From 18d51ed4d1804bd07f129b22daa31247383570bf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Andriot?= <albator78@libertysurf.fr>
Date: Thu, 2 Oct 2014 09:50:54 +0200
Subject: RPM Packaging: update dependencies

---
 .../dependencies/avahi-tqt/avahi-tqt-14.0.0.spec   |  70 ++++++-----
 redhat/dependencies/tqt3/tqt3-14.0.0.spec          | 133 ++++++++++++---------
 .../tqtinterface/tqtinterface-14.0.0.spec          |  50 ++++----
 3 files changed, 142 insertions(+), 111 deletions(-)

diff --git a/redhat/dependencies/avahi-tqt/avahi-tqt-14.0.0.spec b/redhat/dependencies/avahi-tqt/avahi-tqt-14.0.0.spec
index 03bc7e825..57e8c27b0 100644
--- a/redhat/dependencies/avahi-tqt/avahi-tqt-14.0.0.spec
+++ b/redhat/dependencies/avahi-tqt/avahi-tqt-14.0.0.spec
@@ -21,6 +21,13 @@
 %define tde_includedir %{tde_prefix}/include
 %define tde_libdir %{tde_prefix}/%{_lib}
 
+%if 0%{?mdkversion} || 0%{?mdkversion} || 0%{?pclinuxos}
+%define libavahi %{_lib}avahi
+%else
+%define libavahi libavahi
+%endif
+
+
 Name:		trinity-avahi-tqt
 Epoch:		2
 Version:	0.6.30
@@ -43,7 +50,6 @@ BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0:	%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
 
-BuildRequires:	libtqt3-mt-devel >= 3.5.0
 BuildRequires:	libtqt4-devel >= 1:4.2.0
 
 BuildRequires:	gcc-c++
@@ -53,9 +59,6 @@ BuildRequires:	libtool
 # GETTEXT support
 BuildRequires:	gettext-devel
 
-# GLIB2 support
-BuildRequires:	glib2-devel
-
 # DBUS support
 %if 0%{?suse_version}
 BuildRequires:	dbus-1-devel
@@ -64,7 +67,7 @@ BuildRequires:	dbus-1-devel
 BuildRequires:	dbus-devel
 %endif
 
-# AVAHI support
+# AVAHI support
 %if 0%{?mgaversion} || 0%{?mdkversion}
 BuildRequires:	%{_lib}avahi-client-devel
 %endif
@@ -72,7 +75,7 @@ BuildRequires:	%{_lib}avahi-client-devel
 BuildRequires:	avahi-devel
 %endif
 
-# EXPAT support
+# EXPAT support
 %if 0%{?rhel} || 0%{?fedora}
 BuildRequires:	expat-devel
 %endif
@@ -80,12 +83,15 @@ BuildRequires:	expat-devel
 BuildRequires:	libexpat-devel
 %endif
 
-# UUID support
-%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version} || 0%{?rhel} >= 6
-BuildRequires: libuuid-devel
+# NAS support
+%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion}
+%define with_nas 1
+BuildRequires: nas-devel
 %endif
-%if 0%{?rhel} == 5
-BuildRequires: e2fsprogs-devel
+
+# XT support
+%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version}
+BuildRequires: libXt-devel
 %endif
 
 %description
@@ -100,18 +106,15 @@ into a TQt main loop application.
 
 ##########
 
-%package -n libavahi-tqt
+%package -n %{libavahi}-tqt1
 Summary:	Avahi TQt integration library
 Group:		System/Libraries
-
-%if 0%{?mgaversion} || 0%{?mdkversion}
-Provides:		%{_lib}avahi-qt3
-%endif
+Provides:	libavahi-tqt1 = %{?epoch:%{epoch}:}%{version}-%{release}
 
 Obsoletes:		trinity-avahi-tqt < %{?epoch:%{epoch}:}%{version}-%{release}
 Provides:		trinity-avahi-tqt = %{?epoch:%{epoch}:}%{version}-%{release}
 
-%description -n libavahi-tqt
+%description -n %{libavahi}-tqt1
 Avahi is a fully LGPL framework for Multicast DNS Service Discovery.
 It allows programs to publish and discover services and hosts
 running on a local network with no specific configuration. For
@@ -121,32 +124,39 @@ print to, files to look at and people to talk to.
 This library contains the interface to integrate the Avahi libraries
 into a TQt main loop application.
 
-%post -n libavahi-tqt
+%post -n %{libavahi}-tqt1
 /sbin/ldconfig || :
 
-%postun -n libavahi-tqt
+%postun -n %{libavahi}-tqt1
 /sbin/ldconfig || :
 
-%files -n libavahi-tqt
+%files -n %{libavahi}-tqt1
 %defattr(-,root,root,-)
 %{_libdir}/libavahi-tqt.so.1
 %{_libdir}/libavahi-tqt.so.1.0.0
 
 ##########
 
-%package -n libavahi-tqt-devel
+%package -n %{libavahi}-tqt1-devel
 Summary:	Avahi TQt integration library (Development Files)
-Group:		Development/Libraries
-Requires:	libavahi-tqt = %{?epoch:%{epoch}:}%{version}-%{release}
+Group:		Development/Libraries/C and C++
+Provides:	libavahi-tqt1-devel = %{?epoch:%{epoch}:}%{version}-%{release}
 
-%if 0%{?mgaversion} || 0%{?mdkversion}
-Provides:		%{_lib}avahi-qt3-devel
-%endif
+Requires:	%{libavahi}-tqt1 = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	libtqt4-devel >= 1:4.2.0
 
 Obsoletes:		trinity-avahi-tqt-devel < %{?epoch:%{epoch}:}%{version}-%{release}
 Provides:		trinity-avahi-tqt-devel = %{?epoch:%{epoch}:}%{version}-%{release}
 
-%description -n libavahi-tqt-devel
+# AVAHI support
+%if 0%{?mgaversion} || 0%{?mdkversion}
+Requires:	%{_lib}avahi-client-devel
+%endif
+%if 0%{?suse_version} || 0%{?rhel} || 0%{?fedora}
+Requires:	avahi-devel
+%endif
+
+%description -n %{libavahi}-tqt1-devel
 Avahi is a fully LGPL framework for Multicast DNS Service Discovery.
 It allows programs to publish and discover services and hosts
 running on a local network with no specific configuration. For
@@ -156,13 +166,13 @@ print to, files to look at and people to talk to.
 This library contains the interface to integrate the Avahi libraries
 into a TQt main loop application.
 
-%post -n libavahi-tqt-devel
+%post -n %{libavahi}-tqt1-devel
 /sbin/ldconfig || :
 
-%postun -n libavahi-tqt-devel
+%postun -n %{libavahi}-tqt1-devel
 /sbin/ldconfig || :
 
-%files -n libavahi-tqt-devel
+%files -n %{libavahi}-tqt1-devel
 %defattr(-,root,root,-)
 %{_includedir}/avahi-tqt/
 %{_libdir}/libavahi-tqt.so
diff --git a/redhat/dependencies/tqt3/tqt3-14.0.0.spec b/redhat/dependencies/tqt3/tqt3-14.0.0.spec
index 4d6db1907..ea62b8946 100644
--- a/redhat/dependencies/tqt3/tqt3-14.0.0.spec
+++ b/redhat/dependencies/tqt3/tqt3-14.0.0.spec
@@ -18,6 +18,12 @@
 # TDE specific variables
 %define tde_version 14.0.0
 
+%if 0%{?mdkversion} || 0%{?mdkversion} || 0%{?pclinuxos}
+%define libtqt3 %{_lib}tqt3
+%else
+%define libtqt3 libtqt3
+%endif
+
 
 Name:		trinity-tqt3
 Version:	3.5.0
@@ -170,11 +176,17 @@ BuildRequires: libxmu-devel
 %endif
 
 # XI support
-%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version}
-BuildRequires: libXi-devel
+%if 0%{?rhel} == 4
+BuildRequires:	xorg-x11-devel
+%endif
+%if 0%{?mgaversion} || 0%{?mdkversion}
+BuildRequires:	%{_lib}xi-devel
 %endif
-%if 0%{?mgaversion}
-BuildRequires: %{_lib}xi-devel
+%if 0%{?suse_version} >= 1220 || 0%{?rhel} >= 5 || 0%{?fedora}
+BuildRequires:	libXi-devel
+%endif
+%if 0%{?suse_version} == 1140
+BuildRequires:	libXi6-devel
 %endif
 
 # Xorg support
@@ -232,9 +244,10 @@ BuildRequires: util-linux
 
 ##########
 
-%package -n libtqt3-mt
+%package -n %{libtqt3}-mt
 Summary:	TQt GUI Library (Threaded runtime version), Version 3
 Group:		System/GUI/Other
+Provides:	libtqt3-mt = %{version}-%{release}
 
 Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
@@ -242,18 +255,18 @@ Requires: coreutils
 Requires: fontconfig >= 2.0
 Requires: /etc/ld.so.conf.d
 
-%description -n libtqt3-mt
+%description -n %{libtqt3}-mt
 This is the Trolltech TQt library, version 3. It's necessary for
 applications that link against the libtqt-mt.so.3, e.g. all Trinity
 applications.
 
-%post -n libtqt3-mt
+%post -n %{libtqt3}-mt
 /sbin/ldconfig || :
 
-%postun -n libtqt3-mt
+%postun -n %{libtqt3}-mt
 /sbin/ldconfig || :
 
-%files -n libtqt3-mt
+%files -n %{libtqt3}-mt
 %defattr(-,root,root,-)
 %doc FAQ LICENSE* README* changes*
 %dir %{_libdir}/tqt3/
@@ -281,10 +294,11 @@ applications.
 
 ###########
 
-%package -n libtqt3-mt-devel
+%package -n %{libtqt3}-mt-devel
 Summary:	TQt development files (Threaded)
 Group:		Development/Libraries/X11
-Requires:	libtqt3-mt = %{version}-%{release}
+Provides:	libtqt3-mt-devel = %{version}-%{release}
+Requires:	%{libtqt3}-mt = %{version}-%{release}
 
 Requires: glibc-devel
 Requires: fontconfig-devel
@@ -308,11 +322,17 @@ Requires: e2fsprogs-devel
 %endif
 
 # XI support
-%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version}
-Requires: libXi-devel
+%if 0%{?rhel} == 4
+Requires:	xorg-x11-devel
+%endif
+%if 0%{?mgaversion} || 0%{?mdkversion}
+Requires:	%{_lib}xi-devel
+%endif
+%if 0%{?suse_version} >= 1220 || 0%{?rhel} >= 5 || 0%{?fedora}
+Requires:	libXi-devel
 %endif
-%if 0%{?mgaversion}
-Requires: %{_lib}xi-devel
+%if 0%{?suse_version} == 1140
+Requires:	libXi6-devel
 %endif
 
 # Xrender support
@@ -388,7 +408,7 @@ Requires: libice-devel
 %endif
 
 
-%description -n libtqt3-mt-devel
+%description -n %{libtqt3}-mt-devel
 TQt is a C++ class library optimized for graphical user interface
 development. This package contains the libtqt-mt.so symlink, necessary
 for building threaded TQt applications as well as the libtqui.so symlink
@@ -402,13 +422,13 @@ anymore but which are still used by some programs. So if you encounter
 problems with missing header files, please install this package first
 before you send a bugreport.
 
-%post -n libtqt3-mt-devel
+%post -n %{libtqt3}-mt-devel
 /sbin/ldconfig || :
 
-%postun -n libtqt3-mt-devel
+%postun -n %{libtqt3}-mt-devel
 /sbin/ldconfig || :
 
-%files -n libtqt3-mt-devel
+%files -n %{libtqt3}-mt-devel
 %defattr(-,root,root,-)
 %{_libdir}/libtqt-mt.la
 %{_libdir}/libtqt-mt.so
@@ -741,97 +761,103 @@ before you send a bugreport.
 
 ##########
 
-%package -n libtqt3-mt-mysql
+%package -n %{libtqt3}-mt-mysql
 Summary:	MySQL database driver for TQt3 (Threaded)
 Group:		System/GUI/Other
-Requires:	libtqt3-mt = %{version}-%{release}
+Provides:	libtqt3-mt-mysql = %{version}-%{release}
+Requires:	%{libtqt3}-mt = %{version}-%{release}
 
-%description -n libtqt3-mt-mysql
+%description -n %{libtqt3}-mt-mysql
 This package contains the threaded MySQL plugin for TQt3. Install it if
 you intend to use or write TQt programs that are to access a MySQL DB.
 
-%files -n libtqt3-mt-mysql
+%files -n %{libtqt3}-mt-mysql
 %defattr(-,root,root,-)
 %{_libdir}/tqt3/plugins/sqldrivers/libqsqlmysql.so
 
 ##########
 
-%package -n libtqt3-mt-odbc
+%package -n %{libtqt3}-mt-odbc
 Summary:	ODBC database driver for TQt3 (Threaded)
 Group:		System/GUI/Other
-Requires:	libtqt3-mt = %{version}-%{release}
+Provides:	libtqt3-mt-odbc = %{version}-%{release}
+Requires:	%{libtqt3}-mt = %{version}-%{release}
 
-%description -n libtqt3-mt-odbc
+%description -n %{libtqt3}-mt-odbc
 This package contains the threaded ODBC plugin for TQt3. Install it if
 you intend to use or write TQt programs that are to access an ODBC DB.
 
-%files -n libtqt3-mt-odbc
+%files -n %{libtqt3}-mt-odbc
 %defattr(-,root,root,-)
 %{_libdir}/tqt3/plugins/sqldrivers/libqsqlodbc.so
 
 ##########
 
-%package -n libtqt3-mt-psql
+%package -n %{libtqt3}-mt-psql
 Summary:	PostgreSQL database driver for TQt3 (Threaded)
 Group:		System/GUI/Other
-Requires:	libtqt3-mt = %{version}-%{release}
+Provides:	libtqt3-mt-psql = %{version}-%{release}
+Requires:	%{libtqt3}-mt = %{version}-%{release}
 
-%description -n libtqt3-mt-psql
+%description -n %{libtqt3}-mt-psql
 This package contains the threaded PostgreSQL plugin for TQt3.
 Install it if you intend to use or write TQt programs that are
 to access a PostgreSQL DB.
 
-%files -n libtqt3-mt-psql
+%files -n %{libtqt3}-mt-psql
 %defattr(-,root,root,-)
 %{_libdir}/tqt3/plugins/sqldrivers/libqsqlpsql.so
 
 ##########
 
 %if 0%{?with_ibase}
-%package -n libtqt3-mt-ibase
+%package -n %{libtqt3}-mt-ibase
 Summary:	InterBase/FireBird database driver for TQt3 (Threaded)
 Group:		System/GUI/Other
-Requires:	libtqt3-mt = %{version}-%{release}
+Provides:	libtqt3-mt-ibase = %{version}-%{release}
+Requires:	%{libtqt3}-mt = %{version}-%{release}
 
-%description -n libtqt3-mt-ibase
+%description -n %{libtqt3}-mt-ibase
 This package contains the threaded InterBase/FireBird plugin
 for TQt3. Install it if you intend to use or write TQt programs
 that are to access an InterBase/FireBird DB.
 
-%files -n libtqt3-mt-ibase
+%files -n %{libtqt3}-mt-ibase
 %defattr(-,root,root,-)
 %{_libdir}/tqt3/plugins/sqldrivers/libqsqlibase.so
 %endif
 
 ##########
 
-%package -n libtqt3-mt-sqlite
+%package -n %{libtqt3}-mt-sqlite
 Summary:	SQLite database driver for TQt3 (Threaded)
 Group:		System/GUI/Other
-Requires:	libtqt3-mt = %{version}-%{release}
+Provides:	libtqt3-mt-sqlite = %{version}-%{release}
+Requires:	%{libtqt3}-mt = %{version}-%{release}
 
-%description -n libtqt3-mt-sqlite
+%description -n %{libtqt3}-mt-sqlite
 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
 SQLite DB.
 
-%files -n libtqt3-mt-sqlite
+%files -n %{libtqt3}-mt-sqlite
 %defattr(-,root,root,-)
 %{_libdir}/tqt3/plugins/sqldrivers/libqsqlite.so
 
 ##########
 
-%package -n libtqt3-mt-sqlite3
+%package -n %{libtqt3}-mt-sqlite3
 Summary:	SQLite3 database driver for TQt3 (Threaded)
 Group:		System/GUI/Other
-Requires:	libtqt3-mt = %{version}-%{release}
+Provides:	libtqt3-mt-sqlite3 = %{version}-%{release}
+Requires:	%{libtqt3}-mt = %{version}-%{release}
 
-%description -n libtqt3-mt-sqlite3
+%description -n %{libtqt3}-mt-sqlite3
 This package contains the threaded SQLite3 plugin for TQt3. Install
 it if you intend to use or write TQt programs that are to access an
 SQLite3 DB.
 
-%files -n libtqt3-mt-sqlite3
+%files -n %{libtqt3}-mt-sqlite3
 %defattr(-,root,root,-)
 %{_libdir}/tqt3/plugins/sqldrivers/libqsqlite3.so
 
@@ -840,7 +866,7 @@ SQLite3 DB.
 %package -n tqt3-compat-headers
 Summary:	TQt 1.x and 2.x compatibility includes
 Group:		Development/Libraries/X11
-Requires:	libtqt3-mt = %{version}-%{release}
+Requires:	%{libtqt3}-mt = %{version}-%{release}
 
 %description -n tqt3-compat-headers
 This package contains header files that are intended for build
@@ -915,7 +941,7 @@ libtqt3-headers.
 %package -n tqt3-dev-tools
 Summary:	TQt3 development tools
 Group:		Development/Libraries/X11
-Requires:	libtqt3-mt = %{version}-%{release}
+Requires:	%{libtqt3}-mt-devel = %{version}-%{release}
 Requires:	tqt3-dev-tools-devel = %{version}-%{release}
 
 %description -n tqt3-dev-tools
@@ -958,7 +984,7 @@ that are written using TQt3.
 %package -n tqt3-designer
 Summary:	TQt3 Designer
 Group:		System/GUI/Other
-Requires:	libtqt3-mt = %{version}-%{release}
+Requires:	%{libtqt3}-mt = %{version}-%{release}
 
 %description -n tqt3-designer
 The TQt Designer is a GUI design program that interactively lets you
@@ -1001,8 +1027,7 @@ or automake.
 %package -n tqt3-apps-devel
 Summary:	TQt3 Developer applications development files
 Group:		Development/Libraries/X11
-Requires:	libtqt3-mt = %{version}-%{release}
-Requires:	libtqt3-mt-devel = %{version}-%{release}
+Requires:	%{libtqt3}-mt-devel = %{version}-%{release}
 
 %description -n tqt3-apps-devel
 This package is intended for developers who want to develop applications
@@ -1043,7 +1068,7 @@ developer includes with his application.
 %package -n tqt3-linguist
 Summary:	The TQt3 Linguist
 Group:		System/GUI/Other
-Requires:	libtqt3-mt = %{version}-%{release}
+Requires:	%{libtqt3}-mt = %{version}-%{release}
 
 %description -n tqt3-linguist
 This package contains the TQt3 Linguist which provides translators a
@@ -1067,7 +1092,7 @@ development files by the translator.
 %package -n tqt3-assistant
 Summary:	The TQt3 assistant application
 Group:		System/GUI/Other
-Requires:	libtqt3-mt = %{version}-%{release}
+Requires:	%{libtqt3}-mt = %{version}-%{release}
 
 %description -n tqt3-assistant
 This package contains the TQt3 Assistant, an easy to use frontend for
@@ -1093,7 +1118,7 @@ the package tqt3-apps-devel.
 %package -n tqt3-qtconfig
 Summary:	The TQt3 Configuration Application
 Group:		Development/Libraries/X11
-Requires:	libtqt3-mt = %{version}-%{release}
+Requires:	%{libtqt3}-mt = %{version}-%{release}
 
 %description -n tqt3-qtconfig
 The TQt Configuration program allows endusers to configure the look
@@ -1114,7 +1139,7 @@ install this package.
 %package -n tqt3-dev-tools-embedded
 Summary:	Tools to develop embedded TQt applications
 Group:		System/GUI/Other
-Requires:	libtqt3-mt = %{version}-%{release}
+Requires:	%{libtqt3}-mt-devel = %{version}-%{release}
 
 %description -n tqt3-dev-tools-embedded
 This package contains applications only suitable for developing
@@ -1138,7 +1163,7 @@ by TQt Embedded applications.
 %package -n tqt3-dev-tools-compat
 Summary:	Conversion utilities for TQt3 development
 Group:		System/GUI/Other
-Requires:	libtqt3-mt = %{version}-%{release}
+Requires:	%{libtqt3}-mt-devel = %{version}-%{release}
 
 %description -n tqt3-dev-tools-compat
 This package contains some older TQt tools (namely tqt20fix tqtrename140,
@@ -1163,7 +1188,7 @@ translation system to the TQt 3 system.
 %package -n tqt3-i18n
 Summary:	Translation (i18n) files for TQt3 library
 Group:		System/GUI/Other
-Requires:	libtqt3-mt = %{version}-%{release}
+Requires:	%{libtqt3}-mt = %{version}-%{release}
 
 %description -n tqt3-i18n
 This package contains the internationalization files for the TQt library.
diff --git a/redhat/dependencies/tqtinterface/tqtinterface-14.0.0.spec b/redhat/dependencies/tqtinterface/tqtinterface-14.0.0.spec
index 2d9911e0c..d3564904b 100755
--- a/redhat/dependencies/tqtinterface/tqtinterface-14.0.0.spec
+++ b/redhat/dependencies/tqtinterface/tqtinterface-14.0.0.spec
@@ -23,6 +23,12 @@
 %define tde_libdir %{tde_prefix}/%{_lib}
 %define cmake_modules_dir %{_datadir}/cmake/Modules
 
+%if 0%{?mdkversion} || 0%{?mdkversion} || 0%{?pclinuxos}
+%define libtqt4 %{_lib}tqt4
+%else
+%define libtqt4 libtqt4
+%endif
+
 Name:		trinity-tqtinterface
 Epoch:		1
 Version:	4.2.0
@@ -61,20 +67,6 @@ BuildRequires:	pkgconfig
 BuildRequires:	pth-devel
 %endif
 
-# X11 libraries
-%if 0%{?rhel} == 4
-BuildRequires:	xorg-x11-devel
-%endif
-%if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires:	%{_lib}xi-devel
-%endif
-%if 0%{?suse_version} >= 1220 || 0%{?rhel} >= 5 || 0%{?fedora}
-BuildRequires:	libXi-devel
-%endif
-%if 0%{?suse_version} == 1140
-BuildRequires:	libXi6-devel
-%endif
-
 # MESA support
 %if 0%{?rhel} || 0%{?fedora}
 BuildRequires: mesa-libGL-devel
@@ -98,10 +90,12 @@ although some code has been added for useful functions that are no longer part o
 
 ##########
 
-%package -n libtqt4
+%package -n %{libtqt4}
 Group:		System/GUI/Other
 Summary:	The Trinity Qt Interface Libraries
-Requires:	%{name} = %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:	libtqt4 = %{?epoch:%{epoch}:}%{version}-%{release}
+
+Requires:	libtqt3-mt >= 3.5.0
 
 Requires:		libtqt3-mt >= 3.5.0
 %if 0%{?suse_version} && 0%{?suse_version} < 1300
@@ -111,29 +105,31 @@ Requires:		trinity-cmake-macros
 Obsoletes:	trinity-tqtinterface < %{?epoch:%{epoch}:}%{version}-%{release}
 Provides:	trinity-tqtinterface = %{?epoch:%{epoch}:}%{version}-%{release}
 
-%description -n libtqt4
+%description -n %{libtqt4}
 The Trinity Qt Interface is a library that abstracts Qt from Trinity.
 This allows the Trinity code to rapidly port from one version of Qt to another.
 This is primarily accomplished by defining old functions in terms of new functions,
 although some code has been added for useful functions that are no longer part of Qt.
 
-%files -n libtqt4
+%files -n %{libtqt4}
 %defattr(-,root,root,-)
 %{_libdir}/libtqt.so.4
 %{_libdir}/libtqt.so.4.2.0
 
-%post -n libtqt4
+%post -n %{libtqt4}
 /sbin/ldconfig || :
 
-%postun -n libtqt4
+%postun -n %{libtqt4}
 /sbin/ldconfig || :
 
 ##########
 
-%package -n libtqt4-devel
-Group:		Development/Libraries
+%package -n %{libtqt4}-devel
+Group:		Development/Libraries/X11
 Summary:	The Trinity Qt Interface Libraries (Development Files)
-Requires:	libtqt4 = %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:	libtqt4-devel = %{?epoch:%{epoch}:}%{version}-%{release}
+
+Requires:	%{libtqt4} = %{?epoch:%{epoch}:}%{version}-%{release}
 Requires:	libtqt3-mt-devel >= 3.5.0
 Requires:	tqt3-dev-tools >= 3.5.0
 
@@ -144,19 +140,19 @@ Requires:		trinity-cmake-macros
 Obsoletes:	trinity-tqtinterface-devel < %{?epoch:%{epoch}:}%{version}-%{release}
 Provides:	trinity-tqtinterface-devel = %{?epoch:%{epoch}:}%{version}-%{release}
 
-%description -n libtqt4-devel
+%description -n %{libtqt4}-devel
 The Trinity Qt Interface is a library that abstracts Qt from Trinity.
 This allows the Trinity code to rapidly port from one version of Qt to another.
 This is primarily accomplished by defining old functions in terms of new functions,
 although some code has been added for useful functions that are no longer part of Qt.
 
-%post -n libtqt4-devel
+%post -n %{libtqt4}-devel
 /sbin/ldconfig || :
 
-%postun -n libtqt4-devel
+%postun -n %{libtqt4}-devel
 /sbin/ldconfig || :
 
-%files -n libtqt4-devel
+%files -n %{libtqt4}-devel
 %defattr(-,root,root,-)
 %{_bindir}/convert_qt_tqt1
 %{_bindir}/convert_qt_tqt2
-- 
cgit v1.2.1


From bec23ad3d7863468f4285f61aa0ff7b9a68efa7f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Andriot?= <albator78@libertysurf.fr>
Date: Thu, 2 Oct 2014 18:30:36 +0200
Subject: RPM Packaging: update dbus-tqt

---
 .../dependencies/dbus-1-tqt/dbus-1-tqt-14.0.0.spec | 30 ++++++++++++-------
 redhat/dependencies/dbus-tqt/dbus-tqt-14.0.0.spec  | 34 +++++++++++++---------
 2 files changed, 40 insertions(+), 24 deletions(-)

diff --git a/redhat/dependencies/dbus-1-tqt/dbus-1-tqt-14.0.0.spec b/redhat/dependencies/dbus-1-tqt/dbus-1-tqt-14.0.0.spec
index a8692ce38..69ead7bfa 100644
--- a/redhat/dependencies/dbus-1-tqt/dbus-1-tqt-14.0.0.spec
+++ b/redhat/dependencies/dbus-1-tqt/dbus-1-tqt-14.0.0.spec
@@ -18,6 +18,12 @@
 # TDE specific building variables
 %define tde_version 14.0.0
 
+%if 0%{?mdkversion} || 0%{?mdkversion} || 0%{?pclinuxos}
+%define libdbus %{_lib}dbus
+%else
+%define libdbus libdbus
+%endif
+
 
 Name:		trinity-dbus-1-tqt
 Epoch:		2
@@ -66,14 +72,15 @@ See the dbus description for more information about D-BUS in general.
 
 ###########
 
-%package -n libdbus-1-tqt0
+%package -n %{libdbus}-1-tqt0
 Summary:		dbus bindings for the Trinity Qt [TQt] interface
 Group:			System/Libraries
+Provides:		libdbus-1-tqt0 = %{?epoch:%{epoch}:}%{version}-%{release}
 
 Obsoletes:		trinity-dbus-1-tqt < %{?epoch:%{epoch}:}%{version}-%{release}
 Provides:		trinity-dbus-1-tqt = %{?epoch:%{epoch}:}%{version}-%{release}
 
-%description -n libdbus-1-tqt0
+%description -n %{libdbus}-1-tqt0
 D-BUS is a message bus, used for sending messages between applications.
 Conceptually, it fits somewhere in between raw sockets and CORBA in
 terms of complexity.
@@ -82,28 +89,29 @@ This package provides bindings for the Trinity Qt TQt interface.
 
 See the dbus description for more information about D-BUS in general.
 
-%post -n libdbus-1-tqt0
+%post -n %{libdbus}-1-tqt0
 /sbin/ldconfig || :
 
-%postun -n libdbus-1-tqt0
+%postun -n %{libdbus}-1-tqt0
 /sbin/ldconfig || :
 
-%files -n libdbus-1-tqt0
+%files -n %{libdbus}-1-tqt0
 %defattr(-,root,root,-)
 %{_libdir}/libdbus-1-tqt.so.0
 %{_libdir}/libdbus-1-tqt.so.0.0.0
 
 ##########
 
-%package -n libdbus-1-tqt0-devel
+%package -n %{libdbus}-1-tqt0-devel
 Summary:		dbus bindings for the Trinity Qt [TQt] interface (Development Files)
 Group:			Development/Libraries/C and C++
-Requires:		libdbus-1-tqt0 = %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		libdbus-1-tqt0-devel = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:		%{libdbus}-1-tqt0 = %{?epoch:%{epoch}:}%{version}-%{release}
 
 Obsoletes:		trinity-dbus-1-tqt-devel < %{?epoch:%{epoch}:}%{version}-%{release}
 Provides:		trinity-dbus-1-tqt-devel = %{?epoch:%{epoch}:}%{version}-%{release}
 
-%description -n libdbus-1-tqt0-devel
+%description -n %{libdbus}-1-tqt0-devel
 D-BUS is a message bus, used for sending messages between applications.
 Conceptually, it fits somewhere in between raw sockets and CORBA in
 terms of complexity.
@@ -112,13 +120,13 @@ This package provides bindings for the Trinity Qt TQt interface.
 
 See the dbus description for more information about D-BUS in general.
 
-%post -n libdbus-1-tqt0-devel
+%post -n %{libdbus}-1-tqt0-devel
 /sbin/ldconfig || :
 
-%postun -n libdbus-1-tqt0-devel
+%postun -n %{libdbus}-1-tqt0-devel
 /sbin/ldconfig || :
 
-%files -n libdbus-1-tqt0-devel
+%files -n %{libdbus}-1-tqt0-devel
 %defattr(-,root,root,-)
 %{_bindir}/dbusxml2qt3
 %{_includedir}/*.h
diff --git a/redhat/dependencies/dbus-tqt/dbus-tqt-14.0.0.spec b/redhat/dependencies/dbus-tqt/dbus-tqt-14.0.0.spec
index a3f7d268f..89908b295 100644
--- a/redhat/dependencies/dbus-tqt/dbus-tqt-14.0.0.spec
+++ b/redhat/dependencies/dbus-tqt/dbus-tqt-14.0.0.spec
@@ -18,6 +18,12 @@
 # TDE specific building variables
 %define tde_version 14.0.0
 
+%if 0%{?mdkversion} || 0%{?mdkversion} || 0%{?pclinuxos}
+%define libdbus %{_lib}dbus
+%else
+%define libdbus libdbus
+%endif
+
 
 Name:		trinity-dbus-tqt
 Epoch:		2
@@ -67,14 +73,15 @@ See the dbus description for more information about D-BUS in general.
 
 ##########
 
-%package -n libdbus-tqt-1-0
-Summary:	Simple inter-process messaging system (TQt-based shared library)
-Group:		System/Libraries
+%package -n %{libdbus}-tqt-1-0
+Summary:		Simple inter-process messaging system (TQt-based shared library)
+Group:			System/Libraries
+Provides:		libdbus-tqt-1-0 = %{?epoch:%{epoch}:}%{version}-%{release}
 
 Obsoletes:		trinity-dbus-tqt < %{?epoch:%{epoch}:}%{version}-%{release}
 Provides:		trinity-dbus-tqt = %{?epoch:%{epoch}:}%{version}-%{release}
 
-%description -n libdbus-tqt-1-0
+%description -n %{libdbus}-tqt-1-0
 D-BUS is a message bus, used for sending messages between applications.
 Conceptually, it fits somewhere in between raw sockets and CORBA in
 terms of complexity.
@@ -84,28 +91,29 @@ Qt interface to D-BUS.
 
 See the dbus description for more information about D-BUS in general.
 
-%post -n libdbus-tqt-1-0
+%post -n %{libdbus}-tqt-1-0
 /sbin/ldconfig || :
 
-%postun -n libdbus-tqt-1-0
+%postun -n %{libdbus}-tqt-1-0
 /sbin/ldconfig || :
 
-%files -n libdbus-tqt-1-0
+%files -n %{libdbus}-tqt-1-0
 %defattr(-,root,root,-)
 %{_libdir}/libdbus-tqt-1.so.0
 %{_libdir}/libdbus-tqt-1.so.0.0.0
 
 ##########
 
-%package -n libdbus-tqt-1-0-devel
+%package -n %{libdbus}-tqt-1-0-devel
 Summary:		Simple inter-process messaging system (TQt interface)
 Group:			Development/Libraries/C and C++
-Requires:		libdbus-tqt-1-0 = %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		libdbus-tqt-1-0-devel = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:		%{libdbus}-tqt-1-0 = %{?epoch:%{epoch}:}%{version}-%{release}
 
 Obsoletes:		trinity-dbus-tqt-devel < %{?epoch:%{epoch}:}%{version}-%{release}
 Provides:		trinity-dbus-tqt-devel = %{?epoch:%{epoch}:}%{version}-%{release}
 
-%description -n libdbus-tqt-1-0-devel
+%description -n %{libdbus}-tqt-1-0-devel
 D-BUS is a message bus, used for sending messages between applications.
 Conceptually, it fits somewhere in between raw sockets and CORBA in
 terms of complexity.
@@ -115,13 +123,13 @@ Qt interface to D-BUS.
 
 See the dbus description for more information about D-BUS in general.
 
-%post -n libdbus-tqt-1-0-devel
+%post -n %{libdbus}-tqt-1-0-devel
 /sbin/ldconfig || :
 
-%postun -n libdbus-tqt-1-0-devel
+%postun -n %{libdbus}-tqt-1-0-devel
 /sbin/ldconfig || :
 
-%files -n libdbus-tqt-1-0-devel
+%files -n %{libdbus}-tqt-1-0-devel
 %defattr(-,root,root,-)
 %{_includedir}/dbus-1.0/*
 %{_libdir}/libdbus-tqt-1.so
-- 
cgit v1.2.1


From 5bd8508283f096e231cad2ffe348866b73e441f7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Andriot?= <albator78@libertysurf.fr>
Date: Thu, 2 Oct 2014 19:09:23 +0200
Subject: RPM Packaging: update libart_lgpl

---
 .../dependencies/avahi-tqt/avahi-tqt-14.0.0.spec   |  14 +-
 .../dependencies/dbus-1-tqt/dbus-1-tqt-14.0.0.spec |  14 +-
 redhat/dependencies/dbus-tqt/dbus-tqt-14.0.0.spec  |  14 +-
 .../libart-lgpl/libart-lgpl-14.0.0.spec            | 175 +++++++++++----------
 redhat/dependencies/tqt3/tqt3-14.0.0.spec          |   2 +-
 5 files changed, 112 insertions(+), 107 deletions(-)

diff --git a/redhat/dependencies/avahi-tqt/avahi-tqt-14.0.0.spec b/redhat/dependencies/avahi-tqt/avahi-tqt-14.0.0.spec
index 57e8c27b0..83dcd2ec5 100644
--- a/redhat/dependencies/avahi-tqt/avahi-tqt-14.0.0.spec
+++ b/redhat/dependencies/avahi-tqt/avahi-tqt-14.0.0.spec
@@ -15,7 +15,7 @@
 # Please submit bugfixes or comments via http:/www.trinitydesktop.org/
 #
 
-# TDE specific building variables
+# TDE variables
 %define tde_version 14.0.0
 %define tde_prefix /opt/trinity
 %define tde_includedir %{tde_prefix}/include
@@ -137,10 +137,10 @@ into a TQt main loop application.
 
 ##########
 
-%package -n %{libavahi}-tqt1-devel
+%package -n %{libavahi}-tqt-devel
 Summary:	Avahi TQt integration library (Development Files)
 Group:		Development/Libraries/C and C++
-Provides:	libavahi-tqt1-devel = %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:	libavahi-tqt-devel = %{?epoch:%{epoch}:}%{version}-%{release}
 
 Requires:	%{libavahi}-tqt1 = %{?epoch:%{epoch}:}%{version}-%{release}
 Requires:	libtqt4-devel >= 1:4.2.0
@@ -156,7 +156,7 @@ Requires:	%{_lib}avahi-client-devel
 Requires:	avahi-devel
 %endif
 
-%description -n %{libavahi}-tqt1-devel
+%description -n %{libavahi}-tqt-devel
 Avahi is a fully LGPL framework for Multicast DNS Service Discovery.
 It allows programs to publish and discover services and hosts
 running on a local network with no specific configuration. For
@@ -166,13 +166,13 @@ print to, files to look at and people to talk to.
 This library contains the interface to integrate the Avahi libraries
 into a TQt main loop application.
 
-%post -n %{libavahi}-tqt1-devel
+%post -n %{libavahi}-tqt-devel
 /sbin/ldconfig || :
 
-%postun -n %{libavahi}-tqt1-devel
+%postun -n %{libavahi}-tqt-devel
 /sbin/ldconfig || :
 
-%files -n %{libavahi}-tqt1-devel
+%files -n %{libavahi}-tqt-devel
 %defattr(-,root,root,-)
 %{_includedir}/avahi-tqt/
 %{_libdir}/libavahi-tqt.so
diff --git a/redhat/dependencies/dbus-1-tqt/dbus-1-tqt-14.0.0.spec b/redhat/dependencies/dbus-1-tqt/dbus-1-tqt-14.0.0.spec
index 69ead7bfa..17a045350 100644
--- a/redhat/dependencies/dbus-1-tqt/dbus-1-tqt-14.0.0.spec
+++ b/redhat/dependencies/dbus-1-tqt/dbus-1-tqt-14.0.0.spec
@@ -15,7 +15,7 @@
 # Please submit bugfixes or comments via http:/www.trinitydesktop.org/
 #
 
-# TDE specific building variables
+# TDE variables
 %define tde_version 14.0.0
 
 %if 0%{?mdkversion} || 0%{?mdkversion} || 0%{?pclinuxos}
@@ -102,16 +102,16 @@ See the dbus description for more information about D-BUS in general.
 
 ##########
 
-%package -n %{libdbus}-1-tqt0-devel
+%package -n %{libdbus}-1-tqt-devel
 Summary:		dbus bindings for the Trinity Qt [TQt] interface (Development Files)
 Group:			Development/Libraries/C and C++
-Provides:		libdbus-1-tqt0-devel = %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		libdbus-1-tqt-devel = %{?epoch:%{epoch}:}%{version}-%{release}
 Requires:		%{libdbus}-1-tqt0 = %{?epoch:%{epoch}:}%{version}-%{release}
 
 Obsoletes:		trinity-dbus-1-tqt-devel < %{?epoch:%{epoch}:}%{version}-%{release}
 Provides:		trinity-dbus-1-tqt-devel = %{?epoch:%{epoch}:}%{version}-%{release}
 
-%description -n %{libdbus}-1-tqt0-devel
+%description -n %{libdbus}-1-tqt-devel
 D-BUS is a message bus, used for sending messages between applications.
 Conceptually, it fits somewhere in between raw sockets and CORBA in
 terms of complexity.
@@ -120,13 +120,13 @@ This package provides bindings for the Trinity Qt TQt interface.
 
 See the dbus description for more information about D-BUS in general.
 
-%post -n %{libdbus}-1-tqt0-devel
+%post -n %{libdbus}-1-tqt-devel
 /sbin/ldconfig || :
 
-%postun -n %{libdbus}-1-tqt0-devel
+%postun -n %{libdbus}-1-tqt-devel
 /sbin/ldconfig || :
 
-%files -n %{libdbus}-1-tqt0-devel
+%files -n %{libdbus}-1-tqt-devel
 %defattr(-,root,root,-)
 %{_bindir}/dbusxml2qt3
 %{_includedir}/*.h
diff --git a/redhat/dependencies/dbus-tqt/dbus-tqt-14.0.0.spec b/redhat/dependencies/dbus-tqt/dbus-tqt-14.0.0.spec
index 89908b295..db9237f94 100644
--- a/redhat/dependencies/dbus-tqt/dbus-tqt-14.0.0.spec
+++ b/redhat/dependencies/dbus-tqt/dbus-tqt-14.0.0.spec
@@ -15,7 +15,7 @@
 # Please submit bugfixes or comments via http:/www.trinitydesktop.org/
 #
 
-# TDE specific building variables
+# TDE variables
 %define tde_version 14.0.0
 
 %if 0%{?mdkversion} || 0%{?mdkversion} || 0%{?pclinuxos}
@@ -104,16 +104,16 @@ See the dbus description for more information about D-BUS in general.
 
 ##########
 
-%package -n %{libdbus}-tqt-1-0-devel
+%package -n %{libdbus}-tqt-1-devel
 Summary:		Simple inter-process messaging system (TQt interface)
 Group:			Development/Libraries/C and C++
-Provides:		libdbus-tqt-1-0-devel = %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		libdbus-tqt-1-devel = %{?epoch:%{epoch}:}%{version}-%{release}
 Requires:		%{libdbus}-tqt-1-0 = %{?epoch:%{epoch}:}%{version}-%{release}
 
 Obsoletes:		trinity-dbus-tqt-devel < %{?epoch:%{epoch}:}%{version}-%{release}
 Provides:		trinity-dbus-tqt-devel = %{?epoch:%{epoch}:}%{version}-%{release}
 
-%description -n %{libdbus}-tqt-1-0-devel
+%description -n %{libdbus}-tqt-1-devel
 D-BUS is a message bus, used for sending messages between applications.
 Conceptually, it fits somewhere in between raw sockets and CORBA in
 terms of complexity.
@@ -123,13 +123,13 @@ Qt interface to D-BUS.
 
 See the dbus description for more information about D-BUS in general.
 
-%post -n %{libdbus}-tqt-1-0-devel
+%post -n %{libdbus}-tqt-1-devel
 /sbin/ldconfig || :
 
-%postun -n %{libdbus}-tqt-1-0-devel
+%postun -n %{libdbus}-tqt-1-devel
 /sbin/ldconfig || :
 
-%files -n %{libdbus}-tqt-1-0-devel
+%files -n %{libdbus}-tqt-1-devel
 %defattr(-,root,root,-)
 %{_includedir}/dbus-1.0/*
 %{_libdir}/libdbus-tqt-1.so
diff --git a/redhat/dependencies/libart-lgpl/libart-lgpl-14.0.0.spec b/redhat/dependencies/libart-lgpl/libart-lgpl-14.0.0.spec
index 3d29ee9f0..afbbda311 100644
--- a/redhat/dependencies/libart-lgpl/libart-lgpl-14.0.0.spec
+++ b/redhat/dependencies/libart-lgpl/libart-lgpl-14.0.0.spec
@@ -15,27 +15,22 @@
 # Please submit bugfixes or comments via http:/www.trinitydesktop.org/
 #
 
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?tde_prefix}" != "/usr"
-%define _variant .opt
-%endif
 
 # TDE variables
 %define tde_version 14.0.0
-%define tde_prefix /opt/trinity
-%define tde_bindir %{tde_prefix}/bin
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_datadir %{tde_prefix}/share
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define _docdir %{tde_datadir}/doc
+
+%if 0%{?mdkversion} || 0%{?mdkversion} || 0%{?pclinuxos}
+%define libart %{_lib}art
+%else
+%define libart libart
+%endif
 
 
 Name:           trinity-libart-lgpl
 Version:        2.3.22
 Release:		%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
-Summary:        Library of functions for 2D graphics - runtime files
-Group:          System Environment/Libraries
+Summary:        Library of functions for 2D graphics
+Group:			System/Libraries
 URL:			http://www.trinitydesktop.org/
 
 %if 0%{?suse_version}
@@ -47,15 +42,14 @@ License:	LGPLv2+
 #Vendor:			Trinity Project
 #Packager:		Francois Andriot <francois.andriot@free.fr>
 
-Prefix:			%{tde_prefix}
+Prefix:			/usr
 BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
 
-BuildRequires:  trinity-tqt3-devel >= 3.5.0
-BuildRequires:  trinity-tqtinterface-devel >= %{tde_version}
-
 BuildRequires:	gcc-c++
+BuildRequires:	pkgconfig
+BuildRequires:	libtool
 
 %description
 A library of functions for 2D graphics supporting a superset of the
@@ -64,89 +58,102 @@ and illustration programs. It is written in optimized C, and is fully
 compatible with C++. With a small footprint of 10,000 lines of code, it is
 especially suitable for embedded applications.
 
+##########
+
+%package -n %{libart}_lgpl_2-2
+Summary:        Library of functions for 2D graphics - runtime files
+Group:			System/Libraries
+Provides:		libart_lgpl_2-2 = %{version}-%{release}
+
+%description -n %{libart}_lgpl_2-2
+A library of functions for 2D graphics supporting a superset of the
+PostScript imaging model, designed to be integrated with graphics, artwork,
+and illustration programs. It is written in optimized C, and is fully
+compatible with C++. With a small footprint of 10,000 lines of code, it is
+especially suitable for embedded applications.
 
-%post
+%post -n %{libart}_lgpl_2-2
 /sbin/ldconfig || :
 
-%postun
+%postun -n %{libart}_lgpl_2-2
 /sbin/ldconfig || :
 
-%files
+%files -n %{libart}_lgpl_2-2
 %defattr(-,root,root,-)
-%{tde_libdir}/libart_lgpl_2.so.2
-%{tde_libdir}/libart_lgpl_2.so.2.3.21
+%{_libdir}/libart_lgpl_2.so.2
+%{_libdir}/libart_lgpl_2.so.2.3.21
 
 ##########
 
-%package        devel
+%package -n %{libart}_lgpl-devel
 Summary:        Library of functions for 2D graphics - development files
 Group:          Development/Libraries
-Requires:       %{name} = %{version}-%{release}
+Requires:       %{libart}_lgpl_2-2 = %{version}-%{release}
 
-%description    devel
+%description -n %{libart}_lgpl-devel
 A library of functions for 2D graphics supporting a superset of the
 PostScript imaging model, designed to be integrated with graphics, artwork,
 and illustration programs. It is written in optimized C, and is fully
 compatible with C++. With a small footprint of 10,000 lines of code, it is
 especially suitable for embedded applications.
 
-%post devel
+%post -n %{libart}_lgpl-devel
 /sbin/ldconfig || :
 
-%postun devel
+%postun -n %{libart}_lgpl-devel
 /sbin/ldconfig || :
 
-%files devel
+%files -n %{libart}_lgpl-devel
 %defattr(-,root,root,-)
-%{tde_bindir}/libart2-config
-%{tde_libdir}/libart_lgpl_2.a
-%{tde_libdir}/libart_lgpl_2.la
-%{tde_libdir}/libart_lgpl_2.so
-%{tde_tdeincludedir}/libart-2.0/libart_lgpl/art_affine.h
-%{tde_tdeincludedir}/libart-2.0/libart_lgpl/art_alphagamma.h
-%{tde_tdeincludedir}/libart-2.0/libart_lgpl/art_bpath.h
-%{tde_tdeincludedir}/libart-2.0/libart_lgpl/art_config.h
-%{tde_tdeincludedir}/libart-2.0/libart_lgpl/art_filterlevel.h
-%{tde_tdeincludedir}/libart-2.0/libart_lgpl/art_gray_svp.h
-%{tde_tdeincludedir}/libart-2.0/libart_lgpl/art_misc.h
-%{tde_tdeincludedir}/libart-2.0/libart_lgpl/art_pathcode.h
-%{tde_tdeincludedir}/libart-2.0/libart_lgpl/art_pixbuf.h
-%{tde_tdeincludedir}/libart-2.0/libart_lgpl/art_point.h
-%{tde_tdeincludedir}/libart-2.0/libart_lgpl/art_rect.h
-%{tde_tdeincludedir}/libart-2.0/libart_lgpl/art_rect_svp.h
-%{tde_tdeincludedir}/libart-2.0/libart_lgpl/art_rect_uta.h
-%{tde_tdeincludedir}/libart-2.0/libart_lgpl/art_render.h
-%{tde_tdeincludedir}/libart-2.0/libart_lgpl/art_render_gradient.h
-%{tde_tdeincludedir}/libart-2.0/libart_lgpl/art_render_mask.h
-%{tde_tdeincludedir}/libart-2.0/libart_lgpl/art_render_svp.h
-%{tde_tdeincludedir}/libart-2.0/libart_lgpl/art_rgb.h
-%{tde_tdeincludedir}/libart-2.0/libart_lgpl/art_rgb_a_affine.h
-%{tde_tdeincludedir}/libart-2.0/libart_lgpl/art_rgb_affine.h
-%{tde_tdeincludedir}/libart-2.0/libart_lgpl/art_rgb_bitmap_affine.h
-%{tde_tdeincludedir}/libart-2.0/libart_lgpl/art_rgb_pixbuf_affine.h
-%{tde_tdeincludedir}/libart-2.0/libart_lgpl/art_rgb_rgba_affine.h
-%{tde_tdeincludedir}/libart-2.0/libart_lgpl/art_rgb_svp.h
-%{tde_tdeincludedir}/libart-2.0/libart_lgpl/art_rgba.h
-%{tde_tdeincludedir}/libart-2.0/libart_lgpl/art_svp.h
-%{tde_tdeincludedir}/libart-2.0/libart_lgpl/art_svp_intersect.h
-%{tde_tdeincludedir}/libart-2.0/libart_lgpl/art_svp_ops.h
-%{tde_tdeincludedir}/libart-2.0/libart_lgpl/art_svp_point.h
-%{tde_tdeincludedir}/libart-2.0/libart_lgpl/art_svp_render_aa.h
-%{tde_tdeincludedir}/libart-2.0/libart_lgpl/art_svp_vpath.h
-%{tde_tdeincludedir}/libart-2.0/libart_lgpl/art_svp_vpath_stroke.h
-%{tde_tdeincludedir}/libart-2.0/libart_lgpl/art_svp_wind.h
-%{tde_tdeincludedir}/libart-2.0/libart_lgpl/art_uta.h
-%{tde_tdeincludedir}/libart-2.0/libart_lgpl/art_uta_ops.h
-%{tde_tdeincludedir}/libart-2.0/libart_lgpl/art_uta_rect.h
-%{tde_tdeincludedir}/libart-2.0/libart_lgpl/art_uta_svp.h
-%{tde_tdeincludedir}/libart-2.0/libart_lgpl/art_uta_vpath.h
-%{tde_tdeincludedir}/libart-2.0/libart_lgpl/art_vpath.h
-%{tde_tdeincludedir}/libart-2.0/libart_lgpl/art_vpath_bpath.h
-%{tde_tdeincludedir}/libart-2.0/libart_lgpl/art_vpath_dash.h
-%{tde_tdeincludedir}/libart-2.0/libart_lgpl/art_vpath_svp.h
-%{tde_tdeincludedir}/libart-2.0/libart_lgpl/libart-features.h
-%{tde_tdeincludedir}/libart-2.0/libart_lgpl/libart.h
-%{tde_libdir}/pkgconfig/libart-2.0.pc
+%{_bindir}/libart2-config
+%{_libdir}/libart_lgpl_2.a
+%{_libdir}/libart_lgpl_2.la
+%{_libdir}/libart_lgpl_2.so
+%{_includedir}/libart-2.0/libart_lgpl/art_affine.h
+%{_includedir}/libart-2.0/libart_lgpl/art_alphagamma.h
+%{_includedir}/libart-2.0/libart_lgpl/art_bpath.h
+%{_includedir}/libart-2.0/libart_lgpl/art_config.h
+%{_includedir}/libart-2.0/libart_lgpl/art_filterlevel.h
+%{_includedir}/libart-2.0/libart_lgpl/art_gray_svp.h
+%{_includedir}/libart-2.0/libart_lgpl/art_misc.h
+%{_includedir}/libart-2.0/libart_lgpl/art_pathcode.h
+%{_includedir}/libart-2.0/libart_lgpl/art_pixbuf.h
+%{_includedir}/libart-2.0/libart_lgpl/art_point.h
+%{_includedir}/libart-2.0/libart_lgpl/art_rect.h
+%{_includedir}/libart-2.0/libart_lgpl/art_rect_svp.h
+%{_includedir}/libart-2.0/libart_lgpl/art_rect_uta.h
+%{_includedir}/libart-2.0/libart_lgpl/art_render.h
+%{_includedir}/libart-2.0/libart_lgpl/art_render_gradient.h
+%{_includedir}/libart-2.0/libart_lgpl/art_render_mask.h
+%{_includedir}/libart-2.0/libart_lgpl/art_render_svp.h
+%{_includedir}/libart-2.0/libart_lgpl/art_rgb.h
+%{_includedir}/libart-2.0/libart_lgpl/art_rgb_a_affine.h
+%{_includedir}/libart-2.0/libart_lgpl/art_rgb_affine.h
+%{_includedir}/libart-2.0/libart_lgpl/art_rgb_bitmap_affine.h
+%{_includedir}/libart-2.0/libart_lgpl/art_rgb_pixbuf_affine.h
+%{_includedir}/libart-2.0/libart_lgpl/art_rgb_rgba_affine.h
+%{_includedir}/libart-2.0/libart_lgpl/art_rgb_svp.h
+%{_includedir}/libart-2.0/libart_lgpl/art_rgba.h
+%{_includedir}/libart-2.0/libart_lgpl/art_svp.h
+%{_includedir}/libart-2.0/libart_lgpl/art_svp_intersect.h
+%{_includedir}/libart-2.0/libart_lgpl/art_svp_ops.h
+%{_includedir}/libart-2.0/libart_lgpl/art_svp_point.h
+%{_includedir}/libart-2.0/libart_lgpl/art_svp_render_aa.h
+%{_includedir}/libart-2.0/libart_lgpl/art_svp_vpath.h
+%{_includedir}/libart-2.0/libart_lgpl/art_svp_vpath_stroke.h
+%{_includedir}/libart-2.0/libart_lgpl/art_svp_wind.h
+%{_includedir}/libart-2.0/libart_lgpl/art_uta.h
+%{_includedir}/libart-2.0/libart_lgpl/art_uta_ops.h
+%{_includedir}/libart-2.0/libart_lgpl/art_uta_rect.h
+%{_includedir}/libart-2.0/libart_lgpl/art_uta_svp.h
+%{_includedir}/libart-2.0/libart_lgpl/art_uta_vpath.h
+%{_includedir}/libart-2.0/libart_lgpl/art_vpath.h
+%{_includedir}/libart-2.0/libart_lgpl/art_vpath_bpath.h
+%{_includedir}/libart-2.0/libart_lgpl/art_vpath_dash.h
+%{_includedir}/libart-2.0/libart_lgpl/art_vpath_svp.h
+%{_includedir}/libart-2.0/libart_lgpl/libart-features.h
+%{_includedir}/libart-2.0/libart_lgpl/libart.h
+%{_libdir}/pkgconfig/libart-2.0.pc
 
 ##########
 
@@ -166,16 +173,14 @@ autoreconf -fiv
 
 %build
 unset QTDIR QTINC QTLIB
-export PATH="%{tde_bindir}:${PATH}"
-export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}"
 
 %configure \
-  --prefix=%{tde_prefix} \
-  --exec-prefix=%{tde_prefix} \
-  --bindir=%{tde_bindir} \
-  --libdir=%{tde_libdir} \
-  --datadir=%{tde_datadir} \
-  --includedir=%{tde_tdeincludedir} \
+  --prefix=%{_prefix} \
+  --exec-prefix=%{_prefix} \
+  --bindir=%{_bindir} \
+  --libdir=%{_libdir} \
+  --datadir=%{_datadir} \
+  --includedir=%{_includedir} \
   \
   --disable-dependency-tracking
   
diff --git a/redhat/dependencies/tqt3/tqt3-14.0.0.spec b/redhat/dependencies/tqt3/tqt3-14.0.0.spec
index ea62b8946..4cc81241a 100644
--- a/redhat/dependencies/tqt3/tqt3-14.0.0.spec
+++ b/redhat/dependencies/tqt3/tqt3-14.0.0.spec
@@ -15,7 +15,7 @@
 # Please submit bugfixes or comments via http:/www.trinitydesktop.org/
 #
 
-# TDE specific variables
+# TDE variables
 %define tde_version 14.0.0
 
 %if 0%{?mdkversion} || 0%{?mdkversion} || 0%{?pclinuxos}
-- 
cgit v1.2.1


From 8a82bef5b4eb7ebe82319e5681064346733d7583 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Andriot?= <albator78@libertysurf.fr>
Date: Thu, 2 Oct 2014 19:16:28 +0200
Subject: RPM Packaging: update libart_lgpl

---
 redhat/dependencies/libart-lgpl/libart-lgpl-14.0.0.spec | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/redhat/dependencies/libart-lgpl/libart-lgpl-14.0.0.spec b/redhat/dependencies/libart-lgpl/libart-lgpl-14.0.0.spec
index afbbda311..798bbdf78 100644
--- a/redhat/dependencies/libart-lgpl/libart-lgpl-14.0.0.spec
+++ b/redhat/dependencies/libart-lgpl/libart-lgpl-14.0.0.spec
@@ -109,6 +109,8 @@ especially suitable for embedded applications.
 %{_libdir}/libart_lgpl_2.a
 %{_libdir}/libart_lgpl_2.la
 %{_libdir}/libart_lgpl_2.so
+%dir %{_includedir}/libart-2.0
+%dir %{_includedir}/libart-2.0/libart_lgpl
 %{_includedir}/libart-2.0/libart_lgpl/art_affine.h
 %{_includedir}/libart-2.0/libart_lgpl/art_alphagamma.h
 %{_includedir}/libart-2.0/libart_lgpl/art_bpath.h
-- 
cgit v1.2.1


From cbc0a27c501c763afaa8d5a239708b834538af23 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Andriot?= <albator78@libertysurf.fr>
Date: Thu, 2 Oct 2014 20:33:46 +0200
Subject: RPM Packaging: update tdelibs

---
 .../tdelibs/tdelibs-14.0.0-cups_by_default.patch   | 33 --------------
 redhat/tdelibs/tdelibs-14.0.0.spec                 | 53 ++++++----------------
 2 files changed, 14 insertions(+), 72 deletions(-)
 delete mode 100644 redhat/tdelibs/tdelibs-14.0.0-cups_by_default.patch

diff --git a/redhat/tdelibs/tdelibs-14.0.0-cups_by_default.patch b/redhat/tdelibs/tdelibs-14.0.0-cups_by_default.patch
deleted file mode 100644
index 2f281cf04..000000000
--- a/redhat/tdelibs/tdelibs-14.0.0-cups_by_default.patch
+++ /dev/null
@@ -1,33 +0,0 @@
---- ./tdeprint/kmfactory.cpp.ORI	2013-05-09 00:14:51.664045869 +0200
-+++ ./tdeprint/kmfactory.cpp	2013-05-09 00:16:59.154367127 +0200
-@@ -249,8 +249,21 @@
- 		conf->writeEntry("PrintSystem", sys);
- 		conf->sync();
- 	}
--	else if ( sys.length()==1 && sys[0].isDigit() ) // discard old-style settings
-+	else if ( sys.length()==1 && sys[0].isDigit() ) { // discard old-style settings
-         	sys = "lpdunix";
-+	} else {
-+		//Always Autodetect
-+		//it will not try autodetect if user changes any option
-+		//when user force some option, AlwaysSearch will be "no" and then
-+		//kprinter will not to try autodetect again.
-+		if(conf->readEntry("AlwaysSearch") != "no" ) {
-+			sys = autoDetect();
-+			conf->writeEntry("PrintSystem",sys);
-+			conf->writeEntry("AlwaysSearch","yes");
-+			conf->sync();
-+		}
-+	}
-+
- 	return sys;
- }
- 
-@@ -278,6 +291,7 @@
- 	{
- 		TDEConfig	*conf = printConfig();
- 		conf->setGroup("General");
-+		conf->writeEntry("AlwaysSearch","no");
- 		conf->writeEntry("PrintSystem", syst);
- 		conf->sync();
- 
diff --git a/redhat/tdelibs/tdelibs-14.0.0.spec b/redhat/tdelibs/tdelibs-14.0.0.spec
index b05699d96..7c460eed8 100644
--- a/redhat/tdelibs/tdelibs-14.0.0.spec
+++ b/redhat/tdelibs/tdelibs-14.0.0.spec
@@ -60,21 +60,6 @@ BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0:		%{name}-%{version}%{?preversion:~%{preversion}}.tar.gz
 
-#Patch11:		tdelibs-14.0.0-displayconfig_crash.patch
-
-# Patches from Mandriva
-Patch101:		tdelibs-14.0.0-cups_by_default.patch
-Patch102:		tdelibs-14.0.0-fix_kurlbar_global.patch
-Patch103:		tdelibs-14.0.0-fix_enable_kdialogbox.patch
-Patch104:		tdelibs-14.0.0-fix_https_loop.patch
-Patch105:		tdelibs-14.0.0-tdeio_file_grouplist.patch
-Patch107:		tdelibs-14.0.0-karchive_assert.patch
-Patch108:		tdelibs-14.0.0-tdeabc_add_postofficebox.patch
-
-# Enables the 'kddebug' feature even when built with '-DNDEBUG'
-#Patch201:		tdelibs-14.0.0-enable_kddebug.patch
-
-
 Obsoletes:		tdelibs < %{version}-%{release}
 Provides:		tdelibs = %{version}-%{release}
 Obsoletes:		trinity-kdelibs < %{version}-%{release}
@@ -82,14 +67,19 @@ Provides:		trinity-kdelibs = %{version}-%{release}
 Obsoletes:		trinity-kdelibs-apidocs < %{version}-%{release}
 Provides:		trinity-kdelibs-apidocs = %{version}-%{release}
 
+# Trinity dependencies
+BuildRequires:	libtqt3-mt-devel >= 3.5.0
+BuildRequires:	libtqt4-devel >= 1:4.2.0
+BuildRequires:	trinity-arts-devel >= 1:1.5.10
+BuildRequires:	libdbus-tqt-1-devel >= 2:0.63
+BuildRequires:	libdbus-1-tqt-devel >= 2:0.9
+
+Requires:		trinity-arts >= 1:1.5.10
+
+
 
 BuildRequires:	cmake >= 2.8
 BuildRequires:	libtool
-BuildRequires:	trinity-tqt3-devel >= 3.5.0
-BuildRequires:	trinity-tqtinterface-devel >= %{tde_version}
-BuildRequires:	trinity-arts-devel >= 1:1.5.10
-BuildRequires:	trinity-dbus-1-tqt-devel >= 1:0.9
-BuildRequires:	trinity-dbus-tqt-devel >= 1:0.63
 BuildRequires:	krb5-devel
 BuildRequires:	libxslt-devel
 BuildRequires:	cups-devel
@@ -103,7 +93,7 @@ BuildRequires:	glib2-devel
 #BuildRequires:	lua-devel
 
 # LIBART_LGPL support
-BuildRequires:	trinity-libart-lgpl-devel
+BuildRequires:	%{libart}_lgpl-devel
 
 # ASPELL support
 BuildRequires:	aspell
@@ -320,10 +310,8 @@ Requires:		openssl
 %define with_xrandr 1
 %endif
 
-# Trinity dependencies
-Requires:		trinity-tqt3 >= 3.5.0
-Requires:		trinity-tqtinterface >= %{tde_version}
-Requires:		trinity-arts >= 1:1.5.10
+# LIBMAGIC support
+BuildRequires:	file-devel
 
 
 %description
@@ -417,7 +405,6 @@ kimgio (image manipulation).
 %{tde_datadir}/icons/default.tde
 %{tde_datadir}/icons/hicolor/index.theme
 %{tde_datadir}/locale/all_languages
-%{tde_datadir}/mimelnk/magic
 %{tde_datadir}/mimelnk/*/*.desktop
 %{tde_datadir}/services/*
 %{tde_datadir}/servicetypes/*
@@ -480,7 +467,7 @@ applications for TDE.
 
 ##########
 
-%if 0%{?suse_version} || 0%{?pclinuxos}
+%if 0%{?pclinuxos}
 %debug_package
 %endif
 
@@ -489,18 +476,6 @@ applications for TDE.
 %prep
 %setup -q -n %{name}-%{version}%{?preversion:~%{preversion}}
 
-#patch11 -p1 -b .displayconfigcrash
-
-%patch101 -p1 -b .cups_by_default
-%patch102 -p0 -b .kurl
-%patch103 -p0 -b .kdialogbox
-%patch104 -p0 -b .httpsloop
-%patch105 -p0 -b .tdeiofilegrouplist
-%patch107 -p0 -b .karchiveassert
-%patch108 -p0 -b .tdeabc
-
-#patch201 -p1 -b .kddebug
-
 
 %build
 unset QTDIR QTINC QTLIB
-- 
cgit v1.2.1


From 723dfadd1b06be1022eb581b00975b8179470e72 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Andriot?= <albator78@libertysurf.fr>
Date: Thu, 2 Oct 2014 20:57:28 +0200
Subject: RPM Packaging: update tdelibs

---
 redhat/tdelibs/tdelibs-14.0.0.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/redhat/tdelibs/tdelibs-14.0.0.spec b/redhat/tdelibs/tdelibs-14.0.0.spec
index 7c460eed8..b576dfc9d 100644
--- a/redhat/tdelibs/tdelibs-14.0.0.spec
+++ b/redhat/tdelibs/tdelibs-14.0.0.spec
@@ -93,7 +93,7 @@ BuildRequires:	glib2-devel
 #BuildRequires:	lua-devel
 
 # LIBART_LGPL support
-BuildRequires:	%{libart}_lgpl-devel
+BuildRequires:	libart_lgpl-devel
 
 # ASPELL support
 BuildRequires:	aspell
-- 
cgit v1.2.1


From 5213aac7ef885b28e150b76174577b26eab49083 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Andriot?= <albator78@libertysurf.fr>
Date: Thu, 2 Oct 2014 21:20:30 +0200
Subject: RPM Packaging: cleanup arts

---
 redhat/dependencies/arts/arts-3.5.12.spec          | 153 ----------------
 .../arts/arts-3.5.13-enable_jack.patch             |  52 ------
 .../dependencies/arts/arts-3.5.13-enable_oss.patch | 139 --------------
 redhat/dependencies/arts/arts-3.5.13.1.spec        | 182 -------------------
 redhat/dependencies/arts/arts-3.5.13.2-debug.patch |  12 --
 .../arts/arts-3.5.13.2-fix_esd_buffer.patch        |  20 --
 redhat/dependencies/arts/arts-3.5.13.spec          | 201 ---------------------
 7 files changed, 759 deletions(-)
 delete mode 100644 redhat/dependencies/arts/arts-3.5.12.spec
 delete mode 100644 redhat/dependencies/arts/arts-3.5.13-enable_jack.patch
 delete mode 100644 redhat/dependencies/arts/arts-3.5.13-enable_oss.patch
 delete mode 100644 redhat/dependencies/arts/arts-3.5.13.1.spec
 delete mode 100644 redhat/dependencies/arts/arts-3.5.13.2-debug.patch
 delete mode 100644 redhat/dependencies/arts/arts-3.5.13.2-fix_esd_buffer.patch
 delete mode 100644 redhat/dependencies/arts/arts-3.5.13.spec

diff --git a/redhat/dependencies/arts/arts-3.5.12.spec b/redhat/dependencies/arts/arts-3.5.12.spec
deleted file mode 100644
index 1a72133d6..000000000
--- a/redhat/dependencies/arts/arts-3.5.12.spec
+++ /dev/null
@@ -1,153 +0,0 @@
-# Default version for this component
-%if "%{?version}" == ""
-%define version 3.5.12
-%endif
-%define release 6
-
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?_prefix}" != "/usr"
-%define _variant .opt
-%endif
-
-# TDE 3.5.12 specific building variables
-BuildRequires:	autoconf automake libtool m4
-
-
-Name:		trinity-arts
-Version:	%{?version}
-Release:	%{?release}%{?dist}%{?_variant}
-License:	GPL
-Summary:	aRts (analog realtime synthesizer) - the KDE sound system
-Group:		System Environment/Daemons 
-
-Vendor:		Trinity Project
-URL:		http://www.trinitydesktop.org/
-Packager:	Francois Andriot <francois.andriot@free.fr>
-
-Prefix:		%{_prefix}
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:	arts-%{version}.tar.gz
-
-BuildRequires:	tqtinterface-devel
-BuildRequires:	audiofile-devel
-BuildRequires:	alsa-lib-devel
-BuildRequires:	glib2-devel
-BuildRequires:	libtool-ltdl-devel
-BuildRequires:	gsl-devel
-
-Requires:	tqtinterface
-Requires:	audiofile
-
-%if "%{?_prefix}" == "/usr"
-Obsoletes:	arts
-%endif
-
-%description
-arts (analog real-time synthesizer) is the sound system of KDE 3.
-
-The principle of arts is to create/process sound using small modules which do
-certain tasks. These may be create a waveform (oscillators), play samples,
-filter data, add signals, perform effects like delay/flanger/chorus, or
-output the data to the soundcard.
-
-By connecting all those small modules together, you can perform complex
-tasks like simulating a mixer, generating an instrument or things like
-playing a wave file with some effects.
-
-
-%package devel
-Group:		Development/Libraries
-Summary:	%{name} - Development files
-Requires:	%{name} = %{version}-%{release}
-%if "%{?_prefix}" == "/usr"
-Obsoletes:	arts-devel
-%endif
-
-%description devel
-Development files for %{name}
-
-%prep
-%setup -q -n dependencies/arts
-
-%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
-%build
-export PATH="%{_bindir}:${PATH}"
-export LDFLAGS="-L%{_libdir} -I%{_includedir}"
-
-%configure \
-  --disable-rpath \
-  --disable-debug --disable-warnings \
-  --disable-dependency-tracking \
-  --enable-new-ldflags \
-  --disable-libmad \
-  --with-alsa \
-  --enable-final \
-  --enable-closure \
-  --with-extra-includes=%{_includedir}/tqt
-
-%__make %{?_smp_mflags}
-
-%install
-%__rm -rf %{?buildroot}
-%__make install DESTDIR=%{?buildroot}
-
-%clean
-%__rm -rf %{?buildroot}
-
-%files
-%defattr(-,root,root,-)
-%doc COPYING.LIB
-%dir %{_libdir}/mcop
-%dir %{_libdir}/mcop/Arts
-%{_libdir}/mcop/Arts/*
-%{_libdir}/mcop/*.mcopclass
-%{_libdir}/mcop/*.mcoptype
-%{_libdir}/lib*.so.*
-%{_libdir}/lib*.la
-%{_bindir}/artscat
-%{_bindir}/artsd
-%{_bindir}/artsdsp
-%{_bindir}/artsplay
-%{_bindir}/artsrec
-%{_bindir}/artsshell
-%{_bindir}/artswrapper
-
-%files devel
-%defattr(-,root,root,-)
-%{_bindir}/mcopidl
-%dir %{_includedir}
-%{_includedir}/arts/
-%{_includedir}/artsc/
-%{_bindir}/artsc-config
-%{_libdir}/lib*.so
-
-
-%changelog
-* Fri Sep 16 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.12-6
-- Add support for RHEL 5.
-
-* Mon Sep 12 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.12-5
-- Add "Group" field
-
-* Sun Sep 04 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.12-4
-- Import to GIT
-- Removes cmake stuff, build with autotools only
-
-* Mon Aug 22 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.12-3
-- Correct macro to install under "/opt", if desired
-
-* Sat Dec 18 2010  Francois Andriot <francois.andriot@free.fr> - 3.5.12-2
-- Add cmake support
-- Add some BuildRequires
-
-* Fri Dec 17 2010 Francois Andriot <francois.andriot@free.fr> - 3.5.12-1
-- Add macro _kde3_prefix to define custom installation prefix (ex: /opt/trinity)
-- Add '--with-extra-includes=%{_includedir}/tqt'
-
-* Tue Dec 07 2010 Francois Andriot <francois.andriot@free.fr> - 3.5.12-0
-- Initial version
-
diff --git a/redhat/dependencies/arts/arts-3.5.13-enable_jack.patch b/redhat/dependencies/arts/arts-3.5.13-enable_jack.patch
deleted file mode 100644
index 28dfa50a5..000000000
--- a/redhat/dependencies/arts/arts-3.5.13-enable_jack.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-diff -Nuar arts.ORI/CMakeLists.txt arts/CMakeLists.txt
---- arts.ORI/CMakeLists.txt	2011-12-16 20:58:30.000000000 +0100
-+++ arts/CMakeLists.txt	2011-12-16 20:59:20.462377316 +0100
-@@ -34,6 +34,7 @@
- option( WITH_VORBIS "Enable Ogg/Vorbis support" ON )
- option( WITH_MAD "Enable MAD mp3 decoder support" ON )
- option( WITH_ESOUND "Enable ESOUND support" OFF )
-+option( WITH_JACK "Enable JACK support" OFF )
- 
- 
- ##### paths setup ###############################
-@@ -163,6 +164,19 @@
- endif( WITH_ESOUND )
- 
- 
-+##### check for JACK ############################
-+
-+set( HAVE_LIBJACK 0 )
-+if( WITH_JACK )
-+  pkg_search_module( LIBJACK jack )
-+  if( LIBJACK_FOUND )
-+    set( HAVE_LIBJACK 1 )
-+  else( LIBJACK_FOUND )
-+    message(FATAL_ERROR "\nJACK support is requested, but `jack.pc` was not found" )
-+  endif( LIBJACK_FOUND )
-+endif( WITH_JACK )
-+
-+
- ##### check for glib/gthread modules ############
- 
- pkg_search_module( GLIB2 glib-2.0 )
-diff -Nuar arts.ORI/config.h.cmake arts/config.h.cmake
---- arts.ORI/config.h.cmake	2011-12-16 20:58:30.000000000 +0100
-+++ arts/config.h.cmake	2011-12-16 20:59:24.095343176 +0100
-@@ -34,3 +34,5 @@
- #cmakedefine HAVE_SYS_SOUNDCARD_H 1
- #cmakedefine HAVE_LIBPTHREAD 1
- #define HAVE_IOCTL_INT_ULONGINT_DOTS 3
-+
-+#cmakedefine HAVE_LIBJACK 1
-diff -Nuar arts.ORI/flow/CMakeLists.txt arts/flow/CMakeLists.txt
---- arts.ORI/flow/CMakeLists.txt	2011-12-16 21:00:29.000000000 +0100
-+++ arts/flow/CMakeLists.txt	2011-12-16 21:02:29.831594171 +0100
-@@ -66,7 +66,7 @@
- tde_add_library( ${target} SHARED
-   SOURCES ${${target}_SRCS}
-   VERSION 1.0.0
--  LINK artsgsl-static artsgslpp-static artsflow_idl-shared ${AUDIOFILE_LIBRARIES}
-+  LINK artsgsl-static artsgslpp-static artsflow_idl-shared ${AUDIOFILE_LIBRARIES} ${LIBJACK_LIBRARIES}
-   DESTINATION ${LIB_INSTALL_DIR}
- )
- 
diff --git a/redhat/dependencies/arts/arts-3.5.13-enable_oss.patch b/redhat/dependencies/arts/arts-3.5.13-enable_oss.patch
deleted file mode 100644
index ca89ed76c..000000000
--- a/redhat/dependencies/arts/arts-3.5.13-enable_oss.patch
+++ /dev/null
@@ -1,139 +0,0 @@
-diff -Nuar arts.ORI/artsc/CMakeLists.txt arts.PATCHED/artsc/CMakeLists.txt
---- arts.ORI/artsc/CMakeLists.txt	2011-06-12 07:57:03.000000000 +0200
-+++ arts.PATCHED/artsc/CMakeLists.txt	2011-11-14 21:53:12.000000000 +0100
-@@ -43,6 +43,7 @@
- include_directories(
-   ${CMAKE_CURRENT_BINARY_DIR}
-   ${CMAKE_BINARY_DIR}
-+  ${CMAKE_SOURCE_DIR}/artsc
-   ${CMAKE_BINARY_DIR}/mcop
-   ${CMAKE_SOURCE_DIR}/mcop
-   ${CMAKE_BINARY_DIR}/flow
-@@ -64,7 +65,7 @@
- tde_add_library( artsdsp SHARED
-   SOURCES artsdsp.c
-   VERSION 0.0.0
--  LINK artsc-shared
-+  LINK artsc-shared dl
-   DESTINATION ${LIB_INSTALL_DIR}
- )
- 
-diff -Nuar arts.ORI/CMakeLists.txt arts.PATCHED/CMakeLists.txt
---- arts.ORI/CMakeLists.txt	2011-03-28 04:09:15.000000000 +0200
-+++ arts.PATCHED/CMakeLists.txt	2011-11-14 21:53:46.000000000 +0100
-@@ -33,6 +33,7 @@
- option( WITH_AUDIOFILE "Enable audiofile (wav) support" ON )
- option( WITH_VORBIS "Enable Ogg/Vorbis support" ON )
- option( WITH_MAD "Enable MAD mp3 decoder support" ON )
-+option( WITH_ESOUND "Enable ESOUND support" OFF )
- 
- 
- ##### paths setup ###############################
-@@ -58,6 +59,8 @@
- check_include_file( "malloc.h" HAVE_MALLOC_H )
- check_include_file( "memory.h" HAVE_MEMORY_H )
- check_include_file( "dlfcn.h" HAVE_DLFCN_H )
-+check_include_file( "sys/soundcard.h" HAVE_SYS_SOUNDCARD_H )
-+check_include_file( "pthread.h" HAVE_LIBPTHREAD )
- 
- 
- ##### check for system libraries ################
-@@ -145,6 +148,21 @@
- endif( WITH_ALSA )
- 
- 
-+##### check for esound #######################
-+
-+set( HAVE_LIBESD 0 )
-+if( WITH_ESOUND )
-+
-+  pkg_search_module( ESOUND esound )
-+  if( ESOUND_FOUND )
-+    set( HAVE_LIBESD 1 )
-+  else( ESOUND_FOUND )
-+    message(FATAL_ERROR "\nESOUND support is requested, but `libesd` not found" )
-+  endif( ESOUND_FOUND )
-+
-+endif( WITH_ESOUND )
-+
-+
- ##### check for glib/gthread modules ############
- 
- pkg_search_module( GLIB2 glib-2.0 )
-diff -Nuar arts.ORI/config.h.cmake arts.PATCHED/config.h.cmake
---- arts.ORI/config.h.cmake	2010-10-12 03:53:06.000000000 +0200
-+++ arts.PATCHED/config.h.cmake	2011-11-14 22:00:50.000000000 +0100
-@@ -23,8 +23,14 @@
- 
- #cmakedefine HAVE_LIBAUDIOFILE 1
- 
-+#cmakedefine HAVE_LIBESD 1
-+
- #cmakedefine HAVE_LIBASOUND2 1
- #cmakedefine HAVE_ALSA_ASOUNDLIB_H 1
- #cmakedefine HAVE_SND_PCM_RESUME 1
- #cmakedefine ALSA_PCM_OLD_SW_PARAMS_API 1
- #cmakedefine ALSA_PCM_OLD_HW_PARAMS_API 1
-+
-+#cmakedefine HAVE_SYS_SOUNDCARD_H 1
-+#cmakedefine HAVE_LIBPTHREAD 1
-+#define HAVE_IOCTL_INT_ULONGINT_DOTS 3
-diff -Nuar arts.ORI/flow/CMakeLists.txt arts.PATCHED/flow/CMakeLists.txt
---- arts.ORI/flow/CMakeLists.txt	2011-10-04 04:01:15.000000000 +0200
-+++ arts.PATCHED/flow/CMakeLists.txt	2011-11-14 21:53:12.000000000 +0100
-@@ -15,6 +15,7 @@
- 
- include_directories(
-   ${CMAKE_BINARY_DIR}
-+  ${CMAKE_SOURCE_DIR}/artsc
-   ${CMAKE_BINARY_DIR}/mcop
-   ${CMAKE_SOURCE_DIR}/mcop
-   ${CMAKE_CURRENT_BINARY_DIR}
-diff -Nuar arts.ORI/mcop/CMakeLists.txt arts.PATCHED/mcop/CMakeLists.txt
---- arts.ORI/mcop/CMakeLists.txt	2010-10-12 03:53:05.000000000 +0200
-+++ arts.PATCHED/mcop/CMakeLists.txt	2011-11-14 22:04:29.000000000 +0100
-@@ -12,11 +12,11 @@
- configure_file( arts_export.h.in arts_export.h )
- 
- if( NOT EXTENSION_DIR )
--  set( EXTENSION_DIR ${CMAKE_INSTALL_PREFIX}/lib )
-+  set( EXTENSION_DIR ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX} )
- endif( NOT EXTENSION_DIR )
- 
- if( NOT DTRADER_DIR )
--  set( DTRADER_DIR ${CMAKE_INSTALL_PREFIX}/lib/mcop )
-+  set( DTRADER_DIR ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}/mcop )
- endif( NOT DTRADER_DIR )
- 
- add_definitions(
-@@ -66,6 +66,6 @@
- tde_add_library( ${target} SHARED
-   SOURCES ${${target}_SRCS}
-   VERSION 1.0.0
--  LINK ltdlc-static
-+  LINK ltdlc-static ${ESOUND_LIBRARIES}
-   DESTINATION ${LIB_INSTALL_DIR}
- )
-diff -Nuar arts.ORI/mcop_mt/CMakeLists.txt arts.PATCHED/mcop_mt/CMakeLists.txt
---- arts.ORI/mcop_mt/CMakeLists.txt	2010-10-12 03:53:05.000000000 +0200
-+++ arts.PATCHED/mcop_mt/CMakeLists.txt	2011-11-14 21:53:12.000000000 +0100
-@@ -11,6 +11,11 @@
- 
- include_directories(
-   ${CMAKE_BINARY_DIR}
-+  ${CMAKE_BINARY_DIR}/flow
-+  ${CMAKE_BINARY_DIR}/mcop
-+  ${CMAKE_SOURCE_DIR}/flow
-+  ${CMAKE_SOURCE_DIR}/mcop
-+  ${GLIB2_INCLUDE_DIRS}
- )
- 
- 
-@@ -19,6 +24,6 @@
- tde_add_library( mcop_mt SHARED
-   SOURCES threads_posix.cc
-   VERSION 1.0.0
--  LINK artsflow-shared
-+  LINK artsflow-shared pthread
-   DESTINATION ${LIB_INSTALL_DIR}
- )
diff --git a/redhat/dependencies/arts/arts-3.5.13.1.spec b/redhat/dependencies/arts/arts-3.5.13.1.spec
deleted file mode 100644
index 4b5f276a4..000000000
--- a/redhat/dependencies/arts/arts-3.5.13.1.spec
+++ /dev/null
@@ -1,182 +0,0 @@
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?tde_prefix}" != "/usr"
-%define _variant .opt
-%endif
-
-%define tde_bindir %{tde_prefix}/bin
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-
-%define tde_tdeincludedir %{tde_includedir}/tde
-
-%define _docdir %{tde_prefix}/share/doc
-
-Name:		trinity-arts
-Version:	3.5.13.1
-Release:	1%{?dist}%{?_variant}
-License:	GPL
-Summary:	aRts (analog realtime synthesizer) - the KDE sound system
-Group:		System Environment/Daemons 
-
-Vendor:		Trinity Project
-URL:		http://www.trinitydesktop.org/
-Packager:	Francois Andriot <francois.andriot@free.fr>
-
-Prefix:		%{tde_prefix}
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:	arts-3.5.13.1.tar.gz
-
-BuildRequires:	trinity-tqtinterface-devel >= %{version}
-BuildRequires:	audiofile-devel
-BuildRequires:	alsa-lib-devel
-BuildRequires:	glib2-devel
-BuildRequires:	gsl-devel
-BuildRequires:	libvorbis-devel
-BuildRequires:	esound-devel
-
-%if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires:	%{_lib}jack-devel
-BuildRequires:	%{_lib}ltdl-devel
-%endif
-%if 0%{?rhel} >= 5 || 0%{?fedora}
-BuildRequires:	jack-audio-connection-kit-devel
-BuildRequires:	libtool-ltdl-devel
-%endif
-%if 0%{?suse_version}
-BuildRequires:	libjack-devel
-BuildRequires:	libltdl-devel
-%endif
-
-# TDE 3.5.13 specific building variables
-BuildRequires: cmake >= 2.8
-
-Requires:		trinity-tqtinterface >= %{version}
-Requires:		audiofile
-
-%if "%{?tde_prefix}" == "/usr"
-Obsoletes:	arts
-%endif
-
-%description
-arts (analog real-time synthesizer) is the sound system of KDE 3.
-
-The principle of arts is to create/process sound using small modules which do
-certain tasks. These may be create a waveform (oscillators), play samples,
-filter data, add signals, perform effects like delay/flanger/chorus, or
-output the data to the soundcard.
-
-By connecting all those small modules together, you can perform complex
-tasks like simulating a mixer, generating an instrument or things like
-playing a wave file with some effects.
-
-%files
-%defattr(-,root,root,-)
-%doc COPYING.LIB
-%dir %{tde_libdir}/mcop
-%dir %{tde_libdir}/mcop/Arts
-%{tde_libdir}/mcop/Arts/*
-%{tde_libdir}/mcop/*.mcopclass
-%{tde_libdir}/mcop/*.mcoptype
-%{tde_libdir}/lib*.so.*
-%{tde_bindir}/artscat
-%{tde_bindir}/artsd
-%{tde_bindir}/artsdsp
-%{tde_bindir}/artsplay
-%{tde_bindir}/artsrec
-%{tde_bindir}/artsshell
-%{tde_bindir}/artswrapper
-# The '.la' files are runtime, not devel !
-%{tde_libdir}/lib*.la
-
-%post
-/sbin/ldconfig || :
-
-%postun
-/sbin/ldconfig || :
-
-##########
-
-%package devel
-Group:		Development/Libraries
-Summary:	%{name} - Development files
-Requires:	%{name} = %{version}-%{release}
-%if "%{?tde_prefix}" == "/usr"
-Obsoletes:	arts-devel
-%endif
-
-%description devel
-Development files for %{name}
-
-%files devel
-%defattr(-,root,root,-)
-%{tde_bindir}/mcopidl
-# Arts includes are under 'tde' - this is on purpose !
-%{tde_tdeincludedir}/arts/
-# Artsc includes are not under 'tde'.
-%{tde_includedir}/artsc/
-%{tde_bindir}/artsc-config
-%{tde_libdir}/lib*.so
-%{tde_libdir}/pkgconfig/*.pc
-%{tde_libdir}/*.a
-
-%post devel
-/sbin/ldconfig || :
-
-%postun devel
-/sbin/ldconfig || :
-
-##########
-
-%if 0%{?suse_version} || 0%{?pclinuxos}
-%debug_package
-%endif
-
-##########
-
-
-%prep
-%setup -q -n arts-3.5.13.1
-
-%build
-unset QTDIR || : ; . /etc/profile.d/qt3.sh
-export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
-
-%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version}
-%__mkdir_p build
-cd build
-%endif
-
-%cmake \
-  -DCMAKE_INSTALL_PREFIX=%{tde_prefix} \
-  -DBIN_INSTALL_DIR=%{tde_bindir} \
-  -DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir}/arts \
-  -DLIB_INSTALL_DIR=%{tde_libdir} \
-  -DPKGCONFIG_INSTALL_DIR=%{tde_libdir}/pkgconfig \
-  -DWITH_ALSA=ON \
-  -DWITH_AUDIOFILE=ON \
-  -DWITH_VORBIS=ON \
-  -DWITH_MAD=OFF \
-  -DWITH_ESOUND=ON \
-%if 0%{?rhel} == 4
-  -DWITH_JACK=OFF \
-%else
-  -DWITH_JACK=ON \
-%endif
-  -DCMAKE_SKIP_RPATH="OFF" \
-  ..
-
-
-%__make %{?_smp_mflags}
-
-%install
-%__rm -rf %{?buildroot}
-%__make install -C build DESTDIR=%{?buildroot}
-
-%clean
-%__rm -rf %{?buildroot}
-
-
-%changelog
-* Tue Sep 11 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13.1-1
-- Initial release for TDE 3.5.13.1
diff --git a/redhat/dependencies/arts/arts-3.5.13.2-debug.patch b/redhat/dependencies/arts/arts-3.5.13.2-debug.patch
deleted file mode 100644
index 1925292ab..000000000
--- a/redhat/dependencies/arts/arts-3.5.13.2-debug.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- trinity-arts-3.5.13.2~pre15+85a8c7ad/flow/audioionull.cc.ORI	2013-05-26 13:35:39.081803512 +0200
-+++ trinity-arts-3.5.13.2~pre15+85a8c7ad/flow/audioionull.cc	2013-05-26 13:36:02.342333674 +0200
-@@ -133,6 +133,9 @@
- 		if((_direction & directionWrite) && getParam(canWrite) >= _fragmentSize)
- 			todo |= AudioSubSystem::ioWrite;
- 
-+		fprintf(stderr, "AudioIO: can write %d, fragment size %d, todo %d\n",
-+			getParam(canWrite), _fragmentSize, todo);
-+
- 		if(!todo)
- 			return;
- 
diff --git a/redhat/dependencies/arts/arts-3.5.13.2-fix_esd_buffer.patch b/redhat/dependencies/arts/arts-3.5.13.2-fix_esd_buffer.patch
deleted file mode 100644
index c60be93f0..000000000
--- a/redhat/dependencies/arts/arts-3.5.13.2-fix_esd_buffer.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff -Nuar trinity-arts-3.5.13.2.ORI/flow/audioioesd.cc trinity-arts-3.5.13.2.P/flow/audioioesd.cc
---- trinity-arts-3.5.13.2.ORI/flow/audioioesd.cc	2013-04-08 19:05:22.665624664 +0200
-+++ trinity-arts-3.5.13.2.P/flow/audioioesd.cc	2013-04-08 23:58:07.905872271 +0200
-@@ -204,14 +204,10 @@
- 		return write_fd;
- 
- 	case canRead:
--		return ESD_BUF_SIZE;
-+		return param(fragmentSize);
- 
- 	case canWrite:
--		return ESD_BUF_SIZE;
--
--		// ESD handles are actually socket descriptors, and I know not
--		// of any portable way to peek at the socket's send or receive
--		// buffers.
-+		return param(fragmentSize);
- 
- 	default:
- 		return param(p);
diff --git a/redhat/dependencies/arts/arts-3.5.13.spec b/redhat/dependencies/arts/arts-3.5.13.spec
deleted file mode 100644
index af9fef33a..000000000
--- a/redhat/dependencies/arts/arts-3.5.13.spec
+++ /dev/null
@@ -1,201 +0,0 @@
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?tde_prefix}" != "/usr"
-%define _variant .opt
-%endif
-
-%define tde_bindir %{tde_prefix}/bin
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-
-%define tde_tdeincludedir %{tde_includedir}/kde
-
-%define _docdir %{tde_prefix}/share/doc
-
-Name:		trinity-arts
-Version:	3.5.13
-Release:	4%{?dist}%{?_variant}
-License:	GPL
-Summary:	aRts (analog realtime synthesizer) - the KDE sound system
-Group:		System Environment/Daemons 
-
-Vendor:		Trinity Project
-URL:		http://www.trinitydesktop.org/
-Packager:	Francois Andriot <francois.andriot@free.fr>
-
-Prefix:		%{tde_prefix}
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:	arts-%{version}.tar.gz
-
-# TDE 3.5.13: Re-enable lost OSS support
-Patch0:		arts-3.5.13-enable_oss.patch
-
-# TDE 3.5.13: Re-enable lost JACK support
-Patch1:		arts-3.5.13-enable_jack.patch
-
-BuildRequires:	tqtinterface-devel >= %{version}
-BuildRequires:	audiofile-devel
-BuildRequires:	alsa-lib-devel
-BuildRequires:	glib2-devel
-BuildRequires:	gsl-devel
-BuildRequires:	libvorbis-devel
-BuildRequires:	esound-devel
-
-%if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires:	%{_lib}jack-devel
-BuildRequires:	%{_lib}ltdl-devel
-%endif
-%if 0%{?rhel} >= 5
-BuildRequires:	jack-audio-connection-kit-devel
-BuildRequires:	libtool-ltdl-devel
-%endif
-%if 0%{?suse_version}
-BuildRequires:	libjack-devel
-BuildRequires:	libltdl-devel
-%endif
-
-# TDE 3.5.13 specific building variables
-BuildRequires: cmake >= 2.8
-
-Requires:		tqtinterface
-Requires:		audiofile
-
-%if "%{?tde_prefix}" == "/usr"
-Obsoletes:	arts
-%endif
-
-%description
-arts (analog real-time synthesizer) is the sound system of KDE 3.
-
-The principle of arts is to create/process sound using small modules which do
-certain tasks. These may be create a waveform (oscillators), play samples,
-filter data, add signals, perform effects like delay/flanger/chorus, or
-output the data to the soundcard.
-
-By connecting all those small modules together, you can perform complex
-tasks like simulating a mixer, generating an instrument or things like
-playing a wave file with some effects.
-
-%files
-%defattr(-,root,root,-)
-%doc COPYING.LIB
-%dir %{tde_libdir}/mcop
-%dir %{tde_libdir}/mcop/Arts
-%{tde_libdir}/mcop/Arts/*
-%{tde_libdir}/mcop/*.mcopclass
-%{tde_libdir}/mcop/*.mcoptype
-%{tde_libdir}/lib*.so.*
-%{tde_bindir}/artscat
-%{tde_bindir}/artsd
-%{tde_bindir}/artsdsp
-%{tde_bindir}/artsplay
-%{tde_bindir}/artsrec
-%{tde_bindir}/artsshell
-%{tde_bindir}/artswrapper
-# The '.la' files are runtime, not devel !
-%{tde_libdir}/lib*.la
-
-%post
-/sbin/ldconfig || :
-
-%postun
-/sbin/ldconfig || :
-
-##########
-
-%package devel
-Group:		Development/Libraries
-Summary:	%{name} - Development files
-Requires:	%{name} = %{version}-%{release}
-%if "%{?tde_prefix}" == "/usr"
-Obsoletes:	arts-devel
-%endif
-
-%description devel
-Development files for %{name}
-
-%files devel
-%defattr(-,root,root,-)
-%{tde_bindir}/mcopidl
-%{tde_tdeincludedir}/arts/
-%{tde_includedir}/artsc/
-%{tde_bindir}/artsc-config
-%{tde_libdir}/lib*.so
-%{tde_libdir}/pkgconfig/*.pc
-%{tde_libdir}/*.a
-
-%post devel
-/sbin/ldconfig || :
-
-%postun devel
-/sbin/ldconfig || :
-
-##########
-
-%if 0%{?suse_version}
-%debug_package
-%endif
-
-##########
-
-
-%prep
-%setup -q -n dependencies/arts
-%patch0 -p1
-%patch1 -p1
-
-%build
-unset QTDIR || : ; . /etc/profile.d/qt3.sh
-export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
-
-%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version}
-%__mkdir_p build
-cd build
-%endif
-
-%cmake \
-  -DCMAKE_INSTALL_PREFIX=%{tde_prefix} \
-  -DBIN_INSTALL_DIR=%{tde_bindir} \
-  -DINCLUDE_INSTALL_DIR=%{tde_includedir}/arts \
-  -DLIB_INSTALL_DIR=%{tde_libdir} \
-  -DPKGCONFIG_INSTALL_DIR=%{tde_libdir}/pkgconfig \
-  -DWITH_ALSA=ON \
-  -DWITH_AUDIOFILE=ON \
-  -DWITH_VORBIS=ON \
-  -DWITH_MAD=OFF \
-  -DWITH_ESOUND=ON \
-%if 0%{?rhel} == 4
-  -DWITH_JACK=OFF \
-%else
-  -DWITH_JACK=ON \
-%endif
-  -DCMAKE_SKIP_RPATH="OFF" \
-  ..
-
-
-%__make %{?_smp_mflags}
-
-%install
-%__rm -rf %{?buildroot}
-%__make install -C build DESTDIR=%{?buildroot}
-
-%clean
-%__rm -rf %{?buildroot}
-
-
-%changelog
-* Fri Dec 16 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-4
-- Enables JACK support
-
-* Mon Nov 14 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-3
-- Enables OSS and ESD support
-
-* Thu Nov 03 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-2
-- Add missing BuildRequires
-
-* Sun Oct 30 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-1
-- Initial release for RHEL 6, RHEL 5 and Fedora 15
-
-* Fri Sep 02 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-0
-- Import to GIT
-- Built with future TDE version (3.5.13 + cmake + QT3.3.8d)
-- 
cgit v1.2.1


From 96a97262c49baa658c13942cc890d5ddab341256 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Andriot?= <albator78@libertysurf.fr>
Date: Thu, 2 Oct 2014 21:21:22 +0200
Subject: RPM Packaging: cleanup avahi-tqt

---
 .../dependencies/avahi-tqt/avahi-tqt-3.5.13.1.spec | 156 ---------------------
 .../dependencies/avahi-tqt/avahi-tqt-3.5.13.spec   | 154 --------------------
 2 files changed, 310 deletions(-)
 delete mode 100644 redhat/dependencies/avahi-tqt/avahi-tqt-3.5.13.1.spec
 delete mode 100644 redhat/dependencies/avahi-tqt/avahi-tqt-3.5.13.spec

diff --git a/redhat/dependencies/avahi-tqt/avahi-tqt-3.5.13.1.spec b/redhat/dependencies/avahi-tqt/avahi-tqt-3.5.13.1.spec
deleted file mode 100644
index 81652edf4..000000000
--- a/redhat/dependencies/avahi-tqt/avahi-tqt-3.5.13.1.spec
+++ /dev/null
@@ -1,156 +0,0 @@
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?tde_prefix}" != "/usr"
-%define _variant .opt
-%endif
-
-# TDE 3.5.13 specific building variables
-%define tde_bindir %{tde_prefix}/bin
-%define tde_includedir %{tde_prefix}/include
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_libdir %{tde_prefix}/%{_lib}
-
-
-Name:		trinity-avahi-tqt
-Version:	3.5.13.1
-Release:	1%{?dist}%{?_variant}
-License:	GPL
-Summary:	Avahi TQT Interface
-Group:		System Environment/Libraries
-
-Vendor:		Trinity Project
-Packager:	Francois Andriot <francois.andriot@free.fr>
-URL:		http://www.trinitydesktop.org/
-
-Prefix:		%{tde_prefix}
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:	avahi-tqt-3.5.13.1.tar.gz
-
-BuildRequires:	gcc-c++
-BuildRequires:	cmake >= 2.8
-BuildRequires:	qt3-devel
-BuildRequires:	tqtinterface-devel >= 3.5.13.1
-BuildRequires:	gettext-devel
-BuildRequires:	libtool
-%if 0%{?suse_version}
-BuildRequires:	dbus-1-devel
-%else
-BuildRequires:	dbus-devel
-%endif
-
-%if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires:	%{_lib}avahi-client-devel
-# On Mageia 2, package is 'lib64expat1-devel', but on Mandriva, 'lib64expat-devel'
-BuildRequires:	%{_lib}expat%{?mgaversion:1}-devel
-Provides:		%{_lib}avahi-qt3
-%else
-BuildRequires:	avahi-devel
-%if 0%{?suse_version}
-BuildRequires:	libexpat-devel
-%else
-BuildRequires:	expat-devel
-%endif
-%endif
-
-Requires:		qt3
-Requires:		trinity-tqtinterface >= 3.5.13
-
-Obsoletes:		avahi-tqt < %{version}-%{release}
-Provides:		avahi-tqt = %{version}-%{release}
-
-
-%description
-Avahi TQT Interface
-
-
-%package devel
-Requires:	%{name}
-Summary:	%{name} - Development files
-Group:		Development/Libraries
-
-%if 0%{?mgaversion} || 0%{?mdkversion}
-Provides:		%{_lib}avahi-qt3-devel
-%endif
-
-Obsoletes:		avahi-tqt-devel < %{version}-%{release}
-Provides:		avahi-tqt-devel = %{version}-%{release}
-
-%description devel
-Development files for %{name}
-
-
-%if 0%{?suse_version} || 0%{?pclinuxos}
-%debug_package
-%endif
-
-
-%prep
-%setup -q -n avahi-tqt-3.5.13.1
-
-# Ugly hack to modify TQT include directory inside autoconf files.
-# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
-%__sed -i "acinclude.m4" \
-  -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g"
-
-%__cp -f "/usr/share/libtool/config/ltmain.sh" "./ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "./ltmain.sh"
-
-# Removes stale libtool stuff
-%__rm -f common/libtool.m4 common/ltoptions.m4 common/lt~obsolete.m4 common/ltsugar.m4 common/ltversion.m4
-
-%build
-unset QTDIR || : ; . /etc/profile.d/qt3.sh
-export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir} -I%{tde_includedir}/tqt"
-export CXXFLAGS="${CXXFLAGS} ${LDFLAGS}"
-
-./autogen.sh
-
-%configure \
-  --exec-prefix=%{tde_prefix} \
-  --bindir=%{tde_bindir} \
-  --datadir=%{tde_datadir} \
-  --docdir=%{tde_docdir} \
-  --includedir=%{tde_includedir} \
-  --libdir=%{tde_libdir} \
-  --enable-compat-libdns_sd \
-  --with-systemdsystemunitdir=/lib/systemd/system  \
-  MOC_QT3=%{tde_bindir}/moc-tqt
-
-%__make %{?_smp_mflags}
-
-%install
-%__rm -rf %{?buildroot}
-%__make install DESTDIR=%{?buildroot}
-
-# Removes '.a' file
-%__rm -f %{?buildroot}%{tde_libdir}/libavahi-tqt.a
-
-%clean
-%__rm -rf %{?buildroot}
-
-%post
-/sbin/ldconfig || :
-
-%postun
-/sbin/ldconfig || :
-
-%post devel
-/sbin/ldconfig || :
-
-%postun devel
-/sbin/ldconfig || :
-
-%files
-%{tde_libdir}/libavahi-tqt.so.1
-%{tde_libdir}/libavahi-tqt.so.1.0.0
-
-%files devel
-%{tde_includedir}/avahi-tqt/
-%{tde_libdir}/libavahi-tqt.so
-%{tde_libdir}/libavahi-tqt.la
-%{tde_libdir}/pkgconfig/avahi-tqt.pc
-
-%changelog
-* Tue Sep 11 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13.1-1
-- Initial release for TDE 3.5.13.1
diff --git a/redhat/dependencies/avahi-tqt/avahi-tqt-3.5.13.spec b/redhat/dependencies/avahi-tqt/avahi-tqt-3.5.13.spec
deleted file mode 100644
index 41772b84d..000000000
--- a/redhat/dependencies/avahi-tqt/avahi-tqt-3.5.13.spec
+++ /dev/null
@@ -1,154 +0,0 @@
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?tde_prefix}" != "/usr"
-%define _variant .opt
-%endif
-
-# TDE 3.5.13 specific building variables
-%define tde_bindir %{tde_prefix}/bin
-%define tde_includedir %{tde_prefix}/include
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_libdir %{tde_prefix}/%{_lib}
-
-
-Name:		trinity-avahi-tqt
-Version:	3.5.13
-Release:	1%{?dist}%{?_variant}
-License:	GPL
-Summary:	Avahi TQT Interface
-Group:		System Environment/Libraries
-
-Vendor:		Trinity Project
-Packager:	Francois Andriot <francois.andriot@free.fr>
-URL:		http://www.trinitydesktop.org/
-
-Prefix:		%{tde_prefix}
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:	avahi-tqt-3.5.13.tar.gz
-
-BuildRequires:	gcc-c++
-BuildRequires:	cmake >= 2.8
-BuildRequires:	qt3-devel
-BuildRequires:	tqtinterface-devel >= 3.5.13
-BuildRequires:	gettext-devel
-%if 0%{?suse_version}
-BuildRequires:	dbus-1-devel
-%else
-BuildRequires:	dbus-devel
-%endif
-
-%if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires:	%{_lib}avahi-client-devel
-# On Mageia 2, package is 'lib64expat1-devel', but on Mandriva, 'lib64expat-devel'
-BuildRequires:	%{_lib}expat%{?mgaversion:1}-devel
-Provides:		%{_lib}avahi-qt3
-%else
-BuildRequires:	avahi-devel
-%if 0%{?suse_version}
-BuildRequires:	libexpat-devel
-%else
-BuildRequires:	expat-devel
-%endif
-%endif
-
-Requires:		qt3
-Requires:		tqtinterface >= 3.5.13
-
-Obsoletes:		avahi-tqt < %{version}-%{release}
-Provides:		avahi-tqt = %{version}-%{release}
-
-%description
-Avahi TQT Interface
-
-
-%package devel
-Requires:	%{name}
-Summary:	%{name} - Development files
-Group:		Development/Libraries
-
-%if 0%{?mgaversion} || 0%{?mdkversion}
-Provides:		%{_lib}avahi-qt3-devel
-%endif
-
-Obsoletes:		avahi-tqt-devel < %{version}-%{release}
-Provides:		avahi-tqt-devel = %{version}-%{release}
-
-%description devel
-Development files for %{name}
-
-
-%if 0%{?suse_version}
-%debug_package
-%endif
-
-
-%prep
-%setup -q -n dependencies/avahi-tqt
-
-# Ugly hack to modify TQT include directory inside autoconf files.
-# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
-%__sed -i "acinclude.m4" \
-  -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g"
-
-%__cp -f "/usr/share/libtool/config/ltmain.sh" "./ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "./ltmain.sh"
-
-# Removes stale libtool stuff
-%__rm -f common/libtool.m4 common/ltoptions.m4 common/lt~obsolete.m4 common/ltsugar.m4 common/ltversion.m4
-
-%build
-unset QTDIR || : ; . /etc/profile.d/qt?.sh
-export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir} -I%{tde_includedir}/tqt"
-export CXXFLAGS="${CXXFLAGS} ${LDFLAGS}"
-
-./autogen.sh
-
-%configure \
-  --exec-prefix=%{tde_prefix} \
-  --bindir=%{tde_bindir} \
-  --datadir=%{tde_datadir} \
-  --docdir=%{tde_docdir} \
-  --includedir=%{tde_includedir} \
-  --libdir=%{tde_libdir} \
-  --enable-compat-libdns_sd \
-  --with-systemdsystemunitdir=/lib/systemd/system  \
-  MOC_QT3=%{tde_bindir}/moc-tqt
-
-%__make %{?_smp_mflags}
-
-%install
-%__rm -rf %{?buildroot}
-%__make install DESTDIR=%{?buildroot}
-
-# Removes '.a' file
-%__rm -f %{?buildroot}%{tde_libdir}/libavahi-tqt.a
-
-%clean
-%__rm -rf %{?buildroot}
-
-%post
-/sbin/ldconfig || :
-
-%postun
-/sbin/ldconfig || :
-
-%post devel
-/sbin/ldconfig || :
-
-%postun devel
-/sbin/ldconfig || :
-
-%files
-%{tde_libdir}/libavahi-tqt.so.1
-%{tde_libdir}/libavahi-tqt.so.1.0.0
-
-%files devel
-%{tde_includedir}/avahi-tqt/
-%{tde_libdir}/libavahi-tqt.so
-%{tde_libdir}/libavahi-tqt.la
-%{tde_libdir}/pkgconfig/avahi-tqt.pc
-
-%changelog
-* Mon Jul 30 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13-1
-- Initial release for TDE 3.5.13
-- 
cgit v1.2.1


From 7180aa61732bfb7f801a73873c9a28a6b5a2b960 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Andriot?= <albator78@libertysurf.fr>
Date: Thu, 2 Oct 2014 21:21:48 +0200
Subject: RPM Packaging: cleanup dbus-1-tqt

---
 .../dbus-1-tqt/dbus-1-tqt-3.5.13.1.spec            | 115 --------------------
 .../dependencies/dbus-1-tqt/dbus-1-tqt-3.5.13.spec | 116 ---------------------
 2 files changed, 231 deletions(-)
 delete mode 100644 redhat/dependencies/dbus-1-tqt/dbus-1-tqt-3.5.13.1.spec
 delete mode 100644 redhat/dependencies/dbus-1-tqt/dbus-1-tqt-3.5.13.spec

diff --git a/redhat/dependencies/dbus-1-tqt/dbus-1-tqt-3.5.13.1.spec b/redhat/dependencies/dbus-1-tqt/dbus-1-tqt-3.5.13.1.spec
deleted file mode 100644
index cf0f70911..000000000
--- a/redhat/dependencies/dbus-1-tqt/dbus-1-tqt-3.5.13.1.spec
+++ /dev/null
@@ -1,115 +0,0 @@
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?tde_prefix}" != "/usr"
-%define _variant .opt
-%endif
-
-%define tde_bindir %{tde_prefix}/bin
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-
-Name:		trinity-dbus-1-tqt
-Version:	3.5.13.1
-Release:	1%{?dist}%{?_variant}
-License:	GPL
-Summary:	Dbus TQT Interface
-Group:		System Environment/Libraries
-
-Obsoletes:		dbus-1-tqt < %{version}-%{release}
-Provides:		dbus-1-tqt = %{version}-%{release}
-
-Vendor:		Trinity Project
-Packager:	Francois Andriot <francois.andriot@free.fr>
-
-Prefix:		%{tde_prefix}
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:	dbus-1-tqt-3.5.13.1.tar.gz
-
-BuildRequires:	gcc-c++
-%if 0%{?suse_version}
-BuildRequires:	dbus-1-devel
-%else
-BuildRequires:	dbus-devel
-%endif
-BuildRequires:	trinity-tqtinterface-devel >= %{version}
-
-# TDE 3.5.13 specific building variables
-BuildRequires:	cmake >= 2.8
-BuildRequires:	qt3-devel
-Requires:		qt3
-
-
-%description
-Dbus TQT Interface
-
-
-%package devel
-Requires:	%{name}
-Summary:	%{name} - Development files
-Group:		Development/Libraries
-
-Obsoletes:		dbus-1-tqt-devel < %{version}-%{release}
-Provides:		dbus-1-tqt-devel = %{version}-%{release}
-
-%description devel
-Development files for %{name}
-
-%if 0%{?suse_version} || 0%{?pclinuxos}
-%debug_package
-%endif
-
-
-%prep
-%setup -q -n dbus-1-tqt-3.5.13.1
-
-%build
-unset QTDIR || : ; . /etc/profile.d/qt?.sh
-export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
-
-%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version}
-%__mkdir_p build
-cd build
-%endif
-
-%cmake \
-  -DBIN_INSTALL_DIR=%{tde_bindir} \
-  -DINCLUDE_INSTALL_DIR=%{tde_includedir} \
-  -DLIB_INSTALL_DIR=%{tde_libdir} \
-  ..
-
-%__make %{?_smp_mflags}
-
-
-%install
-%__rm -rf %{?buildroot}
-%__make install DESTDIR=%{?buildroot} -C build
-
-%clean
-%__rm -rf %{?buildroot}
-
-%post
-/sbin/ldconfig || :
-
-%postun
-/sbin/ldconfig || :
-
-%post devel
-/sbin/ldconfig || :
-
-%postun devel
-/sbin/ldconfig || :
-
-%files
-%{tde_bindir}/dbusxml2qt3
-%{tde_libdir}/libdbus-1-tqt.so.0
-%{tde_libdir}/libdbus-1-tqt.so.0.0.0
-
-%files devel
-%{tde_includedir}/*.h
-%{tde_libdir}/libdbus-1-tqt.so
-%{tde_libdir}/libdbus-1-tqt.la
-%{tde_libdir}/pkgconfig/*.pc
-
-%changelog
-* Tue Sep 11 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13.1-1
-- Initial release for TDE 3.5.13.1
diff --git a/redhat/dependencies/dbus-1-tqt/dbus-1-tqt-3.5.13.spec b/redhat/dependencies/dbus-1-tqt/dbus-1-tqt-3.5.13.spec
deleted file mode 100644
index 5e3e98d18..000000000
--- a/redhat/dependencies/dbus-1-tqt/dbus-1-tqt-3.5.13.spec
+++ /dev/null
@@ -1,116 +0,0 @@
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?tde_prefix}" != "/usr"
-%define _variant .opt
-%endif
-
-%define tde_bindir %{tde_prefix}/bin
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-
-Name:		trinity-dbus-1-tqt
-Version:	3.5.13
-Release:	1%{?dist}%{?_variant}
-License:	GPL
-Summary:	Dbus TQT Interface
-Group:		System Environment/Libraries
-
-Obsoletes:		dbus-1-tqt < %{version}-%{release}
-Provides:		dbus-1-tqt = %{version}-%{release}
-
-Vendor:		Trinity Project
-Packager:	Francois Andriot <francois.andriot@free.fr>
-
-Prefix:		%{tde_prefix}
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:	dbus-1-tqt-3.5.13.tar.gz
-
-BuildRequires:	gcc-c++
-%if 0%{?suse_version}
-BuildRequires:	dbus-1-devel
-%else
-BuildRequires:	dbus-devel
-%endif
-BuildRequires:	tqtinterface-devel >= 3.5.13
-
-# TDE 3.5.13 specific building variables
-BuildRequires:	cmake >= 2.8
-BuildRequires:	qt3-devel
-Requires:		qt3
-
-
-%description
-Dbus TQT Interface
-
-
-%package devel
-Requires:	%{name}
-Summary:	%{name} - Development files
-Group:		Development/Libraries
-
-Obsoletes:		dbus-1-tqt-devel < %{version}-%{release}
-Provides:		dbus-1-tqt-devel = %{version}-%{release}
-
-%description devel
-Development files for %{name}
-
-%if 0%{?suse_version}
-%debug_package
-%endif
-
-
-%prep
-%setup -q -n dependencies/dbus-1-tqt
-
-%build
-unset QTDIR || : ; . /etc/profile.d/qt?.sh
-export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
-
-%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version}
-%__mkdir_p build
-cd build
-%endif
-
-%cmake \
-  -DBIN_INSTALL_DIR=%{tde_bindir} \
-  -DINCLUDE_INSTALL_DIR=%{tde_includedir} \
-  -DLIB_INSTALL_DIR=%{tde_libdir} \
-  ..
-
-%__make %{?_smp_mflags}
-
-
-%install
-%__rm -rf %{?buildroot}
-%__make install DESTDIR=%{?buildroot} -C build
-
-%clean
-%__rm -rf %{?buildroot}
-
-%post
-/sbin/ldconfig || :
-
-%postun
-/sbin/ldconfig || :
-
-%post devel
-/sbin/ldconfig || :
-
-%postun devel
-/sbin/ldconfig || :
-
-%files
-%{tde_bindir}/dbusxml2qt3
-%{tde_libdir}/libdbus-1-tqt.so.0
-%{tde_libdir}/libdbus-1-tqt.so.0.0.0
-
-%files devel
-%{tde_includedir}/*.h
-%{tde_libdir}/libdbus-1-tqt.so
-%{tde_libdir}/libdbus-1-tqt.la
-%{tde_libdir}/pkgconfig/*.pc
-
-%changelog
-* Tue Nov 11 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-1
-- Initial release for RHEL 6, RHEL 5, Fedora 15 and Fedora 16
-
-- 
cgit v1.2.1


From f8537dae53861804e54d28b41fe48cf48824a06c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Andriot?= <albator78@libertysurf.fr>
Date: Thu, 2 Oct 2014 21:23:03 +0200
Subject: RPM Packaging: cleanup dbus-tqt

---
 .../dependencies/dbus-tqt/dbus-tqt-3.5.13.1.spec   | 125 -------------------
 redhat/dependencies/dbus-tqt/dbus-tqt-3.5.13.spec  | 135 ---------------------
 2 files changed, 260 deletions(-)
 delete mode 100644 redhat/dependencies/dbus-tqt/dbus-tqt-3.5.13.1.spec
 delete mode 100644 redhat/dependencies/dbus-tqt/dbus-tqt-3.5.13.spec

diff --git a/redhat/dependencies/dbus-tqt/dbus-tqt-3.5.13.1.spec b/redhat/dependencies/dbus-tqt/dbus-tqt-3.5.13.1.spec
deleted file mode 100644
index f9953eb5a..000000000
--- a/redhat/dependencies/dbus-tqt/dbus-tqt-3.5.13.1.spec
+++ /dev/null
@@ -1,125 +0,0 @@
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?tde_prefix}" != "/usr"
-%define _variant .opt
-%endif
-
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-
-Name:		trinity-dbus-tqt
-Version:	3.5.13.1
-Release:	1%{?dist}%{?_variant}
-License:	GPL
-Summary:	Dbus TQT Interface
-Group:		System Environment/Libraries
-
-Vendor:		Trinity Project
-Packager:	Francois Andriot <francois.andriot@free.fr>
-
-Prefix:		%{tde_prefix}
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:	dbus-tqt-3.5.13.1.tar.gz
-
-# [dbus-tqt] Fix build on RHEL 4
-Patch1:		dbus-tqt-3.5.13-fix_old_dbus_types.patch
-
-BuildRequires:	gcc-c++
-%if 0%{?suse_version}
-BuildRequires:	dbus-1-devel
-%else
-BuildRequires:	dbus-devel
-%endif
-BuildRequires:	trinity-tqtinterface-devel >= %{version}
-
-# TDE 3.5.13 specific building variables
-BuildRequires:	cmake >= 2.8
-BuildRequires:	qt3-devel
-
-Requires:		qt3
-
-Obsoletes:		dbus-tqt < %{version}-%{release}
-Provides:		dbus-tqt = %{version}-%{release}
-
-
-%description
-Dbus TQT Interface
-
-
-%package devel
-Requires:		%{name}
-Summary:		%{name} - Development files
-Group:			Development/Libraries
-
-Obsoletes:		dbus-tqt-devel < %{version}-%{release}
-Provides:		dbus-tqt-devel = %{version}-%{release}
-
-%description devel
-Development files for %{name}
-
-
-%if 0%{?suse_version} || 0%{?pclinuxos}
-%debug_package
-%endif
-
-
-%prep
-%setup -q -n dbus-tqt-3.5.13.1
-
-%if 0%{?rhel} == 4
-%patch1 -p1 -b .dbustypes
-%endif
-
-%build
-unset QTDIR || : ; . /etc/profile.d/qt?.sh
-export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
-
-%if 0%{?rhel} == 4
-export CXXFLAGS="-DDBUS_API_SUBJECT_TO_CHANGE ${CXXFLAGS}"
-%endif
-
-%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version}
-%__mkdir_p build
-cd build
-%endif
-
-%cmake \
-  -DINCLUDE_INSTALL_DIR=%{tde_includedir} \
-  -DLIB_INSTALL_DIR=%{tde_libdir} \
-  ..
-
-%__make %{?_smp_mflags}
-
-
-%install
-%__rm -rf %{?buildroot}
-%__make install DESTDIR=%{?buildroot} -C build
-
-%clean
-%__rm -rf %{?buildroot}
-
-%post
-/sbin/ldconfig || :
-
-%postun
-/sbin/ldconfig || :
-
-%post devel
-/sbin/ldconfig || :
-
-%postun devel
-/sbin/ldconfig || :
-
-%files
-%{tde_libdir}/libdbus-tqt-1.so.0
-%{tde_libdir}/libdbus-tqt-1.so.0.0.0
-
-%files devel
-%{tde_includedir}/dbus-1.0/*
-%{tde_libdir}/libdbus-tqt-1.so
-%{tde_libdir}/libdbus-tqt-1.la
-%{tde_libdir}/pkgconfig/dbus-tqt.pc
-
-%changelog
-* Tue Sep 11 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13.1-1
-- Initial release for TDE 3.5.13.1
diff --git a/redhat/dependencies/dbus-tqt/dbus-tqt-3.5.13.spec b/redhat/dependencies/dbus-tqt/dbus-tqt-3.5.13.spec
deleted file mode 100644
index 2ee2c1a8a..000000000
--- a/redhat/dependencies/dbus-tqt/dbus-tqt-3.5.13.spec
+++ /dev/null
@@ -1,135 +0,0 @@
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?tde_prefix}" != "/usr"
-%define _variant .opt
-%endif
-
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-
-Name:		trinity-dbus-tqt
-Version:	3.5.13
-Release:	3%{?dist}%{?_variant}
-License:	GPL
-Summary:	Dbus TQT Interface
-Group:		System Environment/Libraries
-
-Vendor:		Trinity Project
-Packager:	Francois Andriot <francois.andriot@free.fr>
-
-Prefix:		%{tde_prefix}
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:	dbus-tqt-3.5.13.tar.gz
-
-# [dbus-tqt] Fix build on RHEL 4
-Patch1:		dbus-tqt-3.5.13-fix_old_dbus_types.patch
-
-BuildRequires:	gcc-c++
-%if 0%{?suse_version}
-BuildRequires:	dbus-1-devel
-%else
-BuildRequires:	dbus-devel
-%endif
-BuildRequires:	tqtinterface-devel >= 3.5.13
-
-# TDE 3.5.13 specific building variables
-BuildRequires:	cmake >= 2.8
-BuildRequires:	qt3-devel
-
-Requires:		qt3
-
-Obsoletes:		dbus-tqt < %{version}-%{release}
-Provides:		dbus-tqt = %{version}-%{release}
-
-
-%description
-Dbus TQT Interface
-
-
-%package devel
-Requires:		%{name}
-Summary:		%{name} - Development files
-Group:			Development/Libraries
-
-Obsoletes:		dbus-tqt-devel < %{version}-%{release}
-Provides:		dbus-tqt-devel = %{version}-%{release}
-
-%description devel
-Development files for %{name}
-
-
-%if 0%{?suse_version}
-%debug_package
-%endif
-
-
-%prep
-%setup -q -n dependencies/dbus-tqt
-
-%if 0%{?rhel} == 4
-%patch1 -p1 -b .dbustypes
-%endif
-
-%build
-unset QTDIR || : ; . /etc/profile.d/qt?.sh
-export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
-
-%if 0%{?rhel} == 4
-export CXXFLAGS="-DDBUS_API_SUBJECT_TO_CHANGE ${CXXFLAGS}"
-%endif
-
-%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version}
-%__mkdir_p build
-cd build
-%endif
-
-%cmake \
-  -DINCLUDE_INSTALL_DIR=%{tde_includedir} \
-  -DLIB_INSTALL_DIR=%{tde_libdir} \
-  ..
-
-%__make %{?_smp_mflags}
-
-
-%install
-%__rm -rf %{?buildroot}
-%__make install DESTDIR=%{?buildroot} -C build
-
-%clean
-%__rm -rf %{?buildroot}
-
-%post
-/sbin/ldconfig || :
-
-%postun
-/sbin/ldconfig || :
-
-%post devel
-/sbin/ldconfig || :
-
-%postun devel
-/sbin/ldconfig || :
-
-%files
-%{tde_libdir}/libdbus-tqt-1.so.0
-%{tde_libdir}/libdbus-tqt-1.so.0.0.0
-
-%files devel
-%{tde_includedir}/dbus-1.0/*
-%{tde_libdir}/libdbus-tqt-1.so
-%{tde_libdir}/libdbus-tqt-1.la
-%{tde_libdir}/pkgconfig/dbus-tqt.pc
-
-%changelog
-* Wed May 02 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13-3
-- Updates BuildRequires
-
-* Tue Nov 07 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-2
-- Updates BuildRequires
-
-* Sun Oct 30 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-1
-- Initial release for RHEL 6, RHEL 5 and Fedora 15
-
-* Sun Sep 02 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13.0
-- Import to GIT
-- Built with future TDE version (3.5.13 + cmake + QT3.3.8d)
-- 
cgit v1.2.1


From f3eb081fb57cc2327d9940901b1b6a28528d4f14 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Andriot?= <albator78@libertysurf.fr>
Date: Thu, 2 Oct 2014 21:37:25 +0200
Subject: RPM Packaging: cleanup tdepim

---
 redhat/tdepim/kdepim-3.5.12.spec                   |  153 --
 ...depim-3.5.13-disable_fsync_in_cached_imap.patch |   19 -
 redhat/tdepim/kdepim-3.5.13-fix_check_mail.patch   |   21 -
 .../tdepim/kdepim-3.5.13-fix_composer_crash.patch  |   20 -
 .../kdepim-3.5.13-fix_gcc47_compilation.patch      |   64 -
 .../kdepim-3.5.13-fix_include_directory.patch      |  219 --
 .../kdepim-3.5.13-fix_kalarm_icon_reference.patch  |   19 -
 .../kdepim-3.5.13-fix_kio_imap4_addquotes.patch    |   61 -
 ...kdepim-3.5.13-fix_kio_imap4_infinite_loop.patch |   17 -
 .../kdepim-3.5.13-fix_knotes_after_restored.patch  |   21 -
 .../kdepim-3.5.13-fix_knotes_on_suspend.patch      |   20 -
 .../tdepim/kdepim-3.5.13-fix_linear_alphabet.patch |   71 -
 redhat/tdepim/kdepim-3.5.13-fix_segv.patch         |   33 -
 .../tdepim/kdepim-3.5.13-fix_systray_count.patch   |   20 -
 .../kdepim-3.5.13.1-fix_imapparser_segv.patch      |   44 -
 .../kdepim-3.5.13.1-fix_imapparser_segv_2.patch    |   15 -
 .../kdepim-3.5.13.1-kmime_utils_quotes.patch       |   41 -
 redhat/tdepim/kdepim-3.5.13.1.spec                 | 2166 -------------------
 redhat/tdepim/kdepim-3.5.13.spec                   | 2198 --------------------
 ...pim-3.5.13.2-kmail_networkmanager_support.patch |  251 ---
 20 files changed, 5473 deletions(-)
 delete mode 100644 redhat/tdepim/kdepim-3.5.12.spec
 delete mode 100644 redhat/tdepim/kdepim-3.5.13-disable_fsync_in_cached_imap.patch
 delete mode 100644 redhat/tdepim/kdepim-3.5.13-fix_check_mail.patch
 delete mode 100644 redhat/tdepim/kdepim-3.5.13-fix_composer_crash.patch
 delete mode 100644 redhat/tdepim/kdepim-3.5.13-fix_gcc47_compilation.patch
 delete mode 100644 redhat/tdepim/kdepim-3.5.13-fix_include_directory.patch
 delete mode 100644 redhat/tdepim/kdepim-3.5.13-fix_kalarm_icon_reference.patch
 delete mode 100644 redhat/tdepim/kdepim-3.5.13-fix_kio_imap4_addquotes.patch
 delete mode 100644 redhat/tdepim/kdepim-3.5.13-fix_kio_imap4_infinite_loop.patch
 delete mode 100644 redhat/tdepim/kdepim-3.5.13-fix_knotes_after_restored.patch
 delete mode 100644 redhat/tdepim/kdepim-3.5.13-fix_knotes_on_suspend.patch
 delete mode 100644 redhat/tdepim/kdepim-3.5.13-fix_linear_alphabet.patch
 delete mode 100644 redhat/tdepim/kdepim-3.5.13-fix_segv.patch
 delete mode 100644 redhat/tdepim/kdepim-3.5.13-fix_systray_count.patch
 delete mode 100644 redhat/tdepim/kdepim-3.5.13.1-fix_imapparser_segv.patch
 delete mode 100644 redhat/tdepim/kdepim-3.5.13.1-fix_imapparser_segv_2.patch
 delete mode 100644 redhat/tdepim/kdepim-3.5.13.1-kmime_utils_quotes.patch
 delete mode 100644 redhat/tdepim/kdepim-3.5.13.1.spec
 delete mode 100644 redhat/tdepim/kdepim-3.5.13.spec
 delete mode 100644 redhat/tdepim/tdepim-3.5.13.2-kmail_networkmanager_support.patch

diff --git a/redhat/tdepim/kdepim-3.5.12.spec b/redhat/tdepim/kdepim-3.5.12.spec
deleted file mode 100644
index a8134cd94..000000000
--- a/redhat/tdepim/kdepim-3.5.12.spec
+++ /dev/null
@@ -1,153 +0,0 @@
-# Default version for this component
-%if "%{?version}" == ""
-%define version 3.5.12
-%define release 6
-%endif
-
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?_prefix}" != "/usr"
-%define _variant .opt
-%define _docdir %{_prefix}/share/doc
-%endif
-
-# TDE 3.5.12 specific building variables
-BuildRequires: autoconf automake libtool m4
-%define tde_docdir %{_docdir}
-%define tde_libdir %{_libdir}/kde3
-
-
-Name:		trinity-kdepim
-Version:	%{?version}
-Release:	%{?release}%{?dist}%{?_variant}
-License:	GPL
-Group:		Applications/Productivity
-
-Vendor:		Trinity Project
-Packager:	Francois Andriot <francois.andriot@free.fr>
-Summary:	PIM (Personal Information Manager) applications
-
-Prefix:		%{_prefix}
-
-Source0:	kdepim-%{version}.tar.gz
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-# TDE official patches from SVN, unmodified
-# Attempt to fix a kdepim FTBFS based on a missing stdc header #include
-Patch0:		http://www.trinitydesktop.org/patches/r1228885.diff
-
-BuildRequires:	tqtinterface
-BuildRequires:	trinity-arts
-BuildRequires:	trinity-kdelibs
-BuildRequires:	gpgme-devel
-BuildRequires:	libgpg-error-devel
-BuildRequires:	flex
-BuildRequires:	libical-devel
-BuildRequires:	gnokii-devel
-
-%if 0%{?fedora} >= 15
-BuildRequires:	flex-static
-%endif
-
-Requires:	trinity-kdelibs
-
-%description
-PIM (Personal Information Manager) applications.
-
-
-%package devel
-Requires:	%{name}
-Summary:	%{name} - Development files
-Group: Development/Libraries
-%description devel
-Development files for %{name}.
-
-
-%prep
-%setup -q -n kdepim
-%patch0 -p1
-
-%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
-%build
-unset QTDIR || : ; . /etc/profile.d/qt.sh
-export PATH="%{_bindir}:${PATH}"
-export LDFLAGS="-L%{_libdir} -I%{_includedir}"
-
-%configure \
-  --disable-rpath \
-  --enable-new-ldflags \
-  --disable-dependency-tracking \
-  --disable-debug --disable-warnings --enable-final \
-  --with-extra-includes=%{_includedir}/tqt
-
-# Do NOT use %{?_smp_mflags} for this package, or it will fail to build !
-%__make
-
-%install
-export PATH="%{_bindir}:${PATH}"
-%__rm -rf %{?buildroot}
-%__make install DESTDIR=%{?buildroot}
-
-%clean
-%__rm -rf %{?buildroot}
-
-%files
-%defattr(-,root,root,-)
-%{_bindir}/*
-%{_datadir}/applications/kde/*.desktop
-%{_datadir}/applnk/.hidden/*
-%{_datadir}/applnk/*/*
-%{_datadir}/apps/*
-%{_datadir}/autostart/*.desktop
-%{_datadir}/config/*
-%{_datadir}/icons/*
-%{_datadir}/services/*
-%{_datadir}/mimelnk/application/*
-%{_datadir}/config.kcfg/*
-%{_libdir}/lib*.so.*
-%{tde_libdir}/*.so
-%{tde_libdir}/*.so.*
-%{tde_libdir}/plugins/designer/*.so
-%{_datadir}/servicetypes/*
-%{_libdir}/kconf_update_bin/*
-%{_libdir}/libakregatorprivate.so
-%{_libdir}/libkmailprivate.so
-%{tde_docdir}/HTML/en/*
-
-%files devel
-%defattr(-,root,root,-)
-%{_libdir}/*.la
-%{_libdir}/*.so
-%{_includedir}/*
-%{tde_libdir}/*.la
-%{tde_libdir}/plugins/designer/*.la
-%exclude %{_libdir}/libakregatorprivate.so
-%exclude %{_libdir}/libkmailprivate.so
-
-%changelog
-* Sun Sep 18 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.12-6
-- Add RHEL5 support
-
-* Mon Sep 05 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.12-5
-- Import to GIT
-
-* Tue Aug 23 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.12-4
-- Correct (again) macro to install under "/opt", if desired
-- Add missing BuildRequires
-- Add 'patch0' to allow compilation with GCC >= 4.5
-
-* Mon Aug 22 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.12-3
-- Correct macro to install under "/opt", if desired
-
-* Sun Dec 19 2010 Francois Andriot <francois.andriot@free.fr> - 3.5.12-2
-- Rebuilt
-
-* Fri Dec 17 2010 Francois Andriot <francois.andriot@free.fr> - 3.5.12-1
-- Add macro _kde3_prefix to define custom installation prefix (ex: /opt/kde3)
-- Add '--with-extra-includes=%{_includedir}/tqt'
-
-* Wed Dec 15 2010 Francois Andriot <francois.andriot@free.fr> - 3.5.12-0
-- Initial version
-
diff --git a/redhat/tdepim/kdepim-3.5.13-disable_fsync_in_cached_imap.patch b/redhat/tdepim/kdepim-3.5.13-disable_fsync_in_cached_imap.patch
deleted file mode 100644
index c382ec723..000000000
--- a/redhat/tdepim/kdepim-3.5.13-disable_fsync_in_cached_imap.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-commit 82d4a938ce57d8611e1ef2e26924bb4367483b0c
-Author: Timothy Pearson <kb9vqf@pearsoncomputing.net>
-Date:   1341027705 -0500
-
-    Disable unneccesary fsync() in cached IMAP handler
-
-diff --git a/kmail/kmfoldercachedimap.cpp b/kmail/kmfoldercachedimap.cpp
-index 72f1113..e7009a2 100644
---- a/kmail/kmfoldercachedimap.cpp
-+++ b/kmail/kmfoldercachedimap.cpp
-@@ -478,7 +478,7 @@ int KMFolderCachedImap::writeUidCache()
-     str << lastUid() << endl;
-     uidcache.flush();
-     if ( uidcache.status() == IO_Ok ) {
--      fsync( uidcache.handle() ); /* this is probably overkill */
-+      // fsync( uidcache.handle() ); /* this is probably overkill */
-       uidcache.close();
-       if ( uidcache.status() == IO_Ok )
-         return 0;
diff --git a/redhat/tdepim/kdepim-3.5.13-fix_check_mail.patch b/redhat/tdepim/kdepim-3.5.13-fix_check_mail.patch
deleted file mode 100644
index b5558cd19..000000000
--- a/redhat/tdepim/kdepim-3.5.13-fix_check_mail.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-commit 2d5f15c865de75f3147bd849ef81d3ed034f8104
-Author: Darrell Anderson <humanreadable@yahoo.com>
-Date:   1335654338 -0500
-
-    Reverse patch from GIT hash 33e649c9.
-    This resolves bug report 406.
-    Thanks to Slavek Banko.
-
-diff --git a/kmail/kmcomposewin.cpp b/kmail/kmcomposewin.cpp
-index 227f48c..cb9db70 100644
---- a/kmail/kmcomposewin.cpp
-+++ b/kmail/kmcomposewin.cpp
-@@ -4351,8 +4351,6 @@ void KMComposeWin::slotContinueDoSend( bool sentOk )
-       }
-       (*it)->cleanupHeader();
-       sentOk = kmkernel->msgSender()->send((*it), mSendMethod);
--      if (sentOk)
--          kmkernel->acctMgr()->checkMail(true);
-     }
- 
-     if (!sentOk)
diff --git a/redhat/tdepim/kdepim-3.5.13-fix_composer_crash.patch b/redhat/tdepim/kdepim-3.5.13-fix_composer_crash.patch
deleted file mode 100644
index 4ee139a44..000000000
--- a/redhat/tdepim/kdepim-3.5.13-fix_composer_crash.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-commit 84f29704e3fadcf1afb22da208e1dbb87feb7718
-Author: Serghei Amelian <serghei.amelian@gmail.com>
-Date:   1333065429 +0300
-
-    [kmail] fixed composer crash
-
-diff --git a/kmail/mailcomposerIface.h b/kmail/mailcomposerIface.h
-index 2858657..4cba7f3 100644
---- a/kmail/mailcomposerIface.h
-+++ b/kmail/mailcomposerIface.h
-@@ -13,6 +13,9 @@
- class MailComposerIface : virtual public DCOPObject
- {
-     K_DCOP
-+
-+    public: MailComposerIface() : DCOPObject("MailComposerIface") {}
-+
-   k_dcop:
-     /**
-       Send message.      
diff --git a/redhat/tdepim/kdepim-3.5.13-fix_gcc47_compilation.patch b/redhat/tdepim/kdepim-3.5.13-fix_gcc47_compilation.patch
deleted file mode 100644
index 0dc2aae1a..000000000
--- a/redhat/tdepim/kdepim-3.5.13-fix_gcc47_compilation.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-diff -uNrb tdepim.orig/kmail/kmsystemtray.cpp tdepim/kmail/kmsystemtray.cpp
---- tdepim.orig/kmail/kmsystemtray.cpp	2012-02-08 20:40:02.000000000 -0600
-+++ tdepim/kmail/kmsystemtray.cpp	2012-04-18 17:27:51.347213673 -0500
-@@ -482,9 +482,9 @@
-   /** The number of unread messages in that folder */
-   int unread = fldr->countUnread();
- 
--  TQMap<TQGuardedPtr<KMFolder>, int>::Iterator it =
-+  TQMap<TQGuardedPtr<KMFolder>, int>::Iterator unread_it =
-       mFoldersWithUnread.find(fldr);
--  bool unmapped = (it == mFoldersWithUnread.end());
-+  bool unmapped = (unread_it == mFoldersWithUnread.end());
- 
-   /** If the folder is not mapped yet, increment count by numUnread
-       in folder */
-diff -uNrb tdepim.orig/korganizer/korgac/alarmdialog.cpp tdepim/korganizer/korgac/alarmdialog.cpp
---- tdepim.orig/korganizer/korgac/alarmdialog.cpp	2012-02-08 20:40:02.000000000 -0600
-+++ tdepim/korganizer/korgac/alarmdialog.cpp	2012-04-18 17:32:28.668760481 -0500
-@@ -498,9 +498,9 @@
-     found = true;
-     item->mNotified = true;
-     Alarm::List alarms = incidence->alarms();
--    Alarm::List::ConstIterator it;
--    for ( it = alarms.begin(); it != alarms.end(); ++it ) {
--      Alarm *alarm = *it;
-+    Alarm::List::ConstIterator c_it;
-+    for ( c_it = alarms.begin(); c_it != alarms.end(); ++c_it ) {
-+      Alarm *alarm = *c_it;
-       // FIXME: Check whether this should be done for all multiple alarms
-       if (alarm->type() == Alarm::Procedure) {
-         // FIXME: Add a message box asking whether the procedure should really be executed
-diff -uNrb tdepim.orig/kresources/caldav/resource.cpp tdepim/kresources/caldav/resource.cpp
---- tdepim.orig/kresources/caldav/resource.cpp	2012-03-11 12:15:18.000000000 -0500
-+++ tdepim/kresources/caldav/resource.cpp	2012-04-18 17:55:16.219084894 -0500
-@@ -15,6 +15,7 @@
-  ========================================================================*/
- 
- #include <string.h>
-+#include <unistd.h>
- 
- #include <tqurl.h>
- #include <tqmessagebox.h>
-diff -uNrb tdepim.orig/kresources/carddav/resource.cpp tdepim/kresources/carddav/resource.cpp
---- tdepim.orig/kresources/carddav/resource.cpp	2012-03-11 12:15:18.000000000 -0500
-+++ tdepim/kresources/carddav/resource.cpp	2012-04-18 17:55:54.555564703 -0500
-@@ -14,6 +14,7 @@
-  ========================================================================*/
- 
- #include <string.h>
-+#include <unistd.h>
- 
- #include <tqurl.h>
- #include <tqmessagebox.h>
---- kdepim/libkcal/listbase.h.gcc47	2012-04-25 23:32:57.483879335 +0200
-+++ kdepim/libkcal/listbase.h	2012-04-25 23:33:27.608192801 +0200
-@@ -67,7 +67,7 @@
- 
-     bool removeRef( T *t )
-     {
--      TQValueListIterator<T *> it = find( t );
-+      TQValueListIterator<T *> it = this->find( t );
-       if ( it == TQValueList<T*>::end() ) {
-         return false;
-       } else {
diff --git a/redhat/tdepim/kdepim-3.5.13-fix_include_directory.patch b/redhat/tdepim/kdepim-3.5.13-fix_include_directory.patch
deleted file mode 100644
index 2d12817b2..000000000
--- a/redhat/tdepim/kdepim-3.5.13-fix_include_directory.patch
+++ /dev/null
@@ -1,219 +0,0 @@
---- kdepim/akregator/src/CMakeLists.txt.ORI	2012-08-02 23:49:19.725396251 +0200
-+++ kdepim/akregator/src/CMakeLists.txt	2012-08-02 23:49:26.428291587 +0200
-@@ -39,7 +39,7 @@
- install( FILES
-     plugin.h articleinterceptor.h akregator_export.h storage.h
-     feedstorage.h storagefactory.h storagefactoryregistry.h
--  DESTINATION ${INCLUDE_INSTALL_DIR}/kde/akregator )
-+  DESTINATION ${INCLUDE_INSTALL_DIR}/akregator )
- 
- 
- ##### other data ################################
---- kdepim/libksieve/ksieve/CMakeLists.txt.ORI	2012-08-02 22:02:44.380776017 +0000
-+++ kdepim/libksieve/ksieve/CMakeLists.txt	2012-08-02 22:03:27.102148170 +0000
-@@ -11,4 +11,4 @@
- 
- install( FILES
-     error.h lexer.h parser.h scriptbuilder.h
--  DESTINATION ${INCLUDE_INSTALL_DIR}/kde/ksieve )
-+  DESTINATION ${INCLUDE_INSTALL_DIR}/ksieve )
---- kdepim/libemailfunctions/CMakeLists.txt.ORI	2012-08-02 22:02:44.381775953 +0000
-+++ kdepim/libemailfunctions/CMakeLists.txt	2012-08-02 22:03:27.103148111 +0000
-@@ -25,7 +25,7 @@
- ##### header files ################################
- 
- if( BUILD_LIBKDEPIM )
--  install( FILES idmapper.h DESTINATION ${INCLUDE_INSTALL_DIR}/kde/libemailfunctions )
-+  install( FILES idmapper.h DESTINATION ${INCLUDE_INSTALL_DIR}/libemailfunctions )
- endif()
- 
- 
---- kdepim/libkdenetwork/qgpgme/CMakeLists.txt.ORI	2012-08-02 22:02:44.381775953 +0000
-+++ kdepim/libkdenetwork/qgpgme/CMakeLists.txt	2012-08-02 22:03:27.104148051 +0000
-@@ -27,7 +27,7 @@
- 
- install( FILES
-     eventloopinteractor.h dataprovider.h
--  DESTINATION ${INCLUDE_INSTALL_DIR}/kde/qgpgme )
-+  DESTINATION ${INCLUDE_INSTALL_DIR}/qgpgme )
- 
- 
- ##### qgpgme (shared) ###########################
---- kdepim/libkdenetwork/gpgmepp/CMakeLists.txt.ORI	2012-08-02 22:02:44.382775890 +0000
-+++ kdepim/libkdenetwork/gpgmepp/CMakeLists.txt	2012-08-02 22:03:27.105147991 +0000
-@@ -35,7 +35,7 @@
-     keygenerationresult.h importresult.h decryptionresult.h
-     verificationresult.h signingresult.h encryptionresult.h
-     engineinfo.h
--  DESTINATION ${INCLUDE_INSTALL_DIR}/kde/gpgme++ )
-+  DESTINATION ${INCLUDE_INSTALL_DIR}/gpgme++ )
- 
- 
- ##### gpgme++ (shared) ##########################
---- kdepim/kontact/interfaces/CMakeLists.txt.ORI	2012-08-02 22:02:44.383775827 +0000
-+++ kdepim/kontact/interfaces/CMakeLists.txt	2012-08-02 22:03:27.106147931 +0000
-@@ -26,7 +26,7 @@
- 
- install( FILES
-     core.h plugin.h summary.h
--  DESTINATION ${INCLUDE_INSTALL_DIR}/kde/kontact )
-+  DESTINATION ${INCLUDE_INSTALL_DIR}/kontact )
- 
- 
- ##### other data ################################
---- kdepim/libkcal/CMakeLists.txt.ORI	2012-08-02 22:02:44.384775764 +0000
-+++ kdepim/libkcal/CMakeLists.txt	2012-08-02 22:03:27.107147871 +0000
-@@ -49,7 +49,7 @@
-     resourcelocaldirconfig.h resourcelocaldir.h resourcelocal.h
-     scheduler.h libkcal_export.h todo.h vcaldrag.h vcalformat.h
-     attachmenthandler.h ${CMAKE_CURRENT_BINARY_DIR}/htmlexportsettings.h
--  DESTINATION ${INCLUDE_INSTALL_DIR}/kde/libkcal )
-+  DESTINATION ${INCLUDE_INSTALL_DIR}/libkcal )
- 
- 
- ##### other data ################################
---- kdepim/kresources/egroupware/CMakeLists.txt.ORI	2012-08-02 22:02:44.385775701 +0000
-+++ kdepim/kresources/egroupware/CMakeLists.txt	2012-08-02 22:03:27.108147811 +0000
-@@ -28,7 +28,7 @@
- 
- install( FILES
-     kabc_resourcexmlrpc.h kcal_resourcexmlrpc.h
--  DESTINATION ${INCLUDE_INSTALL_DIR}/kde/kabc )
-+  DESTINATION ${INCLUDE_INSTALL_DIR}/kabc )
- 
- 
- ##### other data ################################
---- kdepim/indexlib/CMakeLists.txt.ORI	2012-08-02 22:02:44.386775637 +0000
-+++ kdepim/indexlib/CMakeLists.txt	2012-08-02 22:03:27.109147752 +0000
-@@ -26,7 +26,7 @@
- 
- install( FILES
-     create.h index.h lockfile.h
--  DESTINATION ${INCLUDE_INSTALL_DIR}/kde/index )
-+  DESTINATION ${INCLUDE_INSTALL_DIR}/index )
- 
- 
- ##### other data ################################
---- kdepim/kaddressbook/interfaces/CMakeLists.txt.ORI	2012-08-02 22:02:44.386775637 +0000
-+++ kdepim/kaddressbook/interfaces/CMakeLists.txt	2012-08-02 22:03:27.110147693 +0000
-@@ -28,7 +28,7 @@
- install( FILES
-     configurewidget.h contacteditorwidget.h core.h
-     extensionwidget.h xxport.h
--  DESTINATION ${INCLUDE_INSTALL_DIR}/kde/kaddressbook )
-+  DESTINATION ${INCLUDE_INSTALL_DIR}/kaddressbook )
- 
- 
- ##### other data ################################
---- kdepim/mimelib/mimelib/CMakeLists.txt.ORI	2012-08-02 22:02:44.387775573 +0000
-+++ kdepim/mimelib/mimelib/CMakeLists.txt	2012-08-02 22:03:27.111147634 +0000
-@@ -16,4 +16,4 @@
-     mboxlist.h mechansm.h mediatyp.h message.h mimepp.h
-     msgcmp.h msgid.h nntp.h param.h pop.h protocol.h
-     string.h text.h token.h utility.h uuencode.h binhex.h
--  DESTINATION ${INCLUDE_INSTALL_DIR}/kde/mimelib )
-+  DESTINATION ${INCLUDE_INSTALL_DIR}/mimelib )
---- kdepim/certmanager/lib/kleo/CMakeLists.txt.ORI	2012-08-02 22:02:44.388775510 +0000
-+++ kdepim/certmanager/lib/kleo/CMakeLists.txt	2012-08-02 22:03:27.112147575 +0000
-@@ -34,7 +34,7 @@
-     verifyopaquejob.h decryptverifyjob.h signencryptjob.h
-     refreshkeysjob.h multideletejob.h hierarchicalkeylistjob.h
-     keyfilter.h keyfiltermanager.h
--  DESTINATION ${INCLUDE_INSTALL_DIR}/kde/kleo )
-+  DESTINATION ${INCLUDE_INSTALL_DIR}/kleo )
- 
- 
- ##### kleopatra_core (static) ###################
---- kdepim/korganizer/interfaces/calendar/CMakeLists.txt.ORI	2012-08-02 22:02:44.390775383 +0000
-+++ kdepim/korganizer/interfaces/calendar/CMakeLists.txt	2012-08-02 22:03:27.114147455 +0000
-@@ -11,7 +11,7 @@
- 
- install( FILES
-     plugin.h calendardecoration.h
--  DESTINATION ${INCLUDE_INSTALL_DIR}/kde/calendar )
-+  DESTINATION ${INCLUDE_INSTALL_DIR}/calendar )
- 
- install( FILES
-     calendarplugin.desktop calendardecoration.desktop
---- kdepim/korganizer/interfaces/korganizer/CMakeLists.txt.ORI	2012-08-02 22:02:44.391775319 +0000
-+++ kdepim/korganizer/interfaces/korganizer/CMakeLists.txt	2012-08-02 22:03:27.114147455 +0000
-@@ -11,7 +11,7 @@
- 
- install( FILES
-     part.h baseview.h calendarviewbase.h mainwindow.h corehelper.h printplugin.h
--  DESTINATION ${INCLUDE_INSTALL_DIR}/kde/korganizer )
-+  DESTINATION ${INCLUDE_INSTALL_DIR}/korganizer )
- 
- install( FILES
-     korganizerpart.desktop korgprintplugin.desktop
---- kdepim/kmail/interfaces/CMakeLists.txt.ORI	2012-08-02 22:02:44.392775255 +0000
-+++ kdepim/kmail/interfaces/CMakeLists.txt	2012-08-02 22:03:27.116147335 +0000
-@@ -12,4 +12,4 @@
- install( FILES
-     observer.h observable.h htmlwriter.h bodypart.h
-     bodypartformatter.h bodyparturlhandler.h
--  DESTINATION ${INCLUDE_INSTALL_DIR}/kde/kmail/interfaces )
-+  DESTINATION ${INCLUDE_INSTALL_DIR}/kmail/interfaces )
---- kdepim/kgantt/kgantt/CMakeLists.txt.ORI	2012-08-02 22:02:44.393775192 +0000
-+++ kdepim/kgantt/kgantt/CMakeLists.txt	2012-08-02 22:03:27.117147275 +0000
-@@ -26,7 +26,7 @@
- install( FILES
-     KGantt.h KGanttItem.h KGanttRelation.h xQGanttBarView.h xQGanttBarViewPort.h
-     xQGanttListView.h xQGanttListViewPort.h KGanttBarConfig.h
--  DESTINATION ${INCLUDE_INSTALL_DIR}/kde/kgantt )
-+  DESTINATION ${INCLUDE_INSTALL_DIR}/kgantt )
- 
- 
- ##### kgantt (shared) ###########################
---- kdepim/libkpimexchange/core/CMakeLists.txt.ORI	2012-08-02 22:02:44.394775129 +0000
-+++ kdepim/libkpimexchange/core/CMakeLists.txt	2012-08-02 22:03:27.118147215 +0000
-@@ -30,7 +30,7 @@
- 
- install( FILES
-     exchangeclient.h exchangeaccount.h
--  DESTINATION ${INCLUDE_INSTALL_DIR}/kde/kdepim )
-+  DESTINATION ${INCLUDE_INSTALL_DIR}/kdepim )
- 
- 
- ##### kpimexchange (shared) #####################
---- kdepim/ktnef/ktnef/CMakeLists.txt.ORI	2012-08-02 22:02:44.395775066 +0000
-+++ kdepim/ktnef/ktnef/CMakeLists.txt	2012-08-02 22:03:27.119147156 +0000
-@@ -13,4 +13,4 @@
-     ktnefparser.h ktnefattach.h ktnefproperty.h
-     ktnefpropertyset.h ktnefmessage.h ktnefwriter.h
-     ktnefdefs.h
--  DESTINATION ${INCLUDE_INSTALL_DIR}/kde/ktnef )
-+  DESTINATION ${INCLUDE_INSTALL_DIR}/ktnef )
---- ./knotes/CMakeLists.txt.ORI	2012-08-02 22:07:47.777059775 +0000
-+++ ./knotes/CMakeLists.txt	2012-08-02 22:08:42.414825054 +0000
-@@ -34,7 +34,7 @@
- 
- ##### headers ###################################
- 
--install( FILES KNotesIface.h KNotesAppIface.h DESTINATION ${INCLUDE_INSTALL_DIR}/kde )
-+install( FILES KNotesIface.h KNotesAppIface.h DESTINATION ${INCLUDE_INSTALL_DIR} )
- 
- 
- ##### other data ################################
---- ./kmail/CMakeLists.txt.ORI	2012-08-02 22:07:47.777059775 +0000
-+++ ./kmail/CMakeLists.txt	2012-08-02 22:08:42.415825014 +0000
-@@ -65,7 +65,7 @@
- 
- install( FILES
-     kmailIface.h kmailpartIface.h kmailicalIface.h
--  DESTINATION ${INCLUDE_INSTALL_DIR}/kde )
-+  DESTINATION ${INCLUDE_INSTALL_DIR} )
- 
- 
- ##### other data ################################
---- ./libkdepim/CMakeLists.txt.ORI	2012-08-02 22:07:47.778059734 +0000
-+++ ./libkdepim/CMakeLists.txt	2012-08-02 22:08:42.416824973 +0000
-@@ -40,7 +40,7 @@
- 
- install( FILES
-     kdepimmacros.h kpimprefs.h
--  DESTINATION ${INCLUDE_INSTALL_DIR}/kde )
-+  DESTINATION ${INCLUDE_INSTALL_DIR} )
- 
- 
- ##### other data ################################
diff --git a/redhat/tdepim/kdepim-3.5.13-fix_kalarm_icon_reference.patch b/redhat/tdepim/kdepim-3.5.13-fix_kalarm_icon_reference.patch
deleted file mode 100644
index e6fbadd8e..000000000
--- a/redhat/tdepim/kdepim-3.5.13-fix_kalarm_icon_reference.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-commit 228ad1c6df4be49fde421520e25fb9645ee922e7
-Author: Darrell Anderson <humanreadable@yahoo.com>
-Date:   1339265402 -0500
-
-    Update kalarmd icon reference, which does not exist, to kalarm.
-
-diff --git a/kalarm/kalarmd/kalarmd.autostart.desktop b/kalarm/kalarmd/kalarmd.autostart.desktop
-index 7342be1..c9a72db 100644
---- a/kalarm/kalarmd/kalarmd.autostart.desktop
-+++ b/kalarm/kalarmd/kalarmd.autostart.desktop
-@@ -46,7 +46,7 @@ Name[uk]=Демон KAlarm
- Name[zh_CN]=KAlarm 进程
- Name[zh_TW]=KAlarm 守護程式
- Exec=kalarmd --autostart
--Icon=kalarmd
-+Icon=kalarm
- Type=Application
- Comment=KAlarm alarm daemon autostart at login
- Comment[af]=Begin KAlarm bediener outomaties tydens aanteken
diff --git a/redhat/tdepim/kdepim-3.5.13-fix_kio_imap4_addquotes.patch b/redhat/tdepim/kdepim-3.5.13-fix_kio_imap4_addquotes.patch
deleted file mode 100644
index debb6ebd5..000000000
--- a/redhat/tdepim/kdepim-3.5.13-fix_kio_imap4_addquotes.patch
+++ /dev/null
@@ -1,61 +0,0 @@
---- kdepim/libkmime/kmime_util.cpp.addquotes	2012-05-28 22:58:31.257167175 +0200
-+++ kdepim/libkmime/kmime_util.cpp	2012-05-29 20:02:19.679233274 +0200
-@@ -436,49 +436,26 @@
- 
- void removeQuots(TQCString &str)
- {
--  bool inQuote=false;
--
--  for (int i=0; i < (int)str.length(); i++) {
--    if (str[i] == '"') {
--      str.remove(i,1);
--      i--;
--      inQuote = !inQuote;
--    } else {
--      if (inQuote && (str[i] == '\\'))
--        str.remove(i,1);
--    }
--  }
-+  str.replace(TQRegExp("\\\""), "\"");
-+  str.replace(TQRegExp("\\\\"), "\\");
- }
- 
- 
- void removeQuots(TQString &str)
- {
--  bool inQuote=false;
--
--  for (int i=0; i < (int)str.length(); i++) {
--    if (str[i] == '"') {
--      str.remove(i,1);
--      i--;
--      inQuote = !inQuote;
--    } else {
--      if (inQuote && (str[i] == '\\'))
--        str.remove(i,1);
--    }
--  }
-+  str.replace(TQRegExp("\\\""), "\"");
-+  str.replace(TQRegExp("\\\\"), "\\");
- }
- 
- 
- void addQuotes(TQCString &str, bool forceQuotes)
- {
-   bool needsQuotes=false;
--  for (unsigned int i=0; i < str.length(); i++) {
--    if (strchr("()<>@,.;:[]=\\\"",str[i])!=0)
--      needsQuotes = true;
--    if (str[i]=='\\' || str[i]=='\"') {
--      str.insert(i, '\\');
--      i++;
--    }
--  }
-+  if ( TQString( str ) .contains( TQRegExp( TQString( "\"|\\\\|=|\\]|\\[|:|;|,|\\.|,|@|<|>|\\)|\\(" ) ) ) )
-+    needsQuotes = true;
-+
-+  str.replace(TQRegExp("\\"), "\\\\");
-+  str.replace(TQRegExp("\""), "\\\"");
- 
-   if (needsQuotes || forceQuotes) {
-     str.insert(0,'\"');
diff --git a/redhat/tdepim/kdepim-3.5.13-fix_kio_imap4_infinite_loop.patch b/redhat/tdepim/kdepim-3.5.13-fix_kio_imap4_infinite_loop.patch
deleted file mode 100644
index 90e0a1269..000000000
--- a/redhat/tdepim/kdepim-3.5.13-fix_kio_imap4_infinite_loop.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- kdepim/kioslaves/imap4/imapparser.cc.ORI	2012-05-27 23:40:50.101207608 +0200
-+++ kdepim/kioslaves/imap4/imapparser.cc	2012-05-27 23:43:23.264547024 +0200
-@@ -277,11 +277,11 @@
-   }
-   cmd = sendCommand (new imapCommand ("AUTHENTICATE", firstCommand.latin1()));
- 
--  while ( true )
-+  int pl = 0;
-+  while ( pl != -1 && !cmd->isComplete () )
-   {
-     //read the next line
--    while (parseLoop() == 0) ;
--    if ( cmd->isComplete() ) break;
-+    while ((pl = parseLoop()) == 0) ;
- 
-     if (!continuation.isEmpty())
-     {
diff --git a/redhat/tdepim/kdepim-3.5.13-fix_knotes_after_restored.patch b/redhat/tdepim/kdepim-3.5.13-fix_knotes_after_restored.patch
deleted file mode 100644
index 25d6ef993..000000000
--- a/redhat/tdepim/kdepim-3.5.13-fix_knotes_after_restored.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-commit 533f494f46d65be366aee3e9973b674320e46bc8
-Author: Darrell Anderson <humanreadable@yahoo.com>
-Date:   1336698215 -0500
-
-    Fix knotes not appearing on the desktop when a session is restored.
-    Thanks to Slavek Banko.
-    This resolves bug report 987.
-
-diff --git a/knotes/knote.cpp b/knotes/knote.cpp
-index 182aee8..08c24b8 100644
---- a/knotes/knote.cpp
-+++ b/knotes/knote.cpp
-@@ -765,7 +765,7 @@ void KNote::slotClose()
-     m_editor->clearFocus();
-     m_config->setHideNote( true );
-     m_config->setPosition( pos() );
--    m_config->writeConfig();
-+
-     // just hide the note so it's still available from the dock window
-     hide();
- }
diff --git a/redhat/tdepim/kdepim-3.5.13-fix_knotes_on_suspend.patch b/redhat/tdepim/kdepim-3.5.13-fix_knotes_on_suspend.patch
deleted file mode 100644
index 7de27843b..000000000
--- a/redhat/tdepim/kdepim-3.5.13-fix_knotes_on_suspend.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-commit c48253af15badc7a81db7ea2f22465405a897110
-Author: Slávek Banko <slavek.banko@axis.cz>
-Date:   1337752740 +0200
-
-    Fix knotes to not close notes during saving session.
-    This closes Bug 987
-
-diff --git a/knotes/knote.cpp b/knotes/knote.cpp
-index 08c24b8..e68c8ca 100644
---- a/knotes/knote.cpp
-+++ b/knotes/knote.cpp
-@@ -1267,6 +1267,8 @@ void KNote::resizeEvent( TQResizeEvent *qre )
- 
- void KNote::closeEvent( TQCloseEvent *event )
- {
-+    if(kapp->sessionSaving())
-+        return;
-     event->ignore(); //We don't want to close (and delete the widget). Just hide it
-     slotClose();
- }
diff --git a/redhat/tdepim/kdepim-3.5.13-fix_linear_alphabet.patch b/redhat/tdepim/kdepim-3.5.13-fix_linear_alphabet.patch
deleted file mode 100644
index 610e62306..000000000
--- a/redhat/tdepim/kdepim-3.5.13-fix_linear_alphabet.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-commit 80bc593eb31b3162fd870ee64eceb0ec90fac15c
-Author: Timothy Pearson <kb9vqf@pearsoncomputing.net>
-Date:   1327531088 -0600
-
-    Fix linear alphabet string errors
-
-diff --git a/NewsLog.txt b/NewsLog.txt
-index bc32c09..cc5cdc4 100644
---- a/NewsLog.txt
-+++ b/NewsLog.txt
-@@ -1960,7 +1960,7 @@ Bugfixes
-    deleted without ever having been initialised. Also init some other vars ASAP. (700035)
-  - kolab/issue1712 Update revision when adding new attendees.(663228)
-  - kolab/issue1672 Make sure to open the folder when saving a single message as well.(664661)
-- - Fix lack of double-quotes around folder name, making GEQUOTAROOT fail on folders with a space in the
-+ - Fix lack of double-quotes around folder name, making GETQUOTAROOT fail on folders with a space in the
-    name.(665276)
-  - Port the ability to add and remove subfolders from korganizer's resource view from proko2. (665274)
-  - kolab/issue1721 Don't exit when the popup menu is canceled.(665679)
-diff --git a/kioslaves/imap4/rfcdecoder.cc b/kioslaves/imap4/rfcdecoder.cc
-index f91e9f8..08b641b 100644
---- a/kioslaves/imap4/rfcdecoder.cc
-+++ b/kioslaves/imap4/rfcdecoder.cc
-@@ -37,7 +37,7 @@
- // adapted to QT-Toolkit by Sven Carstens <s.carstens@gmx.de> 2000
- 
- static unsigned char base64chars[] =
--  "ABCDEFGHIJKLMNOPTQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+,";
-+  "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+,";
- #define UNDEFINED 64
- #define MAXLINE  76
- 
-diff --git a/libkmime/kmime_util.cpp b/libkmime/kmime_util.cpp
-index d4c8943..03a14e9 100644
---- a/libkmime/kmime_util.cpp
-+++ b/libkmime/kmime_util.cpp
-@@ -337,7 +337,7 @@ TQCString encodeRFC2047String(const TQString &src, const char *charset,
- 
- TQCString uniqueString()
- {
--  static char chars[] = "0123456789abcdefghijklmnopqrstuvxyzABCDEFGHIJKLMNOPTQRSTUVWXYZ";
-+  static char chars[] = "0123456789abcdefghijklmnopqrstuvxyzABCDEFGHIJKLMNOPQRSTUVWXYZ";
-   time_t now;
-   TQCString ret;
-   char p[11];
-diff --git a/mimelib/dw_cte.cpp b/mimelib/dw_cte.cpp
-index 127a29a..4498597 100644
---- a/mimelib/dw_cte.cpp
-+++ b/mimelib/dw_cte.cpp
-@@ -353,7 +353,7 @@ static int to_cr(const char* srcBuf, size_t srcLen, char* destBuf,
- }
- 
- 
--static char base64tab[] = "ABCDEFGHIJKLMNOPTQRSTUVWXYZ"
-+static char base64tab[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
-     "abcdefghijklmnopqrstuvwxyz0123456789+/";
- 
- static char base64idx[128] = {
-diff --git a/mimelib/mediatyp.cpp b/mimelib/mediatyp.cpp
-index 87ee345..7c766fe 100644
---- a/mimelib/mediatyp.cpp
-+++ b/mimelib/mediatyp.cpp
-@@ -231,7 +231,7 @@ void DwMediaType::SetBoundary(const DwString& aStr)
- void DwMediaType::CreateBoundary(unsigned aLevel)
- {
-     // Create a random printable string and set it as the boundary parameter
--    static const char c[] = "ABCDEFGHIJKLMNOPTQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
-+    static const char c[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
-     const int cLen = 64;
-     char buf[80];
-     strcpy(buf, "Boundary-");
diff --git a/redhat/tdepim/kdepim-3.5.13-fix_segv.patch b/redhat/tdepim/kdepim-3.5.13-fix_segv.patch
deleted file mode 100644
index 10b071c46..000000000
--- a/redhat/tdepim/kdepim-3.5.13-fix_segv.patch
+++ /dev/null
@@ -1,33 +0,0 @@
---- kdepim/kioslaves/imap4/imapparser.cc.segv	2012-05-29 20:22:52.187840588 +0200
-+++ kdepim/kioslaves/imap4/imapparser.cc	2012-05-29 20:29:30.723545443 +0200
-@@ -1354,10 +1354,10 @@
-         label = parseOneWordC (inWords);
-       }
- 
--      if (inWords[0] == ')')
-+      if (!inWords.isEmpty () && inWords[0] == ')')
-         inWords.pos++;
-     }
--    if (inWords[0] == ']')
-+    if (!inWords.isEmpty () && inWords[0] == ']')
-       inWords.pos++;
-     skipWS (inWords);
- 
-@@ -1479,6 +1479,7 @@
-     {
-       TQCString word = parseLiteralC(inWords, false, true);
- 
-+      if(!word.isEmpty()) {
-       switch (word[0])
-       {
-       case 'E':
-@@ -1602,6 +1603,9 @@
-         parseLiteralC(inWords);
-         break;
-       }
-+      } else {
-+        parseLiteralC(inWords);
-+	  }
-     }
-   }
- 
diff --git a/redhat/tdepim/kdepim-3.5.13-fix_systray_count.patch b/redhat/tdepim/kdepim-3.5.13-fix_systray_count.patch
deleted file mode 100644
index 6e5d983fe..000000000
--- a/redhat/tdepim/kdepim-3.5.13-fix_systray_count.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-commit 40c435e566bcfddd3fd69b55efec786b1162a8be
-Author: Slávek Banko <slavek.banko@axis.cz>
-Date:   1337997785 +0200
-
-    Fix KMail counting of unread messages in the system tray icon
-    Thanks to Francois Andriot
-
-diff --git a/kmail/kmsystemtray.cpp b/kmail/kmsystemtray.cpp
-index 001453a..d36bd3e 100644
---- a/kmail/kmsystemtray.cpp
-+++ b/kmail/kmsystemtray.cpp
-@@ -493,7 +493,7 @@ void KMSystemTray::updateNewMessages()
-    * our last known version, and adjust mCount with that difference */
-   else
-   {
--    int diff = unread - it.data();
-+    int diff = unread - unread_it.data();
-     mCount += diff;
-   }
- 
diff --git a/redhat/tdepim/kdepim-3.5.13.1-fix_imapparser_segv.patch b/redhat/tdepim/kdepim-3.5.13.1-fix_imapparser_segv.patch
deleted file mode 100644
index 4be0cd25f..000000000
--- a/redhat/tdepim/kdepim-3.5.13.1-fix_imapparser_segv.patch
+++ /dev/null
@@ -1,44 +0,0 @@
---- kdepim-3.5.13.1/kioslaves/imap4/imapparser.cc.segv	2012-09-08 12:06:42.000000000 +0200
-+++ kdepim-3.5.13.1/kioslaves/imap4/imapparser.cc	2012-09-26 12:05:13.897737893 +0200
-@@ -345,6 +345,7 @@
-   parseOneWordC(result);        // *
-   TQByteArray what = parseLiteral (result); // see whats coming next
- 
-+  if(!what.isEmpty ()) {
-   switch (what[0])
-   {
-     //the status responses
-@@ -482,6 +483,7 @@
-       if (valid)
-       {
-         what = parseLiteral (result);
-+	if(!what.isEmpty ()) {
-         switch (what[0])
-         {
-         case 'E':
-@@ -520,10 +522,12 @@
-         default:
-           break;
-         }
-+	}
-       }
-     }
-     break;
-   }                             //switch
-+  }
- }                               //func
- 
- 
-@@ -1915,9 +1919,10 @@
-   if (!inWords.isEmpty() && inWords[0] == '{')
-   {
-     TQCString retVal;
--    ulong runLen = inWords.find ('}', 1);
--    if (runLen > 0)
-+    long srunLen = inWords.find ('}', 1); // Can return -1, so use a signed long
-+    if (srunLen > 0)
-     {
-+      ulong runLen = (ulong)srunLen;
-       bool proper;
-       ulong runLenSave = runLen + 1;
-       TQCString tmpstr(runLen);
diff --git a/redhat/tdepim/kdepim-3.5.13.1-fix_imapparser_segv_2.patch b/redhat/tdepim/kdepim-3.5.13.1-fix_imapparser_segv_2.patch
deleted file mode 100644
index d8260c166..000000000
--- a/redhat/tdepim/kdepim-3.5.13.1-fix_imapparser_segv_2.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- kdepim-3.5.13.1/kioslaves/imap4/imapparser.h~	2012-09-26 14:43:52.932265697 +0200
-+++ kdepim-3.5.13.1/kioslaves/imap4/imapparser.h	2012-09-26 14:45:33.190317168 +0200
-@@ -94,7 +94,11 @@
-   }
-   uint length()
-   {
--    return data.size() - pos;
-+    if( pos < data.size() ) {
-+      return data.size() - pos;
-+    } else {
-+      return 0;
-+    }
-   }
-   void fromString(const TQString &s)
-   {
diff --git a/redhat/tdepim/kdepim-3.5.13.1-kmime_utils_quotes.patch b/redhat/tdepim/kdepim-3.5.13.1-kmime_utils_quotes.patch
deleted file mode 100644
index 25d99c683..000000000
--- a/redhat/tdepim/kdepim-3.5.13.1-kmime_utils_quotes.patch
+++ /dev/null
@@ -1,41 +0,0 @@
---- kdepim-3.5.13.1/libkmime/kmime_util.cpp.quotes	2012-09-08 12:06:45.000000000 +0200
-+++ kdepim-3.5.13.1/libkmime/kmime_util.cpp	2012-09-25 18:49:54.806551812 +0200
-@@ -436,29 +436,25 @@
- 
- void removeQuots(TQCString &str)
- {
--  str.replace(TQRegExp("\\\""), "\"");
--  str.replace(TQRegExp("\\\\"), "\\");
-+  // Removes any quote or backslash caracter
-+  str.replace(TQRegExp("[\\\"]"), "");
- }
- 
- 
- void removeQuots(TQString &str)
- {
--  str.replace(TQRegExp("\\\""), "\"");
--  str.replace(TQRegExp("\\\\"), "\\");
-+  // Removes any quote or backslash caracter
-+  str.replace(TQRegExp("[\\\"]"), "");
- }
- 
- 
- void addQuotes(TQCString &str, bool forceQuotes)
- {
--  bool needsQuotes=false;
--  if ( TQString( str ) .contains( TQRegExp( TQString( "\"|\\\\|=|\\]|\\[|:|;|,|\\.|,|@|<|>|\\)|\\(" ) ) ) )
--    needsQuotes = true;
--
--  str.replace(TQRegExp("\\"), "\\\\");
--  str.replace(TQRegExp("\""), "\\\"");
--
--  if (needsQuotes || forceQuotes) {
--    str.insert(0,'\"');
-+  if ( forceQuotes || TQString(str).contains( TQRegExp( TQString( "\"|\\\\|=|\\]|\\[|:|;|,|\\.|,|@|<|>|\\)|\\(" ) ) ) ) {
-+    // Adds a backslash in front of any existing quote or backslash caracter
-+    str.replace(TQRegExp("([\\\"])"), "\\\\1");
-+    // Adds quote at beginning and end of thestring
-+    str.insert(0,'"');
-     str.append("\"");
-   }
- }
diff --git a/redhat/tdepim/kdepim-3.5.13.1.spec b/redhat/tdepim/kdepim-3.5.13.1.spec
deleted file mode 100644
index eeaec366e..000000000
--- a/redhat/tdepim/kdepim-3.5.13.1.spec
+++ /dev/null
@@ -1,2166 +0,0 @@
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?tde_prefix}" != "/usr"
-%define _variant .opt
-%endif
-
-# TDE 3.5.13 specific building variables
-BuildRequires: cmake >= 2.8
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-
-%define tde_tdeappdir %{tde_datadir}/applications/kde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_docdir}
-
-# KDEPIM specific features
-%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}
-%define with_gnokii 1
-BuildRequires:	gnokii-devel
-%endif
-
-# TDEPIM optional features
-#define		with_kitchensync 0
-
-
-Name:		trinity-tdepim
-Version:	3.5.13.1
-Release:	2%{?dist}%{?_variant}
-License:	GPL
-Group:		Applications/Productivity
-
-Vendor:		Trinity Project
-Packager:	Francois Andriot <francois.andriot@free.fr>
-Summary:	Personal Information Management apps from the official Trinity release
-
-Prefix:		%{tde_prefix}
-
-Source0:	kdepim-3.5.13.1.tar.gz
-
-# [tdepim] Fix include directory location for installer .h files
-Patch13:	kdepim-3.5.13-fix_include_directory.patch
-# [tdepim] Missing LDFLAGS cause FTBFS on MGA2/MDV2011
-Patch14:	kdepim-3.5.13-missing_ldflags.patch
-
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-BuildRequires:	trinity-tqtinterface-devel >= %{version}
-BuildRequires:	trinity-arts-devel >= %{version}
-BuildRequires:	trinity-kdelibs-devel >= %{version}
-BuildRequires:	trinity-libcaldav-devel
-BuildRequires:	trinity-libcarddav-devel
-
-BuildRequires:	gpgme-devel
-BuildRequires:	libgpg-error-devel
-BuildRequires:	flex
-BuildRequires:	libical-devel
-BuildRequires:	boost-devel
-BuildRequires:	pcre-devel
-BuildRequires:	glib2-devel
-BuildRequires:	gcc-c++ make
-BuildRequires:	libidn-devel
-
-%if 0%{?fedora} >= 15
-BuildRequires:	flex-static
-%endif
-%if 0%{?rhel} > 0 && 0%{?rhel} <= 5
-BuildRequires:	trinity-libcurl-devel
-%else
-BuildRequires:	curl-devel
-%endif
-
-%if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires:	%{_lib}xcomposite%{?mgaversion:1}-devel
-BuildRequires:	%{_lib}sasl2-devel
-%else
-%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version}
-BuildRequires:	libXcomposite-devel
-%endif
-BuildRequires:	cyrus-sasl-devel
-%endif
-
-Requires:	trinity-libtdepim = %{version}-%{release}
-Requires:	%{name}-kfile-plugins = %{version}-%{release}
-Requires:	%{name}-kio-plugins = %{version}-%{release}
-Requires:	%{name}-kresources = %{version}-%{release}
-Requires:	%{name}-wizards = %{version}-%{release}
-Requires:	trinity-akregator = %{version}-%{release}
-Requires:	trinity-kaddressbook = %{version}-%{release}
-Requires:	trinity-kalarm = %{version}-%{release}
-Requires:	trinity-kandy = %{version}-%{release}
-Requires:	trinity-karm = %{version}-%{release}
-Requires:	trinity-kleopatra = %{version}-%{release}
-Requires:	trinity-kmail = %{version}-%{release}
-Requires:	trinity-kmailcvt = %{version}-%{release}
-Requires:	trinity-kmobile = %{version}-%{release}
-Requires:	trinity-knode = %{version}-%{release}
-Requires:	trinity-knotes = %{version}-%{release}
-Requires:	trinity-kode = %{version}-%{release}
-Requires:	trinity-konsolekalendar = %{version}-%{release}
-Requires:	trinity-kontact = %{version}-%{release}
-Requires:	trinity-korganizer = %{version}-%{release}
-Requires:	trinity-korn = %{version}-%{release}
-Requires:	trinity-ktnef = %{version}-%{release}
-Requires:	trinity-libindex = %{version}-%{release}
-Requires:	trinity-libkcal = %{version}-%{release}
-Requires:	trinity-libkgantt = %{version}-%{release}
-Requires:	trinity-libkleopatra = %{version}-%{release}
-Requires:	trinity-libkmime = %{version}-%{release}
-Requires:	trinity-libkpimexchange = %{version}-%{release}
-Requires:	trinity-libkpimidentities = %{version}-%{release}
-Requires:	trinity-libksieve = %{version}-%{release}
-Requires:	trinity-libktnef = %{version}-%{release}
-Requires:	trinity-libmimelib = %{version}-%{release}
-
-Obsoletes:	trinity-kdepim < %{version}-%{release}
-Provides:	trinity-kdepim = %{version}-%{release}
-Obsoletes:	tdepim < %{version}-%{release}
-Provides:	tdepim = %{version}-%{release}
-
-%description
-This metapackage includes a collection of Personal Information Management
-(PIM) applications provided with the official release of Trinity.
-
-%files
-
-##########
-
-%package devel
-Summary:	Development files for %{name}
-Group:		Development/Libraries
-
-Obsoletes:	tdepim-cmake < %{version}-%{release}
-
-Obsoletes:	trinity-kdepim-devel < %{version}-%{release}
-Provides:	trinity-kdepim-devel = %{version}-%{release}
-Obsoletes:	tdepim-devel < %{version}-%{release}
-Provides:	tdepim-devel = %{version}-%{release}
-
-Requires:	%{name} = %{version}-%{release}
-Requires:	trinity-akregator-devel = %{version}-%{release}
-Requires:	trinity-libtdepim-devel = %{version}-%{release}
-Requires:	trinity-kaddressbook-devel = %{version}-%{release}
-Requires:	trinity-karm-devel = %{version}-%{release}
-Requires:	trinity-kmail-devel = %{version}-%{release}
-Requires:	trinity-knode-devel = %{version}-%{release}
-Requires:	trinity-knotes-devel = %{version}-%{release}
-Requires:	trinity-kode-devel = %{version}-%{release}
-Requires:	trinity-kontact-devel = %{version}-%{release}
-Requires:	trinity-korganizer-devel = %{version}-%{release}
-Requires:	trinity-libindex-devel = %{version}-%{release}
-Requires:	trinity-libkcal-devel = %{version}-%{release}
-Requires:	trinity-libkgantt-devel = %{version}-%{release}
-Requires:	trinity-libkleopatra-devel = %{version}-%{release}
-Requires:	trinity-libkmime-devel = %{version}-%{release}
-Requires:	trinity-libkpimexchange-devel = %{version}-%{release}
-Requires:	trinity-libkpimidentities-devel = %{version}-%{release}
-Requires:	trinity-libksieve-devel = %{version}-%{release}
-Requires:	trinity-libktnef-devel = %{version}-%{release}
-Requires:	trinity-libmimelib-devel = %{version}-%{release}
-Requires:	%{name}-kresources-devel = %{version}-%{release}
-
-%description devel
-This metapackage includes all development files for TDE PIM.
-It also contains the CMAKE macros.
-
-%files devel
-%{tde_datadir}/cmake/*
-
-##########
-
-%package -n trinity-akregator
-Summary:	RSS feed aggregator for TDE
-Group:		Applications/Internet
-Requires:	trinity-libtdepim = %{version}-%{release}
-Requires:	trinity-libkcal = %{version}-%{release}
-
-%description -n trinity-akregator
-aKregator is a fast, lightweight, and intuitive feed reader program
-for TDE.  It allows you to quickly browse through hundreds of
-thousands of internet feeds in a quick, efficient, and familiar way.
-
-%files -n trinity-akregator
-%{tde_bindir}/akregator
-%{tde_tdelibdir}/libakregatorpart.la
-%{tde_tdelibdir}/libakregatorpart.so
-%{tde_tdelibdir}/libakregator_mk4storage_plugin.la
-%{tde_tdelibdir}/libakregator_mk4storage_plugin.so
-%{tde_libdir}/libakregatorprivate.so.*
-%{tde_tdeappdir}/akregator.desktop
-%{tde_datadir}/apps/akregator
-%{tde_datadir}/config.kcfg/akregator.kcfg
-%{tde_datadir}/config.kcfg/mk4config.kcfg
-%{tde_datadir}/icons/crystalsvg/*/actions/rss_tag.png
-%{tde_datadir}/icons/crystalsvg/16x16/apps/akregator_empty.png
-%{tde_datadir}/icons/hicolor/*/apps/akregator.png
-%{tde_datadir}/icons/hicolor/scalable/apps/akregator.svgz
-%{tde_datadir}/services/akregator_mk4storage_plugin.desktop
-%{tde_datadir}/services/akregator_part.desktop
-%{tde_datadir}/services/feed.protocol
-%{tde_datadir}/services/kontact/akregatorplugin*.desktop
-%{tde_datadir}/servicetypes/akregator_plugin.desktop
-%{tde_tdedocdir}/HTML/en/akregator/
-
-%post -n trinity-akregator
-/sbin/ldconfig || :
-for f in crystalsvg hicolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-akregator
-/sbin/ldconfig || :
-for f in crystalsvg hicolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-##########
-
-%package -n trinity-akregator-devel
-Summary:	Development files for trinity-akregator
-Group:		Development/Libraries
-Requires:	trinity-akregator = %{version}-%{release}
-
-%description -n trinity-akregator-devel
-%{summary}
-
-%files -n trinity-akregator-devel
-%{tde_tdeincludedir}/akregator/
-%{tde_libdir}/libakregatorprivate.la
-%{tde_libdir}/libakregatorprivate.so
-
-%post -n trinity-akregator-devel
-/sbin/ldconfig || :
-
-%postun -n trinity-akregator-devel
-/sbin/ldconfig || :
-
-##########
-
-%package -n trinity-kaddressbook
-Summary:	TDE addressbook application
-Group:		Applications/Communications
-Requires:	trinity-kdebase-pim-ioslaves
-Requires:	%{name}-kresources = %{version}-%{release}
-
-%description -n trinity-kaddressbook
-KAddressBook is the main address book application for TDE; it enables you
-to manage your contacts efficiently and comfortably. It can load and save
-your contacts to many different locations, including the local file system,
-LDAP servers, and SQL databases.
-
-%files -n trinity-kaddressbook
-%{tde_bindir}/kabc2mutt
-%{tde_bindir}/kaddressbook
-%{tde_bindir}/kabcdistlistupdater
-%{tde_tdelibdir}/kcm_kabconfig.la
-%{tde_tdelibdir}/kcm_kabconfig.so
-%{tde_tdelibdir}/kcm_kabcustomfields.la
-%{tde_tdelibdir}/kcm_kabcustomfields.so
-%{tde_tdelibdir}/kcm_kabldapconfig.la
-%{tde_tdelibdir}/kcm_kabldapconfig.so
-%{tde_tdelibdir}/ldifvcardthumbnail.la
-%{tde_tdelibdir}/ldifvcardthumbnail.so
-%{tde_tdelibdir}/libkaddrbk_*.la
-%{tde_tdelibdir}/libkaddrbk_*.so
-%{tde_tdelibdir}/libkaddressbookpart.la
-%{tde_tdelibdir}/libkaddressbookpart.so
-%{tde_libdir}/libkabinterfaces.so.*
-%{tde_libdir}/libkaddressbook.so.*
-%{tde_tdeappdir}/kaddressbook.desktop
-%{tde_datadir}/apps/kaddressbook
-%{tde_datadir}/icons/hicolor/*/apps/kaddressbook.png
-%{tde_datadir}/services/kabconfig.desktop
-%{tde_datadir}/services/kabcustomfields.desktop
-%{tde_datadir}/services/kabldapconfig.desktop
-%{tde_datadir}/services/kaddressbook
-%{tde_datadir}/services/kontact/kaddressbookplugin.desktop
-%{tde_datadir}/services/kresources/kabc/imap.desktop
-%{tde_datadir}/services/ldifvcardthumbnail.desktop
-%{tde_datadir}/servicetypes/dcopaddressbook.desktop
-%{tde_datadir}/servicetypes/kaddressbook_contacteditorwidget.desktop
-%{tde_datadir}/servicetypes/kaddressbookimprotocol.desktop
-%{tde_datadir}/servicetypes/kaddressbook_extension.desktop
-%{tde_datadir}/servicetypes/kaddressbook_view.desktop
-%{tde_datadir}/servicetypes/kaddressbook_xxport.desktop
-%{tde_tdedocdir}/HTML/en/kaddressbook/
-%{tde_datadir}/autostart/kabcdistlistupdater.desktop
-%{tde_tdeincludedir}/kaddressbook
-%{tde_tdeincludedir}/kabc
-
-%post -n trinity-kaddressbook
-/sbin/ldconfig || :
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-kaddressbook
-/sbin/ldconfig || :
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-##########
-
-%package -n trinity-kaddressbook-devel
-Summary:	Development files for trinity-kaddressbook
-Group:		Development/Libraries
-Requires:	trinity-kaddressbook = %{version}-%{release}
-
-%description -n trinity-kaddressbook-devel
-%{summary}
-
-%files -n trinity-kaddressbook-devel
-%{tde_libdir}/libkabinterfaces.la
-%{tde_libdir}/libkabinterfaces.so
-%{tde_libdir}/libkaddressbook.la
-%{tde_libdir}/libkaddressbook.so
-
-%post -n trinity-kaddressbook-devel
-/sbin/ldconfig || :
-
-%postun -n trinity-kaddressbook-devel
-/sbin/ldconfig || :
-
-##########
-
-%package -n trinity-kalarm
-Summary:	Trinity alarm message, command and email scheduler
-Group:		Applications/Communications
-Requires:	trinity-libkpimidentities = %{version}-%{release}
-
-%description -n trinity-kalarm
-KAlarm provides a graphical interface to schedule personal timed events -
-pop-up alarm messages, command execution and sending emails. There is a
-range of options for configuring recurring events.
-
-A pop-up alarm can show either a simple text message, or the contents of a
-text or image file, It can optionally be spoken, or play a sound file. You
-can choose its appearance, and set reminders. Among KAlarm's other
-facilities, you can set up templates to allow KAlarm to be used as a 'tea
-timer'.
-
-As an alternative to using the graphical interface, alarms can be scheduled
-from the command line or via DCOP calls from other programs. KAlarm is
-TDE-based, but will also run on other desktops.
-
-%files -n trinity-kalarm
-%{tde_bindir}/kalarm
-%{tde_bindir}/kalarmd
-%{tde_tdeappdir}/kalarm.desktop
-%{tde_datadir}/applnk/.hidden/kalarmd.desktop
-%{tde_datadir}/applnk/Applications/kalarm.desktop
-%{tde_datadir}/apps/kalarm
-%{tde_datadir}/autostart/kalarm.tray.desktop
-%{tde_datadir}/autostart/kalarmd.autostart.desktop
-%{tde_datadir}/icons/crystalsvg/*/actions/kalarm.png
-%{tde_datadir}/icons/hicolor/*/apps/kalarm.png
-%{tde_tdedocdir}/HTML/en/kalarm/
-
-%post -n trinity-kalarm
-for f in crystalsvg hicolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-kalarm
-for f in crystalsvg hicolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-##########
-
-%package -n trinity-kandy
-Summary:	Trinity mobile phone utility
-Group:		Applications/Communications
-
-%description -n trinity-kandy
-At the moment Kandy is more or less a terminal program with some special
-features to store commands and their parameters, but is also has a simple GUI
-to access the phone book of a mobile phone and it is able to save this phone
-book to the TDE address book.
-
-Kandy is aimed at mobile phones with integrated (GSM) modems.
-
-%files -n trinity-kandy
-%{tde_bindir}/kandy
-%{tde_bindir}/kandy_client
-%{tde_tdeappdir}/kandy.desktop
-%{tde_datadir}/applnk/Utilities/kandy.desktop
-%{tde_datadir}/apps/kandy
-%{tde_datadir}/icons/crystalsvg/*/apps/kandy.png
-%{tde_datadir}/config.kcfg/kandy.kcfg
-%{tde_tdedocdir}/HTML/en/kandy/
-
-%post -n trinity-kandy
-for f in crystalsvg ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-kandy
-for f in crystalsvg ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-##########
-
-%package -n trinity-karm
-Summary:	Trinity time tracker tool
-Group:		Applications/Productivity
-
-%description -n trinity-karm
-KArm is a time tracker for busy people who need to keep track of the amount of
-time they spend on various tasks.
-
-%files -n trinity-karm
-%{tde_bindir}/karm
-%{tde_libdir}/libkarm.so.*
-%{tde_tdelibdir}/libkarmpart.la
-%{tde_tdelibdir}/libkarmpart.so
-%{tde_tdeappdir}/karm.desktop
-%{tde_datadir}/applnk/Utilities/karm.desktop
-%{tde_datadir}/apps/karm
-%{tde_datadir}/apps/karmpart
-%{tde_datadir}/icons/hicolor/*/apps/karm.png
-%{tde_datadir}/services/karm_part.desktop
-%{tde_datadir}/services/kontact/karmplugin.desktop
-%{tde_tdedocdir}/HTML/en/karm/
-
-%post -n trinity-karm
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
-done
-/sbin/ldconfig || :
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-karm
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
-done
-/sbin/ldconfig || :
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-##########
-
-%package -n trinity-karm-devel
-Summary:	Development files for karm
-Group:		Development/Libraries
-
-%description -n trinity-karm-devel
-%{summary}
-
-%files -n trinity-karm-devel
-%{tde_libdir}/libkarm.so
-%{tde_libdir}/libkarm.la
-
-%post -n trinity-karm-devel
-/sbin/ldconfig || :
-
-%postun -n trinity-karm-devel
-/sbin/ldconfig || :
-
-##########
-
-%package kfile-plugins
-Summary:	TDE File dialog plugins for palm and vcf files
-Group:		Environment/Libraries
-
-Obsoletes:	tdepim-kfile-plugins < %{version}-%{release}
-
-%description kfile-plugins
-File dialog plugins for palm and vcf files.
-
-%files kfile-plugins
-%{tde_tdelibdir}/kfile_ics.la
-%{tde_tdelibdir}/kfile_ics.so
-%{tde_tdelibdir}/kfile_vcf.la
-%{tde_tdelibdir}/kfile_vcf.so
-%{tde_datadir}/services/kfile_ics.desktop
-%{tde_datadir}/services/kfile_vcf.desktop
-
-##########
-
-%package kio-plugins
-Summary:	Trinity pim I/O Slaves
-Group:		Environment/Libraries
-
-Obsoletes:	tdepim-kio-plugins < %{version}-%{release}
-
-%description kio-plugins
-This package includes the pim kioslaves. This includes imap4, sieve,
-and mbox.
-
-%files kio-plugins
-%{tde_tdelibdir}/kio_groupwise.la
-%{tde_tdelibdir}/kio_groupwise.so
-%{tde_tdelibdir}/kio_imap4.la
-%{tde_tdelibdir}/kio_imap4.so
-%{tde_tdelibdir}/kio_mbox.la
-%{tde_tdelibdir}/kio_mbox.so
-%{tde_tdelibdir}/kio_scalix.la
-%{tde_tdelibdir}/kio_scalix.so
-%{tde_tdelibdir}/kio_sieve.la
-%{tde_tdelibdir}/kio_sieve.so
-%{tde_datadir}/services/groupwise.protocol
-%{tde_datadir}/services/groupwises.protocol
-%{tde_datadir}/services/imap4.protocol
-%{tde_datadir}/services/imaps.protocol
-%{tde_datadir}/services/mbox.protocol
-%{tde_datadir}/services/scalix.protocol
-%{tde_datadir}/services/scalixs.protocol
-%{tde_datadir}/services/sieve.protocol
-
-##########
-
-%package kresources
-Summary:	Trinity pim resource plugins
-Group:		Environment/Libraries
-#Requires:	trinity-kaddressbook = %{version}-%{release}
-#Requires:	trinity-korganizer = %{version}-%{release}
-#Requires:	trinity-knotes = %{version}-%{release}
-Requires:	libcaldav
-Requires:	libcarddav
-
-Obsoletes:	tdepim-kresources < %{version}-%{release}
-
-%description kresources
-This package includes several plugins needed to interface with groupware
-servers. It also includes plugins for features such as blogging and
-tracking feature plans.
-
-%files kresources
-%{tde_tdelibdir}/kcal_caldav.la
-%{tde_tdelibdir}/kcal_caldav.so
-%{tde_tdelibdir}/kcal_groupdav.la
-%{tde_tdelibdir}/kcal_groupdav.so
-%{tde_tdelibdir}/kcal_groupwise.la
-%{tde_tdelibdir}/kcal_groupwise.so
-%{tde_tdelibdir}/kcal_kolab.la
-%{tde_tdelibdir}/kcal_kolab.so
-%{tde_tdelibdir}/kcal_scalix.la
-%{tde_tdelibdir}/kcal_scalix.so
-%{tde_tdelibdir}/kcal_newexchange.la
-%{tde_tdelibdir}/kcal_newexchange.so
-%{tde_tdelibdir}/kcal_resourcefeatureplan.la
-%{tde_tdelibdir}/kcal_resourcefeatureplan.so
-%{tde_tdelibdir}/kcal_slox.la
-%{tde_tdelibdir}/kcal_slox.so
-%{tde_tdelibdir}/kcal_xmlrpc.la
-%{tde_tdelibdir}/kcal_xmlrpc.so
-%{tde_tdelibdir}/knotes_kolab.la
-%{tde_tdelibdir}/knotes_kolab.so
-%{tde_tdelibdir}/knotes_scalix.la
-%{tde_tdelibdir}/knotes_scalix.so
-%{tde_tdelibdir}/knotes_xmlrpc.la
-%{tde_tdelibdir}/knotes_xmlrpc.so
-%{tde_libdir}/libkabckolab.so.*
-%{tde_libdir}/libkabcscalix.so.*
-%{tde_libdir}/libkabc_groupdav.so.*
-%{tde_libdir}/libkabc_groupwise.so.*
-%{tde_libdir}/libkabc_newexchange.so.*
-%{tde_libdir}/libkabc_slox.so.*
-%{tde_libdir}/libkabc_xmlrpc.so.*
-%{tde_libdir}/libkcalkolab.so.*
-%{tde_libdir}/libkcalscalix.so.*
-%{tde_libdir}/libkcal_caldav.so.*
-%{tde_libdir}/libkabc_carddav.so.*
-%{tde_libdir}/libkcal_groupdav.so.*
-%{tde_libdir}/libkcal_groupwise.so.*
-%{tde_libdir}/libkcal_newexchange.so.*
-%{tde_libdir}/libkcal_resourcefeatureplan.so.*
-%{tde_libdir}/libkcal_slox.so.*
-%{tde_libdir}/libkcal_xmlrpc.so.*
-%{tde_libdir}/libkgroupwarebase.so.*
-%{tde_libdir}/libkgroupwaredav.so.*
-%{tde_libdir}/libknoteskolab.so.*
-%{tde_libdir}/libknotesscalix.so.*
-%{tde_libdir}/libknotes_xmlrpc.so.*
-%{tde_libdir}/libkslox.so.*
-%{tde_libdir}/libgwsoap.so.*
-%{tde_datadir}/services/kresources/kabc/kabc_groupdav.desktop
-%{tde_datadir}/services/kresources/kabc/kabc_groupwise.desktop
-%{tde_datadir}/services/kresources/kabc/kabc_newexchange.desktop
-%{tde_datadir}/services/kresources/kabc/kabc_opengroupware.desktop
-%{tde_datadir}/services/kresources/kabc/kabc_ox.desktop
-%{tde_datadir}/services/kresources/kabc/kabc_slox.desktop
-%{tde_datadir}/services/kresources/kabc/kabc_xmlrpc.desktop
-%{tde_datadir}/services/kresources/kabc/kolab.desktop
-%{tde_datadir}/services/kresources/kabc/scalix.desktop
-%{tde_datadir}/services/kresources/kcal/exchange.desktop
-%{tde_datadir}/services/kresources/kcal/kcal_caldav.desktop
-%{tde_datadir}/services/kresources/kabc/kabc_carddav.desktop
-%{tde_datadir}/services/kresources/kcal/kcal_groupdav.desktop
-%{tde_datadir}/services/kresources/kcal/kcal_groupwise.desktop
-%{tde_datadir}/services/kresources/kcal/kcal_newexchange.desktop
-%{tde_datadir}/services/kresources/kcal/kcal_opengroupware.desktop
-%{tde_datadir}/services/kresources/kcal/kcal_ox.desktop
-%{tde_datadir}/services/kresources/kcal/kcal_resourcefeatureplan.desktop
-%{tde_datadir}/services/kresources/kcal/kcal_slox.desktop
-%{tde_datadir}/services/kresources/kcal/kcal_xmlrpc.desktop
-%{tde_datadir}/services/kresources/kcal/kolab.desktop
-%{tde_datadir}/services/kresources/kcal/scalix.desktop
-%{tde_datadir}/services/kresources/knotes/knotes_xmlrpc.desktop
-%{tde_datadir}/services/kresources/knotes/kolabresource.desktop
-%{tde_datadir}/services/kresources/knotes/scalix.desktop
-
-%{tde_datadir}/apps/kconf_update/upgrade-resourcetype.pl
-%{tde_datadir}/apps/kconf_update/kolab-resource.upd
-
-%{tde_tdelibdir}/kabc_carddav.la
-%{tde_tdelibdir}/kabc_carddav.so
-%{tde_tdelibdir}/kabc_groupdav.la
-%{tde_tdelibdir}/kabc_groupdav.so
-%{tde_tdelibdir}/kabc_groupwise.la
-%{tde_tdelibdir}/kabc_groupwise.so
-%{tde_tdelibdir}/kabc_kolab.la
-%{tde_tdelibdir}/kabc_kolab.so
-%{tde_tdelibdir}/kabc_newexchange.la
-%{tde_tdelibdir}/kabc_newexchange.so
-%{tde_tdelibdir}/kabc_scalix.la
-%{tde_tdelibdir}/kabc_scalix.so
-%{tde_tdelibdir}/kabc_slox.la
-%{tde_tdelibdir}/kabc_slox.so
-%{tde_tdelibdir}/kabc_xmlrpc.la
-%{tde_tdelibdir}/kabc_xmlrpc.so
-
-%post kresources
-/sbin/ldconfig || :
-
-%postun kresources
-/sbin/ldconfig || :
-
-##########
-
-%package kresources-devel
-Summary:	Development files for kresources
-Group:		Development/Libraries
-Requires:	%{name}-kresources = %{version}-%{release}
-Requires:	libcaldav
-Requires:	libcarddav
-
-Obsoletes:	tdepim-kresources-devel < %{version}-%{release}
-
-%description kresources-devel
-%{summary}
-
-%files kresources-devel
-%{tde_libdir}/libkslox.la
-%{tde_libdir}/libkslox.so
-%{tde_libdir}/libkabc_groupdav.la
-%{tde_libdir}/libkabc_groupdav.so
-%{tde_libdir}/libkabc_groupwise.la
-%{tde_libdir}/libkabc_groupwise.so
-%{tde_libdir}/libgwsoap.la
-%{tde_libdir}/libgwsoap.so
-%{tde_libdir}/libkabc_carddav.la
-%{tde_libdir}/libkabc_carddav.so
-%{tde_libdir}/libkabc_newexchange.la
-%{tde_libdir}/libkabc_newexchange.so
-%{tde_libdir}/libkabc_slox.la
-%{tde_libdir}/libkabc_slox.so
-%{tde_libdir}/libkabc_xmlrpc.la
-%{tde_libdir}/libkabc_xmlrpc.so
-%{tde_libdir}/libkabckolab.la
-%{tde_libdir}/libkabckolab.so
-%{tde_libdir}/libkabcscalix.la
-%{tde_libdir}/libkabcscalix.so
-%{tde_libdir}/libkcal_caldav.la
-%{tde_libdir}/libkcal_caldav.so
-%{tde_libdir}/libkcal_groupdav.la
-%{tde_libdir}/libkcal_groupdav.so
-%{tde_libdir}/libkcal_groupwise.la
-%{tde_libdir}/libkcal_groupwise.so
-%{tde_libdir}/libkcal_newexchange.la
-%{tde_libdir}/libkcal_newexchange.so
-%{tde_libdir}/libkcal_resourcefeatureplan.la
-%{tde_libdir}/libkcal_resourcefeatureplan.so
-%{tde_libdir}/libkcal_slox.la
-%{tde_libdir}/libkcal_slox.so
-%{tde_libdir}/libkcal_xmlrpc.la
-%{tde_libdir}/libkcal_xmlrpc.so
-%{tde_libdir}/libkcalkolab.la
-%{tde_libdir}/libkcalkolab.so
-%{tde_libdir}/libkcalscalix.la
-%{tde_libdir}/libkcalscalix.so
-%{tde_libdir}/libkgroupwarebase.la
-%{tde_libdir}/libkgroupwarebase.so
-%{tde_libdir}/libkgroupwaredav.la
-%{tde_libdir}/libkgroupwaredav.so
-%{tde_libdir}/libknotes_xmlrpc.la
-%{tde_libdir}/libknotes_xmlrpc.so
-%{tde_libdir}/libknoteskolab.la
-%{tde_libdir}/libknoteskolab.so
-%{tde_libdir}/libknotesscalix.la
-%{tde_libdir}/libknotesscalix.so
-%{tde_tdeincludedir}/kpimprefs.h
-
-%post kresources-devel
-/sbin/ldconfig || :
-
-%postun kresources-devel
-/sbin/ldconfig || :
-
-##########
-
-%package wizards
-Summary:	Trinity server configuration wizards
-Group:		Applications/Communications
-
-Obsoletes:	tdepim-wizards < %{version}-%{release}
-
-%description wizards
-This package contains KDE-based wizards for configuring eGroupware,
-Kolab, and SUSE Linux Openexchange servers.
-
-%files wizards
-%{tde_bindir}/egroupwarewizard
-%{tde_bindir}/exchangewizard
-%{tde_bindir}/groupwarewizard
-%{tde_bindir}/groupwisewizard
-%{tde_bindir}/kolabwizard
-%{tde_bindir}/scalixadmin
-%{tde_bindir}/scalixwizard
-%{tde_bindir}/sloxwizard
-%{tde_tdelibdir}/libegroupwarewizard.la
-%{tde_tdelibdir}/libegroupwarewizard.so
-%{tde_tdelibdir}/libexchangewizard.la
-%{tde_tdelibdir}/libexchangewizard.so
-%{tde_tdelibdir}/libgroupwisewizard.la
-%{tde_tdelibdir}/libgroupwisewizard.so
-%{tde_tdelibdir}/libkolabwizard.la
-%{tde_tdelibdir}/libkolabwizard.so
-%{tde_tdelibdir}/libscalixwizard.la
-%{tde_tdelibdir}/libscalixwizard.so
-%{tde_tdelibdir}/libsloxwizard.la
-%{tde_tdelibdir}/libsloxwizard.so
-%{tde_tdeappdir}/groupwarewizard.desktop
-%{tde_datadir}/config.kcfg/egroupware.kcfg
-%{tde_datadir}/config.kcfg/groupwise.kcfg
-%{tde_datadir}/config.kcfg/kolab.kcfg
-%{tde_datadir}/config.kcfg/scalix.kcfg
-%{tde_datadir}/config.kcfg/slox.kcfg
-
-%post wizards
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun wizards
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-##########
-
-%if 0%{?with_kitchensync}
-%package -n trinity-kitchensync
-Summary:	Synchronization framework
-Group:		Applications/Communications
-BuildRequires:	opensync-devel
-#Suggests: konqueror-trinity
-#Conflicts: kdebluetooth-irmcsync-trinity (<< 0.99+1.0beta2-4.1), ksync-trinity
-
-%description -n trinity-kitchensync
-This package contains a synchronization framework, still under heavy
-development (?).  Kitchensync uses opensync.
-
-%files -n trinity-kitchensync
-%{tde_bindir}/kitchensync
-%{tde_tdelibdir}/libkitchensyncpart.la
-%{tde_tdelibdir}/libkitchensyncpart.so
-%{tde_datadir}/apps/kitchensync
-%{tde_libdir}/libkitchensync.so.*
-%{tde_libdir}/libqopensync.so.*
-%{tde_tdeappdir}/kitchensync.desktop
-%{tde_datadir}/icons/hicolor/*/apps/kitchensync.png
-
-%post -n trinity-kitchensync
-/sbin/ldconfig || :
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-kitchensync
-/sbin/ldconfig || :
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-%endif
-
-##########
-
-%package -n trinity-kleopatra
-Summary:	Trinity Certificate Manager
-Group:		Applications/Communications
-%if 0%{?suse_version}
-Requires:	gpg2
-Requires:	pinentry
-Requires:	dirmngr
-%endif
-%if 0%{?rhel} == 4
-Requires:	gnupg
-%endif
-%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version}
-Requires:	gnupg2
-Requires:	pinentry
-Requires:	dirmngr
-%endif
-
-%description -n trinity-kleopatra
-Kleopatra is the TDE tool for managing X.509 certificates in the gpgsm
-keybox and for retrieving certificates from LDAP servers.
-
-%files -n trinity-kleopatra
-%{tde_bindir}/kleopatra
-%{tde_bindir}/kwatchgnupg
-%{tde_tdelibdir}/kcm_kleopatra.la
-%{tde_tdelibdir}/kcm_kleopatra.so
-%{tde_tdeappdir}/kleopatra_import.desktop
-%{tde_datadir}/apps/kleopatra
-%{tde_datadir}/apps/kwatchgnupg
-%{tde_datadir}/services/kleopatra_config_*.desktop
-%{tde_tdedocdir}/HTML/en/kleopatra/
-%{tde_tdedocdir}/HTML/en/kwatchgnupg/
-
-%post -n trinity-kleopatra
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-kleopatra
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-##########
-
-%package -n trinity-kmail
-Summary:	Trinity Email client
-Group:		Applications/Communications
-Requires:	%{name}-kio-plugins = %{version}-%{release}
-%if 0%{?suse_version}
-Requires:	gpg2
-Requires:	pinentry
-%endif
-%if 0%{?rhel} == 4
-Requires:	gnupg
-%endif
-%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version}
-Requires:	gnupg2
-Requires:	pinentry
-%endif
-Requires:	procmail
-Requires:	trinity-kaddressbook = %{version}-%{release}
-Requires:	trinity-kleopatra = %{version}-%{release}
-Requires:	trinity-kdebase-pim-ioslaves
-
-Provides: imap-client, mail-reader
-
-%description -n trinity-kmail
-KMail is a fully-featured email client that fits nicely into the TDE
-desktop. It has features such as support for IMAP, POP3, multiple accounts,
-mail filtering and sorting, PGP/GnuPG privacy, and inline attachments.
-
-You need to install %{name}-kio-plugins if you want to use IMAP or
-mbox files, and/or trinity-tdebase-kio-plugins if you want to use POP3.
-
-%files -n trinity-kmail
-%{tde_datadir}/config/kmail.antispamrc
-%{tde_datadir}/config/kmail.antivirusrc
-%{tde_bindir}/kmail
-%{tde_bindir}/kmail_*.sh
-%{tde_tdelibdir}/kcm_kmail.la
-%{tde_tdelibdir}/kcm_kmail.so
-%{tde_tdelibdir}/libkmail_bodypartformatter_application_octetstream.la
-%{tde_tdelibdir}/libkmail_bodypartformatter_application_octetstream.so
-%{tde_tdelibdir}/libkmail_bodypartformatter_text_calendar.la
-%{tde_tdelibdir}/libkmail_bodypartformatter_text_calendar.so
-%{tde_tdelibdir}/libkmail_bodypartformatter_text_vcard.la
-%{tde_tdelibdir}/libkmail_bodypartformatter_text_vcard.so
-%{tde_tdelibdir}/libkmail_bodypartformatter_text_xdiff.la
-%{tde_tdelibdir}/libkmail_bodypartformatter_text_xdiff.so
-%{tde_tdelibdir}/libkmailpart.la
-%{tde_tdelibdir}/libkmailpart.so
-%{tde_tdeappdir}/KMail.desktop
-%{tde_tdeappdir}/kmail_view.desktop
-%{tde_datadir}/apps/kconf_update/kmail-3.1-update-new-mail-notification-settings.pl
-%{tde_datadir}/apps/kconf_update/kmail-3.1-use-UOID-for-identities.pl
-%{tde_datadir}/apps/kconf_update/kmail-3.1.4-dont-use-UOID-0-for-any-identity.pl
-%{tde_datadir}/apps/kconf_update/kmail-3.2-misc.sh
-%{tde_datadir}/apps/kconf_update/kmail-3.2-update-loop-on-goto-unread-settings.sh
-%{tde_datadir}/apps/kconf_update/kmail-3.3-aegypten.pl
-%{tde_datadir}/apps/kconf_update/kmail-3.3-misc.pl
-%{tde_datadir}/apps/kconf_update/kmail-3.3-move-identities.pl
-%{tde_datadir}/apps/kconf_update/kmail-3.3-split-sign-encr-keys.sh
-%{tde_datadir}/apps/kconf_update/kmail-3.3-use-ID-for-accounts.pl
-%{tde_datadir}/apps/kconf_update/kmail-3.3b1-misc.pl
-%{tde_datadir}/apps/kconf_update/kmail-3.4-misc.pl
-%{tde_datadir}/apps/kconf_update/kmail-3.4.1-update-status-filters.pl
-%{tde_datadir}/apps/kconf_update/kmail-3.5-trigger-flag-migration.pl
-%{tde_datadir}/apps/kconf_update/kmail-3.5-filter-icons.pl
-%{tde_datadir}/apps/kconf_update/kmail-pgpidentity.pl
-%{tde_datadir}/apps/kconf_update/kmail-upd-identities.pl
-%{tde_datadir}/apps/kconf_update/kmail.upd
-%{tde_datadir}/apps/kconf_update/upgrade-signature.pl
-%{tde_datadir}/apps/kconf_update/upgrade-transport.pl
-%{tde_datadir}/apps/kmail
-%{tde_datadir}/config.kcfg/custommimeheader.kcfg
-%{tde_datadir}/config.kcfg/kmail.kcfg
-%{tde_datadir}/config.kcfg/customtemplates_kfg.kcfg
-%{tde_datadir}/config.kcfg/replyphrases.kcfg
-%{tde_datadir}/config.kcfg/templatesconfiguration_kfg.kcfg
-%{tde_datadir}/icons/crystalsvg/*/apps/kmaillight.png
-%{tde_datadir}/icons/hicolor/*/apps/kmail.png
-%{tde_datadir}/icons/hicolor/scalable/apps/kmail.svgz
-%{tde_datadir}/services/kmail_config_*.desktop
-%{tde_datadir}/services/kontact/kmailplugin.desktop
-%{tde_datadir}/servicetypes/dcopimap.desktop
-%{tde_datadir}/servicetypes/dcopmail.desktop
-# 'libkmailprivate.so' is required at runtime, not devel !
-%{tde_libdir}/libkmailprivate.so
-%{tde_libdir}/libkmailprivate.la
-%{tde_tdedocdir}/HTML/en/kmail/
-
-%post -n trinity-kmail
-for f in crystalsvg hicolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
-done
-/sbin/ldconfig || :
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-kmail
-for f in crystalsvg hicolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
-done
-/sbin/ldconfig || :
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-##########
-
-%package -n trinity-kmail-devel
-Summary:	Development files for kmail
-Group:		Development/Libraries
-
-%description -n trinity-kmail-devel
-%{summary}
-
-%files -n trinity-kmail-devel
-%{tde_tdeincludedir}/kmail/
-%{tde_tdeincludedir}/kmail*.h
-
-%post -n trinity-kmail-devel
-/sbin/ldconfig || :
-
-%postun -n trinity-kmail-devel
-/sbin/ldconfig || :
-
-##########
- 
-%package -n trinity-kmailcvt
-Summary:	Trinity KMail mail folder converter
-Group:		Applications/Communications
-Requires:	trinity-kmail = %{version}-%{release}
-
-%description -n trinity-kmailcvt
-Converts mail folders to KMail format.  Formats supported for import
-include Outlook Express, Evolution, and plain mbox.
-
-%files -n trinity-kmailcvt
-%{tde_bindir}/kmailcvt
-%{tde_datadir}/applnk/Utilities/kmailcvt.desktop
-%{tde_datadir}/apps/kmailcvt
-%{tde_datadir}/icons/crystalsvg/*/apps/kmailcvt.png
-
-%post -n trinity-kmailcvt
-for f in crystalsvg ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
-done
-
-%postun -n trinity-kmailcvt
-for f in crystalsvg ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
-done
-
-##########
-
-%package -n trinity-knode
-Summary:	Trinity news reader
-Group:		Applications/Internet
-
-%description -n trinity-knode
-KNode is an easy-to-use, convenient newsreader. It is intended to be usable
-by inexperienced users, but also includes support for such features as
-MIME attachments, article scoring, and creating and verifying GnuPG
-signatures.
-
-%files -n trinity-knode
-%{tde_bindir}/knode
-%{tde_tdelibdir}/kcm_knode.la
-%{tde_tdelibdir}/kcm_knode.so
-%{tde_tdelibdir}/libknodepart.la
-%{tde_tdelibdir}/libknodepart.so
-%{tde_libdir}/libknodecommon.so.*
-%{tde_tdeappdir}/KNode.desktop
-%{tde_datadir}/apps/knode/
-%{tde_datadir}/icons/hicolor/*/apps/knode.png
-%{tde_datadir}/icons/hicolor/*/apps/knode2.png
-%{tde_datadir}/services/knewsservice.protocol
-%{tde_datadir}/services/knode_config_*.desktop
-%{tde_datadir}/services/kontact/knodeplugin.desktop
-%{tde_tdedocdir}/HTML/en/knode/
-
-%post -n trinity-knode
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
-done
-/sbin/ldconfig || :
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-knode
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
-done
-/sbin/ldconfig || :
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-##########
-
-%package -n trinity-knode-devel
-Summary:	Development files for trinity-knode
-Group:		Development/Libraries
-Requires:	trinity-knode = %{version}-%{release}
-
-%description -n trinity-knode-devel
-%{summary}
-
-%files -n trinity-knode-devel
-%{tde_libdir}/libknodecommon.la
-%{tde_libdir}/libknodecommon.so
-
-%post -n trinity-knode-devel
-/sbin/ldconfig || :
-
-%postun -n trinity-knode-devel
-/sbin/ldconfig || :
-
-##########
-
-%package -n trinity-knotes
-Summary:	Trinity sticky notes
-Group:		Applications/Utilities
-Requires:	trinity-tdepim-kresources = %{version}-%{release}
-
-%description -n trinity-knotes
-KNotes is a program that lets you write sticky notes. The notes are saved
-automatically when you exit the program, and they display when you open the
-program.  The program supports printing and mailing your notes.
-
-%files -n trinity-knotes
-%{tde_bindir}/knotes
-%{tde_tdelibdir}/knotes_local.la
-%{tde_tdelibdir}/knotes_local.so
-%{tde_libdir}/libknotes.so.*
-%{tde_tdeappdir}/knotes.desktop
-%{tde_datadir}/apps/knotes
-%{tde_datadir}/config.kcfg/knoteconfig.kcfg
-%{tde_datadir}/config.kcfg/knotesglobalconfig.kcfg
-%{tde_datadir}/icons/hicolor/*/apps/knotes.png
-%{tde_datadir}/services/kresources/knotes/imap.desktop
-%{tde_datadir}/services/kresources/knotes/local.desktop
-%{tde_datadir}/services/kresources/knotes_manager.desktop
-%{tde_datadir}/services/kontact/knotesplugin.desktop
-%{tde_tdedocdir}/HTML/en/knotes/
-
-%post -n trinity-knotes
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
-done
-/sbin/ldconfig || :
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-knotes
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
-done
-/sbin/ldconfig || :
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-##########
-
-%package -n trinity-knotes-devel
-Summary:	Development files for knots
-Group:		Development/Libraries
-Requires:	trinity-knotes = %{version}-%{release}
-Requires:	%{name}-kresources-devel = %{version}-%{release}
-
-%description -n trinity-knotes-devel
-%{summary}
-
-%files -n trinity-knotes-devel
-%{tde_libdir}/libknotes.so
-%{tde_libdir}/libknotes.la
-%{tde_tdeincludedir}/KNotesAppIface.h
-%{tde_tdeincludedir}/KNotesIface.h
-
-%post -n trinity-knotes-devel
-/sbin/ldconfig || :
-
-%postun -n trinity-knotes-devel
-/sbin/ldconfig || :
-
-##########
-
-%package -n trinity-kode
-Summary:	Helper library for programmatic generation of C++ code
-Group:		Development/Libraries
-
-%description -n trinity-kode
-This package includes a program kode for generation of C++ template files
-and kxml_compiler for generation of C++ classes representing XML data
-described by RelaxNG schemes.
-
-%files -n trinity-kode
-%{tde_bindir}/kode
-%{tde_bindir}/kxml_compiler
-%{tde_libdir}/libkode.so.*
-
-%post -n trinity-kode
-/sbin/ldconfig || :
-
-%postun -n trinity-kode
-/sbin/ldconfig || :
-
-##########
-
-%package -n trinity-kode-devel
-Summary:	Development files for trinity-kode
-Group:		Development/Libraries
-Requires:	trinity-kode = %{version}-%{release}
-
-%description -n trinity-kode-devel
-%{summary}
-
-%files -n trinity-kode-devel
-%{tde_libdir}/libkode.la
-%{tde_libdir}/libkode.so
-
-%post -n trinity-kode-devel
-/sbin/ldconfig || :
-
-%postun -n trinity-kode-devel
-/sbin/ldconfig || :
-
-##########
-
-%package -n trinity-konsolekalendar
-Summary:	Trinity konsole personal organizer
-Group:		Applications/Productivity
-
-%description -n trinity-konsolekalendar
-KonsoleKalendar is a command-line interface to TDE calendars.
-Konsolekalendar complements the TDE KOrganizer by providing a console
-frontend to manage your calendars.
-
-%files -n trinity-konsolekalendar
-%{tde_bindir}/konsolekalendar
-%{tde_tdeappdir}/konsolekalendar.desktop
-%{tde_datadir}/icons/crystalsvg/*/apps/konsolekalendar.png
-%{tde_tdedocdir}/HTML/en/konsolekalendar/
-
-%post -n trinity-konsolekalendar
-for f in crystalsvg ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-konsolekalendar
-for f in crystalsvg ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-##########
-
-%package -n trinity-kontact
-Summary:	Trinity pim application
-Group:		Applications/Communications
-Requires:	trinity-kmail = %{version}-%{release}
-Requires:	trinity-korganizer = %{version}-%{release}
-Requires:	trinity-kaddressbook = %{version}-%{release}
-Requires:	trinity-knode = %{version}-%{release}
-Requires:	trinity-knotes = %{version}-%{release}
-Requires:	trinity-akregator = %{version}-%{release}
-
-%description -n trinity-kontact
-Kontact is the integrated solution to your personal information management
-needs. It combines TDE applications like KMail, KOrganizer, and
-KAddressBook into a single interface to provide easy access to mail,
-scheduling, address book and other PIM functionality.
-
-%files -n trinity-kontact
-%{tde_bindir}/kontact
-%{tde_tdelibdir}/kcm_kmailsummary.la
-%{tde_tdelibdir}/kcm_kmailsummary.so
-%{tde_tdelibdir}/kcm_kontact.la
-%{tde_tdelibdir}/kcm_kontact.so
-%{tde_tdelibdir}/kcm_kontactknt.la
-%{tde_tdelibdir}/kcm_kontactknt.so
-%{tde_tdelibdir}/kcm_kontactsummary.la
-%{tde_tdelibdir}/kcm_kontactsummary.so
-%{tde_tdelibdir}/kcm_korgsummary.la
-%{tde_tdelibdir}/kcm_korgsummary.so
-%{tde_tdelibdir}/kcm_sdsummary.la
-%{tde_tdelibdir}/kcm_sdsummary.so
-%{tde_tdelibdir}/libkontact_*.la
-%{tde_tdelibdir}/libkontact_*.so
-%{tde_libdir}/libkontact.so.*
-%{tde_libdir}/libkpinterfaces.so.*
-%{tde_tdeappdir}/Kontact.desktop
-%{tde_tdeappdir}/kontactdcop.desktop
-%{tde_datadir}/apps/kontact
-%{tde_datadir}/apps/kontactsummary/kontactsummary_part.rc
-%{tde_datadir}/config.kcfg/kontact.kcfg
-%{tde_datadir}/icons/hicolor/*/apps/kontact.png
-%{tde_datadir}/icons/crystalsvg/*/actions/kontact_*.png
-%{tde_datadir}/services/kcmkmailsummary.desktop
-%{tde_datadir}/services/kcmkontactknt.desktop
-%{tde_datadir}/services/kcmkontactsummary.desktop
-%{tde_datadir}/services/kcmkorgsummary.desktop
-%{tde_datadir}/services/kcmsdsummary.desktop
-%{tde_datadir}/services/kontact/newstickerplugin.desktop
-%{tde_datadir}/services/kontact/specialdatesplugin.desktop
-%{tde_datadir}/services/kontact/summaryplugin.desktop
-%{tde_datadir}/services/kontact/weatherplugin.desktop
-%{tde_datadir}/services/kontactconfig.desktop
-%{tde_datadir}/servicetypes/kontactplugin.desktop
-%{tde_tdedocdir}/HTML/en/kontact/
-%{tde_tdedocdir}/HTML/en/kpilot/
-
-%post -n trinity-kontact
-for f in crystalsvg hicolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
-done
-/sbin/ldconfig || :
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-kontact
-for f in crystalsvg hicolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
-done
-/sbin/ldconfig || :
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-##########
-
-%package -n trinity-kontact-devel
-Summary:	Development files for kontact
-Group:		Development/Libraries
-Requires:	trinity-kontact = %{version}-%{release}
-
-%description -n trinity-kontact-devel
-%{summary}
-
-%files -n trinity-kontact-devel
-%{tde_libdir}/libkontact.la
-%{tde_libdir}/libkontact.so
-%{tde_libdir}/libkpinterfaces.la
-%{tde_libdir}/libkpinterfaces.so
-%{tde_tdeincludedir}/kontact/
-
-%post -n trinity-kontact-devel
-/sbin/ldconfig || :
-
-%postun -n trinity-kontact-devel
-/sbin/ldconfig || :
-
-##########
-
-%package -n trinity-korganizer
-Summary:	Trinity personal organizer
-Group:		Applications/Productivity
-Requires:	trinity-libkpimidentities = %{version}-%{release}
-Requires:	trinity-libkpimexchange = %{version}-%{release}
-Requires:	%{name}-kresources = %{version}-%{release}
-Requires:	perl
-
-%description -n trinity-korganizer
-This package contains KOrganizer, a calendar and scheduling program.
-
-KOrganizer aims to be a complete program for organizing appointments,
-contacts, projects, etc. KOrganizer natively supports information interchange
-with other calendar applications, through the industry standard vCalendar
-personal data interchange file format. This eases the move from other
-modern PIMs to KOrganizer.
-
-KOrganizer offers full synchronization with Palm Pilots, if kpilot is
-installed.
-
-%files -n trinity-korganizer
-%{tde_bindir}/ical2vcal
-%{tde_bindir}/korgac
-%{tde_bindir}/korganizer
-%{tde_tdelibdir}/kcm_korganizer.la
-%{tde_tdelibdir}/kcm_korganizer.so
-%{tde_tdelibdir}/libkorg_*.la
-%{tde_tdelibdir}/libkorg_*.so
-%{tde_tdelibdir}/libkorganizerpart.la
-%{tde_tdelibdir}/libkorganizerpart.so
-%{tde_libdir}/libkocorehelper.so.*
-%{tde_libdir}/libkorg_stdprinting.so.*
-%{tde_libdir}/libkorganizer.so.*
-%{tde_libdir}/libkorganizer_calendar.so.*
-%{tde_libdir}/libkorganizer_eventviewer.so.*
-%{tde_tdeappdir}/korganizer.desktop
-%{tde_datadir}/apps/kconf_update/korganizer.upd
-%{tde_datadir}/apps/korgac
-%{tde_datadir}/apps/korganizer
-%{tde_datadir}/autostart/korgac.desktop
-%{tde_datadir}/config.kcfg/korganizer.kcfg
-%{tde_datadir}/icons/hicolor/*/apps/korganizer.png
-%{tde_datadir}/services/kontact/korganizerplugin.desktop
-%{tde_datadir}/services/kontact/journalplugin.desktop
-%{tde_datadir}/services/kontact/todoplugin.desktop
-%{tde_datadir}/services/korganizer_*.desktop
-%{tde_datadir}/services/korganizer
-%{tde_datadir}/services/webcal.protocol
-%{tde_datadir}/servicetypes/calendardecoration.desktop
-%{tde_datadir}/servicetypes/calendarplugin.desktop
-%{tde_datadir}/servicetypes/dcopcalendar.desktop
-%{tde_datadir}/servicetypes/korganizerpart.desktop
-%{tde_datadir}/servicetypes/korgprintplugin.desktop
-%{tde_tdedocdir}/HTML/en/korganizer/
-
-%post -n trinity-korganizer
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
-done
-/sbin/ldconfig || :
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-korganizer
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
-done
-/sbin/ldconfig || :
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-##########
-
-%package -n trinity-korganizer-devel
-Summary:	Development files for korganizer
-Group:		Development/Libraries
-Requires:	trinity-korganizer = %{version}-%{release}
-
-%description -n trinity-korganizer-devel
-%{summary}
-
-%files -n trinity-korganizer-devel
-%{tde_tdeincludedir}/korganizer/
-%{tde_tdeincludedir}/calendar/
-%{tde_libdir}/libkocorehelper.la
-%{tde_libdir}/libkocorehelper.so
-%{tde_libdir}/libkorg_stdprinting.la
-%{tde_libdir}/libkorg_stdprinting.so
-%{tde_libdir}/libkorganizer.la
-%{tde_libdir}/libkorganizer.so
-%{tde_libdir}/libkorganizer_calendar.la
-%{tde_libdir}/libkorganizer_calendar.so
-%{tde_libdir}/libkorganizer_eventviewer.la
-%{tde_libdir}/libkorganizer_eventviewer.so
-
-%post -n trinity-korganizer-devel
-/sbin/ldconfig || :
-
-%postun -n trinity-korganizer-devel
-/sbin/ldconfig || :
-
-##########
-
-%package -n trinity-korn
-Summary:	Trinity mail checker
-Group:		Applications/Communications
-Requires:	%{name}-kio-plugins = %{version}-%{release}
-#Requires:	tdebase-kio-plugins-trinity
-
-%description -n trinity-korn
-Korn is a TDE mail checker that can display a small summary in the Kicker
-tray.  It supports checking mbox, pop3, imap4, and nntp sources.
-
-Once mail is received you can have Korn run a third party program or change
-the color/icon of the Kicker display.  In addition to this you can have
-Korn run a program once you click on the docked icon in Kicker.
-
-%files -n trinity-korn
-%{tde_bindir}/korn
-%{tde_libdir}/kconf_update_bin/korn-3-4-config_change
-%{tde_tdeappdir}/KOrn.desktop
-%{tde_datadir}/apps/kconf_update/korn-3-4-config_change.upd
-%{tde_datadir}/apps/kconf_update/korn-3-5-metadata-update.pl
-%{tde_datadir}/apps/kconf_update/korn-3-5-ssl-update.pl
-%{tde_datadir}/apps/kconf_update/korn-3-5-update.upd
-%{tde_datadir}/icons/hicolor/*/apps/korn.png
-%{tde_tdedocdir}/HTML/en/korn/
-
-%post -n trinity-korn
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
-done
-/sbin/ldconfig || :
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-korn
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
-done
-/sbin/ldconfig || :
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-##########
-
-%package -n trinity-ktnef
-Summary:	Trinity TNEF viewer
-Group:		Applications/Communications
-
-%description -n trinity-ktnef
-The TNEF File Viewer allows you to handle mail attachments using the TNEF
-format. These attachments are usually found in mails coming from Microsoft
-mail servers and embed the mail properties as well as the actual attachments.
-
-%files -n trinity-ktnef
-%{tde_bindir}/ktnef
-%{tde_tdeappdir}/ktnef.desktop
-%{tde_datadir}/apps/ktnef
-%{tde_datadir}/icons/hicolor/*/apps/ktnef.png
-%{tde_datadir}/icons/locolor/*/apps/ktnef.png
-%{tde_datadir}/mimelnk/application/ms-tnef.desktop
-%{tde_tdedocdir}/HTML/en/ktnef/
-
-%post -n trinity-ktnef
-for f in hicolor locolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-ktnef
-for f in hicolor locolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-##########
-
-%package -n trinity-libindex
-Summary:	Trinity indexing library
-Group:		Environment/Libraries
-
-%description -n trinity-libindex
-This library provides text indexing and is currently used by KMail
-to implement fast searches in mail bodies.
-
-This is the runtime package for programs that use the libindex library.
-
-%files -n trinity-libindex
-%{tde_libdir}/libindex.so.*
-
-%post -n trinity-libindex
-/sbin/ldconfig || :
-
-%postun -n trinity-libindex
-/sbin/ldconfig || :
-
-##########
-
-%package -n trinity-libindex-devel
-Summary:	Trinity indexing library [development]
-Group:		Development/Libraries
-Requires:	trinity-libindex = %{version}-%{release}
-
-%description -n trinity-libindex-devel
-This library provides text indexing and is currently used by KMail
-to implement searching through mail text.
-
-This is the development package which contains the headers for the libindex-trinity
-library.
-
-%files -n trinity-libindex-devel
-%{tde_bindir}/indexlib-config
-%{tde_tdeincludedir}/index
-%{tde_libdir}/libindex.la
-%{tde_libdir}/libindex.so
-
-%post -n trinity-libindex-devel
-/sbin/ldconfig || :
-
-%postun -n trinity-libindex-devel
-/sbin/ldconfig || :
-
-##########
-
-%package -n trinity-libkcal
-Summary:	Trinity calendaring library
-Group:		Environment/Libraries
-#Requires:	%{name}-kresources = %{version}-%{release}
-
-%description -n trinity-libkcal
-This library provides a C++ API for handling the vCalendar and iCalendar
-formats.
-
-This is the runtime package for programs that use the libkcal-trinity library.
-
-%files -n trinity-libkcal
-%{tde_tdelibdir}/kcal_kabc.la
-%{tde_tdelibdir}/kcal_kabc.so
-%{tde_tdelibdir}/kcal_localdir.la
-%{tde_tdelibdir}/kcal_localdir.so
-%{tde_tdelibdir}/kcal_local.la
-%{tde_tdelibdir}/kcal_local.so
-%{tde_tdelibdir}/kcal_remote.la
-%{tde_tdelibdir}/kcal_remote.so
-%{tde_libdir}/libkcal.so.*
-%{tde_libdir}/libkcal_resourceremote.so.*
-%{tde_libdir}/libkholidays.so.*
-%{tde_datadir}/apps/libkholidays
-%{tde_datadir}/services/kresources/kcal/imap.desktop
-%{tde_datadir}/services/kresources/kcal/kabc.desktop
-%{tde_datadir}/services/kresources/kcal/local.desktop
-%{tde_datadir}/services/kresources/kcal/localdir.desktop
-%{tde_datadir}/services/kresources/kcal/remote.desktop
-%{tde_datadir}/services/kresources/kcal_manager.desktop
-
-%post -n trinity-libkcal
-/sbin/ldconfig || :
-
-%postun -n trinity-libkcal
-/sbin/ldconfig || :
-
-##########
-
-%package -n trinity-libkcal-devel
-Summary:	Trinity calendaring library [development]
-Group:		Development/Libraries
-Requires:	trinity-libkcal = %{version}-%{release}
-Requires:	trinity-libtdepim-devel = %{version}-%{release}
-Requires:	trinity-libktnef-devel = %{version}-%{release}
-
-%description -n trinity-libkcal-devel
-This library provides a C++ API for handling the vCalendar and iCalendar
-formats.
-
-This is the development package which contains the headers for the libkcal-trinity
-library.
-
-%files -n trinity-libkcal-devel
-%{tde_tdeincludedir}/libemailfunctions/idmapper.h
-%{tde_tdeincludedir}/libkcal
-%{tde_libdir}/libkcal.la
-%{tde_libdir}/libkcal.so
-%{tde_libdir}/libkcal_resourceremote.la
-%{tde_libdir}/libkcal_resourceremote.so
-%{tde_libdir}/libkholidays.la
-%{tde_libdir}/libkholidays.so
-
-%post -n trinity-libkcal-devel
-/sbin/ldconfig || :
-
-%postun -n trinity-libkcal-devel
-/sbin/ldconfig || :
-
-##########
-
-%package -n trinity-libtdepim
-Summary:	Trinity PIM library
-Group:		Environment/Libraries
-Requires:	trinity-libkcal = %{version}-%{release}
-
-Obsoletes:	libtdepim < %{version}-%{release}
-Provides:	libtdepim = %{version}-%{release}
-
-%description -n trinity-libtdepim
-This is the runtime package for programs that use the libtdepim-trinity library.
-
-%files -n trinity-libtdepim
-%{tde_tdelibdir}/plugins/designer/[kt]depimwidgets.la
-%{tde_tdelibdir}/plugins/designer/[kt]depimwidgets.so
-%{tde_tdelibdir}/plugins/designer/kpartsdesignerplugin.la
-%{tde_tdelibdir}/plugins/designer/kpartsdesignerplugin.so
-%{tde_libdir}/lib[kt]depim.so.*
-%{tde_datadir}/apps/[kt]depimwidgets
-%{tde_datadir}/apps/lib[kt]depim
-%{tde_datadir}/apps/[kt]depim
-%{tde_datadir}/config.kcfg/pimemoticons.kcfg
-%{tde_datadir}/icons/crystalsvg/22x22/actions/button_fewer.png
-%{tde_datadir}/icons/crystalsvg/22x22/actions/button_more.png
-
-%post -n trinity-libtdepim
-for f in crystalsvg ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
-done
-/sbin/ldconfig || :
-
-%postun -n trinity-libtdepim
-for f in crystalsvg ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
-done
-/sbin/ldconfig || :
-
-##########
-
-%package -n trinity-libtdepim-devel
-Summary:	Trinity PIM library [development]
-Group:		Development/Libraries
-Requires:	trinity-libtdepim = %{version}-%{release}
-Requires:	trinity-kdelibs-devel
-
-Obsoletes:	libtdepim-devel < %{version}-%{release}
-Provides:	libtdepim-devel = %{version}-%{release}
-
-%description -n trinity-libtdepim-devel
-This is the development package which contains the headers for the libtdepim-trinity
-library.
-
-%files -n trinity-libtdepim-devel
-%{tde_tdeincludedir}/[kt]depimmacros.h
-%{tde_libdir}/lib[kt]depim.la
-%{tde_libdir}/lib[kt]depim.so
-
-%post -n trinity-libtdepim-devel
-/sbin/ldconfig || :
-
-%postun -n trinity-libtdepim-devel
-/sbin/ldconfig || :
-
-##########
-
-%package -n trinity-libkgantt
-Summary:	Trinity gantt charting library
-Group:		Environment/Libraries
-
-%description -n trinity-libkgantt
-This is the runtime package for programs that use the libkgantt-trinity library.
-
-%files -n trinity-libkgantt
-%{tde_libdir}/libkgantt.so.*
-%{tde_datadir}/apps/kgantt
-
-%post -n trinity-libkgantt
-/sbin/ldconfig || :
-
-%postun -n trinity-libkgantt
-/sbin/ldconfig || :
-
-##########
-
-%package -n trinity-libkgantt-devel
-Summary:	Trinity gantt charting library [development]
-Group:		Development/Libraries
-Requires:	trinity-libkgantt = %{version}-%{release}
-Requires:	trinity-libtdepim-devel = %{version}-%{release}
-
-%description -n trinity-libkgantt-devel
-This is the development package which contains the headers for the libkgantt-trinity
-library.
-
-%files -n trinity-libkgantt-devel
-%{tde_tdeincludedir}/kgantt
-%{tde_libdir}/libkgantt.la
-%{tde_libdir}/libkgantt.so
-
-%post -n trinity-libkgantt-devel
-/sbin/ldconfig || :
-
-%postun -n trinity-libkgantt-devel
-/sbin/ldconfig || :
-
-##########
-
-%package -n trinity-libkleopatra
-Summary:	TDE GnuPG interface libraries
-Group:		Environment/Libraries
-Requires:	gnupg
-
-%description -n trinity-libkleopatra
-This library is used by several TDE applications to interface to the
-GnuPG program.
-
-This is the runtime package for programs that use the libkleopatra-trinity library.
-
-%files -n trinity-libkleopatra
-%{tde_datadir}/config/libkleopatrarc
-%{tde_libdir}/libgpgme++.so.*
-%{tde_libdir}/libkleopatra.so.*
-%{tde_libdir}/libkpgp.so.*
-%{tde_libdir}/libqgpgme.so.*
-%{tde_datadir}/apps/kconf_update/kpgp-3.1-upgrade-address-data.pl
-%{tde_datadir}/apps/kconf_update/kpgp.upd
-%{tde_datadir}/apps/libkleopatra/
-%{tde_datadir}/icons/crystalsvg/*/apps/gpg.png
-%{tde_datadir}/icons/crystalsvg/*/apps/gpgsm.png
-
-%post -n trinity-libkleopatra
-for f in crystalsvg ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
-done
-/sbin/ldconfig || :
-
-%postun -n trinity-libkleopatra
-for f in crystalsvg ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
-done
-/sbin/ldconfig || :
-
-##########
-
-%package -n trinity-libkleopatra-devel
-Summary:	Trinity GnuPG interface libraries [development]
-Group:		Development/Libraries
-Requires:	trinity-libkleopatra = %{version}-%{release}
-Requires:	trinity-libtdepim-devel = %{version}-%{release}
-
-%description -n trinity-libkleopatra-devel
-This library is used by several KDE applications to interface to the
-GnuPG program.
-
-This is the development package which contains the headers for the
-libkleopatra-trinity library.
-
-%files -n trinity-libkleopatra-devel
-%{tde_tdeincludedir}/gpgme++/
-%{tde_tdeincludedir}/kleo/
-%{tde_tdeincludedir}/qgpgme/
-%{tde_libdir}/libgpgme++.la
-%{tde_libdir}/libgpgme++.so
-%{tde_libdir}/libkleopatra.la
-%{tde_libdir}/libkleopatra.so
-%{tde_libdir}/libkpgp.la
-%{tde_libdir}/libkpgp.so
-%{tde_libdir}/libqgpgme.la
-%{tde_libdir}/libqgpgme.so
-
-%post -n trinity-libkleopatra-devel
-/sbin/ldconfig || :
-
-%postun -n trinity-libkleopatra-devel
-/sbin/ldconfig || :
-
-##########
-
-%package -n trinity-libkmime
-Summary:	Trinity MIME interface library
-Group:		Environment/Libraries
-#Conflicts:	trinity-libmimelib
-
-%description -n trinity-libkmime
-This library provides a C++ interface to MIME messages, parsing them into
-an object tree.
-
-%files -n trinity-libkmime
-%{tde_libdir}/libkmime.so.*
-
-%post -n trinity-libkmime
-/sbin/ldconfig || :
-
-%postun -n trinity-libkmime
-/sbin/ldconfig || :
-
-##########
-
-%package -n trinity-libkmime-devel
-Summary:	Development files for libkmime
-Group:		Development/Libraries
-Requires:	trinity-libkmime = %{version}-%{release}
-
-%description -n trinity-libkmime-devel
-%{summary}
-
-%files -n trinity-libkmime-devel
-%{tde_libdir}/libkmime.la
-%{tde_libdir}/libkmime.so
-
-%post -n trinity-libkmime-devel
-/sbin/ldconfig || :
-
-%postun -n trinity-libkmime-devel
-/sbin/ldconfig || :
-
-##########
-
-%package -n trinity-libkpimexchange
-Summary:	Trinity PIM Exchange library
-Group:		Environment/Libraries
-
-%description -n trinity-libkpimexchange
-This is the runtime package for programs that use the libkpimexchange-trinity
-library. 
-
-%files -n trinity-libkpimexchange
-%{tde_tdelibdir}/resourcecalendarexchange.la
-%{tde_tdelibdir}/resourcecalendarexchange.so
-%{tde_libdir}/libkpimexchange.so.*
-
-%post -n trinity-libkpimexchange
-/sbin/ldconfig || :
-
-%postun -n trinity-libkpimexchange
-/sbin/ldconfig || :
-
-##########
-
-%package -n trinity-libkpimexchange-devel
-Summary:	Trinity PIM Exchange library [development]
-Group:		Development/Libraries
-Requires:	trinity-libkpimexchange = %{version}-%{release}
-Requires:	trinity-libkcal-devel = %{version}-%{release}
-Requires:	trinity-libtdepim-devel = %{version}-%{release}
-
-%description -n trinity-libkpimexchange-devel
-This is the development package which contains the headers for the
-libkpimexchange-trinity library.
-
-%files -n trinity-libkpimexchange-devel
-%{tde_tdeincludedir}/[kt]depim/exchangeaccount.h
-%{tde_tdeincludedir}/[kt]depim/exchangeclient.h
-%{tde_libdir}/libkpimexchange.la
-%{tde_libdir}/libkpimexchange.so
-
-%post -n trinity-libkpimexchange-devel
-/sbin/ldconfig || :
-
-%postun -n trinity-libkpimexchange-devel
-/sbin/ldconfig || :
-
-##########
-
-%package -n trinity-libkpimidentities
-Summary:	Trinity PIM user identity information library
-Group:		Environment/Libraries
-
-%description -n trinity-libkpimidentities
-This library provides information to TDE programs about user identity,
-such as email address, organization, etc.
-
-This is the runtime package for programs that use the libkpimidentities-trinity
-library.
-
-%files -n trinity-libkpimidentities
-%{tde_libdir}/libkpimidentities.so.*
-
-%post -n trinity-libkpimidentities
-/sbin/ldconfig || :
-
-%postun -n trinity-libkpimidentities
-/sbin/ldconfig || :
-
-##########
-
-%package -n trinity-libkpimidentities-devel
-Summary:	Development files for libkpimidentities
-Group:		Development/Libraries
-Requires:	trinity-libkpimidentities = %{version}-%{release}
-
-%description -n trinity-libkpimidentities-devel
-%{summary}
-
-%files -n trinity-libkpimidentities-devel
-%{tde_libdir}/libkpimidentities.la
-%{tde_libdir}/libkpimidentities.so
-
-%post -n trinity-libkpimidentities-devel
-/sbin/ldconfig || :
-
-%postun -n trinity-libkpimidentities-devel
-/sbin/ldconfig || :
-
-##########
-
-%package -n trinity-libksieve
-Summary:	Trinity mail/news message filtering library
-Group:		Environment/Libraries
-
-%description -n trinity-libksieve
-This is the runtime package for programs that use the libksieve-trinity library.
-
-%files -n trinity-libksieve
-%{tde_libdir}/libksieve.so.*
-
-%post -n trinity-libksieve
-/sbin/ldconfig || :
-
-%postun -n trinity-libksieve
-/sbin/ldconfig || :
-
-##########
-
-%package -n trinity-libksieve-devel
-Summary:	Trinity mail/news message filtering library [development]
-Group:		Development/Libraries
-Requires:	trinity-libksieve = %{version}-%{release}
-Requires:	trinity-libtdepim-devel = %{version}-%{release}
-
-%description -n trinity-libksieve-devel
-This is the development package which contains the headers for the libksieve-trinity
-library.
-
-%files -n trinity-libksieve-devel
-%{tde_tdeincludedir}/ksieve
-%{tde_libdir}/libksieve.la
-%{tde_libdir}/libksieve.so
-
-%post -n trinity-libksieve-devel
-/sbin/ldconfig || :
-
-%postun -n trinity-libksieve-devel
-/sbin/ldconfig || :
-
-##########
-
-%package -n trinity-libktnef
-Summary:	Library for handling KTNEF email attachments
-Group:		Environment/Libraries
-
-%description -n trinity-libktnef
-This library handles mail attachments using the TNEF format. These
-attachments are usually found in mails coming from Microsoft mail
-servers and embed the mail properties as well as the actual
-attachments.
-.
-This is the runtime library for packages using the ktnef-trinity library.
-
-%files -n trinity-libktnef
-%{tde_libdir}/libktnef.so.*
-
-%post -n trinity-libktnef
-/sbin/ldconfig || :
-
-%postun -n trinity-libktnef
-/sbin/ldconfig || :
-
-##########
-
-%package -n trinity-libktnef-devel
-Summary:	KTNEF handler library [development]
-Group:		Development/Libraries
-Requires:	trinity-libktnef = %{version}-%{release}
-Requires:	trinity-libtdepim-devel = %{version}-%{release}
-
-%description -n trinity-libktnef-devel
-This library handles mail attachments using the TNEF format. These
-attachments are usually found in mails coming from Microsoft mail
-servers and embed the mail properties as well as the actual
-attachments.
-
-This is the development package which contains the headers for the
-ktnef-trinity library.
-
-%files -n trinity-libktnef-devel
-%{tde_tdeincludedir}/ktnef
-%{tde_libdir}/libktnef.la
-%{tde_libdir}/libktnef.so
-
-%post -n trinity-libktnef-devel
-/sbin/ldconfig || :
-
-%postun -n trinity-libktnef-devel
-/sbin/ldconfig || :
-
-##########
-
-%package -n trinity-libmimelib
-Summary:	Trinity mime library
-Group:		Environment/Libraries
-
-%description -n trinity-libmimelib
-This library is used by several Trinity applications to handle mime types.
-
-This is the runtime package for programs that use the libmimelib-trinity library.
-
-%files -n trinity-libmimelib
-%{tde_libdir}/libmimelib.so.*
-
-%post -n trinity-libmimelib
-/sbin/ldconfig || :
-
-%postun -n trinity-libmimelib
-/sbin/ldconfig || :
-
-##########
-
-%package -n trinity-libmimelib-devel
-Summary:	Trinity mime library [development]
-Group:		Development/Libraries
-Requires:	trinity-libmimelib = %{version}-%{release}
-
-%description -n trinity-libmimelib-devel
-This library is used by several KDE applications to handle mime types.
-
-This is the development package which contains the headers for the
-libmimelib library.
-
-%files -n trinity-libmimelib-devel
-%{tde_tdeincludedir}/mimelib
-%{tde_libdir}/libmimelib.la
-%{tde_libdir}/libmimelib.so
-
-%post -n trinity-libmimelib-devel
-/sbin/ldconfig || :
-
-%postun -n trinity-libmimelib-devel
-/sbin/ldconfig || :
-
-##########
-
-%package -n trinity-kmobile
-Summary:	Synchronize and manage mobile phone with your PC.
-Group:		Applications/Communications
-
-%description -n trinity-kmobile
-KMobileTools is a nice TDE-based application that allows to synchronize 
-and manage mobile phones with your PC. It handles full SMS control, 
-dialing calls, phonebook, and phone status monitoring.
-
-%files -n trinity-kmobile
-%{tde_bindir}/kmobile
-%{tde_datadir}/icons/default.kde/32x32/devices/mobile_camera.png
-%{tde_datadir}/icons/default.kde/32x32/devices/mobile_musicplayer.png
-%{tde_datadir}/icons/default.kde/32x32/devices/mobile_organizer.png
-%{tde_datadir}/icons/default.kde/32x32/devices/mobile_phone.png
-%{tde_datadir}/icons/default.kde/32x32/devices/mobile_unknown.png
-%{tde_datadir}/icons/hicolor/*/apps/kmobile.png
-%{tde_datadir}/services/libkmobile_digicam.desktop
-%{tde_datadir}/services/libkmobile_gammu.desktop
-%{tde_datadir}/services/libkmobile_skeleton.desktop
-%{tde_datadir}/servicetypes/libkmobile.desktop
-%{tde_datadir}/apps/kmobile/kmobileui.rc
-%{tde_tdeappdir}/kmobile.desktop
-%{tde_tdelibdir}/libkmobile_skeleton.la
-%{tde_tdelibdir}/libkmobile_skeleton.so
-%{tde_libdir}/libkmobileclient.la
-%{tde_libdir}/libkmobileclient.so
-%{tde_libdir}/libkmobiledevice.la
-%{tde_libdir}/libkmobiledevice.so
-
-%post -n trinity-kmobile
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-kmobile
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-##########
-
-%if 0%{?suse_version} || 0%{?pclinuxos}
-%debug_package
-%endif
-
-##########
-
-%prep
-%setup -q -n kdepim-3.5.13.1
-%patch13 -p1 -b .incdir
-%patch14 -p1 -b .ldflags
-
-%build
-unset QTDIR || : ; . /etc/profile.d/qt3.sh
-export PATH="%{tde_bindir}:${PATH}"
-export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
-export CMAKE_INCLUDE_PATH="%{tde_includedir}:%{tde_includedir}/tqt"
-export LD_LIBRARY_PATH="%{tde_libdir}"
-
-# Specific path for RHEL4
-if [ -d /usr/X11R6 ]; then
-  export CXXFLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}"
-fi
-
-%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version}
-%__mkdir_p build
-cd build
-%endif
-
-%cmake \
-  -DCMAKE_INSTALL_PREFIX=%{tde_prefix} \
-  -DBIN_INSTALL_DIR=%{tde_bindir} \
-  -DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \
-  -DLIB_INSTALL_DIR=%{tde_libdir} \
-  -DSHARE_INSTALL_PREFIX=%{tde_datadir} \
-  -DCMAKE_SKIP_RPATH="OFF" \
-  -DWITH_ARTS=ON \
-  -DWITH_SASL=ON \
-  -DWITH_NEWDISTRLISTS=ON  \
-  %{?with_gnokii:-DWITH_GNOKII=ON} \
-  -DWITH_EXCHANGE=ON \
-  -DWITH_EGROUPWARE=ON \
-  -DWITH_KOLAB=ON \
-  -DWITH_SLOX=ON \
-  -DWITH_GROUPWISE=ON \
-  -DWITH_FEATUREPLAN=ON \
-  -DWITH_GROUPDAV=ON \
-  -DWITH_BIRTHDAYS=ON \
-  -DWITH_NEWEXCHANGE=ON \
-  -DWITH_SCALIX=ON \
-  -DWITH_CALDAV=ON \
-  -DWITH_CARDDAV=ON \
-  -DWITH_INDEXLIB=ON \
-  %{?with_kitchensync:-DBUILD_KITCHENSYNC=ON} \
-  -DBUILD_ALL=ON \
-  ..
-
-%__make %{?_smp_mflags}
-
-%install
-export PATH="%{_bindir}:${PATH}"
-%__rm -rf %{?buildroot}
-%__make install DESTDIR=%{?buildroot} -C build
-
-# Fix for Perl path in trinity-korganizer
-# Perl is '/usr/bin/perl' not '/bin/perl'
-%if 0%{?fedora} >= 17
-%__sed -i %{?buildroot}%{?tde_bindir}/ical2vcal -e "s|/bin/perl|/usr/bin/perl|"
-%endif
-
-%clean
-%__rm -rf %{?buildroot}
-
-
-%changelog
-* Sun Nov 11 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13.1-2
-- Fix korganizer packaging
-
-* Tue Sep 25 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13.1-1
-- Initial release for TDE 3.5.13.1
diff --git a/redhat/tdepim/kdepim-3.5.13.spec b/redhat/tdepim/kdepim-3.5.13.spec
deleted file mode 100644
index 8a9c6d6a6..000000000
--- a/redhat/tdepim/kdepim-3.5.13.spec
+++ /dev/null
@@ -1,2198 +0,0 @@
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?tde_prefix}" != "/usr"
-%define _variant .opt
-%endif
-
-# TDE 3.5.13 specific building variables
-BuildRequires: cmake >= 2.8
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-
-%define tde_tdeappdir %{tde_datadir}/applications/kde
-%define tde_tdedocdir %{tde_docdir}/kde
-%define tde_tdeincludedir %{tde_includedir}/kde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_docdir}
-
-# KDEPIM specific features
-%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion}
-%define with_gnokii 1
-%else
-%define with_gnokii 0
-%endif
-
-# TDEPIM optional features
-#BuildRequires: opensync-devel
-%define		with_kitchensync 0
-
-
-Name:		trinity-tdepim
-Version:	3.5.13
-Release:	8%{?dist}%{?_variant}
-License:	GPL
-Group:		Applications/Productivity
-
-Vendor:		Trinity Project
-Packager:	Francois Andriot <francois.andriot@free.fr>
-Summary:	Personal Information Management apps from the official Trinity release
-
-Prefix:		%{tde_prefix}
-
-Source0:	kdepim-%{version}.tar.gz
-
-# [kdepim] Fix compilation with GCC 4.7 [Bug #958]
-Patch1:		kdepim-3.5.13-fix_gcc47_compilation.patch
-# [tdepim] Reverse patch from GIT hash 33e649c9. [Bug #406] [Commit #2d5f15c8]
-Patch2:		kdepim-3.5.13-fix_check_mail.patch
-# [tdepim] Fix kmail composer crash [Bug #953]
-Patch3:		kdepim-3.5.13-fix_composer_crash.patch
-# [tdepim] Fix KMail counting of unread messages in the system tray icon [Commit #40c435e5]
-Patch4:		kdepim-3.5.13-fix_systray_count.patch
-# [tdepim] Fix knotes not appearing on the desktop when a session is restored. [Bug #987] [Commit #533f494f]
-Patch5:		kdepim-3.5.13-fix_knotes_after_restored.patch
-# [tdepim] Fix knotes to not close notes during saving session. [Bug #987] [Commit #c48253af]
-Patch6:		kdepim-3.5.13-fix_knotes_on_suspend.patch
-# [tdepim] Fix linear alphabet string errors [Bug 635] [Commit #80bc593e]
-Patch7:		kdepim-3.5.13-fix_linear_alphabet.patch
-# [tdepim] Fix infinite loop on IMAP4 authentication failure [Bug #1007]
-Patch8:		kdepim-3.5.13-fix_kio_imap4_infinite_loop.patch
-# [tdepim] Fix infinite loop on kmime_utils addquotes [Bug #1009] [Commit #9b43d6e1] [Commit #b0c92b30]
-Patch9:		kdepim-3.5.13-fix_kio_imap4_addquotes.patch
-Patch10:	kdepim-3.5.13-fix_segv.patch
-# [tdepim] Update kalarmd icon reference, which does not exist, to kalarm. [Commit #228ad1c6]
-Patch11:	kdepim-3.5.13-fix_kalarm_icon_reference.patch
-# [tdepim] Disable unneccesary fsync() in cached IMAP handler [Bug #467] [Commit #82d4a938]
-Patch12:	kdepim-3.5.13-disable_fsync_in_cached_imap.patch
-# [tdepim] Fix include directory location
-Patch13:	kdepim-3.5.13-fix_include_directory.patch
-# [tdepim] Missing LDFLAGS cause FTBFS on MGA2/MDV2011
-Patch14:	kdepim-3.5.13-missing_ldflags.patch
-
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-BuildRequires:	tqtinterface-devel
-BuildRequires:	trinity-arts-devel
-BuildRequires:	trinity-kdelibs-devel
-BuildRequires:	gpgme-devel
-BuildRequires:	libgpg-error-devel
-BuildRequires:	flex
-BuildRequires:	libical-devel
-BuildRequires:	boost-devel
-BuildRequires:	pcre-devel
-BuildRequires:	glib2-devel
-BuildRequires:	gcc-c++ make
-BuildRequires:	libidn-devel
-
-BuildRequires:	libcaldav-devel
-BuildRequires:	libcarddav-devel
-
-%if 0%{?with_gnokii}
-BuildRequires:	gnokii-devel
-%endif
-
-%if 0%{?fedora} >= 15
-BuildRequires:	flex-static
-%endif
-%if 0%{?rhel} > 0 && 0%{?rhel} <= 5
-BuildRequires:	trinity-libcurl-devel
-%else
-BuildRequires:	curl-devel
-%endif
-
-%if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires:	%{_lib}xcomposite%{?mgaversion:1}-devel
-BuildRequires:	%{_lib}sasl2-devel
-%else
-BuildRequires:	libXcomposite-devel
-BuildRequires:	cyrus-sasl-devel
-%endif
-
-Requires:	trinity-libtdepim = %{version}-%{release}
-Requires:	%{name}-kfile-plugins = %{version}-%{release}
-Requires:	%{name}-kio-plugins = %{version}-%{release}
-Requires:	%{name}-kresources = %{version}-%{release}
-Requires:	%{name}-wizards = %{version}-%{release}
-Requires:	trinity-akregator = %{version}-%{release}
-Requires:	trinity-kaddressbook = %{version}-%{release}
-Requires:	trinity-kalarm = %{version}-%{release}
-Requires:	trinity-kandy = %{version}-%{release}
-Requires:	trinity-karm = %{version}-%{release}
-Requires:	trinity-kleopatra = %{version}-%{release}
-Requires:	trinity-kmail = %{version}-%{release}
-Requires:	trinity-kmailcvt = %{version}-%{release}
-Requires:	trinity-kmobile = %{version}-%{release}
-Requires:	trinity-knode = %{version}-%{release}
-Requires:	trinity-knotes = %{version}-%{release}
-Requires:	trinity-kode = %{version}-%{release}
-Requires:	trinity-konsolekalendar = %{version}-%{release}
-Requires:	trinity-kontact = %{version}-%{release}
-Requires:	trinity-korganizer = %{version}-%{release}
-Requires:	trinity-korn = %{version}-%{release}
-Requires:	trinity-ktnef = %{version}-%{release}
-Requires:	trinity-libindex = %{version}-%{release}
-Requires:	trinity-libkcal = %{version}-%{release}
-Requires:	trinity-libkgantt = %{version}-%{release}
-Requires:	trinity-libkleopatra = %{version}-%{release}
-Requires:	trinity-libkmime = %{version}-%{release}
-Requires:	trinity-libkpimexchange = %{version}-%{release}
-Requires:	trinity-libkpimidentities = %{version}-%{release}
-Requires:	trinity-libksieve = %{version}-%{release}
-Requires:	trinity-libktnef = %{version}-%{release}
-Requires:	trinity-libmimelib = %{version}-%{release}
-
-Obsoletes:	trinity-kdepim < %{version}-%{release}
-Provides:	trinity-kdepim = %{version}-%{release}
-Obsoletes:	tdepim < %{version}-%{release}
-Provides:	tdepim = %{version}-%{release}
-
-%description
-This metapackage includes a collection of Personal Information Management
-(PIM) applications provided with the official release of Trinity.
-
-%files
-
-##########
-
-%package devel
-Summary:	Development files for %{name}
-Group:		Development/Libraries
-
-Obsoletes:	tdepim-cmake < %{version}-%{release}
-
-Obsoletes:	trinity-kdepim-devel < %{version}-%{release}
-Provides:	trinity-kdepim-devel = %{version}-%{release}
-Obsoletes:	tdepim-devel < %{version}-%{release}
-Provides:	tdepim-devel = %{version}-%{release}
-
-Requires:	%{name} = %{version}-%{release}
-Requires:	trinity-akregator-devel = %{version}-%{release}
-Requires:	trinity-libtdepim-devel = %{version}-%{release}
-Requires:	trinity-kaddressbook-devel = %{version}-%{release}
-Requires:	trinity-karm-devel = %{version}-%{release}
-Requires:	trinity-kmail-devel = %{version}-%{release}
-Requires:	trinity-knode-devel = %{version}-%{release}
-Requires:	trinity-knotes-devel = %{version}-%{release}
-Requires:	trinity-kode-devel = %{version}-%{release}
-Requires:	trinity-kontact-devel = %{version}-%{release}
-Requires:	trinity-korganizer-devel = %{version}-%{release}
-Requires:	trinity-libindex-devel = %{version}-%{release}
-Requires:	trinity-libkcal-devel = %{version}-%{release}
-Requires:	trinity-libkgantt-devel = %{version}-%{release}
-Requires:	trinity-libkleopatra-devel = %{version}-%{release}
-Requires:	trinity-libkmime-devel = %{version}-%{release}
-Requires:	trinity-libkpimexchange-devel = %{version}-%{release}
-Requires:	trinity-libkpimidentities-devel = %{version}-%{release}
-Requires:	trinity-libksieve-devel = %{version}-%{release}
-Requires:	trinity-libktnef-devel = %{version}-%{release}
-Requires:	trinity-libmimelib-devel = %{version}-%{release}
-Requires:	%{name}-kresources-devel = %{version}-%{release}
-
-%description devel
-This metapackage includes all development files for TDE PIM.
-It also contains the CMAKE macros.
-
-%files devel
-%{tde_datadir}/cmake/*
-
-##########
-
-%package -n trinity-akregator
-Summary:	RSS feed aggregator for TDE
-Group:		Applications/Internet
-Requires:	trinity-libtdepim = %{version}-%{release}
-Requires:	trinity-libkcal = %{version}-%{release}
-
-%description -n trinity-akregator
-aKregator is a fast, lightweight, and intuitive feed reader program
-for TDE.  It allows you to quickly browse through hundreds of
-thousands of internet feeds in a quick, efficient, and familiar way.
-
-%files -n trinity-akregator
-%{tde_bindir}/akregator
-%{tde_tdelibdir}/libakregatorpart.la
-%{tde_tdelibdir}/libakregatorpart.so
-%{tde_tdelibdir}/libakregator_mk4storage_plugin.la
-%{tde_tdelibdir}/libakregator_mk4storage_plugin.so
-%{tde_libdir}/libakregatorprivate.so.*
-%{tde_tdeappdir}/akregator.desktop
-%{tde_datadir}/apps/akregator
-%{tde_datadir}/config.kcfg/akregator.kcfg
-%{tde_datadir}/config.kcfg/mk4config.kcfg
-%{tde_datadir}/icons/crystalsvg/*/actions/rss_tag.png
-%{tde_datadir}/icons/crystalsvg/16x16/apps/akregator_empty.png
-%{tde_datadir}/icons/hicolor/*/apps/akregator.png
-%{tde_datadir}/icons/hicolor/scalable/apps/akregator.svgz
-%{tde_datadir}/services/akregator_mk4storage_plugin.desktop
-%{tde_datadir}/services/akregator_part.desktop
-%{tde_datadir}/services/feed.protocol
-%{tde_datadir}/services/kontact/akregatorplugin*.desktop
-%{tde_datadir}/servicetypes/akregator_plugin.desktop
-%{tde_tdedocdir}/HTML/en/akregator/
-
-%post -n trinity-akregator
-/sbin/ldconfig || :
-for f in crystalsvg hicolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-akregator
-/sbin/ldconfig || :
-for f in crystalsvg hicolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-##########
-
-%package -n trinity-akregator-devel
-Summary:	Development files for trinity-akregator
-Group:		Development/Libraries
-Requires:	trinity-akregator = %{version}-%{release}
-
-%description -n trinity-akregator-devel
-%{summary}
-
-%files -n trinity-akregator-devel
-%{tde_tdeincludedir}/akregator/
-%{tde_libdir}/libakregatorprivate.la
-%{tde_libdir}/libakregatorprivate.so
-
-%post -n trinity-akregator-devel
-/sbin/ldconfig || :
-
-%postun -n trinity-akregator-devel
-/sbin/ldconfig || :
-
-##########
-
-%package -n trinity-kaddressbook
-Summary:	TDE addressbook application
-Group:		Applications/Communications
-Requires:	trinity-kdebase-pim-ioslaves
-Requires:	%{name}-kresources = %{version}-%{release}
-
-%description -n trinity-kaddressbook
-KAddressBook is the main address book application for TDE; it enables you
-to manage your contacts efficiently and comfortably. It can load and save
-your contacts to many different locations, including the local file system,
-LDAP servers, and SQL databases.
-
-%files -n trinity-kaddressbook
-%{tde_bindir}/kabc2mutt
-%{tde_bindir}/kaddressbook
-%{tde_bindir}/kabcdistlistupdater
-%{tde_tdelibdir}/kcm_kabconfig.la
-%{tde_tdelibdir}/kcm_kabconfig.so
-%{tde_tdelibdir}/kcm_kabcustomfields.la
-%{tde_tdelibdir}/kcm_kabcustomfields.so
-%{tde_tdelibdir}/kcm_kabldapconfig.la
-%{tde_tdelibdir}/kcm_kabldapconfig.so
-%{tde_tdelibdir}/ldifvcardthumbnail.la
-%{tde_tdelibdir}/ldifvcardthumbnail.so
-%{tde_tdelibdir}/libkaddrbk_*.la
-%{tde_tdelibdir}/libkaddrbk_*.so
-%{tde_tdelibdir}/libkaddressbookpart.la
-%{tde_tdelibdir}/libkaddressbookpart.so
-%{tde_libdir}/libkabinterfaces.so.*
-%{tde_libdir}/libkaddressbook.so.*
-%{tde_tdeappdir}/kaddressbook.desktop
-%{tde_datadir}/apps/kaddressbook
-%{tde_datadir}/icons/hicolor/*/apps/kaddressbook.png
-%{tde_datadir}/services/kabconfig.desktop
-%{tde_datadir}/services/kabcustomfields.desktop
-%{tde_datadir}/services/kabldapconfig.desktop
-%{tde_datadir}/services/kaddressbook
-%{tde_datadir}/services/kontact/kaddressbookplugin.desktop
-%{tde_datadir}/services/kresources/kabc/imap.desktop
-%{tde_datadir}/services/ldifvcardthumbnail.desktop
-%{tde_datadir}/servicetypes/dcopaddressbook.desktop
-%{tde_datadir}/servicetypes/kaddressbook_contacteditorwidget.desktop
-%{tde_datadir}/servicetypes/kaddressbookimprotocol.desktop
-%{tde_datadir}/servicetypes/kaddressbook_extension.desktop
-%{tde_datadir}/servicetypes/kaddressbook_view.desktop
-%{tde_datadir}/servicetypes/kaddressbook_xxport.desktop
-%{tde_tdedocdir}/HTML/en/kaddressbook/
-%{tde_datadir}/autostart/kabcdistlistupdater.desktop
-%{tde_tdeincludedir}/kaddressbook
-%{tde_tdeincludedir}/kabc
-
-%post -n trinity-kaddressbook
-/sbin/ldconfig || :
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-kaddressbook
-/sbin/ldconfig || :
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-##########
-
-%package -n trinity-kaddressbook-devel
-Summary:	Development files for trinity-kaddressbook
-Group:		Development/Libraries
-Requires:	trinity-kaddressbook = %{version}-%{release}
-
-%description -n trinity-kaddressbook-devel
-%{summary}
-
-%files -n trinity-kaddressbook-devel
-%{tde_libdir}/libkabinterfaces.la
-%{tde_libdir}/libkabinterfaces.so
-%{tde_libdir}/libkaddressbook.la
-%{tde_libdir}/libkaddressbook.so
-
-%post -n trinity-kaddressbook-devel
-/sbin/ldconfig || :
-
-%postun -n trinity-kaddressbook-devel
-/sbin/ldconfig || :
-
-##########
-
-%package -n trinity-kalarm
-Summary:	Trinity alarm message, command and email scheduler
-Group:		Applications/Communications
-Requires:	trinity-libkpimidentities = %{version}-%{release}
-
-%description -n trinity-kalarm
-KAlarm provides a graphical interface to schedule personal timed events -
-pop-up alarm messages, command execution and sending emails. There is a
-range of options for configuring recurring events.
-
-A pop-up alarm can show either a simple text message, or the contents of a
-text or image file, It can optionally be spoken, or play a sound file. You
-can choose its appearance, and set reminders. Among KAlarm's other
-facilities, you can set up templates to allow KAlarm to be used as a 'tea
-timer'.
-
-As an alternative to using the graphical interface, alarms can be scheduled
-from the command line or via DCOP calls from other programs. KAlarm is
-TDE-based, but will also run on other desktops.
-
-%files -n trinity-kalarm
-%{tde_bindir}/kalarm
-%{tde_bindir}/kalarmd
-%{tde_tdeappdir}/kalarm.desktop
-%{tde_datadir}/applnk/.hidden/kalarmd.desktop
-%{tde_datadir}/applnk/Applications/kalarm.desktop
-%{tde_datadir}/apps/kalarm
-%{tde_datadir}/autostart/kalarm.tray.desktop
-%{tde_datadir}/autostart/kalarmd.autostart.desktop
-%{tde_datadir}/icons/crystalsvg/*/actions/kalarm.png
-%{tde_datadir}/icons/hicolor/*/apps/kalarm.png
-%{tde_tdedocdir}/HTML/en/kalarm/
-
-%post -n trinity-kalarm
-for f in crystalsvg hicolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-kalarm
-for f in crystalsvg hicolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-##########
-
-%package -n trinity-kandy
-Summary:	Trinity mobile phone utility
-Group:		Applications/Communications
-
-%description -n trinity-kandy
-At the moment Kandy is more or less a terminal program with some special
-features to store commands and their parameters, but is also has a simple GUI
-to access the phone book of a mobile phone and it is able to save this phone
-book to the TDE address book.
-
-Kandy is aimed at mobile phones with integrated (GSM) modems.
-
-%files -n trinity-kandy
-%{tde_bindir}/kandy
-%{tde_bindir}/kandy_client
-%{tde_tdeappdir}/kandy.desktop
-%{tde_datadir}/applnk/Utilities/kandy.desktop
-%{tde_datadir}/apps/kandy
-%{tde_datadir}/config.kcfg/kandy.kcfg
-%{tde_tdedocdir}/HTML/en/kandy/
-
-%post -n trinity-kandy
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-kandy
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-##########
-
-%package -n trinity-karm
-Summary:	Trinity time tracker tool
-Group:		Applications/Productivity
-
-%description -n trinity-karm
-KArm is a time tracker for busy people who need to keep track of the amount of
-time they spend on various tasks.
-
-%files -n trinity-karm
-%{tde_bindir}/karm
-%{tde_libdir}/libkarm.so.*
-%{tde_tdelibdir}/libkarmpart.la
-%{tde_tdelibdir}/libkarmpart.so
-%{tde_tdeappdir}/karm.desktop
-%{tde_datadir}/applnk/Utilities/karm.desktop
-%{tde_datadir}/apps/karm
-%{tde_datadir}/apps/karmpart
-%{tde_datadir}/icons/hicolor/*/apps/karm.png
-%{tde_datadir}/services/karm_part.desktop
-%{tde_datadir}/services/kontact/karmplugin.desktop
-%{tde_tdedocdir}/HTML/en/karm/
-
-%post -n trinity-karm
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
-done
-/sbin/ldconfig || :
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-karm
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
-done
-/sbin/ldconfig || :
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-##########
-
-%package -n trinity-karm-devel
-Summary:	Development files for karm
-Group:		Development/Libraries
-
-%description -n trinity-karm-devel
-%{summary}
-
-%files -n trinity-karm-devel
-%{tde_libdir}/libkarm.so
-%{tde_libdir}/libkarm.la
-
-%post -n trinity-karm-devel
-/sbin/ldconfig || :
-
-%postun -n trinity-karm-devel
-/sbin/ldconfig || :
-
-##########
-
-%package kfile-plugins
-Summary:	TDE File dialog plugins for palm and vcf files
-Group:		Environment/Libraries
-
-Obsoletes:	tdepim-kfile-plugins < %{version}-%{release}
-
-%description kfile-plugins
-File dialog plugins for palm and vcf files.
-
-%files kfile-plugins
-%{tde_tdelibdir}/kfile_ics.la
-%{tde_tdelibdir}/kfile_ics.so
-%{tde_tdelibdir}/kfile_vcf.la
-%{tde_tdelibdir}/kfile_vcf.so
-%{tde_datadir}/services/kfile_ics.desktop
-%{tde_datadir}/services/kfile_vcf.desktop
-
-##########
-
-%package kio-plugins
-Summary:	Trinity pim I/O Slaves
-Group:		Environment/Libraries
-
-Obsoletes:	tdepim-kio-plugins < %{version}-%{release}
-
-%description kio-plugins
-This package includes the pim kioslaves. This includes imap4, sieve,
-and mbox.
-
-%files kio-plugins
-%{tde_tdelibdir}/kio_groupwise.la
-%{tde_tdelibdir}/kio_groupwise.so
-%{tde_tdelibdir}/kio_imap4.la
-%{tde_tdelibdir}/kio_imap4.so
-%{tde_tdelibdir}/kio_mbox.la
-%{tde_tdelibdir}/kio_mbox.so
-%{tde_tdelibdir}/kio_scalix.la
-%{tde_tdelibdir}/kio_scalix.so
-%{tde_tdelibdir}/kio_sieve.la
-%{tde_tdelibdir}/kio_sieve.so
-%{tde_datadir}/services/groupwise.protocol
-%{tde_datadir}/services/groupwises.protocol
-%{tde_datadir}/services/imap4.protocol
-%{tde_datadir}/services/imaps.protocol
-%{tde_datadir}/services/mbox.protocol
-%{tde_datadir}/services/scalix.protocol
-%{tde_datadir}/services/scalixs.protocol
-%{tde_datadir}/services/sieve.protocol
-
-##########
-
-%package kresources
-Summary:	Trinity pim resource plugins
-Group:		Environment/Libraries
-#Requires:	trinity-kaddressbook = %{version}-%{release}
-#Requires:	trinity-korganizer = %{version}-%{release}
-#Requires:	trinity-knotes = %{version}-%{release}
-Requires:	libcaldav
-Requires:	libcarddav
-
-Obsoletes:	tdepim-kresources < %{version}-%{release}
-
-%description kresources
-This package includes several plugins needed to interface with groupware
-servers. It also includes plugins for features such as blogging and
-tracking feature plans.
-
-%files kresources
-%{tde_tdelibdir}/kcal_caldav.la
-%{tde_tdelibdir}/kcal_caldav.so
-%{tde_tdelibdir}/kcal_groupdav.la
-%{tde_tdelibdir}/kcal_groupdav.so
-%{tde_tdelibdir}/kcal_groupwise.la
-%{tde_tdelibdir}/kcal_groupwise.so
-%{tde_tdelibdir}/kcal_kolab.la
-%{tde_tdelibdir}/kcal_kolab.so
-%{tde_tdelibdir}/kcal_scalix.la
-%{tde_tdelibdir}/kcal_scalix.so
-%{tde_tdelibdir}/kcal_newexchange.la
-%{tde_tdelibdir}/kcal_newexchange.so
-%{tde_tdelibdir}/kcal_resourcefeatureplan.la
-%{tde_tdelibdir}/kcal_resourcefeatureplan.so
-%{tde_tdelibdir}/kcal_slox.la
-%{tde_tdelibdir}/kcal_slox.so
-%{tde_tdelibdir}/kcal_xmlrpc.la
-%{tde_tdelibdir}/kcal_xmlrpc.so
-%{tde_tdelibdir}/knotes_kolab.la
-%{tde_tdelibdir}/knotes_kolab.so
-%{tde_tdelibdir}/knotes_scalix.la
-%{tde_tdelibdir}/knotes_scalix.so
-%{tde_tdelibdir}/knotes_xmlrpc.la
-%{tde_tdelibdir}/knotes_xmlrpc.so
-%{tde_libdir}/libkabckolab.so.*
-%{tde_libdir}/libkabcscalix.so.*
-%{tde_libdir}/libkabc_groupdav.so.*
-%{tde_libdir}/libkabc_groupwise.so.*
-%{tde_libdir}/libkabc_newexchange.so.*
-%{tde_libdir}/libkabc_slox.so.*
-%{tde_libdir}/libkabc_xmlrpc.so.*
-%{tde_libdir}/libkcalkolab.so.*
-%{tde_libdir}/libkcalscalix.so.*
-%{tde_libdir}/libkcal_caldav.so.*
-%{tde_libdir}/libkabc_carddav.so.*
-%{tde_libdir}/libkcal_groupdav.so.*
-%{tde_libdir}/libkcal_groupwise.so.*
-%{tde_libdir}/libkcal_newexchange.so.*
-%{tde_libdir}/libkcal_resourcefeatureplan.so.*
-%{tde_libdir}/libkcal_slox.so.*
-%{tde_libdir}/libkcal_xmlrpc.so.*
-%{tde_libdir}/libkgroupwarebase.so.*
-%{tde_libdir}/libkgroupwaredav.so.*
-%{tde_libdir}/libknoteskolab.so.*
-%{tde_libdir}/libknotesscalix.so.*
-%{tde_libdir}/libknotes_xmlrpc.so.*
-%{tde_libdir}/libkslox.so.*
-%{tde_libdir}/libgwsoap.so.*
-%{tde_datadir}/services/kresources/kabc/kabc_groupdav.desktop
-%{tde_datadir}/services/kresources/kabc/kabc_groupwise.desktop
-%{tde_datadir}/services/kresources/kabc/kabc_newexchange.desktop
-%{tde_datadir}/services/kresources/kabc/kabc_opengroupware.desktop
-%{tde_datadir}/services/kresources/kabc/kabc_ox.desktop
-%{tde_datadir}/services/kresources/kabc/kabc_slox.desktop
-%{tde_datadir}/services/kresources/kabc/kabc_xmlrpc.desktop
-%{tde_datadir}/services/kresources/kabc/kolab.desktop
-%{tde_datadir}/services/kresources/kabc/scalix.desktop
-%{tde_datadir}/services/kresources/kcal/exchange.desktop
-%{tde_datadir}/services/kresources/kcal/kcal_caldav.desktop
-%{tde_datadir}/services/kresources/kabc/kabc_carddav.desktop
-%{tde_datadir}/services/kresources/kcal/kcal_groupdav.desktop
-%{tde_datadir}/services/kresources/kcal/kcal_groupwise.desktop
-%{tde_datadir}/services/kresources/kcal/kcal_newexchange.desktop
-%{tde_datadir}/services/kresources/kcal/kcal_opengroupware.desktop
-%{tde_datadir}/services/kresources/kcal/kcal_ox.desktop
-%{tde_datadir}/services/kresources/kcal/kcal_resourcefeatureplan.desktop
-%{tde_datadir}/services/kresources/kcal/kcal_slox.desktop
-%{tde_datadir}/services/kresources/kcal/kcal_xmlrpc.desktop
-%{tde_datadir}/services/kresources/kcal/kolab.desktop
-%{tde_datadir}/services/kresources/kcal/scalix.desktop
-%{tde_datadir}/services/kresources/knotes/knotes_xmlrpc.desktop
-%{tde_datadir}/services/kresources/knotes/kolabresource.desktop
-%{tde_datadir}/services/kresources/knotes/scalix.desktop
-
-%{tde_datadir}/apps/kconf_update/upgrade-resourcetype.pl
-%{tde_datadir}/apps/kconf_update/kolab-resource.upd
-
-%{tde_tdelibdir}/kabc_carddav.la
-%{tde_tdelibdir}/kabc_carddav.so
-%{tde_tdelibdir}/kabc_groupdav.la
-%{tde_tdelibdir}/kabc_groupdav.so
-%{tde_tdelibdir}/kabc_groupwise.la
-%{tde_tdelibdir}/kabc_groupwise.so
-%{tde_tdelibdir}/kabc_kolab.la
-%{tde_tdelibdir}/kabc_kolab.so
-%{tde_tdelibdir}/kabc_newexchange.la
-%{tde_tdelibdir}/kabc_newexchange.so
-%{tde_tdelibdir}/kabc_scalix.la
-%{tde_tdelibdir}/kabc_scalix.so
-%{tde_tdelibdir}/kabc_slox.la
-%{tde_tdelibdir}/kabc_slox.so
-%{tde_tdelibdir}/kabc_xmlrpc.la
-%{tde_tdelibdir}/kabc_xmlrpc.so
-
-%post kresources
-/sbin/ldconfig || :
-
-%postun kresources
-/sbin/ldconfig || :
-
-##########
-
-%package kresources-devel
-Summary:	Development files for kresources
-Group:		Development/Libraries
-Requires:	%{name}-kresources = %{version}-%{release}
-Requires:	libcaldav
-Requires:	libcarddav
-
-Obsoletes:	tdepim-kresources-devel < %{version}-%{release}
-
-%description kresources-devel
-%{summary}
-
-%files kresources-devel
-%{tde_libdir}/libkslox.la
-%{tde_libdir}/libkslox.so
-%{tde_libdir}/libkabc_groupdav.la
-%{tde_libdir}/libkabc_groupdav.so
-%{tde_libdir}/libkabc_groupwise.la
-%{tde_libdir}/libkabc_groupwise.so
-%{tde_libdir}/libgwsoap.la
-%{tde_libdir}/libgwsoap.so
-%{tde_libdir}/libkabc_carddav.la
-%{tde_libdir}/libkabc_carddav.so
-%{tde_libdir}/libkabc_newexchange.la
-%{tde_libdir}/libkabc_newexchange.so
-%{tde_libdir}/libkabc_slox.la
-%{tde_libdir}/libkabc_slox.so
-%{tde_libdir}/libkabc_xmlrpc.la
-%{tde_libdir}/libkabc_xmlrpc.so
-%{tde_libdir}/libkabckolab.la
-%{tde_libdir}/libkabckolab.so
-%{tde_libdir}/libkabcscalix.la
-%{tde_libdir}/libkabcscalix.so
-%{tde_libdir}/libkcal_caldav.la
-%{tde_libdir}/libkcal_caldav.so
-%{tde_libdir}/libkcal_groupdav.la
-%{tde_libdir}/libkcal_groupdav.so
-%{tde_libdir}/libkcal_groupwise.la
-%{tde_libdir}/libkcal_groupwise.so
-%{tde_libdir}/libkcal_newexchange.la
-%{tde_libdir}/libkcal_newexchange.so
-%{tde_libdir}/libkcal_resourcefeatureplan.la
-%{tde_libdir}/libkcal_resourcefeatureplan.so
-%{tde_libdir}/libkcal_slox.la
-%{tde_libdir}/libkcal_slox.so
-%{tde_libdir}/libkcal_xmlrpc.la
-%{tde_libdir}/libkcal_xmlrpc.so
-%{tde_libdir}/libkcalkolab.la
-%{tde_libdir}/libkcalkolab.so
-%{tde_libdir}/libkcalscalix.la
-%{tde_libdir}/libkcalscalix.so
-%{tde_libdir}/libkgroupwarebase.la
-%{tde_libdir}/libkgroupwarebase.so
-%{tde_libdir}/libkgroupwaredav.la
-%{tde_libdir}/libkgroupwaredav.so
-%{tde_libdir}/libknotes_xmlrpc.la
-%{tde_libdir}/libknotes_xmlrpc.so
-%{tde_libdir}/libknoteskolab.la
-%{tde_libdir}/libknoteskolab.so
-%{tde_libdir}/libknotesscalix.la
-%{tde_libdir}/libknotesscalix.so
-%{tde_tdeincludedir}/kpimprefs.h
-
-%post kresources-devel
-/sbin/ldconfig || :
-
-%postun kresources-devel
-/sbin/ldconfig || :
-
-##########
-
-%package wizards
-Summary:	Trinity server configuration wizards
-Group:		Applications/Communications
-
-Obsoletes:	tdepim-wizards < %{version}-%{release}
-
-%description wizards
-This package contains KDE-based wizards for configuring eGroupware,
-Kolab, and SUSE Linux Openexchange servers.
-
-%files wizards
-%{tde_bindir}/egroupwarewizard
-%{tde_bindir}/exchangewizard
-%{tde_bindir}/groupwarewizard
-%{tde_bindir}/groupwisewizard
-%{tde_bindir}/kolabwizard
-%{tde_bindir}/scalixadmin
-%{tde_bindir}/scalixwizard
-%{tde_bindir}/sloxwizard
-%{tde_tdelibdir}/libegroupwarewizard.la
-%{tde_tdelibdir}/libegroupwarewizard.so
-%{tde_tdelibdir}/libexchangewizard.la
-%{tde_tdelibdir}/libexchangewizard.so
-%{tde_tdelibdir}/libgroupwisewizard.la
-%{tde_tdelibdir}/libgroupwisewizard.so
-%{tde_tdelibdir}/libkolabwizard.la
-%{tde_tdelibdir}/libkolabwizard.so
-%{tde_tdelibdir}/libscalixwizard.la
-%{tde_tdelibdir}/libscalixwizard.so
-%{tde_tdelibdir}/libsloxwizard.la
-%{tde_tdelibdir}/libsloxwizard.so
-%{tde_tdeappdir}/groupwarewizard.desktop
-%{tde_datadir}/config.kcfg/egroupware.kcfg
-%{tde_datadir}/config.kcfg/groupwise.kcfg
-%{tde_datadir}/config.kcfg/kolab.kcfg
-%{tde_datadir}/config.kcfg/scalix.kcfg
-%{tde_datadir}/config.kcfg/slox.kcfg
-
-%post wizards
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun wizards
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-##########
-
-%if %{?with_kitchensync}
-%package -n trinity-kitchensync
-Summary:	Synchronization framework
-Group:		Applications/Communications
-#Suggests: konqueror-trinity
-#Conflicts: kdebluetooth-irmcsync-trinity (<< 0.99+1.0beta2-4.1), ksync-trinity
-
-%description -n trinity-kitchensync
-This package contains a synchronization framework, still under heavy
-development (?).  Kitchensync uses opensync.
-
-%files -n trinity-kitchensync
-%{tde_bindir}/kitchensync
-%{tde_tdelibdir}/libkitchensyncpart.la
-%{tde_tdelibdir}/libkitchensyncpart.so
-%{tde_datadir}/apps/kitchensync
-%{tde_libdir}/libkitchensync.so.*
-%{tde_libdir}/libqopensync.so.*
-%{tde_tdeappdir}/kitchensync.desktop
-%{tde_datadir}/icons/hicolor/*/apps/kitchensync.png
-
-%post -n trinity-kitchensync
-/sbin/ldconfig || :
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-kitchensync
-/sbin/ldconfig || :
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-%endif
-
-##########
-
-%package -n trinity-kleopatra
-Summary:	Trinity Certificate Manager
-Group:		Applications/Communications
-Requires:	gnupg2
-Requires:	dirmngr
-Requires:	pinentry
-
-%description -n trinity-kleopatra
-Kleopatra is the TDE tool for managing X.509 certificates in the gpgsm
-keybox and for retrieving certificates from LDAP servers.
-
-%files -n trinity-kleopatra
-%{tde_bindir}/kleopatra
-%{tde_bindir}/kwatchgnupg
-%{tde_tdelibdir}/kcm_kleopatra.la
-%{tde_tdelibdir}/kcm_kleopatra.so
-%{tde_tdeappdir}/kleopatra_import.desktop
-%{tde_datadir}/apps/kleopatra
-%{tde_datadir}/apps/kwatchgnupg
-%{tde_datadir}/services/kleopatra_config_*.desktop
-%{tde_tdedocdir}/HTML/en/kleopatra/
-%{tde_tdedocdir}/HTML/en/kwatchgnupg/
-
-%post -n trinity-kleopatra
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-kleopatra
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-##########
-
-%package -n trinity-kmail
-Summary:	Trinity Email client
-Group:		Applications/Communications
-Requires:	%{name}-kio-plugins = %{version}-%{release}
-Requires:	gnupg2
-Requires:	pinentry
-Requires:	procmail
-Requires:	trinity-kaddressbook = %{version}-%{release}
-Requires:	trinity-kleopatra = %{version}-%{release}
-Requires:	trinity-kdebase-pim-ioslaves
-
-Provides: imap-client, mail-reader
-
-%description -n trinity-kmail
-KMail is a fully-featured email client that fits nicely into the TDE
-desktop. It has features such as support for IMAP, POP3, multiple accounts,
-mail filtering and sorting, PGP/GnuPG privacy, and inline attachments.
-
-You need to install %{name}-kio-plugins if you want to use IMAP or
-mbox files, and/or trinity-tdebase-kio-plugins if you want to use POP3.
-
-%files -n trinity-kmail
-%{tde_datadir}/config/kmail.antispamrc
-%{tde_datadir}/config/kmail.antivirusrc
-%{tde_bindir}/kmail
-%{tde_bindir}/kmail_*.sh
-%{tde_tdelibdir}/kcm_kmail.la
-%{tde_tdelibdir}/kcm_kmail.so
-%{tde_tdelibdir}/libkmail_bodypartformatter_application_octetstream.la
-%{tde_tdelibdir}/libkmail_bodypartformatter_application_octetstream.so
-%{tde_tdelibdir}/libkmail_bodypartformatter_text_calendar.la
-%{tde_tdelibdir}/libkmail_bodypartformatter_text_calendar.so
-%{tde_tdelibdir}/libkmail_bodypartformatter_text_vcard.la
-%{tde_tdelibdir}/libkmail_bodypartformatter_text_vcard.so
-%{tde_tdelibdir}/libkmail_bodypartformatter_text_xdiff.la
-%{tde_tdelibdir}/libkmail_bodypartformatter_text_xdiff.so
-%{tde_tdelibdir}/libkmailpart.la
-%{tde_tdelibdir}/libkmailpart.so
-%{tde_tdeappdir}/KMail.desktop
-%{tde_tdeappdir}/kmail_view.desktop
-%{tde_datadir}/apps/kconf_update/kmail-3.1-update-new-mail-notification-settings.pl
-%{tde_datadir}/apps/kconf_update/kmail-3.1-use-UOID-for-identities.pl
-%{tde_datadir}/apps/kconf_update/kmail-3.1.4-dont-use-UOID-0-for-any-identity.pl
-%{tde_datadir}/apps/kconf_update/kmail-3.2-misc.sh
-%{tde_datadir}/apps/kconf_update/kmail-3.2-update-loop-on-goto-unread-settings.sh
-%{tde_datadir}/apps/kconf_update/kmail-3.3-aegypten.pl
-%{tde_datadir}/apps/kconf_update/kmail-3.3-misc.pl
-%{tde_datadir}/apps/kconf_update/kmail-3.3-move-identities.pl
-%{tde_datadir}/apps/kconf_update/kmail-3.3-split-sign-encr-keys.sh
-%{tde_datadir}/apps/kconf_update/kmail-3.3-use-ID-for-accounts.pl
-%{tde_datadir}/apps/kconf_update/kmail-3.3b1-misc.pl
-%{tde_datadir}/apps/kconf_update/kmail-3.4-misc.pl
-%{tde_datadir}/apps/kconf_update/kmail-3.4.1-update-status-filters.pl
-%{tde_datadir}/apps/kconf_update/kmail-3.5-trigger-flag-migration.pl
-%{tde_datadir}/apps/kconf_update/kmail-3.5-filter-icons.pl
-%{tde_datadir}/apps/kconf_update/kmail-pgpidentity.pl
-%{tde_datadir}/apps/kconf_update/kmail-upd-identities.pl
-%{tde_datadir}/apps/kconf_update/kmail.upd
-%{tde_datadir}/apps/kconf_update/upgrade-signature.pl
-%{tde_datadir}/apps/kconf_update/upgrade-transport.pl
-%{tde_datadir}/apps/kmail
-%{tde_datadir}/config.kcfg/custommimeheader.kcfg
-%{tde_datadir}/config.kcfg/kmail.kcfg
-%{tde_datadir}/config.kcfg/customtemplates_kfg.kcfg
-%{tde_datadir}/config.kcfg/replyphrases.kcfg
-%{tde_datadir}/config.kcfg/templatesconfiguration_kfg.kcfg
-%{tde_datadir}/icons/crystalsvg/*/apps/kmaillight.png
-%{tde_datadir}/icons/hicolor/*/apps/kmail.png
-%{tde_datadir}/icons/hicolor/scalable/apps/kmail.svgz
-%{tde_datadir}/services/kmail_config_*.desktop
-%{tde_datadir}/services/kontact/kmailplugin.desktop
-%{tde_datadir}/servicetypes/dcopimap.desktop
-%{tde_datadir}/servicetypes/dcopmail.desktop
-# 'libkmailprivate.so' is required at runtime, not devel !
-%{tde_libdir}/libkmailprivate.so
-%{tde_libdir}/libkmailprivate.la
-%{tde_tdedocdir}/HTML/en/kmail/
-
-%post -n trinity-kmail
-for f in crystalsvg hicolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
-done
-/sbin/ldconfig || :
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-kmail
-for f in crystalsvg hicolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
-done
-/sbin/ldconfig || :
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-##########
-
-%package -n trinity-kmail-devel
-Summary:	Development files for kmail
-Group:		Development/Libraries
-
-%description -n trinity-kmail-devel
-%{summary}
-
-%files -n trinity-kmail-devel
-%{tde_tdeincludedir}/kmail/
-%{tde_tdeincludedir}/kmail*.h
-
-%post -n trinity-kmail-devel
-/sbin/ldconfig || :
-
-%postun -n trinity-kmail-devel
-/sbin/ldconfig || :
-
-##########
- 
-%package -n trinity-kmailcvt
-Summary:	Trinity KMail mail folder converter
-Group:		Applications/Communications
-Requires:	trinity-kmail = %{version}-%{release}
-
-%description -n trinity-kmailcvt
-Converts mail folders to KMail format.  Formats supported for import
-include Outlook Express, Evolution, and plain mbox.
-
-%files -n trinity-kmailcvt
-%{tde_bindir}/kmailcvt
-%{tde_datadir}/applnk/Utilities/kmailcvt.desktop
-%{tde_datadir}/apps/kmailcvt
-%{tde_datadir}/icons/crystalsvg/*/apps/kmailcvt.png
-
-%post -n trinity-kmailcvt
-for f in crystalsvg ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
-done
-
-%postun -n trinity-kmailcvt
-for f in crystalsvg ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
-done
-
-##########
-
-%package -n trinity-knode
-Summary:	Trinity news reader
-Group:		Applications/Internet
-
-%description -n trinity-knode
-KNode is an easy-to-use, convenient newsreader. It is intended to be usable
-by inexperienced users, but also includes support for such features as
-MIME attachments, article scoring, and creating and verifying GnuPG
-signatures.
-
-%files -n trinity-knode
-%{tde_bindir}/knode
-%{tde_tdelibdir}/kcm_knode.la
-%{tde_tdelibdir}/kcm_knode.so
-%{tde_tdelibdir}/libknodepart.la
-%{tde_tdelibdir}/libknodepart.so
-%{tde_libdir}/libknodecommon.so.*
-%{tde_tdeappdir}/KNode.desktop
-%{tde_datadir}/apps/knode/
-%{tde_datadir}/icons/hicolor/*/apps/knode.png
-%{tde_datadir}/icons/hicolor/*/apps/knode2.png
-%{tde_datadir}/services/knewsservice.protocol
-%{tde_datadir}/services/knode_config_*.desktop
-%{tde_datadir}/services/kontact/knodeplugin.desktop
-%{tde_tdedocdir}/HTML/en/knode/
-
-%post -n trinity-knode
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
-done
-/sbin/ldconfig || :
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-knode
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
-done
-/sbin/ldconfig || :
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-##########
-
-%package -n trinity-knode-devel
-Summary:	Development files for trinity-knode
-Group:		Development/Libraries
-Requires:	trinity-knode = %{version}-%{release}
-
-%description -n trinity-knode-devel
-%{summary}
-
-%files -n trinity-knode-devel
-%{tde_libdir}/libknodecommon.la
-%{tde_libdir}/libknodecommon.so
-
-%post -n trinity-knode-devel
-/sbin/ldconfig || :
-
-%postun -n trinity-knode-devel
-/sbin/ldconfig || :
-
-##########
-
-%package -n trinity-knotes
-Summary:	Trinity sticky notes
-Group:		Applications/Utilities
-Requires:	trinity-tdepim-kresources = %{version}-%{release}
-
-%description -n trinity-knotes
-KNotes is a program that lets you write sticky notes. The notes are saved
-automatically when you exit the program, and they display when you open the
-program.  The program supports printing and mailing your notes.
-
-%files -n trinity-knotes
-%{tde_bindir}/knotes
-%{tde_tdelibdir}/knotes_local.la
-%{tde_tdelibdir}/knotes_local.so
-%{tde_libdir}/libknotes.so.*
-%{tde_tdeappdir}/knotes.desktop
-%{tde_datadir}/apps/knotes
-%{tde_datadir}/config.kcfg/knoteconfig.kcfg
-%{tde_datadir}/config.kcfg/knotesglobalconfig.kcfg
-%{tde_datadir}/icons/hicolor/*/apps/knotes.png
-%{tde_datadir}/services/kresources/knotes/imap.desktop
-%{tde_datadir}/services/kresources/knotes/local.desktop
-%{tde_datadir}/services/kresources/knotes_manager.desktop
-%{tde_datadir}/services/kontact/knotesplugin.desktop
-%{tde_tdedocdir}/HTML/en/knotes/
-
-%post -n trinity-knotes
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
-done
-/sbin/ldconfig || :
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-knotes
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
-done
-/sbin/ldconfig || :
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-##########
-
-%package -n trinity-knotes-devel
-Summary:	Development files for knots
-Group:		Development/Libraries
-Requires:	trinity-knotes = %{version}-%{release}
-Requires:	%{name}-kresources-devel = %{version}-%{release}
-
-%description -n trinity-knotes-devel
-%{summary}
-
-%files -n trinity-knotes-devel
-%{tde_libdir}/libknotes.so
-%{tde_libdir}/libknotes.la
-%{tde_tdeincludedir}/KNotesAppIface.h
-%{tde_tdeincludedir}/KNotesIface.h
-
-%post -n trinity-knotes-devel
-/sbin/ldconfig || :
-
-%postun -n trinity-knotes-devel
-/sbin/ldconfig || :
-
-##########
-
-%package -n trinity-kode
-Summary:	Helper library for programmatic generation of C++ code
-Group:		Development/Libraries
-
-%description -n trinity-kode
-This package includes a program kode for generation of C++ template files
-and kxml_compiler for generation of C++ classes representing XML data
-described by RelaxNG schemes.
-
-%files -n trinity-kode
-%{tde_bindir}/kode
-%{tde_bindir}/kxml_compiler
-%{tde_libdir}/libkode.so.*
-
-%post -n trinity-kode
-/sbin/ldconfig || :
-
-%postun -n trinity-kode
-/sbin/ldconfig || :
-
-##########
-
-%package -n trinity-kode-devel
-Summary:	Development files for trinity-kode
-Group:		Development/Libraries
-Requires:	trinity-kode = %{version}-%{release}
-
-%description -n trinity-kode-devel
-%{summary}
-
-%files -n trinity-kode-devel
-%{tde_libdir}/libkode.la
-%{tde_libdir}/libkode.so
-
-%post -n trinity-kode-devel
-/sbin/ldconfig || :
-
-%postun -n trinity-kode-devel
-/sbin/ldconfig || :
-
-##########
-
-%package -n trinity-konsolekalendar
-Summary:	Trinity konsole personal organizer
-Group:		Applications/Productivity
-
-%description -n trinity-konsolekalendar
-KonsoleKalendar is a command-line interface to TDE calendars.
-Konsolekalendar complements the TDE KOrganizer by providing a console
-frontend to manage your calendars.
-
-%files -n trinity-konsolekalendar
-%{tde_bindir}/konsolekalendar
-%{tde_tdeappdir}/konsolekalendar.desktop
-%{tde_datadir}/icons/crystalsvg/*/apps/konsolekalendar.png
-%{tde_tdedocdir}/HTML/en/konsolekalendar/
-
-%post -n trinity-konsolekalendar
-for f in crystalsvg ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-konsolekalendar
-for f in crystalsvg ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-##########
-
-%package -n trinity-kontact
-Summary:	Trinity pim application
-Group:		Applications/Communications
-Requires:	trinity-kmail = %{version}-%{release}
-Requires:	trinity-korganizer = %{version}-%{release}
-Requires:	trinity-kaddressbook = %{version}-%{release}
-Requires:	trinity-knode = %{version}-%{release}
-Requires:	trinity-knotes = %{version}-%{release}
-Requires:	trinity-akregator = %{version}-%{release}
-
-%description -n trinity-kontact
-Kontact is the integrated solution to your personal information management
-needs. It combines TDE applications like KMail, KOrganizer, and
-KAddressBook into a single interface to provide easy access to mail,
-scheduling, address book and other PIM functionality.
-
-%files -n trinity-kontact
-%{tde_bindir}/kontact
-%{tde_tdelibdir}/kcm_kmailsummary.la
-%{tde_tdelibdir}/kcm_kmailsummary.so
-%{tde_tdelibdir}/kcm_kontact.la
-%{tde_tdelibdir}/kcm_kontact.so
-%{tde_tdelibdir}/kcm_kontactknt.la
-%{tde_tdelibdir}/kcm_kontactknt.so
-%{tde_tdelibdir}/kcm_kontactsummary.la
-%{tde_tdelibdir}/kcm_kontactsummary.so
-%{tde_tdelibdir}/kcm_korgsummary.la
-%{tde_tdelibdir}/kcm_korgsummary.so
-%{tde_tdelibdir}/kcm_sdsummary.la
-%{tde_tdelibdir}/kcm_sdsummary.so
-%{tde_tdelibdir}/libkontact_*.la
-%{tde_tdelibdir}/libkontact_*.so
-%{tde_libdir}/libkontact.so.*
-%{tde_libdir}/libkpinterfaces.so.*
-%{tde_tdeappdir}/Kontact.desktop
-%{tde_tdeappdir}/kontactdcop.desktop
-%{tde_datadir}/apps/kontact
-%{tde_datadir}/apps/kontactsummary/kontactsummary_part.rc
-%{tde_datadir}/config.kcfg/kontact.kcfg
-%{tde_datadir}/icons/hicolor/*/apps/kontact.png
-%{tde_datadir}/icons/crystalsvg/*/actions/kontact_*.png
-%{tde_datadir}/services/kcmkmailsummary.desktop
-%{tde_datadir}/services/kcmkontactknt.desktop
-%{tde_datadir}/services/kcmkontactsummary.desktop
-%{tde_datadir}/services/kcmkorgsummary.desktop
-%{tde_datadir}/services/kcmsdsummary.desktop
-%{tde_datadir}/services/kontact/newstickerplugin.desktop
-%{tde_datadir}/services/kontact/specialdatesplugin.desktop
-%{tde_datadir}/services/kontact/summaryplugin.desktop
-%{tde_datadir}/services/kontact/weatherplugin.desktop
-%{tde_datadir}/services/kontactconfig.desktop
-%{tde_datadir}/servicetypes/kontactplugin.desktop
-%{tde_tdedocdir}/HTML/en/kontact/
-%{tde_tdedocdir}/HTML/en/kpilot/
-
-%post -n trinity-kontact
-for f in crystalsvg hicolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
-done
-/sbin/ldconfig || :
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-kontact
-for f in crystalsvg hicolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
-done
-/sbin/ldconfig || :
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-##########
-
-%package -n trinity-kontact-devel
-Summary:	Development files for kontact
-Group:		Development/Libraries
-Requires:	trinity-kontact = %{version}-%{release}
-
-%description -n trinity-kontact-devel
-%{summary}
-
-%files -n trinity-kontact-devel
-%{tde_libdir}/libkontact.la
-%{tde_libdir}/libkontact.so
-%{tde_libdir}/libkpinterfaces.la
-%{tde_libdir}/libkpinterfaces.so
-%{tde_tdeincludedir}/kontact/
-
-%post -n trinity-kontact-devel
-/sbin/ldconfig || :
-
-%postun -n trinity-kontact-devel
-/sbin/ldconfig || :
-
-##########
-
-%package -n trinity-korganizer
-Summary:	Trinity personal organizer
-Group:		Applications/Productivity
-Requires:	trinity-libkpimidentities = %{version}-%{release}
-Requires:	trinity-libkpimexchange = %{version}-%{release}
-Requires:	%{name}-kresources = %{version}-%{release}
-Requires:	perl
-
-%description -n trinity-korganizer
-This package contains KOrganizer, a calendar and scheduling program.
-
-KOrganizer aims to be a complete program for organizing appointments,
-contacts, projects, etc. KOrganizer natively supports information interchange
-with other calendar applications, through the industry standard vCalendar
-personal data interchange file format. This eases the move from other
-modern PIMs to KOrganizer.
-
-KOrganizer offers full synchronization with Palm Pilots, if kpilot is
-installed.
-
-%files -n trinity-korganizer
-%{tde_bindir}/ical2vcal
-%{tde_bindir}/korgac
-%{tde_bindir}/korganizer
-%{tde_tdelibdir}/kcm_korganizer.la
-%{tde_tdelibdir}/kcm_korganizer.so
-%{tde_tdelibdir}/libkorg_*.la
-%{tde_tdelibdir}/libkorg_*.so
-%{tde_tdelibdir}/libkorganizerpart.la
-%{tde_tdelibdir}/libkorganizerpart.so
-%{tde_libdir}/libkocorehelper.so.*
-%{tde_libdir}/libkorg_stdprinting.so.*
-%{tde_libdir}/libkorganizer.so.*
-%{tde_libdir}/libkorganizer_calendar.so.*
-%{tde_libdir}/libkorganizer_eventviewer.so.*
-%{tde_tdeappdir}/korganizer.desktop
-%{tde_datadir}/apps/kconf_update/korganizer.upd
-%{tde_datadir}/apps/korgac
-%{tde_datadir}/apps/korganizer
-%{tde_datadir}/autostart/korgac.desktop
-%{tde_datadir}/config.kcfg/korganizer.kcfg
-%{tde_datadir}/icons/hicolor/*/apps/korganizer.png
-%{tde_datadir}/services/kontact/korganizerplugin.desktop
-%{tde_datadir}/services/kontact/journalplugin.desktop
-%{tde_datadir}/services/kontact/todoplugin.desktop
-%{tde_datadir}/services/korganizer_*.desktop
-%{tde_datadir}/services/korganizer
-%{tde_datadir}/services/webcal.protocol
-%{tde_datadir}/servicetypes/calendardecoration.desktop
-%{tde_datadir}/servicetypes/calendarplugin.desktop
-%{tde_datadir}/servicetypes/dcopcalendar.desktop
-%{tde_datadir}/servicetypes/korganizerpart.desktop
-%{tde_datadir}/servicetypes/korgprintplugin.desktop
-%{tde_tdeincludedir}/korganizer
-%{tde_tdeincludedir}/korganizer
-%{tde_tdeincludedir}/calendar
-%{tde_tdedocdir}/HTML/en/korganizer/
-
-%post -n trinity-korganizer
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
-done
-/sbin/ldconfig || :
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-korganizer
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
-done
-/sbin/ldconfig || :
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-##########
-
-%package -n trinity-korganizer-devel
-Summary:	Development files for korganizer
-Group:		Development/Libraries
-Requires:	trinity-korganizer = %{version}-%{release}
-
-%description -n trinity-korganizer-devel
-%{summary}
-
-%files -n trinity-korganizer-devel
-%{tde_libdir}/libkocorehelper.la
-%{tde_libdir}/libkocorehelper.so
-%{tde_libdir}/libkorg_stdprinting.la
-%{tde_libdir}/libkorg_stdprinting.so
-%{tde_libdir}/libkorganizer.la
-%{tde_libdir}/libkorganizer.so
-%{tde_libdir}/libkorganizer_calendar.la
-%{tde_libdir}/libkorganizer_calendar.so
-%{tde_libdir}/libkorganizer_eventviewer.la
-%{tde_libdir}/libkorganizer_eventviewer.so
-
-%post -n trinity-korganizer-devel
-/sbin/ldconfig || :
-
-%postun -n trinity-korganizer-devel
-/sbin/ldconfig || :
-
-##########
-
-%package -n trinity-korn
-Summary:	Trinity mail checker
-Group:		Applications/Communications
-Requires:	%{name}-kio-plugins = %{version}-%{release}
-#Requires:	tdebase-kio-plugins-trinity
-
-%description -n trinity-korn
-Korn is a TDE mail checker that can display a small summary in the Kicker
-tray.  It supports checking mbox, pop3, imap4, and nntp sources.
-
-Once mail is received you can have Korn run a third party program or change
-the color/icon of the Kicker display.  In addition to this you can have
-Korn run a program once you click on the docked icon in Kicker.
-
-%files -n trinity-korn
-%{tde_bindir}/korn
-%{tde_libdir}/kconf_update_bin/korn-3-4-config_change
-%{tde_tdeappdir}/KOrn.desktop
-%{tde_datadir}/apps/kconf_update/korn-3-4-config_change.upd
-%{tde_datadir}/apps/kconf_update/korn-3-5-metadata-update.pl
-%{tde_datadir}/apps/kconf_update/korn-3-5-ssl-update.pl
-%{tde_datadir}/apps/kconf_update/korn-3-5-update.upd
-%{tde_datadir}/icons/hicolor/*/apps/korn.png
-%{tde_tdedocdir}/HTML/en/korn/
-
-%post -n trinity-korn
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
-done
-/sbin/ldconfig || :
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-korn
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
-done
-/sbin/ldconfig || :
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-##########
-
-%package -n trinity-ktnef
-Summary:	Trinity TNEF viewer
-Group:		Applications/Communications
-
-%description -n trinity-ktnef
-The TNEF File Viewer allows you to handle mail attachments using the TNEF
-format. These attachments are usually found in mails coming from Microsoft
-mail servers and embed the mail properties as well as the actual attachments.
-
-%files -n trinity-ktnef
-%{tde_bindir}/ktnef
-%{tde_tdeappdir}/ktnef.desktop
-%{tde_datadir}/apps/ktnef
-%{tde_datadir}/icons/hicolor/*/apps/ktnef.png
-%{tde_datadir}/icons/locolor/*/apps/ktnef.png
-%{tde_datadir}/mimelnk/application/ms-tnef.desktop
-%{tde_tdedocdir}/HTML/en/ktnef/
-
-%post -n trinity-ktnef
-for f in hicolor locolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-ktnef
-for f in hicolor locolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-##########
-
-%package -n trinity-libindex
-Summary:	Trinity indexing library
-Group:		Environment/Libraries
-
-%description -n trinity-libindex
-This library provides text indexing and is currently used by KMail
-to implement fast searches in mail bodies.
-
-This is the runtime package for programs that use the libindex library.
-
-%files -n trinity-libindex
-%{tde_libdir}/libindex.so.*
-
-%post -n trinity-libindex
-/sbin/ldconfig || :
-
-%postun -n trinity-libindex
-/sbin/ldconfig || :
-
-##########
-
-%package -n trinity-libindex-devel
-Summary:	Trinity indexing library [development]
-Group:		Development/Libraries
-Requires:	trinity-libindex = %{version}-%{release}
-
-%description -n trinity-libindex-devel
-This library provides text indexing and is currently used by KMail
-to implement searching through mail text.
-
-This is the development package which contains the headers for the libindex-trinity
-library.
-
-%files -n trinity-libindex-devel
-%{tde_bindir}/indexlib-config
-%{tde_tdeincludedir}/index
-%{tde_libdir}/libindex.la
-%{tde_libdir}/libindex.so
-
-%post -n trinity-libindex-devel
-/sbin/ldconfig || :
-
-%postun -n trinity-libindex-devel
-/sbin/ldconfig || :
-
-##########
-
-%package -n trinity-libkcal
-Summary:	Trinity calendaring library
-Group:		Environment/Libraries
-#Requires:	%{name}-kresources = %{version}-%{release}
-
-%description -n trinity-libkcal
-This library provides a C++ API for handling the vCalendar and iCalendar
-formats.
-
-This is the runtime package for programs that use the libkcal-trinity library.
-
-%files -n trinity-libkcal
-%{tde_tdelibdir}/kcal_kabc.la
-%{tde_tdelibdir}/kcal_kabc.so
-%{tde_tdelibdir}/kcal_localdir.la
-%{tde_tdelibdir}/kcal_localdir.so
-%{tde_tdelibdir}/kcal_local.la
-%{tde_tdelibdir}/kcal_local.so
-%{tde_tdelibdir}/kcal_remote.la
-%{tde_tdelibdir}/kcal_remote.so
-%{tde_libdir}/libkcal.so.*
-%{tde_libdir}/libkcal_resourceremote.so.*
-%{tde_libdir}/libkholidays.so.*
-%{tde_datadir}/apps/libkholidays
-%{tde_datadir}/services/kresources/kcal/imap.desktop
-%{tde_datadir}/services/kresources/kcal/kabc.desktop
-%{tde_datadir}/services/kresources/kcal/local.desktop
-%{tde_datadir}/services/kresources/kcal/localdir.desktop
-%{tde_datadir}/services/kresources/kcal/remote.desktop
-%{tde_datadir}/services/kresources/kcal_manager.desktop
-
-%post -n trinity-libkcal
-/sbin/ldconfig || :
-
-%postun -n trinity-libkcal
-/sbin/ldconfig || :
-
-##########
-
-%package -n trinity-libkcal-devel
-Summary:	Trinity calendaring library [development]
-Group:		Development/Libraries
-Requires:	trinity-libkcal = %{version}-%{release}
-Requires:	trinity-libtdepim-devel = %{version}-%{release}
-Requires:	trinity-libktnef-devel = %{version}-%{release}
-
-%description -n trinity-libkcal-devel
-This library provides a C++ API for handling the vCalendar and iCalendar
-formats.
-
-This is the development package which contains the headers for the libkcal-trinity
-library.
-
-%files -n trinity-libkcal-devel
-%{tde_tdeincludedir}/libemailfunctions/idmapper.h
-%{tde_tdeincludedir}/libkcal
-%{tde_libdir}/libkcal.la
-%{tde_libdir}/libkcal.so
-%{tde_libdir}/libkcal_resourceremote.la
-%{tde_libdir}/libkcal_resourceremote.so
-%{tde_libdir}/libkholidays.la
-%{tde_libdir}/libkholidays.so
-
-%post -n trinity-libkcal-devel
-/sbin/ldconfig || :
-
-%postun -n trinity-libkcal-devel
-/sbin/ldconfig || :
-
-##########
-
-%package -n trinity-libtdepim
-Summary:	Trinity PIM library
-Group:		Environment/Libraries
-Requires:	trinity-libkcal = %{version}-%{release}
-
-Obsoletes:	libtdepim < %{version}-%{release}
-Provides:	libtdepim = %{version}-%{release}
-
-%description -n trinity-libtdepim
-This is the runtime package for programs that use the libtdepim-trinity library.
-
-%files -n trinity-libtdepim
-%{tde_tdelibdir}/plugins/designer/[kt]depimwidgets.la
-%{tde_tdelibdir}/plugins/designer/[kt]depimwidgets.so
-%{tde_tdelibdir}/plugins/designer/kpartsdesignerplugin.la
-%{tde_tdelibdir}/plugins/designer/kpartsdesignerplugin.so
-%{tde_libdir}/lib[kt]depim.so.*
-%{tde_datadir}/apps/[kt]depimwidgets
-%{tde_datadir}/apps/lib[kt]depim
-%{tde_datadir}/apps/[kt]depim
-%{tde_datadir}/config.kcfg/pimemoticons.kcfg
-%{tde_datadir}/icons/crystalsvg/22x22/actions/button_fewer.png
-%{tde_datadir}/icons/crystalsvg/22x22/actions/button_more.png
-
-%post -n trinity-libtdepim
-for f in crystalsvg ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
-done
-/sbin/ldconfig || :
-
-%postun -n trinity-libtdepim
-for f in crystalsvg ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
-done
-/sbin/ldconfig || :
-
-##########
-
-%package -n trinity-libtdepim-devel
-Summary:	Trinity PIM library [development]
-Group:		Development/Libraries
-Requires:	trinity-libtdepim = %{version}-%{release}
-Requires:	trinity-kdelibs-devel
-
-Obsoletes:	libtdepim-devel < %{version}-%{release}
-Provides:	libtdepim-devel = %{version}-%{release}
-
-%description -n trinity-libtdepim-devel
-This is the development package which contains the headers for the libtdepim-trinity
-library.
-
-%files -n trinity-libtdepim-devel
-%{tde_tdeincludedir}/[kt]depimmacros.h
-%{tde_libdir}/lib[kt]depim.la
-%{tde_libdir}/lib[kt]depim.so
-
-%post -n trinity-libtdepim-devel
-/sbin/ldconfig || :
-
-%postun -n trinity-libtdepim-devel
-/sbin/ldconfig || :
-
-##########
-
-%package -n trinity-libkgantt
-Summary:	Trinity gantt charting library
-Group:		Environment/Libraries
-
-%description -n trinity-libkgantt
-This is the runtime package for programs that use the libkgantt-trinity library.
-
-%files -n trinity-libkgantt
-%{tde_libdir}/libkgantt.so.*
-%{tde_datadir}/apps/kgantt
-
-%post -n trinity-libkgantt
-/sbin/ldconfig || :
-
-%postun -n trinity-libkgantt
-/sbin/ldconfig || :
-
-##########
-
-%package -n trinity-libkgantt-devel
-Summary:	Trinity gantt charting library [development]
-Group:		Development/Libraries
-Requires:	trinity-libkgantt = %{version}-%{release}
-Requires:	trinity-libtdepim-devel = %{version}-%{release}
-
-%description -n trinity-libkgantt-devel
-This is the development package which contains the headers for the libkgantt-trinity
-library.
-
-%files -n trinity-libkgantt-devel
-%{tde_tdeincludedir}/kgantt
-%{tde_libdir}/libkgantt.la
-%{tde_libdir}/libkgantt.so
-
-%post -n trinity-libkgantt-devel
-/sbin/ldconfig || :
-
-%postun -n trinity-libkgantt-devel
-/sbin/ldconfig || :
-
-##########
-
-%package -n trinity-libkleopatra
-Summary:	TDE GnuPG interface libraries
-Group:		Environment/Libraries
-Requires:	gnupg
-
-%description -n trinity-libkleopatra
-This library is used by several TDE applications to interface to the
-GnuPG program.
-
-This is the runtime package for programs that use the libkleopatra-trinity library.
-
-%files -n trinity-libkleopatra
-%{tde_datadir}/config/libkleopatrarc
-%{tde_libdir}/libgpgme++.so.*
-%{tde_libdir}/libkleopatra.so.*
-%{tde_libdir}/libkpgp.so.*
-%{tde_libdir}/libqgpgme.so.*
-%{tde_datadir}/apps/kconf_update/kpgp-3.1-upgrade-address-data.pl
-%{tde_datadir}/apps/kconf_update/kpgp.upd
-%{tde_datadir}/apps/libkleopatra/
-%{tde_datadir}/icons/crystalsvg/*/apps/gpg.png
-%{tde_datadir}/icons/crystalsvg/*/apps/gpgsm.png
-
-%post -n trinity-libkleopatra
-for f in crystalsvg ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
-done
-/sbin/ldconfig || :
-
-%postun -n trinity-libkleopatra
-for f in crystalsvg ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
-done
-/sbin/ldconfig || :
-
-##########
-
-%package -n trinity-libkleopatra-devel
-Summary:	Trinity GnuPG interface libraries [development]
-Group:		Development/Libraries
-Requires:	trinity-libkleopatra = %{version}-%{release}
-Requires:	trinity-libtdepim-devel = %{version}-%{release}
-
-%description -n trinity-libkleopatra-devel
-This library is used by several KDE applications to interface to the
-GnuPG program.
-
-This is the development package which contains the headers for the
-libkleopatra-trinity library.
-
-%files -n trinity-libkleopatra-devel
-%{tde_tdeincludedir}/gpgme++
-%{tde_tdeincludedir}/kleo
-%{tde_tdeincludedir}/qgpgme
-%{tde_libdir}/libgpgme++.la
-%{tde_libdir}/libgpgme++.so
-%{tde_libdir}/libkleopatra.la
-%{tde_libdir}/libkleopatra.so
-%{tde_libdir}/libkpgp.la
-%{tde_libdir}/libkpgp.so
-%{tde_libdir}/libqgpgme.la
-%{tde_libdir}/libqgpgme.so
-
-%post -n trinity-libkleopatra-devel
-/sbin/ldconfig || :
-
-%postun -n trinity-libkleopatra-devel
-/sbin/ldconfig || :
-
-##########
-
-%package -n trinity-libkmime
-Summary:	Trinity MIME interface library
-Group:		Environment/Libraries
-#Conflicts:	trinity-libmimelib
-
-%description -n trinity-libkmime
-This library provides a C++ interface to MIME messages, parsing them into
-an object tree.
-
-%files -n trinity-libkmime
-%{tde_libdir}/libkmime.so.*
-
-%post -n trinity-libkmime
-/sbin/ldconfig || :
-
-%postun -n trinity-libkmime
-/sbin/ldconfig || :
-
-##########
-
-%package -n trinity-libkmime-devel
-Summary:	Development files for libkmime
-Group:		Development/Libraries
-Requires:	trinity-libkmime = %{version}-%{release}
-
-%description -n trinity-libkmime-devel
-%{summary}
-
-%files -n trinity-libkmime-devel
-%{tde_libdir}/libkmime.la
-%{tde_libdir}/libkmime.so
-
-%post -n trinity-libkmime-devel
-/sbin/ldconfig || :
-
-%postun -n trinity-libkmime-devel
-/sbin/ldconfig || :
-
-##########
-
-%package -n trinity-libkpimexchange
-Summary:	Trinity PIM Exchange library
-Group:		Environment/Libraries
-
-%description -n trinity-libkpimexchange
-This is the runtime package for programs that use the libkpimexchange-trinity
-library. 
-
-%files -n trinity-libkpimexchange
-%{tde_tdelibdir}/resourcecalendarexchange.la
-%{tde_tdelibdir}/resourcecalendarexchange.so
-%{tde_libdir}/libkpimexchange.so.*
-
-%post -n trinity-libkpimexchange
-/sbin/ldconfig || :
-
-%postun -n trinity-libkpimexchange
-/sbin/ldconfig || :
-
-##########
-
-%package -n trinity-libkpimexchange-devel
-Summary:	Trinity PIM Exchange library [development]
-Group:		Development/Libraries
-Requires:	trinity-libkpimexchange = %{version}-%{release}
-Requires:	trinity-libkcal-devel = %{version}-%{release}
-Requires:	trinity-libtdepim-devel = %{version}-%{release}
-
-%description -n trinity-libkpimexchange-devel
-This is the development package which contains the headers for the
-libkpimexchange-trinity library.
-
-%files -n trinity-libkpimexchange-devel
-%{tde_tdeincludedir}/[kt]depim/exchangeaccount.h
-%{tde_tdeincludedir}/[kt]depim/exchangeclient.h
-%{tde_libdir}/libkpimexchange.la
-%{tde_libdir}/libkpimexchange.so
-
-%post -n trinity-libkpimexchange-devel
-/sbin/ldconfig || :
-
-%postun -n trinity-libkpimexchange-devel
-/sbin/ldconfig || :
-
-##########
-
-%package -n trinity-libkpimidentities
-Summary:	Trinity PIM user identity information library
-Group:		Environment/Libraries
-
-%description -n trinity-libkpimidentities
-This library provides information to TDE programs about user identity,
-such as email address, organization, etc.
-
-This is the runtime package for programs that use the libkpimidentities-trinity
-library.
-
-%files -n trinity-libkpimidentities
-%{tde_libdir}/libkpimidentities.so.*
-
-%post -n trinity-libkpimidentities
-/sbin/ldconfig || :
-
-%postun -n trinity-libkpimidentities
-/sbin/ldconfig || :
-
-##########
-
-%package -n trinity-libkpimidentities-devel
-Summary:	Development files for libkpimidentities
-Group:		Development/Libraries
-Requires:	trinity-libkpimidentities = %{version}-%{release}
-
-%description -n trinity-libkpimidentities-devel
-%{summary}
-
-%files -n trinity-libkpimidentities-devel
-%{tde_libdir}/libkpimidentities.la
-%{tde_libdir}/libkpimidentities.so
-
-%post -n trinity-libkpimidentities-devel
-/sbin/ldconfig || :
-
-%postun -n trinity-libkpimidentities-devel
-/sbin/ldconfig || :
-
-##########
-
-%package -n trinity-libksieve
-Summary:	Trinity mail/news message filtering library
-Group:		Environment/Libraries
-
-%description -n trinity-libksieve
-This is the runtime package for programs that use the libksieve-trinity library.
-
-%files -n trinity-libksieve
-%{tde_libdir}/libksieve.so.*
-
-%post -n trinity-libksieve
-/sbin/ldconfig || :
-
-%postun -n trinity-libksieve
-/sbin/ldconfig || :
-
-##########
-
-%package -n trinity-libksieve-devel
-Summary:	Trinity mail/news message filtering library [development]
-Group:		Development/Libraries
-Requires:	trinity-libksieve = %{version}-%{release}
-Requires:	trinity-libtdepim-devel = %{version}-%{release}
-
-%description -n trinity-libksieve-devel
-This is the development package which contains the headers for the libksieve-trinity
-library.
-
-%files -n trinity-libksieve-devel
-%{tde_tdeincludedir}/ksieve
-%{tde_libdir}/libksieve.la
-%{tde_libdir}/libksieve.so
-
-%post -n trinity-libksieve-devel
-/sbin/ldconfig || :
-
-%postun -n trinity-libksieve-devel
-/sbin/ldconfig || :
-
-##########
-
-%package -n trinity-libktnef
-Summary:	Library for handling KTNEF email attachments
-Group:		Environment/Libraries
-
-%description -n trinity-libktnef
-This library handles mail attachments using the TNEF format. These
-attachments are usually found in mails coming from Microsoft mail
-servers and embed the mail properties as well as the actual
-attachments.
-.
-This is the runtime library for packages using the ktnef-trinity library.
-
-%files -n trinity-libktnef
-%{tde_libdir}/libktnef.so.*
-
-%post -n trinity-libktnef
-/sbin/ldconfig || :
-
-%postun -n trinity-libktnef
-/sbin/ldconfig || :
-
-##########
-
-%package -n trinity-libktnef-devel
-Summary:	KTNEF handler library [development]
-Group:		Development/Libraries
-Requires:	trinity-libktnef = %{version}-%{release}
-Requires:	trinity-libtdepim-devel = %{version}-%{release}
-
-%description -n trinity-libktnef-devel
-This library handles mail attachments using the TNEF format. These
-attachments are usually found in mails coming from Microsoft mail
-servers and embed the mail properties as well as the actual
-attachments.
-
-This is the development package which contains the headers for the
-ktnef-trinity library.
-
-%files -n trinity-libktnef-devel
-%{tde_tdeincludedir}/ktnef
-%{tde_libdir}/libktnef.la
-%{tde_libdir}/libktnef.so
-
-%post -n trinity-libktnef-devel
-/sbin/ldconfig || :
-
-%postun -n trinity-libktnef-devel
-/sbin/ldconfig || :
-
-##########
-
-%package -n trinity-libmimelib
-Summary:	Trinity mime library
-Group:		Environment/Libraries
-
-%description -n trinity-libmimelib
-This library is used by several Trinity applications to handle mime types.
-
-This is the runtime package for programs that use the libmimelib-trinity library.
-
-%files -n trinity-libmimelib
-%{tde_libdir}/libmimelib.so.*
-
-%post -n trinity-libmimelib
-/sbin/ldconfig || :
-
-%postun -n trinity-libmimelib
-/sbin/ldconfig || :
-
-##########
-
-%package -n trinity-libmimelib-devel
-Summary:	Trinity mime library [development]
-Group:		Development/Libraries
-Requires:	trinity-libmimelib = %{version}-%{release}
-
-%description -n trinity-libmimelib-devel
-This library is used by several KDE applications to handle mime types.
-
-This is the development package which contains the headers for the
-libmimelib library.
-
-%files -n trinity-libmimelib-devel
-%{tde_tdeincludedir}/mimelib
-%{tde_libdir}/libmimelib.la
-%{tde_libdir}/libmimelib.so
-
-%post -n trinity-libmimelib-devel
-/sbin/ldconfig || :
-
-%postun -n trinity-libmimelib-devel
-/sbin/ldconfig || :
-
-##########
-
-%package -n trinity-kmobile
-Summary:	Synchronize and manage mobile phone with your PC.
-Group:		Applications/Communications
-
-%description -n trinity-kmobile
-KMobileTools is a nice TDE-based application that allows to synchronize 
-and manage mobile phones with your PC. It handles full SMS control, 
-dialing calls, phonebook, and phone status monitoring.
-
-%files -n trinity-kmobile
-%{tde_bindir}/kmobile
-%{tde_datadir}/icons/default.kde/32x32/devices/mobile_camera.png
-%{tde_datadir}/icons/default.kde/32x32/devices/mobile_musicplayer.png
-%{tde_datadir}/icons/default.kde/32x32/devices/mobile_organizer.png
-%{tde_datadir}/icons/default.kde/32x32/devices/mobile_phone.png
-%{tde_datadir}/icons/default.kde/32x32/devices/mobile_unknown.png
-%{tde_datadir}/icons/hicolor/*/apps/kmobile.png
-%{tde_datadir}/services/libkmobile_digicam.desktop
-%{tde_datadir}/services/libkmobile_gammu.desktop
-%{tde_datadir}/services/libkmobile_skeleton.desktop
-%{tde_datadir}/servicetypes/libkmobile.desktop
-%{tde_datadir}/apps/kmobile/kmobileui.rc
-%{tde_tdeappdir}/kmobile.desktop
-%{tde_tdelibdir}/libkmobile_skeleton.la
-%{tde_tdelibdir}/libkmobile_skeleton.so
-%{tde_libdir}/libkmobileclient.la
-%{tde_libdir}/libkmobileclient.so
-%{tde_libdir}/libkmobiledevice.la
-%{tde_libdir}/libkmobiledevice.so
-
-%post -n trinity-kmobile
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-kmobile
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-##########
-
-%prep
-%setup -q -n kdepim
-%patch1 -p1 -b .gcc47
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1
-%patch7 -p1
-%patch8 -p1
-#patch9 -p1 -b .addquotes
-%patch10 -p1 -b .segv
-%patch11 -p1
-%patch12 -p1
-%patch13 -p1 -b .incdir
-%patch14 -p1 -b .ldflags
-
-%build
-unset QTDIR || : ; . /etc/profile.d/qt.sh
-export PATH="%{tde_bindir}:${PATH}"
-export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
-export CMAKE_INCLUDE_PATH="%{tde_includedir}:%{tde_includedir}/tqt"
-export LD_LIBRARY_PATH="%{tde_libdir}"
-
-%if 0%{?rhel} || 0%{?fedora}
-%__mkdir_p build
-cd build
-%endif
-
-%cmake \
-  -DCMAKE_INSTALL_PREFIX=%{tde_prefix} \
-  -DBIN_INSTALL_DIR=%{tde_bindir} \
-  -DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \
-  -DLIB_INSTALL_DIR=%{tde_libdir} \
-  -DSHARE_INSTALL_PREFIX=%{tde_datadir} \
-  -DCMAKE_SKIP_RPATH="OFF" \
-  -DWITH_ARTS=ON \
-  -DWITH_SASL=ON \
-  -DWITH_NEWDISTRLISTS=ON  \
-%if 0%{?with_gnokii}
-  -DWITH_GNOKII=ON \
-%else
-  -DWITH_GNOKII=OFF \
-%endif
-  -DWITH_EXCHANGE=ON \
-  -DWITH_EGROUPWARE=ON \
-  -DWITH_KOLAB=ON \
-  -DWITH_SLOX=ON \
-  -DWITH_GROUPWISE=ON \
-  -DWITH_FEATUREPLAN=ON \
-  -DWITH_GROUPDAV=ON \
-  -DWITH_BIRTHDAYS=ON \
-  -DWITH_NEWEXCHANGE=ON \
-  -DWITH_SCALIX=ON \
-  -DWITH_CALDAV=ON \
-  -DWITH_CARDDAV=ON \
-  -DWITH_INDEXLIB=ON \
-%if %{?with_kitchensync}
-  -DBUILD_KITCHENSYNC=ON \
-%endif
-  -DBUILD_ALL=ON \
-  ..
-
-%__make  %{?_smp_mflags} || %__make VERBOSE=1
-
-%install
-export PATH="%{_bindir}:${PATH}"
-%__rm -rf %{?buildroot}
-%__make install DESTDIR=%{?buildroot} -C build
-
-%clean
-%__rm -rf %{?buildroot}
-
-
-%changelog
-* Sun Jul 30 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13-8
-- Add more '-devel' packages
-- Add support for Mageia 2
-
-* Sat Jun 30 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13-7
-- Rename 'tdepim' to 'trinity-tdepim'
-- Disable unneccesary fsync() in cached IMAP handler [Bug #467] [Commit #82d4a938]
-
-* Sat Jun 16 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13-6
-- Rename 'kdepim' to 'tdepim'
-- Add 'Requires: trinity-kdebase-pim-ioslaves' to add POP3 support to kmail
-- Split into several packages
-- Update kalarmd icon reference, which does not exist, to kalarm. [Commit #228ad1c6]
-
-* Sun May 27 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13-5
-- Fix KMail counting of unread messages in the system tray icon [Commit #40c435e5]
-- Fix knotes not appearing on the desktop when a session is restored. [Bug #987] [Commit #533f494f]
-- Fix knotes to not close notes during saving session. [Bug #987] [Commit #c48253af]
-- Fix linear alphabet string errors [Bug 635] [Commit #80bc593e]
-- Fix infinite loop on IMAP4 authentication failure [Bug #1007]
-
-* Wed Apr 25 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13-4
-- Fix compilation with GCC 4.7 [Bug #958]
-- Reverse patch from GIT hash 33e649c9. [Bug #406] [Commit #2d5f15c8]
-- Fix kmail composer crash [Bug #953]
-
-* Sun Nov 27 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-3
-- Add missing files '*.la'
-
-* Fri Nov 04 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-2
-- Updates BuildRequires
-
-* Sun Oct 30 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-1
-- Initial release for RHEL 6, RHEL 5 and Fedora 15
-
-* Mon Sep 05 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.12-0
-- Import to GIT
diff --git a/redhat/tdepim/tdepim-3.5.13.2-kmail_networkmanager_support.patch b/redhat/tdepim/tdepim-3.5.13.2-kmail_networkmanager_support.patch
deleted file mode 100644
index e6dc1ead3..000000000
--- a/redhat/tdepim/tdepim-3.5.13.2-kmail_networkmanager_support.patch
+++ /dev/null
@@ -1,251 +0,0 @@
---- trinity-tdepim-3.5.13.2~pre23+6c74b892/kmail/CMakeLists.txt.ORI	2013-05-25 17:07:04.113241481 +0200
-+++ trinity-tdepim-3.5.13.2~pre23+6c74b892/kmail/CMakeLists.txt	2013-05-25 17:09:01.115862006 +0200
-@@ -178,7 +178,7 @@
-   localsubscriptiondialog.cpp editorwatcher.cpp favoritefolderview.cpp
-   foldertreebase.cpp snippetdlgbase.ui snippetwidget.cpp snippetconfig.cpp
-   snippetdlg.cpp snippetitem.cpp snippetsettings.cpp snippetsettingsbase.ui
--  messageactions.cpp korghelper.cpp foldersetselector.cpp stringutil.cpp
-+  messageactions.cpp korghelper.cpp kmnetworkmonitor.cpp foldersetselector.cpp stringutil.cpp
-   treebase.cpp backupjob.cpp importjob.cpp folderutil.cpp archivefolderdialog.cpp
-   importarchivedialog.cpp ${CMAKE_SOURCE_DIR}/korganizer/kcalendariface.stub
-   ${CMAKE_SOURCE_DIR}/korganizer/korganizeriface.stub )
-@@ -192,7 +192,7 @@
-   SOURCES ${${target}_SRCS}
-   LINK
-     emailfunctions-static kmime-shared kpgp-shared kdepim-shared kpimidentities-shared
--    mimelib-shared ksieve-shared khtml-shared ${INDEX_LIBRARY}
-+    mimelib-shared ksieve-shared khtml-shared kdedbus-shared ${INDEX_LIBRARY}
-   DESTINATION ${LIB_INSTALL_DIR}
- )
- 
---- trinity-tdepim-3.5.13.2~pre23+6c74b892/kmail/kmkernel.cpp.ORI	2013-05-25 17:10:26.899117831 +0200
-+++ trinity-tdepim-3.5.13.2~pre23+6c74b892/kmail/kmkernel.cpp	2013-05-25 17:12:30.471605868 +0200
-@@ -72,6 +72,7 @@
- #include <kwallet.h>
- using KWallet::Wallet;
- #include "actionscheduler.h"
-+#include "kmnetworkmonitor.h" 
- 
- #include <qutf7codec.h>
- #include <tqvbox.h>
-@@ -169,6 +170,9 @@
- 
-   connectDCOPSignal( 0, 0, "kmailSelectFolder(TQString)",
-                      "selectFolder(TQString)", false );
-+
-+  networkMonitor = new KMNetworkMonitor(this, "KMNetworkMonitor");
-+  connect(networkMonitor, TQT_SIGNAL(stateChanged(bool)), TQT_SLOT(slotNetworkStateChanged(bool)));
- }
- 
- KMKernel::~KMKernel ()
-@@ -2056,6 +2060,15 @@
-   mPutJobs.remove(it);
- }
- 
-+void KMKernel::slotNetworkStateChanged(bool state)
-+{
-+  if(state) {
-+    resumeNetworkJobs();
-+  } else {
-+    stopNetworkJobs();
-+  }
-+}
-+
- void KMKernel::slotRequestConfigSync() {
-   // ### FIXME: delay as promised in the kdoc of this function ;-)
-   KMKernel::config()->sync();
---- trinity-tdepim-3.5.13.2~pre23+6c74b892/kmail/kmkernel.h.ORI	2013-05-25 17:13:53.309922294 +0200
-+++ trinity-tdepim-3.5.13.2~pre23+6c74b892/kmail/kmkernel.h	2013-05-25 17:15:29.587965912 +0200
-@@ -28,6 +28,8 @@
-   class Wallet;
- }
- 
-+class KMNetworkMonitor; 
-+
- /** The KMail namespace contains classes used for KMail.
- * This is to keep them out of the way from all the other
- * un-namespaced classes in libs and the rest of PIM.
-@@ -434,6 +436,7 @@
- protected slots:
-   void slotDataReq(KIO::Job*,TQByteArray&);
-   void slotResult(KIO::Job*);
-+  void slotNetworkStateChanged(bool);
- 
- signals:
-   void configChanged();
-@@ -517,6 +520,8 @@
-   KPIM::ThreadWeaver::WeaverThreadLogger *the_weaverLogger;
- 
-   KWallet::Wallet *mWallet;
-+  
-+  KMNetworkMonitor *networkMonitor; 
- 
-   // variables used by dcopAddMessage()
-   TQStringList mAddMessageMsgIds;
---- /dev/null	2013-05-25 09:16:59.792134055 +0200
-+++ trinity-tdepim-3.5.13.2~pre23+6c74b892/kmail/kmnetworkmonitor.h	2013-05-25 17:20:02.351394952 +0200
-@@ -0,0 +1,45 @@
-+/*
-+   This file is part of the KDE3 Fork Project
-+   Copyright (c) 2013 Serghei Amelian <serghei.amelian@gmail.com>
-+
-+   This library is free software; you can redistribute it and/or
-+   modify it under the terms of the GNU Library General Public
-+   License version 2 as published by the Free Software Foundation.
-+
-+   This library is distributed in the hope that it will be useful,
-+   but WITHOUT ANY WARRANTY; without even the implied warranty of
-+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+   Library General Public License for more details.
-+
-+   You should have received a copy of the GNU Library General Public License
-+   along with this library; see the file COPYING.LIB.  If not, write to
-+   the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-+   Boston, MA 02110-1301, USA.
-+*/
-+#ifndef _KMNETWORKMONITOR_H_
-+#define _KMNETWORKMONITOR_H_
-+
-+#include <tqobject.h>
-+
-+class KMNetworkMonitorPrivate;
-+
-+
-+class KMNetworkMonitor : public TQObject {
-+
-+    TQ_OBJECT
-+
-+    friend class KMNetworkMonitorPrivate;
-+
-+public:
-+    KMNetworkMonitor(TQObject *parent = 0, const char *name = 0);
-+    ~KMNetworkMonitor();
-+
-+signals:
-+    void stateChanged(bool);
-+
-+private:
-+    KMNetworkMonitorPrivate *d;
-+};
-+
-+
-+#endif
---- /dev/null	2013-05-25 09:16:59.792134055 +0200
-+++ trinity-tdepim-3.5.13.2~pre23+6c74b892/kmail/kmnetworkmonitor.cpp	2013-05-25 17:21:55.565054211 +0200
-@@ -0,0 +1,116 @@
-+/*
-+   This file is part of the KDE3 Fork Project
-+   Copyright (c) 2013 Serghei Amelian <serghei.amelian@gmail.com>
-+
-+   This library is free software; you can redistribute it and/or
-+   modify it under the terms of the GNU Library General Public
-+   License version 2 as published by the Free Software Foundation.
-+
-+   This library is distributed in the hope that it will be useful,
-+   but WITHOUT ANY WARRANTY; without even the implied warranty of
-+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+   Library General Public License for more details.
-+
-+   You should have received a copy of the GNU Library General Public License
-+   along with this library; see the file COPYING.LIB.  If not, write to
-+   the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-+   Boston, MA 02110-1301, USA.
-+*/
-+
-+#include <TQTime.h>
-+
-+#include <dbus/TQDBusConnection.h>
-+#include <dbus/qdbuserror.h>
-+#include <dbus/TQDBusMessage.h>
-+#include <dbus/qdbusproxy.h>
-+
-+#include <kdebug.h>
-+
-+#include "kmnetworkmonitor.h"
-+
-+
-+class KMNetworkMonitorPrivate : public TQDBusProxy {
-+
-+    TQ_OBJECT
-+
-+public:
-+    KMNetworkMonitorPrivate(KMNetworkMonitor *parent)
-+        : TQDBusProxy(parent, "KMNetworkMonitorPrivate"), lastStatus(-1)
-+    {
-+        setService("org.freedesktop.NetworkManager");
-+        setPath("/org/freedesktop/NetworkManager");
-+        setInterface("org.freedesktop.NetworkManager");
-+
-+        TQTime::singleShot(0, this, TQT_SLOT(initialize()));
-+    }
-+
-+protected slots:
-+    void initialize()
-+    {
-+        // connect to DBUS
-+        TQDBusConnection dbus = TQDBusConnection::systemBus();
-+        if(!dbus.isConnected()) {
-+            kdDebug() << "Unable to connect to DBus: " << dbus.lastError().message() << endl;
-+            return;
-+        }
-+        setConnection(dbus);
-+
-+        // check for current status
-+        int rc = sendWithAsyncReply("state", TQValueList<TQDBusData>());
-+        if(0 == rc) {
-+            kdDebug() << "Unable to send \"state\" command to DBus" << endl;
-+            return;
-+        }
-+    }
-+
-+    void handleDBusSignal(const TQDBusMessage &message)
-+    {
-+        // the message is for us
-+        if(path() == message.path() && interface() == message.interface() && "StateChanged" == message.member())
-+            handleMessage(message);
-+    }
-+
-+    void handleAsyncReply(const TQDBusMessage &message)
-+    {
-+        handleMessage(message);
-+    }
-+
-+    void handleMessage(const TQDBusMessage &message)
-+    {
-+        bool ok;
-+        TQ_UINT32 state = message[0].toUInt32(&ok);
-+
-+        if(!ok) {
-+            kdDebug() << "KMNetworkMonitor: received unexpected type for state (" << message[0].typeName() << ")" << endl;
-+            return;
-+        }
-+
-+        int currStatus = (50 < state ? 1 : 0);
-+
-+        if(lastStatus != currStatus) {
-+            emit static_cast<KMNetworkMonitor*>(parent())->stateChanged(1 == currStatus);
-+            lastStatus = currStatus;
-+        }
-+    }
-+
-+private:
-+    // -1 = unitialized, 0 = offline, 1 = online
-+    int lastStatus;
-+};
-+
-+
-+KMNetworkMonitor::KMNetworkMonitor(TQObject *parent, const char *name)
-+    : TQObject(parent, name)
-+{
-+    d = new KMNetworkMonitorPrivate(this);
-+}
-+
-+
-+KMNetworkMonitor::~KMNetworkMonitor()
-+{
-+    delete d;
-+}
-+
-+
-+#include "kmnetworkmonitor.moc"
-+#include "kmnetworkmonitor.cpp.moc"
-- 
cgit v1.2.1


From 54922f67414b087c6c16b42ddfd38a72f4edb1a2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Andriot?= <albator78@libertysurf.fr>
Date: Thu, 2 Oct 2014 21:48:48 +0200
Subject: RPM Packaging: update tdelibs

---
 redhat/tdelibs/tdelibs-14.0.0.spec | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/redhat/tdelibs/tdelibs-14.0.0.spec b/redhat/tdelibs/tdelibs-14.0.0.spec
index b576dfc9d..97c28ccc0 100644
--- a/redhat/tdelibs/tdelibs-14.0.0.spec
+++ b/redhat/tdelibs/tdelibs-14.0.0.spec
@@ -77,14 +77,15 @@ BuildRequires:	libdbus-1-tqt-devel >= 2:0.9
 Requires:		trinity-arts >= 1:1.5.10
 
 
-
 BuildRequires:	cmake >= 2.8
+BuildRequires:	gcc-c++
+BuildRequires:	pkgconfig
+
 BuildRequires:	libtool
 BuildRequires:	krb5-devel
 BuildRequires:	libxslt-devel
 BuildRequires:	cups-devel
 BuildRequires:	openssl-devel
-BuildRequires:	gcc-c++
 BuildRequires:	alsa-lib-devel
 BuildRequires:	libidn-devel
 BuildRequires:	libtiff-devel
@@ -148,7 +149,7 @@ Requires:		udisks
 # UDISKS2 support
 %if 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} || 0%{?rhel} >= 7
 %define with_udisks2 1
-%if 0%{?fedora} >= 20 || 0%{?rhel} >= 7
+%if 0%{?fedora} >= 18 || 0%{?rhel} >= 7
 BuildRequires:	libudisks2-devel
 %else
 BuildRequires:	udisks2-devel
-- 
cgit v1.2.1


From 847534b9b0fadec28cb3045b06740fc59e0b06f4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Andriot?= <albator78@libertysurf.fr>
Date: Thu, 2 Oct 2014 22:23:21 +0200
Subject: RPM Packaging: update tdelibs

---
 redhat/tdelibs/tdelibs-14.0.0.spec | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/redhat/tdelibs/tdelibs-14.0.0.spec b/redhat/tdelibs/tdelibs-14.0.0.spec
index 97c28ccc0..21734a9d1 100644
--- a/redhat/tdelibs/tdelibs-14.0.0.spec
+++ b/redhat/tdelibs/tdelibs-14.0.0.spec
@@ -311,6 +311,11 @@ Requires:		openssl
 %define with_xrandr 1
 %endif
 
+# XT support
+%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version}
+BuildRequires: libXt-devel
+%endif
+
 # LIBMAGIC support
 BuildRequires:	file-devel
 
-- 
cgit v1.2.1


From 6ecd003a00d771473f8e18cc3da5ddfb9fe5207c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Andriot?= <albator78@libertysurf.fr>
Date: Thu, 2 Oct 2014 23:02:07 +0200
Subject: RPM Packaging: update tdelibs

---
 redhat/tdelibs/tdelibs-14.0.0.spec | 24 ++++++++++++++----------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/redhat/tdelibs/tdelibs-14.0.0.spec b/redhat/tdelibs/tdelibs-14.0.0.spec
index 21734a9d1..38cec7ea7 100644
--- a/redhat/tdelibs/tdelibs-14.0.0.spec
+++ b/redhat/tdelibs/tdelibs-14.0.0.spec
@@ -81,7 +81,6 @@ BuildRequires:	cmake >= 2.8
 BuildRequires:	gcc-c++
 BuildRequires:	pkgconfig
 
-BuildRequires:	libtool
 BuildRequires:	krb5-devel
 BuildRequires:	libxslt-devel
 BuildRequires:	cups-devel
@@ -89,7 +88,10 @@ BuildRequires:	openssl-devel
 BuildRequires:	alsa-lib-devel
 BuildRequires:	libidn-devel
 BuildRequires:	libtiff-devel
+
+# GLIB2 support
 BuildRequires:	glib2-devel
+
 # LUA support are not ready yet
 #BuildRequires:	lua-devel
 
@@ -226,31 +228,33 @@ BuildRequires:	OpenEXR-devel
 %endif
 
 # LIBTOOL
+BuildRequires:	libtool
 %if 0%{?mgaversion} || 0%{?mdkversion}
 BuildRequires:	%{_lib}ltdl-devel
 %endif
 %if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version} >= 1220
 BuildRequires:	libtool-ltdl-devel
 %endif
-%if 0%{?rhel} == 4 || 0%{?suse_version} == 1140
-BuildRequires:	libtool
-%endif
 
-# X11 support
+# XCOMPOSITE support
 %if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires:	x11-proto-devel
 %if 0%{?mgaversion} >= 4
 BuildRequires:	%{_lib}xcomposite-devel
 %else
 BuildRequires:	%{_lib}xcomposite%{?mgaversion:1}-devel
 %endif
 %endif
-%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version}
-BuildRequires:	xorg-x11-proto-devel
-%endif
 %if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version} >= 1220
 BuildRequires:	libXcomposite-devel
 %endif
+
+# X11 support
+%if 0%{?mgaversion} || 0%{?mdkversion}
+BuildRequires:	x11-proto-devel
+%endif
+%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version}
+BuildRequires:	xorg-x11-proto-devel
+%endif
 %if 0%{?rhel} == 4
 BuildRequires:	xorg-x11-devel
 %endif
@@ -547,7 +551,7 @@ fi
   -DWITH_ASPELL=ON \
   %{?!with_hspell:-DWITH_HSPELL=OFF} \
   -DWITH_TDEICONLOADER_DEBUG=OFF \
-  ..
+  .. || cat CMakeFiles/CMakeError.log && exit 1
 
 %__make %{?_smp_mflags} || %__make
 
-- 
cgit v1.2.1


From d67b1cb29c53b128d5d48933d0d5807a0b0eee5a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Andriot?= <albator78@libertysurf.fr>
Date: Thu, 2 Oct 2014 23:19:04 +0200
Subject: RPM Packaging: update tdelibs

---
 redhat/tdelibs/tdelibs-14.0.0.spec | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/redhat/tdelibs/tdelibs-14.0.0.spec b/redhat/tdelibs/tdelibs-14.0.0.spec
index 38cec7ea7..41134b161 100644
--- a/redhat/tdelibs/tdelibs-14.0.0.spec
+++ b/redhat/tdelibs/tdelibs-14.0.0.spec
@@ -551,7 +551,12 @@ fi
   -DWITH_ASPELL=ON \
   %{?!with_hspell:-DWITH_HSPELL=OFF} \
   -DWITH_TDEICONLOADER_DEBUG=OFF \
-  .. || cat CMakeFiles/CMakeError.log && exit 1
+  .. || :
+  
+cat CMakeFiles/CMakeOutput.log
+ls -l %{tde_libdir}/pkgconfig/arts.pc
+cat %{tde_libdir}/pkgconfig/arts.pc
+exit 1
 
 %__make %{?_smp_mflags} || %__make
 
-- 
cgit v1.2.1


From cbb6523d84f216f068f8db3471f51d975f01301a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Andriot?= <albator78@libertysurf.fr>
Date: Thu, 2 Oct 2014 23:37:47 +0200
Subject: RPM Packaging: update tdelibs

---
 redhat/tdelibs/tdelibs-14.0.0.spec | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/redhat/tdelibs/tdelibs-14.0.0.spec b/redhat/tdelibs/tdelibs-14.0.0.spec
index 41134b161..e41c29fa6 100644
--- a/redhat/tdelibs/tdelibs-14.0.0.spec
+++ b/redhat/tdelibs/tdelibs-14.0.0.spec
@@ -553,9 +553,10 @@ fi
   -DWITH_TDEICONLOADER_DEBUG=OFF \
   .. || :
   
-cat CMakeFiles/CMakeOutput.log
 ls -l %{tde_libdir}/pkgconfig/arts.pc
 cat %{tde_libdir}/pkgconfig/arts.pc
+pkg-config --cflags arts
+pkg-config --libs arts
 exit 1
 
 %__make %{?_smp_mflags} || %__make
-- 
cgit v1.2.1


From 2dfb0889d84e3bbcc167c039df597fcddc763aa8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Andriot?= <albator78@libertysurf.fr>
Date: Fri, 3 Oct 2014 00:00:39 +0200
Subject: RPM Packaging: update arts

---
 redhat/dependencies/arts/arts-14.0.0.spec | 30 ++++++++++++++++++++++++++++--
 1 file changed, 28 insertions(+), 2 deletions(-)

diff --git a/redhat/dependencies/arts/arts-14.0.0.spec b/redhat/dependencies/arts/arts-14.0.0.spec
index 184c5b24b..7344265cf 100644
--- a/redhat/dependencies/arts/arts-14.0.0.spec
+++ b/redhat/dependencies/arts/arts-14.0.0.spec
@@ -36,7 +36,7 @@ Name:		trinity-arts
 Epoch:		1
 Version:	1.5.10
 Release:	%{?!preversion:2}%{?preversion:1_%{preversion}}%{?dist}%{?_variant}
-Summary:	aRts (analog realtime synthesizer) - the TDE sound system
+Summary:	ARTS (analog realtime synthesizer) - the TDE sound system
 Group:		System Environment/Daemons 
 URL:		http://www.trinitydesktop.org/
 
@@ -180,6 +180,33 @@ Requires:	%{name} = %{?epoch:%{epoch}:}%{version}-%{release}
 Obsoletes:	arts-devel
 %endif
 
+Requires:	alsa-lib-devel
+Requires:	audiofile-devel
+Requires:	libvorbis-devel
+Requires:	esound-devel
+
+%if 0%{?with_libmad}
+%if 0%{?mdkversion} || 0%{?mgaversion}
+Requires:		%{_lib}mad-devel
+%endif
+%if 0%{?fedora} || 0%{?suse_version} || 0%{?rhel}
+Requires:		libmad-devel
+%endif
+%endif
+
+%if 0%{?with_jack}
+%if 0%{?mgaversion} || 0%{?mdkversion}
+Requires:	%{_lib}jack-devel
+%endif
+%if 0%{?rhel} >= 5 || 0%{?fedora}
+Requires:	jack-audio-connection-kit-devel
+%endif
+%if 0%{?suse_version}
+Requires:	libjack-devel
+%endif
+%endif
+
+
 %description devel
 arts (analog real-time synthesizer) is the sound system of TDE.
 
@@ -236,7 +263,6 @@ Requires:	%{name} = %{?epoch:%{epoch}:}%{version}-%{release}
 
 ##########
 
-
 %prep
 %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
 
-- 
cgit v1.2.1


From a55c825eeccabe0f0f34998b3466b76f2ab790d1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Andriot?= <albator78@libertysurf.fr>
Date: Fri, 3 Oct 2014 00:16:34 +0200
Subject: RPM Packaging: update arts

---
 redhat/dependencies/arts/arts-14.0.0.spec | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/redhat/dependencies/arts/arts-14.0.0.spec b/redhat/dependencies/arts/arts-14.0.0.spec
index 7344265cf..0afd17efd 100644
--- a/redhat/dependencies/arts/arts-14.0.0.spec
+++ b/redhat/dependencies/arts/arts-14.0.0.spec
@@ -20,7 +20,7 @@
 %define _variant .opt
 %endif
 
-# TDE specific variables
+# TDE variables
 %define tde_version 14.0.0
 %define tde_prefix /opt/trinity
 %define tde_bindir %{tde_prefix}/bin
@@ -174,7 +174,7 @@ playing a wave file with some effects.
 
 %package devel
 Group:		Development/Libraries
-Summary:	aRts (analog realtime synthesizer) - the TDE sound system (Development files)
+Summary:	ARTS (analog realtime synthesizer) - the TDE sound system (Development files)
 Requires:	%{name} = %{?epoch:%{epoch}:}%{version}-%{release}
 %if "%{?tde_prefix}" == "/usr"
 Obsoletes:	arts-devel
-- 
cgit v1.2.1


From 91c51c0c2bb170ce7e1f7b0c3210f9462aff3435 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Andriot?= <albator78@libertysurf.fr>
Date: Fri, 3 Oct 2014 00:16:50 +0200
Subject: RPM Packaging: update arts

---
 redhat/tdelibs/tdelibs-14.0.0.spec | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/redhat/tdelibs/tdelibs-14.0.0.spec b/redhat/tdelibs/tdelibs-14.0.0.spec
index e41c29fa6..070cae273 100644
--- a/redhat/tdelibs/tdelibs-14.0.0.spec
+++ b/redhat/tdelibs/tdelibs-14.0.0.spec
@@ -551,13 +551,7 @@ fi
   -DWITH_ASPELL=ON \
   %{?!with_hspell:-DWITH_HSPELL=OFF} \
   -DWITH_TDEICONLOADER_DEBUG=OFF \
-  .. || :
-  
-ls -l %{tde_libdir}/pkgconfig/arts.pc
-cat %{tde_libdir}/pkgconfig/arts.pc
-pkg-config --cflags arts
-pkg-config --libs arts
-exit 1
+  ..
 
 %__make %{?_smp_mflags} || %__make
 
-- 
cgit v1.2.1


From 13f6760fb14f0a8884c5016f013dbbf7c4e5ca40 Mon Sep 17 00:00:00 2001
From: Michele Calgaro <michele.calgaro@yahoo.it>
Date: Fri, 3 Oct 2014 16:58:03 +0900
Subject: Fixed tdelibs FTBFS on Debian/Ubuntu.

---
 debian/lenny/tdelibs/debian/control    | 2 +-
 debian/squeeze/tdelibs/debian/control  | 2 +-
 ubuntu/maverick/tdelibs/debian/control | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/debian/lenny/tdelibs/debian/control b/debian/lenny/tdelibs/debian/control
index 320474004..8d9a4b0cd 100644
--- a/debian/lenny/tdelibs/debian/control
+++ b/debian/lenny/tdelibs/debian/control
@@ -16,7 +16,7 @@ Build-Depends: cdbs (>= 0.4.41ubuntu2), debhelper (>= 5.0.31), quilt, autotools-
  libxml2-dev, libxml2-utils, libxslt1-dev, libavahi-tqt-dev,
  sharutils, texinfo, libogg-dev, libtqtinterface-dev,
  gettext-kde, lsb-release, base-files, sudo, libr-dev,
- libudev-dev, cmake, libltdl-dev
+ libudev-dev, cmake, libltdl-dev, libmagic-dev
 Build-Depends-Indep: doxygen, libtqtinterface-doc, graphviz, gsfonts-x11
 Standards-Version: 3.8.3
 
diff --git a/debian/squeeze/tdelibs/debian/control b/debian/squeeze/tdelibs/debian/control
index 320474004..8d9a4b0cd 100644
--- a/debian/squeeze/tdelibs/debian/control
+++ b/debian/squeeze/tdelibs/debian/control
@@ -16,7 +16,7 @@ Build-Depends: cdbs (>= 0.4.41ubuntu2), debhelper (>= 5.0.31), quilt, autotools-
  libxml2-dev, libxml2-utils, libxslt1-dev, libavahi-tqt-dev,
  sharutils, texinfo, libogg-dev, libtqtinterface-dev,
  gettext-kde, lsb-release, base-files, sudo, libr-dev,
- libudev-dev, cmake, libltdl-dev
+ libudev-dev, cmake, libltdl-dev, libmagic-dev
 Build-Depends-Indep: doxygen, libtqtinterface-doc, graphviz, gsfonts-x11
 Standards-Version: 3.8.3
 
diff --git a/ubuntu/maverick/tdelibs/debian/control b/ubuntu/maverick/tdelibs/debian/control
index d75538067..182174583 100644
--- a/ubuntu/maverick/tdelibs/debian/control
+++ b/ubuntu/maverick/tdelibs/debian/control
@@ -16,7 +16,7 @@ Build-Depends: cdbs (>= 0.4.41ubuntu2), debhelper (>= 5.0.31), quilt, autotools-
  libxml2-dev, libxml2-utils, libxslt1-dev, libavahi-tqt-dev,
  sharutils, texinfo, libogg-dev, libtqtinterface-dev,
  gettext-kde, lsb-release, base-files, sudo, libr-dev,
- libudev-dev, cmake, libltdl-dev
+ libudev-dev, cmake, libltdl-dev, libmagic-dev
 Build-Depends-Indep: doxygen, libtqtinterface-doc, graphviz, gsfonts-x11
 Standards-Version: 3.8.3
 
-- 
cgit v1.2.1


From 207150b44fec55bf2b8c5e74badde93880e277fe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Andriot?= <albator78@libertysurf.fr>
Date: Fri, 3 Oct 2014 16:37:29 +0200
Subject: RPM Packaging: update and cleanup tdelibs

---
 redhat/tde-i18n/kde-i18n-3.5.12.spec               |   1195 -
 .../kde-i18n-3.5.13-add_zh_TW_translations.patch   | 136888 ------------------
 redhat/tde-i18n/kde-i18n-3.5.13.spec               |   1193 -
 redhat/tde-i18n/tde-3.5.13.2-admin.patch           |     44 -
 .../tde-i18n-14.0.0-extra_translations.patch       |     27 -
 redhat/tde-i18n/tde-i18n-14.0.0-updates.patch      |    341 -
 redhat/tde-i18n/tde-i18n-3.5.13.1.spec             |   1274 -
 redhat/tdelibs/kdelibs-3.5.12-fixx11h.patch        |     21 -
 .../kdelibs-3.5.12-kstandarddirs_trinity.patch     |     29 -
 redhat/tdelibs/kdelibs-3.5.12.spec                 |    369 -
 ...ibs-3.5.13-add_dynamic_label_to_kpassword.patch |    139 -
 .../kdelibs-3.5.13-add_inotify_support.patch       |     67 -
 .../tdelibs/kdelibs-3.5.13-enable_fam_gamin.patch  |     79 -
 redhat/tdelibs/kdelibs-3.5.13-enable_pcre.patch    |     67 -
 ...-fix_UTF8_encoding_for_WebDAV_directories.patch |     45 -
 .../tdelibs/kdelibs-3.5.13-fix_add_printer.patch   |     20 -
 ...ibs-3.5.13-fix_all_languages_installation.patch |     20 -
 .../tdelibs/kdelibs-3.5.13-fix_build_kspell2.patch |     27 -
 ....5.13-fix_composition_extension_detection.patch |    159 -
 ...-3.5.13-fix_creation_of_profile_directory.patch |     12 -
 .../tdelibs/kdelibs-3.5.13-fix_dcoptypes_h.patch   |     22 -
 .../tdelibs/kdelibs-3.5.13-fix_iso_kioslave.patch  |     20 -
 ...kioslave_not_parsing_large_image_properly.patch |    171 -
 redhat/tdelibs/kdelibs-3.5.13-fix_kdirwatch.patch  |     20 -
 .../tdelibs/kdelibs-3.5.13-fix_konq_filter.patch   |     83 -
 ...kdelibs-3.5.13-fix_ktempfile_special_bits.patch |     27 -
 .../tdelibs/kdelibs-3.5.13-fix_slide_drawing.patch |     52 -
 ...3-fix_spinbox_text_entry_when_base_not_10.patch |     35 -
 ...kdelibs-3.5.13-fix_tdesu_internal_pathing.patch |     33 -
 ...5.13-fix_x11_threading_when_kinit_is_used.patch |     20 -
 .../kdelibs-3.5.13-fix_xrender_libdir.patch        |    987 -
 redhat/tdelibs/kdelibs-3.5.13-kate_syntax.patch.gz |    Bin 195241 -> 0 bytes
 redhat/tdelibs/kdelibs-3.5.13-maxlinelength.patch  |     40 -
 ...5.13-prevent_xdg_autostart_multiple_times.patch |     53 -
 .../kdelibs-3.5.13-reduce_more_applications.patch  |     41 -
 ...store_tdesu_keeppassword_default_disabled.patch |     21 -
 ...te_iso_kioslave_better_handle_large_image.patch |    115 -
 ...disable_invalid_certificate_always_prompt.patch |     15 -
 redhat/tdelibs/kdelibs-3.5.13.1.spec               |    434 -
 .../kdelibs-3.5.13.2-kpassivepopup_latin1.patch    |     11 -
 redhat/tdelibs/kdelibs-3.5.13.spec                 |    520 -
 redhat/tdelibs/tdelibs-14.0.0.spec                 |    152 +-
 .../tdelibs/tdelibs-3.5.13.2-cups_by_default.patch |     33 -
 ...s-3.5.13.2-fix-starting-kde4-applications.patch |     13 -
 .../tdelibs-3.5.13.2-fix_arts_include.patch        |     25 -
 ...tdelibs-3.5.13.2-fix_kzip_empty_directory.patch |     38 -
 redhat/tdelibs/tdelibs-3.5.13.2-fix_xdg_menu.patch |    976 -
 .../tdelibs-3.5.13.2-xdg_dirs_set_path.patch       |    150 -
 redhat/tdelibs/tdelibs-3.5.13.2.spec               |    144 +-
 redhat/tdelibs/trinity-tdelibs-3.5.13.3.spec       |    480 -
 50 files changed, 163 insertions(+), 146584 deletions(-)
 delete mode 100644 redhat/tde-i18n/kde-i18n-3.5.12.spec
 delete mode 100644 redhat/tde-i18n/kde-i18n-3.5.13-add_zh_TW_translations.patch
 delete mode 100644 redhat/tde-i18n/kde-i18n-3.5.13.spec
 delete mode 100644 redhat/tde-i18n/tde-3.5.13.2-admin.patch
 delete mode 100644 redhat/tde-i18n/tde-i18n-14.0.0-extra_translations.patch
 delete mode 100644 redhat/tde-i18n/tde-i18n-14.0.0-updates.patch
 delete mode 100644 redhat/tde-i18n/tde-i18n-3.5.13.1.spec
 delete mode 100644 redhat/tdelibs/kdelibs-3.5.12-fixx11h.patch
 delete mode 100644 redhat/tdelibs/kdelibs-3.5.12-kstandarddirs_trinity.patch
 delete mode 100644 redhat/tdelibs/kdelibs-3.5.12.spec
 delete mode 100644 redhat/tdelibs/kdelibs-3.5.13-add_dynamic_label_to_kpassword.patch
 delete mode 100644 redhat/tdelibs/kdelibs-3.5.13-add_inotify_support.patch
 delete mode 100644 redhat/tdelibs/kdelibs-3.5.13-enable_fam_gamin.patch
 delete mode 100644 redhat/tdelibs/kdelibs-3.5.13-enable_pcre.patch
 delete mode 100644 redhat/tdelibs/kdelibs-3.5.13-fix_UTF8_encoding_for_WebDAV_directories.patch
 delete mode 100644 redhat/tdelibs/kdelibs-3.5.13-fix_add_printer.patch
 delete mode 100644 redhat/tdelibs/kdelibs-3.5.13-fix_all_languages_installation.patch
 delete mode 100644 redhat/tdelibs/kdelibs-3.5.13-fix_build_kspell2.patch
 delete mode 100644 redhat/tdelibs/kdelibs-3.5.13-fix_composition_extension_detection.patch
 delete mode 100644 redhat/tdelibs/kdelibs-3.5.13-fix_creation_of_profile_directory.patch
 delete mode 100644 redhat/tdelibs/kdelibs-3.5.13-fix_dcoptypes_h.patch
 delete mode 100644 redhat/tdelibs/kdelibs-3.5.13-fix_iso_kioslave.patch
 delete mode 100644 redhat/tdelibs/kdelibs-3.5.13-fix_iso_kioslave_not_parsing_large_image_properly.patch
 delete mode 100644 redhat/tdelibs/kdelibs-3.5.13-fix_kdirwatch.patch
 delete mode 100644 redhat/tdelibs/kdelibs-3.5.13-fix_konq_filter.patch
 delete mode 100644 redhat/tdelibs/kdelibs-3.5.13-fix_ktempfile_special_bits.patch
 delete mode 100644 redhat/tdelibs/kdelibs-3.5.13-fix_slide_drawing.patch
 delete mode 100644 redhat/tdelibs/kdelibs-3.5.13-fix_spinbox_text_entry_when_base_not_10.patch
 delete mode 100644 redhat/tdelibs/kdelibs-3.5.13-fix_tdesu_internal_pathing.patch
 delete mode 100644 redhat/tdelibs/kdelibs-3.5.13-fix_x11_threading_when_kinit_is_used.patch
 delete mode 100644 redhat/tdelibs/kdelibs-3.5.13-fix_xrender_libdir.patch
 delete mode 100644 redhat/tdelibs/kdelibs-3.5.13-kate_syntax.patch.gz
 delete mode 100644 redhat/tdelibs/kdelibs-3.5.13-maxlinelength.patch
 delete mode 100644 redhat/tdelibs/kdelibs-3.5.13-prevent_xdg_autostart_multiple_times.patch
 delete mode 100644 redhat/tdelibs/kdelibs-3.5.13-reduce_more_applications.patch
 delete mode 100644 redhat/tdelibs/kdelibs-3.5.13-restore_tdesu_keeppassword_default_disabled.patch
 delete mode 100644 redhat/tdelibs/kdelibs-3.5.13-update_iso_kioslave_better_handle_large_image.patch
 delete mode 100644 redhat/tdelibs/kdelibs-3.5.13.1-disable_invalid_certificate_always_prompt.patch
 delete mode 100644 redhat/tdelibs/kdelibs-3.5.13.1.spec
 delete mode 100644 redhat/tdelibs/kdelibs-3.5.13.2-kpassivepopup_latin1.patch
 delete mode 100644 redhat/tdelibs/kdelibs-3.5.13.spec
 delete mode 100644 redhat/tdelibs/tdelibs-3.5.13.2-cups_by_default.patch
 delete mode 100644 redhat/tdelibs/tdelibs-3.5.13.2-fix-starting-kde4-applications.patch
 delete mode 100644 redhat/tdelibs/tdelibs-3.5.13.2-fix_arts_include.patch
 delete mode 100644 redhat/tdelibs/tdelibs-3.5.13.2-fix_kzip_empty_directory.patch
 delete mode 100644 redhat/tdelibs/tdelibs-3.5.13.2-fix_xdg_menu.patch
 delete mode 100644 redhat/tdelibs/tdelibs-3.5.13.2-xdg_dirs_set_path.patch
 delete mode 100644 redhat/tdelibs/trinity-tdelibs-3.5.13.3.spec

diff --git a/redhat/tde-i18n/kde-i18n-3.5.12.spec b/redhat/tde-i18n/kde-i18n-3.5.12.spec
deleted file mode 100644
index d9c904423..000000000
--- a/redhat/tde-i18n/kde-i18n-3.5.12.spec
+++ /dev/null
@@ -1,1195 +0,0 @@
-# Default version for this component
-%if "%{?version}" == ""
-%define version 3.5.12
-%endif
-%define release 9
-
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?_prefix}" != "/usr"
-%define _variant .opt
-%define _docdir %{_prefix}/share/doc
-%endif
-
-# TDE 3.5.12 specific building variables
-BuildRequires: autoconf automake libtool m4
-%define tde_docdir %{_docdir}
-%define tde_includedir %{_includedir}/kde
-%define tde_libdir %{_libdir}/kde3
-
-# Builds all supported languages (not unsupported ones)
-%if "%{?KDE_LANGS}" == ""
-%define KDE_LANGS ar bg bn ca cs da de el en_GB es et fi fr he hi hu is it ja lt nl nb nn pa pl pt pt_BR ro ru sk sl sr sv ta tr uk zh_CN zh_TW
-%endif
-
-
-Name:		trinity-kde-i18n
-Summary:	Internationalization support for Trinity
-Version:	%{?version}
-Release:	%{?release}%{?dist}%{?_variant}
-
-Vendor:		Trinity Project
-Packager:	Francois Andriot <francois.andriot@free.fr>
-URL:		http://www.trinitydesktop.org/
-
-Prefix:    %{_prefix}
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-# GFDL, with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts.
-License:	GFDL
-Group:		User Interface/Desktops
-BuildArch:	noarch
-
-# Speed build options
-%define debug_package %{nil}
-%define __spec_install_post %{nil}
-AutoReq: no
-
-Source0:	kde-i18n-%{version}.tar.gz
-
-# TDE 3.5.12: Translate 'kdesu' message was modified in 'kdebase' package
-Patch0:		kde-i18n-kdesu.patch
-
-# TDE 3.5.12: Translate 'Open Terminal Here' desktop shortcut
-Patch1:		trinity-kde-i18n-fr-openterminalhere.patch
-
-# TDE 3.5.13: French translations for new features
-Patch2:		kde-i18n-3.5.13-add_french_translations.patch
-
-# TDE 3.5.13: Updated translations for zh_TW, thanks to Wei-Lun Chao !
-Patch3:		kde-i18n-3.5.13-add_zh_TW_translations.patch
-
-BuildRequires:	findutils
-BuildRequires:	gettext
-BuildRequires:	trinity-arts-devel
-BuildRequires:	trinity-kdelibs-devel
-
-%description
-%{summary}.
-
-%package Afrikaans
-Summary: Afrikaans(af) language support for KDE3
-Group: User Interface/Desktops
-Provides: %{name}-af = %{version}-%{release}
-#Requires: kde-filesystem
-%description Afrikaans
-%{summary}.
-
-%package Arabic 
-Summary: Arabic(ar) language support for KDE3
-Group: User Interface/Desktops
-Provides: %{name}-ar = %{version}-%{release}
-#Requires: kde-filesystem
-%description Arabic
-%{summary}.
-
-%package Azerbaijani
-Summary: Azerbaijani(az) language support for KDE3
-Group: User Interface/Desktops
-Provides: %{name}-az = %{version}-%{release}
-#Requires: kde-filesystem
-%description Azerbaijani
-%{summary}.
-
-%package Belarusian
-Summary: Belarusian(be) language support for KDE3
-Group: User Interface/Desktops
-Provides: %{name}-be = %{version}-%{release}
-#Requires: kde-filesystem
-%description Belarusian
-%{summary}.
-
-%package Bulgarian
-Summary: Bulgarian(bg) language support for KDE3
-Group: User Interface/Desktops
-Provides: %{name}-bg = %{version}-%{release}
-#Requires: kde-filesystem
-%description Bulgarian
-%{summary}.
-
-%package Bengali
-Summary: Bengali(bn) language support for KDE3
-Group: User Interface/Desktops
-Provides: %{name}-bn = %{version}-%{release}
-#Requires: kde-filesystem
-%description Bengali
-%{summary}.
-
-%package Tibetan
-Summary: Tibetan(bo) language support for KDE3
-Group: User Interface/Desktops
-Provides: %{name}-bo = %{version}-%{release}
-#Requires: kde-filesystem
-%description Tibetan
-%{summary}.
-
-%package Breton
-Summary: Breton(br) language support for KDE3
-Group: User Interface/Desktops
-Provides: %{name}-br = %{version}-%{release}
-#Requires: kde-filesystem
-%description Breton
-%{summary}.
-
-%package Bosnian
-Summary: Bosnian(bs) language support for KDE3
-Group: User Interface/Desktops
-Provides: %{name}-bs = %{version}-%{release}
-#Requires: kde-filesystem
-%description Bosnian
-%{summary}.
-
-%package Catalan
-Summary: Catalan(ca) language support for KDE3
-Group: User Interface/Desktops
-Provides: %{name}-ca = %{version}-%{release}
-#Requires: kde-filesystem
-%description Catalan
-%{summary}.
-
-%package Czech
-Summary: Czech(cs) language support for KDE3
-Group: User Interface/Desktops
-Provides: %{name}-cs = %{version}-%{release}
-#Requires: kde-filesystem
-%description Czech
-%{summary}.
-
-%package Cymraeg
-Summary: Cymraeg language support for KDE3
-Group: User Interface/Desktops
-#Requires: kde-filesystem
-%description Cymraeg
-%{summary}.
-
-%package Welsh
-Summary: Welsh(cy) language support for KDE3
-Group: User Interface/Desktops
-Provides: %{name}-cy = %{version}-%{release}
-#Requires: kde-filesystem
-%description Welsh
-%{summary}.
-
-%package Danish
-Summary: Danish(da) language support for KDE3
-Group: User Interface/Desktops
-Provides: %{name}-da = %{version}-%{release}
-#Requires: kde-filesystem
-%description Danish
-%{summary}.
-
-%package German
-Summary: German(de) language support for KDE3
-Group: User Interface/Desktops
-Provides: %{name}-de = %{version}-%{release}
-#Requires: kde-filesystem
-%description German
-%{summary}.
-
-%package Greek
-Summary: Greek(el) language support for KDE3
-Group: User Interface/Desktops
-Provides: %{name}-el = %{version}-%{release}
-#Requires: kde-filesystem
-%description Greek
-%{summary}.
-
-%package British
-Summary: British(en_GB) English support for KDE3
-Group: User Interface/Desktops
-Provides: %{name}-en_GB = %{version}-%{release}
-#Requires: kde-filesystem
-%description British
-%{summary}.
-
-%package Esperanto
-Summary: Esperanto(eo) support for KDE3
-Group: User Interface/Desktops
-Provides: %{name}-eo = %{version}-%{release}
-#Requires: kde-filesystem
-%description Esperanto
-%{summary}.
-
-%package Spanish
-Summary: Spanish(es) language support for KDE3
-Group: User Interface/Desktops
-Provides: %{name}-es = %{version}-%{release}
-#Requires: kde-filesystem
-%description Spanish
-%{summary}.
-
-%package Estonian
-Summary: Estonian(et) language support for KDE3
-Group: User Interface/Desktops
-Provides: %{name}-et = %{version}-%{release}
-#Requires: kde-filesystem
-%description Estonian
-%{summary}.
-
-%package Basque
-Summary: Basque(eu) language support for KDE3
-Group: User Interface/Desktops
-Provides: %{name}-eu = %{version}-%{release}
-#Requires: kde-filesystem
-%description Basque
-%{summary}.
-
-%package Farsi
-Summary: Farsi(fa) language support for KDE3
-Group: User Interface/Desktops
-Provides: %{name}-fa = %{version}-%{release}
-#Requires: kde-filesystem
-%description Farsi
-%{summary}.
-
-%package Finnish
-Summary: Finnish(fi) language support for KDE3
-Group: User Interface/Desktops
-Provides: %{name}-fi = %{version}-%{release}
-#Requires: kde-filesystem
-%description Finnish
-%{summary}.
-
-%package Faroese
-Summary: Faroese(fo) language support for KDE3
-Group: User Interface/Desktops
-Provides: %{name}-fo = %{version}-%{release}
-#Requires: kde-filesystem
-%description Faroese
-%{summary}.
-
-%package French
-Summary: French(fr) language support for KDE3
-Group: User Interface/Desktops
-Provides: %{name}-fr = %{version}-%{release}
-#Requires: kde-filesystem
-%description French
-%{summary}.
-
-%package Frisian
-Summary: Frisian(fy) language support for KDE3
-Group: User Interface/Desktops
-Provides: %{name}-fy = %{version}-%{release}
-#Requires: kde-filesystem
-%description Frisian
-%{summary}.
-
-%package Irish
-Summary: Irish(ga) language support for KDE3
-Group: User Interface/Desktops
-Obsoletes: kde-i18n-Gaeilge < %{version}
-Provides: %{name}-ga = %{version}-%{release}
-#Requires: kde-filesystem
-%description Irish
-%{summary}.
-
-%package Galician
-Summary: Galician(gl) language support for KDE3
-Group: User Interface/Desktops
-Provides: %{name}-gl = %{version}-%{release}
-#Requires: kde-filesystem
-%description Galician
-%{summary}.
-
-%package Hebrew
-Summary: Hebrew(he) language support for KDE3
-Group: User Interface/Desktops
-Provides: %{name}-he = %{version}-%{release}
-#Requires: kde-filesystem
-%description Hebrew
-%{summary}.
-
-%package Hindi
-Summary: Hindi(hi) language support for KDE3
-Group: User Interface/Desktops
-Provides: %{name}-hi = %{version}-%{release}
-#Requires: kde-filesystem
-%description Hindi
-%{summary}.
-
-%package Croatian
-Summary: Croatian(hr) language support for KDE3
-Group: User Interface/Desktops
-Provides: %{name}-hr = %{version}-%{release}
-#Requires: kde-filesystem
-%description Croatian
-%{summary}.
-
-%package Hungarian
-Summary: Hungarian(hu) language support for KDE3
-Group: User Interface/Desktops
-Provides: %{name}-hu = %{version}-%{release}
-#Requires: kde-filesystem
-%description Hungarian
-%{summary}.
-
-%package Indonesian
-Summary: Indonesian(id) language support for KDE3
-Group: User Interface/Desktops
-Provides: %{name}-id = %{version}-%{release}
-#Requires: kde-filesystem
-%description Indonesian
-%{summary}.
-
-%package Icelandic
-Summary: Icelandic(is) language support for KDE3
-Group: User Interface/Desktops
-Provides: %{name}-is = %{version}-%{release}
-#Requires: kde-filesystem
-%description Icelandic
-%{summary}.
-
-%package Italian
-Summary: Italian(it) language support for KDE3
-Group: User Interface/Desktops
-Provides: %{name}-it = %{version}-%{release}
-#Requires: kde-filesystem
-%description Italian
-%{summary}.
-
-%package Japanese
-Summary: Japanese(ja) language support for KDE3
-Group: User Interface/Desktops
-Provides: %{name}-ja = %{version}-%{release}
-#Requires: kde-filesystem
-%description Japanese
-%{summary}.
-
-%package Korean
-Summary: Korean(ko) language support for KDE3
-Group: User Interface/Desktops
-Provides: %{name}-ko = %{version}-%{release}
-#Requires: kde-filesystem
-%description Korean
-%{summary}.
-
-%package Kurdish
-Summary: Kurdish(ku) language support for KDE3
-Group: User Interface/Desktops
-Provides: %{name}-ku = %{version}-%{release}
-#Requires: kde-filesystem
-%description Kurdish
-%{summary}.
-
-%package Lao
-Summary: Lao(lo) language support for KDE3
-Group: User Interface/Desktops
-Provides: %{name}-lo = %{version}-%{release}
-#Requires: kde-filesystem
-%description Lao
-%{summary}.
-
-%package Lithuanian
-Summary: Lithuanian(lt) language support for KDE3
-Group: User Interface/Desktops
-Provides: %{name}-lt = %{version}-%{release}
-#Requires: kde-filesystem
-%description Lithuanian
-%{summary}.
-
-%package Latvian
-Summary: Latvian(lv) language support for KDE3
-Group: User Interface/Desktops
-Provides: %{name}-lv = %{version}-%{release}
-#Requires: kde-filesystem
-%description Latvian
-%{summary}.
-
-%package Maori
-Summary: Maori(mi) language support for KDE3
-Group: User Interface/Desktops
-Provides: %{name}-mi = %{version}-%{release}
-#Requires: kde-filesystem
-%description Maori
-%{summary}.
-
-%package Macedonian
-Summary: Macedonian(mk) language support for KDE3
-Group: User Interface/Desktops
-Provides: %{name}-mk = %{version}-%{release}
-#Requires: kde-filesystem
-%description Macedonian
-%{summary}.
-
-%package Maltese
-Summary: Maltese(mt) language support for KDE3
-Group: User Interface/Desktops
-Provides: %{name}-mt = %{version}-%{release}
-#Requires: kde-filesystem
-%description Maltese
-%{summary}.
-
-%package Dutch
-Summary: Dutch(nl) language support for KDE3
-Group: User Interface/Desktops
-Provides: %{name}-nl = %{version}-%{release}
-#Requires: kde-filesystem
-%description Dutch
-%{summary}.
-
-%package Norwegian
-Summary: Norwegian(no) (Bokmaal) language support for KDE3
-Group: User Interface/Desktops
-Provides: %{name}-no = %{version}-%{release}
-#Requires: kde-filesystem
-%description Norwegian
-%{summary}.
-
-%package Norwegian-Nynorsk
-Summary: Norwegian(nn) (Nynorsk) language support for KDE3
-Group: User Interface/Desktops
-Provides: %{name}-nn = %{version}-%{release}
-#Requires: kde-filesystem
-%description Norwegian-Nynorsk
-%{summary}.
-
-%package Occitan
-Summary: Occitan(oc) language support for KDE3
-Group: User Interface/Desktops
-Provides: %{name}-oc = %{version}-%{release}
-#Requires: kde-filesystem
-%description Occitan
-%{summary}.
-
-%package Polish
-Summary: Polish(pl) language support for KDE3
-Group: User Interface/Desktops
-Provides: %{name}-pl = %{version}-%{release}
-#Requires: kde-filesystem
-%description Polish
-%{summary}.
-
-%package Portuguese
-Summary: Portuguese(pt) language support for KDE3
-Group: User Interface/Desktops
-Provides: %{name}-pt = %{version}-%{release}
-#Requires: kde-filesystem
-%description Portuguese
-%{summary}.
-
-%package Punjabi
-Summary: Punjabi(pa) language support for KDE3
-Group: User Interface/Desktops
-Provides: %{name}-pa = %{version}-%{release}
-#Requires: kde-filesystem
-%description Punjabi
-%{summary}.
-
-%package Brazil
-Summary: Brazil(pt_BR) Portuguese language support for KDE3
-Group: User Interface/Desktops
-Provides: %{name}-pt_BR = %{version}-%{release}
-#Requires: kde-filesystem
-%description Brazil
-%{summary}.
-
-%package Romanian
-Summary: Romanian(ro) language support for KDE3
-Group: User Interface/Desktops
-Provides: %{name}-ro = %{version}-%{release}
-#Requires: kde-filesystem
-%description Romanian
-%{summary}.
-
-%package Russian
-Summary: Russian(ru) language support for KDE3
-Group: User Interface/Desktops
-Provides: %{name}-ru = %{version}-%{release}
-#Requires: kde-filesystem
-%description Russian
-%{summary}.
-
-%package Slovak
-Summary: Slovak(sk) language support for KDE3
-Group: User Interface/Desktops
-Provides: %{name}-sk = %{version}-%{release}
-#Requires: kde-filesystem
-%description Slovak
-%{summary}.
-
-%package Slovenian
-Summary: Slovenian(sl) language support for KDE3
-Group: User Interface/Desktops
-Provides: %{name}-sl = %{version}-%{release}
-#Requires: kde-filesystem
-%description Slovenian
-%{summary}.
-
-%package Serbian
-Summary: Serbian(sr) language support for KDE3
-Group: User Interface/Desktops
-Provides: %{name}-sr = %{version}-%{release}
-#Requires: kde-filesystem
-%description Serbian
-%{summary}.
-
-%package Swedish
-Summary: Swedish(sv) language support for KDE3
-Group: User Interface/Desktops
-Provides: %{name}-sv = %{version}-%{release}
-#Requires: kde-filesystem
-%description Swedish
-%{summary}.
-
-%package Tamil
-Summary: Tamil(ta) language support for KDE3
-Group: User Interface/Desktops
-Provides: %{name}-ta = %{version}-%{release}
-#Requires: kde-filesystem
-%description Tamil
-%{summary}.
-
-%package Tajik
-Summary: Tajik(tg) language support for KDE3
-Group: User Interface/Desktops
-Provides: %{name}-tg = %{version}-%{release}
-#Requires: kde-filesystem
-%description Tajik
-%{summary}.
-
-%package Thai
-Summary: Thai(th) language support for KDE3
-Group: User Interface/Desktops
-Provides: %{name}-th = %{version}-%{release}
-#Requires: kde-filesystem
-%description Thai
-%{summary}.
-
-%package Turkish
-Summary: Turkish(tr) language support for KDE3
-Group: User Interface/Desktops
-Provides: %{name}-tr = %{version}-%{release}
-#Requires: kde-filesystem
-%description Turkish
-%{summary}.
-
-%package Ukrainian
-Summary: Ukrainian(uk) language support for KDE3
-Group: User Interface/Desktops
-Provides: %{name}-uk = %{version}-%{release}
-#Requires: kde-filesystem
-%description Ukrainian
-%{summary}.
-
-%package Venda
-Summary: Venda(ven) language support for KDE3
-Group: User Interface/Desktops
-Provides: %{name}-ven = %{version}-%{release}
-#Requires: kde-filesystem
-%description Venda
-%{summary}.
-
-%package Vietnamese
-Summary: Vietnamese(vi) language support for KDE3
-Group: User Interface/Desktops
-Provides: %{name}-vi = %{version}-%{release}
-#Requires: kde-filesystem
-%description Vietnamese
-%{summary}.
-
-%package Walloon
-Summary: Walloon(wa) language support for KDE3
-Group: User Interface/Desktops
-Provides: %{name}-wa = %{version}-%{release}
-#Requires: kde-filesystem
-%description Walloon
-%{summary}.
-
-%package Xhosa
-Summary: Xhosa(xh) (a Bantu language) support for KDE3
-Group: User Interface/Desktops
-Provides: %{name}-xh = %{version}-%{release}
-#Requires: kde-filesystem
-%description Xhosa
-%{summary}.
-
-%package Chinese
-Summary: Chinese(zh_CN) (Simplified Chinese) language support for KDE3
-Group: User Interface/Desktops
-Provides: %{name}-zh_CN = %{version}-%{release}
-#Requires: kde-filesystem
-%description Chinese
-%{summary}.
-
-%package Chinese-Big5
-Summary: Chinese(zh_TW) (Big5) language support for KDE3
-Group: User Interface/Desktops
-Provides: %{name}-tz_TW = %{version}-%{release}
-#Requires: kde-filesystem
-%description Chinese-Big5
-%{summary}.
-
-
-
-%prep
-%setup -q -n kde-i18n
-
-for l in %{KDE_LANGS}; do
-  for f in kde-i18n-${l}-*.tar.bz2; do
-    tar xjf "${f}"
-  done
-done
-
-%patch0
-%patch1
-%patch2 -p0
-%patch3 -p0
-
-
-%build
-export PATH="%{_bindir}:${PATH}"
-export LDFLAGS="-L%{_libdir} -I%{_includedir}"
-
-export kde_htmldir="%{tde_docdir}/HTML"
-
-for l in %{KDE_LANGS}; do
-  for f in kde-i18n-${l}-*/; do
-    if [ -d "${f}" ] && [ -x "${f}/configure" ] ; then 
-      pushd ${f}
-      %configure
-      %__make %{?_smp_mflags}
-      popd
-    fi
-  done
-done
-
-%install
-%__rm -rf %{?buildroot}
-export PATH="%{_bindir}:${PATH}"
-
-for l in %{KDE_LANGS}; do
-  for f in kde-i18n-${l}-*/; do
-    if [ -d "${f}" ] && [ -r "${f}/Makefile" ] ; then 
-      %__make install DESTDIR="%{?buildroot}" -C "${f}"
-    fi
-  done
-done
-
-# make symlinks relative
-%if "%{_prefix}" == "/usr"
-pushd "%{buildroot}%{tde_docdir}/HTML"
-for lang in *; do
-  if [ -d "$lang" ]; then
-    pushd "$lang"
-    for i in */*/*; do
-      if [ -d $i -a -L $i/common ]; then
-        rm -f $i/common
-        ln -sf ../../../docs/common $i
-      fi
-    done
-
-    for i in */*; do
-      if [ -d $i -a -L $i/common ]; then
-        rm -f $i/common
-        ln -sf ../../docs/common $i
-      fi
-    done
-
-    for i in *; do
-      if [ -d $i -a -L $i/common ]; then
-        rm -f $i/common
-        ln -sf ../docs/common $i
-      fi
-    done
-
-    popd
-  fi
-done
-popd   
-%endif
-
-# remove zero-length file
-find "%{buildroot}%{tde_docdir}/HTML" -size 0 -exec rm -f {} \;
-
-# See http://fedoraproject.org/wiki/Languages (???)
-%__rm -f %{buildroot}%{_datadir}/locale/*/flag.png
-
-# Removes conflict with KDE4
-%if "%{?_prefix}" == "/usr"
-%__rm -f %{buildroot}%{_datadir}/locale/*/entry.desktop
-%endif
-
-# remove obsolete KDE 3 application data translations
-%__rm -rf "%{buildroot}%{_datadir}/apps"
-
-%clean
-%__rm -rf %{buildroot}
-
-%if "%( grep -w af <<< '%{KDE_LANGS}' )" != ""
-%files Afrikaans
-%defattr(-,root,root,-)
-%lang(af) %{_datadir}/locale/af/*
-%lang(af) %{tde_docdir}/HTML/af/
-%endif
-
-%if "%( grep -w ar <<< '%{KDE_LANGS}' )" != ""
-%files Arabic 
-%defattr(-,root,root,-)
-%lang(ar) %{_datadir}/locale/ar/*
-%endif
-
-%if "%( grep -w az <<< '%{KDE_LANGS}' )" != ""
-%files Azerbaijani
-%defattr(-,root,root,-)
-%lang(az) %{_datadir}/locale/az/*
-%endif
-
-%if "%( grep -w be <<< '%{KDE_LANGS}' )" != ""
-%files Belarusian
-%defattr(-,root,root,-)
-%lang(be) %{_datadir}/locale/be/*
-%endif
-
-%if "%( grep -w bg <<< '%{KDE_LANGS}' )" != ""
-%files Bulgarian
-%defattr(-,root,root,-)
-%lang(bg) %{_datadir}/locale/bg/*
-%endif
-
-%if "%( grep -w bn <<< '%{KDE_LANGS}' )" != ""
-%files Bengali
-%defattr(-,root,root,-)
-%lang(bn) %{_datadir}/locale/bn/*
-%endif
-
-%if "%( grep -w bo <<< '%{KDE_LANGS}' )" != ""
-%files Tibetan
-%defattr(-,root,root,-)
-%lang(bo) %{_datadir}/locale/bo/*
-%endif
-
-%if "%( grep -w br <<< '%{KDE_LANGS}' )" != ""
-%files Breton
-%defattr(-,root,root,-)
-%lang(br) %{_datadir}/locale/br/*
-%endif
-
-%if "%( grep -w bs <<< '%{KDE_LANGS}' )" != ""
-%files Bosnian
-%defattr(-,root,root,-)
-%lang(bs) %{_datadir}/locale/bs/*
-%endif
-
-%if "%( grep -w ca <<< '%{KDE_LANGS}' )" != ""
-%files Catalan
-%defattr(-,root,root,-)
-%lang(ca) %{_datadir}/locale/ca/*
-%lang(ca) %{tde_docdir}/HTML/ca/
-%endif
-
-%if "%( grep -w cs <<< '%{KDE_LANGS}' )" != ""
-%files Czech
-%defattr(-,root,root,-)
-%lang(cs) %{_datadir}/locale/cs/*
-%lang(cs) %{tde_docdir}/HTML/cs/
-%endif
-
-%if "%( grep -w cy <<< '%{KDE_LANGS}' )" != ""
-%files Welsh
-%defattr(-,root,root,-)
-%lang(cy) %{_datadir}/locale/cy/*
-%endif
-
-%if "%( grep -w da <<< '%{KDE_LANGS}' )" != ""
-%files Danish
-%defattr(-,root,root,-)
-%lang(da) %{_datadir}/locale/da/*
-%lang(da) %{tde_docdir}/HTML/da/
-%endif
-
-%if "%( grep -w de <<< '%{KDE_LANGS}' )" != ""
-%files German
-%defattr(-,root,root,-)
-%lang(de) %{_datadir}/locale/de/*
-%lang(de) %{tde_docdir}/HTML/de/
-%endif
-
-%if "%( grep -w el <<< '%{KDE_LANGS}' )" != ""
-%files Greek
-%defattr(-,root,root,-)
-%lang(el) %{_datadir}/locale/el/*
-%endif
-
-%if "%( grep -w en_GB <<< '%{KDE_LANGS}' )" != ""
-%files British
-%defattr(-,root,root,-)
-%lang(en_GB) %{_datadir}/locale/en_GB/*
-%lang(en_GB) %{tde_docdir}/HTML/en_GB/
-%endif
-
-%if "%( grep -w eo <<< '%{KDE_LANGS}' )" != ""
-%files Esperanto
-%defattr(-,root,root,-)
-%lang(eo) %{_datadir}/locale/eo/*
-%endif
-
-%if "%( grep -w es <<< '%{KDE_LANGS}' )" != ""
-%files Spanish
-%defattr(-,root,root,-)
-%lang(es) %{_datadir}/locale/es/*
-%lang(es) %{tde_docdir}/HTML/es/
-%endif
-
-%if "%( grep -w et <<< '%{KDE_LANGS}' )" != ""
-%files Estonian
-%defattr(-,root,root,-)
-%lang(et) %{_datadir}/locale/et/*
-%lang(et) %{tde_docdir}/HTML/et/
-%endif
-
-%if "%( grep -w eu <<< '%{KDE_LANGS}' )" != ""
-%files Basque
-%defattr(-,root,root,-)
-%lang(eu) %{_datadir}/locale/eu/*
-%endif
-
-%if "%( grep -w fa <<< '%{KDE_LANGS}' )" != ""
-%files Farsi
-%defattr(-,root,root,-)
-%lang(fa) %{_datadir}/locale/fa/*
-%endif
-
-%if "%( grep -w fi <<< '%{KDE_LANGS}' )" != ""
-%files Finnish
-%defattr(-,root,root,-)
-%lang(fi) %{_datadir}/locale/fi/*
-%lang(fi) %{tde_docdir}/HTML/fi/
-%endif
-
-%if "%( grep -w fo <<< '%{KDE_LANGS}' )" != ""
-%files Faroese
-%defattr(-,root,root,-)
-%lang(fo) %{_datadir}/locale/fo/*
-%endif
-
-%if "%( grep -w fr <<< '%{KDE_LANGS}' )" != ""
-%files French
-%defattr(-,root,root,-)
-%lang(fr) %{_datadir}/locale/fr/*
-%lang(fr) %{tde_docdir}/HTML/fr/
-%endif
-
-%if "%( grep -w fy <<< '%{KDE_LANGS}' )" != ""
-%files Frisian
-%defattr(-,root,root,-)
-%lang(fy) %{_datadir}/locale/fy/*
-%endif
-
-%if "%( grep -w ga <<< '%{KDE_LANGS}' )" != ""
-%files Irish
-%defattr(-,root,root,-)
-%lang(ga) %{_datadir}/locale/ga/*
-%endif
-
-%if "%( grep -w gl <<< '%{KDE_LANGS}' )" != ""
-%files Galician
-%defattr(-,root,root,-)
-%lang(gl) %{_datadir}/locale/gl/*
-%endif
-
-%if "%( grep -w he <<< '%{KDE_LANGS}' )" != ""
-%files Hebrew
-%defattr(-,root,root,-)
-%lang(he) %{_datadir}/locale/he/*
-%lang(he) %{tde_docdir}/HTML/he/
-%endif
-
-%if "%( grep -w hi <<< '%{KDE_LANGS}' )" != ""
-%files Hindi
-%defattr(-,root,root,-)
-%lang(hi) %{_datadir}/locale/hi/*
-%endif
-
-%if "%( grep -w hr <<< '%{KDE_LANGS}' )" != ""
-%files Croatian
-%defattr(-,root,root,-)
-%lang(hr) %{_datadir}/locale/hr/*
-%lang(hr) %{tde_docdir}/HTML/hr/
-%endif
-
-%if "%( grep -w hu <<< '%{KDE_LANGS}' )" != ""
-%files Hungarian
-%defattr(-,root,root,-)
-%lang(hu) %{_datadir}/locale/hu/*
-%lang(hu) %{tde_docdir}/HTML/hu/
-%endif
-
-%if "%( grep -w id <<< '%{KDE_LANGS}' )" != ""
-%files Indonesian
-%defattr(-,root,root,-)
-%lang(id) %{_datadir}/locale/id/*
-%lang(id) %{tde_docdir}/HTML/id/
-%endif
-
-%if "%( grep -w is <<< '%{KDE_LANGS}' )" != ""
-%files Icelandic
-%defattr(-,root,root,-)
-%lang(is) %{_datadir}/locale/is/*
-%endif
-
-%if "%( grep -w it <<< '%{KDE_LANGS}' )" != ""
-%files Italian
-%defattr(-,root,root,-)
-%lang(it) %{_datadir}/locale/it/*
-%lang(it) %{tde_docdir}/HTML/it/
-%endif
-
-%if "%( grep -w ja <<< '%{KDE_LANGS}' )" != ""
-%files Japanese
-%defattr(-,root,root,-)
-%lang(ja) %{_datadir}/locale/ja/*
-%lang(ja) %{tde_docdir}/HTML/ja/
-%endif
-
-%if "%( grep -w ko <<< '%{KDE_LANGS}' )" != ""
-%files Korean
-%defattr(-,root,root,-)
-%lang(ko) %{_datadir}/locale/ko/*
-%lang(ko) %{tde_docdir}/HTML/ko/
-%endif
-
-%if "%( grep -w ku <<< '%{KDE_LANGS}' )" != ""
-%files Kurdish
-%defattr(-,root,root,-)
-%lang(ku) %{_datadir}/locale/ku/*
-%lang(ku) %{tde_docdir}/HTML/ku/
-%endif
-
-%if "%( grep -w lao <<< '%{KDE_LANGS}' )" != ""
-%files Lao
-%defattr(-,root,root,-)
-%lang(lo) %{_datadir}/locale/lo/*
-%lang(lo) %{tde_docdir}/HTML/lo/
-%endif
-
-%if "%( grep -w lt <<< '%{KDE_LANGS}' )" != ""
-%files Lithuanian
-%defattr(-,root,root,-)
-%lang(lt) %{_datadir}/locale/lt/*
-%endif
-
-%if "%( grep -w lv <<< '%{KDE_LANGS}' )" != ""
-%files Latvian
-%defattr(-,root,root,-)
-%lang(lv) %{_datadir}/locale/lv/*
-%endif
-
-%if "%( grep -w mi <<< '%{KDE_LANGS}' )" != ""
-%files Maori
-%defattr(-,root,root,-)
-%lang(mi) %{_datadir}/locale/mi/*
-%endif
-
-%if "%( grep -w mk <<< '%{KDE_LANGS}' )" != ""
-%files Macedonian
-%defattr(-,root,root,-)
-%lang(mk) %{_datadir}/locale/mk/*
-%endif
-
-%if "%( grep -w mt <<< '%{KDE_LANGS}' )" != ""
-%files Maltese
-%defattr(-,root,root,-)
-%lang(mt) %{_datadir}/locale/mt/*
-%endif
-
-%if "%( grep -w nl <<< '%{KDE_LANGS}' )" != ""
-%files Dutch
-%defattr(-,root,root,-)
-%lang(nl) %{_datadir}/locale/nl/*
-%lang(nl) %{tde_docdir}/HTML/nl/
-%endif
-
-%if "%( grep -w nb <<< '%{KDE_LANGS}' )" != ""
-%files Norwegian
-%defattr(-,root,root,-)
-%lang(nb) %{_datadir}/locale/nb/*
-#%lang(nb) %{tde_docdir}/HTML/nb/
-%endif
-
-%if "%( grep -w nn <<< '%{KDE_LANGS}' )" != ""
-%files Norwegian-Nynorsk
-%defattr(-,root,root,-)
-%lang(nn) %{_datadir}/locale/nn/*
-#%lang(nn) %{tde_docdir}/HTML/nn/
-%endif
-
-%if "%( grep -w oc <<< '%{KDE_LANGS}' )" != ""
-%files Occitan
-%defattr(-,root,root,-)
-%lang(oc) %{_datadir}/locale/oc/*
-%endif
-
-%if "%( grep -w pa <<< '%{KDE_LANGS}' )" != ""
-%files Punjabi
-%defattr(-,root,root,-)
-%lang(pa) %{_datadir}/locale/pa/*
-%endif
-
-%if "%( grep -w pl <<< '%{KDE_LANGS}' )" != ""
-%files Polish
-%defattr(-,root,root,-)
-%lang(pl) %{_datadir}/locale/pl/*
-%lang(pl) %{tde_docdir}/HTML/pl/
-%endif
-
-%if "%( grep -w pt <<< '%{KDE_LANGS}' )" != ""
-%files Portuguese
-%defattr(-,root,root,-)
-%lang(pt) %{_datadir}/locale/pt/*
-%lang(pt) %{tde_docdir}/HTML/pt/
-%endif
-
-%if "%( grep -w pt_BR <<< '%{KDE_LANGS}' )" != ""
-%files Brazil
-%defattr(-,root,root,-)
-%lang(pt_BR) %{_datadir}/locale/pt_BR/*
-%lang(pt_BR) %{tde_docdir}/HTML/pt_BR/
-%endif
-
-%if "%( grep -w ro <<< '%{KDE_LANGS}' )" != ""
-%files Romanian
-%defattr(-,root,root,-)
-%lang(ro) %{_datadir}/locale/ro/*
-%lang(ro) %{tde_docdir}/HTML/ro/
-%endif
-
-%if "%( grep -w ru <<< '%{KDE_LANGS}' )" != ""
-%files Russian
-%defattr(-,root,root,-)
-%lang(ru) %{_datadir}/locale/ru/*
-%lang(ru) %{tde_docdir}/HTML/ru/
-%endif
-
-%if "%( grep -w sk <<< '%{KDE_LANGS}' )" != ""
-%files Slovak
-%defattr(-,root,root,-)
-%lang(sk) %{_datadir}/locale/sk/*
-%lang(sk) %{tde_docdir}/HTML/sk/
-%endif
-
-%if "%( grep -w sl <<< '%{KDE_LANGS}' )" != ""
-%files Slovenian
-%defattr(-,root,root,-)
-%lang(sl) %{_datadir}/locale/sl/*
-%lang(sl) %{tde_docdir}/HTML/sl/
-%endif
-
-%if "%( grep -w sr <<< '%{KDE_LANGS}' )" != ""
-%files Serbian
-%defattr(-,root,root,-)
-%lang(sr) %{_datadir}/locale/sr/*
-%lang(sr) %{tde_docdir}/HTML/sr/
-%endif
-
-%if "%( grep -w sv <<< '%{KDE_LANGS}' )" != ""
-%files Swedish
-%defattr(-,root,root,-)
-%lang(sv) %{_datadir}/locale/sv/*
-%lang(sv) %{tde_docdir}/HTML/sv/
-%endif
-
-%if "%( grep -w ta <<< '%{KDE_LANGS}' )" != ""
-%files Tamil
-%defattr(-,root,root,-)
-%lang(ta) %{_datadir}/locale/ta/*
-%endif
-
-%if "%( grep -w tg <<< '%{KDE_LANGS}' )" != ""
-%files Tajik
-%defattr(-,root,root,-)
-%lang(tg) %{_datadir}/locale/tg/*
-%endif
-
-%if "%( grep -w th <<< '%{KDE_LANGS}' )" != ""
-%files Thai
-%defattr(-,root,root,-)
-%lang(th) %{_datadir}/locale/th/*
-%endif
-
-%if "%( grep -w tr <<< '%{KDE_LANGS}' )" != ""
-%files Turkish
-%defattr(-,root,root,-)
-%lang(tr) %{_datadir}/locale/tr/*
-%lang(tr) %{tde_docdir}/HTML/tr/
-%endif
-
-%if "%( grep -w uk <<< '%{KDE_LANGS}' )" != ""
-%files Ukrainian
-%defattr(-,root,root,-)
-%lang(uk) %{tde_docdir}/HTML/uk/
-%lang(uk) %{_datadir}/locale/uk/*
-%endif
-
-%if "%( grep -w ven <<< '%{KDE_LANGS}' )" != ""
-%files Venda
-%defattr(-,root,root,-)
-%lang(ven) %{_datadir}/locale/ven/*
-%endif
-
-%if "%( grep -w vi <<< '%{KDE_LANGS}' )" != ""
-%files Vietnamese
-%defattr(-,root,root,-)
-%lang(vi) %{_datadir}/locale/vi/*
-%endif
-
-%if "%( grep -w wa <<< '%{KDE_LANGS}' )" != ""
-%files Walloon
-%defattr(-,root,root,-)
-%lang(wa) %{_datadir}/locale/wa/*
-%endif
-
-%if "%( grep -w xh <<< '%{KDE_LANGS}' )" != ""
-%files Xhosa
-%defattr(-,root,root,-)
-%lang(xh) %{_datadir}/locale/xh/*
-%lang(xh) %{tde_docdir}/HTML/xh/
-%endif
-
-%if "%( grep -w zh_CN <<< '%{KDE_LANGS}' )" != ""
-%files Chinese
-%defattr(-,root,root,-)
-%lang(zh_CN) %{_datadir}/locale/zh_CN/*
-%lang(zh_CN) %{tde_docdir}/HTML/zh_CN/
-%endif
-
-%if "%( grep -w zh_TW <<< '%{KDE_LANGS}' )" != ""
-%files Chinese-Big5
-%defattr(-,root,root,-)
-%lang(zh_TW) %{_datadir}/locale/zh_TW/*
-%lang(zh_TW) %{tde_docdir}/HTML/zh_TW/
-%endif
-
-%changelog
-* Sun Dec 18 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-9
-- Updates French translations (mostly Kickoff Menu related)
-
-* Fri Dec 09 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.12-8
-- Backport from TDE 3.5.13
-- Removes 'kde-filesystem" dependancy
-- Fix HTML directory location
-- Re-adds missing files 'entry.desktop'
-- Updates zh_TW translation, thanks to Wei-Lun Chao
-- Add missing french translations for TDE 3.5.13
-
-* Mon Sep 19 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.12-7
-- Add support for RHEL5
-
-* Sun Sep 11 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.12-6
-- Re-introduce all languages (again)
-
-* Wed Aug 24 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.12-5
-- Re-introduce all languages
-
-* Mon Aug 22 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.12-4
-- Correct macro to install under "/opt", if desired
-
-* Thu Jul 21 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.12-3
-- Add 'Patch1': translation for 'Open Terminal Here...' background shortcut
-
-* Sun Dec 19 2010 Francois Andriot <francois.andriot@free.fr> - 3.5.12-2
-- Rebuilt
-
-* Sun Dec 19 2010 Francois Andriot <francois.andriot@free.fr> - 3.5.12-0
-- Initial version (French language only)
-- Based on RHEL SPEC file 'kde-i18n'
-- Add 'patch0' to reflect modifications in 'kdesu' from 'kdebase' package
-
diff --git a/redhat/tde-i18n/kde-i18n-3.5.13-add_zh_TW_translations.patch b/redhat/tde-i18n/kde-i18n-3.5.13-add_zh_TW_translations.patch
deleted file mode 100644
index 11b9fe1ca..000000000
--- a/redhat/tde-i18n/kde-i18n-3.5.13-add_zh_TW_translations.patch
+++ /dev/null
@@ -1,136888 +0,0 @@
-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) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Traditional Chinese <zh_l10n@linux.org.tw>\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) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Chinese Traditional <zh-l10n@linux.org.tw>\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 <b>start</b> / <b>stop</b>  "
--"updating of the display. Stopping the update will zero the processing power  "
--"required (CPU usage)"
--msgstr "點選此圖示會<b>開始</b>/<b>停止</b>更新顯示。停止更新會讓 CPU 使用率歸零。"
-+"Clicking on this icon will <b>start</b> / <b>stop</b>  updating of the "
-+"display. Stopping the update will zero the processing power  required (CPU "
-+"usage)"
-+msgstr ""
-+"點選此圖示會<b>開始</b>/<b>停止</b>更新顯示。停止更新會讓 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 <jupiter@ocool.org>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\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 "目前的模組有未儲存的變更。<br>您想要在關閉設定視窗前 套用這些變更或者捨棄這些變更？"
-+msgstr ""
-+"目前的模組有未儲存的變更。<br>您想要在關閉設定視窗前 套用這些變更或者捨棄這些"
-+"變更？"
- 
- #: 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 "目前的模組有未儲存的變更。<br>您想要在離開KMousetool前 套用這些變更或者捨棄這些變更？"
-+msgstr ""
-+"目前的模組有未儲存的變更。<br>您想要在離開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 "<p><b>KMouseTool</b> is written and maintained by <a HREF=\"mailto:jeff@mousetool.com\">Jeff Roush</a>.</p>  <p>For more information, see the man page for <b>kmousetool</b> or the KDE documentation, both of which should have been installed with the program, or see <a HREF=\"http://www.mousetool.com/\">www.mousetool.com</a>. </p><p>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.</p>"
--#~ msgstr "<p><b>KMouseTool</b>撰寫者及維護者為<a HREF=\"mailto:jeff@mousetool.com\">Jeff Roush</a>.</p>  <p>想獲取更多資訊，請參見<b>kmousetool</b>的man page 或者KDE文件，這兩者應該都已隨程式一同安裝，或者參閱 <a HREF=\"http://www.mousetool.com/\">www.mousetool.com</a>. </p><p>這個程式是 以GPL的形式授權。另外，使用這個程式表示您同意不追究作者任何因使用這個程式所導致損害的 責任。</p>"
-+#~ msgid ""
-+#~ "<p><b>KMouseTool</b> is written and maintained by <a HREF=\"mailto:"
-+#~ "jeff@mousetool.com\">Jeff Roush</a>.</p>  <p>For more information, see "
-+#~ "the man page for <b>kmousetool</b> or the KDE documentation, both of "
-+#~ "which should have been installed with the program, or see <a HREF="
-+#~ "\"http://www.mousetool.com/\">www.mousetool.com</a>. </p><p>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.</p>"
-+#~ msgstr ""
-+#~ "<p><b>KMouseTool</b>撰寫者及維護者為<a HREF=\"mailto:jeff@mousetool.com"
-+#~ "\">Jeff Roush</a>.</p>  <p>想獲取更多資訊，請參見<b>kmousetool</b>的man "
-+#~ "page 或者KDE文件，這兩者應該都已隨程式一同安裝，或者參閱 <a HREF=\"http://"
-+#~ "www.mousetool.com/\">www.mousetool.com</a>. </p><p>這個程式是 以GPL的形式"
-+#~ "授權。另外，使用這個程式表示您同意不追究作者任何因使用這個程式所導致損害"
-+#~ "的 責任。</p>"
- 
--#~ 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 <a HREF=\"mailto:jeff@mousetool.com\">Jeff Roush</a>.  "
--#~ msgstr "如果您有任何改善這個程式的想法，請將您的想法貼到KDE Accessibility Mailing List，或者直接將您的想法直接寄給作者<a HREF=\"mailto: jeff@mousetool.com\">Jeff Roush</a>.  "
-+#~ 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 <a HREF="
-+#~ "\"mailto:jeff@mousetool.com\">Jeff Roush</a>.  "
-+#~ msgstr ""
-+#~ "如果您有任何改善這個程式的想法，請將您的想法貼到KDE Accessibility Mailing "
-+#~ "List，或者直接將您的想法直接寄給作者<a HREF=\"mailto: jeff@mousetool.com"
-+#~ "\">Jeff Roush</a>.  "
- 
--#~ msgid "<p>This program is distributed under the GPL, the GNU Public License.</p><p>A copy of this license should have been installed along with the program.</p>"
--#~ msgstr "<p>本程式是以GPL(GNU Public License)形式散佈。</p><p>這個授權書的副本應該已隨同程式安裝。</p>"
-+#~ msgid ""
-+#~ "<p>This program is distributed under the GPL, the GNU Public License.</"
-+#~ "p><p>A copy of this license should have been installed along with the "
-+#~ "program.</p>"
-+#~ msgstr ""
-+#~ "<p>本程式是以GPL(GNU Public License)形式散布。</p><p>這個授權書的副本應該"
-+#~ "已隨同程式安裝。</p>"
- 
- #~ 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) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Traditional Chinese <zh_l10n@linux.org.tw>\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 ""
--"<qt>There are unsaved changes."
--"<br>Do you want to apply the changes before closing the \"phrase book\" window "
--"or discard the changes?</qt>"
--msgstr "<qt>有變更尚未儲存。<br>關閉片語書視窗之前，您要套用變更還是要放棄變更？</qt>"
-+"<qt>There are unsaved changes.<br>Do you want to apply the changes before "
-+"closing the \"phrase book\" window or discard the changes?</qt>"
-+msgstr ""
-+"<qt>有變更尚未儲存。<br>關閉片語書視窗之前，您要套用變更還是要放棄變更？</qt>"
- 
- #: 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 <i>%1</i> has a different extension than <i>.phrasebook</i>"
--". Do you wish to add <i>.phrasebook</i> to the filename?"
-+"Your chosen filename <i>%1</i> has a different extension than <i>."
-+"phrasebook</i>. Do you wish to add <i>.phrasebook</i> to the filename?"
- msgstr ""
--"您選擇的檔案名稱 <i>%1</i> 延伸檔名與 <i>.phrasebook</i>不同。是否把 <i>.phrasebook</i> 加到檔案名稱？"
-+"您選擇的檔案名稱 <i>%1</i> 延伸檔名與 <i>.phrasebook</i>不同。是否把 <i>."
-+"phrasebook</i> 加到檔案名稱？"
- 
- #: phrasebook/phrasebook.cpp:290 phrasebook/phrasebook.cpp:306
- msgid "File Extension"
-@@ -1048,9 +1070,11 @@
- 
- #: phrasebook/phrasebook.cpp:305
- msgid ""
--"Your chosen filename <i>%1</i> has the extension <i>.phrasebook</i>"
--". Do you wish to save in phrasebook format?"
--msgstr "您選擇的檔案名稱 <i>%1</i> 有 <i>.phrasebook</i> 延伸檔名。您是否要以片語書格式儲存？"
-+"Your chosen filename <i>%1</i> has the extension <i>.phrasebook</i>. Do you "
-+"wish to save in phrasebook format?"
-+msgstr ""
-+"您選擇的檔案名稱 <i>%1</i> 有 <i>.phrasebook</i> 延伸檔名。您是否要以片語書格"
-+"式儲存？"
- 
- #: 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) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Traditional Chinese <zh_l10n@linux.org.tw>\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) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Chinese Traditional <zh-l10n@linux.org.tw>\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.  <em>Note<em>"
--": KTTSMgr only automatically starts for text jobs having 5 sentences or more."
-+"KTTSMgr and displays an icon in the system tray.  <em>Note<em>: 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 ""
- "<qt>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:<dl><dt>%e</dt><dd>Name of the event</dd><dt>"
--"%a</dt><dd>Application that sent the event</dd><dt>%m</dt><dd>"
--"The message sent by the application</dd></dl></qt>"
--msgstr ""
--"<qt>指定 KTTS 在接收到事件時要怎麼讀。如果選擇「讀出自訂的文字」，則在欄位中輸入要讀出來的文字。您可以在文字中使用底下的代換符號： <dl> <dt>"
--"%e</dt><dd>事件名稱</dd> <dt>%a</dt><dd>送出此事件的應用程式</dd> <dt>%m</dt><dd>"
--"應用程式送出的訊息</dd> </dl></qt>"
-+"substitution strings in the text:<dl><dt>%e</dt><dd>Name of the event</"
-+"dd><dt>%a</dt><dd>Application that sent the event</dd><dt>%m</dt><dd>The "
-+"message sent by the application</dd></dl></qt>"
-+msgstr ""
-+"<qt>指定 KTTS 在接收到事件時要怎麼讀。如果選擇「讀出自訂的文字」，則在欄位中"
-+"輸入要讀出來的文字。您可以在文字中使用底下的代換符號： <dl> <dt>%e</dt><dd>事"
-+"件名稱</dd> <dt>%a</dt><dd>送出此事件的應用程式</dd> <dt>%m</dt><dd>應用程式"
-+"送出的訊息</dd> </dl></qt>"
- 
- #. 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 ""
--"<p>Select the audio output method desired.  If you select <b>GStreamer</b>"
--", you must also select a <b>Sink</b>.</p>"
--"<p><em>Note</em>:  You must have GStreamer >= 0.87 to use GStreamer.</p>"
-+"<p>Select the audio output method desired.  If you select <b>GStreamer</b>, "
-+"you must also select a <b>Sink</b>.</p><p><em>Note</em>:  You must have "
-+"GStreamer >= 0.87 to use GStreamer.</p>"
- msgstr ""
--"<p>選擇音效輸出方法。如果您選擇 <b>GStreamer</b>，您也要選擇 <b>接收器</b>（Sink）。</p> "
--"<p><em>注意：</em>您必須安裝 GStreamer 0.87 版以上。</p>"
-+"<p>選擇音效輸出方法。如果您選擇 <b>GStreamer</b>，您也要選擇 <b>接收器</b>"
-+"（Sink）。</p> <p><em>注意：</em>您必須安裝 GStreamer 0.87 版以上。</p>"
- 
- #. 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 ""
--"<p>Check to use the GStreamer audio output system.  You must also select a <b>"
--"Sink</b> plugin.</p>"
--msgstr "<p>勾選以使用 GStreamer 音效輸出系統。您必須選擇一個<b>接收器</b>外掛程式。</p>"
-+"<p>Check to use the GStreamer audio output system.  You must also select a "
-+"<b>Sink</b> plugin.</p>"
-+msgstr ""
-+"<p>勾選以使用 GStreamer 音效輸出系統。您必須選擇一個<b>接收器</b>外掛程式。</"
-+"p>"
- 
- #. i18n: file kcmkttsmgr/kcmkttsmgrwidget.ui line 1548
- #: rc.cpp:372
-@@ -744,8 +783,11 @@
- #: rc.cpp:381
- #, no-c-format
- msgid ""
--"<p>Check to use aKode for audio output.  You must also select a <b>Sink</b>.</p>"
--msgstr "<p>勾選以使用 aKode 做為音效輸出。您必須同時指定一個<b>接收器</b>（Sink）。</p>"
-+"<p>Check to use aKode for audio output.  You must also select a <b>Sink</b>."
-+"</p>"
-+msgstr ""
-+"<p>勾選以使用 aKode 做為音效輸出。您必須同時指定一個<b>接收器</b>（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 ""
--"<b>WARNING: This filter is a key component of the KTTS system. Please read the "
--"KTTS Handbook before modifying these settings.</b>"
--msgstr "<b>警告：這個過濾器是 KTTS 系統的主要成員。要變更這些設定之前，請先參考 KTTS 手冊。</b>"
-+"<b>WARNING: This filter is a key component of the KTTS system. Please read "
-+"the KTTS Handbook before modifying these settings.</b>"
-+msgstr ""
-+"<b>警告：這個過濾器是 KTTS 系統的主要成員。要變更這些設定之前，請先參考 KTTS "
-+"手冊。</b>"
- 
- #. 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.  <b>Important</b>"
--": must end with tab (\\t)."
--msgstr "這個字串會取代正規表示式比對到的項目。<b>重要：</b>必須以 tab（\\t）結束。"
-+"This string replaces the matched regular expression.  <b>Important</b>: must "
-+"end with tab (\\t)."
-+msgstr ""
-+"這個字串會取代正規表示式比對到的項目。<b>重要：</b>必須以 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 ""
- "<qt>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 <b>knotify</b> 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 ""
--"<qt>輸入一個 DCOP 應用程式代碼。這個過濾器會只套用到該程式送出的文字發音要求。您也可以輸入一個以上的代碼，用逗號隔開。使用 <b>"
--"knotify</b> 則會套用在所有 KDE 通知上。如果留白的話，預設套用到所有的應用程式。提示：在命令列上用 kdcop "
--"可以知道應用程式的代碼。範例如下：\"konversaion,kvirc,ksirc,kopete\"</qt>"
-+"commas.  Use <b>knotify</b> 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 ""
-+"<qt>輸入一個 DCOP 應用程式代碼。這個過濾器會只套用到該程式送出的文字發音要"
-+"求。您也可以輸入一個以上的代碼，用逗號隔開。使用 <b>knotify</b> 則會套用在所"
-+"有 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 ""
--"<qt>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 <b>"
--"knotify</b> 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\"</qt>"
--msgstr ""
--"<qt>輸入一個 DCOP 應用程式代碼。這個過濾器會只套用到該程式送出的文字發音要求。您也可以輸入一個以上的代碼，用逗號隔開。使用 <b>"
--"knotify</b> 則會套用在所有 KDE 通知上。如果留白的話，預設套用到所有的應用程式。提示：在命令列上用 kdcop "
--"可以知道應用程式的代碼。範例如下：\"konversaion,kvirc,ksirc,kopete\"</qt>"
-+"<qt>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 <b>knotify</b> 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\"</qt>"
-+msgstr ""
-+"<qt>輸入一個 DCOP 應用程式代碼。這個過濾器會只套用到該程式送出的文字發音要"
-+"求。您也可以輸入一個以上的代碼，用逗號隔開。使用 <b>knotify</b> 則會套用在所"
-+"有 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 ""
--"<h1>Text-to-Speech</h1>"
--"<p>This is the configuration for the text-to-speech dcop service</p>"
--"<p>This allows other applications to access text-to-speech resources</p>"
--"<p>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</p>"
--msgstr ""
--"<h1>文字發音</h1>"
--"<p>這是文字發音 DCOP 服務的設定。</p>"
--"<p>它允許其他應用程式使用文字發音的資源。</p> "
--"<p>請確定已設定好您所使用的預設語言，這會被大部份的應用程式所套用。</p>"
-+"<h1>Text-to-Speech</h1><p>This is the configuration for the text-to-speech "
-+"dcop service</p><p>This allows other applications to access text-to-speech "
-+"resources</p><p>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</p>"
-+msgstr ""
-+"<h1>文字發音</h1><p>這是文字發音 DCOP 服務的設定。</p><p>它允許其他應用程式使"
-+"用文字發音的資源。</p> <p>請確定已設定好您所使用的預設語言，這會被大部份的應"
-+"用程式所套用。</p>"
- 
- #: kcmkttsmgr/kcmkttsmgr.cpp:1080 kttsd/main.cpp:36
- #: players/artsplayer/artsplayer.cpp:240
-@@ -2443,35 +2544,32 @@
- #: kttsjobmgr/kttsjobmgr.cpp:127
- msgid ""
- "<p>These are all the text jobs.  The <b>State</b> column may be:"
--"<ul>"
--"<li><b>Queued</b> - the job is waiting and will not be spoken until its state "
--"is changed to <b>Waiting</b> by clicking the <b>Resume</b> or <b>Restart</b> "
--"buttons.</li>"
--"<li><b>Waiting</b> - the job is ready to be spoken.  It will be spoken when the "
--"jobs preceding it in the list have finished.</li>"
--"<li><b>Speaking</b> - the job is speaking.  The <b>Position</b> "
--"column shows the current sentence of the job being spoken.  You may pause a "
--"speaking job by clicking the <b>Hold</b> button.</li>"
--"<li><b>Paused</b> - the job is currently paused.  Paused jobs prevent jobs "
--"below them from speaking.  Use the <b>Resume</b> or <b>Restart</b> "
--"buttons to resume speaking the job, or click <b>Later</b> "
--"to move the job down in the list.</li>"
--"<li><b>Finished</b> - the job has finished speaking.  When a second job "
--"finishes, this one will be deleted.  You may click <b>Restart</b> "
--"to repeat the job.</li></ul><em>Note</em>: Messages, Warnings, and Screen "
--"Reader Output do not appear in this list.  See the Handbook for more "
--"information.</p>"
--msgstr ""
--"<p>這些是所有的文字發音工作。<b>狀態</b>欄位可能為： "
--"<ul>"
--"<li><b>已送進佇列</b>：此工作已經在等待，但是除非點選<b>恢復</b>或<b>重新開始</b>讓狀態變成<b>等待中</b>"
--"，否則不會被執行。</li> "
--"<li><b>等待中</b>：此工作已經準備好被執行了，正在等待執行中的工作結束。</li> "
--"<li><b>執行中</b>：此工作正在執行。<b>位置</b>欄位顯示目前正在唸的句子。您可以按下<b>暫停</b>來暫停此工作。</li> "
--"<li><b>已暫停</b>：此工作目前暫停執行。之後的工作也不會被執行。用<b>恢復</b>或<b>重新開始</b>來恢復工作，或是<b>延後</b>"
--"將工作放到清單的底部。</li> "
--"<li><b>已完成</b>：此工作已完成。當下一個工作也完成後，這個工作就會被刪除。您可以點選<b>重新開始</b>來重新執行工作。</li></ul> "
--"<em>注意：</em>訊息、警告與螢幕讀取輸出不會出現在此清單中。詳情請參考手冊。</p>"
-+"<ul><li><b>Queued</b> - the job is waiting and will not be spoken until its "
-+"state is changed to <b>Waiting</b> by clicking the <b>Resume</b> or "
-+"<b>Restart</b> buttons.</li><li><b>Waiting</b> - the job is ready to be "
-+"spoken.  It will be spoken when the jobs preceding it in the list have "
-+"finished.</li><li><b>Speaking</b> - the job is speaking.  The <b>Position</"
-+"b> column shows the current sentence of the job being spoken.  You may pause "
-+"a speaking job by clicking the <b>Hold</b> button.</li><li><b>Paused</b> - "
-+"the job is currently paused.  Paused jobs prevent jobs below them from "
-+"speaking.  Use the <b>Resume</b> or <b>Restart</b> buttons to resume "
-+"speaking the job, or click <b>Later</b> to move the job down in the list.</"
-+"li><li><b>Finished</b> - the job has finished speaking.  When a second job "
-+"finishes, this one will be deleted.  You may click <b>Restart</b> to repeat "
-+"the job.</li></ul><em>Note</em>: Messages, Warnings, and Screen Reader "
-+"Output do not appear in this list.  See the Handbook for more information.</"
-+"p>"
-+msgstr ""
-+"<p>這些是所有的文字發音工作。<b>狀態</b>欄位可能為： <ul><li><b>已送進佇列</"
-+"b>：此工作已經在等待，但是除非點選<b>恢復</b>或<b>重新開始</b>讓狀態變成<b>等"
-+"待中</b>，否則不會被執行。</li> <li><b>等待中</b>：此工作已經準備好被執行了，"
-+"正在等待執行中的工作結束。</li> <li><b>執行中</b>：此工作正在執行。<b>位置</"
-+"b>欄位顯示目前正在唸的句子。您可以按下<b>暫停</b>來暫停此工作。</li> <li><b>"
-+"已暫停</b>：此工作目前暫停執行。之後的工作也不會被執行。用<b>恢復</b>或<b>重"
-+"新開始</b>來恢復工作，或是<b>延後</b>將工作放到清單的底部。</li> <li><b>已完"
-+"成</b>：此工作已完成。當下一個工作也完成後，這個工作就會被刪除。您可以點選<b>"
-+"重新開始</b>來重新執行工作。</li></ul> <em>注意：</em>訊息、警告與螢幕讀取輸"
-+"出不會出現在此清單中。詳情請參考手冊。</p>"
- 
- #: kttsjobmgr/kttsjobmgr.cpp:176
- msgid "Hold"
-@@ -2480,12 +2578,13 @@
- #: kttsjobmgr/kttsjobmgr.cpp:178
- msgid ""
- "<p>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 <b>Resume</b> to make the job speakable, or click <b>Later</b> "
-+"speaking.  Paused jobs prevent jobs that follow them from speaking, so "
-+"either click <b>Resume</b> to make the job speakable, or click <b>Later</b> "
- "to move it down in the list.</p>"
- msgstr ""
--"<p>將工作狀態變更為「已暫停」。如果正在發音，這個工作會暫停發音。之後的工作也會被卡住不會執行。點選<b>恢復</b>可以恢復工作，或是<b>延後</b>"
--"將工作移到清單底部。</p>"
-+"<p>將工作狀態變更為「已暫停」。如果正在發音，這個工作會暫停發音。之後的工作也"
-+"會被卡住不會執行。點選<b>恢復</b>可以恢復工作，或是<b>延後</b>將工作移到清單"
-+"底部。</p>"
- 
- #: kttsjobmgr/kttsjobmgr.cpp:185 kttsmgr/kttsmgr.cpp:186
- msgid "Resume"
-@@ -2493,9 +2592,11 @@
- 
- #: kttsjobmgr/kttsjobmgr.cpp:187
- msgid ""
--"<p>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.</p>"
--msgstr "<p>恢復已暫停的工作，或將已送進佇列的工作狀態改為「等待中」。如果此工作在清單的最頂端，則會開始工作。</p>"
-+"<p>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.</p>"
-+msgstr ""
-+"<p>恢復已暫停的工作，或將已送進佇列的工作狀態改為「等待中」。如果此工作在清單"
-+"的最頂端，則會開始工作。</p>"
- 
- #: kttsjobmgr/kttsjobmgr.cpp:192
- msgid "R&estart"
-@@ -2503,14 +2604,16 @@
- 
- #: kttsjobmgr/kttsjobmgr.cpp:194
- msgid ""
--"<p>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.</p>"
--msgstr "<p>讓此工作從頭開始，並將狀態改變為「等待中」。如果此工作在清單的最頂端，則開始工作。</p>"
-+"<p>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.</p>"
-+msgstr ""
-+"<p>讓此工作從頭開始，並將狀態改變為「等待中」。如果此工作在清單的最頂端，則開"
-+"始工作。</p>"
- 
- #: kttsjobmgr/kttsjobmgr.cpp:201
- msgid ""
--"<p>Deletes the job.  If it is currently speaking, it stops speaking.  The next "
--"speakable job in the list begins speaking.</p>"
-+"<p>Deletes the job.  If it is currently speaking, it stops speaking.  The "
-+"next speakable job in the list begins speaking.</p>"
- msgstr "<p>刪除此工作。如果它正在工作，則會停止。下一個工作會開始執行。</p>"
- 
- #: kttsjobmgr/kttsjobmgr.cpp:206
-@@ -2521,7 +2624,9 @@
- msgid ""
- "<p>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.</p>"
--msgstr "<p>將工作移到清單的最底部，稍後會繼續工作。如果此工作正在執行，它的狀態會改變為「已暫停」。</p>"
-+msgstr ""
-+"<p>將工作移到清單的最底部，稍後會繼續工作。如果此工作正在執行，它的狀態會改變"
-+"為「已暫停」。</p>"
- 
- #: kttsjobmgr/kttsjobmgr.cpp:214
- msgid "Pre&vious Part"
-@@ -2561,10 +2666,13 @@
- 
- #: kttsjobmgr/kttsjobmgr.cpp:241
- msgid ""
--"<p>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 <b>Talkers</b> tab.</p>"
--msgstr "<p>將目前剪貼簿中的內容送進工作清單，並標技為「等待中」。如果此工作在清單的最頂端，則開始執行。它會用預設的發音員來讀。</p>"
-+"<p>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 <b>Talkers</"
-+"b> tab.</p>"
-+msgstr ""
-+"<p>將目前剪貼簿中的內容送進工作清單，並標技為「等待中」。如果此工作在清單的最"
-+"頂端，則開始執行。它會用預設的發音員來讀。</p>"
- 
- #: kttsjobmgr/kttsjobmgr.cpp:247
- msgid "Spea&k File"
-@@ -2574,9 +2682,11 @@
- msgid ""
- "<p>Prompts you for a file name and queues the contents of the file for "
- "speaking.  You must click the <b>Resume</b> button before the job will be "
--"speakable.  The job will be spoken by the topmost Talker in the <b>Talkers</b> "
--"tab.</p>"
--msgstr "<p>讓您選擇一個檔案，並將檔案內容送進工作清單。您必須點選<b>恢復</b>才能讓它開始工作。它會用預設的發音員來讀。</p>"
-+"speakable.  The job will be spoken by the topmost Talker in the <b>Talkers</"
-+"b> tab.</p>"
-+msgstr ""
-+"<p>讓您選擇一個檔案，並將檔案內容送進工作清單。您必須點選<b>恢復</b>才能讓它"
-+"開始工作。它會用預設的發音員來讀。</p>"
- 
- #: kttsjobmgr/kttsjobmgr.cpp:255
- msgid "Change Talker"
-@@ -2584,8 +2694,8 @@
- 
- #: kttsjobmgr/kttsjobmgr.cpp:257
- msgid ""
--"<p>Prompts you with a list of your configured Talkers from the <b>Talkers</b> "
--"tab.  The job will be spoken using the selected Talker.</p>"
-+"<p>Prompts you with a list of your configured Talkers from the <b>Talkers</"
-+"b> tab.  The job will be spoken using the selected Talker.</p>"
- msgstr "<p>讓您選擇發音員。這個工作會使用所選取的發音員來讀。</p>"
- 
- #: 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) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Traditional Chinese <zh_l10n@linux.org.tw>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
-@@ -42,7 +41,9 @@
- msgid ""
- "<p align=\"center\">If you would like to change the configuration of KTTSD "
- "please use the KDE Control Center or click the button below.</p>"
--msgstr "<p align=\"center\">如果您要變更 KTTSD 的設定，請使用 KDE 控制中心，或按下方的按鍵。</p>"
-+msgstr ""
-+"<p align=\"center\">如果您要變更 KTTSD 的設定，請使用 KDE 控制中心，或按下方"
-+"的按鍵。</p>"
- 
- #. 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) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Traditional Chinese <zh_l10n@linux.org.tw>\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 <saviro.tw@yahoo.com.tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Chinese(traditinal) <zh-l10n@linux.org.tw>\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 <yochenhsieh@xuite.net>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Traditional Chinese <zh_l10n@linux.org.tw>\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) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Traditional Chinese <zh_l10n@linux.org.tw>\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 <jupiter@ocool.org>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\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 <jupiter@ocool.org>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\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) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Traditional Chinese <zh_l10n@linux.org.tw>\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) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Traditional Chinese <zh_l10n@linux.org.tw>\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) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Traditional Chinese <zh_l10n@linux.org.tw>\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) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Traditional Chinese <zh_l10n@linux.org.tw>\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) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Traditional Chinese <zh_l10n@linux.org.tw>\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) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Traditional Chinese <zh_l10n@linux.org.tw>\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) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Traditional Chinese <zh_l10n@linux.org.tw>\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) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Traditional Chinese <zh_l10n@linux.org.tw>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
-@@ -66,14 +65,14 @@
- #: fsview_part.cpp:105
- msgid ""
- "<p>This is the FSView plugin, a graphical browsing mode showing filesystem "
--"utilization by using a tree map visualization.</p>"
--"<p>Note that in this mode, automatic updating when filesystem changes are made "
--"is intentionally <b>not</b> done.</p>"
--"<p>For details on usage and options available, see the online help under menu "
--"'Help/FSView Manual'.</p>"
-+"utilization by using a tree map visualization.</p><p>Note that in this mode, "
-+"automatic updating when filesystem changes are made is intentionally <b>not</"
-+"b> done.</p><p>For details on usage and options available, see the online "
-+"help under menu 'Help/FSView Manual'.</p>"
- msgstr ""
--"<p>這是 FSView，一個使用樹狀圖來檢視目前檔案系統使用狀況的外掛程式。</p> "
--"<p>注意，在此模式下，<b>不會</b>自動更新檔案系統的狀況。詳細的用法與可用的選項，請參考 FSView 線上手冊。</p>"
-+"<p>這是 FSView，一個使用樹狀圖來檢視目前檔案系統使用狀況的外掛程式。</p> <p>"
-+"注意，在此模式下，<b>不會</b>自動更新檔案系統的狀況。詳細的用法與可用的選項，"
-+"請參考 FSView 線上手冊。</p>"
- 
- #: 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) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Traditional Chinese <zh_l10n@linux.org.tw>\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) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Traditional Chinese <zh_l10n@linux.org.tw>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
-@@ -90,7 +89,8 @@
- 
- #: imgallerydialog.cpp:201
- msgid ""
--"<p>Whether subfolders should be included for the image gallery creation or not."
-+"<p>Whether subfolders should be included for the image gallery creation or "
-+"not."
- msgstr "<p>建立相簿時是否要收入子資料夾的內容。"
- 
- #: imgallerydialog.cpp:208
-@@ -103,8 +103,8 @@
- 
- #: imgallerydialog.cpp:212
- msgid ""
--"<p>You can limit the number of folders the image gallery creator will traverse "
--"to by setting an upper bound for the recursion depth."
-+"<p>You can limit the number of folders the image gallery creator will "
-+"traverse to by setting an upper bound for the recursion depth."
- msgstr "<p>您可以限制要遞迴收錄多少層以內的子資料夾到相簿內。"
- 
- #: imgallerydialog.cpp:224
-@@ -113,8 +113,8 @@
- 
- #: imgallerydialog.cpp:227
- msgid ""
--"<p>This makes a copy of all images and the gallery will refer to these copies "
--"instead of the original images."
-+"<p>This makes a copy of all images and the gallery will refer to these "
-+"copies instead of the original images."
- msgstr "<p>這會將所有的影像複製一份在相簿中，並只存取此複本。"
- 
- #: imgallerydialog.cpp:233
-@@ -123,11 +123,12 @@
- 
- #: imgallerydialog.cpp:237
- msgid ""
--"<p>If you enable this option you can specify a comment file which will be used "
--"for generating subtitles for the images."
--"<p>For details about the file format please see the \"What's This?\" help "
--"below."
--msgstr "<p>開啟此選項的話，您可以指定使用一個備註檔，以記錄影像的子標題。 <p>關於此檔案格式的詳情，請參考「這是什麼？」的說明。"
-+"<p>If you enable this option you can specify a comment file which will be "
-+"used for generating subtitles for the images.<p>For details about the file "
-+"format please see the \"What's This?\" help below."
-+msgstr ""
-+"<p>開啟此選項的話，您可以指定使用一個備註檔，以記錄影像的子標題。 <p>關於此檔"
-+"案格式的詳情，請參考「這是什麼？」的說明。"
- 
- #: imgallerydialog.cpp:244
- msgid "Comments &file:"
-@@ -135,24 +136,13 @@
- 
- #: imgallerydialog.cpp:247
- msgid ""
--"<p>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:"
--"<p>FILENAME1:"
--"<br>Description"
--"<br>"
--"<br>FILENAME2:"
--"<br>Description"
--"<br>"
--"<br>and so on"
-+"<p>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:"
-+"<p>FILENAME1:<br>Description<br><br>FILENAME2:<br>Description<br><br>and so "
-+"on"
- msgstr ""
- "<p>您可以指定備註檔的檔名。備註檔內包含影像的子標題。檔案格式為： "
--"<p>FILENAME1:"
--"<br> Description"
--"<br> "
--"<br> FILENAME2:"
--"<br> Description"
--"<br> "
--"<br> "
-+"<p>FILENAME1:<br> Description<br> <br> FILENAME2:<br> Description<br> <br> "
- "<br>依此類推。"
- 
- #: 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) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Chinese Traditional <zh-l10n@linux.org.tw>\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) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Traditional Chinese <zh_l10n@linux.org.tw>\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 ""
--"<qt>Error opening the file"
--"<br><strong>%1</strong>"
--"<br>for reading. The document will not be created.</qt>"
-+"<qt>Error opening the file<br><strong>%1</strong><br>for reading. The "
-+"document will not be created.</qt>"
- msgstr "<qt>開啟檔案 <strong>%1</strong> 時發生錯誤。<br> 無法建立文件。</qt>"
- 
- #: filetemplates.cpp:385 filetemplates.cpp:980
-@@ -60,10 +58,12 @@
- 
- #: filetemplates.cpp:561
- msgid ""
--"<p>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'.</p>"
--msgstr "<p>此字串用於樣本名稱，並在樣本選單中顯示。通常應該用來描述樣本的意義，例如，HTML 文件。</p>"
-+"<p>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'.</p>"
-+msgstr ""
-+"<p>此字串用於樣本名稱，並在樣本選單中顯示。通常應該用來描述樣本的意義，例如，"
-+"HTML 文件。</p>"
- 
- #: filetemplates.cpp:566
- msgid "Press to select or change the icon for this template"
-@@ -76,9 +76,11 @@
- #: filetemplates.cpp:572
- msgid ""
- "<p>The group is used for chosing a submenu for the plugin. If it is empty, "
--"'Other' is used.</p>"
--"<p>You can type any string to add a new group to your menu.</p>"
--msgstr "<p>此群組是用於選擇外掛程式的子選單。如果保持空白，則會使用「其他」。</p> <p>您可以輸入任何字串以新增群組到您的選單中。</p>"
-+"'Other' is used.</p><p>You can type any string to add a new group to your "
-+"menu.</p>"
-+msgstr ""
-+"<p>此群組是用於選擇外掛程式的子選單。如果保持空白，則會使用「其他」。</p> <p>"
-+"您可以輸入任何字串以新增群組到您的選單中。</p>"
- 
- #: filetemplates.cpp:576
- msgid "Document &name:"
-@@ -86,17 +88,16 @@
- 
- #: filetemplates.cpp:579
- msgid ""
--"<p>This string will be used to set a name for the new document, to display in "
--"the title bar and file list.</p>"
--"<p>If the string contains '%N', that will be replaced with a number increasing "
--"with each similarly named file.</p>"
--"<p> For example, if the Document Name is 'New shellscript (%N).sh', the first "
-+"<p>This string will be used to set a name for the new document, to display "
-+"in the title bar and file list.</p><p>If the string contains '%N', that will "
-+"be replaced with a number increasing with each similarly named file.</p><p> "
-+"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.</p>"
- msgstr ""
--"<p>這個字串用於設定新文件的名稱，以顯示於檔案清單及標頭列。</p> "
--"<p>如果字串包含了 '%N'，則會替換為類似檔名的編號。</p> "
--"<p>例如，如果文件名稱為 \"New shellscript (%N)\"，則第一個檔案名稱為 New shellscript (1)，第二個則為 New "
-+"<p>這個字串用於設定新文件的名稱，以顯示於檔案清單及標頭列。</p> <p>如果字串包"
-+"含了 '%N'，則會替換為類似檔名的編號。</p> <p>例如，如果文件名稱為 \"New "
-+"shellscript (%N)\"，則第一個檔案名稱為 New shellscript (1)，第二個則為 New "
- "shellscript (2) 依此類推。</p>"
- 
- #: filetemplates.cpp:587
-@@ -119,8 +120,8 @@
- 
- #: filetemplates.cpp:596
- msgid ""
--"<p>This string is used, for example, as context help for this template (such as "
--"the 'whatsthis' help for the menu item.)</p>"
-+"<p>This string is used, for example, as context help for this template (such "
-+"as the 'whatsthis' help for the menu item.)</p>"
- msgstr "<p>此字串用於描述此樣本。</p>"
- 
- #: filetemplates.cpp:600
-@@ -129,18 +130,19 @@
- 
- #: filetemplates.cpp:603
- msgid ""
--"<p>You can set this if you want to share your template with other users.</p>"
--"<p>the recommended form is like an Email address: 'Anders Lund "
--"&lt;anders@alweb.dk&gt;'</p>"
-+"<p>You can set this if you want to share your template with other users.</"
-+"p><p>the recommended form is like an Email address: 'Anders Lund &lt;"
-+"anders@alweb.dk&gt;'</p>"
- msgstr ""
--"<p>如果您要將此樣本分享給其他使用者，您可以設定此值。</p> "
--"<p>建議使用的格式是類似電子郵件地址：Anders Lund &lt;anders@alweb.dk&gt;</p>"
-+"<p>如果您要將此樣本分享給其他使用者，您可以設定此值。</p> <p>建議使用的格式是"
-+"類似電子郵件地址：Anders Lund &lt;anders@alweb.dk&gt;</p>"
- 
- #: filetemplates.cpp:675
- msgid ""
- "<p>If you want to base this template on an existing file or template, select "
- "the appropriate option below.</p>"
--msgstr "<p>如果您要以現存檔案或樣本為基礎建立新樣本，請在下方選擇適當的選項。</p>"
-+msgstr ""
-+"<p>如果您要以現存檔案或樣本為基礎建立新樣本，請在下方選擇適當的選項。</p>"
- 
- #: filetemplates.cpp:682
- msgid "Start with an &empty document"
-@@ -186,10 +188,12 @@
- 
- #: filetemplates.cpp:793
- msgid ""
--"<p>You can replace certain strings in the text with template macros."
--"<p>If any of the data below is incorrect or missing, edit the data in the KDE "
-+"<p>You can replace certain strings in the text with template macros.<p>If "
-+"any of the data below is incorrect or missing, edit the data in the KDE "
- "email information."
--msgstr "<p>您可以將目前文字裡的字串換成樣本巨集。<p>如果底下的資料不正確或遺失，請編輯 KDE 電子郵件資訊裡的資料。"
-+msgstr ""
-+"<p>您可以將目前文字裡的字串換成樣本巨集。<p>如果底下的資料不正確或遺失，請編"
-+"輯 KDE 電子郵件資訊裡的資料。"
- 
- #: filetemplates.cpp:797
- msgid "Replace full name '%1' with the '%{fullname}' macro"
-@@ -208,7 +212,9 @@
- "<p>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.</p>"
--msgstr "<p>現在要建立樣本並儲存到指定的位置了。若您要指定游標的位置，請放一個 ^ 符號在您想要的位置。</p>"
-+msgstr ""
-+"<p>現在要建立樣本並儲存到指定的位置了。若您要指定游標的位置，請放一個 ^ 符號"
-+"在您想要的位置。</p>"
- 
- #: filetemplates.cpp:822
- msgid "Open the template for editing"
-@@ -220,11 +226,11 @@
- 
- #: filetemplates.cpp:923
- msgid ""
--"<p>The file "
--"<br><strong>'%1'</strong>"
--"<br> already exists; if you do not want to overwrite it, change the template "
--"file name to something else."
--msgstr "<p>檔案 <strong>%1</strong> 已存在。<br>如果您不想覆寫它，請修改樣本檔案名稱。"
-+"<p>The file <br><strong>'%1'</strong><br> already exists; if you do not want "
-+"to overwrite it, change the template file name to something else."
-+msgstr ""
-+"<p>檔案 <strong>%1</strong> 已存在。<br>如果您不想覆寫它，請修改樣本檔案名"
-+"稱。"
- 
- #: filetemplates.cpp:926
- msgid "File Exists"
-@@ -236,9 +242,8 @@
- 
- #: filetemplates.cpp:978
- msgid ""
--"<qt>Error opening the file"
--"<br><strong>%1</strong>"
--"<br>for reading. The document will not be created</qt>"
-+"<qt>Error opening the file<br><strong>%1</strong><br>for reading. The "
-+"document will not be created</qt>"
- msgstr "<qt>開啟 <strong>%1</strong> 時發生錯誤。無法建立文件。</qt>"
- 
- #: 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) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Traditional Chinese <zh_l10n@linux.org.tw>\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) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Traditional Chinese <zh_l10n@linux.org.tw>\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 <tonniewalker@hotmail.com>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\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) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Traditional Chinese <zh_l10n@linux.org.tw>\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) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Chinese Traditional <zh-l10n@linux.org.tw>\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 <dir> "
--"&& <command>'"
-+"Sets the working folder of the command. The command executed is 'cd <dir> && "
-+"<command>'"
- msgstr "設定此命令的工作目錄。執行此命令時會執行 'cd <dir> && <command>'"
- 
- #: 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 ""
--"<qt>"
--"<p>Decides what is suggested as <em>working folder</em> for the command.</p>"
--"<p><strong>Application Working Folder (default):</strong> "
--"The folder from which you launched the application hosting the plugin, usually "
--"your home folder.</p>"
--"<p><strong>Document Folder:</strong> The folder of the document. Used only for "
--"local documents.</p>"
--"<p><strong>Latest Working Folder:</strong> The folder used last time you used "
--"this plugin.</p></qt>"
-+"<qt><p>Decides what is suggested as <em>working folder</em> for the command."
-+"</p><p><strong>Application Working Folder (default):</strong> The folder "
-+"from which you launched the application hosting the plugin, usually your "
-+"home folder.</p><p><strong>Document Folder:</strong> The folder of the "
-+"document. Used only for local documents.</p><p><strong>Latest Working Folder:"
-+"</strong> The folder used last time you used this plugin.</p></qt>"
- msgstr ""
--"<qt>"
--"<p>決定此命令建議的工作目錄。</p> "
--"<p><strong>應用程式工作目錄（預設）：</strong>您啟動此應用程式的資料夾，通常是您的家目錄。</p> "
--"<p><strong>文件目錄：</strong>文件所在的目錄。只使用於本地端文件。</p> "
--"<p><strong>最新使用的工作目錄：</strong>最後一此使用此外掛程式時使用的目錄。</p></qt>"
-+"<qt><p>決定此命令建議的工作目錄。</p> <p><strong>應用程式工作目錄（預設）：</"
-+"strong>您啟動此應用程式的資料夾，通常是您的家目錄。</p> <p><strong>文件目錄："
-+"</strong>文件所在的目錄。只使用於本地端文件。</p> <p><strong>最新使用的工作目"
-+"錄：</strong>最後一此使用此外掛程式時使用的目錄。</p></qt>"
- 
- #: 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) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Traditional Chinese <zh_l10n@linux.org.tw>\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) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Chinese Traditional <zh-l10n@linux.org.tw>\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 <hpwu@redhat.com>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\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) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Traditional Chinese <zh_l10n@linux.org.tw>\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) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Traditional Chinese <zh_l10n@linux.org.tw>\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) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Traditional Chinese <zh_l10n@linux.org.tw>\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 <franklin at goodhorse dot idv dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Chinese Traditional <zh-l10n@linux.org.tw>\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) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Traditional Chinese <zh_l10n@linux.org.tw>\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 ""
--"<qt>"
--"<p>Usage: <code>textfilter COMMAND</code></p>"
--"<p>Replace the selection with the output of the specified shell command.</p>"
--"</qt>"
-+"<qt><p>Usage: <code>textfilter COMMAND</code></p><p>Replace the selection "
-+"with the output of the specified shell command.</p></qt>"
- msgstr ""
--"<qt>"
--"<p>用法：<code>textfilter <命令></code></p> "
--"<p>將所選擇的取代為指定的文稿命令的輸出。</p></qt>"
-+"<qt><p>用法：<code>textfilter <命令></code></p> <p>將所選擇的取代為指定的文稿"
-+"命令的輸出。</p></qt>"
- 
- #: 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) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Traditional Chinese <zh_l10n@linux.org.tw>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
-@@ -50,7 +49,9 @@
- msgid ""
- "<b>Error:</b> Failed to execute xmllint. Please make sure that xmllint is "
- "installed. It is part of libxml2."
--msgstr "<b>錯誤:</b> 無法啟動xmllint。 請確定xmllint已經安裝。xmllint是libxml2的一部分"
-+msgstr ""
-+"<b>錯誤:</b> 無法啟動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) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Traditional Chinese <zh_l10n@linux.org.tw>\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) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Traditional Chinese <zh_l10n@linux.org.tw>\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) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Traditional Chinese <zh_l10n@linux.org.tw>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
-@@ -39,9 +38,11 @@
- 
- #: kcmkuick.cpp:151
- msgid ""
--"<h1>Kuick</h1> With this module you can configure Kuick, the KDE quickcopy and "
--"move plugin for Konqueror."
--msgstr "<h1>Kuick</h1> 有了這個模組，您可以設定 kuick(KDE quickcopy) 和運行 Konqueror 的外掛。"
-+"<h1>Kuick</h1> With this module you can configure Kuick, the KDE quickcopy "
-+"and move plugin for Konqueror."
-+msgstr ""
-+"<h1>Kuick</h1> 有了這個模組，您可以設定 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) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Traditional Chinese <zh_l10n@linux.org.tw>\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 <keanu@ms50.url.com.tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: zh-l10n <zh-l10n@linux.org.tw> <>\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 <keanu@ms50.url.com.tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\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) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Traditional Chinese <zh_l10n@linux.org.tw>\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) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Traditional Chinese <zh_l10n@linux.org.tw>\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) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Traditional Chinese <zh_l10n@linux.org.tw>\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 <keanu@ms50.url.com.tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: zh-l10n <zh-l10n@linux.org.tw> <>\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) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Traditional Chinese <zh_l10n@linux.org.tw>\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 <maddog@linuxhall.org>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Chinese (traditional) <zh-l10n@lists.linux.org.tw>\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 <ycheng@slat.org>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team:  zh-l10n <zh-l10n@linux.org.tw>\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) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Traditional Chinese <zh_l10n@linux.org.tw>\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) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Traditional Chinese <zh_l10n@linux.org.tw>\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) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Chinese Traditional <zh-l10n@linux.org.tw>\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) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Traditional Chinese <zh_l10n@linux.org.tw>\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 ""
--"<qt>Cannot connect to RSS service. Please make sure the <strong>"
--"rssservice</strong> program is available (usually distributed as part of "
--"kdenetwork).</qt>"
-+"<qt>Cannot connect to RSS service. Please make sure the <strong>rssservice</"
-+"strong> program is available (usually distributed as part of kdenetwork).</"
-+"qt>"
- msgstr ""
--"<qt>無法連接到 RSS 服務。請確定 <strong>rssservice</strong> 程式存在（通常會跟著 kdenetwork 一起）。</qt>"
-+"<qt>無法連接到 RSS 服務。請確定 <strong>rssservice</strong> 程式存在（通常會"
-+"跟著 kdenetwork 一起）。</qt>"
- 
- #: 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) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Traditional Chinese <zh_l10n@linux.org.tw>\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) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Chinese Traditional <zh-l10n@linux.org.tw>\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) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Traditional Chinese <zh_l10n@linux.org.tw>\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) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Traditional Chinese <zh_l10n@linux.org.tw>\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) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Traditional Chinese <zh_l10n@linux.org.tw>\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 "<qt>Unable to open <b>%1</b> for reading.</qt>"
-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) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Traditional Chinese <zh_l10n@linux.org.tw>\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 ""
--"<HTML><BODY>"
--"<p><strong>Please wait! Searching for...</strong></p>"
--"<TABLE BORDER=1 WIDTH=\"100%\"><TR><TD BGCOLOR=\"#707671\"><strong>"
--"Title</strong></TD><TD>%1</TD></TR><TR><TD BGCOLOR=\"#707671\"><strong>"
--"Author</strong></TD><TD>%2</TD></TR><TR><TD BGCOLOR=\"#707671\"><strong>"
--"Album</strong></TD><TD>%3</TD></TR></TABLE>"
--msgstr ""
--"<HTML><BODY>"
--"<p><strong>請稍候，搜尋下列條件中...</strong></p> <TABLE BORDER=1 WIDTH=\"100%\"> <TR> "
--"<TD BGCOLOR=\"#707671\"><strong>標題</strong></TD> <TD>%1</TD> </TR> <TR> "
--"<TD BGCOLOR=\"#707671\"><strong>作者</strong></TD> <TD>%2</TD> </TR> <TR> "
--"<TD BGCOLOR=\"#707671\"><strong>專輯</strong></TD> <TD>%3</TD> </TR> </TABLE>"
-+"<HTML><BODY><p><strong>Please wait! Searching for...</strong></p><TABLE "
-+"BORDER=1 WIDTH=\"100%\"><TR><TD BGCOLOR=\"#707671\"><strong>Title</strong></"
-+"TD><TD>%1</TD></TR><TR><TD BGCOLOR=\"#707671\"><strong>Author</strong></"
-+"TD><TD>%2</TD></TR><TR><TD BGCOLOR=\"#707671\"><strong>Album</strong></"
-+"TD><TD>%3</TD></TR></TABLE>"
-+msgstr ""
-+"<HTML><BODY><p><strong>請稍候，搜尋下列條件中...</strong></p> <TABLE "
-+"BORDER=1 WIDTH=\"100%\"> <TR> <TD BGCOLOR=\"#707671\"><strong>標題</strong></"
-+"TD> <TD>%1</TD> </TR> <TR> <TD BGCOLOR=\"#707671\"><strong>作者</strong></"
-+"TD> <TD>%2</TD> </TR> <TR> <TD BGCOLOR=\"#707671\"><strong>專輯</strong></"
-+"TD> <TD>%3</TD> </TR> </TABLE>"
- 
- #: lyrics.cpp:221
- msgid ""
--"<hr>"
--"<p><strong>Searching at %1</strong>"
--"<br><small>(<a href=\"%3\">%2</a></small>)</p>"
--msgstr ""
--"<hr>"
--"<p><strong>搜尋於 %1...</strong>"
--"<br><small>（<a href=\"%3\">%2</a></small>）</p>"
-+"<hr><p><strong>Searching at %1</strong><br><small>(<a href=\"%3\">%2</a></"
-+"small>)</p>"
-+msgstr ""
-+"<hr><p><strong>搜尋於 %1...</strong><br><small>（<a href=\"%3\">%2</a></"
-+"small>）</p>"
- 
- #: lyrics.cpp:229
- msgid ""
--"<hr>"
--"<p><strong>Using the stored URL</strong>"
--"<br><small>(<a href=\"%2\">%1</a></small>)</p>"
--msgstr ""
--"<hr>"
--"<p><strong>使用已儲存的網址</strong>"
--"<br> <small><a href=\"%2\">%1</a></small></p>"
-+"<hr><p><strong>Using the stored URL</strong><br><small>(<a href=\"%2\">%1</"
-+"a></small>)</p>"
-+msgstr ""
-+"<hr><p><strong>使用已儲存的網址</strong><br> <small><a href=\"%2\">%1</a></"
-+"small></p>"
- 
- #: 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) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Traditional Chinese <zh_l10n@linux.org.tw>\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) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Traditional Chinese <zh_l10n@linux.org.tw>\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) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Traditional Chinese <zh_l10n@linux.org.tw>\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) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Traditional Chinese <zh_l10n@linux.org.tw>\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) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Traditional Chinese <zh_l10n@linux.org.tw>\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) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Traditional Chinese <zh_l10n@linux.org.tw>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
-@@ -69,7 +68,8 @@
- 
- #: plugin_rellinks.cpp:88
- msgid ""
--"<p>This link references the next document in an ordered series of documents.</p>"
-+"<p>This link references the next document in an ordered series of documents."
-+"</p>"
- msgstr "<p>此連結為順序文件的下一份文件。</p>"
- 
- #: 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) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Chinese Traditional <zh-l10n@linux.org.tw>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
-@@ -26,8 +25,8 @@
- 
- #: searchbar.cpp:79
- msgid ""
--"Search Bar"
--"<p>Enter a search term. Click on the icon to change search mode or provider."
-+"Search Bar<p>Enter a search term. Click on the icon to change search mode or "
-+"provider."
- msgstr "搜尋列<p>輸入搜尋條件。點選此圖示改變搜尋模式或提供者。"
- 
- #: 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) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Traditional Chinese <zh_l10n@linux.org.tw>\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) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Traditional Chinese <zh_l10n@linux.org.tw>\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 <jupiter@ocool.org>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Chinese traditional <zh-l10n@linux.org.tw>\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) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Traditional Chinese <zh_l10n@linux.org.tw>\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) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Traditional Chinese <zh_l10n@linux.org.tw>\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 ""
--"<qt>The selected URL cannot be verified because it contains a password. Sending "
--"this URL to <b>%1</b> would put the security of <b>%2</b> at risk.</qt>"
--msgstr "<qt>所選取的網址無法檢查，因為包含密碼。將此網址所到 <b>%1</b> 會有 %2 安全上的風險。</qt>"
-+"<qt>The selected URL cannot be verified because it contains a password. "
-+"Sending this URL to <b>%1</b> would put the security of <b>%2</b> at risk.</"
-+"qt>"
-+msgstr ""
-+"<qt>所選取的網址無法檢查，因為包含密碼。將此網址所到 <b>%1</b> 會有 %2 安全上"
-+"的風險。</qt>"
- 
- #. 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 <ycheng@slat.org>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\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 <jupiter@ocool.org>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Chinese traditional <zh-l10n@linux.org.tw>\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) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Traditional Chinese <zh_l10n@linux.org.tw>\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 <pesder.liao@msa.hinet.net>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\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."
--"<br>In this case, you should probably select <i>/dev/hda</i> "
--"if your boot drive is an IDE drive or <i>/dev/sda</i> "
--"if your boot drive is SCSI."
--msgstr ""
--"在此選擇您想要安裝 LILO 啟動載入器的磁碟或分割區。除非您預備使用 LILO 以外的啟動管理器，它應該被安裝在您的開機磁碟的 MBR (主要啟動紀錄) "
--"中。"
--"<br>在這種狀況下，如果您使用 IDE 磁碟，您應該會使用 <i>/dev/hda</i>；如果您使用 SCSI 磁碟，使用 <i>/dev/sda</i>"
--"。"
-+"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.<br>In this case, "
-+"you should probably select <i>/dev/hda</i> if your boot drive is an IDE "
-+"drive or <i>/dev/sda</i> if your boot drive is SCSI."
-+msgstr ""
-+"在此選擇您想要安裝 LILO 啟動載入器的磁碟或分割區。除非您預備使用 LILO 以外的"
-+"啟動管理器，它應該被安裝在您的開機磁碟的 MBR (主要啟動紀錄) 中。<br>在這種狀"
-+"況下，如果您使用 IDE 磁碟，您應該會使用 <i>/dev/hda</i>；如果您使用 SCSI 磁"
-+"碟，使用 <i>/dev/sda</i>。"
- 
- #: 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 <i>default</i> in the <b>Images</b> tab."
--msgstr "LILO 將會等待在這邊指定的時間之後，自動啟動在<b>映像</b>分頁中標記為<i>預設</i>的核心（或作業系統）。"
-+"LILO will wait the amount of time specified here before booting the kernel "
-+"(or OS) marked as <i>default</i> in the <b>Images</b> tab."
-+msgstr ""
-+"LILO 將會等待在這邊指定的時間之後，自動啟動在<b>映像</b>分頁中標記為<i>預設</"
-+"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."
--"<br>Linear mode tells the boot loader the location of kernels in linear "
--"addressing rather than sector/head/cylinder."
--"<br>linear mode is required for some SCSI drives, and shouldn't hurt unless "
--"you're planning to create a boot disk to be used with a different computer."
--"<br>See the lilo.conf man page for details."
--msgstr ""
--"如果您要使用線性模式，核取此方塊。"
--"<br>線性模式會使啟動載入器以線性位置載入核心而不用 CHS 方式。"
--"<br>對有些 SCSI 磁碟而言，線性模式是必須的。除非您要建立在別台電腦上使用的開機磁碟，這也不會造成傷害。"
--"<br>詳細資料請參照 lilo.conf 手冊頁。"
-+"Check this box if you want to use the linear mode.<br>Linear mode tells the "
-+"boot loader the location of kernels in linear addressing rather than sector/"
-+"head/cylinder.<br>linear mode is required for some SCSI drives, and "
-+"shouldn't hurt unless you're planning to create a boot disk to be used with "
-+"a different computer.<br>See the lilo.conf man page for details."
-+msgstr ""
-+"如果您要使用線性模式，核取此方塊。<br>線性模式會使啟動載入器以線性位置載入核"
-+"心而不用 CHS 方式。<br>對有些 SCSI 磁碟而言，線性模式是必須的。除非您要建立在"
-+"別臺電腦上使用的開機磁碟，這也不會造成傷害。<br>詳細資料請參照 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."
--"<br>The compact mode tries to merge read requests for adjacent sectors into a "
--"single read request. This reduces load time and keeps the boot map smaller, but "
--"will not work on all systems."
-+"Check this box if you want to use the compact mode.<br>The compact mode "
-+"tries to merge read requests for adjacent sectors into a single read "
-+"request. This reduces load time and keeps the boot map smaller, but will not "
-+"work on all systems."
- msgstr ""
--"如果您要使用緊密模式，核取此方塊。"
--"<br>緊密模式嘗試將多個磁區的讀取合併成一次讀取。這可以減少載入的時間並保持較小的啟動對應檔，但不是所有系統都能使用。"
-+"如果您要使用緊密模式，核取此方塊。<br>緊密模式嘗試將多個磁區的讀取合併成一次"
-+"讀取。這可以減少載入的時間並保持較小的啟動對應檔，但不是所有系統都能使用。"
- 
- #: 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 <b>lock</b> option in lilo.conf."
- msgstr ""
--"核取這個方塊以自動紀錄開機命令成為往後開機的預設值。這種方式會讓 LILO “鎖定”這個選擇直到手動變更。\n"
-+"核取這個方塊以自動紀錄開機命令成為往後開機的預設值。這種方式會讓 LILO “鎖"
-+"定”這個選擇直到手動變更。\n"
- "這會設定 lilo.conf 中的 <b>lock</b> 選項。"
- 
- #: 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 <i>linux</i>, but not <i>"
--"linux single</i> or <i>linux init=/bin/sh</i>).\n"
--"This sets the <b>restricted</b> option in lilo.conf."
--"<br>This sets a default for all Linux kernels you want to boot. If you need a "
--"per-kernel setting, go to the <i>Operating systems</i> tab and select <i>"
--"Details</i>."
--msgstr ""
--"如果核取這個方塊，要變更任何參數時，在下面輸入的密碼是必須的。也就是使用者可以啟動 <i>linux</i> 但不能使用 <i>linux single</i> "
--"或 <i>linux init=/bin/sh</i>。\n"
--"這會設定 lilo.conf 中的 <b>restricted</b> 選項。這個會影響所有的核心。如果您希望在每個核心有不同的設定，請到 <i>"
--"作業系統</i> 分頁並選擇 <i>詳細資料</i>。"
-+"parameters are changed (i.e. the user can boot <i>linux</i>, but not "
-+"<i>linux single</i> or <i>linux init=/bin/sh</i>).\n"
-+"This sets the <b>restricted</b> option in lilo.conf.<br>This sets a default "
-+"for all Linux kernels you want to boot. If you need a per-kernel setting, go "
-+"to the <i>Operating systems</i> tab and select <i>Details</i>."
-+msgstr ""
-+"如果核取這個方塊，要變更任何參數時，在下面輸入的密碼是必須的。也就是使用者可"
-+"以啟動 <i>linux</i> 但不能使用 <i>linux single</i> 或 <i>linux init=/bin/sh</"
-+"i>。\n"
-+"這會設定 lilo.conf 中的 <b>restricted</b> 選項。這個會影響所有的核心。如果您"
-+"希望在每個核心有不同的設定，請到 <i>作業系統</i> 分頁並選擇 <i>詳細資料</i>。"
- 
- #: 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."
- "<br><b>WARNING:</b> The password is stored in clear text in /etc/lilo.conf. "
- "You'll want to make sure nobody untrusted can read this file. Also, you "
--"probably don't want to use your normal/root password here."
--"<br>This sets a default for all Linux kernels you want to boot. If you need a "
--"per-kernel setting, go to the <i>Operating systems</i> tab and select <i>"
--"Details</i>."
--msgstr ""
--"在這邊輸入開機時需要的密碼。如果使用了上面的 <i>限制參數</i> 功能，必須要使用這個密碼才能變更參數。"
--"<br><b>警告：</b> 這個密碼是以未編碼的方式存在 /etc/lilo.conf "
--"中。您必須確定未授權的人不能讀取這個檔案。同時，建議不要使用您的一般/管理者密碼。"
--"<br>這個會影響所有的核心，如果您希望在每個核心有不同的設定，請到 <i>作業系統</i> 分頁並使用 <i>詳細資料</i>。"
-+"probably don't want to use your normal/root password here.<br>This sets a "
-+"default for all Linux kernels you want to boot. If you need a per-kernel "
-+"setting, go to the <i>Operating systems</i> tab and select <i>Details</i>."
-+msgstr ""
-+"在這邊輸入開機時需要的密碼。如果使用了上面的 <i>限制參數</i> 功能，必須要使用"
-+"這個密碼才能變更參數。<br><b>警告：</b> 這個密碼是以未編碼的方式存在 /etc/"
-+"lilo.conf 中。您必須確定未授權的人不能讀取這個檔案。同時，建議不要使用您的一"
-+"般/管理者密碼。<br>這個會影響所有的核心，如果您希望在每個核心有不同的設定，請"
-+"到 <i>作業系統</i> 分頁並使用 <i>詳細資料</i>。"
- 
- #: 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."
--"<br>If you intend to use a VGA graphics mode, you must compile the kernel with "
--"support for framebuffer devices. The <i>ask</i> setting brings up a prompt at "
--"boot time."
--"<br>This sets a default for all Linux kernels you want to boot. If you need a "
--"per-kernel setting, go to the <i>Operating systems</i> tab and select <i>"
--"Details</i>."
--msgstr ""
--"您可以在這邊選擇預設的圖形模式。"
--"<br>如果您希望使用 VGA 圖形模式，您必須在編譯核心時加入 framebuffer 的支援。選擇 <i>詢問</i> 將會在開機時詢問您。"
--"<p>這個會影響所有的核心，如果您希望在每個核心有不同的設定，請到 <i>作業系統</i> 分頁並使用 <i>詳細資料</i>。"
-+"You can select the default graphics mode here.<br>If you intend to use a VGA "
-+"graphics mode, you must compile the kernel with support for framebuffer "
-+"devices. The <i>ask</i> setting brings up a prompt at boot time.<br>This "
-+"sets a default for all Linux kernels you want to boot. If you need a per-"
-+"kernel setting, go to the <i>Operating systems</i> tab and select "
-+"<i>Details</i>."
-+msgstr ""
-+"您可以在這邊選擇預設的圖形模式。<br>如果您希望使用 VGA 圖形模式，您必須在編譯"
-+"核心時加入 framebuffer 的支援。選擇 <i>詢問</i> 將會在開機時詢問您。<p>這個會"
-+"影響所有的核心，如果您希望在每個核心有不同的設定，請到 <i>作業系統</i> 分頁並"
-+"使用 <i>詳細資料</i>。"
- 
- #: 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)."
--"<br>This sets the <i>prompt</i> option in lilo.conf."
-+"shift is pressed (in that case, it goes to the LILO prompt).<br>This sets "
-+"the <i>prompt</i> option in lilo.conf."
- msgstr ""
--"如果核取這個方塊，不論是否有按下按鍵都會出現 LILO 提示。如果關閉， LILO 將會啟動預設的作業系統，除非您按下“shift”（這樣就會進入 LILO "
--"提示）。"
--"<br>這個會設定 lilo.conf 中的 <i>prompt</i> 選項。"
-+"如果核取這個方塊，不論是否有按下按鍵都會出現 LILO 提示。如果關閉， LILO 將會"
-+"啟動預設的作業系統，除非您按下“shift”（這樣就會進入 LILO 提示）。<br>這個會設"
-+"定 lilo.conf 中的 <i>prompt</i> 選項。"
- 
- #: 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."
--"<br>This sets the <i>append</i> option in lilo.conf."
--msgstr "在這邊輸入任何您希望傳遞給核心的額外參數。通常您可以保留空白。<br>這會設定 lilo.conf 中的<i>append</i>選項。"
-+"Enter any extra parameters you wish to pass to the kernel here. Usually, "
-+"this can be left blank.<br>This sets the <i>append</i> option in lilo.conf."
-+msgstr ""
-+"在這邊輸入任何您希望傳遞給核心的額外參數。通常您可以保留空白。<br>這會設定 "
-+"lilo.conf 中的<i>append</i>選項。"
- 
- #: 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."
--"<br>If you intend to use a VGA graphics mode, you must compile the kernel with "
--"support for framebuffer devices. The <i>ask</i> setting brings up a prompt at "
--"boot time."
-+"You can select the graphics mode for this kernel here.<br>If you intend to "
-+"use a VGA graphics mode, you must compile the kernel with support for "
-+"framebuffer devices. The <i>ask</i> setting brings up a prompt at boot time."
- msgstr ""
--"您可以在這邊選擇核心所使用的圖形模式。"
--"<br>如果您要使用 VGA 圖形模式，您必須在編譯核心時加入 framebuffer 的支援。選擇 <i>詢問</i> 將會在開機時詢問您。"
-+"您可以在這邊選擇核心所使用的圖形模式。<br>如果您要使用 VGA 圖形模式，您必須在"
-+"編譯核心時加入 framebuffer 的支援。選擇 <i>詢問</i> 將會在開機時詢問您。"
- 
- #: 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."
--"<br>Don't turn this off unless you know what you're doing."
--msgstr ""
--"啟動這個核心時要以唯讀方式掛載的檔案系統。一般而言， init 命令稿會在一些檢查之後，將根檔案系統重新掛載為讀寫模式，這應該要被開啟。"
--"<br>不要關閉這個功能除非您非常確定。"
-+"normally take care of remounting the root filesystem in read-write mode "
-+"after running some checks, this should always be turned on.<br>Don't turn "
-+"this off unless you know what you're doing."
-+msgstr ""
-+"啟動這個核心時要以唯讀方式掛載的檔案系統。一般而言， init 命令稿會在一些檢查"
-+"之後，將根檔案系統重新掛載為讀寫模式，這應該要被開啟。<br>不要關閉這個功能除"
-+"非您非常確定。"
- 
- #: 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."
--"<br>This sets the <i>unsafe</i> 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.<br>This sets the "
-+"<i>unsafe</i> keyword in lilo.conf."
- msgstr ""
--"這個功能關閉一些寫入設定檔時的檢查。在“一般”的情形下，這不應該被使用，但是這仍是有用的，例如提供自軟碟開機的功能而不需要在每次執行 lilo 時放入軟碟片。"
-+"這個功能關閉一些寫入設定檔時的檢查。在“一般”的情形下，這不應該被使用，但是這"
-+"仍是有用的，例如提供自軟碟開機的功能而不需要在每次執行 lilo 時放入軟碟片。"
- "<br>這會設定 lilo.conf 中的 <i>unsafe</i> 關鍵字。"
- 
- #: 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."
--"<br>This sets the <b>lock</b> option in lilo.conf"
--msgstr ""
--"啟動這個功能以啟動自動紀錄開機指令的功能，並將之作為往後開機的預設值。這種方式會讓 LILO “鎖定”這個選擇直到手動變更。"
--"<br>這會設定 lilo.conf 中的 <b>lock</b> 選項。"
-+"default for the following bootups. This way, lilo \"locks\" on a choice "
-+"until it is manually overridden.<br>This sets the <b>lock</b> option in lilo."
-+"conf"
-+msgstr ""
-+"啟動這個功能以啟動自動紀錄開機指令的功能，並將之作為往後開機的預設值。這種方"
-+"式會讓 LILO “鎖定”這個選擇直到手動變更。<br>這會設定 lilo.conf 中的 <b>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 <i>linux</i>, but not <i>"
--"linux single</i> or <i>linux init=/bin/sh</i>).\n"
-+"parameters are changed (i.e. the user can boot <i>linux</i>, but not "
-+"<i>linux single</i> or <i>linux init=/bin/sh</i>).\n"
- "This sets the <b>restricted</b> option in lilo.conf."
- msgstr ""
--"如果核取這個方塊，要變更任何參數時，在下面輸入的密碼是必須的。也就是使用者可以啟動 <i>linux</i> 但不能使用 <i>linux single</i> "
--"或 <i>linux init=/bin/sh</i>。\n"
-+"如果核取這個方塊，要變更任何參數時，在下面輸入的密碼是必須的。也就是使用者可"
-+"以啟動 <i>linux</i> 但不能使用 <i>linux single</i> 或 <i>linux init=/bin/sh</"
-+"i>。\n"
- "這會設定 lilo.conf 中的 <b>restricted</b> 選項。"
- 
- #: 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 ""
--"在這邊輸入開機時需要的密碼（如果有的話）。如果使用了上面的 <i>限制參數</i> 功能，必須要使用這個密碼才能變更參數。"
--"<br><b>警告：</b> 這個密碼是以未編碼的方式存在 /etc/lilo.conf "
--"中。您必須確定未授權的人不能讀取這個檔案。同時，建議不要使用您的一般/管理者密碼。"
-+"在這邊輸入開機時需要的密碼（如果有的話）。如果使用了上面的 <i>限制參數</i> 功"
-+"能，必須要使用這個密碼才能變更參數。<br><b>警告：</b> 這個密碼是以未編碼的方"
-+"式存在 /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."
--"<br>This sets the <i>unsafe</i> 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.<br>This sets the "
-+"<i>unsafe</i> keyword in lilo.conf."
- msgstr ""
--"這個功能關閉一些寫入設定檔時的檢查，在“一般”的情形下，這不應該被使用。但是這仍是有用的，例如提供自軟碟開機的功能而不需要在每次執行 lilo 時放入軟碟片。"
-+"這個功能關閉一些寫入設定檔時的檢查，在“一般”的情形下，這不應該被使用。但是這"
-+"仍是有用的，例如提供自軟碟開機的功能而不需要在每次執行 lilo 時放入軟碟片。"
- "<br>這會設定 lilo.conf 中的 <i>unsafe</i> 關鍵字。"
- 
- #: qt/standalone.cpp:41
-@@ -557,17 +562,21 @@
- 
- #: qt/standalone.cpp:43
- msgid ""
--"The <i>What's This?</i> 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 "<i>這是什麼？</i> 按鈕是這個程式說明系統的一部份。按下這個按鈕以及任何程式元件以取得像這樣的說明視窗。"
-+"The <i>What's This?</i> 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 ""
-+"<i>這是什麼？</i> 按鈕是這個程式說明系統的一部份。按下這個按鈕以及任何程式元"
-+"件以取得像這樣的說明視窗。"
- 
- #: 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 <i>What's This</i> "
--"button on the left."
--msgstr "這個按鈕呼叫程式的線上說明系統。如果它沒有作用，是因為目前沒有說明檔案；此時，請使用右邊的 <i>這是什麼？</i> 按鈕。"
-+"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 <i>What's This</"
-+"i> button on the left."
-+msgstr ""
-+"這個按鈕呼叫程式的線上說明系統。如果它沒有作用，是因為目前沒有說明檔案；此"
-+"時，請使用右邊的 <i>這是什麼？</i> 按鈕。"
- 
- #: 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) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Traditional Chinese <zh_l10n@linux.org.tw>\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 <franklin at goodhorse dot idv dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\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 <b>10240</b> 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 <b>10240</b> bytes."
- msgstr ""
--"磁帶機於個別的區塊讀寫資料。這個設定控制區塊大小，應該與您的磁帶機的區塊大小一致。Floppy 磁帶機應該設定為 <b>10240</b> bytes。"
-+"磁帶機於個別的區塊讀寫資料。這個設定控制區塊大小，應該與您的磁帶機的區塊大小"
-+"一致。Floppy 磁帶機應該設定為 <b>10240</b> 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 <em>non-rewinding</em> "
--"tape device.  The default is <b>/dev/tape</b>."
-+"The location in the filesystem of the <em>non-rewinding</em> tape device.  "
-+"The default is <b>/dev/tape</b>."
- msgstr "<em>不迴帶設備名稱</em>在檔案系統中的位置。預設為<b>/dev/type</b>。"
- 
- #. 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 <b>tar</b>."
--msgstr "這個設定控制 KDat 用於進行磁帶備份的命令。您應該用完整的路徑名稱。預設值為 <b>tar</b>。"
-+"This setting controls the command that KDat uses to perform the tape "
-+"backup.  The full path should be given.  The default is <b>tar</b>."
-+msgstr ""
-+"這個設定控制 KDat 用於進行磁帶備份的命令。您應該用完整的路徑名稱。預設值為 "
-+"<b>tar</b>。"
- 
- #. i18n: file OptionsDlgWidget.ui line 185
- #: rc.cpp:51
-@@ -1147,8 +1152,8 @@
- #: rc.cpp:63
- #, no-c-format
- msgid ""
--"This command issues an <tt>mtload</tt> command to the tape device before trying "
--"to mount it.\n"
-+"This command issues an <tt>mtload</tt> 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 <keanu@ms50.url.com.tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\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) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Traditional Chinese <zh_l10n@linux.org.tw>\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) <franklin@mail.everfocus.com.tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
-+"tw>\n"
- "Language-Team: Chinese Traditional <zh@li.org>\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 ""
- "<p>Using an dynamic IP address causes this device to get a free IP address "
- "automatically.</p>\n"
--"<p>The interface will try to contact an DHCP- or BOOTP-Server during the boot "
--"process.</p>\n"
-+"<p>The interface will try to contact an DHCP- or BOOTP-Server during the "
-+"boot process.</p>\n"
- "<p>Rendevouz is not supported yet.</p>"
- msgstr ""
- "<p>使用動態 IP 位址，網路設備會自動取得 IP 位址。</p>\n"
--"<p>此介面會在開機時試著去尋找 DHCP 或 BOOTP 伺服器。</p> "
--"<p>Rendevouz 尚未支援。</p>"
-+"<p>此介面會在開機時試著去尋找 DHCP 或 BOOTP 伺服器。</p> <p>Rendevouz 尚未支"
-+"援。</p>"
- 
- #. i18n: file kadddevicedlg.ui line 184
- #: rc.cpp:42
-@@ -368,7 +369,9 @@
- "<p>Ensures that this interface gets activated during boot time.</p>\n"
- "<p>Otherwise, you will have to active the interface manually after you have "
- "logged in after the boot process.</p>"
--msgstr "<p>確保在開機期間此介面已經被開啟。</p> <p>不然您就必須在開完機後登入系統，再手動啟動介面。</p>"
-+msgstr ""
-+"<p>確保在開機期間此介面已經被開啟。</p> <p>不然您就必須在開完機後登入系統，再"
-+"手動啟動介面。</p>"
- 
- #. i18n: file kadddevicedlg.ui line 197
- #: rc.cpp:52
-@@ -425,8 +428,8 @@
- "<p>Please enter the desired subnetmask for the interface here.</p>\n"
- "<p>For small private networks, 255.255.255.0 will most often be a reasonable "
- "default value.</p>\n"
--"<p>This field will change from a popup box to a combo box as soon as you enable "
--"the advanced settings below.</p>"
-+"<p>This field will change from a popup box to a combo box as soon as you "
-+"enable the advanced settings below.</p>"
- msgstr ""
- "<p>請輸入此介面的子網路遮罩。</p>\n"
- "<p>對某些小的私密網路而言，255.255.255.0 通常是合理的預設值。</p>\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 ""
- "<p>Here you should enter the IP address for the network interface.</p>\n"
--"<p>Please note: If your network is connected to the internet, you should only "
--"enter IP addresses you have been given by your provider.</p>\n"
-+"<p>Please note: If your network is connected to the internet, you should "
-+"only enter IP addresses you have been given by your provider.</p>\n"
- "<p>Otherwise, you should enter one of the IP addresses which are explicitly "
- "reserved for private use.</p>\n"
- "<p>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.</p>\n"
--"<p>Cass C networks: 192.168.0.0 to 192.168.255.25, for example 192.168.0.13.</p>"
--"\n"
--"<p>Class B networks: 172.16.0.0 to 172.31.255.255, for example 172.28.2.5</p>\n"
-+"<p>Cass C networks: 192.168.0.0 to 192.168.255.25, for example 192.168.0.13."
-+"</p>\n"
-+"<p>Class B networks: 172.16.0.0 to 172.31.255.255, for example 172.28.2.5</"
-+"p>\n"
- "<p>Class A networks: 10.0.0.0 to 10.255.255.255, for example 10.5.12.14</p>\n"
--"<p>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.</p>"
-+"<p>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.</p>"
- msgstr ""
- "<p>請在此輸入網路介面的 IP 位址。</p>\n"
--"<p>請注意：如果您是連接到網際網路上，您應該輸入您的網路服務提供者給您的 IP 位址。</p>\n"
-+"<p>請注意：如果您是連接到網際網路上，您應該輸入您的網路服務提供者給您的 IP 位"
-+"址。</p>\n"
- "<p>否則，您應該輸入私密網路的位址。</p>\n"
--"<p>大部份小的私密網路使用的是 C class 的網路，允許 255 台電腦在同一個網域內。</p> "
--"<p>C class 網路：192.168.0.0 到 192.168.255.255，例如 192.168.0.13。</p>\n"
-+"<p>大部份小的私密網路使用的是 C class 的網路，允許 255 臺電腦在同一個網域內。"
-+"</p> <p>C class 網路：192.168.0.0 到 192.168.255.255，例如 192.168.0.13。</"
-+"p>\n"
- "<p>B class 網路：172.16.0.0 到 172.31.255.255，例如 172.28.2.5。</p>\n"
- "<p>A class 網路：10.0.0.0 到 10.255.255.255，例如 10.5.12.14。</p>\n"
- "<p>請確定您設定的 IP 位址不會跟別人衝突，否則您會遇到一大堆的麻煩。</p>"
-@@ -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 <b>eth0</b>..."
--msgstr "帶起介面<b>eth0</b>..."
-+msgstr "帶起介面<b>eth0</b>…"
- 
- #. 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 ""
--"<font size=\"+1\"><p align=\"center\"><b>Your Platform is Not Supported</b></p>"
--"</font>"
--msgstr "<font size=\"+1\"><p align=\"center\"><b>未支援您的平台</b></p></font>"
-+"<font size=\"+1\"><p align=\"center\"><b>Your Platform is Not Supported</b></"
-+"p></font>"
-+msgstr "<font size=\"+1\"><p align=\"center\"><b>未支援您的平臺</b></p></font>"
- 
- #. 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 <b>sure</b> "
--"your platform behaves the same as the chosen one. Please be sure, because your "
--"current network configuration could be damaged."
--msgstr "如果您<b>十分確定</b>您的平台的行為與以下的平台一樣，您可以選擇其中一個。但請您要十分確定，因為您的網路設定可能會損毀。"
-+"You may choose one of the following supported platforms if you are <b>sure</"
-+"b> your platform behaves the same as the chosen one. Please be sure, because "
-+"your current network configuration could be damaged."
-+msgstr ""
-+"如果您<b>十分確定</b>您的平臺的行為與以下的平臺一樣，您可以選擇其中一個。但請"
-+"您要十分確定，因為您的網路設定可能會損毀。"
- 
- #: 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) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Chinese Traditional <zh-l10n@linux.org.tw>\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) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Traditional Chinese <zh_l10n@linux.org.tw>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
-@@ -19,47 +18,37 @@
- 
- #: IOCore.cpp:51
- msgid ""
--"<error>FAILED</error> to remove <cmd>%1</cmd> from <cmd>%2</cmd>: \"%3\""
--"<br/>"
-+"<error>FAILED</error> to remove <cmd>%1</cmd> from <cmd>%2</cmd>: \"%3\"<br/>"
- msgstr "從 <cmd>%2</cmd> 移除 <cmd>%1</cmd> <error>失敗</error>: \"%3\"<br/>"
- 
- #: 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 <cmd>%1</cmd> from <cmd>%2</cmd><br/>"
- msgstr "從 <cmd>%2</cmd> 移除 <cmd>%1</cmd><br/>"
- 
- #: 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 <cmd>%1</cmd> in <cmd>%2</cmd><br/>"
- msgstr "在 <cmd>%2</cmd> 建立 <cmd>%1</cmd><br/>"
- 
- #: 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 ""
--"<error>FAILED</error> to create <cmd>%1</cmd> in <cmd>%2</cmd>: \"%3\""
--"<br/>"
-+"<error>FAILED</error> to create <cmd>%1</cmd> in <cmd>%2</cmd>: \"%3\"<br/>"
- msgstr "在 <cmd>%2</cmd> 建立 <cmd>%1</cmd> <error>失敗</error>: \"%3\"<br/>"
- 
- #: 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 ""
- "<p>These are the <img src=\"small|exec\"/> <strong>services</strong> "
--"available on your computer. To start a service, drag it onto the <em>Start</em> "
--"section of a runlevel.</p>"
--"<p>To stop one, do the same for the <em>Stop</em> section.</p>"
--msgstr ""
--"<p>這式您系統紹可用的 <img src=\"small|exec\"/><strong>服務</strong>"
--". 要啟動一個服務, 拖曳他到執行層級的<em>啟動</em>區域.</p>"
--"<p>要停止, 拖曳到<em>停止</em>區域.</p>"
-+"available on your computer. To start a service, drag it onto the <em>Start</"
-+"em> section of a runlevel.</p><p>To stop one, do the same for the <em>Stop</"
-+"em> section.</p>"
-+msgstr ""
-+"<p>這式您系統紹可用的 <img src=\"small|exec\"/><strong>服務</strong>. 要啟動"
-+"一個服務, 拖曳他到執行層級的<em>啟動</em>區域.</p><p>要停止, 拖曳到<em>停止</"
-+"em>區域.</p>"
- 
- #: OldView.cpp:242
- msgid ""
- "<p>You can drag services from a runlevel onto the <img src=\"small|trash\"/> "
--"<strong>trashcan</strong> to delete them from that runlevel.</p>"
--"<p>The <strong>Undo command</strong> can be used to restore deleted entries.</p>"
-+"<strong>trashcan</strong> to delete them from that runlevel.</p><p>The "
-+"<strong>Undo command</strong> can be used to restore deleted entries.</p>"
- msgstr ""
--"<p>您可以從啟動層級拖曳服務到 <img src=\"small|trash\"/> <strong>資源回收桶</strong> 以將之刪除.</p>"
--"<p><strong>復原</strong> 可以用來復原刪除的項目.</p>"
-+"<p>您可以從啟動層級拖曳服務到 <img src=\"small|trash\"/> <strong>資源回收桶</"
-+"strong> 以將之刪除.</p><p><strong>復原</strong> 可以用來復原刪除的項目.</p>"
- 
- #: OldView.cpp:254
- #, c-format
-@@ -113,18 +102,17 @@
- 
- #: OldView.cpp:260
- msgid ""
--"<p>These are the services <strong>started</strong> in runlevel %1.</p>"
--"<p>The number shown on the left of the <img src=\"user|ksysv_start\"/> "
--"icon determines the order in which the services are started. You can arrange "
--"them via drag and drop, as long as a suitable <em>sorting number</em> "
--"can be generated.</p>"
--"<p>If that's not possible, you have to change the number manually via the "
--"<strong>Properties dialog box</strong>.</p>"
--msgstr ""
--"<p>這是在啟動層級 %1 所<strong>啟動</strong> 的服務.</p>"
--"<p>在<img src=\"user|ksysv_start\"/>圖示左邊的編號決定了服務啟動的順序. 您可以經由拖放來排序, 如此適當的<em>"
--"排列編號</em>會被產生.</p>"
--"<p>如果沒有適當的產生, 您可以經由在<strong>內容對話方塊</strong>中手動改變編號.</p>"
-+"<p>These are the services <strong>started</strong> in runlevel %1.</p><p>The "
-+"number shown on the left of the <img src=\"user|ksysv_start\"/> icon "
-+"determines the order in which the services are started. You can arrange them "
-+"via drag and drop, as long as a suitable <em>sorting number</em> can be "
-+"generated.</p><p>If that's not possible, you have to change the number "
-+"manually via the <strong>Properties dialog box</strong>.</p>"
-+msgstr ""
-+"<p>這是在啟動層級 %1 所<strong>啟動</strong> 的服務.</p><p>在<img src=\"user|"
-+"ksysv_start\"/>圖示左邊的編號決定了服務啟動的順序. 您可以經由拖放來排序, 如此"
-+"適當的<em>排列編號</em>會被產生.</p><p>如果沒有適當的產生, 您可以經由在"
-+"<strong>內容對話方塊</strong>中手動改變編號.</p>"
- 
- #: OldView.cpp:268
- msgid "Start"
-@@ -132,18 +120,17 @@
- 
- #: OldView.cpp:278
- msgid ""
--"<p>These are the services <strong>stopped</strong> in runlevel %1.</p>"
--"<p>The number shown on the left of the <img src=\"user|ksysv_stop\"/> "
--"icon determines the order in which the services are stopped. You can arrange "
--"them via drag and drop, as long as a suitable <em>sorting number</em> "
--"can be generated.</p>"
--"<p>If that's not possible, you have to change the number manually via the "
--"<strong>Properties dialog box</strong>.</p>"
--msgstr ""
--"<p>這是在啟動層級 %1 所<strong>停止</strong> 的服務.</p>"
--"<p>在<img src=\"user|ksysv_stop\"/>圖示左邊的編號決定了服務停止的順序. 您可以經由拖放來排序, 如此適當的<em>"
--"排列編號</em>會被產生.</p>"
--"<p>如果沒有適當的產生, 您可以經由在<strong>內容對話方塊</strong>中手動改變編號.</p>"
-+"<p>These are the services <strong>stopped</strong> in runlevel %1.</p><p>The "
-+"number shown on the left of the <img src=\"user|ksysv_stop\"/> icon "
-+"determines the order in which the services are stopped. You can arrange them "
-+"via drag and drop, as long as a suitable <em>sorting number</em> can be "
-+"generated.</p><p>If that's not possible, you have to change the number "
-+"manually via the <strong>Properties dialog box</strong>.</p>"
-+msgstr ""
-+"<p>這是在啟動層級 %1 所<strong>停止</strong> 的服務.</p><p>在<img src=\"user|"
-+"ksysv_stop\"/>圖示左邊的編號決定了服務停止的順序. 您可以經由拖放來排序, 如此"
-+"適當的<em>排列編號</em>會被產生.</p><p>如果沒有適當的產生, 您可以經由在"
-+"<strong>內容對話方塊</strong>中手動改變編號.</p>"
- 
- #: OldView.cpp:353
- #, c-format
-@@ -221,19 +208,20 @@
- 
- #: OldView.cpp:937
- msgid ""
--"<p>You have specified that your system's init scripts are located in the folder "
--"<tt><b>%1</b></tt>, but this folder does not exist. You probably selected the "
--"wrong distribution during configuration.</p> "
--"<p>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.</p>"
--"<p>Would you like to reconfigure %4?</p>"
--msgstr ""
--"<p>你剛才將你系統的啟動 scrpit 目錄指定到 <tt><b>%1</b></tt>,但這個目錄並不存在。你可能在設定時選擇了錯誤的版本。</p> "
--"<p>如果你重新設定 %2,或許就可以修正這個錯誤。如果你選擇要重新設定，你應該將這個程式關掉, 這樣組態設定精靈就會在下一次 %3 "
--"啟動時執行。如果你選擇不要重新設定組態，你將無法檢視或是編輯你系統啟動時的設定。</p> "
--"<p>你願意重新設定 %4 ?</p>"
-+"<p>You have specified that your system's init scripts are located in the "
-+"folder <tt><b>%1</b></tt>, but this folder does not exist. You probably "
-+"selected the wrong distribution during configuration.</p> <p>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.</p><p>Would you like to reconfigure %4?</p>"
-+msgstr ""
-+"<p>你剛才將你系統的啟動 scrpit 目錄指定到 <tt><b>%1</b></tt>,但這個目錄並不存"
-+"在。你可能在設定時選擇了錯誤的版本。</p> <p>如果你重新設定 %2,或許就可以修正"
-+"這個錯誤。如果你選擇要重新設定，你應該將這個程式關掉, 這樣組態設定精靈就會在"
-+"下一次 %3 啟動時執行。如果你選擇不要重新設定組態，你將無法檢視或是編輯你系統"
-+"啟動時的設定。</p> <p>你願意重新設定 %4 ?</p>"
- 
- #: OldView.cpp:954
- msgid "Folder Does Not Exist"
-@@ -250,16 +238,17 @@
- #: OldView.cpp:965
- msgid ""
- "<p>You do not have the right permissions to edit your system's init "
--"configuration. However, you are free to browse the runlevels.</p>"
--"<p>If you really want to edit the configuration, either <strong>restart</strong> "
--"%1 <strong>as root</strong> (or another privileged user), or ask your sysadmin "
--"to install %2 <em>suid</em> or <em>sgid</em>.</p>"
--"<p>The latter way is not recommended though, due to security issues.</p>"
--msgstr ""
--"<p>抱歉, 您沒有足夠的權限可以編輯您系統的啟動組態.然而, 您可以瀏覽這個啟動層級.</p>"
--"<p>如果您比較希望編輯這個組態, 您可以<strong>用 root 的身分重新啟動</strong> "
--"%1 (或使用一個具有較多權限的使用者), 或要求您的系統管理者以 <em>suid</em> 或 <em>sgid</em> 模式安裝 %2.</p>"
--"<p>但因為安全的因素, 不建議後者.</p>"
-+"configuration. However, you are free to browse the runlevels.</p><p>If you "
-+"really want to edit the configuration, either <strong>restart</strong> %1 "
-+"<strong>as root</strong> (or another privileged user), or ask your sysadmin "
-+"to install %2 <em>suid</em> or <em>sgid</em>.</p><p>The latter way is not "
-+"recommended though, due to security issues.</p>"
-+msgstr ""
-+"<p>抱歉, 您沒有足夠的權限可以編輯您系統的啟動組態.然而, 您可以瀏覽這個啟動層"
-+"級.</p><p>如果您比較希望編輯這個組態, 您可以<strong>用 root 的身分重新啟動</"
-+"strong> %1 (或使用一個具有較多權限的使用者), 或要求您的系統管理者以 "
-+"<em>suid</em> 或 <em>sgid</em> 模式安裝 %2.</p><p>但因為安全的因素, 不建議後"
-+"者.</p>"
- 
- #: 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 ""
- "<p>Click on the checkboxes to <strong>show</strong> or <strong>hide</strong> "
--"runlevels.</p> "
--"<p>The list of currently visible runlevels is saved when you use the <strong>"
--"Save Options command</strong>.</p>"
-+"runlevels.</p> <p>The list of currently visible runlevels is saved when you "
-+"use the <strong>Save Options command</strong>.</p>"
- msgstr ""
--"<p>在方塊中點選以<strong>顯示</strong>或<strong>隱藏</strong>啟動層級.</p>"
--"<p>目前可見的執行層級列表會在您使用<strong>儲存選項</strong>時被儲存.</p>"
-+"<p>在方塊中點選以<strong>顯示</strong>或<strong>隱藏</strong>啟動層級.</p><p>"
-+"目前可見的執行層級列表會在您使用<strong>儲存選項</strong>時被儲存.</p>"
- 
- #: TopWidget.cpp:402
- msgid "Show only the selected runlevels"
-@@ -478,19 +468,16 @@
- 
- #: TopWidget.cpp:422
- msgid ""
--"<p>If the lock is closed <img src=\"user|ksysv_locked\"/>"
--", you don't have the right <strong>permissions</strong> "
--"to edit the init configuration.</p>"
--"<p>Either restart %1 as root (or another more privileged user), or ask your "
--"sysadmin to install %1 <em>suid</em> or <em>sgid</em>.</p>"
--"<p>The latter way is <strong>not</strong> recommended though, due to security "
--"issues.</p>"
--msgstr ""
--"<p>當鎖定被關閉<img src=\"user|ksysv_locked\"/>, 您不能得到正確的<strong>權限</strong>"
--"來編輯啟動組態.</p>"
--"<p>重新以 root 啟動 %1 (或是以一個擁有比較多權限的使用者) 或要求您的系統管理者以 <em>suid</em> 或 <em>sgid</em>"
--"安裝 %1.</p>"
--"<p>但因為安全的因素, <strong>不建議</strong>後者.</p>"
-+"<p>If the lock is closed <img src=\"user|ksysv_locked\"/>, you don't have "
-+"the right <strong>permissions</strong> to edit the init configuration.</"
-+"p><p>Either restart %1 as root (or another more privileged user), or ask "
-+"your sysadmin to install %1 <em>suid</em> or <em>sgid</em>.</p><p>The latter "
-+"way is <strong>not</strong> recommended though, due to security issues.</p>"
-+msgstr ""
-+"<p>當鎖定被關閉<img src=\"user|ksysv_locked\"/>, 您不能得到正確的<strong>權限"
-+"</strong>來編輯啟動組態.</p><p>重新以 root 啟動 %1 (或是以一個擁有比較多權限"
-+"的使用者) 或要求您的系統管理者以 <em>suid</em> 或 <em>sgid</em>安裝 %1.</"
-+"p><p>但因為安全的因素, <strong>不建議</strong>後者.</p>"
- 
- #: TopWidget.cpp:566
- msgid " Changed"
-@@ -510,14 +497,14 @@
- 
- #: TopWidget.cpp:830
- msgid ""
--"<p>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.</p>"
--"<p>Please adjust the sorting numbers manually via the <strong>"
--"Properties dialog box</strong>.</p>"
--msgstr ""
--"<p>抱歉, 無法產生適當的排列號碼給這個位置. 這表示在前後相鄰的服務中沒有可用的編號, 且服務無法符合詞彙.</p>"
--"<p>請使用<strong>內容對話方塊</strong>手動調整排列編號.</p>"
-+"<p>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.</p><p>Please adjust the sorting "
-+"numbers manually via the <strong>Properties dialog box</strong>.</p>"
-+msgstr ""
-+"<p>抱歉, 無法產生適當的排列號碼給這個位置. 這表示在前後相鄰的服務中沒有可用的"
-+"編號, 且服務無法符合詞彙.</p><p>請使用<strong>內容對話方塊</strong>手動調整排"
-+"列編號.</p>"
- 
- #: 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公司的 <em>tksysv</em> 相似, 但 <em>Sys-V 啟動編輯器</em>"
--"允許拖放操作,同時也可以使用鍵盤."
-+"Sys-V 風格的啟動編輯器,與RedHat公司的 <em>tksysv</em> 相似, 但 <em>Sys-V 啟動"
-+"編輯器</em>允許拖放操作,同時也可以使用鍵盤."
- 
- #: 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 ""
- "<h1>Congratulations!</h1>\n"
- "<p>\n"
--"You have finished the initial configuration of SysV-Init Editor. <b>Press</b> "
--"the button labeled <b>Finish</b> to start editing your init-configuration.\n"
-+"You have finished the initial configuration of SysV-Init Editor. <b>Press</"
-+"b> the button labeled <b>Finish</b> to start editing your init-"
-+"configuration.\n"
- "</p>"
- msgstr ""
- "<h1>恭喜!</h1>\n"
- "<p>\n"
--"您完成了 Sys-V 啟動編輯器的初始化組態. <b>按下</b>標有<b>完成</b>的按鈕以開始編輯您的啟動組態.\n"
-+"您完成了 Sys-V 啟動編輯器的初始化組態. <b>按下</b>標有<b>完成</b>的按鈕以開始"
-+"編輯您的啟動組態.\n"
- "</p>"
- 
- #. 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).</p>\n"
- "<p>Changed service entries will be distinguished by this color.</p>"
- msgstr ""
--"<p>使用<strong>選擇顏色對話方塊</strong>來選取文字顏色給<em>已變更的服務</em> (改變順序或名稱).</p>\n"
-+"<p>使用<strong>選擇顏色對話方塊</strong>來選取文字顏色給<em>已變更的服務</"
-+"em> (改變順序或名稱).</p>\n"
- "<p>已變更的服務將會用這個顏色標示.</p>"
- 
- #. 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 @@
- "<em>services new to a runlevel</em>.</p>\n"
- "<p>New service entries will be distinguished by this color.</p>"
- msgstr ""
--"<p>使用<strong>選擇顏色對話方塊</strong>來選取文字顏色給<em>新增到啟動層級的服務</em>.</p>\n"
-+"<p>使用<strong>選擇顏色對話方塊</strong>來選取文字顏色給<em>新增到啟動層級的"
-+"服務</em>.</p>\n"
- "<p>新的服務將會用這個顏色標示.</p>"
- 
- #. 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 ""
- "<p>Use the <strong>Select Color dialog box</strong> to pick a selected text "
--"color for <em>services that have been changed</em> (either order/sorting number "
--"or name).</p>\n"
--"<p>Changed service entries will be distinguished by this color while they are "
--"selected.</p>"
-+"color for <em>services that have been changed</em> (either order/sorting "
-+"number or name).</p>\n"
-+"<p>Changed service entries will be distinguished by this color while they "
-+"are selected.</p>"
- msgstr ""
--"<p>使用<strong>選擇顏色對話方塊</strong>來選取一個選定的文字顏色給<em>已變更的服務</em> (改變順序或名稱).</p>\n"
-+"<p>使用<strong>選擇顏色對話方塊</strong>來選取一個選定的文字顏色給<em>已變更"
-+"的服務</em> (改變順序或名稱).</p>\n"
- "<p>已變更的服務被選取時將會用這個顏色標示.</p>"
- 
- #. i18n: file lookandfeelconfig.ui line 382
-@@ -867,20 +859,21 @@
- "<p>New service entries will be distinguished by this color while they are "
- "selected.</p>"
- msgstr ""
--"<p>使用<strong>選擇顏色對話方塊</strong>來選取一個選定的文字顏色給<em>新增到啟動層級的服務</em>.</p>\n"
-+"<p>使用<strong>選擇顏色對話方塊</strong>來選取一個選定的文字顏色給<em>新增到"
-+"啟動層級的服務</em>.</p>\n"
- "<p>新的服務被選取時將會用這個顏色標示.</p>"
- 
- #. 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) <franklin@mail.everfocus.com.tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
-+"tw>\n"
- "Language-Team: Chinese Traditional <zh@li.org>\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 ""
- "<p>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."
--"<p>Do you want to add it now?"
--msgstr "<p>shell %1 尚未列於檔案 %2。為了要使用這個 shell 您必須先將它加入到這個檔案。<p>您要現在加入它嗎？"
-+"you must add it to this file first.<p>Do you want to add it now?"
-+msgstr ""
-+"<p>shell %1 尚未列於檔案 %2。為了要使用這個 shell 您必須先將它加入到這個檔"
-+"案。<p>您要現在加入它嗎？"
- 
- #: 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. <BR><B>Files</B> "
--"stores user/group data in traditional /etc/passwd and /etc/group flat files. "
--"<BR><B>LDAP</B> 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.<BR><B>System</B> "
--"provides a read-only access to all users and groups which your installation "
--"knows about."
-+"three storage backends are supported. <BR><B>Files</B> stores user/group "
-+"data in traditional /etc/passwd and /etc/group flat files. <BR><B>LDAP</B> "
-+"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.<BR><B>System</B> provides a read-only "
-+"access to all users and groups which your installation knows about."
- msgstr ""
- "這個選項讓您選擇使用者與群組的資料要儲存在哪裡。目前有三種後端型態可以選擇。"
--"<br> 選擇<b>檔案</b>會將使用者與群組資料存放在傳統的 /etc/passwd 與 /etc/group 檔案中。"
--"<br> 選擇<b>LDAP</b>會將這些資料用 posixAccount 與 posixGroup object classes "
--"放在目錄伺服器中。這個選項也可以用來管理 Samba 使用者與群組，此時是使用 sambaSamAccount object class。"
--"<br> 選擇<b>系統</b>則會提供一種讓所有使用者與群組只能唯讀的方式。"
-+"<br> 選擇<b>檔案</b>會將使用者與群組資料存放在傳統的 /etc/passwd 與 /etc/"
-+"group 檔案中。<br> 選擇<b>LDAP</b>會將這些資料用 posixAccount 與 posixGroup "
-+"object classes 放在目錄伺服器中。這個選項也可以用來管理 Samba 使用者與群組，"
-+"此時是使用 sambaSamAccount object class。<br> 選擇<b>系統</b>則會提供一種讓所"
-+"有使用者與群組只能唯讀的方式。"
- 
- #. 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 <shell@shellhung.org>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Traditional Chinese <zh-l10n@linux.org.tw>\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) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Traditional Chinese <zh_l10n@linux.org.tw>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
-@@ -74,15 +73,13 @@
- #: kdesavers/Euphoria.cpp:1040
- msgid ""
- "<h3>Euphoria 1.0</h3>\n"
--"<p>Copyright (c) 2002 Terence M. Welsh"
--"<br>\n"
-+"<p>Copyright (c) 2002 Terence M. Welsh<br>\n"
- "<a href=\"http://www.reallyslick.com/\">http://www.reallyslick.com/</a></p>\n"
- "\n"
- "<p>Ported to KDE by Karl Robillard</p>"
- msgstr ""
- "<h3>Euphoria 1.0</h3>\n"
--"<p>Copyright (c) 2002 Terence M. Welsh"
--"<br>\n"
-+"<p>Copyright (c) 2002 Terence M. Welsh<br>\n"
- "<a href=\"http://www.reallyslick.com/\">http://www.reallyslick.com/</a></p>\n"
- "\n"
- "<p>由Karl Robillard移植到KDE</p>"
-@@ -118,15 +115,13 @@
- #: kdesavers/Flux.cpp:921
- msgid ""
- "<h3>Flux 1.0</h3>\n"
--"<p>Copyright (c) 2002 Terence M. Welsh"
--"<br>\n"
-+"<p>Copyright (c) 2002 Terence M. Welsh<br>\n"
- "<a href=\"http://www.reallyslick.com/\">http://www.reallyslick.com/</a></p>\n"
- "\n"
- "<p>Ported to KDE by Karl Robillard</p>"
- msgstr ""
- "<h3>Flux 1.0</h3>\n"
--"<p>Copyright (c) 2002 Terence M. Welsh"
--"<br>\n"
-+"<p>Copyright (c) 2002 Terence M. Welsh<br>\n"
- "<a href=\"http://www.reallyslick.com/\">http://www.reallyslick.com/</a></p>\n"
- "\n"
- "<p>由Karl Robillard移植到KDE</p>"
-@@ -162,15 +157,13 @@
- #: kdesavers/SolarWinds.cpp:733
- msgid ""
- "<h3>Solar Winds 1.0</h3>\n"
--"<p>Copyright (c) 2002 Terence M. Welsh"
--"<br>\n"
-+"<p>Copyright (c) 2002 Terence M. Welsh<br>\n"
- "<a href=\"http://www.reallyslick.com/\">http://www.reallyslick.com/</a></p>\n"
- "\n"
- "<p>Ported to KDE by Karl Robillard</p>"
- msgstr ""
- "<h3>太陽風 1.0</h3>\n"
--"<p>Copyright (c) 2002 Terence M. Welsh"
--"<br>\n"
-+"<p>Copyright (c) 2002 Terence M. Welsh<br>\n"
- "<a href=\"http://www.reallyslick.com/\">http://www.reallyslick.com/</a></p>\n"
- "\n"
- "<p>由Karl Robillard移植到KDE</p>"
-@@ -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 ""
- "<h3>Particle Fountain</h3>\n"
- "<p>Particle Fountain Screen Saver for KDE</p>\n"
--"Copyright (c)  Ian Reinhart Geiser 2001"
--"<br>\n"
-+"Copyright (c)  Ian Reinhart Geiser 2001<br>\n"
- "\n"
- "<p>KConfig code and KScreenSaver \"Setup...\" improvements by Nick Betcher "
- "<nbetcher@usinternet.com> 2001</p>"
- msgstr ""
- "<h3>粒子噴泉</h3>\n"
- "<p>KDE的粒子噴泉螢幕保護程式</p>\n"
--"Copyright (c)  Ian Reinhart Geiser 2001"
--"<br>\n"
-+"Copyright (c)  Ian Reinhart Geiser 2001<br>\n"
- "\n"
--"<p>KConfig code 和 KScreenSaver \"Setup...\" 由 Nick Betcher "
--"所改進<nbetcher@usinternet.com> 2001</p>"
-+"<p>KConfig code 和 KScreenSaver \"Setup...\" 由 Nick Betcher 所改進"
-+"<nbetcher@usinternet.com> 2001</p>"
- 
- #: kdesavers/gravity.cpp:40
- msgid "Particle Gravity Screen Saver"
-@@ -373,19 +364,17 @@
- msgid ""
- "<h3>Gravity</h3>\n"
- "<p>Particle Gravity Screen Saver for KDE</p>\n"
--"Copyright (c)  Ian Reinhart Geiser 2001"
--"<br>\n"
-+"Copyright (c)  Ian Reinhart Geiser 2001<br>\n"
- "\n"
- "<p>KConfig code and KScreenSaver \"Setup...\" improvements by Nick Betcher "
- "<nbetcher@usinternet.com> 2001</p>"
- msgstr ""
- "<h3>重力</h3>\n"
- "<p>KDE的螢幕粒子重力保護程式</p>\n"
--"Copyright (c)  Ian Reinhart Geiser 2001"
--"<br>\n"
-+"Copyright (c)  Ian Reinhart Geiser 2001<br>\n"
- "\n"
--"<p>KConfig code 和 KScreenSaver \"Setup...\" 由Nick Betcher "
--"所改進<nbetcher@usinternet.com> 2001</p>"
-+"<p>KConfig code 和 KScreenSaver \"Setup...\" 由Nick Betcher 所改進"
-+"<nbetcher@usinternet.com> 2001</p>"
- 
- #: kdesavers/kclock.cpp:54
- msgid "Clock"
-@@ -443,9 +432,7 @@
- 
- #: kdesavers/kclock.cpp:228
- msgid ""
--"Clock Screen Saver"
--"<br>Version 1.0"
--"<br><nobr>Melchior FRANZ (c) 2003</nobr>"
-+"Clock Screen Saver<br>Version 1.0<br><nobr>Melchior FRANZ (c) 2003</nobr>"
- msgstr "時鐘螢幕保護程式<br>版本 1.0<br><nobr>Melchior FRANZ (c) 2003</nobr>"
- 
- #: kdesavers/kvm.cpp:65
-@@ -600,15 +587,12 @@
- 
- #: kdesavers/pendulum.cpp:788
- msgid ""
--"<h3>KPendulum Screen Saver for KDE</h3>"
--"<p>Simulation of a two-part pendulum</p>"
--"<p>Copyright (c) Georg&nbsp;Drenkhahn 2004</p>"
--"<p><tt>georg-d@users.sourceforge.net</tt></p>"
--msgstr ""
--"<h3>KPendulum 螢幕保護程式</h3> "
--"<p>模擬一個兩部份鐘擺</p> "
--"<p>Copyright (c) Georg&nbsp;Drenkhahn 2004</p> "
--"<p><tt>georg-d@users.sourceforge.net</tt></p>"
-+"<h3>KPendulum Screen Saver for KDE</h3><p>Simulation of a two-part pendulum</"
-+"p><p>Copyright (c) Georg&nbsp;Drenkhahn 2004</p><p><tt>georg-d@users."
-+"sourceforge.net</tt></p>"
-+msgstr ""
-+"<h3>KPendulum 螢幕保護程式</h3> <p>模擬一個兩部份鐘擺</p> <p>Copyright (c) "
-+"Georg&nbsp;Drenkhahn 2004</p> <p><tt>georg-d@users.sourceforge.net</tt></p>"
- 
- #: kdesavers/polygon.cpp:35
- msgid "KPolygon"
-@@ -656,15 +640,13 @@
- 
- #: kdesavers/rotation.cpp:782
- msgid ""
--"<h3>KRotation Screen Saver for KDE</h3>"
--"<p>Simulation of a force free rotating asymmetric body</p>"
--"<p>Copyright (c) Georg&nbsp;Drenkhahn 2004</p>"
--"<p><tt>georg-d@users.sourceforge.net</tt></p>"
--msgstr ""
--"<h3>KRotation 螢幕保護程式</h3> "
--"<p>模擬不對稱主體的自由旋轉。</p> "
--"<p>Copyright (c) Georg&nbsp;Drenkhahn 2004</p>"
--"<p><tt>georg-d@users.sourceforge.net</tt></p>"
-+"<h3>KRotation Screen Saver for KDE</h3><p>Simulation of a force free "
-+"rotating asymmetric body</p><p>Copyright (c) Georg&nbsp;Drenkhahn 2004</"
-+"p><p><tt>georg-d@users.sourceforge.net</tt></p>"
-+msgstr ""
-+"<h3>KRotation 螢幕保護程式</h3> <p>模擬不對稱主體的自由旋轉。</p> "
-+"<p>Copyright (c) Georg&nbsp;Drenkhahn 2004</p><p><tt>georg-d@users."
-+"sourceforge.net</tt></p>"
- 
- #: 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 ""
- "<p align=\"center\">\n"
--"m<sub>2</sub>"
--"<br>\n"
--"-----------"
--"<br>\n"
-+"m<sub>2</sub><br>\n"
-+"-----------<br>\n"
- "m<sub>1</sub>+m<sub>2</sub>\n"
- "</p>"
- msgstr ""
- "<p align=\"center\">\n"
--"m<sub>2</sub>"
--"<br>\n"
--"-----------"
--"<br>\n"
-+"m<sub>2</sub><br>\n"
-+"-----------<br>\n"
- "m<sub>1</sub>+m<sub>2</sub>\n"
- "</p>"
- 
-@@ -1482,18 +1458,14 @@
- #, no-c-format
- msgid ""
- "<p align=\"center\">\n"
--"l<sub>2</sub>"
--"<br>\n"
--"------"
--"<br>\n"
-+"l<sub>2</sub><br>\n"
-+"------<br>\n"
- "l<sub>1</sub>+l<sub>2</sub>\n"
- "</p>"
- msgstr ""
- "<p align=\"center\">\n"
--"l<sub>2</sub>"
--"<br>\n"
--"------"
--"<br>\n"
-+"l<sub>2</sub><br>\n"
-+"------<br>\n"
- "l<sub>1</sub>+l<sub>2</sub>\n"
- "</p>"
- 
-@@ -1513,12 +1485,10 @@
- #: rc.cpp:422
- #, no-c-format
- msgid ""
--"Perspective"
--"<br>\n"
-+"Perspective<br>\n"
- "Change [s]"
- msgstr ""
--"部份"
--"<br>\n"
-+"部份<br>\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) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Traditional Chinese <zh_l10n@linux.org.tw>\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) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Traditional Chinese <zh_l10n@linux.org.tw>\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) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Traditional Chinese <zh_l10n@linux.org.tw>\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 <b>"
--"http://icewm.themes.org/</b> 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 <b>http://icewm.themes.org/</b> theme files into this folder, "
-+"or by creating folder symlinks to existing IceWM themes on your system."
- msgstr ""
--"點選上方的連結讓視窗顯示 KDE IceWM 主題資料夾。您可以將 <b>http://icewm.themes.org/</b> "
--"的主題檔案解壓到此資料夾，或是建立連到目前 IceWM 主題的符號連結以新增或移除原始的 IceWM 主題。"
-+"點選上方的連結讓視窗顯示 KDE IceWM 主題資料夾。您可以將 <b>http://icewm."
-+"themes.org/</b> 的主題檔案解壓到此資料夾，或是建立連到目前 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) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Traditional Chinese <zh_l10n@linux.org.tw>\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 "
--"&lt;http://cosmos.dnsalias.net/cosmos/&gt;"
-+"Draws fireworks and zooming, fading flares. By Tom Campbell. You can find it "
-+"at &lt;http://cosmos.dnsalias.net/cosmos/&gt;"
- 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 &lt;http://www.electricsheep.org/&gt;. 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 &lt;http://www.electricsheep.org/&gt;. 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 &lt;lassauge@mail.dotcom.fr&gt;."
-+"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 &lt;lassauge@mail.dotcom.fr&gt;."
- msgstr ""
--"畫出在充滿樹的風景中，立體三角形像煙火一樣撒落。需要 OpenGL，還有夠快的硬體支援。由 Eric Lassauge "
--"&lt;lassauge@mail.dotcom.fr&gt; 撰寫。"
-+"畫出在充滿樹的風景中，立體三角形像煙火一樣撒落。需要 OpenGL，還有夠快的硬體支"
-+"援。由 Eric Lassauge &lt;lassauge@mail.dotcom.fr&gt; 撰寫。"
- 
- #: 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 &lt;http://www.draves.org/goban/&gt;."
--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 &lt;http://www.draves.org/goban/&gt;."
-+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 &lt;lassauge@mail.dotcom.fr&gt;."
-+"OpenGL, and a machine with fast hardware support for texture maps. Written "
-+"by Eric Lassauge &lt;lassauge@mail.dotcom.fr&gt;."
- msgstr ""
--"畫出一些有花紋的球瘋狂地旋轉。需要 OpenGL，及夠快的硬體。由 Eric Lassauge &lt;lassauge@mail.dotcom.fr&gt; "
--"撰寫。"
-+"畫出一些有花紋的球瘋狂地旋轉。需要 OpenGL，及夠快的硬體。由 Eric Lassauge "
-+"&lt;lassauge@mail.dotcom.fr&gt; 撰寫。"
- 
- #: 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 "
--"&lt;http://www.dgp.utoronto.ca/~mjmcguff/eversion/&gt;."
--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 &lt;http://www.dgp.utoronto.ca/~mjmcguff/eversion/&gt;."
-+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 &lt;http://www1.las.es/~amil/ssystem/&gt;, 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 &lt;http://www1.las.es/~amil/ssystem/"
-+"&gt;, 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 "
--"&lt;http://limax.paru.cas.cz/~hubicka/XaoS/&gt;."
--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 &lt;http://limax.paru.cas.cz/~hubicka/XaoS/&gt;."
-+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 &lt;http://www.jwz.org/xdaliclock/&gt;."
-+"included with the XScreenSaver package, but if you don't have it already, "
-+"you can find it at &lt;http://www.jwz.org/xdaliclock/&gt;."
- 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 "
--"&lt;http://www.cs.colorado.edu/~tuna/xearth/&gt;."
--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 &lt;http://www.cs.colorado.edu/"
-+"~tuna/xearth/&gt;."
-+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 "
--"&lt;http://metalab.unc.edu/pub/Linux/X11/demos/&gt;."
-+"Fish! This is not included with the XScreenSaver package, but if you don't "
-+"have it already, you can find it at &lt;http://metalab.unc.edu/pub/Linux/X11/"
-+"demos/&gt;."
- 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 "
--"&lt;http://www.epcc.ed.ac.uk/~spb/xmountains/&gt;. 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 &lt;http://www.epcc.ed.ac.uk/"
-+"~spb/xmountains/&gt;. 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 &lt;http://www.euronet.nl/~rja/Xsnow/&gt;."
-+"Draws falling snow and the occasional tiny Santa. By Rick Jansen. You can "
-+"find it at &lt;http://www.euronet.nl/~rja/Xsnow/&gt;."
- 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 <j_h_liau@yahoo.com.tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: traditional Chinese <zh-l10n@linux.org.tw>\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 <gentamicin5@yahoo.com.tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: traditional Chinese <zh-l10n@linux.org.tw>\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.<br> digital clock: a LCD-style clock<br> analog clock: a traditional clock with clock face and hands"
--#~ msgstr "在這裡你可以選擇時鐘的類型。<br> 數位時鐘： LCD 風格的時鐘<br> 類比時鐘：傳統有指針的時鐘"
-+#~ msgid ""
-+#~ "Here you can select the clock type.<br> digital clock: a LCD-style "
-+#~ "clock<br> analog clock: a traditional clock with clock face and hands"
-+#~ msgstr ""
-+#~ "在這裡你可以選擇時鐘的類型。<br> 數位時鐘： LCD 風格的時鐘<br> 類比時鐘："
-+#~ "傳統有指針的時鐘"
- 
- #~ 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 <tonyni@hotmail.com>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\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 <EMAIL@ADDRESS>, 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 <tonyni@hotmail.com>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\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 <j_h_liau@yahoo.com.tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\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 ""
--"<p>Do you want to generate a backtrace? This will help the developers to figure "
--"out what went wrong.</p>\n"
--"<p>Unfortunately this will take some time on slow machines.</p>"
--"<p><b>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 "
-+"<p>Do you want to generate a backtrace? This will help the developers to "
-+"figure out what went wrong.</p>\n"
-+"<p>Unfortunately this will take some time on slow machines.</p><p><b>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.</b></p>"
- msgstr ""
- "<p>您是否想要產生回溯追蹤？這可以幫助作者找到錯誤。</p>\n"
--"<p>不幸的是，在較慢的機器上這需要相當的時間。</p>"
--"<p><b>注意：回溯追蹤並不包括錯誤的描述與讓臭蟲出現的相關資訊。沒有這些描述資訊是不可能解決問題的。</b></p>"
-+"<p>不幸的是，在較慢的機器上這需要相當的時間。</p><p><b>注意：回溯追蹤並不包括"
-+"錯誤的描述與讓臭蟲出現的相關資訊。沒有這些描述資訊是不可能解決問題的。</b></"
-+"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 <ericc@shinewave.com.tw>, 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 <wmtuen@gmail.com>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Chinese/Traditional <zh-l10n@linux.org.tw>\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 <iitze@hotmail.com>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team:  Chinese (traditional) <zh-l10n@linux.org.tw>\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 ""
--"<h1>File Associations</h1> 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\".)"
--"<p> A file association consists of the following: "
--"<ul>"
--"<li>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\";</li> "
--"<li>A short description of the MIME-type, for example the description of the "
--"MIME type \"x-kword\" is simply 'KWord document';</li> "
--"<li>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);</li> "
--"<li>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.</li></ul> 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 ""
--"<h1>檔案關聯</h1> 這個模組允許您選擇對於指定檔案類別要關聯的應用程式。檔案類別可以對應到 MIME 類別 (MIME "
--"是「多用途網際網路郵件延伸標準」)。"
--"<p>檔案的關聯性依下列決定："
--"<ul>"
--"<li>檔案的 MIME 類別規則，舉例而言，檔名樣式 *.kwd 表示所有以 '.kwd' 結尾的檔名, 都是關聯到 \"x-kword\" MIME "
--"類別。</li>"
--"<li>MIME 類別的簡短描述，例如 \"x-kword\" 的描述為 'KWord 文件'；</li>"
--"<li>使用與該 MIME 類別的圖示，您可以在 Konqueror 的檢視中依據圖示來識別其類型(至少對您經常使用的類型而言)；</li>"
--"<li>可以用於開啟指定 MIME 類別的程式列表 ── 如果有多於一個程式可以使用，這個列表會依據優先值排序。</li></ul>"
--"您可能會發現有些 MIME 類別沒有相關的檔名樣式；此時，Konqueror 會依據檔案內容決定 MIME 類別。"
-+"<h1>File Associations</h1> 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\".)<p> A file association consists of the "
-+"following: <ul><li>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\";</li> <li>A short "
-+"description of the MIME-type, for example the description of the MIME type "
-+"\"x-kword\" is simply 'KWord document';</li> <li>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);</li> <li>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.</li></ul> 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 ""
-+"<h1>檔案關聯</h1> 這個模組允許您選擇對於指定檔案類別要關聯的應用程式。檔案類"
-+"別可以對應到 MIME 類別 (MIME 是「多用途網際網路郵件延伸標準」)。<p>檔案的關聯"
-+"性依下列決定：<ul><li>檔案的 MIME 類別規則，舉例而言，檔名樣式 *.kwd 表示所有"
-+"以 '.kwd' 結尾的檔名, 都是關聯到 \"x-kword\" MIME 類別。</li><li>MIME 類別的"
-+"簡短描述，例如 \"x-kword\" 的描述為 'KWord 文件'；</li><li>使用與該 MIME 類別"
-+"的圖示，您可以在 Konqueror 的檢視中依據圖示來識別其類型(至少對您經常使用的類"
-+"型而言)；</li><li>可以用於開啟指定 MIME 類別的程式列表 ── 如果有多於一個程式"
-+"可以使用，這個列表會依據優先值排序。</li></ul>您可能會發現有些 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 <b>%1</b> "
--"(%2) file type and files of type <b>%3</b> (%4) are per definition also of type "
--"<b>%5</b>."
-+"(%2) file type and files of type <b>%3</b> (%4) are per definition also of "
-+"type <b>%5</b>."
- msgstr ""
--"在這裡列出的服務是由於它與 <b>%1</b> (%2) 檔案類型關聯，而類型 <b>%3</b> (%4) 的檔案也同時是類型 <b>%5</b> 的定義。"
-+"在這裡列出的服務是由於它與 <b>%1</b> (%2) 檔案類型關聯，而類型 <b>%3</b> (%"
-+"4) 的檔案也同時是類型 <b>%5</b> 的定義。"
- 
- #: kservicelistwidget.cpp:357
- msgid ""
--"Either select the <b>%1</b> file type to remove the service from there or move "
--"the service down to deprecate it."
--msgstr "您可以選擇 <b>%1</b> 檔案類型將它的服務移除或是把該服務下移以降低其優先權。"
-+"Either select the <b>%1</b> file type to remove the service from there or "
-+"move the service down to deprecate it."
-+msgstr ""
-+"您可以選擇 <b>%1</b> 檔案類型將它的服務移除或是把該服務下移以降低其優先權。"
- 
- #: kservicelistwidget.cpp:360
- msgid ""
--"Do you want to remove the service from the <b>%1</b> file type or from the <b>"
--"%2</b> file type?"
-+"Do you want to remove the service from the <b>%1</b> file type or from the "
-+"<b>%2</b> file type?"
- msgstr "您是否想要從檔案類型<b>%1</b>或檔案類型<b>%2</b>中移除這個服務"
- 
- #: 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 <j_h_liau@yahoo.com.tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Traditional Chinese <zh-l10n@linux.org.tw>\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 <asho@debian.org.tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
-@@ -47,49 +47,32 @@
- #: caldialog.cpp:90
- msgid ""
- "<qt>Calibration is about to check the value range your device delivers."
--"<br>"
--"<br>Please move <b>axis %1 %2</b> on your device to the <b>minimum</b> "
--"position."
--"<br>"
--"<br>Press any button on the device or click on the 'Next' button to continue "
--"with the next step.</qt>"
-+"<br><br>Please move <b>axis %1 %2</b> on your device to the <b>minimum</b> "
-+"position.<br><br>Press any button on the device or click on the 'Next' "
-+"button to continue with the next step.</qt>"
- msgstr ""
--"<qt>準備偵測裝置移動範圍。"
--"<br>"
--"<br>請移動裝置的<b>%1 軸 %2</b>到<b>最小</b>的位置。"
--"<br>"
--"<br>按下搖桿任意鍵或按「下一步」繼續。</qt>"
-+"<qt>準備偵測裝置移動範圍。<br><br>請移動裝置的<b>%1 軸 %2</b>到<b>最小</b>的"
-+"位置。<br><br>按下搖桿任意鍵或按「下一步」繼續。</qt>"
- 
- #: caldialog.cpp:107
- msgid ""
- "<qt>Calibration is about to check the value range your device delivers."
--"<br>"
--"<br>Please move <b>axis %1 %2</b> on your device to the <b>center</b> position."
--"<br>"
--"<br>Press any button on the device or click on the 'Next' button to continue "
--"with the next step.</qt>"
-+"<br><br>Please move <b>axis %1 %2</b> on your device to the <b>center</b> "
-+"position.<br><br>Press any button on the device or click on the 'Next' "
-+"button to continue with the next step.</qt>"
- msgstr ""
--"<qt>準備偵測裝置移動範圍。"
--"<br>"
--"<br>請移動裝置的<b>%1 軸 %2</b>到<b>中央</b>的位置。"
--"<br>"
--"<br>按下搖桿任意鍵或按「下一步」繼續。</qt>"
-+"<qt>準備偵測裝置移動範圍。<br><br>請移動裝置的<b>%1 軸 %2</b>到<b>中央</b>的"
-+"位置。<br><br>按下搖桿任意鍵或按「下一步」繼續。</qt>"
- 
- #: caldialog.cpp:124
- msgid ""
- "<qt>Calibration is about to check the value range your device delivers."
--"<br>"
--"<br>Please move <b>axis %1 %2</b> on your device to the <b>maximum</b> "
--"position."
--"<br>"
--"<br>Press any button on the device or click on the 'Next' button to continue "
--"with the next step.</qt>"
-+"<br><br>Please move <b>axis %1 %2</b> on your device to the <b>maximum</b> "
-+"position.<br><br>Press any button on the device or click on the 'Next' "
-+"button to continue with the next step.</qt>"
- msgstr ""
--"<qt>準備偵測裝置移動範圍。"
--"<br>"
--"<br>請移動裝置的<b>%1 軸 %2</b>到<b>最大</b>的位置。"
--"<br>"
--"<br>按下搖桿任意鍵或按「下一步」繼續。</qt>"
-+"<qt>準備偵測裝置移動範圍。<br><br>請移動裝置的<b>%1 軸 %2</b>到<b>最大</b>的"
-+"位置。<br><br>按下搖桿任意鍵或按「下一步」繼續。</qt>"
- 
- #: 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 ""
- "<h1>Joystick</h1>This module helps to check if your joystick is working "
--"correctly."
--"<br>If it delivers wrong values for the axes, you can try to solve this with "
--"the calibration."
--"<br>This module tries to find all available joystick devices by checking "
--"/dev/js[0-4] and /dev/input/js[0-4]"
--"<br>If you have another device file, enter it in the combobox."
--"<br>The Buttons list shows the state of the buttons on your joystick, the Axes "
--"list shows the current value for all axes."
--"<br>NOTE: the current Linux device driver (Kernel 2.4, 2.6) can only autodetect"
--"<ul>"
--"<li>2-axis, 4-button joystick</li>"
--"<li>3-axis, 4-button joystick</li>"
--"<li>4-axis, 4-button joystick</li>"
--"<li>Saitek Cyborg 'digital' joysticks</li></ul>(For details you can check your "
--"Linux source/Documentation/input/joystick.txt)"
--msgstr ""
--"<h1>搖桿</h1>該模組能幫您檢查搖桿是否設定正確."
--"<br>如果搖桿送出錯誤的方向, 您可以重新校正搖桿."
--"<br>該模組會試著搜尋 /dev/js[0-4] 和 /dev/input/js[0-4] 找出可使用的搖桿"
--"<br>如果您有其他的裝置檔, 輸入到裝置清單新增."
--"<br>按鍵清單列出搖桿上的所有按鍵, 座標列表列出所有的座標位置."
--"<br>注意: 現在的 Linux (核心 2.4, 2.6) 驅動程式可以自動偵測"
--"<ul>"
--"<li>2-軸, 4-鍵 搖桿</li>"
--"<li>3-軸, 4-鍵 搖桿</li>"
--"<li>4-軸, 4-鍵 搖桿</li>"
--"<li>Saitek Cyborg 'digital' 搖桿</li></ul>(更多的資訊請參閱 Linux 源碼中的 "
--"Documentation/input/joystick.txt)"
-+"correctly.<br>If it delivers wrong values for the axes, you can try to solve "
-+"this with the calibration.<br>This module tries to find all available "
-+"joystick devices by checking /dev/js[0-4] and /dev/input/js[0-4]<br>If you "
-+"have another device file, enter it in the combobox.<br>The Buttons list "
-+"shows the state of the buttons on your joystick, the Axes list shows the "
-+"current value for all axes.<br>NOTE: the current Linux device driver (Kernel "
-+"2.4, 2.6) can only autodetect<ul><li>2-axis, 4-button joystick</li><li>3-"
-+"axis, 4-button joystick</li><li>4-axis, 4-button joystick</li><li>Saitek "
-+"Cyborg 'digital' joysticks</li></ul>(For details you can check your Linux "
-+"source/Documentation/input/joystick.txt)"
-+msgstr ""
-+"<h1>搖桿</h1>該模組能幫您檢查搖桿是否設定正確.<br>如果搖桿送出錯誤的方向, 您"
-+"可以重新校正搖桿.<br>該模組會試著搜尋 /dev/js[0-4] 和 /dev/input/js[0-4] 找出"
-+"可使用的搖桿<br>如果您有其他的裝置檔, 輸入到裝置清單新增.<br>按鍵清單列出搖桿"
-+"上的所有按鍵, 座標列表列出所有的座標位置.<br>注意: 現在的 Linux (核心 2.4, "
-+"2.6) 驅動程式可以自動偵測<ul><li>2-軸, 4-鍵 搖桿</li><li>3-軸, 4-鍵 搖桿</"
-+"li><li>4-軸, 4-鍵 搖桿</li><li>Saitek Cyborg 'digital' 搖桿</li></ul>(更多的"
-+"資訊請參閱 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."
--"<br>Checks were done in /dev/js[0-4] and /dev/input/js[0-4]"
--"<br>If you know that there is one attached, please enter the correct device "
--"file."
-+"No joystick device automatically found on this computer.<br>Checks were done "
-+"in /dev/js[0-4] and /dev/input/js[0-4]<br>If you know that there is one "
-+"attached, please enter the correct device file."
- msgstr ""
--"電腦上找不到任何搖桿。"
--"<br>檢查 /dev/js[0-4] 和 /dev/input/js[0-4] 是否正常"
-+"電腦上找不到任何搖桿。<br>檢查 /dev/js[0-4] 和 /dev/input/js[0-4] 是否正常"
- "<br>如果已確認連線，請輸入正確的裝置檔案。"
- 
- #: joywidget.cpp:236
-@@ -260,13 +231,12 @@
- 
- #: joywidget.cpp:337
- msgid ""
--"<qt>Calibration is about to check the precision."
--"<br>"
--"<br><b>Please move all axes to their center position and then do not touch the "
--"joystick anymore.</b>"
--"<br>"
--"<br>Click OK to start the calibration.</qt>"
--msgstr "<qt>準備校正準確度.<br><br><b>請將轉軸移到中心然後不要再接觸搖桿.</b><br><br>按下確定開始校正.</qt>"
-+"<qt>Calibration is about to check the precision.<br><br><b>Please move all "
-+"axes to their center position and then do not touch the joystick anymore.</"
-+"b><br><br>Click OK to start the calibration.</qt>"
-+msgstr ""
-+"<qt>準備校正準確度.<br><br><b>請將轉軸移到中心然後不要再接觸搖桿.</b><br><br>"
-+"按下確定開始校正.</qt>"
- 
- #: 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) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Traditional Chinese <zh_l10n@linux.org.tw>\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 <tzerming@gmail.com>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Chinese Traditional <kde@linux.org.tw>\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) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Chinese Traditional <zh-l10n@linux.org.tw>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
-@@ -26,20 +25,19 @@
- 
- #: kasaboutdlg.cpp:164
- msgid ""
--"<html><body>"
--"<p>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.</p>"
--"<p>You can find information about the latest developments in Kasbar at <a "
--"href=\"%3\">%4</a>, the Kasbar homepage.</p></body></html>"
-+"<html><body><p>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.</p><p>You can "
-+"find information about the latest developments in Kasbar at <a href=\"%3\">%"
-+"4</a>, the Kasbar homepage.</p></body></html>"
- msgstr ""
--"<html><body>"
--"<p>Kasbar TNG 在開始只是在原有的 Kasbar applet(新的) 延伸 API "
--"的一部分，但是後來為了不同的使用者族群所需要的特色而完全重寫。首先重寫所有已在本來 taskbar 已有的基本特徵，接著加入一些在舊有 Kasbar "
--"所具有的特色，像是視窗縮圖預覽(thumbnails)。</p>"
--"<p>您可在 Kasbar 的網頁找到關於最新的發展資訊：<a href=\"%3\">%4</a></p></body></html>"
-+"<html><body><p>Kasbar TNG 在開始只是在原有的 Kasbar applet(新的) 延伸 API 的"
-+"一部分，但是後來為了不同的使用者族群所需要的特色而完全重寫。首先重寫所有已在"
-+"本來 taskbar 已有的基本特徵，接著加入一些在舊有 Kasbar 所具有的特色，像是視窗"
-+"縮圖預覽(thumbnails)。</p><p>您可在 Kasbar 的網頁找到關於最新的發展資訊：<a "
-+"href=\"%3\">%4</a></p></body></html>"
- 
- #: kasaboutdlg.cpp:184
- msgid "Authors"
-@@ -51,29 +49,26 @@
- 
- #: kasaboutdlg.cpp:190
- msgid ""
--"<html><b>Richard Moore</b> <a href=\"mailto:rich@kde.org\">rich@kde.org</a>"
--"<br><b>Homepage:</b> <a href=\"http://xmelegance.org/\">"
--"http://xmelegance.org/</a>"
--"<p>Developer and maintainer of the Kasbar TNG code.</p>"
--"<hr/><b>Daniel M. Duley (Mosfet)</b> <a href=\"mailto:mosfet@kde.org\">"
--"mosfet@kde.org</a>"
--"<br><b>Homepage:</b> <a href=\"http://www.mosfet.org/\">"
--"http://www.mosfet.org/</a>"
--"<p>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.</p></html>"
-+"<html><b>Richard Moore</b> <a href=\"mailto:rich@kde.org\">rich@kde.org</"
-+"a><br><b>Homepage:</b> <a href=\"http://xmelegance.org/\">http://xmelegance."
-+"org/</a><p>Developer and maintainer of the Kasbar TNG code.</p><hr/"
-+"><b>Daniel M. Duley (Mosfet)</b> <a href=\"mailto:mosfet@kde.org"
-+"\">mosfet@kde.org</a><br><b>Homepage:</b> <a href=\"http://www.mosfet.org/"
-+"\">http://www.mosfet.org/</a><p>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.</p></html>"
- msgstr ""
--"<html><b>Richard Moore</b> <a href=\"mailto:rich@kde.org\">rich@kde.org</a>"
--"<br><b>首頁：</b> <a href=\"http://xmelegance.org/\">http://xmelegance.org/</a>"
--"<p>Kasbar TNG 程式碼的開發及維護者。</p>"
--"<hr/><b>Daniel M. Duley (Mosfet)</b> <a href=\"mailto:mosfet@kde.org\">"
--"mosfet@kde.org</a>"
--"<br><b>首頁：</b> <a href=\"http://www.mosfet.org/\">http://www.mosfet.org/</a>"
--"<p>Mosfet 他寫了此延伸功能所的基礎架構─原始 Kasbar applet "
--"。雖然這裡只剩下一些些原本的程式碼，但是在不透明模式的基本外觀上看來還是跟原本的大致上相同。</p>"
--"<hr/><b>李健秋(Andrew Lee)</b> <a href=\"mailto:andrew@linux.org.tw\">"
--"andrew@linux.org.tw</a>"
--"<p>Andrew 他替 Kabar 翻譯了繁體中文訊息，若您發現他翻譯的不好或不正確的地方，可用中文直接寫信告訴他。</html>"
-+"<html><b>Richard Moore</b> <a href=\"mailto:rich@kde.org\">rich@kde.org</"
-+"a><br><b>首頁：</b> <a href=\"http://xmelegance.org/\">http://xmelegance.org/"
-+"</a><p>Kasbar TNG 程式碼的開發及維護者。</p><hr/><b>Daniel M. Duley (Mosfet)"
-+"</b> <a href=\"mailto:mosfet@kde.org\">mosfet@kde.org</a><br><b>首頁：</b> "
-+"<a href=\"http://www.mosfet.org/\">http://www.mosfet.org/</a><p>Mosfet 他寫了"
-+"此延伸功能所的基礎架構─原始 Kasbar applet 。雖然這裡只剩下一些些原本的程式"
-+"碼，但是在不透明模式的基本外觀上看來還是跟原本的大致上相同。</p><hr/><b>李健"
-+"秋(Andrew Lee)</b> <a href=\"mailto:andrew@linux.org.tw\">andrew@linux.org."
-+"tw</a><p>Andrew 他替 Kabar 翻譯了傳統字漢語訊息，若您發現他翻譯的不好或不正確的"
-+"地方，可用中文直接寫信告訴他。</html>"
- 
- #: 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 ""
--"<html><body><b>Name</b>: $name"
--"<br><b>Visible name</b>: $visibleName"
--"<br>"
--"<br><b>Iconified</b>: $iconified"
--"<br><b>Minimized</b>: $minimized"
--"<br><b>Maximized</b>: $maximized"
--"<br><b>Shaded</b>: $shaded"
--"<br><b>Always on top</b>: $alwaysOnTop"
--"<br>"
--"<br><b>Desktop</b>: $desktop"
--"<br><b>All desktops</b>: $onAllDesktops"
--"<br>"
--"<br><b>Iconic name</b>: $iconicName"
--"<br><b>Iconic visible name</b>: $visibleIconicName"
--"<br>"
--"<br><b>Modified</b>: $modified"
--"<br><b>Demands attention</b>: $demandsAttention"
--"<br></body></html>"
-+"<html><body><b>Name</b>: $name<br><b>Visible name</b>: "
-+"$visibleName<br><br><b>Iconified</b>: $iconified<br><b>Minimized</b>: "
-+"$minimized<br><b>Maximized</b>: $maximized<br><b>Shaded</b>: "
-+"$shaded<br><b>Always on top</b>: $alwaysOnTop<br><br><b>Desktop</b>: "
-+"$desktop<br><b>All desktops</b>: $onAllDesktops<br><br><b>Iconic name</b>: "
-+"$iconicName<br><b>Iconic visible name</b>: "
-+"$visibleIconicName<br><br><b>Modified</b>: $modified<br><b>Demands "
-+"attention</b>: $demandsAttention<br></body></html>"
- msgstr ""
--"<html><body><b>名稱</b>： $name"
--"<br><b>可視名稱</b>： $visibleName"
--"<br>"
--"<br><b>圖示化</b>：$iconified"
--"<br><b>最小化</b>： $minimized"
--"<br><b>最大化</b>： $maximized"
--"<br><b>陰影</b>： $shaded"
--"<br><b>最上層顯示</b>： $alwaysOnTop"
--"<br>"
--"<br><b>桌面</b>： $desktop"
--"<br><b>所有桌面</b>： $onAllDesktops"
--"<br>"
--"<br><b>圖示名稱</b>：$iconicName"
--"<br><b>圖示可視名稱</b>： $visibleIconicName"
--"<br>"
--"<br><b>已修改</b>： $modified"
--"<br><b>伺服程式提示</b>： $demandsAttention"
--"<br></body></html>"
-+"<html><body><b>名稱</b>： $name<br><b>可視名稱</b>： $visibleName<br><br><b>"
-+"圖示化</b>：$iconified<br><b>最小化</b>： $minimized<br><b>最大化</b>： "
-+"$maximized<br><b>陰影</b>： $shaded<br><b>最上層顯示</b>： "
-+"$alwaysOnTop<br><br><b>桌面</b>： $desktop<br><b>所有桌面</b>： "
-+"$onAllDesktops<br><br><b>圖示名稱</b>：$iconicName<br><b>圖示可視名稱</b>： "
-+"$visibleIconicName<br><br><b>已修改</b>： $modified<br><b>伺服程式提示</b>： "
-+"$demandsAttention<br></body></html>"
- 
- #: 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) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Chinese Traditional <zh-l10n@linux.org.tw>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
-@@ -45,28 +44,22 @@
- #: app/kateexternaltools.cpp:461
- msgid ""
- "<p>The script to execute to invoke the tool. The script is passed to /bin/sh "
--"for execution. The following macros will be expanded:</p>"
--"<ul>"
--"<li><code>%URL</code> - the URL of the current document."
--"<li><code>%URLs</code> - a list of the URLs of all open documents."
--"<li><code>%directory</code> - the URL of the directory containing the current "
--"document."
--"<li><code>%filename</code> - the filename of the current document."
--"<li><code>%line</code> - the current line of the text cursor in the current "
--"view."
--"<li><code>%column</code> - the column of the text cursor in the current view."
--"<li><code>%selection</code> - the selected text in the current view."
--"<li><code>%text</code> - the text of the current document.</ul>"
--msgstr ""
--"<p>用來執行以呼叫工具的命令稿。此命令稿會傳送到 /bin/sh 以利執行。下列巨集會被自動展開： </p>"
--"<ul>"
--"<li><code>%URL</code> ─ 目前文件的 URL。"
--"<li><code>%URLs</code> ─ 所有開啟文件的 URL。"
--"<li><code>%directory</code> ─ 包含目前文件的目錄 URL。"
--"<li><code>%filename</code> ─ 目前文件的檔案名稱。"
--"<li><code>%line</code> ─ 目前檢視中文字游標所在的行。"
--"<li><code>%column</code> ─ 目前檢視中文字游標所在的欄。"
--"<li><code>%selection</code> ─ 目前檢視中選取的文字。"
-+"for execution. The following macros will be expanded:</p><ul><li><code>%URL</"
-+"code> - the URL of the current document.<li><code>%URLs</code> - a list of "
-+"the URLs of all open documents.<li><code>%directory</code> - the URL of the "
-+"directory containing the current document.<li><code>%filename</code> - the "
-+"filename of the current document.<li><code>%line</code> - the current line "
-+"of the text cursor in the current view.<li><code>%column</code> - the column "
-+"of the text cursor in the current view.<li><code>%selection</code> - the "
-+"selected text in the current view.<li><code>%text</code> - the text of the "
-+"current document.</ul>"
-+msgstr ""
-+"<p>用來執行以呼叫工具的命令稿。此命令稿會傳送到 /bin/sh 以利執行。下列巨集會"
-+"被自動展開： </p><ul><li><code>%URL</code> ─ 目前文件的 URL。<li><code>%"
-+"URLs</code> ─ 所有開啟文件的 URL。<li><code>%directory</code> ─ 包含目前文件"
-+"的目錄 URL。<li><code>%filename</code> ─ 目前文件的檔案名稱。<li><code>%"
-+"line</code> ─ 目前檢視中文字游標所在的行。<li><code>%column</code> ─ 目前檢視"
-+"中文字游標所在的欄。<li><code>%selection</code> ─ 目前檢視中選取的文字。"
- "<li><code>%text</code> ─ 目前文件的文字。</ul>"
- 
- #: 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 <em>command</em> will be used."
--msgstr "該指令所使用的可執行檔。這是用來查核該工具是否應該顯示；如果沒有設定，會使用<em>指令</em>的第一個字。"
-+"The executable used by the command. This is used to check if a tool should "
-+"be displayed; if not set, the first word of <em>command</em> will be used."
-+msgstr ""
-+"該指令所使用的可執行檔。這是用來查核該工具是否應該顯示；如果沒有設定，會使用"
-+"<em>指令</em>的第一個字。"
- 
- #: 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 ""
--"<p>The current document has not been saved, and cannot be attached to an email "
--"message."
--"<p>Do you want to save it and proceed?"
--msgstr "<p>目前的文件尚未儲存，因此不能附加到電子郵件中。<p>您是否要將它儲存後繼續？"
-+"<p>The current document has not been saved, and cannot be attached to an "
-+"email message.<p>Do you want to save it and proceed?"
-+msgstr ""
-+"<p>目前的文件尚未儲存，因此不能附加到電子郵件中。<p>您是否要將它儲存後繼續？"
- 
- #: app/katemainwindow.cpp:669
- msgid "Cannot Send Unsaved File"
-@@ -372,15 +373,12 @@
- 
- #: app/katemainwindow.cpp:688
- msgid ""
--"<p>The current file:"
--"<br><strong>%1</strong>"
--"<br>has been modified. Modifications will not be available in the attachment."
--"<p>Do you want to save it before sending it?"
--msgstr ""
--"<p>目前的檔案："
--"<br><strong>%1</strong>"
--"<br>已經被修改過。修改的部分將不會出現在附加檔案中。"
--"<p>您是否要在寄出它之前把它儲存？"
-+"<p>The current file:<br><strong>%1</strong><br>has been modified. "
-+"Modifications will not be available in the attachment.<p>Do you want to save "
-+"it before sending it?"
-+msgstr ""
-+"<p>目前的檔案：<br><strong>%1</strong><br>已經被修改過。修改的部分將不會出現"
-+"在附加檔案中。<p>您是否要在寄出它之前把它儲存？"
- 
- #: 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 ""
--"<p>Press <strong>Mail...</strong> to email the current document."
--"<p>To select more documents to send, press <strong>Show All "
--"Documents&nbsp;&gt;&gt;</strong>."
-+"<p>Press <strong>Mail...</strong> to email the current document.<p>To select "
-+"more documents to send, press <strong>Show All Documents&nbsp;&gt;&gt;</"
-+"strong>."
- msgstr ""
--"<p>按下 <strong>郵件...</strong> 將目前文件以電子郵件傳送。"
--"<p>要選擇更多寄送的文件，請按 <strong>顯示所有文件&nbsp;&gt;&gt;</strong>哈。"
-+"<p>按下 <strong>郵件...</strong> 將目前文件以電子郵件傳送。<p>要選擇更多寄送"
-+"的文件，請按 <strong>顯示所有文件&nbsp;&gt;&gt;</strong>哈。"
- 
- #: app/kateconfigplugindialogpage.cpp:81 app/katemailfilesdialog.cpp:61
- msgid "Name"
-@@ -426,7 +424,7 @@
- 
- #: app/katemailfilesdialog.cpp:105
- msgid "Press <strong>Mail...</strong> to send selected documents"
--msgstr "按下 <strong>郵件...</strong> 將選擇的文件以電子郵件傳送"
-+msgstr "按下 <strong>郵件…</strong> 將選擇的文件以電子郵件傳送"
- 
- #: 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 ""
--"<qt>The documents listed below has changed on disk."
--"<p>Select one or more at the time and press an action button until the list is "
--"empty.</qt>"
--msgstr "<qt>下面列出的文件已經在磁碟上變更過了。<p>選擇一或多個並按下一個動作按鈕直到這個清單清空為止。</qt>"
-+"<qt>The documents listed below has changed on disk.<p>Select one or more at "
-+"the time and press an action button until the list is empty.</qt>"
-+msgstr ""
-+"<qt>下面列出的文件已經在磁碟上變更過了。<p>選擇一或多個並按下一個動作按鈕直到"
-+"這個清單清空為止。</qt>"
- 
- #: 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 <code>cd</code> "
--"to the directory of the active document when started and whenever the active "
-+"If this is checked, the built in Konsole will <code>cd</code> to the "
-+"directory of the active document when started and whenever the active "
- "document changes, if the document is a local file."
- msgstr ""
--"如果選取這個選項，而文件又是一個本地檔案 (在同一部電腦中) ，每當啟動及轉換當前文件時，內置的終端機將 <code>cd</code> 到當前文件的目錄。"
-+"如果選取這個選項，而文件又是一個本地檔案 (在同一部電腦中) ，每當啟動及轉換當"
-+"前文件時，內置的終端機將 <code>cd</code> 到當前文件的目錄。"
- 
- #: 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 ""
--"<p>Enter the expression you want to search for here."
--"<p>If 'regular expression' is unchecked, any non-space letters in your "
--"expression will be escaped with a backslash character."
--"<p>Possible meta characters are:"
--"<br><b>.</b> - Matches any character"
--"<br><b>^</b> - Matches the beginning of a line"
--"<br><b>$</b> - Matches the end of a line"
--"<br><b>\\&lt;</b> - Matches the beginning of a word"
--"<br><b>\\&gt;</b> - Matches the end of a word"
--"<p>The following repetition operators exist:"
--"<br><b>?</b> - The preceding item is matched at most once"
--"<br><b>*</b> - The preceding item is matched zero or more times"
--"<br><b>+</b> - The preceding item is matched one or more times"
--"<br><b>{<i>n</i>}</b> - The preceding item is matched exactly <i>n</i> times"
--"<br><b>{<i>n</i>,}</b> - The preceding item is matched <i>n</i> or more times"
--"<br><b>{,<i>n</i>}</b> - The preceding item is matched at most <i>n</i> times"
--"<br><b>{<i>n</i>,<i>m</i>}</b> - The preceding item is matched at least <i>n</i>"
--", but at most <i>m</i> times."
--"<p>Furthermore, backreferences to bracketed subexpressions are available via "
--"the notation <code>\\#</code>."
-+"<p>Enter the expression you want to search for here.<p>If 'regular "
-+"expression' is unchecked, any non-space letters in your expression will be "
-+"escaped with a backslash character.<p>Possible meta characters are:<br><b>.</"
-+"b> - Matches any character<br><b>^</b> - Matches the beginning of a "
-+"line<br><b>$</b> - Matches the end of a line<br><b>\\&lt;</b> - Matches the "
-+"beginning of a word<br><b>\\&gt;</b> - Matches the end of a word<p>The "
-+"following repetition operators exist:<br><b>?</b> - The preceding item is "
-+"matched at most once<br><b>*</b> - The preceding item is matched zero or "
-+"more times<br><b>+</b> - The preceding item is matched one or more "
-+"times<br><b>{<i>n</i>}</b> - The preceding item is matched exactly <i>n</i> "
-+"times<br><b>{<i>n</i>,}</b> - The preceding item is matched <i>n</i> or more "
-+"times<br><b>{,<i>n</i>}</b> - The preceding item is matched at most <i>n</i> "
-+"times<br><b>{<i>n</i>,<i>m</i>}</b> - The preceding item is matched at least "
-+"<i>n</i>, but at most <i>m</i> times.<p>Furthermore, backreferences to "
-+"bracketed subexpressions are available via the notation <code>\\#</code>."
- "<p>See the grep(1) documentation for the full documentation."
- msgstr ""
--"<p>在此鍵入你想搜尋的正規表示式。"
--"<p>如果核消「正規表示式」，在您的表示式中的任何非空白字元都會加上反斜線字元。"
--"<p>可用的特殊字元有："
--"<br><b>.</b> - 符合任何字元"
--"<br><b>^</b> - 符合行首"
--"<br><b>$</b> - 符合行尾"
--"<br><b>\\&lt;</b> - 符合字首"
--"<br><b>\\&gt;</b> - 符合字尾"
--"<p>以下是可用的 repetition operators ："
--"<br><b>?</b> - 前面的項目最多只可以符合一次"
--"<br><b>*</b> - 前面的項目可以符合零至無限次"
--"<br><b>+</b> - 前面的項目要符合一或更多次times"
--"<br><b>{<i>n</i>}</b> - 前面的項目要符合剛好 <i>n</i> 次times"
--"<br><b>{<i>n</i>,}</b> - 前面的項目要符合 <i>n</i> 或更多次 times"
--"<br><b>{,<i>n</i>}</b> - 前面的項目最多 <i>n</i> 次times"
--"<br><b>{<i>n</i>,<i>m</i>}</b> - 前面的項目最少符合 <i>n</i> 次，但最多 <i>m</i> 次。"
--"<p>此外，可以用 <code>\\#</code> 來用回括著了的表示式。"
--"<p>請查閱 grep(1) 文件以獲取完整的資訊。"
-+"<p>在此鍵入你想搜尋的正規表示式。<p>如果核消「正規表示式」，在您的表示式中的"
-+"任何非空白字元都會加上反斜線字元。<p>可用的特殊字元有：<br><b>.</b> - 符合任"
-+"何字元<br><b>^</b> - 符合行首<br><b>$</b> - 符合行尾<br><b>\\&lt;</b> - 符合"
-+"字首<br><b>\\&gt;</b> - 符合字尾<p>以下是可用的 repetition operators ："
-+"<br><b>?</b> - 前面的項目最多只可以符合一次<br><b>*</b> - 前面的項目可以符合"
-+"零至無限次<br><b>+</b> - 前面的項目要符合一或更多次times<br><b>{<i>n</i>}</"
-+"b> - 前面的項目要符合剛好 <i>n</i> 次times<br><b>{<i>n</i>,}</b> - 前面的項目"
-+"要符合 <i>n</i> 或更多次 times<br><b>{,<i>n</i>}</b> - 前面的項目最多 <i>n</"
-+"i> 次times<br><b>{<i>n</i>,<i>m</i>}</b> - 前面的項目最少符合 <i>n</i> 次，但"
-+"最多 <i>m</i> 次。<p>此外，可以用 <code>\\#</code> 來用回括著了的表示式。<p>"
-+"請查閱 grep(1) 文件以獲取完整的資訊。"
- 
- #: app/kategrepdialog.cpp:224
- msgid ""
-@@ -792,13 +786,13 @@
- 
- #: app/kategrepdialog.cpp:238
- msgid ""
--"<p>If this is enabled, your pattern will be passed unmodified to <em>"
--"grep(1)</em>. 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."
-+"<p>If this is enabled, your pattern will be passed unmodified to <em>grep(1)"
-+"</em>. 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 ""
--"<p>如果啟用此項，您的樣式將會不經修改傳送給 <em>grep(1)</em>。否則，所有非字母的字元將會被加上反斜線字元以避免 grep "
--"將它們視為表示式的一部分。"
-+"<p>如果啟用此項，您的樣式將會不經修改傳送給 <em>grep(1)</em>。否則，所有非字"
-+"母的字元將會被加上反斜線字元以避免 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 ""
--"<p>The document '%1' has been modified, but not saved."
--"<p>Do you want to save your changes or discard them?"
--msgstr "<p>此文件「%1」已被修改，但尚未被儲存。<p>您想要儲存您的變更或是放棄它們？"
-+"<p>The document '%1' has been modified, but not saved.<p>Do you want to save "
-+"your changes or discard them?"
-+msgstr ""
-+"<p>此文件「%1」已被修改，但尚未被儲存。<p>您想要儲存您的變更或是放棄它們？"
- 
- #: 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 ""
--"<qt>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 <b>Window &gt; Tool Views &gt; Show "
--"Sidebars</b> in the menu. It is still possible to show/hide the tool views with "
--"the assigned shortcuts.</qt>"
--msgstr ""
--"<qt>您即將隱藏邊列。將邊列隱藏後將無法再度使用滑鼠直接存取工具檢視，因此如果您需要再次存取邊列請呼叫選單中的 <b>"
--"視窗 &gt; 工具檢視 &gt; 顯示邊列</b>。您也可以使用指定的快速鍵來顯示/隱藏工具檢視。</qt>"
-+"<qt>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 <b>Window &gt; Tool Views &gt; Show "
-+"Sidebars</b> in the menu. It is still possible to show/hide the tool views "
-+"with the assigned shortcuts.</qt>"
-+msgstr ""
-+"<qt>您即將隱藏邊列。將邊列隱藏後將無法再度使用滑鼠直接存取工具檢視，因此如果"
-+"您需要再次存取邊列請呼叫選單中的 <b>視窗 &gt; 工具檢視 &gt; 顯示邊列</b>。您"
-+"也可以使用指定的快速鍵來顯示/隱藏工具檢視。</qt>"
- 
- #: 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 ""
--"<qt>The following documents have been modified. Do you want to save them before "
--"closing?</qt>"
-+"<qt>The following documents have been modified. Do you want to save them "
-+"before closing?</qt>"
- msgstr "<qt>下列文件已被修改過。您想要在關閉前儲存它們嗎？</qt>"
- 
- #: 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 ""
--"<p>Here you can enter a path for a folder to display."
--"<p>To go to a folder previously entered, press the arrow on the right and "
--"choose one. "
--"<p>The entry has folder completion. Right-click to choose how completion should "
-+"<p>Here you can enter a path for a folder to display.<p>To go to a folder "
-+"previously entered, press the arrow on the right and choose one. <p>The "
-+"entry has folder completion. Right-click to choose how completion should "
- "behave."
- msgstr ""
--"<p>您可以在這裡輸入要顯示的資料夾路徑。"
--"<p>要移至前一次輸入的資料夾，請按下右邊的箭頭並且選擇一個。"
--"<p>該項目具有資料夾補齊功能。右擊滑鼠鍵可以選擇補齊功能要如何運作。"
-+"<p>您可以在這裡輸入要顯示的資料夾路徑。<p>要移至前一次輸入的資料夾，請按下右"
-+"邊的箭頭並且選擇一個。<p>該項目具有資料夾補齊功能。右擊滑鼠鍵可以選擇補齊功能"
-+"要如何運作。"
- 
- #: app/katefileselector.cpp:203
- msgid ""
--"<p>Here you can enter a name filter to limit which files are displayed."
--"<p>To clear the filter, toggle off the filter button to the left."
--"<p>To reapply the last filter used, toggle on the filter button."
--msgstr ""
--"<p>您可以在這裡輸入名稱過濾器來限制要顯示的檔案。"
--"<p>要清除過濾器，請將過濾器按鈕切換至左方。"
--"<p>要重新套用上次使用的過濾器，請使用過濾器按鈕切換。"
-+"<p>Here you can enter a name filter to limit which files are displayed.<p>To "
-+"clear the filter, toggle off the filter button to the left.<p>To reapply the "
-+"last filter used, toggle on the filter button."
-+msgstr ""
-+"<p>您可以在這裡輸入名稱過濾器來限制要顯示的檔案。<p>要清除過濾器，請將過濾器"
-+"按鈕切換至左方。<p>要重新套用上次使用的過濾器，請使用過濾器按鈕切換。"
- 
- #: app/katefileselector.cpp:207
- msgid ""
--"<p>This button clears the name filter when toggled off, or reapplies the last "
--"filter used when toggled on."
--msgstr "<p>當這個按鈕切換到關閉時會清除名稱過濾器，切換到開啟時則會重新套用上次的過濾器。"
-+"<p>This button clears the name filter when toggled off, or reapplies the "
-+"last filter used when toggled on."
-+msgstr ""
-+"<p>當這個按鈕切換到關閉時會清除名稱過濾器，切換到開啟時則會重新套用上次的過濾"
-+"器。"
- 
- #: app/katefileselector.cpp:321
- msgid "Apply last filter (\"%1\")"
-@@ -1514,7 +1516,8 @@
- 
- #: app/katefileselector.cpp:592
- msgid ""
--"<p>Decides how many locations to keep in the history of the location combo box."
-+"<p>Decides how many locations to keep in the history of the location combo "
-+"box."
- msgstr "<p>決定在位置組合方塊的歷史記錄中要保留多少位置。"
- 
- #: app/katefileselector.cpp:597
-@@ -1525,38 +1528,35 @@
- #: app/katefileselector.cpp:602
- msgid ""
- "<p>These options allow you to have the File Selector automatically change "
--"location to the folder of the active document on certain events."
--"<p>Auto synchronization is <em>lazy</em>, meaning it will not take effect until "
--"the file selector is visible."
--"<p>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.<p>Auto "
-+"synchronization is <em>lazy</em>, meaning it will not take effect until the "
-+"file selector is visible.<p>None of these are enabled by default, but you "
-+"can always sync the location by pressing the sync button in the toolbar."
- msgstr ""
--"<p>這些選項讓您的檔案選擇器會自動依照某些事件自動變更位置到作用中文件的資料夾。"
--"<p>自動同步是很 <em>被動</em>的，代表它只有在檔案選擇器為可視時才會生效。"
-+"<p>這些選項讓您的檔案選擇器會自動依照某些事件自動變更位置到作用中文件的資料"
-+"夾。<p>自動同步是很 <em>被動</em>的，代表它只有在檔案選擇器為可視時才會生效。"
- "<p>這些功能都不是預設啟用的，但是您隨時可以按下工具列中的同步按鈕來同步位置。"
- 
- #: app/katefileselector.cpp:611
- msgid ""
--"<p>If this option is enabled (default), the location will be restored when you "
--"start Kate."
--"<p><strong>Note</strong> that if the session is handled by the KDE session "
--"manager, the location is always restored."
-+"<p>If this option is enabled (default), the location will be restored when "
-+"you start Kate.<p><strong>Note</strong> that if the session is handled by "
-+"the KDE session manager, the location is always restored."
- msgstr ""
--"<p>如果啟用此選項(預設)，當您啟動 Kate 時會回存上次的位置。"
--"<p><strong>注意</strong>如果作業階段是由 KDE 作業階段管理程式掌控，將永遠會回存上次的位置。"
-+"<p>如果啟用此選項(預設)，當您啟動 Kate 時會回存上次的位置。<p><strong>注意</"
-+"strong>如果作業階段是由 KDE 作業階段管理程式掌控，將永遠會回存上次的位置。"
- 
- #: app/katefileselector.cpp:615
- msgid ""
- "<p>If this option is enabled (default), the current filter will be restored "
--"when you start Kate."
--"<p><strong>Note</strong> that if the session is handled by the KDE session "
--"manager, the filter is always restored."
--"<p><strong>Note</strong> that some of the autosync settings may override the "
--"restored location if on."
--msgstr ""
--"<p>如果啟用此選項(預設)，當您啟動 Kate 時會回存目前的過濾器。"
--"<p><strong>注意</strong>如果作業階段是由 KDE 作業階段管理程式掌控，將永遠會回存目前的過濾器。"
--"<p><strong>注意</strong>部分自動同步設定開啟時可能會覆蓋回存的位置。"
-+"when you start Kate.<p><strong>Note</strong> that if the session is handled "
-+"by the KDE session manager, the filter is always restored.<p><strong>Note</"
-+"strong> that some of the autosync settings may override the restored "
-+"location if on."
-+msgstr ""
-+"<p>如果啟用此選項(預設)，當您啟動 Kate 時會回存目前的過濾器。<p><strong>注意"
-+"</strong>如果作業階段是由 KDE 作業階段管理程式掌控，將永遠會回存目前的過濾"
-+"器。<p><strong>注意</strong>部分自動同步設定開啟時可能會覆蓋回存的位置。"
- 
- #. i18n: file ./data/kateui.rc line 43
- #: rc.cpp:9
-@@ -1612,18 +1612,18 @@
- "<p>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.</p>\n"
--"<p>Just choose "
--"<br><strong>View -&gt; Split [ Horizontal | Vertical ]</strong></p>\n"
-+"<p>Just choose <br><strong>View -&gt; Split [ Horizontal | Vertical ]</"
-+"strong></p>\n"
- msgstr ""
- "<p>您可以依喜好將 Kate 編輯器分割任意次或任何\n"
- "方向。每個框架都會有自己的狀態列並且都可以\n"
- "顯示任何開啟的文件。</p>\n"
--"<p>只要選擇 "
--"<br><strong>檢視 -&gt; 分割 [ 水平 | 垂直 ]</strong></p>\n"
-+"<p>只要選擇 <br><strong>檢視 -&gt; 分割 [ 水平 | 垂直 ]</strong></p>\n"
- 
- #: tips.cpp:32
- msgid ""
--"<p>You can drag the Tool views (<em>File List</em> and <em>File Selector</em>)\n"
-+"<p>You can drag the Tool views (<em>File List</em> and <em>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.</p>\n"
-@@ -1634,8 +1634,8 @@
- 
- #: tips.cpp:39
- msgid ""
--"<p>Kate has a built-in terminal emulator, just click on <strong>"
--"\"Terminal\"</strong> at\n"
-+"<p>Kate has a built-in terminal emulator, just click on <strong>\"Terminal"
-+"\"</strong> at\n"
- "the bottom to show or hide it as you desire.</p>\n"
- msgstr ""
- "<p>Kate 有內建的終端機模擬器，只要按 <strong>「終端機」</strong> \n"
-@@ -1645,25 +1645,22 @@
- msgid ""
- "<p>Kate can highlight the current line with a\n"
- "<table bgcolor=\"yellow\" border=\"0\" cellspacing=\"0\" cellpadding=\"0\" "
--"width=\"100%\">"
--"<tr>"
--"<td>different\n"
-+"width=\"100%\"><tr><td>different\n"
- "background color.<strong>|</strong></td></tr></table></p>\n"
- "<p>You can set the color in the <em>Colors</em> page of the configuration\n"
- "dialog.</p>\n"
- msgstr ""
- "<p>Kate 可以將目前所在的行突顯為\n"
- "<table bgcolor=\"yellow\" border=\"0\" cellspacing=\"0\" cellpadding=\"0\" "
--"width=\"100%\">"
--"<tr>"
--"<td>不同的\n"
-+"width=\"100%\"><tr><td>不同的\n"
- "背景色彩。<strong>|</strong></td></tr></table></p>\n"
- "<p>您可以在組態對話盒中的 <em>色彩</em> 頁面\n"
- "設定色彩。</p>\n"
- 
- #: tips.cpp:54
- msgid ""
--"<p>You can open the currently edited file in any other application from within\n"
-+"<p>You can open the currently edited file in any other application from "
-+"within\n"
- "Kate.</p>\n"
- "<p>Choose <strong>File -&gt; Open With</strong> for the list of programs\n"
- "configured\n"
-@@ -1680,19 +1677,21 @@
- #: tips.cpp:64
- msgid ""
- "<p>You can configure the editor to always display the line numbers and/or\n"
--"bookmark panes when started from the <strong>View Defaults</strong> "
--"page of the\n"
-+"bookmark panes when started from the <strong>View Defaults</strong> page of "
-+"the\n"
- "configuration dialog.</p>\n"
- msgstr ""
--"<p>您可以設定編輯器在啟動時永遠顯示行數和/或\n"
-+"<p>您可以設定編輯器在啟動時永遠顯示列數和/或\n"
- "書籤面板，就在組態對話盒的 <strong>檢視的預設值</strong>\n"
- "中。</p>\n"
- 
- #: tips.cpp:71
- msgid ""
--"<p>You can download new or updated <em>Syntax highlight definitions</em> from\n"
-+"<p>You can download new or updated <em>Syntax highlight definitions</em> "
-+"from\n"
- "the <strong>Highlighting</strong> page in the configuration dialog.</p>\n"
--"<p>Just click the <em>Download...</em> button on the <em>Highlight Modes</em>\n"
-+"<p>Just click the <em>Download...</em> button on the <em>Highlight Modes</"
-+"em>\n"
- "tab (You have to be online, of course...).</p>\n"
- msgstr ""
- "<p>您可以從組態對話盒中的 <strong>突顯功能</strong> 頁面\n"
-@@ -1702,23 +1701,25 @@
- 
- #: tips.cpp:79
- msgid ""
--"<p>You can cycle through all open documents by pressing <strong>"
--"Alt+Left</strong>\n"
--"or <strong>Alt+Right</strong>. The next/previous document will immediately be "
--"displayed\n"
-+"<p>You can cycle through all open documents by pressing <strong>Alt+Left</"
-+"strong>\n"
-+"or <strong>Alt+Right</strong>. The next/previous document will immediately "
-+"be displayed\n"
- "in the active frame.</p>\n"
- msgstr ""
--"<p>您可以按 <strong>Alt+Left</strong> 或 <strong>Alt+Right</strong> 來在所有開啟的文件\n"
-+"<p>您可以按 <strong>Alt+Left</strong> 或 <strong>Alt+Right</strong> 來在所有"
-+"開啟的文件\n"
- "之間循環瀏覽。上一個/下一個文件會立即顯示在作用中\n"
- "的框架。</p>\n"
- 
- #: tips.cpp:86
- msgid ""
--"<p>You can do cool sed-like regular expression replacements using <em>"
--"Command Line</em>.</p>\n"
--"<p>For example, press <strong>F7</strong> and enter <code>"
--"s /oldtext/newtext/g</code>\n"
--"to replace &quot;oldtext&quot; with &quot;newtext&quot; throughout the current\n"
-+"<p>You can do cool sed-like regular expression replacements using "
-+"<em>Command Line</em>.</p>\n"
-+"<p>For example, press <strong>F7</strong> and enter <code>s /oldtext/newtext/"
-+"g</code>\n"
-+"to replace &quot;oldtext&quot; with &quot;newtext&quot; throughout the "
-+"current\n"
- "line.</p>\n"
- msgstr ""
- "<p>您可以使用 <em>命令列</em> 來進行很酷的 類-sed 正規表示式取代功能。</p>\n"
-@@ -1736,7 +1737,8 @@
- 
- #: tips.cpp:100
- msgid ""
--"<p>You can filter the files displayed in the <em>File Selector</em> tool view.\n"
-+"<p>You can filter the files displayed in the <em>File Selector</em> tool "
-+"view.\n"
- "</p>\n"
- "<p>Simply enter your filter in the filter entry at the bottom, for example:\n"
- "<code>*.html *.php</code> if you only want to see HTML and PHP files in the\n"
-@@ -1755,7 +1757,8 @@
- "<p>You can have two views - or even more - of the same document in Kate. "
- "Editing\n"
- "in either will be reflected in both.</p>\n"
--"<p>So if you find yourself scrolling up and down to look at text at the other\n"
-+"<p>So if you find yourself scrolling up and down to look at text at the "
-+"other\n"
- "end of a document, just press <strong>Ctrl+Shift+T</strong> to split\n"
- "horizontally.</p>\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) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Traditional Chinese <zh_l10n@linux.org.tw>\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 <j_h_liau@yahoo.com.tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Chinese(traditional) <zh-l10n@linux.org.tw>\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."
--"<br>\n"
-+"This is the configuration of the Audible Bell.<br>\n"
- "It could be the system bell and/or a custom bell."
- msgstr ""
--"這是有聲響鈴的組態。"
--"<br>\n"
-+"這是有聲響鈴的組態。<br>\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."
--"<br>\n"
-+"\"System Bell\" control module for how to customize the system bell.<br>\n"
- "Normally, this is just a \"beep\"."
- msgstr ""
--"如果這個選項被確認，將會使用預設的系統響鈴。如何自訂系統響鈴則請見\"系統響鈴\"控制模組。"
--"<br>\n"
-+"如果這個選項被確認，將會使用預設的系統響鈴。如何自訂系統響鈴則請見\"系統響鈴"
-+"\"控制模組。<br>\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."
- "<br>\n"
- "Please note that on slow machines this may cause a \"lag\" between the event "
- "causing the bell and the sound being played."
- msgstr ""
--"如果您要播放聲音檔作為自訂的響鈴，請確認這個選項。如此的話，您大概就要關閉系統響鈴。"
--"<br>\n"
-+"如果您要播放聲音檔作為自訂的響鈴，請確認這個選項。如此的話，您大概就要關閉系"
-+"統響鈴。<br>\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) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Chinese Traditional <zh-l10n@linux.org.tw>\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."
--"<p> 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.<p> "
-+"Please note that on slow machines this may cause a \"lag\" between the event "
-+"causing the bell and the sound being played."
- msgstr ""
--"如果您要播放聲音檔作為自訂的響鈴，請確認這個選項。如此的話，您大概就要關閉系統響鈴。"
--"<p>請注意在速度較慢的機器上，響鈴及播放聲音事件間可能造成\"延滯\"。"
-+"如果您要播放聲音檔作為自訂的響鈴，請確認這個選項。如此的話，您大概就要關閉系"
-+"統響鈴。<p>請注意在速度較慢的機器上，響鈴及播放聲音事件間可能造成\"延滯\"。"
- 
- #: 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 <hbger@rpgs1.isa.nthu.edu.tw>, 2001
- # Kenduest Lee <kenduest@i18n.linux.org.tw>, 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 <j_h_liau@yahoo.com.tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Traditional Chinese <zh-l10n@linux.org.tw>\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 ""
--"您現在正在設定的是"
--"<h1>aRts 聲音伺服器</h1>，KDE 的聲音伺服器。這個程式將不僅讓您在播放一些 MP3 "
--"檔案或玩遊戲時仍然可以聽到系統聲音，它同時允許您套用不同的效果在系統音源上，並提供程式設計師一個較簡單的方式來達到聲音支援。"
-+"您現在正在設定的是<h1>aRts 聲音伺服器</h1>，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 <b>/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 <b>/dev/sound/dsp</b> "
--"instead. Other alternatives are things like <b>/dev/dsp0</b> or <b>/dev/dsp1</b>"
--", if you have a soundcard that supports multiple outputs, or you have multiple "
-+"Normally, the sound server defaults to using the device called <b>/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 <b>/dev/sound/dsp</b> instead. "
-+"Other alternatives are things like <b>/dev/dsp0</b> or <b>/dev/dsp1</b>, if "
-+"you have a soundcard that supports multiple outputs, or you have multiple "
- "soundcards."
- msgstr ""
--"一般而言，聲音伺服器預設使用 <b>/dev/dsp</b> 作為聲音輸出，這在絕大多數的情況下應該都能運作。一個例外的情況是如果您使用 devfs "
--"時，則您應該要使用 <b>/dev/sound/dsp</b>作為取代。其他像 <b>/dev/dsp0<b> 或 <b>/dev/dsp1</b> "
--"則是當您的音效卡支援多重輸出或您有多張音效卡時使用。"
-+"一般而言，聲音伺服器預設使用 <b>/dev/dsp</b> 作為聲音輸出，這在絕大多數的情況"
-+"下應該都能運作。一個例外的情況是如果您使用 devfs 時，則您應該要使用 <b>/dev/"
-+"sound/dsp</b>作為取代。其他像 <b>/dev/dsp0<b> 或 <b>/dev/dsp1</b> 則是當您的"
-+"音效卡支援多重輸出或您有多張音效卡時使用。"
- 
- #: 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 "
--"<b>Yamaha soundcards</b>, you might need to configure this to 48000 Hz here, if "
--"you are using <b>old SoundBlaster cards</b>, 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 音質)。如果您使用某些 <b>Yamaha 音效卡</b>"
--", 您可能必須將頻率設定改為 48000 Hz，如果您使用的是 <b>舊的聲霸卡</b>，例如 SoundBlaster Pro ，則您可能必須將設定改為 "
--"22050 Hz。當然其他數值的採用也都是有其可能性，端視環境需求而定(例如專業的錄音設備)。"
-+"quality), which is supported on almost any hardware. If you are using "
-+"certain <b>Yamaha soundcards</b>, you might need to configure this to 48000 "
-+"Hz here, if you are using <b>old SoundBlaster cards</b>, 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 音質)。"
-+"如果您使用某些 <b>Yamaha 音效卡</b>, 您可能必須將頻率設定改為 48000 Hz，如果"
-+"您使用的是 <b>舊的聲霸卡</b>，例如 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 <b>command line options</b> "
-+"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 <b>command line options</b> "
- "here which will be passed directly to <b>artsd</b>. The command line options "
--"will override the choices made in the GUI. To see the possible choices, open a "
--"Konsole window, and type <b>artsd -h</b>."
-+"will override the choices made in the GUI. To see the possible choices, open "
-+"a Konsole window, and type <b>artsd -h</b>."
- msgstr ""
--"這個設定模組(configuration module)適用於 aRts 聲音伺服器絕大部分的設定。然而有些設定並不在這裡，所以您可以在這邊增加 <b>"
--"命令行選項</b> 以直接送給 <b>artsd</b>。這些命令行選項將會蓋掉您原來在圖形介面下的選項。要檢視可能的選項，請開啟一個 konsole "
--"視窗，並輸入 <b>artsd -h</b>。"
-+"這個設定模組(configuration module)適用於 aRts 聲音伺服器絕大部分的設定。然而"
-+"有些設定並不在這裡，所以您可以在這邊增加 <b>命令行選項</b> 以直接送給 "
-+"<b>artsd</b>。這些命令行選項將會蓋掉您原來在圖形介面下的選項。要檢視可能的選"
-+"項，請開啟一個 konsole 視窗，並輸入 <b>artsd -h</b>。"
- 
- #: 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 ""
- "<i>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.</i>"
--msgstr "<i>如果您要在遠端的電腦播放聲音，或者 您希望可以從其他電腦控制這個系統的聲音，就啟動這個選項。</i>"
-+msgstr ""
-+"<i>如果您要在遠端的電腦播放聲音，或者 您希望可以從其他電腦控制這個系統的聲"
-+"音，就啟動這個選項。</i>"
- 
- #. 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 ""
- "<i>If your sound is skipping during playback, enable running with highest "
- "possible priority. Increasing your sound buffer might also help.</i>"
--msgstr "<i>如果您的聲音播放時有遺漏，可以使用盡可能高的優先權執行。增加您的聲音緩衝區也許也有幫助。</i>"
-+msgstr ""
-+"<i>如果您的聲音播放時有遺漏，可以使用盡可能高的優先權執行。增加您的聲音緩衝區"
-+"也許也有幫助。</i>"
- 
- #. 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 ""
--"<p align=\"right\"><b>Huge</b> buffer, for <b>low-end</b> machines, <b>"
--"less skipping</b></p>"
--msgstr "<p align=\"right\"><b>大的</b>緩衝區，給<b>低等級的</b>機器<b>，較少遺漏。</b></p>"
-+"<p align=\"right\"><b>Huge</b> buffer, for <b>low-end</b> machines, <b>less "
-+"skipping</b></p>"
-+msgstr ""
-+"<p align=\"right\"><b>大的</b>緩衝區，給<b>低等級的</b>機器<b>，較少遺漏。</"
-+"b></p>"
- 
- #. 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.</i>"
- msgstr ""
--"<i>KDE 聲音系統獨家控制了您的音效硬體，blocking programs 也許希望直接使用它。如果 KDE "
--"聲音系統處於閑置，它可以放棄獨家控制。</i>"
-+"<i>KDE 聲音系統獨家控制了您的音效硬體，blocking programs 也許希望直接使用它。"
-+"如果 KDE 聲音系統處於閑置，它可以放棄獨家控制。</i>"
- 
- #. 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 <j_h_liau@yahoo.com.tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: traditional Chinese <zh-l10n@linux.org.tw>\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 ""
- "<h1>Background</h1> 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."
--"<p> 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."
--"<p> 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."
--"<p> 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 ""
--"<h1>背景</h1>這個模組可以讓您控制虛擬桌面的外觀。KDE 提供您許多的選項來自訂，包含對每個虛擬桌面不同的設定或全部使用相同的桌面。"
--"<p>桌面的外觀是由背景顏色與樣式，選擇性的圖片桌布等所共同形成的。"
--"<p>背景可以使用單一的顏色或一對顏色來混合成不同的樣式。桌面也是可以依據鋪排或放大來自訂的。桌布可以與背景或樣式共同混合或覆蓋。"
--"<p>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.<p> 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."
-+"<p> 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.<p> 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 ""
-+"<h1>背景</h1>這個模組可以讓您控制虛擬桌面的外觀。KDE 提供您許多的選項來自訂，"
-+"包含對每個虛擬桌面不同的設定或全部使用相同的桌面。<p>桌面的外觀是由背景顏色與"
-+"樣式，選擇性的圖片桌布等所共同形成的。<p>背景可以使用單一的顏色或一對顏色來混"
-+"合成不同的樣式。桌面也是可以依據鋪排或放大來自訂的。桌布可以與背景或樣式共同"
-+"混合或覆蓋。<p>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 ""
- "<qt>\n"
--"<p>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.</p>\n"
--"<p>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).</p>\n"
-+"<p>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.</p>\n"
-+"<p>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).</p>\n"
- "</qt>"
- msgstr ""
- "<qt>\n"
--"<p>如果您要增加程式到這個列框則敲擊這裡。這個按鈕會打開一個對話框，並將要求您提供您所要執行程式的細節。要成功地加入程式, "
--"您必須知道它是否相容，可執行檔的名稱以及它的選項(如果必要的話)。</p>\n"
--"<p>您通常可以在終端機模擬視窗鍵入可執行檔名稱並加上 --help(foobar --help)，就可獲得合適程式的可用選項。</p>\n"
-+"<p>如果您要增加程式到這個列框則敲擊這裡。這個按鈕會打開一個對話框，並將要求您"
-+"提供您所要執行程式的細節。要成功地加入程式, 您必須知道它是否相容，可執行檔的"
-+"名稱以及它的選項(如果必要的話)。</p>\n"
-+"<p>您通常可以在終端機模擬視窗鍵入可執行檔名稱並加上 --help(foobar --help)，就"
-+"可獲得合適程式的可用選項。</p>\n"
- "<qt>"
- 
- #. 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 ""
- "<qt>\n"
--"<p>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).</p>\n"
-+"<p>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).</p>\n"
- "<p>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.</p>\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.</p>\n"
- "</qt>"
- msgstr ""
- "<qt>\n"
--"<p>按這裡改變程式選項。您通常可以在終端機模擬視窗鍵入可執行檔名稱並加上 --help。(例如: Kwebdesktop "
--"--help)，就可獲得合適程式的可用選項。</p>\n"
--"<p>一個有用的例子就是 "
--"kwebdesktop這個程式。它在您的桌面背景繪製成一個網頁。您可以在列框右邊選取使用這個程式，但它將繪製為預設的網頁。要改變它顯示的網頁，選取列框內的 "
--"kwebdesktop 程式，然後敲擊這裡。將會出現一個對話框，並允許您用新的網址取代舊有的網址(URL)以改變網頁。</p>\n"
-+"<p>按這裡改變程式選項。您通常可以在終端機模擬視窗鍵入可執行檔名稱並加上 --"
-+"help。(例如: Kwebdesktop --help)，就可獲得合適程式的可用選項。</p>\n"
-+"<p>一個有用的例子就是 kwebdesktop這個程式。它在您的桌面背景繪製成一個網頁。您"
-+"可以在列框右邊選取使用這個程式，但它將繪製為預設的網頁。要改變它顯示的網頁，"
-+"選取列框內的 kwebdesktop 程式，然後敲擊這裡。將會出現一個對話框，並允許您用新"
-+"的網址取代舊有的網址(URL)以改變網頁。</p>\n"
- "</qt>"
- 
- #. i18n: file bgadvanced_ui.ui line 104
-@@ -402,19 +409,16 @@
- "<qt>\n"
- "<p>Select from this listbox the program you want to use to draw your desktop "
- "background.</p>\n"
--"<p>The <b>Program</b> column shows the name of the program."
--"<br>\n"
--"The <b>Comment</b> column brings a short description."
--"<br>\n"
-+"<p>The <b>Program</b> column shows the name of the program.<br>\n"
-+"The <b>Comment</b> column brings a short description.<br>\n"
- "The <b>Refresh</b> column indicates the time interval between redraws of the "
- "desktop.</p>\n"
--"<p>The <b>K Web Desktop</b> 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 <b>Modify</b> button."
--"<br>\n"
-+"<p>The <b>K Web Desktop</b> 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 <b>Modify</b> "
-+"button.<br>\n"
- "You can also add new compliant programs. To do that, click on the <b>Add</b> "
--"button."
--"<br>\n"
-+"button.<br>\n"
- "You can also remove programs from this list clicking on the <b>Remove</b> "
- "button. Please note that it does not remove the program from your system, it "
- "only removes it from the available options in this listbox.</p>\n"
-@@ -422,18 +426,15 @@
- msgstr ""
- "<qt>\n"
- "<p>從這個列框選擇您要用來繪製桌面背景的程式。</p>\n"
--"<p><b>程式</b>這一行顯示程式的名稱。"
--"<br>\n"
--"<p><b>註解</b>這一行提供簡短的描述。"
--"<br>\n"
--"<p><b>重整</b>這一行指示重繪桌面的時間間隔。"
--"<br>\n"
--"<p><b>K Web Desktop</b> 程式 (kwebdesktop) 是值得注意的: 。它在您的桌面繪製指定的網頁。在這裡選取它，然後按<b>"
--"變更</b>按鈕您就可以修飾它以及它所繪的網頁。"
--"<br>\n"
--"您也可以增加新的相容的程式。要這麼做的話，就按<b>增加</b>按鈕。"
-+"<p><b>程式</b>這一列顯示程式的名稱。<br>\n"
-+"<p><b>註解</b>這一列提供簡短的描述。<br>\n"
-+"<p><b>重整</b>這一列指示重繪桌面的時間間隔。<br>\n"
-+"<p><b>K Web Desktop</b> 程式 (kwebdesktop) 是值得注意的: 。它在您的桌面繪製指"
-+"定的網頁。在這裡選取它，然後按<b>變更</b>按鈕您就可以修飾它以及它所繪的網頁。"
- "<br>\n"
--"您也可以按<b>移除</b>從清單中移除程式。請注意它並沒有把程式從您的系統移除，它只是從列框內的可用選項移除。</p>\n"
-+"您也可以增加新的相容的程式。要這麼做的話，就按<b>增加</b>按鈕。<br>\n"
-+"您也可以按<b>移除</b>從清單中移除程式。請注意它並沒有把程式從您的系統移除，它"
-+"只是從列框內的可用選項移除。</p>\n"
- "</qt>"
- 
- #. 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 @@
- "<qt>You can choose here how a background picture is shown on the desktop:\n"
- "<ul>\n"
- "<li><em>Centered:</em> Center the picture on the desktop.</li>\n"
--" "
--"<li><em>Tiled:</em> Tile the picture beginning at the top left of the desktop, "
--"so the desktop is totally covered up.</li>\n"
-+" <li><em>Tiled:</em> Tile the picture beginning at the top left of the "
-+"desktop, so the desktop is totally covered up.</li>\n"
- "<li><em>Center Tiled:</em> Center the picture on the desktop and then tile "
- "around it so that the background is totally covered up.</li>\n"
--"<li><em>Centered Maxpect:</em> Magnify the picture without distorting it until "
--"it fills either the width or height of the desktop, and then center it on the "
--"desktop.</li>\n"
--"<li><em>Scaled:</em> Magnify the picture, until the entire desktop is covered. "
--"This may result in some distortion of the picture.</li>\n"
--"<li><em>Centered Auto Fit:</em> 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.</li>\n"
--"<li><em>Scale and Crop:</em> Magnify the picture without distorting it until it "
--"fills both the width and height of the desktop (cropping the picture if "
-+"<li><em>Centered Maxpect:</em> Magnify the picture without distorting it "
-+"until it fills either the width or height of the desktop, and then center it "
-+"on the desktop.</li>\n"
-+"<li><em>Scaled:</em> Magnify the picture, until the entire desktop is "
-+"covered. This may result in some distortion of the picture.</li>\n"
-+"<li><em>Centered Auto Fit:</em> 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.</li>\n"
-+"<li><em>Scale and Crop:</em> 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.</li>\n"
- "</ul></qt>"
- msgstr ""
- "<qt>這裡您可以選擇背景圖片如何展示在桌面上：\n"
--" "
--"<ul>\n"
-+" <ul>\n"
- "<li><em>置中：</em> 圖片放置在桌面正中央。</li>\n"
--" "
--"<li><em>鋪排：</em> 從桌面左上角開始鋪排，所以桌面會被完整的覆蓋。</li>\n"
--"<li><em>中央鋪排：</em> 圖片先放置在桌面正中央然後從周圍開始鋪排，所以桌面會完全被完整的覆蓋。</li>\n"
--"<li><em>置中最大化：</em> 不會扭曲圖片比例，圖片會最大化直到填滿桌面的長或者寬，然後放置在桌面正中央。</li>\n"
--"<li><em>放大至全螢幕：</em>圖片會最大化直到填滿整個桌面，這有可能造成圖片比例的扭曲。</li>\n"
--"<li><em>置中自動調適：</em> 如果圖片可放進桌面，這個模式跟置中選項一樣。 如果圖片大於桌面，它將按比例縮小到適合桌面。</li>\n"
--"<li><em>縮放 & 剪裁：</em> 不會扭曲圖片比例，圖片會最大化直到填滿桌面的長與寬（如果必要會進行剪裁），然後放置在桌面正中央。</li>\n"
-+" <li><em>鋪排：</em> 從桌面左上角開始鋪排，所以桌面會被完整的覆蓋。</li>\n"
-+"<li><em>中央鋪排：</em> 圖片先放置在桌面正中央然後從周圍開始鋪排，所以桌面會"
-+"完全被完整的覆蓋。</li>\n"
-+"<li><em>置中最大化：</em> 不會扭曲圖片比例，圖片會最大化直到填滿桌面的長或者"
-+"寬，然後放置在桌面正中央。</li>\n"
-+"<li><em>放大至全螢幕：</em>圖片會最大化直到填滿整個桌面，這有可能造成圖片比例"
-+"的扭曲。</li>\n"
-+"<li><em>置中自動調適：</em> 如果圖片可放進桌面，這個模式跟置中選項一樣。 如果"
-+"圖片大於桌面，它將按比例縮小到適合桌面。</li>\n"
-+"<li><em>縮放 & 剪裁：</em> 不會扭曲圖片比例，圖片會最大化直到填滿桌面的長與寬"
-+"（如果必要會進行剪裁），然後放置在桌面正中央。</li>\n"
- "</ul></qt>"
- 
- #. 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: <ul><li><em>Flat:</em> Use a solid color (\"Color 1\").</li> <li><em>Pattern:</em> Use a two-color pattern. Click \"Setup\" to choose the pattern.</li> <li><em>Gradients:</em> Blend two colors using a predefined gradient (horizontal, vertical, etc.).</li> <li><em>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.</li></ul>"
--#~ msgstr "您可以選擇桌面繪製的習慣，選擇為:<ul><li><em>單純:</em> 使用固定顏色 (\"顏色 1\")。</li><li><em>花樣:</em> 使用二種顏色的花樣。按下 \"設定\" 以選擇花樣。</li><li><em>漸層:</em> 使用預先定義的方式混合二種顏色 (水平，垂直等)。</li><li><em>程式:</em> 使用繪製背景的程式，例如定期更新的世界日夜圖。按下 \"設定\" 以選擇並設定程式。</li><ul>"
-+#~ msgid ""
-+#~ "You can select the manner in which the background is painted. The choices "
-+#~ "are: <ul><li><em>Flat:</em> Use a solid color (\"Color 1\").</li> "
-+#~ "<li><em>Pattern:</em> Use a two-color pattern. Click \"Setup\" to choose "
-+#~ "the pattern.</li> <li><em>Gradients:</em> Blend two colors using a "
-+#~ "predefined gradient (horizontal, vertical, etc.).</li> <li><em>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.</li></ul>"
-+#~ msgstr ""
-+#~ "您可以選擇桌面繪製的習慣，選擇為:<ul><li><em>單純:</em> 使用固定顏色 (\"顏"
-+#~ "色 1\")。</li><li><em>花樣:</em> 使用二種顏色的花樣。按下 \"設定\" 以選擇"
-+#~ "花樣。</li><li><em>漸層:</em> 使用預先定義的方式混合二種顏色 (水平，垂直"
-+#~ "等)。</li><li><em>程式:</em> 使用繪製背景的程式，例如定期更新的世界日夜"
-+#~ "圖。按下 \"設定\" 以選擇並設定程式。</li><ul>"
- 
- #~ 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 "<b>Advanced Options</b>"
- #~ msgstr "<b>進階選項</b>"
-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 <j_h_liau@yahoo.com.tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\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 ""
- "<h1>System Bell</h1> 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 ""
--"<h1>系統響鈴</h1> 您可以在這邊自訂您系統的標準鈴聲， 也就是當發生錯誤時您所聽到的\"beep\"聲音。 注意您可以在\"輔助工具\" "
--"控制模組做更進一步的設定， 例如播放聲音檔案而不是標準鈴聲。"
-+"<h1>系統響鈴</h1> 您可以在這邊自訂您系統的標準鈴聲， 也就是當發生錯誤時您所聽"
-+"到的\"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 <j_h_liau@yahoo.com.tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Chinese (Traditional) <zh-l10n@linux.org.tw>\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 ""
- "<h1>CGI Scripts</h1> 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 ""
--"<h1>CGI 程式</h1> CGI KIO slave 讓您不需要執行網頁伺服器便可執行本機的 CGI 程式。 在這個控制模組中，您可以 設定欲搜尋 "
--"CGI 程式碼的路徑。"
-+"<h1>CGI 程式</h1> 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 <j_h_liau@yahoo.com.tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Chinese (traditional <zh-l10n@lists.linux.org.tw>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
-@@ -29,31 +29,33 @@
- 
- #: colorscm.cpp:100
- msgid ""
--"<h1>Colors</h1> 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."
--"<p> 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."
--"<p> 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 ""
--"<h1>色彩</h1> 這個模組可以讓您選擇 KDE "
--"桌面的色彩主題。桌面上的不同元素，像是標題列、選單文字等等，被稱作「介面工具」。您可以經由在清單中選取，或單擊對應的部分來選取您想要改變色彩的介面工具。"
--"<p> 您可以將色彩設定儲存成完整的色彩主題，而且稍後可以再修改或刪除。KDE 包含數個預先定義好的色彩主題供您使用。"
--"<p> 所有的 KDE 應用程式都會遵循選定的色彩主題。非 KDE 應用程式或許會遵循部份或全部的顏色設定。如果啟用這個選項。"
-+"<h1>Colors</h1> 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.<p> 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.<p> 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 ""
-+"<h1>色彩</h1> 這個模組可以讓您選擇 KDE 桌面的色彩主題。桌面上的不同元素，像是"
-+"標題列、選單文字等等，被稱作「介面工具」。您可以經由在清單中選取，或單擊對應"
-+"的部分來選取您想要改變色彩的介面工具。<p> 您可以將色彩設定儲存成完整的色彩主"
-+"題，而且稍後可以再修改或刪除。KDE 包含數個預先定義好的色彩主題供您使用。<p> "
-+"所有的 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."
--"<p> 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.<p> "
-+"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 ""
--"這是預先定義的色彩主題清單，包含您之前所建立的。您可以經由選擇清單中的主題以預覽之。目前的主題將會被所選擇的主題所取代。"
--"<p>警告：如果您曾對目前主題進行過任何變更但尚未套用它，這些變更將會在您選擇其他色彩主題後遺失。"
-+"這是預先定義的色彩主題清單，包含您之前所建立的。您可以經由選擇清單中的主題以"
-+"預覽之。目前的主題將會被所選擇的主題所取代。<p>警告：如果您曾對目前主題進行過"
-+"任何變更但尚未套用它，這些變更將會在您選擇其他色彩主題後遺失。"
- 
- #: 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 <j_h_liau@yahoo.com.tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
-@@ -46,8 +46,8 @@
- 
- #: componentchooser.cpp:408
- msgid ""
--"<qt>You changed the default component of your choice. Do you want to save that "
--"change now?</qt>"
-+"<qt>You changed the default component of your choice. Do you want to save "
-+"that change now?</qt>"
- msgstr "<qt>您的選擇已經變更預設的元件，您現在要儲存此變更嗎？</qt>"
- 
- #: 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 @@
- "<p>This list shows the configurable component types. Click the component you "
- "want to configure.</p>\n"
- "<p>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.</p>\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.</p>\n"
- "</qt>"
- msgstr ""
- "<qt>\n"
- "<p>這個列表顯示可設定元件的類別。請點選您想設定的元件。</p>\n"
--"<p>在這個對話框您可改變KDE的預設元件。您將可在此改變元件程式。元件指 的是處理基本工作的程式，例如終端機程式，文字編輯器及電子郵件程式等。 "
--"眾多的KDE應用程式有時需要引入終端機程式，寄發電子郵件或者顯示一些文 字。為求一致，這些應用程式都會呼叫同樣的元件。 "
--"您可在此選擇這些元件所使用的程式。</p>\n"
-+"<p>在這個對話框您可改變KDE的預設元件。您將可在此改變元件程式。元件指 的是處理"
-+"基本工作的程式，例如終端機程式，文字編輯器及電子郵件程式等。 眾多的KDE應用程"
-+"式有時需要引入終端機程式，寄發電子郵件或者顯示一些文 字。為求一致，這些應用程"
-+"式都會呼叫同樣的元件。 您可在此選擇這些元件所使用的程式。</p>\n"
- "</qt>"
- 
- #. i18n: file emailclientconfig_ui.ui line 83
- #: rc.cpp:33
- #, no-c-format
- msgid ""
--"<ul> "
--"<li>%t: Recipient's address</li> "
--"<li>%s: Subject</li> "
--"<li>%c: Carbon Copy (CC)</li> "
--"<li>%b: Blind Carbon Copy (BCC)</li> "
--"<li>%B: Template body text</li> "
--"<li>%A: Attachment </li> </ul>"
-+"<ul> <li>%t: Recipient's address</li> <li>%s: Subject</li> <li>%c: Carbon "
-+"Copy (CC)</li> <li>%b: Blind Carbon Copy (BCC)</li> <li>%B: Template body "
-+"text</li> <li>%A: Attachment </li> </ul>"
- msgstr ""
--"<ul> "
--"<li>%t: 收件者電子郵件位址</li> "
--"<li>%s: 主旨</li> "
--"<li>%c: 副本 (CC)</li> "
--"<li>%b: 密件副本 (BCC)</li> "
--"<li>%B: 本文文字範本</li> "
--"<li>%A: 附加檔案 </li> </ul>"
-+"<ul> <li>%t: 收件者電子郵件位址</li> <li>%s: 主旨</li> <li>%c: 副本 (CC)</"
-+"li> <li>%b: 密件副本 (BCC)</li> <li>%B: 本文文字範本</li> <li>%A: 附加檔案 </"
-+"li> </ul>"
- 
- #. 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."
--"<br> You can also use several placeholders which will be replaced with the "
--"actual values when the email client is called:"
--"<ul> "
--"<li>%t: Recipient's address</li> "
--"<li>%s: Subject</li> "
--"<li>%c: Carbon Copy (CC)</li> "
--"<li>%b: Blind Carbon Copy (BCC)</li> "
--"<li>%B: Template body text</li> "
--"<li>%A: Attachment </li> </ul>"
-+"accepted.<br> You can also use several placeholders which will be replaced "
-+"with the actual values when the email client is called:<ul> <li>%t: "
-+"Recipient's address</li> <li>%s: Subject</li> <li>%c: Carbon Copy (CC)</li> "
-+"<li>%b: Blind Carbon Copy (BCC)</li> <li>%B: Template body text</li> <li>%A: "
-+"Attachment </li> </ul>"
- msgstr ""
--"按下這個按鈕以選擇您偏好的電子郵件軟體。 請注意 您選擇的檔案必須具有可執行之屬性才會被接受。"
--"<br> 您也可以使用數個在電子郵件軟體被呼叫時將以實際數值取代的占位符"
--"<ul> "
--"<li>%t: 收件者電子郵件位址</li> "
--"<li>%s: 主旨</li> "
--"<li>%c: 副本 (CC)</li> "
--"<li>%b: 密件副本 (BCC)</li> "
--"<li>%B: 本文文字範本</li> "
--"<li>%A: 附加檔案 </li> </ul>"
-+"按下這個按鈕以選擇您偏好的電子郵件軟體。 請注意 您選擇的檔案必須具有可執行之"
-+"屬性才會被接受。<br> 您也可以使用數個在電子郵件軟體被呼叫時將以實際數值取代的"
-+"占位符<ul> <li>%t: 收件者電子郵件位址</li> <li>%s: 主旨</li> <li>%c: 副本 "
-+"(CC)</li> <li>%b: 密件副本 (BCC)</li> <li>%B: 本文文字範本</li> <li>%A: 附加"
-+"檔案 </li> </ul>"
- 
- #. 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. <em>Konsole</em>)."
--msgstr "如果您想要讓所選擇的電子郵件軟體在終端機中執行，請選擇這個選項 (終端機：e.g. <em>Konsole</em>)."
-+"Activate this option if you want the selected email client to be executed in "
-+"a terminal (e.g. <em>Konsole</em>)."
-+msgstr ""
-+"如果您想要讓所選擇的電子郵件軟體在終端機中執行，請選擇這個選項 (終端機：e.g. "
-+"<em>Konsole</em>)."
- 
- #. 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."
--"<br> 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.<br> Also note that some programs that utilize Terminal Emulator "
-+"will not work if you add command line arguments (Example: konsole -ls)."
- msgstr ""
--"按這個按鈕來選擇您喜愛的終端機客戶端。請注意您所選的檔案必須設定可執行屬性才能被接受。"
--"<br>同時也注意某些使用終端機模擬器的程式可能無法依您下的命令列引數運作(例如：konsole -ls)。"
-+"按這個按鈕來選擇您喜愛的終端機客戶端。請注意您所選的檔案必須設定可執行屬性才"
-+"能被接受。<br>同時也注意某些使用終端機模擬器的程式可能無法依您下的命令列引數"
-+"運作(例如：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 <franklin at goodhorse dot idv dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Chinese Traditional <zh-l10n@linux.org.tw>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
-@@ -22,10 +22,12 @@
- 
- #: crypto.cpp:226
- msgid ""
--"<h1>Crypto</h1> This module allows you to configure SSL for use with most KDE "
--"applications, as well as manage your personal certificates and the known "
-+"<h1>Crypto</h1> 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 "<h1>編碼</h1> 這個模組可以讓您設定 SSL 給大多數的 KDE 程式使用，並可以管理您個人憑證與已知的憑證授權。"
-+msgstr ""
-+"<h1>編碼</h1> 這個模組可以讓您設定 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 ""
- "<qt>Use these preconfigurations to more easily configure the SSL encryption "
--"settings. You can choose among the following modes: "
--"<ul>"
--msgstr "<qt>使用這些預先設定可以更便利的設置 SSL 加密設定。您可以選擇下列的模式：<ul>"
-+"settings. You can choose among the following modes: <ul>"
-+msgstr ""
-+"<qt>使用這些預先設定可以更便利的設置 SSL 加密設定。您可以選擇下列的模式：<ul>"
- 
- #: crypto.cpp:338
- msgid "Most Compatible"
-@@ -112,8 +120,8 @@
- 
- #: crypto.cpp:339
- msgid ""
--"<li><b>Most Compatible:</b> Select the settings found to be most "
--"compatible.</li>"
-+"<li><b>Most Compatible:</b> Select the settings found to be most compatible."
-+"</li>"
- msgstr "<li><b>最相容的：</b>選擇最具相容性之設定。</li>"
- 
- #: crypto.cpp:340
-@@ -124,7 +132,9 @@
- msgid ""
- "<li><b>US Ciphers Only:</b> Select only the US strong (&gt;= 128 bit) "
- "encryption ciphers.</li>"
--msgstr "<li><b>只能用在美國境內的編碼：</b>只選取用於美國境內的高度加密編碼 (&gt;= 128位元)。</li>"
-+msgstr ""
-+"<li><b>只能用在美國境內的編碼：</b>只選取用於美國境內的高度加密編碼 (&gt;= "
-+"128位元)。</li>"
- 
- #: crypto.cpp:342
- msgid "Export Ciphers Only"
-@@ -132,9 +142,10 @@
- 
- #: crypto.cpp:343
- msgid ""
--"<li><b>Export Ciphers Only:</b> Select only the weak ciphers (&lt;= 56 "
--"bit).</li>"
--msgstr "<li><b>用於美國境外的編碼：</b>只選取最低度加密之編碼 (&lt;= 56位元)。</li>"
-+"<li><b>Export Ciphers Only:</b> Select only the weak ciphers (&lt;= 56 bit)."
-+"</li>"
-+msgstr ""
-+"<li><b>用於美國境外的編碼：</b>只選取最低度加密之編碼 (&lt;= 56位元)。</li>"
- 
- #: crypto.cpp:344
- msgid "Enable All"
-@@ -150,7 +161,7 @@
- 
- #: crypto.cpp:359
- msgid "If selected, you will be notified when entering an SSL enabled site"
--msgstr "如果選擇此選項，在進入啟用 SSL 的站台時將會通知您。"
-+msgstr "如果選擇此選項，在進入啟用 SSL 的站臺時將會通知您。"
- 
- #: crypto.cpp:363
- msgid "Warn on &leaving SSL mode"
-@@ -158,7 +169,7 @@
- 
- #: crypto.cpp:366
- msgid "If selected, you will be notified when leaving an SSL based site."
--msgstr "如果選擇此選項，在離開支援 SSL 的站台時將會通知您。"
-+msgstr "如果選擇此選項，在離開支援 SSL 的站臺時將會通知您。"
- 
- #: crypto.cpp:370
- msgid "Warn on sending &unencrypted data"
-@@ -204,13 +215,17 @@
- msgid ""
- "If selected, OpenSSL will be asked to use the entropy gathering daemon (EGD) "
- "for initializing the pseudo-random number generator."
--msgstr "如果選擇此選項， OpenSSL 將會使用 EGD (entropy gathering daemon) 作為啟始的亂數產生器。"
-+msgstr ""
-+"如果選擇此選項， OpenSSL 將會使用 EGD (entropy gathering daemon) 作為啟始的亂"
-+"數產生器。"
- 
- #: crypto.cpp:427
- msgid ""
- "If selected, OpenSSL will be asked to use the given file as entropy for "
- "initializing the pseudo-random number generator."
--msgstr "如果選擇此選項， OpenSSL 將會使用給與的檔案做為啟始亂數產生器時的隨機變化依據。"
-+msgstr ""
-+"如果選擇此選項， OpenSSL 將會使用給與的檔案做為啟始亂數產生器時的隨機變化依"
-+"據。"
- 
- #: crypto.cpp:430
- msgid ""
-@@ -224,8 +239,8 @@
- 
- #: crypto.cpp:451
- msgid ""
--"This list box shows which certificates of yours KDE knows about. You can easily "
--"manage them from here."
-+"This list box shows which certificates of yours KDE knows about. You can "
-+"easily manage them from here."
- msgstr "這個列表方塊顯示 KDE 認得的憑證。您可以在這邊加以管理。"
- 
- #: crypto.cpp:455 crypto.cpp:615 crypto.cpp:731
-@@ -238,15 +253,15 @@
- 
- #: crypto.cpp:459 crypto.cpp:734
- msgid "I&mport..."
--msgstr "匯入(&M)..."
-+msgstr "匯入(&M)…"
- 
- #: crypto.cpp:463 crypto.cpp:618
- msgid "&Export..."
--msgstr "匯出(&E)..."
-+msgstr "匯出(&E)…"
- 
- #: crypto.cpp:468 crypto.cpp:573
- msgid "Remo&ve"
--msgstr "移除(&V)..."
-+msgstr "移除(&V)…"
- 
- #: crypto.cpp:473
- msgid "&Unlock"
-@@ -258,7 +273,7 @@
- 
- #: crypto.cpp:483
- msgid "Chan&ge Password..."
--msgstr "更改密碼(&G)..."
-+msgstr "更改密碼(&G)…"
- 
- #: crypto.cpp:493 crypto.cpp:648
- msgid "This is the information known about the owner of the certificate."
-@@ -294,7 +309,7 @@
- 
- #: crypto.cpp:515
- msgid "On SSL Connection..."
--msgstr "當 SSL 連線..."
-+msgstr "當 SSL 連線…"
- 
- #: crypto.cpp:516
- msgid "&Use default certificate"
-@@ -384,9 +399,10 @@
- 
- #: crypto.cpp:611
- msgid ""
--"This list box shows which site and person certificates KDE knows about. You can "
--"easily manage them from here."
--msgstr "這個列表方塊顯示 KDE 認得的站台與個人的憑證。您可以在此很容易地管理管理它們。"
-+"This list box shows which site and person certificates KDE knows about. You "
-+"can easily manage them from here."
-+msgstr ""
-+"這個列表方塊顯示 KDE 認得的站臺與個人的憑證。您可以在此很容易地管理管理它們。"
- 
- #: crypto.cpp:614 crypto.cpp:729
- msgid "Organization"
-@@ -394,8 +410,8 @@
- 
- #: crypto.cpp:621
- msgid ""
--"This button allows you to export the selected certificate to a file of various "
--"formats."
-+"This button allows you to export the selected certificate to a file of "
-+"various formats."
- msgstr "這個按鈕可讓您將已選取的憑證匯出為多種格式的檔案。"
- 
- #: crypto.cpp:628
-@@ -473,7 +489,7 @@
- 
- #: crypto.cpp:753
- msgid "Accept for site signing"
--msgstr "接受這個站台簽名"
-+msgstr "接受這個站臺簽名"
- 
- #: crypto.cpp:754
- msgid "Accept for email signing"
-@@ -497,9 +513,10 @@
- 
- #: crypto.cpp:801
- msgid ""
--"This list box shows which sites you have decided to accept a certificate from "
--"even though the certificate might fail the validation procedure."
--msgstr "這個列表方塊列出您決定要接受憑證的網站，而這些憑證可能是無效的或未經確認的。"
-+"This list box shows which sites you have decided to accept a certificate "
-+"from even though the certificate might fail the validation procedure."
-+msgstr ""
-+"這個列表方塊列出您決定要接受憑證的網站，而這些憑證可能是無效的或未經確認的。"
- 
- #: crypto.cpp:809
- msgid "&Add"
-@@ -547,7 +564,9 @@
- msgid ""
- "If you do not select at least one SSL algorithm, either SSL will not work or "
- "the application may be forced to choose a suitable default."
--msgstr "如果您沒有選擇至少一種 SSL 演算法，SSL 將無法運作，而且程式可能被迫使用適合的預設值。"
-+msgstr ""
-+"如果您沒有選擇至少一種 SSL 演算法，SSL 將無法運作，而且程式可能被迫使用適合的"
-+"預設值。"
- 
- #: crypto.cpp:1087
- msgid "If you do not select at least one cipher, SSLv2 will not work."
-diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kcmcss.po kde-i18n-zh_TW-3.5.10/messages/kdebase/kcmcss.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kcmcss.po	2008-08-19 20:43:10.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdebase/kcmcss.po	2011-11-11 15:45:17.000000000 +0100
-@@ -29,7 +29,7 @@
- "Project-Id-Version: kcmcss\n"
- "POT-Creation-Date: 2008-07-08 01:18+0200\n"
- "PO-Revision-Date: 2005-08-11 21:22+0800\n"
--"Last-Translator: Chao-Hsiung Liao <j_h_liau@yahoo.com.tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team:  <en@li.org>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
-@@ -38,26 +38,29 @@
- 
- #: kcmcss.cpp:37
- msgid ""
--"<h1>Konqueror Stylesheets</h1> This module allows you to apply your own color "
--"and font settings to Konqueror by using stylesheets (CSS). You can either "
--"specify options or apply your own self-written stylesheet by pointing to its "
--"location."
--"<br> Note that these settings will always have precedence before all other "
--"settings made by the site author. This can be useful to visually impaired "
--"people or for web pages that are unreadable due to bad design."
--msgstr ""
--"<h1>Konqueror 樣式表</h1>這些工具可以透過改變樣式表(CSS)的方式來改變 konqueror "
--"瀏覽器的顏色及字型設定。在這個地方您可以應用指定的方式，或是提供您自己撰寫好樣式表的方式來完成設定。"
--"<br>提示：這些設定會被設定為預設樣式直到您所瀏覽的網頁改變這些設定值為止。這些設定值可以運用在增加一些設計不良的網頁 的可讀性。"
-+"<h1>Konqueror Stylesheets</h1> This module allows you to apply your own "
-+"color and font settings to Konqueror by using stylesheets (CSS). You can "
-+"either specify options or apply your own self-written stylesheet by pointing "
-+"to its location.<br> Note that these settings will always have precedence "
-+"before all other settings made by the site author. This can be useful to "
-+"visually impaired people or for web pages that are unreadable due to bad "
-+"design."
-+msgstr ""
-+"<h1>Konqueror 樣式表</h1>這些工具可以透過改變樣式表(CSS)的方式來改變 "
-+"konqueror 瀏覽器的顏色及字型設定。在這個地方您可以應用指定的方式，或是提供您"
-+"自己撰寫好樣式表的方式來完成設定。<br>提示：這些設定會被設定為預設樣式直到您"
-+"所瀏覽的網頁改變這些設定值為止。這些設定值可以運用在增加一些設計不良的網頁 的"
-+"可讀性。"
- 
- #. i18n: file cssconfig.ui line 20
- #: rc.cpp:3 rc.cpp:33
- #, no-c-format
- msgid ""
--"<b>Stylesheets</b>"
--"<p>See http://www.w3.org/Style/CSS for further information on cascading style "
--"sheets.</p>"
--msgstr "<b>樣式表</b><p>請連線至 http://www.w3.org/Style/CSS 來了解更多有關於樣式表的訊息。</p>"
-+"<b>Stylesheets</b><p>See http://www.w3.org/Style/CSS for further information "
-+"on cascading style sheets.</p>"
-+msgstr ""
-+"<b>樣式表</b><p>請連線至 http://www.w3.org/Style/CSS 來了解更多有關於樣式表的"
-+"訊息。</p>"
- 
- #. i18n: file cssconfig.ui line 45
- #: rc.cpp:6
-@@ -69,8 +72,8 @@
- #: rc.cpp:9
- #, no-c-format
- msgid ""
--"<b>Stylesheets</b>"
--"<p>Use this groupbox to determine how Konqueror will render style sheets.</p>"
-+"<b>Stylesheets</b><p>Use this groupbox to determine how Konqueror will "
-+"render style sheets.</p>"
- msgstr "<b>樣式表</b><p>利用這些選項來設定Konqueror 瀏覽器 的預設樣式。</p>"
- 
- #. i18n: file cssconfig.ui line 68
-@@ -83,8 +86,8 @@
- #: rc.cpp:15
- #, no-c-format
- msgid ""
--"<b>Use default stylesheet</b>"
--"<p>Select this option to use the default stylesheet.</p>"
-+"<b>Use default stylesheet</b><p>Select this option to use the default "
-+"stylesheet.</p>"
- msgstr "<b>使用預設樣式表</b><p>點選這個選項來使用預設 的樣式表。</p>"
- 
- #. i18n: file cssconfig.ui line 82
-@@ -97,17 +100,17 @@
- #: rc.cpp:21
- #, no-c-format
- msgid ""
--"<b>Use user-defined stylesheet</b>"
--"<p>If this box is checked, Konqueror will try to load a user-defined style "
--"sheet as specified in the location below. The style sheet allows you to "
--"completely override the way web pages are rendered in your browser. The file "
--"specified should contain a valid style sheet (see http://www.w3.org/Style/CSS "
--"for further information on cascading style sheets).</p>"
--msgstr ""
--"<b>使用者自定樣式表</b>"
--"<p>如果選了這個選項， konqueror "
--"瀏覽器會試著載入下面位置中指定使用者自定的樣式表。樣式表讓您可以完全蓋過網頁在瀏覽器的顯示狀況。這個檔案必需包含了一個完整且正確的樣式表(請連線至 "
--"http://www.w3.org/Style/CSS 來了解更多有關於樣式表題的訊息)。</p>"
-+"<b>Use user-defined stylesheet</b><p>If this box is checked, Konqueror will "
-+"try to load a user-defined style sheet as specified in the location below. "
-+"The style sheet allows you to completely override the way web pages are "
-+"rendered in your browser. The file specified should contain a valid style "
-+"sheet (see http://www.w3.org/Style/CSS for further information on cascading "
-+"style sheets).</p>"
-+msgstr ""
-+"<b>使用者自定樣式表</b><p>如果選了這個選項， konqueror 瀏覽器會試著載入下面位"
-+"置中指定使用者自定的樣式表。樣式表讓您可以完全蓋過網頁在瀏覽器的顯示狀況。這"
-+"個檔案必需包含了一個完整且正確的樣式表(請連線至 http://www.w3.org/Style/CSS "
-+"來了解更多有關於樣式表題的訊息)。</p>"
- 
- #. i18n: file cssconfig.ui line 136
- #: rc.cpp:24
-@@ -119,19 +122,19 @@
- #: rc.cpp:27
- #, no-c-format
- msgid ""
--"<b>Use accessibility stylesheet</b>"
--"<p>Selecting this option will allow you to define a default font, font size, "
--"and font color with a few simple clicks of the mouse. Simply wander over to the "
--"Customize... dialog and pick out your desired options.</p>"
-+"<b>Use accessibility stylesheet</b><p>Selecting this option will allow you "
-+"to define a default font, font size, and font color with a few simple clicks "
-+"of the mouse. Simply wander over to the Customize... dialog and pick out "
-+"your desired options.</p>"
- msgstr ""
--"<b>使用輔助樣式表</b>"
--"<p>只需按幾下滑鼠，選擇這些選項能使您設定成預設的字型、字型大小、及顏色。簡單的按下「自訂...」對話盒並且選擇您所喜好的設定。</p>"
-+"<b>使用輔助樣式表</b><p>只需按幾下滑鼠，選擇這些選項能使您設定成預設的字型、"
-+"字型大小、及顏色。簡單的按下「自訂...」對話盒並且選擇您所喜好的設定。</p>"
- 
- #. i18n: file cssconfig.ui line 175
- #: rc.cpp:30
- #, no-c-format
- msgid "Custom&ize..."
--msgstr "自訂(&I)..."
-+msgstr "自訂(&I)…"
- 
- #. i18n: file csscustom.ui line 44
- #: rc.cpp:39
-@@ -227,10 +230,12 @@
- #: rc.cpp:84
- #, no-c-format
- msgid ""
--"<b>Use same size for all elements</b>"
--"<p>Select this option to override custom font sizes in favor of the base font "
--"size. All fonts will be displayed in the same size.</p>"
--msgstr "<b>全部使用相同字型大小</b><p>選擇這個選項來設定所有的文字都使用相同字型大小。</p>"
-+"<b>Use same size for all elements</b><p>Select this option to override "
-+"custom font sizes in favor of the base font size. All fonts will be "
-+"displayed in the same size.</p>"
-+msgstr ""
-+"<b>全部使用相同字型大小</b><p>選擇這個選項來設定所有的文字都使用相同字型大"
-+"小。</p>"
- 
- #. i18n: file csscustom.ui line 159
- #: rc.cpp:87
-@@ -254,9 +259,11 @@
- #: rc.cpp:96
- #, no-c-format
- msgid ""
--"<b>Suppress images</b>"
--"<p>Selecting this will prevent Konqueror from loading images.</p>"
--msgstr "<b>不使用圖型</b><p>選擇這個選項會使 Konqueror 瀏覽器不從網頁上下 載圖型。</p>"
-+"<b>Suppress images</b><p>Selecting this will prevent Konqueror from loading "
-+"images.</p>"
-+msgstr ""
-+"<b>不使用圖型</b><p>選擇這個選項會使 Konqueror 瀏覽器不從網頁上下 載圖型。</"
-+"p>"
- 
- #. i18n: file csscustom.ui line 184
- #: rc.cpp:99
-@@ -268,10 +275,10 @@
- #: rc.cpp:102
- #, no-c-format
- msgid ""
--"<b>Suppress background images</b>"
--"<p>Selecting this option will prevent Konqueror from loading background "
--"images.</p>"
--msgstr "<b>不使用底圖</b><p>選擇這個選項會使 Konqueror 瀏覽器不從網頁上下載底圖。</p>"
-+"<b>Suppress background images</b><p>Selecting this option will prevent "
-+"Konqueror from loading background images.</p>"
-+msgstr ""
-+"<b>不使用底圖</b><p>選擇這個選項會使 Konqueror 瀏覽器不從網頁上下載底圖。</p>"
- 
- #. i18n: file csscustom.ui line 200
- #: rc.cpp:105
-@@ -283,9 +290,9 @@
- #: rc.cpp:108
- #, no-c-format
- msgid ""
--"<b>Font family</b>"
--"<p>A font family is a group of fonts that resemble one another, with family "
--"members that are e.g. bold, italic, or any number of the above.</p>"
-+"<b>Font family</b><p>A font family is a group of fonts that resemble one "
-+"another, with family members that are e.g. bold, italic, or any number of "
-+"the above.</p>"
- msgstr "<b>字型</b><p>一組字型就是一些相似樣式的字集像是粗體、斜體等等。</p>"
- 
- #. i18n: file csscustom.ui line 214
-@@ -310,10 +317,11 @@
- #: rc.cpp:120
- #, no-c-format
- msgid ""
--"<b>Use same family for all text</b>"
--"<p>Select this option to override custom fonts everywhere in favor of the base "
--"font.</p>"
--msgstr "<b>全部文字使用同一字型</b><p>選擇這個選項來設定所有的文字都使用同一字型。</p>"
-+"<b>Use same family for all text</b><p>Select this option to override custom "
-+"fonts everywhere in favor of the base font.</p>"
-+msgstr ""
-+"<b>全部文字使用同一字型</b><p>選擇這個選項來設定所有的文字都使用同一字型。</"
-+"p>"
- 
- #. i18n: file csscustom.ui line 302
- #: rc.cpp:123
-@@ -325,8 +333,8 @@
- #: rc.cpp:126
- #, no-c-format
- msgid ""
--"<b>Preview</b>"
--"<p>Click on this button to see what your selections look like in action.</p>"
-+"<b>Preview</b><p>Click on this button to see what your selections look like "
-+"in action.</p>"
- msgstr "<b>預覽</b><p>按下這按鈕，可以預覽您選擇的結果。</p>"
- 
- #. i18n: file csscustom.ui line 332
-@@ -369,16 +377,16 @@
- #: rc.cpp:147
- #, no-c-format
- msgid ""
--"<b>Custom</b>"
--"<p>Select this option to define a custom color for the default font.</p>"
-+"<b>Custom</b><p>Select this option to define a custom color for the default "
-+"font.</p>"
- msgstr "<b>使用者自訂</b><p>選擇這個選項來設定預設的字型顏色。</p>"
- 
- #. i18n: file csscustom.ui line 402
- #: rc.cpp:150 rc.cpp:156
- #, no-c-format
- msgid ""
--"<b>Foreground color</b>"
--"<p>The foreground color is the color that the text is drawn in.</p>"
-+"<b>Foreground color</b><p>The foreground color is the color that the text is "
-+"drawn in.</p>"
- msgstr "<b>前景色</b><p>前景就是文字的顏色。</p>"
- 
- #. i18n: file csscustom.ui line 478
-@@ -391,8 +399,8 @@
- #: rc.cpp:159
- #, no-c-format
- msgid ""
--"<b>Background</b>"
--"<p>Behind this door lays the ability to choose a custom default background.</p>"
-+"<b>Background</b><p>Behind this door lays the ability to choose a custom "
-+"default background.</p>"
- msgstr "<b>背景</b><p>在其中可設定使用預設的背景。</p>"
- 
- #. i18n: file csscustom.ui line 503
-@@ -405,10 +413,11 @@
- #: rc.cpp:165
- #, no-c-format
- msgid ""
--"<b>Background</b>"
--"<p>This background color is the one displayed behind the text by default. A "
--"background image will override this.</p>"
--msgstr "<b>背景</b><p>這個背影色設定是用來設定顯示在文字後面顏色的預設值。一個網頁的底圖可能將此覆寫。</p>"
-+"<b>Background</b><p>This background color is the one displayed behind the "
-+"text by default. A background image will override this.</p>"
-+msgstr ""
-+"<b>背景</b><p>這個背影色設定是用來設定顯示在文字後面顏色的預設值。一個網頁的"
-+"底圖可能將此覆寫。</p>"
- 
- #. i18n: file csscustom.ui line 519
- #: rc.cpp:168
-@@ -420,10 +429,12 @@
- #: rc.cpp:171
- #, no-c-format
- msgid ""
--"<b>Use same color for all text</b>"
--"<p>Select this option to apply your chosen color to the default font as well as "
--"any custom fonts as specified in a stylesheet.</p>"
--msgstr "<b>所有文字使用同一顏色</b><p>選擇這一個選項來設定這樣式表中所有文字的顏色者相同。</p>"
-+"<b>Use same color for all text</b><p>Select this option to apply your chosen "
-+"color to the default font as well as any custom fonts as specified in a "
-+"stylesheet.</p>"
-+msgstr ""
-+"<b>所有文字使用同一顏色</b><p>選擇這一個選項來設定這樣式表中所有文字的顏色者"
-+"相同。</p>"
- 
- #. i18n: file preview.ui line 16
- #: rc.cpp:174
-@@ -437,12 +448,9 @@
- msgid ""
- "<qt>\n"
- "\n"
--"<h1>Heading 1</h1>"
--"<br/>\n"
--"<h2>Heading 2</h2>"
--"<br/>\n"
--"<h3>Heading 3</h3>"
--"<br/>\n"
-+"<h1>Heading 1</h1><br/>\n"
-+"<h2>Heading 2</h2><br/>\n"
-+"<h3>Heading 3</h3><br/>\n"
- "\n"
- "<p>User defined stylesheets allow increased\n"
- "accessibility for visually handicapped\n"
-@@ -452,12 +460,9 @@
- msgstr ""
- "<qt>\n"
- "\n"
--"<h1>標頭 1</h1>"
--"<br/>\n"
--"<h2>標頭 2</h2>"
--"<br/>\n"
--"<h3>標頭 3</h3>"
--"<br/>\n"
-+"<h1>標頭 1</h1><br/>\n"
-+"<h2>標頭 2</h2><br/>\n"
-+"<h3>標頭 3</h3><br/>\n"
- "\n"
- "<p>使用者自訂的樣式表可以增加\n"
- "一些有視覺障礙朋友們使用上的\n"
-diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kcmenergy.po kde-i18n-zh_TW-3.5.10/messages/kdebase/kcmenergy.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kcmenergy.po	2006-10-01 18:34:18.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdebase/kcmenergy.po	2011-11-11 15:45:17.000000000 +0100
-@@ -7,7 +7,7 @@
- "Project-Id-Version: kcmenergy\n"
- "POT-Creation-Date: 2005-05-18 21:24+0200\n"
- "PO-Revision-Date: 2005-08-11 20:41+0800\n"
--"Last-Translator: Chao-Hsiung Liao <j_h_liau@yahoo.com.tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team:  <en@li.org>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
-@@ -16,18 +16,18 @@
- 
- #: energy.cpp:145
- msgid ""
--"<h1>Display Power Control</h1> If your display supports power saving features, "
--"you can configure them using this module."
--"<p> There are three levels of power saving: standby, suspend, and off. The "
--"greater the level of power saving, the longer it takes for the display to "
--"return to an active state."
--"<p> To wake up the display from a power saving mode, you can make a small "
--"movement with the mouse, or press a key that is not likely to cause any "
--"unintentional side-effects, for example, the \"Shift\" key."
-+"<h1>Display Power Control</h1> If your display supports power saving "
-+"features, you can configure them using this module.<p> There are three "
-+"levels of power saving: standby, suspend, and off. The greater the level of "
-+"power saving, the longer it takes for the display to return to an active "
-+"state.<p> To wake up the display from a power saving mode, you can make a "
-+"small movement with the mouse, or press a key that is not likely to cause "
-+"any unintentional side-effects, for example, the \"Shift\" key."
- msgstr ""
- "<h1>顯示器省電控制</h1> 如果您的顯示器支援省電功能，您可以用這個模組設定之。"
--"<p> 這邊共有三階段的省電設定：待命、暫停與關閉。越高階段的省電必須要越長的時間來回復運作。"
--"<p> 要將顯示器由省電模式中叫醒，您可以略為移動滑鼠，或者按下任何不會造成副作用的按鍵，例如 \"shift\" 鍵。"
-+"<p> 這邊共有三階段的省電設定：待命、暫停與關閉。越高階段的省電必須要越長的時"
-+"間來回復運作。<p> 要將顯示器由省電模式中叫醒，您可以略為移動滑鼠，或者按下任"
-+"何不會造成副作用的按鍵，例如 \"shift\" 鍵。"
- 
- #: energy.cpp:165
- msgid "&Enable display power management"
-@@ -47,7 +47,7 @@
- 
- #: energy.cpp:187
- msgid "&Standby after:"
--msgstr "待命在...後(&S):"
-+msgstr "待命在…後(&S):"
- 
- #: energy.cpp:189 energy.cpp:200 energy.cpp:212
- msgid " min"
-@@ -65,14 +65,16 @@
- 
- #: energy.cpp:198
- msgid "S&uspend after:"
--msgstr "暫停在...後(&U):"
-+msgstr "暫停在…後(&U):"
- 
- #: energy.cpp:204
- msgid ""
- "Choose the period of inactivity after which the display should enter "
- "\"suspend\" mode. This is the second level of power saving, but may not be "
- "different from the first level for some displays."
--msgstr "選擇顯示器進入 \"暫停\" 模式前的時間。這是第二階段的省電，但在某些顯示器上也許與第一階段並無不同。"
-+msgstr ""
-+"選擇顯示器進入 \"暫停\" 模式前的時間。這是第二階段的省電，但在某些顯示器上也"
-+"許與第一階段並無不同。"
- 
- #: energy.cpp:210
- msgid "&Power off after:"
-@@ -80,7 +82,7 @@
- 
- #: energy.cpp:216
- msgid ""
--"Choose the period of inactivity after which the display should be powered off. "
--"This is the greatest level of power saving that can be achieved while the "
--"display is still physically turned on."
-+"Choose the period of inactivity after which the display should be powered "
-+"off. This is the greatest level of power saving that can be achieved while "
-+"the display is still physically turned on."
- msgstr "選擇顯示器進入 \"關閉\" 模式前的時間.  這是最大階段的省電."
-diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kcmfonts.po kde-i18n-zh_TW-3.5.10/messages/kdebase/kcmfonts.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kcmfonts.po	2007-05-14 12:22:55.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdebase/kcmfonts.po	2011-11-11 15:45:17.000000000 +0100
-@@ -10,8 +10,7 @@
- "Project-Id-Version: kcmfonts\n"
- "POT-Creation-Date: 2007-04-11 02:14+0200\n"
- "PO-Revision-Date: 2007-03-27 14:17+0800\n"
--"Last-Translator: Frank Weng (a.k.a. Franklin) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Chinese Traditional <zh-l10n@linux.org.tw>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
-@@ -41,27 +40,22 @@
- #: fonts.cpp:239
- msgid ""
- "If you have a TFT or LCD screen you can further improve the quality of "
--"displayed fonts by selecting this option."
--"<br>Sub-pixel hinting is also known as ClearType(tm)."
--"<br>"
--"<br><b>This will not work with CRT monitors.</b>"
-+"displayed fonts by selecting this option.<br>Sub-pixel hinting is also known "
-+"as ClearType(tm).<br><br><b>This will not work with CRT monitors.</b>"
- msgstr ""
--"如果您有 TFT 或 LCD 螢幕，你可以選取此項目來增進顯示品質。"
--"<br>Sub-pixel hinting 就是 ClearType(tm)。"
--"<br>"
--"<br><b>這在 CRT 螢幕將無作用。</b>。"
-+"如果您有 TFT 或 LCD 螢幕，你可以選取此項目來增進顯示品質。<br>Sub-pixel "
-+"hinting 就是 ClearType(tm)。<br><br><b>這在 CRT 螢幕將無作用。</b>。"
- 
- #: fonts.cpp:247
- msgid ""
- "In order for sub-pixel hinting to work correctly you need to know how the "
--"sub-pixels of your display are aligned."
--"<br> On TFT or LCD displays a single pixel is actually composed of three "
--"sub-pixels, red, green and blue. Most displays have a linear ordering of RGB "
--"sub-pixel, some have BGR."
-+"sub-pixels of your display are aligned.<br> On TFT or LCD displays a single "
-+"pixel is actually composed of three sub-pixels, red, green and blue. Most "
-+"displays have a linear ordering of RGB sub-pixel, some have BGR."
- msgstr ""
--"為了使 sub-pixel hinting 正常運作，你必需知道 sub-pixels 的顯示方式。"
--"<br>在 TFT 或 LCD 顯示一個 pixel，實際是由三個紅、錄、藍的 sub-pixel 所組成。大部份顯示是 RGB sub-pixel "
--"三線性排列，但亦有 BGR 的方式。"
-+"為了使 sub-pixel hinting 正常運作，你必需知道 sub-pixels 的顯示方式。<br>在 "
-+"TFT 或 LCD 顯示一個 pixel，實際是由三個紅、錄、藍的 sub-pixel 所組成。大部份"
-+"顯示是 RGB sub-pixel 三線性排列，但亦有 BGR 的方式。"
- 
- #: fonts.cpp:258
- msgid "Hinting style: "
-@@ -130,7 +124,7 @@
- 
- #: fonts.cpp:612
- msgid "Ad&just All Fonts..."
--msgstr "調整所有字型...(&J)"
-+msgstr "調整所有字型…(&J)"
- 
- #: fonts.cpp:613
- msgid "Click to change all fonts"
-@@ -159,7 +153,7 @@
- 
- #: fonts.cpp:629
- msgid "Configure..."
--msgstr "設定..."
-+msgstr "設定…"
- 
- #: fonts.cpp:636
- msgid "Force fonts DPI:"
-@@ -175,18 +169,18 @@
- 
- #: fonts.cpp:644
- msgid ""
--"<p>This option forces a specific DPI value for fonts. It may be useful when the "
--"real DPI of the hardware is not detected properly and it is also often misused "
--"when poor quality fonts are used that do not look well with DPI values other "
--"than 96 or 120 DPI.</p>"
--"<p>The use of this option is generally discouraged. For selecting proper DPI "
--"value a better option is explicitly configuring it for the whole X server if "
--"possible (e.g. DisplaySize in xorg.conf or adding <i>-dpi value</i> "
--"to ServerLocalArgs= in $KDEDIR/share/config/kdm/kdmrc). When fonts do not "
--"render properly with real DPI value better fonts should be used or "
--"configuration of font hinting should be checked.</p>"
-+"<p>This option forces a specific DPI value for fonts. It may be useful when "
-+"the real DPI of the hardware is not detected properly and it is also often "
-+"misused when poor quality fonts are used that do not look well with DPI "
-+"values other than 96 or 120 DPI.</p><p>The use of this option is generally "
-+"discouraged. For selecting proper DPI value a better option is explicitly "
-+"configuring it for the whole X server if possible (e.g. DisplaySize in xorg."
-+"conf or adding <i>-dpi value</i> to ServerLocalArgs= in $KDEDIR/share/config/"
-+"kdm/kdmrc). When fonts do not render properly with real DPI value better "
-+"fonts should be used or configuration of font hinting should be checked.</p>"
- msgstr ""
--"<p>這個選項強制指定字型使用的 DPI 值。這在硬體的實際 DPI 值無法被正確偵測到時，以及字型在 96 或 120 DPI 時看起來品質不好時可以使用。"
-+"<p>這個選項強制指定字型使用的 DPI 值。這在硬體的實際 DPI 值無法被正確偵測到"
-+"時，以及字型在 96 或 120 DPI 時看起來品質不好時可以使用。"
- 
- #: fonts.cpp:761
- msgid ""
-diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kcmhtmlsearch.po kde-i18n-zh_TW-3.5.10/messages/kdebase/kcmhtmlsearch.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kcmhtmlsearch.po	2005-09-10 13:15:15.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdebase/kcmhtmlsearch.po	2011-11-11 15:45:17.000000000 +0100
-@@ -8,7 +8,7 @@
- "Project-Id-Version: kcmhtmlsearch\n"
- "POT-Creation-Date: 2005-05-18 21:23+0200\n"
- "PO-Revision-Date: 2005-08-11 21:12+0800\n"
--"Last-Translator: Chao-Hsiung Liao <j_h_liau@yahoo.com.tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team:  <en@li.org>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
-@@ -21,8 +21,8 @@
- 
- #: kcmhtmlsearch.cpp:50
- msgid ""
--"The fulltext search feature makes use of the ht://dig HTML search engine. You "
--"can get ht://dig at the"
-+"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 從"
- 
- #: kcmhtmlsearch.cpp:56
-@@ -69,10 +69,13 @@
- 
- #: kcmhtmlsearch.cpp:106
- msgid ""
--"Here you can select which parts of the documentation should be included in the "
--"fulltext search index. Available options are the KDE Help pages, the installed "
--"man pages, and the installed info pages. You can select any number of these."
--msgstr "您可以在這邊選取要列入全文檢索搜尋對象的文件部分。可用的選項是 KDE 說明頁，安裝的手冊頁，以及安裝的資訊頁. 您可以選擇其中的任意部分。"
-+"Here you can select which parts of the documentation should be included in "
-+"the fulltext search index. Available options are the KDE Help pages, the "
-+"installed man pages, and the installed info pages. You can select any number "
-+"of these."
-+msgstr ""
-+"您可以在這邊選取要列入全文檢索搜尋對象的文件部分。可用的選項是 KDE 說明頁，安"
-+"裝的手冊頁，以及安裝的資訊頁. 您可以選擇其中的任意部分。"
- 
- #: kcmhtmlsearch.cpp:111
- msgid "&KDE help"
-@@ -92,17 +95,17 @@
- 
- #: kcmhtmlsearch.cpp:127
- msgid ""
--"Here you can add additional paths to search for documentation. To add a path, "
--"click on the <em>Add...</em> button and select the folder from where additional "
--"documentation should be searched. You can remove folders by clicking on the <em>"
--"Delete</em> button."
-+"Here you can add additional paths to search for documentation. To add a "
-+"path, click on the <em>Add...</em> button and select the folder from where "
-+"additional documentation should be searched. You can remove folders by "
-+"clicking on the <em>Delete</em> button."
- msgstr ""
--"您可以在這邊增加額外的文件搜尋路徑。要增加路徑，按下 <em>增加...</em> 按鈕並選擇額外文件所在的路徑。您可以經由按下 <em>刪除</em> "
--"按鈕來移除路徑。"
-+"您可以在這邊增加額外的文件搜尋路徑。要增加路徑，按下 <em>增加...</em> 按鈕並"
-+"選擇額外文件所在的路徑。您可以經由按下 <em>刪除</em> 按鈕來移除路徑。"
- 
- #: kcmhtmlsearch.cpp:132
- msgid "Add..."
--msgstr "增加..."
-+msgstr "增加…"
- 
- #: kcmhtmlsearch.cpp:142
- msgid "Language Settings"
-@@ -118,7 +121,7 @@
- 
- #: kcmhtmlsearch.cpp:158
- msgid "Generate Index..."
--msgstr "產生索引..."
-+msgstr "產生索引…"
- 
- #: kcmhtmlsearch.cpp:159
- msgid "Click this button to generate the index for the fulltext search."
-@@ -126,10 +129,12 @@
- 
- #: kcmhtmlsearch.cpp:203
- msgid ""
--"<h1>Help Index</h1> This configuration module lets you configure the ht://dig "
--"engine which can be used for fulltext search in the KDE documentation as well "
--"as other system documentation like man and info pages."
--msgstr "<h1>說明索引</h1> 這個組態模組可以讓您設定 ht://dig 引擎, 並提供 KDE 文件, 系統文件如說明頁與資訊頁的全文檢索。"
-+"<h1>Help Index</h1> This configuration module lets you configure the ht://"
-+"dig engine which can be used for fulltext search in the KDE documentation as "
-+"well as other system documentation like man and info pages."
-+msgstr ""
-+"<h1>說明索引</h1> 這個組態模組可以讓您設定 ht://dig 引擎, 並提供 KDE 文件, 系"
-+"統文件如說明頁與資訊頁的全文檢索。"
- 
- #: _translatorinfo.cpp:1
- msgid ""
-diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kcmicons.po kde-i18n-zh_TW-3.5.10/messages/kdebase/kcmicons.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kcmicons.po	2006-10-01 18:34:18.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdebase/kcmicons.po	2011-11-11 15:45:17.000000000 +0100
-@@ -13,7 +13,7 @@
- "Project-Id-Version: kcmicons\n"
- "POT-Creation-Date: 2006-09-03 02:35+0200\n"
- "PO-Revision-Date: 2005-10-25 21:04+0800\n"
--"Last-Translator: Chao-Hsiung Liao <j_h_liau@yahoo.com.tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Chinese(traitional) <zh-l10n@linux.org.tw>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
-@@ -58,7 +58,7 @@
- 
- #: icons.cpp:117
- msgid "Set Effect..."
--msgstr "設定效果..."
-+msgstr "設定效果…"
- 
- #: icons.cpp:133
- msgid "Desktop/File Manager"
-@@ -154,7 +154,7 @@
- 
- #: iconthemes.cpp:88
- msgid "Install New Theme..."
--msgstr "安裝新主題..."
-+msgstr "安裝新主題…"
- 
- #: iconthemes.cpp:91
- msgid "Remove Theme"
-@@ -187,8 +187,8 @@
- 
- #: iconthemes.cpp:187
- msgid ""
--"A problem occurred during the installation process; however, most of the themes "
--"in the archive have been installed"
-+"A problem occurred during the installation process; however, most of the "
-+"themes in the archive have been installed"
- msgstr "安裝的過程中發生問題；不過主題集中的大部分檔案都已經安裝了。"
- 
- #: iconthemes.cpp:208
-@@ -202,9 +202,10 @@
- #: iconthemes.cpp:286
- msgid ""
- "<qt>Are you sure you want to remove the <strong>%1</strong> icon theme?"
--"<br>"
--"<br>This will delete the files installed by this theme.</qt>"
--msgstr "<qt>您確定要移除 <strong>%1</strong> 圖示主題？<br><br>這樣會刪除這個主題所安裝的檔案。</qt>"
-+"<br><br>This will delete the files installed by this theme.</qt>"
-+msgstr ""
-+"<qt>您確定要移除 <strong>%1</strong> 圖示主題？<br><br>這樣會刪除這個主題所安"
-+"裝的檔案。</qt>"
- 
- #: iconthemes.cpp:294
- msgid "Confirmation"
-@@ -233,22 +234,22 @@
- #: main.cpp:93
- msgid ""
- "<h1>Icons</h1>This module allows you to choose the icons for your desktop."
--"<p>To choose an icon theme, click on its name and apply your choice by pressing "
--"the \"Apply\" button below. If you do not want to apply your choice you can "
--"press the \"Reset\" button to discard your changes.</p>"
--"<p>By pressing the \"Install New Theme\" button you can install your new icon "
--"theme by writing its location in the box or browsing to the location. Press the "
--"\"OK\" button to finish the installation.</p>"
--"<p>The \"Remove Theme\" button will only be activated if you select a theme "
--"that you installed using this module. You are not able to remove globally "
--"installed themes here.</p>"
--"<p>You can also specify effects that should be applied to the icons.</p>"
-+"<p>To choose an icon theme, click on its name and apply your choice by "
-+"pressing the \"Apply\" button below. If you do not want to apply your choice "
-+"you can press the \"Reset\" button to discard your changes.</p><p>By "
-+"pressing the \"Install New Theme\" button you can install your new icon "
-+"theme by writing its location in the box or browsing to the location. Press "
-+"the \"OK\" button to finish the installation.</p><p>The \"Remove Theme\" "
-+"button will only be activated if you select a theme that you installed using "
-+"this module. You are not able to remove globally installed themes here.</"
-+"p><p>You can also specify effects that should be applied to the icons.</p>"
- msgstr ""
--"<h1>圖示</h1>這個模組讓您可以選擇桌面的圖示。"
--"<p>要選用某個圖示主題，請在該名稱上點一下，並按下下方的「套用」。如果您要反悔您所作的選擇，請按下下方的「重設」來放棄您所作的變更。</p>"
--"<p>按下「安裝新主題」讓您可以安裝新的圖示主題，只要輸入其位置或是藉由瀏覽得知其位置，再按下「確定」即可完成安裝</p>"
--"<p>「移除主題」按鈕只有在您選擇了一個您利用本模組所安裝的主題時才可以按。您無法在這裡移除全域安裝的主題</p>"
--"<p>您也可以指定圖示顯示時的特別效果。</p>"
-+"<h1>圖示</h1>這個模組讓您可以選擇桌面的圖示。<p>要選用某個圖示主題，請在該名"
-+"稱上點一下，並按下下方的「套用」。如果您要反悔您所作的選擇，請按下下方的「重"
-+"設」來放棄您所作的變更。</p><p>按下「安裝新主題」讓您可以安裝新的圖示主題，只"
-+"要輸入其位置或是藉由瀏覽得知其位置，再按下「確定」即可完成安裝</p><p>「移除主"
-+"題」按鈕只有在您選擇了一個您利用本模組所安裝的主題時才可以按。您無法在這裡移"
-+"除全域安裝的主題</p><p>您也可以指定圖示顯示時的特別效果。</p>"
- 
- #~ msgid ""
- #~ "<h1>Icons</h1>\n"
-diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kcminfo.po kde-i18n-zh_TW-3.5.10/messages/kdebase/kcminfo.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kcminfo.po	2006-07-22 10:04:12.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdebase/kcminfo.po	2011-11-11 15:45:17.000000000 +0100
-@@ -11,8 +11,7 @@
- "Project-Id-Version: kcminfo\n"
- "POT-Creation-Date: 2006-06-16 03:58+0200\n"
- "PO-Revision-Date: 2006-06-19 09:14+0800\n"
--"Last-Translator: Frank Weng (a.k.a. Franklin) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Chinese Traditional <zh-l10n@linux.org.tw>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
-@@ -236,10 +235,12 @@
- #: info.cpp:392
- msgid ""
- "<h1>System Information</h1> All the information modules return information "
--"about a certain aspect of your computer hardware or your operating system. Not "
--"all modules are available on all hardware architectures and/or operating "
-+"about a certain aspect of your computer hardware or your operating system. "
-+"Not all modules are available on all hardware architectures and/or operating "
- "systems."
--msgstr "<h1>系統資訊</h1>這個資訊模組回報關於您的硬體與作業系統的相關資訊。不是所有的模組都可以在各種不同的硬體或作業系統上使用。"
-+msgstr ""
-+"<h1>系統資訊</h1>這個資訊模組回報關於您的硬體與作業系統的相關資訊。不是所有的"
-+"模組都可以在各種不同的硬體或作業系統上使用。"
- 
- #: info.cpp:406 memory.cpp:95
- msgid "kcminfo"
-@@ -318,8 +319,8 @@
- 
- #: info_fbsd.cpp:169
- msgid ""
--"Your sound system could not be queried.  /dev/sndstat does not exist or is not "
--"readable."
-+"Your sound system could not be queried.  /dev/sndstat does not exist or is "
-+"not readable."
- msgstr "無法查詢您的聲音系統。 /dev/sndstat 不存在或無法讀取。"
- 
- #: info_fbsd.cpp:194
-@@ -901,16 +902,17 @@
- 
- #: memory.cpp:205
- msgid ""
--"This graph gives you an overview of the <b>usage of physical memory</b> "
--"in your system."
--"<p>Most operating systems (including Linux) will use as much of the available "
--"physical memory as possible as disk cache, to speed up the system performance. "
--"<p>This means that if you have a small amount of <b>Free Physical Memory</b> "
--"and a large amount of <b>Disk Cache Memory</b>, your system is well configured."
-+"This graph gives you an overview of the <b>usage of physical memory</b> in "
-+"your system.<p>Most operating systems (including Linux) will use as much of "
-+"the available physical memory as possible as disk cache, to speed up the "
-+"system performance. <p>This means that if you have a small amount of <b>Free "
-+"Physical Memory</b> and a large amount of <b>Disk Cache Memory</b>, your "
-+"system is well configured."
- msgstr ""
--"這個圖表給您系統 <b>實體記憶體的使用</b> 總覽。"
--"<p>多數的作業系統 (包括 linux) 都將近可能的使用可用的實體記憶體作為磁碟快取，以提高系統效能。 "
--"<p>這表示如果您只有少量的<b>未用實體記憶體</b>以及大量的<b>磁碟快取記憶體</b>，則您的系統 是配置的很好的。"
-+"這個圖表給您系統 <b>實體記憶體的使用</b> 總覽。<p>多數的作業系統 (包括 "
-+"linux) 都將近可能的使用可用的實體記憶體作為磁碟快取，以提高系統效能。 <p>這表"
-+"示如果您只有少量的<b>未用實體記憶體</b>以及大量的<b>磁碟快取記憶體</b>，則您"
-+"的系統 是配置的很好的。"
- 
- #: memory.cpp:217
- msgid "Swap Space"
-@@ -918,17 +920,21 @@
- 
- #: memory.cpp:218
- msgid ""
--"The swap space is the <b>virtual memory</b> available to the system. "
--"<p>It will be used on demand and is provided through one or more swap "
--"partitions and/or swap files."
--msgstr "交換空間是系統可用的 <b>虛擬記憶體</b>。 <p>在 有要求時它將被使用，並且是經由一個以上的交換分割區及/或交換檔案所提供。"
-+"The swap space is the <b>virtual memory</b> available to the system. <p>It "
-+"will be used on demand and is provided through one or more swap partitions "
-+"and/or swap files."
-+msgstr ""
-+"交換空間是系統可用的 <b>虛擬記憶體</b>。 <p>在 有要求時它將被使用，並且是經由"
-+"一個以上的交換分割區及/或交換檔案所提供。"
- 
- #: memory.cpp:271
- msgid ""
--"<h1>Memory Information</h1> This display shows you the current memory usage of "
--"your system. The values are updated on a regular basis and give you an overview "
--"of the physical and virtual used memory."
--msgstr "<h1>記憶體資訊</h1> 這些顯示告訴您目前您系統記憶體使用情形。這些數值會規律地更新並給您實體與虛擬記憶體的使用總覽。"
-+"<h1>Memory Information</h1> This display shows you the current memory usage "
-+"of your system. The values are updated on a regular basis and give you an "
-+"overview of the physical and virtual used memory."
-+msgstr ""
-+"<h1>記憶體資訊</h1> 這些顯示告訴您目前您系統記憶體使用情形。這些數值會規律地"
-+"更新並給您實體與虛擬記憶體的使用總覽。"
- 
- #: memory.cpp:350
- msgid "%1 free"
-diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kcminput.po kde-i18n-zh_TW-3.5.10/messages/kdebase/kcminput.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kcminput.po	2006-10-01 18:34:18.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdebase/kcminput.po	2011-11-11 15:45:17.000000000 +0100
-@@ -10,8 +10,7 @@
- "Project-Id-Version: kcminput\n"
- "POT-Creation-Date: 2006-08-22 02:34+0200\n"
- "PO-Revision-Date: 2006-06-19 09:15+0800\n"
--"Last-Translator: Frank Weng (a.k.a. Franklin) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Chinese Traditional <zh-l10n@linux.org.tw>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
-@@ -37,8 +36,8 @@
- 
- #: logitechmouse.cpp:225
- msgid ""
--"RF channel 1 has been set. Please press Connect button on mouse to re-establish "
--"link"
-+"RF channel 1 has been set. Please press Connect button on mouse to re-"
-+"establish link"
- msgstr "RF 頻道 1 已經被設定了。請按滑鼠的連線按鈕來重新建立連結"
- 
- #: logitechmouse.cpp:225 logitechmouse.cpp:229
-@@ -47,8 +46,8 @@
- 
- #: logitechmouse.cpp:229
- msgid ""
--"RF channel 2 has been set. Please press Connect button on mouse to re-establish "
--"link"
-+"RF channel 2 has been set. Please press Connect button on mouse to re-"
-+"establish link"
- msgstr "RF 頻道 2 已經被設定了。請按滑鼠的連線按鈕來重新建立連結"
- 
- #: logitechmouse.cpp:356
-@@ -117,10 +116,12 @@
- 
- #: mouse.cpp:82
- msgid ""
--"<h1>Mouse</h1> This module allows you to choose various options for the way in "
--"which your pointing device works. Your pointing device may be a mouse, "
-+"<h1>Mouse</h1> This module allows you to choose various options for the way "
-+"in which your pointing device works. Your pointing device may be a mouse, "
- "trackball, or some other hardware that performs a similar function."
--msgstr "<h1>滑鼠</h1>這個模組可以讓您選擇您指標設備工作的方式。 您的指標設備可能是滑鼠，軌跡球或其他有類似功能的硬體。"
-+msgstr ""
-+"<h1>滑鼠</h1>這個模組可以讓您選擇您指標設備工作的方式。 您的指標設備可能是滑"
-+"鼠，軌跡球或其他有類似功能的硬體。"
- 
- #: mouse.cpp:101
- msgid "&General"
-@@ -129,25 +130,26 @@
- #: mouse.cpp:106
- msgid ""
- "If you are left-handed, you may prefer to swap the functions of the left and "
--"right buttons on your pointing device by choosing the 'left-handed' option. If "
--"your pointing device has more than two buttons, only those that function as the "
--"left and right buttons are affected. For example, if you have a three-button "
--"mouse, the middle button is unaffected."
-+"right buttons on your pointing device by choosing the 'left-handed' option. "
-+"If your pointing device has more than two buttons, only those that function "
-+"as the left and right buttons are affected. For example, if you have a three-"
-+"button mouse, the middle button is unaffected."
- msgstr ""
--"如果您使用左手，您可能希望透過「使用左手」的選項，來交換指標設備左右鍵的功能。 "
--"如果您的指標設備有多於二個按鈕，只有左右的二個會交換。例如您有一個三鍵滑鼠，則滑鼠的中間鍵將不受影響。"
-+"如果您使用左手，您可能希望透過「使用左手」的選項，來交換指標設備左右鍵的功"
-+"能。 如果您的指標設備有多於二個按鈕，只有左右的二個會交換。例如您有一個三鍵滑"
-+"鼠，則滑鼠的中間鍵將不受影響。"
- 
- #: mouse.cpp:116
- msgid ""
--"The default behavior in KDE is to select and activate icons with a single click "
--"of the left button on your pointing device. This behavior is consistent with "
--"what you would expect when you click links in most web browsers. If you would "
--"prefer to select with a single click, and activate with a double click, check "
--"this option."
--msgstr ""
--"KDE "
--"點選並啟動圖示的預設動作，是使用指標的設備左鍵，並以單擊圖示的方式來進行。這個動作就如同您在瀏覽器中，點選超連結的方式是相同的。如果您希望在單擊的時候進行選取，"
--"而雙擊的時候進行啟動，那麼請選取這個選項。"
-+"The default behavior in KDE is to select and activate icons with a single "
-+"click of the left button on your pointing device. This behavior is "
-+"consistent with what you would expect when you click links in most web "
-+"browsers. If you would prefer to select with a single click, and activate "
-+"with a double click, check this option."
-+msgstr ""
-+"KDE 點選並啟動圖示的預設動作，是使用指標的設備左鍵，並以單擊圖示的方式來進"
-+"行。這個動作就如同您在瀏覽器中，點選超連結的方式是相同的。如果您希望在單擊的"
-+"時候進行選取，而雙擊的時候進行啟動，那麼請選取這個選項。"
- 
- #: mouse.cpp:124
- msgid "Activates and opens a file or folder with a single click."
-@@ -155,19 +157,23 @@
- 
- #: mouse.cpp:130
- msgid ""
--"If you check this option, pausing the mouse pointer over an icon on the screen "
--"will automatically select that icon. This may be useful when single clicks "
--"activate icons, and you want only to select the icon without activating it."
-+"If you check this option, pausing the mouse pointer over an icon on the "
-+"screen will automatically select that icon. This may be useful when single "
-+"clicks activate icons, and you want only to select the icon without "
-+"activating it."
- msgstr ""
--"如果您選擇了這個選項，那麼當滑鼠指標停在螢幕上的某個圖示上面時，這個圖示將會自動的被選取。這對於當您使用單擊來啟動圖示，而您卻只想選取那個圖示的時候，會非常的有"
--"用。"
-+"如果您選擇了這個選項，那麼當滑鼠指標停在螢幕上的某個圖示上面時，這個圖示將會"
-+"自動的被選取。這對於當您使用單擊來啟動圖示，而您卻只想選取那個圖示的時候，會"
-+"非常的有用。"
- 
- #: mouse.cpp:142
- msgid ""
- "If you have checked the option to automatically select icons, this slider "
- "allows you to select how long the mouse pointer must be paused over the icon "
- "before it is selected."
--msgstr "如果您選擇了自動選取圖示的功能，這個滾軸可以讓您設定，滑鼠指標應該停留在圖示上多久的時間，才會選取這個圖示。"
-+msgstr ""
-+"如果您選擇了自動選取圖示的功能，這個滾軸可以讓您設定，滑鼠指標應該停留在圖示"
-+"上多久的時間，才會選取這個圖示。"
- 
- #: mouse.cpp:147
- msgid "Show feedback when clicking an icon"
-@@ -175,7 +181,7 @@
- 
- #: mouse.cpp:179
- msgid "&Cursor Theme"
--msgstr "游標佈景主題(&C)"
-+msgstr "游標布景主題(&C)"
- 
- #: mouse.cpp:183
- msgid "Advanced"
-@@ -187,16 +193,18 @@
- 
- #: mouse.cpp:194
- msgid ""
--"This option allows you to change the relationship between the distance that the "
--"mouse pointer moves on the screen and the relative movement of the physical "
--"device itself (which may be a mouse, trackball, or some other pointing device.)"
--"<p> A high value for the acceleration will lead to large movements of the mouse "
--"pointer on the screen even when you only make a small movement with the "
--"physical device. Selecting very high values may result in the mouse pointer "
--"flying across the screen, making it hard to control."
-+"This option allows you to change the relationship between the distance that "
-+"the mouse pointer moves on the screen and the relative movement of the "
-+"physical device itself (which may be a mouse, trackball, or some other "
-+"pointing device.)<p> A high value for the acceleration will lead to large "
-+"movements of the mouse pointer on the screen even when you only make a small "
-+"movement with the physical device. Selecting very high values may result in "
-+"the mouse pointer flying across the screen, making it hard to control."
- msgstr ""
--"這個選項可以讓您改變滑鼠指標在螢幕上移動與設備本身移動間的相對關係 (移動設備可能是滑鼠，軌跡球或其他指標設備)。"
--"<p>即使是您只是稍微的移動，在較高的加速值下，仍將使滑鼠在畫面上有較大的移動。選擇一個很高的加速值可能會讓您的指標飛快的在畫面上移動，並且難以控制。<"
-+"這個選項可以讓您改變滑鼠指標在螢幕上移動與設備本身移動間的相對關係 (移動設備"
-+"可能是滑鼠，軌跡球或其他指標設備)。<p>即使是您只是稍微的移動，在較高的加速值"
-+"下，仍將使滑鼠在畫面上有較大的移動。選擇一個很高的加速值可能會讓您的指標飛快"
-+"的在畫面上移動，並且難以控制。<"
- 
- #: mouse.cpp:207
- msgid "Pointer threshold:"
-@@ -204,16 +212,17 @@
- 
- #: mouse.cpp:215
- msgid ""
--"The threshold is the smallest distance that the mouse pointer must move on the "
--"screen before acceleration has any effect. If the movement is smaller than the "
--"threshold, the mouse pointer moves as if the acceleration was set to 1X;"
--"<p> thus, when you make small movements with the physical device, there is no "
--"acceleration at all, giving you a greater degree of control over the mouse "
--"pointer. With larger movements of the physical device, you can move the mouse "
--"pointer rapidly to different areas on the screen."
-+"The threshold is the smallest distance that the mouse pointer must move on "
-+"the screen before acceleration has any effect. If the movement is smaller "
-+"than the threshold, the mouse pointer moves as if the acceleration was set "
-+"to 1X;<p> thus, when you make small movements with the physical device, "
-+"there is no acceleration at all, giving you a greater degree of control over "
-+"the mouse pointer. With larger movements of the physical device, you can "
-+"move the mouse pointer rapidly to different areas on the screen."
- msgstr ""
--"這個界限是游標開始加速前必須移動的距離。 如果移動小於這個界限，游標將用正常速度移動( 1X)；"
--"<p>也就是說，當您只有移動設備一小段距離，則不會加速，讓您更容易控制游標。而移動較大距離，則會加速，讓您可以在畫面上快速移動。"
-+"這個界限是游標開始加速前必須移動的距離。 如果移動小於這個界限，游標將用正常速"
-+"度移動( 1X)；<p>也就是說，當您只有移動設備一小段距離，則不會加速，讓您更容易"
-+"控制游標。而移動較大距離，則會加速，讓您可以在畫面上快速移動。"
- 
- #: mouse.cpp:229
- msgid "Double click interval:"
-@@ -226,10 +235,12 @@
- #: mouse.cpp:236
- msgid ""
- "The double click interval is the maximal time (in milliseconds) between two "
--"mouse clicks which turns them into a double click. If the second click happens "
--"later than this time interval after the first click, they are recognized as two "
--"separate clicks."
--msgstr "雙敲擊的間隔，是兩次滑鼠按鍵敲擊的最大間隔時間 (以微秒為單位)。如果第二次在經過這段時間之後才發生，就會被視為二次獨立的敲擊。"
-+"mouse clicks which turns them into a double click. If the second click "
-+"happens later than this time interval after the first click, they are "
-+"recognized as two separate clicks."
-+msgstr ""
-+"雙敲擊的間隔，是兩次滑鼠按鍵敲擊的最大間隔時間 (以微秒為單位)。如果第二次在經"
-+"過這段時間之後才發生，就會被視為二次獨立的敲擊。"
- 
- #: mouse.cpp:247
- msgid "Drag start time:"
-@@ -237,8 +248,8 @@
- 
- #: mouse.cpp:254
- msgid ""
--"If you click with the mouse (e.g. in a multi-line editor) and begin to move the "
--"mouse within the drag start time, a drag operation will be initiated."
-+"If you click with the mouse (e.g. in a multi-line editor) and begin to move "
-+"the mouse within the drag start time, a drag operation will be initiated."
- msgstr "如果您按下滑鼠並開始拖曳 (例如在文字編輯器中)，拖曳的動作將會被啟動。"
- 
- #: mouse.cpp:260
-@@ -247,8 +258,8 @@
- 
- #: mouse.cpp:268
- msgid ""
--"If you click with the mouse and begin to move the mouse at least the drag start "
--"distance, a drag operation will be initiated."
-+"If you click with the mouse and begin to move the mouse at least the drag "
-+"start distance, a drag operation will be initiated."
- msgstr "如果您按下滑鼠並移動超過拖曳開始距離，拖曳的動作將被啟動。"
- 
- #: mouse.cpp:274
-@@ -257,12 +268,13 @@
- 
- #: mouse.cpp:282
- msgid ""
--"If you use the wheel of a mouse, this value determines the number of lines to "
--"scroll for each wheel movement. Note that if this number exceeds the number of "
--"visible lines, it will be ignored and the wheel movement will be handled as a "
--"page up/down movement."
-+"If you use the wheel of a mouse, this value determines the number of lines "
-+"to scroll for each wheel movement. Note that if this number exceeds the "
-+"number of visible lines, it will be ignored and the wheel movement will be "
-+"handled as a page up/down movement."
- msgstr ""
--"如果你使用滑鼠滾輪，這個數值就是你每次滾動滾輪將移動的行距。注意若是這個數值超過了可以顯示的行數，那麼這項設定將會被忽略，並改為切換上／下頁的功能。"
-+"如果你使用滑鼠滾輪，這個數值就是你每次滾動滾輪將移動的列距。注意若是這個數值"
-+"超過了可以顯示的列數，那麼這項設定將會被忽略，並改為切換上／下頁的功能。"
- 
- #: mouse.cpp:288
- msgid "Mouse Navigation"
-@@ -294,7 +306,7 @@
- 
- #: mouse.cpp:334
- msgid "Acceleration &profile:"
--msgstr "加速度設定(&p)"
-+msgstr "加速度設定(&P)"
- 
- #: mouse.cpp:407
- msgid "Mouse"
-@@ -314,7 +326,7 @@
- msgid ""
- "_n:  line\n"
- " lines"
--msgstr " 行"
-+msgstr " 列"
- 
- #. i18n: file kmousedlg.ui line 38
- #: rc.cpp:3
-@@ -338,14 +350,14 @@
- #: rc.cpp:12
- #, no-c-format
- msgid "Re&verse scroll direction"
--msgstr "反相捲動(&V)"
-+msgstr "反向捲動(&V)"
- 
- #. i18n: file kmousedlg.ui line 135
- #: rc.cpp:15
- #, no-c-format
- msgid ""
--"Change the direction of scrolling for the mouse wheel or the 4th and 5th mouse "
--"buttons."
-+"Change the direction of scrolling for the mouse wheel or the 4th and 5th "
-+"mouse buttons."
- msgstr "改變滑鼠滾輪捲動的方向或是第四鍵和第五鍵。"
- 
- #. i18n: file kmousedlg.ui line 143
-@@ -412,10 +424,12 @@
- #: rc.cpp:48
- #, no-c-format
- msgid ""
--"You have a Logitech Mouse connected, and libusb was found at compile time, but "
--"it was not possible to access this mouse. This is probably caused by a "
-+"You have a Logitech Mouse connected, and libusb was found at compile time, "
-+"but it was not possible to access this mouse. This is probably caused by a "
- "permissions problem - you should consult the manual on how to fix this."
--msgstr "您連接了羅技滑鼠，而且也在編譯時找到 libusb，但是仍無法使用這個滑鼠。這可能是權限的問題 - 您應該參考手冊以了解如何修正它。"
-+msgstr ""
-+"您連接了羅技滑鼠，而且也在編譯時找到 libusb，但是仍無法使用這個滑鼠。這可能是"
-+"權限的問題 - 您應該參考手冊以了解如何修正它。"
- 
- #. i18n: file logitechmouse_base.ui line 46
- #: rc.cpp:51
-@@ -461,7 +475,7 @@
- 
- #: core/themepage.cpp:60
- msgid "Select the cursor theme you want to use:"
--msgstr "請選取你想使用的滑鼠游標佈景主題:"
-+msgstr "請選取你想使用的滑鼠游標布景主題:"
- 
- #: core/themepage.cpp:66 xcursor/themepage.cpp:93
- msgid "Name"
-@@ -513,40 +527,42 @@
- 
- #: xcursor/themepage.cpp:84
- msgid "Select the cursor theme you want to use (hover preview to test cursor):"
--msgstr "請選取你想使用的滑鼠游標佈景主題(可以在預覽測試游標)："
-+msgstr "請選取你想使用的滑鼠游標布景主題(可以在預覽測試游標)："
- 
- #: xcursor/themepage.cpp:104
- msgid "Install New Theme..."
--msgstr "安裝新佈置主題"
-+msgstr "安裝新布置主題"
- 
- #: xcursor/themepage.cpp:105
- msgid "Remove Theme"
--msgstr "移除佈景主題"
-+msgstr "移除布景主題"
- 
- #: xcursor/themepage.cpp:212
- msgid "Drag or Type Theme URL"
--msgstr "把佈景主題的網址拖拉到此，或是手動輸入"
-+msgstr "把布景主題的網址拖拉到此，或是手動輸入"
- 
- #: xcursor/themepage.cpp:221
- #, c-format
- msgid "Unable to find the cursor theme archive %1."
--msgstr "無法找到這個游標佈景主題的檔案庫 %1。"
-+msgstr "無法找到這個游標布景主題的檔案庫 %1。"
- 
- #: xcursor/themepage.cpp:223
- msgid ""
--"Unable to download the cursor theme archive; please check that the address %1 "
--"is correct."
--msgstr "無法下載游標佈景主題的檔案庫；請確定網址 %1 是否正確。"
-+"Unable to download the cursor theme archive; please check that the address %"
-+"1 is correct."
-+msgstr "無法下載游標布景主題的檔案庫；請確定網址 %1 是否正確。"
- 
- #: xcursor/themepage.cpp:231
- msgid "The file %1 does not appear to be a valid cursor theme archive."
--msgstr "檔案 %1 並不是一個游標佈景主題"
-+msgstr "檔案 %1 並不是一個游標布景主題"
- 
- #: xcursor/themepage.cpp:240
- msgid ""
- "<qt>Are you sure you want to remove the <strong>%1</strong> cursor theme?"
- "<br>This will delete all the files installed by this theme.</qt>"
--msgstr "<qt>你確定要移除 <strong>%1</strong> 佈景主題嗎？<br>這個動作會刪除所有和這個佈景主題相關的檔案。</qt>"
-+msgstr ""
-+"<qt>你確定要移除 <strong>%1</strong> 布景主題嗎？<br>這個動作會刪除所有和這個"
-+"布景主題相關的檔案。</qt>"
- 
- #: xcursor/themepage.cpp:246
- msgid "Confirmation"
-@@ -554,13 +570,13 @@
- 
- #: xcursor/themepage.cpp:300
- msgid ""
--"A theme named %1 already exists in your icon theme folder. Do you want replace "
--"it with this one?"
--msgstr "一個叫做 %1 的佈景主題已經存在於系統中。請問您要取代它嗎？"
-+"A theme named %1 already exists in your icon theme folder. Do you want "
-+"replace it with this one?"
-+msgstr "一個叫做 %1 的布景主題已經存在於系統中。請問您要取代它嗎？"
- 
- #: xcursor/themepage.cpp:302
- msgid "Overwrite Theme?"
--msgstr "覆蓋這個佈景主題？"
-+msgstr "覆蓋這個布景主題？"
- 
- #: xcursor/themepage.cpp:336 xcursor/themepage.cpp:483
- msgid "No description available"
-@@ -568,7 +584,7 @@
- 
- #: xcursor/themepage.cpp:537
- msgid "No theme"
--msgstr "無佈景主題"
-+msgstr "無布景主題"
- 
- #: xcursor/themepage.cpp:537
- msgid "The old classic X cursors"
-@@ -576,7 +592,7 @@
- 
- #: xcursor/themepage.cpp:539
- msgid "System theme"
--msgstr "系統佈景主題"
-+msgstr "系統布景主題"
- 
- #: xcursor/themepage.cpp:539
- msgid "Do not change cursor theme"
-diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kcmioslaveinfo.po kde-i18n-zh_TW-3.5.10/messages/kdebase/kcmioslaveinfo.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kcmioslaveinfo.po	2006-03-17 11:47:46.000000000 +0100
-+++ kde-i18n-zh_TW-3.5.10/messages/kdebase/kcmioslaveinfo.po	2011-11-11 15:45:17.000000000 +0100
-@@ -13,7 +13,7 @@
- "Project-Id-Version: kcmioslaveinfo\n"
- "POT-Creation-Date: 2006-02-20 03:45+0100\n"
- "PO-Revision-Date: 2003-12-04 23:28+0800\n"
--"Last-Translator: 林耕宇 <s9321028@ncnu.edu.tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
-@@ -54,7 +54,9 @@
- 
- #: kcmioslaveinfo.cpp:137
- msgid "Some info about protocol %1:/ ..."
--msgstr "一些資訊關於協定: %1:/ ..."
-+msgstr "一些資訊關於協定: %1:/…"
- 
--#~ msgid "<qt>Gives you an overview of the installed ioslaves and allows you to configure the network timeout values for those slaves.</qt>"
-+#~ msgid ""
-+#~ "<qt>Gives you an overview of the installed ioslaves and allows you to "
-+#~ "configure the network timeout values for those slaves.</qt>"
- #~ msgstr "<qt>讓您檢視已安裝的 ioslaves 並允許您設定其網路逾時值</qt>"
-diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kcmkclock.po kde-i18n-zh_TW-3.5.10/messages/kdebase/kcmkclock.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kcmkclock.po	2006-01-19 18:50:04.000000000 +0100
-+++ kde-i18n-zh_TW-3.5.10/messages/kdebase/kcmkclock.po	2011-11-11 15:45:17.000000000 +0100
-@@ -7,7 +7,7 @@
- "Project-Id-Version: kcmkclock\n"
- "POT-Creation-Date: 2005-12-17 03:07+0100\n"
- "PO-Revision-Date: 2005-10-27 19:44+0800\n"
--"Last-Translator: Chao-Hsiung Liao <j_h_liau@yahoo.com.tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: traditional Chinese <zh-l10n@linux.org.tw>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
-@@ -23,20 +23,20 @@
- 
- #: dtime.cpp:147
- msgid ""
--"Here you can change the system time. Click into the hours, minutes or seconds "
--"field to change the relevant value, either using the up and down buttons to the "
--"right or by entering a new value."
--msgstr "你可以在這裡改變系統時刻。點選進入時，分，秒欄位來改變相對映的值， 也可以使用右邊的上下按鈕或直接輸入一個新的值。"
-+"Here you can change the system time. Click into the hours, minutes or "
-+"seconds field to change the relevant value, either using the up and down "
-+"buttons to the right or by entering a new value."
-+msgstr ""
-+"你可以在這裡改變系統時刻。點選進入時，分，秒欄位來改變相對映的值， 也可以使用"
-+"右邊的上下按鈕或直接輸入一個新的值。"
- 
- #: dtime.cpp:246
- msgid ""
--"Public Time Server "
--"(pool.ntp.org),asia.pool.ntp.org,europe.pool.ntp.org,north-america.pool.ntp.org,"
--"oceania.pool.ntp.org"
-+"Public Time Server (pool.ntp.org),asia.pool.ntp.org,europe.pool.ntp.org,"
-+"north-america.pool.ntp.org,oceania.pool.ntp.org"
- msgstr ""
--"公用時刻伺服器 "
--"(pool.ntp.org),asia.pool.ntp.org,europe.pool.ntp.org,north-america.pool.ntp.org,"
--"oceania.pool.ntp.org"
-+"公用時刻伺服器 (pool.ntp.org),asia.pool.ntp.org,europe.pool.ntp.org,north-"
-+"america.pool.ntp.org,oceania.pool.ntp.org"
- 
- #: dtime.cpp:331
- msgid "Can not set date."
-@@ -44,14 +44,15 @@
- 
- #: dtime.cpp:361 main.cpp:54
- msgid ""
--"<h1>Date & Time</h1> This control module can be used to set the system date and "
--"time. As these settings do not only affect you as a user, but rather the whole "
--"system, you can only change these settings when you start the Control Center as "
--"root. If you do not have the root password, but feel the system time should be "
--"corrected, please contact your system administrator."
-+"<h1>Date & Time</h1> This control module can be used to set the system date "
-+"and time. As these settings do not only affect you as a user, but rather the "
-+"whole system, you can only change these settings when you start the Control "
-+"Center as root. If you do not have the root password, but feel the system "
-+"time should be corrected, please contact your system administrator."
- msgstr ""
--"<h1>日期及時刻</h1> 這個控制模組可被用來設定系統日期及時剖。 這些設定不僅影響使用者，也會影響整個系統，只有當你用 root 身份 "
--"啟動控制中心時才能改變這些設定。假如你沒有 root 密碼，但覺得系統 時刻需要修正，請聯絡你的系統管理者。"
-+"<h1>日期及時刻</h1> 這個控制模組可被用來設定系統日期及時剖。 這些設定不僅影響"
-+"使用者，也會影響整個系統，只有當你用 root 身分 啟動控制中心時才能改變這些設"
-+"定。假如你沒有 root 密碼，但覺得系統 時刻需要修正，請聯絡你的系統管理者。"
- 
- #: tzone.cpp:52
- msgid "To change the timezone, select your area from the list below"
-diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kcmkded.po kde-i18n-zh_TW-3.5.10/messages/kdebase/kcmkded.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kcmkded.po	2006-10-01 18:34:18.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdebase/kcmkded.po	2011-11-11 15:45:17.000000000 +0100
-@@ -7,7 +7,7 @@
- "Project-Id-Version: kcmkded\n"
- "POT-Creation-Date: 2006-08-22 02:34+0200\n"
- "PO-Revision-Date: 2005-08-11 20:38+0800\n"
--"Last-Translator: Chao-Hsiung Liao <j_h_liau@yahoo.com.tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
-@@ -39,25 +39,21 @@
- 
- #: kcmkded.cpp:59
- msgid ""
--"<h1>Service Manager</h1>"
--"<p>This module allows you to have an overview of all plugins of the KDE Daemon, "
--"also referred to as KDE Services. Generally, there are two types of service:</p>"
--"<ul>"
--"<li>Services invoked at startup</li>"
--"<li>Services called on demand</li></ul>"
--"<p>The latter are only listed for convenience. The startup services can be "
--"started and stopped. In Administrator mode, you can also define whether "
--"services should be loaded at startup.</p>"
--"<p><b> Use this with care: some services are vital for KDE; do not deactivate "
--"services if you do not know what you are doing.</b></p>"
-+"<h1>Service Manager</h1><p>This module allows you to have an overview of all "
-+"plugins of the KDE Daemon, also referred to as KDE Services. Generally, "
-+"there are two types of service:</p><ul><li>Services invoked at startup</"
-+"li><li>Services called on demand</li></ul><p>The latter are only listed for "
-+"convenience. The startup services can be started and stopped. In "
-+"Administrator mode, you can also define whether services should be loaded at "
-+"startup.</p><p><b> Use this with care: some services are vital for KDE; do "
-+"not deactivate services if you do not know what you are doing.</b></p>"
- msgstr ""
--"<h1>服務管理程式</h1>"
--"<p>這模組讓您能夠概覽 KDE 伺服程式的所有外掛程式，也就是所謂 KDE 服務。一般來說，有兩種類型的服務：</p>"
--"<ul>"
--"<li>在啟動時呼叫服務</li>"
--"<li>依需求呼叫服務</li></ul>"
--"<p>這些順序只是方便列舉而已。在啟動時呼叫的服務可以啟動也可以停止。在管理員模式，您也可以定義何種服務要在啟動時載入。</p>"
--"<p><b> 請小心使用這個功能：某些服務對於 KDE 來說是必要的：如果您不知道您在做什麼，請不要停止服務。</b></p>"
-+"<h1>服務管理程式</h1><p>這模組讓您能夠概覽 KDE 伺服程式的所有外掛程式，也就是"
-+"所謂 KDE 服務。一般來說，有兩種類型的服務：</p><ul><li>在啟動時呼叫服務</"
-+"li><li>依需求呼叫服務</li></ul><p>這些順序只是方便列舉而已。在啟動時呼叫的服"
-+"務可以啟動也可以停止。在管理員模式，您也可以定義何種服務要在啟動時載入。</"
-+"p><p><b> 請小心使用這個功能：某些服務對於 KDE 來說是必要的：如果您不知道您在"
-+"做什麼，請不要停止服務。</b></p>"
- 
- #: kcmkded.cpp:67
- msgid "Running"
-@@ -73,9 +69,12 @@
- 
- #: kcmkded.cpp:73
- msgid ""
--"This is a list of available KDE services which will be started on demand. They "
--"are only listed for convenience, as you cannot manipulate these services."
--msgstr "這是在 KDE 中在你需要時會自動載入的服務。在此列出僅供參考，你並不能調整這些服務。"
-+"This is a list of available KDE services which will be started on demand. "
-+"They are only listed for convenience, as you cannot manipulate these "
-+"services."
-+msgstr ""
-+"這是在 KDE 中在你需要時會自動載入的服務。在此列出僅供參考，你並不能調整這些服"
-+"務。"
- 
- #: kcmkded.cpp:79 kcmkded.cpp:93
- msgid "Service"
-@@ -95,10 +94,12 @@
- 
- #: kcmkded.cpp:86
- msgid ""
--"This shows all KDE services that can be loaded on KDE startup. Checked services "
--"will be invoked on next startup. Be careful with deactivation of unknown "
--"services."
--msgstr "此表為 KDE 啟動時會載入的所有 KDE 服務。被選取的服務將會在下次啟動時被載入。請不要隨意關閉那些你不清楚功能的服務"
-+"This shows all KDE services that can be loaded on KDE startup. Checked "
-+"services will be invoked on next startup. Be careful with deactivation of "
-+"unknown services."
-+msgstr ""
-+"此表為 KDE 啟動時會載入的所有 KDE 服務。被選取的服務將會在下次啟動時被載入。"
-+"請不要隨意關閉那些你不清楚功能的服務"
- 
- #: kcmkded.cpp:92
- msgid "Use"
-diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kcmkdnssd.po kde-i18n-zh_TW-3.5.10/messages/kdebase/kcmkdnssd.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kcmkdnssd.po	2006-01-19 18:50:04.000000000 +0100
-+++ kde-i18n-zh_TW-3.5.10/messages/kdebase/kcmkdnssd.po	2011-11-11 15:45:17.000000000 +0100
-@@ -6,7 +6,7 @@
- "Project-Id-Version: kcmkdnssd VERSION\n"
- "POT-Creation-Date: 2005-10-13 02:37+0200\n"
- "PO-Revision-Date: 2005-10-27 19:51+0800\n"
--"Last-Translator: Chao-Hsiung Liao <j_h_liau@yahoo.com.tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Chinese (traditional> <zh-l10n@lists.linux.org.tw>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
-@@ -62,8 +62,8 @@
- #: rc.cpp:18 rc.cpp:70
- #, no-c-format
- msgid ""
--"List of Internet domains  that will be browsed for services. Do not put .local "
--"here - it\n"
-+"List of Internet domains  that will be browsed for services. Do not put ."
-+"local here - it\n"
- "is configured with 'Browse local network' option above."
- msgstr ""
- "用來瀏覽服務的網際網路網域清單。不要在這裡放入 .local - \n"
-@@ -73,7 +73,7 @@
- #: rc.cpp:22 rc.cpp:74
- #, no-c-format
- msgid "Publishing Mode"
--msgstr "發佈模式"
-+msgstr "發布模式"
- 
- #. i18n: file configdialog.ui line 110
- #: rc.cpp:25 rc.cpp:77
-@@ -100,7 +100,9 @@
- msgid ""
- "Advertise services on Internet domain using public IP. To have this option "
- "working you need to configure wide area operation in using administrator mode"
--msgstr "使用公開 IP 於網際網路網域的廣告服務。要讓這個選項運作您須使用管理者模式設定廣域作業"
-+msgstr ""
-+"使用公開 IP 於網際網路網域的廣告服務。要讓這個選項運作您須使用管理者模式設定"
-+"廣域作業"
- 
- #. i18n: file configdialog.ui line 149
- #: rc.cpp:37 rc.cpp:89
-@@ -155,7 +157,8 @@
- #~ msgstr "發現更多網域"
- 
- #~ msgid ""
--#~ "If selected every configured domain will be queried for list of domain to browse. This \n"
-+#~ "If selected every configured domain will be queried for list of domain to "
-+#~ "browse. This \n"
- #~ "process will be recursive."
- #~ msgstr ""
- #~ "如果選擇，每個設定的網域都會被查詢做為要瀏覽的網域清單。\n"
-diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kcmkeys.po kde-i18n-zh_TW-3.5.10/messages/kdebase/kcmkeys.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kcmkeys.po	2006-10-01 18:34:17.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdebase/kcmkeys.po	2011-11-11 15:45:17.000000000 +0100
-@@ -10,8 +10,7 @@
- "Project-Id-Version: kcmkeys\n"
- "POT-Creation-Date: 2006-08-22 02:34+0200\n"
- "PO-Revision-Date: 2006-01-12 13:43+0800\n"
--"Last-Translator: Frank Weng (a.k.a. Franklin) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Traditional Chinese <zh_l10n@linux.org.tw>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
-@@ -20,25 +19,29 @@
- 
- #: shortcuts.cpp:93
- msgid ""
--"<h1>Key Bindings</h1> Using key bindings you can configure certain actions to "
--"be triggered when you press a key or a combination of keys, e.g. Ctrl+C is "
--"normally bound to 'Copy'. KDE allows you to store more than one 'scheme' of key "
--"bindings, so you might want to experiment a little setting up your own scheme "
--"while you can still change back to the KDE defaults."
--"<p> In the tab 'Global Shortcuts' you can configure non-application specific "
--"bindings like how to switch desktops or maximize a window. In the tab "
--"'Application Shortcuts' you will find bindings typically used in applications, "
--"such as copy and paste."
--msgstr ""
--"<h1>按鍵對應</h1>使用按鍵對應您可以設定按下按鍵後觸發特定動作。例如 Ctrl+C 一般會對應到「複製」。 KDE "
--"允許您儲存多個按鍵對應「架構」，所以您可以試著改變您的系統設定，而且您隨時可以回復 KDE 預設值。"
--"<p>在「全域捷徑」標籤中，您可以組態非特定應用程式的設定，像切換桌面或最大化視窗。在「應用程式捷徑」標籤中，您可以找到一般用在程式的按鍵對應，例如複製與貼上。"
-+"<h1>Key Bindings</h1> Using key bindings you can configure certain actions "
-+"to be triggered when you press a key or a combination of keys, e.g. Ctrl+C "
-+"is normally bound to 'Copy'. KDE allows you to store more than one 'scheme' "
-+"of key bindings, so you might want to experiment a little setting up your "
-+"own scheme while you can still change back to the KDE defaults.<p> In the "
-+"tab 'Global Shortcuts' you can configure non-application specific bindings "
-+"like how to switch desktops or maximize a window. In the tab 'Application "
-+"Shortcuts' you will find bindings typically used in applications, such as "
-+"copy and paste."
-+msgstr ""
-+"<h1>按鍵對應</h1>使用按鍵對應您可以設定按下按鍵後觸發特定動作。例如 Ctrl+C 一"
-+"般會對應到「複製」。 KDE 允許您儲存多個按鍵對應「架構」，所以您可以試著改變您"
-+"的系統設定，而且您隨時可以回復 KDE 預設值。<p>在「全域捷徑」標籤中，您可以組"
-+"態非特定應用程式的設定，像切換桌面或最大化視窗。在「應用程式捷徑」標籤中，您"
-+"可以找到一般用在程式的按鍵對應，例如複製與貼上。"
- 
- #: shortcuts.cpp:152
- msgid ""
- "Click here to remove the selected key bindings scheme. You cannot remove the "
- "standard system-wide schemes 'Current scheme' and 'KDE default'."
--msgstr "按下這邊以移除選擇的按鍵對應結構。您不能移除標準系統結構，「目前結構」或是「KDE 預設」。"
-+msgstr ""
-+"按下這邊以移除選擇的按鍵對應結構。您不能移除標準系統結構，「目前結構」或是"
-+"「KDE 預設」。"
- 
- #: shortcuts.cpp:158
- msgid "New scheme"
-@@ -63,7 +66,7 @@
- 
- #: shortcuts.cpp:187
- msgid "App&lication Shortcuts"
--msgstr "應用程式捷徑 (&A)"
-+msgstr "應用程式捷徑(&A)"
- 
- #: shortcuts.cpp:248
- msgid "User-Defined Scheme"
-@@ -75,15 +78,18 @@
- 
- #: shortcuts.cpp:292
- msgid ""
--"Your current changes will be lost if you load another scheme before saving this "
--"one."
--msgstr "在您儲存目前的修改前，載入其他的組合鍵表，那麼您目前所做的改變將會遺失。"
-+"Your current changes will be lost if you load another scheme before saving "
-+"this one."
-+msgstr ""
-+"在您儲存目前的修改前，載入其他的組合鍵表，那麼您目前所做的改變將會遺失。"
- 
- #: shortcuts.cpp:312
- msgid ""
- "This scheme requires the \"%1\" modifier key, which is not available on your "
- "keyboard layout. Do you wish to view it anyway?"
--msgstr "這個組合鍵定義需要 \"%1\" 這個按鍵，不過它並不在您的鍵盤上。您要看到底是哪些按鍵定義嗎？"
-+msgstr ""
-+"這個組合鍵定義需要 \"%1\" 這個按鍵，不過它並不在您的鍵盤上。您要看到底是哪些"
-+"按鍵定義嗎？"
- 
- #: modifiers.cpp:194 modifiers.cpp:290 shortcuts.cpp:314
- msgid "Win"
-@@ -138,15 +144,16 @@
- #: modifiers.cpp:215
- msgid ""
- "Checking this box will change your X Modifier Mapping to better reflect the "
--"standard MacOS modifier key usage. It allows you to use <i>Command+C</i> for <i>"
--"Copy</i>, for instance, instead of the PC standard of <i>Ctrl+C</I>. <b>"
--"Command</b> will be used for application and console commands, <b>Option</b> "
--"as a command modifier and for navigating menus and dialogs, and <b>Control</b> "
--"for window manager commands."
--msgstr ""
--"選取這個選項，將會改變您的 X 組合鍵對映到標準的 MacOS 組合鍵設定。這將允許您使用 <i>Command+C</i> 來執行 <i>Copy</i> "
--"的動作，就如同在 PC 上使用 <i>CTRL+C</i> 一樣。<b>Command</b> 將同時被用在應用程式與 Console 的指令上，<b>"
--"Option</b> 用於選單的操作，而 <b>Control</b> 則用於視窗管理的指令上。"
-+"standard MacOS modifier key usage. It allows you to use <i>Command+C</i> for "
-+"<i>Copy</i>, for instance, instead of the PC standard of <i>Ctrl+C</I>. "
-+"<b>Command</b> will be used for application and console commands, <b>Option</"
-+"b> as a command modifier and for navigating menus and dialogs, and "
-+"<b>Control</b> for window manager commands."
-+msgstr ""
-+"選取這個選項，將會改變您的 X 組合鍵對映到標準的 MacOS 組合鍵設定。這將允許您"
-+"使用 <i>Command+C</i> 來執行 <i>Copy</i> 的動作，就如同在 PC 上使用 <i>CTRL"
-+"+C</i> 一樣。<b>Command</b> 將同時被用在應用程式與 Console 的指令上，"
-+"<b>Option</b> 用於選單的操作，而 <b>Control</b> 則用於視窗管理的指令上。"
- 
- #: modifiers.cpp:228
- msgid "X Modifier Mapping"
-@@ -175,25 +182,28 @@
- 
- #: modifiers.cpp:343
- msgid ""
--"You can only activate this option if your X keyboard layout has the 'Super' or "
--"'Meta' keys properly configured as modifier keys."
--msgstr "當你的 X 鍵盤配置有設定 'Super' 和 'Meta' 的組合鍵時，您才能夠開啟這個選項。"
-+"You can only activate this option if your X keyboard layout has the 'Super' "
-+"or 'Meta' keys properly configured as modifier keys."
-+msgstr ""
-+"當你的 X 鍵盤配置有設定 'Super' 和 'Meta' 的組合鍵時，您才能夠開啟這個選項。"
- 
- #: main.cpp:54
- msgid ""
--"<h1>Keyboard Shortcuts</h1> Using shortcuts you can configure certain actions "
--"to be triggered when you press a key or a combination of keys, e.g. Ctrl+C is "
--"normally bound to 'Copy'. KDE allows you to store more than one 'scheme' of "
--"shortcuts, so you might want to experiment a little setting up your own scheme, "
--"although you can still change back to the KDE defaults."
--"<p> In the 'Global Shortcuts' tab you can configure non-application-specific "
--"bindings, like how to switch desktops or maximize a window; in the 'Application "
--"Shortcuts' tab you will find bindings typically used in applications, such as "
--"copy and paste."
-+"<h1>Keyboard Shortcuts</h1> Using shortcuts you can configure certain "
-+"actions to be triggered when you press a key or a combination of keys, e.g. "
-+"Ctrl+C is normally bound to 'Copy'. KDE allows you to store more than one "
-+"'scheme' of shortcuts, so you might want to experiment a little setting up "
-+"your own scheme, although you can still change back to the KDE defaults.<p> "
-+"In the 'Global Shortcuts' tab you can configure non-application-specific "
-+"bindings, like how to switch desktops or maximize a window; in the "
-+"'Application Shortcuts' tab you will find bindings typically used in "
-+"applications, such as copy and paste."
- msgstr ""
--"<h1>鍵盤捷徑</h1>使用捷徑您可以組態按下按鍵後的動作。例如 Ctrl+C 通常是對應到「複製」。 KDE "
--"允許您儲存多個按鍵對應組合，所以您可以試著改變您的系統設定，您隨時可以回復 KDE 預設值。 "
--"<p>在「全域捷徑」標籤中，您可以設定非特定程式的設定，例如切換桌面或最大化視窗。在「應用程式」標籤中，您可以找到一般用在程式的按鍵對應，例如複製與貼上。"
-+"<h1>鍵盤捷徑</h1>使用捷徑您可以組態按下按鍵後的動作。例如 Ctrl+C 通常是對應到"
-+"「複製」。 KDE 允許您儲存多個按鍵對應組合，所以您可以試著改變您的系統設定，您"
-+"隨時可以回復 KDE 預設值。 <p>在「全域捷徑」標籤中，您可以設定非特定程式的設"
-+"定，例如切換桌面或最大化視窗。在「應用程式」標籤中，您可以找到一般用在程式的"
-+"按鍵對應，例如複製與貼上。"
- 
- #: main.cpp:77
- msgid "Shortcut Schemes"
-@@ -219,23 +229,28 @@
- msgid ""
- "<h1>Command Shortcuts</h1> Using key bindings you can configure applications "
- "and commands to be triggered when you press a key or a combination of keys."
--msgstr "<h1>指令捷徑</h1> 你可以設定當按下某個鍵（或是某些鍵）時， 就執行某個指令或是程式。"
-+msgstr ""
-+"<h1>指令捷徑</h1> 你可以設定當按下某個鍵（或是某些鍵）時， 就執行某個指令或是"
-+"程式。"
- 
- #: commandShortcuts.cpp:83
- msgid ""
--"<qt>Below is a list of known commands which you may assign keyboard shortcuts "
--"to. To edit, add or remove entries from this list use the <a "
--"href=\"launchMenuEditor\">KDE menu editor</a>.</qt>"
-+"<qt>Below is a list of known commands which you may assign keyboard "
-+"shortcuts to. To edit, add or remove entries from this list use the <a href="
-+"\"launchMenuEditor\">KDE menu editor</a>.</qt>"
- msgstr ""
--"<qt>下面是一些已知的指令，你可以指定一些鍵盤捷徑給它們。 請使用 <a href=\"launchMenuEditor\">KDE 選單編輯器</a> "
--"來編輯、新增或是 移除項目</qt>"
-+"<qt>下面是一些已知的指令，你可以指定一些鍵盤捷徑給它們。 請使用 <a href="
-+"\"launchMenuEditor\">KDE 選單編輯器</a> 來編輯、新增或是 移除項目</qt>"
- 
- #: commandShortcuts.cpp:96
- msgid ""
--"This is a list of all the desktop applications and commands currently defined "
--"on this system. Click to select a command to assign a keyboard shortcut to. "
--"Complete management of these entries can be done via the menu editor program."
--msgstr "這是目前系統上所有的桌面程式和指令。按一下選擇一個想要建立鍵盤捷徑的指令。更完整的管理介面請使用選單編輯器程式。"
-+"This is a list of all the desktop applications and commands currently "
-+"defined on this system. Click to select a command to assign a keyboard "
-+"shortcut to. Complete management of these entries can be done via the menu "
-+"editor program."
-+msgstr ""
-+"這是目前系統上所有的桌面程式和指令。按一下選擇一個想要建立鍵盤捷徑的指令。更"
-+"完整的管理介面請使用選單編輯器程式。"
- 
- #: commandShortcuts.cpp:104
- msgid "Shortcut for Selected Command"
-@@ -253,7 +268,7 @@
- 
- #: commandShortcuts.cpp:112
- msgid "C&ustom"
--msgstr "自訂(&u)"
-+msgstr "自訂(&U)"
- 
- #: commandShortcuts.cpp:114
- msgid ""
-@@ -263,10 +278,12 @@
- 
- #: commandShortcuts.cpp:119
- msgid ""
--"Use this button to choose a new shortcut key. Once you click it, you can press "
--"the key-combination which you would like to be assigned to the currently "
--"selected command."
--msgstr "用這個按鍵來選取一個新的捷徑鍵。用滑鼠點它，你可以按下組合鍵，並且將目前 選取的指令指令給它。"
-+"Use this button to choose a new shortcut key. Once you click it, you can "
-+"press the key-combination which you would like to be assigned to the "
-+"currently selected command."
-+msgstr ""
-+"用這個按鍵來選取一個新的捷徑鍵。用滑鼠點它，你可以按下組合鍵，並且將目前 選取"
-+"的指令指令給它。"
- 
- #: commandShortcuts.cpp:142
- msgid ""
-diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kcmkicker.po kde-i18n-zh_TW-3.5.10/messages/kdebase/kcmkicker.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kcmkicker.po	2008-08-19 20:43:10.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdebase/kcmkicker.po	2011-11-11 15:45:17.000000000 +0100
-@@ -9,8 +9,7 @@
- "Project-Id-Version: kcmkicker\n"
- "POT-Creation-Date: 2008-07-08 01:18+0200\n"
- "PO-Revision-Date: 2007-02-27 09:07+0800\n"
--"Last-Translator: Frank Weng (a.k.a. Franklin) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Chinese Traditional <zh-l10n@linux.org.tw>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
-@@ -35,61 +34,68 @@
- 
- #: applettab_impl.cpp:59
- msgid ""
--"Panel applets can be started in two different ways: internally or externally. "
--"While 'internally' is the preferred way to load applets, this can raise "
--"stability or security problems when you are using poorly-programmed third-party "
--"applets. To address these problems, applets can be marked 'trusted'. You might "
--"want to configure Kicker to treat trusted applets differently to untrusted "
--"ones; your options are: "
--"<ul>"
--"<li><em>Load only trusted applets internally:</em> All applets but the ones "
--"marked 'trusted' will be loaded using an external wrapper application.</li> "
--"<li><em>Load startup config applets internally:</em> "
--"The applets shown on KDE startup will be loaded internally, others will be "
--"loaded using an external wrapper application.</li> "
--"<li><em>Load all applets internally</em></li></ul>"
--msgstr ""
--"面板小程式可以用兩種不同的方式啟動：內部和外部啟動。內部啟動是比較被偏好用來載入小程式的方式，但是卻可能有系統穩定性和安全性上的疑慮，尤其是一些 "
--"外來的、沒被好好設計的程式。為了解決這個問題，小程式可以被標記成「可靠的」。 你可能會把 Kicker "
--"設定為以不同的方式來對待「可靠的」和「非可靠的」小程式。 你的選項有："
--"<ul>"
--"<li><em>只有可靠的小程式可被內部載入：</em> 除了被標記為「可靠的」的小程式之外所有的小程式會被用外部的包裝應用程式 載入。 </li> "
--"<li><em>啟動時設定的小程式可被內部載入：</em> 出現在「KDE "
--"啟動時執行」中的小程式會被用內部啟動的方式載入，其它的會被用外部的包裝應用程式載入。 </li> "
--"<li><em>所有的小程式都使用內部啟動載入</em></li></ul>"
-+"Panel applets can be started in two different ways: internally or "
-+"externally. While 'internally' is the preferred way to load applets, this "
-+"can raise stability or security problems when you are using poorly-"
-+"programmed third-party applets. To address these problems, applets can be "
-+"marked 'trusted'. You might want to configure Kicker to treat trusted "
-+"applets differently to untrusted ones; your options are: <ul><li><em>Load "
-+"only trusted applets internally:</em> All applets but the ones marked "
-+"'trusted' will be loaded using an external wrapper application.</li> "
-+"<li><em>Load startup config applets internally:</em> The applets shown on "
-+"KDE startup will be loaded internally, others will be loaded using an "
-+"external wrapper application.</li> <li><em>Load all applets internally</em></"
-+"li></ul>"
-+msgstr ""
-+"面板小程式可以用兩種不同的方式啟動：內部和外部啟動。內部啟動是比較被偏好用來"
-+"載入小程式的方式，但是卻可能有系統穩定性和安全性上的疑慮，尤其是一些 外來的、"
-+"沒被好好設計的程式。為了解決這個問題，小程式可以被標記成「可靠的」。 你可能會"
-+"把 Kicker 設定為以不同的方式來對待「可靠的」和「非可靠的」小程式。 你的選項"
-+"有：<ul><li><em>只有可靠的小程式可被內部載入：</em> 除了被標記為「可靠的」的"
-+"小程式之外所有的小程式會被用外部的包裝應用程式 載入。 </li> <li><em>啟動時設"
-+"定的小程式可被內部載入：</em> 出現在「KDE 啟動時執行」中的小程式會被用內部啟"
-+"動的方式載入，其它的會被用外部的包裝應用程式載入。 </li> <li><em>所有的小程式"
-+"都使用內部啟動載入</em></li></ul>"
- 
- #: applettab_impl.cpp:70
- msgid ""
- "Here you can see a list of applets that are marked 'trusted', i.e. will be "
- "loaded internally by Kicker in any case. To move an applet from the list of "
--"available applets to the trusted ones, or vice versa, select it and press the "
--"left or right buttons."
-+"available applets to the trusted ones, or vice versa, select it and press "
-+"the left or right buttons."
- msgstr ""
--"這裡你可以看到被標記為「可靠的」的小程式列表，例如，在任何情況下都會 被 Kicker 用內部啟動的方式載入。要將一個小程式從「所有的小程式列表」 "
--"移動到「可靠的小程式列表」（或是類似的動作），請選取它，然後按左鍵或右鍵。"
-+"這裡你可以看到被標記為「可靠的」的小程式列表，例如，在任何情況下都會 被 "
-+"Kicker 用內部啟動的方式載入。要將一個小程式從「所有的小程式列表」 移動到「可"
-+"靠的小程式列表」（或是類似的動作），請選取它，然後按左鍵或右鍵。"
- 
- #: applettab_impl.cpp:75
- msgid ""
- "Click here to add the selected applet from the list of available, untrusted "
- "applets to the list of trusted applets."
--msgstr "按這裡將已選取的小程式從「所有可得的、非可靠的小程式列表」移動到 「可靠的小程式列表」。"
-+msgstr ""
-+"按這裡將已選取的小程式從「所有可得的、非可靠的小程式列表」移動到 「可靠的小程"
-+"式列表」。"
- 
- #: applettab_impl.cpp:78
- msgid ""
- "Click here to remove the selected applet from the list of trusted applets to "
- "the list of available, untrusted applets."
--msgstr "按這裡將已選取的小程式從「可靠的小程式列表」移除到 「所有可得的、非可靠的小程式列表」。"
-+msgstr ""
-+"按這裡將已選取的小程式從「可靠的小程式列表」移除到 「所有可得的、非可靠的小程"
-+"式列表」。"
- 
- #: applettab_impl.cpp:81
- msgid ""
--"Here you can see a list of available applets that you currently do not trust. "
--"This does not mean you cannot use those applets, but rather that the panel's "
--"policy using them depends on your applet security level. To move an applet from "
--"the list of available applets to the trusted ones or vice versa, select it and "
--"press the left or right buttons."
-+"Here you can see a list of available applets that you currently do not "
-+"trust. This does not mean you cannot use those applets, but rather that the "
-+"panel's policy using them depends on your applet security level. To move an "
-+"applet from the list of available applets to the trusted ones or vice versa, "
-+"select it and press the left or right buttons."
- msgstr ""
--"這裡你可以看到在目前可得的小程式中，不可靠小程式的列表。 但並不代表你不能使用這些小程式，而是使用它們的方式和你的安全性顧慮有關。 "
--"要將一個小程式從「可得的小程式列表」移動到「可靠的小程式列表」（或類似的 動作），請選取它，然後按左鍵或右鍵。"
-+"這裡你可以看到在目前可得的小程式中，不可靠小程式的列表。 但並不代表你不能使用"
-+"這些小程式，而是使用它們的方式和你的安全性顧慮有關。 要將一個小程式從「可得的"
-+"小程式列表」移動到「可靠的小程式列表」（或類似的 動作），請選取它，然後按左鍵"
-+"或右鍵。"
- 
- #: extensionInfo.cpp:45
- msgid "Main Panel"
-@@ -149,14 +155,16 @@
- msgid ""
- "<h1>Panel</h1> Here you can configure the KDE panel (also referred to as "
- "'kicker'). This includes options like the position and size of the panel, as "
--"well as its hiding behavior and its looks."
--"<p> Note that you can also access some of these options directly by clicking on "
--"the panel, e.g. dragging it with the left mouse button or using the context "
--"menu on right mouse button click. This context menu also offers you "
--"manipulation of the panel's buttons and applets."
-+"well as its hiding behavior and its looks.<p> Note that you can also access "
-+"some of these options directly by clicking on the panel, e.g. dragging it "
-+"with the left mouse button or using the context menu on right mouse button "
-+"click. This context menu also offers you manipulation of the panel's buttons "
-+"and applets."
- msgstr ""
--"<h1>面板</h1>您可以在這邊設定 KDE 面板（或是 'kicker'）。 這包含了像是位置大小等等選項，以及隱藏的方式與外觀。"
--"<p>注意您也可以經由直接點選面板來存取部分的選項，例如用滑鼠左鍵拖曳或是用內容選單。內容選單也提供您許多的面板按鈕與小程式。"
-+"<h1>面板</h1>您可以在這邊設定 KDE 面板（或是 'kicker'）。 這包含了像是位置大"
-+"小等等選項，以及隱藏的方式與外觀。<p>注意您也可以經由直接點選面板來存取部分的"
-+"選項，例如用滑鼠左鍵拖曳或是用內容選單。內容選單也提供您許多的面板按鈕與小程"
-+"式。"
- 
- #: main.cpp:349
- msgid ""
-@@ -284,12 +292,14 @@
- msgid ""
- "<qt>\n"
- "<p>Select this option to always show the Applet Handles.</p>\n"
--"<p>Applet Handles let you move, remove and configure applets in the panel.</p>\n"
-+"<p>Applet Handles let you move, remove and configure applets in the panel.</"
-+"p>\n"
- "</qt>"
- msgstr ""
- "<qt>\n"
- "<p>Select this option to always show the Applet Handles.</p>\n"
--"<p>Applet Handles let you move, remove and configure applets in the panel.</p>\n"
-+"<p>Applet Handles let you move, remove and configure applets in the panel.</"
-+"p>\n"
- "</qt>"
- 
- #. i18n: file advancedOptions.ui line 116
-@@ -303,8 +313,10 @@
- #, no-c-format
- msgid ""
- "<qt>\n"
--"<p>Select this option to make Applet Handles visible only on mouse hover.</p>\n"
--"<p>Applet Handles let you move, remove and configure applets in the panel.</p>\n"
-+"<p>Select this option to make Applet Handles visible only on mouse hover.</"
-+"p>\n"
-+"<p>Applet Handles let you move, remove and configure applets in the panel.</"
-+"p>\n"
- "</qt>"
- msgstr ""
- "<qt>\n"
-@@ -323,14 +335,13 @@
- #, no-c-format
- msgid ""
- "<qt>\n"
--"<p>"
--"<p>Select this option to always hide the Applet Handles. Beware that this "
-+"<p><p>Select this option to always hide the Applet Handles. Beware that this "
- "option can disable removing, moving or configuring some applets.</p>\n"
- "</qt>"
- msgstr ""
- "<qt>\n"
--"<p>"
--"<p>選取這個選項可以永遠隱藏小程式的 Handle。注意，這個選項可能會讓你 無法移除、移動、或是設定一些小程式。</p>\n"
-+"<p><p>選取這個選項可以永遠隱藏小程式的 Handle。注意，這個選項可能會讓你 無法"
-+"移除、移動、或是設定一些小程式。</p>\n"
- "</qt>"
- 
- #. i18n: file advancedOptions.ui line 162
-@@ -356,8 +367,8 @@
- #: rc.cpp:56 rc.cpp:59 rc.cpp:65 rc.cpp:71
- #, no-c-format
- msgid ""
--"Use this slider to set how much transparent panels should be tinted using the "
--"tint color."
-+"Use this slider to set how much transparent panels should be tinted using "
-+"the tint color."
- msgstr "設定面板的透明度"
- 
- #. i18n: file advancedOptions.ui line 251
-@@ -370,13 +381,13 @@
- #: rc.cpp:68
- #, no-c-format
- msgid "Ti&nt amount:"
--msgstr "半透明度(&n)"
-+msgstr "半透明度(&N)"
- 
- #. i18n: file advancedOptions.ui line 279
- #: rc.cpp:74
- #, no-c-format
- msgid "Tint c&olor:"
--msgstr "半透明色(&o)"
-+msgstr "半透明色(&O)"
- 
- #. i18n: file advancedOptions.ui line 293
- #: rc.cpp:80
-@@ -388,12 +399,13 @@
- #: rc.cpp:83
- #, no-c-format
- msgid ""
--"Normally if you have the desktop's or current application's menu bar displayed "
--"in a panel at the top of the screen (MacOS-style), transparency is disabled for "
--"this panel to avoid the desktop background clashing with the menu bar. Set this "
--"option to make it transparent anyways."
-+"Normally if you have the desktop's or current application's menu bar "
-+"displayed in a panel at the top of the screen (MacOS-style), transparency is "
-+"disabled for this panel to avoid the desktop background clashing with the "
-+"menu bar. Set this option to make it transparent anyways."
- msgstr ""
--"通常如果您有桌面或目前應用程式的選單列顯示在螢幕頂端的面板時(MacOS-風格)，此面板的透明效果會停用以避免桌面背景與該選單列混淆。設定此選項可強迫它使用透明"
-+"通常如果您有桌面或目前應用程式的選單列顯示在螢幕頂端的面板時(MacOS-風格)，此"
-+"面板的透明效果會停用以避免桌面背景與該選單列混淆。設定此選項可強迫它使用透明"
- "效果。"
- 
- #. i18n: file applettab.ui line 24
-@@ -472,9 +484,10 @@
- #: rc.cpp:122
- #, no-c-format
- msgid ""
--"If this option is selected, the only way to hide the panel will be to click on "
--"the hide buttons that appear on either end of it."
--msgstr "如果這個選項被選取，那麼隱藏面板的方式，只能由面板左右兩側的隱藏按鈕來執行。"
-+"If this option is selected, the only way to hide the panel will be to click "
-+"on the hide buttons that appear on either end of it."
-+msgstr ""
-+"如果這個選項被選取，那麼隱藏面板的方式，只能由面板左右兩側的隱藏按鈕來執行。"
- 
- #. i18n: file hidingtab.ui line 138
- #: rc.cpp:125
-@@ -492,7 +505,8 @@
- #: rc.cpp:131 rc.cpp:137
- #, no-c-format
- msgid ""
--"Here you can change the delay after which the panel will disappear if not used."
-+"Here you can change the delay after which the panel will disappear if not "
-+"used."
- msgstr "您可以在這邊設定，當面板不使用時自動隱藏的時間。"
- 
- #. i18n: file hidingtab.ui line 163
-@@ -511,8 +525,8 @@
- #: rc.cpp:143
- #, no-c-format
- msgid ""
--"If this option is selected, the panel will allow itself to be covered by other "
--"windows."
-+"If this option is selected, the panel will allow itself to be covered by "
-+"other windows."
- msgstr "當這個選項被選取時，面板允許其他視窗覆蓋在它上面。"
- 
- #. i18n: file hidingtab.ui line 213
-@@ -525,12 +539,14 @@
- #: rc.cpp:149
- #, no-c-format
- msgid ""
--"If this option is selected, the panel will automatically hide after a period of "
--"time and reappear when you move the mouse to the screen edge where the panel is "
--"hidden. This is particularly useful for small screen resolutions, such as on "
--"laptops."
-+"If this option is selected, the panel will automatically hide after a period "
-+"of time and reappear when you move the mouse to the screen edge where the "
-+"panel is hidden. This is particularly useful for small screen resolutions, "
-+"such as on laptops."
- msgstr ""
--"如果您啟動這個選項，那麼面板將會在一段時間後自動隱藏，並且在滑鼠經過時重新出現。這是一個很有用的功能，特別是使用於只有低解析度螢幕的設備上，例如筆記型電腦等。"
-+"如果您啟動這個選項，那麼面板將會在一段時間後自動隱藏，並且在滑鼠經過時重新出"
-+"現。這是一個很有用的功能，特別是使用於只有低解析度螢幕的設備上，例如筆記型電"
-+"腦等。"
- 
- #. i18n: file hidingtab.ui line 235
- #: rc.cpp:152
-@@ -542,10 +558,12 @@
- #: rc.cpp:155
- #, no-c-format
- msgid ""
--"When this option is selected, moving the pointer to the specified edge of the "
--"screen will cause the panel to appear on top of any windows that may be "
-+"When this option is selected, moving the pointer to the specified edge of "
-+"the screen will cause the panel to appear on top of any windows that may be "
- "covering it."
--msgstr "當您選取了這個選項，如果您的滑鼠移到了畫面中的指定範圍時，面板將會被提至畫面的最上方，同時覆蓋原本在它上面的所有視窗。"
-+msgstr ""
-+"當您選取了這個選項，如果您的滑鼠移到了畫面中的指定範圍時，面板將會被提至畫面"
-+"的最上方，同時覆蓋原本在它上面的所有視窗。"
- 
- #. i18n: file hidingtab.ui line 244
- #: rc.cpp:158
-@@ -599,8 +617,8 @@
- #: rc.cpp:182
- #, no-c-format
- msgid ""
--"Here you can set the location on the screen's edge that will bring the panel to "
--"the front."
-+"Here you can set the location on the screen's edge that will bring the panel "
-+"to the front."
- msgstr "您可以在這裡設定會將面板提至桌面最上方的畫面範圍。"
- 
- #. i18n: file hidingtab.ui line 319
-@@ -613,10 +631,12 @@
- #: rc.cpp:188
- #, no-c-format
- msgid ""
--"If this option is enabled, the panel will automatically show itself for a brief "
--"period of time when the desktop is switched so you can see which desktop you "
--"are on."
--msgstr "如果啟動這個選項，那麼當您切換桌面時，面板將會在一段時間後自動顯示出來，以便於您能夠看到現在您正在那一個桌面上。"
-+"If this option is enabled, the panel will automatically show itself for a "
-+"brief period of time when the desktop is switched so you can see which "
-+"desktop you are on."
-+msgstr ""
-+"如果啟動這個選項，那麼當您切換桌面時，面板將會在一段時間後自動顯示出來，以便"
-+"於您能夠看到現在您正在那一個桌面上。"
- 
- #. i18n: file hidingtab.ui line 357
- #: rc.cpp:191
-@@ -628,17 +648,20 @@
- #: rc.cpp:194
- #, no-c-format
- msgid ""
--"This option controls the panel-hiding buttons, which are buttons with a small "
--"triangle found at the ends of the panel. You can place a button at either end "
--"of the panel, or both. Clicking on one of these buttons will hide the panel."
--msgstr "這個選項用於設定位於面板兩側，有著三角型符號的隱藏按鈕。您可以選擇將隱藏按鈕放在面板的任一側，同時在您需要的時候，按下按鈕來隱藏面板。"
-+"This option controls the panel-hiding buttons, which are buttons with a "
-+"small triangle found at the ends of the panel. You can place a button at "
-+"either end of the panel, or both. Clicking on one of these buttons will hide "
-+"the panel."
-+msgstr ""
-+"這個選項用於設定位於面板兩側，有著三角型符號的隱藏按鈕。您可以選擇將隱藏按鈕"
-+"放在面板的任一側，同時在您需要的時候，按下按鈕來隱藏面板。"
- 
- #. i18n: file hidingtab.ui line 377
- #: rc.cpp:200
- #, no-c-format
- msgid ""
--"When this option is selected, a panel-hiding button appears on the left end of "
--"the panel."
-+"When this option is selected, a panel-hiding button appears on the left end "
-+"of the panel."
- msgstr "當這個選項被選取的時候，面板隱藏按鈕將會顯示在面板的左邊。"
- 
- #. i18n: file hidingtab.ui line 385
-@@ -651,8 +674,8 @@
- #: rc.cpp:206
- #, no-c-format
- msgid ""
--"When this option is selected, a panel-hiding button appears on the right end of "
--"the panel."
-+"When this option is selected, a panel-hiding button appears on the right end "
-+"of the panel."
- msgstr "當這個選項被選取的時候，面板隱藏按鈕將會顯示在面板的右邊。"
- 
- #. i18n: file hidingtab.ui line 426
-@@ -672,8 +695,11 @@
- #, no-c-format
- msgid ""
- "When this option is selected the panel will \"slide\" off the screen when "
--"hiding. The speed of the animation is controlled by the slider directly below."
--msgstr "當這個選項被選取的時候，面板在隱藏的時候，將會以動畫的方式隱藏在畫面的邊界上。而動畫執行的速度，您可以透過下面的卷軸來進行設定。"
-+"hiding. The speed of the animation is controlled by the slider directly "
-+"below."
-+msgstr ""
-+"當這個選項被選取的時候，面板在隱藏的時候，將會以動畫的方式隱藏在畫面的邊界"
-+"上。而動畫執行的速度，您可以透過下面的卷軸來進行設定。"
- 
- #. i18n: file hidingtab.ui line 522
- #: rc.cpp:218
-@@ -703,9 +729,11 @@
- #: rc.cpp:230
- #, no-c-format
- msgid ""
--"If this option is selected, informational tooltips will appear when the mouse "
--"cursor moves over the icons, buttons and applets in the panel."
--msgstr "如果這個選項被選取的時候，提示訊息將會在滑鼠游標移到面板上的圖示、按鈕，以及 Applet 上時顯示。"
-+"If this option is selected, informational tooltips will appear when the "
-+"mouse cursor moves over the icons, buttons and applets in the panel."
-+msgstr ""
-+"如果這個選項被選取的時候，提示訊息將會在滑鼠游標移到面板上的圖示、按鈕，以及 "
-+"Applet 上時顯示。"
- 
- #. i18n: file lookandfeeltab.ui line 30
- #: rc.cpp:233
-@@ -723,8 +751,8 @@
- #: rc.cpp:239
- #, no-c-format
- msgid ""
--"When this option is selected a mouseover effect appears when the mouse cursor "
--"is moved over panel buttons"
-+"When this option is selected a mouseover effect appears when the mouse "
-+"cursor is moved over panel buttons"
- msgstr "如果啟動這個選項，那麼當滑鼠游標經過這個面板按鈕時會產生特殊效果"
- 
- #. i18n: file lookandfeeltab.ui line 52
-@@ -737,9 +765,11 @@
- #: rc.cpp:245
- #, no-c-format
- msgid ""
--"When this option is selected informational tooltips will appear when the mouse "
--"cursor moves over the icons, buttons and applets in the panel."
--msgstr "當這個選項被選取時，提示訊息將會在滑鼠游標移到面板上的圖示、按鈕，以及 Applet 上時顯示。"
-+"When this option is selected informational tooltips will appear when the "
-+"mouse cursor moves over the icons, buttons and applets in the panel."
-+msgstr ""
-+"當這個選項被選取時，提示訊息將會在滑鼠游標移到面板上的圖示、按鈕，以及 "
-+"Applet 上時顯示。"
- 
- #. i18n: file lookandfeeltab.ui line 65
- #: rc.cpp:248
-@@ -781,16 +811,17 @@
- #: rc.cpp:281
- #, no-c-format
- msgid ""
--"When the Custom Color option is selected, use this button to pick a color for "
--"quick browser tile backgrounds"
--msgstr "當「自訂顏色」選項被選取時，使用這個按鍵來選擇一個顏色當作快速瀏覽的背景。"
-+"When the Custom Color option is selected, use this button to pick a color "
-+"for quick browser tile backgrounds"
-+msgstr ""
-+"當「自訂顏色」選項被選取時，使用這個按鍵來選擇一個顏色當作快速瀏覽的背景。"
- 
- #. i18n: file lookandfeeltab.ui line 176
- #: rc.cpp:284
- #, no-c-format
- msgid ""
--"When the Custom Color option is selected, use this button to pick a color for "
--"the K menu tile background"
-+"When the Custom Color option is selected, use this button to pick a color "
-+"for the K menu tile background"
- msgstr "當選擇自訂色彩選項時，使用這個按鈕來挑選用於 K 選單拼貼背景的色彩"
- 
- #. i18n: file lookandfeeltab.ui line 205
-@@ -803,9 +834,10 @@
- #: rc.cpp:296
- #, no-c-format
- msgid ""
--"When the Custom Color option is selected, use this button to pick a color for "
--"window list tile backgrounds"
--msgstr "當「自訂顏色」選項被選取時，使用這個按鍵來選擇一個顏色當作視窗列表的背景。"
-+"When the Custom Color option is selected, use this button to pick a color "
-+"for window list tile backgrounds"
-+msgstr ""
-+"當「自訂顏色」選項被選取時，使用這個按鍵來選擇一個顏色當作視窗列表的背景。"
- 
- #. i18n: file lookandfeeltab.ui line 224
- #: rc.cpp:299
-@@ -823,8 +855,8 @@
- #: rc.cpp:314
- #, no-c-format
- msgid ""
--"When the Custom Color option is selected, use this button to pick a color for "
--"the desktop tile background"
-+"When the Custom Color option is selected, use this button to pick a color "
-+"for the desktop tile background"
- msgstr "當選擇自訂色彩選項時，使用這個按鈕來挑選用於 桌面拼貼背景的色彩"
- 
- #. i18n: file lookandfeeltab.ui line 278
-@@ -837,9 +869,10 @@
- #: rc.cpp:323
- #, no-c-format
- msgid ""
--"When the Custom Color option is selected, use this button to pick a color for "
--"application tile backgrounds"
--msgstr "當「自訂顏色」選項被選取時，使用這個按鍵來選擇一個顏色當作應用程式的背景。"
-+"When the Custom Color option is selected, use this button to pick a color "
-+"for application tile backgrounds"
-+msgstr ""
-+"當「自訂顏色」選項被選取時，使用這個按鍵來選擇一個顏色當作應用程式的背景。"
- 
- #. i18n: file lookandfeeltab.ui line 303
- #: rc.cpp:326
-@@ -863,16 +896,18 @@
- #: rc.cpp:344
- #, no-c-format
- msgid "Colorize to &match the desktop color scheme"
--msgstr "使用符合顏色設定的方法來著色(&m)"
-+msgstr "使用符合顏色設定的方法來著色(&M)"
- 
- #. i18n: file lookandfeeltab.ui line 402
- #: rc.cpp:347
- #, no-c-format
- msgid ""
--"If this option is selected, the panel background image will be colored to match "
--"the default colors. To change the default colors, go to the 'Colors' control "
--"module."
--msgstr "如果選擇這個選項，面板背景圖片會塗上預設的顏色。要改變預設顏色，請到「顏色」控制模組。"
-+"If this option is selected, the panel background image will be colored to "
-+"match the default colors. To change the default colors, go to the 'Colors' "
-+"control module."
-+msgstr ""
-+"如果選擇這個選項，面板背景圖片會塗上預設的顏色。要改變預設顏色，請到「顏色」"
-+"控制模組。"
- 
- #. i18n: file lookandfeeltab.ui line 449
- #: rc.cpp:350
-@@ -901,7 +936,7 @@
- #: rc.cpp:360
- #, no-c-format
- msgid "Enable &transparency"
--msgstr "使用透明度(&t)"
-+msgstr "使用透明度(&T)"
- 
- #. i18n: file lookandfeeltab.ui line 503
- #: rc.cpp:363
-@@ -915,7 +950,8 @@
- msgid ""
- "Click here to open the Advanced Options dialog. You can configure the applet "
- "handles look and feel, the tint transparency color and more."
--msgstr "按這裡打開進階選項對話方塊。你可以設定小程式 Handle 的外觀、半透明色...等等。"
-+msgstr ""
-+"按這裡打開進階選項對話方塊。你可以設定小程式 Handle 的外觀、半透明色...等等。"
- 
- #. i18n: file menutab.ui line 27
- #: rc.cpp:369
-@@ -947,7 +983,8 @@
- msgid ""
- "When this option is selected, items in the K Menu will appear with the "
- "application's name next to the icon."
--msgstr "如果這個選項被選取，那麼 K 選單將會在應用程式的圖示之後，同時顯示程式的名字。"
-+msgstr ""
-+"如果這個選項被選取，那麼 K 選單將會在應用程式的圖示之後，同時顯示程式的名字。"
- 
- #. i18n: file menutab.ui line 77
- #: rc.cpp:384
-@@ -961,7 +998,9 @@
- msgid ""
- "When this option is selected, items in the K Menu will appear with the "
- "application's name and a brief description next to the icon."
--msgstr "如果這個選項被選取，那麼 K 選單將會在應用程式的圖示之後，同時顯示程式的名稱及以程式的說明。"
-+msgstr ""
-+"如果這個選項被選取，那麼 K 選單將會在應用程式的圖示之後，同時顯示程式的名稱及"
-+"以程式的說明。"
- 
- #. i18n: file menutab.ui line 91
- #: rc.cpp:390
-@@ -975,7 +1014,9 @@
- msgid ""
- "When this option is selected, items in the K Menu will appear with the "
- "application's brief description next to the icon."
--msgstr "如果這個選項被選取，那麼 K 選單將會在應用程式的圖示之後，同時顯示程式的簡短描述。"
-+msgstr ""
-+"如果這個選項被選取，那麼 K 選單將會在應用程式的圖示之後，同時顯示程式的簡短描"
-+"述。"
- 
- #. i18n: file menutab.ui line 105
- #: rc.cpp:396
-@@ -989,7 +1030,9 @@
- msgid ""
- "When this option is selected, items in the K Menu will appear with a brief "
- "description and the application's name in brackets next to the icon."
--msgstr "如果這個選項被選取，那麼 K 選單將會在應用程式的圖示之後，同時顯示程式的說明及以程式的名字。"
-+msgstr ""
-+"如果這個選項被選取，那麼 K 選單將會在應用程式的圖示之後，同時顯示程式的說明及"
-+"以程式的名字。"
- 
- #. i18n: file menutab.ui line 118
- #: rc.cpp:402
-@@ -1001,19 +1044,21 @@
- #: rc.cpp:405
- #, no-c-format
- msgid ""
--"<qt>When this option is selected an image will appear down the left-hand side "
--"of the K Menu. The image will be tinted according to your color settings.\n"
-+"<qt>When this option is selected an image will appear down the left-hand "
-+"side of the K Menu. The image will be tinted according to your color "
-+"settings.\n"
- "                                    \n"
--"                                    "
--"<p><b>Tip</b>: You can customize the image that appears in the K Menu by "
--"putting an image file called kside.png and a tileable image file called "
--"kside_tile.png in $KDEHOME/share/apps/kicker/pics.</qt>"
-+"                                    <p><b>Tip</b>: You can customize the "
-+"image that appears in the K Menu by putting an image file called kside.png "
-+"and a tileable image file called kside_tile.png in $KDEHOME/share/apps/"
-+"kicker/pics.</qt>"
- msgstr ""
--"<qt>當這個選項被選取時，一個影像會出現在 K 選單的左邊。並且會依據你的顏色設定來顯示半透明色彩。\n"
-+"<qt>當這個選項被選取時，一個影像會出現在 K 選單的左邊。並且會依據你的顏色設定"
-+"來顯示半透明色彩。\n"
- "                                    \n"
--"                                    "
--"<p><b>提示</b>: 你可以自訂這個出現在 K 選單的影像。只要把叫 kside.png 和 kside_tile.png 的檔案放在 "
--"$KDEHOME/share/apps/kicker/pics 中。</qt>"
-+"                                    <p><b>提示</b>: 你可以自訂這個出現在 K 選"
-+"單的影像。只要把叫 kside.png 和 kside_tile.png 的檔案放在 $KDEHOME/share/"
-+"apps/kicker/pics 中。</qt>"
- 
- #. i18n: file menutab.ui line 151
- #: rc.cpp:410
-@@ -1040,8 +1085,11 @@
- #, no-c-format
- msgid ""
- "This is a list of the dynamic menus that can be displayed in the KDE menu in "
--"addition to the normal applications. Use the checkboxes to add or remove menus."
--msgstr "這些存在的動態選單可以被插入到 KDE 的選單之中。你可以使用 CheckBox 來加入或移除項目。"
-+"addition to the normal applications. Use the checkboxes to add or remove "
-+"menus."
-+msgstr ""
-+"這些存在的動態選單可以被插入到 KDE 的選單之中。你可以使用 CheckBox 來加入或移"
-+"除項目。"
- 
- #. i18n: file menutab.ui line 202
- #: rc.cpp:422
-@@ -1061,9 +1109,11 @@
- msgid ""
- "When browsing directories that contain a lot of files, the QuickBrowser can "
- "sometimes hide your whole desktop. Here you can limit the number of entries "
--"shown at a time in the QuickBrowser. This is particularly useful for low screen "
--"resolutions."
--msgstr "當瀏覽幫含許多檔案的目錄時，快速瀏覽器可以隱藏您整個桌面。您可以在這邊限制每次要顯示的項目數目。在低螢幕解析度時這是有用的。"
-+"shown at a time in the QuickBrowser. This is particularly useful for low "
-+"screen resolutions."
-+msgstr ""
-+"當瀏覽幫含許多檔案的目錄時，快速瀏覽器可以隱藏您整個桌面。您可以在這邊限制每"
-+"次要顯示的項目數目。在低螢幕解析度時這是有用的。"
- 
- #. i18n: file menutab.ui line 254
- #: rc.cpp:434
-@@ -1075,9 +1125,10 @@
- #: rc.cpp:437
- #, no-c-format
- msgid ""
--"If this option is enabled, hidden files (i.e. files beginning with a dot) will "
--"be shown in the QuickBrowser menus."
--msgstr "如果設定這個選項，隱藏檔案（檔名以 '.' 開始檔案）將會在快速瀏覽器中被顯示。"
-+"If this option is enabled, hidden files (i.e. files beginning with a dot) "
-+"will be shown in the QuickBrowser menus."
-+msgstr ""
-+"如果設定這個選項，隱藏檔案（檔名以 '.' 開始檔案）將會在快速瀏覽器中被顯示。"
- 
- #. i18n: file menutab.ui line 287
- #: rc.cpp:440
-@@ -1095,16 +1146,16 @@
- #: rc.cpp:446
- #, no-c-format
- msgid ""
--"This option allows you to define the maximum number of applications that should "
--"be displayed in the QuickStart menu area."
-+"This option allows you to define the maximum number of applications that "
-+"should be displayed in the QuickStart menu area."
- msgstr "這個選項用來決定在「快速啟動」選單所能顯示的應用程式最大數目。"
- 
- #. i18n: file menutab.ui line 329
- #: rc.cpp:449
- #, no-c-format
- msgid ""
--"This option allows you to define how many applications should be displayed at "
--"most in the QuickStart menu area."
-+"This option allows you to define how many applications should be displayed "
-+"at most in the QuickStart menu area."
- msgstr "這個選項用來決定在「快速啟動」選單所能顯示的應用程式數目。"
- 
- #. i18n: file menutab.ui line 339
-@@ -1117,8 +1168,8 @@
- #: rc.cpp:455
- #, no-c-format
- msgid ""
--"When this option is selected the QuickStart menu area will be filled with the "
--"applications you have used most recently."
-+"When this option is selected the QuickStart menu area will be filled with "
-+"the applications you have used most recently."
- msgstr "當這個選項被選取時，「快速啟動」選單將列出您最近使用的應用程式。"
- 
- #. i18n: file menutab.ui line 353
-@@ -1131,16 +1182,16 @@
- #: rc.cpp:461
- #, no-c-format
- msgid ""
--"When this option is selected the QuickStart menu area will be filled with the "
--"applications you use most frequently."
-+"When this option is selected the QuickStart menu area will be filled with "
-+"the applications you use most frequently."
- msgstr "當這個選項被選取時，「快速啟動」選單將列出您最常使用的應用程式。"
- 
- #. i18n: file positiontab.ui line 17
- #: rc.cpp:464
- #, no-c-format
- msgid ""
--"This is a list of all the panels currently active on your desktop. Select one "
--"to configure."
-+"This is a list of all the panels currently active on your desktop. Select "
-+"one to configure."
- msgstr "這個清單列出了所有目前在您桌面上的所有面板，請選擇一個以進行設定。"
- 
- #. i18n: file positiontab.ui line 83
-@@ -1154,10 +1205,12 @@
- #, no-c-format
- msgid ""
- "This preview image shows how the panel will appear on your screen with the "
--"settings you have chosen. Clicking the buttons around the image will move the "
--"position of the panel, while moving the length slider and choosing different "
--"sizes will change the dimensions of the panel."
--msgstr "這個影像是依照您的設定的面板預覽。點擊影像周圍的按鈕，可以移動面板的位置，而移動長度滑動鈕並選擇不同的大小則可以改變面板的尺寸。"
-+"settings you have chosen. Clicking the buttons around the image will move "
-+"the position of the panel, while moving the length slider and choosing "
-+"different sizes will change the dimensions of the panel."
-+msgstr ""
-+"這個影像是依照您的設定的面板預覽。點擊影像周圍的按鈕，可以移動面板的位置，而"
-+"移動長度滑動鈕並選擇不同的大小則可以改變面板的尺寸。"
- 
- #. i18n: file positiontab.ui line 191
- #: rc.cpp:476
-@@ -1181,15 +1234,15 @@
- #: rc.cpp:485
- #, no-c-format
- msgid ""
--"This menu selects which screen the Panel will be displayed on in a "
--"multiple-monitor system"
-+"This menu selects which screen the Panel will be displayed on in a multiple-"
-+"monitor system"
- msgstr "這個選單用於決定在多監視器的系統中，面板將顯示在哪一個監視器上。"
- 
- #. i18n: file positiontab.ui line 260
- #: rc.cpp:488
- #, no-c-format
- msgid "Len&gth"
--msgstr "長度(&g)"
-+msgstr "長度(&G)"
- 
- #. i18n: file positiontab.ui line 264
- #: rc.cpp:491
-@@ -1233,8 +1286,8 @@
- #: rc.cpp:507
- #, no-c-format
- msgid ""
--"When this option is selected, the panel will grow as necessary to accommodate "
--"the buttons and applets on it."
-+"When this option is selected, the panel will grow as necessary to "
-+"accommodate the buttons and applets on it."
- msgstr "當這個選項被選取時，面板將會依照按鈕的多寡來改變它的大小。"
- 
- #. i18n: file positiontab.ui line 380
-@@ -1296,10 +1349,12 @@
- #, no-c-format
- msgid ""
- "Here you can set the position of the panel highlighted on the left side. You "
--"can put any panel on top or bottom of the screen and on the left or right side "
--"of the screen. There you can put it into the center or into either corner of "
--"the screen."
--msgstr "這裡你可以設定左邊反白面板的位置。你可以把任何面板放在螢幕的上下左右， 並且可以置中、或是靠邊對齊。"
-+"can put any panel on top or bottom of the screen and on the left or right "
-+"side of the screen. There you can put it into the center or into either "
-+"corner of the screen."
-+msgstr ""
-+"這裡你可以設定左邊反白面板的位置。你可以把任何面板放在螢幕的上下左右， 並且可"
-+"以置中、或是靠邊對齊。"
- 
- #. i18n: file positiontab.ui line 609
- #: rc.cpp:546
-diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kcmkio.po kde-i18n-zh_TW-3.5.10/messages/kdebase/kcmkio.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kcmkio.po	2008-08-19 20:43:10.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdebase/kcmkio.po	2011-11-11 15:45:17.000000000 +0100
-@@ -9,7 +9,7 @@
- "Project-Id-Version: kcmkio\n"
- "POT-Creation-Date: 2008-07-08 01:18+0200\n"
- "PO-Revision-Date: 2005-08-08 12:01+0800\n"
--"Last-Translator: Chao-Hsiung Liao <j_h_liau@yahoo.com.tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
-@@ -31,17 +31,15 @@
- 
- #: cache.cpp:105
- msgid ""
--"<h1>Cache</h1>"
--"<p>This module lets you configure your cache settings.</p>"
--"<p>The cache is an internal memory in Konqueror where recently read web pages "
--"are stored. If you want to retrieve a web page again that you have recently "
--"read, it will not be downloaded from the Internet, but rather retrieved from "
--"the cache, which is a lot faster.</p>"
--msgstr ""
--"<h1>快取</h1>"
--"<p>這個模組讓您設定您的快取設定。</p>"
--"<p>此快取區域是在 Konqueror "
--"裡存放剛讀取過的網頁的內部記憶體。如果您要再次接收剛剛讀過的網頁，就不會從網際網路下載，而是從快取中接收，這將會快得多。</p>"
-+"<h1>Cache</h1><p>This module lets you configure your cache settings.</"
-+"p><p>The cache is an internal memory in Konqueror where recently read web "
-+"pages are stored. If you want to retrieve a web page again that you have "
-+"recently read, it will not be downloaded from the Internet, but rather "
-+"retrieved from the cache, which is a lot faster.</p>"
-+msgstr ""
-+"<h1>快取</h1><p>這個模組讓您設定您的快取設定。</p><p>此快取區域是在 "
-+"Konqueror 裡存放剛讀取過的網頁的內部記憶體。如果您要再次接收剛剛讀過的網頁，"
-+"就不會從網際網路下載，而是從快取中接收，這將會快得多。</p>"
- 
- #: kcookiesmain.cpp:32
- msgid ""
-@@ -62,28 +60,29 @@
- #: kcookiesmain.cpp:83
- msgid ""
- "<h1>Cookies</h1> Cookies contain information that Konqueror (or other KDE "
--"applications using the HTTP protocol) stores on your computer, initiated by a "
--"remote Internet server. This means that a web server can store information "
--"about you and your browsing activities on your machine for later use. You might "
--"consider this an invasion of privacy. "
--"<p> However, cookies are useful in certain situations. For example, they are "
--"often used by Internet shops, so you can 'put things into a shopping basket'. "
--"Some sites require you have a browser that supports cookies. "
--"<p> Because most people want a compromise between privacy and the benefits "
--"cookies offer, KDE offers you the ability to customize the way it handles "
--"cookies. So you might want to set KDE's default policy to ask you whenever a "
--"server wants to set a cookie, allowing you to decide. For your favorite "
--"shopping web sites that you trust, you might want to set the policy to accept, "
--"then you can access the web sites without being prompted every time KDE "
--"receives a cookie."
--msgstr ""
--"<h1>Cookies</h1>Cookies 包含了遠端伺服器要求 Konqueror (或其他使用 HTTP 協定的 KDE 程式) "
--"儲存在您電腦的資訊。這讓網頁伺服器可以在您的電腦儲存關於您的資訊與瀏覽動作以備後續使用。您可能會認為這侵犯您的隱私權。"
--"<p>然而，在某些狀況下 Cookies 是非常有用的。例如在網路購物時，您可以「把貨品放入您的購物車中」。有些站台要求您必須要有一個支援 Cookies "
--"的瀏覽器。"
--"<p>由於大多數的人希望在方便與隱私之間取得一個平衡點， KDE 提供您一個自訂的處理 Cookies 方式。您可能希望 KDE 在伺服器要求設定 "
--"Cookie 時，預設要先徵求您的同意，讓您有決定的機會，對於您偏好而且可信任的購物網站，您可以設定政策為接受 "
--"Cookie，如此您在使用該網站時不需要一直被詢問。"
-+"applications using the HTTP protocol) stores on your computer, initiated by "
-+"a remote Internet server. This means that a web server can store information "
-+"about you and your browsing activities on your machine for later use. You "
-+"might consider this an invasion of privacy. <p> However, cookies are useful "
-+"in certain situations. For example, they are often used by Internet shops, "
-+"so you can 'put things into a shopping basket'. Some sites require you have "
-+"a browser that supports cookies. <p> Because most people want a compromise "
-+"between privacy and the benefits cookies offer, KDE offers you the ability "
-+"to customize the way it handles cookies. So you might want to set KDE's "
-+"default policy to ask you whenever a server wants to set a cookie, allowing "
-+"you to decide. For your favorite shopping web sites that you trust, you "
-+"might want to set the policy to accept, then you can access the web sites "
-+"without being prompted every time KDE receives a cookie."
-+msgstr ""
-+"<h1>Cookies</h1>Cookies 包含了遠端伺服器要求 Konqueror (或其他使用 HTTP 協定"
-+"的 KDE 程式) 儲存在您電腦的資訊。這讓網頁伺服器可以在您的電腦儲存關於您的資訊"
-+"與瀏覽動作以備後續使用。您可能會認為這侵犯您的隱私權。<p>然而，在某些狀況下 "
-+"Cookies 是非常有用的。例如在網路購物時，您可以「把貨品放入您的購物車中」。有"
-+"些站臺要求您必須要有一個支援 Cookies 的瀏覽器。<p>由於大多數的人希望在方便與"
-+"隱私之間取得一個平衡點， KDE 提供您一個自訂的處理 Cookies 方式。您可能希望 "
-+"KDE 在伺服器要求設定 Cookie 時，預設要先徵求您的同意，讓您有決定的機會，對於"
-+"您偏好而且可信任的購物網站，您可以設定政策為接受 Cookie，如此您在使用該網站時"
-+"不需要一直被詢問。"
- 
- #: kcookiesmanagement.cpp:150 kcookiesmanagement.cpp:170
- msgid "DCOP Communication Error"
-@@ -124,9 +123,10 @@
- 
- #: kcookiespolicies.cpp:176
- msgid ""
--"<qt>A policy already exists for"
--"<center><b>%1</b></center>Do you want to replace it?</qt>"
--msgstr "<qt>關於<center><b>%1</b></center>的政策已經存在，您確定要覆蓋它嗎？</qt>"
-+"<qt>A policy already exists for<center><b>%1</b></center>Do you want to "
-+"replace it?</qt>"
-+msgstr ""
-+"<qt>關於<center><b>%1</b></center>的政策已經存在，您確定要覆蓋它嗎？</qt>"
- 
- #: kcookiespolicies.cpp:180
- msgid "Duplicate Policy"
-@@ -142,34 +142,38 @@
- 
- #: kcookiespolicies.cpp:449
- msgid ""
--"<h1>Cookies</h1> Cookies contain information that Konqueror (or any other KDE "
--"application using the HTTP protocol) stores on your computer from a remote "
--"Internet server. This means that a web server can store information about you "
--"and your browsing activities on your machine for later use. You might consider "
--"this an invasion of privacy."
--"<p>However, cookies are useful in certain situations. For example, they are "
--"often used by Internet shops, so you can 'put things into a shopping basket'. "
--"Some sites require you have a browser that supports cookies."
--"<p>Because most people want a compromise between privacy and the benefits "
--"cookies offer, KDE offers you the ability to customize the way it handles "
--"cookies. You might, for example want to set KDE's default policy to ask you "
--"whenever a server wants to set a cookie or simply reject or accept everything. "
--"For example, you might choose to accept all cookies from your favorite shopping "
--"web site. For this all you have to do is either browse to that particular site "
--"and when you are presented with the cookie dialog box, click on <i> "
--"This domain </i> under the 'apply to' tab and choose accept or simply specify "
--"the name of the site in the <i> Domain Specific Policy </i> "
--"tab and set it to accept. This enables you to receive cookies from trusted web "
--"sites without being asked every time KDE receives a cookie."
--msgstr ""
--"<h1>Cookies</h1>Cookies 包含了遠端伺服器要求 Konqueror (或其他使用 HTTP 拹定的 KDE 程式) "
--"儲存在您電腦的資訊。這讓網頁伺服器可以在您的電腦儲存關於您的資訊與瀏覽動作以備後續使用。您可能會認為這侵犯您的隱私權。"
--"<p>然而，在某些狀況下 Cookies 是非常有用的。例如在網路購物時，您可以「把貨品放入您的購物車中」。有些站台要求您必須要有一個支援 Cookies "
--"的瀏覽器。"
--"<p>由於大多數的人希望在方便與隱私之間取得一個平衡點，KDE 提供您一個自訂的處理 Cookies 方式。例如您可能想要設定 KDE "
--"的預設政策為每次有伺服器要設定cookie 或單純地拒絕或接受任何事都要詢問您。您也可能選擇接受所有來自您喜愛的購物網站的 cookies "
--"。要做這些事您可以瀏覽該特定網站，在出現 cookie 對話方塊時單擊「套用到」標籤下的<i>此網域</i>並選擇接受，或者也可以在<i>特定網域政策</i>"
--"標籤中指定網站的名稱並設定為接受。這樣使您可以接收來自信任網站的 cookies 而不會在每次 KDE 收到 cookie 的時候都來問您。"
-+"<h1>Cookies</h1> Cookies contain information that Konqueror (or any other "
-+"KDE application using the HTTP protocol) stores on your computer from a "
-+"remote Internet server. This means that a web server can store information "
-+"about you and your browsing activities on your machine for later use. You "
-+"might consider this an invasion of privacy.<p>However, cookies are useful in "
-+"certain situations. For example, they are often used by Internet shops, so "
-+"you can 'put things into a shopping basket'. Some sites require you have a "
-+"browser that supports cookies.<p>Because most people want a compromise "
-+"between privacy and the benefits cookies offer, KDE offers you the ability "
-+"to customize the way it handles cookies. You might, for example want to set "
-+"KDE's default policy to ask you whenever a server wants to set a cookie or "
-+"simply reject or accept everything. For example, you might choose to accept "
-+"all cookies from your favorite shopping web site. For this all you have to "
-+"do is either browse to that particular site and when you are presented with "
-+"the cookie dialog box, click on <i> This domain </i> under the 'apply to' "
-+"tab and choose accept or simply specify the name of the site in the <i> "
-+"Domain Specific Policy </i> tab and set it to accept. This enables you to "
-+"receive cookies from trusted web sites without being asked every time KDE "
-+"receives a cookie."
-+msgstr ""
-+"<h1>Cookies</h1>Cookies 包含了遠端伺服器要求 Konqueror (或其他使用 HTTP 拹定"
-+"的 KDE 程式) 儲存在您電腦的資訊。這讓網頁伺服器可以在您的電腦儲存關於您的資訊"
-+"與瀏覽動作以備後續使用。您可能會認為這侵犯您的隱私權。<p>然而，在某些狀況下 "
-+"Cookies 是非常有用的。例如在網路購物時，您可以「把貨品放入您的購物車中」。有"
-+"些站臺要求您必須要有一個支援 Cookies 的瀏覽器。<p>由於大多數的人希望在方便與"
-+"隱私之間取得一個平衡點，KDE 提供您一個自訂的處理 Cookies 方式。例如您可能想要"
-+"設定 KDE 的預設政策為每次有伺服器要設定cookie 或單純地拒絕或接受任何事都要詢"
-+"問您。您也可能選擇接受所有來自您喜愛的購物網站的 cookies 。要做這些事您可以瀏"
-+"覽該特定網站，在出現 cookie 對話方塊時單擊「套用到」標籤下的<i>此網域</i>並選"
-+"擇接受，或者也可以在<i>特定網域政策</i>標籤中指定網站的名稱並設定為接受。這樣"
-+"使您可以接收來自信任網站的 cookies 而不會在每次 KDE 收到 cookie 的時候都來問"
-+"您。"
- 
- #: kenvvarproxydlg.cpp:70
- msgid "Variable Proxy Configuration"
-@@ -181,15 +185,15 @@
- 
- #: kenvvarproxydlg.cpp:139 kenvvarproxydlg.cpp:288
- msgid ""
--"<qt>Make sure you entered the actual environment variable name rather than its "
--"value. For example, if the environment variable is "
--"<br><b>HTTP_PROXY=http://localhost:3128</b>"
--"<br> you need to enter <b>HTTP_PROXY</b> here instead of the actual value "
--"http://localhost:3128.</qt>"
-+"<qt>Make sure you entered the actual environment variable name rather than "
-+"its value. For example, if the environment variable is "
-+"<br><b>HTTP_PROXY=http://localhost:3128</b><br> you need to enter "
-+"<b>HTTP_PROXY</b> here instead of the actual value http://localhost:3128.</"
-+"qt>"
- msgstr ""
- "<qt>請確定您輸入的是真實的環境變數名稱而非它的數值。例如環境變數為"
--"<br><b>HTTP_PROXY=http://localhost:3128</b>"
--"<br>則您需要在此輸入<b>HTTP_PROXY</b>而不是此變數的實際數值 http://localhost:3128。</qt>"
-+"<br><b>HTTP_PROXY=http://localhost:3128</b><br>則您需要在此輸入"
-+"<b>HTTP_PROXY</b>而不是此變數的實際數值 http://localhost:3128。</qt>"
- 
- #: kenvvarproxydlg.cpp:147 kenvvarproxydlg.cpp:296 kproxydlg.cpp:372
- msgid "Invalid Proxy Setup"
-@@ -205,16 +209,19 @@
- 
- #: kenvvarproxydlg.cpp:179
- msgid ""
--"Did not detect any environment variables commonly used to set system wide proxy "
--"information."
-+"Did not detect any environment variables commonly used to set system wide "
-+"proxy information."
- msgstr "無法找到任何常用於設定系統代理伺服器資訊的環境變數。"
- 
- #: kenvvarproxydlg.cpp:183
- msgid ""
--"<qt>To learn about the variable names the automatic detection process searches "
--"for, press OK, click on the quick help button on the window title bar of the "
--"previous dialog and then click on the \"<b>Auto Detect</b>\" button.</qt>"
--msgstr "<qt>如果想要知道自動偵測之參數名稱，請按定，單擊前一個對話盒視窗標題列的快速說明按鈕，接著單擊「自動偵測」按鈕。</qt>"
-+"<qt>To learn about the variable names the automatic detection process "
-+"searches for, press OK, click on the quick help button on the window title "
-+"bar of the previous dialog and then click on the \"<b>Auto Detect</b>\" "
-+"button.</qt>"
-+msgstr ""
-+"<qt>如果想要知道自動偵測之參數名稱，請按定，單擊前一個對話盒視窗標題列的快速"
-+"說明按鈕，接著單擊「自動偵測」按鈕。</qt>"
- 
- #: kenvvarproxydlg.cpp:191
- msgid "Automatic Proxy Variable Detection"
-@@ -230,8 +237,8 @@
- 
- #: kmanualproxydlg.cpp:272
- msgid ""
--"One or more of the specified proxy settings are invalid. The incorrect entries "
--"are highlighted."
-+"One or more of the specified proxy settings are invalid. The incorrect "
-+"entries are highlighted."
- msgstr "一或多個指定的代理伺服器程式設定值無效。錯誤的項目已經標示出來。"
- 
- #: kmanualproxydlg.cpp:343
-@@ -266,20 +273,16 @@
- msgid ""
- "<qt>Make sure none of the addresses or URLs you specified contain invalid or "
- "wildcard characters such as spaces, asterisks (*), or question marks(?)."
--"<p><u>Examples of VALID entries:</u>"
--"<br/><code>http://mycompany.com, 192.168.10.1, mycompany.com, localhost, "
--"http://localhost</code>"
--"<p><u>Examples of INVALID entries:</u>"
--"<br/><code>http://my company.com, http:/mycompany,com file:/localhost</code>"
--"</qt>"
--msgstr ""
--"<qt>請確定您所指定的位址或網址沒有包含無效或萬用字元如空白、星號(*)或問號(?)。"
--"<p><u>有效的項目範例：</u>"
--"<br/><code>http://mycompany.com, 192.168.10.1, mycompany.com, localhost, "
--"http://localhost</code>"
--"<p><u>無效的項目範例：</u>"
--"<br/><code>http://my company.com, http:/mycompany,com file:/localhost</code>"
--"</qt>"
-+"<p><u>Examples of VALID entries:</u><br/><code>http://mycompany.com, "
-+"192.168.10.1, mycompany.com, localhost, http://localhost</"
-+"code><p><u>Examples of INVALID entries:</u><br/><code>http://my company.com, "
-+"http:/mycompany,com file:/localhost</code></qt>"
-+msgstr ""
-+"<qt>請確定您所指定的位址或網址沒有包含無效或萬用字元如空白、星號(*)或問號"
-+"(?)。<p><u>有效的項目範例：</u><br/><code>http://mycompany.com, "
-+"192.168.10.1, mycompany.com, localhost, http://localhost</code><p><u>無效的項"
-+"目範例：</u><br/><code>http://my company.com, http:/mycompany,com file:/"
-+"localhost</code></qt>"
- 
- #: kmanualproxydlg.cpp:468
- msgid "Enter the URL or address that should use the above proxy settings:"
-@@ -293,16 +296,15 @@
- 
- #: kmanualproxydlg.cpp:474
- msgid ""
--"<qt>Enter a valid address or url."
--"<p><b><u>NOTE:</u></b> Wildcard matching such as <code>*.kde.org</code> "
--"is not supported. If you want to match any host in the <code>.kde.org</code> "
--"domain, e.g. <code>printing.kde.org</code>, then simply enter <code>"
--".kde.org</code></qt>"
--msgstr ""
--"<qt>輸入有效的位址或網址。"
--"<p><b><u>注意：</u></b>萬用字元例如 <code>*.kde.org</code> 是不支援的。如果您想要使用任何符合 <code>"
--".kde.org</code> 網域的主機，如 <code>printing.kde.org</code>，只要輸入 <code>.kde.org</code> "
--"即可</qt>"
-+"<qt>Enter a valid address or url.<p><b><u>NOTE:</u></b> Wildcard matching "
-+"such as <code>*.kde.org</code> is not supported. If you want to match any "
-+"host in the <code>.kde.org</code> domain, e.g. <code>printing.kde.org</"
-+"code>, then simply enter <code>.kde.org</code></qt>"
-+msgstr ""
-+"<qt>輸入有效的位址或網址。<p><b><u>注意：</u></b>萬用字元例如 <code>*.kde."
-+"org</code> 是不支援的。如果您想要使用任何符合 <code>.kde.org</code> 網域的主"
-+"機，如 <code>printing.kde.org</code>，只要輸入 <code>.kde.org</code> 即可</"
-+"qt>"
- 
- #: kproxydlg.cpp:54
- msgid "&Proxy"
-@@ -317,34 +319,34 @@
- "The address of the automatic proxy configuration script is invalid. Please "
- "correct this problem before proceeding. Otherwise, your changes you will be "
- "ignored."
--msgstr "自動代理伺服器設定命令稿的位址是無效的。請修正後再執行。否則將忽略您的所做的變更。"
-+msgstr ""
-+"自動代理伺服器設定命令稿的位址是無效的。請修正後再執行。否則將忽略您的所做的"
-+"變更。"
- 
- #: kproxydlg.cpp:348
- msgid ""
--"<h1>Proxy</h1>"
--"<p>A proxy server is an intermediate program that sits between your machine and "
--"the Internet and provides services such as web page caching and/or "
--"filtering.</p>"
--"<p>Caching proxy servers give you faster access to sites you have already "
--"visited by locally storing or caching the content of those pages; filtering "
--"proxy servers, on the other hand, provide the ability to block out requests for "
--"ads, spam, or anything else you want to block.</p>"
--"<p><u>Note:</u> Some proxy servers provide both services.</p>"
--msgstr ""
--"<h1>代理伺服器</h1>"
--"<p>代理伺服器是位於您的電腦和網際網路的中介程式，提供網頁快取和/或過濾的服務。</p>"
--"<p>快取式代理伺服器會將您曾經參訪過的網站內容儲存起來，以加速加速網際網路資料讀取速度；過濾式快取伺服器，則提供阻擋廣告、垃圾以及其他任何你想要阻擋的東西的能"
--"力。</p>"
--"<p><u>注意：</u>有些代理伺服器同時提供這兩種服務。</p>"
-+"<h1>Proxy</h1><p>A proxy server is an intermediate program that sits between "
-+"your machine and the Internet and provides services such as web page caching "
-+"and/or filtering.</p><p>Caching proxy servers give you faster access to "
-+"sites you have already visited by locally storing or caching the content of "
-+"those pages; filtering proxy servers, on the other hand, provide the ability "
-+"to block out requests for ads, spam, or anything else you want to block.</"
-+"p><p><u>Note:</u> Some proxy servers provide both services.</p>"
-+msgstr ""
-+"<h1>代理伺服器</h1><p>代理伺服器是位於您的電腦和網際網路的中介程式，提供網頁"
-+"快取和/或過濾的服務。</p><p>快取式代理伺服器會將您曾經參訪過的網站內容儲存起"
-+"來，以加速加速網際網路資料讀取速度；過濾式快取伺服器，則提供阻擋廣告、垃圾以"
-+"及其他任何你想要阻擋的東西的能力。</p><p><u>注意：</u>有些代理伺服器同時提供"
-+"這兩種服務。</p>"
- 
- #: kproxydlg.cpp:367
- msgid ""
--"<qt>The proxy settings you specified are invalid."
--"<p>Please click on the <b>Setup...</b> button and correct the problem before "
--"proceeding; otherwise your changes will be ignored.</qt>"
-+"<qt>The proxy settings you specified are invalid.<p>Please click on the "
-+"<b>Setup...</b> button and correct the problem before proceeding; otherwise "
-+"your changes will be ignored.</qt>"
- msgstr ""
--"<qt>您所指定的代理伺服器資訊設定無效。"
--"<p>請單擊<em>設定...</em>按鈕以便在處理前修正這個問題；否則將忽略您的所做的變更。</qt>"
-+"<qt>您所指定的代理伺服器資訊設定無效。<p>請單擊<em>設定...</em>按鈕以便在處理"
-+"前修正這個問題；否則將忽略您的所做的變更。</qt>"
- 
- #: ksaveioconfig.cpp:239 ksaveioconfig.cpp:253
- msgid "Update Failed"
-@@ -352,7 +354,8 @@
- 
- #: ksaveioconfig.cpp:240
- msgid ""
--"You have to restart the running applications for these changes to take effect."
-+"You have to restart the running applications for these changes to take "
-+"effect."
- msgstr "您必須重新啟動執行中的程式才能讓這些改變生效。"
- 
- #: ksaveioconfig.cpp:254
-@@ -361,35 +364,29 @@
- 
- #: main.cpp:85
- msgid ""
--"<h1>Local Network Browsing</h1>Here you setup your <b>"
--"\"Network Neighborhood\"</b>. You can use either the LISa daemon and the lan:/ "
--"ioslave, or the ResLISa daemon and the rlan:/ ioslave."
--"<br>"
--"<br>About the <b>LAN ioslave</b> configuration:"
--"<br> If you select it, the ioslave, <i>if available</i>"
--", will check whether the host supports this service when you open this host. "
--"Please note that paranoid people might consider even this to be an attack."
-+"<h1>Local Network Browsing</h1>Here you setup your <b>\"Network Neighborhood"
-+"\"</b>. You can use either the LISa daemon and the lan:/ ioslave, or the "
-+"ResLISa daemon and the rlan:/ ioslave.<br><br>About the <b>LAN ioslave</b> "
-+"configuration:<br> If you select it, the ioslave, <i>if available</i>, will "
-+"check whether the host supports this service when you open this host. Please "
-+"note that paranoid people might consider even this to be an attack."
- "<br><i>Always</i> means that you will always see the links for the services, "
- "regardless of whether they are actually offered by the host. <i>Never</i> "
- "means that you will never have the links to the services. In both cases you "
- "will not contact the host, so nobody will ever regard you as an attacker."
--"<br>"
--"<br>More information about <b>LISa</b> can be found at <a "
--"href=\"http://lisa-home.sourceforge.net\">the LISa Homepage</a> "
--"or contact Alexander Neundorf &lt;<a href=\"mailto:neundorf@kde.org\">"
--"neundorf@kde.org</a>&gt;."
--msgstr ""
--"<h1>本地網路瀏覽</h1>您在此設定您的<b>「網路芳鄰」</b>。您可以使用 LISa 伺服程式與 lan:/ ioslave ，或 ResLISa "
--"伺服程式與 rlan:/ ioslave 。"
--"<br>"
--"<br>關於<b>LAN ioslave</b>設定："
--"<br>如果您選擇它，當 ioslave <i>可用時</i>會在您開啟主機時檢查該主機是否支援此服務。請注意多疑的人們甚至可能認為這是一種攻擊。"
--"<br><i>總是</i>代表您會一直看到該服務的連結，不管它們是否真的是由該主機所提供。<i>永遠不</i>"
--"代表您不會有該服務的連結。在這兩種情形您將不會連接到主機，因此沒有人會認為您是攻擊者。"
--"<br>"
--"<br>更多關於<b>LISa</b>的資訊可以在<a href=\"http://lisa-home.sourceforge.net\">"
--"LISa 首頁</a>找到，或者連絡 Alexander Neundorf &lt;<a href=\"mailto:neundorf@kde.org\">"
--"neundorf@kde.org</a>&gt;。"
-+"<br><br>More information about <b>LISa</b> can be found at <a href=\"http://"
-+"lisa-home.sourceforge.net\">the LISa Homepage</a> or contact Alexander "
-+"Neundorf &lt;<a href=\"mailto:neundorf@kde.org\">neundorf@kde.org</a>&gt;."
-+msgstr ""
-+"<h1>本地網路瀏覽</h1>您在此設定您的<b>「網路芳鄰」</b>。您可以使用 LISa 伺服"
-+"程式與 lan:/ ioslave ，或 ResLISa 伺服程式與 rlan:/ ioslave 。<br><br>關於"
-+"<b>LAN ioslave</b>設定：<br>如果您選擇它，當 ioslave <i>可用時</i>會在您開啟"
-+"主機時檢查該主機是否支援此服務。請注意多疑的人們甚至可能認為這是一種攻擊。"
-+"<br><i>總是</i>代表您會一直看到該服務的連結，不管它們是否真的是由該主機所提"
-+"供。<i>永遠不</i>代表您不會有該服務的連結。在這兩種情形您將不會連接到主機，因"
-+"此沒有人會認為您是攻擊者。<br><br>更多關於<b>LISa</b>的資訊可以在<a href="
-+"\"http://lisa-home.sourceforge.net\">LISa 首頁</a>找到，或者連絡 Alexander "
-+"Neundorf &lt;<a href=\"mailto:neundorf@kde.org\">neundorf@kde.org</a>&gt;。"
- 
- #: main.cpp:105
- msgid "&Windows Shares"
-@@ -411,7 +408,9 @@
- msgid ""
- "Here you can set timeout values. You might want to tweak them if your "
- "connection is very slow. The maximum allowed value is %1 seconds."
--msgstr "您可以在此設定逾時時間。當連線速度很慢時，您可能會想調整它。 最大的允許值是 %1 秒。"
-+msgstr ""
-+"您可以在此設定逾時時間。當連線速度很慢時，您可能會想調整它。 最大的允許值是 %"
-+"1 秒。"
- 
- #: netpref.cpp:30 netpref.cpp:37 netpref.cpp:44 netpref.cpp:51
- msgid " sec"
-@@ -453,19 +452,22 @@
- 
- #: netpref.cpp:60
- msgid ""
--"<p>Marks partially uploaded FTP files.</p>"
--"<p>When this option is enabled, partially uploaded files will have a \".part\" "
--"extension. This extension will be removed once the transfer is complete.</p>"
-+"<p>Marks partially uploaded FTP files.</p><p>When this option is enabled, "
-+"partially uploaded files will have a \".part\" extension. This extension "
-+"will be removed once the transfer is complete.</p>"
- msgstr ""
--"<p>標記已經部分上傳的 FTP 檔案。</p>"
--"<p>當此啟用選項時，只上傳部分的檔案會加上「.part」的延伸檔名。這個延伸檔名會在傳輸全部完成後移除。</p>"
-+"<p>標記已經部分上傳的 FTP 檔案。</p><p>當此啟用選項時，只上傳部分的檔案會加上"
-+"「.part」的延伸檔名。這個延伸檔名會在傳輸全部完成後移除。</p>"
- 
- #: netpref.cpp:131
- msgid ""
- "<h1>Network Preferences</h1>Here you can define the behavior of KDE programs "
--"when using Internet and network connections. If you experience timeouts or use "
--"a modem to connect to the Internet, you might want to adjust these settings."
--msgstr "<h1>網路設定</h1>您可以在這裡設定KDE程式使用網際網路及區域網路的行為。若您有逾時問題或使用數據機，您或許會想調整這些設定。"
-+"when using Internet and network connections. If you experience timeouts or "
-+"use a modem to connect to the Internet, you might want to adjust these "
-+"settings."
-+msgstr ""
-+"<h1>網路設定</h1>您可以在這裡設定KDE程式使用網際網路及區域網路的行為。若您有"
-+"逾時問題或使用數據機，您或許會想調整這些設定。"
- 
- #. i18n: file cache_ui.ui line 47
- #: rc.cpp:3
-@@ -497,11 +499,12 @@
- msgid ""
- "Check this box if you want the web pages you visit to be stored on your hard "
- "disk for quicker access. The stored pages will only be updated as needed "
--"instead of on every visit to that site. This is especially useful if you have a "
--"slow connection to the Internet."
-+"instead of on every visit to that site. This is especially useful if you "
-+"have a slow connection to the Internet."
- msgstr ""
--"如果您希望瀏覽過的資料能夠儲存在硬碟上，以便於能快速存取，您可以核取這個方塊。儲存的網頁只有在必要時才會下載而非在你每次參訪該網站時。如果您的網路連線速度很慢，"
--"此功能將會特別有用。"
-+"如果您希望瀏覽過的資料能夠儲存在硬碟上，以便於能快速存取，您可以核取這個方"
-+"塊。儲存的網頁只有在必要時才會下載而非在你每次參訪該網站時。如果您的網路連線"
-+"速度很慢，此功能將會特別有用。"
- 
- #. i18n: file cache_ui.ui line 117
- #: rc.cpp:18 rc.cpp:246
-@@ -519,8 +522,8 @@
- #: rc.cpp:24
- #, no-c-format
- msgid ""
--"Verify whether the cached web page is valid before attempting to fetch the web "
--"page again."
-+"Verify whether the cached web page is valid before attempting to fetch the "
-+"web page again."
- msgstr "直到要把一個網頁抓回來時，才確認快取的網頁是否還有效。"
- 
- #. i18n: file cache_ui.ui line 139
-@@ -535,7 +538,9 @@
- msgid ""
- "Always use documents from the cache when available. You can still use the "
- "reload button to synchronize the cache with the remote host."
--msgstr "在可能的情形下永遠使用快取中的文件。您仍然可以使用重新整理按鈕來讓快取與遠端主機保持同步。"
-+msgstr ""
-+"在可能的情形下永遠使用快取中的文件。您仍然可以使用重新整理按鈕來讓快取與遠端"
-+"主機保持同步。"
- 
- #. i18n: file cache_ui.ui line 150
- #: rc.cpp:33
-@@ -547,25 +552,25 @@
- #: rc.cpp:36
- #, no-c-format
- msgid ""
--"Do not fetch web pages that are not already stored in the cache. Offline mode "
--"prevents you from viewing pages that you have not previously visited."
--msgstr "既使網頁不在快取資料中，也不抓取。離線模式會使你只能瀏覽之前看過的網頁。"
-+"Do not fetch web pages that are not already stored in the cache. Offline "
-+"mode prevents you from viewing pages that you have not previously visited."
-+msgstr ""
-+"既使網頁不在快取資料中，也不抓取。離線模式會使你只能瀏覽之前看過的網頁。"
- 
- #. i18n: file envvarproxy_ui.ui line 30
- #: rc.cpp:39 rc.cpp:54
- #, no-c-format
- msgid ""
- "<qt>\n"
--"Enter the name of the environment variable, e.g. <b>FTP_PROXY</b>"
--", used to store the address of the FTP proxy server."
--"<p>\n"
--"Alternatively, you can click on the <b>\"Auto Detect\"</b> "
--"button to attempt an automatic discovery of this variable.\n"
-+"Enter the name of the environment variable, e.g. <b>FTP_PROXY</b>, used to "
-+"store the address of the FTP proxy server.<p>\n"
-+"Alternatively, you can click on the <b>\"Auto Detect\"</b> button to attempt "
-+"an automatic discovery of this variable.\n"
- "</qt>"
- msgstr ""
- "<qt>\n"
--"請輸入環境變數名稱，例如 <tt>FTP_PROXY</tt>，這是用來儲存 FTP 代理伺服器的位址。"
--"<p>\n"
-+"請輸入環境變數名稱，例如 <tt>FTP_PROXY</tt>，這是用來儲存 FTP 代理伺服器的位"
-+"址。<p>\n"
- "或者，您也可以單擊 <b>「自動偵測」</b> 按鈕試著自動取得此變數。\n"
- "</qt>"
- 
-@@ -574,16 +579,15 @@
- #, no-c-format
- msgid ""
- "<qt>\n"
--"Enter the name of the environment variable, e.g. <b>HTTP_PROXY</b>"
--", used to store the address of the HTTP proxy server."
--"<p>\n"
--"Alternatively, you can click on the <b>\"Auto Detect\"</b> "
--"button to attempt automatic discovery of this variable.\n"
-+"Enter the name of the environment variable, e.g. <b>HTTP_PROXY</b>, used to "
-+"store the address of the HTTP proxy server.<p>\n"
-+"Alternatively, you can click on the <b>\"Auto Detect\"</b> button to attempt "
-+"automatic discovery of this variable.\n"
- "</qt>"
- msgstr ""
- "<qt>\n"
--"請輸入環境變數名稱，例如 <tt>HTTP_PROXY</tt>，這是用來儲存 HTTP 代理伺服器的位址。"
--"<p>\n"
-+"請輸入環境變數名稱，例如 <tt>HTTP_PROXY</tt>，這是用來儲存 HTTP 代理伺服器的"
-+"位址。<p>\n"
- "或者，您也可以單擊 <b>「自動偵測」</b> 按鈕試著自動取得此變數。\n"
- "</qt>"
- 
-@@ -604,16 +608,15 @@
- #, no-c-format
- msgid ""
- "<qt>\n"
--"Enter the name of the environment variable, e.g. <b>HTTPS_PROXY</b>"
--", used to store the address of the HTTPS proxy server."
--"<p>\n"
--"Alternatively, you can click on the <b>\"Auto Detect\"</b> "
--"button to attempt an automatic discovery of this variable.\n"
-+"Enter the name of the environment variable, e.g. <b>HTTPS_PROXY</b>, used to "
-+"store the address of the HTTPS proxy server.<p>\n"
-+"Alternatively, you can click on the <b>\"Auto Detect\"</b> button to attempt "
-+"an automatic discovery of this variable.\n"
- "</qt>"
- msgstr ""
- "<qt>\n"
--"請輸入環境變數名稱，例如 <tt>HTTPS_PROXY</tt>，這是用來儲存 HTTPS 代理伺服器的位址。"
--"<p>\n"
-+"請輸入環境變數名稱，例如 <tt>HTTPS_PROXY</tt>，這是用來儲存 HTTPS 代理伺服器"
-+"的位址。<p>\n"
- "或者，您也可以單擊 <b>「自動偵測」</b> 按鈕試著自動取得此變數。\n"
- "</qt>"
- 
-@@ -634,9 +637,11 @@
- #, no-c-format
- msgid ""
- "<qt>Verify whether or not the environment variable names you supplied are "
--"valid. If an environment variable is not found, the associated labels will be "
--"<b>highlighted</b> to indicate that they are invalid.</qt>"
--msgstr "<qt>單擊此按鈕以快速檢查您提供的環境變數名稱是否正確。如果找不到環境變數，相關的標籤會以<b>反白</b>來指出不正確的設定。</qt>"
-+"valid. If an environment variable is not found, the associated labels will "
-+"be <b>highlighted</b> to indicate that they are invalid.</qt>"
-+msgstr ""
-+"<qt>單擊此按鈕以快速檢查您提供的環境變數名稱是否正確。如果找不到環境變數，相"
-+"關的標籤會以<b>反白</b>來指出不正確的設定。</qt>"
- 
- #. i18n: file envvarproxy_ui.ui line 102
- #: rc.cpp:78
-@@ -648,13 +653,13 @@
- #: rc.cpp:81
- #, no-c-format
- msgid ""
--"<qt>Attempt automatic discovery of the environment variables used for setting "
--"system wide proxy information."
--"<p> This feature works by searching for commonly used variable names such as "
--"HTTP_PROXY, FTP_PROXY and NO_PROXY.</qt>"
-+"<qt>Attempt automatic discovery of the environment variables used for "
-+"setting system wide proxy information.<p> This feature works by searching "
-+"for commonly used variable names such as HTTP_PROXY, FTP_PROXY and NO_PROXY."
-+"</qt>"
- msgstr ""
--"<qt>自動尋找系統中可能是用來設定 proxy 的環境變數。"
--"<p>尋找方法是搜尋一些可能的變數名稱，像是 HTTP_PROXY, FTP_PROXY 和 NO_PROXY.</qt>"
-+"<qt>自動尋找系統中可能是用來設定 proxy 的環境變數。<p>尋找方法是搜尋一些可能"
-+"的變數名稱，像是 HTTP_PROXY, FTP_PROXY 和 NO_PROXY.</qt>"
- 
- #. i18n: file envvarproxy_ui.ui line 113
- #: rc.cpp:84 rc.cpp:381
-@@ -667,17 +672,15 @@
- #, no-c-format
- msgid ""
- "<qt>\n"
--"Enter the environment variable, e.g. <b>NO_PROXY</b>"
--", used to store the addresses of sites for which the proxy server should not be "
--"used."
--"<p>\n"
--"Alternatively, you can click on the <b>\"Auto Detect\"</b> "
--"button to attempt an automatic discovery of this variable.\n"
-+"Enter the environment variable, e.g. <b>NO_PROXY</b>, used to store the "
-+"addresses of sites for which the proxy server should not be used.<p>\n"
-+"Alternatively, you can click on the <b>\"Auto Detect\"</b> button to attempt "
-+"an automatic discovery of this variable.\n"
- "</qt>"
- msgstr ""
- "<qt>\n"
--"請輸入環境變數名稱，例如 <tt>FTP_PROXY</tt>，這是用來儲存 FTP 代理伺服器的位址。"
--"<p>\n"
-+"請輸入環境變數名稱，例如 <tt>FTP_PROXY</tt>，這是用來儲存 FTP 代理伺服器的位"
-+"址。<p>\n"
- "或者，您也可以單擊 <b>「自動偵測」</b> 按鈕試著自動取得此變數。\n"
- "</qt>"
- 
-@@ -715,7 +718,7 @@
- #: rc.cpp:126
- #, no-c-format
- msgid "Change &Policy..."
--msgstr "變更政策(&P)..."
-+msgstr "變更政策(&P)…"
- 
- #. i18n: file kcookiesmanagementdlg_ui.ui line 109
- #: rc.cpp:129
-@@ -727,7 +730,7 @@
- #: rc.cpp:132 rc.cpp:254
- #, no-c-format
- msgid "..."
--msgstr "..."
-+msgstr "…"
- 
- #. i18n: file kcookiesmanagementdlg_ui.ui line 147
- #: rc.cpp:135 rc.cpp:257
-@@ -801,15 +804,14 @@
- msgid ""
- "<qt>\n"
- "Enable cookie support. Normally you will want to have cookie support enabled "
--"and customize it to suit your privacy needs."
--"<p>\n"
-+"and customize it to suit your privacy needs.<p>\n"
- "Please note that disabling cookie support might make many web sites "
- "unbrowsable.\n"
- "</qt>"
- msgstr ""
- "<qt>\n"
--"這個選項將啟動 cookie 支援。一般您會希望啟用 cookie 支援並調整 它以符合您的隱私需求。"
--"<p>\n"
-+"這個選項將啟動 cookie 支援。一般您會希望啟用 cookie 支援並調整 它以符合您的隱"
-+"私需求。<p>\n"
- "請注意停用 cookie 支援可能造成許多網站無法瀏覽。\n"
- "</qt>"
- 
-@@ -824,18 +826,19 @@
- #, no-c-format
- msgid ""
- "<qt>\n"
--"Reject the so called third-party cookies. These are cookies that originate from "
--"a site other than the one you are currently browsing. For example, if you visit "
--"<b>www.foobar.com</b> while this option is on, only cookies that originate from "
--"www.foobar.com will be processed per your settings. Cookies from any other site "
--"will be rejected. This reduces the chances of site operators compiling a "
--"profile about your daily browsing habits.\n"
-+"Reject the so called third-party cookies. These are cookies that originate "
-+"from a site other than the one you are currently browsing. For example, if "
-+"you visit <b>www.foobar.com</b> while this option is on, only cookies that "
-+"originate from www.foobar.com will be processed per your settings. Cookies "
-+"from any other site will be rejected. This reduces the chances of site "
-+"operators compiling a profile about your daily browsing habits.\n"
- "</qt>"
- msgstr ""
- "<qt>\n"
--"拒絕所謂的第三方 cookies。這些 cookies 是由您正在瀏覽的網站以外的網站所產生的。比方說當您參觀 <b>www.foobar.com</b> "
--"時選取了這個選項，只有來自 www.foobar.com 的 cookies 才會被處理。所有其他的 cookies "
--"會被自動拒絕。這減少了網站管理者收集您每日瀏覽習慣的機會。\n"
-+"拒絕所謂的第三方 cookies。這些 cookies 是由您正在瀏覽的網站以外的網站所產生"
-+"的。比方說當您參觀 <b>www.foobar.com</b> 時選取了這個選項，只有來自 www."
-+"foobar.com 的 cookies 才會被處理。所有其他的 cookies 會被自動拒絕。這減少了網"
-+"站管理者收集您每日瀏覽習慣的機會。\n"
- "</qt>"
- 
- #. i18n: file kcookiespoliciesdlg_ui.ui line 62
-@@ -850,10 +853,9 @@
- msgid ""
- "<qt>\n"
- "Automatically accept temporary cookies meant to expire at the end of the "
--"current session. Such cookies will not be stored in your computer's hard drive "
--"or storage device. Instead, they are deleted when you close all applications "
--"(e.g. your browser) that use them."
--"<p>\n"
-+"current session. Such cookies will not be stored in your computer's hard "
-+"drive or storage device. Instead, they are deleted when you close all "
-+"applications (e.g. your browser) that use them.<p>\n"
- "<u>NOTE:</u> Checking this option along with the next one will override your "
- "default as well as site specific cookie policies. However, doing so also "
- "increases your privacy since all cookies will be removed when the current "
-@@ -861,11 +863,11 @@
- "</qt>"
- msgstr ""
- "<qt>\n"
--"自動接收暫存 cookies 代表它輔導報導們會在目前的工作階段結束時過期。。這類 cookies "
--"不會儲存在您電腦的硬碟或儲存裝置裡。因為當您關閉所有使用它們的應用程式（例如您的瀏覽器）時，它們就被刪除了。"
--"<p>\n"
--"<u>注意：</u>選取此選項連帶地會覆蓋您的特定網站 cookie 政策。然而，這麼做會增進您的隱私，因為所有的 cookies "
--"會在目前工作階段結束時移除。\n"
-+"自動接收暫存 cookies 代表它輔導報導們會在目前的工作階段結束時過期。。這類 "
-+"cookies 不會儲存在您電腦的硬碟或儲存裝置裡。因為當您關閉所有使用它們的應用程"
-+"式（例如您的瀏覽器）時，它們就被刪除了。<p>\n"
-+"<u>注意：</u>選取此選項連帶地會覆蓋您的特定網站 cookie 政策。然而，這麼做會增"
-+"進您的隱私，因為所有的 cookies 會在目前工作階段結束時移除。\n"
- "</qt>"
- 
- #. i18n: file kcookiespoliciesdlg_ui.ui line 76
-@@ -879,24 +881,24 @@
- #, no-c-format
- msgid ""
- "<qt>\n"
--"Treat all cookies as session cookies. Session cookies are small pieces of data "
--"that are temporarily stored in your computer's memory until you quit or close "
--"all applications (e.g. your browser) that use them. Unlike regular cookies, "
--"session cookies are never stored on your hard drive or other storage medium."
--"<p>\n"
-+"Treat all cookies as session cookies. Session cookies are small pieces of "
-+"data that are temporarily stored in your computer's memory until you quit or "
-+"close all applications (e.g. your browser) that use them. Unlike regular "
-+"cookies, session cookies are never stored on your hard drive or other "
-+"storage medium.<p>\n"
- "<u>NOTE:</u> Checking this option along with the previous one will override "
--"your default as well as site specific cookie policies. However, doing so also "
--"increases your privacy since all cookies will be removed when the current "
--"session ends.\n"
-+"your default as well as site specific cookie policies. However, doing so "
-+"also increases your privacy since all cookies will be removed when the "
-+"current session ends.\n"
- "</qt>"
- msgstr ""
- "<qt>\n"
--"把所有 cookies 當做工作階段 cookies。工作階段 cookies "
--"是一小段資料，它們暫時儲存在電腦的記憶體中，直到您離開或關閉所有使用它們的應用程式（例如您的瀏覽器）。不同於一般的 cookies ，工作階段 cookies "
--"不會儲存在您的硬碟或本地端的儲存裝置上。"
--"<p>\n"
--"<u>注意：</u>選取此選項連帶地會覆蓋您的特定網站 cookie 政策。然而，這麼做會增進您的隱私，因為所有的cookies "
--"會在目前工作階段結束時移除。\n"
-+"把所有 cookies 當做工作階段 cookies。工作階段 cookies 是一小段資料，它們暫時"
-+"儲存在電腦的記憶體中，直到您離開或關閉所有使用它們的應用程式（例如您的瀏覽"
-+"器）。不同於一般的 cookies ，工作階段 cookies 不會儲存在您的硬碟或本地端的儲"
-+"存裝置上。<p>\n"
-+"<u>注意：</u>選取此選項連帶地會覆蓋您的特定網站 cookie 政策。然而，這麼做會增"
-+"進您的隱私，因為所有的cookies 會在目前工作階段結束時移除。\n"
- "</qt>"
- 
- #. i18n: file kcookiespoliciesdlg_ui.ui line 92
-@@ -914,12 +916,11 @@
- "<ul>\n"
- "<li><b>Ask</b> will cause KDE to ask for your confirmation whenever a server "
- "wants to set a cookie.\"</li>\n"
--"<li><b>Accept</b> will cause cookies to be accepted without prompting you.</li>"
--"\n"
--"<li><b>Reject</b> will cause the cookiejar to refuse all cookies it "
--"receives.</li>\n"
--"</ul>"
--"<p>\n"
-+"<li><b>Accept</b> will cause cookies to be accepted without prompting you.</"
-+"li>\n"
-+"<li><b>Reject</b> will cause the cookiejar to refuse all cookies it receives."
-+"</li>\n"
-+"</ul><p>\n"
- "<u>NOTE:</u> Domain specific policies, which can be set below, always take "
- "precedence over the default policy.\n"
- "</qt>"
-@@ -930,8 +931,7 @@
- "<li><b>詢問</b>會讓 KDE 在每次有伺服器要設定 cookie 時要求您的許可</li>\n"
- "<li><b>接受</b>會不提示您而接受 cookies</li>\n"
- "<li><b>拒絕</b>會拒絕所有收到的 cookies</li>\n"
--"</ul>"
--"<p>\n"
-+"</ul><p>\n"
- "<u>注意：</u>特定網域政策可以在下面設定，它的優先權會高於預設的政策。\n"
- "</qt>"
- 
-@@ -964,31 +964,32 @@
- #, no-c-format
- msgid ""
- "<qt>\n"
--"To add a new policy, simply click on the <b>Add...</b> "
--"button and supply the necessary information. To change an existing policy, use "
--"the <b>Change...</b> button and choose the new policy from the policy dialog "
--"box. Clicking on the <b>Delete</b> button will remove the currently selected "
--"policy causing the default policy setting to be used for that domain whereas <b>"
--"Delete All</b> will remove all the site specific policies.\n"
-+"To add a new policy, simply click on the <b>Add...</b> button and supply the "
-+"necessary information. To change an existing policy, use the <b>Change...</"
-+"b> button and choose the new policy from the policy dialog box. Clicking on "
-+"the <b>Delete</b> button will remove the currently selected policy causing "
-+"the default policy setting to be used for that domain whereas <b>Delete All</"
-+"b> will remove all the site specific policies.\n"
- "</qt>"
- msgstr ""
- "<qt>\n"
--"要增加新的政策。只要單擊 <b>新增...</b>按鈕，並提供對話窗中必須的資訊。要變更一個現存的政策，單擊 <b>變更...</b>"
--"按鈕，並在對話窗中選擇新的政策。單擊 <b>刪除</b> 將會移除您所選擇的項目，並以預設的政策取代該網域的政策。<b>刪除全部</b> "
--"會移除所有的特定網站政策。\n"
-+"要增加新的政策。只要單擊 <b>新增...</b>按鈕，並提供對話窗中必須的資訊。要變更"
-+"一個現存的政策，單擊 <b>變更...</b>按鈕，並在對話窗中選擇新的政策。單擊 <b>刪"
-+"除</b> 將會移除您所選擇的項目，並以預設的政策取代該網域的政策。<b>刪除全部</"
-+"b> 會移除所有的特定網站政策。\n"
- "</qt>"
- 
- #. i18n: file kcookiespoliciesdlg_ui.ui line 184
- #: rc.cpp:231 rc.cpp:428 rc.cpp:668
- #, no-c-format
- msgid "&New..."
--msgstr "新增(&N)..."
-+msgstr "新增(&N)…"
- 
- #. i18n: file kcookiespoliciesdlg_ui.ui line 192
- #: rc.cpp:234 rc.cpp:674
- #, no-c-format
- msgid "Chan&ge..."
--msgstr "變更(&H)..."
-+msgstr "變更(&H)…"
- 
- #. i18n: file kcookiespoliciesdlg_ui.ui line 216
- #: rc.cpp:243
-@@ -1006,7 +1007,8 @@
- "</qt>"
- msgstr ""
- "<qt>\n"
--"你所設定使用不同的 cookie 處理方式的網站列表。 對這些網站，系統會使用自訂的 cookie 處理方式，原不是預設的處理方式。\n"
-+"你所設定使用不同的 cookie 處理方式的網站列表。 對這些網站，系統會使用自訂的 "
-+"cookie 處理方式，原不是預設的處理方式。\n"
- "</qt>"
- 
- #. i18n: file kcookiespoliciesdlg_ui.ui line 295
-@@ -1022,26 +1024,28 @@
- "<qt>\n"
- "Setup proxy configuration.\n"
- "<p>\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"
--"<p>\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"
-+"<p>\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"
- "</qt>"
- msgstr ""
- "<qt>\n"
- "設定代理伺服器組態。\n"
- "<p>\n"
--"代理伺服器是位於您的電腦和網際網路的中介程式，提供網頁快取和/或過濾的服務。</p>"
--"<p>快取式代理伺服器會將您曾經參訪過的網站內容儲存起來，以加速加速網際網路資料讀取速度；過濾式快取伺服器，則提供阻擋廣告、垃圾以及其他任何你想要阻擋的東西的能"
--"力。\n"
-+"代理伺服器是位於您的電腦和網際網路的中介程式，提供網頁快取和/或過濾的服務。</"
-+"p><p>快取式代理伺服器會將您曾經參訪過的網站內容儲存起來，以加速加速網際網路資"
-+"料讀取速度；過濾式快取伺服器，則提供阻擋廣告、垃圾以及其他任何你想要阻擋的東"
-+"西的能力。\n"
- "<p>\n"
--"若您不知道是否需要設定代理伺服器，請先參考您的網路服務供應商的設定指南，或詢問系統管理員。\n"
-+"若您不知道是否需要設定代理伺服器，請先參考您的網路服務供應商的設定指南，或詢"
-+"問系統管理員。\n"
- "</qt>"
- 
- #. i18n: file kproxydlg_ui.ui line 59
-@@ -1067,30 +1071,27 @@
- #, no-c-format
- msgid ""
- "<qt>\n"
--"Automatically detect and configure the proxy settings."
--"<p>\n"
--"Automatic detection is performed using the <b>Web Proxy Auto-Discovery Protocol "
--"(WPAD)</b>."
--"<p>\n"
-+"Automatically detect and configure the proxy settings.<p>\n"
-+"Automatic detection is performed using the <b>Web Proxy Auto-Discovery "
-+"Protocol (WPAD)</b>.<p>\n"
- "<b>NOTE:</b> 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"
- "</qt>"
- msgstr ""
- "<qt>\n"
--"自動偵測並設定代理伺服器設定值。"
--"<p>\n"
--"自動偵測是使用 <b>網頁代理伺服器自動發現協定 (WPAD)</b> 進行的。"
--"<p>\n"
--"<b>注意：</b>這個選項在某些 UNIX/Linux 發行版本可能無法正常運作或者完全無法運作。如果您在使用這個選項時遇到問題，請查閱在 "
--"http://konqueror.kde.org 的 FAQ 章節。\n"
-+"自動偵測並設定代理伺服器設定值。<p>\n"
-+"自動偵測是使用 <b>網頁代理伺服器自動發現協定 (WPAD)</b> 進行的。<p>\n"
-+"<b>注意：</b>這個選項在某些 UNIX/Linux 發行版本可能無法正常運作或者完全無法運"
-+"作。如果您在使用這個選項時遇到問題，請查閱在 http://konqueror.kde.org 的 FAQ "
-+"章節。\n"
- "</qt>"
- 
- #. 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 ""
- "<qt>\n"
--"Use environment variables to configure the proxy settings."
--"<p>\n"
--"Environment variables such as <b>HTTP_PROXY</b> and <b>NO_PROXY</b> "
--"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.<p>\n"
-+"Environment variables such as <b>HTTP_PROXY</b> and <b>NO_PROXY</b> are "
-+"usually used in multi-user UNIX installations, where both graphical and non-"
-+"graphical applications need to share the same proxy configuration "
- "information.\n"
- "</qt>"
- msgstr ""
- "<qt>\n"
--"使用環境變數來設定代理伺服器設定值。"
--"<p>\n"
--"環境變數，像是 <b>HTTP_PROXY</b> 和 <b>NO_PROXY</b> 常常在多使用者的 UNIX "
--"系統中使用，而無論是圖型介面程式或是文字介面程式都共用同樣的代理伺服器資訊。\n"
-+"使用環境變數來設定代理伺服器設定值。<p>\n"
-+"環境變數，像是 <b>HTTP_PROXY</b> 和 <b>NO_PROXY</b> 常常在多使用者的 UNIX 系"
-+"統中使用，而無論是圖型介面程式或是文字介面程式都共用同樣的代理伺服器資訊。\n"
- "</qt>"
- 
- #. 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 ""
- "<qt>\n"
--"Use persistent proxy connection."
--"<p>\n"
-+"Use persistent proxy connection.<p>\n"
- "Although a persistent proxy connection is faster, note that it only works "
--"correctly with proxies that are fully HTTP 1.1 compliant. Do <b>not</b> "
--"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 <b>not</b> use "
-+"this option in combination with non-HTTP 1.1 compliant proxy servers such as "
-+"JunkBuster and WWWOfle.\n"
- "</qt>"
- msgstr ""
- "<qt>\n"
--"使用 HTTP/1.1 來連線."
--"<p>\n"
--"雖然 HTTP/1.1 中的持續性連線比較快速，但是只能使用在支援 HTTP/1.1 的 代理伺服器上。<b>請勿</b> "
--"在不支援 HTTP/1.1 的代理伺服器啟動這個選項。 (例如 JunkBuster 和 WWWOfle)\n"
-+"使用 HTTP/1.1 來連線.<p>\n"
-+"雖然 HTTP/1.1 中的持續性連線比較快速，但是只能使用在支援 HTTP/1.1 的 代理伺服"
-+"器上。<b>請勿</b> 在不支援 HTTP/1.1 的代理伺服器啟動這個選項。 (例如 "
-+"JunkBuster 和 WWWOfle)\n"
- "</qt>"
- 
- #. 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 @@
- "<qt>\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."
--"<p>This feature is useful if all you want or need is to use a proxy server  for "
--"a few specific sites."
--"<p>If you have more complex requirements you might want to use a configuration "
--"script.\n"
-+"addresses listed here.<p>This feature is useful if all you want or need is "
-+"to use a proxy server  for a few specific sites.<p>If you have more complex "
-+"requirements you might want to use a configuration script.\n"
- "</qt>"
- msgstr ""
- "<qt>\n"
--"反轉例外列表的功能。核取此選項會使得只有當要求的 URL 符合此位址列表其中之一時才使用代理伺服器。"
--"<p>如果您只需要在少數特定網站使用代理伺服器時這個功能相當有幫助。"
--"<p>如果您有更複雜的需求，您可能需要使用設定命令稿。\n"
-+"反轉例外列表的功能。核取此選項會使得只有當要求的 URL 符合此位址列表其中之一時"
-+"才使用代理伺服器。<p>如果您只需要在少數特定網站使用代理伺服器時這個功能相當有"
-+"幫助。<p>如果您有更複雜的需求，您可能需要使用設定命令稿。\n"
- "</qt>"
- 
- #. 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 ""
- "<qt>\n"
--"Enter the host or domain to which this policy applies, e.g. <b>www.kde.org</b> "
--"or <b>.kde.org</b>.\n"
-+"Enter the host or domain to which this policy applies, e.g. <b>www.kde.org</"
-+"b> or <b>.kde.org</b>.\n"
- "</qt>"
- msgstr ""
- "<qt>\n"
--"請輸入此要套用此政策的主機或網域。例如 <i>www.kde.org</i> 或 <i>.kde.org</i>。\n"
-+"請輸入此要套用此政策的主機或網域。例如 <i>www.kde.org</i> 或 <i>.kde.org</"
-+"i>。\n"
- "</qt>"
- 
- #. 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 ""
- "<qt>\n"
- "Enter the site or domain name where a fake browser identification should be "
--"used."
--"<p>\n"
--"<u>NOTE:</u> 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 "
--"<code>.kde.org</code> - the fake identity would then be sent to any KDE site "
--"that ends with <code>.kde.org</code>.\n"
-+"used.<p>\n"
-+"<u>NOTE:</u> 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 <code>.kde.org</code> - the fake identity would then be sent to any "
-+"KDE site that ends with <code>.kde.org</code>.\n"
- "</qt>"
- msgstr ""
- "<qt>\n"
--"請輸入您想使用偽裝識別碼的網址或網域。"
--"<p>\n"
--"<u>請注意：</u>您不可以使用萬用字元，如「*,?」。請輸入最頂層的網址讓所有在它之下找到的網址歸成一類；例如，若您要所有 KDE "
--"網站都收到偽裝識別碼，您要輸入 <code>.kde.org</code> - 偽裝識別碼就會送到任何以 <code>.kde.org</code> "
--"結尾的 KDE 網站。\n"
-+"請輸入您想使用偽裝識別碼的網址或網域。<p>\n"
-+"<u>請注意：</u>您不可以使用萬用字元，如「*,?」。請輸入最頂層的網址讓所有在它"
-+"之下找到的網址歸成一類；例如，若您要所有 KDE 網站都收到偽裝識別碼，您要輸入 "
-+"<code>.kde.org</code> - 偽裝識別碼就會送到任何以 <code>.kde.org</code> 結尾"
-+"的 KDE 網站。\n"
- "</qt>"
- 
- #. i18n: file uagentproviderdlg_ui.ui line 60
-@@ -1641,22 +1642,23 @@
- #, no-c-format
- msgid ""
- "<qt>\n"
--"Here you can modify the default browser-identification text or set a site <code>"
--"(eg. www.kde.org)</code> or a domain <code>(eg. kde.org)</code> "
--"specific identification text."
--"<p>\n"
-+"Here you can modify the default browser-identification text or set a site "
-+"<code>(eg. www.kde.org)</code> or a domain <code>(eg. kde.org)</code> "
-+"specific identification text.<p>\n"
- "To add a new site specific identification text, click the <code>New</code> "
- "button and supply the necessary information. To change an existing site "
--"specific entry, click on the <code>Change</code> button. The <code>Delete</code> "
--"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 <code>Change</code> button. The <code>Delete</"
-+"code> button will remove the selected site specific identification text, "
-+"causing the setting to be used for that site or domain.\n"
- "</qt>"
- msgstr ""
- "<qt>\n"
--"您可以在這邊修改網站<code>(如www.kde.org)</code>或網域<code>(如kde.org)</code>的預設瀏覽器識別碼。"
--"<p>\n"
--"要增加新的特定網站識別文字，只要單擊 <code>新增</code>按鈕，並提供對話窗中所需的資訊。要變更一個現存的網站識別項目，單擊 <code>"
--"變更</code>按鈕。<code>刪除</code>按鈕將會移除您所選擇的特定網站識別文字，並將預設的設定使用於該網站或網域。\n"
-+"您可以在這邊修改網站<code>(如www.kde.org)</code>或網域<code>(如kde.org)</"
-+"code>的預設瀏覽器識別碼。<p>\n"
-+"要增加新的特定網站識別文字，只要單擊 <code>新增</code>按鈕，並提供對話窗中所"
-+"需的資訊。要變更一個現存的網站識別項目，單擊 <code>變更</code>按鈕。<code>刪"
-+"除</code>按鈕將會移除您所選擇的特定網站識別文字，並將預設的設定使用於該網站或"
-+"網域。\n"
- "</qt>"
- 
- #. i18n: file useragentdlg_ui.ui line 33
-@@ -1670,22 +1672,20 @@
- #, no-c-format
- msgid ""
- "<qt>\n"
--"Send the browser identification to web sites."
--"<p>\n"
-+"Send the browser identification to web sites.<p>\n"
- "<u>NOTE:</u> 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."
--"<p>\n"
-+"but rather customize it.<p>\n"
- "By default, only minimal identification information is sent to remote sites. "
- "The identification text that will be sent is shown below.\n"
- "</qt>"
- msgstr ""
- "<qt>\n"
--"送出瀏覽器識別碼給網站。"
--"<p>\n"
--"<u>注意：</u>許多網站需要這類訊息來使得網頁能正常顯示，因此強烈地建議您不要關掉所有的選項，但您可以自行設定。"
--"<p>\n"
--"預設的情況，只有最少的識別碼資訊會送至遠端網站。要送出的識別文字會顯示在下面。\n"
-+"送出瀏覽器識別碼給網站。<p>\n"
-+"<u>注意：</u>許多網站需要這類訊息來使得網頁能正常顯示，因此強烈地建議您不要關"
-+"掉所有的選項，但您可以自行設定。<p>\n"
-+"預設的情況，只有最少的識別碼資訊會送至遠端網站。要送出的識別文字會顯示在下"
-+"面。\n"
- "</qt>"
- 
- #. 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 ""
--"<h1>Windows Shares</h1>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 <em>Browse server</em> field. This is mandatory if you do "
--"not run Samba locally. The <em>Broadcast address</em> and <em>WINS address</em> "
--"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."
--"<p>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."
--"<p>"
--msgstr ""
--"<h1> Windows 資源</h1>Konqueror 可以存取視窗檔案系統的資源。如果有指定要瀏覽的電腦，請將之填入 <em>瀏覽伺服器</em> "
--"欄位中。如果您沒有在本地端執行 Samba 時，這是必要的。<em>廣播位址</em> 與 <em>WINS 位址</em> "
--"欄位在您要使用原生碼時是可用的，或是在使用 Samba 時由 smb.conf 中取得選項。在任一種狀況，瀏覽器位址 (smb.conf 中的介面) "
--"在猜測錯誤或您有多張網路介面時，是必須指定的。WINS 伺服器通常可以增進效能，並且有效減少網路負載。"
--"<p>連結使用於指定特定伺服器的預設使用者，可能對應到密碼或存取指定的資源。如果您選擇這樣，新的連結將會為登入與資源而在瀏覽時建立。您可以在這邊編輯它們。密碼是"
--"儲存在本地端的，並且經過編碼使它無法被讀取。基於安全因素，您可能要注意之。包含密碼的項目將會清楚的指示。"
-+"<h1>Windows Shares</h1>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 <em>Browse server</em> field. This is "
-+"mandatory if you do not run Samba locally. The <em>Broadcast address</em> "
-+"and <em>WINS address</em> 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.<p>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.<p>"
-+msgstr ""
-+"<h1> Windows 資源</h1>Konqueror 可以存取視窗檔案系統的資源。如果有指定要瀏覽"
-+"的電腦，請將之填入 <em>瀏覽伺服器</em> 欄位中。如果您沒有在本地端執行 Samba "
-+"時，這是必要的。<em>廣播位址</em> 與 <em>WINS 位址</em> 欄位在您要使用原生碼"
-+"時是可用的，或是在使用 Samba 時由 smb.conf 中取得選項。在任一種狀況，瀏覽器位"
-+"址 (smb.conf 中的介面) 在猜測錯誤或您有多張網路介面時，是必須指定的。WINS 伺"
-+"服器通常可以增進效能，並且有效減少網路負載。<p>連結使用於指定特定伺服器的預設"
-+"使用者，可能對應到密碼或存取指定的資源。如果您選擇這樣，新的連結將會為登入與"
-+"資源而在瀏覽時建立。您可以在這邊編輯它們。密碼是儲存在本地端的，並且經過編碼"
-+"使它無法被讀取。基於安全因素，您可能要注意之。包含密碼的項目將會清楚的指示。"
- "<p>"
- 
- #: socks.cpp:42
-@@ -1928,27 +1934,24 @@
- 
- #: socks.cpp:270
- msgid ""
--"<h1>SOCKS</h1>"
--"<p>This module allows you to configure KDE support for a SOCKS server or "
--"proxy.</p>"
--"<p>SOCKS is a protocol to traverse firewalls as described in <a "
--"href=\"http://rfc.net/rfc1928.html\">RFC 1928</a>. "
--"<p>If you have no idea what this is and if your system administrator does not "
--"tell you to use it, leave it disabled.</p>"
--msgstr ""
--"<h1>SOCKS</h1>"
--"<p>這個模組允許您設定 KDE 對 SOCKS 伺服器或代理伺服器的支援。</p>"
--"<p>SOCKS 是用來穿過防火牆的協定，正如 <a href=\"http://rfc.net/rfc1928.html\">RFC 1928</a> "
--"所述。"
--"<p>如果您不知道這是什麼或您的系統管理者沒有要您使用它，請讓它保持停用。</p>"
-+"<h1>SOCKS</h1><p>This module allows you to configure KDE support for a SOCKS "
-+"server or proxy.</p><p>SOCKS is a protocol to traverse firewalls as "
-+"described in <a href=\"http://rfc.net/rfc1928.html\">RFC 1928</a>. <p>If you "
-+"have no idea what this is and if your system administrator does not tell you "
-+"to use it, leave it disabled.</p>"
-+msgstr ""
-+"<h1>SOCKS</h1><p>這個模組允許您設定 KDE 對 SOCKS 伺服器或代理伺服器的支援。</"
-+"p><p>SOCKS 是用來穿過防火牆的協定，正如 <a href=\"http://rfc.net/rfc1928.html"
-+"\">RFC 1928</a> 所述。<p>如果您不知道這是什麼或您的系統管理者沒有要您使用它，"
-+"請讓它保持停用。</p>"
- 
- #: useragentdlg.cpp:225
- msgid ""
--"<qt>"
--"<center>Found an existing identification for"
--"<br/><b>%1</b>"
--"<br/>Do you want to replace it?</center></qt>"
--msgstr "<qt><center>找到既存之關於<br/><b>%1</b><br/>的識別碼，您是否要置換它？</center></qt>"
-+"<qt><center>Found an existing identification for<br/><b>%1</b><br/>Do you "
-+"want to replace it?</center></qt>"
-+msgstr ""
-+"<qt><center>找到既存之關於<br/><b>%1</b><br/>的識別碼，您是否要置換它？</"
-+"center></qt>"
- 
- #: useragentdlg.cpp:230
- msgid "Duplicate Identification"
-@@ -1964,23 +1967,25 @@
- 
- #: useragentdlg.cpp:383
- msgid ""
--"<h1>Browser Identification</h1> The browser-identification module allows you to "
--"have full control over how Konqueror will identify itself to web sites you "
--"browse.<P>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.<P><u>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 ""
--"<h1>瀏覽器識別碼</h1> 瀏覽器識別碼控制視窗提供您來控制 Konqueror 回報遠端網站的資訊。"
--"<p> 這項功能提供了必要的偽裝的識別碼，這是因為某些網站在未能偵測到Netscape Navigator 或 Internet Explorer "
--"時無法正常顯示，即使這些「未支援的瀏覽器」實際上支援必須的功能並能正常的顯示。因此您必須更改預設的瀏覽器識別碼來瀏覽這些網站"
--"<p><u>注意：</u>要獲得對話盒特定部分的說明，只要按下視窗標題列的快速說明按鈕，然後按下您想求助的段落。"
-+"<h1>Browser Identification</h1> The browser-identification module allows you "
-+"to have full control over how Konqueror will identify itself to web sites "
-+"you browse.<P>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.<P><u>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 ""
-+"<h1>瀏覽器識別碼</h1> 瀏覽器識別碼控制視窗提供您來控制 Konqueror 回報遠端網站"
-+"的資訊。<p> 這項功能提供了必要的偽裝的識別碼，這是因為某些網站在未能偵測到"
-+"Netscape Navigator 或 Internet Explorer 時無法正常顯示，即使這些「未支援的瀏"
-+"覽器」實際上支援必須的功能並能正常的顯示。因此您必須更改預設的瀏覽器識別碼來"
-+"瀏覽這些網站<p><u>注意：</u>要獲得對話盒特定部分的說明，只要按下視窗標題列的"
-+"快速說明按鈕，然後按下您想求助的段落。"
- 
- #~ 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 <j_h_liau@yahoo.com.tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
-@@ -33,9 +33,11 @@
- 
- #: appearance.cpp:33
- msgid ""
--"<h1>Konqueror Fonts</h1>On this page, you can configure which fonts Konqueror "
--"should use to display the web pages you view."
--msgstr "<h1>Konqueror 字型</h1>在此分頁，您可以設定 Konqueror 應該使用哪種字型來顯示您檢視的網頁。"
-+"<h1>Konqueror Fonts</h1>On this page, you can configure which fonts "
-+"Konqueror should use to display the web pages you view."
-+msgstr ""
-+"<h1>Konqueror 字型</h1>在此分頁，您可以設定 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,"
--"<br>overriding any other settings"
-+"Konqueror will never display text smaller than this size,<br>overriding any "
-+"other settings"
- msgstr "Konqueror 永遠不會顯示小於這個大小的文字，<br> 此設定值會覆蓋其他設定"
- 
- #: 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 ""
- "<h1>Konqueror AdBlocK</h1> 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 ""
--"<h1>Konqueror AdBlocK</h1> Konqueror AdBlocK 讓您建立一個過濾器清單來檢查連結的圖片和框架。符合的 URL "
--"會被取消或以佔位符圖片代替。"
-+"<h1>Konqueror AdBlocK</h1> Konqueror AdBlocK 讓您建立一個過濾器清單來檢查連結"
-+"的圖片和框架。符合的 URL 會被取消或以佔位符圖片代替。"
- 
- #: htmlopts.cpp:41
- msgid ""
- "<h1>Konqueror Browser</h1> 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 ""
--"<h1>Konqueror 瀏覽器</h1>您可以在這裡設定 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 ""
-+"<h1>Konqueror 瀏覽器</h1>您可以在這裡設定 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."
--"<br>Unless you have a very slow network connection, you will probably want to "
--"check this box to enhance your browsing experience."
--msgstr ""
--"如果核取此方塊， Konqueror 會自動載入任何內嵌於網頁中的影像。否則它只會顯示該影像的保留位置，而您可以單擊影像按鈕手動載入影像。"
--"<br>除非您的網路連線速度很慢，不然核取此方塊可以增強您的瀏覽經驗。"
-+"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.<br>Unless you have a very slow network connection, you will probably "
-+"want to check this box to enhance your browsing experience."
-+msgstr ""
-+"如果核取此方塊， Konqueror 會自動載入任何內嵌於網頁中的影像。否則它只會顯示該"
-+"影像的保留位置，而您可以單擊影像按鈕手動載入影像。<br>除非您的網路連線速度很"
-+"慢，不然核取此方塊可以增強您的瀏覽經驗。"
- 
- #: 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."
--"<br>Especially if you have a slow network connection, you will probably want to "
--"check this box to enhance your browsing experience."
--msgstr ""
--"如果核取此方塊， Konqueror 會在尚未完全載入的圖片周圍先繪出一個框架作為網頁中的保留位置。"
--"<br>除非您的網路連線速度很慢，不然核取此方塊可以增強您的瀏覽經驗。"
-+"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.<br>Especially "
-+"if you have a slow network connection, you will probably want to check this "
-+"box to enhance your browsing experience."
-+msgstr ""
-+"如果核取此方塊， Konqueror 會在尚未完全載入的圖片周圍先繪出一個框架作為網頁中"
-+"的保留位置。<br>除非您的網路連線速度很慢，不然核取此方塊可以增強您的瀏覽經"
-+"驗。"
- 
- #: 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:"
--"<br>"
--"<ul>"
--"<li><b>Enabled</b>: Always underline links</li>"
--"<li><b>Disabled</b>: Never underline links</li>"
--"<li><b>Only on Hover</b>: Underline when the mouse is moved over the link</li>"
--"</ul>"
--"<br><i>Note: The site's CSS definitions can override this value</i>"
--msgstr ""
--"控制 Konqueror 如何處理超連結加底線："
--"<br>"
--"<ul>"
--"<li><b>啟用</b>：永遠為連結加底線</li>"
--"<li><b>停用</b>：永遠不為連結加底線</li>"
--"<li><b>只有停留其上時</b>：當滑鼠越過連結時才加底線</li></ul>"
--"<br><i>注意：網站的 CSS 定義可以覆蓋此設定</i>"
-+"<br><ul><li><b>Enabled</b>: Always underline links</li><li><b>Disabled</b>: "
-+"Never underline links</li><li><b>Only on Hover</b>: Underline when the mouse "
-+"is moved over the link</li></ul><br><i>Note: The site's CSS definitions can "
-+"override this value</i>"
-+msgstr ""
-+"控制 Konqueror 如何處理超連結加底線：<br><ul><li><b>啟用</b>：永遠為連結加底"
-+"線</li><li><b>停用</b>：永遠不為連結加底線</li><li><b>只有停留其上時</b>：當"
-+"滑鼠越過連結時才加底線</li></ul><br><i>注意：網站的 CSS 定義可以覆蓋此設定</"
-+"i>"
- 
- #: htmlopts.cpp:178
- msgid "A&nimations:"
-@@ -474,20 +494,14 @@
- 
- #: htmlopts.cpp:187
- msgid ""
--"Controls how Konqueror shows animated images:"
--"<br>"
--"<ul>"
--"<li><b>Enabled</b>: Show all animations completely.</li>"
--"<li><b>Disabled</b>: Never show animations, show the start image only.</li>"
--"<li><b>Show only once</b>: Show all animations completely but do not repeat "
--"them.</li>"
--msgstr ""
--"控制 Konqueror 如何顯示動畫影像："
--"<br>"
--"<ul>"
--"<li><b>啟用</b>：完整顯所有動畫。</li>"
--"<li><b>停用</b>：永遠不顯示動畫，只顯示起始影像。</li>"
--"<li><b>只顯示一次</b>：完整顯所有動畫但不重複播放。</li>"
-+"Controls how Konqueror shows animated images:<br><ul><li><b>Enabled</b>: "
-+"Show all animations completely.</li><li><b>Disabled</b>: Never show "
-+"animations, show the start image only.</li><li><b>Show only once</b>: Show "
-+"all animations completely but do not repeat them.</li>"
-+msgstr ""
-+"控制 Konqueror 如何顯示動畫影像：<br><ul><li><b>啟用</b>：完整顯所有動畫。</"
-+"li><li><b>停用</b>：永遠不顯示動畫，只顯示起始影像。</li><li><b>只顯示一次</"
-+"b>：完整顯所有動畫但不重複播放。</li>"
- 
- #: 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. "
--"<p>Select a policy and use the controls on the right to modify it."
-+"disabling Java applets on pages sent by these domains or hosts. <p>Select a "
-+"policy and use the controls on the right to modify it."
- msgstr ""
--"此方塊包含您要設定特定 Java 政策的網域或主機。這個政策會取代預設政策以決定要啟用或停用由這些網域或主機所傳送的 Java applet 。"
--"<p>選擇一個政策並使用右邊的控制項來編輯它。"
-+"此方塊包含您要設定特定 Java 政策的網域或主機。這個政策會取代預設政策以決定要"
-+"啟用或停用由這些網域或主機所傳送的 Java applet 。<p>選擇一個政策並使用右邊的"
-+"控制項來編輯它。"
- 
- #: 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 <b>"
--"java_policy.tgz</b>, will be saved to a location of your choice."
--msgstr "單擊此按鈕來把 Java 政策儲存為壓縮的檔案。這個名為<b>java_policy.tgz</b>的檔案會儲存到您選擇的位置。"
-+"Click this button to save the Java policy to a zipped file. The file, named "
-+"<b>java_policy.tgz</b>, will be saved to a location of your choice."
-+msgstr ""
-+"單擊此按鈕來把 Java 政策儲存為壓縮的檔案。這個名為<b>java_policy.tgz</b>的檔"
-+"案會儲存到您選擇的位置。"
- 
- #: 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 <i>New...</i> 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 <i>New...</i> button and supply the "
- "necessary information requested by the dialog box. To change an existing "
--"policy, click on the <i>Change...</i> button and choose the new policy from the "
--"policy dialog box. Clicking on the <i>Delete</i> button will remove the "
--"selected policy, causing the default policy setting to be used for that domain."
--msgstr ""
--"您可以在這裡設定任何特定主機或網域的特定 Java 政策。要增加新政策，只要單擊<i>新增...</i>"
--"按鈕並提供對話方塊要求的必要資訊。要改變現有的政策，單擊<i>改變...</i>按鈕並從政策對話方塊選擇新政策。單擊<i>刪除</i>"
--"按鈕會移除選擇的政策，並使用預設政策設定於該網域。"
-+"policy, click on the <i>Change...</i> button and choose the new policy from "
-+"the policy dialog box. Clicking on the <i>Delete</i> button will remove the "
-+"selected policy, causing the default policy setting to be used for that "
-+"domain."
-+msgstr ""
-+"您可以在這裡設定任何特定主機或網域的特定 Java 政策。要增加新政策，只要單擊<i>"
-+"新增...</i>按鈕並提供對話方塊要求的必要資訊。要改變現有的政策，單擊<i>改變..."
-+"</i>按鈕並從政策對話方塊選擇新政策。單擊<i>刪除</i>按鈕會移除選擇的政策，並使"
-+"用預設政策設定於該網域。"
- 
- #: 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 <i>New...</i> "
--"button and supply the necessary information requested by the dialog box. To "
--"change an existing policy, click on the <i>Change...</i> "
--"button and choose the new policy from the policy dialog box. Clicking on the <i>"
--"Delete</i> button will remove the selected policy causing the default policy "
--"setting to be used for that domain. The <i>Import</i> and <i>Export</i> "
--"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 政策。要增加新政策，只要單擊<i>新增...</i>"
--"按鈕並提供對話方塊要求的必要資訊。要改變現有的政策，單擊<i>改變...</i>按鈕並從政策對話方塊選擇新政策。單擊<i>刪除</i>"
--"按鈕會移除選擇的政策並使用預設政策設定於該網域。<i>匯入</i>與<i>匯出</i>按鈕讓你可以用壓縮檔案的方式儲存與接收政策，以便和別人分享您的政策。"
-+"domain. To add a new policy, simply click the <i>New...</i> button and "
-+"supply the necessary information requested by the dialog box. To change an "
-+"existing policy, click on the <i>Change...</i> button and choose the new "
-+"policy from the policy dialog box. Clicking on the <i>Delete</i> button will "
-+"remove the selected policy causing the default policy setting to be used for "
-+"that domain. The <i>Import</i> and <i>Export</i> 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 政策。要增加新政策，只要"
-+"單擊<i>新增...</i>按鈕並提供對話方塊要求的必要資訊。要改變現有的政策，單擊<i>"
-+"改變...</i>按鈕並從政策對話方塊選擇新政策。單擊<i>刪除</i>按鈕會移除選擇的政"
-+"策並使用預設政策設定於該網域。<i>匯入</i>與<i>匯出</i>按鈕讓你可以用壓縮檔案"
-+"的方式儲存與接收政策，以便和別人分享您的政策。"
- 
- #: 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. "
- "<p>Select a policy and use the controls on the right to modify it."
- msgstr ""
--"此方塊包含您要設定特定 JavaScript 政策的網域或主機。這個政策會取代預設政策以決定要啟用或停用由這些網域或主機所傳送的網頁的JavaScript 。"
--"<p>選擇一個政策並使用右邊的控制項來編輯它。"
-+"此方塊包含您要設定特定 JavaScript 政策的網域或主機。這個政策會取代預設政策以"
-+"決定要啟用或停用由這些網域或主機所傳送的網頁的JavaScript 。<p>選擇一個政策並"
-+"使用右邊的控制項來編輯它。"
- 
- #: 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 <b>javascript_policy.tgz</b>, will be saved to a location of your choice."
-+"named <b>javascript_policy.tgz</b>, will be saved to a location of your "
-+"choice."
- msgstr ""
--"單擊此按鈕來把 JavaScript 政策儲存為壓縮的檔案。這個名為<b>javascript_policy.tgz</b>的檔案會儲存到您選擇的位置。"
-+"單擊此按鈕來把 JavaScript 政策儲存為壓縮的檔案。這個名為<b>javascript_policy."
-+"tgz</b>的檔案會儲存到您選擇的位置。"
- 
- #: 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 <i>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."
--"<br>"
--"<br><b>Note:</b> Disabling this option might also break certain sites that "
--"require <i>window.open()</i> for proper operation. Use this feature carefully."
--msgstr ""
--"如果您停用此選項， Konqueror 會停止解譯 <i>window.open()</i> JavaScript 命令。如果您時常參觀大量使用此命令來彈出廣 "
--"告的網站時會很有用。"
--"<br>"
--"<br><b>注意：</b>停用此選項也可能會中斷某些需要<i>window.open()</i>才能正確操作的網站。請小心使用此功能。"
-+"If you disable this, Konqueror will stop interpreting the <i>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.<br><br><b>Note:</b> "
-+"Disabling this option might also break certain sites that require <i>window."
-+"open()</i> for proper operation. Use this feature carefully."
-+msgstr ""
-+"如果您停用此選項， Konqueror 會停止解譯 <i>window.open()</i> JavaScript 命"
-+"令。如果您時常參觀大量使用此命令來彈出廣 告的網站時會很有用。<br><br><b>注"
-+"意：</b>停用此選項也可能會中斷某些需要<i>window.open()</i>才能正確操作的網"
-+"站。請小心使用此功能。"
- 
- #: 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 <i>"
--"think</i> it changed the size but the actual window is not affected."
--msgstr "忽略命令稿改變視窗大小的嘗試。讓網頁<i>認為</i>它已經變更了大小但是實際視窗的大小不會受影響。"
-+"Ignore attempts of scripts to change the window size. The web page will "
-+"<i>think</i> it changed the size but the actual window is not affected."
-+msgstr ""
-+"忽略命令稿改變視窗大小的嘗試。讓網頁<i>認為</i>它已經變更了大小但是實際視窗的"
-+"大小不會受影響。"
- 
- #: jspolicies.cpp:233
- msgid ""
--"Some websites change the window size on their own by using <i>"
--"window.resizeBy()</i> or <i>window.resizeTo()</i>. This option specifies the "
--"treatment of such attempts."
-+"Some websites change the window size on their own by using <i>window.resizeBy"
-+"()</i> or <i>window.resizeTo()</i>. This option specifies the treatment of "
-+"such attempts."
- msgstr ""
--"某些網站會使用 <i>window.resizeBy()</i> 或 <i>window.resizeTo()</i> "
--"來改變它們本身視窗的大小。這個選項指定了要如何處理這類的意圖。"
-+"某些網站會使用 <i>window.resizeBy()</i> 或 <i>window.resizeTo()</i> 來改變它"
-+"們本身視窗的大小。這個選項指定了要如何處理這類的意圖。"
- 
- #: 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 <i>"
--"think</i> it moved the window but the actual position is not affected."
--msgstr "忽略命令稿改變視窗位置的嘗試。讓網頁<i>認為</i>它已經移動了視窗但是實際視窗的位置不會受影響。"
-+"Ignore attempts of scripts to change the window position. The web page will "
-+"<i>think</i> it moved the window but the actual position is not affected."
-+msgstr ""
-+"忽略命令稿改變視窗位置的嘗試。讓網頁<i>認為</i>它已經移動了視窗但是實際視窗的"
-+"位置不會受影響。"
- 
- #: jspolicies.cpp:271
- msgid ""
--"Some websites change the window position on their own by using <i>"
--"window.moveBy()</i> or <i>window.moveTo()</i>. This option specifies the "
--"treatment of such attempts."
-+"Some websites change the window position on their own by using <i>window."
-+"moveBy()</i> or <i>window.moveTo()</i>. This option specifies the treatment "
-+"of such attempts."
- msgstr ""
--"某些網站會使用 <i>window.moveBy()</i> 或 <i>window.moveTo()</i> "
--"來改變它們本身視窗的位置。這個選項指定了要如何處理這類的意圖。"
-+"某些網站會使用 <i>window.moveBy()</i> 或 <i>window.moveTo()</i> 來改變它們本"
-+"身視窗的位置。這個選項指定了要如何處理這類的意圖。"
- 
- #: 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 <i>think</i> "
--"it brought the focus to the window but the actual focus will remain unchanged."
--msgstr "忽略命令稿改變視窗焦點的嘗試。讓網頁<i>認為</i>它已經獲得了視窗焦點但是實際視窗的焦點不會受影響。"
-+"Ignore attempts of scripts to focus the window. The web page will <i>think</"
-+"i> it brought the focus to the window but the actual focus will remain "
-+"unchanged."
-+msgstr ""
-+"忽略命令稿改變視窗焦點的嘗試。讓網頁<i>認為</i>它已經獲得了視窗焦點但是實際視"
-+"窗的焦點不會受影響。"
- 
- #: jspolicies.cpp:310
- msgid ""
--"Some websites set the focus to their browser window on their own by using <i>"
--"window.focus()</i>. 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 ""
--"某些網站會使用 <i>window.focus()</i> "
--"來使它們本身瀏覽器視窗獲得焦點。這樣通常會將它的視窗最上方因而中斷了使用者當時要進行的動作。帶到這個選項指定了要如何處理這類的意圖。"
-+"Some websites set the focus to their browser window on their own by using "
-+"<i>window.focus()</i>. 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 ""
-+"某些網站會使用 <i>window.focus()</i> 來使它們本身瀏覽器視窗獲得焦點。這樣通常"
-+"會將它的視窗最上方因而中斷了使用者當時要進行的動作。帶到這個選項指定了要如何"
-+"處理這類的意圖。"
- 
- #: 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 <i>"
--"think</i> it changed the text but the actual text will remain unchanged."
--msgstr "忽略命令稿改變狀態列文字的嘗試。讓網頁<i>認為</i>它已經改變了狀態列文字但是實際的文字不會受影響。"
-+"Ignore attempts of scripts to change the status bar text. The web page will "
-+"<i>think</i> it changed the text but the actual text will remain unchanged."
-+msgstr ""
-+"忽略命令稿改變狀態列文字的嘗試。讓網頁<i>認為</i>它已經改變了狀態列文字但是實"
-+"際的文字不會受影響。"
- 
- #: jspolicies.cpp:351
- msgid ""
--"Some websites change the status bar text by setting <i>window.status</i> or <i>"
--"window.defaultStatus</i>, thus sometimes preventing displaying the real URLs of "
--"hyperlinks. This option specifies the treatment of such attempts."
--msgstr ""
--"某些網站會使用 <i>window.status</i> 或 <i>window.defaultStatus</i> "
--"來改變狀態列的文字，這樣一來有時會妨礙真實網址的顯示。這個選項指定了要如何處理這類的意圖。"
-+"Some websites change the status bar text by setting <i>window.status</i> or "
-+"<i>window.defaultStatus</i>, thus sometimes preventing displaying the real "
-+"URLs of hyperlinks. This option specifies the treatment of such attempts."
-+msgstr ""
-+"某些網站會使用 <i>window.status</i> 或 <i>window.defaultStatus</i> 來改變狀態"
-+"列的文字，這樣一來有時會妨礙真實網址的顯示。這個選項指定了要如何處理這類的意"
-+"圖。"
- 
- #: khttpoptdlg.cpp:16
- msgid "Accept languages:"
-@@ -932,19 +977,18 @@
- 
- #: main.cpp:159
- msgid ""
--"<h2>JavaScript</h2>On this page, you can configure whether JavaScript programs "
--"embedded in web pages should be allowed to be executed by Konqueror."
--"<h2>Java</h2>On this page, you can configure whether Java applets embedded in "
--"web pages should be allowed to be executed by Konqueror."
--"<br>"
--"<br><b>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 ""
--"<h2>JavaScript</h2>在此分頁，您可以設定 Konqueror 是否允許執行內嵌於網頁中的 JavaScript 程式。"
--"<h2>Java</h2>在此分頁，您可以設定 Konqueror 是否允許執行內嵌於網頁中的 Java Applet 程式。"
--"<br>"
--"<br><b>注意：</b>動態的內容常常會有安全性的顧慮，這也是為什麼 Konqueror 讓您指定您想執行來自哪個主機的 Java 和/或 "
-+"<h2>JavaScript</h2>On this page, you can configure whether JavaScript "
-+"programs embedded in web pages should be allowed to be executed by Konqueror."
-+"<h2>Java</h2>On this page, you can configure whether Java applets embedded "
-+"in web pages should be allowed to be executed by Konqueror.<br><br><b>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 ""
-+"<h2>JavaScript</h2>在此分頁，您可以設定 Konqueror 是否允許執行內嵌於網頁中的 "
-+"JavaScript 程式。<h2>Java</h2>在此分頁，您可以設定 Konqueror 是否允許執行內嵌"
-+"於網頁中的 Java Applet 程式。<br><br><b>注意：</b>動態的內容常常會有安全性的"
-+"顧慮，這也是為什麼 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. "
- "<p>Select a policy and use the controls on the right to modify it."
- msgstr ""
--"此方塊包含您要設定特定外掛程式政策的網域或主機。這個政策會取代預設政策以決定要啟用或停用由這些網域或主機所傳送的外掛程式。"
--"<p>選擇一個政策並使用右邊的控制項來修改它。"
-+"此方塊包含您要設定特定外掛程式政策的網域或主機。這個政策會取代預設政策以決定"
-+"要啟用或停用由這些網域或主機所傳送的外掛程式。<p>選擇一個政策並使用右邊的控制"
-+"項來修改它。"
- 
- #: 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 "
--"<b>plugin_policy.tgz</b>, will be saved to a location of your choice."
--msgstr "單擊此按鈕來把外掛程式政策儲存為壓縮的檔案。這個名為<b>plugin_policy.tgz</b>的檔案會儲存到您選擇的位置。"
-+"Click this button to save the plugin policy to a zipped file. The file, "
-+"named <b>plugin_policy.tgz</b>, will be saved to a location of your choice."
-+msgstr ""
-+"單擊此按鈕來把外掛程式政策儲存為壓縮的檔案。這個名為<b>plugin_policy.tgz</b>"
-+"的檔案會儲存到您選擇的位置。"
- 
- #: 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 <i>New...</i> 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 <i>New...</i> button and supply the "
- "necessary information requested by the dialog box. To change an existing "
--"policy, click on the <i>Change...</i> button and choose the new policy from the "
--"policy dialog box. Clicking on the <i>Delete</i> button will remove the "
--"selected policy causing the default policy setting to be used for that domain."
--msgstr ""
--"您可以在這裡設定任何特定主機或網域的特定外掛程式政策。要增加新政策，只要單擊<i>新增...</i>按鈕並提供對話方塊要求的必要資訊。要改變現有的政策，單擊<i"
--">改變...</i>按鈕並從政策對話方塊選擇新政策。單擊<i>刪除</i>按鈕會移除選擇的政策並使用預設政策設定於該網域。"
-+"policy, click on the <i>Change...</i> button and choose the new policy from "
-+"the policy dialog box. Clicking on the <i>Delete</i> button will remove the "
-+"selected policy causing the default policy setting to be used for that "
-+"domain."
-+msgstr ""
-+"您可以在這裡設定任何特定主機或網域的特定外掛程式政策。要增加新政策，只要單擊"
-+"<i>新增...</i>按鈕並提供對話方塊要求的必要資訊。要改變現有的政策，單擊<i>改"
-+"變...</i>按鈕並從政策對話方塊選擇新政策。單擊<i>刪除</i>按鈕會移除選擇的政策"
-+"並使用預設政策設定於該網域。"
- 
- #: pluginopts.cpp:129 pluginopts.cpp:523
- msgid "Netscape Plugins"
-@@ -1049,19 +1104,21 @@
- 
- #: pluginopts.cpp:257
- msgid ""
--"<h1>Konqueror Plugins</h1> 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 ""
--"<h1>Konqueror 外掛程式</h1> Konqueror 網頁瀏覽器可以使用 Netscape 外掛程式來顯示特別的內容，正如 Navigator "
--"一般。請注意，安裝 Netscape 外掛程式的方式可能取決於您的發行版本 (distribution)。舉例來說，典型的安裝位置是 "
--"「/opt/netscape/plugin」。"
-+"<h1>Konqueror Plugins</h1> 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 ""
-+"<h1>Konqueror 外掛程式</h1> 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) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Chinese Traditional <zh-l10n@linux.org.tw>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
-@@ -21,9 +20,10 @@
- 
- #: behaviour.cpp:46
- msgid ""
--"<h1>Konqueror Behavior</h1> You can configure how Konqueror behaves as a file "
--"manager here."
--msgstr "<h1>Konqueror 行為</h1> 您可以在這裡設定 Konqueror 做為檔案管理程式的行為。"
-+"<h1>Konqueror Behavior</h1> You can configure how Konqueror behaves as a "
-+"file manager here."
-+msgstr ""
-+"<h1>Konqueror 行為</h1> 您可以在這裡設定 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. "
--"<ul>"
--"<li><em>Move To Trash:</em> moves the file to your trash folder, from where it "
--"can be recovered very easily.</li> "
-+"\"delete\" a file. <ul><li><em>Move To Trash:</em> moves the file to your "
-+"trash folder, from where it can be recovered very easily.</li> "
- "<li><em>Delete:</em> simply deletes the file.</li> </li></ul>"
- msgstr ""
--"這個選項會告訴 Konqueror ，當您「刪除」檔案時，是否要求做確認。 "
--"<ul>"
--"<li><em>移至資源回收桶：</em> 搬移檔案至您的資源回收桶目錄，它可以非常容易的從那裡復原。</li> "
--"<li><em>刪除：</em> 直接刪除檔案。</li> </li></ul>"
-+"這個選項會告訴 Konqueror ，當您「刪除」檔案時，是否要求做確認。 <ul><li><em>"
-+"移至資源回收桶：</em> 搬移檔案至您的資源回收桶目錄，它可以非常容易的從那裡復"
-+"原。</li> <li><em>刪除：</em> 直接刪除檔案。</li> </li></ul>"
- 
- #: 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 ""
- "<h1>Multiple Desktops</h1>In this module, you can configure how many virtual "
- "desktops you want and how these should be labeled."
--msgstr "<h1>多重桌面</h1>在此模組中，您可以設定您需要多少虛擬桌面以及這些桌面的標籤為何。"
-+msgstr ""
-+"<h1>多重桌面</h1>在此模組中，您可以設定您需要多少虛擬桌面以及這些桌面的標籤為"
-+"何。"
- 
- #: 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 ""
--" "
--"<ul>"
--"<li><em>No action:</em> as you might guess, nothing happens!</li> "
-+" <ul><li><em>No action:</em> as you might guess, nothing happens!</li> "
- "<li><em>Window list menu:</em> 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.</li> "
--"<li><em>Desktop menu:</em> 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.</li> "
--"<li><em>Application menu:</em> 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></ul>"
--msgstr ""
--" "
--"<ul>"
--"<li><em>不動作：</em>您可以猜得到，不會發生任何事！</li>"
--"<li><em>視窗列表選單：</em>會彈出一個顯示所有在虛擬桌面視窗的選單。您可以藉著單擊桌面名稱來切換桌面，或單擊視窗名稱來轉換視窗，如果需要會同時切換桌"
--"面，若視窗是隱藏的則會將它復原。隱藏或最小化的視窗會以括弧包含它們的名稱來表示。</li> "
--"<li><em>桌面選單：</em>會彈出桌面的內容選單。這個選單有設定顯示、鎖定螢幕及登出 KDE 的選項。</li> "
--"<li><em>應用程式選單：</em>會彈出「K」選單。如果您喜歡隱藏面板（也稱為「Kicker」），這對快速切換應用程式會很有用。</li></ul>"
-+"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.</li> "
-+"<li><em>Desktop menu:</em> 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.</li> <li><em>Application menu:</em> 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></ul>"
-+msgstr ""
-+" <ul><li><em>不動作：</em>您可以猜得到，不會發生任何事！</li><li><em>視窗列表"
-+"選單：</em>會彈出一個顯示所有在虛擬桌面視窗的選單。您可以藉著單擊桌面名稱來切"
-+"換桌面，或單擊視窗名稱來轉換視窗，如果需要會同時切換桌面，若視窗是隱藏的則會"
-+"將它復原。隱藏或最小化的視窗會以括弧包含它們的名稱來表示。</li> <li><em>桌面"
-+"選單：</em>會彈出桌面的內容選單。這個選單有設定顯示、鎖定螢幕及登出 KDE 的選"
-+"項。</li> <li><em>應用程式選單：</em>會彈出「K」選單。如果您喜歡隱藏面板（也"
-+"稱為「Kicker」），這對快速切換應用程式會很有用。</li></ul>"
- 
- #: desktopbehavior_impl.cpp:178
- msgid ""
--"You can choose what happens when you click the middle button of your pointing "
--"device on the desktop: "
--"<ul>"
--"<li><em>No action:</em> as you might guess, nothing happens!</li> "
--"<li><em>Window list menu:</em> 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.</li> "
--"<li><em>Desktop menu:</em> 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.</li> "
--"<li><em>Application menu:</em> 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></ul>"
--msgstr ""
--"您可以選擇當您在桌面上敲擊指標裝置中間按鈕時會發生什麼事： "
--"<ul>"
--"<li><em> 不動作：</em> 您可以猜得到，沒事發生！</li>"
--"<li><em>視窗列表選單：</em>會彈出一個顯示所有在虛擬桌面視窗的選單。您可以藉著單擊桌面名稱來切換桌面，或單擊視窗名稱來轉換視窗，如果需要會同時切換桌"
--"面，若視窗是隱藏的則會將它復原。隱藏或最小化的視窗會以括弧包含它們的名稱來表示。</li> "
--"<li><em>桌面選單：</em>會彈出桌面的內容選單。這個選單有設定顯示、鎖定螢幕及登出 KDE 的選項。</li> "
--"<li><em>應用程式選單：</em>會彈出「K」選單。如果您喜歡隱藏面板（也稱為「Kicker」），這對快速切換應用程式會很有用。</li></ul>"
-+"You can choose what happens when you click the middle button of your "
-+"pointing device on the desktop: <ul><li><em>No action:</em> as you might "
-+"guess, nothing happens!</li> <li><em>Window list menu:</em> 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.</li> <li><em>Desktop menu:</em> 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.</li> "
-+"<li><em>Application menu:</em> 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></ul>"
-+msgstr ""
-+"您可以選擇當您在桌面上敲擊指標裝置中間按鈕時會發生什麼事： <ul><li><em> 不動"
-+"作：</em> 您可以猜得到，沒事發生！</li><li><em>視窗列表選單：</em>會彈出一個"
-+"顯示所有在虛擬桌面視窗的選單。您可以藉著單擊桌面名稱來切換桌面，或單擊視窗名"
-+"稱來轉換視窗，如果需要會同時切換桌面，若視窗是隱藏的則會將它復原。隱藏或最小"
-+"化的視窗會以括弧包含它們的名稱來表示。</li> <li><em>桌面選單：</em>會彈出桌面"
-+"的內容選單。這個選單有設定顯示、鎖定螢幕及登出 KDE 的選項。</li> <li><em>應用"
-+"程式選單：</em>會彈出「K」選單。如果您喜歡隱藏面板（也稱為「Kicker」），這對"
-+"快速切換應用程式會很有用。</li></ul>"
- 
- #: 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 ""
--"<p>Allow previews, \"Folder Icons Reflect Contents\", and retrieval of "
--"meta-data on protocols:</p>"
-+"<p>Allow previews, \"Folder Icons Reflect Contents\", and retrieval of meta-"
-+"data on protocols:</p>"
- msgstr "<p>允許預覽、「資料夾圖示反應其內容」與在協定上中繼資料的取回：</p>"
- 
- #: previews.cpp:68
- msgid ""
--"<h1>Preview Options</h1> Here you can modify the behavior of Konqueror when it "
--"shows the files in a folder."
--"<h2>The list of protocols:</h2> 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."
--"<h2>Maximum File Size:</h2> 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 ""
--"<h1>預覽選項</h1>您可以在此編輯當 Konqueror 顯示目錄中的檔案時的行為。"
--"<h2>協定列表：</h2>核取用來顯示預覽的協定，取消不該預覽的協定。例如，當區域網路夠快時，您可能會想顯示 SMB "
--"上的預覽。但是假如您常上一些很慢的FTP 站，您可能會想關閉 FTP 的部分。"
--"<h2>檔案大小的最大值：</h2>選擇要產生預覽的檔案大小最大值。舉例來說，如果設為 1 MB （預設值），所有大於 1 MB "
--"的檔案都不會產生預覽，這是基於速度的考量。"
-+"<h1>Preview Options</h1> Here you can modify the behavior of Konqueror when "
-+"it shows the files in a folder.<h2>The list of protocols:</h2> 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.<h2>Maximum File Size:</h2> "
-+"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 ""
-+"<h1>預覽選項</h1>您可以在此編輯當 Konqueror 顯示目錄中的檔案時的行為。<h2>協"
-+"定列表：</h2>核取用來顯示預覽的協定，取消不該預覽的協定。例如，當區域網路夠快"
-+"時，您可能會想顯示 SMB 上的預覽。但是假如您常上一些很慢的FTP 站，您可能會想關"
-+"閉 FTP 的部分。<h2>檔案大小的最大值：</h2>選擇要產生預覽的檔案大小最大值。舉"
-+"例來說，如果設為 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 @@
- "<p>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.</p>\n"
--"<p>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 ""
--"<p>如果您核取這個選項，任何在您桌面目錄以句點 (.) 開頭的檔案會被顯示。通常，這類的檔案包含設定資訊，而且保持隱藏的狀態。</p>\n"
--"<p>例如，命名為「.directory」的檔案是包含 Konqueror "
--"資訊的純文字檔案，像是顯示目錄的圖示、檔案的排列順序等。您不應該改變或刪除這些檔案，除非您知道您在做什麼。</p>"
-+"<p>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 ""
-+"<p>如果您核取這個選項，任何在您桌面目錄以句點 (.) 開頭的檔案會被顯示。通常，"
-+"這類的檔案包含設定資訊，而且保持隱藏的狀態。</p>\n"
-+"<p>例如，命名為「.directory」的檔案是包含 Konqueror 資訊的純文字檔案，像是顯"
-+"示目錄的圖示、檔案的排列順序等。您不應該改變或刪除這些檔案，除非您知道您在做"
-+"什麼。</p>"
- 
- #. 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) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Chinese Traditional <zh-l10n@linux.org.tw>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
-@@ -31,13 +30,14 @@
- 
- #: kcmkonsole.cpp:43
- msgid ""
--"<h1>Konsole</h1> 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."
-+"<h1>Konsole</h1> 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 ""
--"<hl>konsole</hl> 藉著這個程式您可以調整 konsole (KDE "
--"終端機程式)的設定值，您可以在此調整一些通用的設定，或是您也可以使用RMB來達到同樣的目的。您還可以在此編輯 konsole 的風格設定。"
-+"<hl>konsole</hl> 藉著這個程式您可以調整 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 <j_h_liau@yahoo.com.tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team:  <en@li.org>\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 ""
- "<h1>Enhanced Browsing</h1> In this module you can configure some enhanced "
--"browsing features of KDE. "
--"<h2>Internet Keywords</h2>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."
--"<h2>Web Shortcuts</h2>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. <h2>Internet Keywords</h2>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.<h2>Web Shortcuts</h2>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 ""
- "<h1>加強型瀏覽</h1> 在這個模組你可以設定 KDE 的一些加強型瀏覽功能。 "
--"<h2>Internet 關鍵字</h2>Internet 關鍵字讓你打商標，計劃，名人等等...名稱然後跳到相關的位置。 例如，你可以在 Konqueror "
--"中只打 \"KDE\" 或 \"K Desktop Environment\" 來跳到 KDE 的首頁。"
--"<h2>網頁捷徑</h2>網頁捷徑是一種使用網路搜尋引擎的快速方法。 例如，打 \"altavista:frobozz\" 或 \"av:frobozz\" "
--"然後 Konqueror 就會在 AltaVista 做 \"frobozz\" 搜尋。 甚至更容易：只要按 Alt-F2 (假如你沒有改變這個捷徑) 然後在 "
--"KDE 執行命令對話視窗輸入捷徑。"
-+"<h2>Internet 關鍵字</h2>Internet 關鍵字讓你打商標，計劃，名人等等...名稱然後"
-+"跳到相關的位置。 例如，你可以在 Konqueror 中只打 \"KDE\" 或 \"K Desktop "
-+"Environment\" 來跳到 KDE 的首頁。<h2>網頁捷徑</h2>網頁捷徑是一種使用網路搜尋"
-+"引擎的快速方法。 例如，打 \"altavista:frobozz\" 或 \"av:frobozz\" 然後 "
-+"Konqueror 就會在 AltaVista 做 \"frobozz\" 搜尋。 甚至更容易：只要按 Alt-F2 "
-+"(假如你沒有改變這個捷徑) 然後在 KDE 執行命令對話視窗輸入捷徑。"
- 
- #: main.cpp:63
- msgid "&Filters"
-@@ -71,14 +70,14 @@
- #, no-c-format
- msgid ""
- "<qt>\n"
--"Enable shortcuts that allow you to quickly search for information on the web. "
--"For example, entering the shortcut <b>gg:KDE</b> will result in a search of the "
--"word <b>KDE</b> 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 <b>gg:KDE</b> will result in a "
-+"search of the word <b>KDE</b> on the Google(TM) search engine.\n"
- "</qt>"
- msgstr ""
- "<qt>\n"
--"假如選取這個選項，KDE 會讓你快速的搜尋網際網路上的資訊。例如，輸入捷徑 <b>gg:KDE</b> 就會使用 Google(TM) 搜尋引擎來搜尋 <b>"
--"KDE</b> 這個字。\n"
-+"假如選取這個選項，KDE 會讓你快速的搜尋網際網路上的資訊。例如，輸入捷徑 <b>gg:"
-+"KDE</b> 就會使用 Google(TM) 搜尋引擎來搜尋 <b>KDE</b> 這個字。\n"
- "</qt>"
- 
- #. 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 ""
- "<qt>\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 <b>None</b> 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 <b>None</b> from the list.\n"
- "</qt>"
- msgstr ""
- "<qt>\n"
--"選擇當您在輸入方塊中鍵入單字或語詞而非網址時用來搜尋的引擎。要停用這個功能請在此列表中選擇 <b>無</b>。\n"
-+"選擇當您在輸入方塊中鍵入單字或語詞而非網址時用來搜尋的引擎。要停用這個功能請"
-+"在此列表中選擇 <b>無</b>。\n"
- "</qt>"
- 
- #. 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 ""
- "<qt>\n"
--"Enter the URI that is used to do a search on the search engine here."
--"<br/>The whole text to be searched for can be specified as \\{@} or \\{0}."
--"<br/>\n"
-+"Enter the URI that is used to do a search on the search engine here.<br/>The "
-+"whole text to be searched for can be specified as \\{@} or \\{0}.<br/>\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."
--"<br/>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."
--"<br/>In addition it is possible to specify multiple references (names, numbers "
--"and strings) at once (\\{name1,name2,...,\"string\"})."
--"<br/>The first matching value (from the left) will be used as substitution "
--"value for the resulting URI."
--"<br/>A quoted string can be used as default value if nothing matches from the "
--"left of the reference list.\n"
-+"query string.<br/>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.<br/>In addition it is possible to specify multiple references (names, "
-+"numbers and strings) at once (\\{name1,name2,...,\"string\"}).<br/>The first "
-+"matching value (from the left) will be used as substitution value for the "
-+"resulting URI.<br/>A quoted string can be used as default value if nothing "
-+"matches from the left of the reference list.\n"
- "</qt>"
- msgstr ""
- "<qt>\n"
--"在這裡輸入一個 URI 以進行搜尋引擎搜尋。"
--"<br/>使用整個字串進行搜尋時，可以使用 \\{@} 或 \\{0} 來進行。"
--"<br/>\n"
--"我們建議您最好是使用 \\{@}，因為它會從結果字串中移除所有查詢變數 (name=value) 而 \\{0} 則會使用未修改的查詢字串。"
--"<br/>您可以使用 \\{1} ... \\{n} 來從查詢中指定某個字或 \\{name} 來在使用者查詢中指定特定數值的 'name=value'。"
--"<br/>另外也可以一次 (\\{name1,name2,...,\"string\"}) 指定多個參考 (names, numbers and "
--"strings)。"
--"<br/>第一個符合的數值(從左數來)會做為結果 URI 的數值。"
--"<br/>如果從參考列表中找不到符合項目，用引號框起來的數值也可以做為預設數值。\n"
-+"在這裡輸入一個 URI 以進行搜尋引擎搜尋。<br/>使用整個字串進行搜尋時，可以使用 "
-+"\\{@} 或 \\{0} 來進行。<br/>\n"
-+"我們建議您最好是使用 \\{@}，因為它會從結果字串中移除所有查詢變數 "
-+"(name=value) 而 \\{0} 則會使用未修改的查詢字串。<br/>您可以使用 \\{1} ... "
-+"\\{n} 來從查詢中指定某個字或 \\{name} 來在使用者查詢中指定特定數值的 "
-+"'name=value'。<br/>另外也可以一次 (\\{name1,name2,...,\"string\"}) 指定多個參"
-+"考 (names, numbers and strings)。<br/>第一個符合的數值(從左數來)會做為結果 "
-+"URI 的數值。<br/>如果從參考列表中找不到符合項目，用引號框起來的數值也可以做為"
-+"預設數值。\n"
- "</qt>"
- 
- #. i18n: file plugins/ikws/searchproviderdlg_ui.ui line 66
-@@ -258,12 +255,13 @@
- msgid ""
- "<qt>\n"
- "The shortcuts entered here can be used as a pseudo-URI scheme in KDE. For "
--"example, the shortcut <b>av</b> can be used as in <b>av</b>:<b>my search</b>\n"
-+"example, the shortcut <b>av</b> can be used as in <b>av</b>:<b>my search</"
-+"b>\n"
- "</qt>"
- msgstr ""
- "<qt>\n"
--"在這裡輸入的捷徑可被用來當作在 KDE 的 pseudo-URI scheme。 例如，捷徑 <em>av</em> 可被用來當作在 <em>av</em>"
--":<em>my search</em>\n"
-+"在這裡輸入的捷徑可被用來當作在 KDE 的 pseudo-URI scheme。 例如，捷徑 <em>av</"
-+"em> 可被用來當作在 <em>av</em>:<em>my search</em>\n"
- "</qt>"
- 
- #. 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 "
--"<b>gg:KDE</b> or <b>google:KDE</b>."
--"<p>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 <b>gg:KDE</b> or <b>google:KDE</b>.<p>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 計畫的資訊，您只要輸入 "
--"<b>gg:KDE</b> 或 <b>google:KDE</b>。"
--"<p>如果您選擇預設的搜尋引擎，一般的文字或語詞會在指定的搜尋引擎中查詢，只要將它們鍵入有內建此項功能的應用程式，像是 Konqueror。"
-+"在這個模組中您可以設定網頁捷徑功能。網頁捷徑讓您可以快速的在網際網路上搜尋或"
-+"查詢單字。例如：要使用 Google 引擎搜尋關於 KDE 計畫的資訊，您只要輸入 <b>gg:"
-+"KDE</b> 或 <b>google:KDE</b>。<p>如果您選擇預設的搜尋引擎，一般的文字或語詞會"
-+"在指定的搜尋引擎中查詢，只要將它們鍵入有內建此項功能的應用程式，像是 "
-+"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 <j_h_liau@yahoo.com.tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team:  <en@li.org>\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 <i>drag</i> "
--"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 <i>drag</i> items between the "
-+"available item list and the titlebar preview. Similarly, drag items within "
-+"the titlebar preview to re-position them."
- msgstr ""
--"若要增加或是移除標題列按鍵, 只要將你打算處理的小按鍵們從列表中<i>拉拉拉拉... 拉</i>過來放著預覽即可. 若是你打算移動他們的順序, "
--"也可以用相同的招數來搞定他們."
-+"若要增加或是移除標題列按鍵, 只要將你打算處理的小按鍵們從列表中<i>拉拉拉拉... "
-+"拉</i>過來放著預覽即可. 若是你打算移動他們的順序, 也可以用相同的招數來搞定他"
-+"們."
- 
- #: 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 ""
--"<h1>Window Manager Decoration</h1>"
--"<p>This module allows you to choose the window border decorations, as well as "
--"titlebar button positions and custom decoration options.</p>"
--"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."
--"<p>You can configure each theme in the \"Configure [...]\" tab. There are "
--"different options specific for each theme.</p>"
--"<p>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.</p>"
-+"<h1>Window Manager Decoration</h1><p>This module allows you to choose the "
-+"window border decorations, as well as titlebar button positions and custom "
-+"decoration options.</p>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.<p>You can configure each theme in the \"Configure [...]"
-+"\" tab. There are different options specific for each theme.</p><p>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.</p>"
- msgstr ""
--"<h1>視窗管理程式裝飾</h1>"
--"<p>這個模組讓您可以選擇視窗邊框的裝飾、標題列按鈕位置和自訂裝飾選項。</p>要為您的視窗裝飾選擇主題，按下它的名稱並且按下方的「套用」按鈕來套用您的選擇。如"
--"果您不想套用您的選擇，您可以按「重設」按鈕來放棄您的改變。"
--"<p>您可以在「設定 [...]」分頁中設定每一個主題。那裡有各個主題的不同選項。</p>"
--"<p>在「一般選項(如果可用)」中您可以核取「使用自訂標題按鈕位置」方塊來使用「按鈕」分頁。在「按鈕」分頁中您可以依您的喜好改變按鈕的位置。</p>"
-+"<h1>視窗管理程式裝飾</h1><p>這個模組讓您可以選擇視窗邊框的裝飾、標題列按鈕位"
-+"置和自訂裝飾選項。</p>要為您的視窗裝飾選擇主題，按下它的名稱並且按下方的「套"
-+"用」按鈕來套用您的選擇。如果您不想套用您的選擇，您可以按「重設」按鈕來放棄您"
-+"的改變。<p>您可以在「設定 [...]」分頁中設定每一個主題。那裡有各個主題的不同選"
-+"項。</p><p>在「一般選項(如果可用)」中您可以核取「使用自訂標題按鈕位置」方塊來"
-+"使用「按鈕」分頁。在「按鈕」分頁中您可以依您的喜好改變按鈕的位置。</p>"
- 
- #: 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) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Chinese Traditional <zh-l10n@linux.org.tw>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
-@@ -107,13 +106,14 @@
- #: kcm.cpp:81
- msgid ""
- "<h1>Window-specific Settings</h1> Here you can customize window settings "
--"specifically only for some windows. "
--"<p>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. <p>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 ""
--"<h1>特定視窗設定配置模組</h1>在這裏您可以自行設定特定視窗的一些設定。"
--"<p>請注意若您不是使用 KWin 作視窗管理器，這些設定不會生效。如果您正在使用其他的視窗管理器，請參考它的文件。"
-+"<h1>特定視窗設定配置模組</h1>在這裏您可以自行設定特定視窗的一些設定。<p>請注"
-+"意若您不是使用 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."
--"<p>\n"
-+"A single shortcut can be easily assigned or cleared using the two buttons. "
-+"Only shortcuts with modifiers can be used.<p>\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 <i>base</i>+(<i>list</i>"
--"), where base are modifiers and list is a list of keys."
--"<br>\n"
--"For example \"<b>Shift+Alt+(123) Shift+Ctrl+(ABC)</b>\" will first try <b>"
--"Shift+Alt+1</b>, then others with <b>Shift+Ctrl+C</b> as the last one."
-+"shortcut sets. One set is specified as <i>base</i>+(<i>list</i>), where base "
-+"are modifiers and list is a list of keys.<br>\n"
-+"For example \"<b>Shift+Alt+(123) Shift+Ctrl+(ABC)</b>\" will first try "
-+"<b>Shift+Alt+1</b>, then others with <b>Shift+Ctrl+C</b> as the last one."
- msgstr ""
--"您可以很容易地使用這兩個按鈕來加入/清除一組單快捷鍵。只有附上修飾鍵的快捷鍵才可使用。"
--"<p>\n"
--"系統是可以對單一快捷鍵指定多個按鈕組合的，但只有最先可用的一個會生效。而每組快捷鍵的在指定時要以空白分隔。格式為：<i>修飾鍵<i>+(<i>按鈕組合</i>"
--")。"
--"<br>\n"
--"例如 \"<b>Shift+Alt+(123) Shift+Ctrl+(ABC)</b>\"，會把先試一下<b>Shift+Alt+1</b>，不可用就試<b>"
--"Shift+Alt+2</b>...如此類推，最後是<b>Shift+Alt+C</b>。當中可用的一個會用作該單一快捷鍵。"
-+"您可以很容易地使用這兩個按鈕來加入/清除一組單快捷鍵。只有附上修飾鍵的快捷鍵才"
-+"可使用。<p>\n"
-+"系統是可以對單一快捷鍵指定多個按鈕組合的，但只有最先可用的一個會生效。而每組"
-+"快捷鍵的在指定時要以空白分隔。格式為：<i>修飾鍵<i>+(<i>按鈕組合</i>)。<br>\n"
-+"例如 \"<b>Shift+Alt+(123) Shift+Ctrl+(ABC)</b>\"，會把先試一下<b>Shift+Alt"
-+"+1</b>，不可用就試<b>Shift+Alt+2</b>...如此類推，最後是<b>Shift+Alt+C</b>。當"
-+"中可用的一個會用作該單一快捷鍵。"
- 
- #. 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:"
--"<ul>"
--"<li><em>Do Not Affect:</em> 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.</li>"
--"<li><em>Apply Initially:</em> The window property will be only set to the given "
--"value after the window is created. No further changes will be affected.</li>"
--"<li><em>Remember:</em> The value of the window property will be remembered and "
--"every time time the window is created, the last remembered value will be "
--"applied.</li>"
--"<li><em>Force:</em> The window property will be always forced to the given "
--"value.</li>"
--"<li><em>Apply Now:</em> The window property will be set to the given value "
--"immediately and will not be affected later (this action will be deleted "
--"afterwards).</li>"
--"<li><em>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).</li></ul>"
-+"Specify how the window property should be affected:<ul><li><em>Do Not Affect:"
-+"</em> 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.</li><li><em>Apply Initially:</em> The window "
-+"property will be only set to the given value after the window is created. No "
-+"further changes will be affected.</li><li><em>Remember:</em> The value of "
-+"the window property will be remembered and every time time the window is "
-+"created, the last remembered value will be applied.</li><li><em>Force:</em> "
-+"The window property will be always forced to the given value.</"
-+"li><li><em>Apply Now:</em> The window property will be set to the given "
-+"value immediately and will not be affected later (this action will be "
-+"deleted afterwards).</li><li><em>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).</li></ul>"
- msgstr ""
--"指定視窗屬性會如何被影響："
--"<ul>"
--"<li><em>不影響：</em>視窗屬性不會被影響。會使用預設的處理。指定作此值會禁止更多通用的設定生效。</li>"
--"<li><em>初始化套用：</em>視窗屬性只會在視窗被建立時設成指定值，不會再有其他變更會影響到。</li>"
--"<li><em>記住：</em>上一次的變更會被記住。每一次視窗被建立時，記住的設定就會被套用。</li>"
--"<li><em>強制：</em>視窗屬性何時都會強制設成該值。</li>"
--"<li><em>立刻生效：</em>視窗屬性會立刻設成指定值。不過稍後就會無效(這個動作之後會被刪除)。</li>"
--"<li><em>暫時強制：</em>視窗屬性會被強制設成該值直至它被隱藏。(這個動作在隱藏後會被刪除)</li></ul>"
-+"指定視窗屬性會如何被影響：<ul><li><em>不影響：</em>視窗屬性不會被影響。會使用"
-+"預設的處理。指定作此值會禁止更多通用的設定生效。</li><li><em>初始化套用：</"
-+"em>視窗屬性只會在視窗被建立時設成指定值，不會再有其他變更會影響到。</"
-+"li><li><em>記住：</em>上一次的變更會被記住。每一次視窗被建立時，記住的設定就"
-+"會被套用。</li><li><em>強制：</em>視窗屬性何時都會強制設成該值。</li><li><em>"
-+"立刻生效：</em>視窗屬性會立刻設成指定值。不過稍後就會無效(這個動作之後會被刪"
-+"除)。</li><li><em>暫時強制：</em>視窗屬性會被強制設成該值直至它被隱藏。(這個"
-+"動作在隱藏後會被刪除)</li></ul>"
- 
- #: ruleswidget.cpp:72
- msgid ""
--"Specify how the window property should be affected:"
--"<ul>"
--"<li><em>Do Not Affect:</em> 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.</li>"
--"<li><em>Force:</em> The window property will be always forced to the given "
--"value.</li>"
--"<li><em>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).</li></ul>"
-+"Specify how the window property should be affected:<ul><li><em>Do Not Affect:"
-+"</em> 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.</li><li><em>Force:</em> The window property "
-+"will be always forced to the given value.</li><li><em>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).</li></ul>"
- msgstr ""
--"指定視窗屬性會如何被影響："
--"<ul>"
--"<li><em>不影響：</em>視窗屬性不會被影響。會使用預設的處理。指定作此值會禁止更多通用的設定生效。</li>"
--"<li><em>強制：</em>視窗屬性何時都會強制設成該值。</li>"
--"<li><em>暫時強制：</em>視窗屬性會被強制設成該值直至它被隱藏。(這個動作在隱藏後會被刪除)</li></ul>"
-+"指定視窗屬性會如何被影響：<ul><li><em>不影響：</em>視窗屬性不會被影響。會使用"
-+"預設的處理。指定作此值會禁止更多通用的設定生效。</li><li><em>強制：</em>視窗"
-+"屬性何時都會強制設成該值。</li><li><em>暫時強制：</em>視窗屬性會被強制設成該"
-+"值直至它被隱藏。(這個動作在隱藏後會被刪除)</li></ul>"
- 
- #: 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) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Chinese Traditional <zh-l10n@linux.org.tw>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
-@@ -65,14 +64,16 @@
- #: main.cpp:190
- msgid ""
- "<h1>Window Behavior</h1> 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. "
--"<p>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. <p>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 ""
--"<h1>視窗行為</h1> 在這裡你可以自定當視窗被移動，改變大小或按下時視窗的行為。你也可以指定焦點策略和新視窗的配置策略。"
--"<p>請注意假如你不是使用 KWin 當作你的視窗管理員，這個設定將不會產生作用。假如你使用其他的視窗管理員，請參考它的文件來看如何自定視窗行為。"
-+"<h1>視窗行為</h1> 在這裡你可以自定當視窗被移動，改變大小或按下時視窗的行為。"
-+"你也可以指定焦點策略和新視窗的配置策略。<p>請注意假如你不是使用 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 <em>left</em> click into the titlebar or frame of an <em>active</em> "
--"window."
-+"Behavior on <em>left</em> click into the titlebar or frame of an <em>active</"
-+"em> window."
- msgstr "在<em>作用中</em>的視窗標題列或邊框上按下滑鼠<em>左鍵</em>的行為。"
- 
- #: mouse.cpp:255
- msgid ""
--"Behavior on <em>right</em> click into the titlebar or frame of an <em>"
--"active</em> window."
-+"Behavior on <em>right</em> click into the titlebar or frame of an "
-+"<em>active</em> window."
- msgstr "在<em>作用中</em>的視窗標題列或邊框上按下滑鼠<em>右鍵</em>的行為。"
- 
- #: mouse.cpp:276
- msgid ""
--"Behavior on <em>middle</em> click into the titlebar or frame of an <em>"
--"active</em> window."
-+"Behavior on <em>middle</em> click into the titlebar or frame of an "
-+"<em>active</em> window."
- msgstr "在<em>作用中</em>的視窗標題列或邊框上按下滑鼠<em>中鍵</em>的行為。"
- 
- #: mouse.cpp:285
- msgid ""
--"Behavior on <em>left</em> click into the titlebar or frame of an <em>"
--"inactive</em> window."
-+"Behavior on <em>left</em> click into the titlebar or frame of an "
-+"<em>inactive</em> window."
- msgstr "在<em>非作用中</em>的視窗標題列或邊框上按下滑鼠<em>左鍵</em>的行為。"
- 
- #: mouse.cpp:288
- msgid ""
--"Behavior on <em>right</em> click into the titlebar or frame of an <em>"
--"inactive</em> window."
-+"Behavior on <em>right</em> click into the titlebar or frame of an "
-+"<em>inactive</em> window."
- msgstr "在<em>非作用中</em>的視窗標題列或邊框上按下滑鼠<em>右鍵</em>的行為。"
- 
- #: 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 <em>middle</em> click into the titlebar or frame of an <em>"
--"inactive</em> window."
-+"Behavior on <em>middle</em> click into the titlebar or frame of an "
-+"<em>inactive</em> window."
- msgstr "在<em>非作用中</em>的視窗標題列或邊框上按下滑鼠<em>中鍵</em>的行為。"
- 
- #: 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. "
--"<ul> "
--"<li><em>Click to focus:</em> A window becomes active when you click into it. "
--"This is the behavior you might know from other operating systems.</li> "
--"<li><em>Focus follows mouse:</em> 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.</li> "
--"<li><em>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.</li> "
--"<li><em>Focus strictly under mouse:</em> Only the window under the mouse "
--"pointer is active. If the mouse points nowhere, nothing has focus. </ul>"
--"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 ""
--"焦點策略用來決定作用視窗，換句話說就是你工作的視窗。 "
--"<ul> "
--"<li><em>按鍵取得焦點：</em> 當你在它上面點選使得視窗變成作用中視窗。這種方式你可能在其他作業系統看過。</li>"
--"<li><em>焦點隨滑鼠移動：</em> "
--"只要移動滑鼠游標到一個正常視窗上它就會作用。新視窗會收到焦點，不需要您很明確的指向它們。這相當有用，假如你常用滑鼠。</li>"
--"<li><em>焦點在滑鼠之下：</em>在滑鼠下的視窗變成作用中。假如滑鼠游標那兒都不在，焦點會在游標最後經過的視窗上。新視窗不會自動收到焦點。</li> "
--"<li><em>焦點完全地在滑鼠之下：</em>只有在滑鼠游標下的視窗是作用的。假如滑鼠游標那兒都不在，則沒有東西有焦點。 </ul> "
--"請注意 [焦點在滑鼠之下] 和 [焦點完全地在滑鼠之下] 會使某些功能失效，如在 KDE 模式中以 Alt+Tab 來切換視窗對話盒。"
-+"can work in. <ul> <li><em>Click to focus:</em> A window becomes active when "
-+"you click into it. This is the behavior you might know from other operating "
-+"systems.</li> <li><em>Focus follows mouse:</em> 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.</li> <li><em>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.</li> <li><em>Focus "
-+"strictly under mouse:</em> Only the window under the mouse pointer is "
-+"active. If the mouse points nowhere, nothing has focus. </ul>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 ""
-+"焦點策略用來決定作用視窗，換句話說就是你工作的視窗。 <ul> <li><em>按鍵取得焦"
-+"點：</em> 當你在它上面點選使得視窗變成作用中視窗。這種方式你可能在其他作業系"
-+"統看過。</li><li><em>焦點隨滑鼠移動：</em> 只要移動滑鼠游標到一個正常視窗上它"
-+"就會作用。新視窗會收到焦點，不需要您很明確的指向它們。這相當有用，假如你常用"
-+"滑鼠。</li><li><em>焦點在滑鼠之下：</em>在滑鼠下的視窗變成作用中。假如滑鼠游"
-+"標那兒都不在，焦點會在游標最後經過的視窗上。新視窗不會自動收到焦點。</li> "
-+"<li><em>焦點完全地在滑鼠之下：</em>只有在滑鼠游標下的視窗是作用的。假如滑鼠游"
-+"標那兒都不在，則沒有東西有焦點。 </ul> 請注意 [焦點在滑鼠之下] 和 [焦點完全地"
-+"在滑鼠之下] 會使某些功能失效，如在 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 @@
- "<p>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.)"
--"<ul>"
--"<li><em>None:</em> Prevention is turned off and new windows always become "
--"activated.</li>"
--"<li><em>Low:</em> 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.</li>"
--"<li><em>Normal:</em> Prevention is enabled.</li>"
--"<li><em>High:</em> 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.</li>"
--"<li><em>Extreme:</em> All windows must be explicitly activated by the user.</li>"
--"</ul></p>"
--"<p>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.</p>"
--msgstr ""
--"<p>這個選項指定 KWin 要如何防止未預期開啟的新視窗取得焦點。（注意：這項功能在焦點追隨滑鼠或焦點相黏追隨滑鼠政策下無法運作。）"
--"<ul>"
--"<li><em>無：</em>關閉防堵功能，新視窗都能取得焦點。</li>"
--"<li><em>低：</em>啟用防堵功能；當某些視窗不支援取得優先權(underlying)機制而 KWin "
--"不能有效決定是否讓該視窗取得焦點時則讓它成為作用中視窗。這個設定值造成的結果可能比普通等級好，也可能不好，取決於應用程式自身。</li>"
--"<li><em>普通：</em>啟用防堵功能。</li>"
--"<li><em>高：</em>新視窗只有在當時沒有作用中的視窗或者它們自身屬於目前作用中的應用程式才能取得焦點。這個設定在不使用滑鼠焦點政策時可能不怎麼實用。<"
--"/li>"
--"<li><em>最高：</em>所有的視窗都需要經由使用者明定。</li></ul></p>"
--"<p>要防止失去焦點的視窗需要標記為隨選注意，亦即預設突顯它們的工作列項目。這可以在通知控制模組中改變。</p>"
-+"policies.)<ul><li><em>None:</em> Prevention is turned off and new windows "
-+"always become activated.</li><li><em>Low:</em> 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.</li><li><em>Normal:</em> Prevention is "
-+"enabled.</li><li><em>High:</em> 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."
-+"</li><li><em>Extreme:</em> All windows must be explicitly activated by the "
-+"user.</li></ul></p><p>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."
-+"</p>"
-+msgstr ""
-+"<p>這個選項指定 KWin 要如何防止未預期開啟的新視窗取得焦點。（注意：這項功能在"
-+"焦點追隨滑鼠或焦點相黏追隨滑鼠政策下無法運作。）<ul><li><em>無：</em>關閉防堵"
-+"功能，新視窗都能取得焦點。</li><li><em>低：</em>啟用防堵功能；當某些視窗不支"
-+"援取得優先權(underlying)機制而 KWin 不能有效決定是否讓該視窗取得焦點時則讓它"
-+"成為作用中視窗。這個設定值造成的結果可能比普通等級好，也可能不好，取決於應用"
-+"程式自身。</li><li><em>普通：</em>啟用防堵功能。</li><li><em>高：</em>新視窗"
-+"只有在當時沒有作用中的視窗或者它們自身屬於目前作用中的應用程式才能取得焦點。"
-+"這個設定在不使用滑鼠焦點政策時可能不怎麼實用。</li><li><em>最高：</em>所有的"
-+"視窗都需要經由使用者明定。</li></ul></p><p>要防止失去焦點的視窗需要標記為隨選"
-+"注意，亦即預設突顯它們的工作列項目。這可以在通知控制模組中改變。</p>"
- 
- #: 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. "
--"<ul> "
--"<li><em>Smart</em> will try to achieve a minimum overlap of windows</li> "
--"<li><em>Maximizing</em> 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.</li> "
--"<li><em>Cascade</em> will cascade the windows</li> "
--"<li><em>Random</em> will use a random position</li> "
--"<li><em>Centered</em> will place the window centered</li> "
--"<li><em>Zero-Cornered</em> will place the window in the top-left corner</li>"
--"</ul>"
--msgstr ""
--"配置策略決定一個新視窗會出現在桌面那裡。 "
--"<ul>"
--"<li><em>聰明</em> 會試著儘量不讓視窗重疊</li> "
--"<li><em>最大化</em> 會試著最大化每個視窗以填滿螢幕。它在選擇性影響某些使用指定視窗設定的視窗排列會很有幫助。</li> "
--"<li><em>重疊顯示</em> 會層疊視窗</li> "
--"<li><em>隨機放置</em> 會使用隨機位置</li> "
--"<li><em>置中</em>會將視窗置中</li> "
--"<li><em>零－角落</em>會將視窗置於左上角</li></ul>"
-+"The placement policy determines where a new window will appear on the "
-+"desktop. <ul> <li><em>Smart</em> will try to achieve a minimum overlap of "
-+"windows</li> <li><em>Maximizing</em> 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.</li> <li><em>Cascade</em> "
-+"will cascade the windows</li> <li><em>Random</em> will use a random "
-+"position</li> <li><em>Centered</em> will place the window centered</li> "
-+"<li><em>Zero-Cornered</em> will place the window in the top-left corner</"
-+"li></ul>"
-+msgstr ""
-+"配置策略決定一個新視窗會出現在桌面那裡。 <ul><li><em>聰明</em> 會試著儘量不讓"
-+"視窗重疊</li> <li><em>最大化</em> 會試著最大化每個視窗以填滿螢幕。它在選擇性"
-+"影響某些使用指定視窗設定的視窗排列會很有幫助。</li> <li><em>重疊顯示</em> 會"
-+"層疊視窗</li> <li><em>隨機放置</em> 會使用隨機位置</li> <li><em>置中</em>會將"
-+"視窗置中</li> <li><em>零－角落</em>會將視窗置於左上角</li></ul>"
- 
- #: 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 ""
--"<qt><b>It seems that alpha channel support is not available.</b>"
--"<br>"
--"<br>Please make sure you have <a href=\"http://www.freedesktop.org/\">"
--"Xorg &ge; 6.8</a>, and installed the kompmgr that came with kwin."
--"<br>Also, make sure you have the following entries in your XConfig (e.g. "
--"/etc/X11/xorg.conf):"
--"<br>"
--"<br><i>Section \"Extensions\""
--"<br>Option \"Composite\" \"Enable\""
--"<br>EndSection</i>"
--"<br>"
--"<br>And if your GPU provides hardware-accelerated Xrender support (mainly "
--"nVidia cards):"
--"<br>"
--"<br><i>Option     \"RenderAccel\" \"true\"</i>"
--"<br>In <i>Section \"Device\"</i></qt>"
--msgstr ""
--"<qt><b>似乎不支援 alpha 色頻。</b>"
--"<br>"
--"<br>請確定您具備 <a href=\"http://www.freedesktop.org/\">Xorg &ge; 6.8</a>"
--"，並且安裝了 kwin 及 kompmgr。"
--"<br>並且，請確定在您的 XConfig 有下列項目(e.g. /etc/X11/xorg.conf):"
--"<br>"
--"<br><i>Section \"Extensions\""
--"<br>Option \"Composite\" \"Enable\""
--"<br>EndSection</i>"
--"<br>"
--"<br>And if your GPU provides hardware-accelerated Xrender support (mainly "
--"nVidia cards):"
--"<br>"
--"<br><i>Option     \"RenderAccel\" \"true\"</i>"
--"<br>In <i>Section \"Device\"</i></qt>"
-+"<qt><b>It seems that alpha channel support is not available.</"
-+"b><br><br>Please make sure you have <a href=\"http://www.freedesktop.org/"
-+"\">Xorg &ge; 6.8</a>, and installed the kompmgr that came with kwin."
-+"<br>Also, make sure you have the following entries in your XConfig (e.g. /"
-+"etc/X11/xorg.conf):<br><br><i>Section \"Extensions\"<br>Option \"Composite\" "
-+"\"Enable\"<br>EndSection</i><br><br>And if your GPU provides hardware-"
-+"accelerated Xrender support (mainly nVidia cards):<br><br><i>Option     "
-+"\"RenderAccel\" \"true\"</i><br>In <i>Section \"Device\"</i></qt>"
-+msgstr ""
-+"<qt><b>似乎不支援 alpha 色頻。</b><br><br>請確定您具備 <a href=\"http://www."
-+"freedesktop.org/\">Xorg &ge; 6.8</a>，並且安裝了 kwin 及 kompmgr。<br>並且，"
-+"請確定在您的 XConfig 有下列項目(e.g. /etc/X11/xorg.conf):<br><br><i>Section "
-+"\"Extensions\"<br>Option \"Composite\" \"Enable\"<br>EndSection</"
-+"i><br><br>And if your GPU provides hardware-accelerated Xrender support "
-+"(mainly nVidia cards):<br><br><i>Option     \"RenderAccel\" \"true\"</"
-+"i><br>In <i>Section \"Device\"</i></qt>"
- 
- #: windows.cpp:1246
- msgid "Apply translucency only to decoration"
-@@ -1003,6 +1017,8 @@
- 
- #: windows.cpp:1624
- msgid ""
--"<qt>Translucency support is new and may cause problems"
--"<br> including crashes (sometimes the translucency engine, seldom even X).</qt>"
--msgstr "<qt>透明功能是很新的，因而可能造成問題<br> 甚至當機（有時是透明引擎，偶爾是 X）。</qt>"
-+"<qt>Translucency support is new and may cause problems<br> including crashes "
-+"(sometimes the translucency engine, seldom even X).</qt>"
-+msgstr ""
-+"<qt>透明功能是很新的，因而可能造成問題<br> 甚至當機（有時是透明引擎，偶爾是 "
-+"X）。</qt>"
-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 <chaoweilun@gmail.com>\n"
- "Language-Team:  <en@li.org>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
-@@ -37,7 +37,8 @@
- msgstr ""
- "<h1>忙碌指標</h1>\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) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Chinese Traditional <zh-l10n@linux.org.tw>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
-@@ -972,12 +971,12 @@
- #, no-c-format
- msgid ""
- "<h1>Keyboard Layout</h1> 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 ""
--"<h1>鍵盤配置</h1> "
--"您可以在這邊選擇鍵盤的配置與型號。「型號」對應到連接在您電腦上鍵盤的類型，而這是用來定義「每個按鍵的作用」的，所以不同國家會有所不同。"
-+"<h1>鍵盤配置</h1> 您可以在這邊選擇鍵盤的配置與型號。「型號」對應到連接在您電"
-+"腦上鍵盤的類型，而這是用來定義「每個按鍵的作用」的，所以不同國家會有所不同。"
- 
- #. 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."
--"<p>You can configure NumLock to be turned on or off, or configure KDE not to "
--"set NumLock state."
-+"startup.<p>You can configure NumLock to be turned on or off, or configure "
-+"KDE not to set NumLock state."
- msgstr ""
--"如果能夠支援的話，這個項目能夠讓您設定在啟動 KDE 後數字鎖定鍵的狀態。"
--"<p> 您可以把數字鎖定設定為開啟或者是關閉，或者是不要讓 KDE 去調整數字鎖定的狀態。"
-+"如果能夠支援的話，這個項目能夠讓您設定在啟動 KDE 後數字鎖定鍵的狀態。<p> 您可"
-+"以把數字鎖定設定為開啟或者是關閉，或者是不要讓 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."
--"<p>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.<p>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 "
--"喇叭的聲響。當您使用非機械式鍵盤的話，或者是該鍵盤在打字輸入資料時發出的聲音相當柔軟的話，這可能是相當有用的。"
--"<p>調整該拉條進行音量調整動作，把音量設定為 "
--"<p>您可以拉動滑鈕或按下飛梭方塊的上/下箭頭來改變按鍵反饋的音量。設定音量為 0% 的話，就是關閉按鍵音量的設定。"
-+"如果能夠支援的話，這個選項能夠讓您在按鍵盤上的按鍵時聽到來自 PC 喇叭的聲響。"
-+"當您使用非機械式鍵盤的話，或者是該鍵盤在打字輸入資料時發出的聲音相當柔軟的"
-+"話，這可能是相當有用的。<p>調整該拉條進行音量調整動作，把音量設定為 <p>您可以"
-+"拉動滑鈕或按下飛梭方塊的上/下箭頭來改變按鍵反饋的音量。設定音量為 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 <j_h_liau@yahoo.com.tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\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."
--"<p>Note that some applications may not be translated to your languages; in this "
--"case, they will automatically fall back to US English."
-+"<p>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 "
--"的地方找到很多種語言的翻譯檔套件。"
--"<p>注意有些應用程式可能沒有翻譯成您的語言；在這種情形下它們會自動回復為美式英語。"
-+"您可以在這邊選擇 KDE 所使用的語言。如果列表中的第一個語系無法使用，會使用第二"
-+"個語系代替，並以此類推。如果只有美式英語可用，可能是沒有安裝其他翻譯檔。您可"
-+"以從您取得 KDE 的地方找到很多種語言的翻譯檔套件。<p>注意有些應用程式可能沒有"
-+"翻譯成您的語言；在這種情形下它們會自動回復為美式英語。"
- 
- #: 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)."
--"<p>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).<p>Note that the decimal separator used to "
-+"display monetary values has to be set separately (see the 'Money' tab)."
- msgstr ""
--"您可以在這邊定義顯示數字時所使用的小數點分隔符號 (一般為點號)。"
--"<p>注意，用來顯示金錢數值的小數點分隔符號必須另外設定 (請參照「金錢」頁)。"
-+"您可以在這邊定義顯示數字時所使用的小數點分隔符號 (一般為點號)。<p>注意，用來"
-+"顯示金錢數值的小數點分隔符號必須另外設定 (請參照「金錢」頁)。"
- 
- #: localenum.cpp:174
- msgid ""
--"Here you can define the thousands separator used to display numbers."
--"<p>Note that the thousands separator used to display monetary values has to be "
--"set separately (see the 'Money' tab)."
--msgstr "您可以在這邊定義顯示數字時所使用的千分位分隔符號。<p>注意，用來顯示金錢數值的千分位分隔符號必須另外設定 (請參照「金錢」頁)。"
-+"Here you can define the thousands separator used to display numbers.<p>Note "
-+"that the thousands separator used to display monetary values has to be set "
-+"separately (see the 'Money' tab)."
-+msgstr ""
-+"您可以在這邊定義顯示數字時所使用的千分位分隔符號。<p>注意，用來顯示金錢數值的"
-+"千分位分隔符號必須另外設定 (請參照「金錢」頁)。"
- 
- #: 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."
--"<p>Please note that the Euro symbol may not be available on your system, "
--"depending on the distribution you use."
--msgstr "您可以在這邊輸入您一般使用的貨幣符號，例如 $ 或 DM 。<p>請注意，歐元符號可能無法在您的系統上使用，這與您使用的版本有關。"
-+"Here you can enter your usual currency symbol, e.g. $ or DM.<p>Please note "
-+"that the Euro symbol may not be available on your system, depending on the "
-+"distribution you use."
-+msgstr ""
-+"您可以在這邊輸入您一般使用的貨幣符號，例如 $ 或 DM 。<p>請注意，歐元符號可能"
-+"無法在您的系統上使用，這與您使用的版本有關。"
- 
- #: localemon.cpp:285
- msgid ""
- "Here you can define the decimal separator used to display monetary values."
- "<p>Note that the decimal separator used to display other numbers has to be "
- "defined separately (see the 'Numbers' tab)."
--msgstr "您可以在這邊定義顯示金錢數值時的小數分隔符號。<p>注意，用於顯示其他數字的小數分隔符號必須另外定義 (請參照「數字」頁)。"
-+msgstr ""
-+"您可以在這邊定義顯示金錢數值時的小數分隔符號。<p>注意，用於顯示其他數字的小數"
-+"分隔符號必須另外定義 (請參照「數字」頁)。"
- 
- #: localemon.cpp:293
- msgid ""
- "Here you can define the thousands separator used to display monetary values."
- "<p>Note that the thousands separator used to display other numbers has to be "
- "defined separately (see the 'Numbers' tab)."
--msgstr "您可以在這邊定義顯示金錢數值時的千分位分隔符號。<p>注意，用於顯示其他數字的千分位分隔符號必須另外設定定義 (請參照「數字」頁)。"
-+msgstr ""
-+"您可以在這邊定義顯示金錢數值時的千分位分隔符號。<p>注意，用於顯示其他數字的千"
-+"分位分隔符號必須另外設定定義 (請參照「數字」頁)。"
- 
- #: localemon.cpp:301
- msgid ""
--"This determines the number of fract digits for monetary values, i.e. the number "
--"of digits you find <em>behind</em> the decimal separator. Correct value is 2 "
--"for almost all people."
--msgstr "這決定了要金錢數值中顯示的小數位數，也就是您可以在小數點<em>後面</em>看到的位數。一般而言都會設為 2。"
-+"This determines the number of fract digits for monetary values, i.e. the "
-+"number of digits you find <em>behind</em> the decimal separator. Correct "
-+"value is 2 for almost all people."
-+msgstr ""
-+"這決定了要金錢數值中顯示的小數位數，也就是您可以在小數點<em>後面</em>看到的位"
-+"數。一般而言都會設為 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 ""
--"<p>The text in this textbox will be used to format time strings. The sequences "
--"below will be replaced:</p>"
--"<table>"
--"<tr>"
--"<td><b>HH</b></td>"
--"<td>The hour as a decimal number using a 24-hour clock (00-23).</td></tr>"
--"<tr>"
--"<td><b>hH</b></td>"
--"<td>The hour (24-hour clock) as a decimal number (0-23).</td></tr>"
--"<tr>"
--"<td><b>PH</b></td>"
--"<td>The hour as a decimal number using a 12-hour clock (01-12).</td></tr>"
--"<tr>"
--"<td><b>pH</b></td>"
--"<td>The hour (12-hour clock) as a decimal number (1-12).</td></tr>"
--"<tr>"
--"<td><b>MM</b></td>"
--"<td>The minutes as a decimal number (00-59).</td>"
--"<tr>"
--"<tr>"
--"<td><b>SS</b></td>"
--"<td>The seconds as a decimal number (00-59).</td></tr>"
--"<tr>"
--"<td><b>AMPM</b></td>"
--"<td>Either \"am\" or \"pm\" according to the given time value. Noon is treated "
--"as \"pm\" and midnight as \"am\".</td></tr></table>"
--msgstr ""
--"<p>這個文字方塊中的文字是用於指定時間字串的。下面的串列將會被置換：</p>"
--"<table>"
--"<tr>"
--"<td><b>HH</b></td>"
--"<td>使用二位數的24小時制顯示 (00-23)。</td></tr>"
--"<tr>"
--"<td><b>hH</b></td>"
--"<td>使用24小時制顯示 (0-23)。</td></tr>"
--"<tr>"
--"<td><b>PH</b></td>"
--"<td>使用二位數的12小時制顯示 (01-12)。</td></tr>"
--"<tr>"
--"<td><b>pH</b></td>"
--"<td>使用12小時制顯示 (1-12)。</td></tr>"
--"<tr>"
--"<td><b>MM</b></td>"
--"<td>使用二位數顯示分 (00-59)。</td>"
--"<tr>"
--"<tr>"
--"<td><b>SS</b></td>"
--"<td>使用二位數顯示秒 (00-59)。</td></tr>"
--"<tr>"
--"<td><b>AMPM</b></td>"
--"<td>給定「上午」或「下午」。中午被當作「下午」，而午夜當作「早上」處理。</td></tr></table>"
-+"<p>The text in this textbox will be used to format time strings. The "
-+"sequences below will be replaced:</p><table><tr><td><b>HH</b></td><td>The "
-+"hour as a decimal number using a 24-hour clock (00-23).</td></"
-+"tr><tr><td><b>hH</b></td><td>The hour (24-hour clock) as a decimal number (0-"
-+"23).</td></tr><tr><td><b>PH</b></td><td>The hour as a decimal number using a "
-+"12-hour clock (01-12).</td></tr><tr><td><b>pH</b></td><td>The hour (12-hour "
-+"clock) as a decimal number (1-12).</td></tr><tr><td><b>MM</b></td><td>The "
-+"minutes as a decimal number (00-59).</td><tr><tr><td><b>SS</b></td><td>The "
-+"seconds as a decimal number (00-59).</td></tr><tr><td><b>AMPM</b></"
-+"td><td>Either \"am\" or \"pm\" according to the given time value. Noon is "
-+"treated as \"pm\" and midnight as \"am\".</td></tr></table>"
-+msgstr ""
-+"<p>這個文字方塊中的文字是用於指定時間字串的。下面的串列將會被置換：</"
-+"p><table><tr><td><b>HH</b></td><td>使用二位數的24小時制顯示 (00-23)。</td></"
-+"tr><tr><td><b>hH</b></td><td>使用24小時制顯示 (0-23)。</td></"
-+"tr><tr><td><b>PH</b></td><td>使用二位數的12小時制顯示 (01-12)。</td></"
-+"tr><tr><td><b>pH</b></td><td>使用12小時制顯示 (1-12)。</td></"
-+"tr><tr><td><b>MM</b></td><td>使用二位數顯示分 (00-59)。</"
-+"td><tr><tr><td><b>SS</b></td><td>使用二位數顯示秒 (00-59)。</td></"
-+"tr><tr><td><b>AMPM</b></td><td>給定「上午」或「下午」。中午被當作「下午」，而"
-+"午夜當作「早上」處理。</td></tr></table>"
- 
- #: localetime.cpp:487
- msgid ""
--"<table>"
--"<tr>"
--"<td><b>YYYY</b></td>"
--"<td>The year with century as a decimal number.</td></tr>"
--"<tr>"
--"<td><b>YY</b></td>"
--"<td>The year without century as a decimal number (00-99).</td></tr>"
--"<tr>"
--"<td><b>MM</b></td>"
--"<td>The month as a decimal number (01-12).</td></tr>"
--"<tr>"
--"<td><b>mM</b></td>"
--"<td>The month as a decimal number (1-12).</td></tr>"
--"<tr>"
--"<td><b>SHORTMONTH</b></td>"
--"<td>The first three characters of the month name. </td></tr>"
--"<tr>"
--"<td><b>MONTH</b></td>"
--"<td>The full month name.</td></tr>"
--"<tr>"
--"<td><b>DD</b></td>"
--"<td>The day of month as a decimal number (01-31).</td></tr>"
--"<tr>"
--"<td><b>dD</b></td>"
--"<td>The day of month as a decimal number (1-31).</td></tr>"
--"<tr>"
--"<td><b>SHORTWEEKDAY</b></td>"
--"<td>The first three characters of the weekday name.</td></tr>"
--"<tr>"
--"<td><b>WEEKDAY</b></td>"
--"<td>The full weekday name.</td></tr></table>"
--msgstr ""
--"<table>"
--"<tr>"
--"<td><b>YYYY</b></td>"
--"<td>含世紀數值的年份。</td></tr>"
--"<tr>"
--"<td><b>YY</b></td>"
--"<td>不含世紀數值的年份 (00-99)。</td></tr>"
--"<tr>"
--"<td><b>MM</b></td>"
--"<td>使用二位數顯示月份 (01-12)。</td></tr>"
--"<tr>"
--"<td><b>mM</b></td>"
--"<td>使用數字顯示月份 (1-12)。</td></tr>"
--"<tr>"
--"<td><b>SHORTMONTH</b></td>"
--"<td>使用月份名稱的前三個字元顯示月份。</td></tr>"
--"<tr>"
--"<td><b>MONTH</b></td>"
--"<td>使用完整月份名稱顯示月份。</td></tr>"
--"<tr>"
--"<td><b>DD</b></td>"
--"<td>使用二位數字顯示每月日數 (01-31)。</td></tr>"
--"<tr>"
--"<td><b>dD</b></td>"
--"<td>使用數字顯示每月日數 (1-31)。</td></tr>"
--"<tr>"
--"<td><b>SHORTWEEKDAY</b></td>"
--"<td>使用星期名稱的前三個字元顯示星期。</td></tr>"
--"<tr>"
--"<td><b>WEEKDAY</b></td>"
--"<td>使用完整星期名稱顯示星期。</td></tr></table>"
-+"<table><tr><td><b>YYYY</b></td><td>The year with century as a decimal number."
-+"</td></tr><tr><td><b>YY</b></td><td>The year without century as a decimal "
-+"number (00-99).</td></tr><tr><td><b>MM</b></td><td>The month as a decimal "
-+"number (01-12).</td></tr><tr><td><b>mM</b></td><td>The month as a decimal "
-+"number (1-12).</td></tr><tr><td><b>SHORTMONTH</b></td><td>The first three "
-+"characters of the month name. </td></tr><tr><td><b>MONTH</b></td><td>The "
-+"full month name.</td></tr><tr><td><b>DD</b></td><td>The day of month as a "
-+"decimal number (01-31).</td></tr><tr><td><b>dD</b></td><td>The day of month "
-+"as a decimal number (1-31).</td></tr><tr><td><b>SHORTWEEKDAY</b></td><td>The "
-+"first three characters of the weekday name.</td></tr><tr><td><b>WEEKDAY</b></"
-+"td><td>The full weekday name.</td></tr></table>"
-+msgstr ""
-+"<table><tr><td><b>YYYY</b></td><td>含世紀數值的年份。</td></"
-+"tr><tr><td><b>YY</b></td><td>不含世紀數值的年份 (00-99)。</td></"
-+"tr><tr><td><b>MM</b></td><td>使用二位數顯示月份 (01-12)。</td></"
-+"tr><tr><td><b>mM</b></td><td>使用數字顯示月份 (1-12)。</td></"
-+"tr><tr><td><b>SHORTMONTH</b></td><td>使用月份名稱的前三個字元顯示月份。</"
-+"td></tr><tr><td><b>MONTH</b></td><td>使用完整月份名稱顯示月份。</td></"
-+"tr><tr><td><b>DD</b></td><td>使用二位數字顯示每月日數 (01-31)。</td></"
-+"tr><tr><td><b>dD</b></td><td>使用數字顯示每月日數 (1-31)。</td></"
-+"tr><tr><td><b>SHORTWEEKDAY</b></td><td>使用星期名稱的前三個字元顯示星期。</"
-+"td></tr><tr><td><b>WEEKDAY</b></td><td>使用完整星期名稱顯示星期。</td></tr></"
-+"table>"
- 
- #: localetime.cpp:508
- msgid ""
- "<p>The text in this textbox will be used to format long dates. The sequences "
- "below will be replaced:</p>"
--msgstr "<p>這個文字方塊中的文字用以顯示長格式的日期。下面的串列將會被取代：</p>"
-+msgstr ""
-+"<p>這個文字方塊中的文字用以顯示長格式的日期。下面的串列將會被取代：</p>"
- 
- #: localetime.cpp:514
- msgid ""
--"<p>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:</p>"
--msgstr "<p>這個文字方塊中的文字用以顯示短格式的日期。一般在列出檔案時使用。下面的串列將會被取代：</p>"
-+"<p>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:</p>"
-+msgstr ""
-+"<p>這個文字方塊中的文字用以顯示短格式的日期。一般在列出檔案時使用。下面的串列"
-+"將會被取代：</p>"
- 
- #: localetime.cpp:521
- msgid ""
--"<p>This option determines which day will be considered as the first one of the "
--"week.</p>"
-+"<p>This option determines which day will be considered as the first one of "
-+"the week.</p>"
- msgstr "<p>這個選擇決定了那一天會被認為是一週的第一天。</p>"
- 
- #: localetime.cpp:528
- msgid ""
--"<p>This option determines whether possessive form of month names should be used "
--"in dates.</p>"
-+"<p>This option determines whether possessive form of month names should be "
-+"used in dates.</p>"
- msgstr "<p>這個選擇決定了在日期中是否使用月名稱的所有格。</p>"
- 
- #: 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) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Traditional Chinese <zh_l10n@linux.org.tw>\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 <tzerming@gmail.com>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Chinese Traditional <kde@linux.org.tw>\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 <j_h_liau@yahoo.com.tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
-@@ -29,21 +29,16 @@
- #: knotify.cpp:56
- msgid ""
- "<h1>System Notifications</h1>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:"
--"<ul>"
--"<li>As the application was originally designed."
--"<li>With a beep or other noise."
--"<li>Via a popup dialog box with additional information."
--"<li>By recording the event in a logfile without any additional visual or "
--"audible alert.</ul>"
-+"you will be notified when certain events occur. There are several choices as "
-+"to how you are notified:<ul><li>As the application was originally designed."
-+"<li>With a beep or other noise.<li>Via a popup dialog box with additional "
-+"information.<li>By recording the event in a logfile without any additional "
-+"visual or audible alert.</ul>"
- msgstr ""
--"<h1>系統通知</h1>KDE 提供您極大的控制權，可供設定當發生特定事件時系統應如何向您通知。相關的通知方式有以下幾種選擇: "
--"<ul>"
--"<li>按照應用程式的原始設計方式。"
--"<li>發出嗶聲或其他聲響。"
--"<li>顯示即現對話方塊並帶出其他資訊。 "
--"<li>將事件記錄至記錄檔，而不另外執行視覺或聲音警示。</ul>"
-+"<h1>系統通知</h1>KDE 提供您極大的控制權，可供設定當發生特定事件時系統應如何向"
-+"您通知。相關的通知方式有以下幾種選擇: <ul><li>按照應用程式的原始設計方式。"
-+"<li>發出嗶聲或其他聲響。<li>顯示即現對話方塊並帶出其他資訊。 <li>將事件記錄至"
-+"記錄檔，而不另外執行視覺或聲音警示。</ul>"
- 
- #: 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 <stanley18fan0k@yahoo.com.hk>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
-@@ -30,73 +30,78 @@
- 
- #: kcmperformance.cpp:91
- msgid ""
--"<h1>Konqueror Performance</h1> You can configure several settings that improve "
--"Konqueror performance here. These include options for reusing already running "
--"instances and for keeping instances preloaded."
-+"<h1>Konqueror Performance</h1> You can configure several settings that "
-+"improve Konqueror performance here. These include options for reusing "
-+"already running instances and for keeping instances preloaded."
- msgstr ""
--"<h1>Konqueror Performance</h1>您可以設定數種組態來增加 Konqueror 的效能。這些組態包括重用已執行實體和預先載入實體"
-+"<h1>Konqueror Performance</h1>您可以設定數種組態來增加 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."
--"<p>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."
-+"<p>Be aware that this also means that, if something goes wrong, all your "
-+"file browsing windows will be closed simultaneously"
- msgstr ""
--"這個選項啟動後，Konqueror 瀏覽檔案時，無論您開多少瀏覽視窗，只會有一個實體存在於記憶體中，如此，便能減少資源的需求。(針對瀏覽檔案時)"
--"<p>這也意味著，如果一但發生錯誤，您所有的瀏覽視窗將會一併同時被關閉。"
-+"這個選項啟動後，Konqueror 瀏覽檔案時，無論您開多少瀏覽視窗，只會有一個實體存"
-+"在於記憶體中，如此，便能減少資源的需求。(針對瀏覽檔案時)<p>這也意味著，如果一"
-+"但發生錯誤，您所有的瀏覽視窗將會一併同時被關閉。"
- 
- #: 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."
--"<p>Be aware that this also means that, if something goes wrong, all your "
--"browsing windows will be closed simultaneously."
--msgstr ""
--"這個選項啟動後，無論您開多少瀏覽視窗，Konqueror 只會有一個實體存於記憶體中，如此，便能減少資源的需求。"
--"<p>這也意味著，如果一但發生錯誤，您所有的瀏覽視窗將會一併同時被關閉。"
-+"memory of your computer at any moment, no matter how many browsing windows "
-+"you open, thus reducing resource requirements.<p>Be aware that this also "
-+"means that, if something goes wrong, all your browsing windows will be "
-+"closed simultaneously."
-+msgstr ""
-+"這個選項啟動後，無論您開多少瀏覽視窗，Konqueror 只會有一個實體存於記憶體中，"
-+"如此，便能減少資源的需求。<p>這也意味著，如果一但發生錯誤，您所有的瀏覽視窗將"
-+"會一併同時被關閉。"
- 
- #: 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."
--"<p>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 關掉視窗後，可以保存實體在記憶體中，保存的數量取決於這個選項的值。"
--"<p>當需要一個新的 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.<p>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 關掉視窗後，可以保存實體在記憶體中，保存的數量取決於這"
-+"個選項的值。<p>當需要一個新的 Konqueror 實體時，預先被保存在記憶體的實體可以"
-+"被重用，加快回應的速度。"
- 
- #: konqueror.cpp:69
- msgid ""
--"If enabled, an instance of Konqueror will be preloaded after the ordinary KDE "
--"startup sequence."
--"<p>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 啓動後被預先載入。"
--"<p>雖然可以減少首次啓動 Konqueror 所需的時間，但也會減慢 KDE 啓動速度。(不過，您仍然可以在載入期間使用電腦，所以您可能没有注意到)"
-+"If enabled, an instance of Konqueror will be preloaded after the ordinary "
-+"KDE startup sequence.<p>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 啓動後被預先載入。<p>雖然可以減少"
-+"首次啓動 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."
--"<p><b>Warning:</b> In some cases, it is actually possible that this will reduce "
--"perceived performance."
--msgstr ""
--"這個選項啟動後，在任何時候 KDE 都會盡力預留一個 Konqueror 實體，(即只要沒有 Konqueror 實體時，KDE 會在背景載入一個)這樣 "
--"Konqueror 視窗在任何時候都會快速開啓。"
--"<p><b>警告：</b>在一些情況下，這會使性能有所下降。"
-+"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.<p><b>Warning:</b> In "
-+"some cases, it is actually possible that this will reduce perceived "
-+"performance."
-+msgstr ""
-+"這個選項啟動後，在任何時候 KDE 都會盡力預留一個 Konqueror 實體，(即只要沒有 "
-+"Konqueror 實體時，KDE 會在背景載入一個)這樣 Konqueror 視窗在任何時候都會快速"
-+"開啓。<p><b>警告：</b>在一些情況下，這會使性能有所下降。"
- 
- #. i18n: file konqueror_ui.ui line 27
- #: rc.cpp:3
-@@ -162,34 +167,37 @@
- #: rc.cpp:33
- #, no-c-format
- msgid ""
--"<b>WARNING:</b> This option may in rare cases lead to various problems. Consult "
--"the What's This? (Shift+F1) help for details."
--msgstr "<b>警告：</b>在一些罕見的情況下，這個選項會導致某些問題。詳細資料請查詢「這是什麼」(Shift+F1)。"
-+"<b>WARNING:</b> This option may in rare cases lead to various problems. "
-+"Consult the What's This? (Shift+F1) help for details."
-+msgstr ""
-+"<b>警告：</b>在一些罕見的情況下，這個選項會導致某些問題。詳細資料請查詢「這是"
-+"什麼」(Shift+F1)。"
- 
- #: system.cpp:34
- msgid ""
- "<p>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.</p>"
--"<p>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.).</p>"
--"<p>Changes of system configuration mostly happen by (un)installing "
--"applications. It is therefore recommended to turn this option temporarily off "
--"while (un)installing applications.</p>"
--"<p>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).</p>"
--msgstr ""
--"<p>KDE 啓動時需要對系統組態進行檢查(如MIME "
--"類型，已安裝的程式等)，如果組態在上一次啓動之後變更過，那麼它的快取(KsyCoCa)便需要被更新。</p>"
--"<p>這個選項可以延遲檢查動作，使 KDE "
--"啓動時不再對舆組態有關的目錄進行掃描。如此，便可以加快啓動速度。不過在一些罕見的情況下，變更需要在檢查之前生效，這樣做會導致某些問題(如 K "
--"選單不見了程式，應用程式報告所需 MIME 類型不存在等)。</p>"
--"<p>由於這種變更大部分是由安裝/反安裝應用程式所致的，所以我們建議在那時候暫時關閉選項。</p>"
--"<p>正因如此，我們不建議您使用。選項啓動時 KDE 錯誤控制程式將不會提供回溯追蹤。(您將需要關閉選項，然後重現錯誤，或開啓錯誤控制程式的開發者模式)</p>"
-+"changed since the last time, the system configuration cache (KSyCoCa) needs "
-+"to be updated.</p><p>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.).</p><p>Changes of system "
-+"configuration mostly happen by (un)installing applications. It is therefore "
-+"recommended to turn this option temporarily off while (un)installing "
-+"applications.</p><p>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).</p>"
-+msgstr ""
-+"<p>KDE 啓動時需要對系統組態進行檢查(如MIME 類型，已安裝的程式等)，如果組態在"
-+"上一次啓動之後變更過，那麼它的快取(KsyCoCa)便需要被更新。</p><p>這個選項可以"
-+"延遲檢查動作，使 KDE 啓動時不再對舆組態有關的目錄進行掃描。如此，便可以加快啓"
-+"動速度。不過在一些罕見的情況下，變更需要在檢查之前生效，這樣做會導致某些問題"
-+"(如 K 選單不見了程式，應用程式報告所需 MIME 類型不存在等)。</p><p>由於這種變"
-+"更大部分是由安裝/反安裝應用程式所致的，所以我們建議在那時候暫時關閉選項。</"
-+"p><p>正因如此，我們不建議您使用。選項啓動時 KDE 錯誤控制程式將不會提供回溯追"
-+"蹤。(您將需要關閉選項，然後重現錯誤，或開啓錯誤控制程式的開發者模式)</p>"
-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 <j_h_liau@yahoo.com.tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\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 ""
- "<h1>Printers</h1>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.)"
--"<br/> 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.)<br/> 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 ""
--"<h1>印表機</h1> KDE 列印管理程式是 KDEPrint "
--"的一部分，作為您的作業系統(OS)實際列印子系統的介面。雖然它本身的確在這些子系統上加入了某些功能，KDEPrint "
--"仍需依賴它們的功能。特別是排程與過濾工作，仍是由您的列印子系統完成，包括管理類的工作(加入或修改印表機、設定存取權限等。)"
--"<br/>因此 KDEPrint 支援的功能深深的受您所選的列印子系統影響。為了對現在的列印工作有最佳的支援，KDE 列印功能團隊建議使用基於 CUPS "
--"的列印系統。"
-+"<h1>印表機</h1> KDE 列印管理程式是 KDEPrint 的一部分，作為您的作業系統(OS)實"
-+"際列印子系統的介面。雖然它本身的確在這些子系統上加入了某些功能，KDEPrint 仍需"
-+"依賴它們的功能。特別是排程與過濾工作，仍是由您的列印子系統完成，包括管理類的"
-+"工作(加入或修改印表機、設定存取權限等。)<br/>因此 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 <em>smbstatus</em> and <em>showmount</em>. 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.<p> 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 <em>showmount -a localhost</em> is parsed. On some systems showmount is in /usr/sbin, check if you have showmount in your PATH."
--#~ msgstr "Samba 與 NFS 狀態監視器是 <em>smbstatus</em> 與 <em>showmount</em> 的前端介面. Smbstatus 回報目前的 Samba 連線, 並且是 Samba 套件工具的一部份. Samba 是 SMB (工作階段訊息方塊) 協定, 也被叫做 NetBIOS 或 LanManager 協定. 這個協定可以用於提供網路上的印表機或磁碟資源分享, 包含 MS Windows 系統.<p>Showmount 是 NFS 軟體套件的一部份. NFS 基於網路檔案系統, 是傳統的 Unix 分享檔案方法. 在這邊是使用 <em>showmount -a localhost</em> 來分析. 對有些系統而言, showmount 是被安裝在 /usr/sbin 下面的, 請確定 showmount 有在您的路徑中."
-+#~ msgid ""
-+#~ "The Samba and NFS Status Monitor is a front end to the programs "
-+#~ "<em>smbstatus</em> and <em>showmount</em>. 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.<p> 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 <em>showmount -a localhost</em> is parsed. On some systems "
-+#~ "showmount is in /usr/sbin, check if you have showmount in your PATH."
-+#~ msgstr ""
-+#~ "Samba 與 NFS 狀態監視器是 <em>smbstatus</em> 與 <em>showmount</em> 的前端"
-+#~ "介面. Smbstatus 回報目前的 Samba 連線, 並且是 Samba 套件工具的一部份. "
-+#~ "Samba 是 SMB (工作階段訊息方塊) 協定, 也被叫做 NetBIOS 或 LanManager 協"
-+#~ "定. 這個協定可以用於提供網路上的印表機或磁碟資源分享, 包含 MS Windows 系"
-+#~ "統.<p>Showmount 是 NFS 軟體套件的一部份. NFS 基於網路檔案系統, 是傳統的 "
-+#~ "Unix 分享檔案方法. 在這邊是使用 <em>showmount -a localhost</em> 來分析. 對"
-+#~ "有些系統而言, 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.<p> 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.<p> 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 以上, 有些事件是不會被紀錄的.<p>如同 KDE 中其他的列表, 您可以按下欄位的頂端以依據這個欄位排序. 再按一次可以變更顯示順序.<p>如果列表示空的, 試著按下 \"更新\" 按鈕. 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.<p> 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.<p> 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 "
-+#~ "以上, 有些事件是不會被紀錄的.<p>如同 KDE 中其他的列表, 您可以按下欄位的頂"
-+#~ "端以依據這個欄位排序. 再按一次可以變更顯示順序.<p>如果列表示空的, 試著按"
-+#~ "下 \"更新\" 按鈕. 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 <j_h_liau@yahoo.com.tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\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 <em>"
--"smbstatus</em> and <em>showmount</em>. 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."
--"<p> 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 <em>showmount -a localhost</em> "
--"is parsed. On some systems showmount is in /usr/sbin, check if you have "
--"showmount in your PATH."
--msgstr ""
--"Samba 與 NFS 狀態監視器是 <em>smbstatus</em> 與 <em>showmount</em> "
--"的前端介面. Smbstatus 回報目前的 Samba 連線, 並且是 Samba 套件工具的一部份. Samba 是 SMB (工作階段訊息方塊) 協定, "
--"也被叫做 NetBIOS 或 LanManager 協定. 這個協定可以用於提供網路上的印表機或磁碟資源分享, 包含 MS Windows 系統."
--"<p>Showmount 是 NFS 軟體套件的一部份. NFS 基於網路檔案系統, 是傳統的 Unix 分享檔案方法. 在這邊是使用 <em>"
--"showmount -a localhost</em> 來分析. 對有些系統而言, showmount 是被安裝在 /usr/sbin 下面的, 請確定 "
--"showmount 有在您的路徑中."
-+"The Samba and NFS Status Monitor is a front end to the programs "
-+"<em>smbstatus</em> and <em>showmount</em>. 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.<p> 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 "
-+"<em>showmount -a localhost</em> is parsed. On some systems showmount is in /"
-+"usr/sbin, check if you have showmount in your PATH."
-+msgstr ""
-+"Samba 與 NFS 狀態監視器是 <em>smbstatus</em> 與 <em>showmount</em> 的前端介"
-+"面. Smbstatus 回報目前的 Samba 連線, 並且是 Samba 套件工具的一部份. Samba 是 "
-+"SMB (工作階段訊息方塊) 協定, 也被叫做 NetBIOS 或 LanManager 協定. 這個協定可"
-+"以用於提供網路上的印表機或磁碟資源分享, 包含 MS Windows 系統.<p>Showmount 是 "
-+"NFS 軟體套件的一部份. NFS 基於網路檔案系統, 是傳統的 Unix 分享檔案方法. 在這"
-+"邊是使用 <em>showmount -a localhost</em> 來分析. 對有些系統而言, 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."
--"<p> 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."
--"<p> 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 以上, 有些事件是不會被紀錄的."
--"<p>如同 KDE 中其他的列表, 您可以按下欄位的頂端以依據這個欄位排序. 再按一次可以變更顯示順序."
--"<p>如果列表示空的, 試著按下 \"更新\" 按鈕. 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.<p> 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.<p> 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 以"
-+"上, 有些事件是不會被紀錄的.<p>如同 KDE 中其他的列表, 您可以按下欄位的頂端以依"
-+"據這個欄位排序. 再按一次可以變更顯示順序.<p>如果列表示空的, 試著按下 \"更新"
-+"\" 按鈕. 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) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Chinese Traditional <zh-l10n@linux.org.tw>\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 ""
--"<h1>Screen Saver</h1> 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."
--"<p> 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."
-+"<h1>Screen Saver</h1> 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.<p> 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 ""
--"<h1>螢幕保護</h1> 這個模組可以讓您啟動並組態螢幕保護。注意即使您有設定您顯示器的省電功能也可以啟動螢幕保護。"
--"<p>此外，提供一個無止境的數值來提供娛樂與保護顯示器，同時如果您必須離開電腦一陣子，螢幕保護也提供您一個簡單的方法來鎖定您的畫面。如果您希望螢幕保護程式鎖定畫"
--"面，請確定您有啟動螢幕保護程式的「需要密碼」功能；如果沒有，您仍然可以使用桌面上的「鎖定畫面」按鈕。"
-+"<h1>螢幕保護</h1> 這個模組可以讓您啟動並組態螢幕保護。注意即使您有設定您顯示"
-+"器的省電功能也可以啟動螢幕保護。<p>此外，提供一個無止境的數值來提供娛樂與保護"
-+"顯示器，同時如果您必須離開電腦一陣子，螢幕保護也提供您一個簡單的方法來鎖定您"
-+"的畫面。如果您希望螢幕保護程式鎖定畫面，請確定您有啟動螢幕保護程式的「需要密"
-+"碼」功能；如果沒有，您仍然可以使用桌面上的「鎖定畫面」按鈕。"
- 
- #: 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 <j_h_liau@yahoo.com.tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\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 ""
--"<h1>Smart Card</h1>這個模組允許您設定 KDE 來支援 Smart Card。它可以用在很多的用途上，例如存放 SSL "
--"的憑證，並使用它來登入系統。"
-+"<h1>Smart Card</h1>這個模組允許您設定 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 <j_h_liau@yahoo.com.tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Chinese (traditional) <zh-L10n@linux.org.tw>\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 ""
--"<h1>工作階段管理員</h1>您可以在這邊組態工作階段管理員。 "
--"這包含了登出時是否要經過確認、是否要在登出時儲存工作階段，以及是否要在工作階段結束後自動關機。"
-+"<h1>工作階段管理員</h1>您可以在這邊組態工作階段管理員。 這包含了登出時是否要"
-+"經過確認、是否要在登出時儲存工作階段，以及是否要在工作階段結束後自動關機。"
- 
- #. 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 ""
- "<ul>\n"
--"<li><b>Restore previous session:</b> Will save all applications running on exit "
--"and restore them when they next start up</li>\n"
--"<li><b>Restore manually saved session: </b> 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.</li>\n"
--"<li><b>Start with an empty session:</b> Do not save anything. Will come up with "
--"an empty desktop on next start.</li>\n"
-+"<li><b>Restore previous session:</b> Will save all applications running on "
-+"exit and restore them when they next start up</li>\n"
-+"<li><b>Restore manually saved session: </b> 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.</li>\n"
-+"<li><b>Start with an empty session:</b> Do not save anything. Will come up "
-+"with an empty desktop on next start.</li>\n"
- "</ul>"
- msgstr ""
- "<ul>\n"
--"<li><b>恢復前一個工作階段：</b> 會在離開時儲存所有執行的應用程式並在下次啟動時將他們恢復</li>\n"
--"<li><b>恢復手動儲存的工作階段：</b> 可以在任何時候透過 "
--"K-選單中的「儲存工作階段」來儲存工作階段。這表示目前啟動的應用程式會在下次啟動時恢復。</li>\n"
--"<li><b>以空的工作階段啟動：</b> 不要儲存任何東西。下次啟動時會看到的空無一物的桌面。</li>\n"
-+"<li><b>恢復前一個工作階段：</b> 會在離開時儲存所有執行的應用程式並在下次啟動"
-+"時將他們恢復</li>\n"
-+"<li><b>恢復手動儲存的工作階段：</b> 可以在任何時候透過 K-選單中的「儲存工作階"
-+"段」來儲存工作階段。這表示目前啟動的應用程式會在下次啟動時恢復。</li>\n"
-+"<li><b>以空的工作階段啟動：</b> 不要儲存任何東西。下次啟動時會看到的空無一物"
-+"的桌面。</li>\n"
- "</ul>"
- 
- #. 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 <j_h_liau@yahoo.com.tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Traditional Chinese <zh-l10n@linux.org.tw>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
-@@ -20,22 +20,16 @@
- 
- #: spellchecking.cpp:46
- msgid ""
--"<h1>Spell Checker</h1>"
--"<p>This control module allows you to configure the KDE spell checking system. "
--"You can configure:"
--"<ul>"
--"<li> which spell checking program to use"
--"<li> which types of spelling errors are identified"
--"<li> which dictionary is used by default.</ul>"
--"<br>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.</p>"
-+"<h1>Spell Checker</h1><p>This control module allows you to configure the KDE "
-+"spell checking system. You can configure:<ul><li> which spell checking "
-+"program to use<li> which types of spelling errors are identified<li> which "
-+"dictionary is used by default.</ul><br>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.</p>"
- msgstr ""
--"<h1>拼字檢查</h1>"
--"<p>這個控制模組可讓您設定 KDE 的拼字檢查系統。您可以設定："
--"<ul>"
--"<li> 使用哪一個拼字檢查程式"
--"<li> 要辨識哪些種類的拼字錯誤"
--"<li> 內定使用哪一個字典。</ul>"
--"<br>KDE 拼字檢查系統（KSpell）支援兩種常見的拼字檢查工具：ASpell 與 ISpell。  因此，您在使用 KDE 應用程式與非 KDE "
--"的應用程式時都可以使用相同的字典。</p>"
-+"<h1>拼字檢查</h1><p>這個控制模組可讓您設定 KDE 的拼字檢查系統。您可以設定："
-+"<ul><li> 使用哪一個拼字檢查程式<li> 要辨識哪些種類的拼字錯誤<li> 內定使用哪一"
-+"個字典。</ul><br>KDE 拼字檢查系統（KSpell）支援兩種常見的拼字檢查工具："
-+"ASpell 與 ISpell。  因此，您在使用 KDE 應用程式與非 KDE 的應用程式時都可以使"
-+"用相同的字典。</p>"
-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 <j_h_liau@yahoo.com.tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Chinese(traditional) <zh-l10n@linux.org.tw>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
-@@ -28,7 +28,9 @@
- msgid ""
- "<h1>Style</h1>This module allows you to modify the visual appearance of user "
- "interface elements, such as the widget style and effects."
--msgstr "<h1>風格</h1>這個模組允許您修改使用者介面元件的視覺外觀，例如 Widget 的風格及特效。"
-+msgstr ""
-+"<h1>風格</h1>這個模組允許您修改使用者介面元件的視覺外觀，例如 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 ""
--"<qt>Selected style: <b>%1</b>"
--"<br>"
--"<br>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."
--"<br>"
--"<br>"
--msgstr ""
--"<qt>被選取的風格：<b>%1</b>"
--"<br>"
--"<br>一個或多個特效被選取，不過因為它們不被支援，所以目前無法套用在系統上，同時這些被選取的特效將會被關閉。"
--"<br>"
--"<br>"
-+"<qt>Selected style: <b>%1</b><br><br>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.<br><br>"
-+msgstr ""
-+"<qt>被選取的風格：<b>%1</b><br><br>一個或多個特效被選取，不過因為它們不被支"
-+"援，所以目前無法套用在系統上，同時這些被選取的特效將會被關閉。<br><br>"
- 
- #: kcmstyle.cpp:532
- msgid "Menu translucency is not available.<br>"
-@@ -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 ""
- "<p><b>Software Tint: </b>Alpha-blend using a flat color.</p>\n"
- "<p><b>Software Blend: </b>Alpha-blend using an image.</p>\n"
- "<b>XRender Blend: </b>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.</p>\n"
-+"available). This method may be slower than the Software routines on non-"
-+"accelerated displays, but may however improve performance on remote displays."
-+"</p>\n"
- msgstr ""
- "<p><b>軟體淡色：</b>使用固定色彩做 Alpha-混色。</p>\n"
- "<p><b>軟體混色：</b>使用圖片做 Alpha-混色。</p>\n"
--"<b>XRender 混色： </b>使用 XFree RENDER "
--"延伸功能做圖片混合(如果可用)。這個方法可能會比軟體或非加速的方式慢，但是可以增進遠端畫面的效能。</p>\n"
-+"<b>XRender 混色： </b>使用 XFree RENDER 延伸功能做圖片混合(如果可用)。這個方"
-+"法可能會比軟體或非加速的方式慢，但是可以增進遠端畫面的效能。</p>\n"
- 
- #: kcmstyle.cpp:1042
- msgid "By adjusting this slider you can control the menu effect opacity."
-@@ -312,7 +316,9 @@
- msgid ""
- "<b>Note:</b> that all widgets in this combobox do not apply to Qt-only "
- "applications."
--msgstr "<b>注意：</b>在這個 Combo Box 中的所有 Widget，不可以套用到 Qt-Only 的應用程式。"
-+msgstr ""
-+"<b>注意：</b>在這個 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 ""
--"<p><b>Icons only:</b> Shows only icons on toolbar buttons. Best option for low "
--"resolutions.</p>"
--"<p><b>Text only: </b>Shows only text on toolbar buttons.</p>"
--"<p><b>Text alongside icons: </b> Shows icons and text on toolbar buttons. Text "
--"is aligned alongside the icon.</p><b>Text under icons: </b> "
-+"<p><b>Icons only:</b> Shows only icons on toolbar buttons. Best option for "
-+"low resolutions.</p><p><b>Text only: </b>Shows only text on toolbar buttons."
-+"</p><p><b>Text alongside icons: </b> Shows icons and text on toolbar "
-+"buttons. Text is aligned alongside the icon.</p><b>Text under icons: </b> "
- "Shows icons and text on toolbar buttons. Text is aligned below the icon."
- msgstr ""
--"<p><b>只顯示圖示：</b>在工具列上只以圖示顯示按鍵。在低解析度的環境下，這是個不錯的選擇。</p>"
--"<p><b>只顯示文字：</b>在工具列上只以文字顯示按鍵。</p>"
--"<p><b>文字顯示在圖示旁：</b>在工具列上同時顯示文字和圖示，而文字就顯示在圖示的旁邊。</p>"
--"<p><b>文字顯示在圖示上：</b>在工具列上同時顯示文字和圖示，而文字就顯示在圖示之上。</p>"
-+"<p><b>只顯示圖示：</b>在工具列上只以圖示顯示按鍵。在低解析度的環境下，這是個"
-+"不錯的選擇。</p><p><b>只顯示文字：</b>在工具列上只以文字顯示按鍵。</p><p><b>"
-+"文字顯示在圖示旁：</b>在工具列上同時顯示文字和圖示，而文字就顯示在圖示的旁"
-+"邊。</p><p><b>文字顯示在圖示上：</b>在工具列上同時顯示文字和圖示，而文字就顯"
-+"示在圖示之上。</p>"
- 
- #: 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) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Chinese Traditional <zh-l10n@linux.org.tw>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
-@@ -94,13 +93,14 @@
- 
- #: kcmtaskbar.cpp:144
- msgid ""
--"<h1>Taskbar</h1> 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."
-+"<h1>Taskbar</h1> 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 ""
--"<h1>工作列</h1> 您可以在這邊組態工作列. 這包含了如工作列是否要嵌入於面板或浮動在外面(預設: 嵌入). "
--"您也可以組態工作列是否要顯示所有的視窗或只有目前桌面上的視窗"
-+"<h1>工作列</h1> 您可以在這邊組態工作列. 這包含了如工作列是否要嵌入於面板或浮"
-+"動在外面(預設: 嵌入). 您也可以組態工作列是否要顯示所有的視窗或只有目前桌面上"
-+"的視窗"
- 
- #: 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 <b>only</b> "
--"the windows on the current desktop. \n"
-+"Turning this option off will cause the taskbar to display <b>only</b> 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 <em>Show all windows</em> "
--"option.\n"
--"\n"
--"You can set the taskbar to <strong>Never</strong> group windows, to <strong>"
--"Always</strong> group windows or to group windows only <strong>"
--"When the Taskbar is Full</strong>.\n"
-+"window group buttons are clicked on a menu appears showing all the windows "
-+"in that group. This can be especially useful with the <em>Show all windows</"
-+"em> option.\n"
-+"\n"
-+"You can set the taskbar to <strong>Never</strong> group windows, to "
-+"<strong>Always</strong> group windows or to group windows only <strong>When "
-+"the Taskbar is Full</strong>.\n"
- "\n"
- "By default the taskbar groups windows when it is full."
- msgstr ""
--"工作列可以將相近的視窗組為一個單一按鈕。當這些視窗群組按鈕被按下時會出現一個選單來顯示在群組中的所有視窗。這在<em>顯示所有視窗</em>"
--"選項中會特別有用。\n"
-+"工作列可以將相近的視窗組為一個單一按鈕。當這些視窗群組按鈕被按下時會出現一個"
-+"選單來顯示在群組中的所有視窗。這在<em>顯示所有視窗</em>選項中會特別有用。\n"
- "\n"
--"您可以設定工作列 <strong>永不</strong> 使用群組視窗，<strong>永遠</strong> 群組視窗或者只有 <strong>"
--"當工作列已滿</strong> 時才將視窗群組起來。\n"
-+"您可以設定工作列 <strong>永不</strong> 使用群組視窗，<strong>永遠</strong> 群"
-+"組視窗或者只有 <strong>當工作列已滿</strong> 時才將視窗群組起來。\n"
- "\n"
- "預設中工作列會在已滿的情況下群組視窗。"
- 
-@@ -223,10 +225,11 @@
- #: rc.cpp:44
- #, no-c-format
- msgid ""
--"Select this option if you want the taskbar to display <b>only</b> "
--"minimized windows. \n"
-+"Select this option if you want the taskbar to display <b>only</b> 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 ""
- "選取這個選項如果您希望工作列<b>只有</b>顯示縮到最小的視窗。\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 <j_h_liau@yahoo.com.tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: zh-l10n <zh-l10n@linux.org.tw>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
-@@ -28,8 +28,8 @@
- 
- #: kcmusb.cpp:34
- msgid ""
--"<h1>USB Devices</h1> This module allows you to see the devices attached to your "
--"USB bus(es)."
-+"<h1>USB Devices</h1> This module allows you to see the devices attached to "
-+"your USB bus(es)."
- msgstr "<h1>USB 裝置</h1> 這個模組可以讓您知道有什麼裝置接在您的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 <wmtuen@gmail.com>, 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 <wmtuen@gmail.com>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Chinese/Traditional <zh-l10n@linux.org.tw>\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."
--"<br>The meaning of the columns:"
--"<br><b>Name</b>: port or node name, the number can change with each bus reset"
--"<br><b>GUID</b>: the 64 bit GUID of the node"
--"<br><b>Local</b>: checked if the node is an IEEE 1394 port of your computer"
--"<br><b>IRM</b>: checked if the node is isochronous resource manager capable"
--"<br><b>CRM</b>: checked if the node is cycle master capable"
--"<br><b>ISO</b>: checked if the node supports isochronous transfers"
--"<br><b>BM</b>: checked if the node is bus manager capable"
--"<br><b>PM</b>: checked if the node is power management capable"
--"<br><b>Acc</b>: the cycle clock accuracy of the node, valid from 0 to 100"
--"<br><b>Speed</b>: the speed of the node"
--"<br>"
-+"configuration.<br>The meaning of the columns:<br><b>Name</b>: port or node "
-+"name, the number can change with each bus reset<br><b>GUID</b>: the 64 bit "
-+"GUID of the node<br><b>Local</b>: checked if the node is an IEEE 1394 port "
-+"of your computer<br><b>IRM</b>: checked if the node is isochronous resource "
-+"manager capable<br><b>CRM</b>: checked if the node is cycle master "
-+"capable<br><b>ISO</b>: checked if the node supports isochronous "
-+"transfers<br><b>BM</b>: checked if the node is bus manager capable<br><b>PM</"
-+"b>: checked if the node is power management capable<br><b>Acc</b>: the cycle "
-+"clock accuracy of the node, valid from 0 to 100<br><b>Speed</b>: the speed "
-+"of the node<br>"
- msgstr ""
--"在右邊你可以看到您的 IEEE 1394的設定。"
--"<br>每一欄的意思是："
--"<br><b>名稱</b>：連接埠或裝置名稱，匯流排重設時可以將號碼更改"
--"<br><b>GUID</b>：裝置的 64 bit GUID"
--"<br><b>本機</b>：如裝置是在您的電腦上 IEEE 1394 連接埠則會選取"
--"<br><b>IRM</b>：如支援非同步資源管理"
--"<br><b>CRM</b>: 如支援 cycle master 則會選取"
--"<br><b>ISO</b>：如支援非同步傳送"
--"<br><b>BM</b>：如支援匯流排管理功能則會選取"
--"<br><b>PM</b>：如支援電源管理功能則會選取"
--"<br><b>Acc</b>：裝置的週期準確度，有效值由 0 至 100"
--"<br><b>速度</b>：裝置的速度"
--"<br>"
-+"在右邊你可以看到您的 IEEE 1394的設定。<br>每一欄的意思是：<br><b>名稱</b>：連"
-+"接埠或裝置名稱，匯流排重設時可以將號碼更改<br><b>GUID</b>：裝置的 64 bit "
-+"GUID<br><b>本機</b>：如裝置是在您的電腦上 IEEE 1394 連接埠則會選取"
-+"<br><b>IRM</b>：如支援非同步資源管理<br><b>CRM</b>: 如支援 cycle master 則會"
-+"選取<br><b>ISO</b>：如支援非同步傳送<br><b>BM</b>：如支援匯流排管理功能則會選"
-+"取<br><b>PM</b>：如支援電源管理功能則會選取<br><b>Acc</b>：裝置的週期準確度，"
-+"有效值由 0 至 100<br><b>速度</b>：裝置的速度<br>"
- 
- #: 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 <j_h_liau@yahoo.com.tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
-@@ -39,8 +39,8 @@
- 
- #: kcmxinerama.cpp:56
- msgid ""
--"<h1>Multiple Monitors</h1> This module allows you to configure KDE support for "
--"multiple monitors."
-+"<h1>Multiple Monitors</h1> This module allows you to configure KDE support "
-+"for multiple monitors."
- msgstr "<h1>多重螢幕</h1> 這個模組能讓您設定 KDE 的多重螢幕支援"
- 
- #: kcmxinerama.cpp:74
-@@ -54,10 +54,12 @@
- 
- #: kcmxinerama.cpp:103
- msgid ""
--"<qt>"
--"<p>This module is only for configuring systems with a single desktop spread "
--"across multiple monitors. You do not appear to have this configuration.</p></qt>"
--msgstr "<qt><p>這個模組只能在使用一個桌面於多重螢幕的系統上執行。您似乎無法使用此模組</p></qt>"
-+"<qt><p>This module is only for configuring systems with a single desktop "
-+"spread across multiple monitors. You do not appear to have this "
-+"configuration.</p></qt>"
-+msgstr ""
-+"<qt><p>這個模組只能在使用一個桌面於多重螢幕的系統上執行。您似乎無法使用此模組"
-+"</p></qt>"
- 
- #: 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 <j_h_liau@yahoo.com.tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\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 "<big><b>Loading...</b></big>"
--msgstr "<big><b>載入中...</b></big>"
-+msgstr "<big><b>載入中…</b></big>"
- 
- #: 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 ""
--"<p>Use the \"What's This?\" (Shift+F1) to get help on specific options.</p>"
--"<p>To read the full manual click <a href=\"%1\">here</a>.</p>"
-+"<p>Use the \"What's This?\" (Shift+F1) to get help on specific options.</"
-+"p><p>To read the full manual click <a href=\"%1\">here</a>.</p>"
- msgstr ""
--"<p>使用「這是什麼？」 (Shift+F1) 來取得特定選項的說明。</p>"
--"<p>要讀取完整的說明手冊請按 <a href=\"%1\">這裡</a>。</p>"
-+"<p>使用「這是什麼？」 (Shift+F1) 來取得特定選項的說明。</p><p>要讀取完整的說"
-+"明手冊請按 <a href=\"%1\">這裡</a>。</p>"
- 
- #: helpwidget.cpp:51
- msgid ""
- "<h1>KDE Info Center</h1>There is no quick help available for the active info "
--"module."
--"<br>"
--"<br>Click <a href = \"kinfocenter/index.html\">here</a> "
--"to read the general Info Center manual."
-+"module.<br><br>Click <a href = \"kinfocenter/index.html\">here</a> to read "
-+"the general Info Center manual."
- msgstr ""
--"<h1>KDE 資訊中心</h1>抱歉，作用中的資訊模組並無快速說明。"
--"<br>"
--"<br>請按 <a href = \"kinfocenter/index.html\">這裡</a> 以讀取一般資訊中心手冊。"
-+"<h1>KDE 資訊中心</h1>抱歉，作用中的資訊模組並無快速說明。<br><br>請按 <a "
-+"href = \"kinfocenter/index.html\">這裡</a> 以讀取一般資訊中心手冊。"
- 
- #: helpwidget.cpp:56
- msgid ""
- "<h1>KDE Control Center</h1>There is no quick help available for the active "
--"control module."
--"<br>"
--"<br>Click <a href = \"kcontrol/index.html\">here</a> "
--"to read the general Control Center manual."
-+"control module.<br><br>Click <a href = \"kcontrol/index.html\">here</a> to "
-+"read the general Control Center manual."
- msgstr ""
--"<h1>KDE 控制中心</h1>抱歉，作用中的控制模組並無快速說明。"
--"<br>"
--"<br>請按 <a href = \"kcontrol/index.html\">這裡</a> 以讀取一般控制中心手冊。"
-+"<h1>KDE 控制中心</h1>抱歉，作用中的控制模組並無快速說明。<br><br>請按 <a "
-+"href = \"kcontrol/index.html\">這裡</a> 以讀取一般控制中心手冊。"
- 
- #: kcrootonly.cpp:30
- msgid ""
--"<big>You need super user privileges to run this control module.</big>"
--"<br>Click on the \"Administrator Mode\" button below."
--msgstr "<big>你需要超級使用者的權限來執行這個控制模組。</big> <br>點選下面 \"管理者模式\" 按鈕。"
-+"<big>You need super user privileges to run this control module.</"
-+"big><br>Click on the \"Administrator Mode\" button below."
-+msgstr ""
-+"<big>你需要超級使用者的權限來執行這個控制模組。</big> <br>點選下面 \"管理者模"
-+"式\" 按鈕。"
- 
- #: main.cpp:105
- msgid "The KDE Control Center"
-@@ -168,7 +166,7 @@
- 
- #: modules.cpp:160
- msgid "<big>Loading...</big>"
--msgstr "<big>載入中 ...</big>"
-+msgstr "<big>載入中…</big>"
- 
- #: 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 ""
--"<b>Changes in this module require root access.</b>"
--"<br>Click the \"Administrator Mode\" button to allow modifications in this "
--"module."
-+"<b>Changes in this module require root access.</b><br>Click the "
-+"\"Administrator Mode\" button to allow modifications in this module."
- msgstr ""
--"<b>變更這個模組需要具備系統管理員的權限才能夠進行！</b>"
--"<br>請點選 「管理者模式」 按鈕以便於切換到系統管理者權限來進行修改的動作。"
-+"<b>變更這個模組需要具備系統管理員的權限才能夠進行！</b><br>請點選 「管理者模"
-+"式」 按鈕以便於切換到系統管理者權限來進行修改的動作。"
- 
- #: 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 "<qt><p>The diagnostics is:<br>%1<p>Possible reasons:</p><ul><li>An error occurred during your last KDE upgrade leaving an orphaned control module<li>You have old third party modules lying around.</ul><p>Check these points carefully and try to remove the module mentioned in the error message. If this fails, consider contacting your distributor or packager.</p></qt>"
--#~ msgstr "<qt><p>診斷結果為：<br>%1<p>可能原因是：</p><ul><li>您在上一次升級 KDE 時，有部份的控制模組沒有更新。<li>您的系統中存在有舊的 Third Party 模組。</ul><p>請小心的檢查上述幾點，並試著移除在錯誤訊息中所提到的模組。如果還是失敗，請聯絡您的套件廠商，或是套件的整理者。</p></qt>"
-+#~ msgid ""
-+#~ "<qt><p>The diagnostics is:<br>%1<p>Possible reasons:</p><ul><li>An error "
-+#~ "occurred during your last KDE upgrade leaving an orphaned control "
-+#~ "module<li>You have old third party modules lying around.</ul><p>Check "
-+#~ "these points carefully and try to remove the module mentioned in the "
-+#~ "error message. If this fails, consider contacting your distributor or "
-+#~ "packager.</p></qt>"
-+#~ msgstr ""
-+#~ "<qt><p>診斷結果為：<br>%1<p>可能原因是：</p><ul><li>您在上一次升級 KDE "
-+#~ "時，有部份的控制模組沒有更新。<li>您的系統中存在有舊的 Third Party 模組。"
-+#~ "</ul><p>請小心的檢查上述幾點，並試著移除在錯誤訊息中所提到的模組。如果還是"
-+#~ "失敗，請聯絡您的套件廠商，或是套件的整理者。</p></qt>"
- 
- #~ 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) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Chinese Traditional <zh-l10n@linux.org.tw>\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 <j_h_liau@yahoo.com.tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Chinese (traditional) <zh-L10n@linux.org.tw>\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 <j_h_liau@yahoo.com.tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Traditional Chinese <zh-l10n@linux.org.tw>\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) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Chinese Traditional <zh-l10n@linux.org.tw>\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 <hpwu@redhat.com>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Chinese (Traditional) <zh-l10n@linux.org.tw>\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 <cwhuang@linux.org.tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Chinese Traditional <zh-l10n@linux.org.tw>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
-@@ -27,8 +27,8 @@
- 
- #: lock/autologout.cc:40
- msgid ""
--"<qt>To prevent being logged out, resume using this session by moving the mouse "
--"or pressing a key.</qt>"
-+"<qt>To prevent being logged out, resume using this session by moving the "
-+"mouse or pressing a key.</qt>"
- msgstr "<qt>要避免被強制登出，請移動滑鼠或按下一鍵來恢復工作階段。"
- 
- #: 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."
--"<br>The current session will be hidden and a new login screen will be "
--"displayed."
--"<br>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 ""
--"您已經選擇要開啟一個新的工作階段，而不繼續使用目前的。"
--"<br>目前的階段會被隱藏起來，並顯示一個新的登入畫面。"
--"<br>一個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.<br>The current session will be hidden and a new login screen "
-+"will be displayed.<br>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 ""
-+"您已經選擇要開啟一個新的工作階段，而不繼續使用目前的。<br>目前的階段會被隱藏"
-+"起來，並顯示一個新的登入畫面。<br>一個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 <i>kcheckpass</i>."
-@@ -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 ""
--"<p>You have chosen to open another desktop session."
--"<br>The current session will be hidden and a new login screen will be "
--"displayed."
--"<br>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.</p>"
--msgstr ""
--"您已經選擇要開啟另一個工作階段。"
--"<br>目前的階段會被隱藏起來，並顯示一個新的登入畫面。"
--"<br>一個F-key會被指定到各個階段，如F%1指定到第一個、F%2指定到第二個...如此類推。您還可以按下 Ctrl+Alt+F-key "
--"在各個階段之間切換。另外，KDE Panel 和桌面選單會在切換期間作適當的改變。"
-+"<p>You have chosen to open another desktop session.<br>The current session "
-+"will be hidden and a new login screen will be displayed.<br>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.</p>"
-+msgstr ""
-+"您已經選擇要開啟另一個工作階段。<br>目前的階段會被隱藏起來，並顯示一個新的登"
-+"入畫面。<br>一個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 "<qt>使用者 <b>%1</b> 在這個系統中不存在。</qt>"
- 
- #: 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 ""
--"<qt>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"
-+"<qt>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"
- "<ul>\n"
- "<li><em>Normal:</em> This is the standard, timesharing scheduler. It will "
- "divide fairly the available processing time between all processes.</li>\n"
- "<li><em>Realtime:</em>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.</li>\n"
-+"does not give up the processor might hang the system. You need root's "
-+"password to use the scheduler.</li>\n"
- "</ul>\n"
- "</qt>"
- msgstr ""
--"<qt>您可以選擇為該程式使用哪種排程器。排程器決定該執行哪個程序和哪些程序要等待。有兩種排程器可供選擇：\n"
-+"<qt>您可以選擇為該程式使用哪種排程器。排程器決定該執行哪個程序和哪些程序要等"
-+"待。有兩種排程器可供選擇：\n"
- "<ul>\n"
--"<li><em>普通：</em> 這是標準的時間分享排程器。它平均分配可用的處理時間給所有的程序。</li>\n"
--"<li><em>即時：</em> 該排程器將不中斷地執行程式，直到它釋放處理器。這可能是危險的──不釋放處理器的程式可能會導致系統當機。需要有管理者 root "
--"的密碼才能使用該排程器。</li>\n"
-+"<li><em>普通：</em> 這是標準的時間分享排程器。它平均分配可用的處理時間給所有"
-+"的程序。</li>\n"
-+"<li><em>即時：</em> 該排程器將不中斷地執行程式，直到它釋放處理器。這可能是危"
-+"險的──不釋放處理器的程式可能會導致系統當機。需要有管理者 root 的密碼才能使用"
-+"該排程器。</li>\n"
- "</ul>\n"
- "</qt>"
- 
-@@ -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 ""
- "<p>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.</p>\\n"
--"<p>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 ""
--"<p>如果您開啟這選項，那麼所有在桌面目錄中以點(.)開頭的檔案都會被顯示出來。一般來說，它們都包含了配置資訊，並且被隱藏起來。</p>"
--"\\n例如名為\\\".directory\\\"的檔案是一些包含了 Konqueror "
--"資訊的純文字檔案。它們包含了如代表目錄的圖示、檔案排列的樣式等。除非您清楚自己在做什麼事，否則您不應碰這些檔案。</p>"
-+"information, and remain hidden from view.</p>\\n<p>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 ""
-+"<p>如果您開啟這選項，那麼所有在桌面目錄中以點(.)開頭的檔案都會被顯示出來。一"
-+"般來說，它們都包含了配置資訊，並且被隱藏起來。</p>\\n例如名為\\\".directory\\"
-+"\"的檔案是一些包含了 Konqueror 資訊的純文字檔案。它們包含了如代表目錄的圖示、"
-+"檔案排列的樣式等。除非您清楚自己在做什麼事，否則您不應碰這些檔案。</p>"
- 
- #. 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 <zh-l10n@toptk.com>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: TopTech Localization Team <zh-l10n@toptk.com>\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) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Chinese Traditional <zh-l10n@linux.org.tw>\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 <j_h_liau@yahoo.com.tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: zh-l10n <zh-l10n@linux.org.tw>\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 <j_h_liau@yahoo.com.tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Chinese(traditional) <zh-l10n@linux.org.tw>\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."
--"<p>KDM will substitute the following character pairs with the respective "
--"contents:"
--"<br>"
--"<ul>"
--"<li>%d -> current display</li>"
--"<li>%h -> host name, possibly with domain name</li>"
--"<li>%n -> node name, most probably the host name without domain name</li>"
--"<li>%s -> the operating system</li>"
--"<li>%r -> the operating system's version</li>"
--"<li>%m -> the machine (hardware) type</li>"
--"<li>%% -> a single %</li></ul>"
--msgstr ""
--"這是 KDM 登入視窗中的「標題」。您可能會想要在這裏放一些不錯的歡迎詞或者作業系統的相關資訊。"
--"<p>KDM 會將下列字元替代為個別的內容："
--"<br>"
--"<ul>"
--"<li>%d -> 目前的顯示</li>"
--"<li>%h -> 主機名稱，可能會加上網域名稱</li>"
--"<li>%n -> 節點名稱，通常是去掉網域名稱的主機名稱</li>"
--"<li>%s -> 作業系統</li>"
--"<li>%r -> 作業系統的版本</li>"
--"<li>%m -> 電腦（硬體）類型</li>"
--"<li>%% -> 單獨的 %</li></ul>"
-+"This is the \"headline\" for KDM's login window. You may want to put some "
-+"nice greeting or information about the operating system here.<p>KDM will "
-+"substitute the following character pairs with the respective contents:"
-+"<br><ul><li>%d -> current display</li><li>%h -> host name, possibly with "
-+"domain name</li><li>%n -> node name, most probably the host name without "
-+"domain name</li><li>%s -> the operating system</li><li>%r -> the operating "
-+"system's version</li><li>%m -> the machine (hardware) type</li><li>%% -> a "
-+"single %</li></ul>"
-+msgstr ""
-+"這是 KDM 登入視窗中的「標題」。您可能會想要在這裏放一些不錯的歡迎詞或者作業系"
-+"統的相關資訊。<p>KDM 會將下列字元替代為個別的內容：<br><ul><li>%d -> 目前的顯"
-+"示</li><li>%h -> 主機名稱，可能會加上網域名稱</li><li>%n -> 節點名稱，通常是"
-+"去掉網域名稱的主機名稱</li><li>%s -> 作業系統</li><li>%r -> 作業系統的版本</"
-+"li><li>%m -> 電腦（硬體）類型</li><li>%% -> 單獨的 %</li></ul>"
- 
- #: 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 ""
- "<h1>KDM - Appearance</h1> Here you can configure the basic appearance of the "
--"KDM login manager, i.e. a greeting string, an icon etc."
--"<p> For further refinement of KDM's appearance, see the \"Font\" and "
--"\"Background\"  tabs."
-+"KDM login manager, i.e. a greeting string, an icon etc.<p> For further "
-+"refinement of KDM's appearance, see the \"Font\" and \"Background\"  tabs."
- msgstr ""
--"<h1>KDM - 外觀</h1> 您可以在這編組態基本的 KDM 登入管理員顯示, 例如: 問候訊息, 圖示等等."
--"<p> 對於更進一步的微調, 請參見 \"字型\" 與 \"背景\" 標籤."
-+"<h1>KDM - 外觀</h1> 您可以在這編組態基本的 KDM 登入管理員顯示, 例如: 問候訊"
-+"息, 圖示等等.<p> 對於更進一步的微調, 請參見 \"字型\" 與 \"背景\" 標籤."
- 
- #: 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:"
--"<ul> "
--"<li><em>Everybody:</em> everybody can shutdown the computer using KDM</li> "
--"<li><em>Only root:</em> KDM will only allow shutdown after the user has entered "
--"the root password</li> "
--"<li><em>Nobody:</em> nobody can shutdown the computer using KDM</li></ul>"
--msgstr ""
--"您可以在這邊設定哪些使用者允許使用 KDM 關閉這台電腦。可選擇的項目有: "
--"<ul> "
--"<li><em>所有人:</em> 所有使用者都可以使用透過 KDM 關閉這台電腦。</li> "
--"<li><em>系統管理者:</em> 只允許輸入 root 密碼後才能夠進行關閉這台電腦。</li> "
--"<li><em>都不允許:</em> 不允許任何人使用 KDM 關閉這台電腦。</li></ul>"
-+"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:<ul> <li><em>Everybody:</em> everybody can shutdown the "
-+"computer using KDM</li> <li><em>Only root:</em> KDM will only allow shutdown "
-+"after the user has entered the root password</li> <li><em>Nobody:</em> "
-+"nobody can shutdown the computer using KDM</li></ul>"
-+msgstr ""
-+"您可以在這邊設定哪些使用者允許使用 KDM 關閉這臺電腦。可選擇的項目有: <ul> "
-+"<li><em>所有人:</em> 所有使用者都可以使用透過 KDM 關閉這臺電腦。</li> "
-+"<li><em>系統管理者:</em> 只允許輸入 root 密碼後才能夠進行關閉這臺電腦。</li> "
-+"<li><em>都不允許:</em> 不允許任何人使用 KDM 關閉這臺電腦。</li></ul>"
- 
- #: 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 ""
--"<qt>"
--"<center><font color=red><big><b>Attention!"
--"<br>Read help!</b></big></font></center></qt>"
--msgstr ""
--"<qt>"
--"<center><font color=red><big><b>注意！"
--"<br>請閱讀說明！</b></big></font></center></qt>"
-+"<qt><center><font color=red><big><b>Attention!<br>Read help!</b></big></"
-+"font></center></qt>"
-+msgstr ""
-+"<qt><center><font color=red><big><b>注意！<br>請閱讀說明！</b></big></font></"
-+"center></qt>"
- 
- #: 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 ""
--"<h1>Login Manager</h1> 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 <em>Modify</em> button to acquire superuser rights. You will "
--"be asked for the superuser password."
--"<h2>Appearance</h2> 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."
-+"<h1>Login Manager</h1> 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 <em>Modify</em> button to acquire superuser "
-+"rights. You will be asked for the superuser password.<h2>Appearance</h2> 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."
- "<h2>Font</h2>Here you can choose the fonts that the Login Manager should use "
--"for various purposes like greetings and user names. "
--"<h2>Background</h2>If you want to set a special background for the login "
--"screen, this is where to do it."
--"<h2>Shutdown</h2> Here you can specify who is allowed to shutdown/reboot the "
--"machine and whether a boot manager should be used."
--"<h2>Users</h2>On this tab page, you can select which users the Login Manager "
--"will offer you for logging in."
--"<h2>Convenience</h2> 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."
--"<br>Note, that these settings are security holes by their nature, so use them "
--"very carefully."
--msgstr ""
--"<h1>登入管理員</h1>在這個模組之中，您可以設定由 KDE "
--"登入管理員所接受的變數。這包括了使用者登入時所能選擇的外觀與感覺。請注意您只能以管理者的權限執行這個模組。如果您沒有使用超級使用者的權限，來啟動 KDE "
--"的控制中心（當然，這是正確的作法），您可以按下<em>變更 (Modify)</em>按鈕以取得管理者權限。同時，您將被詢問超級使用者密碼。"
--"<h2>外觀</h2> 在這個標籤頁，您可以設定登入管理員的外觀、使用的語言，以及 GUI 樣式。語言設定與使用者的語言設定並不會互相衝突。"
--"<h2>字型</h2>您可以在這邊選擇字型，讓登入管理員使用不同的字型，例如問候語及使用者名稱。"
--"<h2>背景</h2>如果您希望為登入畫面設定特定的背景，在這邊可以完成您的願望。"
--"<h2>關機</h2>您可以在這裡設定誰能夠停止、重新啟動這部機器，以及是否使用開機管理程式。"
--"<h2>使用者</h2>在這個標籤頁，您可以選擇登入管理員所要提供的使用者清單，以供您在登入系統時使用。"
--"<h2>便利設施</h2>您可以在這邊指定能自動登入的使用者，不需要提供密碼就可以登入的使用者，以及其他給懶人使用的功能。 "
--"<br>注意：這些選項的性質可說是個系統安全上的漏洞，請非常您一定要小心的使用。"
-+"for various purposes like greetings and user names. <h2>Background</h2>If "
-+"you want to set a special background for the login screen, this is where to "
-+"do it.<h2>Shutdown</h2> Here you can specify who is allowed to shutdown/"
-+"reboot the machine and whether a boot manager should be used.<h2>Users</"
-+"h2>On this tab page, you can select which users the Login Manager will offer "
-+"you for logging in.<h2>Convenience</h2> 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.<br>Note, that these settings are security "
-+"holes by their nature, so use them very carefully."
-+msgstr ""
-+"<h1>登入管理員</h1>在這個模組之中，您可以設定由 KDE 登入管理員所接受的變數。"
-+"這包括了使用者登入時所能選擇的外觀與感覺。請注意您只能以管理者的權限執行這個"
-+"模組。如果您沒有使用超級使用者的權限，來啟動 KDE 的控制中心（當然，這是正確的"
-+"作法），您可以按下<em>變更 (Modify)</em>按鈕以取得管理者權限。同時，您將被詢"
-+"問超級使用者密碼。<h2>外觀</h2> 在這個標籤頁，您可以設定登入管理員的外觀、使"
-+"用的語言，以及 GUI 樣式。語言設定與使用者的語言設定並不會互相衝突。<h2>字型</"
-+"h2>您可以在這邊選擇字型，讓登入管理員使用不同的字型，例如問候語及使用者名稱。"
-+"<h2>背景</h2>如果您希望為登入畫面設定特定的背景，在這邊可以完成您的願望。<h2>"
-+"關機</h2>您可以在這裡設定誰能夠停止、重新啟動這部機器，以及是否使用開機管理程"
-+"式。<h2>使用者</h2>在這個標籤頁，您可以選擇登入管理員所要提供的使用者清單，以"
-+"供您在登入系統時使用。<h2>便利設施</h2>您可以在這邊指定能自動登入的使用者，不"
-+"需要提供密碼就可以登入的使用者，以及其他給懶人使用的功能。 <br>注意：這些選項"
-+"的性質可說是個系統安全上的漏洞，請非常您一定要小心的使用。"
- 
- #: 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) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Chinese Traditional <zh-l10n@linux.org.tw>\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 "<unknown>"
-@@ -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) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Chinese Traditional <zh-l10n@linux.org.tw>\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 ""
--"<qt>Enter the filename you are looking for. "
--"<br>Alternatives may be separated by a semicolon \";\"."
--"<br>"
--"<br>The filename may contain the following special characters:"
--"<ul>"
--"<li><b>?</b> matches any single character</li>"
--"<li><b>*</b> matches zero or more of any characters</li>"
--"<li><b>[...]</b> matches any of the characters in braces</li></ul>"
--"<br>Example searches:"
--"<ul>"
--"<li><b>*.kwd;*.txt</b> finds all files ending with .kwd or .txt</li>"
--"<li><b>go[dt]</b> finds god and got</li>"
--"<li><b>Hel?o</b> finds all files that start with \"Hel\" and end with \"o\", "
--"having one character in between</li>"
--"<li><b>My Document.kwd</b> finds a file of exactly that name</li></ul></qt>"
-+"<qt>Enter the filename you are looking for. <br>Alternatives may be "
-+"separated by a semicolon \";\".<br><br>The filename may contain the "
-+"following special characters:<ul><li><b>?</b> matches any single character</"
-+"li><li><b>*</b> matches zero or more of any characters</li><li><b>[...]</b> "
-+"matches any of the characters in braces</li></ul><br>Example searches:"
-+"<ul><li><b>*.kwd;*.txt</b> finds all files ending with .kwd or .txt</"
-+"li><li><b>go[dt]</b> finds god and got</li><li><b>Hel?o</b> finds all files "
-+"that start with \"Hel\" and end with \"o\", having one character in between</"
-+"li><li><b>My Document.kwd</b> finds a file of exactly that name</li></ul></"
-+"qt>"
- msgstr ""
--"<qt>輸入你所要找的檔案名稱。"
--"<br>多個名稱可以使用分號「;」隔開。"
--"<br>"
--"<br>檔案名稱中可以包含下列特殊字元："
--"<ul>"
--"<li><b>?</b> 比對任何單一字元</li>"
--"<li><b>*</b> 比對零個或多個任意字元</li>"
--"<li><b>[...]</b> 比對任何在中括號中的字元</li></ul>"
--"<br>搜尋範例:"
--"<ul>"
--"<li><b>*.kwd;*.txt</b> 找尋所有檔名結尾為 .kwd 或是 .txt 的檔案。</li>"
--"<li><b>go[dt]</b> 找到檔案 god 與 got</li>"
--"<li><b>Hel?o</b> 找出所有以「Hel」起頭且以「o」結尾，且其中只有一個字元的所有檔案</li>"
--"<li><b>My Document.kwd</b> 找到一個檔名完全相符的檔案</li></ul></qt>"
-+"<qt>輸入你所要找的檔案名稱。<br>多個名稱可以使用分號「;」隔開。<br><br>檔案名"
-+"稱中可以包含下列特殊字元：<ul><li><b>?</b> 比對任何單一字元</li><li><b>*</b> "
-+"比對零個或多個任意字元</li><li><b>[...]</b> 比對任何在中括號中的字元</li></"
-+"ul><br>搜尋範例:<ul><li><b>*.kwd;*.txt</b> 找尋所有檔名結尾為 .kwd 或是 .txt "
-+"的檔案。</li><li><b>go[dt]</b> 找到檔案 god 與 got</li><li><b>Hel?o</b> 找出"
-+"所有以「Hel」起頭且以「o」結尾，且其中只有一個字元的所有檔案</li><li><b>My "
-+"Document.kwd</b> 找到一個檔名完全相符的檔案</li></ul></qt>"
- 
- #: kftabdlg.cpp:111
- msgid ""
--"<qt>This lets you use the files' index created by the <i>slocate</i> "
--"package to speed-up the search; remember to update the index from time to time "
-+"<qt>This lets you use the files' index created by the <i>slocate</i> package "
-+"to speed-up the search; remember to update the index from time to time "
- "(using <i>updatedb</i>).</qt>"
- msgstr ""
--"<qt>這讓您使用<i>slocate</i>所建立的檔案索引包來加速搜尋。 別忘了要不時更新檔案索引(使用<i>updatedb</i>)。</qt>"
-+"<qt>這讓您使用<i>slocate</i>所建立的檔案索引包來加速搜尋。 別忘了要不時更新檔"
-+"案索引(使用<i>updatedb</i>)。</qt>"
- 
- #: kftabdlg.cpp:147
- msgid "Find all files created or &modified:"
-@@ -238,7 +226,9 @@
- "<qt>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.</qt>"
--msgstr "<qt>如果選擇此項，只會找到包含這些文字的檔案。請注意並非所有 上列的檔案格式都有支援。請參考文件，以得知所支援的檔案格 式。</qt>"
-+msgstr ""
-+"<qt>如果選擇此項，只會找到包含這些文字的檔案。請注意並非所有 上列的檔案格式都"
-+"有支援。請參考文件，以得知所支援的檔案格 式。</qt>"
- 
- #: kftabdlg.cpp:264
- msgid "Case s&ensitive"
-@@ -256,11 +246,13 @@
- msgid ""
- "<qt>This lets you search in any type of file, even those that usually do not "
- "contain text (for example program files and images).</qt>"
--msgstr "<qt>這讓您在檔任何格式的檔案中搜尋，儘管這些檔案常常不包含文字(例如程式檔或圖像檔) </qt>"
-+msgstr ""
-+"<qt>這讓您在檔任何格式的檔案中搜尋，儘管這些檔案常常不包含文字(例如程式檔或圖"
-+"像檔) </qt>"
- 
- #: 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 ""
--"<qt>Search within files' specific comments/metainfo"
--"<br>These are some examples:"
--"<br>"
--"<ul>"
--"<li><b>Audio files (mp3...)</b> Search in id3 tag for a title, an album</li>"
--"<li><b>Images (png...)</b> Search images with a special resolution, "
--"comment...</li></ul></qt>"
-+"<qt>Search within files' specific comments/metainfo<br>These are some "
-+"examples:<br><ul><li><b>Audio files (mp3...)</b> Search in id3 tag for a "
-+"title, an album</li><li><b>Images (png...)</b> Search images with a special "
-+"resolution, comment...</li></ul></qt>"
- msgstr ""
--"<qt>搜尋檔案的備註或格式資訊"
--"<br>這裡有一些範例："
--"<br>"
--"<ul>"
--"<li><b>音訊檔案 (mp3...)</b>搜尋 mp3 檔案內的 id3 標籤資訊， 例如歌名、專輯名稱...</li>"
--"<li><b>影像檔案 (png...)</b>依照所定義的解析度、 備註等來搜尋影像檔案</li></ul></qt>"
-+"<qt>搜尋檔案的備註或格式資訊<br>這裡有一些範例：<br><ul><li><b>音訊檔案 "
-+"(mp3...)</b>搜尋 mp3 檔案內的 id3 標籤資訊， 例如歌名、專輯名稱...</"
-+"li><li><b>影像檔案 (png...)</b>依照所定義的解析度、 備註等來搜尋影像檔案</"
-+"li></ul></qt>"
- 
- #: kftabdlg.cpp:358
- msgid ""
--"<qt>If specified, search only in this field"
--"<br>"
--"<ul>"
--"<li><b>Audio files (mp3...)</b> This can be Title, Album...</li>"
--"<li><b>Images (png...)</b> Search only in Resolution, Bitdepth...</li></ul></qt>"
-+"<qt>If specified, search only in this field<br><ul><li><b>Audio files "
-+"(mp3...)</b> This can be Title, Album...</li><li><b>Images (png...)</b> "
-+"Search only in Resolution, Bitdepth...</li></ul></qt>"
- msgstr ""
--"<qt>如果這個選項被設定了，那麼只會搜尋這個欄位內的內容。"
--"<br>"
--"<ul>"
--"<li><b>音訊檔案(mp3...)</b>這可以是歌名、 專輯、...</li>"
--"<li><b>影像檔案 (png...)</b>只會依照解析度、 色階、...搜尋</li></ul></qt>"
-+"<qt>如果這個選項被設定了，那麼只會搜尋這個欄位內的內容。<br><ul><li><b>音訊檔"
-+"案(mp3...)</b>這可以是歌名、 專輯、...</li><li><b>影像檔案 (png...)</b>只會依"
-+"照解析度、 色階、...搜尋</li></ul></qt>"
- 
- #: 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 <j_h_liau@yahoo.com.tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: zh-l10n <zh-l10n@linux.org.tw>\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 <j_h_liau@yahoo.com.tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Chinese(traditional) <zh-l10n@linux.org.tw>\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 ""
--"<b>The fonts shown are your personal fonts.</b>"
--"<br>To see (and install) system-wide fonts, click on the \"Administrator Mode\" "
--"button below."
--msgstr "<b>顯示的字型是您的個人字型。</b><br>要查看(和安裝)系統層級的字型，請按下方的「系統管理者模式」按鈕。"
-+"<b>The fonts shown are your personal fonts.</b><br>To see (and install) "
-+"system-wide fonts, click on the \"Administrator Mode\" button below."
-+msgstr ""
-+"<b>顯示的字型是您的個人字型。</b><br>要查看(和安裝)系統層級的字型，請按下方的"
-+"「系統管理者模式」按鈕。"
- 
- #: 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 ""
--"<h1>Font Installer</h1>"
--"<p> This module allows you to install TrueType, Type1, and Bitmap fonts.</p>"
--"<p>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.</p>"
--msgstr ""
--"<h1>字型安裝程式</h1>"
--"<p>這個模組用來安裝 TrueType、Type1 以及Bitmap字型。</p>"
--"<p>您也可以利用 Konqueror 來安裝 字型：在 Konqueror 的位址列鍵入 "
--"fonts:/，就會顯示出您目前已安裝的字型。要安裝新字型，只要複製一份到此資料夾即可。</p>"
-+"<h1>Font Installer</h1><p> This module allows you to install TrueType, "
-+"Type1, and Bitmap fonts.</p><p>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.</p>"
-+msgstr ""
-+"<h1>字型安裝程式</h1><p>這個模組用來安裝 TrueType、Type1 以及Bitmap字型。</"
-+"p><p>您也可以利用 Konqueror 來安裝 字型：在 Konqueror 的位址列鍵入 fonts:/，"
-+"就會顯示出您目前已安裝的字型。要安裝新字型，只要複製一份到此資料夾即可。</p>"
- 
- #: kcmfontinst/KCmFontInst.cpp:324
- msgid ""
--"<h1>Font Installer</h1>"
--"<p> This module allows you to install TrueType, Type1, and Bitmap fonts.</p>"
--"<p>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).</p>"
--"<p><b>NOTE:</b> 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\".</p>"
--msgstr ""
--"<h1>字型安裝程式</h1>"
--"<p>這個模組用來安裝TrueType、Type1 以及Bitmap字型。</p>"
--"<p>您也可以利用 Konqueror 來安裝 字型：在 Konqueror 的位址列鍵入 "
--"fonts:/，就會顯示出您目前已安裝的字型。要安裝新字型，只要複製一份到適當的資料夾即可─「個人」代表只供您自己使用的字型，而「系統」則是全系統的字型（所有人"
--"皆可用）。</p>"
--"<p><b>注意：</b>當您不是以「root」登入時，任何安裝的字型都只有您能用。要安裝全系統的字型，請使用「系統管理者模式」按鈕來以「root」執行此模組。"
-+"<h1>Font Installer</h1><p> This module allows you to install TrueType, "
-+"Type1, and Bitmap fonts.</p><p>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).</p><p><b>NOTE:</b> 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\".</p>"
-+msgstr ""
-+"<h1>字型安裝程式</h1><p>這個模組用來安裝TrueType、Type1 以及Bitmap字型。</"
-+"p><p>您也可以利用 Konqueror 來安裝 字型：在 Konqueror 的位址列鍵入 fonts:/，"
-+"就會顯示出您目前已安裝的字型。要安裝新字型，只要複製一份到適當的資料夾即可─"
-+"「個人」代表只供您自己使用的字型，而「系統」則是全系統的字型（所有人皆可"
-+"用）。</p><p><b>注意：</b>當您不是以「root」登入時，任何安裝的字型都只有您能"
-+"用。要安裝全系統的字型，請使用「系統管理者模式」按鈕來以「root」執行此模組。"
- "</p>"
- 
- #: kcmfontinst/KCmFontInst.cpp:421
-@@ -154,19 +153,17 @@
- #: kcmfontinst/KCmFontInst.cpp:611
- msgid ""
- "<p>Please note that any open applications will need to be restarted in order "
--"for any changes to be noticed."
--"<p>"
--"<p>(You will also have to restart this application in order to use its print "
--"function on any newly installed fonts.)</p>"
--msgstr ""
--"<p>請注意任何已開啟的應用程式將須要重新啟動才能反應出所做的變更。"
--"<p>"
--"<p>(您也必須重新啟動這個應用程式才能讓新安裝的字型使用其列印功能。)</p>"
-+"for any changes to be noticed.<p><p>(You will also have to restart this "
-+"application in order to use its print function on any newly installed fonts.)"
-+"</p>"
-+msgstr ""
-+"<p>請注意任何已開啟的應用程式將須要重新啟動才能反應出所做的變更。<p><p>(您也"
-+"必須重新啟動這個應用程式才能讓新安裝的字型使用其列印功能。)</p>"
- 
- #: 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 ""
--"<p>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.</p>"
--"<p>Selecting this option will inform the installer to create the necessary "
--"files so that these older applications can use the fonts you install.</p>"
--"<p>Please note, however, that this will slow down the installation process."
--"<p>"
--msgstr ""
--"<p>現代的應用程式使用稱為「FontConfig」的系統來獲得字型清單。較舊的應用程式像 OpenOffice 1.x、GIMP 1.x "
--"等等則使用過去的「core X fonts」來達到目的。</p>"
--"<p>選擇這個選項會通知安裝程式建立必要的檔案以便那些舊程式可以使用您所安裝的字型。</p>"
--"<p>然而，請您注意這會降低安裝過程的速度。"
--"<p>"
-+"<p>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.</p><p>Selecting this option "
-+"will inform the installer to create the necessary files so that these older "
-+"applications can use the fonts you install.</p><p>Please note, however, that "
-+"this will slow down the installation process.<p>"
-+msgstr ""
-+"<p>現代的應用程式使用稱為「FontConfig」的系統來獲得字型清單。較舊的應用程式"
-+"像 OpenOffice 1.x、GIMP 1.x 等等則使用過去的「core X fonts」來達到目的。</"
-+"p><p>選擇這個選項會通知安裝程式建立必要的檔案以便那些舊程式可以使用您所安裝的"
-+"字型。</p><p>然而，請您注意這會降低安裝過程的速度。<p>"
- 
- #: kcmfontinst/SettingsDialog.cpp:57
- msgid "Configure fonts for Ghostscript"
-@@ -263,31 +258,33 @@
- 
- #: kcmfontinst/SettingsDialog.cpp:58
- msgid ""
--"<p>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.</p>"
--"<p>Selecting this option will create the necessary Ghostscript config files.</p>"
--"<p>Please note, however, that this will also slow down the installation "
--"process.</p>"
--"<p>As most applications can, and do, embed the fonts into the PostScript before "
--"sending this to Ghostscript, this option can safely be disabled."
--msgstr ""
--"<p>在列印時，大多數應用程式都是使用 PostScript。亦即將其送至特定的應用程式，其名為 Ghostscript，它能解譯 PostScript "
--"並送出正確的指令到您的印表機。如果您的應用程式沒有內嵌任何 PostScript 使用的字型，那就需要通知 Ghostscript "
--"您已安裝何種字型以及安裝在何處。</p>"
--"<p>選擇這個選項會建立必要的 Ghostscript 設定檔。</p>"
--"<p>請注意，這會減低安裝過程的速度。</p>"
--"<p>當大部分應用程式在送出資料到 Ghostscript 之前都可以，並確實內嵌字型到 PostScript，您便可以安心停用這個選項。"
-+"<p>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.</p><p>Selecting this option will "
-+"create the necessary Ghostscript config files.</p><p>Please note, however, "
-+"that this will also slow down the installation process.</p><p>As most "
-+"applications can, and do, embed the fonts into the PostScript before sending "
-+"this to Ghostscript, this option can safely be disabled."
-+msgstr ""
-+"<p>在列印時，大多數應用程式都是使用 PostScript。亦即將其送至特定的應用程式，"
-+"其名為 Ghostscript，它能解譯 PostScript 並送出正確的指令到您的印表機。如果您"
-+"的應用程式沒有內嵌任何 PostScript 使用的字型，那就需要通知 Ghostscript 您已安"
-+"裝何種字型以及安裝在何處。</p><p>選擇這個選項會建立必要的 Ghostscript 設定"
-+"檔。</p><p>請注意，這會減低安裝過程的速度。</p><p>當大部分應用程式在送出資料"
-+"到 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 ""
--"<p>Only fonts may be installed.</p>"
--"<p>If installing a fonts package (*%1), then extract the components, and "
--"install individually.</p>"
--msgstr "<p>只有要被安裝的字型。</p><p>如果安裝一個字型套件 (*%1)，則解開其元件並各別安裝。</p>"
-+"<p>Only fonts may be installed.</p><p>If installing a fonts package (*%1), "
-+"then extract the components, and install individually.</p>"
-+msgstr ""
-+"<p>只有要被安裝的字型。</p><p>如果安裝一個字型套件 (*%1)，則解開其元件並各別"
-+"安裝。</p>"
- 
- #: kio/KioFonts.cpp:2309
- msgid ""
- "<p>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:</p>"
--"<ul>%1</ul>"
--"<p>\n"
-+"with the moving they will all have to be moved. The other affected fonts are:"
-+"</p><ul>%1</ul><p>\n"
- " Do you wish to move all of these?</p>"
- msgstr ""
--"<p>這個字型位於一個包含其他字型的檔案；為了進行這次移動的動作其他所有字型也會被移動。其他會被影響的字型有：</p>"
--"<ul>%1</ul>"
--"<p>\n"
-+"<p>這個字型位於一個包含其他字型的檔案；為了進行這次移動的動作其他所有字型也會"
-+"被移動。其他會被影響的字型有：</p><ul>%1</ul><p>\n"
- "您是否希望移動它們全部？</p>"
- 
- #: kio/KioFonts.cpp:2314
- msgid ""
- "<p>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:</p>"
--"<ul>%1</ul>"
--"<p>\n"
-+"are:</p><ul>%1</ul><p>\n"
- " Do you wish to copy all of these?</p>"
- msgstr ""
--"<p>這個字型位於一個包含其他字型的檔案；為了進行這次複製的動作其他所有字型也會被複製。其他會被影響的字型有：</p>"
--"<ul>%1</ul>"
--"<p>\n"
-+"<p>這個字型位於一個包含其他字型的檔案；為了進行這次複製的動作其他所有字型也會"
-+"被複製。其他會被影響的字型有：</p><ul>%1</ul><p>\n"
- "您是否希望複製它們全部？</p>"
- 
- #: kio/KioFonts.cpp:2318
- msgid ""
- "<p>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:</p>"
--"<ul>%1</ul>"
--"<p>\n"
-+"are:</p><ul>%1</ul><p>\n"
- " Do you wish to delete all of these?</p>"
- msgstr ""
--"<p>這個字型位於一個包含其他字型的檔案；為了進行這次刪除的動作其他所有字型也會被刪除。其他會被影響的字型有：</p>"
--"<ul>%1</ul>"
--"<p>\n"
-+"<p>這個字型位於一個包含其他字型的檔案；為了進行這次刪除的動作其他所有字型也會"
-+"被刪除。其他會被影響的字型有：</p><ul>%1</ul><p>\n"
- "您是否希望刪除它們全部？</p>"
- 
- #: 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 "<p><b>NOTE:</b> 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\".</p>"
--#~ msgstr "<p><b>注意：</b>由於您並未以\"root\"身份登入，所安裝的字型 只有你可以使用。如果您想要安裝字型讓整個系統使用，請按 \"Administrator Mode\"鍵，以\"root\"身份來執行本模組。"
-+#~ msgid ""
-+#~ "<p><b>NOTE:</b> 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\".</p>"
-+#~ msgstr ""
-+#~ "<p><b>注意：</b>由於您並未以\"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 <b>not</b> handled - and \"encodings\" and \"util\" are for X11 encoding files"
--#~ msgstr "您無法新增名為\"CID\"、\"encodings\"、或是\"util\"的資料夾， 因為他們是特定的系統資料夾(\"CID\"是給\"CID\"字型使用， <b>不該</b>由此處理，而\"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 <b>not</b> handled - and \"encodings\" and \"util\" "
-+#~ "are for X11 encoding files"
-+#~ msgstr ""
-+#~ "您無法新增名為\"CID\"、\"encodings\"、或是\"util\"的資料夾， 因為他們是特"
-+#~ "定的系統資料夾(\"CID\"是給\"CID\"字型使用， <b>不該</b>由此處理，而"
-+#~ "\"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) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Traditional Chinese <zh_l10n@linux.org.tw>\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) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Traditional Chinese <zh_l10n@linux.org.tw>\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 <j_h_liau@yahoo.com.tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\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 "<qt>The folder <b>%1</b> does not exist; unable to create index.</qt>"
-@@ -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 "<h1>Help Index</h1> With this control module you configure and build the index files required by the search function of the help center."
--#~ msgstr "<h1>輔助索引</h1>這個控制模組可以讓您設定並建立，在輔助中心的搜尋功能中，所需要的索引檔。"
-+#~ msgid ""
-+#~ "<h1>Help Index</h1> With this control module you configure and build the "
-+#~ "index files required by the search function of the help center."
-+#~ msgstr ""
-+#~ "<h1>輔助索引</h1>這個控制模組可以讓您設定並建立，在輔助中心的搜尋功能中，"
-+#~ "所需要的索引檔。"
- 
- #~ 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 <j_h_liau@yahoo.com.tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\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 ""
--"<p>This module allows configuring input actions, like mouse gestures, keyboard "
--"shortcuts for performing commands, launching applications or DCOP calls, and "
--"similar.</p>\n"
--"<p><b>NOTE: </b>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.</p>"
-+"<p>This module allows configuring input actions, like mouse gestures, "
-+"keyboard shortcuts for performing commands, launching applications or DCOP "
-+"calls, and similar.</p>\n"
-+"<p><b>NOTE: </b>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.</p>"
- msgstr ""
--"<p>這個模組允許配置輸入的動作，如滑鼠手勢，鍵盤快速鍵完成指令，起動應用程式或 DCOP 呼叫，及諸如此類的。</p>\n"
--"<p><b>注意：</b>如果您不是有經驗的使用者，在修改這些動作時要小心，主要就是要有節制地對啟動/關閉動作和觸發器進行變更。</p>"
-+"<p>這個模組允許配置輸入的動作，如滑鼠手勢，鍵盤快速鍵完成指令，起動應用程式"
-+"或 DCOP 呼叫，及諸如此類的。</p>\n"
-+"<p><b>注意：</b>如果您不是有經驗的使用者，在修改這些動作時要小心，主要就是要"
-+"有節制地對啟動/關閉動作和觸發器進行變更。</p>"
- 
- #. 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:"
--"<ul>\n"
-+"Specify the window where the keyboard input should be sent to:<ul>\n"
- "<li><em>Action window:</em> 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.</li>\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.</li>\n"
- "<li><em>Active window:</em> The currently active window.</li>\n"
- "<li><em>Specific window:</em> Any window matching the given criteria.</li>\n"
- "</ul>"
- msgstr ""
--"指定鍵盤輸入應送出至哪個視窗："
--"<ul>\n"
--"<li><em>動作視窗：</em> "
--"觸發動作發生的視窗；這通常是目前作用中視窗，除了滑鼠手勢觸發─它是發生於該滑鼠之下的視窗─與視窗觸發─它是由觸發該動作的視窗。</li>\n"
-+"指定鍵盤輸入應送出至哪個視窗：<ul>\n"
-+"<li><em>動作視窗：</em> 觸發動作發生的視窗；這通常是目前作用中視窗，除了滑鼠"
-+"手勢觸發─它是發生於該滑鼠之下的視窗─與視窗觸發─它是由觸發該動作的視窗。</"
-+"li>\n"
- "<li><em>作用中視窗：</em> 目前作用中的視窗</li>\n"
- "<li><em>指定的視窗：</em> 任何合於指定條件的視窗。</li>\n"
- "</ul>"
-@@ -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 <i>Full duplex</i> is checked in your <i>Sound System</i> options."
- msgstr ""
--"<b>注意：</b> 要讓語音辨識功能正確執行，您須要有能正常運作的 <i>arts</i>，並使用全雙工模式： \n"
-+"<b>注意：</b> 要讓語音辨識功能正確執行，您須要有能正常運作的 <i>arts</i>，並"
-+"使用全雙工模式： \n"
- "請確定您的 <i>聲音伺服器</i> 選項中的 <i>全雙工</i> 核取方塊已核取。"
- 
- #. 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 ""
--"<qt>%1"
--"<br><font color='red'>One of the sound references is not correct</font></qt>"
-+"<qt>%1<br><font color='red'>One of the sound references is not correct</"
-+"font></qt>"
- msgstr "<qt>%1<br><font color='red'>其中一個語音參照不正確</font></qt>"
- 
- #: 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) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Traditional Chinese <zh_l10n@linux.org.tw>\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) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Chinese Traditional <zh-l10n@linux.org.tw>\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) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Chinese Traditional <zh-l10n@linux.org.tw>\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 ""
--"<p>You have chosen to open another desktop session."
--"<br>The current session will be hidden and a new login screen will be "
--"displayed."
--"<br>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.</p>"
-+"<p>You have chosen to open another desktop session.<br>The current session "
-+"will be hidden and a new login screen will be displayed.<br>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.</p>"
- msgstr ""
--"<p>您選項了其他的工作階段。"
--"<br>目前的工作階段將會被隱藏，同時顯示新的登入視窗。"
--"<br>功能鍵可以用來切換不同的工作階段；F%1 通常設定為第一個工作階段，而 F%2為第二個，其他的依此類推。您可以同時按下 "
--"CTRL、ALT，以及功能鍵來切換你的工作階段。此外，KDE 面板和桌面選單也提供在工作階段之間切換的動作。</p>"
-+"<p>您選項了其他的工作階段。<br>目前的工作階段將會被隱藏，同時顯示新的登入視"
-+"窗。<br>功能鍵可以用來切換不同的工作階段；F%1 通常設定為第一個工作階段，而 F%"
-+"2為第二個，其他的依此類推。您可以同時按下 CTRL、ALT，以及功能鍵來切換你的工作"
-+"階段。此外，KDE 面板和桌面選單也提供在工作階段之間切換的動作。</p>"
- 
- #: ui/k_mnu.cpp:408
- msgid "Warning - New Session"
-@@ -536,8 +534,8 @@
- #: rc.cpp:24
- #, no-c-format
- msgid ""
--"<qt>This is the applet list. Select an applet and click on <b>Add to panel</b> "
--"to add it</qt>"
-+"<qt>This is the applet list. Select an applet and click on <b>Add to panel</"
-+"b> to add it</qt>"
- msgstr "<qt>這是小程式清單。選擇一個小程式並按 <b>加入至面板</b> 來加入它</qt>"
- 
- #. 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 <thhsieh@linux.org.tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Traditional Chinese <zh-l10n@linux.org.tw>\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 <j_h_liau@yahoo.com.tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\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 <j_h_liau@yahoo.com.tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Chinese (traditional) <zh-l10n@lists.linux.org.tw>\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) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Traditional Chinese <zh_l10n@linux.org.tw>\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) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Traditional Chinese <zh_l10n@linux.org.tw>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
-@@ -36,7 +35,7 @@
- 
- #: kio_ldap.cpp:524
- msgid "site:"
--msgstr "站台："
-+msgstr "站臺："
- 
- #: kio_ldap.cpp:551 kio_ldap.cpp:686
- msgid "Invalid authorization information."
-@@ -66,4 +65,4 @@
- #: kio_ldap.cpp:1033
- #, c-format
- msgid "Invalid LDIF file in line %1."
--msgstr "LDIF 檔案內容第 %1 行語法錯誤。"
-+msgstr "LDIF 檔案內容第 %1 列語法錯誤。"
-diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kio_mac.po kde-i18n-zh_TW-3.5.10/messages/kdebase/kio_mac.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kio_mac.po	2006-07-22 10:04:12.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdebase/kio_mac.po	2011-11-11 15:45:17.000000000 +0100
-@@ -7,7 +7,7 @@
- "Project-Id-Version: kio_mac\n"
- "POT-Creation-Date: 2005-09-21 02:57+0200\n"
- "PO-Revision-Date: 2005-11-03 18:49+0800\n"
--"Last-Translator: Chao-Hsiung Liao <j_h_liau@yahoo.com.tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
-@@ -35,7 +35,8 @@
- 
- #: kio_mac.cpp:201
- msgid ""
--"hpls did not exit normally - please ensure you have installed the hfsplus tools"
-+"hpls did not exit normally - please ensure you have installed the hfsplus "
-+"tools"
- msgstr "hpls 並未正常結束─請確定您是否已安裝 hfsplus 工具組"
- 
- #: kio_mac.cpp:288
-diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kio_man.po kde-i18n-zh_TW-3.5.10/messages/kdebase/kio_man.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kio_man.po	2007-07-12 10:27:45.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdebase/kio_man.po	2011-11-11 15:45:17.000000000 +0100
-@@ -8,7 +8,7 @@
- "Project-Id-Version: kio_man\n"
- "POT-Creation-Date: 2007-05-29 02:15+0200\n"
- "PO-Revision-Date: 2005-11-04 18:55+0800\n"
--"Last-Translator: Chao-Hsiung Liao <j_h_liau@yahoo.com.tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
-@@ -28,19 +28,16 @@
- 
- #: kio_man.cpp:465
- msgid ""
--"No man page matching to %1 found."
--"<br>"
--"<br>Check that you have not mistyped the name of the page that you want.\n"
--"Be careful that you must take care about upper case and lower case characters!"
--"<br>If everything looks correct, then perhaps you need to set a better search "
--"path for man pages, be it by the environment variable MANPATH or a matching "
--"file in the directory /etc ."
-+"No man page matching to %1 found.<br><br>Check that you have not mistyped "
-+"the name of the page that you want.\n"
-+"Be careful that you must take care about upper case and lower case "
-+"characters!<br>If everything looks correct, then perhaps you need to set a "
-+"better search path for man pages, be it by the environment variable MANPATH "
-+"or a matching file in the directory /etc ."
- msgstr ""
--"找不到符合 %1 的 man page。"
--"<br>"
--"<br>請檢查您是否打錯您所要頁面的名稱。\n"
--"請注意您必須確認大寫與小寫字母！"
--"<br>如果一切看來都正確，可能您得設定一個更好的 man page 搜尋路徑，可用 MANPATH 環境變數或在 /etc 目錄中符合的檔案來設定。"
-+"找不到符合 %1 的 man page。<br><br>請檢查您是否打錯您所要頁面的名稱。\n"
-+"請注意您必須確認大寫與小寫字母！<br>如果一切看來都正確，可能您得設定一個更好"
-+"的 man page 搜尋路徑，可用 MANPATH 環境變數或在 /etc 目錄中符合的檔案來設定。"
- 
- #: kio_man.cpp:496
- msgid "Open of %1 failed."
-@@ -63,7 +60,9 @@
- "Note: if you read a man page in your language, be aware it can contain some "
- "mistakes or be obsolete. In case of doubt, you should have a look at the "
- "English version."
--msgstr "注意：如果您以您的語言來閱讀 man page，請小心它可能包含一些錯誤和缺漏。如果對此有疑慮，您應該使用英語版本。"
-+msgstr ""
-+"注意：如果您以您的語言來閱讀 man page，請小心它可能包含一些錯誤和缺漏。如果對"
-+"此有疑慮，您應該使用英語版本。"
- 
- #: kio_man.cpp:723
- msgid "User Commands"
-@@ -134,14 +133,20 @@
- "Could not find the sgml2roff program on your system. Please install it, if "
- "necessary, and extend the search path by adjusting the environment variable "
- "PATH before starting KDE."
--msgstr "抱歉，您的系統並未安裝 sgm2roff。請確認您有正確安裝上該程式套件，並確認 PATH 環境變數內能夠找到該程式項目。"
-+msgstr ""
-+"抱歉，您的系統並未安裝 sgm2roff。請確認您有正確安裝上該程式套件，並確認 PATH "
-+"環境變數內能夠找到該程式項目。"
- 
- #: kmanpart.cpp:65
- msgid "KMan"
- msgstr "KMan"
- 
--#~ msgid "No man page matching to %1 found. You can extend the search path by setting the environment variable MANPATH before starting KDE."
--#~ msgstr "找不到與 %1 相符的 man page。您可以在開始 KDE 之前藉由設定環境變數MANPATH 延伸搜尋路徑，以便於進一步提供更多 manpage 放置的目錄位置。"
-+#~ msgid ""
-+#~ "No man page matching to %1 found. You can extend the search path by "
-+#~ "setting the environment variable MANPATH before starting KDE."
-+#~ msgstr ""
-+#~ "找不到與 %1 相符的 man page。您可以在開始 KDE 之前藉由設定環境變數MANPATH "
-+#~ "延伸搜尋路徑，以便於進一步提供更多 manpage 放置的目錄位置。"
- 
- #~ msgid "<body bgcolor=#ffffff><h1>UNIX Manual Index</h1>"
- #~ msgstr "<body bgcolor=#ffffff><h1>Unix 使用手冊目錄</h1>"
-diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kio_media.po kde-i18n-zh_TW-3.5.10/messages/kdebase/kio_media.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kio_media.po	2008-08-19 20:43:10.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdebase/kio_media.po	2011-11-11 15:45:17.000000000 +0100
-@@ -9,7 +9,7 @@
- "Project-Id-Version: kio_media\n"
- "POT-Creation-Date: 2008-07-08 01:18+0200\n"
- "PO-Revision-Date: 2007-11-26 15:09+0800\n"
--"Last-Translator: Chih-Wei Huang <cwhuang@linux.org.tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Chinese Traditional <zh-l10n@linux.org.tw>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
-@@ -84,8 +84,8 @@
- #: rc.cpp:15
- #, no-c-format
- msgid ""
--"Attempts to chown or chmod files do not return errors, although they fail. Use "
--"with caution!"
-+"Attempts to chown or chmod files do not return errors, although they fail. "
-+"Use with caution!"
- msgstr "對檔案做 chown 或 chmod 不要回報錯誤。請小心使用！"
- 
- #. i18n: file propsdlgplugin/propertiespagegui.ui line 76
-@@ -122,10 +122,12 @@
- #: rc.cpp:33
- #, no-c-format
- msgid ""
--"Under what directory this file system shall be mounted. Please note that there "
--"is no guarantee that the system will respect your wish. For one the directory "
--"has to be below /media - and it does not yet have to exist."
--msgstr "這個檔案系統要掛載在哪個目錄之下。請注意，這不保證系統會照您所希望的做。目錄應在 /media 之下，但不必存在。"
-+"Under what directory this file system shall be mounted. Please note that "
-+"there is no guarantee that the system will respect your wish. For one the "
-+"directory has to be below /media - and it does not yet have to exist."
-+msgstr ""
-+"這個檔案系統要掛載在哪個目錄之下。請注意，這不保證系統會照您所希望的做。目錄"
-+"應在 /media 之下，但不必存在。"
- 
- #. i18n: file propsdlgplugin/propertiespagegui.ui line 130
- #: rc.cpp:36
-@@ -170,7 +172,9 @@
- msgid ""
- "UTF8 is the filesystem safe 8-bit encoding of Unicode that is used by the "
- "console. It can be be enabled for the filesystem with this option."
--msgstr "UTF8 是 8 位元的萬用字元集（Unicode），可安全用於檔案系統中。這個選項可以開啟檔案系統對 UTF8 的支援。"
-+msgstr ""
-+"UTF8 是 8 位元的萬用字元集（Unicode），可安全用於檔案系統中。這個選項可以開啟"
-+"檔案系統對 UTF8 的支援。"
- 
- #. i18n: file propsdlgplugin/propertiespagegui.ui line 186
- #: rc.cpp:57
-@@ -207,21 +211,23 @@
- "its metadata being committed to the journal.\n"
- "\n"
- "<h3><b>Write Back</b></h3>\n"
--"           Data ordering is not preserved - data may be written into the main "
--"file system after its metadata has been committed to the journal.  This is "
--"rumoured to  be the  highest-throughput option.  It guarantees internal file "
--"system integrity,  however it can allow old data to appear in files after  a  "
--"crash  and  journal recovery."
-+"           Data ordering is not preserved - data may be written into the "
-+"main file system after its metadata has been committed to the journal.  This "
-+"is rumoured to  be the  highest-throughput option.  It guarantees internal "
-+"file system integrity,  however it can allow old data to appear in files "
-+"after  a  crash  and  journal recovery."
- msgstr ""
- "<h2>指定檔案資料使用日誌模式。Metadata 永遠會使用。</h2>\n"
- "\n"
- "<h3><b>所有資料</b></h3>\n"
--"        所有的資料都會在寫入主要檔案系統前先提交給日誌。這個狀況速度最滿，但是資料安全性最高。\n"
-+"        所有的資料都會在寫入主要檔案系統前先提交給日誌。這個狀況速度最滿，但"
-+"是資料安全性最高。\n"
- "<h3><b>強制依序</b></h3>\n"
- "        所有資料先強制寫入主要檔案系統後，才將它的 metadata 提交到日誌中。\n"
- "<h3><b>寫回</b></h3>\n"
--"        不保存資料順序─資料可能在 metadata "
--"提交到日誌之後才寫入主檔案系統。據說這樣是最快的。它保證內部檔案系統的完整度，但是在當機之後，檔案系統中的可能是舊資料，並且會做修復的動作。"
-+"        不保存資料順序─資料可能在 metadata 提交到日誌之後才寫入主檔案系統。據"
-+"說這樣是最快的。它保證內部檔案系統的完整度，但是在當機之後，檔案系統中的可能"
-+"是舊資料，並且會做修復的動作。"
- 
- #. i18n: file propsdlgplugin/propertiespagegui.ui line 226
- #: rc.cpp:78
-@@ -251,8 +257,8 @@
- #: rc.cpp:102 rc.cpp:129
- #, no-c-format
- msgid ""
--"<h2>Defines  the  behaviour  for  creation and display of filenames which fit "
--"into 8.3 characters. If a long name for a file exists, it will always be "
-+"<h2>Defines  the  behaviour  for  creation and display of filenames which "
-+"fit into 8.3 characters. If a long name for a file exists, it will always be "
- "preferred display.</h2>\n"
- "\n"
- "<h3><b>Lower</b></h3>\n"
-@@ -264,21 +270,26 @@
- "short name is not all upper case.\n"
- "\n"
- "<h3><b>Windows NT</b></h3>\n"
--"Display the shortname as is; store a long name when the short name is not all "
--"lower case or all upper case.\n"
-+"Display the shortname as is; store a long name when the short name is not "
-+"all lower case or all upper case.\n"
- "\n"
- "<h3><b>Mixed</b></h3>\n"
--"Display the short name as is; store a long name when the short name is not all "
--"upper case."
-+"Display the short name as is; store a long name when the short name is not "
-+"all upper case."
- msgstr ""
--"<h2>定義建立與顯示 8.3 格式檔名時的行為。如果檔案有長檔名，會優先顯示長檔名。</h2>\n"
-+"<h2>定義建立與顯示 8.3 格式檔名時的行為。如果檔案有長檔名，會優先顯示長檔名。"
-+"</h2>\n"
- "\n"
--"<h3><b>強制小寫</b></h3>顯示短檔名時將名稱強制改為小寫；若短檔名不是全部都大寫時，則儲存到長檔名中。\n"
-+"<h3><b>強制小寫</b></h3>顯示短檔名時將名稱強制改為小寫；若短檔名不是全部都大"
-+"寫時，則儲存到長檔名中。\n"
- "\n"
--"<h3><b>Windows 95</b></h3>顯示短檔名時將名稱強制改為大寫；若短檔名不是全部都大寫時，則儲存到長檔名中。\n"
-+"<h3><b>Windows 95</b></h3>顯示短檔名時將名稱強制改為大寫；若短檔名不是全部都"
-+"大寫時，則儲存到長檔名中。\n"
- "\n"
--"<h3><b>Windows NT</b></h3>將短檔名照原來的樣子顯示；若短檔名不是全部大寫或全部小寫時，則儲存到長檔名中。\n"
--"<h3><b>混合模式</b></h3>將短檔名照原來的樣子顯示；若短檔名不是全部都大寫時，則儲存到長檔名中。"
-+"<h3><b>Windows NT</b></h3>將短檔名照原來的樣子顯示；若短檔名不是全部大寫或全"
-+"部小寫時，則儲存到長檔名中。\n"
-+"<h3><b>混合模式</b></h3>將短檔名照原來的樣子顯示；若短檔名不是全部都大寫時，"
-+"則儲存到長檔名中。"
- 
- #. i18n: file propsdlgplugin/propertiespagegui.ui line 294
- #: rc.cpp:117
-@@ -435,16 +446,19 @@
- 
- #: mediamanager/halbackend.cpp:1042
- msgid ""
--"Moreover, programs still using the device have been detected. They are listed "
--"below. You have to close them or change their working directory before "
--"attempting to unmount the device again."
--msgstr "此外，系統偵測到底下的程式仍然在使用此裝置。您必須先將它們關閉，或改變它們的工作目錄，才能卸載此裝置。"
-+"Moreover, programs still using the device have been detected. They are "
-+"listed below. You have to close them or change their working directory "
-+"before attempting to unmount the device again."
-+msgstr ""
-+"此外，系統偵測到底下的程式仍然在使用此裝置。您必須先將它們關閉，或改變它們的"
-+"工作目錄，才能卸載此裝置。"
- 
- #: mediamanager/halbackend.cpp:1065 mediamanager/halbackend.cpp:1306
- msgid ""
--"Unfortunately, the device <b>%1</b> (%2) named <b>'%3'</b> "
--"and currently mounted at <b>%4</b> could not be unmounted. "
--msgstr "不幸地，裝置 <b>%1</b>（%2）名為 <b>%3</b> 目前掛載於 <b>%4</b> 無法卸載。"
-+"Unfortunately, the device <b>%1</b> (%2) named <b>'%3'</b> and currently "
-+"mounted at <b>%4</b> could not be unmounted. "
-+msgstr ""
-+"不幸地，裝置 <b>%1</b>（%2）名為 <b>%3</b> 目前掛載於 <b>%4</b> 無法卸載。"
- 
- #: mediamanager/halbackend.cpp:1071
- msgid "The following error was returned by umount command:"
-diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kio_nfs.po kde-i18n-zh_TW-3.5.10/messages/kdebase/kio_nfs.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kio_nfs.po	2006-07-22 10:04:12.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdebase/kio_nfs.po	2011-11-11 15:45:17.000000000 +0100
-@@ -3,7 +3,7 @@
- "Project-Id-Version: kio_nfs\n"
- "POT-Creation-Date: 2005-06-10 01:24+0200\n"
- "PO-Revision-Date: 2005-11-04 19:02+0800\n"
--"Last-Translator: Chao-Hsiung Liao <j_h_liau@yahoo.com.tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Traditional Chinese <zh-l10n@linux.org.tw>\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_nntp.po kde-i18n-zh_TW-3.5.10/messages/kdebase/kio_nntp.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kio_nntp.po	2006-07-22 10:04:12.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdebase/kio_nntp.po	2011-11-11 15:45:17.000000000 +0100
-@@ -3,7 +3,7 @@
- "Project-Id-Version: kio_nntp\n"
- "POT-Creation-Date: 2005-06-20 01:29+0200\n"
- "PO-Revision-Date: 2005-11-04 19:08+0800\n"
--"Last-Translator: Chao-Hsiung Liao <j_h_liau@yahoo.com.tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Traditional Chinese <zh-l10n@linux.org.tw>\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_pop3.po kde-i18n-zh_TW-3.5.10/messages/kdebase/kio_pop3.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kio_pop3.po	2007-10-08 12:00:12.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdebase/kio_pop3.po	2011-11-11 15:45:17.000000000 +0100
-@@ -3,7 +3,7 @@
- "Project-Id-Version: kio_pop3\n"
- "POT-Creation-Date: 2007-07-17 01:45+0200\n"
- "PO-Revision-Date: 2005-11-04 19:11+0800\n"
--"Last-Translator: Chao-Hsiung Liao <j_h_liau@yahoo.com.tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
-@@ -30,10 +30,8 @@
- "\"%1\""
- 
- #: pop3.cc:305
--msgid ""
--"Could not send to server.\n"
--msgstr ""
--"無法傳送給伺服器。\n"
-+msgid "Could not send to server.\n"
-+msgstr "無法傳送給伺服器。\n"
- 
- #: pop3.cc:360 pop3.cc:419 pop3.cc:616
- msgid "No authentication details supplied."
-@@ -41,19 +39,20 @@
- 
- #: pop3.cc:397
- msgid ""
--"Login via APOP failed. The server %1 may not support APOP, although it claims "
--"to support it, or the password may be wrong.\n"
-+"Login via APOP failed. The server %1 may not support APOP, although it "
-+"claims to support it, or the password may be wrong.\n"
- "\n"
- "%2"
- msgstr ""
--"透過 APOP 登入失敗。伺服器 %1 可能不支援 APOP 協定，雖然它宣稱有支援，或者您所提供的密碼是錯誤的。\n"
-+"透過 APOP 登入失敗。伺服器 %1 可能不支援 APOP 協定，雖然它宣稱有支援，或者您"
-+"所提供的密碼是錯誤的。\n"
- "\n"
- "%2"
- 
- #: pop3.cc:585
- msgid ""
--"Login via SASL (%1) failed. The server may not support %2, or the password may "
--"be wrong.\n"
-+"Login via SASL (%1) failed. The server may not support %2, or the password "
-+"may be wrong.\n"
- "\n"
- "%3"
- msgstr ""
-@@ -115,7 +114,9 @@
- msgid ""
- "Your POP3 server claims to support TLS but negotiation was unsuccessful. You "
- "can disable TLS in KDE using the crypto settings module."
--msgstr "您的 POP3 伺服器宣稱支援 TLS 但協定商議失敗。您可以在 KDE 中使用 crypto 設定模組將 TLS 關掉。"
-+msgstr ""
-+"您的 POP3 伺服器宣稱支援 TLS 但協定商議失敗。您可以在 KDE 中使用 crypto 設定"
-+"模組將 TLS 關掉。"
- 
- #: pop3.cc:746
- msgid ""
-diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kio_print.po kde-i18n-zh_TW-3.5.10/messages/kdebase/kio_print.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kio_print.po	2005-09-10 13:15:15.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdebase/kio_print.po	2011-11-11 15:45:17.000000000 +0100
-@@ -7,7 +7,7 @@
- "Project-Id-Version: kio_print\n"
- "POT-Creation-Date: 2005-05-18 21:24+0200\n"
- "PO-Revision-Date: 2003-12-17 10:07+0800\n"
--"Last-Translator: Tsung-Chien Ho <iitze@hotmail.com>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team:  <Chinese (traditional) <zh-l10n@linux.org.tw>>\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_remote.po kde-i18n-zh_TW-3.5.10/messages/kdebase/kio_remote.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kio_remote.po	2006-07-22 10:04:12.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdebase/kio_remote.po	2011-11-11 15:45:17.000000000 +0100
-@@ -6,8 +6,7 @@
- "Project-Id-Version: kio_remote\n"
- "POT-Creation-Date: 2006-04-28 03:54+0200\n"
- "PO-Revision-Date: 2006-01-20 15:30+0800\n"
--"Last-Translator: Frank Weng (a.k.a. Franklin) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Traditional Chinese <zh_l10n@linux.org.tw>\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_settings.po kde-i18n-zh_TW-3.5.10/messages/kdebase/kio_settings.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kio_settings.po	2006-07-22 10:04:12.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdebase/kio_settings.po	2011-11-11 15:45:17.000000000 +0100
-@@ -6,8 +6,7 @@
- "Project-Id-Version: kio_settings\n"
- "POT-Creation-Date: 2005-05-18 21:24+0200\n"
- "PO-Revision-Date: 2006-01-20 15:30+0800\n"
--"Last-Translator: Frank Weng (a.k.a. Franklin) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Traditional Chinese <zh_l10n@linux.org.tw>\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_sftp.po kde-i18n-zh_TW-3.5.10/messages/kdebase/kio_sftp.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kio_sftp.po	2006-07-22 10:04:12.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdebase/kio_sftp.po	2011-11-11 15:45:17.000000000 +0100
-@@ -9,7 +9,7 @@
- "Project-Id-Version: kio_sftp\n"
- "POT-Creation-Date: 2005-05-18 21:24+0200\n"
- "PO-Revision-Date: 2005-11-04 19:26+0800\n"
--"Last-Translator: Chao-Hsiung Liao <j_h_liau@yahoo.com.tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
-@@ -96,7 +96,8 @@
- 
- #: kio_sftp.cpp:1068
- msgid ""
--"Unknown error was encountered while copying the file to '%1'. Please try again."
-+"Unknown error was encountered while copying the file to '%1'. Please try "
-+"again."
- msgstr "當複製檔案到「%1」遇到不明錯誤。請再試一次。"
- 
- #: kio_sftp.cpp:1318
-@@ -163,9 +164,10 @@
- 
- #: ksshprocess.cpp:932
- msgid ""
--"The identity of the remote host '%1' could not be verified because the host's "
--"key is not in the \"known hosts\" file."
--msgstr "因為伺服器鍵值不在「已知的伺服器」清單中，所以無法驗證遠端伺服器 '%1'。"
-+"The identity of the remote host '%1' could not be verified because the "
-+"host's key is not in the \"known hosts\" file."
-+msgstr ""
-+"因為伺服器鍵值不在「已知的伺服器」清單中，所以無法驗證遠端伺服器 '%1'。"
- 
- #: ksshprocess.cpp:938
- msgid ""
-@@ -198,14 +200,15 @@
- "WARNING: The identity of the remote host '%1' has changed!\n"
- "\n"
- "Someone could be eavesdropping on your connection, or the administrator may "
--"have just changed the host's key. Either way, you should verify the host's key "
--"fingerprint with the host's administrator. The key fingerprint is:\n"
-+"have just changed the host's key. Either way, you should verify the host's "
-+"key fingerprint with the host's administrator. The key fingerprint is:\n"
- "%2\n"
- "Add the correct host key to \"%3\" to get rid of this message."
- msgstr ""
- "警告：遠端伺服器 '%1' 的識別碼更改！\n"
- "\n"
--"可能您的連線被竊聴了，也有可能是伺服器管理員修改了伺服器的識別碼。不管如何，你應該在連線前先檢驗識別碼。識別碼：\n"
-+"可能您的連線被竊聴了，也有可能是伺服器管理員修改了伺服器的識別碼。不管如何，"
-+"你應該在連線前先檢驗識別碼。識別碼：\n"
- "%2\n"
- "\n"
- "請使用 \"%3\" 正確的識別鍵值來關閉這個訊息的出現。"
-@@ -215,8 +218,8 @@
- "WARNING: The identity of the remote host '%1' has changed!\n"
- "\n"
- "Someone could be eavesdropping on your connection, or the administrator may "
--"have just changed the host's key. Either way, you should verify the host's key "
--"fingerprint with the host's administrator before connecting. The key "
-+"have just changed the host's key. Either way, you should verify the host's "
-+"key fingerprint with the host's administrator before connecting. The key "
- "fingerprint is:\n"
- "%2\n"
- "\n"
-@@ -224,7 +227,8 @@
- msgstr ""
- "警告：遠端伺服器 '%1' 的識別碼更改！\n"
- "\n"
--"可能您的連線被竊聴了，也有可能是伺服器管理員修改了伺服器的識別碼。不管如何，你應該在連線前先檢驗識別碼。識別碼：\n"
-+"可能您的連線被竊聴了，也有可能是伺服器管理員修改了伺服器的識別碼。不管如何，"
-+"你應該在連線前先檢驗識別碼。識別碼：\n"
- "%2\n"
- "\n"
- "您要接受這個新的鍵值，並使用它來進行連線嗎？"
-diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kio_smb.po kde-i18n-zh_TW-3.5.10/messages/kdebase/kio_smb.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kio_smb.po	2006-07-22 10:04:12.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdebase/kio_smb.po	2011-11-11 15:45:17.000000000 +0100
-@@ -8,7 +8,7 @@
- "Project-Id-Version: kio_smb\n"
- "POT-Creation-Date: 2005-11-08 02:45+0100\n"
- "PO-Revision-Date: 2005-11-04 22:05+0800\n"
--"Last-Translator: Chao-Hsiung Liao <j_h_liau@yahoo.com.tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
-@@ -56,8 +56,8 @@
- 
- #: kio_smb_browse.cpp:242
- msgid ""
--"Unable to find any workgroups in your local network. This might be caused by an "
--"enabled firewall."
-+"Unable to find any workgroups in your local network. This might be caused by "
-+"an enabled firewall."
- msgstr "無法在您的本地網路發現任何工作群組。這可能是由於使用了防火牆造成的。"
- 
- #: kio_smb_browse.cpp:249
-@@ -85,24 +85,28 @@
- 
- #: kio_smb_browse.cpp:291
- msgid ""
--"The given name could not be resolved to a unique server. Make sure your network "
--"is setup without any name conflicts between names used by Windows and by UNIX "
--"name resolution."
--msgstr "無法將指定的名稱解析為特定的伺服器。請確定您的網路設定跟 Windows 與 UNIX 解析之間使用的名稱沒有衝突。"
-+"The given name could not be resolved to a unique server. Make sure your "
-+"network is setup without any name conflicts between names used by Windows "
-+"and by UNIX name resolution."
-+msgstr ""
-+"無法將指定的名稱解析為特定的伺服器。請確定您的網路設定跟 Windows 與 UNIX 解析"
-+"之間使用的名稱沒有衝突。"
- 
- #: kio_smb_browse.cpp:297
- msgid ""
--"libsmbclient reported an error, but did not specify what the problem is. This "
--"might indicate a severe problem with your network - but also might indicate a "
--"problem with libsmbclient.\n"
--"If you want to help us, please provide a tcpdump of the network interface while "
--"you try to browse (be aware that it might contain private data, so do not post "
--"it if you are unsure about that - you can send it privately to the developers "
--"if they ask for it)"
-+"libsmbclient reported an error, but did not specify what the problem is. "
-+"This might indicate a severe problem with your network - but also might "
-+"indicate a problem with libsmbclient.\n"
-+"If you want to help us, please provide a tcpdump of the network interface "
-+"while you try to browse (be aware that it might contain private data, so do "
-+"not post it if you are unsure about that - you can send it privately to the "
-+"developers if they ask for it)"
- msgstr ""
--"libsmbclient 報告了一個錯誤，但並未指出問題為何。這有可能是您網路中的伺服器出現問題─但是也可能是libsmbclient 的問題。\n"
--"如果您想協助我們，請您提供您嘗試瀏覽網路的 tcpdump "
--"資料。(請注意其中可能包含私人資料，如果您不確定請勿公開散佈。如果程式開發者跟您要求相關資料，您可以私底下Email給他)"
-+"libsmbclient 報告了一個錯誤，但並未指出問題為何。這有可能是您網路中的伺服器出"
-+"現問題─但是也可能是libsmbclient 的問題。\n"
-+"如果您想協助我們，請您提供您嘗試瀏覽網路的 tcpdump 資料。(請注意其中可能包含"
-+"私人資料，如果您不確定請勿公開散布。如果程式開發者跟您要求相關資料，您可以私"
-+"底下Email給他)"
- 
- #: kio_smb_browse.cpp:308
- #, c-format
-diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kio_smtp.po kde-i18n-zh_TW-3.5.10/messages/kdebase/kio_smtp.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kio_smtp.po	2007-10-08 12:00:12.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdebase/kio_smtp.po	2011-11-11 15:45:17.000000000 +0100
-@@ -7,7 +7,7 @@
- "Project-Id-Version: kio_smtp\n"
- "POT-Creation-Date: 2007-07-17 01:45+0200\n"
- "PO-Revision-Date: 2005-11-05 08:47+0800\n"
--"Last-Translator: Chao-Hsiung Liao <j_h_liau@yahoo.com.tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
-@@ -15,7 +15,8 @@
- 
- #: command.cc:138
- msgid ""
--"The server rejected both EHLO and HELO commands as unknown or unimplemented.\n"
-+"The server rejected both EHLO and HELO commands as unknown or "
-+"unimplemented.\n"
- "Please contact the server's system administrator."
- msgstr ""
- "該伺服器對 EHLO 與 HELO 指令以未知或未實作拒絕。\n"
-@@ -33,7 +34,9 @@
- msgid ""
- "Your SMTP server does not support TLS. Disable TLS, if you want to connect "
- "without encryption."
--msgstr "您的郵件主機並不支援 TLS。如果你希望在沒有加密的情況下進行連線，請關閉 TLS 選項。"
-+msgstr ""
-+"您的郵件主機並不支援 TLS。如果你希望在沒有加密的情況下進行連線，請關閉 TLS 選"
-+"項。"
- 
- #: command.cc:186
- msgid ""
-diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kio_system.po kde-i18n-zh_TW-3.5.10/messages/kdebase/kio_system.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kio_system.po	2006-07-22 10:04:12.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdebase/kio_system.po	2011-11-11 15:45:17.000000000 +0100
-@@ -6,8 +6,7 @@
- "Project-Id-Version: kio_system\n"
- "POT-Creation-Date: 2006-04-28 03:54+0200\n"
- "PO-Revision-Date: 2006-01-20 15:31+0800\n"
--"Last-Translator: Frank Weng (a.k.a. Franklin) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Traditional Chinese <zh_l10n@linux.org.tw>\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_tar.po kde-i18n-zh_TW-3.5.10/messages/kdebase/kio_tar.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kio_tar.po	2007-10-08 12:00:12.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdebase/kio_tar.po	2011-11-11 15:45:17.000000000 +0100
-@@ -6,8 +6,7 @@
- "Project-Id-Version: kio_tar\n"
- "POT-Creation-Date: 2007-09-22 01:12+0200\n"
- "PO-Revision-Date: 2006-01-20 15:35+0800\n"
--"Last-Translator: Frank Weng (a.k.a. Franklin) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Traditional Chinese <zh_l10n@linux.org.tw>\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_thumbnail.po kde-i18n-zh_TW-3.5.10/messages/kdebase/kio_thumbnail.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kio_thumbnail.po	2006-07-22 10:04:12.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdebase/kio_thumbnail.po	2011-11-11 15:45:17.000000000 +0100
-@@ -6,8 +6,7 @@
- "Project-Id-Version: kio_thumbnail\n"
- "POT-Creation-Date: 2005-06-03 01:23+0200\n"
- "PO-Revision-Date: 2006-01-20 16:10+0800\n"
--"Last-Translator: Frank Weng (a.k.a. Franklin) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Traditional Chinese <zh_l10n@linux.org.tw>\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_trash.po kde-i18n-zh_TW-3.5.10/messages/kdebase/kio_trash.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kio_trash.po	2007-01-15 10:56:32.000000000 +0100
-+++ kde-i18n-zh_TW-3.5.10/messages/kdebase/kio_trash.po	2011-11-11 15:45:17.000000000 +0100
-@@ -6,8 +6,7 @@
- "Project-Id-Version: kio_trash\n"
- "POT-Creation-Date: 2006-11-07 02:35+0100\n"
- "PO-Revision-Date: 2006-01-20 16:29+0800\n"
--"Last-Translator: Frank Weng (a.k.a. Franklin) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Traditional Chinese <zh_l10n@linux.org.tw>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
-@@ -33,11 +32,12 @@
- #: ktrash.cpp:43
- msgid ""
- "Helper program to handle the KDE trash can\n"
--"Note: to move files to the trash, do not use ktrash, but \"kfmclient move 'url' "
--"trash:/\""
-+"Note: to move files to the trash, do not use ktrash, but \"kfmclient move "
-+"'url' trash:/\""
- msgstr ""
- "協助使用 KDE 資源回收桶的程式\n"
--"注意：要移動檔案到資源回收桶，不要用 ktrash，而要使用 \"kfmclient move 'url' trash:/\""
-+"注意：要移動檔案到資源回收桶，不要用 ktrash，而要使用 \"kfmclient move 'url' "
-+"trash:/\""
- 
- #: kio_trash.cpp:46
- msgid "Protocol name"
-@@ -55,10 +55,13 @@
- 
- #: kio_trash.cpp:116
- msgid ""
--"The directory %1 does not exist anymore, so it is not possible to restore this "
--"item to its original location. You can either recreate that directory and use "
--"the restore operation again, or drag the item anywhere else to restore it."
--msgstr "目錄 %1 不存在，所以無法回復這個檔案。您可以重新建立該目錄，或是把這個檔案拖曳到別處去存放。"
-+"The directory %1 does not exist anymore, so it is not possible to restore "
-+"this item to its original location. You can either recreate that directory "
-+"and use the restore operation again, or drag the item anywhere else to "
-+"restore it."
-+msgstr ""
-+"目錄 %1 不存在，所以無法回復這個檔案。您可以重新建立該目錄，或是把這個檔案拖"
-+"曳到別處去存放。"
- 
- #: kio_trash.cpp:145
- msgid "This file is already in the trash bin."
-diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kjobviewer.po kde-i18n-zh_TW-3.5.10/messages/kdebase/kjobviewer.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kjobviewer.po	2006-07-22 10:04:12.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdebase/kjobviewer.po	2011-11-11 15:45:17.000000000 +0100
-@@ -3,7 +3,7 @@
- "Project-Id-Version: kjobviewer\n"
- "POT-Creation-Date: 2006-03-12 03:46+0100\n"
- "PO-Revision-Date: 2005-11-05 08:51+0800\n"
--"Last-Translator: Chao-Hsiung Liao <j_h_liau@yahoo.com.tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\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/klipper.po kde-i18n-zh_TW-3.5.10/messages/kdebase/klipper.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/klipper.po	2006-07-22 10:04:12.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdebase/klipper.po	2011-11-11 15:45:17.000000000 +0100
-@@ -11,8 +11,7 @@
- "Project-Id-Version: klipper\n"
- "POT-Creation-Date: 2006-06-17 03:59+0200\n"
- "PO-Revision-Date: 2006-06-19 10:13+0800\n"
--"Last-Translator: Frank Weng (a.k.a. Franklin) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Chinese Traditional <zh-l10n@linux.org.tw>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
-@@ -37,7 +36,7 @@
- 
- #: configdialog.cpp:52
- msgid "Ac&tions"
--msgstr "動作(&t)"
-+msgstr "動作(&T)"
- 
- #: configdialog.cpp:55
- msgid "Global &Shortcuts"
-@@ -57,13 +56,14 @@
- 
- #: configdialog.cpp:105
- msgid ""
--"Sometimes, the selected text has some whitespace at the end, which, if loaded "
--"as URL in a browser would cause an error. Enabling this option removes any "
--"whitespace at the beginning or end of the selected string (the original "
--"clipboard contents will not be modified)."
-+"Sometimes, the selected text has some whitespace at the end, which, if "
-+"loaded as URL in a browser would cause an error. Enabling this option "
-+"removes any whitespace at the beginning or end of the selected string (the "
-+"original clipboard contents will not be modified)."
- msgstr ""
--"有時，在你所選取的文字的最後會有空白字元，如果是一個網址的話， 這樣的空白字元可能會造成瀏覽器出現錯誤。啟動這個選項，可以移除 "
--"你所選取的文字頭尾的空白字元。（但是剪貼簿中的原始內容不會更改）"
-+"有時，在你所選取的文字的最後會有空白字元，如果是一個網址的話， 這樣的空白字元"
-+"可能會造成瀏覽器出現錯誤。啟動這個選項，可以移除 你所選取的文字頭尾的空白字"
-+"元。（但是剪貼簿中的原始內容不會更改）"
- 
- #: configdialog.cpp:107
- msgid "&Replay actions on an item selected from history"
-@@ -75,9 +75,12 @@
- 
- #: configdialog.cpp:112
- msgid ""
--"Selecting this option has the effect, that the clipboard can never be emptied. "
--"E.g. when an application exits, the clipboard would usually be emptied."
--msgstr "啟動這個選項會讓剪貼簿不被清空。因為，當程式結束時，常常會清空 剪貼簿中的資料。"
-+"Selecting this option has the effect, that the clipboard can never be "
-+"emptied. E.g. when an application exits, the clipboard would usually be "
-+"emptied."
-+msgstr ""
-+"啟動這個選項會讓剪貼簿不被清空。因為，當程式結束時，常常會清空 剪貼簿中的資"
-+"料。"
- 
- #: configdialog.cpp:117
- msgid "&Ignore selection"
-@@ -87,7 +90,9 @@
- msgid ""
- "This option prevents the selection being recorded in the clipboard history. "
- "Only explicit clipboard changes are recorded."
--msgstr "這個選項會讓「選取」不被紀錄在剪貼簿的歷史紀錄中。只有「剪貼」的動作才會被紀錄。"
-+msgstr ""
-+"這個選項會讓「選取」不被紀錄在剪貼簿的歷史紀錄中。只有「剪貼」的動作才會被紀"
-+"錄。"
- 
- #: configdialog.cpp:123
- msgid "Clipboard/Selection Behavior"
-@@ -96,24 +101,17 @@
- #: configdialog.cpp:127
- msgid ""
- "<qt>There are two different clipboard buffers available:"
--"<br>"
--"<br><b>Clipboard</b> is filled by selecting something and pressing Ctrl+C, or "
--"by clicking \"Copy\" in a toolbar or menubar."
--"<br>"
--"<br><b>Selection</b> is available immediately after selecting some text. The "
--"only way to access the selection is to press the middle mouse button."
--"<br>"
--"<br>You can configure the relationship between Clipboard and Selection.</qt>"
-+"<br><br><b>Clipboard</b> is filled by selecting something and pressing Ctrl"
-+"+C, or by clicking \"Copy\" in a toolbar or menubar.<br><br><b>Selection</b> "
-+"is available immediately after selecting some text. The only way to access "
-+"the selection is to press the middle mouse button.<br><br>You can configure "
-+"the relationship between Clipboard and Selection.</qt>"
- msgstr ""
--"<qt>有兩種不同的剪貼簿緩衝區可供使用："
--"<br>"
--"<br><b>剪貼簿</b> 當選取了某個物件，然後按 Ctrl+C 或是"
--"<br>在工具列或選單列上選「複製」物件會被放在這裡。"
--"<br>"
--"<br><b>選取區</b> 當選取了某個物件，它便會馬上被儲存在此。"
--"<br>按滑鼠中鍵可以讀取已經選取的物件。"
--"<br>"
--"<br>你也可以自己設定剪貼簿和選取區之間的關係。</qt>"
-+"<qt>有兩種不同的剪貼簿緩衝區可供使用：<br><br><b>剪貼簿</b> 當選取了某個物"
-+"件，然後按 Ctrl+C 或是<br>在工具列或選單列上選「複製」物件會被放在這裡。"
-+"<br><br><b>選取區</b> 當選取了某個物件，它便會馬上被儲存在此。<br>按滑鼠中鍵"
-+"可以讀取已經選取的物件。<br><br>你也可以自己設定剪貼簿和選取區之間的關係。</"
-+"qt>"
- 
- #: configdialog.cpp:138
- msgid "Sy&nchronize contents of the clipboard and the selection"
-@@ -121,8 +119,8 @@
- 
- #: configdialog.cpp:141
- msgid ""
--"Selecting this option synchronizes these two buffers, so they work the same way "
--"as in KDE 1.x and 2.x."
-+"Selecting this option synchronizes these two buffers, so they work the same "
-+"way as in KDE 1.x and 2.x."
- msgstr "啟動這個選項會同步化這兩個緩衝區，就像在 KDE 1.x 和 KDE 1.x 一樣。"
- 
- #: configdialog.cpp:145
-@@ -131,13 +129,15 @@
- 
- #: configdialog.cpp:148
- msgid ""
--"Using this option will only set the selection when highlighting something and "
--"the clipboard when choosing e.g. \"Copy\" in a menubar."
--msgstr "開啟這個選項，當你選取某些東西時不會自動放進剪貼簿，而是要在 選單選 \"複製\" 才會放進剪貼簿。"
-+"Using this option will only set the selection when highlighting something "
-+"and the clipboard when choosing e.g. \"Copy\" in a menubar."
-+msgstr ""
-+"開啟這個選項，當你選取某些東西時不會自動放進剪貼簿，而是要在 選單選 \"複製\" "
-+"才會放進剪貼簿。"
- 
- #: configdialog.cpp:155
- msgid "Tim&eout for action popups:"
--msgstr "動作彈跳選單的逾時時間 (&e):"
-+msgstr "動作彈跳選單的逾時時間(&E):"
- 
- #: configdialog.cpp:157
- msgid " sec"
-@@ -149,7 +149,7 @@
- 
- #: configdialog.cpp:161
- msgid "C&lipboard history size:"
--msgstr "剪貼簿歷史紀錄大小 (&l)"
-+msgstr "剪貼簿歷史紀錄大小(&L)"
- 
- #: configdialog.cpp:183
- msgid ""
-@@ -171,26 +171,26 @@
- 
- #: configdialog.cpp:286
- msgid "&Use graphical editor for editing regular expressions"
--msgstr "使用圖型編輯器來編輯正規表示法 (&U)"
-+msgstr "使用圖型編輯器來編輯正規表示法(&U)"
- 
- #: configdialog.cpp:295
- msgid "&Add Action"
--msgstr "新增動作 (&A)"
-+msgstr "新增動作(&A)"
- 
- #: configdialog.cpp:298
- msgid "&Delete Action"
--msgstr "刪除動作 (&D)"
-+msgstr "刪除動作(&D)"
- 
- #: configdialog.cpp:301
- #, c-format
- msgid ""
--"Click on a highlighted item's column to change it. \"%s\" in a command will be "
--"replaced with the clipboard contents."
-+"Click on a highlighted item's column to change it. \"%s\" in a command will "
-+"be replaced with the clipboard contents."
- msgstr "敲擊高亮度項目的欄位來改變。 \"%s\" 在一個命令列將會取代剪貼簿內容。"
- 
- #: configdialog.cpp:307
- msgid "Advanced..."
--msgstr "進階..."
-+msgstr "進階…"
- 
- #: configdialog.cpp:332
- msgid "Add Command"
-@@ -214,7 +214,7 @@
- 
- #: configdialog.cpp:367
- msgid "<new action>"
--msgstr "啟動動作 (&a)"
-+msgstr "啟動動作(&A)"
- 
- #: configdialog.cpp:407
- msgid "Advanced Settings"
-@@ -222,25 +222,20 @@
- 
- #: configdialog.cpp:424
- msgid "D&isable Actions for Windows of Type WM_CLASS"
--msgstr "關閉型態為 WM_CLASS 的視窗行為 (&i)"
-+msgstr "關閉型態為 WM_CLASS 的視窗行為(&I)"
- 
- #: configdialog.cpp:427
- msgid ""
- "<qt>This lets you specify windows in which Klipper should not invoke "
--"\"actions\". Use"
--"<br>"
--"<br>"
--"<center><b>xprop | grep WM_CLASS</b></center>"
--"<br>in a terminal to find out the WM_CLASS of a window. Next, click on the "
--"window you want to examine. The first string it outputs after the equal sign is "
--"the one you need to enter here.</qt>"
-+"\"actions\". Use<br><br><center><b>xprop | grep WM_CLASS</b></center><br>in "
-+"a terminal to find out the WM_CLASS of a window. Next, click on the window "
-+"you want to examine. The first string it outputs after the equal sign is the "
-+"one you need to enter here.</qt>"
- msgstr ""
- "<qt>這讓你指定在哪些視窗中 Klipper 不應該呼叫「動作」。在終端機中使用"
--"<br>"
--"<br>"
--"<center><b>xprop | grep WM_CLASS</b></center>"
--"<br> 來找出一個視窗的 WM_CLASS。"
--"<br>接下來，選擇您所想檢驗的視窗。在等號之後出現的第一個字串便是你應該在這裡輸入的字串。</qt>"
-+"<br><br><center><b>xprop | grep WM_CLASS</b></center><br> 來找出一個視窗的 "
-+"WM_CLASS。<br>接下來，選擇您所想檢驗的視窗。在等號之後出現的第一個字串便是你"
-+"應該在這裡輸入的字串。</qt>"
- 
- #: klipperbindings.cpp:29
- msgid "Clipboard"
-@@ -314,11 +309,11 @@
- 
- #: toplevel.cpp:647
- msgid "Enable &Actions"
--msgstr "啟動動作 (&A)"
-+msgstr "啟動動作(&A)"
- 
- #: toplevel.cpp:651
- msgid "&Actions Enabled"
--msgstr "動作已啟動 (&A)"
-+msgstr "動作已啟動(&A)"
- 
- #: toplevel.cpp:1089
- msgid "KDE cut & paste history utility"
-@@ -358,7 +353,7 @@
- 
- #: urlgrabber.cpp:199
- msgid "&Edit Contents..."
--msgstr "編輯內容 (&E) ..."
-+msgstr "編輯內容(&E)…"
- 
- #: urlgrabber.cpp:262
- msgid "Edit Contents"
-diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kmenuapplet.po kde-i18n-zh_TW-3.5.10/messages/kdebase/kmenuapplet.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kmenuapplet.po	2008-08-19 20:43:10.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdebase/kmenuapplet.po	2011-11-11 15:45:17.000000000 +0100
-@@ -7,7 +7,7 @@
- "Project-Id-Version: kmenuapplet\n"
- "POT-Creation-Date: 2008-08-11 01:16+0200\n"
- "PO-Revision-Date: 2005-11-05 10:50+0800\n"
--"Last-Translator: Chao-Hsiung Liao <j_h_liau@yahoo.com.tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: <Chinese (traditional) <zh-l10n@linux.org.tw>>\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/kmenuedit.po kde-i18n-zh_TW-3.5.10/messages/kdebase/kmenuedit.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kmenuedit.po	2006-07-22 10:04:12.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdebase/kmenuedit.po	2011-11-11 15:45:17.000000000 +0100
-@@ -7,7 +7,7 @@
- "Project-Id-Version: kmenuedit 1.4\n"
- "POT-Creation-Date: 2005-05-18 21:24+0200\n"
- "PO-Revision-Date: 2005-11-05 13:28+0800\n"
--"Last-Translator: Chao-Hsiung Liao <j_h_liau@yahoo.com.tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: zh-l10n <zh-l10n@linux.org.tw>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
-@@ -30,8 +30,8 @@
- "Following the command, you can have several place holders which will be "
- "replaced with the actual values when the actual program is run:\n"
- "%f - a single file name\n"
--"%F - a list of files; use for applications that can open several local files at "
--"once\n"
-+"%F - a list of files; use for applications that can open several local files "
-+"at once\n"
- "%u - a single URL\n"
- "%U - a list of URLs\n"
- "%d - the folder of the file to open\n"
-@@ -132,11 +132,11 @@
- 
- #: kmenuedit.cpp:65
- msgid "&New Submenu..."
--msgstr "新增子選單(&N)..."
-+msgstr "新增子選單(&N)…"
- 
- #: kmenuedit.cpp:66
- msgid "New &Item..."
--msgstr "新增項目(&I)..."
-+msgstr "新增項目(&I)…"
- 
- #: kmenuedit.cpp:68
- msgid "New S&eparator"
-diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kminipagerapplet.po kde-i18n-zh_TW-3.5.10/messages/kdebase/kminipagerapplet.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kminipagerapplet.po	2008-08-19 20:43:10.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdebase/kminipagerapplet.po	2011-11-11 15:45:17.000000000 +0100
-@@ -9,8 +9,7 @@
- "Project-Id-Version: kminipagerapplet\n"
- "POT-Creation-Date: 2008-08-18 01:16+0200\n"
- "PO-Revision-Date: 2006-05-18 10:52+0800\n"
--"Last-Translator: Frank Weng (a.k.a. Franklin) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Traditional Chinese <zh_l10n@linux.org.tw>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
-@@ -27,7 +26,7 @@
- 
- #: pagerapplet.cpp:689
- msgid "Pager Layout"
--msgstr "呼叫器佈局"
-+msgstr "呼叫器布局"
- 
- #: pagerapplet.cpp:693
- msgid "&Automatic"
-@@ -105,7 +104,7 @@
- 
- #: pagerapplet.cpp:724
- msgid "&Configure Desktops..."
--msgstr "設定桌面(&C)..."
-+msgstr "設定桌面(&C)…"
- 
- #: pagerbutton.cpp:807
- #, c-format
-@@ -173,7 +172,7 @@
- #: rc.cpp:27
- #, no-c-format
- msgid "Number of rows to arrange the desktop previews into"
--msgstr "安排桌面預覽行數"
-+msgstr "安排桌面預覽列數"
- 
- #. i18n: file pagersettings.kcfg line 49
- #: rc.cpp:30
-diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/knetattach.po kde-i18n-zh_TW-3.5.10/messages/kdebase/knetattach.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/knetattach.po	2008-08-19 20:43:10.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdebase/knetattach.po	2011-11-11 15:45:17.000000000 +0100
-@@ -6,8 +6,7 @@
- "Project-Id-Version: knetattach\n"
- "POT-Creation-Date: 2008-07-08 01:18+0200\n"
- "PO-Revision-Date: 2006-01-20 16:20+0800\n"
--"Last-Translator: Frank Weng (a.k.a. Franklin) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Traditional Chinese <zh_l10n@linux.org.tw>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
-@@ -98,9 +97,10 @@
- #: rc.cpp:30
- #, no-c-format
- msgid ""
--"Enter a name for this <i>%1</i> as well as the server address, port and folder "
--"path to use and press the Next button."
--msgstr "輸入 <i>%1</i> 的名稱及伺服器位址，埠號與資料夾路徑，然後按「下一步」。"
-+"Enter a name for this <i>%1</i> as well as the server address, port and "
-+"folder path to use and press the Next button."
-+msgstr ""
-+"輸入 <i>%1</i> 的名稱及伺服器位址，埠號與資料夾路徑，然後按「下一步」。"
- 
- #. i18n: file knetattach.ui line 215
- #: rc.cpp:33
-@@ -152,29 +152,36 @@
- msgid ""
- "Enter a name for this <i>WebFolder</i> as well as a server address, port and "
- "folder path to use and press the <b>Save & Connect</b> button."
--msgstr "輸入這個 <i>Web資料夾</i> 的名稱及伺服器位址、埠號與資料夾路徑，然後按下「<b>儲存並連線</b>」。"
-+msgstr ""
-+"輸入這個 <i>Web資料夾</i> 的名稱及伺服器位址、埠號與資料夾路徑，然後按下「<b>"
-+"儲存並連線</b>」。"
- 
- #: knetattach.ui.h:42
- msgid ""
--"Enter a name for this <i>Secure shell connection</i> "
--"as well as a server address, port and folder path to use and press the <b>"
--"Save & Connect</b> button."
--msgstr "輸入這個<i>SSH 連線</li>的名稱及伺服器位址、埠號與資料夾路徑，然後按下「<b>儲存並連線</b>」。"
-+"Enter a name for this <i>Secure shell connection</i> as well as a server "
-+"address, port and folder path to use and press the <b>Save & Connect</b> "
-+"button."
-+msgstr ""
-+"輸入這個<i>SSH 連線</li>的名稱及伺服器位址、埠號與資料夾路徑，然後按下「<b>儲"
-+"存並連線</b>」。"
- 
- #: knetattach.ui.h:44
- msgid ""
--"Enter a name for this <i>File Transfer Protocol connection</i> "
--"as well as a server address and folder path to use and press the <b>"
--"Save & Connect</b> button."
--msgstr "輸入這個<i>FTP 連線</li>的名稱及伺服器位址、埠號與資料夾路徑，然後按下「<b>儲存並連線</b>」。"
-+"Enter a name for this <i>File Transfer Protocol connection</i> as well as a "
-+"server address and folder path to use and press the <b>Save & Connect</b> "
-+"button."
-+msgstr ""
-+"輸入這個<i>FTP 連線</li>的名稱及伺服器位址、埠號與資料夾路徑，然後按下「<b>儲"
-+"存並連線</b>」。"
- 
- #: knetattach.ui.h:46
- msgid ""
--"Enter a name for this <i>Microsoft Windows network drive</i> "
--"as well as a server address and folder path to use and press the <b>"
--"Save & Connect</b> button."
-+"Enter a name for this <i>Microsoft Windows network drive</i> as well as a "
-+"server address and folder path to use and press the <b>Save & Connect</b> "
-+"button."
- msgstr ""
--"輸入這個<i>Microsoft Windows 網路磁碟機</li>的名稱及伺服器位址、埠號與資料夾路徑，然後按下「<b>儲存並連線</b>」。"
-+"輸入這個<i>Microsoft Windows 網路磁碟機</li>的名稱及伺服器位址、埠號與資料夾"
-+"路徑，然後按下「<b>儲存並連線</b>」。"
- 
- #: knetattach.ui.h:161
- msgid "Unable to connect to server.  Please check your settings and try again."
-diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/konqueror.po kde-i18n-zh_TW-3.5.10/messages/kdebase/konqueror.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/konqueror.po	2008-08-19 20:43:10.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdebase/konqueror.po	2011-11-11 15:45:17.000000000 +0100
-@@ -13,7 +13,7 @@
- "Project-Id-Version: konqueror\n"
- "POT-Creation-Date: 2008-07-08 01:19+0200\n"
- "PO-Revision-Date: 2007-06-25 08:13+0800\n"
--"Last-Translator: Franklin Weng <franklin at goodhorse dot idv dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Chinese Traditional <zh-l10n@linux.org.tw>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
-@@ -68,7 +68,9 @@
- 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 在您開啟一個資料夾會開啟一個新視窗，而不是在目前的"
-+"視窗顯示該資料夾的內容。"
- 
- #. i18n: file konqueror.kcfg line 20
- #: about/konq_aboutpage.cc:124 rc.cpp:75
-@@ -80,11 +82,12 @@
- #: rc.cpp:78
- #, no-c-format
- 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, "
-+"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 ""
--"這是在 \\\"Home\\\" 按鈕被按下時 Konqueror 會跳至的 URL (例：資料夾或網頁)。這通常是您的家目錄，標有 (~) 符號。"
-+"這是在 \\\"Home\\\" 按鈕被按下時 Konqueror 會跳至的 URL (例：資料夾或網頁)。"
-+"這通常是您的家目錄，標有 (~) 符號。"
- 
- #. i18n: file konqueror.kcfg line 26
- #: rc.cpp:81
-@@ -96,9 +99,11 @@
- #: rc.cpp:84
- #, no-c-format
- 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 ""
-+"在這裡您可以控制當滑鼠移到一個檔案上方時，是否要顯示關於該檔案額外資訊的彈出"
-+"視窗"
- 
- #. i18n: file konqueror.kcfg line 38
- #: rc.cpp:87
-@@ -110,9 +115,11 @@
- #: rc.cpp:90
- #, no-c-format
- 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 ""
-+"在這裡您可以控制當滑鼠移到一個檔案上方時，是否要顯示含有該檔案較大預覽的彈出"
-+"視窗"
- 
- #. i18n: file konqueror.kcfg line 44
- #: rc.cpp:93
-@@ -124,8 +131,8 @@
- #: rc.cpp:96
- #, no-c-format
- 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 "核取此選項會允許直接點選圖示名稱來為檔案重新命名。"
- 
- #. i18n: file konqueror.kcfg line 50
-@@ -138,12 +145,14 @@
- #: rc.cpp:102
- #, no-c-format
- msgid ""
--"Uncheck this if you do not want 'Delete' menu commands to be displayed on the "
--"desktop and in the file manager's menus and context menus. You can still delete "
--"files when hidden by holding the Shift key while calling 'Move to Trash'."
--msgstr ""
--"如果您不想讓「刪除」選單指令顯示在桌面和檔案管理程式的選單和快顯選單中，請核消此選項。在隱藏後您仍然可以在使用「移至資源回收桶」時按住 Shift "
--"鍵來刪除檔案。"
-+"Uncheck this if you do not want 'Delete' menu commands to be displayed on "
-+"the desktop and in the file manager's menus and context menus. You can still "
-+"delete files when hidden by holding the Shift key while calling 'Move to "
-+"Trash'."
-+msgstr ""
-+"如果您不想讓「刪除」選單指令顯示在桌面和檔案管理程式的選單和快顯選單中，請核"
-+"消此選項。在隱藏後您仍然可以在使用「移至資源回收桶」時按住 Shift 鍵來刪除檔"
-+"案。"
- 
- #. i18n: file konqueror.kcfg line 57
- #: rc.cpp:105
-@@ -173,16 +182,18 @@
- #: rc.cpp:117
- #, no-c-format
- msgid ""
--"This option tells Konqueror whether to ask for a confirmation when you move the "
--"file to your trash folder, from where it can be recovered very easily."
--msgstr "這個選項告訴 Konqueror 當您將檔案移至您的資源回收桶資料夾時(以便能輕易的回復)是否要求確認。"
-+"This option tells Konqueror whether to ask for a confirmation when you move "
-+"the file to your trash folder, from where it can be recovered very easily."
-+msgstr ""
-+"這個選項告訴 Konqueror 當您將檔案移至您的資源回收桶資料夾時(以便能輕易的回復)"
-+"是否要求確認。"
- 
- #. i18n: file konqueror.kcfg line 615
- #: rc.cpp:120
- #, no-c-format
- msgid ""
--"This option tells Konqueror whether to ask for a confirmation when you simply "
--"delete the file."
-+"This option tells Konqueror whether to ask for a confirmation when you "
-+"simply delete the file."
- msgstr "這個選項告訴 Konqueror 當您直接刪除檔案時是否要求確認。"
- 
- #. i18n: file iconview/konq_iconview.rc line 5
-@@ -315,7 +326,7 @@
- #: rc.cpp:366 rc.cpp:372
- #, no-c-format
- msgid "Choose Font..."
--msgstr "選擇字型..."
-+msgstr "選擇字型…"
- 
- #. i18n: file sidebar/trees/history_module/history_dlg.ui line 133
- #: rc.cpp:369
-@@ -339,8 +350,8 @@
- #: rc.cpp:381
- #, no-c-format
- msgid ""
--"Shows the number of times visited and the dates of the first and last visits, "
--"in addition to the URL"
-+"Shows the number of times visited and the dates of the first and last "
-+"visits, in addition to the URL"
- msgstr "除了網址外同時顯示您光臨的次數與第一次與最近一次光臨的日期"
- 
- #. i18n: file sidebar/trees/history_module/history_dlg.ui line 183
-@@ -382,7 +393,7 @@
- 
- #: konq_factory.cc:220
- msgid "Web browser, file manager, ..."
--msgstr "網頁瀏覽器，檔案管理員，..."
-+msgstr "網頁瀏覽器，檔案管理員，…"
- 
- #: konq_factory.cc:222
- msgid "(c) 1999-2005, The Konqueror developers"
-@@ -495,12 +506,13 @@
- msgid ""
- "Checking this box on at least two views sets those views as 'linked'. Then, "
- "when you change directories in one view, the other views linked with it will "
--"automatically update to show the current directory. This is especially useful "
--"with different types of views, such as a directory tree with an icon view or "
--"detailed view, and possibly a terminal emulator window."
--msgstr ""
--"選取此方塊為至少兩個「連結」的檢視。如此一來，當你在其中一個檢視中改變目錄時，另一個連結到它的檢視將會自動地更新顯示目前目錄。當使用不同的檢視，例如終端模擬視窗"
--"、圖示的樹狀目錄或清單時，這將會特別有用。"
-+"automatically update to show the current directory. This is especially "
-+"useful with different types of views, such as a directory tree with an icon "
-+"view or detailed view, and possibly a terminal emulator window."
-+msgstr ""
-+"選取此方塊為至少兩個「連結」的檢視。如此一來，當你在其中一個檢視中改變目錄"
-+"時，另一個連結到它的檢視將會自動地更新顯示目前目錄。當使用不同的檢視，例如終"
-+"端模擬視窗、圖示的樹狀目錄或清單時，這將會特別有用。"
- 
- #: konq_frame.cc:148
- msgid "Close View"
-@@ -555,8 +567,8 @@
- 
- #: konq_main.cc:46
- msgid ""
--"For URLs that point to files, opens the directory and selects the file, instead "
--"of opening the actual file"
-+"For URLs that point to files, opens the directory and selects the file, "
-+"instead of opening the actual file"
- msgstr "對指向檔案的 URL，開啟其目錄並選擇該檔案，而非直接開啟實際的檔案"
- 
- #: konq_main.cc:47
-@@ -583,8 +595,8 @@
- 
- #: konq_mainwindow.cc:583 konq_run.cc:119
- msgid ""
--"There appears to be a configuration error. You have associated Konqueror with "
--"%1, but it cannot handle this file type."
-+"There appears to be a configuration error. You have associated Konqueror "
-+"with %1, but it cannot handle this file type."
- msgstr "設定有誤。您設定用 Konqueror 來檢視 %1，但它無法處理此類型的檔案。"
- 
- #: konq_mainwindow.cc:1414
-@@ -708,7 +720,7 @@
- 
- #: konq_mainwindow.cc:3705
- msgid "&Edit File Type..."
--msgstr "編輯檔案類型(&E)..."
-+msgstr "編輯檔案類型(&E)…"
- 
- #: konq_mainwindow.cc:3707 sidebar/trees/history_module/history_module.cpp:78
- msgid "New &Window"
-@@ -720,11 +732,11 @@
- 
- #: konq_mainwindow.cc:3709
- msgid "Send &Link Address..."
--msgstr "傳送連結位址(&L)..."
-+msgstr "傳送連結位址(&L)…"
- 
- #: konq_mainwindow.cc:3710
- msgid "S&end File..."
--msgstr "寄出檔案...(&E)"
-+msgstr "寄出檔案…(&E)"
- 
- #: konq_mainwindow.cc:3713
- msgid "Open &Terminal"
-@@ -732,11 +744,11 @@
- 
- #: konq_mainwindow.cc:3715
- msgid "&Open Location..."
--msgstr "開啟位置(&O)..."
-+msgstr "開啟位置(&O)…"
- 
- #: konq_mainwindow.cc:3717
- msgid "&Find File..."
--msgstr "尋找檔案(&F)..."
-+msgstr "尋找檔案(&F)…"
- 
- #: konq_mainwindow.cc:3722
- msgid "&Use index.html"
-@@ -792,11 +804,11 @@
- 
- #: konq_mainwindow.cc:3762
- msgid "Most Often Visited"
--msgstr "最常去的站台"
-+msgstr "最常去的站臺"
- 
- #: konq_mainwindow.cc:3769 konq_mainwindow.cc:4335
- msgid "&Save View Profile..."
--msgstr "儲存檢視設定檔(&S)..."
-+msgstr "儲存檢視設定檔(&S)…"
- 
- #: konq_mainwindow.cc:3770
- msgid "Save View Changes per &Folder"
-@@ -808,7 +820,7 @@
- 
- #: konq_mainwindow.cc:3792
- msgid "Configure Extensions..."
--msgstr "設定延伸功能..."
-+msgstr "設定延伸功能…"
- 
- #: konq_mainwindow.cc:3793
- msgid "Configure Spell Checking..."
-@@ -869,7 +881,7 @@
- 
- #: konq_mainwindow.cc:3821
- msgid "C&onfigure View Profiles..."
--msgstr "配置檢視設定(&O)..."
-+msgstr "配置檢視設定(&O)…"
- 
- #: konq_mainwindow.cc:3822
- msgid "Load &View Profile"
-@@ -933,10 +945,11 @@
- 
- #: konq_mainwindow.cc:3915
- msgid ""
--"Enter the parent folder"
--"<p>For instance, if the current location is file:/home/%1 clicking this button "
--"will take you to file:/home."
--msgstr "進入母目錄<p>例如，目前的位置是 file:/home/%1 按下此按鈕會將您帶到 file:/home。"
-+"Enter the parent folder<p>For instance, if the current location is file:/"
-+"home/%1 clicking this button will take you to file:/home."
-+msgstr ""
-+"進入母目錄<p>例如，目前的位置是 file:/home/%1 按下此按鈕會將您帶到 file:/"
-+"home。"
- 
- #: konq_mainwindow.cc:3918
- msgid "Enter the parent folder"
-@@ -960,12 +973,12 @@
- 
- #: konq_mainwindow.cc:3926
- msgid ""
--"Navigate to your 'Home Location'"
--"<p>You can configure the location this button takes you to in the <b>"
--"KDE Control Center</b>, under <b>File Manager</b>/<b>Behavior</b>."
-+"Navigate to your 'Home Location'<p>You can configure the location this "
-+"button takes you to in the <b>KDE Control Center</b>, under <b>File Manager</"
-+"b>/<b>Behavior</b>."
- msgstr ""
--"帶領您到您的「家位置」"
--"<p>您可以從<b>KDE 控制中心</b>裡的<b>檔案管理員</b>/<b>行為</b>中設定此按鈕會帶您去的位置。"
-+"帶領您到您的「家位置」<p>您可以從<b>KDE 控制中心</b>裡的<b>檔案管理員</b>/<b>"
-+"行為</b>中設定此按鈕會帶您去的位置。"
- 
- #: konq_mainwindow.cc:3929
- msgid "Navigate to your 'Home Location'"
-@@ -973,10 +986,12 @@
- 
- #: konq_mainwindow.cc:3931
- msgid ""
--"Reload the currently displayed document"
--"<p>This may, for example, be needed to refresh webpages that have been modified "
--"since they were loaded, in order to make the changes visible."
--msgstr "重新載入目前顯示的文件<p>這個功能在已載入的網頁有所變更時可用來更新網頁，如此才能讓變更顯現出來。"
-+"Reload the currently displayed document<p>This may, for example, be needed "
-+"to refresh webpages that have been modified since they were loaded, in order "
-+"to make the changes visible."
-+msgstr ""
-+"重新載入目前顯示的文件<p>這個功能在已載入的網頁有所變更時可用來更新網頁，如此"
-+"才能讓變更顯現出來。"
- 
- #: konq_mainwindow.cc:3934
- msgid "Reload the currently displayed document"
-@@ -984,10 +999,12 @@
- 
- #: konq_mainwindow.cc:3936
- msgid ""
--"Reload all currently displayed documents in tabs"
--"<p>This may, for example, be needed to refresh webpages that have been modified "
--"since they were loaded, in order to make the changes visible."
--msgstr "重新載入目前分頁中顯示的文件<p>這個功能在已載入的網頁有所變更時需要更新網頁，如此才能讓變更顯現出來。"
-+"Reload all currently displayed documents in tabs<p>This may, for example, be "
-+"needed to refresh webpages that have been modified since they were loaded, "
-+"in order to make the changes visible."
-+msgstr ""
-+"重新載入目前分頁中顯示的文件<p>這個功能在已載入的網頁有所變更時需要更新網頁，"
-+"如此才能讓變更顯現出來。"
- 
- #: konq_mainwindow.cc:3939
- msgid "Reload all currently displayed document in tabs"
-@@ -995,10 +1012,11 @@
- 
- #: konq_mainwindow.cc:3941
- msgid ""
--"Stop loading the document"
--"<p>All network transfers will be stopped and Konqueror will display the content "
--"that has been received so far."
--msgstr "停止載入文件<p>所有網路的傳輸會被停止，而 Konqueror 則會顯示到此時所接收到的內容。"
-+"Stop loading the document<p>All network transfers will be stopped and "
-+"Konqueror will display the content that has been received so far."
-+msgstr ""
-+"停止載入文件<p>所有網路的傳輸會被停止，而 Konqueror 則會顯示到此時所接收到的"
-+"內容。"
- 
- #: konq_mainwindow.cc:3944
- msgid "Stop loading the document"
-@@ -1006,10 +1024,12 @@
- 
- #: konq_mainwindow.cc:3946
- msgid ""
--"Cut the currently selected text or item(s) and move it to the system clipboard"
--"<p> This makes it available to the <b>Paste</b> command in Konqueror and other "
--"KDE applications."
--msgstr "剪下目前選取的文字或項目，並移至系統剪貼簿<p>這樣就可以在 Konqueror 和其他 KDE 應用程式中使用 <b>貼上</b> 命令。"
-+"Cut the currently selected text or item(s) and move it to the system "
-+"clipboard<p> This makes it available to the <b>Paste</b> command in "
-+"Konqueror and other KDE applications."
-+msgstr ""
-+"剪下目前選取的文字或項目，並移至系統剪貼簿<p>這樣就可以在 Konqueror 和其他 "
-+"KDE 應用程式中使用 <b>貼上</b> 命令。"
- 
- #: konq_mainwindow.cc:3950
- msgid "Move the selected text or item(s) to the clipboard"
-@@ -1017,10 +1037,12 @@
- 
- #: konq_mainwindow.cc:3952
- msgid ""
--"Copy the currently selected text or item(s) to the system clipboard"
--"<p>This makes it available to the <b>Paste</b> command in Konqueror and other "
--"KDE applications."
--msgstr "複製目前選取的文字或項目至系統剪貼簿<p>這樣就可以在 Konqueror 和其他 KDE 應用程式中使用 <b>貼上</b> 命令。"
-+"Copy the currently selected text or item(s) to the system clipboard<p>This "
-+"makes it available to the <b>Paste</b> command in Konqueror and other KDE "
-+"applications."
-+msgstr ""
-+"複製目前選取的文字或項目至系統剪貼簿<p>這樣就可以在 Konqueror 和其他 KDE 應用"
-+"程式中使用 <b>貼上</b> 命令。"
- 
- #: konq_mainwindow.cc:3956
- msgid "Copy the selected text or item(s) to the clipboard"
-@@ -1028,9 +1050,11 @@
- 
- #: konq_mainwindow.cc:3958
- msgid ""
--"Paste the previously cut or copied clipboard contents"
--"<p>This also works for text copied or cut from other KDE applications."
--msgstr "貼上先前已剪下或複製的剪貼簿內容<p>此功能也可用於從其他 KDE 應用程式複製或剪下的文字。"
-+"Paste the previously cut or copied clipboard contents<p>This also works for "
-+"text copied or cut from other KDE applications."
-+msgstr ""
-+"貼上先前已剪下或複製的剪貼簿內容<p>此功能也可用於從其他 KDE 應用程式複製或剪"
-+"下的文字。"
- 
- #: konq_mainwindow.cc:3961
- msgid "Paste the clipboard contents"
-@@ -1038,15 +1062,14 @@
- 
- #: konq_mainwindow.cc:3963
- msgid ""
--"Print the currently displayed document"
--"<p>You will be presented with a dialog where you can set various options, such "
--"as the number of copies to print and which printer to use."
--"<p>This dialog also provides access to special KDE printing services such as "
--"creating a PDF file from the current document."
--msgstr ""
--"列印目前顯示的文件"
--"<p>您會看到一個對話盒讓您可以設定各種選項，如要印列的份數或要使用哪臺印表機。"
--"<p>此對話盒也提供對特殊 KDE 列印服務的存取，像是自目前的文件建立 PDF 檔案。"
-+"Print the currently displayed document<p>You will be presented with a dialog "
-+"where you can set various options, such as the number of copies to print and "
-+"which printer to use.<p>This dialog also provides access to special KDE "
-+"printing services such as creating a PDF file from the current document."
-+msgstr ""
-+"列印目前顯示的文件<p>您會看到一個對話盒讓您可以設定各種選項，如要印列的份數或"
-+"要使用哪臺印表機。<p>此對話盒也提供對特殊 KDE 列印服務的存取，像是自目前的文"
-+"件建立 PDF 檔案。"
- 
- #: konq_mainwindow.cc:3969
- msgid "Print the current document"
-@@ -1060,13 +1083,15 @@
- msgid ""
- "A locked view cannot change folders. Use in combination with 'link view' to "
- "explore many files from one folder"
--msgstr "在鎖定的檢視下不能更改資料夾。請使用「連結檢視」以瀏覽資料夾中的多個檔案"
-+msgstr ""
-+"在鎖定的檢視下不能更改資料夾。請使用「連結檢視」以瀏覽資料夾中的多個檔案"
- 
- #: konq_mainwindow.cc:3977
- msgid ""
--"Sets the view as 'linked'. A linked view follows folder changes made in other "
--"linked views."
--msgstr "設定此檢視為 \"linked\"。一個連結的檢視將會因目錄其他連結檢視變更而跟著變動。"
-+"Sets the view as 'linked'. A linked view follows folder changes made in "
-+"other linked views."
-+msgstr ""
-+"設定此檢視為 \"linked\"。一個連結的檢視將會因目錄其他連結檢視變更而跟著變動。"
- 
- #: konq_mainwindow.cc:4001
- #: sidebar/trees/bookmark_module/bookmark_module.cpp:71
-@@ -1087,19 +1112,19 @@
- 
- #: konq_mainwindow.cc:4175
- msgid "Copy &Files..."
--msgstr "複製檔案(&F)..."
-+msgstr "複製檔案(&F)…"
- 
- #: konq_mainwindow.cc:4176
- msgid "M&ove Files..."
--msgstr "移動檔案(&O)..."
-+msgstr "移動檔案(&O)…"
- 
- #: konq_mainwindow.cc:4180
- msgid "Create Folder..."
--msgstr "建立資料夾..."
-+msgstr "建立資料夾…"
- 
- #: konq_mainwindow.cc:4334
- msgid "&Save View Profile \"%1\"..."
--msgstr "儲存檢視設定檔\"%1\"(&S)..."
-+msgstr "儲存檢視設定檔\"%1\"(&S)…"
- 
- #: konq_mainwindow.cc:4674
- msgid "Open in T&his Window"
-@@ -1209,13 +1234,15 @@
- msgid ""
- "This bar contains the list of currently open tabs. Click on a tab to make it "
- "active. The option to show a close button instead of the website icon in the "
--"left corner of the tab is configurable. You can also use keyboard shortcuts to "
--"navigate through tabs. The text on the tab is the title of the website "
-+"left corner of the tab is configurable. You can also use keyboard shortcuts "
-+"to navigate through tabs. The text on the tab is the title of the website "
- "currently open in it, put your mouse over the tab too see the full title in "
- "case it was truncated to fit the tab size."
- msgstr ""
--"這一列包含目前開啟的分頁清單。按下分頁可使它成為作用中。用來在分頁左上角顯示關閉按鈕以代替網站圖示的選項是可以設定的。您也可以使用快捷鍵來瀏覽各分頁。在分頁上的"
--"文字是它目前所開啟的網站的標題，由於它會被截短以符合分頁大小，您可以把滑鼠移至分頁上來檢視完整的標題。"
-+"這一列包含目前開啟的分頁清單。按下分頁可使它成為作用中。用來在分頁左上角顯示"
-+"關閉按鈕以代替網站圖示的選項是可以設定的。您也可以使用快捷鍵來瀏覽各分頁。在"
-+"分頁上的文字是它目前所開啟的網站的標題，由於它會被截短以符合分頁大小，您可以"
-+"把滑鼠移至分頁上來檢視完整的標題。"
- 
- #: konq_tabs.cc:89
- msgid "&Reload Tab"
-@@ -1250,7 +1277,9 @@
- "The page you are trying to view is the result of posted form data. If you "
- "resend the data, any action the form carried out (such as search or online "
- "purchase) will be repeated. "
--msgstr "您嘗試檢視的網頁是送出表單資料的結果。如果您重新送出資料，此 表單所進行的任何動作（像是搜尋或線上購物）都會重覆一次。"
-+msgstr ""
-+"您嘗試檢視的網頁是送出表單資料的結果。如果您重新送出資料，此 表單所進行的任何"
-+"動作（像是搜尋或線上購物）都會重覆一次。"
- 
- #: konq_view.cc:1359
- msgid "Resend"
-@@ -1342,11 +1371,11 @@
- 
- #: iconview/konq_iconview.cc:305 listview/konq_listview.cc:668
- msgid "Se&lect..."
--msgstr "選取(&L)..."
-+msgstr "選取(&L)…"
- 
- #: iconview/konq_iconview.cc:307 listview/konq_listview.cc:669
- msgid "Unselect..."
--msgstr "不選取..."
-+msgstr "不選取…"
- 
- #: iconview/konq_iconview.cc:310 listview/konq_listview.cc:671
- msgid "Unselect All"
-@@ -1585,7 +1614,7 @@
- 
- #: keditbookmarks/actionsimpl.cpp:120
- msgid "Chan&ge Icon..."
--msgstr "變更圖示(&g)..."
-+msgstr "變更圖示(&G)…"
- 
- #: keditbookmarks/actionsimpl.cpp:123
- msgid "Update Favicon"
-@@ -1597,7 +1626,7 @@
- 
- #: keditbookmarks/actionsimpl.cpp:129
- msgid "&New Folder..."
--msgstr "新增資料夾(&N)..."
-+msgstr "新增資料夾(&N)…"
- 
- #: keditbookmarks/actionsimpl.cpp:132
- msgid "&New Bookmark"
-@@ -1657,31 +1686,31 @@
- 
- #: keditbookmarks/actionsimpl.cpp:178
- msgid "Import &Netscape Bookmarks..."
--msgstr "匯入 Netscape 書籤...(&N)"
-+msgstr "匯入 Netscape 書籤…(&N)"
- 
- #: keditbookmarks/actionsimpl.cpp:181
- msgid "Import &Opera Bookmarks..."
--msgstr "匯入 &Opera 書籤..."
-+msgstr "匯入 &Opera 書籤…"
- 
- #: keditbookmarks/actionsimpl.cpp:184
- msgid "Import All &Crash Sessions as Bookmarks..."
--msgstr "匯入所有的 &Crash Sessions 為書籤..."
-+msgstr "匯入所有的 &Crash Sessions 為書籤…"
- 
- #: keditbookmarks/actionsimpl.cpp:187
- msgid "Import &Galeon Bookmarks..."
--msgstr "匯入 &Galeon 書籤..."
-+msgstr "匯入 &Galeon 書籤…"
- 
- #: keditbookmarks/actionsimpl.cpp:190
- msgid "Import &KDE2/KDE3 Bookmarks..."
--msgstr "匯入 &KDE2/KDE3 書籤..."
-+msgstr "匯入 &KDE2/KDE3 書籤…"
- 
- #: keditbookmarks/actionsimpl.cpp:193
- msgid "Import &IE Bookmarks..."
--msgstr "匯入 &IE 書籤..."
-+msgstr "匯入 &IE 書籤…"
- 
- #: keditbookmarks/actionsimpl.cpp:196
- msgid "Import &Mozilla Bookmarks..."
--msgstr "匯入 &Mozilla 書籤..."
-+msgstr "匯入 &Mozilla 書籤…"
- 
- #: keditbookmarks/actionsimpl.cpp:199
- msgid "Export to &Netscape Bookmarks"
-@@ -1689,19 +1718,19 @@
- 
- #: keditbookmarks/actionsimpl.cpp:202
- msgid "Export to &Opera Bookmarks..."
--msgstr "匯出成 &Opera 書籤..."
-+msgstr "匯出成 &Opera 書籤…"
- 
- #: keditbookmarks/actionsimpl.cpp:205
- msgid "Export to &HTML Bookmarks..."
--msgstr "匯出成 &HTML 書籤..."
-+msgstr "匯出成 &HTML 書籤…"
- 
- #: keditbookmarks/actionsimpl.cpp:208
- msgid "Export to &IE Bookmarks..."
--msgstr "匯出成 &IE 書籤..."
-+msgstr "匯出成 &IE 書籤…"
- 
- #: keditbookmarks/actionsimpl.cpp:211
- msgid "Export to &Mozilla Bookmarks..."
--msgstr "匯出成 &Mozilla 書籤..."
-+msgstr "匯出成 &Mozilla 書籤…"
- 
- #: keditbookmarks/actionsimpl.cpp:249
- msgid "*.html|HTML Bookmark Listing"
-@@ -1821,7 +1850,7 @@
- 
- #: keditbookmarks/favicons.cpp:86
- msgid "Updating favicon..."
--msgstr "更新 Favicon..."
-+msgstr "更新 Favicon…"
- 
- #: keditbookmarks/favicons.cpp:95
- msgid "Local file"
-@@ -1957,11 +1986,12 @@
- 
- #: keditbookmarks/main.cpp:96
- msgid ""
--"Another instance of %1 is already running, do you really want to open another "
--"instance or continue work in the same instance?\n"
-+"Another instance of %1 is already running, do you really want to open "
-+"another instance or continue work in the same instance?\n"
- "Please note that, unfortunately, duplicate views are read-only."
- msgstr ""
--"另一個 %1 的實體已經在執行，您要開啟另一個實體，或是在相同的實體下繼續工作？\n"
-+"另一個 %1 的實體已經在執行，您要開啟另一個實體，或是在相同的實體下繼續工"
-+"作？\n"
- "請注意，重複的檢視是唯讀的。"
- 
- #: keditbookmarks/main.cpp:100
-@@ -2002,7 +2032,7 @@
- 
- #: keditbookmarks/testlink.cpp:98 keditbookmarks/testlink.cpp:101
- msgid "Checking..."
--msgstr "檢查中..."
-+msgstr "檢查中…"
- 
- #: keditbookmarks/testlink.cpp:266
- msgid "Error "
-@@ -2018,8 +2048,8 @@
- 
- #: keditbookmarks/toplevel.cpp:215
- msgid ""
--"<b>Reset Quick Search</b>"
--"<br>Resets the quick search so that all bookmarks are shown again."
-+"<b>Reset Quick Search</b><br>Resets the quick search so that all bookmarks "
-+"are shown again."
- msgstr "<b>重新設定快速搜尋</b><br>重新設定快速搜尋以使所有的書籤再次顯示。"
- 
- #: keditbookmarks/toplevel.cpp:219 sidebar/trees/konqsidebar_tree.cpp:33
-@@ -2110,33 +2140,39 @@
- 
- #: about/konq_aboutpage.cc:185
- msgid ""
--"Konqueror makes working with and managing your files easy. You can browse both "
--"local and networked folders while enjoying advanced features such as the "
--"powerful sidebar and file previews."
--msgstr "Konqueror 讓工作與管理您的檔案變得容易。您可以在瀏覽本地端與網路資料夾的同時享受像多功能的邊列與檔案預覽這類進階的功能。"
-+"Konqueror makes working with and managing your files easy. You can browse "
-+"both local and networked folders while enjoying advanced features such as "
-+"the powerful sidebar and file previews."
-+msgstr ""
-+"Konqueror 讓工作與管理您的檔案變得容易。您可以在瀏覽本地端與網路資料夾的同時"
-+"享受像多功能的邊列與檔案預覽這類進階的功能。"
- 
- #: about/konq_aboutpage.cc:189
- msgid ""
- "Konqueror is also a full featured and easy to use web browser which you can  "
--"use to explore the Internet. Enter the address (e.g. <a "
--"href=\"http://www.kde.org\">http://www.kde.org</A>) of a web page you would "
--"like to visit in the location bar and press Enter, or choose an entry from the "
--"Bookmarks menu."
--msgstr ""
--"Konqueror 也是功能完整且易於使用的網頁瀏覽器，可供您瀏覽網際網路。只要在位址列輸入您要瀏覽的網路位址（例如 <a "
--"href=\"http://www.kde.org\">http://www.kde.org</A>）並按下 Enter 鍵，或從您的書籤選單中選擇一個項目。"
-+"use to explore the Internet. Enter the address (e.g. <a href=\"http://www."
-+"kde.org\">http://www.kde.org</A>) of a web page you would like to visit in "
-+"the location bar and press Enter, or choose an entry from the Bookmarks menu."
-+msgstr ""
-+"Konqueror 也是功能完整且易於使用的網頁瀏覽器，可供您瀏覽網際網路。只要在位址"
-+"列輸入您要瀏覽的網路位址（例如 <a href=\"http://www.kde.org\">http://www.kde."
-+"org</A>）並按下 Enter 鍵，或從您的書籤選單中選擇一個項目。"
- 
- #: about/konq_aboutpage.cc:194
- msgid ""
- "To return to the previous location, press the back button  <img width='16' "
- "height='16' src=\"%1\"> in the toolbar. "
--msgstr "如果您要回到前一個位置，可按下工具列上的「上一頁」按鈕  <img width='16' height='16' src=\"%1\">。"
-+msgstr ""
-+"如果您要回到前一個位置，可按下工具列上的「上一頁」按鈕  <img width='16' "
-+"height='16' src=\"%1\">。"
- 
- #: about/konq_aboutpage.cc:197
- msgid ""
- "To quickly go to your Home folder press the  home button <img width='16' "
- "height='16' src=\"%1\">."
--msgstr "如果您要快速移至家目錄，可按下工具列上的「家」按鈕  <img width='16' height='16' src=\"%1\">。"
-+msgstr ""
-+"如果您要快速移至家目錄，可按下工具列上的「家」按鈕  <img width='16' "
-+"height='16' src=\"%1\">。"
- 
- #: about/konq_aboutpage.cc:199
- msgid ""
-@@ -2145,14 +2181,15 @@
- 
- #: about/konq_aboutpage.cc:201
- msgid ""
--"<em>Tuning Tip:</em> If you want the Konqueror web browser to start faster, you "
--"can turn off this information screen by clicking <a href=\"%1\">here</a>"
--". You can re-enable it by choosing the Help -> Konqueror Introduction menu "
-+"<em>Tuning Tip:</em> If you want the Konqueror web browser to start faster, "
-+"you can turn off this information screen by clicking <a href=\"%1\">here</"
-+"a>. You can re-enable it by choosing the Help -> Konqueror Introduction menu "
- "option, and then pressing Settings -> Save View Profile \"Web Browsing\"."
- msgstr ""
--"<em>微調小密訣：</em> 如果您希望讓 Konqueror 瀏覽器啟動更快些，您可以單擊 <a href=\"%1\">這裡</a> "
--"來關閉這個訊息畫面。您也可以經由選擇「說明」->「Konqueror 征服家簡介」來重新開啟它，並且從「設定」->"
--"「儲存檢視設定檔“Web Browsing”」來儲存。"
-+"<em>微調小密訣：</em> 如果您希望讓 Konqueror 瀏覽器啟動更快些，您可以單擊 <a "
-+"href=\"%1\">這裡</a> 來關閉這個訊息畫面。您也可以經由選擇「說明」->"
-+"「Konqueror 征服家簡介」來重新開啟它，並且從「設定」->「儲存檢視設定檔“Web "
-+"Browsing”」來儲存。"
- 
- #: about/konq_aboutpage.cc:206
- msgid "Next: Tips &amp; Tricks"
-@@ -2160,16 +2197,17 @@
- 
- #: about/konq_aboutpage.cc:241
- msgid ""
--"Konqueror is designed to embrace and support Internet standards. The aim is to "
--"fully implement the officially sanctioned standards from organizations such as "
--"the W3 and OASIS, while also adding extra support for other common usability "
--"features that arise as de facto standards across the Internet. Along with this "
--"support, for such functions as favicons, Internet Keywords, and <A HREF=\"%1\">"
--"XBEL bookmarks</A>, Konqueror also implements:"
-+"Konqueror is designed to embrace and support Internet standards. The aim is "
-+"to fully implement the officially sanctioned standards from organizations "
-+"such as the W3 and OASIS, while also adding extra support for other common "
-+"usability features that arise as de facto standards across the Internet. "
-+"Along with this support, for such functions as favicons, Internet Keywords, "
-+"and <A HREF=\"%1\">XBEL bookmarks</A>, Konqueror also implements:"
- msgstr ""
- "Konqueror 征服家支援網際網路的標準，目標是完整的實作由國際組織如 W3 與 OASIS "
--"等所認可的正式標準。同時也額外加入了其它常見而有用的網際網路業界標準(de facto standards)。此外，Konqueror 也支援 "
--"favicons、關鍵字以及 <A HREF=\"%1\">XBEL 書籤</A> 等的功能， Konqueror 也實作了："
-+"等所認可的正式標準。同時也額外加入了其它常見而有用的網際網路業界標準(de "
-+"facto standards)。此外，Konqueror 也支援 favicons、關鍵字以及 <A HREF=\"%1"
-+"\">XBEL 書籤</A> 等的功能， Konqueror 也實作了："
- 
- #: about/konq_aboutpage.cc:248
- msgid "Web Browsing"
-@@ -2185,10 +2223,11 @@
- 
- #: about/konq_aboutpage.cc:251
- msgid ""
--"<A HREF=\"%1\">DOM</A> (Level 1, partially Level 2) based <A HREF=\"%2\">"
--"HTML 4.01</A>"
-+"<A HREF=\"%1\">DOM</A> (Level 1, partially Level 2) based <A HREF=\"%2"
-+"\">HTML 4.01</A>"
- msgstr ""
--"<A HREF=\"%1\">DOM</A> (Level 1, 部分 Level 2) 基於 <A HREF=\"%2\">HTML 4.01</A>"
-+"<A HREF=\"%1\">DOM</A> (Level 1, 部分 Level 2) 基於 <A HREF=\"%2\">HTML "
-+"4.01</A>"
- 
- #: about/konq_aboutpage.cc:253 about/konq_aboutpage.cc:255
- #: about/konq_aboutpage.cc:267 about/konq_aboutpage.cc:272
-@@ -2211,8 +2250,8 @@
- 
- #: about/konq_aboutpage.cc:258
- msgid ""
--"JavaScript enabled (globally). Configure JavaScript <A HREF=\\\"%1\\\">here</A>"
--"."
-+"JavaScript enabled (globally). Configure JavaScript <A HREF=\\\"%1\\\">here</"
-+"A>."
- msgstr "Javascript 已被啟用（全域）。在<A HREF=\\\"%1\\\">這邊</A>可以設定。"
- 
- #: about/konq_aboutpage.cc:259
-@@ -2221,11 +2260,11 @@
- 
- #: about/konq_aboutpage.cc:260
- msgid ""
--"JDK 1.2.0 (Java 2) compatible VM (<A HREF=\"%1\">Blackdown</A>, <A HREF=\"%2\">"
--"IBM</A> or <A HREF=\"%3\">Sun</A>)"
-+"JDK 1.2.0 (Java 2) compatible VM (<A HREF=\"%1\">Blackdown</A>, <A HREF=\"%2"
-+"\">IBM</A> or <A HREF=\"%3\">Sun</A>)"
- msgstr ""
--"JDK 1.2.0 (Java 2) 相容虛擬機器 (<A HREF=\"%1\">Blackdown</A>, <A HREF=\"%2\">IBM</A> "
--"或 <A HREF=\"%3\">Sun</A>)"
-+"JDK 1.2.0 (Java 2) 相容虛擬機器 (<A HREF=\"%1\">Blackdown</A>, <A HREF=\"%2"
-+"\">IBM</A> 或 <A HREF=\"%3\">Sun</A>)"
- 
- #: about/konq_aboutpage.cc:262
- msgid "Enable Java (globally) <A HREF=\"%1\">here</A>."
-@@ -2233,13 +2272,14 @@
- 
- #: about/konq_aboutpage.cc:263
- msgid ""
--"Netscape Communicator<SUP>&reg;</SUP> <A HREF=\"%4\">plugins</A> "
--"(for viewing <A HREF=\"%1\">Flash<SUP>&reg;</SUP></A>, <A HREF=\"%2\">Real<SUP>"
--"&reg;</SUP></A>Audio, <A HREF=\"%3\">Real<SUP>&reg;</SUP></A>Video, etc.)"
--msgstr ""
--"Netscape Communicator<SUP>&reg;</SUP> <A HREF=\"%4\">外掛程式</A> "
--"(用於檢視<A HREF=\"%1\">Flash<SUP>&reg;</SUP></A>, <A HREF=\"%2\">Real<SUP>"
--"&reg;</SUP></A>Audio, <A HREF=\"%3\">Real<SUP>&reg;</SUP></A>Video, etc.)"
-+"Netscape Communicator<SUP>&reg;</SUP> <A HREF=\"%4\">plugins</A> (for "
-+"viewing <A HREF=\"%1\">Flash<SUP>&reg;</SUP></A>, <A HREF=\"%2"
-+"\">Real<SUP>&reg;</SUP></A>Audio, <A HREF=\"%3\">Real<SUP>&reg;</SUP></"
-+"A>Video, etc.)"
-+msgstr ""
-+"Netscape Communicator<SUP>&reg;</SUP> <A HREF=\"%4\">外掛程式</A> (用於檢視"
-+"<A HREF=\"%1\">Flash<SUP>&reg;</SUP></A>, <A HREF=\"%2\">Real<SUP>&reg;</"
-+"SUP></A>Audio, <A HREF=\"%3\">Real<SUP>&reg;</SUP></A>Video, etc.)"
- 
- #: about/konq_aboutpage.cc:268
- msgid "Secure Sockets Layer"
-@@ -2287,7 +2327,7 @@
- 
- #: about/konq_aboutpage.cc:282
- msgid "and <A HREF=\"%1\">many more...</A>"
--msgstr "以及 <A HREF=\"%1\">更多其他的...</A>"
-+msgstr "以及 <A HREF=\"%1\">更多其他的…</A>"
- 
- #: about/konq_aboutpage.cc:283
- msgid "URL-Completion"
-@@ -2315,68 +2355,78 @@
- 
- #: about/konq_aboutpage.cc:338
- msgid ""
--"Use Internet-Keywords and Web-Shortcuts: by typing \"gg: KDE\" one can search "
--"the Internet, using Google, for the search phrase \"KDE\". There are a lot of "
--"Web-Shortcuts predefined to make searching for software or looking up certain "
--"words in an encyclopedia a breeze. You can even <a href=\"%1\">"
--"create your own</a> Web-Shortcuts."
--msgstr ""
--"使用網際網路關鍵字與網頁捷徑：輸入「gg: KDE」可以使用 google "
--"在網際網路找尋「KDE」一詞。目前有許多預先定義的網頁捷徑可以找到某些關鍵字。而且您也可以 <a href=\"%1\">建立您自己的</a> 網頁捷徑。"
-+"Use Internet-Keywords and Web-Shortcuts: by typing \"gg: KDE\" one can "
-+"search the Internet, using Google, for the search phrase \"KDE\". There are "
-+"a lot of Web-Shortcuts predefined to make searching for software or looking "
-+"up certain words in an encyclopedia a breeze. You can even <a href=\"%1"
-+"\">create your own</a> Web-Shortcuts."
-+msgstr ""
-+"使用網際網路關鍵字與網頁捷徑：輸入「gg: KDE」可以使用 google 在網際網路找尋"
-+"「KDE」一詞。目前有許多預先定義的網頁捷徑可以找到某些關鍵字。而且您也可以 <a "
-+"href=\"%1\">建立您自己的</a> 網頁捷徑。"
- 
- #: about/konq_aboutpage.cc:343
- msgid ""
--"Use the magnifier button <img width='16' height='16' src=\"%1\"> "
--"in the toolbar to increase the font size on your web page."
--msgstr "使用工具列中的放大鏡按鈕 <img width='16' height='16' src=\"%1\"> 來增加網頁的字型大小。"
-+"Use the magnifier button <img width='16' height='16' src=\"%1\"> in the "
-+"toolbar to increase the font size on your web page."
-+msgstr ""
-+"使用工具列中的放大鏡按鈕 <img width='16' height='16' src=\"%1\"> 來增加網頁的"
-+"字型大小。"
- 
- #: about/konq_aboutpage.cc:345
- msgid ""
--"When you want to paste a new address into the Location toolbar you might want "
--"to clear the current entry by pressing the black arrow with the white cross "
--"<img width='16' height='16' src=\"%1\"> in the toolbar."
-+"When you want to paste a new address into the Location toolbar you might "
-+"want to clear the current entry by pressing the black arrow with the white "
-+"cross <img width='16' height='16' src=\"%1\"> in the toolbar."
- msgstr ""
--"當您要貼上新的位址到位置工具列，您可藉由按下工具列中的這個黑箭頭與白十字 <img width='16' height='16' src=\"%1\"> "
--"來清除目前的內容。"
-+"當您要貼上新的位址到位置工具列，您可藉由按下工具列中的這個黑箭頭與白十字 "
-+"<img width='16' height='16' src=\"%1\"> 來清除目前的內容。"
- 
- #: about/konq_aboutpage.cc:349
- msgid ""
--"To create a link on your desktop pointing to the current page, simply drag the "
--"\"Location\" label that is to the left of the Location toolbar, drop it on to "
--"the desktop, and choose \"Link\"."
--msgstr "希望把目前瀏覽的網頁連結位址放置到您桌面上，只要用滑鼠按住位置工具列左邊的“位置”標籤，然後拖曳到桌面上放開，然後選擇建立連結就可以完成了。"
-+"To create a link on your desktop pointing to the current page, simply drag "
-+"the \"Location\" label that is to the left of the Location toolbar, drop it "
-+"on to the desktop, and choose \"Link\"."
-+msgstr ""
-+"希望把目前瀏覽的網頁連結位址放置到您桌面上，只要用滑鼠按住位置工具列左邊的“位"
-+"置”標籤，然後拖曳到桌面上放開，然後選擇建立連結就可以完成了。"
- 
- #: about/konq_aboutpage.cc:352
- msgid ""
--"You can also find <img width='16' height='16' src=\"%1\"> "
--"\"Full-Screen Mode\" in the Settings menu. This feature is very useful for "
--"\"Talk\" sessions."
-+"You can also find <img width='16' height='16' src=\"%1\"> \"Full-Screen Mode"
-+"\" in the Settings menu. This feature is very useful for \"Talk\" sessions."
- msgstr ""
--"您也可以在設定選單找到 <img width='16' height='16' src=\"%1\">「全螢幕模式」。對於常上「聊天室」的人是很有用的。"
-+"您也可以在設定選單找到 <img width='16' height='16' src=\"%1\">「全螢幕模"
-+"式」。對於常上「聊天室」的人是很有用的。"
- 
- #: about/konq_aboutpage.cc:355
- msgid ""
--"Divide et impera (lat. \"Divide and conquer\") - by splitting a window into two "
--"parts (e.g. Window -> <img width='16' height='16' src=\"%1\"> "
--"Split View Left/Right) you can make Konqueror appear the way you like. You can "
--"even load some example view-profiles (e.g. Midnight Commander), or create your "
-+"Divide et impera (lat. \"Divide and conquer\") - by splitting a window into "
-+"two parts (e.g. Window -> <img width='16' height='16' src=\"%1\"> Split View "
-+"Left/Right) you can make Konqueror appear the way you like. You can even "
-+"load some example view-profiles (e.g. Midnight Commander), or create your "
- "own ones."
- msgstr ""
--"分割並控制(雙關語) - 分割視窗成二個區域（例如：視窗 -> <img width='16' height='16' src=\"%1\"> "
--"分割檢視左/右）您可以讓 Konqueror 變成您希望的樣子。您甚至可以載入一些範例設定（如 Minight-Commander），或者自己建立。"
-+"分割並控制(雙關語) - 分割視窗成二個區域（例如：視窗 -> <img width='16' "
-+"height='16' src=\"%1\"> 分割檢視左/右）您可以讓 Konqueror 變成您希望的樣子。"
-+"您甚至可以載入一些範例設定（如 Minight-Commander），或者自己建立。"
- 
- #: about/konq_aboutpage.cc:360
- msgid ""
--"Use the <a href=\"%1\">user-agent</a> feature if the website you are visiting "
--"asks you to use a different browser (and do not forget to send a complaint to "
--"the webmaster!)"
--msgstr "如果網站要求您使用其他的瀏覽器，請使用 <a href=\"%1\">使用者代理</a> 功能（別忘了向他們抱怨！）"
-+"Use the <a href=\"%1\">user-agent</a> feature if the website you are "
-+"visiting asks you to use a different browser (and do not forget to send a "
-+"complaint to the webmaster!)"
-+msgstr ""
-+"如果網站要求您使用其他的瀏覽器，請使用 <a href=\"%1\">使用者代理</a> 功能（別"
-+"忘了向他們抱怨！）"
- 
- #: about/konq_aboutpage.cc:363
- msgid ""
- "The <img width='16' height='16' src=\"%1\"> History in your SideBar ensures "
- "that you can keep track of the pages you have visited recently."
--msgstr "在邊列上的 <img width='16' height='16' src=\"%1\"> 紀錄，可以讓您追蹤最近所瀏覽過的網頁。"
-+msgstr ""
-+"在邊列上的 <img width='16' height='16' src=\"%1\"> 紀錄，可以讓您追蹤最近所瀏"
-+"覽過的網頁。"
- 
- #: about/konq_aboutpage.cc:365
- msgid ""
-@@ -2385,11 +2435,12 @@
- 
- #: about/konq_aboutpage.cc:367
- msgid ""
--"Advanced users will appreciate the Konsole which you can embed into Konqueror "
--"(Window -> <img width='16' height='16' SRC=\"%1\"> Show Terminal Emulator)."
-+"Advanced users will appreciate the Konsole which you can embed into "
-+"Konqueror (Window -> <img width='16' height='16' SRC=\"%1\"> Show Terminal "
-+"Emulator)."
- msgstr ""
--"進階的使用者會很高興能把 Konsole 嵌入 Konqueror（視窗 -> <img width='16' height='16' SRC=\"%1\"> "
--"顯示終端機模擬）。"
-+"進階的使用者會很高興能把 Konsole 嵌入 Konqueror（視窗 -> <img width='16' "
-+"height='16' SRC=\"%1\"> 顯示終端機模擬）。"
- 
- #: about/konq_aboutpage.cc:370
- msgid ""
-@@ -2448,7 +2499,7 @@
- 
- #: shellcmdplugin/kshellcmdplugin.cpp:36
- msgid "&Execute Shell Command..."
--msgstr "執行 Shell 命令(&E)..."
-+msgstr "執行 Shell 命令(&E)…"
- 
- #: shellcmdplugin/kshellcmdplugin.cpp:51
- msgid "Executing shell commands works only on local directories."
-@@ -2506,17 +2557,11 @@
- 
- #: sidebar/trees/history_module/history_item.cpp:121
- msgid ""
--"<qt>"
--"<center><b>%4</b></center>"
--"<hr>Last visited: %1"
--"<br>First visited: %2"
--"<br>Number of times visited: %3</qt>"
--msgstr ""
--"<qt>"
--"<center><b>%4</b></center>"
--"<hr>最近一次參觀： %1"
--"<br>第一次參觀： %2"
--"<br>參觀次數： %3</qt>"
-+"<qt><center><b>%4</b></center><hr>Last visited: %1<br>First visited: %"
-+"2<br>Number of times visited: %3</qt>"
-+msgstr ""
-+"<qt><center><b>%4</b></center><hr>最近一次參觀： %1<br>第一次參觀： %2<br>參"
-+"觀次數： %3</qt>"
- 
- #: sidebar/trees/history_module/kcmhistory.cpp:68
- #: sidebar/trees/history_module/kcmhistory.cpp:73
-@@ -2604,7 +2649,7 @@
- 
- #: sidebar/trees/konq_sidebartree.cpp:903
- msgid "&Create New Folder..."
--msgstr "建立新資料夾(&C)..."
-+msgstr "建立新資料夾(&C)…"
- 
- #: sidebar/trees/konq_sidebartree.cpp:909
- msgid "Delete Link"
-@@ -2628,9 +2673,12 @@
- 
- #: sidebar/sidebar_widget.cpp:122
- msgid ""
--"<qt>This removes all your entries from the sidebar and adds the system default "
--"ones.<BR><B>This procedure is irreversible</B><BR>Do you want to proceed?</qt>"
--msgstr "<qt>這會將所有您的項目自邊列移除，並且加上系統的預設項目。<BR><B>這個程序是不能反悔的</B><BR>您是否要繼續執行？</qt>"
-+"<qt>This removes all your entries from the sidebar and adds the system "
-+"default ones.<BR><B>This procedure is irreversible</B><BR>Do you want to "
-+"proceed?</qt>"
-+msgstr ""
-+"<qt>這會將所有您的項目自邊列移除，並且加上系統的預設項目。<BR><B>這個程序是不"
-+"能反悔的</B><BR>您是否要繼續執行？</qt>"
- 
- #: sidebar/sidebar_widget.cpp:277
- msgid "Add New"
-@@ -2682,10 +2730,12 @@
- 
- #: sidebar/sidebar_widget.cpp:634
- msgid ""
--"You have hidden the navigation panel configuration button. To make it visible "
--"again, click the right mouse button on any of the navigation panel buttons and "
--"select \"Show Configuration Button\"."
--msgstr "您已經隱藏導覽面板設定按鈕。要讓它再次出現，在導覽面板的任何部分 單擊滑鼠右鍵並選擇“顯示設定按鈕”。"
-+"You have hidden the navigation panel configuration button. To make it "
-+"visible again, click the right mouse button on any of the navigation panel "
-+"buttons and select \"Show Configuration Button\"."
-+msgstr ""
-+"您已經隱藏導覽面板設定按鈕。要讓它再次出現，在導覽面板的任何部分 單擊滑鼠右鍵"
-+"並選擇“顯示設定按鈕”。"
- 
- #: sidebar/sidebar_widget.cpp:733
- msgid "Configure Sidebar"
-@@ -2693,15 +2743,15 @@
- 
- #: sidebar/sidebar_widget.cpp:858
- msgid "Set Name..."
--msgstr "設定名稱..."
-+msgstr "設定名稱…"
- 
- #: sidebar/sidebar_widget.cpp:859
- msgid "Set URL..."
--msgstr "設定 URL..."
-+msgstr "設定 URL…"
- 
- #: sidebar/sidebar_widget.cpp:860
- msgid "Set Icon..."
--msgstr "設定圖示..."
-+msgstr "設定圖示…"
- 
- #: sidebar/sidebar_widget.cpp:864
- msgid "Configure Navigation Panel"
-@@ -2750,5 +2800,5 @@
- "_: EMAIL OF TRANSLATORS\n"
- "Your emails"
- msgstr ""
--"shyue@sonoma.com.tw,cwhuang@linux.org.tw,kenduest@i18n.linux.org.tw,"
--"pesder.liao@msa.hinet.net,b8802046@mail.ntust.edu.tw"
-+"shyue@sonoma.com.tw,cwhuang@linux.org.tw,kenduest@i18n.linux.org.tw,pesder."
-+"liao@msa.hinet.net,b8802046@mail.ntust.edu.tw"
-diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/konsole.po kde-i18n-zh_TW-3.5.10/messages/kdebase/konsole.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/konsole.po	2007-10-08 12:00:12.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdebase/konsole.po	2011-11-11 15:45:17.000000000 +0100
-@@ -10,8 +10,7 @@
- "Project-Id-Version: konsole\n"
- "POT-Creation-Date: 2007-08-03 01:12+0200\n"
- "PO-Revision-Date: 2007-01-26 08:36+0800\n"
--"Last-Translator: Frank Weng (a.k.a. Franklin) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Chinese Traditional <zh-l10n@linux.org.tw>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
-@@ -128,11 +127,11 @@
- 
- #: konsole.cpp:627 konsole_part.cpp:368
- msgid "Se&lect..."
--msgstr "選擇(&L)..."
-+msgstr "選擇(&L)…"
- 
- #: konsole.cpp:633
- msgid "&Install Bitmap..."
--msgstr "安裝點陣字(&I)..."
-+msgstr "安裝點陣字(&I)…"
- 
- #: konsole.cpp:641 konsole_part.cpp:372
- msgid "&Encoding"
-@@ -152,19 +151,19 @@
- 
- #: konsole.cpp:661
- msgid "40x15 (&Small)"
--msgstr "40x15 (小型) (&S)"
-+msgstr "40x15 (小型)(&S)"
- 
- #: konsole.cpp:662
- msgid "80x24 (&VT100)"
--msgstr "80x24 (&VT100)"
-+msgstr "80x24(&VT100)"
- 
- #: konsole.cpp:663
- msgid "80x25 (&IBM PC)"
--msgstr "80x25 (&IBM PC)"
-+msgstr "80x25(&IBM PC)"
- 
- #: konsole.cpp:664
- msgid "80x40 (&XTerm)"
--msgstr "80x40 (&XTerm)"
-+msgstr "80x40(&XTerm)"
- 
- #: konsole.cpp:665
- msgid "80x52 (IBM V&GA)"
-@@ -172,11 +171,11 @@
- 
- #: konsole.cpp:667
- msgid "&Custom..."
--msgstr "自訂(&C)..."
-+msgstr "自訂(&C)…"
- 
- #: konsole.cpp:672
- msgid "Hist&ory..."
--msgstr "歷史紀錄(&O)..."
-+msgstr "歷史紀錄(&O)…"
- 
- #: konsole.cpp:678 konsole_part.cpp:447
- msgid "&Save as Default"
-@@ -204,7 +203,7 @@
- 
- #: konsole.cpp:797 konsole.cpp:1080
- msgid "&Rename Session..."
--msgstr "更名工作階段(&R)..."
-+msgstr "更名工作階段(&R)…"
- 
- #: konsole.cpp:801 konsole.cpp:1089
- msgid "Monitor for &Activity"
-@@ -228,7 +227,7 @@
- 
- #: konsole.cpp:816
- msgid "Select &Tab Color..."
--msgstr "選擇分頁色彩(&T)..."
-+msgstr "選擇分頁色彩(&T)…"
- 
- #: konsole.cpp:820
- msgid "Switch to Tab"
-@@ -296,7 +295,7 @@
- 
- #: konsole.cpp:1053
- msgid "&Find in History..."
--msgstr "搜尋歷史紀錄(&F)..."
-+msgstr "搜尋歷史紀錄(&F)…"
- 
- #: konsole.cpp:1061
- msgid "Find Pre&vious"
-@@ -304,7 +303,7 @@
- 
- #: konsole.cpp:1065
- msgid "S&ave History As..."
--msgstr "儲存歷史紀錄至(&A)..."
-+msgstr "儲存歷史紀錄至(&A)…"
- 
- #: konsole.cpp:1069
- msgid "Clear &History"
-@@ -316,7 +315,7 @@
- 
- #: konsole.cpp:1084
- msgid "&ZModem Upload..."
--msgstr "&ZModem 上傳..."
-+msgstr "&ZModem 上傳…"
- 
- #: konsole.cpp:1104
- msgid "Hide &Menubar"
-@@ -324,11 +323,11 @@
- 
- #: konsole.cpp:1110
- msgid "Save Sessions &Profile..."
--msgstr "儲存工作階段組態(&P)..."
-+msgstr "儲存工作階段組態(&P)…"
- 
- #: konsole.cpp:1121
- msgid "&Print Screen..."
--msgstr "列印螢幕(&P)..."
-+msgstr "列印螢幕(&P)…"
- 
- #: konsole.cpp:1126
- msgid "New Session"
-@@ -377,8 +376,8 @@
- 
- #: konsole.cpp:1196
- msgid ""
--"You have open sessions (besides the current one). These will be killed if you "
--"continue.\n"
-+"You have open sessions (besides the current one). These will be killed if "
-+"you continue.\n"
- "Are you sure you want to quit?"
- msgstr ""
- "您還有其他使用中的工作階段 (除了正在使用的這個以外)。\n"
-@@ -394,7 +393,9 @@
- msgid ""
- "The application running in Konsole does not respond to the close request. Do "
- "you want Konsole to close anyway?"
--msgstr "目前於 Konsole 內執行的程式沒有正確回應所以無法正常讓它結束。您確定要關閉 Konsole 程式？"
-+msgstr ""
-+"目前於 Konsole 內執行的程式沒有正確回應所以無法正常讓它結束。您確定要關閉 "
-+"Konsole 程式？"
- 
- #: konsole.cpp:1234
- msgid "Application Does Not Respond"
-@@ -411,11 +412,11 @@
- #: konsole.cpp:1809
- msgid ""
- "If you want to use the bitmap fonts distributed with Konsole, they must be "
--"installed.  After installation, you must restart Konsole to use them.  Do you "
--"want to install the fonts listed below into fonts:/Personal?"
-+"installed.  After installation, you must restart Konsole to use them.  Do "
-+"you want to install the fonts listed below into fonts:/Personal?"
- msgstr ""
--"如果您想要使用 Konsole 隨附的點陣字型，就必須安裝它們。安裝完成後，您必須重新啟動 Konsole 才能使用它們。您是否想要將下列字型安裝到 "
--"fonts:/Personal？"
-+"如果您想要使用 Konsole 隨附的點陣字型，就必須安裝它們。安裝完成後，您必須重新"
-+"啟動 Konsole 才能使用它們。您是否想要將下列字型安裝到 fonts:/Personal？"
- 
- #: konsole.cpp:1811
- msgid "Install Bitmap Fonts?"
-@@ -439,19 +440,20 @@
- 
- #: konsole.cpp:2034
- msgid ""
--"You have chosen one or more Ctrl+<key> combinations to be used as shortcuts. As "
--"a result these key combinations will no longer be passed to the command shell "
--"or to applications that run inside Konsole. This can have the unintended "
--"consequence that functionality that would otherwise be bound to these key "
--"combinations is no longer accessible.\n"
-+"You have chosen one or more Ctrl+<key> combinations to be used as shortcuts. "
-+"As a result these key combinations will no longer be passed to the command "
-+"shell or to applications that run inside Konsole. This can have the "
-+"unintended consequence that functionality that would otherwise be bound to "
-+"these key combinations is no longer accessible.\n"
- "\n"
--"You may wish to reconsider your choice of keys and use Alt+Ctrl+<key> "
--"or Ctrl+Shift+<key> instead.\n"
-+"You may wish to reconsider your choice of keys and use Alt+Ctrl+<key> or Ctrl"
-+"+Shift+<key> instead.\n"
- "\n"
- "You are currently using the following Ctrl+<key> combinations:"
- msgstr ""
--"您已經選擇一或多個 Ctrl+<key> 組合來做為捷徑鍵。如此一來這些組合鍵就不再具有命令 shell 或在 Konsole "
--"中執行的應用程式的功能。這可能不是您所樂意見到的，但是除非把這些組合鍵取消否則無法避免。\n"
-+"您已經選擇一或多個 Ctrl+<key> 組合來做為捷徑鍵。如此一來這些組合鍵就不再具有"
-+"命令 shell 或在 Konsole 中執行的應用程式的功能。這可能不是您所樂意見到的，但"
-+"是除非把這些組合鍵取消否則無法避免。\n"
- "\n"
- "您可以會想考慮您所選擇的按鍵並使用 Alt+Ctrl+<key> 或 Ctrl+Shift+<key>代替。\n"
- "\n"
-@@ -489,7 +491,7 @@
- 
- #: konsole.cpp:3461
- msgid "New Shell at Bookmark"
--msgstr "開啟新 Shell 於書籤..."
-+msgstr "開啟新 Shell 於書籤…"
- 
- #: konsole.cpp:3464
- msgid "Shell at Bookmark"
-@@ -520,7 +522,7 @@
- 
- #: konsole.cpp:3835
- msgid "&Number of lines: "
--msgstr "行數(&N):"
-+msgstr "列數(&N):"
- 
- #: konsole.cpp:3839 konsole_part.cpp:984
- msgid ""
-@@ -561,10 +563,8 @@
- msgstr "儲存歷史紀錄"
- 
- #: konsole.cpp:4040
--msgid ""
--"This is not a local file.\n"
--msgstr ""
--"這不是本地檔案。\n"
-+msgid "This is not a local file.\n"
-+msgstr "這不是本地檔案。\n"
- 
- #: konsole.cpp:4050
- msgid ""
-@@ -646,7 +646,7 @@
- 
- #: konsole.cpp:4184 konsole_part.cpp:991
- msgid "Number of lines:"
--msgstr "行數:"
-+msgstr "列數:"
- 
- #: konsole.cpp:4212
- msgid "As &regular expression"
-@@ -654,7 +654,7 @@
- 
- #: konsole.cpp:4215
- msgid "&Edit..."
--msgstr "編輯(&E)..."
-+msgstr "編輯(&E)…"
- 
- #: konsole_part.cpp:92 main.cpp:168
- msgid "Konsole"
-@@ -662,11 +662,11 @@
- 
- #: konsole_part.cpp:399
- msgid "&History..."
--msgstr "歷史紀錄(&H)..."
-+msgstr "歷史紀錄(&H)…"
- 
- #: konsole_part.cpp:405
- msgid "Li&ne Spacing"
--msgstr "行距(&N)"
-+msgstr "列距(&N)"
- 
- #: konsole_part.cpp:411
- msgid "&0"
-@@ -718,7 +718,7 @@
- 
- #: konsole_part.cpp:435
- msgid "Wor&d Connectors..."
--msgstr "單字分隔(&D)..."
-+msgstr "單字分隔(&D)…"
- 
- #: konsole_part.cpp:441
- msgid "&Use Konsole's Settings"
-@@ -937,16 +937,12 @@
- "上面的列表只包括我能夠保留記錄的部分貢獻者。"
- 
- #: main.cpp:337
--msgid ""
--"You can't use BOTH -ls and -e.\n"
--msgstr ""
--"您不能同時使用 -ls 與 -e。\n"
-+msgid "You can't use BOTH -ls and -e.\n"
-+msgstr "您不能同時使用 -ls 與 -e。\n"
- 
- #: main.cpp:464
--msgid ""
--"expected --vt_sz <#columns>x<#lines> e.g. 80x40\n"
--msgstr ""
--"期望 --vt_sz <#列>x<#行> 例如. 80x40\n"
-+msgid "expected --vt_sz <#columns>x<#lines> e.g. 80x40\n"
-+msgstr "期望 --vt_sz <#列>x<#行> 例如. 80x40\n"
- 
- #: printsettings.cpp:32
- msgid "Printer &friendly mode (black text, no background)"
-@@ -1066,12 +1062,12 @@
- 
- #: session.cpp:137
- msgid ""
--"Konsole is unable to open a PTY (pseudo teletype).  It is likely that this is "
--"due to an incorrect configuration of the PTY devices.  Konsole needs to have "
--"read/write access to the PTY devices."
-+"Konsole is unable to open a PTY (pseudo teletype).  It is likely that this "
-+"is due to an incorrect configuration of the PTY devices.  Konsole needs to "
-+"have read/write access to the PTY devices."
- msgstr ""
--"Konsole 無法開啟 PTY (pseudo teletype)。這可能是由於 PTY 裝置的組態不正確。Konsole 需要對 PTY "
--"裝置有讀取/寫入權限。"
-+"Konsole 無法開啟 PTY (pseudo teletype)。這可能是由於 PTY 裝置的組態不正確。"
-+"Konsole 需要對 PTY 裝置有讀取/寫入權限。"
- 
- #: session.cpp:138
- msgid "A Fatal Error Has Occurred"
-@@ -1117,8 +1113,7 @@
- msgid ""
- "<p>...that right-clicking on any tab allows for the changing of the tab text "
- "color?\n"
--msgstr ""
--"<p>...是否允許在任何分頁以滑鼠右擊來變更分頁文字色彩？\n"
-+msgstr "<p>…是否允許在任何分頁以滑鼠右擊來變更分頁文字色彩？\n"
- 
- #: tips.cpp:8
- msgid ""
-@@ -1128,35 +1123,32 @@
- "<p>...分頁文字色彩是否可以代碼 \\e[28;COLORt (COLOR: 0-16,777,215)變更？\n"
- 
- #: tips.cpp:13
--msgid ""
--"<p>...that the code \\e[8;ROW;COLUMNt will resize Konsole?\n"
--msgstr ""
--"<p>...是否可以代碼 \\e[8;ROW;COLUMNt 改變 Konsole 大小？\n"
-+msgid "<p>...that the code \\e[8;ROW;COLUMNt will resize Konsole?\n"
-+msgstr "<p>…是否可以代碼 \\e[8;ROW;COLUMNt 改變 Konsole 大小？\n"
- 
- #: tips.cpp:18
- msgid ""
--"<p>...that you can start a new standard session by pressing the \"New\" button "
--"in the tabbar?\n"
-+"<p>...that you can start a new standard session by pressing the \"New\" "
-+"button in the tabbar?\n"
- msgstr ""
--"<p>...知道您可以按在 Konsole 工作列上的「新增」按扭來啟動一個新的標準工作階段嗎？\n"
-+"<p>...知道您可以按在 Konsole 工作列上的「新增」按扭來啟動一個新的標準工作階段"
-+"嗎？\n"
- 
- #: tips.cpp:23
- msgid ""
--"<p>...that pressing and holding the \"New\" button on the tabbar will display a "
--"menu of sessions to select?\n"
-+"<p>...that pressing and holding the \"New\" button on the tabbar will "
-+"display a menu of sessions to select?\n"
- msgstr ""
- "<p>...知道按住在分頁列上的「新增」按鈕不放會顯示選取工作階段的選單嗎？\n"
- 
- #: tips.cpp:28
--msgid ""
--"<p>...that pressing Ctrl+Alt+N will start a new standard session?\n"
--msgstr ""
--"<p>...知道按 Ctrl+Alt+N 會啟動一個新的標準工作階段嗎？\n"
-+msgid "<p>...that pressing Ctrl+Alt+N will start a new standard session?\n"
-+msgstr "<p>…知道按 Ctrl+Alt+N 會啟動一個新的標準工作階段嗎？\n"
- 
- #: tips.cpp:33
- msgid ""
--"<p>...that you can cycle through the Konsole sessions by holding down the Shift "
--"key and\n"
-+"<p>...that you can cycle through the Konsole sessions by holding down the "
-+"Shift key and\n"
- "pressing the Left or Right Arrow keys?\n"
- msgstr ""
- "<p>...知道您可以按住 Shift 鍵再按左右箭咀鍵來穿梭各 Konsole 工作階段嗎？\n"
-@@ -1177,7 +1169,8 @@
- msgid ""
- "<p>...that you can rename your Konsole sessions by clicking with the right "
- "mouse\n"
--"button and selecting \"Rename session\"? The change will be reflected in the\n"
-+"button and selecting \"Rename session\"? The change will be reflected in "
-+"the\n"
- "Konsole tabbar, making it easier to remember the content of the session.\n"
- msgstr ""
- "<p>...知道您可以按滑鼠右鍵再選「變更工作階段名稱」\n"
-@@ -1191,10 +1184,8 @@
- "<p>...知道您可以雙擊 Konsole 分頁列上的按鈕來變更 Konsole 工作階段名稱嗎？\n"
- 
- #: tips.cpp:59
--msgid ""
--"<p>...that you can activate the menu with the Ctrl+Alt+M shortcut?\n"
--msgstr ""
--"<p>...知道您可以按快捷鍵 Ctrl+Alt+M 來觸動選單嗎？\n"
-+msgid "<p>...that you can activate the menu with the Ctrl+Alt+M shortcut?\n"
-+msgstr "<p>…知道您可以按快捷鍵 Ctrl+Alt+M 來觸動選單嗎？\n"
- 
- #: tips.cpp:64
- msgid ""
-@@ -1208,7 +1199,8 @@
- "<p>...that you can create your own session types by using the session \n"
- "editor which you can find under \"Settings->Configure Konsole...\"?\n"
- msgstr ""
--"<p>...知道您可以用工作階段編輯器 (可以在「設定值->設定 Konsole...」 裡找到) \n"
-+"<p>...知道您可以用工作階段編輯器 (可以在「設定值->設定 Konsole...」 裡找"
-+"到) \n"
- "來建立自己的新工作階段類型？\n"
- 
- #: tips.cpp:75
-@@ -1223,8 +1215,8 @@
- 
- #: tips.cpp:82
- msgid ""
--"<p>...that you can move a session by holding down the middle mouse button over "
--"the tab?\n"
-+"<p>...that you can move a session by holding down the middle mouse button "
-+"over the tab?\n"
- "</p>\n"
- msgstr ""
- "<p>...知道您可以在 Konsole 分頁列上按住滑鼠中鍵來移動工作階段嗎？\n"
-@@ -1232,8 +1224,8 @@
- 
- #: tips.cpp:88
- msgid ""
--"<p>...that you can reorder the session tabs with \"View->"
--"Move Session Left/Right\" menu\n"
-+"<p>...that you can reorder the session tabs with \"View->Move Session Left/"
-+"Right\" menu\n"
- "commands or by holding down the Shift and Ctrl keys and pressing the Left or "
- "Right \n"
- "Arrow keys?\n"
-@@ -1246,8 +1238,8 @@
- 
- #: tips.cpp:96
- msgid ""
--"<p>...that you can scroll pagewise in the history by holding down the Shift key "
--"\n"
-+"<p>...that you can scroll pagewise in the history by holding down the Shift "
-+"key \n"
- "and pressing the Page Up or Page Down keys?\n"
- msgstr ""
- "<p>...知道您可以在歷史紀錄中按住 Shift 鍵再按 Page Up 或 Page Down\n"
-@@ -1255,8 +1247,8 @@
- 
- #: tips.cpp:102
- msgid ""
--"<p>...that you can scroll linewise in the history by holding down the Shift key "
--"\n"
-+"<p>...that you can scroll linewise in the history by holding down the Shift "
-+"key \n"
- "and pressing the Up or Down Arrow keys?\n"
- msgstr ""
- "<p>...知道您可以在歷史紀錄中按住 Shift 鍵並按上下箭咀鍵來逐行捲動嗎？\n"
-@@ -1265,8 +1257,7 @@
- msgid ""
- "<p>...that you can insert the clipboard by holding down the Shift key and \n"
- "pressing the Insert key?\n"
--msgstr ""
--"<p>...知道您可以按住 Shift 鍵再按 Insert 鍵來插入剪貼薄的內容嗎？\n"
-+msgstr "<p>…知道您可以按住 Shift 鍵再按 Insert 鍵來插入剪貼薄的內容嗎？\n"
- 
- #: tips.cpp:114
- msgid ""
-@@ -1286,24 +1277,23 @@
- 
- #: tips.cpp:126
- msgid ""
--"<p>...that you can turn off the terminal size hint under \"Settings->"
--"Configure Konsole...\"?\n"
--msgstr ""
--"<p>...知道您可以在「設定值->設定 Konsole...」 下關閉終端機大小提示？\n"
-+"<p>...that you can turn off the terminal size hint under \"Settings-"
-+">Configure Konsole...\"?\n"
-+msgstr "<p>…知道您可以在「設定值->設定 Konsole...」 下關閉終端機大小提示？\n"
- 
- #: tips.cpp:131
- msgid ""
- "<p>...that pressing Ctrl while selecting text will let Konsole ignore line "
- "breaks?\n"
--msgstr ""
--"<p>...知道您可以在選擇文字時按住 Ctrl 鍵可以讓 Konsole 忽略跳行嗎？\n"
-+msgstr "<p>…知道您可以在選擇文字時按住 Ctrl 鍵可以讓 Konsole 忽略跳行嗎？\n"
- 
- #: tips.cpp:136
- msgid ""
--"<p>...that pressing the Ctrl and Alt keys while selecting text will let Konsole "
--"select columns?\n"
-+"<p>...that pressing the Ctrl and Alt keys while selecting text will let "
-+"Konsole select columns?\n"
- msgstr ""
--"<p>...知道您可以在選擇文字時按住 Ctrl 鍵與 Alt 鍵可以讓 Konsole 依欄選擇嗎？\n"
-+"<p>...知道您可以在選擇文字時按住 Ctrl 鍵與 Alt 鍵可以讓 Konsole 依欄選擇"
-+"嗎？\n"
- 
- #: tips.cpp:141
- msgid ""
-@@ -1315,7 +1305,8 @@
- 
- #: tips.cpp:147
- msgid ""
--"<p>...that when a program evaluates the left mouse button you can still select\n"
-+"<p>...that when a program evaluates the left mouse button you can still "
-+"select\n"
- "text while pressing the Shift key?\n"
- msgstr ""
- "<p>...知道當一個程式會吃掉滑鼠左鍵時，您仍可\n"
-@@ -1323,26 +1314,32 @@
- 
- #: tips.cpp:153
- msgid ""
--"<p>...that you can let Konsole set the current directory as the window title?\n"
--"For Bash, put 'export PS1=$PS1\"\\[\\e]0;\\H:\\w\\a\\]\"' in your ~/.bashrc .\n"
-+"<p>...that you can let Konsole set the current directory as the window "
-+"title?\n"
-+"For Bash, put 'export PS1=$PS1\"\\[\\e]0;\\H:\\w\\a\\]\"' in your ~/."
-+"bashrc .\n"
- msgstr ""
- "<p>...知道您可以讓 Konsole 用當前目錄名作為視窗標題嗎？\n"
--"用 Bash 的話，請將 'export PS1=$PS1\"\\[\\e]0;\\H:\\w\\a\\]' 放進您的~/.bashrc 中。\n"
-+"用 Bash 的話，請將 'export PS1=$PS1\"\\[\\e]0;\\H:\\w\\a\\]' 放進您的~/."
-+"bashrc 中。\n"
- 
- #: tips.cpp:159
- msgid ""
--"<p>...that you can let Konsole set the current directory as the session name?\n"
--"For Bash, put 'export PS1=$PS1\"\\[\\e]30;\\H:\\w\\a\\]\"' in your ~/.bashrc .\n"
-+"<p>...that you can let Konsole set the current directory as the session "
-+"name?\n"
-+"For Bash, put 'export PS1=$PS1\"\\[\\e]30;\\H:\\w\\a\\]\"' in your ~/."
-+"bashrc .\n"
- msgstr ""
- "<p>...知道您可以讓 Konsole 用當前目錄名作為視窗標題嗎？\n"
--"用 Bash 的話，請將 'export PS1=$PS1\"\\[\\e]30;\\H:\\w\\a\\]\"' 放進您的~/.bashrc 中。\n"
-+"用 Bash 的話，請將 'export PS1=$PS1\"\\[\\e]30;\\H:\\w\\a\\]\"' 放進您的~/."
-+"bashrc 中。\n"
- 
- #: tips.cpp:165
- msgid ""
--"<p>...that if you let your shell pass the current directory to Konsole within "
--"the prompt\n"
--"variable, e.g. for Bash with 'export PS1=$PS1\"\\[\\e]31;\\w\\a\\]\"' in your "
--"~/.bashrc, then\n"
-+"<p>...that if you let your shell pass the current directory to Konsole "
-+"within the prompt\n"
-+"variable, e.g. for Bash with 'export PS1=$PS1\"\\[\\e]31;\\w\\a\\]\"' in "
-+"your ~/.bashrc, then\n"
- "Konsole can bookmark it, and session management will remember your current "
- "working directory\n"
- "on non-Linux systems too?\n"
-@@ -1374,8 +1371,8 @@
- 
- #: tips.cpp:187
- msgid ""
--"<p>...that if you drag &amp; drop a URL into a Konsole window you are presented "
--"with a\n"
-+"<p>...that if you drag &amp; drop a URL into a Konsole window you are "
-+"presented with a\n"
- "menu giving the option to copy or move the specified file into the current "
- "working directory,\n"
- "as well as just pasting the URL as text.\n"
-@@ -1388,10 +1385,10 @@
- 
- #: tips.cpp:195
- msgid ""
--"<p>...that the \"Settings->Configure Shortcuts...\" dialog allows you to define "
--"keyboard shortcuts for actions\n"
--"not shown in the menu, like activating menu, changing font and for listing and "
--"switching sessions?\n"
-+"<p>...that the \"Settings->Configure Shortcuts...\" dialog allows you to "
-+"define keyboard shortcuts for actions\n"
-+"not shown in the menu, like activating menu, changing font and for listing "
-+"and switching sessions?\n"
- msgstr ""
- "<p>...「設定值->設定捷徑鍵」對話盒允許您定義選單中沒顯示的動作的捷徑鍵，\n"
- "像作用選單、改變字型與列出並切換工作階段？\n"
-@@ -1402,7 +1399,8 @@
- "tabbar or in an empty tabbar space displays a menu where you can set several "
- "tab options?\n"
- msgstr ""
--"<p>...在分頁列左上角的「新增」按鈕或在分頁列的空白空間按右鍵會否出現讓您設定各類分頁選項的選單？\n"
-+"<p>...在分頁列左上角的「新增」按鈕或在分頁列的空白空間按右鍵會否出現讓您設定"
-+"各類分頁選項的選單？\n"
- 
- #: zmodem_dialog.cpp:28
- msgid "&Stop"
-diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kpager.po kde-i18n-zh_TW-3.5.10/messages/kdebase/kpager.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kpager.po	2006-10-01 18:34:17.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdebase/kpager.po	2011-11-11 15:45:17.000000000 +0100
-@@ -7,7 +7,7 @@
- "Project-Id-Version: kpager 1.7\n"
- "POT-Creation-Date: 2006-08-16 04:04+0200\n"
- "PO-Revision-Date: 2005-11-08 19:59+0800\n"
--"Last-Translator: Chao-Hsiung Liao <j_h_liau@yahoo.com.tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: zh-tw <zh-l10n@linux.org.tw>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
-@@ -63,7 +63,7 @@
- 
- #: config.cpp:80
- msgid "Layout"
--msgstr "佈局"
-+msgstr "布局"
- 
- #: config.cpp:84
- msgid "Classical"
-@@ -109,7 +109,7 @@
- #~ msgstr "KPager 設定"
- 
- #~ msgid "Configure Pager..."
--#~ msgstr "組態呼叫器..."
-+#~ msgstr "組態呼叫器…"
- 
- #~ msgid "Create pager as a child of specified parent window"
- #~ msgstr "將呼叫迄建立為指定視窗的子視窗"
-diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kpersonalizer.po kde-i18n-zh_TW-3.5.10/messages/kdebase/kpersonalizer.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kpersonalizer.po	2005-09-10 13:15:15.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdebase/kpersonalizer.po	2011-11-11 15:45:17.000000000 +0100
-@@ -8,7 +8,7 @@
- "Project-Id-Version: kpersonalizer\n"
- "POT-Creation-Date: 2005-09-03 02:36+0200\n"
- "PO-Revision-Date: 2005-08-11 16:26+0800\n"
--"Last-Translator: Chao-Hsiung Liao <j_h_liau@yahoo.com.tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
-@@ -117,7 +117,7 @@
- 
- #: kpersonalizer.cpp:71
- msgid "Step 2: I want it my Way..."
--msgstr "第二步：我要我的風格..."
-+msgstr "第二步：我要我的風格…"
- 
- #: kpersonalizer.cpp:75
- msgid "Step 3: Eyecandy-O-Meter"
-@@ -125,7 +125,7 @@
- 
- #: kpersonalizer.cpp:79
- msgid "Step 4: Everybody loves Themes"
--msgstr "第四步：每個人都愛佈景主題"
-+msgstr "第四步：每個人都愛布景主題"
- 
- #: kpersonalizer.cpp:83
- msgid "Step 5: Time to Refine"
-@@ -137,24 +137,22 @@
- 
- #: kpersonalizer.cpp:152
- msgid ""
--"<p>Are you sure you want to quit the Desktop Settings Wizard?</p>"
--"<p>The Desktop Settings Wizard helps you to configure the KDE desktop to your "
--"personal liking.</p>"
--"<p>Click <b>Cancel</b> to return and finish your setup.</p>"
--msgstr ""
--"<p>您確定要離開桌面設定精靈？</p>"
--"<p>桌面設定精靈幫助您設定 KDE 桌面以符合您的個人喜好。</p>"
--"<p>按下<b>「取消」</b>返回並完成您的設定。</p>"
-+"<p>Are you sure you want to quit the Desktop Settings Wizard?</p><p>The "
-+"Desktop Settings Wizard helps you to configure the KDE desktop to your "
-+"personal liking.</p><p>Click <b>Cancel</b> to return and finish your setup.</"
-+"p>"
-+msgstr ""
-+"<p>您確定要離開桌面設定精靈？</p><p>桌面設定精靈幫助您設定 KDE 桌面以符合您的"
-+"個人喜好。</p><p>按下<b>「取消」</b>返回並完成您的設定。</p>"
- 
- #: kpersonalizer.cpp:156
- msgid ""
--"<p>Are you sure you want to quit the Desktop Settings Wizard?</p>"
--"<p>If yes, click <b>Quit</b> and all changes will be lost."
--"<br>If not, click <b>Cancel</b> to return and finish your setup.</p>"
--msgstr ""
--"<p>您確定要離開桌面設定精靈？</p>"
--"<p>如果是，請按<b>「離開」</b>而所有變更將會遺失。"
--"<br>如果不是，請按<b>「取消」</b>返回並完成您的設定。</p>"
-+"<p>Are you sure you want to quit the Desktop Settings Wizard?</p><p>If yes, "
-+"click <b>Quit</b> and all changes will be lost.<br>If not, click <b>Cancel</"
-+"b> to return and finish your setup.</p>"
-+msgstr ""
-+"<p>您確定要離開桌面設定精靈？</p><p>如果是，請按<b>「離開」</b>而所有變更將會"
-+"遺失。<br>如果不是，請按<b>「取消」</b>返回並完成您的設定。</p>"
- 
- #: kpersonalizer.cpp:160
- msgid "All Changes Will Be Lost"
-@@ -162,67 +160,47 @@
- 
- #: kospage.cpp:352
- msgid ""
--"<b>Window activation:</b> <i>Focus on click</i>"
--"<br><b>Titlebar double-click:</b> <i>Shade window</i>"
--"<br><b>Mouse selection:</b> <i>Single click</i>"
--"<br><b>Application startup notification:</b> <i>busy cursor</i>"
--"<br><b>Keyboard scheme:</b> <i>KDE default</i>"
--"<br>"
--msgstr ""
--"<b>視窗生效：</b> <i>單擊才聚焦</i>"
--"<br><b>雙擊標題列：</b><i>隱藏視窗</i>"
--"<br> <b>滑鼠選擇：</b> <i>單擊</i>"
--"<br> <b>應用程式啟動通知：</b> <i>忙碌的游標</i> "
--"<br><b>鍵盤組合：</b> <i>KDE 預設</i>"
--"<br>"
-+"<b>Window activation:</b> <i>Focus on click</i><br><b>Titlebar double-click:"
-+"</b> <i>Shade window</i><br><b>Mouse selection:</b> <i>Single click</"
-+"i><br><b>Application startup notification:</b> <i>busy cursor</"
-+"i><br><b>Keyboard scheme:</b> <i>KDE default</i><br>"
-+msgstr ""
-+"<b>視窗生效：</b> <i>單擊才聚焦</i><br><b>雙擊標題列：</b><i>隱藏視窗</"
-+"i><br> <b>滑鼠選擇：</b> <i>單擊</i><br> <b>應用程式啟動通知：</b> <i>忙碌的"
-+"游標</i> <br><b>鍵盤組合：</b> <i>KDE 預設</i><br>"
- 
- #: kospage.cpp:364
- msgid ""
--"<b>Window activation:</b> <i>Focus follows mouse</i>"
--"<br><b>Titlebar double-click:</b> <i>Shade window</i>"
--"<br><b>Mouse selection:</b> <i>Single click</i>"
--"<br><b>Application startup notification:</b> <i>none</i>"
--"<br><b>Keyboard scheme:</b> <i>UNIX</i>"
--"<br>"
--msgstr ""
--"<b>視窗生效：</b> <i>單擊才聚焦</i>"
--"<br><b>雙擊標題列：</b><i>將視窗移到最後</i>"
--"<br><b>滑鼠選擇：</b> <i>單擊</i>"
--"<br><b>應用程式啟動通知：</b><i>無</i> "
--"<br><b>鍵盤組合：</b><i>UNIX</i>"
--"<br>"
-+"<b>Window activation:</b> <i>Focus follows mouse</i><br><b>Titlebar double-"
-+"click:</b> <i>Shade window</i><br><b>Mouse selection:</b> <i>Single click</"
-+"i><br><b>Application startup notification:</b> <i>none</i><br><b>Keyboard "
-+"scheme:</b> <i>UNIX</i><br>"
-+msgstr ""
-+"<b>視窗生效：</b> <i>單擊才聚焦</i><br><b>雙擊標題列：</b><i>將視窗移到最後</"
-+"i><br><b>滑鼠選擇：</b> <i>單擊</i><br><b>應用程式啟動通知：</b><i>無</i> "
-+"<br><b>鍵盤組合：</b><i>UNIX</i><br>"
- 
- #: kospage.cpp:376
- msgid ""
--"<b>Window activation:</b> <i>Focus on click</i>"
--"<br><b>Titlebar double-click:</b> <i>Maximize window</i>"
--"<br><b>Mouse selection:</b> <i>Double click</i>"
--"<br><b>Application startup notification:</b> <i>busy cursor</i>"
--"<br><b>Keyboard scheme:</b> <i>Windows</i>"
--"<br>"
--msgstr ""
--"<b>視窗生效：</b> <i>單擊才聚焦</i>"
--"<br><b>雙擊標題列：</b><i>視窗最大化</i>"
--"<br> <b>滑鼠選擇：</b> <i>雙擊</i>"
--"<br> <b>應用程式啟動通知：</b> <i>忙碌的游標</i> "
--"<br><b>鍵盤組合：</b> <i>Windows</i>"
--"<br>"
-+"<b>Window activation:</b> <i>Focus on click</i><br><b>Titlebar double-click:"
-+"</b> <i>Maximize window</i><br><b>Mouse selection:</b> <i>Double click</"
-+"i><br><b>Application startup notification:</b> <i>busy cursor</"
-+"i><br><b>Keyboard scheme:</b> <i>Windows</i><br>"
-+msgstr ""
-+"<b>視窗生效：</b> <i>單擊才聚焦</i><br><b>雙擊標題列：</b><i>視窗最大化</"
-+"i><br> <b>滑鼠選擇：</b> <i>雙擊</i><br> <b>應用程式啟動通知：</b> <i>忙碌的"
-+"游標</i> <br><b>鍵盤組合：</b> <i>Windows</i><br>"
- 
- #: kospage.cpp:388
- msgid ""
--"<b>Window activation:</b> <i>Focus on click</i>"
--"<br><b>Titlebar double-click:</b> <i>Shade window</i>"
--"<br><b>Mouse selection:</b> <i>Single click</i>"
--"<br><b>Application startup notification:</b> <i>none</i>"
--"<br><b>Keyboard scheme:</b> <i>Mac</i>"
--"<br>"
--msgstr ""
--"<b>視窗生效：</b> <i>單擊才聚焦</i>"
--"<br><b>雙擊標題列：</b><i>隱藏視窗</i>"
--"<br> <b>滑鼠選擇：</b> <i>單擊</i>"
--"<br> <b>應用程式啟動通知：</b> <i>無</i> "
--"<br><b>鍵盤組合：</b> <i>Mac</i>"
--"<br>"
-+"<b>Window activation:</b> <i>Focus on click</i><br><b>Titlebar double-click:"
-+"</b> <i>Shade window</i><br><b>Mouse selection:</b> <i>Single click</"
-+"i><br><b>Application startup notification:</b> <i>none</i><br><b>Keyboard "
-+"scheme:</b> <i>Mac</i><br>"
-+msgstr ""
-+"<b>視窗生效：</b> <i>單擊才聚焦</i><br><b>雙擊標題列：</b><i>隱藏視窗</"
-+"i><br> <b>滑鼠選擇：</b> <i>單擊</i><br> <b>應用程式啟動通知：</b> <i>無</i> "
-+"<br><b>鍵盤組合：</b> <i>Mac</i><br>"
- 
- #: keyecandypage.cpp:67
- msgid "Features"
-@@ -262,7 +240,7 @@
- 
- #: keyecandypage.cpp:90
- msgid "Sound Theme"
--msgstr "音效佈景主題"
-+msgstr "音效布景主題"
- 
- #: keyecandypage.cpp:96
- msgid "Large Desktop Icons"
-@@ -318,19 +296,22 @@
- "desktop in five quick, easy steps. You can set things like your country (for "
- "date and time formats, etc.), language, desktop behavior and more.</p>\n"
- "<p>You will be able to change all the settings later using the KDE Control "
--"Center. You may choose to postpone your personalization until later by clicking "
--"on <b>Skip Wizard</b>. Any changes made so far, will then be reversed, except "
--"for the country and language settings. However, new users are encouraged to use "
--"this simple method.</p>\n"
-+"Center. You may choose to postpone your personalization until later by "
-+"clicking on <b>Skip Wizard</b>. Any changes made so far, will then be "
-+"reversed, except for the country and language settings. However, new users "
-+"are encouraged to use this simple method.</p>\n"
- "<p>If you already like your KDE configuration and wish to quit the Wizard, "
- "click <b>Skip Wizard</b>, then <b>Quit</b>.</p>"
- msgstr ""
--"<p>個人化工具將透過五個快速、簡單的步驟，協助您設定好 KDE "
--"基本的組態。您可以設定像是您的國家（用來設定時間與日期等等的格式）、語系、桌面行為以及其他。</p> \n"
--"<p>您可以在稍後使用 KDE "
--"控制中心來變更所有的設定。您也可以選擇按下<b>「略過精靈」</b>來暫停個人化工具的執行。到目前為止所作的任何變更，將會被取消，除了國家與語言設定之外。儘管如"
--"此，我們還是建議新使用者使用個人化工具這個簡單的方法。</p>\n"
--"<p>如果您已經喜歡您的 KDE 設定，並且希望離開個人化工具，按下<b>「略過精靈」</b>，然後<b>「離開」</b>。</p>"
-+"<p>個人化工具將透過五個快速、簡單的步驟，協助您設定好 KDE 基本的組態。您可以"
-+"設定像是您的國家（用來設定時間與日期等等的格式）、語系、桌面行為以及其他。</"
-+"p> \n"
-+"<p>您可以在稍後使用 KDE 控制中心來變更所有的設定。您也可以選擇按下<b>「略過精"
-+"靈」</b>來暫停個人化工具的執行。到目前為止所作的任何變更，將會被取消，除了國"
-+"家與語言設定之外。儘管如此，我們還是建議新使用者使用個人化工具這個簡單的方"
-+"法。</p>\n"
-+"<p>如果您已經喜歡您的 KDE 設定，並且希望離開個人化工具，按下<b>「略過精靈」</"
-+"b>，然後<b>「離開」</b>。</p>"
- 
- #. i18n: file kcountrypagedlg.ui line 100
- #: rc.cpp:11
-@@ -348,15 +329,17 @@
- #: rc.cpp:17
- #, no-c-format
- msgid ""
--"<P>KDE offers many visually appealing special effects, such as smoothed fonts, "
--"previews in the file manager and animated menus. All this beauty, however, "
--"comes at a small performance cost. </P>\n"
--"If you have a fast, new processor, you might want to turn them all on, but for "
--"those of us with slower processors, starting off with less eye candy helps to "
--"keep your desktop more responsive."
--msgstr ""
--"<P>KDE 提供許多動人的視覺效果，像是平滑的字體、檔案管理員檔案預覽或者動畫式選單。然而所有的漂亮的效果，都將付出些許的效能成本。<P>\n"
--"如果您有一個較快的、新的處理器，您可以開啟所有的功能。但如果您使用較慢的處理器，少用一些漂亮的效果將有助於您的桌面有更佳的反應速度。"
-+"<P>KDE offers many visually appealing special effects, such as smoothed "
-+"fonts, previews in the file manager and animated menus. All this beauty, "
-+"however, comes at a small performance cost. </P>\n"
-+"If you have a fast, new processor, you might want to turn them all on, but "
-+"for those of us with slower processors, starting off with less eye candy "
-+"helps to keep your desktop more responsive."
-+msgstr ""
-+"<P>KDE 提供許多動人的視覺效果，像是平滑的字體、檔案管理員檔案預覽或者動畫式選"
-+"單。然而所有的漂亮的效果，都將付出些許的效能成本。<P>\n"
-+"如果您有一個較快的、新的處理器，您可以開啟所有的功能。但如果您使用較慢的處理"
-+"器，少用一些漂亮的效果將有助於您的桌面有更佳的反應速度。"
- 
- #. i18n: file keyecandypagedlg.ui line 96
- #: rc.cpp:21
-@@ -436,13 +419,11 @@
- #: rc.cpp:56
- #, no-c-format
- msgid ""
--"<b>System Behavior</b>"
--"<br>\n"
-+"<b>System Behavior</b><br>\n"
- "Graphical User Interfaces behave differently on various Operating Systems.\n"
- "KDE allows you to customize its behavior according to your needs."
- msgstr ""
--"<b>系統行為</b>"
--"<br>\n"
-+"<b>系統行為</b><br>\n"
- "不同作業系統的圖形化使用者介面行為都有些不同。\n"
- "KDE 允許您自訂您符合您需要的行為。 "
- 
-@@ -450,8 +431,8 @@
- #: rc.cpp:61
- #, no-c-format
- msgid ""
--"For motion impaired users, KDE provides keyboard gestures to activate special "
--"keyboard settings."
-+"For motion impaired users, KDE provides keyboard gestures to activate "
-+"special keyboard settings."
- msgstr "對於行動不便的使用者，KDE 提供鍵盤筆勢來使用特殊的鍵盤設定值。"
- 
- #. i18n: file kospagedlg.ui line 179
-@@ -465,11 +446,12 @@
- #, no-c-format
- msgid ""
- "<h3>Finished</h3>\n"
--"<p>After closing this dialog you can always restart this Wizard by choosing the "
--"entry <b>Desktop Settings Wizard</b> from the Settings menu.</p>"
-+"<p>After closing this dialog you can always restart this Wizard by choosing "
-+"the entry <b>Desktop Settings Wizard</b> from the Settings menu.</p>"
- msgstr ""
- "<h3>完成</h3>\n"
--"<p>在關閉這個對話框後，您也可以隨時藉由按下設定選單的<b>「桌面設定精靈」</b>這個項目來重新啟動這個精靈。</p>"
-+"<p>在關閉這個對話框後，您也可以隨時藉由按下設定選單的<b>「桌面設定精靈」</b>"
-+"這個項目來重新啟動這個精靈。</p>"
- 
- #. i18n: file krefinepagedlg.ui line 81
- #: rc.cpp:71
-@@ -477,7 +459,9 @@
- msgid ""
- "You can refine the settings you made by starting the KDE Control Center by "
- "choosing the entry <b>Control Center</b> in the K menu."
--msgstr "您可以選擇在 K 警方選單中的<b>「控制中心」</b>項目來啟動 KDE 控制中心，並在此重新調整您的設定。"
-+msgstr ""
-+"您可以選擇在 K 警方選單中的<b>「控制中心」</b>項目來啟動 KDE 控制中心，並在此"
-+"重新調整您的設定。"
- 
- #. i18n: file krefinepagedlg.ui line 133
- #: rc.cpp:74
-@@ -495,8 +479,8 @@
- #: rc.cpp:80
- #, no-c-format
- msgid ""
--"Please choose the way your computer should look by selecting one of the items "
--"below."
-+"Please choose the way your computer should look by selecting one of the "
-+"items below."
- msgstr "請在下方的項目中選擇您要的外觀。"
- 
- #. i18n: file kstylepagedlg.ui line 89
-diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kprinter.po kde-i18n-zh_TW-3.5.10/messages/kdebase/kprinter.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kprinter.po	2006-07-22 10:04:12.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdebase/kprinter.po	2011-11-11 15:45:17.000000000 +0100
-@@ -5,7 +5,7 @@
- "Project-Id-Version: kprinter\n"
- "POT-Creation-Date: 2005-05-18 21:24+0200\n"
- "PO-Revision-Date: 2005-11-25 16:20+0800\n"
--"Last-Translator: Frank Weng <franklin at goodhorse dot idv dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
-@@ -34,7 +34,7 @@
- 
- #: main.cpp:37
- msgid "Job output mode (gui, console, none)"
--msgstr "工作輸出模式 (圖形介面, 控制台, 沒有)"
-+msgstr "工作輸出模式 (圖形介面, 控制臺, 沒有)"
- 
- #: main.cpp:38
- msgid "Print system to use (lpd, cups)"
-@@ -92,8 +92,8 @@
- 
- #: printwrapper.cpp:196
- msgid ""
--"When using '--nodialog', you must at least specify one file to print or use the "
--"'--stdin' flag."
-+"When using '--nodialog', you must at least specify one file to print or use "
-+"the '--stdin' flag."
- msgstr "使用 --nodialog 的時候，您至少要指定一個檔案，或是用 --stdin。"
- 
- #: printwrapper.cpp:245
-diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/krandr.po kde-i18n-zh_TW-3.5.10/messages/kdebase/krandr.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/krandr.po	2007-01-15 10:56:31.000000000 +0100
-+++ kde-i18n-zh_TW-3.5.10/messages/kdebase/krandr.po	2011-11-11 15:45:17.000000000 +0100
-@@ -7,7 +7,7 @@
- "Project-Id-Version: krandr\n"
- "POT-Creation-Date: 2006-11-08 02:34+0100\n"
- "PO-Revision-Date: 2005-11-08 21:11+0800\n"
--"Last-Translator: Chao-Hsiung Liao <j_h_liau@yahoo.com.tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
-@@ -31,8 +31,8 @@
- "update to version 4.3 or greater. You need the X Resize And Rotate extension "
- "(RANDR) version 1.1 or greater to use this feature.</qt>"
- msgstr ""
--"<qt>您的 X 伺服器無法支援更改螢幕大小及旋轉。請更新至 4.3 以上的版本。您需要 X Resize And Rotate extension "
--"(RANDR) 1.1 以上的版本才能使用本程式。</qt>"
-+"<qt>您的 X 伺服器無法支援更改螢幕大小及旋轉。請更新至 4.3 以上的版本。您需要 "
-+"X Resize And Rotate extension (RANDR) 1.1 以上的版本才能使用本程式。</qt>"
- 
- #: krandrmodule.cpp:91
- msgid "Settings for screen:"
-@@ -45,8 +45,8 @@
- 
- #: krandrmodule.cpp:100
- msgid ""
--"The screen whose settings you would like to change can be selected using this "
--"drop-down list."
-+"The screen whose settings you would like to change can be selected using "
-+"this drop-down list."
- msgstr "請利用此下拉選單來選擇您要更改的螢幕"
- 
- #: krandrmodule.cpp:109
-@@ -83,8 +83,8 @@
- 
- #: krandrmodule.cpp:130
- msgid ""
--"If this option is enabled the size and orientation settings will be used when "
--"KDE starts."
-+"If this option is enabled the size and orientation settings will be used "
-+"when KDE starts."
- msgstr "選取此選項後，當 KDE 開始時即會使用螢幕的大小及顯示方向的設定"
- 
- #: krandrmodule.cpp:135
-@@ -93,9 +93,10 @@
- 
- #: krandrmodule.cpp:137
- msgid ""
--"If this option is enabled, options set by the system tray applet will be saved "
--"and loaded when KDE starts instead of being temporary."
--msgstr "選取此選項後，此工作列程式的設定將會從 KDE 開始時即運作。選項將不會是暫時性的"
-+"If this option is enabled, options set by the system tray applet will be "
-+"saved and loaded when KDE starts instead of being temporary."
-+msgstr ""
-+"選取此選項後，此工作列程式的設定將會從 KDE 開始時即運作。選項將不會是暫時性的"
- 
- #: krandrmodule.cpp:174 krandrtray.cpp:149
- msgid "%1 x %2"
-@@ -111,7 +112,7 @@
- 
- #: krandrtray.cpp:94
- msgid "Configure Display..."
--msgstr "設定螢幕..."
-+msgstr "設定螢幕…"
- 
- #: krandrtray.cpp:117
- msgid "Screen configuration has changed"
-@@ -162,18 +163,21 @@
- 
- #: randr.cpp:163
- msgid "&Accept Configuration"
--msgstr "接受新設定 (&A)"
-+msgstr "接受新設定(&A)"
- 
- #: randr.cpp:164
- msgid "&Return to Previous Configuration"
--msgstr "回到原本設定 (&R)"
-+msgstr "回到原本設定(&R)"
- 
- #: randr.cpp:166
- msgid ""
- "Your screen orientation, size and refresh rate have been changed to the "
- "requested settings. Please indicate whether you wish to keep this "
--"configuration. In 15 seconds the display will revert to your previous settings."
--msgstr "您的畫面顯示方向，大小以及更新速率已經更改至新的設定。請確認您是否要保留新的設定。在 15 秒之後畫面將回復到之前的設定。"
-+"configuration. In 15 seconds the display will revert to your previous "
-+"settings."
-+msgstr ""
-+"您的畫面顯示方向，大小以及更新速率已經更改至新的設定。請確認您是否要保留新的"
-+"設定。在 15 秒之後畫面將回復到之前的設定。"
- 
- #: randr.cpp:197
- msgid ""
-diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/krdb.po kde-i18n-zh_TW-3.5.10/messages/kdebase/krdb.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/krdb.po	2006-07-22 10:04:12.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdebase/krdb.po	2011-11-11 15:45:17.000000000 +0100
-@@ -7,7 +7,7 @@
- "Project-Id-Version: krdb\n"
- "POT-Creation-Date: 2006-05-17 03:54+0200\n"
- "PO-Revision-Date: 2005-11-08 21:12+0800\n"
--"Last-Translator: Chao-Hsiung Liao <j_h_liau@yahoo.com.tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
-@@ -18,7 +18,8 @@
- "# created by KDE, %1\n"
- "#\n"
- "# If you do not want KDE to override your GTK settings, select\n"
--"# Appearance & Themes -> Colors in the Control Center and disable the checkbox\n"
-+"# Appearance & Themes -> Colors in the Control Center and disable the "
-+"checkbox\n"
- "# \"Apply colors to non-KDE applications\"\n"
- "#\n"
- "#\n"
-diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kreadconfig.po kde-i18n-zh_TW-3.5.10/messages/kdebase/kreadconfig.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kreadconfig.po	2006-07-22 10:04:12.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdebase/kreadconfig.po	2011-11-11 15:45:17.000000000 +0100
-@@ -3,7 +3,7 @@
- "Project-Id-Version: kreadconfig\n"
- "POT-Creation-Date: 2005-05-18 21:24+0200\n"
- "PO-Revision-Date: 2005-11-08 21:27+0800\n"
--"Last-Translator: Chao-Hsiung Liao <j_h_liau@yahoo.com.tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: zh_l10n <zh-l10n@linux.org.tw>\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/krunapplet.po kde-i18n-zh_TW-3.5.10/messages/kdebase/krunapplet.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/krunapplet.po	2006-07-22 10:04:12.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdebase/krunapplet.po	2011-11-11 15:45:17.000000000 +0100
-@@ -4,7 +4,7 @@
- "Project-Id-Version: krunapplet\n"
- "POT-Creation-Date: 2005-05-18 21:24+0200\n"
- "PO-Revision-Date: 2005-11-08 21:28+0800\n"
--"Last-Translator: Chao-Hsiung Liao <j_h_liau@yahoo.com.tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: <Chinese (traditional) <zh-l10n@linux.org.tw>>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
-@@ -31,11 +31,12 @@
- msgid ""
- "Unable to 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 以嘗試強制關閉。注意，強制關閉將無法儲存您目前的工作階段。"
-+"無法連繫工作階段管理員。您可以嘗試按下 Ctrl+Alt+Backspace 以嘗試強制關閉。注"
-+"意，強制關閉將無法儲存您目前的工作階段。"
- 
- #: runapplet.cpp:268
- msgid ""
-diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kscreensaver.po kde-i18n-zh_TW-3.5.10/messages/kdebase/kscreensaver.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kscreensaver.po	2007-05-14 12:22:55.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdebase/kscreensaver.po	2011-11-11 15:45:17.000000000 +0100
-@@ -8,7 +8,7 @@
- "Project-Id-Version: kscreensaver\n"
- "POT-Creation-Date: 2007-01-26 02:37+0100\n"
- "PO-Revision-Date: 2005-11-08 21:47+0800\n"
--"Last-Translator: Chao-Hsiung Liao <j_h_liau@yahoo.com.tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: <Chinese (traditional) <zh-l10n@linux.org.tw>>\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/ksmserver.po kde-i18n-zh_TW-3.5.10/messages/kdebase/ksmserver.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/ksmserver.po	2007-05-14 12:22:55.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdebase/ksmserver.po	2011-11-11 15:45:17.000000000 +0100
-@@ -11,8 +11,7 @@
- "Project-Id-Version: ksmserver\n"
- "POT-Creation-Date: 2007-03-07 02:42+0100\n"
- "PO-Revision-Date: 2007-03-13 14:26+0800\n"
--"Last-Translator: Frank Weng (a.k.a. Franklin) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Chinese Traditional <zh-l10n@linux.org.tw>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
-@@ -77,14 +76,42 @@
- 
- #: shutdowndlg.cpp:136
- msgid "&Turn Off Computer"
--msgstr "關閉電腦 (&T)"
-+msgstr "關閉電腦(&T)"
- 
- #: shutdowndlg.cpp:144
- msgid "&Restart Computer"
--msgstr "重新啟動電腦 (&R)"
-+msgstr "重新啟動電腦(&R)"
- 
- #: shutdowndlg.cpp:164
- msgid ""
- "_: current option in boot loader\n"
- " (current)"
--msgstr " (current)"
-+msgstr " (當前)"
-+
-+#: shutdowndlg.cpp:321
-+msgid "Log out"
-+msgstr "登出"
-+
-+#: shutdowndlg.cpp:423
-+msgid "&Suspend"
-+msgstr "懸置(&S)"
-+
-+#: shutdowndlg.cpp:444
-+msgid "&Hibernate"
-+msgstr "休眠(&H)"
-+
-+#: shutdowndlg.cpp:461
-+msgid "&Restart"
-+msgstr "重新啟動(&R)"
-+
-+#: shutdowndlg.cpp:496
-+msgid "&Turn Off"
-+msgstr "關機(&T)"
-+
-+#: shutdowndlg.cpp:561
-+msgid "&Suspend Computer"
-+msgstr "懸置電腦(&S)"
-+
-+#: shutdowndlg.cpp:569
-+msgid "&Hibernate Computer"
-+msgstr "休眠電腦(&H)"
-diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/ksplash.po kde-i18n-zh_TW-3.5.10/messages/kdebase/ksplash.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/ksplash.po	2006-10-01 18:34:17.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdebase/ksplash.po	2011-11-11 15:45:17.000000000 +0100
-@@ -11,8 +11,7 @@
- "Project-Id-Version: ksplash\n"
- "POT-Creation-Date: 2005-05-18 21:24+0200\n"
- "PO-Revision-Date: 2006-08-14 14:26+0800\n"
--"Last-Translator: Frank Weng (a.k.a. Franklin) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Chinese Traditional <zh-l10n@linux.org.tw>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
-@@ -45,7 +44,7 @@
- 
- #: main.cpp:34
- msgid "Override theme"
--msgstr "覆蓋佈景主題"
-+msgstr "覆蓋布景主題"
- 
- #: main.cpp:35
- msgid "Do not attempt to start DCOP server"
-diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/ksplashthemes.po kde-i18n-zh_TW-3.5.10/messages/kdebase/ksplashthemes.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/ksplashthemes.po	2006-10-01 18:34:18.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdebase/ksplashthemes.po	2011-11-11 15:45:17.000000000 +0100
-@@ -7,8 +7,7 @@
- "Project-Id-Version: ksplashthemes\n"
- "POT-Creation-Date: 2006-08-24 02:34+0200\n"
- "PO-Revision-Date: 2006-08-14 14:27+0800\n"
--"Last-Translator: Frank Weng (a.k.a. Franklin) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Chinese Traditional <zh-l10n@linux.org.tw>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
-@@ -29,7 +28,7 @@
- 
- #: installer.cpp:107
- msgid "Add..."
--msgstr "加入..."
-+msgstr "加入…"
- 
- #: installer.cpp:115
- msgid "Test"
-@@ -41,11 +40,11 @@
- 
- #: installer.cpp:307
- msgid "Failed to remove theme '%1'"
--msgstr "移除佈景主題「%1」失敗"
-+msgstr "移除布景主題「%1」失敗"
- 
- #: installer.cpp:332 installer.cpp:397
- msgid "(Could not load theme)"
--msgstr "(無法載入佈景主題)"
-+msgstr "(無法載入布景主題)"
- 
- #: installer.cpp:364
- msgid "<b>Name:</b> %1<br>"
-@@ -74,11 +73,11 @@
- 
- #: installer.cpp:379
- msgid "This theme requires the plugin %1 which is not installed."
--msgstr "這個佈景主題需要的外掛程式 %1 尚未安裝。"
-+msgstr "這個布景主題需要的外掛程式 %1 尚未安裝。"
- 
- #: installer.cpp:386
- msgid "Could not load theme configuration file."
--msgstr "無法載入佈景主題組態檔案。"
-+msgstr "無法載入布景主題組態檔案。"
- 
- #: installer.cpp:406
- msgid "No preview available."
-@@ -86,11 +85,11 @@
- 
- #: installer.cpp:420
- msgid "KSplash Theme Files"
--msgstr "KSplash 佈景主題檔案"
-+msgstr "KSplash 布景主題檔案"
- 
- #: installer.cpp:421
- msgid "Add Theme"
--msgstr "加入佈景主題"
-+msgstr "加入布景主題"
- 
- #: installer.cpp:474
- msgid "Unable to start ksplashsimple."
-@@ -102,7 +101,7 @@
- 
- #: main.cpp:57
- msgid "&Theme Installer"
--msgstr "佈景主題安裝程式(&T)"
-+msgstr "布景主題安裝程式(&T)"
- 
- #: main.cpp:64
- msgid "KDE splash screen theme manager"
-@@ -118,7 +117,7 @@
- 
- #: main.cpp:71
- msgid "KDE Theme Manager authors"
--msgstr "KDE 佈景主題管理程式作者"
-+msgstr "KDE 布景主題管理程式作者"
- 
- #: main.cpp:71
- msgid "Original installer code"
-diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kstart.po kde-i18n-zh_TW-3.5.10/messages/kdebase/kstart.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kstart.po	2006-07-22 10:04:12.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdebase/kstart.po	2011-11-11 15:45:17.000000000 +0100
-@@ -10,7 +10,7 @@
- "Project-Id-Version: kstart\n"
- "POT-Creation-Date: 2005-05-18 21:24+0200\n"
- "PO-Revision-Date: 2005-11-09 19:07+0800\n"
--"Last-Translator: Chao-Hsiung Liao <j_h_liau@yahoo.com.tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: <Chinese (traditional) <zh-l10n@linux.org.tw>>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
-@@ -122,7 +122,8 @@
- #: kstart.cpp:290
- msgid ""
- "Utility to launch applications with special window properties \n"
--"such as iconified, maximized, a certain virtual desktop, a special decoration\n"
-+"such as iconified, maximized, a certain virtual desktop, a special "
-+"decoration\n"
- "and so on."
- msgstr ""
- "用來啟動特殊視窗內容的啟動程式工具\n"
-diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kstyle_keramik_config.po kde-i18n-zh_TW-3.5.10/messages/kdebase/kstyle_keramik_config.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kstyle_keramik_config.po	2006-07-22 10:04:12.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdebase/kstyle_keramik_config.po	2011-11-11 15:45:17.000000000 +0100
-@@ -6,8 +6,7 @@
- "Project-Id-Version: kstyle_keramik_config\n"
- "POT-Creation-Date: 2005-05-18 21:24+0200\n"
- "PO-Revision-Date: 2006-01-20 16:22+0800\n"
--"Last-Translator: Frank Weng (a.k.a. Franklin) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Traditional Chinese <zh_l10n@linux.org.tw>\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/ksysguard.po kde-i18n-zh_TW-3.5.10/messages/kdebase/ksysguard.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/ksysguard.po	2008-08-19 20:43:10.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdebase/ksysguard.po	2011-11-11 15:45:17.000000000 +0100
-@@ -10,8 +10,7 @@
- "Project-Id-Version: ksysguard\n"
- "POT-Creation-Date: 2008-07-08 01:18+0200\n"
- "PO-Revision-Date: 2006-12-06 10:00+0800\n"
--"Last-Translator: Frank Weng (a.k.a. Franklin) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Chinese Traditional <zh-l10n@linux.org.tw>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
-@@ -31,7 +30,8 @@
- msgid ""
- "The file %1 does not contain a valid worksheet definition, which must have a "
- "document type 'KSysGuardWorkSheet'."
--msgstr "檔案 %1 不包含有效的工作表定義，其中必須有“KsysGuardWorkSheet”的文件類型。"
-+msgstr ""
-+"檔案 %1 不包含有效的工作表定義，其中必須有“KsysGuardWorkSheet”的文件類型。"
- 
- #: WorkSheet.cc:125
- msgid "The file %1 has an invalid worksheet size."
-@@ -139,9 +139,11 @@
- 
- #: ksgrd/HostConnector.cc:77
- msgid ""
--"Select this if you want to connect to a ksysguard daemon that is running on the "
--"machine you want to connect to, and is listening for client requests."
--msgstr "如果您想要連線到在您要連接的機器上執行並聽取客戶端要求ksysguard 伺服程式，請選擇此項。"
-+"Select this if you want to connect to a ksysguard daemon that is running on "
-+"the machine you want to connect to, and is listening for client requests."
-+msgstr ""
-+"如果您想要連線到在您要連接的機器上執行並聽取客戶端要求ksysguard 伺服程式，請"
-+"選擇此項。"
- 
- #: ksgrd/HostConnector.cc:80
- msgid "Custom command"
-@@ -219,7 +221,7 @@
- 
- #: ksgrd/StyleSettings.cc:91
- msgid "Change Color..."
--msgstr "改變顏色..."
-+msgstr "改變顏色…"
- 
- #: ksgrd/StyleSettings.cc:166
- #, c-format
-@@ -579,7 +581,9 @@
- msgid ""
- "This is your work space. It holds your worksheets. You need to create a new "
- "worksheet (Menu File->New) before you can drag sensors here."
--msgstr "這是您的工作空間。他保存您的工作表。在您能拖曳新的偵測器前， 您必須建立新的工作表（選單 檔案 -> 新增）。"
-+msgstr ""
-+"這是您的工作空間。他保存您的工作表。在您能拖曳新的偵測器前， 您必須建立新的工"
-+"作表（選單 檔案 -> 新增）。"
- 
- #: Workspace.cc:105 ksysguard.cc:176
- msgid "Process Table"
-@@ -804,7 +808,7 @@
- 
- #: SensorDisplayLib/ProcessList.cc:825
- msgid "Renice Process..."
--msgstr "調整程序優先值..."
-+msgstr "調整程序優先值…"
- 
- #: SensorDisplayLib/ProcessList.cc:873
- msgid ""
-@@ -850,8 +854,8 @@
- #: SensorDisplayLib/DancingBarsSettings.cc:67
- #: SensorDisplayLib/FancyPlotterSettings.cc:95
- msgid ""
--"Enter the minimum value for the display here. If both values are 0, automatic "
--"range detection is enabled."
-+"Enter the minimum value for the display here. If both values are 0, "
-+"automatic range detection is enabled."
- msgstr "在這邊輸入顯示的最小值。如果二個數值都是 0 ，將會啟用自動偵測範圍。"
- 
- #: SensorDisplayLib/DancingBarsSettings.cc:71
-@@ -862,8 +866,8 @@
- #: SensorDisplayLib/DancingBarsSettings.cc:75
- #: SensorDisplayLib/FancyPlotterSettings.cc:105
- msgid ""
--"Enter the maximum value for the display here. If both values are 0, automatic "
--"range detection is enabled."
-+"Enter the maximum value for the display here. If both values are 0, "
-+"automatic range detection is enabled."
- msgstr "在這邊輸入顯示的最大值。如果二個數值都是 0 ，將會啟用自動偵測範圍。"
- 
- #. i18n: file ./SensorDisplayLib/MultiMeterSettingsWidget.ui line 61
-@@ -927,10 +931,12 @@
- 
- #: SensorDisplayLib/DancingBarsSettings.cc:154
- msgid ""
--"This determines the size of the font used to print a label underneath the bars. "
--"Bars are automatically suppressed if text becomes too large, so it is advisable "
--"to use a small font size here."
--msgstr "這個會偵測顯示在長條圖下面的字型大小。如果字型太大的話長條圖將會自動隱藏，所以我們建議你使用較小的字型大小。"
-+"This determines the size of the font used to print a label underneath the "
-+"bars. Bars are automatically suppressed if text becomes too large, so it is "
-+"advisable to use a small font size here."
-+msgstr ""
-+"這個會偵測顯示在長條圖下面的字型大小。如果字型太大的話長條圖將會自動隱藏，所"
-+"以我們建議你使用較小的字型大小。"
- 
- #: SensorDisplayLib/DancingBarsSettings.cc:161
- #: SensorDisplayLib/FancyPlotterSettings.cc:224
-@@ -964,7 +970,7 @@
- 
- #: SensorDisplayLib/DancingBarsSettings.cc:174
- msgid "Edit..."
--msgstr "編輯..."
-+msgstr "編輯…"
- 
- #: SensorDisplayLib/DancingBarsSettings.cc:176
- msgid "Push this button to configure the label."
-@@ -1022,9 +1028,11 @@
- #: SensorDisplayLib/FancyPlotterSettings.cc:86
- msgid ""
- "Check this box if you want the display range to adapt dynamically to the "
--"currently displayed values; if you do not check this, you have to specify the "
--"range you want in the fields below."
--msgstr "如果你想要顯示的範圍自動對應目前能夠顯示的數值，請核取此方塊；如果你沒有核取，那麼你必須在下面的欄位中指定您想要的範圍。"
-+"currently displayed values; if you do not check this, you have to specify "
-+"the range you want in the fields below."
-+msgstr ""
-+"如果你想要顯示的範圍自動對應目前能夠顯示的數值，請核取此方塊；如果你沒有核"
-+"取，那麼你必須在下面的欄位中指定您想要的範圍。"
- 
- #: SensorDisplayLib/FancyPlotterSettings.cc:111
- msgid "Horizontal Scale"
-@@ -1092,7 +1100,7 @@
- msgid ""
- "Check this box if horizontal lines should be decorated with the values they "
- "mark."
--msgstr "如果水平線應該依照其標記的數值來佈置，請核取此方塊。"
-+msgstr "如果水平線應該依照其標記的數值來布置，請核取此方塊。"
- 
- #: SensorDisplayLib/FancyPlotterSettings.cc:185
- msgid "Top bar"
-@@ -1102,7 +1110,9 @@
- msgid ""
- "Check this to active the display title bar. This is probably only useful for "
- "applet displays. The bar is only visible if the display is large enough."
--msgstr "選取這個以啟動標題列。這大概只有在顯示小程式的時候有用。這個長條只在顯示夠大的時候看的到。"
-+msgstr ""
-+"選取這個以啟動標題列。這大概只有在顯示小程式的時候有用。這個長條只在顯示夠大"
-+"的時候看的到。"
- 
- #. i18n: file ./SensorDisplayLib/MultiMeterSettingsWidget.ui line 206
- #: SensorDisplayLib/FancyPlotterSettings.cc:193 rc.cpp:87 rc.cpp:102
-@@ -1125,7 +1135,7 @@
- 
- #: SensorDisplayLib/FancyPlotterSettings.cc:242
- msgid "Set Color..."
--msgstr "設定色彩..."
-+msgstr "設定色彩…"
- 
- #: SensorDisplayLib/FancyPlotterSettings.cc:244
- msgid "Push this button to configure the color of the sensor in the diagram."
-@@ -1157,7 +1167,7 @@
- 
- #: SensorDisplayLib/SensorDisplay.cc:169
- msgid "&Setup Update Interval..."
--msgstr "設定更新間隔(&S)..."
-+msgstr "設定更新間隔(&S)…"
- 
- #: SensorDisplayLib/SensorDisplay.cc:171
- msgid "&Continue Update"
-@@ -1169,15 +1179,14 @@
- 
- #: SensorDisplayLib/SensorDisplay.cc:240
- msgid ""
--"<qt>"
--"<p>This is a sensor display. To customize a sensor display click and hold the "
--"right mouse button on either the frame or the display box and select the <i>"
--"Properties</i> entry from the popup menu. Select <i>Remove</i> "
-+"<qt><p>This is a sensor display. To customize a sensor display click and "
-+"hold the right mouse button on either the frame or the display box and "
-+"select the <i>Properties</i> entry from the popup menu. Select <i>Remove</i> "
- "to delete the display from the worksheet.</p>%1</qt>"
- msgstr ""
--"<qt>"
--"<p>這是偵測器顯示。要自訂一個偵測器顯示，在外框或顯示方塊上按下並按住滑鼠右鍵並選擇跳出選單中的 <i>內容</i> 項目。選擇 <i>移除</i> "
--"可以從工作表中刪除顯示。</p>%1</qt>"
-+"<qt><p>這是偵測器顯示。要自訂一個偵測器顯示，在外框或顯示方塊上按下並按住滑鼠"
-+"右鍵並選擇跳出選單中的 <i>內容</i> 項目。選擇 <i>移除</i> 可以從工作表中刪除"
-+"顯示。</p>%1</qt>"
- 
- #: SensorDisplayLib/SensorLogger.cc:136
- msgid "Logging"
-@@ -1207,7 +1216,7 @@
- 
- #: SensorDisplayLib/SensorLogger.cc:384
- msgid "&Edit Sensor..."
--msgstr "編輯偵測器(&E)..."
-+msgstr "編輯偵測器(&E)…"
- 
- #: SensorDisplayLib/SensorLogger.cc:396
- msgid "St&op Logging"
-@@ -1262,9 +1271,11 @@
- #: SensorDisplayLib/DummyDisplay.cc:38
- msgid ""
- "This is an empty space in a worksheet. Drag a sensor from the Sensor Browser "
--"and drop it here. A sensor display will appear that allows you to monitor the "
--"values of the sensor over time."
--msgstr "這是工作表的空白空間。從偵測器瀏覽器拖曳一個偵測器到這邊。偵測器將會出現並讓您可以隨時監控這個偵測器的數值。"
-+"and drop it here. A sensor display will appear that allows you to monitor "
-+"the values of the sensor over time."
-+msgstr ""
-+"這是工作表的空白空間。從偵測器瀏覽器拖曳一個偵測器到這邊。偵測器將會出現並讓"
-+"您可以隨時監控這個偵測器的數值。"
- 
- #: SensorDisplayLib/ProcessController.cc:54
- msgid "Name"
-@@ -1458,7 +1469,7 @@
- #: rc.cpp:150
- #, no-c-format
- msgid "Select Font..."
--msgstr "選擇字型..."
-+msgstr "選擇字型…"
- 
- #. i18n: file ./SensorDisplayLib/LogFileSettings.ui line 199
- #: rc.cpp:153
-@@ -1518,15 +1529,16 @@
- 
- #: KSysGuardApplet.cc:242 KSysGuardApplet.cc:394
- msgid ""
--"The KSysGuard applet does not support displaying of this type of sensor. Please "
--"choose another sensor."
-+"The KSysGuard applet does not support displaying of this type of sensor. "
-+"Please choose another sensor."
- msgstr "KSysGuard 小程式不支援此類型偵測器的顯示。請選擇其他偵測器。"
- 
- #: KSysGuardApplet.cc:334
- msgid ""
- "The file %1 does not contain a valid applet definition, which must have a "
- "document type 'KSysGuardApplet'."
--msgstr "檔案 %1 不包含有效的工作表定義，其中必須有“KSysGuardApplet”的文件類型。"
-+msgstr ""
-+"檔案 %1 不包含有效的工作表定義，其中必須有“KSysGuardApplet”的文件類型。"
- 
- #: KSysGuardApplet.cc:488
- msgid "Drag sensors from the KDE System Guard into this cell."
-@@ -1546,14 +1558,15 @@
- 
- #: SensorBrowser.cc:88
- msgid ""
--"The sensor browser lists the connected hosts and the sensors that they provide. "
--"Click and drag sensors into drop zones of a worksheet or the panel applet. A "
--"display will appear that visualizes the values provided by the sensor. Some "
--"sensor displays can display values of multiple sensors. Simply drag other "
--"sensors on to the display to add more sensors."
-+"The sensor browser lists the connected hosts and the sensors that they "
-+"provide. Click and drag sensors into drop zones of a worksheet or the panel "
-+"applet. A display will appear that visualizes the values provided by the "
-+"sensor. Some sensor displays can display values of multiple sensors. Simply "
-+"drag other sensors on to the display to add more sensors."
- msgstr ""
--"偵測器瀏覽器列出目前連線的主機與他們所提供的偵測器。拖曳偵測器到工作表或面板小程式。顯示器將出現偵測器並提供視覺化顯示的數值。有些偵測器顯示可以顯示多個偵測器的"
--"數值。只要拖曳其他的偵測器到顯示器上便可以增加偵測器。"
-+"偵測器瀏覽器列出目前連線的主機與他們所提供的偵測器。拖曳偵測器到工作表或面板"
-+"小程式。顯示器將出現偵測器並提供視覺化顯示的數值。有些偵測器顯示可以顯示多個"
-+"偵測器的數值。只要拖曳其他的偵測器到顯示器上便可以增加偵測器。"
- 
- #: SensorBrowser.cc:148
- msgid "Drag sensors to empty fields in a worksheet."
-@@ -1581,15 +1594,15 @@
- 
- #: ksysguard.cc:108
- msgid "&New Worksheet..."
--msgstr "新增工作表(&N)..."
-+msgstr "新增工作表(&N)…"
- 
- #: ksysguard.cc:111
- msgid "Import Worksheet..."
--msgstr "匯入工作表..."
-+msgstr "匯入工作表…"
- 
- #: ksysguard.cc:114
- msgid "&Import Recent Worksheet"
--msgstr "匯入最近的工作表(&I)..."
-+msgstr "匯入最近的工作表(&I)…"
- 
- #: ksysguard.cc:117
- msgid "&Remove Worksheet"
-@@ -1597,11 +1610,11 @@
- 
- #: ksysguard.cc:120
- msgid "&Export Worksheet..."
--msgstr "匯出工作表(&E)..."
-+msgstr "匯出工作表(&E)…"
- 
- #: ksysguard.cc:125
- msgid "C&onnect Host..."
--msgstr "連接主機(&O)..."
-+msgstr "連接主機(&O)…"
- 
- #: ksysguard.cc:127
- msgid "D&isconnect Host"
-@@ -1617,7 +1630,7 @@
- 
- #: ksysguard.cc:140
- msgid "Configure &Style..."
--msgstr "設定風格(&S)..."
-+msgstr "設定風格(&S)…"
- 
- #: ksysguard.cc:157
- msgid "Do you really want to restore the default worksheets?"
-diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/ksystemtrayapplet.po kde-i18n-zh_TW-3.5.10/messages/kdebase/ksystemtrayapplet.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/ksystemtrayapplet.po	2008-08-19 20:43:10.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdebase/ksystemtrayapplet.po	2011-11-11 15:45:17.000000000 +0100
-@@ -3,7 +3,7 @@
- "Project-Id-Version: ksystemtrayapplet\n"
- "POT-Creation-Date: 2008-08-14 01:16+0200\n"
- "PO-Revision-Date: 2005-11-09 21:53+0800\n"
--"Last-Translator: Chao-Hsiung Liao <j_h_liau@yahoo.com.tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: zh_l10n <zh-l10n@linux.org.tw>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
-@@ -23,7 +23,7 @@
- 
- #: systemtrayapplet.cpp:726
- msgid "Configure System Tray..."
--msgstr "設定系統匣..."
-+msgstr "設定系統匣…"
- 
- #~ msgid "Lock the desktop"
- #~ msgstr "鎖定桌面"
-@@ -35,4 +35,4 @@
- #~ msgstr "鎖住螢幕"
- 
- #~ msgid "&Logout..."
--#~ msgstr "登出(&L)..."
-+#~ msgstr "登出(&L)…"
-diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/ksystraycmd.po kde-i18n-zh_TW-3.5.10/messages/kdebase/ksystraycmd.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/ksystraycmd.po	2006-10-01 18:34:18.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdebase/ksystraycmd.po	2011-11-11 15:45:17.000000000 +0100
-@@ -6,8 +6,7 @@
- "Project-Id-Version: ksystraycmd\n"
- "POT-Creation-Date: 2006-08-12 04:01+0200\n"
- "PO-Revision-Date: 2006-01-24 15:40+0800\n"
--"Last-Translator: Frank Weng (a.k.a. Franklin) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Traditional Chinese <zh_l10n@linux.org.tw>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
-@@ -15,10 +14,8 @@
- "X-Generator: KBabel 1.10.2\n"
- 
- #: ksystraycmd.cpp:60
--msgid ""
--"No window matching pattern '%1' and no command specified.\n"
--msgstr ""
--"沒有視窗符合樣式 %1，也沒有指定命令。\n"
-+msgid "No window matching pattern '%1' and no command specified.\n"
-+msgstr "沒有視窗符合樣式 %1，也沒有指定命令。\n"
- 
- #: ksystraycmd.cpp:67
- msgid "KSysTrayCmd: KShellProcess cannot find a shell."
-@@ -80,7 +77,8 @@
- msgid ""
- "Keep the tray icon even if the client exits. This option\n"
- "has no effect unless startonshow is specified."
--msgstr "即使客戶端離開也保持在系統閘。除非指定 startonshow 否則此選項不會發生作用。"
-+msgstr ""
-+"即使客戶端離開也保持在系統閘。除非指定 startonshow 否則此選項不會發生作用。"
- 
- #: main.cpp:39
- msgid ""
-diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kthememanager.po kde-i18n-zh_TW-3.5.10/messages/kdebase/kthememanager.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kthememanager.po	2008-08-19 20:43:10.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdebase/kthememanager.po	2011-11-11 15:45:17.000000000 +0100
-@@ -1,14 +1,14 @@
- # Chinese/Traditional translation of kthememanager.
- # Woodman Tuen <wmtuen@gmail.com>, 2005.
--# 
--# 
-+#
-+#
- msgid ""
- msgstr ""
- "Project-Id-Version: kthememanager\n"
- "Report-Msgid-Bugs-To: \n"
- "POT-Creation-Date: 2008-07-08 01:18+0200\n"
- "PO-Revision-Date: 2005-08-25 14:31+0800\n"
--"Last-Translator: Woodman Tuen <wmtuen@gmail.com>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Chinese/Traditional <kde-i18n-doc@kde.org>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
-@@ -28,62 +28,62 @@
- 
- #: knewthemedlg.cpp:28
- msgid "New Theme"
--msgstr "新增佈景主題"
-+msgstr "新增布景主題"
- 
- #: kthememanager.cpp:49
- msgid "KDE Theme Manager"
--msgstr "KDE 佈景主題管理員"
-+msgstr "KDE 布景主題管理員"
- 
- #: kthememanager.cpp:50 kthememanager.cpp:56
- msgid ""
- "This control module handles installing, removing and creating visual KDE "
- "themes."
--msgstr "本處控制模組負責安裝、移除及建立 KDE 視覺佈景主題。"
-+msgstr "本處控制模組負責安裝、移除及建立 KDE 視覺布景主題。"
- 
- #: kthememanager.cpp:219
- msgid "Theme Files"
--msgstr "佈景主題檔案"
-+msgstr "布景主題檔案"
- 
- #: kthememanager.cpp:220
- msgid "Select Theme File"
--msgstr "選取佈景主題檔案"
-+msgstr "選取布景主題檔案"
- 
- #: kthememanager.cpp:254
- msgid "Do you really want to remove the theme <b>%1</b>?"
--msgstr "您真的要移除佈景主題 <b>%1</b>？"
-+msgstr "您真的要移除布景主題 <b>%1</b>？"
- 
- #: kthememanager.cpp:255
- msgid "Remove Theme"
--msgstr "移除佈景主題"
-+msgstr "移除布景主題"
- 
- #: kthememanager.cpp:277
- msgid "My Theme"
--msgstr "我的佈景主題"
-+msgstr "我的布景主題"
- 
- #: kthememanager.cpp:288
- msgid "Theme %1 already exists."
--msgstr "佈景主題 %1 已經存在。"
-+msgstr "布景主題 %1 已經存在。"
- 
- #: kthememanager.cpp:308
- #, c-format
- msgid "Your theme has been successfully created in %1."
--msgstr "您的佈景主題成功在 %1 建立。"
-+msgstr "您的布景主題成功在 %1 建立。"
- 
- #: kthememanager.cpp:309
- msgid "Theme Created"
--msgstr "佈景主題已建立"
-+msgstr "布景主題已建立"
- 
- #: kthememanager.cpp:311
- msgid "An error occurred while creating your theme."
--msgstr "建位您的佈景主題時發生錯誤。"
-+msgstr "建位您的布景主題時發生錯誤。"
- 
- #: kthememanager.cpp:312
- msgid "Theme Not Created"
--msgstr "佈景主題沒有建立"
-+msgstr "布景主題沒有建立"
- 
- #: kthememanager.cpp:339
- msgid "This theme does not contain a preview."
--msgstr "這佈景主題不包含預覽。"
-+msgstr "這布景主題不包含預覽。"
- 
- #: kthememanager.cpp:344
- msgid "Author: %1<br>Email: %2<br>Version: %3<br>Homepage: %4"
-@@ -93,13 +93,13 @@
- #: rc.cpp:3
- #, no-c-format
- msgid "Choose your visual KDE theme:"
--msgstr "選擇您的 KDE 視覺佈景主題："
-+msgstr "選擇您的 KDE 視覺布景主題："
- 
- #. i18n: file kthemedlg.ui line 75
- #: rc.cpp:6
- #, no-c-format
- msgid "Get new themes..."
--msgstr "取得新的佈景主題....."
-+msgstr "取得新的布景主題….."
- 
- #. i18n: file kthemedlg.ui line 78
- #: rc.cpp:9
-@@ -111,37 +111,37 @@
- #: rc.cpp:12
- #, no-c-format
- msgid "Go to the KDE themes website"
--msgstr "前往 KDE 佈景主題網站"
-+msgstr "前往 KDE 布景主題網站"
- 
- #. i18n: file kthemedlg.ui line 121
- #: rc.cpp:15
- #, no-c-format
- msgid "&Remove Theme"
--msgstr "移除佈景主題(&R)"
-+msgstr "移除布景主題(&R)"
- 
- #. i18n: file kthemedlg.ui line 129
- #: rc.cpp:18
- #, no-c-format
- msgid "Create &New Theme..."
--msgstr "建立新的佈景主題(&N)..."
-+msgstr "建立新的布景主題(&N)…"
- 
- #. i18n: file kthemedlg.ui line 137
- #: rc.cpp:21
- #, no-c-format
- msgid "&Install New Theme..."
--msgstr "安裝新的佈景主題(&I)..."
-+msgstr "安裝新的布景主題(&I)…"
- 
- #. i18n: file kthemedlg.ui line 143
- #: rc.cpp:24
- #, no-c-format
- msgid "Theme"
--msgstr "佈景主題"
-+msgstr "布景主題"
- 
- #. i18n: file kthemedlg.ui line 191
- #: rc.cpp:27
- #, no-c-format
- msgid "Customize your theme:"
--msgstr "自訂您的佈景主題："
-+msgstr "自訂您的布景主題："
- 
- #. i18n: file kthemedlg.ui line 236
- #: rc.cpp:30
-@@ -189,13 +189,13 @@
- #: rc.cpp:51
- #, no-c-format
- msgid "Customize the icon theme"
--msgstr "自訂圖示佈景"
-+msgstr "自訂圖示布景"
- 
- #. i18n: file kthemedlg.ui line 399
- #: rc.cpp:57
- #, no-c-format
- msgid "Customize the font theme"
--msgstr "自訂字型佈景"
-+msgstr "自訂字型布景"
- 
- #. i18n: file kthemedlg.ui line 436
- #: rc.cpp:60
-@@ -213,7 +213,7 @@
- #: rc.cpp:66
- #, no-c-format
- msgid "&Theme name:"
--msgstr "佈景主題名稱(&T)"
-+msgstr "布景主題名稱(&T)"
- 
- #. i18n: file newthemewidget.ui line 36
- #: rc.cpp:69
-diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/ktip.po kde-i18n-zh_TW-3.5.10/messages/kdebase/ktip.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/ktip.po	2007-01-15 10:56:32.000000000 +0100
-+++ kde-i18n-zh_TW-3.5.10/messages/kdebase/ktip.po	2011-11-11 15:45:17.000000000 +0100
-@@ -10,8 +10,7 @@
- "Project-Id-Version: ktip\n"
- "POT-Creation-Date: 2006-11-23 02:35+0100\n"
- "PO-Revision-Date: 2006-11-24 16:33+0800\n"
--"Last-Translator: Frank Weng (a.k.a. Franklin) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Chinese Traditional <zh-l10n@linux.org.tw>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
-@@ -110,8 +109,8 @@
- "thus reach the desktop itself by clicking on the desktop icon on the\n"
- "panel.</p>\n"
- "<p>If you do not currently have the icon there, you can add it by right "
--"clicking on the panel, and then selecting Add to Panel->Special Button->"
--"Desktop Access.\n"
-+"clicking on the panel, and then selecting Add to Panel->Special Button-"
-+">Desktop Access.\n"
- "<br>\n"
- "<center>\n"
- "<img src=\"crystalsvg/48x48/filesystems/desktop.png\">\n"
-@@ -121,7 +120,8 @@
- "您可以馬上最小化所有目前在桌面上的視窗\n"
- "並且藉著按下面板上的桌面圖示可以馬上顯示\n"
- "桌面。</p>\n"
--"<p>如果您目前還看不到該按鈕，您可以在面板上按滑鼠右鍵並選擇「加入至面板->特殊按鈕->顯示桌面」來加入它。\n"
-+"<p>如果您目前還看不到該按鈕，您可以在面板上按滑鼠右鍵並選擇「加入至面板->特殊"
-+"按鈕->顯示桌面」來加入它。\n"
- "<br>\n"
- "<center>\n"
- "<img src=\"crystalsvg/48x48/filesystems/desktop.png\">\n"
-@@ -164,9 +164,11 @@
- "</center>\n"
- msgstr ""
- "<p>\n"
--"預設會在進入 KDE 時自動啟動且會在面板右端的系統匣停留的應用程式 Klipper，會保留一些已選擇的文字區域。這些文字可以擷取來使用甚至（例如在 URL "
--"的情況下）執行。</p>\n"
--"<p>您可以在<a href=\"help:/klipper\">Klipper 手冊</a>找到更多關於使用 Klipper 的資訊</p>\n"
-+"預設會在進入 KDE 時自動啟動且會在面板右端的系統匣停留的應用程式 Klipper，會保"
-+"留一些已選擇的文字區域。這些文字可以擷取來使用甚至（例如在 URL 的情況下）執"
-+"行。</p>\n"
-+"<p>您可以在<a href=\"help:/klipper\">Klipper 手冊</a>找到更多關於使用 "
-+"Klipper 的資訊</p>\n"
- "<br>\n"
- "<center>\n"
- "<img src=\"hicolor/48x48/apps/klipper.png\">\n"
-@@ -177,8 +179,7 @@
- "<p>\n"
- "The window list, which is accessible via an icon on the panel, provides a\n"
- "quick overview of all windows on all virtual desktops. Alternatively,\n"
--"press Alt+F5 to display the window list.</p>"
--"<br>\n"
-+"press Alt+F5 to display the window list.</p><br>\n"
- "<center>\n"
- "<img src=\"crystalsvg/48x48/apps/window_list.png\">\n"
- "</center>\n"
-@@ -186,8 +187,7 @@
- "<p>\n"
- "可經由面板上的圖示來使用的視窗列表，它能\n"
- "提供所有虛擬桌面上所有視窗的快速檢視。另外，\n"
--"按 Alt+F5 可以顯示視窗列表。</p>"
--"<br>\n"
-+"按 Alt+F5 可以顯示視窗列表。</p><br>\n"
- "<center>\n"
- "<img src=\"crystalsvg/48x48/apps/window_list.png\">\n"
- "</center>\n"
-@@ -211,10 +211,8 @@
- "<strong>\"print:/manager\"</strong>... --  <em>\"Type where?\"</em>,\n"
- " you may ask. Type it...</p>\n"
- "<ul>\n"
--"  "
--"<li>...either in Konqueror's <i>address field</i>,</li>\n"
--"  "
--"<li>...or in a <i>Run Command</i> dialog,\n"
-+"  <li>...either in Konqueror's <i>address field</i>,</li>\n"
-+"  <li>...or in a <i>Run Command</i> dialog,\n"
- "         opened by pressing <strong>Alt+F2</strong>.</li>\n"
- "</ul>\n"
- "</p>\n"
-@@ -226,10 +224,8 @@
- "<strong>「print:/manager」</strong>... --  您會問：\n"
- "<em>「在哪裡輸入？」</em>，您可以輸入到...</p>\n"
- "<ul>\n"
--"  "
--"<li>...可以是 Konqueror 的 <i>位址欄</i> ，</li>\n"
--"  "
--"<li>...或者是 <i>執行命令</i> 對話盒，\n"
-+"  <li>...可以是 Konqueror 的 <i>位址欄</i> ，</li>\n"
-+"  <li>...或者是 <i>執行命令</i> 對話盒，\n"
- "         可以用按 <strong>[Alt+F2]</strong>開啟之。</li>\n"
- "</ul>\n"
- "</p>\n"
-@@ -242,31 +238,28 @@
- "<p>\n"
- "Double-clicking on the titlebar of any window \"shades\" it, which means\n"
- "that only the titlebar stays visible. Double-clicking the titlebar a\n"
--"second time will make the window visible again."
--"<br>\n"
-+"second time will make the window visible again.<br>\n"
- "Of course, you can change this behavior within the Control Center.\n"
- "</p>\n"
- "<p>For more information about ways to manipulate windows in KDE, take\n"
--"a look at <a href=\"help:/khelpcenter/userguide/windows-how-to-work.html\">"
--"the KDE User Guide</a>.</p>\n"
-+"a look at <a href=\"help:/khelpcenter/userguide/windows-how-to-work.html"
-+"\">the KDE User Guide</a>.</p>\n"
- msgstr ""
- "<p>\n"
- "雙擊任何視窗的標題列可以「遮蓋」視窗，\n"
- "亦即只有標題列是看得到的。再次雙擊標題列\n"
--"會令視窗再次出現。"
--"<br>\n"
-+"會令視窗再次出現。<br>\n"
- "當然，你可以使用控制中心來改變這個行為模式。\n"
- "</p>\n"
- "<p>需要更多關於在 KDE 中管理視窗的資訊，請查閱\n"
--"<a href=\"help:/khelpcenter/userguide/windows-how-to-work.html\">KDE 使用者指南</a>"
--"。</p>\n"
-+"<a href=\"help:/khelpcenter/userguide/windows-how-to-work.html\">KDE 使用者指"
-+"南</a>。</p>\n"
- 
- #: tips.cpp:127
- msgid ""
- "<p>\n"
- "You can cycle through the windows on a virtual desktop by holding the\n"
--"Alt key and pressing Tab or Shift+Tab.</p>"
--"<br>\n"
-+"Alt key and pressing Tab or Shift+Tab.</p><br>\n"
- "<center><img src=\"crystalsvg/48x48/apps/kcmkwm.png\"></center></p>\n"
- "<p>For more information, see <a\n"
- "href=\"help:/khelpcenter/userguide/windows-how-to-work.html\">the KDE\n"
-@@ -274,8 +267,7 @@
- msgstr ""
- "<p>\n"
- "你可以藉著按住 Alt 鍵然後按 Tab 鍵或 Shift+Tab 鍵\n"
--"來輪流切換同一個虛擬桌面上的視窗。</p>"
--"<br>\n"
-+"來輪流切換同一個虛擬桌面上的視窗。</p><br>\n"
- "<center><img src=\"crystalsvg/48x48/apps/kcmkwm.png\"></center></p>\n"
- "<p>需要更多資訊，請查閱 <a\n"
- "href=\"help:/khelpcenter/userguide/windows-how-to-work.html\">KDE\n"
-@@ -284,7 +276,8 @@
- #: tips.cpp:138
- msgid ""
- "<p>\n"
--"You can assign <b>keyboard shortcuts</b> to your favorite applications in the\n"
-+"You can assign <b>keyboard shortcuts</b> to your favorite applications in "
-+"the\n"
- "KDE menu editor (K-menu->Settings->Menu Editor). Select the application\n"
- "(e.g. Konsole), then click on the image next to \"Current shortcut\n"
- "key:\". Press the key combination you want (say, Ctrl+Alt+K).\n"
-@@ -304,8 +297,8 @@
- "of desktops\" slider in the Control Center (Desktop->Multiple Desktops).\n"
- "</p>\n"
- "<p>For more information about using virtual desktops, look at <a\n"
--"href=\"help:/khelpcenter/userguide/windows-how-to-work.html#using-multiple-deskt"
--"ops\">the\n"
-+"href=\"help:/khelpcenter/userguide/windows-how-to-work.html#using-multiple-"
-+"desktops\">the\n"
- "KDE User Guide</a>.</p>\n"
- msgstr ""
- "<p>\n"
-@@ -313,15 +306,16 @@
- "的數目」滑動鈕來設定虛擬桌面的數目。\n"
- "</p>\n"
- "<p>需要更多關於使用虛擬桌面的資訊，請查閱<a\n"
--"href=\"help:/khelpcenter/userguide/windows-how-to-work.html#using-multiple-deskt"
--"ops\">\n"
-+"href=\"help:/khelpcenter/userguide/windows-how-to-work.html#using-multiple-"
-+"desktops\">\n"
- "KDE 使用者指南</a>。</p>\n"
- 
- #: tips.cpp:159
- msgid ""
- "<p>The KDE project was founded in October 1996 and had its first release,\n"
- "1.0, on July 12, 1998.</p>\n"
--"<p>You can <em>support the KDE project</em> with work (programming, designing,\n"
-+"<p>You can <em>support the KDE project</em> with work (programming, "
-+"designing,\n"
- "documenting, proof-reading, translating, etc.) and financial or\n"
- "hardware donations. Please contact <a\n"
- " href=\"mailto:kde-ev@kde.org\">kde-ev@kde.org</a>\n"
-@@ -341,41 +335,25 @@
- #: tips.cpp:172
- msgid ""
- "<p>KDE provides some shortcuts to change the size of a window:</p>\n"
--"<table>"
--"<tr>\n"
--"<th>To maximize a window...</th>\t"
--"<th>click the maximize button...</th>\n"
--"</tr>"
--"<tr>\n"
--"<td>...full-screen,</td>\t\t"
--"<td>...with the left mouse button</td>\n"
--"</tr>"
--"<tr>\n"
--"<td>...vertically only,</td>\t"
--"<td>...with the middle mouse button</td>\n"
--"</tr>"
--"<tr>\n"
--"<td>...horizontally only,</td>\t"
--"<td>...with the right mouse button</td>\n"
-+"<table><tr>\n"
-+"<th>To maximize a window...</th>\t<th>click the maximize button...</th>\n"
-+"</tr><tr>\n"
-+"<td>...full-screen,</td>\t\t<td>...with the left mouse button</td>\n"
-+"</tr><tr>\n"
-+"<td>...vertically only,</td>\t<td>...with the middle mouse button</td>\n"
-+"</tr><tr>\n"
-+"<td>...horizontally only,</td>\t<td>...with the right mouse button</td>\n"
- "</tr></table>\n"
- msgstr ""
- "<p>KDE 提供了一些鍵盤捷徑來改變視窗的大小：</p>\n"
--"<table>"
--"<tr>\n"
--"<th>要將視窗最大化...</th>\t"
--"<th>按下最大化按鈕...</th>\n"
--"</tr>"
--"<tr>\n"
--"<td>...佔滿整個螢幕，</td>\t\t"
--"<td>...使用左滑鼠鍵</td>\n"
--"</tr>"
--"<tr>\n"
--"<td>...只是垂直方向，</td>\t"
--"<td>...使用中滑鼠鍵</td>\n"
--"</tr>"
--"<tr>\n"
--"<td>...只是水平方向，</td>\t"
--"<td>...使用右滑鼠鍵</td>\n"
-+"<table><tr>\n"
-+"<th>要將視窗最大化...</th>\t<th>按下最大化按鈕...</th>\n"
-+"</tr><tr>\n"
-+"<td>...佔滿整個螢幕，</td>\t\t<td>...使用左滑鼠鍵</td>\n"
-+"</tr><tr>\n"
-+"<td>...只是垂直方向，</td>\t<td>...使用中滑鼠鍵</td>\n"
-+"</tr><tr>\n"
-+"<td>...只是水平方向，</td>\t<td>...使用右滑鼠鍵</td>\n"
- "</tr></table>\n"
- 
- #: tips.cpp:186
-@@ -457,16 +435,14 @@
- "language well suited to desktop development. The KDE object model\n"
- "extends the power of C++ even further. See\n"
- " <a href=\"http://developer.kde.org/\">http://developer.kde.org/</a>\n"
--"for details.</p>"
--"<br>\n"
-+"for details.</p><br>\n"
- "<center><img src=\"hicolor/48x48/apps/konqueror.png\"></center>\n"
- msgstr ""
- "<p>\n"
- "KDE 是建立在設計良好的 C++ 基礎上。C++ 是一個很適合桌面開發的\n"
- "程式語言。KDE 的物件模組更進一步的擴充 C++ 的功能。詳情請見 \n"
- "<a href=\"http://developer.kde.org/\">http://developer.kde.org/</a>。\n"
--"</p>"
--"<br>\n"
-+"</p><br>\n"
- "<center><img src=\"hicolor/48x48/apps/konqueror.png\"></center>\n"
- 
- #: tips.cpp:239
-@@ -487,16 +463,16 @@
- "You can cycle through the virtual desktops by holding the Ctrl key and\n"
- "pressing Tab or Shift+Tab.</p>\n"
- "<p>For more information about using virtual desktops, look at <a\n"
--"href=\"help:/khelpcenter/userguide/windows-how-to-work.html#using-multiple-deskt"
--"ops\">the\n"
-+"href=\"help:/khelpcenter/userguide/windows-how-to-work.html#using-multiple-"
-+"desktops\">the\n"
- "KDE User Guide</a>.</p>\n"
- msgstr ""
- "<p>\n"
- "您可以按住 Ctrl 鍵並按下 Tab 或 Shift+Tab 來循迴\n"
- "各虛擬桌面。</p>\n"
- "<p>需要更多使用虛擬桌面的相關資訊，請查閱 <a\n"
--"href=\"help:/khelpcenter/userguide/windows-how-to-work.html#using-multiple-deskt"
--"ops\">\n"
-+"href=\"help:/khelpcenter/userguide/windows-how-to-work.html#using-multiple-"
-+"desktops\">\n"
- "KDE 使用者指南</a>。</p>\n"
- 
- #: tips.cpp:257
-@@ -585,19 +561,18 @@
- #: tips.cpp:309
- msgid ""
- "<p>\n"
--"Need comprehensive info about KDEPrinting?"
--"<br> </p>\n"
-+"Need comprehensive info about KDEPrinting?<br> </p>\n"
- "<p> Type <strong>help:/kdeprint/</strong> into a Konqueror address field\n"
- "and get the\n"
--" <a href=\"http://printing.kde.org/documentation/handbook/\">"
--"KDEPrint Handbook</a>\n"
--"displayed.</p> "
--"<p>This, plus more material (like a\n"
-+" <a href=\"http://printing.kde.org/documentation/handbook/\">KDEPrint "
-+"Handbook</a>\n"
-+"displayed.</p> <p>This, plus more material (like a\n"
- " <a href=\"http://printing.kde.org/faq/\">FAQ</a>, various\n"
--" <a href=\"http://printing.kde.org/documentation/tutorials/\">Tutorials</a>,\n"
-+" <a href=\"http://printing.kde.org/documentation/tutorials/\">Tutorials</"
-+"a>,\n"
- "a \"TipsNTricks\" section and the\n"
--" <a href=\"http://mail.kde.org/mailman/listinfo/kde-print/\">"
--"kdeprint mailing list</a>)\n"
-+" <a href=\"http://mail.kde.org/mailman/listinfo/kde-print/\">kdeprint "
-+"mailing list</a>)\n"
- " are available at\n"
- "<a href=\"http://printing.kde.org/\">printing.kde.org</a>...\n"
- "</p>\n"
-@@ -605,18 +580,17 @@
- "<img src=\"crystalsvg/48x48/devices/printer1.png\">\n"
- msgstr ""
- "<p>\n"
--"需要更多關於 KDEPrinting 的資訊？"
--"<br> </p>\n"
-+"需要更多關於 KDEPrinting 的資訊？<br> </p>\n"
- "<p> 在 Konqueror 位址欄輸入 <strong>help:/kdeprint/</strong>\n"
- "就可以看到\n"
--" <a href=\"http://printing.kde.org/documentation/handbook/\">KDEPrint 手冊</a>\n"
--"</p> "
--"<p>更多的資料（如\n"
-+" <a href=\"http://printing.kde.org/documentation/handbook/\">KDEPrint 手冊</"
-+"a>\n"
-+"</p> <p>更多的資料（如\n"
- " <a href=\"http://printing.kde.org/faq/\">FAQ</a> ，各種的\n"
- " <a href=\"http://printing.kde.org/documentation/tutorials/\">教學</a>，\n"
- "「TipsNTricks」文件和\n"
--" <a href=\"http://mail.kde.org/mailman/listinfo/kde-print/\">kdeprint 通信論壇</a>"
--"）\n"
-+" <a href=\"http://mail.kde.org/mailman/listinfo/kde-print/\">kdeprint 通信論"
-+"壇</a>）\n"
- "可以在<a href=\"http://printing.kde.org/\">printing.kde.org</a>...找到\n"
- "</p>\n"
- "<center>\n"
-@@ -650,14 +624,12 @@
- msgid ""
- "<p>\n"
- "If you need to kill some time, KDE comes with an extensive collection\n"
--"of games.</p>"
--"<br>\n"
-+"of games.</p><br>\n"
- "<center>\n"
- "<img src=\"crystalsvg/48x48/apps/package_games.png\">\n"
- msgstr ""
- "<p>\n"
--"如果想消磨時間，可以玩附隨 KDE 的大量遊戲。</p>"
--"<br>\n"
-+"如果想消磨時間，可以玩附隨 KDE 的大量遊戲。</p><br>\n"
- "<center>\n"
- "<img src=\"crystalsvg/48x48/apps/package_games.png\">\n"
- 
-@@ -667,7 +639,8 @@
- "desktop by dragging a graphics image from a Konqueror window to the\n"
- "desktop background.</p>\n"
- msgstr ""
--"<p>由 Konqueror 視窗拖曳圖像到桌面背景可<strong>快速改變背景</strong>圖像。</p>\n"
-+"<p>由 Konqueror 視窗拖曳圖像到桌面背景可<strong>快速改變背景</strong>圖像。</"
-+"p>\n"
- 
- #: tips.cpp:360
- msgid ""
-@@ -682,8 +655,8 @@
- msgid ""
- "<p>\n"
- "A fast way to get your favorite application onto your panel is to\n"
--"right-click the panel (Panel Menu) and select Add to Panel->Application->"
--"whatever.\n"
-+"right-click the panel (Panel Menu) and select Add to Panel->Application-"
-+">whatever.\n"
- "</p>\n"
- msgstr ""
- "<p>\n"
-@@ -746,10 +719,10 @@
- #: tips.cpp:409
- msgid ""
- "<p>\n"
--"If you know its name, you can <strong>execute any program</strong> by pressing\n"
-+"If you know its name, you can <strong>execute any program</strong> by "
-+"pressing\n"
- "<strong>Alt+F2</strong>\n"
--"and entering the program name in the command-line window provided."
--"<p>\n"
-+"and entering the program name in the command-line window provided.<p>\n"
- "<br>\n"
- "<center>\n"
- "<img src=\"crystalsvg/48x48/apps/kmenu.png\">\n"
-@@ -757,8 +730,7 @@
- "<p>\n"
- "如果知道程式名稱，您可以按\n"
- " <strong>Alt+F2</strong> \n"
--"並在提供的命令輸入列視窗內輸入程式名稱來<strong>執行任何程式</strong>。"
--"<p>\n"
-+"並在提供的命令輸入列視窗內輸入程式名稱來<strong>執行任何程式</strong>。<p>\n"
- "<br>\n"
- "<center>\n"
- "<img src=\"crystalsvg/48x48/apps/kmenu.png\">\n"
-@@ -769,8 +741,7 @@
- "You can <strong>browse any URL</strong> by pressing\n"
- "<strong>Alt+F2</strong> and entering the URL in the\n"
- "command-line window provided.\n"
--"</p>"
--"<br>\n"
-+"</p><br>\n"
- "<center>\n"
- "<img src=\"crystalsvg/48x48/filesystems/network.png\">\n"
- msgstr ""
-@@ -778,8 +749,7 @@
- "按 <strong>Alt+F2</strong> 並在提供的\n"
- "指令輸入欄視窗內輸入 URL 就可以\n"
- "<strong>瀏覽任何 URL</strong>。\n"
--"</p>"
--"<br>\n"
-+"</p><br>\n"
- "<center>\n"
- "<img src=\"crystalsvg/48x48/filesystems/network.png\">\n"
- 
-@@ -805,16 +775,14 @@
- "You can access a <strong>man page</strong> by entering a\n"
- "hash mark (#) and the name of the man page wherever you can enter\n"
- "a URL, like in the location field of the web browser or the\n"
--"<strong>Alt+F2</strong> command-line.</p>"
--"<br>\n"
-+"<strong>Alt+F2</strong> command-line.</p><br>\n"
- "<center>\n"
- "<img src=\"hicolor/48x48/apps/khelpcenter.png\">\n"
- msgstr ""
- "<p>\n"
- "只要是能輸入 URL 的地方，例如網頁瀏覽器的位置欄或是 <strong>Alt+F2\n"
- "</strong> 命令列中，輸入井號（#）然後跟隨 man 手冊頁的名稱\n"
--"就可以瀏覽 <strong>man 手冊頁</strong>。</p>"
--"<br>\n"
-+"就可以瀏覽 <strong>man 手冊頁</strong>。</p><br>\n"
- "<center>\n"
- "<img src=\"hicolor/48x48/apps/khelpcenter.png\">\n"
- 
-@@ -843,18 +811,16 @@
- #: tips.cpp:465
- msgid ""
- "<p>\n"
--"If you cannot access the titlebar, you can still <strong>move a window</strong>"
--"\n"
-+"If you cannot access the titlebar, you can still <strong>move a window</"
-+"strong>\n"
- "on the screen by holding the Alt key, clicking anywhere into the window\n"
--"and \"dragging\" it with the mouse.</p>"
--"<br>\n"
-+"and \"dragging\" it with the mouse.</p><br>\n"
- "<p>Of course, you can change this behavior by using the Control Center.</p>\n"
- msgstr ""
- "<p>\n"
- "如果無法取得標題列，你仍然可以按著 Alt 鍵不放，\n"
- "再以滑鼠按下視窗內的任何地方並「拖曳」它來在\n"
--"螢幕中<strong>移動視窗</strong>。</p>"
--"<br>\n"
-+"螢幕中<strong>移動視窗</strong>。</p><br>\n"
- "<p>當然，您可以使用控制中心來改變這個行為模式。</p>\n"
- 
- #: tips.cpp:474
-@@ -863,8 +829,8 @@
- "<p> Then use <strong>'kprinter'</strong> as \"print command\".\n"
- "Works with Netscape, Mozilla, Galeon, gv, Acrobat Reader,\n"
- " StarOffice, OpenOffice.org, any GNOME application and many more...</p>\n"
--"<p>See <a href=\"http://printing.kde.org/faq/kdeprint.phtml#out\">"
--"printing.kde.org</a>\n"
-+"<p>See <a href=\"http://printing.kde.org/faq/kdeprint.phtml#out\">printing."
-+"kde.org</a>\n"
- "for more detailed hints...\n"
- "</p>\n"
- "<center>\n"
-@@ -875,8 +841,8 @@
- "<p> 那麼就使用<strong>「kprinter」</strong>做為「列印命令」吧。\n"
- "它可以相容 Netscape、Mozilla、Galeon、gv、Acrobat Reader、\n"
- "StarOffice、OpenOffice.org，任何 GNOME 程式以及更多...</p>\n"
--"<p>查閱 <a href=\"http://printing.kde.org/faq/kdeprint.phtml#out\">"
--"printing.kde.org</a> \n"
-+"<p>查閱 <a href=\"http://printing.kde.org/faq/kdeprint.phtml#out\">printing."
-+"kde.org</a> \n"
- "以取得更詳細的提示...\n"
- "</p>\n"
- "<center>\n"
-@@ -886,7 +852,8 @@
- #: tips.cpp:488
- msgid ""
- "<p>\n"
--"You can <strong>resize a window</strong> on the screen by holding the Alt key,\n"
-+"You can <strong>resize a window</strong> on the screen by holding the Alt "
-+"key,\n"
- "right-clicking anywhere into the window and moving the mouse.</p>\n"
- msgstr ""
- "<p>\n"
-@@ -916,21 +883,22 @@
- "Sweden, France, Canada, USA, Australia, Namibia, Argentina, and even in\n"
- "Norway!</p>\n"
- "<p>\n"
--"To see where KDE developers can be found, take a look at <a "
--"href=\"http://worldwide.kde.org\">worldwide.kde.org</a>.</p>\n"
-+"To see where KDE developers can be found, take a look at <a href=\"http://"
-+"worldwide.kde.org\">worldwide.kde.org</a>.</p>\n"
- msgstr ""
- "<p>\n"
--"您會發現 KDE 的開發者偏佈全世界，例如：在德國、\n"
-+"您會發現 KDE 的開發者偏布全世界，例如：在德國、\n"
- "瑞典、法國、加拿大、美國、澳州、納米比亞、阿根廷，\n"
- "甚至是挪威！</p>\n"
- "<p>\n"
--"要知道哪裡可以找到 KDE 開發者，請查閱<a href=\"http://worldwide.kde.org\">worldwide.kde.org</a>"
--"。</p>\n"
-+"要知道哪裡可以找到 KDE 開發者，請查閱<a href=\"http://worldwide.kde.org"
-+"\">worldwide.kde.org</a>。</p>\n"
- 
- #: tips.cpp:515
- msgid ""
- "<p>\n"
--"KDE's CD player, KsCD, accesses the Internet CD database freedb to provide you\n"
-+"KDE's CD player, KsCD, accesses the Internet CD database freedb to provide "
-+"you\n"
- "with title/track information.\n"
- "</p>\n"
- "<p>Full details of KsCD's functions are available in <a\n"
-@@ -949,8 +917,8 @@
- "Some people open many terminal windows just to enter <em>one single</em>\n"
- "command.</p>\n"
- "<ul>\n"
--"<li>Use <strong>Alt+F2</strong> for just firing up programs (Alt+F2 \"kword\") "
--"or\n"
-+"<li>Use <strong>Alt+F2</strong> for just firing up programs (Alt+F2 \"kword"
-+"\") or\n"
- "<li>use Konsole sessions (\"New\" in toolbar) if you need text output.\n"
- "</ul>\n"
- msgstr ""
-@@ -958,20 +926,21 @@
- "有些人開啟很多終端機視窗只是為了輸入<em>一個</em>指令。</p>\n"
- "<ul>\n"
- "<li>使用 <strong>Alt+F2</strong> 來開啟程式（Alt+F2 \"kword\"）或\n"
--"<li>如果需要看到輸出結果，使用 Konsole 連線階段（工具列中的「新增」）。</ul>\n"
-+"<li>如果需要看到輸出結果，使用 Konsole 連線階段（工具列中的「新增」）。</"
-+"ul>\n"
- 
- #: tips.cpp:536
- msgid ""
- "<p>\n"
--"You can change the color of the window titlebars by clicking on the title bar "
--"of the\n"
-+"You can change the color of the window titlebars by clicking on the title "
-+"bar of the\n"
- "color example in the <em>Appearance & Themes</em> module within the Control "
- "Center.\n"
- "</p>\n"
- "<p>This works for all of the other available colors too.</p>\n"
- msgstr ""
- "<p>\n"
--"您可以按下控制中心的<em>外觀 & 佈景主題</em>中色彩範例\n"
-+"您可以按下控制中心的<em>外觀 & 布景主題</em>中色彩範例\n"
- "的標題列來改變視窗標題列的色彩。\n"
- "</p>\n"
- "<p>這點也可以用在所有其他可用的色彩上。</p>\n"
-@@ -979,7 +948,8 @@
- #: tips.cpp:545
- msgid ""
- "<p align=\"center\"><strong>KDE Command Line Printing (I)</strong></p>\n"
--"<p> Want to print from command line, without missing KDE's printing power?</p>\n"
-+"<p> Want to print from command line, without missing KDE's printing power?</"
-+"p>\n"
- "<p> Type <strong>'kprinter'</strong>. Up pops the\n"
- "KDEPrint dialog. Select printer, print options and\n"
- "print files (note that you may select <em>different</em>\n"
-@@ -1002,11 +972,13 @@
- "<p>\n"
- "You may specify print files and/or name a printer from the command line:\n"
- "<pre>\n"
--"kprinter -d infotec \\\n   /home/kurt/paragliding.jpg \\\n   "
--"../kdeprint-handbook.pdf \\\n   /opt/kde3/flyer.ps\n"
-+"kprinter -d infotec \\\n"
-+"   /home/kurt/paragliding.jpg \\\n"
-+"   ../kdeprint-handbook.pdf \\\n"
-+"   /opt/kde3/flyer.ps\n"
- "</pre>\n"
--" This prints 3 different files (from different folders) to printer "
--"\"infotec\".\n"
-+" This prints 3 different files (from different folders) to printer \"infotec"
-+"\".\n"
- " </p>\n"
- "<center>\n"
- "<img src=\"crystalsvg/48x48/devices/printer1.png\">\n"
-@@ -1016,8 +988,10 @@
- "<p>\n"
- "您可以在命令列指定列印檔案和/或為印表機命名：\n"
- "<pre>\n"
--"kprinter -d infotec \\\n   /home/kurt/paragliding.jpg \\\n   "
--"../kdeprint-handbook.pdf \\\n   /opt/kde3/flyer.ps\n"
-+"kprinter -d infotec \\\n"
-+"   /home/kurt/paragliding.jpg \\\n"
-+"   ../kdeprint-handbook.pdf \\\n"
-+"   /opt/kde3/flyer.ps\n"
- "</pre>\n"
- " 這樣會利用印表機「infotec」列印三個不同的檔案\n"
- "（來自不同的目錄）。\n"
-@@ -1034,7 +1008,7 @@
- "Control Center and might implement different features.</p>\n"
- msgstr ""
- "<p>\n"
--"視窗管理程式的款式及舊式佈景的差別在於，前者甚至會從控制台中\n"
-+"視窗管理程式的款式及舊式布景的差別在於，前者甚至會從控制臺中\n"
- "反映出視窗標題列的顏色設定並可能有不同的功能。</p>\n"
- 
- #: tips.cpp:583
-@@ -1055,18 +1029,16 @@
- msgid ""
- "<p>If you want to know when <b>the next release</b> of KDE is planned,\n"
- "look for the release schedule on <a\n"
--" href=\"http://developer.kde.org/\">http://developer.kde.org</a>. If you only\n"
-+" href=\"http://developer.kde.org/\">http://developer.kde.org</a>. If you "
-+"only\n"
- "find old release schedules, there will probably be some weeks/months of\n"
--"intensive development left before the next release.</p>"
--"<br>\n"
-+"intensive development left before the next release.</p><br>\n"
- "<center><img src=\"hicolor/48x48/apps/konqueror.png\"></center>\n"
- msgstr ""
- "<p>如果想知道<b>下一個版本</b>的 KDE 會計劃在何時推出，在 \n"
- "<a href=\"http://developer.kde.org/\">http://developer.kde.org</a> 中\n"
- "就可以找到推出時間表。如果你只找到舊版本的時間表，下個版本可能需時\n"
--"數星期或數個月的發展。"
--"<p>"
--"<br>\n"
-+"數星期或數個月的發展。<p><br>\n"
- "<center><img src=\"hicolor/48x48/apps/konqueror.png\"></center>\n"
- 
- #: tips.cpp:602
-@@ -1103,27 +1075,25 @@
- msgid ""
- "<p>If you want another panel, to make more space for your applets and\n"
- "buttons, press right mouse button on the panel to invoke the panel menu\n"
--"and select \"Add to Panel->Panel->Panel\".</p>"
--"<p>\n"
-+"and select \"Add to Panel->Panel->Panel\".</p><p>\n"
- "(You can then put anything on the fresh panel, adjust its size and\n"
- "so on.)</p>\n"
- msgstr ""
- "<p>如果您想增加面板來騰出空間給面板程式或按鈕，\n"
- "可在面板上按滑鼠右鍵來顯示面板選單並選擇\n"
--"「加入至面板→面板→面板」。</p>"
--"<p>\n"
-+"「加入至面板→面板→面板」。</p><p>\n"
- "（您可以在新的面板上放上任何東西或\n"
- "調整大小之類。）</p>\n"
- 
- #: tips.cpp:630
- msgid ""
- "<p>If you want to contribute your own \"tip of the day\", please send it to\n"
--"<a href=\"mailto:kde-doc-english@kde.org\">kde-doc-english@kde.org</a>"
--", and we will be happy to\n"
-+"<a href=\"mailto:kde-doc-english@kde.org\">kde-doc-english@kde.org</a>, and "
-+"we will be happy to\n"
- " include\n"
- "it in the next release.</p>\n"
- msgstr ""
--"<p>如果您想貢獻自己的「每日秘訣」，請寄到\n"
-+"<p>如果您想貢獻自己的「每日祕訣」，請寄到\n"
- "<a href=\"mailto:kde-doc-english@kde.org\">kde-doc-english@kde.org</a>，\n"
- "我們將很樂意\n"
- "把它收錄\n"
-@@ -1177,10 +1147,10 @@
- "</p>\n"
- "<p>For further instructions, and details about the advanced features\n"
- "available with Web Shortcuts, see <a\n"
--"href=\"help:/konqueror/enhanced-browsing.html\">the Konqueror Handbook</a>.</p>"
--"\n"
--"<p align=\"right\"><em>Contributed by Michael Lachmann and Thomas Diehl</em></p>"
--"\n"
-+"href=\"help:/konqueror/enhanced-browsing.html\">the Konqueror Handbook</a>.</"
-+"p>\n"
-+"<p align=\"right\"><em>Contributed by Michael Lachmann and Thomas Diehl</"
-+"em></p>\n"
- msgstr ""
- "<p>\n"
- "在「設定→設定 Konqueror→網路捷徑」 裡可以\n"
-@@ -1236,14 +1206,14 @@
- msgid ""
- "<p>\n"
- "If you want to make your desktop look more interesting, you can find\n"
--"tons of themes, widget styles window decorations and more at <a "
--"href=\"http://kde-look.org/\">kde-look.org</a>.\n"
-+"tons of themes, widget styles window decorations and more at <a href="
-+"\"http://kde-look.org/\">kde-look.org</a>.\n"
- "</p>\n"
- "<p align=\"right\"><em>Contributed by Carsten Niehaus</em></p>\n"
- msgstr ""
- "<p>\n"
- "如果想讓桌面看來更有趣，在 <a href=\"http://www.kde-look.org/\">\n"
--"www.kde-look.org</a> 裡有很多佈景主題、\n"
-+"www.kde-look.org</a> 裡有很多布景主題、\n"
- "介面風格和視窗裝飾可使用。\n"
- "</p>\n"
- "<p align=\"right\"><em>由 Carsten Niehaus 提供</em></p>\n"
-@@ -1305,8 +1275,7 @@
- "available on your distribution.) <em>kmag</em> works\n"
- "just like <em>xmag</em>, with the difference that it magnifies on the fly.\n"
- "</p>\n"
--"<p align=\"right\"><em>Contributed by Jesper Pedersen</em></p>"
--"<br>\n"
-+"<p align=\"right\"><em>Contributed by Jesper Pedersen</em></p><br>\n"
- msgstr ""
- "<p>\n"
- "如果您想量度螢幕上某一段距離，一個稱為 <em>kruler</em> 的程式\n"
-@@ -1316,8 +1285,7 @@
- "（它不屬於 KDE 基本安裝套件，需要另外安裝。它有可能已在您的發行套件中\n"
- "安裝好了。）<em>kmag</em> 就像 <em>xmag</em> 一樣運作，分別只在於前者\n"
- "可隨時將螢幕放大。</p>\n"
--"<p align=\"right\"><em>由 Jesper Pedersen 提供</em></p>"
--"<br>\n"
-+"<p align=\"right\"><em>由 Jesper Pedersen 提供</em></p><br>\n"
- 
- #: tips.cpp:749
- msgid ""
-@@ -1326,49 +1294,45 @@
- "configure the sound server from the Control Center by selecting\n"
- "Sound &amp; Multimedia->Sound Server.\n"
- "</p>\n"
--"<p align=\"right\"><em>Contributed by Jeff Tranter</em></p>"
--"<br>\n"
-+"<p align=\"right\"><em>Contributed by Jeff Tranter</em></p><br>\n"
- msgstr ""
- "<p>\n"
- "KDE 中的音效是以 <b>artsd</b> 音效伺服器來維護的。您可以\n"
- "在控制中心裡選擇「音效 &amp; 多媒體→音效伺服器」\n"
- "來設定音效伺服器。\n"
- "</p>\n"
--"<p align=\"right\"><em>由 Jeff Tranter 提供</em></p>"
--"<br>\n"
-+"<p align=\"right\"><em>由 Jeff Tranter 提供</em></p><br>\n"
- 
- #: tips.cpp:759
- msgid ""
- "<p>\n"
--"You can associate sounds, pop up windows, and more with KDE events. This can be "
--"configured\n"
--"from the Control Center by selecting Sound &amp; Multimedia->"
--"System Notifications.\n"
-+"You can associate sounds, pop up windows, and more with KDE events. This can "
-+"be configured\n"
-+"from the Control Center by selecting Sound &amp; Multimedia->System "
-+"Notifications.\n"
- "</p>\n"
--"<p align=\"right\"><em>Contributed by Jeff Tranter</em></p>"
--"<br>\n"
-+"<p align=\"right\"><em>Contributed by Jeff Tranter</em></p><br>\n"
- msgstr ""
- "<p>\n"
- "您可以將音效關連到 KDE 事件。這可以在控制中心\n"
- "裡選擇「音效 &amp; 多媒體→系統通知」來設定。\n"
- "</p>\n"
--"<p align=\"right\"><em>由 Jeff Tranter 提供</em></p>"
--"<br>\n"
-+"<p align=\"right\"><em>由 Jeff Tranter 提供</em></p><br>\n"
- 
- #: tips.cpp:768
- msgid ""
- "<p>\n"
--"Most non-KDE sound applications that do not know about the sound server can be\n"
--"run using the <b>artsdsp</b> command. When the application is run, accesses to\n"
-+"Most non-KDE sound applications that do not know about the sound server can "
-+"be\n"
-+"run using the <b>artsdsp</b> command. When the application is run, accesses "
-+"to\n"
- "the audio device will be redirected to the <b>artsd</b> sound server.\n"
- "</p>\n"
- "<p>\n"
--"The command format is:"
--"<br>\n"
-+"The command format is:<br>\n"
- "<b>artsdsp</b> <em>application</em> <em>arguments</em> ...\n"
- "</p>\n"
--"<p align=\"right\"><em>Contributed by Jeff Tranter</em></p>"
--"<br>\n"
-+"<p align=\"right\"><em>Contributed by Jeff Tranter</em></p><br>\n"
- msgstr ""
- "<p>\n"
- "大多數不使用音效伺服器的非 KDE 聲音應用程式可以\n"
-@@ -1376,12 +1340,10 @@
- "時，對音效裝置的存取都會重新導向到 <b>artsd</b> 音效伺服器。\n"
- "</p>\n"
- "<p>\n"
--"命令的格式為："
--"<br>\n"
-+"命令的格式為：<br>\n"
- "<b>artsdsp</b> <em>應用程式</em> <em>引數</em> ...\n"
- "</p>\n"
--"<p align=\"right\"><em>由 Jeff Tranter 提供</em></p>"
--"<br>\n"
-+"<p align=\"right\"><em>由 Jeff Tranter 提供</em></p><br>\n"
- 
- #: tips.cpp:782
- msgid ""
-@@ -1486,7 +1448,7 @@
- "<p>\n"
- "KDE 應用程式為許多功能提功了簡短的「這是什麼？」\n"
- "說明文字。只要按下視窗標題列上的問號標記，接著\n"
--"按下您需要協助的項目。(在某些佈景主題中，此按鈕\n"
-+"按下您需要協助的項目。(在某些布景主題中，此按鈕\n"
- "是以小寫的「i」來代替問號標記)。\n"
- "</p>\n"
- 
-@@ -1646,8 +1608,8 @@
- msgid ""
- "<p>You can use the mouse wheel to quickly perform a number of tasks;\n"
- "here are a few you might not have known of: \n"
--"<ul>"
--"<li>Ctrl+Mouse-Wheel in the Konqueror web browser to change the font-size,\n"
-+"<ul><li>Ctrl+Mouse-Wheel in the Konqueror web browser to change the font-"
-+"size,\n"
- "or in Konqueror file manager to change icon size.</li>\n"
- "<li>Shift+Mouse-Wheel for fast scrolling in all KDE applications.</li>\n"
- "<li>Mouse-Wheel over the taskbar in Kicker to quickly alternate between\n"
-@@ -1657,8 +1619,7 @@
- msgstr ""
- "<p>您可以使用滑鼠滾輪來快速的執行某些工作；\n"
- "這裡是一些您可能不知道的：\n"
--"<ul>"
--"<li>在 Konqueror 網頁瀏覽器中按 Ctrl+滑鼠滾輪可改變\n"
-+"<ul><li>在 Konqueror 網頁瀏覽器中按 Ctrl+滑鼠滾輪可改變\n"
- "字型大小，或在 Konqueror 檔案管理程式中改變圖示大小。</li>\n"
- "<li>Shift+滑鼠滾輪可在所有 KDE 應用程式中快速捲動。</li>\n"
- "<li>在 Kicker 工作列可以滑鼠滾輪切換不同的視窗。</li>\n"
-@@ -1758,7 +1719,7 @@
- "<p>不同的虛擬桌面可以各別自訂某些地方。\n"
- "例如，您可以為特定的桌面指定特殊的背景：\n"
- "可以看看 KDE 的控制中心，在「外觀 &amp; \n"
--"佈景主題->背景」或者在桌面按右鍵並選擇\n"
-+"布景主題->背景」或者在桌面按右鍵並選擇\n"
- "設定桌面。</p>\n"
- 
- #: tips.cpp:1014
-@@ -1791,11 +1752,9 @@
- " choice.\n"
- "</p>\n"
- "<p>\n"
--"<hr>"
--"<br>"
--"<br>\n"
--"<i>This is the last tip in the tips database. Clicking \"Next\" will take you "
--"back to\n"
-+"<hr><br><br>\n"
-+"<i>This is the last tip in the tips database. Clicking \"Next\" will take "
-+"you back to\n"
- " the first tip.</i>\n"
- "</p>\n"
- msgstr ""
-@@ -1807,9 +1766,7 @@
- "您的選擇。\n"
- "</p>\n"
- "<p>\n"
--"<hr>"
--"<br>"
--"<br>\n"
-+"<hr><br><br>\n"
- "<i>這是密訣資料庫中的最後一個密訣。按「下一步」會將您帶回\n"
- "第一個密訣。</i>\n"
- "</p>\n"
-diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kwin_clients.po kde-i18n-zh_TW-3.5.10/messages/kdebase/kwin_clients.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kwin_clients.po	2008-08-19 20:43:10.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdebase/kwin_clients.po	2011-11-11 15:45:17.000000000 +0100
-@@ -9,7 +9,7 @@
- "Project-Id-Version: kwin_clients\n"
- "POT-Creation-Date: 2008-07-08 01:18+0200\n"
- "PO-Revision-Date: 2005-11-17 19:25+0800\n"
--"Last-Translator: Chao-Hsiung Liao <j_h_liau@yahoo.com.tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
-@@ -23,7 +23,9 @@
- msgid ""
- "When selected, the window borders are drawn using the titlebar colors; "
- "otherwise, they are drawn using normal border colors."
--msgstr "選擇後，視窗裝飾將使用標題列的顏色繪製，否則，將取而代之使用正常的邊界顏色繪製。"
-+msgstr ""
-+"選擇後，視窗裝飾將使用標題列的顏色繪製，否則，將取而代之使用正常的邊界顏色繪"
-+"製。"
- 
- #: b2/config/config.cpp:49
- msgid "Draw &resize handle"
-@@ -31,8 +33,8 @@
- 
- #: b2/config/config.cpp:51
- msgid ""
--"When selected, decorations are drawn with a \"grab handle\" in the bottom right "
--"corner of the windows; otherwise, no grab handle is drawn."
-+"When selected, decorations are drawn with a \"grab handle\" in the bottom "
-+"right corner of the windows; otherwise, no grab handle is drawn."
- msgstr "選取時，裝飾中的拖動手把將會顯示於視窗右下方。要不然就是不顯示。"
- 
- #: b2/config/config.cpp:56
-@@ -61,8 +63,8 @@
- 
- #: b2/config/config.cpp:66
- msgid ""
--"An action can be associated to a double click of the menu button. Leave it to "
--"none if in doubt."
-+"An action can be associated to a double click of the menu button. Leave it "
-+"to none if in doubt."
- msgstr "您可以使雙擊選單按鈕時有所動作。不確定的話可不選。"
- 
- #: b2/b2client.cpp:346 keramik/keramik.cpp:1036
-@@ -177,11 +179,11 @@
- 
- #: kwmtheme/cli_installer/main.cpp:12
- msgid "Installs a KWM theme"
--msgstr "安裝一個 KWM 佈景主題"
-+msgstr "安裝一個 KWM 布景主題"
- 
- #: kwmtheme/cli_installer/main.cpp:16
- msgid "Path to a theme config file"
--msgstr "佈景主題設定檔的路徑"
-+msgstr "布景主題設定檔的路徑"
- 
- #: laptop/laptopclient.cpp:353
- msgid "Laptop"
-@@ -197,7 +199,7 @@
- #: rc.cpp:6
- #, no-c-format
- msgid "Display the window &icon in the caption bubble"
--msgstr "在標題圓中顯示視窗圖示 (&I)"
-+msgstr "在標題圓中顯示視窗圖示(&I)"
- 
- #. i18n: file ./keramik/config/keramikconfig.ui line 33
- #: rc.cpp:9
-@@ -218,11 +220,12 @@
- #, no-c-format
- msgid ""
- "Check this option if you want the caption bubble to have the same size on "
--"active windows that it has on inactive ones. This option is useful for laptops "
--"or low resolution displays where you want maximize the amount of space "
--"available to the window contents."
-+"active windows that it has on inactive ones. This option is useful for "
-+"laptops or low resolution displays where you want maximize the amount of "
-+"space available to the window contents."
- msgstr ""
--"如果您想讓作用中的視窗擁有與非作用中視窗相同大小的標題圓，請選擇這個選項。 當您希望螢幕能容納更多視窗時(如筆記型電腦或者低解析度顯示)，這個選項非常有用."
-+"如果您想讓作用中的視窗擁有與非作用中視窗相同大小的標題圓，請選擇這個選項。 當"
-+"您希望螢幕能容納更多視窗時(如筆記型電腦或者低解析度顯示)，這個選項非常有用."
- 
- #. i18n: file ./keramik/config/keramikconfig.ui line 52
- #: rc.cpp:18
-@@ -234,9 +237,11 @@
- #: rc.cpp:21
- #, no-c-format
- msgid ""
--"Check this option if you want a grab bar to be drawn below windows. When this "
--"option is not selected only a thin border will be drawn in its place."
--msgstr "如果您想讓擷取列置於視窗下，請選擇這個選項。 當這個選項未被選取時，將只有一個細邊在它的位置上。"
-+"Check this option if you want a grab bar to be drawn below windows. When "
-+"this option is not selected only a thin border will be drawn in its place."
-+msgstr ""
-+"如果您想讓擷取列置於視窗下，請選擇這個選項。 當這個選項未被選取時，將只有一個"
-+"細邊在它的位置上。"
- 
- #. i18n: file ./keramik/config/keramikconfig.ui line 63
- #: rc.cpp:24 rc.cpp:51
-@@ -248,8 +253,8 @@
- #: rc.cpp:27 rc.cpp:54
- #, no-c-format
- msgid ""
--"Check this option if you want the titlebar text to have a 3D look with a shadow "
--"behind it."
-+"Check this option if you want the titlebar text to have a 3D look with a "
-+"shadow behind it."
- msgstr "如果您想標題列的文字有著3D陰影效果，請選擇這個選項。"
- 
- #. i18n: file ./plastik/config/configdialog.ui line 16
-@@ -274,9 +279,10 @@
- #: rc.cpp:48
- #, no-c-format
- msgid ""
--"Check this option if the window border should be painted in the titlebar color. "
--"Otherwise it will be painted in the background color."
--msgstr "如果您希望視窗裝飾的顏色跟標題列一樣，請選擇這個選項，否則會跟背景顏色一樣。"
-+"Check this option if the window border should be painted in the titlebar "
-+"color. Otherwise it will be painted in the background color."
-+msgstr ""
-+"如果您希望視窗裝飾的顏色跟標題列一樣，請選擇這個選項，否則會跟背景顏色一樣。"
- 
- #. i18n: file ./plastik/config/configdialog.ui line 92
- #: rc.cpp:57
-@@ -304,13 +310,17 @@
- msgid ""
- "Check this option if you want windows to be closed when you double click the "
- "menu button, similar to Microsoft Windows."
--msgstr "如果您希望雙擊視窗選單按鈕時關閉視窗，請選擇這個選項。(如 Microsoft Windows 一樣)"
-+msgstr ""
-+"如果您希望雙擊視窗選單按鈕時關閉視窗，請選擇這個選項。(如 Microsoft Windows "
-+"一樣)"
- 
- #: quartz/config/config.cpp:42
- msgid ""
- "When selected, the window decoration borders are drawn using the titlebar "
- "colors; otherwise, they are drawn using normal border colors instead."
--msgstr "選擇後，視窗裝飾將使用標題列的顏色繪製，否則，將取而代之使用正常的邊界顏色繪製。"
-+msgstr ""
-+"選擇後，視窗裝飾將使用標題列的顏色繪製，否則，將取而代之使用正常的邊界顏色繪"
-+"製。"
- 
- #: quartz/config/config.cpp:45
- msgid "Quartz &extra slim"
-@@ -331,8 +341,8 @@
- #: modernsystem/config/config.cpp:42
- msgid ""
- "When selected, all windows are drawn with a resize handle at the lower right "
--"corner. This makes window resizing easier, especially for trackballs and other "
--"mouse replacements on laptops."
-+"corner. This makes window resizing easier, especially for trackballs and "
-+"other mouse replacements on laptops."
- msgstr "若選擇了此項目，則每一個視窗的右下角都會有一個調整視窗大小用的手把。"
- 
- #: modernsystem/config/config.cpp:52
-diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kwin_lib.po kde-i18n-zh_TW-3.5.10/messages/kdebase/kwin_lib.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kwin_lib.po	2006-07-22 10:04:12.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdebase/kwin_lib.po	2011-11-11 15:45:17.000000000 +0100
-@@ -6,8 +6,7 @@
- "Project-Id-Version: kwin_lib\n"
- "POT-Creation-Date: 2005-10-08 02:42+0200\n"
- "PO-Revision-Date: 2006-01-20 15:51+0800\n"
--"Last-Translator: Frank Weng (a.k.a. Franklin) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Traditional Chinese <zh_l10n@linux.org.tw>\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/kwin.po kde-i18n-zh_TW-3.5.10/messages/kdebase/kwin.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kwin.po	2008-08-19 20:43:10.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdebase/kwin.po	2011-11-11 15:45:17.000000000 +0100
-@@ -9,7 +9,7 @@
- "Project-Id-Version: kwin\n"
- "POT-Creation-Date: 2008-03-10 01:27+0100\n"
- "PO-Revision-Date: 2005-11-17 19:24+0800\n"
--"Last-Translator: Chao-Hsiung Liao <j_h_liau@yahoo.com.tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: <Chinese (traditional) <zh-l10n@linux.org.tw>>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
-@@ -416,17 +416,16 @@
- msgid ""
- "kwin: it looks like there's already a window manager running. kwin not "
- "started.\n"
--msgstr ""
--"KWin: 似乎已經有其他的視窗管理程式已經啟動了。 因此 kwin 無法啟動\n"
-+msgstr "KWin: 似乎已經有其他的視窗管理程式已經啟動了。 因此 kwin 無法啟動\n"
- 
- #: main.cpp:80
- msgid "kwin: failure during initialization; aborting"
--msgstr "kwin: 程式在初使化時發生錯誤... 放棄執行"
-+msgstr "kwin: 程式在初使化時發生錯誤… 放棄執行"
- 
- #: main.cpp:101
- msgid ""
--"kwin: unable to claim manager selection, another wm running? (try using "
--"--replace)\n"
-+"kwin: unable to claim manager selection, another wm running? (try using --"
-+"replace)\n"
- msgstr ""
- "kwin：無法宣告管理程式選擇區，是否有其他 wm 在執行？(嘗試使用 --replace)\n"
- 
-@@ -488,15 +487,15 @@
- 
- #: useractions.cpp:69
- msgid "Window &Shortcut..."
--msgstr "視窗捷徑鍵(&S)..."
-+msgstr "視窗捷徑鍵(&S)…"
- 
- #: useractions.cpp:70
- msgid "&Special Window Settings..."
--msgstr "特殊的視窗設定(&S)..."
-+msgstr "特殊的視窗設定(&S)…"
- 
- #: useractions.cpp:71
- msgid "&Special Application Settings..."
--msgstr "特殊的應用程式設定(&S)..."
-+msgstr "特殊的應用程式設定(&S)…"
- 
- #: useractions.cpp:73
- msgid "Ad&vanced"
-@@ -536,7 +535,7 @@
- 
- #: useractions.cpp:103
- msgid "Configur&e Window Behavior..."
--msgstr "設定視窗行為...(&E)"
-+msgstr "設定視窗行為…(&E)"
- 
- #: useractions.cpp:198
- msgid "To &Desktop"
-@@ -554,34 +553,35 @@
- #: workspace.cpp:2397
- msgid ""
- "You have selected to show a window without its border.\n"
--"Without the border, you will not be able to enable the border again using the "
--"mouse: use the window operations menu instead, activated using the %1 keyboard "
--"shortcut."
-+"Without the border, you will not be able to enable the border again using "
-+"the mouse: use the window operations menu instead, activated using the %1 "
-+"keyboard shortcut."
- msgstr ""
- "您已經選擇顯示無邊框的視窗。\n"
--"沒有邊框，您將無法使用滑鼠讓邊框再次出現：要使用視窗操作選單來代替，使用 %1 鍵盤捷徑來作用它。"
-+"沒有邊框，您將無法使用滑鼠讓邊框再次出現：要使用視窗操作選單來代替，使用 %1 "
-+"鍵盤捷徑來作用它。"
- 
- #: workspace.cpp:2409
- msgid ""
- "You have selected to show a window in fullscreen mode.\n"
--"If the application itself does not have an option to turn the fullscreen mode "
--"off you will not be able to disable it again using the mouse: use the window "
--"operations menu instead, activated using the %1 keyboard shortcut."
-+"If the application itself does not have an option to turn the fullscreen "
-+"mode off you will not be able to disable it again using the mouse: use the "
-+"window operations menu instead, activated using the %1 keyboard shortcut."
- msgstr ""
- "您已經選擇要視窗以全螢幕模式顯示。\n"
--"如果該應用程式本身沒有關閉全螢幕模式的選項，您將無法使用滑鼠將其關閉：要使用視窗操作選單來代替，使用 %1 鍵盤捷徑來作用它。"
-+"如果該應用程式本身沒有關閉全螢幕模式的選項，您將無法使用滑鼠將其關閉：要使用"
-+"視窗操作選單來代替，使用 %1 鍵盤捷徑來作用它。"
- 
- #: workspace.cpp:2446 workspace.cpp:2528
- msgid ""
--"The Composite Manager could not be started.\\nMake sure you have \"kompmgr\" in "
--"a $PATH directory."
--msgstr ""
--"混合式管理程式無法啟動。\\n請確定您的 $PATH 目錄中有「kompmgr」。"
-+"The Composite Manager could not be started.\\nMake sure you have \"kompmgr\" "
-+"in a $PATH directory."
-+msgstr "混合式管理程式無法啟動。\\n請確定您的 $PATH 目錄中有「kompmgr」。"
- 
- #: workspace.cpp:2506
- msgid ""
--"The Composite Manager crashed twice within a minute and is therefore disabled "
--"for this session."
-+"The Composite Manager crashed twice within a minute and is therefore "
-+"disabled for this session."
- msgstr "該混合式管理程式在一分鐘內已當機兩次，因此在此工作階段中將停用它。"
- 
- #: workspace.cpp:2507 workspace.cpp:2529 workspace.cpp:2567
-@@ -590,53 +590,48 @@
- 
- #: workspace.cpp:2546
- msgid ""
--"<qt><b>kompmgr failed to open the display</b>"
--"<br>There is probably an invalid display entry in your ~/.xcompmgrrc.</qt>"
--msgstr "<qt><b>kompmgr 開啟該畫面失敗</b><br>這可能是因為在您的 ~/.xcompmgrrc 中有無效的畫面項目。</qt>"
-+"<qt><b>kompmgr failed to open the display</b><br>There is probably an "
-+"invalid display entry in your ~/.xcompmgrrc.</qt>"
-+msgstr ""
-+"<qt><b>kompmgr 開啟該畫面失敗</b><br>這可能是因為在您的 ~/.xcompmgrrc 中有無"
-+"效的畫面項目。</qt>"
- 
- #: workspace.cpp:2548
- msgid ""
--"<qt><b>kompmgr cannot find the Xrender extension</b>"
--"<br>You are using either an outdated or a crippled version of XOrg."
--"<br>Get XOrg &ge; 6.8 from www.freedesktop.org."
--"<br></qt>"
-+"<qt><b>kompmgr cannot find the Xrender extension</b><br>You are using either "
-+"an outdated or a crippled version of XOrg.<br>Get XOrg &ge; 6.8 from www."
-+"freedesktop.org.<br></qt>"
- msgstr ""
--"<qt><b>kompmgr 找不到 Xrender 延伸功能</b>"
--"<br>您所使用的可能是過期或有缺陷的 XOrg 版本。"
--"<br>請至 www.freedesktop.org 取得 XOrg &ge; 6.8 。"
--"<br></qt>"
-+"<qt><b>kompmgr 找不到 Xrender 延伸功能</b><br>您所使用的可能是過期或有缺陷的 "
-+"XOrg 版本。<br>請至 www.freedesktop.org 取得 XOrg &ge; 6.8 。<br></qt>"
- 
- #: workspace.cpp:2550
- msgid ""
--"<qt><b>Composite extension not found</b>"
--"<br>You <i>must</i> use XOrg &ge; 6.8 for translucency and shadows to work."
--"<br>Additionally, you need to add a new section to your X config file:"
--"<br><i>Section \"Extensions\""
--"<br>Option \"Composite\" \"Enable\""
--"<br>EndSection</i></qt>"
--msgstr ""
--"<qt><b>找不到 Composite extension</b>"
--"<br>您 <i>必須</i> 使用 XOrg &ge; 6.8 才能使透明與陰影正常運作。"
--"<br>此外，您需要在 X config 檔案中加入此段："
--"<br><i>Section \"Extensions\""
--"<br>Option \"Composite\" \"Enable\""
--"<br>EndSection</i></qt>"
-+"<qt><b>Composite extension not found</b><br>You <i>must</i> use XOrg &ge; "
-+"6.8 for translucency and shadows to work.<br>Additionally, you need to add a "
-+"new section to your X config file:<br><i>Section \"Extensions\"<br>Option "
-+"\"Composite\" \"Enable\"<br>EndSection</i></qt>"
-+msgstr ""
-+"<qt><b>找不到 Composite extension</b><br>您 <i>必須</i> 使用 XOrg &ge; 6.8 才"
-+"能使透明與陰影正常運作。<br>此外，您需要在 X config 檔案中加入此段："
-+"<br><i>Section \"Extensions\"<br>Option \"Composite\" \"Enable"
-+"\"<br>EndSection</i></qt>"
- 
- #: workspace.cpp:2555
- msgid ""
--"<qt><b>Damage extension not found</b>"
--"<br>You <i>must</i> use XOrg &ge; 6.8 for translucency and shadows to work.</qt>"
-+"<qt><b>Damage extension not found</b><br>You <i>must</i> use XOrg &ge; 6.8 "
-+"for translucency and shadows to work.</qt>"
- msgstr ""
--"<qt><b>找不到Damage extension </b>"
--"<br>您 <i>必須</i> 使用 XOrg &ge; 6.8 才能使透明與陰影正常運作。</qt>"
-+"<qt><b>找不到Damage extension </b><br>您 <i>必須</i> 使用 XOrg &ge; 6.8 才能"
-+"使透明與陰影正常運作。</qt>"
- 
- #: workspace.cpp:2557
- msgid ""
--"<qt><b>XFixes extension not found</b>"
--"<br>You <i>must</i> use XOrg &ge; 6.8 for translucency and shadows to work.</qt>"
-+"<qt><b>XFixes extension not found</b><br>You <i>must</i> use XOrg &ge; 6.8 "
-+"for translucency and shadows to work.</qt>"
- msgstr ""
--"<qt><b>找不到 XFixes extension</b>"
--"<br>您 <i>必須</i> 使用 XOrg &ge; 6.8 才能使透明與陰影正常運作。</qt>"
-+"<qt><b>找不到 XFixes extension</b><br>您 <i>必須</i> 使用 XOrg &ge; 6.8 才能"
-+"使透明與陰影正常運作。</qt>"
- 
- #: killer/killer.cpp:50
- msgid "KWin helper utility"
-@@ -648,13 +643,13 @@
- 
- #: killer/killer.cpp:71
- msgid ""
--"<qt>Window with title \"<b>%2</b>\" is not responding. This window belongs to "
--"application <b>%1</b> (PID=%3, hostname=%4)."
--"<p>Do you wish to terminate this application? (All unsaved data in this "
--"application will be lost.)</qt>"
--msgstr ""
--"<qt>標題為「<b>%2</b>」的視窗沒有回應。該視窗是屬於應用程式 <b>%1</b> (PID=%3, hostname=%4)。"
--"<p>您是否希望終止此應用程式？(此應用程式中所有未儲存的資料將會遺失。)</qt>"
-+"<qt>Window with title \"<b>%2</b>\" is not responding. This window belongs "
-+"to application <b>%1</b> (PID=%3, hostname=%4).<p>Do you wish to terminate "
-+"this application? (All unsaved data in this application will be lost.)</qt>"
-+msgstr ""
-+"<qt>標題為「<b>%2</b>」的視窗沒有回應。該視窗是屬於應用程式 <b>%1</b> (PID=%"
-+"3, hostname=%4)。<p>您是否希望終止此應用程式？(此應用程式中所有未儲存的資料將"
-+"會遺失。)</qt>"
- 
- #: killer/killer.cpp:76
- msgid "Terminate"
-diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kwriteconfig.po kde-i18n-zh_TW-3.5.10/messages/kdebase/kwriteconfig.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kwriteconfig.po	2006-07-22 10:04:12.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdebase/kwriteconfig.po	2011-11-11 15:45:17.000000000 +0100
-@@ -6,8 +6,7 @@
- "Project-Id-Version: kwriteconfig\n"
- "POT-Creation-Date: 2005-05-18 21:24+0200\n"
- "PO-Revision-Date: 2006-01-20 15:43+0800\n"
--"Last-Translator: Frank Weng (a.k.a. Franklin) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Traditional Chinese <zh_l10n@linux.org.tw>\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/kxkb.po kde-i18n-zh_TW-3.5.10/messages/kdebase/kxkb.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kxkb.po	2006-07-22 10:04:12.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdebase/kxkb.po	2011-11-11 15:45:17.000000000 +0100
-@@ -9,8 +9,7 @@
- "Project-Id-Version: kxkb\n"
- "POT-Creation-Date: 2006-04-06 03:54+0200\n"
- "PO-Revision-Date: 2006-01-12 13:59+0800\n"
--"Last-Translator: Frank Weng (a.k.a. Franklin) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Traditional Chinese <zh_l10n@linux.org.tw>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
-@@ -27,11 +26,11 @@
- 
- #: kxkbtraywindow.cpp:60
- msgid "Error changing keyboard layout to '%1'"
--msgstr "變更鍵盤佈局為「%1」失敗"
-+msgstr "變更鍵盤布局為「%1」失敗"
- 
- #: kxkbtraywindow.cpp:110
- msgid "Configure..."
--msgstr "設定..."
-+msgstr "設定…"
- 
- #: pixmap.cpp:243
- msgid "Belgian"
-@@ -299,7 +298,7 @@
- 
- #: pixmap.cpp:316
- msgid "Maltese (US layout)"
--msgstr "馬爾他鍵盤 (美國佈局)"
-+msgstr "馬爾他鍵盤 (美國布局)"
- 
- #: pixmap.cpp:317
- msgid "Northern Saami (Finland)"
-@@ -443,7 +442,7 @@
- 
- #: kxkbbindings.cpp:10
- msgid "Switch to Next Keyboard Layout"
--msgstr "切換到下一個鍵盤佈局"
-+msgstr "切換到下一個鍵盤布局"
- 
- #: _translatorinfo.cpp:1
- msgid ""
-diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/libdmctl.po kde-i18n-zh_TW-3.5.10/messages/kdebase/libdmctl.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/libdmctl.po	2008-02-13 10:55:26.000000000 +0100
-+++ kde-i18n-zh_TW-3.5.10/messages/kdebase/libdmctl.po	2011-11-11 15:45:17.000000000 +0100
-@@ -6,8 +6,7 @@
- "Project-Id-Version: libdmctl\n"
- "POT-Creation-Date: 2007-11-02 01:14+0100\n"
- "PO-Revision-Date: 2006-01-20 15:36+0800\n"
--"Last-Translator: Frank Weng (a.k.a. Franklin) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Traditional Chinese <zh_l10n@linux.org.tw>\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/libkickermenu_kdeprint.po kde-i18n-zh_TW-3.5.10/messages/kdebase/libkickermenu_kdeprint.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/libkickermenu_kdeprint.po	2005-09-10 13:15:15.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdebase/libkickermenu_kdeprint.po	2011-11-11 15:45:17.000000000 +0100
-@@ -2,13 +2,12 @@
- # Copyright (C) YEAR Free Software Foundation, Inc.
- # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
- #
--#, fuzzy
- msgid ""
- msgstr ""
--"Project-Id-Version: PACKAGE VERSION\n"
-+"Project-Id-Version: libkickermenu_kdeprint\n"
- "POT-Creation-Date: 2005-05-18 21:24+0200\n"
- "PO-Revision-Date: 2003-11-07 13:55+1000\n"
--"Last-Translator: Tony Ni <tonyni@hotmail.com>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
-@@ -36,4 +35,4 @@
- 
- #: print_mnu.cpp:75
- msgid "Print File..."
--msgstr "列印檔案..."
-+msgstr "列印檔案…"
-diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/libkickermenu_konsole.po kde-i18n-zh_TW-3.5.10/messages/kdebase/libkickermenu_konsole.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/libkickermenu_konsole.po	2006-03-17 11:47:46.000000000 +0100
-+++ kde-i18n-zh_TW-3.5.10/messages/kdebase/libkickermenu_konsole.po	2011-11-11 15:45:17.000000000 +0100
-@@ -8,7 +8,7 @@
- "Report-Msgid-Bugs-To: \n"
- "POT-Creation-Date: 2006-02-23 03:46+0100\n"
- "PO-Revision-Date: 2005-08-25 14:12+0800\n"
--"Last-Translator: Yuan-Chen Cheng <ycheng@slat.org>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\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/libkickermenu_prefmenu.po kde-i18n-zh_TW-3.5.10/messages/kdebase/libkickermenu_prefmenu.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/libkickermenu_prefmenu.po	2006-05-22 20:38:36.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdebase/libkickermenu_prefmenu.po	2011-11-11 15:45:17.000000000 +0100
-@@ -8,7 +8,7 @@
- "Report-Msgid-Bugs-To: \n"
- "POT-Creation-Date: 2006-03-18 04:02+0100\n"
- "PO-Revision-Date: 2005-08-25 14:13+0800\n"
--"Last-Translator: Keanu <keanu@ms50.url.com.tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\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/libkickermenu_recentdocs.po kde-i18n-zh_TW-3.5.10/messages/kdebase/libkickermenu_recentdocs.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/libkickermenu_recentdocs.po	2005-09-10 13:15:15.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdebase/libkickermenu_recentdocs.po	2011-11-11 15:45:17.000000000 +0100
-@@ -7,7 +7,7 @@
- "Project-Id-Version: libkickermenu_recentdoc\n"
- "POT-Creation-Date: 2005-05-18 21:24+0200\n"
- "PO-Revision-Date: 2002-08-24 23:18+0800\n"
--"Last-Translator: Yuan-Chen Cheng <ycheng@slat.org>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\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/libkickermenu_remotemenu.po kde-i18n-zh_TW-3.5.10/messages/kdebase/libkickermenu_remotemenu.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/libkickermenu_remotemenu.po	2005-09-10 13:15:15.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdebase/libkickermenu_remotemenu.po	2011-11-11 15:45:17.000000000 +0100
-@@ -1,14 +1,14 @@
- # Chinese/Traditional translation of libkickermenu_remotemenu.
- # Woodman Tuen <wmtuen@gmail.com>, 2005.
--# 
--# 
-+#
-+#
- msgid ""
- msgstr ""
- "Project-Id-Version: libkickermenu_remotemenu\n"
- "Report-Msgid-Bugs-To: \n"
- "POT-Creation-Date: 2005-05-18 21:24+0200\n"
- "PO-Revision-Date: 2005-08-25 14:14+0800\n"
--"Last-Translator: Woodman Tuen <wmtuen@gmail.com>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Chinese/Traditional <zh-l10n@linux.org.tw>\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/libkickermenu_systemmenu.po kde-i18n-zh_TW-3.5.10/messages/kdebase/libkickermenu_systemmenu.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/libkickermenu_systemmenu.po	2006-05-22 20:38:36.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdebase/libkickermenu_systemmenu.po	2011-11-11 15:45:17.000000000 +0100
-@@ -1,15 +1,15 @@
- # Chinese/Traditional translation of libkickermenu_systemmenu.
- # Woodman Tuen <wmtuen@gmail.com>, 2005.
--# 
--# 
--# 
-+#
-+#
-+#
- msgid ""
- msgstr ""
- "Project-Id-Version: libkickermenu_systemmenu\n"
- "Report-Msgid-Bugs-To: \n"
- "POT-Creation-Date: 2006-03-18 04:02+0100\n"
- "PO-Revision-Date: 2005-08-25 14:08+0800\n"
--"Last-Translator: Woodman Tuen <wmtuen@gmail.com>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Chinese/Traditional <zh-l10n@linux.org.tw>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
-@@ -17,4 +17,4 @@
- 
- #: systemmenu.cpp:60
- msgid "Empty..."
--msgstr "清空..."
-+msgstr "清空…"
-diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/libkickermenu_tom.po kde-i18n-zh_TW-3.5.10/messages/kdebase/libkickermenu_tom.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/libkickermenu_tom.po	2005-09-10 13:15:15.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdebase/libkickermenu_tom.po	2011-11-11 15:45:17.000000000 +0100
-@@ -1,14 +1,14 @@
- # Chinese/Traditional translation of libkickermenu_tom.
- # Woodman Tuen <wmtuen@gmail.com>, 2005.
--# 
--# 
-+#
-+#
- msgid ""
- msgstr ""
- "Project-Id-Version: libkickermenu_tom\n"
- "Report-Msgid-Bugs-To: \n"
- "POT-Creation-Date: 2005-05-18 21:24+0200\n"
- "PO-Revision-Date: 2005-08-25 14:06+0800\n"
--"Last-Translator: Woodman Tuen <wmtuen@gmail.com>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Chinese/Traditional <zh-l10n@linux.org.tw>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
-@@ -52,15 +52,15 @@
- 
- #: tom.cc:391
- msgid "Modify This Task..."
--msgstr "修改本工作..."
-+msgstr "修改本工作…"
- 
- #: tom.cc:392
- msgid "Remove This Task..."
--msgstr "移除本工作..."
-+msgstr "移除本工作…"
- 
- #: tom.cc:393
- msgid "Insert New Task..."
--msgstr "插入新工作..."
-+msgstr "插入新工作…"
- 
- #: tom.cc:439
- msgid "Tasks"
-@@ -76,7 +76,7 @@
- 
- #: tom.cc:489 tom.cc:515
- msgid "Run Command..."
--msgstr "執行指令..."
-+msgstr "執行指令…"
- 
- #: tom.cc:493
- msgid "Recently Used Items"
-@@ -105,12 +105,12 @@
- 
- #: tom.cc:613
- msgid ""
--"<qt>Are you sure you want to remove the <strong>%1</strong> task?"
--"<p><em>Tip: You can restore the task after it has been removed by selecting the "
--"&quot;Modify These Tasks&quot; entry</em></qt>"
-+"<qt>Are you sure you want to remove the <strong>%1</strong> task?<p><em>Tip: "
-+"You can restore the task after it has been removed by selecting the &quot;"
-+"Modify These Tasks&quot; entry</em></qt>"
- msgstr ""
--"<qt>您真的要移除 <strong>%1</strong> 工作？"
--"<p><em>提示：您可以選取&quot;修正這些工作&quot;選項來回復已刪除的工作</em></qt>"
-+"<qt>您真的要移除 <strong>%1</strong> 工作？<p><em>提示：您可以選取&quot;修正"
-+"這些工作&quot;選項來回復已刪除的工作</em></qt>"
- 
- #: tom.cc:615
- msgid "Remove Task?"
-diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/libkicker.po kde-i18n-zh_TW-3.5.10/messages/kdebase/libkicker.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/libkicker.po	2008-08-19 20:43:10.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdebase/libkicker.po	2011-11-11 15:45:17.000000000 +0100
-@@ -7,7 +7,7 @@
- "Project-Id-Version: libkicker\n"
- "POT-Creation-Date: 2008-07-31 01:15+0200\n"
- "PO-Revision-Date: 2005-11-27 08:40+0800\n"
--"Last-Translator: Chao-Hsiung Liao <j_h_liau@yahoo.com.tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
-@@ -99,10 +99,12 @@
- #: rc.cpp:33
- #, no-c-format
- msgid ""
--"When this option is enabled, when the panel is placed on the side or top edges "
--"of the screen, the background image will be rotated to match the panel's "
--"orientation"
--msgstr "當此選項啟用時，該面板會置於畫面的側邊或頂端，其背景圖片也會旋轉以符合面板的方向"
-+"When this option is enabled, when the panel is placed on the side or top "
-+"edges of the screen, the background image will be rotated to match the "
-+"panel's orientation"
-+msgstr ""
-+"當此選項啟用時，該面板會置於畫面的側邊或頂端，其背景圖片也會旋轉以符合面板的"
-+"方向"
- 
- #. i18n: file kickerSettings.kcfg line 53
- #: rc.cpp:36
-@@ -114,10 +116,12 @@
- #: rc.cpp:39
- #, no-c-format
- msgid ""
--"Here you can choose an image to be displayed on the panel. Press the 'browse' "
--"button to choose a theme using the file dialog. This option is only effective "
--"if 'Enable background image' is selected"
--msgstr "您可以在這裡選擇要在面板上顯示的圖片。按下「瀏覽」以使用檔案對話盒選擇佈景主題。這個選項只有在選取了「啟用背景圖片」時才會生效。"
-+"Here you can choose an image to be displayed on the panel. Press the "
-+"'browse' button to choose a theme using the file dialog. This option is only "
-+"effective if 'Enable background image' is selected"
-+msgstr ""
-+"您可以在這裡選擇要在面板上顯示的圖片。按下「瀏覽」以使用檔案對話盒選擇布景主"
-+"題。這個選項只有在選取了「啟用背景圖片」時才會生效。"
- 
- #. i18n: file kickerSettings.kcfg line 59
- #: rc.cpp:42
-@@ -154,9 +158,11 @@
- #: rc.cpp:57
- #, no-c-format
- msgid ""
--"Select this option to make applet handles only visible on mouse hover. Applet "
--"handles let you move, remove and configure applets."
--msgstr "選擇這個選項讓面板程式控制桿只有在滑鼠通過時才出現。面板程式控制桿讓您移動、移除與設定面板程式。"
-+"Select this option to make applet handles only visible on mouse hover. "
-+"Applet handles let you move, remove and configure applets."
-+msgstr ""
-+"選擇這個選項讓面板程式控制桿只有在滑鼠通過時才出現。面板程式控制桿讓您移動、"
-+"移除與設定面板程式。"
- 
- #. i18n: file kickerSettings.kcfg line 83
- #: rc.cpp:60
-@@ -168,9 +174,11 @@
- #: rc.cpp:63
- #, no-c-format
- msgid ""
--"Select this option to always hide the applet handles. Beware this could disable "
--"moving, removing or configuring some applets."
--msgstr "選擇這個選項永遠隱藏面板程式控制桿。注意這樣會停用對某些面板程式的移動、移除與設定。"
-+"Select this option to always hide the applet handles. Beware this could "
-+"disable moving, removing or configuring some applets."
-+msgstr ""
-+"選擇這個選項永遠隱藏面板程式控制桿。注意這樣會停用對某些面板程式的移動、移除"
-+"與設定。"
- 
- #. i18n: file kickerSettings.kcfg line 89
- #: rc.cpp:66
-@@ -183,18 +191,22 @@
- #, no-c-format
- msgid ""
- "A list of applets that have been loaded at runtime. In the case of a crash "
--"these applets will not be loaded at the next Kicker start, in case they caused "
--"the crash"
--msgstr "在執行階段已載入的面板程式清單。如果遇到當機的情形時這些面板程式將不會在下次 Kicker 啟動時被載入，以免它們就是造成當機的原兇。"
-+"these applets will not be loaded at the next Kicker start, in case they "
-+"caused the crash"
-+msgstr ""
-+"在執行階段已載入的面板程式清單。如果遇到當機的情形時這些面板程式將不會在下次 "
-+"Kicker 啟動時被載入，以免它們就是造成當機的原兇。"
- 
- #. i18n: file kickerSettings.kcfg line 98
- #: rc.cpp:72
- #, no-c-format
- msgid ""
--"A list of extensions that have been loaded at runtime. In the case of a crash "
--"these extensions will not be loaded at the next Kicker start, in case they "
--"caused the crash"
--msgstr "在執行階段已載入的延伸功能清單。如果遇到當機的情形時這些延伸功能將不會在下次 Kicker 啟動時被載入，以免它們就是造成當機的原兇。"
-+"A list of extensions that have been loaded at runtime. In the case of a "
-+"crash these extensions will not be loaded at the next Kicker start, in case "
-+"they caused the crash"
-+msgstr ""
-+"在執行階段已載入的延伸功能清單。如果遇到當機的情形時這些延伸功能將不會在下次 "
-+"Kicker 啟動時被載入，以免它們就是造成當機的原兇。"
- 
- #. i18n: file kickerSettings.kcfg line 108
- #: rc.cpp:75
-@@ -458,7 +470,9 @@
- "Buttons that represent KServices (applications, primarily) watch for the "
- "removal of the service and delete themselves when this happens. This setting "
- "turns this off."
--msgstr "代表 KServices (主要為應用程式)的按鈕監控該服務的移除並隨後刪除其按鈕。這個設定會關閉此功能。"
-+msgstr ""
-+"代表 KServices (主要為應用程式)的按鈕監控該服務的移除並隨後刪除其按鈕。這個設"
-+"定會關閉此功能。"
- 
- #. i18n: file kickerSettings.kcfg line 329
- #: rc.cpp:207
-diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/libkonq.po kde-i18n-zh_TW-3.5.10/messages/kdebase/libkonq.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/libkonq.po	2007-10-08 12:00:12.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdebase/libkonq.po	2011-11-11 15:45:17.000000000 +0100
-@@ -11,7 +11,7 @@
- "Project-Id-Version: libkonq\n"
- "POT-Creation-Date: 2007-09-26 01:13+0200\n"
- "PO-Revision-Date: 2005-11-25 13:17+0800\n"
--"Last-Translator: Frank Weng <franklin at goodhorse dot idv dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
-@@ -96,7 +96,7 @@
- 
- #: konq_dirpart.cc:222
- msgid "Configure Background..."
--msgstr "設定背景..."
-+msgstr "設定背景…"
- 
- #: konq_dirpart.cc:225
- msgid "Allows choosing of background settings for this view"
-@@ -216,7 +216,7 @@
- 
- #: konq_popupmenu.cc:501
- msgid "Create &Folder..."
--msgstr "建立目錄(&F)..."
-+msgstr "建立目錄(&F)…"
- 
- #: konq_popupmenu.cc:508
- msgid "&Restore"
-@@ -257,11 +257,11 @@
- 
- #: konq_popupmenu.cc:902
- msgid "&Other..."
--msgstr "其他(&O)..."
-+msgstr "其他(&O)…"
- 
- #: konq_popupmenu.cc:906 konq_popupmenu.cc:913
- msgid "&Open With..."
--msgstr "開啟用(&O)..."
-+msgstr "開啟用(&O)…"
- 
- #: konq_popupmenu.cc:933
- msgid "Ac&tions"
-diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/libtaskbar.po kde-i18n-zh_TW-3.5.10/messages/kdebase/libtaskbar.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/libtaskbar.po	2008-08-19 20:43:10.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdebase/libtaskbar.po	2011-11-11 15:45:17.000000000 +0100
-@@ -9,8 +9,7 @@
- "Project-Id-Version: libtaskbar\n"
- "POT-Creation-Date: 2008-08-18 01:16+0200\n"
- "PO-Revision-Date: 2007-02-27 09:12+0800\n"
--"Last-Translator: Frank Weng (a.k.a. Franklin) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Chinese Traditional <zh-l10n@linux.org.tw>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
-@@ -27,11 +26,12 @@
- #: rc.cpp:6
- #, no-c-format
- msgid ""
--"Turning this option off will cause the taskbar to display <b>only</b> "
--"the windows on the current desktop. \\n\\nBy default, this option is selected "
-+"Turning this option off will cause the taskbar to display <b>only</b> the "
-+"windows on the current desktop. \\n\\nBy default, this option is selected "
- "and all windows are shown."
- msgstr ""
--"關掉這個選項會讓工作列<b>只</b>顯示目前桌面上的視窗。\\n\\n預設為開啟，也就是會顯示所有的視窗。"
-+"關掉這個選項會讓工作列<b>只</b>顯示目前桌面上的視窗。\\n\\n預設為開啟，也就是"
-+"會顯示所有的視窗。"
- 
- #. i18n: file taskbar.kcfg line 16
- #: rc.cpp:9
-@@ -43,11 +43,12 @@
- #: rc.cpp:12
- #, no-c-format
- msgid ""
--"Select this option if you want the taskbar to display <b>only</b> "
--"minimized windows. \\n\\nBy default, this option is not selected and the "
--"taskbar will show all windows."
-+"Select this option if you want the taskbar to display <b>only</b> minimized "
-+"windows. \\n\\nBy default, this option is not selected and the taskbar will "
-+"show all windows."
- msgstr ""
--"選擇這個選項會讓工作列<b>只</b>顯示最小化的視窗。\\n\\n預設是關閉的，也就是會顯示所有的視窗。"
-+"選擇這個選項會讓工作列<b>只</b>顯示最小化的視窗。\\n\\n預設是關閉的，也就是會"
-+"顯示所有的視窗。"
- 
- #. i18n: file taskbar.kcfg line 22
- #: rc.cpp:15
-@@ -78,16 +79,18 @@
- #, 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 <em>Show all windows</em> "
--"option.\\n\\nYou can set the taskbar to <strong>Never</strong> "
--"group windows, to <strong>Always</strong> group windows or to group windows "
--"only <strong>When the Taskbar is Full</strong>.\\n\\nBy default the taskbar "
-+"window group buttons are clicked on a menu appears showing all the windows "
-+"in that group. This can be especially useful with the <em>Show all windows</"
-+"em> option.\\n\\nYou can set the taskbar to <strong>Never</strong> group "
-+"windows, to <strong>Always</strong> group windows or to group windows only "
-+"<strong>When the Taskbar is Full</strong>.\\n\\nBy default the taskbar "
- "groups windows when it is full."
- msgstr ""
--"工作列可以將類似的視窗歸類成一個群組，並提供一個按鍵。當按下群組按鍵時，會出現一個選單選擇您要用的視窗。這在您打開<em>顯示所有視窗</em>"
--"時特別好用。\\n\\n您也可以將工作列設定成<strong>從不</strong>這樣做，或是<strong>總是</strong>"
--"這樣做，或是<strong>當工作列滿了</strong>才這樣做。\\n\\n預設為工作列滿了之後才歸類成群組。"
-+"工作列可以將類似的視窗歸類成一個群組，並提供一個按鍵。當按下群組按鍵時，會出"
-+"現一個選單選擇您要用的視窗。這在您打開<em>顯示所有視窗</em>時特別好用。\\n\\n"
-+"您也可以將工作列設定成<strong>從不</strong>這樣做，或是<strong>總是</strong>"
-+"這樣做，或是<strong>當工作列滿了</strong>才這樣做。\\n\\n預設為工作列滿了之後"
-+"才歸類成群組。"
- 
- #. i18n: file taskbar.kcfg line 37
- #: rc.cpp:30
-@@ -101,8 +104,7 @@
- msgid ""
- "Selecting this option causes the taskbar to show windows in order of the "
- "desktop they appear on.\\n\\nBy default this option is selected."
--msgstr ""
--"選擇這個選項，工作列會依桌面排序視窗。\\n\\n預設是開啟。"
-+msgstr "選擇這個選項，工作列會依桌面排序視窗。\\n\\n預設是開啟。"
- 
- #. i18n: file taskbar.kcfg line 42
- #: rc.cpp:36
-@@ -116,8 +118,7 @@
- msgid ""
- "Selecting this option causes the taskbar to show windows ordered by "
- "application.\\n\\nBy default this option is selected."
--msgstr ""
--"選擇這個選項，工作列會依應用程式排序視窗。\\n\\n預設是開啟。"
-+msgstr "選擇這個選項，工作列會依應用程式排序視窗。\\n\\n預設是開啟。"
- 
- #. i18n: file taskbar.kcfg line 47
- #: rc.cpp:42
-@@ -129,10 +130,11 @@
- #: rc.cpp:45
- #, no-c-format
- msgid ""
--"Select this option if you want window icons to appear along with their titles "
--"in the taskbar.\\n\\nBy default this option is selected."
-+"Select this option if you want window icons to appear along with their "
-+"titles in the taskbar.\\n\\nBy default this option is selected."
- msgstr ""
--"如果您要在工作列前面顯示應用成式的圖示，就可以打開這個選項。\\n\\n預設是開啟。"
-+"如果您要在工作列前面顯示應用成式的圖示，就可以打開這個選項。\\n\\n預設是開"
-+"啟。"
- 
- #. i18n: file taskbar.kcfg line 64
- #: rc.cpp:48
-@@ -145,10 +147,11 @@
- #, no-c-format
- msgid ""
- "Turning this option off will cause the taskbar to display <b>only</b> "
--"windows which are on the same Xinerama screen as the taskbar.\\n\\nBy default, "
--"this option is selected and all windows are shown."
-+"windows which are on the same Xinerama screen as the taskbar.\\n\\nBy "
-+"default, this option is selected and all windows are shown."
- msgstr ""
--"關掉這個選項，工作列就<b>只</b>會顯示同一個 Xinerama 螢幕內的視窗。\\n\\n預設是開啟，也就是會顯示所有的視窗。"
-+"關掉這個選項，工作列就<b>只</b>會顯示同一個 Xinerama 螢幕內的視窗。\\n\\n預設"
-+"是開啟，也就是會顯示所有的視窗。"
- 
- #. i18n: file taskbar.kcfg line 74
- #: rc.cpp:54
-@@ -162,7 +165,8 @@
- 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 taskbar.kcfg line 87
- #: rc.cpp:60
-@@ -228,9 +232,11 @@
- #: rc.cpp:90
- #, no-c-format
- msgid ""
--"The number of times to blink a taskbar button when a window asks for attention. "
--"Setting this to 1000 or greater causes the button to blink forever."
--msgstr "當視窗要求使用者注意時，要閃爍工作列的按鍵幾次。設定 1000 次以上表示不停止。"
-+"The number of times to blink a taskbar button when a window asks for "
-+"attention. Setting this to 1000 or greater causes the button to blink "
-+"forever."
-+msgstr ""
-+"當視窗要求使用者注意時，要閃爍工作列的按鍵幾次。設定 1000 次以上表示不停止。"
- 
- #. i18n: file taskbar.kcfg line 130
- #: rc.cpp:93
-@@ -242,8 +248,8 @@
- #: rc.cpp:96
- #, no-c-format
- msgid ""
--"Turning this option on will cause the taskbar to draw visible button frames for "
--"each entry in the taskbar. \\n\\nBy default, this option is off."
-+"Turning this option on will cause the taskbar to draw visible button frames "
-+"for each entry in the taskbar. \\n\\nBy default, this option is off."
- msgstr ""
- "打開這個選項的話，工作列上就不會用按鈕來顯示視窗與工作。\\n\\n預設為關閉。"
- 
-@@ -257,10 +263,12 @@
- #: rc.cpp:102
- #, no-c-format
- msgid ""
--"Turning this option on will cause the taskbar to draw fancier text that has an "
--"outline around it. While this is useful for transparent panels or particularly "
--"dark panel backgrounds, it is slower."
--msgstr "打開這個選項的話，工具列上的文字會以較花俏的方式顯現，外面會有一圈外環。這對透明的面板，或是較暗的面板來說特別有用，但是會變比較慢。"
-+"Turning this option on will cause the taskbar to draw fancier text that has "
-+"an outline around it. While this is useful for transparent panels or "
-+"particularly dark panel backgrounds, it is slower."
-+msgstr ""
-+"打開這個選項的話，工具列上的文字會以較花俏的方式顯現，外面會有一圈外環。這對"
-+"透明的面板，或是較暗的面板來說特別有用，但是會變比較慢。"
- 
- #. i18n: file taskbar.kcfg line 140
- #: rc.cpp:105
-@@ -279,13 +287,12 @@
- #, no-c-format
- msgid ""
- "Enabling this option will draw a thumbnail of the window in its mouse-over "
--"effect."
--"<p>If a window is minimized or resides on a different desktop while the taskbar "
--"is starting, an icon is shown until the window is restored or the appropriate "
--"desktop is activated, respectively.</p>"
-+"effect.<p>If a window is minimized or resides on a different desktop while "
-+"the taskbar is starting, an icon is shown until the window is restored or "
-+"the appropriate desktop is activated, respectively.</p>"
- msgstr ""
--"開啟這個選項，在滑鼠位置上會顯示極小的視窗。 "
--"<p>如果視窗已經最小化，或是在另一個桌面的話，就會使用圖示，直到切到該桌面或是叫出此視窗。</p>"
-+"開啟這個選項，在滑鼠位置上會顯示極小的視窗。 <p>如果視窗已經最小化，或是在另"
-+"一個桌面的話，就會使用圖示，直到切到該桌面或是叫出此視窗。</p>"
- 
- #. i18n: file taskbar.kcfg line 149
- #: rc.cpp:114
-@@ -297,11 +304,12 @@
- #: rc.cpp:117
- #, no-c-format
- msgid ""
--"A thumbnail is created by resizing the window. The scaling factor is determined "
--"by its largest dimension and this value. In doing so, the thumbnail's size will "
--"not exceed this value in any dimension."
-+"A thumbnail is created by resizing the window. The scaling factor is "
-+"determined by its largest dimension and this value. In doing so, the "
-+"thumbnail's size will not exceed this value in any dimension."
- msgstr ""
--"極小視窗其實是把視窗重新調整大小，調整的比例是由最大的維度(dimension)與此值來決定。設定此值，則極小視窗大小不會在任一維度超過這個值。"
-+"極小視窗其實是把視窗重新調整大小，調整的比例是由最大的維度(dimension)與此值來"
-+"決定。設定此值，則極小視窗大小不會在任一維度超過這個值。"
- 
- #. i18n: file taskbar.kcfg line 154
- #: rc.cpp:120
-@@ -313,8 +321,8 @@
- #: rc.cpp:123
- #, no-c-format
- msgid ""
--"Turning this option on will allow choosing your own colors for taskbar buttons "
--"text and background."
-+"Turning this option on will allow choosing your own colors for taskbar "
-+"buttons text and background."
- msgstr "開啟這個選項的話，您可以選擇在工作列上按鈕的文字顏色，以及其背景顏色。"
- 
- #. i18n: file taskbar.kcfg line 158
-@@ -341,8 +349,8 @@
- #: rc.cpp:135
- #, no-c-format
- msgid ""
--"This color is used for displaying text on taskbar button for tasks other than "
--"active."
-+"This color is used for displaying text on taskbar button for tasks other "
-+"than active."
- msgstr "這個顏色會用於目前未活動中工作按鈕上的文字。"
- 
- #. i18n: file taskbar.kcfg line 168
-@@ -371,7 +379,7 @@
- 
- #: taskcontainer.cpp:1517
- msgid "Loading application ..."
--msgstr "載入應用程式中..."
-+msgstr "載入應用程式中…"
- 
- #: taskcontainer.cpp:1581
- msgid "On all desktops"
-diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/libtaskmanager.po kde-i18n-zh_TW-3.5.10/messages/kdebase/libtaskmanager.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/libtaskmanager.po	2007-10-08 12:00:12.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdebase/libtaskmanager.po	2011-11-11 15:45:17.000000000 +0100
-@@ -8,7 +8,7 @@
- "Report-Msgid-Bugs-To: \n"
- "POT-Creation-Date: 2007-08-31 01:13+0200\n"
- "PO-Revision-Date: 2005-08-25 13:03+0800\n"
--"Last-Translator: Paladin Liu <paladin@ms1.hinet.net>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: zh-l10n <zh-l10n@linux.org.tw>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
-@@ -91,7 +91,7 @@
- msgstr "所有的桌面(&A)"
- 
- #~ msgid "&Always on Top"
--#~ msgstr "維持在頂端 (&A)"
-+#~ msgstr "維持在頂端(&A)"
- 
- #~ msgid "&Restore"
--#~ msgstr "還原 (&R)"
-+#~ msgstr "還原(&R)"
-diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/lockout.po kde-i18n-zh_TW-3.5.10/messages/kdebase/lockout.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/lockout.po	2008-08-19 20:43:10.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdebase/lockout.po	2011-11-11 15:45:17.000000000 +0100
-@@ -6,10 +6,10 @@
- #
- msgid ""
- msgstr ""
--"Project-Id-Version: PACKAGE VERSION\n"
-+"Project-Id-Version: lockout\n"
- "POT-Creation-Date: 2008-08-18 01:16+0200\n"
- "PO-Revision-Date: 2005-11-25 12:42+0800\n"
--"Last-Translator: Frank Weng <franklin at goodhorse dot idv dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
-@@ -33,12 +33,12 @@
- 
- #: lockout.cpp:210
- msgid "&Configure Screen Saver..."
--msgstr "設定螢幕保護程式(&C)..."
-+msgstr "設定螢幕保護程式(&C)…"
- 
- #: lockout.cpp:226
- msgid "&Log Out..."
--msgstr "登出(&L)..."
-+msgstr "登出(&L)…"
- 
- #: lockout.cpp:231
- msgid "&Configure Session Manager..."
--msgstr "設定 Session 管理員(&C)..."
-+msgstr "設定 Session 管理員(&C)…"
-diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/mediaapplet.po kde-i18n-zh_TW-3.5.10/messages/kdebase/mediaapplet.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/mediaapplet.po	2008-08-19 20:43:10.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdebase/mediaapplet.po	2011-11-11 15:45:17.000000000 +0100
-@@ -1,14 +1,14 @@
- # Chinese/Traditional translation of mediaapplet.
- # Woodman Tuen <wmtuen@gmail.com>, 2005.
--# 
--# 
-+#
-+#
- msgid ""
- msgstr ""
- "Project-Id-Version: mediaapplet\n"
- "Report-Msgid-Bugs-To: \n"
- "POT-Creation-Date: 2008-07-31 01:15+0200\n"
- "PO-Revision-Date: 2005-08-25 12:59+0800\n"
--"Last-Translator: Woodman Tuen <wmtuen@gmail.com>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Chinese/Traditional <zh-l10n@linux.org.tw>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
-@@ -48,7 +48,7 @@
- 
- #: mediaapplet.cpp:433
- msgid "&Configure..."
--msgstr "設定(&C)..."
-+msgstr "設定(&C)…"
- 
- #: preferencesdialog.cpp:61
- msgid "Media Applet Preferences"
-diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/naughtyapplet.po kde-i18n-zh_TW-3.5.10/messages/kdebase/naughtyapplet.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/naughtyapplet.po	2008-08-19 20:43:10.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdebase/naughtyapplet.po	2011-11-11 15:45:17.000000000 +0100
-@@ -8,7 +8,7 @@
- "Report-Msgid-Bugs-To: \n"
- "POT-Creation-Date: 2008-08-19 01:16+0200\n"
- "PO-Revision-Date: 2005-08-25 12:50+0800\n"
--"Last-Translator: Yuan-Chen Cheng <ycheng@slat.org>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Traditional Chinese <zh-l10n@linux.org.tw>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
-@@ -16,11 +16,12 @@
- 
- #: NaughtyApplet.cpp:111
- msgid ""
--"A program called '%1' is slowing down the others on your machine. It may have a "
--"bug that is causing this, or it may just be busy.\n"
-+"A program called '%1' is slowing down the others on your machine. It may "
-+"have a bug that is causing this, or it may just be busy.\n"
- "Would you like to try to stop the program?"
- msgstr ""
--"一個名為‘%1’的程式正在降低您的系統的速度。這可能是一個臭蟲所引致，或許可能是程式正在忙碌。\n"
-+"一個名為‘%1’的程式正在降低您的系統的速度。這可能是一個臭蟲所引致，或許可能是"
-+"程式正在忙碌。\n"
- "您要嘗試中止程式嗎？"
- 
- #: NaughtyApplet.cpp:116
-diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/nsplugin.po kde-i18n-zh_TW-3.5.10/messages/kdebase/nsplugin.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/nsplugin.po	2008-02-13 10:55:26.000000000 +0100
-+++ kde-i18n-zh_TW-3.5.10/messages/kdebase/nsplugin.po	2011-11-11 15:45:17.000000000 +0100
-@@ -9,7 +9,7 @@
- "Report-Msgid-Bugs-To: \n"
- "POT-Creation-Date: 2007-12-22 01:14+0100\n"
- "PO-Revision-Date: 2005-08-25 12:47+0800\n"
--"Last-Translator: Yuan-Chen Cheng <ycheng@slat.org>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Traditional Chinese <zh-l10n@linux.org.tw>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
-@@ -37,7 +37,7 @@
- 
- #: plugin_part.cpp:220
- msgid "&Save As..."
--msgstr "另存為(&S)..."
-+msgstr "另存為(&S)…"
- 
- #: plugin_part.cpp:301
- #, c-format
-@@ -81,9 +81,11 @@
- 
- #: viewer/viewer.cpp:280
- msgid ""
--"There was an error connecting to the Desktop communications server. Please make "
--"sure that the 'dcopserver' process has been started, and then try again."
--msgstr "當連線到 DCOP 伺服器發生了錯誤。請確認 'dcopserver' 這個程式有啟動，然後再試一次。"
-+"There was an error connecting to the Desktop communications server. Please "
-+"make sure that the 'dcopserver' process has been started, and then try again."
-+msgstr ""
-+"當連線到 DCOP 伺服器發生了錯誤。請確認 'dcopserver' 這個程式有啟動，然後再試"
-+"一次。"
- 
- #: viewer/viewer.cpp:284
- msgid "Error Connecting to DCOP Server"
-diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/privacy.po kde-i18n-zh_TW-3.5.10/messages/kdebase/privacy.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/privacy.po	2008-08-19 20:43:10.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdebase/privacy.po	2011-11-11 15:45:17.000000000 +0100
-@@ -11,7 +11,7 @@
- "Report-Msgid-Bugs-To: \n"
- "POT-Creation-Date: 2008-07-08 01:18+0200\n"
- "PO-Revision-Date: 2005-08-25 12:43+0800\n"
--"Last-Translator: Keng-Tso Ou <jupiter@ocool.org>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
-@@ -33,7 +33,8 @@
- msgid ""
- "The privacy module allows a user to erase traces which KDE leaves on the "
- "system, such as command histories or browser caches."
--msgstr "此隱私模組讓使用者消除 KDE 遺留在系統中的痕跡，例如指令的歷史紀錄或網頁快取。"
-+msgstr ""
-+"此隱私模組讓使用者消除 KDE 遺留在系統中的痕跡，例如指令的歷史紀錄或網頁快取。"
- 
- #: privacy.cpp:49
- msgid "kcm_privacy"
-@@ -107,8 +108,8 @@
- 
- #: privacy.cpp:112
- msgid ""
--"Check all cleanup actions you would like to perform. These will be executed by "
--"pressing the button below"
-+"Check all cleanup actions you would like to perform. These will be executed "
-+"by pressing the button below"
- msgstr "選取所有要清除動作。按下下面的按鈕就可執行選取的動作。"
- 
- #: privacy.cpp:113
-@@ -121,7 +122,8 @@
- 
- #: privacy.cpp:116
- msgid ""
--"Clears the history of commands run through the Run Command tool on the desktop"
-+"Clears the history of commands run through the Run Command tool on the "
-+"desktop"
- msgstr "清除桌面指令執行工具的指令執行紀錄"
- 
- #: privacy.cpp:117
-@@ -164,11 +166,11 @@
- 
- #: privacy.cpp:254
- msgid "Starting cleanup..."
--msgstr "開始清除..."
-+msgstr "開始清除…"
- 
- #: privacy.cpp:263
- msgid "Clearing %1..."
--msgstr "正在清除 %1..."
-+msgstr "正在清除 %1…"
- 
- #: privacy.cpp:298
- msgid "Clearing of %1 failed"
-diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/quicklauncher.po kde-i18n-zh_TW-3.5.10/messages/kdebase/quicklauncher.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/quicklauncher.po	2008-08-19 20:43:10.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdebase/quicklauncher.po	2011-11-11 15:45:17.000000000 +0100
-@@ -7,7 +7,7 @@
- "Project-Id-Version: quicklauncher\n"
- "POT-Creation-Date: 2008-07-31 01:15+0200\n"
- "PO-Revision-Date: 2005-11-29 19:42+0800\n"
--"Last-Translator: Chao-Hsiung Liao <j_h_liau@yahoo.com.tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Chinese (traditional) <zh-L10n@linux.org.tw>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
-@@ -39,7 +39,7 @@
- 
- #: quicklauncher.cpp:110
- msgid "Configure Quicklauncher..."
--msgstr "設定快速啟動程式..."
-+msgstr "設定快速啟動程式…"
- 
- #: quicklauncher.cpp:175
- msgid "Remove Application"
-@@ -67,7 +67,7 @@
- #: rc.cpp:6
- #, no-c-format
- msgid "Layout"
--msgstr "佈局"
-+msgstr "布局"
- 
- #. i18n: file configdlgbase.ui line 46
- #: rc.cpp:9
-diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/trashapplet.po kde-i18n-zh_TW-3.5.10/messages/kdebase/trashapplet.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/trashapplet.po	2006-07-22 10:04:12.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdebase/trashapplet.po	2011-11-11 15:45:17.000000000 +0100
-@@ -1,15 +1,15 @@
- # Chinese/Traditional translation of trashapplet.
- # Woodman Tuen <wmtuen@gmail.com>, 2005.
--# 
--# 
--# 
-+#
-+#
-+#
- msgid ""
- msgstr ""
- "Project-Id-Version: trashapplet\n"
- "Report-Msgid-Bugs-To: \n"
- "POT-Creation-Date: 2005-09-27 02:32+0200\n"
- "PO-Revision-Date: 2005-08-25 12:26+0800\n"
--"Last-Translator: Woodman Tuen <wmtuen@gmail.com>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Chinese/Traditional <zh-l10n@linux.org.tw>\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/useraccount.po kde-i18n-zh_TW-3.5.10/messages/kdebase/useraccount.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/useraccount.po	2008-08-19 20:43:10.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdebase/useraccount.po	2011-11-11 15:45:17.000000000 +0100
-@@ -7,7 +7,7 @@
- "Project-Id-Version: useraccount\n"
- "POT-Creation-Date: 2008-07-08 01:18+0200\n"
- "PO-Revision-Date: 2005-08-11 12:36+0800\n"
--"Last-Translator: Stanley Wong <stanley18fan0k@yahoo.com.hk>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
-@@ -35,11 +35,11 @@
- 
- #: chfacedlg.cpp:79
- msgid "Custom &Image..."
--msgstr "自訂影像(&I)..."
-+msgstr "自訂影像(&I)…"
- 
- #: chfacedlg.cpp:83
- msgid "&Acquire Image..."
--msgstr "取得影像(&A)..."
-+msgstr "取得影像(&A)…"
- 
- #: chfacedlg.cpp:104
- msgid "(Custom)"
-@@ -68,7 +68,7 @@
- 
- #: main.cpp:68
- msgid "Change &Password..."
--msgstr "更改密碼(&P)..."
-+msgstr "更改密碼(&P)…"
- 
- #: main.cpp:81
- msgid "kcm_useraccount"
-@@ -100,15 +100,17 @@
- 
- #: main.cpp:100
- msgid ""
--"<qt>Here you can change your personal information, which will be used in mail "
--"programs and word processors, for example. You can change your login password "
--"by clicking <em>Change Password</em>.</qt>"
--msgstr "<qt>在這裏您可以更改您的個人資訊。它們會被郵件程式、文字處理器等程式使用到。您可以按<em>更改密碼</em>來更改您的登入密碼。"
-+"<qt>Here you can change your personal information, which will be used in "
-+"mail programs and word processors, for example. You can change your login "
-+"password by clicking <em>Change Password</em>.</qt>"
-+msgstr ""
-+"<qt>在這裏您可以更改您的個人資訊。它們會被郵件程式、文字處理器等程式使用到。"
-+"您可以按<em>更改密碼</em>來更改您的登入密碼。"
- 
- #: main.cpp:115
- msgid ""
--"A program error occurred: the internal program 'kdepasswd' could not be found. "
--"You will not be able to change your password."
-+"A program error occurred: the internal program 'kdepasswd' could not be "
-+"found. You will not be able to change your password."
- msgstr "發生程式錯誤：找不到內部程式 'kdepasswd'。您將無法更改您的密碼。"
- 
- #: main.cpp:213
-@@ -204,7 +206,7 @@
- #: rc.cpp:27
- #, no-c-format
- msgid "Change Password..."
--msgstr "更改密碼..."
-+msgstr "更改密碼…"
- 
- #. i18n: file main_widget.ui line 232
- #: rc.cpp:30
-diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdeedu/blinken.po kde-i18n-zh_TW-3.5.10/messages/kdeedu/blinken.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdeedu/blinken.po	2006-07-22 10:04:14.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdeedu/blinken.po	2011-11-11 15:45:17.000000000 +0100
-@@ -6,8 +6,7 @@
- "Project-Id-Version: blinken\n"
- "POT-Creation-Date: 2006-02-24 03:55+0100\n"
- "PO-Revision-Date: 2006-06-16 16:02+0800\n"
--"Last-Translator: Frank Weng (a.k.a. Franklin) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Traditional Chinese <zh_l10n@linux.org.tw>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
-@@ -36,10 +35,10 @@
- 
- #: blinken.cpp:78
- msgid ""
--"_: If the Steve font that is used by bliken by default to show status messages "
--"does not support any of the characters of your language, please translate that "
--"message to 1 and KDE standard font will be used to show the texts, if not "
--"translate it to 0\n"
-+"_: If the Steve font that is used by bliken by default to show status "
-+"messages does not support any of the characters of your language, please "
-+"translate that message to 1 and KDE standard font will be used to show the "
-+"texts, if not translate it to 0\n"
- "0"
- msgstr "1"
- 
-@@ -101,31 +100,31 @@
- 
- #: blinken.cpp:574
- msgid "Set the Difficulty Level..."
--msgstr "設定難度等級..."
-+msgstr "設定難度等級…"
- 
- #: blinken.cpp:579
- msgid "Next sequence in 3..."
--msgstr "下一個序列來了，倒數三..."
-+msgstr "下一個序列來了，倒數三…"
- 
- #: blinken.cpp:584
- msgid "Next sequence in 3, 2..."
--msgstr "下一個序列來了，倒數三...二..."
-+msgstr "下一個序列來了，倒數三…二..."
- 
- #: blinken.cpp:585
- msgid "Next sequence in 2..."
--msgstr "下一個序列來了，倒數二..."
-+msgstr "下一個序列來了，倒數二…"
- 
- #: blinken.cpp:590
- msgid "Next sequence in 3, 2, 1..."
--msgstr "下一個序列來了，倒數三...二...一..."
-+msgstr "下一個序列來了，倒數三…二...一..."
- 
- #: blinken.cpp:591
- msgid "Next sequence in 2, 1..."
--msgstr "下一個序列來了，倒數二...一..."
-+msgstr "下一個序列來了，倒數二…一..."
- 
- #: blinken.cpp:596
- msgid "Remember this sequence..."
--msgstr "記住這個序列..."
-+msgstr "記住這個序列…"
- 
- #: blinken.cpp:601
- msgid "Repeat the sequence!"
-diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdeedu/kalzium.po kde-i18n-zh_TW-3.5.10/messages/kdeedu/kalzium.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdeedu/kalzium.po	2008-08-19 20:43:13.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdeedu/kalzium.po	2011-11-11 15:45:17.000000000 +0100
-@@ -6,8 +6,7 @@
- "Project-Id-Version: kalzium\n"
- "POT-Creation-Date: 2008-07-08 01:24+0200\n"
- "PO-Revision-Date: 2006-10-16 12:47+0800\n"
--"Last-Translator: Frank Weng (a.k.a. Franklin) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Chinese Traditional <zh-l10n@linux.org.tw>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
-@@ -140,8 +139,8 @@
- 
- #: detailinfodlg.cpp:224
- msgid ""
--"_: the first variable is a number. The result is for example '1.' or '5.', the "
--"second is the value of the ionisation energy\n"
-+"_: the first variable is a number. The result is for example '1.' or '5.', "
-+"the second is the value of the ionisation energy\n"
- "%1. Ionization energy: %2"
- msgstr "%1. 游離能：%2"
- 
-@@ -559,15 +558,15 @@
- 
- #: kalzium.cpp:148
- msgid "&Equation Solver..."
--msgstr "化學方程式計算機(&E)..."
-+msgstr "化學方程式計算機(&E)…"
- 
- #: kalzium.cpp:152
- msgid "&Plot Data..."
--msgstr "繪製資料(&P)..."
-+msgstr "繪製資料(&P)…"
- 
- #: kalzium.cpp:153
- msgid "&Glossary..."
--msgstr "術語表(&G)..."
-+msgstr "術語表(&G)…"
- 
- #: kalzium.cpp:156 kalzium.cpp:181 kalzium.cpp:298
- msgid "Show &Legend"
-@@ -702,15 +701,13 @@
- msgid ""
- "_: For example: \"1 Carbon\" or \"3 Oxygen\"\n"
- "%1 %2\n"
--msgstr ""
--"%1 %2\n"
-+msgstr "%1 %2\n"
- 
- #: molcalcwidget.cpp:90
- msgid ""
- "_: For example: 1 Seaborgium. Cumulative Mass: 263.119 u (39.25%)\n"
- "%1 %2. Cumulative Mass: %3 u (%4%)\n"
--msgstr ""
--"%1 %2 累積質量 %3 u（%4%）\n"
-+msgstr "%1 %2 累積質量 %3 u（%4%）\n"
- 
- #: molcalcwidget.cpp:103
- msgid "Molecular mass: %1 u"
-@@ -732,7 +729,8 @@
- " is being filled last. For example, all elements in the s-block\n"
- " fill up the s-orbits."
- msgstr ""
--"週期表可以分為 s-、p-、d- 與 f- 四個區塊。四個字母分別指出哪個軌道最後才被填入。例如，所有在 s- 區塊的元素都是最後才會填入 s- 軌道。"
-+"週期表可以分為 s-、p-、d- 與 f- 四個區塊。四個字母分別指出哪個軌道最後才被填"
-+"入。例如，所有在 s- 區塊的元素都是最後才會填入 s- 軌道。"
- 
- #: periodictableview.cpp:449
- msgid ""
-@@ -1278,9 +1276,11 @@
- #: rc.cpp:219
- #, no-c-format
- msgid ""
--"If selected, the temperatures will be displayed in Kelvin. This is then saved "
--"in configuration and restored next time you start Kalzium."
--msgstr "選取此選項的話，溫度會以絕對溫度（Kelvin，K）為單位來顯示。此選項會儲存在設定中，並且在下次啟動 Kalzium 時回復。"
-+"If selected, the temperatures will be displayed in Kelvin. This is then "
-+"saved in configuration and restored next time you start Kalzium."
-+msgstr ""
-+"選取此選項的話，溫度會以絕對溫度（Kelvin，K）為單位來顯示。此選項會儲存在設定"
-+"中，並且在下次啟動 Kalzium 時回復。"
- 
- #. i18n: file settings_units.ui line 55
- #: rc.cpp:222
-@@ -1298,9 +1298,11 @@
- #: rc.cpp:228
- #, no-c-format
- msgid ""
--"If selected, the temperatures will be displayed in Degrees Fahrenheit. This is "
--"then saved in configuration and restored next time you start Kalzium."
--msgstr "選取此選項的話，溫度會以華氏溫度（Fahrenheit，F）為單位來顯示。此選項會儲存在設定中，並且在下次啟動 Kalzium 時回復。"
-+"If selected, the temperatures will be displayed in Degrees Fahrenheit. This "
-+"is then saved in configuration and restored next time you start Kalzium."
-+msgstr ""
-+"選取此選項的話，溫度會以華氏溫度（Fahrenheit，F）為單位來顯示。此選項會儲存在"
-+"設定中，並且在下次啟動 Kalzium 時回復。"
- 
- #. i18n: file settings_units.ui line 72
- #: rc.cpp:231
-@@ -1320,7 +1322,9 @@
- msgid ""
- "If selected, the temperatures will be displayed in Degrees Rankine. This is "
- "then saved in configuration and restored next time you start Kalzium."
--msgstr "選取此選項的話，溫度會以雷氏溫度（Rankine，Ra）為單位來顯示。此選項會儲存在設定中，並且在下次啟動 Kalzium 時回復。"
-+msgstr ""
-+"選取此選項的話，溫度會以雷氏溫度（Rankine，Ra）為單位來顯示。此選項會儲存在設"
-+"定中，並且在下次啟動 Kalzium 時回復。"
- 
- #
- #. i18n: file settings_units.ui line 89
-@@ -1341,7 +1345,9 @@
- msgid ""
- "If selected, the temperatures will be displayed in Degrees Réaumur. This is "
- "then saved in configuration and restored next time you start Kalzium."
--msgstr "選取此選項的話，溫度會以列氏溫度（Réaumur，Ré）為單位來顯示。此選項會儲存在設定中，並且在下次啟動 Kalzium 時回復。"
-+msgstr ""
-+"選取此選項的話，溫度會以列氏溫度（Réaumur，Ré）為單位來顯示。此選項會儲存在設"
-+"定中，並且在下次啟動 Kalzium 時回復。"
- 
- #. i18n: file settings_units.ui line 106
- #: rc.cpp:249
-@@ -1361,7 +1367,9 @@
- msgid ""
- "If selected, the temperatures will be displayed in Degrees Celsius. This is "
- "then saved in configuration and restored next time you start Kalzium."
--msgstr "選取此選項的話，溫度會以攝氏溫度（Celsius，C）為單位來顯示。此選項會儲存在設定中，並且在下次啟動 Kalzium 時回復。"
-+msgstr ""
-+"選取此選項的話，溫度會以攝氏溫度（Celsius，C）為單位來顯示。此選項會儲存在設"
-+"定中，並且在下次啟動 Kalzium 時回復。"
- 
- #. i18n: file settings_units.ui line 125
- #: rc.cpp:258
-@@ -1387,7 +1395,9 @@
- msgid ""
- "Check this if you prefer the energy unit in  kJ/mol (kilojoule per mol). The "
- "other choice you have is eV (electronvolt)."
--msgstr "如果您打算以 kJ/mol（千焦耳/每莫耳）做為能量單位，則勾選此選項。另外您也可以選擇 eV（電子伏特）。"
-+msgstr ""
-+"如果您打算以 kJ/mol（千焦耳/每莫耳）做為能量單位，則勾選此選項。另外您也可以"
-+"選擇 eV（電子伏特）。"
- 
- #. i18n: file settings_units.ui line 153
- #: rc.cpp:270
-@@ -1405,9 +1415,11 @@
- #: rc.cpp:276
- #, no-c-format
- msgid ""
--"Check this if you prefer the energy unit in eV (electronvolt). The other choice "
--"you have is kJ/mol (kilojoule per mol)."
--msgstr "如果您打算以 eV（電子伏特）做為能量單位，則勾選此選項。另外您也可以選擇 kJ/mol（千焦耳/每莫耳）。"
-+"Check this if you prefer the energy unit in eV (electronvolt). The other "
-+"choice you have is kJ/mol (kilojoule per mol)."
-+msgstr ""
-+"如果您打算以 eV（電子伏特）做為能量單位，則勾選此選項。另外您也可以選擇 kJ/"
-+"mol（千焦耳/每莫耳）。"
- 
- #. i18n: file somwidget.ui line 48
- #: rc.cpp:279
-@@ -1430,8 +1442,8 @@
- #: rc.cpp:287
- #, no-c-format
- msgid ""
--"This page gives an overview about the spectrum this element. With the mouse you "
--"can zoom into the spectrum."
-+"This page gives an overview about the spectrum this element. With the mouse "
-+"you can zoom into the spectrum."
- msgstr "此頁可以給您此元素的光譜概觀。您可以用滑鼠來縮放光譜。"
- 
- #. i18n: file spectrumview.ui line 19
-@@ -1815,9 +1827,11 @@
- #. i18n: file data/data.xml line 214
- #: rc.cpp:585
- msgid ""
--"Boron means 'Bor(ax) + (carb)on'. It is found in borax and behaves a lot like "
--"carbon"
--msgstr "「硼」（Boron）為 Bor(ax) 與 (carb)on 的合體字。它在硼酸（Borax）內發現，而性質跟碳（Carbon）很相近"
-+"Boron means 'Bor(ax) + (carb)on'. It is found in borax and behaves a lot "
-+"like carbon"
-+msgstr ""
-+"「硼」（Boron）為 Bor(ax) 與 (carb)on 的合體字。它在硼酸（Borax）內發現，而性"
-+"質跟碳（Carbon）很相近"
- 
- #. i18n: file data/data.xml line 260
- #: rc.cpp:587
-@@ -1919,7 +1933,9 @@
- msgid ""
- "It was discovered near a town named Magnesia in a black earth. Thus. it was "
- "named 'magnesia nigra'. short: Manganese"
--msgstr "這是在一個叫做 Magnesia 附近的黑色土壤中發現的，因此被命名為 \"magnesia nigra\"，簡稱 Manganese。"
-+msgstr ""
-+"這是在一個叫做 Magnesia 附近的黑色土壤中發現的，因此被命名為 \"magnesia nigra"
-+"\"，簡稱 Manganese。"
- 
- #. i18n: file data/data.xml line 1325
- #: rc.cpp:627
-@@ -1992,7 +2008,8 @@
- "Named after the small town of Ytterby near Stockholm in Sweden. Terbium. "
- "Ytterbium and Gadolinium are also named after this town."
- msgstr ""
--"依瑞典斯德哥爾摩附近的一個小城 Ytterby 命名。鋱（Terbium），鐿（Ytterbium）與釓（Gadolinium）也是依這個城市而命名的。"
-+"依瑞典斯德哥爾摩附近的一個小城 Ytterby 命名。鋱（Terbium），鐿（Ytterbium）與"
-+"釓（Gadolinium）也是依這個城市而命名的。"
- 
- #. i18n: file data/data.xml line 2023
- #: rc.cpp:655
-@@ -2106,9 +2123,11 @@
- #. i18n: file data/data.xml line 3080
- #: rc.cpp:697
- msgid ""
--"Named after the greek Prometheus. Prometheus stole the fire from the gods and "
--"gave it to mankind."
--msgstr "依希臘神話中的普羅米修斯（Prometheus）命名。普羅米修斯從神殿中偷取火送到人間。"
-+"Named after the greek Prometheus. Prometheus stole the fire from the gods "
-+"and gave it to mankind."
-+msgstr ""
-+"依希臘神話中的普羅米修斯（Prometheus）命名。普羅米修斯從神殿中偷取火送到人"
-+"間。"
- 
- #. i18n: file data/data.xml line 3115
- #: rc.cpp:699
-@@ -2143,9 +2162,11 @@
- #. i18n: file data/data.xml line 3335
- #: rc.cpp:711
- msgid ""
--"Named ofter the Swedish town of Ytterby. Terbium and Ytterbium are also named "
--"after this town."
--msgstr "依瑞典城市 Ytterby 命名。鋱（Terbium）跟鐿（Ytterbium）也是依這個城市而命名的。"
-+"Named ofter the Swedish town of Ytterby. Terbium and Ytterbium are also "
-+"named after this town."
-+msgstr ""
-+"依瑞典城市 Ytterby 命名。鋱（Terbium）跟鐿（Ytterbium）也是依這個城市而命名"
-+"的。"
- 
- #. i18n: file data/data.xml line 3374
- #: rc.cpp:713
-@@ -2156,7 +2177,8 @@
- #: rc.cpp:715
- msgid ""
- "Like Terbium and Gadolinium. this is named after the Swedish town of Ytterby"
--msgstr "就像鋱（Terbium）與釓（Gadolinium），它也是依瑞典城市 Ytterby 而命名的。"
-+msgstr ""
-+"就像鋱（Terbium）與釓（Gadolinium），它也是依瑞典城市 Ytterby 而命名的。"
- 
- #. i18n: file data/data.xml line 3449
- #: rc.cpp:717
-@@ -2176,9 +2198,11 @@
- #. i18n: file data/data.xml line 3561
- #: rc.cpp:723
- msgid ""
--"'tung sten' means 'heavy stone' in Swedish. The old name (and thus the symbol "
--"'W') was Wolfram. named after a mineral"
--msgstr "tung sten 在瑞典語中表示「很重的石頭」。舊名稱是 Wolfram（因此符號為 W），依礦石命名"
-+"'tung sten' means 'heavy stone' in Swedish. The old name (and thus the "
-+"symbol 'W') was Wolfram. named after a mineral"
-+msgstr ""
-+"tung sten 在瑞典語中表示「很重的石頭」。舊名稱是 Wolfram（因此符號為 W），依"
-+"礦石命名"
- 
- #. i18n: file data/data.xml line 3602
- #: rc.cpp:725
-@@ -2264,8 +2288,8 @@
- #. i18n: file data/data.xml line 4210
- #: rc.cpp:757
- msgid ""
--"Greek 'protos' for 'ancester'. Protactinium is before Actinium in the periodic "
--"table."
-+"Greek 'protos' for 'ancester'. Protactinium is before Actinium in the "
-+"periodic table."
- msgstr "希臘文中的 protos 表示「祖先」。鏷在週期表中是在錒的前面"
- 
- #. i18n: file data/data.xml line 4247
-@@ -2363,7 +2387,8 @@
- #. i18n: file data/data.xml line 4829
- #: rc.cpp:795
- msgid ""
--"Named after the German city Darmstadt where many elements have been discovered."
-+"Named after the German city Darmstadt where many elements have been "
-+"discovered."
- msgstr "依德國城市 Darmstadt 命名，許多元素在這裡被發現"
- 
- #. i18n: file data/data.xml line 4855
-@@ -3049,7 +3074,9 @@
- msgid ""
- "Form of a substance; dependant on form stability and whether it takes up a "
- "definite volume: solid, liquid or gaseous."
--msgstr "物質的形態，與該形態的穩定度，以及它是否暫有明確的體積有關：固態、液態或氣態。"
-+msgstr ""
-+"物質的形態，與該形態的穩定度，以及它是否暫有明確的體積有關：固態、液態或氣"
-+"態。"
- 
- #. i18n: file data/knowledge.xml line 7
- #: rc.cpp:1139
-@@ -3106,20 +3133,23 @@
- #: rc.cpp:1163
- #, no-c-format
- msgid ""
--"Separation of a liquid solution (homogeneous mix) into its components through "
--"evaporation and condensation. In a fractionary distillation the process is "
--"repeated several times in a column."
--msgstr "透過蒸發與冷凝的方式，將均勻混合的溶液中的各個組成成份分離出來的方法。在蒸餾的過程中，可能會重複很多次的蒸發跟冷凝的過程。"
-+"Separation of a liquid solution (homogeneous mix) into its components "
-+"through evaporation and condensation. In a fractionary distillation the "
-+"process is repeated several times in a column."
-+msgstr ""
-+"透過蒸發與冷凝的方式，將均勻混合的溶液中的各個組成成份分離出來的方法。在蒸餾"
-+"的過程中，可能會重複很多次的蒸發跟冷凝的過程。"
- 
- #. i18n: file data/knowledge.xml line 28
- #: rc.cpp:1169
- #, no-c-format
- msgid ""
- "Matter that cannot be broken down into simpler matter. Chemical elements are "
--"cornerstones of Materials. Elements consist of atoms that consist of a nucleus "
--"of positive protons, neutral neutrons, and a shell of electrons."
-+"cornerstones of Materials. Elements consist of atoms that consist of a "
-+"nucleus of positive protons, neutral neutrons, and a shell of electrons."
- msgstr ""
--"物質不能再被分為更簡單的物質。化學元素是各種材料的基石。組成元素的原子是由帶正電的質子與中子組成的原子核，以及原子核外繞行的帶負電的電子所組成。"
-+"物質不能再被分為更簡單的物質。化學元素是各種材料的基石。組成元素的原子是由帶"
-+"正電的質子與中子組成的原子核，以及原子核外繞行的帶負電的電子所組成。"
- 
- #. i18n: file data/knowledge.xml line 31
- #: rc.cpp:1172
-@@ -3163,18 +3193,20 @@
- msgid ""
- "Separation of a solid matter from a liquid matter or gaseous matter with a "
- "filter (porous separation wall)."
--msgstr "使用過濾器（有多孔的分離壁障）將固態物質從液態或氣態物質中分離出來的方法"
-+msgstr ""
-+"使用過濾器（有多孔的分離壁障）將固態物質從液態或氣態物質中分離出來的方法"
- 
- #. i18n: file data/knowledge.xml line 47
- #: rc.cpp:1196
- #, no-c-format
- msgid ""
--"Matter consisting of differentiated matter, combined in non-set ratios. "
--"[i]Homogeneous mixes[/i] have a coherent look, [i]heterogeneous mixes[/i] "
-+"Matter consisting of differentiated matter, combined in non-set ratios. [i]"
-+"Homogeneous mixes[/i] have a coherent look, [i]heterogeneous mixes[/i] "
- "consist of multiple phases."
- msgstr ""
--"包含多種可區分的物質，以任意的比例組合成的物質。<i>同質混合物（Homogeneous mixes）</i>為均勻混合，有一致外觀的混合物；<i>"
--"異質混合物（Heterogeneous mixes）</i>為不均勻混合，具有多相的外觀的混合物。"
-+"包含多種可區分的物質，以任意的比例組合成的物質。<i>同質混合物（Homogeneous "
-+"mixes）</i>為均勻混合，有一致外觀的混合物；<i>異質混合物（Heterogeneous "
-+"mixes）</i>為不均勻混合，具有多相的外觀的混合物。"
- 
- #. i18n: file data/knowledge.xml line 50
- #: rc.cpp:1199
-@@ -3198,10 +3230,12 @@
- #: rc.cpp:1208
- #, no-c-format
- msgid ""
--"During a chemical reaction mass is neither lost nor gained. The sum mass of the "
--"material going into the reaction equals the sum of the mass of the products of "
--"the reaction."
--msgstr "在化學反應中，質量不會減少也不會增加。所有參與反應的材料的總質量，會等於反應後產物的總質量。"
-+"During a chemical reaction mass is neither lost nor gained. The sum mass of "
-+"the material going into the reaction equals the sum of the mass of the "
-+"products of the reaction."
-+msgstr ""
-+"在化學反應中，質量不會減少也不會增加。所有參與反應的材料的總質量，會等於反應"
-+"後產物的總質量。"
- 
- #. i18n: file data/knowledge.xml line 58
- #: rc.cpp:1211
-@@ -3213,9 +3247,11 @@
- #: rc.cpp:1214
- #, no-c-format
- msgid ""
--"An alloy always contains the same elements in the same mass ratio. Should two "
--"or more elements bind together then the mass ratio is constant."
--msgstr "一化合物中含有的元素是固定的，元素間的質量比例也是固定的。兩種以上的元素形成化合物時，其質量比為常數。"
-+"An alloy always contains the same elements in the same mass ratio. Should "
-+"two or more elements bind together then the mass ratio is constant."
-+msgstr ""
-+"一化合物中含有的元素是固定的，元素間的質量比例也是固定的。兩種以上的元素形成"
-+"化合物時，其質量比為常數。"
- 
- #. i18n: file data/knowledge.xml line 62
- #: rc.cpp:1217
-@@ -3272,8 +3308,11 @@
- #, no-c-format
- msgid ""
- "Through chemical composition and physical attributes, homogeneous portion of "
--"matter that separated from its environment in its expansion through a surface."
--msgstr "由於化學成份與物理屬性的不同，物質中同性質的成份從其環境中透過表面擴張分離出來。"
-+"matter that separated from its environment in its expansion through a "
-+"surface."
-+msgstr ""
-+"由於化學成份與物理屬性的不同，物質中同性質的成份從其環境中透過表面擴張分離出"
-+"來。"
- 
- #. i18n: file data/knowledge.xml line 82
- #: rc.cpp:1247
-@@ -3370,9 +3409,11 @@
- #: rc.cpp:1292
- #, no-c-format
- msgid ""
--"Rays consisting of alpha particles, consisting of two protons and two neutrons "
--"that are emitted from the Atoms of certain radioactive elements."
--msgstr "含有 alpha 粒子的射線。alpha 粒子由兩個質子與兩個中子組成，由放射性元素的原子中發射出來。"
-+"Rays consisting of alpha particles, consisting of two protons and two "
-+"neutrons that are emitted from the Atoms of certain radioactive elements."
-+msgstr ""
-+"含有 alpha 粒子的射線。alpha 粒子由兩個質子與兩個中子組成，由放射性元素的原子"
-+"中發射出來。"
- 
- #. i18n: file data/knowledge.xml line 114
- #: rc.cpp:1295 rc.cpp:1319 rc.cpp:1328 rc.cpp:1340 rc.cpp:1455 rc.cpp:1464
-@@ -3387,7 +3428,8 @@
- msgid ""
- "Atoms are chemically inseparable and building blocks of matter. Atoms of one "
- "kind are called an Element."
--msgstr "原子在化學上是無法分離的，並組合成物質。同一種原子組成的物質就稱為元素。"
-+msgstr ""
-+"原子在化學上是無法分離的，並組合成物質。同一種原子組成的物質就稱為元素。"
- 
- #. i18n: file data/knowledge.xml line 118
- #: rc.cpp:1304 rc.cpp:1448 rc.cpp:1467 rc.cpp:1482 rc.cpp:1494
-@@ -3417,18 +3459,20 @@
- #: rc.cpp:1316
- #, no-c-format
- msgid ""
--"The small, positively-charged center of an Atom, in which Protons and Neutrons "
--"are found."
-+"The small, positively-charged center of an Atom, in which Protons and "
-+"Neutrons are found."
- msgstr "位於原子中央的小的帶正電的核心，核心內有質子與中子。"
- 
- #. i18n: file data/knowledge.xml line 132
- #: rc.cpp:1325
- #, no-c-format
- msgid ""
--"Mass of an atom, taken on a scale where the the mass of a carbon atom is 12u. "
--"In elements that consist of different isotopes the mid-range mass of the "
--"isotope mix is given."
--msgstr "原子的質量。以碳元素為基準（定為 12u），依其比例決定其值。含有同位素的原子則是以同位素質量的加權平均數來決定。"
-+"Mass of an atom, taken on a scale where the the mass of a carbon atom is "
-+"12u. In elements that consist of different isotopes the mid-range mass of "
-+"the isotope mix is given."
-+msgstr ""
-+"原子的質量。以碳元素為基準（定為 12u），依其比例決定其值。含有同位素的原子則"
-+"是以同位素質量的加權平均數來決定。"
- 
- #. i18n: file data/knowledge.xml line 139
- #: rc.cpp:1334 rc.cpp:1349 rc.cpp:1358 rc.cpp:1367 rc.cpp:1376 rc.cpp:1385
-@@ -3443,11 +3487,12 @@
- msgid ""
- "Isotopes are forms of a chemical element whose nuclei have the same atomic "
- "number, Z, but different atomic masses, A. The word isotope, meaning at the "
--"same place, comes from the fact that all isotopes of an element are located at "
--"the same place on the periodic table."
-+"same place, comes from the fact that all isotopes of an element are located "
-+"at the same place on the periodic table."
- msgstr ""
--"同位素（isotope）是某化學元素的原子核中有相同的原子數量 Z，但是不同的原子質量 A。isotope "
--"這個字的意思是「同樣的地方」，表示所有同位素在元素週期表上都是落在同一個位置上。"
-+"同位素（isotope）是某化學元素的原子核中有相同的原子數量 Z，但是不同的原子質"
-+"量 A。isotope 這個字的意思是「同樣的地方」，表示所有同位素在元素週期表上都是"
-+"落在同一個位置上。"
- 
- #. i18n: file data/knowledge.xml line 146
- #: rc.cpp:1343
-@@ -3460,26 +3505,28 @@
- #, no-c-format
- msgid ""
- "The spin is an intrinsic angular momentum associated with microscopic "
--"particles. It is a purely quantum mechanical phenomenon without any analogy in "
--"classical mechanics. Whereas classical angular momentum arises from the "
-+"particles. It is a purely quantum mechanical phenomenon without any analogy "
-+"in classical mechanics. Whereas classical angular momentum arises from the "
- "rotation of an extended object, spin is not associated with any rotating "
- "internal masses, but is intrinsic to the particle itself."
- msgstr ""
--"自旋（spin）是與微觀粒子有關的內部角動量。這純粹是量子力學的現象，與傳統力學無關。傳統力學中的角動量是由繞著物體旋轉而產生，而自旋並非繞著內部的質量，而是粒"
--"子本身內部所有的。"
-+"自旋（spin）是與微觀粒子有關的內部角動量。這純粹是量子力學的現象，與傳統力學"
-+"無關。傳統力學中的角動量是由繞著物體旋轉而產生，而自旋並非繞著內部的質量，而"
-+"是粒子本身內部所有的。"
- 
- #. i18n: file data/knowledge.xml line 154
- #: rc.cpp:1355
- #, no-c-format
- msgid ""
--"The magnetic moment of an object is a vector relating the aligning torque in a "
--"magnetic field experienced by the object to the field vector itself. It's "
--"measured in units of the nuclear magneton &#956;[sub]n[/sub]=(5.0507866 &#177; "
--"0.0000017) 10[sup]-27[/sup] JT[sup]-1[/sup]"
--msgstr ""
--"物體的磁矩（magnetic moment）是一個向量，從經過物體的磁場的校準力矩（aligning "
--"torque）指向磁場的向量。它是用核磁子（nuclear magneton）的單位來測量： &#956;<sub>n</sub> "
--"= (5.0507866&#177; 0.0000017) 10<sup>-27</sup> JT<sup>-1</sup>"
-+"The magnetic moment of an object is a vector relating the aligning torque in "
-+"a magnetic field experienced by the object to the field vector itself. It's "
-+"measured in units of the nuclear magneton &#956;[sub]n[/sub]=(5.0507866 "
-+"&#177; 0.0000017) 10[sup]-27[/sup] JT[sup]-1[/sup]"
-+msgstr ""
-+"物體的磁矩（magnetic moment）是一個向量，從經過物體的磁場的校準力矩"
-+"（aligning torque）指向磁場的向量。它是用核磁子（nuclear magneton）的單位來測"
-+"量： &#956;<sub>n</sub> = (5.0507866&#177; 0.0000017) 10<sup>-27</sup> "
-+"JT<sup>-1</sup>"
- 
- #. i18n: file data/knowledge.xml line 160
- #: rc.cpp:1361
-@@ -3492,22 +3539,17 @@
- #, no-c-format
- msgid ""
- "The decay mode describes a particular way a particle decays. For radioactive "
--"decay (the decay of nuclides) the decay modes are:[br] -> "
--"alpha decay (emission of a Helium-4 nucleus).[br] -> "
--"&#946;[sup]-[/sup] decay (emission of an electron)[br] -> "
--"&#946;[sup]+[/sup] decay (emission of a positron) [br] -> "
--"electron capture (EC) [br] -> proton emission [br] -> "
--"spontaneous fission [br] Typically one decay mode predominates for a particular "
--"nuclide."
--msgstr ""
--"衰變模式（decay mode）描述粒子衰變的特殊方式。以放射性衰變（原子衰變）而言，其衰變模式為："
--"<br> -> alpha 衰變（氦 He-4 核的放射）"
--"<br> -> &#946;<sup>-</sup> 衰變（電子的放射）"
--"<br> -> &#946;<sup>+</sup> 衰變（正電子的放射）"
--"<br> -> 電子捕獲（EC） "
--"<br> -> 質子放射 "
--"<br> -> 自發性核裂變 "
--"<br>通常一個特定的原子核只有一種主要的衰變模式。"
-+"decay (the decay of nuclides) the decay modes are:[br] -> alpha decay "
-+"(emission of a Helium-4 nucleus).[br] -> &#946;[sup]-[/sup] decay (emission "
-+"of an electron)[br] -> &#946;[sup]+[/sup] decay (emission of a positron) "
-+"[br] -> electron capture (EC) [br] -> proton emission [br] -> spontaneous "
-+"fission [br] Typically one decay mode predominates for a particular nuclide."
-+msgstr ""
-+"衰變模式（decay mode）描述粒子衰變的特殊方式。以放射性衰變（原子衰變）而言，"
-+"其衰變模式為：<br> -> alpha 衰變（氦 He-4 核的放射）<br> -> &#946;<sup>-</"
-+"sup> 衰變（電子的放射）<br> -> &#946;<sup>+</sup> 衰變（正電子的放射）<br> -"
-+"> 電子捕獲（EC） <br> -> 質子放射 <br> -> 自發性核裂變 <br>通常一個特定的原子"
-+"核只有一種主要的衰變模式。"
- 
- #. i18n: file data/knowledge.xml line 167
- #: rc.cpp:1370
-@@ -3576,27 +3618,28 @@
- #, no-c-format
- msgid ""
- "A nuclear isomer is a metastable or isomeric state of an atom caused by the "
--"excitation of a proton or neutron in its nucleus so that it requires a change "
--"in spin before it can release its extra energy. They decay to lower energy "
--"states of the nuclide through two isomeric transitions:[br] -> "
--"&#947;- emission (emission of a high-energy photon)[br] -> "
--"internal conversion (the energy is used to ionize the atom)[br] Contrast this "
--"with the definition of a chemical isomer, the more common use of the word. Also "
--"contrast with the meaning of isotope, in which the difference is the number of "
--"neutrons in the nucleus. Metastable isomers of a particular atom are usually "
--"designated with an \"m\" (or, in the case of atoms with more than one isomer, "
--"2m, 3m, and so on). This designation is usually placed after the atomic symbol "
--"and number of the atom (e.g., Co-58m), but is sometimes placed as a superscript "
--"before (e.g., [sup]m[/sup]Co-58 or [sup]58m[/sup]Co)."
--msgstr ""
--"核異構物是原子由於其原子核中的質子或中子被激發後產生的一種同質異構或亞穩（metastable）的狀態。它需要改變自旋方式，以釋放出多餘的能量。它們會經過兩次同"
--"質異構的轉換以衰變到較低的能量狀態："
--"<br> -> &#947; 放射（較高能量的質子的放射）"
--"<br> -> 內部轉換（將能量用於電離原子）"
--"<br>與化學的同質異構物（isomer）比，這個字比較常用。與化學的同位素比較（isotope），差異是在原子核的中子數量不同。一個特定原子的亞穩態的核異構物"
--"通常用 m 來表示（有的原子有兩個以上的核異構物，用 2m，3m "
--"等來表示）。這個標記通常放在原子的化學符號與原子序號的後面（例如：Co-58m），但有時會放在前面以上標表示（例如：<sup>m</sup>"
--"Co-58 或是 <sup>58m</sup>Co）。"
-+"excitation of a proton or neutron in its nucleus so that it requires a "
-+"change in spin before it can release its extra energy. They decay to lower "
-+"energy states of the nuclide through two isomeric transitions:[br] -> "
-+"&#947;- emission (emission of a high-energy photon)[br] -> internal "
-+"conversion (the energy is used to ionize the atom)[br] Contrast this with "
-+"the definition of a chemical isomer, the more common use of the word. Also "
-+"contrast with the meaning of isotope, in which the difference is the number "
-+"of neutrons in the nucleus. Metastable isomers of a particular atom are "
-+"usually designated with an \"m\" (or, in the case of atoms with more than "
-+"one isomer, 2m, 3m, and so on). This designation is usually placed after the "
-+"atomic symbol and number of the atom (e.g., Co-58m), but is sometimes placed "
-+"as a superscript before (e.g., [sup]m[/sup]Co-58 or [sup]58m[/sup]Co)."
-+msgstr ""
-+"核異構物是原子由於其原子核中的質子或中子被激發後產生的一種同質異構或亞穩"
-+"（metastable）的狀態。它需要改變自旋方式，以釋放出多餘的能量。它們會經過兩次"
-+"同質異構的轉換以衰變到較低的能量狀態：<br> -> &#947; 放射（較高能量的質子的放"
-+"射）<br> -> 內部轉換（將能量用於電離原子）<br>與化學的同質異構物（isomer）"
-+"比，這個字比較常用。與化學的同位素比較（isotope），差異是在原子核的中子數量不"
-+"同。一個特定原子的亞穩態的核異構物通常用 m 來表示（有的原子有兩個以上的核異構"
-+"物，用 2m，3m 等來表示）。這個標記通常放在原子的化學符號與原子序號的後面（例"
-+"如：Co-58m），但有時會放在前面以上標表示（例如：<sup>m</sup>Co-58 或是 "
-+"<sup>58m</sup>Co）。"
- 
- #. i18n: file data/knowledge.xml line 211
- #: rc.cpp:1442
-@@ -3617,12 +3660,12 @@
- #, no-c-format
- msgid ""
- "The electron is a subatomic particle with a mass of m[sub]e[/sub]=(9.1093897 "
--"&#177; 0.0000054)e-31 kg and a negative charge of [i]e[/i]=(1.60217733 &#177; "
--"0.00000049)e-19 C\n"
-+"&#177; 0.0000054)e-31 kg and a negative charge of [i]e[/i]=(1.60217733 "
-+"&#177; 0.00000049)e-19 C\n"
- "\t\t"
- msgstr ""
--"電子是一種亞原子粒子，質量為 m<sub>e</sub> = (9.1093897 &#177; 0.0000054)e-31 公斤，負電荷為 <i>e</i> "
--"= (1.60217733 &#177; 0.00000049)e-19 C。\n"
-+"電子是一種亞原子粒子，質量為 m<sub>e</sub> = (9.1093897 &#177; 0.0000054)e-"
-+"31 公斤，負電荷為 <i>e</i> = (1.60217733 &#177; 0.00000049)e-19 C。\n"
- "\t\t"
- 
- #. i18n: file data/knowledge.xml line 224
-@@ -3630,12 +3673,13 @@
- #, no-c-format
- msgid ""
- "The proton is a subatomic particle with a mass of m[sub]e[/sub]=(1.6726231 "
--"&#177; 0.0000010) 10[sup]-27[/sup] kg and a positive charge of "
--"[i]e[/i]=(1.60217733 &#177; 0.00000049) 10[sup]-19[/sup] C which occurs in the "
-+"&#177; 0.0000010) 10[sup]-27[/sup] kg and a positive charge of [i]e[/i]="
-+"(1.60217733 &#177; 0.00000049) 10[sup]-19[/sup] C which occurs in the "
- "nucleus of an atom."
- msgstr ""
--"質子是一種亞原子粒子，質量為 m<sub>e</sub> = (1.6726231 &#177; 0.0000010) 10<sup>-27</sup> "
--"公斤，正電荷為 <i>e</i> = (1.60217733 &#177; 0.00000049) 10<sup>-19</sup> C，存在於原子核中。"
-+"質子是一種亞原子粒子，質量為 m<sub>e</sub> = (1.6726231 &#177; 0.0000010) "
-+"10<sup>-27</sup> 公斤，正電荷為 <i>e</i> = (1.60217733 &#177; 0.00000049) "
-+"10<sup>-19</sup> C，存在於原子核中。"
- 
- #. i18n: file data/knowledge.xml line 233
- #: rc.cpp:1476
-@@ -3644,8 +3688,8 @@
- "The neutron is a subatomic particle with a mass of m[sub]e[/sub]=(1.6749286 "
- "&#177; 0.0000010) 10[sup]-27[/sup] kg which occurs in the nucleus of an atom."
- msgstr ""
--"中子是一種亞原子粒子，質量為 m<sub>e</sub> = (1.6749286 &#177; 0.0000010) 10<sup>-27</sup> "
--"公斤，存在於原子核中。"
-+"中子是一種亞原子粒子，質量為 m<sub>e</sub> = (1.6749286 &#177; 0.0000010) "
-+"10<sup>-27</sup> 公斤，存在於原子核中。"
- 
- #. i18n: file data/knowledge.xml line 241
- #: rc.cpp:1488
-@@ -3657,10 +3701,10 @@
- #: rc.cpp:1491
- #, no-c-format
- msgid ""
--"Cathode rays are streams of electrons observed in vacuum tubes, i.e. evacuated "
--"glass tubes that are equipped with at least two electrodes, a cathode (negative "
--"electrode) and an anode (positive electrode) in a configuration known as a "
--"diode."
-+"Cathode rays are streams of electrons observed in vacuum tubes, i.e. "
-+"evacuated glass tubes that are equipped with at least two electrodes, a "
-+"cathode (negative electrode) and an anode (positive electrode) in a "
-+"configuration known as a diode."
- msgstr "陰極射線（Cathode rays）是在真空管中發現的電子束，"
- 
- #. i18n: file data/knowledge.xml line 248
-@@ -3673,14 +3717,15 @@
- #: rc.cpp:1500
- #, no-c-format
- msgid ""
--"The Ionic Radius is the radius of a charged atom, a so called ion. The ion can "
--"have a positive or a negative charge. The charge of the ion which radius you "
--"see is also displayed in Kalzium. A positive ion has less electrons in its "
--"shell then the atom, a negative ion has more electrons. Therefore, a postive "
--"ion has a smaller radius than its atom and vice versa."
--msgstr ""
--"離子半徑（Ionic Radius）就是帶電的原子，又叫做離子（ion）的半徑。離子可以帶正電也可以帶負電。Kalzium "
--"也會顯示出您所見到的離子的電性。正離子在原子表面的電子數較少，負離子則較多。因此正離子的半徑會比原子半徑要小，反之亦然。"
-+"The Ionic Radius is the radius of a charged atom, a so called ion. The ion "
-+"can have a positive or a negative charge. The charge of the ion which radius "
-+"you see is also displayed in Kalzium. A positive ion has less electrons in "
-+"its shell then the atom, a negative ion has more electrons. Therefore, a "
-+"postive ion has a smaller radius than its atom and vice versa."
-+msgstr ""
-+"離子半徑（Ionic Radius）就是帶電的原子，又叫做離子（ion）的半徑。離子可以帶正"
-+"電也可以帶負電。Kalzium 也會顯示出您所見到的離子的電性。正離子在原子表面的電"
-+"子數較少，負離子則較多。因此正離子的半徑會比原子半徑要小，反之亦然。"
- 
- #. i18n: file data/knowledge.xml line 253
- #: rc.cpp:1509 rc.cpp:1512 rc.cpp:1536 rc.cpp:1554
-@@ -3692,20 +3737,23 @@
- #: rc.cpp:1515
- #, no-c-format
- msgid ""
--"The van der Waals radius of an atom is the radius of an imaginary hard sphere "
--"which can be used to model the atom for many purposes. Van der Waals radii are "
--"determined from measurements of atomic spacing between pairs of unbonded atoms "
--"in crystals."
-+"The van der Waals radius of an atom is the radius of an imaginary hard "
-+"sphere which can be used to model the atom for many purposes. Van der Waals "
-+"radii are determined from measurements of atomic spacing between pairs of "
-+"unbonded atoms in crystals."
- msgstr ""
--"原子的凡德瓦半徑（van der Waals）是將原子模擬成一個硬的球體，可用於在許多方面模擬原子。凡德瓦半徑是測量晶體中一對對未成鍵的原子距離來決定的。"
-+"原子的凡德瓦半徑（van der Waals）是將原子模擬成一個硬的球體，可用於在許多方面"
-+"模擬原子。凡德瓦半徑是測量晶體中一對對未成鍵的原子距離來決定的。"
- 
- #. i18n: file data/knowledge.xml line 267
- #: rc.cpp:1530
- #, no-c-format
- msgid ""
--"The atomic radius is the distance from the atomic nucleus to the outmost stable "
--"electron orbital in a atom that is at equilibrium."
--msgstr "原子半徑（atomic radius）是原子在平衡狀態下，原子核與最外層的穩定電子軌道的距離。"
-+"The atomic radius is the distance from the atomic nucleus to the outmost "
-+"stable electron orbital in a atom that is at equilibrium."
-+msgstr ""
-+"原子半徑（atomic radius）是原子在平衡狀態下，原子核與最外層的穩定電子軌道的距"
-+"離。"
- 
- #. i18n: file data/knowledge.xml line 276
- #: rc.cpp:1545
-@@ -3726,17 +3774,19 @@
- #, no-c-format
- msgid ""
- "Watchglasses are round glass panes with a diameter of around 5 - 10 cm which "
--"are used in the various experimental techniques. The border is bent upwards to "
--"allow the watchglass to hold small amounts of liquids in order to let them "
--"evaporate. The evaporation can be accelerated by heating the watchglass with a "
--"Bunsen burner. Watchglasses can also be used to cover petri dishes or beakers. "
--"Moreover watchglasses are suited to weighing small amounts of matter or "
--"alternatively drying them in the airing cupboard. The term watchglass is "
--"derived from the former pocket watches' protection glass which was often domed."
--msgstr ""
--"表玻璃（watch glasses）是直徑約 5-10 "
--"公分的圓形玻璃，可用於許多實驗中。它的邊緣上彎，能留住小量液體以便讓它們蒸發。也可以用本生燈對表玻璃加熱以加速蒸發。表玻璃也可以用於蓋住培養皿或是燒杯，此外也適"
--"用於秤小量物質的重量，或是置於風乾機中風乾。表玻璃這個名詞是源於其微凸的造型就像是懷錶上的保護玻璃而來。"
-+"are used in the various experimental techniques. The border is bent upwards "
-+"to allow the watchglass to hold small amounts of liquids in order to let "
-+"them evaporate. The evaporation can be accelerated by heating the watchglass "
-+"with a Bunsen burner. Watchglasses can also be used to cover petri dishes or "
-+"beakers. Moreover watchglasses are suited to weighing small amounts of "
-+"matter or alternatively drying them in the airing cupboard. The term "
-+"watchglass is derived from the former pocket watches' protection glass which "
-+"was often domed."
-+msgstr ""
-+"表玻璃（watch glasses）是直徑約 5-10 公分的圓形玻璃，可用於許多實驗中。它的邊"
-+"緣上彎，能留住小量液體以便讓它們蒸發。也可以用本生燈對表玻璃加熱以加速蒸發。"
-+"表玻璃也可以用於蓋住培養皿或是燒杯，此外也適用於秤小量物質的重量，或是置於風"
-+"乾機中風乾。表玻璃這個名詞是源於其微凸的造型就像是懷錶上的保護玻璃而來。"
- 
- #. i18n: file data/tools.xml line 10
- #: rc.cpp:1563
-@@ -3748,21 +3798,25 @@
- #: rc.cpp:1566
- #, no-c-format
- msgid ""
--"A dehydrator is a laboratory apparatus which is often made of glass and serves "
--"to dry chemical matters, that is, to remove water or liquid from a sample.\n"
--"\t\t\tIn principle it is a glass bowl with cap which has a planar grinding so "
--"that the bowl is air tight closeable. The dehydrator's lower part is ordinarily "
--"filled with a drying agent e.g. calcium chloride, silica gel, phosphoric "
--"anhydride or sulphuric acid. The sample to be dried is placed on a diaphanous "
--"cartridge of plastic or ceramics above the drying agent.\n"
-+"A dehydrator is a laboratory apparatus which is often made of glass and "
-+"serves to dry chemical matters, that is, to remove water or liquid from a "
-+"sample.\n"
-+"\t\t\tIn principle it is a glass bowl with cap which has a planar grinding "
-+"so that the bowl is air tight closeable. The dehydrator's lower part is "
-+"ordinarily filled with a drying agent e.g. calcium chloride, silica gel, "
-+"phosphoric anhydride or sulphuric acid. The sample to be dried is placed on "
-+"a diaphanous cartridge of plastic or ceramics above the drying agent.\n"
- "\t\t\tThe drying agent is hygroscopic, which means that it dehumidifies its "
- "environment by absorbing water vapor. The dry atmosphere then takes up water "
- "from the sample to be dried."
- msgstr ""
--"脫水器（dehydrator）是一種實驗室中的器具。它通常是用玻璃製造，用於乾燥化學物質，也就是將樣本中的水份或液體去除。\n"
--"\t\t\t實際上它就是一個有蓋的玻璃碗，蓋子磨光以便密封。脫水器的下半部常會填入乾燥劑，如氯化鈣、矽凝膠、五氧化二磷或是硫酸等等。要乾燥的樣本會放在乾燥劑上方"
--"，用塑膠或陶製的透明盒子隔開。\n"
--"\t\t\t乾燥劑可以吸收水份，因此會用吸取環境中的水氣的方式使環境變乾燥。乾燥的空氣就會使樣本失去其中的水份。"
-+"脫水器（dehydrator）是一種實驗室中的器具。它通常是用玻璃製造，用於乾燥化學物"
-+"質，也就是將樣本中的水份或液體去除。\n"
-+"\t\t\t實際上它就是一個有蓋的玻璃碗，蓋子磨光以便密封。脫水器的下半部常會填入"
-+"乾燥劑，如氯化鈣、矽凝膠、五氧化二磷或是硫酸等等。要乾燥的樣本會放在乾燥劑上"
-+"方，用塑膠或陶製的透明盒子隔開。\n"
-+"\t\t\t乾燥劑可以吸收水份，因此會用吸取環境中的水氣的方式使環境變乾燥。乾燥的"
-+"空氣就會使樣本失去其中的水份。"
- 
- #. i18n: file data/tools.xml line 17
- #: rc.cpp:1571
-@@ -3774,11 +3828,12 @@
- #: rc.cpp:1574
- #, no-c-format
- msgid ""
--" The spatula is a laboratory tool to scrape off, grind and transport chemicals. "
--"The material they are made of (e.g. iron, titanium, platinum) and their design "
--"(e.g. flat spatula or spoon spatula) can be different."
-+" The spatula is a laboratory tool to scrape off, grind and transport "
-+"chemicals. The material they are made of (e.g. iron, titanium, platinum) and "
-+"their design (e.g. flat spatula or spoon spatula) can be different."
- msgstr ""
--"刮刀（spatula）是一種實驗室用的工具，可以刮掉、壓碎與移動化學品。刮刀有許多種製造的材料（如鐵、鈦、鉑等）與設計（平面式的，或湯匙式的）。"
-+"刮刀（spatula）是一種實驗室用的工具，可以刮掉、壓碎與移動化學品。刮刀有許多種"
-+"製造的材料（如鐵、鈦、鉑等）與設計（平面式的，或湯匙式的）。"
- 
- #. i18n: file data/tools.xml line 22
- #: rc.cpp:1577
-@@ -3790,16 +3845,17 @@
- #: rc.cpp:1580
- #, no-c-format
- msgid ""
--"The water jet pump has two entry pipes and one exit and consists in principle "
--"of two pipes one inside the other. At the water entry a water jet shoots under "
--"full pressure out of a nozzle into a slightly larger pipe. Thereby the water "
--"jet carries away air or fluid from the second entry. "
--"<br> this is caused by the negative pressure in a drifting fluid. Thus it is an "
-+"The water jet pump has two entry pipes and one exit and consists in "
-+"principle of two pipes one inside the other. At the water entry a water jet "
-+"shoots under full pressure out of a nozzle into a slightly larger pipe. "
-+"Thereby the water jet carries away air or fluid from the second entry. <br> "
-+"this is caused by the negative pressure in a drifting fluid. Thus it is an "
- "application of the hydrodynamic paradox. This says that objects close to "
- "drifting fluids are aspirated instead of being pushed away."
- msgstr ""
--"水噴射幫浦（water jet "
--"pump）有兩根進水管與一根出水管。在進水處有一個噴水口，會以全力將水噴射到另一個較大的管子內，利用漂移流體產生的負壓原理將空氣或其它流體導入另一個入口。"
-+"水噴射幫浦（water jet pump）有兩根進水管與一根出水管。在進水處有一個噴水口，"
-+"會以全力將水噴射到另一個較大的管子內，利用漂移流體產生的負壓原理將空氣或其它"
-+"流體導入另一個入口。"
- 
- #. i18n: file data/tools.xml line 27
- #: rc.cpp:1583
-@@ -3812,10 +3868,11 @@
- #, no-c-format
- msgid ""
- "With a refractometer the refractive index of optical media is determined. If "
--"the refractive index of a chemical is known it can be used after a synthesis to "
--"determine the sample's purity or to audit the synthesis' success."
-+"the refractive index of a chemical is known it can be used after a synthesis "
-+"to determine the sample's purity or to audit the synthesis' success."
- msgstr ""
--"折射計（Refractometer）用於決定光學媒體產生的折射率。如果某化學物質的折射率已知，則可用於測定化學合成樣品的純度，以及決定合成是否成功。"
-+"折射計（Refractometer）用於決定光學媒體產生的折射率。如果某化學物質的折射率已"
-+"知，則可用於測定化學合成樣品的純度，以及決定合成是否成功。"
- 
- #. i18n: file data/tools.xml line 32
- #: rc.cpp:1589
-@@ -3830,7 +3887,9 @@
- "A mortar is used for  manually grinding solids. It can also be used to "
- "homogenize a mixture of powders by grinding. A club-shaped tool known as a "
- "pestle is used with the mortar for grinding."
--msgstr "研缽（mortar）與一根棍棒狀的研磨棒（pestle）用於研磨固體。它也可以用於將粉末調勻。"
-+msgstr ""
-+"研缽（mortar）與一根棍棒狀的研磨棒（pestle）用於研磨固體。它也可以用於將粉末"
-+"調勻。"
- 
- #. i18n: file data/tools.xml line 37
- #: rc.cpp:1595
-@@ -3845,12 +3904,12 @@
- "Heating coils are used to heat flasks and other containers. Multiple heating "
- "coils can be connected with a thermometer so that the heat will not exceed a "
- "specified temperature. It is possible to use a magnetic field inside the "
--"heating coil to stir fluids with a magnetic stirrer. This will homogenize the "
--"fluid in terms of temperature and composition."
-+"heating coil to stir fluids with a magnetic stirrer. This will homogenize "
-+"the fluid in terms of temperature and composition."
- msgstr ""
--"加熱線圈（heating "
--"coils）用於加熱燒瓶與其它的容器。可以將多個加熱線圈與溫度計相連，以避免超過指定的溫度。另外也可以利用線圈中的磁場配合磁性的攪拌器來攪動流體，這樣可以將流體"
--"混合均勻並達到一致溫度。"
-+"加熱線圈（heating coils）用於加熱燒瓶與其它的容器。可以將多個加熱線圈與溫度計"
-+"相連，以避免超過指定的溫度。另外也可以利用線圈中的磁場配合磁性的攪拌器來攪動"
-+"流體，這樣可以將流體混合均勻並達到一致溫度。"
- 
- #. i18n: file data/tools.xml line 42
- #: rc.cpp:1601
-@@ -3862,10 +3921,12 @@
- #: rc.cpp:1604
- #, no-c-format
- msgid ""
--"Large containers like round-bottomed flasks are placed on rings made of cork, a "
--"special soft lightweight wood with good insulating qualities to protect fragile "
--"instruments."
--msgstr "大的容器如圓形的燒瓶會放在軟木製成的環上。軟木（Cork）是一種特別輕特別軟的木頭，有很好的阻絕性以保護易破的器具。"
-+"Large containers like round-bottomed flasks are placed on rings made of "
-+"cork, a special soft lightweight wood with good insulating qualities to "
-+"protect fragile instruments."
-+msgstr ""
-+"大的容器如圓形的燒瓶會放在軟木製成的環上。軟木（Cork）是一種特別輕特別軟的木"
-+"頭，有很好的阻絕性以保護易破的器具。"
- 
- #. i18n: file data/tools.xml line 47
- #: rc.cpp:1607
-@@ -3877,9 +3938,11 @@
- #: rc.cpp:1610
- #, no-c-format
- msgid ""
--"A dropping funnel can be used to drop precise amounts of fluid. You can control "
--"the dropping speed with a valve."
--msgstr "滴漏（dropping funnel）可用於滴入特定量的流體。您可以用調節閥來控制滴入的速度。"
-+"A dropping funnel can be used to drop precise amounts of fluid. You can "
-+"control the dropping speed with a valve."
-+msgstr ""
-+"滴漏（dropping funnel）可用於滴入特定量的流體。您可以用調節閥來控制滴入的速"
-+"度。"
- 
- #. i18n: file data/tools.xml line 52
- #: rc.cpp:1613
-@@ -3894,7 +3957,9 @@
- "A separating funnel can be used to separate a mixture of fluids by differing "
- "density. A valve at the bottom allows you to drain the more dense fluid for "
- "transfer to another container."
--msgstr "分離漏斗（separating funnel）可依不同的密度來分離混合的流體。底部的閥門可以讓您排出較密的流體，流到另一個容器中。"
-+msgstr ""
-+"分離漏斗（separating funnel）可依不同的密度來分離混合的流體。底部的閥門可以讓"
-+"您排出較密的流體，流到另一個容器中。"
- 
- #. i18n: file data/tools.xml line 57
- #: rc.cpp:1619
-@@ -3906,8 +3971,8 @@
- #: rc.cpp:1622
- #, no-c-format
- msgid ""
--"This rack comes in handy when you want to test many small amounts of chemicals "
--"in a row, or if you want to dry test tubes."
-+"This rack comes in handy when you want to test many small amounts of "
-+"chemicals in a row, or if you want to dry test tubes."
- msgstr "一個手可以拿取的架子，可放上許多試管。"
- 
- #. i18n: file data/tools.xml line 62
-@@ -3920,14 +3985,16 @@
- #: rc.cpp:1628
- #, no-c-format
- msgid ""
--"A vortexer serves to homogenize reagents found in laboratories. The container "
--"containing liquid to be homogenized is put on a platform. The platform shakes "
--"by rotary agitation up to 3000RPM at which point a contact sensor is activated. "
--"In this way extremely small volumes of fluid can be homogenized quickly as "
--"well. It is the opposite of a centrifuge, used to separate fluids."
--msgstr ""
--"震盪器（Vortexer）用於將試劑均勻混合。將要混合的液體裝入容器中，並放在一個平台上。平台會以最高每分鐘 3000 "
--"轉的速度旋轉震動。這樣少量的流體可以快速而充份的混合在一起。它與離心機（centrifuge）相反，離心機用於將液體中的成份分離。"
-+"A vortexer serves to homogenize reagents found in laboratories. The "
-+"container containing liquid to be homogenized is put on a platform. The "
-+"platform shakes by rotary agitation up to 3000RPM at which point a contact "
-+"sensor is activated. In this way extremely small volumes of fluid can be "
-+"homogenized quickly as well. It is the opposite of a centrifuge, used to "
-+"separate fluids."
-+msgstr ""
-+"震盪器（Vortexer）用於將試劑均勻混合。將要混合的液體裝入容器中，並放在一個平"
-+"臺上。平臺會以最高每分鐘 3000 轉的速度旋轉震動。這樣少量的流體可以快速而充份"
-+"的混合在一起。它與離心機（centrifuge）相反，離心機用於將液體中的成份分離。"
- 
- #. i18n: file data/tools.xml line 67
- #: rc.cpp:1631
-@@ -3939,11 +4006,13 @@
- #: rc.cpp:1634
- #, no-c-format
- msgid ""
--"These bottles are used for many purposes. In most laboratories they are usually "
--"filled with water, salt, acid or other commonly used fluids. They make it easy "
--"to apply the fluid if you do not need to measure a precise amount."
-+"These bottles are used for many purposes. In most laboratories they are "
-+"usually filled with water, salt, acid or other commonly used fluids. They "
-+"make it easy to apply the fluid if you do not need to measure a precise "
-+"amount."
- msgstr ""
--"洗瓶（wash bottle）可用於許多地方。大部份的實驗室中它們用於裝水、鹽、酸類或其他成用的流體。當您不需要很精確的數量時，它們就很好用。"
-+"洗瓶（wash bottle）可用於許多地方。大部份的實驗室中它們用於裝水、鹽、酸類或其"
-+"他成用的流體。當您不需要很精確的數量時，它們就很好用。"
- 
- #. i18n: file data/tools.xml line 72
- #: rc.cpp:1637
-@@ -3956,15 +4025,16 @@
- #, no-c-format
- msgid ""
- "A rotary evaporator consists of a round flask in a bath of hot water that is "
--"designed to evaporate solvents. The flask is rotated and the solvent collects "
--"under a vacuum onto a condenser and drips into a condensate collecting flask. "
--"in this way solutions can be concentrated or purified. By attaching a vacuum "
--"pump, the air pressure and therefore  the boiling point of the fluid can be "
--"decreased."
--msgstr ""
--"減壓濃縮裝置（Rotary "
--"evaporator，官方譯法，民間又譯作旋轉蒸發瓶）用於蒸發溶媒（solvent）。將溶劑放入一個圓形燒瓶並浸在熱水中，燒瓶會被旋轉，溶劑中易揮發的溶媒在真空"
--"條件下蒸發並經由冷凝而滴入收集燒瓶中，這樣溶液就被濃縮或純化了。連接到真空幫浦之後，氣壓下降，沸點也會跟著下降。"
-+"designed to evaporate solvents. The flask is rotated and the solvent "
-+"collects under a vacuum onto a condenser and drips into a condensate "
-+"collecting flask. in this way solutions can be concentrated or purified. By "
-+"attaching a vacuum pump, the air pressure and therefore  the boiling point "
-+"of the fluid can be decreased."
-+msgstr ""
-+"減壓濃縮裝置（Rotary evaporator，官方譯法，民間又譯作旋轉蒸發瓶）用於蒸發溶媒"
-+"（solvent）。將溶劑放入一個圓形燒瓶並浸在熱水中，燒瓶會被旋轉，溶劑中易揮發的"
-+"溶媒在真空條件下蒸發並經由冷凝而滴入收集燒瓶中，這樣溶液就被濃縮或純化了。連"
-+"接到真空幫浦之後，氣壓下降，沸點也會跟著下降。"
- 
- #. i18n: file data/tools.xml line 77
- #: rc.cpp:1643
-@@ -3976,11 +4046,13 @@
- #: rc.cpp:1646
- #, no-c-format
- msgid ""
--"A reflux condenser subjects fluid to a process where a gas produced by heating "
--"is collected on the reflux condenser. The fluid is cooled until it condenses "
--"and runs back into the original fluid. Usually it is put on a round-bottomed "
--"flask or several neck flasks."
--msgstr "迴流冷凝器（reflux condenser）會將加熱所產生的氣體冷凝並迴流到原始的液體中。通常它會放在一個圓形燒平或數個長頸燒瓶中。"
-+"A reflux condenser subjects fluid to a process where a gas produced by "
-+"heating is collected on the reflux condenser. The fluid is cooled until it "
-+"condenses and runs back into the original fluid. Usually it is put on a "
-+"round-bottomed flask or several neck flasks."
-+msgstr ""
-+"迴流冷凝器（reflux condenser）會將加熱所產生的氣體冷凝並迴流到原始的液體中。"
-+"通常它會放在一個圓形燒平或數個長頸燒瓶中。"
- 
- #. i18n: file data/tools.xml line 82
- #: rc.cpp:1649
-@@ -3992,10 +4064,12 @@
- #: rc.cpp:1652
- #, no-c-format
- msgid ""
--"A pipette bulb is used to fill pipettes. It produces a negative pressure which "
--"makes the fluid go into the pipette. If one lets air back into the ball the "
--"fluid will run out of the pipette."
--msgstr "吸管球（pipette bulb）用於將液體吸入吸管中。它會產生負壓，讓流體進入吸管。它也可以將吸管中的液體壓出吸管外。"
-+"A pipette bulb is used to fill pipettes. It produces a negative pressure "
-+"which makes the fluid go into the pipette. If one lets air back into the "
-+"ball the fluid will run out of the pipette."
-+msgstr ""
-+"吸管球（pipette bulb）用於將液體吸入吸管中。它會產生負壓，讓流體進入吸管。它"
-+"也可以將吸管中的液體壓出吸管外。"
- 
- #. i18n: file data/tools.xml line 87
- #: rc.cpp:1655
-@@ -4007,10 +4081,12 @@
- #: rc.cpp:1658
- #, no-c-format
- msgid ""
--"In a test tube  small reactions or experiements are performed. There are many "
--"different types of tubes. For example some have connectors, some are etched for "
--"measurements, some are hardened for durability."
--msgstr "小的化學反應跟小實驗可以在試管（test cube）中進行。試管有許多種，例如有些種類有連接器，有些有刻度，有些試管為了耐用而比較硬。"
-+"In a test tube  small reactions or experiements are performed. There are "
-+"many different types of tubes. For example some have connectors, some are "
-+"etched for measurements, some are hardened for durability."
-+msgstr ""
-+"小的化學反應跟小實驗可以在試管（test cube）中進行。試管有許多種，例如有些種類"
-+"有連接器，有些有刻度，有些試管為了耐用而比較硬。"
- 
- #. i18n: file data/tools.xml line 92
- #: rc.cpp:1661
-@@ -4022,13 +4098,14 @@
- #: rc.cpp:1664
- #, no-c-format
- msgid ""
--"Most laboratories insist that everyone wears protective goggles. Without them, "
--"it is too risky to work with most chemicals. Usually, the lens is a special "
--"type of plastic which protects you from both mechanical impacts and acid and "
--"base chemicals."
--msgstr ""
--"大部份的實驗室都會堅持每個人都要戴護目鏡（protective "
--"goggles），因為不戴的話太危險。通常它的鏡片是特殊塑膠製成，可以保護眼睛不會受到撞擊以及酸鹼等化學物質的傷害。"
-+"Most laboratories insist that everyone wears protective goggles. Without "
-+"them, it is too risky to work with most chemicals. Usually, the lens is a "
-+"special type of plastic which protects you from both mechanical impacts and "
-+"acid and base chemicals."
-+msgstr ""
-+"大部份的實驗室都會堅持每個人都要戴護目鏡（protective goggles），因為不戴的話"
-+"太危險。通常它的鏡片是特殊塑膠製成，可以保護眼睛不會受到撞擊以及酸鹼等化學物"
-+"質的傷害。"
- 
- #. i18n: file data/tools.xml line 97
- #: rc.cpp:1667
-@@ -4040,10 +4117,12 @@
- #: rc.cpp:1670
- #, no-c-format
- msgid ""
--"A round-bottomed flask is used for a lot of reactions. Some can be connected to "
--"other items, as the frosting on the neck shows. With cork rings they can be "
--"placed on a table."
--msgstr "圓底燒瓶用於許多化學反應。有些會在頸部連接其它的物件。使用軟木環就可以將圓底燒瓶置於桌上。"
-+"A round-bottomed flask is used for a lot of reactions. Some can be connected "
-+"to other items, as the frosting on the neck shows. With cork rings they can "
-+"be placed on a table."
-+msgstr ""
-+"圓底燒瓶用於許多化學反應。有些會在頸部連接其它的物件。使用軟木環就可以將圓底"
-+"燒瓶置於桌上。"
- 
- #. i18n: file data/tools.xml line 102
- #: rc.cpp:1673
-@@ -4069,10 +4148,12 @@
- #: rc.cpp:1682
- #, no-c-format
- msgid ""
--"There are reactions which need to be kept free of water. To make this possible "
--"one uses a drying tube, which contains a hygroscopic chemical to absorb water "
--"in the atmosphere."
--msgstr "有些化學反應需要保持無水狀態，此時就需要乾燥管（drying tube）。乾燥管內有化學乾燥劑，以吸收空氣中的水份。"
-+"There are reactions which need to be kept free of water. To make this "
-+"possible one uses a drying tube, which contains a hygroscopic chemical to "
-+"absorb water in the atmosphere."
-+msgstr ""
-+"有些化學反應需要保持無水狀態，此時就需要乾燥管（drying tube）。乾燥管內有化學"
-+"乾燥劑，以吸收空氣中的水份。"
- 
- #. i18n: file data/tools.xml line 112
- #: rc.cpp:1685
-@@ -4084,10 +4165,13 @@
- #: rc.cpp:1688
- #, no-c-format
- msgid ""
--"With a test tube fastener you can easily hold test tubes. If you use a fastener "
--"there is a safe distance between the hand and the test tube when the tube is "
--"hot. In particular, it is used when you hold a test tube over an open flame."
--msgstr "試管夾（test tube fastener）可以協助您固定試管，也可以避免您的手與熱的試管直接接觸以免燙傷，特別是試管需要在火燄上加熱時。"
-+"With a test tube fastener you can easily hold test tubes. If you use a "
-+"fastener there is a safe distance between the hand and the test tube when "
-+"the tube is hot. In particular, it is used when you hold a test tube over an "
-+"open flame."
-+msgstr ""
-+"試管夾（test tube fastener）可以協助您固定試管，也可以避免您的手與熱的試管直"
-+"接接觸以免燙傷，特別是試管需要在火燄上加熱時。"
- 
- #. i18n: file data/tools.xml line 117
- #: rc.cpp:1691
-@@ -4099,10 +4183,12 @@
- #: rc.cpp:1694
- #, no-c-format
- msgid ""
--"In a measuring cylinder you can fill amounts of liquids relatively precisely. "
--"Furthermore, the cylinder allows particulate matter to sink. Following this, "
--"you can separate particulates from the fluid by decanting."
--msgstr "量筒（measuring cylinder）讓您精確量取液體。此外，也可以讓特定物質沉澱，以便從流體中分離出來。"
-+"In a measuring cylinder you can fill amounts of liquids relatively "
-+"precisely. Furthermore, the cylinder allows particulate matter to sink. "
-+"Following this, you can separate particulates from the fluid by decanting."
-+msgstr ""
-+"量筒（measuring cylinder）讓您精確量取液體。此外，也可以讓特定物質沉澱，以便"
-+"從流體中分離出來。"
- 
- #. i18n: file data/tools.xml line 122
- #: rc.cpp:1697
-@@ -4115,9 +4201,11 @@
- #, no-c-format
- msgid ""
- "With a thermometer you can determine the temperature of a sample. In a "
--"laboratory special thermometers are used, which can also be used within acids "
--"or bases."
--msgstr "溫度計（thermometer）用於決定樣本溫度。在實驗室中也有一些特殊的溫度計，用於測量酸鹼物質的溫度。"
-+"laboratory special thermometers are used, which can also be used within "
-+"acids or bases."
-+msgstr ""
-+"溫度計（thermometer）用於決定樣本溫度。在實驗室中也有一些特殊的溫度計，用於測"
-+"量酸鹼物質的溫度。"
- 
- #. i18n: file data/tools.xml line 127
- #: rc.cpp:1703
-@@ -4133,8 +4221,8 @@
- "heaters have a built-in magnet which can rotate. This causes the stir bar to "
- "rotate and the mixture to be homogenized."
- msgstr ""
--"磁性攪拌棒（Magnetic stir "
--"bars）是小的磁性棒，不會起化學作用。大部份的加入器中都內建一個會旋轉的磁鐵。因此磁性棒可以跟隨磁鐵旋轉，將液體攪伴均勻。"
-+"磁性攪拌棒（Magnetic stir bars）是小的磁性棒，不會起化學作用。大部份的加入器"
-+"中都內建一個會旋轉的磁鐵。因此磁性棒可以跟隨磁鐵旋轉，將液體攪伴均勻。"
- 
- #. i18n: file data/tools.xml line 132
- #: rc.cpp:1709
-@@ -4147,9 +4235,11 @@
- #, no-c-format
- msgid ""
- "With a magnetic stir bar retriever you can remove magnetic stir bars from a "
--"container. The retriever is a bar with a magnet at the end which attracts the "
--"stir bars."
--msgstr "磁性攪拌棒回收器（magnetic stir bar retriever）用於從容器中取出磁性攪拌棒，它具有磁性可以將磁性攪拌棒吸出來。"
-+"container. The retriever is a bar with a magnet at the end which attracts "
-+"the stir bars."
-+msgstr ""
-+"磁性攪拌棒回收器（magnetic stir bar retriever）用於從容器中取出磁性攪拌棒，它"
-+"具有磁性可以將磁性攪拌棒吸出來。"
- 
- #. i18n: file data/tools.xml line 137
- #: rc.cpp:1715
-@@ -4161,14 +4251,15 @@
- #: rc.cpp:1718
- #, no-c-format
- msgid ""
--"Pipettes are used to introduce small quantities of liquids in laboratories. A "
--"pipette has a volume scale and as a rule pileusballs are used as droppers for "
--"liquids. Both sorts of pipettes are calibrated for fluids with a temperature of "
--"20°C and for time of outflow (signified by \"Ex.\"). If needed times of outflow "
--"are indicated on the pipettes."
--msgstr ""
--"吸管（pipette）用於在實驗中引入小量液體。它有容量刻度，有的只有一兩個特定的刻度。這兩種都在攝氏 20 "
--"度時進行體積校正，以及校正滿出來時的流出時間，並標示在吸管上。"
-+"Pipettes are used to introduce small quantities of liquids in laboratories. "
-+"A pipette has a volume scale and as a rule pileusballs are used as droppers "
-+"for liquids. Both sorts of pipettes are calibrated for fluids with a "
-+"temperature of 20°C and for time of outflow (signified by \"Ex.\"). If "
-+"needed times of outflow are indicated on the pipettes."
-+msgstr ""
-+"吸管（pipette）用於在實驗中引入小量液體。它有容量刻度，有的只有一兩個特定的刻"
-+"度。這兩種都在攝氏 20 度時進行體積校正，以及校正滿出來時的流出時間，並標示在"
-+"吸管上。"
- 
- #. i18n: file data/tools.xml line 142
- #: rc.cpp:1721
-@@ -4180,33 +4271,31 @@
- #: rc.cpp:1724
- #, no-c-format
- msgid ""
--"This flask named after the chemist Emil Erlenmeyer (1825-1909) comes - unlike "
--"the beaker - with an inverted conical base and a cylindrical neck. There are "
--"different types of Erlenmeyer flasks for laboratory applications, the narrow "
--"and wide neck form. Depending on the application the flask may have precision "
--"grinding to allow good connection to other containers.\n"
--"\t\t\t"
--"<br>\n"
-+"This flask named after the chemist Emil Erlenmeyer (1825-1909) comes - "
-+"unlike the beaker - with an inverted conical base and a cylindrical neck. "
-+"There are different types of Erlenmeyer flasks for laboratory applications, "
-+"the narrow and wide neck form. Depending on the application the flask may "
-+"have precision grinding to allow good connection to other containers.\n"
-+"\t\t\t<br>\n"
- "\t\t\tThe narrow neck reduces the risk of fluid escaping, especially when "
- "boiling or during reactions which agitate the contents.\n"
--"\t\t\t"
--"<br>\n"
--"\t\t\tAn Erlenmeyer flask is useful for mixing fluids or accelerating reactions "
--"by stirring or shaking, for example. The Erlenmeyer flask is particularly "
--"suited for a magnetic stirrer, since it can be placed directly on the stirring "
--"platform. A round-bottomed flask, by contrast, must be placed on a cork ring on "
--"the stirring platform.\n"
--msgstr ""
--"錐形燒瓶（Emil Erlenmeyer）的英文名稱是為了紀念化學家 Emil "
--"Erlenmeyer（1825-1909）。與一般燒瓶不同，它的底座是圓錐型，瓶頸則為圓柱狀。依據不同的實驗用途有幾種不同的錐形燒瓶，如窄頸與寬頸等。有的燒瓶會"
--"磨光以便容易與其它容器連接在一起。\n"
--"\t\t\t"
--"<br>\n"
-+"\t\t\t<br>\n"
-+"\t\t\tAn Erlenmeyer flask is useful for mixing fluids or accelerating "
-+"reactions by stirring or shaking, for example. The Erlenmeyer flask is "
-+"particularly suited for a magnetic stirrer, since it can be placed directly "
-+"on the stirring platform. A round-bottomed flask, by contrast, must be "
-+"placed on a cork ring on the stirring platform.\n"
-+msgstr ""
-+"錐形燒瓶（Emil Erlenmeyer）的英文名稱是為了紀念化學家 Emil Erlenmeyer（1825-"
-+"1909）。與一般燒瓶不同，它的底座是圓錐型，瓶頸則為圓柱狀。依據不同的實驗用途"
-+"有幾種不同的錐形燒瓶，如窄頸與寬頸等。有的燒瓶會磨光以便容易與其它容器連接在"
-+"一起。\n"
-+"\t\t\t<br>\n"
- "\t\t\t窄頸燒瓶可以避免流體溢出，特別是在沸騰或是在攪拌其內容物時。\n"
--"\t\t\t"
--"<br>\n"
--"\t\t\t錐形燒瓶常用於混合流體，或是攪拌、搖動以加速反應進行時。它特別適合與磁性攪拌棒一起使用，因為它可以直接放在攪拌平台上。圓形燒瓶相對而言就比較不方便，"
--"因為它必須擺在軟木環上。\n"
-+"\t\t\t<br>\n"
-+"\t\t\t錐形燒瓶常用於混合流體，或是攪拌、搖動以加速反應進行時。它特別適合與磁"
-+"性攪拌棒一起使用，因為它可以直接放在攪拌平臺上。圓形燒瓶相對而言就比較不方"
-+"便，因為它必須擺在軟木環上。\n"
- 
- #. i18n: file data/tools.xml line 153
- #: rc.cpp:1732
-@@ -4219,12 +4308,13 @@
- #, no-c-format
- msgid ""
- "For some chemical reactions it is important that the solvent is gas free. To "
--"achieve this the reaction vessel is put for some time into a ultrasonic bath. "
--"Through the high sound frequency the vapor locks peel away and ascend. This "
--"procedure is called outgassing."
--msgstr ""
--"有些化學反應必須確保溶劑中沒有氣體。此時會將進行反應用的導管放在超音波清洗器（ultrasonic "
--"bath）中。透過超高頻的聲音，將裡面的氣體震出來。這個過程叫做除氣（outgassing）。"
-+"achieve this the reaction vessel is put for some time into a ultrasonic "
-+"bath. Through the high sound frequency the vapor locks peel away and ascend. "
-+"This procedure is called outgassing."
-+msgstr ""
-+"有些化學反應必須確保溶劑中沒有氣體。此時會將進行反應用的導管放在超音波清洗器"
-+"（ultrasonic bath）中。透過超高頻的聲音，將裡面的氣體震出來。這個過程叫做除氣"
-+"（outgassing）。"
- 
- #. i18n: file data/tools.xml line 158
- #: rc.cpp:1738
-@@ -4236,13 +4326,14 @@
- #: rc.cpp:1741
- #, no-c-format
- msgid ""
--"In a laboratory you often have to weigh out very precise amounts of reagents. "
--"High precise scales can measure masses down to 1/10000 gram.Therefor they stand "
--"on granite blocks to avoid vibrancies and are protected against blasts by a "
--"dome."
--msgstr ""
--"在實驗室中經常需要量測出非常精確的試劑重量。高精確度的天平可用於測量質量，最小單位甚至可以到萬分之一克。因此經常使用花崗岩做底部以防止震動，並在外部使用半圓罩子"
--"以避免風的干擾。"
-+"In a laboratory you often have to weigh out very precise amounts of "
-+"reagents. High precise scales can measure masses down to 1/10000 gram."
-+"Therefor they stand on granite blocks to avoid vibrancies and are protected "
-+"against blasts by a dome."
-+msgstr ""
-+"在實驗室中經常需要量測出非常精確的試劑重量。高精確度的天平可用於測量質量，最"
-+"小單位甚至可以到萬分之一克。因此經常使用花崗岩做底部以防止震動，並在外部使用"
-+"半圓罩子以避免風的干擾。"
- 
- #. i18n: file data/tools.xml line 163
- #: rc.cpp:1744
-@@ -4254,17 +4345,18 @@
- #: rc.cpp:1747
- #, no-c-format
- msgid ""
--"To separate a mixture you can use distillation amongst others. The distillation "
--"bridge is thereby the way between the two pots. In the one pot there is the "
--"mixture to be separated. Through heating, a gas forms which is lead through the "
--"bridge. At the end of the bridge the gas phase is condensed again and drips in "
--"a round flask. As a rule, the bridge is cooled by return flow. In addition, "
--"there is often a thermometer for controlling the temperature on the "
--"distillation bridge."
--msgstr ""
--"要分離混合物，我們可以用蒸餾的方式。蒸餾橋（Distillation "
--"bridge）擺在兩個杯子中間。其中一個杯子是要分離的混合物，經過加熱後，氣體被導到橋中。氣體到橋的另一端後被冷凝，並滴入圓形燒瓶中。蒸餾橋的冷卻一般是靠回流。"
--"此外，蒸餾橋上通常也會有溫度計以控制溫度。"
-+"To separate a mixture you can use distillation amongst others. The "
-+"distillation bridge is thereby the way between the two pots. In the one pot "
-+"there is the mixture to be separated. Through heating, a gas forms which is "
-+"lead through the bridge. At the end of the bridge the gas phase is condensed "
-+"again and drips in a round flask. As a rule, the bridge is cooled by return "
-+"flow. In addition, there is often a thermometer for controlling the "
-+"temperature on the distillation bridge."
-+msgstr ""
-+"要分離混合物，我們可以用蒸餾的方式。蒸餾橋（Distillation bridge）擺在兩個杯子"
-+"中間。其中一個杯子是要分離的混合物，經過加熱後，氣體被導到橋中。氣體到橋的另"
-+"一端後被冷凝，並滴入圓形燒瓶中。蒸餾橋的冷卻一般是靠回流。此外，蒸餾橋上通常"
-+"也會有溫度計以控制溫度。"
- 
- #. i18n: file data/tools.xml line 169
- #: rc.cpp:1750
-@@ -4278,10 +4370,11 @@
- msgid ""
- "A syringe consists of two parts: A glass tube and a punch. Both are normally "
- "made of glass. A gas floats into the glass tube. As the syringe is a closed "
--"system the punch has to give way. This can be used measuring the volume of an "
--"reaction."
-+"system the punch has to give way. This can be used measuring the volume of "
-+"an reaction."
- msgstr ""
--"注射器（syringe）包括兩部份：一個玻璃管與一個注射用的桿子。通常兩者都是玻璃做的。當氣體流入玻璃管內時，因為注射器是密封的，因此會將桿子推出。這樣可用於測"
-+"注射器（syringe）包括兩部份：一個玻璃管與一個注射用的桿子。通常兩者都是玻璃做"
-+"的。當氣體流入玻璃管內時，因為注射器是密封的，因此會將桿子推出。這樣可用於測"
- "量反應時的體積。"
- 
- #. i18n: file data/tools.xml line 174
-@@ -4295,12 +4388,14 @@
- #, no-c-format
- msgid ""
- "At the four ends of this separation beaker you put four small caps. While "
--"distilling, you can turn the beaker by 60 degree after a certain temperate has "
--"been reached. This way, at the end of the distillation all four caps have a "
--"specific liquid in it, depending on the boiling points of the liquid distilled."
--msgstr ""
--"分離燒杯（separation beaker）有四個口，每個口都有小蓋子。在蒸餾的過程中，您可以在燒杯達到一定溫度時就將燒杯轉 60 "
--"度。這樣在蒸餾完成時，依沸點的不同，四個蓋子都會有特定的液體在裡面。"
-+"distilling, you can turn the beaker by 60 degree after a certain temperate "
-+"has been reached. This way, at the end of the distillation all four caps "
-+"have a specific liquid in it, depending on the boiling points of the liquid "
-+"distilled."
-+msgstr ""
-+"分離燒杯（separation beaker）有四個口，每個口都有小蓋子。在蒸餾的過程中，您可"
-+"以在燒杯達到一定溫度時就將燒杯轉 60 度。這樣在蒸餾完成時，依沸點的不同，四個"
-+"蓋子都會有特定的液體在裡面。"
- 
- #. i18n: file data/tools.xml line 179
- #: rc.cpp:1762
-@@ -4312,12 +4407,13 @@
- #: rc.cpp:1765
- #, no-c-format
- msgid ""
--"There are several types of burners. The picture shows a Teclu-Burner. Each type "
--"has specific uses. They vary in the peak temperature and overall heating "
--"capability."
--msgstr ""
--"燃燒器（burner）有好幾種。圖片中顯示的是雙層轉筒燃燒器（Teclu-burner，又譯作「特克魯燃燒器」）。每一種都有不同的用途。它們的最大溫度以及整體加"
--"熱能力都不同。"
-+"There are several types of burners. The picture shows a Teclu-Burner. Each "
-+"type has specific uses. They vary in the peak temperature and overall "
-+"heating capability."
-+msgstr ""
-+"燃燒器（burner）有好幾種。圖片中顯示的是雙層轉筒燃燒器（Teclu-burner，又譯作"
-+"「特克魯燃燒器」）。每一種都有不同的用途。它們的最大溫度以及整體加熱能力都不"
-+"同。"
- 
- #. i18n: file data/tools.xml line 184
- #: rc.cpp:1768
-@@ -4331,7 +4427,9 @@
- msgid ""
- "Most laboratories use extractor hoods. They filter the gasses from chemical "
- "reactions and pump the cleaned air outside of the building."
--msgstr "大部份的實驗室都有通風櫃（extractor hood）。它們會將化學反應產生的氣體過濾，並將乾淨的氣體排出。"
-+msgstr ""
-+"大部份的實驗室都有通風櫃（extractor hood）。它們會將化學反應產生的氣體過濾，"
-+"並將乾淨的氣體排出。"
- 
- #. i18n: file data/tools.xml line 189
- #: rc.cpp:1774
-@@ -4349,9 +4447,9 @@
- "reached the contact thermometer will make the heating coild stop heating. "
- "Therefore in an experiment it is possible to have a constant temperature."
- msgstr ""
--"接觸式溫度計（contact "
--"thermometer）與一般溫度計不同的地方在於它有個偵測目前溫度的感應器。將它與加熱線圈相連，就可以在感應器感知溫度已達到設定目標時停止加熱。因此實驗時可以"
--"保持恆溫。"
-+"接觸式溫度計（contact thermometer）與一般溫度計不同的地方在於它有個偵測目前溫"
-+"度的感應器。將它與加熱線圈相連，就可以在感應器感知溫度已達到設定目標時停止加"
-+"熱。因此實驗時可以保持恆溫。"
- 
- #. i18n: file data/tools.xml line 194
- #: rc.cpp:1780
-@@ -4381,8 +4479,9 @@
- "value. If you need a more precise value you can for example use a pH-Meter "
- "which is using the conductivity of a solution."
- msgstr ""
--"測量溶液的酸鹼值（pH）有好幾種方法。石蕊試紙是其中一種。根據它變色的程度可以一定程度的知道 pH 值。如果您需要更精確的數值，您可以用 pH "
--"量尺，它是利用溶液的傳導能力。"
-+"測量溶液的酸鹼值（pH）有好幾種方法。石蕊試紙是其中一種。根據它變色的程度可以"
-+"一定程度的知道 pH 值。如果您需要更精確的數值，您可以用 pH 量尺，它是利用溶液"
-+"的傳導能力。"
- 
- #. i18n: file data/tools.xml line 204
- #: rc.cpp:1792
-@@ -4406,14 +4505,15 @@
- #: rc.cpp:1801
- #, no-c-format
- msgid ""
--"A buret is used to titrate liquids. The buret is filled with a specified volume "
--"of a liquid. Below it a container like an Erlenmeyer flask is placed. By "
--"opening the valve the liquid in the container will be titrated. High-quality "
--"buret have a venting-mechanism with which they can be very easily refilled with "
--"the exact volume for which the buret is calibrated."
--msgstr ""
--"滴定管（Buret）用於滴定溶液。滴定管中裝了特定容量的液體。在它下方是一個容器，如錐形瓶。開啟閥門後，容器內的液體就開始被滴定。高品質的滴定管會有一種孔狀的設"
--"備，這樣可以重新填入精確容量的液體。"
-+"A buret is used to titrate liquids. The buret is filled with a specified "
-+"volume of a liquid. Below it a container like an Erlenmeyer flask is placed. "
-+"By opening the valve the liquid in the container will be titrated. High-"
-+"quality buret have a venting-mechanism with which they can be very easily "
-+"refilled with the exact volume for which the buret is calibrated."
-+msgstr ""
-+"滴定管（Buret）用於滴定溶液。滴定管中裝了特定容量的液體。在它下方是一個容器，"
-+"如錐形瓶。開啟閥門後，容器內的液體就開始被滴定。高品質的滴定管會有一種孔狀的"
-+"設備，這樣可以重新填入精確容量的液體。"
- 
- #. i18n: file data/tools.xml line 214
- #: rc.cpp:1804
-@@ -4441,10 +4541,11 @@
- #, no-c-format
- msgid ""
- "The DSC measures the heat flow volume of a compound. This value is very "
--"specific for every kind of matter. Thus, the DSC is used to identify chemicals "
--"or to describe them."
-+"specific for every kind of matter. Thus, the DSC is used to identify "
-+"chemicals or to describe them."
- msgstr ""
--"熱微差掃描分析儀（DSC）測量化合物的熱通量（heat flow volume）。每種物質都有特定的熱通量值，因此 DSC 用於辨識或描述化學物質。"
-+"熱微差掃描分析儀（DSC）測量化合物的熱通量（heat flow volume）。每種物質都有特"
-+"定的熱通量值，因此 DSC 用於辨識或描述化學物質。"
- 
- #. i18n: file data/tools.xml line 224
- #: rc.cpp:1816
-@@ -4456,13 +4557,13 @@
- #: rc.cpp:1819
- #, no-c-format
- msgid ""
--"A dewar vessel (or dewar flask) is designed for a good thermal insulation. Its "
--"hull is a double-layer construction with vacuum between the two layers. Because "
--"of this they are appropriote for keeping liquids cold or warm. A thermos flawsk "
--"is an example of a dewar vessel."
-+"A dewar vessel (or dewar flask) is designed for a good thermal insulation. "
-+"Its hull is a double-layer construction with vacuum between the two layers. "
-+"Because of this they are appropriote for keeping liquids cold or warm. A "
-+"thermos flawsk is an example of a dewar vessel."
- msgstr ""
--"杜瓦瓶（dewar vessel 或 dewar "
--"flask）用於隔絕熱能。外層有兩層，中間抽成真空。因此它們適於保持液體的溫度。我們常用的保溫瓶就是杜瓦瓶的一種。"
-+"杜瓦瓶（dewar vessel 或 dewar flask）用於隔絕熱能。外層有兩層，中間抽成真空。"
-+"因此它們適於保持液體的溫度。我們常用的保溫瓶就是杜瓦瓶的一種。"
- 
- #: somwidget_impl.cpp:139
- msgid "Elements with melting point around this temperature:"
-diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdeedu/kanagram.po kde-i18n-zh_TW-3.5.10/messages/kdeedu/kanagram.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdeedu/kanagram.po	2008-08-19 20:43:13.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdeedu/kanagram.po	2011-11-11 15:45:17.000000000 +0100
-@@ -6,8 +6,7 @@
- "Project-Id-Version: kanagram\n"
- "POT-Creation-Date: 2008-07-08 01:24+0200\n"
- "PO-Revision-Date: 2006-06-30 14:54+0800\n"
--"Last-Translator: Frank Weng (a.k.a. Franklin) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Chinese Traditional <zh-l10n@linux.org.tw>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
-@@ -176,19 +175,18 @@
- msgstr "需要標籤<%1>但是讀到標籤<%2>"
- 
- #: keduvockvtmlreader.cpp:1670 keduvockvtmlreader.cpp:1690
--msgid ""
--"File:\t%1\n"
--msgstr ""
--"檔案：\t%1\n"
-+msgid "File:\t%1\n"
-+msgstr "檔案：\t%1\n"
- 
- #: keduvockvtmlreader.cpp:1673
- msgid ""
--"Your document contains an unknown tag <%1>.  Maybe your version of KVocTrain is "
--"too old, or the document is damaged.\n"
-+"Your document contains an unknown tag <%1>.  Maybe your version of KVocTrain "
-+"is too old, or the document is damaged.\n"
- "Loading is aborted because KVocTrain cannot read documents with unknown "
- "elements.\n"
- msgstr ""
--"您的文件中包含未知的標籤<%1>。也許您的 KVocTrain 版本太舊了，或是文件已損毀。\n"
-+"您的文件中包含未知的標籤<%1>。也許您的 KVocTrain 版本太舊了，或是文件已損"
-+"毀。\n"
- "載入將中斷，因為 KVocTrain 無法讀取含有未知標籤的文件。\n"
- 
- #: keduvockvtmlreader.cpp:1681
-@@ -229,8 +227,8 @@
- 
- #: mainsettings.cpp:150
- msgid ""
--"The font could not be installed. Please check that you are properly connected "
--"to the Internet."
-+"The font could not be installed. Please check that you are properly "
-+"connected to the Internet."
- msgstr "無法安裝此字型。請檢查您是否已連上網路。"
- 
- #. i18n: file ./vocabeditwidget.ui line 16
-@@ -249,10 +247,12 @@
- #: rc.cpp:15
- #, no-c-format
- msgid ""
--"The description of the vocabulary. If you're creating a new vocabulary, add a "
--"description so that users of your vocabulary will know what kinds of words it "
--"contains."
--msgstr "字彙的描述。如果您要建立新字彙，請寫好描述以便讓使用者知道這個字彙包含了哪些種類的字。"
-+"The description of the vocabulary. If you're creating a new vocabulary, add "
-+"a description so that users of your vocabulary will know what kinds of words "
-+"it contains."
-+msgstr ""
-+"字彙的描述。如果您要建立新字彙，請寫好描述以便讓使用者知道這個字彙包含了哪些"
-+"種類的字。"
- 
- #. i18n: file ./vocabeditwidget.ui line 96
- #: rc.cpp:18
-@@ -324,8 +324,8 @@
- #: rc.cpp:54
- #, no-c-format
- msgid ""
--"This setting allows you to set the length of time that Kanagram's hint bubble "
--"is shown."
-+"This setting allows you to set the length of time that Kanagram's hint "
-+"bubble is shown."
- msgstr "這個設定是 Kanagram 提示顯示的時間。"
- 
- #. i18n: file ./mainsettingswidget.ui line 30
-diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdeedu/kbruch.po kde-i18n-zh_TW-3.5.10/messages/kdeedu/kbruch.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdeedu/kbruch.po	2008-08-19 20:43:13.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdeedu/kbruch.po	2011-11-11 15:45:17.000000000 +0100
-@@ -6,8 +6,7 @@
- "Project-Id-Version: kbruch\n"
- "POT-Creation-Date: 2008-07-08 01:24+0200\n"
- "PO-Revision-Date: 2006-06-16 16:31+0800\n"
--"Last-Translator: Frank Weng (a.k.a. Franklin) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Traditional Chinese <zh_l10n@linux.org.tw>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
-@@ -42,10 +41,12 @@
- 
- #: exercisecompare.cpp:137
- msgid ""
--"In this exercise you have to compare 2 given fractions by choosing the correct "
--"comparison sign. You can change the comparison sign by just clicking on the "
--"button showing the sign."
--msgstr "這個練習中您要比較兩個分數的大小，選擇正確的比較符號。您可以點選比較符號的按鍵來改變符號。"
-+"In this exercise you have to compare 2 given fractions by choosing the "
-+"correct comparison sign. You can change the comparison sign by just clicking "
-+"on the button showing the sign."
-+msgstr ""
-+"這個練習中您要比較兩個分數的大小，選擇正確的比較符號。您可以點選比較符號的按"
-+"鍵來改變符號。"
- 
- #: exercisecompare.cpp:211 exerciseconvert.cpp:338 exercisefactorize.cpp:399
- #: taskview.cpp:263
-@@ -89,9 +90,10 @@
- #: exerciseconvert.cpp:159 exerciseconvert.cpp:423 exercisefactorize.cpp:156
- #: exercisefactorize.cpp:470 taskview.cpp:154 taskview.cpp:347
- msgid ""
--"Click on this button to check your result. The button will not work if you have "
--"not entered a result yet."
--msgstr "按下此鍵來檢查您的計算結果是否正確。如果您還沒輸入，則這個按鍵不會有作用。"
-+"Click on this button to check your result. The button will not work if you "
-+"have not entered a result yet."
-+msgstr ""
-+"按下此鍵來檢查您的計算結果是否正確。如果您還沒輸入，則這個按鍵不會有作用。"
- 
- #: taskview.cpp:169
- msgid "In this exercise you have to solve a given task with fractions."
-@@ -100,14 +102,16 @@
- #: taskview.cpp:170
- msgid ""
- "In this exercise you have to solve the generated task. You have to enter "
--"numerator and denominator. You can adjust the difficulty of the task with the "
--"boxes in the toolbar. Do not forget to reduce the result!"
--msgstr "這個練習是讓您解分數的計算題。您必須輸入結果的分子與分母。您可以在工具列中調整題目的難度。記得結果要約分！"
-+"numerator and denominator. You can adjust the difficulty of the task with "
-+"the boxes in the toolbar. Do not forget to reduce the result!"
-+msgstr ""
-+"這個練習是讓您解分數的計算題。您必須輸入結果的分子與分母。您可以在工具列中調"
-+"整題目的難度。記得結果要約分！"
- 
- #: exerciseconvert.cpp:406 taskview.cpp:332
- msgid ""
--"You entered a 0 as the denominator. This means division by zero, which is not "
--"allowed. This task will be counted as not correctly solved."
-+"You entered a 0 as the denominator. This means division by zero, which is "
-+"not allowed. This task will be counted as not correctly solved."
- msgstr "您輸入 0 當分母。這表示除數為零，是絕對錯誤的。這一題會被認定為錯誤。"
- 
- #: exerciseconvert.cpp:412 taskview.cpp:338
-@@ -314,7 +318,8 @@
- #: rc.cpp:111
- #, no-c-format
- msgid ""
--"Enables/disables showing the result also in the special mixed-number notation."
-+"Enables/disables showing the result also in the special mixed-number "
-+"notation."
- msgstr "決定是否要在顯示結果時也以帶分數方式顯示。"
- 
- #: mainqtwidget.cpp:70
-@@ -323,8 +328,8 @@
- 
- #: mainqtwidget.cpp:71
- msgid ""
--"Click on the different icons to choose another exercise. The exercises help you "
--"to practice different aspects of calculating with fractions."
-+"Click on the different icons to choose another exercise. The exercises help "
-+"you to practice different aspects of calculating with fractions."
- msgstr "點選不同的圖示可以選擇各種不同的分數計算練習題型。"
- 
- #: mainqtwidget.cpp:79
-@@ -374,8 +379,8 @@
- 
- #: mainqtwidget.cpp:200
- msgid ""
--"Choose the number which will be the maximum for the main denominator: 10, 20, "
--"30, 40 or 50."
-+"Choose the number which will be the maximum for the main denominator: 10, "
-+"20, 30, 40 or 50."
- msgstr "選擇要以哪一個做為最大分母：10，20，30，40 或 50。"
- 
- #: mainqtwidget.cpp:212
-@@ -404,9 +409,9 @@
- 
- #: mainqtwidget.cpp:238
- msgid ""
--"Choose the type of operations you want for calculating fractions: "
--"Addition/Substraction, Multiplication/Division or All Operations Mixed. If you "
--"choose All Operations Mixed, the program will randomly choose addition, "
-+"Choose the type of operations you want for calculating fractions: Addition/"
-+"Substraction, Multiplication/Division or All Operations Mixed. If you choose "
-+"All Operations Mixed, the program will randomly choose addition, "
- "substraction, multiplication and/or division."
- msgstr "選擇您要練習分數計算的運算型態：加減、乘除或加減乘除混合題型。"
- 
-@@ -498,8 +503,9 @@
- "field. Do not forget to enter all prime factors, even when a prime factor "
- "repeats several times!"
- msgstr ""
--"這個練習讓您做質因數分解。您必須輸入此數字的所有質因數。您可以點選質因數的按鍵來加入質因數，已選擇的質因數會列在上方的欄位中。要記得輸入「所有」的質因數，包括重"
--"複出現的！"
-+"這個練習讓您做質因數分解。您必須輸入此數字的所有質因數。您可以點選質因數的按"
-+"鍵來加入質因數，已選擇的質因數會列在上方的欄位中。要記得輸入「所有」的質因"
-+"數，包括重複出現的！"
- 
- #: statisticsview.cpp:65
- msgid "Tasks so far:"
-@@ -539,11 +545,13 @@
- 
- #: statisticsview.cpp:131
- msgid ""
--"This part of the window shows the statistics.  Each exercise you do is counted. "
--"You can reset the statistics by clicking on the button below. Also, if you do "
--"not want to see the statistics, use the vertical bar on the left to reduce the "
--"size of this window part."
--msgstr "視窗的這部份顯示統計數據。您做的每一題計算都會計數。您可以將統計重置歸零，也可以用左方的垂直列來把統計視窗關掉。"
-+"This part of the window shows the statistics.  Each exercise you do is "
-+"counted. You can reset the statistics by clicking on the button below. Also, "
-+"if you do not want to see the statistics, use the vertical bar on the left "
-+"to reduce the size of this window part."
-+msgstr ""
-+"視窗的這部份顯示統計數據。您做的每一題計算都會計數。您可以將統計重置歸零，也"
-+"可以用左方的垂直列來把統計視窗關掉。"
- 
- #: exerciseconvert.cpp:170
- msgid "In this exercise you have to convert a number into a fraction."
-@@ -551,6 +559,6 @@
- 
- #: exerciseconvert.cpp:171
- msgid ""
--"In this exercise you have to convert a given number into a fraction by entering "
--"numerator and denominator. Do not forget to reduce the result!"
-+"In this exercise you have to convert a given number into a fraction by "
-+"entering numerator and denominator. Do not forget to reduce the result!"
- msgstr "這個練習讓您將一個循環小數轉成分數。要記得把結果約分！"
-diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdeedu/keduca.po kde-i18n-zh_TW-3.5.10/messages/kdeedu/keduca.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdeedu/keduca.po	2008-08-19 20:43:13.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdeedu/keduca.po	2011-11-11 15:45:17.000000000 +0100
-@@ -8,8 +8,7 @@
- "Project-Id-Version: keduca\n"
- "POT-Creation-Date: 2008-07-08 01:24+0200\n"
- "PO-Revision-Date: 2006-06-19 12:25+0800\n"
--"Last-Translator: Frank Weng (a.k.a. Franklin) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Chinese Traditional <zh-l10n@linux.org.tw>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
-@@ -179,7 +178,7 @@
- 
- #: keduca/keduca.cpp:67 keducabuilder/keducabuilder.cpp:116
- msgid "Open &Gallery..."
--msgstr "開啟相簿(&G)..."
-+msgstr "開啟相簿(&G)…"
- 
- #: keducabuilder/keducabuilder.cpp:121
- msgid "Document Info"
-@@ -187,11 +186,11 @@
- 
- #: keducabuilder/keducabuilder.cpp:124
- msgid "&Add..."
--msgstr "新增(&A)..."
-+msgstr "新增(&A)…"
- 
- #: keducabuilder/keducabuilder.cpp:125
- msgid "&Edit..."
--msgstr "編輯(&E)..."
-+msgstr "編輯(&E)…"
- 
- #: keducabuilder/keducabuilder.cpp:127
- msgid "&Up"
-@@ -275,8 +274,8 @@
- 
- #: keducabuilder/keducabuilder.cpp:462
- msgid ""
--"If you want to share this document, it is better to copy the images to the same "
--"folder as the document.\n"
-+"If you want to share this document, it is better to copy the images to the "
-+"same folder as the document.\n"
- "Do you want to copy images?"
- msgstr "如果要分享此文件，最好將圖片複製到跟文件同一個目錄下。您要複製圖片嗎？"
- 
-@@ -307,7 +306,7 @@
- 
- #: keducabuilder/keducabuilder.cpp:536
- msgid "Complete Document Info..."
--msgstr "完成文件資訊..."
-+msgstr "完成文件資訊…"
- 
- #: keducabuilder/keducabuilder.cpp:546
- msgid ""
-@@ -431,15 +430,15 @@
- 
- #: keduca/keducaview.cpp:81 keduca/keducaview.cpp:96
- msgid "&Next >>"
--msgstr "下一個 >> (&N)"
-+msgstr "下一個 >>(&N)"
- 
- #: keduca/keducaview.cpp:89
- msgid "&Save Results..."
--msgstr "儲存結果(&S)..."
-+msgstr "儲存結果(&S)…"
- 
- #: keduca/keducaview.cpp:151
- msgid "Save Results As"
--msgstr "儲存結果為..."
-+msgstr "儲存結果為…"
- 
- #: keduca/keducaview.cpp:192
- msgid "Save failed."
-@@ -551,11 +550,9 @@
- #, no-c-format
- msgid ""
- "<span style=\"color:black\">\n"
--"  "
--"<p><b>Question</b></p>\n"
-+"  <p><b>Question</b></p>\n"
- "<hr>\n"
--"  "
--"<p>Only the question and type is required.</p>\n"
-+"  <p>Only the question and type is required.</p>\n"
- "</span>"
- msgstr ""
- "<span style=\"color:black\">\n"
-@@ -617,11 +614,9 @@
- #, no-c-format
- msgid ""
- "<span style=\"color:black\">\n"
--"  "
--"<p><b>Answers</b></p>\n"
-+"  <p><b>Answers</b></p>\n"
- "<hr>\n"
--"  "
--"<p>Only the answer and value is required.</p>\n"
-+"  <p>Only the answer and value is required.</p>\n"
- "</span>"
- msgstr ""
- "<span style=\"color:black\">\n"
-diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdeedu/kfile_drgeo.po kde-i18n-zh_TW-3.5.10/messages/kdeedu/kfile_drgeo.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdeedu/kfile_drgeo.po	2006-07-22 10:04:14.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdeedu/kfile_drgeo.po	2011-11-11 15:45:17.000000000 +0100
-@@ -6,8 +6,7 @@
- "Project-Id-Version: kfile_drgeo\n"
- "POT-Creation-Date: 2005-05-08 12:46+0200\n"
- "PO-Revision-Date: 2006-06-20 16:21+0800\n"
--"Last-Translator: Frank Weng (a.k.a. Franklin) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Chinese Traditional <zh-l10n@linux.org.tw>\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/kdeedu/kfile_kig.po kde-i18n-zh_TW-3.5.10/messages/kdeedu/kfile_kig.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdeedu/kfile_kig.po	2006-07-22 10:04:14.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdeedu/kfile_kig.po	2011-11-11 15:45:17.000000000 +0100
-@@ -6,8 +6,7 @@
- "Project-Id-Version: kfile_kig\n"
- "POT-Creation-Date: 2005-05-25 08:18+0200\n"
- "PO-Revision-Date: 2006-06-19 10:24+0800\n"
--"Last-Translator: Frank Weng (a.k.a. Franklin) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Chinese Traditional <zh-l10n@linux.org.tw>\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/kdeedu/kgeography.po kde-i18n-zh_TW-3.5.10/messages/kdeedu/kgeography.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdeedu/kgeography.po	2007-05-14 12:22:57.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdeedu/kgeography.po	2011-11-11 15:45:17.000000000 +0100
-@@ -12,8 +12,7 @@
- "Project-Id-Version: kgeography\n"
- "POT-Creation-Date: 2007-03-02 02:46+0100\n"
- "PO-Revision-Date: 2007-03-13 14:28+0800\n"
--"Last-Translator: Frank Weng (a.k.a. Franklin) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Chinese Traditional <zh-l10n@linux.org.tw>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
-@@ -64,14 +63,14 @@
- msgid ""
- "_: There are two ways of dealing with the translation of \"%1 is the capital "
- "of...\". The first option simply replaces %1 with the translated name of the "
--"relevant city. If the grammar of your language allows this, choose this option "
--"by setting the translation of this message to 1, and leave untranslated the "
--"translations of \"%1 is the capital of...\" that have the placename embedded "
--"(or translate them as - if you wish to show the file as fully translated. The "
--"second option is to translate all messages in full - this is likely to be "
--"required in the case of highly-inflected languages like Russian. To choose this "
--"option, set the translation of this message to 0, and translate all the "
--"messages.\n"
-+"relevant city. If the grammar of your language allows this, choose this "
-+"option by setting the translation of this message to 1, and leave "
-+"untranslated the translations of \"%1 is the capital of...\" that have the "
-+"placename embedded (or translate them as - if you wish to show the file as "
-+"fully translated. The second option is to translate all messages in full - "
-+"this is likely to be required in the case of highly-inflected languages like "
-+"Russian. To choose this option, set the translation of this message to 0, "
-+"and translate all the messages.\n"
- "0"
- msgstr "0"
- 
-@@ -88,13 +87,13 @@
- "_: There are two ways of dealing with the translation of \"The capital of %1 "
- "is...\". The first option simply replaces %1 with the translated name of the "
- "relevant region. If the grammar of your language allows this, choose this "
--"option by setting the translation of this message to 1, and leave untranslated "
--"the translations of \"The capital of %1 is...\" that have the placename "
--"embedded (or translate them as - if you wish to show the file as fully "
--"translated. The second option is to translate all messages in full - this is "
--"likely to be required in the case of highly-inflected languages like Russian. "
--"To choose this option, set the translation of this message to 0, and translate "
--"all the messages.\n"
-+"option by setting the translation of this message to 1, and leave "
-+"untranslated the translations of \"The capital of %1 is...\" that have the "
-+"placename embedded (or translate them as - if you wish to show the file as "
-+"fully translated. The second option is to translate all messages in full - "
-+"this is likely to be required in the case of highly-inflected languages like "
-+"Russian. To choose this option, set the translation of this message to 0, "
-+"and translate all the messages.\n"
- "0"
- msgstr "0"
- 
-@@ -111,13 +110,13 @@
- "_: There are two ways of dealing with the translation of \"The flag of %1 "
- "is...\". The first option simply replaces %1 with the translated name of the "
- "relevant region. If the grammar of your language allows this, choose this "
--"option by setting the translation of this message to 1, and leave untranslated "
--"the translations of \"The flag of %1 is...\" that have the placename embedded "
--"(or translate them as - if you wish to show the file as fully translated. The "
--"second option is to translate all messages in full - this is likely to be "
--"required in the case of highly-inflected languages like Russian. To choose this "
--"option, set the translation of this message to 0, and translate all the "
--"messages.\n"
-+"option by setting the translation of this message to 1, and leave "
-+"untranslated the translations of \"The flag of %1 is...\" that have the "
-+"placename embedded (or translate them as - if you wish to show the file as "
-+"fully translated. The second option is to translate all messages in full - "
-+"this is likely to be required in the case of highly-inflected languages like "
-+"Russian. To choose this option, set the translation of this message to 0, "
-+"and translate all the messages.\n"
- "0"
- msgstr "0"
- 
-@@ -143,22 +142,23 @@
- 
- #: kgeography.cpp:50
- msgid ""
--"In this section left click on any part of the map to learn about the divisions"
-+"In this section left click on any part of the map to learn about the "
-+"divisions"
- msgstr "這一章節內，點擊地圖的任何地方，可以學習關於該地區的資訊"
- 
- #: kgeography.cpp:51
- msgid "&Click Division in Map..."
--msgstr "點選地圖上的地區(&C)..."
-+msgstr "點選地圖上的地區(&C)…"
- 
- #: kgeography.cpp:52
- msgid ""
--"In this challenge you are given a division name on the left under the menu and "
--"you must find it on the map and click on it"
-+"In this challenge you are given a division name on the left under the menu "
-+"and you must find it on the map and click on it"
- msgstr "在這個挑戰中，您必須根據國家名稱在地圖上點擊正確的位置。"
- 
- #: kgeography.cpp:53
- msgid "Guess Division From Its &Capital..."
--msgstr "從首都猜國家(&C)..."
-+msgstr "從首都猜國家(&C)…"
- 
- #: kgeography.cpp:54
- msgid "In this quiz you have to guess the division name given its capital"
-@@ -166,7 +166,7 @@
- 
- #: kgeography.cpp:55
- msgid "Guess Capital of &Division..."
--msgstr "猜國家的首都(&D)..."
-+msgstr "猜國家的首都(&D)…"
- 
- #: kgeography.cpp:56
- msgid "In this quiz you have to guess the capital of a given division name"
-@@ -174,7 +174,7 @@
- 
- #: kgeography.cpp:57
- msgid "&Guess Division From Its Flag..."
--msgstr "從國旗猜國家(&G)..."
-+msgstr "從國旗猜國家(&G)…"
- 
- #: kgeography.cpp:58
- msgid "In this quiz you have to guess the division name given its flag"
-@@ -182,7 +182,7 @@
- 
- #: kgeography.cpp:59
- msgid "G&uess Flag of Division..."
--msgstr "猜國家的國旗(&U)..."
-+msgstr "猜國家的國旗(&U)…"
- 
- #: kgeography.cpp:60
- msgid "In this quiz you have to guess the flag of a division given its name"
-@@ -190,7 +190,7 @@
- 
- #: kgeography.cpp:76
- msgid "&Open Map..."
--msgstr "開啟地圖(&O)..."
-+msgstr "開啟地圖(&O)…"
- 
- #: kgeography.cpp:82
- msgid "&Original Size"
-@@ -224,16 +224,16 @@
- 
- #: kgeography.cpp:290
- msgid ""
--"_: There are two ways of dealing with the translation of \"Current map: %1\". "
--"The first option simply replaces %1 with the translated name of the relevant "
--"region. If the grammar of your language allows this, choose this option by "
--"setting the translation of this message to 1, and leave untranslated the "
--"translations of \"Current map: %1\" that have the placename embedded (or "
--"translate them as - if you wish to show the file as fully translated. The "
--"second option is to translate all messages in full - this is likely to be "
--"required in the case of highly-inflected languages like Russian. To choose this "
--"option, set the translation of this message to 0, and translate all the "
--"messages.\n"
-+"_: There are two ways of dealing with the translation of \"Current map: %1"
-+"\". The first option simply replaces %1 with the translated name of the "
-+"relevant region. If the grammar of your language allows this, choose this "
-+"option by setting the translation of this message to 1, and leave "
-+"untranslated the translations of \"Current map: %1\" that have the placename "
-+"embedded (or translate them as - if you wish to show the file as fully "
-+"translated. The second option is to translate all messages in full - this is "
-+"likely to be required in the case of highly-inflected languages like "
-+"Russian. To choose this option, set the translation of this message to 0, "
-+"and translate all the messages.\n"
- "0"
- msgstr "0"
- 
-@@ -245,7 +245,9 @@
- msgid ""
- "Maps, flags, translations, etc. are as accurate as their respective authors "
- "could achieve, but KGeography should not be taken as an authoritative source."
--msgstr "地圖、旗幟、翻譯等等已經由各地的作者盡量精確地提供了，但是 KGeography 不應被當做是相關資訊的權威來源。"
-+msgstr ""
-+"地圖、旗幟、翻譯等等已經由各地的作者盡量精確地提供了，但是 KGeography 不應被"
-+"當做是相關資訊的權威來源。"
- 
- #: main.cpp:19
- msgid "KGeography"
-@@ -287,20 +289,22 @@
- msgid ""
- "You have found a bug in a map. Please contact the author and tell the %1 map "
- "has nothing associated to color %2,%3,%4."
--msgstr "您在地圖上找到了錯誤。請與作者聯絡，並告訴他地圖 %1 並未與顏色 %2,%3,%4 相關。"
-+msgstr ""
-+"您在地圖上找到了錯誤。請與作者聯絡，並告訴他地圖 %1 並未與顏色 %2,%3,%4 相"
-+"關。"
- 
- #: mapasker.cpp:173
- msgid ""
--"_: There are two ways of dealing with the translation of \"Please click on: "
--"%1\". The first option simply replaces %1 with the translated name of the "
--"relevant region/city. If the grammar of your language allows this, choose this "
--"option by setting the translation of this message to 1, and leave untranslated "
--"the translations of \"Please click on: %1\" that have the placename embedded "
--"(or translate them as - if you wish to show the file as fully translated. The "
--"second option is to translate all messages in full - this is likely to be "
--"required in the case of highly-inflected languages like Russian. To choose this "
--"option, set the translation of this message to 0, and translate all the "
--"messages.\n"
-+"_: There are two ways of dealing with the translation of \"Please click on: %"
-+"1\". The first option simply replaces %1 with the translated name of the "
-+"relevant region/city. If the grammar of your language allows this, choose "
-+"this option by setting the translation of this message to 1, and leave "
-+"untranslated the translations of \"Please click on: %1\" that have the "
-+"placename embedded (or translate them as - if you wish to show the file as "
-+"fully translated. The second option is to translate all messages in full - "
-+"this is likely to be required in the case of highly-inflected languages like "
-+"Russian. To choose this option, set the translation of this message to 0, "
-+"and translate all the messages.\n"
- "0"
- msgstr "0"
- 
-@@ -358,8 +362,8 @@
- 
- #: mapparser.cpp:157
- msgid ""
--"There is already either a division called %1 or a division with the same colors "
--"as %2"
-+"There is already either a division called %1 or a division with the same "
-+"colors as %2"
- msgstr "已經有個地區叫做 %1，不然就是有個地區的顏色與 %2 一樣"
- 
- #: mapparser.cpp:159
-@@ -401,8 +405,7 @@
- #: mapsdatatranslation.cpp:2
- msgid ""
- "_: africa.kgm\n"
--"<qt>Current map:"
--"<br><b>Africa</b></qt>"
-+"<qt>Current map:<br><b>Africa</b></qt>"
- msgstr "<qt>目前地圖：<br><b>非洲</b></qt>"
- 
- #: mapsdatatranslation.cpp:3
-@@ -433,7 +436,7 @@
- msgid ""
- "_: africa.kgm\n"
- "The capital of Algeria is..."
--msgstr "阿爾及利亞（Algeria）的首都是..."
-+msgstr "阿爾及利亞（Algeria）的首都是…"
- 
- #: mapsdatatranslation.cpp:8
- msgid ""
-@@ -446,7 +449,7 @@
- msgid ""
- "_: africa.kgm\n"
- "The flag of Algeria is..."
--msgstr "阿爾及利亞（Algeria）的國旗是..."
-+msgstr "阿爾及利亞（Algeria）的國旗是…"
- 
- #: mapsdatatranslation.cpp:10
- msgid ""
-@@ -470,7 +473,7 @@
- msgid ""
- "_: africa.kgm\n"
- "The capital of Angola is..."
--msgstr "安哥拉（Angola）的首都是..."
-+msgstr "安哥拉（Angola）的首都是…"
- 
- #: mapsdatatranslation.cpp:14
- msgid ""
-@@ -483,7 +486,7 @@
- msgid ""
- "_: africa.kgm\n"
- "The flag of Angola is..."
--msgstr "安哥拉（Angola）的國旗是..."
-+msgstr "安哥拉（Angola）的國旗是…"
- 
- #: mapsdatatranslation.cpp:16
- msgid ""
-@@ -507,7 +510,7 @@
- msgid ""
- "_: africa.kgm\n"
- "The capital of Benin is..."
--msgstr "貝南（Benin）的首都是..."
-+msgstr "貝南（Benin）的首都是…"
- 
- #: mapsdatatranslation.cpp:20
- msgid ""
-@@ -520,7 +523,7 @@
- msgid ""
- "_: africa.kgm\n"
- "The flag of Benin is..."
--msgstr "貝南（Benin）的國旗是..."
-+msgstr "貝南（Benin）的國旗是…"
- 
- #: mapsdatatranslation.cpp:22
- msgid ""
-@@ -544,7 +547,7 @@
- msgid ""
- "_: africa.kgm\n"
- "The capital of Botswana is..."
--msgstr "波札那（Botswana）的首都是..."
-+msgstr "波札那（Botswana）的首都是…"
- 
- #: mapsdatatranslation.cpp:26
- msgid ""
-@@ -557,7 +560,7 @@
- msgid ""
- "_: africa.kgm\n"
- "The flag of Botswana is..."
--msgstr "波札那（Botswana）的國旗是..."
-+msgstr "波札那（Botswana）的國旗是…"
- 
- #: mapsdatatranslation.cpp:28
- msgid ""
-@@ -581,7 +584,7 @@
- msgid ""
- "_: africa.kgm\n"
- "The capital of Burkina Faso is..."
--msgstr "布吉納法索（Burkina Faso）的首都是..."
-+msgstr "布吉納法索（Burkina Faso）的首都是…"
- 
- #: mapsdatatranslation.cpp:32
- msgid ""
-@@ -594,7 +597,7 @@
- msgid ""
- "_: africa.kgm\n"
- "The flag of Burkina Faso is..."
--msgstr "布吉納法索（Burkina Faso）的國旗是..."
-+msgstr "布吉納法索（Burkina Faso）的國旗是…"
- 
- #: mapsdatatranslation.cpp:34
- msgid ""
-@@ -618,7 +621,7 @@
- msgid ""
- "_: africa.kgm\n"
- "The capital of Burundi is..."
--msgstr "蒲隆地（Burundi）的首都是..."
-+msgstr "蒲隆地（Burundi）的首都是…"
- 
- #: mapsdatatranslation.cpp:38
- msgid ""
-@@ -631,7 +634,7 @@
- msgid ""
- "_: africa.kgm\n"
- "The flag of Burundi is..."
--msgstr "蒲隆地（Burundi）的國旗是..."
-+msgstr "蒲隆地（Burundi）的國旗是…"
- 
- #: mapsdatatranslation.cpp:40
- msgid ""
-@@ -655,7 +658,7 @@
- msgid ""
- "_: africa.kgm\n"
- "The capital of Cameroon is..."
--msgstr "喀麥隆（Cameroon）的首都是..."
-+msgstr "喀麥隆（Cameroon）的首都是…"
- 
- #: mapsdatatranslation.cpp:44
- msgid ""
-@@ -668,7 +671,7 @@
- msgid ""
- "_: africa.kgm\n"
- "The flag of Cameroon is..."
--msgstr "喀麥隆（Cameroon）的國旗是..."
-+msgstr "喀麥隆（Cameroon）的國旗是…"
- 
- #: mapsdatatranslation.cpp:46
- msgid ""
-@@ -692,7 +695,7 @@
- msgid ""
- "_: africa.kgm\n"
- "The capital of Central African Republic is..."
--msgstr "中非共和國（Central African Republic）的首都是..."
-+msgstr "中非共和國（Central African Republic）的首都是…"
- 
- #: mapsdatatranslation.cpp:50
- msgid ""
-@@ -705,7 +708,7 @@
- msgid ""
- "_: africa.kgm\n"
- "The flag of Central African Republic is..."
--msgstr "中非共和國（Central African Republic）的國旗是..."
-+msgstr "中非共和國（Central African Republic）的國旗是…"
- 
- #: mapsdatatranslation.cpp:52
- msgid ""
-@@ -729,7 +732,7 @@
- msgid ""
- "_: africa.kgm\n"
- "The capital of Chad is..."
--msgstr "查德（Chad）的首都是..."
-+msgstr "查德（Chad）的首都是…"
- 
- #: mapsdatatranslation.cpp:56
- msgid ""
-@@ -742,7 +745,7 @@
- msgid ""
- "_: africa.kgm\n"
- "The flag of Chad is..."
--msgstr "查德（Chad）的國旗是..."
-+msgstr "查德（Chad）的國旗是…"
- 
- #: mapsdatatranslation.cpp:58
- msgid ""
-@@ -766,7 +769,7 @@
- msgid ""
- "_: africa.kgm\n"
- "The capital of Côte d'Ivoire is..."
--msgstr "象牙海岸（Côte d'Ivoire）的首都是..."
-+msgstr "象牙海岸（Côte d'Ivoire）的首都是…"
- 
- #: mapsdatatranslation.cpp:62
- msgid ""
-@@ -779,7 +782,7 @@
- msgid ""
- "_: africa.kgm\n"
- "The flag of Côte d'Ivoire is..."
--msgstr "象牙海岸（Côte d'Ivoire）的國旗是..."
-+msgstr "象牙海岸（Côte d'Ivoire）的國旗是…"
- 
- #: mapsdatatranslation.cpp:64
- msgid ""
-@@ -809,7 +812,7 @@
- msgid ""
- "_: africa.kgm\n"
- "The capital of Democratic Republic of the Congo is..."
--msgstr "剛果民主共和國（Democratic Republic of the Congo）的首都是..."
-+msgstr "剛果民主共和國（Democratic Republic of the Congo）的首都是…"
- 
- #: mapsdatatranslation.cpp:69
- msgid ""
-@@ -822,7 +825,7 @@
- msgid ""
- "_: africa.kgm\n"
- "The flag of Democratic Republic of the Congo is..."
--msgstr "剛果民主共和國（Democratic Republic of the Congo）的國旗是..."
-+msgstr "剛果民主共和國（Democratic Republic of the Congo）的國旗是…"
- 
- #: mapsdatatranslation.cpp:71
- msgid ""
-@@ -846,7 +849,7 @@
- msgid ""
- "_: africa.kgm\n"
- "The capital of Djibouti is..."
--msgstr "吉布地（Djibouti）的首都是..."
-+msgstr "吉布地（Djibouti）的首都是…"
- 
- #: mapsdatatranslation.cpp:75
- msgid ""
-@@ -859,7 +862,7 @@
- msgid ""
- "_: africa.kgm\n"
- "The flag of Djibouti is..."
--msgstr "吉布地（Djibouti）的國旗是..."
-+msgstr "吉布地（Djibouti）的國旗是…"
- 
- #: mapsdatatranslation.cpp:78
- msgid ""
-@@ -877,7 +880,7 @@
- msgid ""
- "_: africa.kgm\n"
- "The capital of Egypt is..."
--msgstr "埃及（Egypt）的首都是..."
-+msgstr "埃及（Egypt）的首都是…"
- 
- #: mapsdatatranslation.cpp:81
- msgid ""
-@@ -890,7 +893,7 @@
- msgid ""
- "_: africa.kgm\n"
- "The flag of Egypt is..."
--msgstr "埃及（Egypt）的國旗是..."
-+msgstr "埃及（Egypt）的國旗是…"
- 
- #: mapsdatatranslation.cpp:83
- msgid ""
-@@ -914,7 +917,7 @@
- msgid ""
- "_: africa.kgm\n"
- "The capital of Equatorial Guinea is..."
--msgstr "赤道幾內亞（Equatorial Guinea）的首都是..."
-+msgstr "赤道幾內亞（Equatorial Guinea）的首都是…"
- 
- #: mapsdatatranslation.cpp:87
- msgid ""
-@@ -927,7 +930,7 @@
- msgid ""
- "_: africa.kgm\n"
- "The flag of Equatorial Guinea is..."
--msgstr "赤道幾內亞（Equatorial Guinea）的國旗是..."
-+msgstr "赤道幾內亞（Equatorial Guinea）的國旗是…"
- 
- #: mapsdatatranslation.cpp:89
- msgid ""
-@@ -951,7 +954,7 @@
- msgid ""
- "_: africa.kgm\n"
- "The capital of Eritrea is..."
--msgstr "厄利垂亞（Eritrea）的首都是..."
-+msgstr "厄利垂亞（Eritrea）的首都是…"
- 
- #: mapsdatatranslation.cpp:93
- msgid ""
-@@ -964,7 +967,7 @@
- msgid ""
- "_: africa.kgm\n"
- "The flag of Eritrea is..."
--msgstr "厄利垂亞（Eritrea）的國旗是..."
-+msgstr "厄利垂亞（Eritrea）的國旗是…"
- 
- #: mapsdatatranslation.cpp:95
- msgid ""
-@@ -988,7 +991,7 @@
- msgid ""
- "_: africa.kgm\n"
- "The capital of Ethiopia is..."
--msgstr "衣索比亞（Ethiopia）的首都是..."
-+msgstr "衣索比亞（Ethiopia）的首都是…"
- 
- #: mapsdatatranslation.cpp:99
- msgid ""
-@@ -1001,7 +1004,7 @@
- msgid ""
- "_: africa.kgm\n"
- "The flag of Ethiopia is..."
--msgstr "衣索比亞（Ethiopia）的國旗是..."
-+msgstr "衣索比亞（Ethiopia）的國旗是…"
- 
- #: mapsdatatranslation.cpp:101
- msgid ""
-@@ -1025,7 +1028,7 @@
- msgid ""
- "_: africa.kgm\n"
- "The capital of Gabon is..."
--msgstr "加彭（Gabon）的首都是..."
-+msgstr "加彭（Gabon）的首都是…"
- 
- #: mapsdatatranslation.cpp:105
- msgid ""
-@@ -1038,7 +1041,7 @@
- msgid ""
- "_: africa.kgm\n"
- "The flag of Gabon is..."
--msgstr "加彭（Gabon）的國旗是..."
-+msgstr "加彭（Gabon）的國旗是…"
- 
- #: mapsdatatranslation.cpp:107
- msgid ""
-@@ -1062,7 +1065,7 @@
- msgid ""
- "_: africa.kgm\n"
- "The capital of Ghana is..."
--msgstr "迦納（Ghana）的首都是..."
-+msgstr "迦納（Ghana）的首都是…"
- 
- #: mapsdatatranslation.cpp:111
- msgid ""
-@@ -1075,7 +1078,7 @@
- msgid ""
- "_: africa.kgm\n"
- "The flag of Ghana is..."
--msgstr "迦納（Ghana）的國旗是..."
-+msgstr "迦納（Ghana）的國旗是…"
- 
- #: mapsdatatranslation.cpp:113
- msgid ""
-@@ -1105,7 +1108,7 @@
- msgid ""
- "_: africa.kgm\n"
- "The capital of Guinea is..."
--msgstr "幾內亞（Guinea）的首都是..."
-+msgstr "幾內亞（Guinea）的首都是…"
- 
- #: mapsdatatranslation.cpp:118
- msgid ""
-@@ -1118,7 +1121,7 @@
- msgid ""
- "_: africa.kgm\n"
- "The flag of Guinea is..."
--msgstr "幾內亞（Guinea）的國旗是..."
-+msgstr "幾內亞（Guinea）的國旗是…"
- 
- #: mapsdatatranslation.cpp:120
- msgid ""
-@@ -1142,7 +1145,7 @@
- msgid ""
- "_: africa.kgm\n"
- "The capital of Guinea-Bissau is..."
--msgstr "幾內亞比索（Guinea-Bissau）的首都是..."
-+msgstr "幾內亞比索（Guinea-Bissau）的首都是…"
- 
- #: mapsdatatranslation.cpp:124
- msgid ""
-@@ -1155,7 +1158,7 @@
- msgid ""
- "_: africa.kgm\n"
- "The flag of Guinea-Bissau is..."
--msgstr "幾內亞比索（Guinea-Bissau）的國旗是..."
-+msgstr "幾內亞比索（Guinea-Bissau）的國旗是…"
- 
- #: mapsdatatranslation.cpp:126
- msgid ""
-@@ -1209,7 +1212,7 @@
- msgid ""
- "_: africa.kgm\n"
- "The capital of Kenya is..."
--msgstr "肯亞（Kenya）的首都是..."
-+msgstr "肯亞（Kenya）的首都是…"
- 
- #: mapsdatatranslation.cpp:135
- msgid ""
-@@ -1222,7 +1225,7 @@
- msgid ""
- "_: africa.kgm\n"
- "The flag of Kenya is..."
--msgstr "肯亞（Kenya）的國旗是..."
-+msgstr "肯亞（Kenya）的國旗是…"
- 
- #: mapsdatatranslation.cpp:137
- msgid ""
-@@ -1258,7 +1261,7 @@
- msgid ""
- "_: africa.kgm\n"
- "The capital of Lesotho is..."
--msgstr "賴索托（Lesotho）的首都是..."
-+msgstr "賴索托（Lesotho）的首都是…"
- 
- #: mapsdatatranslation.cpp:143
- msgid ""
-@@ -1271,7 +1274,7 @@
- msgid ""
- "_: africa.kgm\n"
- "The flag of Lesotho is..."
--msgstr "賴索托（Lesotho）的國旗是..."
-+msgstr "賴索托（Lesotho）的國旗是…"
- 
- #: mapsdatatranslation.cpp:145
- msgid ""
-@@ -1295,7 +1298,7 @@
- msgid ""
- "_: africa.kgm\n"
- "The capital of Liberia is..."
--msgstr "賴比瑞亞（Liberia）的首都是..."
-+msgstr "賴比瑞亞（Liberia）的首都是…"
- 
- #: mapsdatatranslation.cpp:149
- msgid ""
-@@ -1308,7 +1311,7 @@
- msgid ""
- "_: africa.kgm\n"
- "The flag of Liberia is..."
--msgstr "賴比瑞亞（Liberia）的國旗是..."
-+msgstr "賴比瑞亞（Liberia）的國旗是…"
- 
- #: mapsdatatranslation.cpp:151
- msgid ""
-@@ -1332,7 +1335,7 @@
- msgid ""
- "_: africa.kgm\n"
- "The capital of Libya is..."
--msgstr "利比亞（Libya）的首都是..."
-+msgstr "利比亞（Libya）的首都是…"
- 
- #: mapsdatatranslation.cpp:155
- msgid ""
-@@ -1345,7 +1348,7 @@
- msgid ""
- "_: africa.kgm\n"
- "The flag of Libya is..."
--msgstr "利比亞（Libya）的國旗是..."
-+msgstr "利比亞（Libya）的國旗是…"
- 
- #: mapsdatatranslation.cpp:157
- msgid ""
-@@ -1369,7 +1372,7 @@
- msgid ""
- "_: africa.kgm\n"
- "The capital of Madagascar is..."
--msgstr "馬達加斯加（Madagascar）的首都是..."
-+msgstr "馬達加斯加（Madagascar）的首都是…"
- 
- #: mapsdatatranslation.cpp:161
- msgid ""
-@@ -1382,7 +1385,7 @@
- msgid ""
- "_: africa.kgm\n"
- "The flag of Madagascar is..."
--msgstr "馬達加斯加（Madagascar）的國旗是..."
-+msgstr "馬達加斯加（Madagascar）的國旗是…"
- 
- #: mapsdatatranslation.cpp:163
- msgid ""
-@@ -1406,7 +1409,7 @@
- msgid ""
- "_: africa.kgm\n"
- "The capital of Malawi is..."
--msgstr "馬拉威（Malawi）的首都是..."
-+msgstr "馬拉威（Malawi）的首都是…"
- 
- #: mapsdatatranslation.cpp:167
- msgid ""
-@@ -1419,7 +1422,7 @@
- msgid ""
- "_: africa.kgm\n"
- "The flag of Malawi is..."
--msgstr "馬拉威（Malawi）的國旗是..."
-+msgstr "馬拉威（Malawi）的國旗是…"
- 
- #: mapsdatatranslation.cpp:169
- msgid ""
-@@ -1443,7 +1446,7 @@
- msgid ""
- "_: africa.kgm\n"
- "The capital of Mali is..."
--msgstr "馬利（Mali）的首都是..."
-+msgstr "馬利（Mali）的首都是…"
- 
- #: mapsdatatranslation.cpp:173
- msgid ""
-@@ -1456,7 +1459,7 @@
- msgid ""
- "_: africa.kgm\n"
- "The flag of Mali is..."
--msgstr "馬利（Mali）的國旗是..."
-+msgstr "馬利（Mali）的國旗是…"
- 
- #: mapsdatatranslation.cpp:175
- msgid ""
-@@ -1480,7 +1483,7 @@
- msgid ""
- "_: africa.kgm\n"
- "The capital of Mauritania is..."
--msgstr "茅利塔尼亞（Mauritania）的首都是..."
-+msgstr "茅利塔尼亞（Mauritania）的首都是…"
- 
- #: mapsdatatranslation.cpp:179
- msgid ""
-@@ -1493,7 +1496,7 @@
- msgid ""
- "_: africa.kgm\n"
- "The flag of Mauritania is..."
--msgstr "茅利塔尼亞（Mauritania）的國旗是..."
-+msgstr "茅利塔尼亞（Mauritania）的國旗是…"
- 
- #: mapsdatatranslation.cpp:181
- msgid ""
-@@ -1517,7 +1520,7 @@
- msgid ""
- "_: africa.kgm\n"
- "The capital of Morocco is..."
--msgstr "摩洛哥（Morocco）的首都是..."
-+msgstr "摩洛哥（Morocco）的首都是…"
- 
- #: mapsdatatranslation.cpp:185
- msgid ""
-@@ -1530,7 +1533,7 @@
- msgid ""
- "_: africa.kgm\n"
- "The flag of Morocco is..."
--msgstr "摩洛哥（Morocco）的國旗是..."
-+msgstr "摩洛哥（Morocco）的國旗是…"
- 
- #: mapsdatatranslation.cpp:187
- msgid ""
-@@ -1554,7 +1557,7 @@
- msgid ""
- "_: africa.kgm\n"
- "The capital of Mozambique is..."
--msgstr "莫三比克（Mozambique）的首都是..."
-+msgstr "莫三比克（Mozambique）的首都是…"
- 
- #: mapsdatatranslation.cpp:191
- msgid ""
-@@ -1567,7 +1570,7 @@
- msgid ""
- "_: africa.kgm\n"
- "The flag of Mozambique is..."
--msgstr "莫三比克（Mozambique）的國旗是..."
-+msgstr "莫三比克（Mozambique）的國旗是…"
- 
- #: mapsdatatranslation.cpp:193
- msgid ""
-@@ -1591,7 +1594,7 @@
- msgid ""
- "_: africa.kgm\n"
- "The capital of Namibia is..."
--msgstr "納米比亞（Namibia）的首都是..."
-+msgstr "納米比亞（Namibia）的首都是…"
- 
- #: mapsdatatranslation.cpp:197
- msgid ""
-@@ -1604,7 +1607,7 @@
- msgid ""
- "_: africa.kgm\n"
- "The flag of Namibia is..."
--msgstr "納米比亞（Namibia）的國旗是..."
-+msgstr "納米比亞（Namibia）的國旗是…"
- 
- #: mapsdatatranslation.cpp:199
- msgid ""
-@@ -1628,7 +1631,7 @@
- msgid ""
- "_: africa.kgm\n"
- "The capital of Niger is..."
--msgstr "尼日（Niger）的首都是..."
-+msgstr "尼日（Niger）的首都是…"
- 
- #: mapsdatatranslation.cpp:203
- msgid ""
-@@ -1641,7 +1644,7 @@
- msgid ""
- "_: africa.kgm\n"
- "The flag of Niger is..."
--msgstr "尼日（Niger）的國旗是..."
-+msgstr "尼日（Niger）的國旗是…"
- 
- #: mapsdatatranslation.cpp:205
- msgid ""
-@@ -1665,7 +1668,7 @@
- msgid ""
- "_: africa.kgm\n"
- "The capital of Nigeria is..."
--msgstr "奈及利亞（Nigeria）的首都是..."
-+msgstr "奈及利亞（Nigeria）的首都是…"
- 
- #: mapsdatatranslation.cpp:209
- msgid ""
-@@ -1678,7 +1681,7 @@
- msgid ""
- "_: africa.kgm\n"
- "The flag of Nigeria is..."
--msgstr "奈及利亞（Nigeria）的國旗是..."
-+msgstr "奈及利亞（Nigeria）的國旗是…"
- 
- #: mapsdatatranslation.cpp:211
- msgid ""
-@@ -1714,7 +1717,7 @@
- msgid ""
- "_: africa.kgm\n"
- "The capital of Republic of the Congo is..."
--msgstr "剛果（Republic of the Congo）的首都是..."
-+msgstr "剛果（Republic of the Congo）的首都是…"
- 
- #: mapsdatatranslation.cpp:217
- msgid ""
-@@ -1727,7 +1730,7 @@
- msgid ""
- "_: africa.kgm\n"
- "The flag of Republic of the Congo is..."
--msgstr "剛果（Republic of the Congo）的國旗是..."
-+msgstr "剛果（Republic of the Congo）的國旗是…"
- 
- #: mapsdatatranslation.cpp:219
- msgid ""
-@@ -1751,7 +1754,7 @@
- msgid ""
- "_: africa.kgm\n"
- "The capital of Rwanda is..."
--msgstr "盧安達（Rwanda）的首都是..."
-+msgstr "盧安達（Rwanda）的首都是…"
- 
- #: mapsdatatranslation.cpp:223
- msgid ""
-@@ -1764,7 +1767,7 @@
- msgid ""
- "_: africa.kgm\n"
- "The flag of Rwanda is..."
--msgstr "盧安達（Rwanda）的國旗是..."
-+msgstr "盧安達（Rwanda）的國旗是…"
- 
- #: mapsdatatranslation.cpp:225
- msgid ""
-@@ -1794,7 +1797,7 @@
- msgid ""
- "_: africa.kgm\n"
- "The capital of Senegal is..."
--msgstr "塞內加爾（Senegal）的首都是..."
-+msgstr "塞內加爾（Senegal）的首都是…"
- 
- #: mapsdatatranslation.cpp:230
- msgid ""
-@@ -1807,7 +1810,7 @@
- msgid ""
- "_: africa.kgm\n"
- "The flag of Senegal is..."
--msgstr "塞內加爾（Senegal）的國旗是..."
-+msgstr "塞內加爾（Senegal）的國旗是…"
- 
- #: mapsdatatranslation.cpp:232
- msgid ""
-@@ -1831,7 +1834,7 @@
- msgid ""
- "_: africa.kgm\n"
- "The capital of Sierra Leone is..."
--msgstr "獅子山共和國（Sierra Leone）的首都是..."
-+msgstr "獅子山共和國（Sierra Leone）的首都是…"
- 
- #: mapsdatatranslation.cpp:236
- msgid ""
-@@ -1844,7 +1847,7 @@
- msgid ""
- "_: africa.kgm\n"
- "The flag of Sierra Leone is..."
--msgstr "獅子山共和國（Sierra Leone）的國旗是..."
-+msgstr "獅子山共和國（Sierra Leone）的國旗是…"
- 
- #: mapsdatatranslation.cpp:238
- msgid ""
-@@ -1868,7 +1871,7 @@
- msgid ""
- "_: africa.kgm\n"
- "The capital of Somalia is..."
--msgstr "索馬利亞（Somalia）的首都是..."
-+msgstr "索馬利亞（Somalia）的首都是…"
- 
- #: mapsdatatranslation.cpp:242
- msgid ""
-@@ -1881,7 +1884,7 @@
- msgid ""
- "_: africa.kgm\n"
- "The flag of Somalia is..."
--msgstr "索馬利亞（Somalia）的國旗是..."
-+msgstr "索馬利亞（Somalia）的國旗是…"
- 
- #: mapsdatatranslation.cpp:244
- msgid ""
-@@ -1905,7 +1908,7 @@
- msgid ""
- "_: africa.kgm\n"
- "The capital of South Africa is..."
--msgstr "南非（South Africa）的首都是..."
-+msgstr "南非（South Africa）的首都是…"
- 
- #: mapsdatatranslation.cpp:248
- msgid ""
-@@ -1918,7 +1921,7 @@
- msgid ""
- "_: africa.kgm\n"
- "The flag of South Africa is..."
--msgstr "南非（South Africa）的國旗是..."
-+msgstr "南非（South Africa）的國旗是…"
- 
- #: mapsdatatranslation.cpp:250
- msgid ""
-@@ -1948,7 +1951,7 @@
- msgid ""
- "_: africa.kgm\n"
- "The capital of Sudan is..."
--msgstr "蘇丹（Sudan）的首都是..."
-+msgstr "蘇丹（Sudan）的首都是…"
- 
- #: mapsdatatranslation.cpp:255
- msgid ""
-@@ -1961,7 +1964,7 @@
- msgid ""
- "_: africa.kgm\n"
- "The flag of Sudan is..."
--msgstr "蘇丹（Sudan）的國旗是..."
-+msgstr "蘇丹（Sudan）的國旗是…"
- 
- #: mapsdatatranslation.cpp:257
- msgid ""
-@@ -1985,7 +1988,7 @@
- msgid ""
- "_: africa.kgm\n"
- "The capital of Swaziland is..."
--msgstr "史瓦濟蘭（Swaziland）的首都是..."
-+msgstr "史瓦濟蘭（Swaziland）的首都是…"
- 
- #: mapsdatatranslation.cpp:261
- msgid ""
-@@ -1998,7 +2001,7 @@
- msgid ""
- "_: africa.kgm\n"
- "The flag of Swaziland is..."
--msgstr "史瓦濟蘭（Swaziland）的國旗是..."
-+msgstr "史瓦濟蘭（Swaziland）的國旗是…"
- 
- #: mapsdatatranslation.cpp:263
- msgid ""
-@@ -2028,7 +2031,7 @@
- msgid ""
- "_: africa.kgm\n"
- "The capital of Tanzania is..."
--msgstr "坦尚尼亞（Tanzania）的首都是..."
-+msgstr "坦尚尼亞（Tanzania）的首都是…"
- 
- #: mapsdatatranslation.cpp:268
- msgid ""
-@@ -2041,7 +2044,7 @@
- msgid ""
- "_: africa.kgm\n"
- "The flag of Tanzania is..."
--msgstr "坦尚尼亞（Tanzania）的國旗是..."
-+msgstr "坦尚尼亞（Tanzania）的國旗是…"
- 
- #: mapsdatatranslation.cpp:270
- msgid ""
-@@ -2065,7 +2068,7 @@
- msgid ""
- "_: africa.kgm\n"
- "The capital of The Gambia is..."
--msgstr "甘比亞（The Gambia）的首都是..."
-+msgstr "甘比亞（The Gambia）的首都是…"
- 
- #: mapsdatatranslation.cpp:274
- msgid ""
-@@ -2078,7 +2081,7 @@
- msgid ""
- "_: africa.kgm\n"
- "The flag of The Gambia is..."
--msgstr "甘比亞（The Gambia）的國旗是..."
-+msgstr "甘比亞（The Gambia）的國旗是…"
- 
- #: mapsdatatranslation.cpp:276
- msgid ""
-@@ -2102,7 +2105,7 @@
- msgid ""
- "_: africa.kgm\n"
- "The capital of Togo is..."
--msgstr "多哥（Togo）的首都是..."
-+msgstr "多哥（Togo）的首都是…"
- 
- #: mapsdatatranslation.cpp:280
- msgid ""
-@@ -2115,7 +2118,7 @@
- msgid ""
- "_: africa.kgm\n"
- "The flag of Togo is..."
--msgstr "多哥（Togo）的國旗是..."
-+msgstr "多哥（Togo）的國旗是…"
- 
- #: mapsdatatranslation.cpp:282
- msgid ""
-@@ -2139,7 +2142,7 @@
- msgid ""
- "_: africa.kgm\n"
- "The capital of Tunisia is..."
--msgstr "突尼西亞（Tunisia）的首都是..."
-+msgstr "突尼西亞（Tunisia）的首都是…"
- 
- #: mapsdatatranslation.cpp:286
- msgid ""
-@@ -2152,7 +2155,7 @@
- msgid ""
- "_: africa.kgm\n"
- "The flag of Tunisia is..."
--msgstr "突尼西亞（Tunisia）的國旗是..."
-+msgstr "突尼西亞（Tunisia）的國旗是…"
- 
- #: mapsdatatranslation.cpp:288
- msgid ""
-@@ -2188,7 +2191,7 @@
- msgid ""
- "_: africa.kgm\n"
- "The capital of Uganda is..."
--msgstr "烏干達（Uganda）的首都是..."
-+msgstr "烏干達（Uganda）的首都是…"
- 
- #: mapsdatatranslation.cpp:294
- msgid ""
-@@ -2201,7 +2204,7 @@
- msgid ""
- "_: africa.kgm\n"
- "The flag of Uganda is..."
--msgstr "烏干達（Uganda）的國旗是..."
-+msgstr "烏干達（Uganda）的國旗是…"
- 
- #: mapsdatatranslation.cpp:296
- msgid ""
-@@ -2237,7 +2240,7 @@
- msgid ""
- "_: africa.kgm\n"
- "The capital of Western Sahara is..."
--msgstr "西撒哈拉（Western Sahara）的首都是..."
-+msgstr "西撒哈拉（Western Sahara）的首都是…"
- 
- #: mapsdatatranslation.cpp:302
- msgid ""
-@@ -2250,7 +2253,7 @@
- msgid ""
- "_: africa.kgm\n"
- "The flag of Western Sahara is..."
--msgstr "西撒哈拉（Western Sahara）的國旗是..."
-+msgstr "西撒哈拉（Western Sahara）的國旗是…"
- 
- #: mapsdatatranslation.cpp:304
- msgid ""
-@@ -2280,7 +2283,7 @@
- msgid ""
- "_: africa.kgm\n"
- "The capital of Zambia is..."
--msgstr "尚比亞（Zambia）的首都是..."
-+msgstr "尚比亞（Zambia）的首都是…"
- 
- #: mapsdatatranslation.cpp:309
- msgid ""
-@@ -2293,7 +2296,7 @@
- msgid ""
- "_: africa.kgm\n"
- "The flag of Zambia is..."
--msgstr "尚比亞（Zambia）的國旗是..."
-+msgstr "尚比亞（Zambia）的國旗是…"
- 
- #: mapsdatatranslation.cpp:311
- msgid ""
-@@ -2317,7 +2320,7 @@
- msgid ""
- "_: africa.kgm\n"
- "The capital of Zimbabwe is..."
--msgstr "辛巴威（Zimbabwe）的首都是..."
-+msgstr "辛巴威（Zimbabwe）的首都是…"
- 
- #: mapsdatatranslation.cpp:315
- msgid ""
-@@ -2330,7 +2333,7 @@
- msgid ""
- "_: africa.kgm\n"
- "The flag of Zimbabwe is..."
--msgstr "辛巴威（Zimbabwe）的國旗是..."
-+msgstr "辛巴威（Zimbabwe）的國旗是…"
- 
- #: mapsdatatranslation.cpp:317
- msgid ""
-@@ -2353,8 +2356,7 @@
- #: mapsdatatranslation.cpp:320
- msgid ""
- "_: asia.kgm\n"
--"<qt>Current map:"
--"<br><b>Asia</b></qt>"
-+"<qt>Current map:<br><b>Asia</b></qt>"
- msgstr "<qt>目前地圖：<br><b>亞洲</b></qt>"
- 
- #: mapsdatatranslation.cpp:321
-@@ -2373,7 +2375,7 @@
- msgid ""
- "_: asia.kgm\n"
- "The capital of Russia is..."
--msgstr "俄羅斯（Russia）的首都是..."
-+msgstr "俄羅斯（Russia）的首都是…"
- 
- #: mapsdatatranslation.cpp:324
- msgid ""
-@@ -2386,7 +2388,7 @@
- msgid ""
- "_: asia.kgm\n"
- "The flag of Russia is..."
--msgstr "俄羅斯（Russia）的國旗是..."
-+msgstr "俄羅斯（Russia）的國旗是…"
- 
- #: mapsdatatranslation.cpp:326
- msgid ""
-@@ -2410,7 +2412,7 @@
- msgid ""
- "_: asia.kgm\n"
- "The capital of Turkey is..."
--msgstr "土耳其（Turkey）的首都是..."
-+msgstr "土耳其（Turkey）的首都是…"
- 
- #: mapsdatatranslation.cpp:330
- msgid ""
-@@ -2423,7 +2425,7 @@
- msgid ""
- "_: asia.kgm\n"
- "The flag of Turkey is..."
--msgstr "土耳其（Turkey）的國旗是..."
-+msgstr "土耳其（Turkey）的國旗是…"
- 
- #: mapsdatatranslation.cpp:332
- msgid ""
-@@ -2471,7 +2473,7 @@
- msgid ""
- "_: asia.kgm\n"
- "The capital of Iran is..."
--msgstr "伊朗（Iran）的首都是..."
-+msgstr "伊朗（Iran）的首都是…"
- 
- #: mapsdatatranslation.cpp:340
- msgid ""
-@@ -2484,7 +2486,7 @@
- msgid ""
- "_: asia.kgm\n"
- "The flag of Iran is..."
--msgstr "伊朗（Iran）的國旗是..."
-+msgstr "伊朗（Iran）的國旗是…"
- 
- #: mapsdatatranslation.cpp:342
- msgid ""
-@@ -2508,7 +2510,7 @@
- msgid ""
- "_: asia.kgm\n"
- "The capital of Iraq is..."
--msgstr "伊拉克（Iraq）的首都是..."
-+msgstr "伊拉克（Iraq）的首都是…"
- 
- #: mapsdatatranslation.cpp:346
- msgid ""
-@@ -2521,7 +2523,7 @@
- msgid ""
- "_: asia.kgm\n"
- "The flag of Iraq is..."
--msgstr "伊拉克（Iraq）的國旗是..."
-+msgstr "伊拉克（Iraq）的國旗是…"
- 
- #: mapsdatatranslation.cpp:348
- msgid ""
-@@ -2545,7 +2547,7 @@
- msgid ""
- "_: asia.kgm\n"
- "The capital of Israel is..."
--msgstr "以色列（Israel）的首都是..."
-+msgstr "以色列（Israel）的首都是…"
- 
- #: mapsdatatranslation.cpp:352
- msgid ""
-@@ -2558,7 +2560,7 @@
- msgid ""
- "_: asia.kgm\n"
- "The flag of Israel is..."
--msgstr "以色列（Israel）的國旗是..."
-+msgstr "以色列（Israel）的國旗是…"
- 
- #: mapsdatatranslation.cpp:354
- msgid ""
-@@ -2582,7 +2584,7 @@
- msgid ""
- "_: asia.kgm\n"
- "The capital of Jordan is..."
--msgstr "約旦（Jordan）的首都是..."
-+msgstr "約旦（Jordan）的首都是…"
- 
- #: mapsdatatranslation.cpp:358
- msgid ""
-@@ -2595,7 +2597,7 @@
- msgid ""
- "_: asia.kgm\n"
- "The flag of Jordan is..."
--msgstr "約旦（Jordan）的國旗是..."
-+msgstr "約旦（Jordan）的國旗是…"
- 
- #: mapsdatatranslation.cpp:360
- msgid ""
-@@ -2625,7 +2627,7 @@
- msgid ""
- "_: asia.kgm\n"
- "The capital of Kuwait is..."
--msgstr "科威特（Kuwait）的首都是..."
-+msgstr "科威特（Kuwait）的首都是…"
- 
- #: mapsdatatranslation.cpp:365
- msgid ""
-@@ -2638,7 +2640,7 @@
- msgid ""
- "_: asia.kgm\n"
- "The flag of Kuwait is..."
--msgstr "科威特（Kuwait）的國旗是..."
-+msgstr "科威特（Kuwait）的國旗是…"
- 
- #: mapsdatatranslation.cpp:367
- msgid ""
-@@ -2662,7 +2664,7 @@
- msgid ""
- "_: asia.kgm\n"
- "The capital of Lebanon is..."
--msgstr "黎巴嫩（Lebanon）的首都是..."
-+msgstr "黎巴嫩（Lebanon）的首都是…"
- 
- #: mapsdatatranslation.cpp:371
- msgid ""
-@@ -2675,7 +2677,7 @@
- msgid ""
- "_: asia.kgm\n"
- "The flag of Lebanon is..."
--msgstr "黎巴嫩（Lebanon）的國旗是..."
-+msgstr "黎巴嫩（Lebanon）的國旗是…"
- 
- #: mapsdatatranslation.cpp:373
- msgid ""
-@@ -2699,7 +2701,7 @@
- msgid ""
- "_: asia.kgm\n"
- "The capital of Qatar is..."
--msgstr "卡達（Qatar）的首都是..."
-+msgstr "卡達（Qatar）的首都是…"
- 
- #: mapsdatatranslation.cpp:377
- msgid ""
-@@ -2712,7 +2714,7 @@
- msgid ""
- "_: asia.kgm\n"
- "The flag of Qatar is..."
--msgstr "卡達（Qatar）的國旗是..."
-+msgstr "卡達（Qatar）的國旗是…"
- 
- #: mapsdatatranslation.cpp:379
- msgid ""
-@@ -2736,7 +2738,7 @@
- msgid ""
- "_: asia.kgm\n"
- "The capital of Saudi Arabia is..."
--msgstr "沙烏地阿拉伯（Saudi Arabia）的首都是..."
-+msgstr "沙烏地阿拉伯（Saudi Arabia）的首都是…"
- 
- #: mapsdatatranslation.cpp:383
- msgid ""
-@@ -2749,7 +2751,7 @@
- msgid ""
- "_: asia.kgm\n"
- "The flag of Saudi Arabia is..."
--msgstr "沙烏地阿拉伯（Saudi Arabia）的國旗是..."
-+msgstr "沙烏地阿拉伯（Saudi Arabia）的國旗是…"
- 
- #: mapsdatatranslation.cpp:385
- msgid ""
-@@ -2785,7 +2787,7 @@
- msgid ""
- "_: asia.kgm\n"
- "The capital of Syria is..."
--msgstr "敘利亞（Syria）的首都是..."
-+msgstr "敘利亞（Syria）的首都是…"
- 
- #: mapsdatatranslation.cpp:391
- msgid ""
-@@ -2798,7 +2800,7 @@
- msgid ""
- "_: asia.kgm\n"
- "The flag of Syria is..."
--msgstr "敘利亞（Syria）的國旗是..."
-+msgstr "敘利亞（Syria）的國旗是…"
- 
- #: mapsdatatranslation.cpp:393
- msgid ""
-@@ -2828,7 +2830,7 @@
- msgid ""
- "_: asia.kgm\n"
- "The capital of United Arab Emirates is..."
--msgstr "阿拉伯聯合大公國（United Arab Emirates）的首都是..."
-+msgstr "阿拉伯聯合大公國（United Arab Emirates）的首都是…"
- 
- #: mapsdatatranslation.cpp:398
- msgid ""
-@@ -2841,7 +2843,7 @@
- msgid ""
- "_: asia.kgm\n"
- "The flag of United Arab Emirates is..."
--msgstr "阿拉伯聯合大公國（United Arab Emirates）的國旗是..."
-+msgstr "阿拉伯聯合大公國（United Arab Emirates）的國旗是…"
- 
- #: mapsdatatranslation.cpp:400
- msgid ""
-@@ -2865,7 +2867,7 @@
- msgid ""
- "_: asia.kgm\n"
- "The capital of Oman is..."
--msgstr "阿曼（Oman）的首都是..."
-+msgstr "阿曼（Oman）的首都是…"
- 
- #: mapsdatatranslation.cpp:404
- msgid ""
-@@ -2878,7 +2880,7 @@
- msgid ""
- "_: asia.kgm\n"
- "The flag of Oman is..."
--msgstr "阿曼（Oman）的國旗是..."
-+msgstr "阿曼（Oman）的國旗是…"
- 
- #: mapsdatatranslation.cpp:406
- msgid ""
-@@ -2908,7 +2910,7 @@
- msgid ""
- "_: asia.kgm\n"
- "The capital of Yemen is..."
--msgstr "葉門（Yemen）的首都是..."
-+msgstr "葉門（Yemen）的首都是…"
- 
- #: mapsdatatranslation.cpp:411
- msgid ""
-@@ -2921,7 +2923,7 @@
- msgid ""
- "_: asia.kgm\n"
- "The flag of Yemen is..."
--msgstr "葉門（Yemen）的國旗是..."
-+msgstr "葉門（Yemen）的國旗是…"
- 
- #: mapsdatatranslation.cpp:413
- msgid ""
-@@ -2951,7 +2953,7 @@
- msgid ""
- "_: asia.kgm\n"
- "The capital of China is..."
--msgstr "中華人民共和國（China）的首都是..."
-+msgstr "中華人民共和國（China）的首都是…"
- 
- #: mapsdatatranslation.cpp:418
- msgid ""
-@@ -2964,7 +2966,7 @@
- msgid ""
- "_: asia.kgm\n"
- "The flag of China is..."
--msgstr "中華人民共和國（China）的國旗是..."
-+msgstr "中華人民共和國（China）的國旗是…"
- 
- #: mapsdatatranslation.cpp:420
- msgid ""
-@@ -2988,7 +2990,7 @@
- msgid ""
- "_: asia.kgm\n"
- "The capital of India is..."
--msgstr "印度（India）的首都是..."
-+msgstr "印度（India）的首都是…"
- 
- #: mapsdatatranslation.cpp:424
- msgid ""
-@@ -3001,7 +3003,7 @@
- msgid ""
- "_: asia.kgm\n"
- "The flag of India is..."
--msgstr "印度（India）的國旗是..."
-+msgstr "印度（India）的國旗是…"
- 
- #: mapsdatatranslation.cpp:426
- msgid ""
-@@ -3025,7 +3027,7 @@
- msgid ""
- "_: asia.kgm\n"
- "The capital of Sri Lanka is..."
--msgstr "斯里蘭卡（Sri Lanka）的首都是..."
-+msgstr "斯里蘭卡（Sri Lanka）的首都是…"
- 
- #: mapsdatatranslation.cpp:430
- msgid ""
-@@ -3038,7 +3040,7 @@
- msgid ""
- "_: asia.kgm\n"
- "The flag of Sri Lanka is..."
--msgstr "斯里蘭卡（Sri Lanka）的國旗是..."
-+msgstr "斯里蘭卡（Sri Lanka）的國旗是…"
- 
- #: mapsdatatranslation.cpp:432
- msgid ""
-@@ -3062,7 +3064,7 @@
- msgid ""
- "_: asia.kgm\n"
- "The capital of Mongolia is..."
--msgstr "蒙古（Mongolia）的首都是..."
-+msgstr "蒙古（Mongolia）的首都是…"
- 
- #: mapsdatatranslation.cpp:436
- msgid ""
-@@ -3075,7 +3077,7 @@
- msgid ""
- "_: asia.kgm\n"
- "The flag of Mongolia is..."
--msgstr "蒙古（Mongolia）的國旗是..."
-+msgstr "蒙古（Mongolia）的國旗是…"
- 
- #: mapsdatatranslation.cpp:438
- msgid ""
-@@ -3099,7 +3101,7 @@
- msgid ""
- "_: asia.kgm\n"
- "The capital of Kazakhstan is..."
--msgstr "哈薩克（Kazakhstan）的首都是..."
-+msgstr "哈薩克（Kazakhstan）的首都是…"
- 
- #: mapsdatatranslation.cpp:442
- msgid ""
-@@ -3112,7 +3114,7 @@
- msgid ""
- "_: asia.kgm\n"
- "The flag of Kazakhstan is..."
--msgstr "哈薩克（Kazakhstan）的國旗是..."
-+msgstr "哈薩克（Kazakhstan）的國旗是…"
- 
- #: mapsdatatranslation.cpp:444
- msgid ""
-@@ -3136,7 +3138,7 @@
- msgid ""
- "_: asia.kgm\n"
- "The capital of Japan is..."
--msgstr "日本（Japan）的首都是..."
-+msgstr "日本（Japan）的首都是…"
- 
- #: mapsdatatranslation.cpp:448
- msgid ""
-@@ -3149,7 +3151,7 @@
- msgid ""
- "_: asia.kgm\n"
- "The flag of Japan is..."
--msgstr "日本（Japan）的國旗是..."
-+msgstr "日本（Japan）的國旗是…"
- 
- #: mapsdatatranslation.cpp:450
- msgid ""
-@@ -3173,7 +3175,7 @@
- msgid ""
- "_: asia.kgm\n"
- "The capital of Myanmar is..."
--msgstr "緬甸（Myanmar）的首都是..."
-+msgstr "緬甸（Myanmar）的首都是…"
- 
- #: mapsdatatranslation.cpp:454
- msgid ""
-@@ -3186,7 +3188,7 @@
- msgid ""
- "_: asia.kgm\n"
- "The flag of Myanmar is..."
--msgstr "緬甸（Myanmar）的國旗是..."
-+msgstr "緬甸（Myanmar）的國旗是…"
- 
- #: mapsdatatranslation.cpp:456
- msgid ""
-@@ -3210,7 +3212,7 @@
- msgid ""
- "_: asia.kgm\n"
- "The capital of Nepal is..."
--msgstr "尼泊爾（Nepal）的首都是..."
-+msgstr "尼泊爾（Nepal）的首都是…"
- 
- #: mapsdatatranslation.cpp:460
- msgid ""
-@@ -3223,7 +3225,7 @@
- msgid ""
- "_: asia.kgm\n"
- "The flag of Nepal is..."
--msgstr "尼泊爾（Nepal）的國旗是..."
-+msgstr "尼泊爾（Nepal）的國旗是…"
- 
- #: mapsdatatranslation.cpp:462
- msgid ""
-@@ -3247,7 +3249,7 @@
- msgid ""
- "_: asia.kgm\n"
- "The capital of Bhutan is..."
--msgstr "不丹（Bhutan）的首都是..."
-+msgstr "不丹（Bhutan）的首都是…"
- 
- #: mapsdatatranslation.cpp:466
- msgid ""
-@@ -3260,7 +3262,7 @@
- msgid ""
- "_: asia.kgm\n"
- "The flag of Bhutan is..."
--msgstr "不丹（Bhutan）的國旗是..."
-+msgstr "不丹（Bhutan）的國旗是…"
- 
- #: mapsdatatranslation.cpp:468
- msgid ""
-@@ -3290,7 +3292,7 @@
- msgid ""
- "_: asia.kgm\n"
- "The capital of Malaysia is..."
--msgstr "馬來西亞（Malaysia）的首都是..."
-+msgstr "馬來西亞（Malaysia）的首都是…"
- 
- #: mapsdatatranslation.cpp:473
- msgid ""
-@@ -3303,7 +3305,7 @@
- msgid ""
- "_: asia.kgm\n"
- "The flag of Malaysia is..."
--msgstr "馬來西亞（Malaysia）的國旗是..."
-+msgstr "馬來西亞（Malaysia）的國旗是…"
- 
- #: mapsdatatranslation.cpp:475
- msgid ""
-@@ -3327,7 +3329,7 @@
- msgid ""
- "_: asia.kgm\n"
- "The capital of Bangladesh is..."
--msgstr "孟加拉（Bangladesh）的首都是..."
-+msgstr "孟加拉（Bangladesh）的首都是…"
- 
- #: mapsdatatranslation.cpp:479
- msgid ""
-@@ -3340,7 +3342,7 @@
- msgid ""
- "_: asia.kgm\n"
- "The flag of Bangladesh is..."
--msgstr "孟加拉（Bangladesh）的國旗是..."
-+msgstr "孟加拉（Bangladesh）的國旗是…"
- 
- #: mapsdatatranslation.cpp:481
- msgid ""
-@@ -3364,7 +3366,7 @@
- msgid ""
- "_: asia.kgm\n"
- "The capital of Afghanistan is..."
--msgstr "阿富汗（Afghanistan）的首都是..."
-+msgstr "阿富汗（Afghanistan）的首都是…"
- 
- #: mapsdatatranslation.cpp:485
- msgid ""
-@@ -3377,7 +3379,7 @@
- msgid ""
- "_: asia.kgm\n"
- "The flag of Afghanistan is..."
--msgstr "阿富汗（Afghanistan）的國旗是..."
-+msgstr "阿富汗（Afghanistan）的國旗是…"
- 
- #: mapsdatatranslation.cpp:487
- msgid ""
-@@ -3401,7 +3403,7 @@
- msgid ""
- "_: asia.kgm\n"
- "The capital of Azerbaijan is..."
--msgstr "亞塞拜然（Azerbaijan）的首都是..."
-+msgstr "亞塞拜然（Azerbaijan）的首都是…"
- 
- #: mapsdatatranslation.cpp:491
- msgid ""
-@@ -3414,7 +3416,7 @@
- msgid ""
- "_: asia.kgm\n"
- "The flag of Azerbaijan is..."
--msgstr "亞塞拜然（Azerbaijan）的國旗是..."
-+msgstr "亞塞拜然（Azerbaijan）的國旗是…"
- 
- #: mapsdatatranslation.cpp:493
- msgid ""
-@@ -3438,7 +3440,7 @@
- msgid ""
- "_: asia.kgm\n"
- "The capital of Armenia is..."
--msgstr "亞美尼亞（Armenia）的首都是..."
-+msgstr "亞美尼亞（Armenia）的首都是…"
- 
- #: mapsdatatranslation.cpp:497
- msgid ""
-@@ -3451,7 +3453,7 @@
- msgid ""
- "_: asia.kgm\n"
- "The flag of Armenia is..."
--msgstr "亞美尼亞（Armenia）的國旗是..."
-+msgstr "亞美尼亞（Armenia）的國旗是…"
- 
- #: mapsdatatranslation.cpp:499
- msgid ""
-@@ -3475,7 +3477,7 @@
- msgid ""
- "_: asia.kgm\n"
- "The capital of Bahrain is..."
--msgstr "巴林（Bahrain）的首都是..."
-+msgstr "巴林（Bahrain）的首都是…"
- 
- #: mapsdatatranslation.cpp:503
- msgid ""
-@@ -3488,7 +3490,7 @@
- msgid ""
- "_: asia.kgm\n"
- "The flag of Bahrain is..."
--msgstr "巴林（Bahrain）的國旗是..."
-+msgstr "巴林（Bahrain）的國旗是…"
- 
- #: mapsdatatranslation.cpp:505
- msgid ""
-@@ -3512,7 +3514,7 @@
- msgid ""
- "_: asia.kgm\n"
- "The capital of Georgia is..."
--msgstr "喬治亞（Georgia）的首都是..."
-+msgstr "喬治亞（Georgia）的首都是…"
- 
- #: mapsdatatranslation.cpp:509
- msgid ""
-@@ -3525,7 +3527,7 @@
- msgid ""
- "_: asia.kgm\n"
- "The flag of Georgia is..."
--msgstr "喬治亞（Georgia）的國旗是..."
-+msgstr "喬治亞（Georgia）的國旗是…"
- 
- #: mapsdatatranslation.cpp:511
- msgid ""
-@@ -3549,7 +3551,7 @@
- msgid ""
- "_: asia.kgm\n"
- "The capital of Turkmenistan is..."
--msgstr "土庫曼（Turkmenistan）的首都是..."
-+msgstr "土庫曼（Turkmenistan）的首都是…"
- 
- #: mapsdatatranslation.cpp:515
- msgid ""
-@@ -3562,7 +3564,7 @@
- msgid ""
- "_: asia.kgm\n"
- "The flag of Turkmenistan is..."
--msgstr "土庫曼（Turkmenistan）的國旗是..."
-+msgstr "土庫曼（Turkmenistan）的國旗是…"
- 
- #: mapsdatatranslation.cpp:517
- msgid ""
-@@ -3586,7 +3588,7 @@
- msgid ""
- "_: asia.kgm\n"
- "The capital of Uzbekistan is..."
--msgstr "烏茲別克（Uzbekistan）的首都是..."
-+msgstr "烏茲別克（Uzbekistan）的首都是…"
- 
- #: mapsdatatranslation.cpp:521
- msgid ""
-@@ -3599,7 +3601,7 @@
- msgid ""
- "_: asia.kgm\n"
- "The flag of Uzbekistan is..."
--msgstr "烏茲別克（Uzbekistan）的國旗是..."
-+msgstr "烏茲別克（Uzbekistan）的國旗是…"
- 
- #: mapsdatatranslation.cpp:523
- msgid ""
-@@ -3623,7 +3625,7 @@
- msgid ""
- "_: asia.kgm\n"
- "The capital of Kyrgyzstan is..."
--msgstr "吉爾吉斯（Kyrgyzstan）的首都是..."
-+msgstr "吉爾吉斯（Kyrgyzstan）的首都是…"
- 
- #: mapsdatatranslation.cpp:527
- msgid ""
-@@ -3636,7 +3638,7 @@
- msgid ""
- "_: asia.kgm\n"
- "The flag of Kyrgyzstan is..."
--msgstr "吉爾吉斯（Kyrgyzstan）的國旗是..."
-+msgstr "吉爾吉斯（Kyrgyzstan）的國旗是…"
- 
- #: mapsdatatranslation.cpp:529
- msgid ""
-@@ -3660,7 +3662,7 @@
- msgid ""
- "_: asia.kgm\n"
- "The capital of Tajikistan is..."
--msgstr "塔吉克（Tajikistan）的首都是..."
-+msgstr "塔吉克（Tajikistan）的首都是…"
- 
- #: mapsdatatranslation.cpp:533
- msgid ""
-@@ -3673,7 +3675,7 @@
- msgid ""
- "_: asia.kgm\n"
- "The flag of Tajikistan is..."
--msgstr "塔吉克（Tajikistan）的國旗是..."
-+msgstr "塔吉克（Tajikistan）的國旗是…"
- 
- #: mapsdatatranslation.cpp:535
- msgid ""
-@@ -3697,7 +3699,7 @@
- msgid ""
- "_: asia.kgm\n"
- "The capital of Pakistan is..."
--msgstr "巴基斯坦（Pakistan）的首都是..."
-+msgstr "巴基斯坦（Pakistan）的首都是…"
- 
- #: mapsdatatranslation.cpp:539
- msgid ""
-@@ -3710,7 +3712,7 @@
- msgid ""
- "_: asia.kgm\n"
- "The flag of Pakistan is..."
--msgstr "巴基斯坦（Pakistan）的國旗是..."
-+msgstr "巴基斯坦（Pakistan）的國旗是…"
- 
- #: mapsdatatranslation.cpp:541
- msgid ""
-@@ -3734,7 +3736,7 @@
- msgid ""
- "_: asia.kgm\n"
- "The capital of Laos is..."
--msgstr "寮國（Laos）的首都是..."
-+msgstr "寮國（Laos）的首都是…"
- 
- #: mapsdatatranslation.cpp:545
- msgid ""
-@@ -3747,7 +3749,7 @@
- msgid ""
- "_: asia.kgm\n"
- "The flag of Laos is..."
--msgstr "寮國（Laos）的國旗是..."
-+msgstr "寮國（Laos）的國旗是…"
- 
- #: mapsdatatranslation.cpp:547
- msgid ""
-@@ -3771,7 +3773,7 @@
- msgid ""
- "_: asia.kgm\n"
- "The capital of Cambodia is..."
--msgstr "柬埔寨（Cambodia）的首都是..."
-+msgstr "柬埔寨（Cambodia）的首都是…"
- 
- #: mapsdatatranslation.cpp:551
- msgid ""
-@@ -3784,7 +3786,7 @@
- msgid ""
- "_: asia.kgm\n"
- "The flag of Cambodia is..."
--msgstr "柬埔寨（Cambodia）的國旗是..."
-+msgstr "柬埔寨（Cambodia）的國旗是…"
- 
- #: mapsdatatranslation.cpp:553
- msgid ""
-@@ -3808,7 +3810,7 @@
- msgid ""
- "_: asia.kgm\n"
- "The capital of Brunei is..."
--msgstr "汶萊（Brunei）的首都是..."
-+msgstr "汶萊（Brunei）的首都是…"
- 
- #: mapsdatatranslation.cpp:557
- msgid ""
-@@ -3821,7 +3823,7 @@
- msgid ""
- "_: asia.kgm\n"
- "The flag of Brunei is..."
--msgstr "汶萊（Brunei）的國旗是..."
-+msgstr "汶萊（Brunei）的國旗是…"
- 
- #: mapsdatatranslation.cpp:559
- msgid ""
-@@ -3845,7 +3847,7 @@
- msgid ""
- "_: asia.kgm\n"
- "The capital of Philippines is..."
--msgstr "菲律賓（Philippines）的首都是..."
-+msgstr "菲律賓（Philippines）的首都是…"
- 
- #: mapsdatatranslation.cpp:563
- msgid ""
-@@ -3858,7 +3860,7 @@
- msgid ""
- "_: asia.kgm\n"
- "The flag of Philippines is..."
--msgstr "菲律賓（Philippines）的國旗是..."
-+msgstr "菲律賓（Philippines）的國旗是…"
- 
- #: mapsdatatranslation.cpp:565
- msgid ""
-@@ -3882,7 +3884,7 @@
- msgid ""
- "_: asia.kgm\n"
- "The capital of Thailand is..."
--msgstr "泰國（Thailand）的首都是..."
-+msgstr "泰國（Thailand）的首都是…"
- 
- #: mapsdatatranslation.cpp:569
- msgid ""
-@@ -3895,7 +3897,7 @@
- msgid ""
- "_: asia.kgm\n"
- "The flag of Thailand is..."
--msgstr "泰國（Thailand）的國旗是..."
-+msgstr "泰國（Thailand）的國旗是…"
- 
- #: mapsdatatranslation.cpp:571
- msgid ""
-@@ -3919,7 +3921,7 @@
- msgid ""
- "_: asia.kgm\n"
- "The capital of Vietnam is..."
--msgstr "越南（Vietnam）的首都是..."
-+msgstr "越南（Vietnam）的首都是…"
- 
- #: mapsdatatranslation.cpp:575
- msgid ""
-@@ -3932,7 +3934,7 @@
- msgid ""
- "_: asia.kgm\n"
- "The flag of Vietnam is..."
--msgstr "越南（Vietnam）的國旗是..."
-+msgstr "越南（Vietnam）的國旗是…"
- 
- #: mapsdatatranslation.cpp:577
- msgid ""
-@@ -3950,38 +3952,38 @@
- msgid ""
- "_: asia.kgm\n"
- "Taiwan"
--msgstr "中華民國（台灣，Taiwan）"
-+msgstr "中華民國（臺灣，Taiwan）"
- 
- #: mapsdatatranslation.cpp:580
- msgid ""
- "_: asia.kgm\n"
- "The capital of Taiwan is..."
--msgstr "中華民國（台灣，Taiwan）的首都是..."
-+msgstr "中華民國（臺灣，Taiwan）的首都是…"
- 
- #: mapsdatatranslation.cpp:581
- msgid ""
- "_: asia.kgm\n"
- "Please click on:\n"
- "Taiwan"
--msgstr "請點選：中華民國（台灣，Taiwan）"
-+msgstr "請點選：中華民國（臺灣，Taiwan）"
- 
- #: mapsdatatranslation.cpp:582
- msgid ""
- "_: asia.kgm\n"
- "The flag of Taiwan is..."
--msgstr "中華民國（台灣，Taiwan）的國旗是..."
-+msgstr "中華民國（臺灣，Taiwan）的國旗是…"
- 
- #: mapsdatatranslation.cpp:583
- msgid ""
- "_: asia.kgm\n"
- "Taipei"
--msgstr "台北（Taipei）"
-+msgstr "臺北（Taipei）"
- 
- #: mapsdatatranslation.cpp:584
- msgid ""
- "_: asia.kgm\n"
- "Taipei is the capital of..."
--msgstr "台北（Taipei）是哪個國家的首都？"
-+msgstr "臺北（Taipei）是哪個國家的首都？"
- 
- #: mapsdatatranslation.cpp:585 mapsdatatranslation.cpp:589
- msgid ""
-@@ -3993,7 +3995,7 @@
- msgid ""
- "_: asia.kgm\n"
- "The capital of Singapore is..."
--msgstr "新加坡（Singapore）的首都是..."
-+msgstr "新加坡（Singapore）的首都是…"
- 
- #: mapsdatatranslation.cpp:587
- msgid ""
-@@ -4006,7 +4008,7 @@
- msgid ""
- "_: asia.kgm\n"
- "The flag of Singapore is..."
--msgstr "新加坡（Singapore）的國旗是..."
-+msgstr "新加坡（Singapore）的國旗是…"
- 
- #: mapsdatatranslation.cpp:590
- msgid ""
-@@ -4024,7 +4026,7 @@
- msgid ""
- "_: asia.kgm\n"
- "The capital of North Korea is..."
--msgstr "北韓（North Korea）的首都是..."
-+msgstr "北韓（North Korea）的首都是…"
- 
- #: mapsdatatranslation.cpp:593
- msgid ""
-@@ -4037,7 +4039,7 @@
- msgid ""
- "_: asia.kgm\n"
- "The flag of North Korea is..."
--msgstr "北韓（North Korea）的國旗是..."
-+msgstr "北韓（North Korea）的國旗是…"
- 
- #: mapsdatatranslation.cpp:595
- msgid ""
-@@ -4061,7 +4063,7 @@
- msgid ""
- "_: asia.kgm\n"
- "The capital of South Korea is..."
--msgstr "南韓（South Korea）的首都是..."
-+msgstr "南韓（South Korea）的首都是…"
- 
- #: mapsdatatranslation.cpp:599
- msgid ""
-@@ -4074,7 +4076,7 @@
- msgid ""
- "_: asia.kgm\n"
- "The flag of South Korea is..."
--msgstr "南韓（South Korea）的國旗是..."
-+msgstr "南韓（South Korea）的國旗是…"
- 
- #: mapsdatatranslation.cpp:601
- msgid ""
-@@ -4097,8 +4099,7 @@
- #: mapsdatatranslation.cpp:604
- msgid ""
- "_: austria.kgm\n"
--"<qt>Current map:"
--"<br><b>Austria</b></qt>"
-+"<qt>Current map:<br><b>Austria</b></qt>"
- msgstr "<qt>目前地圖：<br><b>奧地利</b></qt>"
- 
- #: mapsdatatranslation.cpp:605
-@@ -4123,7 +4124,7 @@
- msgid ""
- "_: austria.kgm\n"
- "The capital of Vienna is..."
--msgstr "維也納（Vienna）的首都是..."
-+msgstr "維也納（Vienna）的首都是…"
- 
- #: mapsdatatranslation.cpp:609
- msgid ""
-@@ -4148,7 +4149,7 @@
- msgid ""
- "_: austria.kgm\n"
- "The capital of Burgenland is..."
--msgstr "布爾根蘭（Burgenland）的首都是..."
-+msgstr "布爾根蘭（Burgenland）的首都是…"
- 
- #: mapsdatatranslation.cpp:614
- msgid ""
-@@ -4179,7 +4180,7 @@
- msgid ""
- "_: austria.kgm\n"
- "The capital of Styria is..."
--msgstr "思提瑞亞（Styria）的首都是..."
-+msgstr "思提瑞亞（Styria）的首都是…"
- 
- #: mapsdatatranslation.cpp:619
- msgid ""
-@@ -4210,7 +4211,7 @@
- msgid ""
- "_: austria.kgm\n"
- "The capital of Carinthia is..."
--msgstr "卡林西亞（Carinthia）的首都是..."
-+msgstr "卡林西亞（Carinthia）的首都是…"
- 
- #: mapsdatatranslation.cpp:624
- msgid ""
-@@ -4241,7 +4242,7 @@
- msgid ""
- "_: austria.kgm\n"
- "The capital of Tyrol is..."
--msgstr "提洛（Tyrol）的首都是..."
-+msgstr "提洛（Tyrol）的首都是…"
- 
- #: mapsdatatranslation.cpp:629
- msgid ""
-@@ -4272,7 +4273,7 @@
- msgid ""
- "_: austria.kgm\n"
- "The capital of Vorarlberg is..."
--msgstr "福拉爾貝格（Vorarlberg）的首都是..."
-+msgstr "福拉爾貝格（Vorarlberg）的首都是…"
- 
- #: mapsdatatranslation.cpp:634
- msgid ""
-@@ -4303,7 +4304,7 @@
- msgid ""
- "_: austria.kgm\n"
- "The capital of Salzburg is..."
--msgstr "薩爾茨堡（Salzburg）的首都是..."
-+msgstr "薩爾茨堡（Salzburg）的首都是…"
- 
- #: mapsdatatranslation.cpp:639
- msgid ""
-@@ -4328,7 +4329,7 @@
- msgid ""
- "_: austria.kgm\n"
- "The capital of Upper Austria is..."
--msgstr "上奧地利（Upper Austria）的首都是..."
-+msgstr "上奧地利（Upper Austria）的首都是…"
- 
- #: mapsdatatranslation.cpp:644
- msgid ""
-@@ -4359,7 +4360,7 @@
- msgid ""
- "_: austria.kgm\n"
- "The capital of Lower Austria is..."
--msgstr "下奧地利（Lower Austria）的首都是..."
-+msgstr "下奧地利（Lower Austria）的首都是…"
- 
- #: mapsdatatranslation.cpp:649
- msgid ""
-@@ -4389,8 +4390,7 @@
- #: mapsdatatranslation.cpp:653
- msgid ""
- "_: brazil.kgm\n"
--"<qt>Current map:"
--"<br><b>Brazil</b></qt>"
-+"<qt>Current map:<br><b>Brazil</b></qt>"
- msgstr "<qt>目前地圖：<br><b>巴西</b></qt>"
- 
- #: mapsdatatranslation.cpp:654
-@@ -4403,7 +4403,7 @@
- msgid ""
- "_: brazil.kgm\n"
- "The capital of Sergipe is..."
--msgstr "塞爾希培（Sergipe）的首都是..."
-+msgstr "塞爾希培（Sergipe）的首都是…"
- 
- #: mapsdatatranslation.cpp:656
- msgid ""
-@@ -4416,7 +4416,7 @@
- msgid ""
- "_: brazil.kgm\n"
- "The flag of Sergipe is..."
--msgstr "塞爾希培（Sergipe）的旗幟是..."
-+msgstr "塞爾希培（Sergipe）的旗幟是…"
- 
- #: mapsdatatranslation.cpp:658
- msgid ""
-@@ -4440,7 +4440,7 @@
- msgid ""
- "_: brazil.kgm\n"
- "The capital of Para is..."
--msgstr "帕拉（Para）的首都是..."
-+msgstr "帕拉（Para）的首都是…"
- 
- #: mapsdatatranslation.cpp:662
- msgid ""
-@@ -4453,7 +4453,7 @@
- msgid ""
- "_: brazil.kgm\n"
- "The flag of Para is..."
--msgstr "帕拉（Para）的旗幟是..."
-+msgstr "帕拉（Para）的旗幟是…"
- 
- #: mapsdatatranslation.cpp:664
- msgid ""
-@@ -4477,7 +4477,7 @@
- msgid ""
- "_: brazil.kgm\n"
- "The capital of Minas Gerais is..."
--msgstr "米納斯吉拉斯（Minas Gerais）的首都是..."
-+msgstr "米納斯吉拉斯（Minas Gerais）的首都是…"
- 
- #: mapsdatatranslation.cpp:668
- msgid ""
-@@ -4490,7 +4490,7 @@
- msgid ""
- "_: brazil.kgm\n"
- "The flag of Minas Gerais is..."
--msgstr "米納斯吉拉斯（Minas Gerais）的旗幟是..."
-+msgstr "米納斯吉拉斯（Minas Gerais）的旗幟是…"
- 
- #: mapsdatatranslation.cpp:670
- msgid ""
-@@ -4514,7 +4514,7 @@
- msgid ""
- "_: brazil.kgm\n"
- "The capital of Roraima is..."
--msgstr "羅賴馬（Roraima）的首都是..."
-+msgstr "羅賴馬（Roraima）的首都是…"
- 
- #: mapsdatatranslation.cpp:674
- msgid ""
-@@ -4527,7 +4527,7 @@
- msgid ""
- "_: brazil.kgm\n"
- "The flag of Roraima is..."
--msgstr "羅賴馬（Roraima）的旗幟是..."
-+msgstr "羅賴馬（Roraima）的旗幟是…"
- 
- #: mapsdatatranslation.cpp:676
- msgid ""
-@@ -4551,7 +4551,7 @@
- msgid ""
- "_: brazil.kgm\n"
- "The capital of Federal District is..."
--msgstr "巴西利亞邦聯行政區（Federal District）的首都是..."
-+msgstr "巴西利亞邦聯行政區（Federal District）的首都是…"
- 
- #: mapsdatatranslation.cpp:680
- msgid ""
-@@ -4564,7 +4564,7 @@
- msgid ""
- "_: brazil.kgm\n"
- "The flag of Federal District is..."
--msgstr "巴西利亞邦聯行政區（Federal District）的旗幟是..."
-+msgstr "巴西利亞邦聯行政區（Federal District）的旗幟是…"
- 
- #: mapsdatatranslation.cpp:682
- msgid ""
-@@ -4588,7 +4588,7 @@
- msgid ""
- "_: brazil.kgm\n"
- "The capital of Mato Grosso do Sul is..."
--msgstr "南馬托格羅索（Mato Grosso do Sul）的首都是..."
-+msgstr "南馬托格羅索（Mato Grosso do Sul）的首都是…"
- 
- #: mapsdatatranslation.cpp:686
- msgid ""
-@@ -4601,7 +4601,7 @@
- msgid ""
- "_: brazil.kgm\n"
- "The flag of Mato Grosso do Sul is..."
--msgstr "南馬托格羅索（Mato Grosso do Sul）的旗幟是..."
-+msgstr "南馬托格羅索（Mato Grosso do Sul）的旗幟是…"
- 
- #: mapsdatatranslation.cpp:688
- msgid ""
-@@ -4625,7 +4625,7 @@
- msgid ""
- "_: brazil.kgm\n"
- "The capital of Mato Grosso is..."
--msgstr "馬托格羅索（Mato Grosso）的首都是..."
-+msgstr "馬托格羅索（Mato Grosso）的首都是…"
- 
- #: mapsdatatranslation.cpp:692
- msgid ""
-@@ -4638,7 +4638,7 @@
- msgid ""
- "_: brazil.kgm\n"
- "The flag of Mato Grosso is..."
--msgstr "馬托格羅索（Mato Grosso）的旗幟是..."
-+msgstr "馬托格羅索（Mato Grosso）的旗幟是…"
- 
- #: mapsdatatranslation.cpp:694
- msgid ""
-@@ -4662,7 +4662,7 @@
- msgid ""
- "_: brazil.kgm\n"
- "The capital of Parana is..."
--msgstr "巴拉那（Parana）的首都是..."
-+msgstr "巴拉那（Parana）的首都是…"
- 
- #: mapsdatatranslation.cpp:698
- msgid ""
-@@ -4675,7 +4675,7 @@
- msgid ""
- "_: brazil.kgm\n"
- "The flag of Parana is..."
--msgstr "巴拉那（Parana）的旗幟是..."
-+msgstr "巴拉那（Parana）的旗幟是…"
- 
- #: mapsdatatranslation.cpp:700
- msgid ""
-@@ -4699,7 +4699,7 @@
- msgid ""
- "_: brazil.kgm\n"
- "The capital of Santa Catarina is..."
--msgstr "聖卡塔林納（Santa Catarina）的首都是..."
-+msgstr "聖卡塔林納（Santa Catarina）的首都是…"
- 
- #: mapsdatatranslation.cpp:704
- msgid ""
-@@ -4712,7 +4712,7 @@
- msgid ""
- "_: brazil.kgm\n"
- "The flag of Santa Catarina is..."
--msgstr "聖卡塔林納（Santa Catarina）的旗幟是..."
-+msgstr "聖卡塔林納（Santa Catarina）的旗幟是…"
- 
- #: mapsdatatranslation.cpp:706
- msgid ""
-@@ -4736,7 +4736,7 @@
- msgid ""
- "_: brazil.kgm\n"
- "The capital of Ceara is..."
--msgstr "塞阿拉（Ceara）的首都是..."
-+msgstr "塞阿拉（Ceara）的首都是…"
- 
- #: mapsdatatranslation.cpp:710
- msgid ""
-@@ -4749,7 +4749,7 @@
- msgid ""
- "_: brazil.kgm\n"
- "The flag of Ceara is..."
--msgstr "塞阿拉（Ceara）的旗幟是..."
-+msgstr "塞阿拉（Ceara）的旗幟是…"
- 
- #: mapsdatatranslation.cpp:712
- msgid ""
-@@ -4773,7 +4773,7 @@
- msgid ""
- "_: brazil.kgm\n"
- "The capital of Goias is..."
--msgstr "戈亞斯（Goias）的首都是..."
-+msgstr "戈亞斯（Goias）的首都是…"
- 
- #: mapsdatatranslation.cpp:716
- msgid ""
-@@ -4786,7 +4786,7 @@
- msgid ""
- "_: brazil.kgm\n"
- "The flag of Goias is..."
--msgstr "戈亞斯（Goias）的旗幟是..."
-+msgstr "戈亞斯（Goias）的旗幟是…"
- 
- #: mapsdatatranslation.cpp:718
- msgid ""
-@@ -4810,7 +4810,7 @@
- msgid ""
- "_: brazil.kgm\n"
- "The capital of Paraiba is..."
--msgstr "帕拉伊巴（Paraiba）的首都是..."
-+msgstr "帕拉伊巴（Paraiba）的首都是…"
- 
- #: mapsdatatranslation.cpp:722
- msgid ""
-@@ -4823,7 +4823,7 @@
- msgid ""
- "_: brazil.kgm\n"
- "The flag of Paraiba is..."
--msgstr "帕拉伊巴（Paraiba）的旗幟是..."
-+msgstr "帕拉伊巴（Paraiba）的旗幟是…"
- 
- #: mapsdatatranslation.cpp:724
- msgid ""
-@@ -4847,7 +4847,7 @@
- msgid ""
- "_: brazil.kgm\n"
- "The capital of Amapa is..."
--msgstr "阿馬帕（Amapa）的首都是..."
-+msgstr "阿馬帕（Amapa）的首都是…"
- 
- #: mapsdatatranslation.cpp:728
- msgid ""
-@@ -4860,7 +4860,7 @@
- msgid ""
- "_: brazil.kgm\n"
- "The flag of Amapa is..."
--msgstr "阿馬帕（Amapa）的旗幟是..."
-+msgstr "阿馬帕（Amapa）的旗幟是…"
- 
- #: mapsdatatranslation.cpp:730
- msgid ""
-@@ -4884,7 +4884,7 @@
- msgid ""
- "_: brazil.kgm\n"
- "The capital of Alagoas is..."
--msgstr "阿拉戈阿斯（Alagoas）的首都是..."
-+msgstr "阿拉戈阿斯（Alagoas）的首都是…"
- 
- #: mapsdatatranslation.cpp:734
- msgid ""
-@@ -4897,7 +4897,7 @@
- msgid ""
- "_: brazil.kgm\n"
- "The flag of Alagoas is..."
--msgstr "阿拉戈阿斯（Alagoas）的旗幟是..."
-+msgstr "阿拉戈阿斯（Alagoas）的旗幟是…"
- 
- #: mapsdatatranslation.cpp:736
- msgid ""
-@@ -4921,7 +4921,7 @@
- msgid ""
- "_: brazil.kgm\n"
- "The capital of Amazonas is..."
--msgstr "亞馬遜（Amazonas）的首都是..."
-+msgstr "亞馬遜（Amazonas）的首都是…"
- 
- #: mapsdatatranslation.cpp:740
- msgid ""
-@@ -4934,7 +4934,7 @@
- msgid ""
- "_: brazil.kgm\n"
- "The flag of Amazonas is..."
--msgstr "亞馬遜（Amazonas）的旗幟是..."
-+msgstr "亞馬遜（Amazonas）的旗幟是…"
- 
- #: mapsdatatranslation.cpp:742
- msgid ""
-@@ -4958,7 +4958,7 @@
- msgid ""
- "_: brazil.kgm\n"
- "The capital of Rio Grande do Norte is..."
--msgstr "北里約格朗德（Rio Grande do Norte）的首都是..."
-+msgstr "北里約格朗德（Rio Grande do Norte）的首都是…"
- 
- #: mapsdatatranslation.cpp:746
- msgid ""
-@@ -4971,7 +4971,7 @@
- msgid ""
- "_: brazil.kgm\n"
- "The flag of Rio Grande do Norte is..."
--msgstr "北里約格朗德（Rio Grande do Norte）的旗幟是..."
-+msgstr "北里約格朗德（Rio Grande do Norte）的旗幟是…"
- 
- #: mapsdatatranslation.cpp:748
- msgid ""
-@@ -4995,7 +4995,7 @@
- msgid ""
- "_: brazil.kgm\n"
- "The capital of Tocantins is..."
--msgstr "托坎廷斯（Tocantins）的首都是..."
-+msgstr "托坎廷斯（Tocantins）的首都是…"
- 
- #: mapsdatatranslation.cpp:752
- msgid ""
-@@ -5008,7 +5008,7 @@
- msgid ""
- "_: brazil.kgm\n"
- "The flag of Tocantins is..."
--msgstr "托坎廷斯（Tocantins）的旗幟是..."
-+msgstr "托坎廷斯（Tocantins）的旗幟是…"
- 
- #: mapsdatatranslation.cpp:754
- msgid ""
-@@ -5032,7 +5032,7 @@
- msgid ""
- "_: brazil.kgm\n"
- "The capital of Rio Grande do Sul is..."
--msgstr "南里約格朗德（Rio Grande do Sul）的首都是..."
-+msgstr "南里約格朗德（Rio Grande do Sul）的首都是…"
- 
- #: mapsdatatranslation.cpp:758
- msgid ""
-@@ -5045,7 +5045,7 @@
- msgid ""
- "_: brazil.kgm\n"
- "The flag of Rio Grande do Sul is..."
--msgstr "南里約格朗德（Rio Grande do Sul）的旗幟是..."
-+msgstr "南里約格朗德（Rio Grande do Sul）的旗幟是…"
- 
- #: mapsdatatranslation.cpp:760
- msgid ""
-@@ -5069,7 +5069,7 @@
- msgid ""
- "_: brazil.kgm\n"
- "The capital of Rondonia is..."
--msgstr "朗多尼亞（Rondonia）的首都是..."
-+msgstr "朗多尼亞（Rondonia）的首都是…"
- 
- #: mapsdatatranslation.cpp:764
- msgid ""
-@@ -5082,7 +5082,7 @@
- msgid ""
- "_: brazil.kgm\n"
- "The flag of Rondonia is..."
--msgstr "朗多尼亞（Rondonia）的旗幟是..."
-+msgstr "朗多尼亞（Rondonia）的旗幟是…"
- 
- #: mapsdatatranslation.cpp:766
- msgid ""
-@@ -5106,7 +5106,7 @@
- msgid ""
- "_: brazil.kgm\n"
- "The capital of Pernambuco is..."
--msgstr "伯南布哥（Pernambuco）的首都是..."
-+msgstr "伯南布哥（Pernambuco）的首都是…"
- 
- #: mapsdatatranslation.cpp:770
- msgid ""
-@@ -5119,7 +5119,7 @@
- msgid ""
- "_: brazil.kgm\n"
- "The flag of Pernambuco is..."
--msgstr "伯南布哥（Pernambuco）的旗幟是..."
-+msgstr "伯南布哥（Pernambuco）的旗幟是…"
- 
- #: mapsdatatranslation.cpp:772
- msgid ""
-@@ -5143,7 +5143,7 @@
- msgid ""
- "_: brazil.kgm\n"
- "The capital of Acre is..."
--msgstr "阿克理（Acre）的首都是..."
-+msgstr "阿克理（Acre）的首都是…"
- 
- #: mapsdatatranslation.cpp:776
- msgid ""
-@@ -5156,7 +5156,7 @@
- msgid ""
- "_: brazil.kgm\n"
- "The flag of Acre is..."
--msgstr "阿克理（Acre）的旗幟是..."
-+msgstr "阿克理（Acre）的旗幟是…"
- 
- #: mapsdatatranslation.cpp:778
- msgid ""
-@@ -5180,7 +5180,7 @@
- msgid ""
- "_: brazil.kgm\n"
- "The capital of Rio de Janeiro State is..."
--msgstr "里約熱內盧（Rio de Janeiro State）的首都是..."
-+msgstr "里約熱內盧（Rio de Janeiro State）的首都是…"
- 
- #: mapsdatatranslation.cpp:782
- msgid ""
-@@ -5193,7 +5193,7 @@
- msgid ""
- "_: brazil.kgm\n"
- "The flag of Rio de Janeiro State is..."
--msgstr "里約熱內盧（Rio de Janeiro State）的旗幟是..."
-+msgstr "里約熱內盧（Rio de Janeiro State）的旗幟是…"
- 
- #: mapsdatatranslation.cpp:784
- msgid ""
-@@ -5217,7 +5217,7 @@
- msgid ""
- "_: brazil.kgm\n"
- "The capital of Bahia is..."
--msgstr "巴伊亞（Bahia）的首都是..."
-+msgstr "巴伊亞（Bahia）的首都是…"
- 
- #: mapsdatatranslation.cpp:788
- msgid ""
-@@ -5230,7 +5230,7 @@
- msgid ""
- "_: brazil.kgm\n"
- "The flag of Bahia is..."
--msgstr "巴伊亞（Bahia）的旗幟是..."
-+msgstr "巴伊亞（Bahia）的旗幟是…"
- 
- #: mapsdatatranslation.cpp:790
- msgid ""
-@@ -5254,7 +5254,7 @@
- msgid ""
- "_: brazil.kgm\n"
- "The capital of Maranhao is..."
--msgstr "馬朗浩（Maranhao）的首都是..."
-+msgstr "馬朗浩（Maranhao）的首都是…"
- 
- #: mapsdatatranslation.cpp:794
- msgid ""
-@@ -5267,7 +5267,7 @@
- msgid ""
- "_: brazil.kgm\n"
- "The flag of Maranhao is..."
--msgstr "馬朗浩（Maranhao）的旗幟是..."
-+msgstr "馬朗浩（Maranhao）的旗幟是…"
- 
- #: mapsdatatranslation.cpp:796
- msgid ""
-@@ -5291,7 +5291,7 @@
- msgid ""
- "_: brazil.kgm\n"
- "The capital of Sao Paulo State is..."
--msgstr "聖保羅（Sao Paulo State）的首都是..."
-+msgstr "聖保羅（Sao Paulo State）的首都是…"
- 
- #: mapsdatatranslation.cpp:800
- msgid ""
-@@ -5304,7 +5304,7 @@
- msgid ""
- "_: brazil.kgm\n"
- "The flag of Sao Paulo State is..."
--msgstr "聖保羅（Sao Paulo State）的旗幟是..."
-+msgstr "聖保羅（Sao Paulo State）的旗幟是…"
- 
- #: mapsdatatranslation.cpp:802
- msgid ""
-@@ -5328,7 +5328,7 @@
- msgid ""
- "_: brazil.kgm\n"
- "The capital of Piaui is..."
--msgstr "皮奧伊（Piaui）的首都是..."
-+msgstr "皮奧伊（Piaui）的首都是…"
- 
- #: mapsdatatranslation.cpp:806
- msgid ""
-@@ -5341,7 +5341,7 @@
- msgid ""
- "_: brazil.kgm\n"
- "The flag of Piaui is..."
--msgstr "皮奧伊（Piaui）的旗幟是..."
-+msgstr "皮奧伊（Piaui）的旗幟是…"
- 
- #: mapsdatatranslation.cpp:808
- msgid ""
-@@ -5365,7 +5365,7 @@
- msgid ""
- "_: brazil.kgm\n"
- "The capital of Espirito Santo is..."
--msgstr "聖埃斯皮里托（Espirito Santo）的首都是..."
-+msgstr "聖埃斯皮里托（Espirito Santo）的首都是…"
- 
- #: mapsdatatranslation.cpp:812
- msgid ""
-@@ -5378,7 +5378,7 @@
- msgid ""
- "_: brazil.kgm\n"
- "The flag of Espirito Santo is..."
--msgstr "聖埃斯皮里托（Espirito Santo）的旗幟是..."
-+msgstr "聖埃斯皮里托（Espirito Santo）的旗幟是…"
- 
- #: mapsdatatranslation.cpp:814
- msgid ""
-@@ -5413,8 +5413,7 @@
- #: mapsdatatranslation.cpp:819
- msgid ""
- "_: canada.kgm\n"
--"<qt>Current map:"
--"<br><b>Canada</b></qt>"
-+"<qt>Current map:<br><b>Canada</b></qt>"
- msgstr "<qt>目前地圖：<br><b>加拿大</b></qt>"
- 
- #: mapsdatatranslation.cpp:820
-@@ -5439,7 +5438,7 @@
- msgid ""
- "_: canada.kgm\n"
- "The capital of Prince Edward Island is..."
--msgstr "愛德華王子島（Prince Edward Island）的首都是..."
-+msgstr "愛德華王子島（Prince Edward Island）的首都是…"
- 
- #: mapsdatatranslation.cpp:824
- msgid ""
-@@ -5452,7 +5451,7 @@
- msgid ""
- "_: canada.kgm\n"
- "The flag of Prince Edward Island is..."
--msgstr "愛德華王子島（Prince Edward Island）的旗幟是..."
-+msgstr "愛德華王子島（Prince Edward Island）的旗幟是…"
- 
- #: mapsdatatranslation.cpp:826
- msgid ""
-@@ -5476,7 +5475,7 @@
- msgid ""
- "_: canada.kgm\n"
- "The capital of British Columbia is..."
--msgstr "卑詩省（又叫英屬哥倫比亞）（British Columbia）的首都是..."
-+msgstr "卑詩省（又叫英屬哥倫比亞）（British Columbia）的首都是…"
- 
- #: mapsdatatranslation.cpp:830
- msgid ""
-@@ -5489,7 +5488,7 @@
- msgid ""
- "_: canada.kgm\n"
- "The flag of British Columbia is..."
--msgstr "卑詩省（又叫英屬哥倫比亞）（British Columbia）的旗幟是..."
-+msgstr "卑詩省（又叫英屬哥倫比亞）（British Columbia）的旗幟是…"
- 
- #: mapsdatatranslation.cpp:832
- msgid ""
-@@ -5513,7 +5512,7 @@
- msgid ""
- "_: canada.kgm\n"
- "The capital of Ontario is..."
--msgstr "安大略（Ontario）的首都是..."
-+msgstr "安大略（Ontario）的首都是…"
- 
- #: mapsdatatranslation.cpp:836
- msgid ""
-@@ -5526,7 +5525,7 @@
- msgid ""
- "_: canada.kgm\n"
- "The flag of Ontario is..."
--msgstr "安大略（Ontario）的旗幟是..."
-+msgstr "安大略（Ontario）的旗幟是…"
- 
- #: mapsdatatranslation.cpp:838
- msgid ""
-@@ -5550,7 +5549,7 @@
- msgid ""
- "_: canada.kgm\n"
- "The capital of Newfoundland is..."
--msgstr "紐芬蘭（Newfoundland）的首都是..."
-+msgstr "紐芬蘭（Newfoundland）的首都是…"
- 
- #: mapsdatatranslation.cpp:842
- msgid ""
-@@ -5563,7 +5562,7 @@
- msgid ""
- "_: canada.kgm\n"
- "The flag of Newfoundland is..."
--msgstr "紐芬蘭（Newfoundland）的旗幟是..."
-+msgstr "紐芬蘭（Newfoundland）的旗幟是…"
- 
- #: mapsdatatranslation.cpp:844
- msgid ""
-@@ -5587,7 +5586,7 @@
- msgid ""
- "_: canada.kgm\n"
- "The capital of Nunavut is..."
--msgstr "努那福特（Nunavut）的首都是..."
-+msgstr "努那福特（Nunavut）的首都是…"
- 
- #: mapsdatatranslation.cpp:848
- msgid ""
-@@ -5600,7 +5599,7 @@
- msgid ""
- "_: canada.kgm\n"
- "The flag of Nunavut is..."
--msgstr "努那福特（Nunavut）的旗幟是..."
-+msgstr "努那福特（Nunavut）的旗幟是…"
- 
- #: mapsdatatranslation.cpp:850
- msgid ""
-@@ -5624,7 +5623,7 @@
- msgid ""
- "_: canada.kgm\n"
- "The capital of Alberta is..."
--msgstr "艾伯塔（Alberta）的首都是..."
-+msgstr "艾伯塔（Alberta）的首都是…"
- 
- #: mapsdatatranslation.cpp:854
- msgid ""
-@@ -5637,7 +5636,7 @@
- msgid ""
- "_: canada.kgm\n"
- "The flag of Alberta is..."
--msgstr "艾伯塔（Alberta）的旗幟是..."
-+msgstr "艾伯塔（Alberta）的旗幟是…"
- 
- #: mapsdatatranslation.cpp:856
- msgid ""
-@@ -5661,7 +5660,7 @@
- msgid ""
- "_: canada.kgm\n"
- "The capital of North West Territories is..."
--msgstr "西北地區（North West Territories）的首都是..."
-+msgstr "西北地區（North West Territories）的首都是…"
- 
- #: mapsdatatranslation.cpp:860
- msgid ""
-@@ -5674,7 +5673,7 @@
- msgid ""
- "_: canada.kgm\n"
- "The flag of North West Territories is..."
--msgstr "西北地區（North West Territories）的旗幟是..."
-+msgstr "西北地區（North West Territories）的旗幟是…"
- 
- #: mapsdatatranslation.cpp:862
- msgid ""
-@@ -5698,7 +5697,7 @@
- msgid ""
- "_: canada.kgm\n"
- "The capital of Quebec is..."
--msgstr "魁北克（Quebec）的首都是..."
-+msgstr "魁北克（Quebec）的首都是…"
- 
- #: mapsdatatranslation.cpp:866
- msgid ""
-@@ -5711,7 +5710,7 @@
- msgid ""
- "_: canada.kgm\n"
- "The flag of Quebec is..."
--msgstr "魁北克（Quebec）的旗幟是..."
-+msgstr "魁北克（Quebec）的旗幟是…"
- 
- #: mapsdatatranslation.cpp:868
- msgid ""
-@@ -5735,7 +5734,7 @@
- msgid ""
- "_: canada.kgm\n"
- "The capital of New Brunswick is..."
--msgstr "紐布蘭（New Brunswick）的首都是..."
-+msgstr "紐布蘭（New Brunswick）的首都是…"
- 
- #: mapsdatatranslation.cpp:872
- msgid ""
-@@ -5748,7 +5747,7 @@
- msgid ""
- "_: canada.kgm\n"
- "The flag of New Brunswick is..."
--msgstr "紐布蘭（New Brunswick）的旗幟是..."
-+msgstr "紐布蘭（New Brunswick）的旗幟是…"
- 
- #: mapsdatatranslation.cpp:874
- msgid ""
-@@ -5772,7 +5771,7 @@
- msgid ""
- "_: canada.kgm\n"
- "The capital of Manitoba is..."
--msgstr "曼尼托巴（Manitoba）的首都是..."
-+msgstr "曼尼托巴（Manitoba）的首都是…"
- 
- #: mapsdatatranslation.cpp:878
- msgid ""
-@@ -5785,7 +5784,7 @@
- msgid ""
- "_: canada.kgm\n"
- "The flag of Manitoba is..."
--msgstr "曼尼托巴（Manitoba）的旗幟是..."
-+msgstr "曼尼托巴（Manitoba）的旗幟是…"
- 
- #: mapsdatatranslation.cpp:880
- msgid ""
-@@ -5809,7 +5808,7 @@
- msgid ""
- "_: canada.kgm\n"
- "The capital of Nova Scotia is..."
--msgstr "諾瓦斯科（Nova Scotia）的首都是..."
-+msgstr "諾瓦斯科（Nova Scotia）的首都是…"
- 
- #: mapsdatatranslation.cpp:884
- msgid ""
-@@ -5822,7 +5821,7 @@
- msgid ""
- "_: canada.kgm\n"
- "The flag of Nova Scotia is..."
--msgstr "諾瓦斯科（Nova Scotia）的旗幟是..."
-+msgstr "諾瓦斯科（Nova Scotia）的旗幟是…"
- 
- #: mapsdatatranslation.cpp:886
- msgid ""
-@@ -5846,7 +5845,7 @@
- msgid ""
- "_: canada.kgm\n"
- "The capital of Yukon Territory is..."
--msgstr "育空地區（Yukon Territory）的首都是..."
-+msgstr "育空地區（Yukon Territory）的首都是…"
- 
- #: mapsdatatranslation.cpp:890
- msgid ""
-@@ -5859,7 +5858,7 @@
- msgid ""
- "_: canada.kgm\n"
- "The flag of Yukon Territory is..."
--msgstr "育空地區（Yukon Territory）的旗幟是..."
-+msgstr "育空地區（Yukon Territory）的旗幟是…"
- 
- #: mapsdatatranslation.cpp:892
- msgid ""
-@@ -5883,7 +5882,7 @@
- msgid ""
- "_: canada.kgm\n"
- "The capital of Saskatchewan is..."
--msgstr "薩克其萬（Saskatchewan）的首都是..."
-+msgstr "薩克其萬（Saskatchewan）的首都是…"
- 
- #: mapsdatatranslation.cpp:896
- msgid ""
-@@ -5896,7 +5895,7 @@
- msgid ""
- "_: canada.kgm\n"
- "The flag of Saskatchewan is..."
--msgstr "薩克其萬（Saskatchewan）的旗幟是..."
-+msgstr "薩克其萬（Saskatchewan）的旗幟是…"
- 
- #: mapsdatatranslation.cpp:898
- msgid ""
-@@ -5919,8 +5918,7 @@
- #: mapsdatatranslation.cpp:901
- msgid ""
- "_: china.kgm\n"
--"<qt>Current map:"
--"<br><b>China</b></qt>"
-+"<qt>Current map:<br><b>China</b></qt>"
- msgstr "<qt>目前地圖：<br><b>中國</b></qt>"
- 
- #: mapsdatatranslation.cpp:902
-@@ -6035,7 +6033,7 @@
- msgid ""
- "_: china.kgm\n"
- "Taiwan"
--msgstr "台灣（Taiwan）"
-+msgstr "中華民國（臺灣，Taiwan）"
- 
- #: mapsdatatranslation.cpp:921
- msgid ""
-@@ -6065,7 +6063,7 @@
- msgid ""
- "_: china.kgm\n"
- "The capital of Anhui is..."
--msgstr "安徽省的首都是..."
-+msgstr "安徽省的首都是…"
- 
- #: mapsdatatranslation.cpp:926
- msgid ""
-@@ -6122,7 +6120,7 @@
- msgid ""
- "_: china.kgm\n"
- "The capital of Fujian is..."
--msgstr "福建省的首都是..."
-+msgstr "福建省的首都是…"
- 
- #: mapsdatatranslation.cpp:935
- msgid ""
-@@ -6153,7 +6151,7 @@
- msgid ""
- "_: china.kgm\n"
- "The capital of Gansu is..."
--msgstr "甘肅省的首都是..."
-+msgstr "甘肅省的首都是…"
- 
- #: mapsdatatranslation.cpp:940
- msgid ""
-@@ -6184,7 +6182,7 @@
- msgid ""
- "_: china.kgm\n"
- "The capital of Guangdong is..."
--msgstr "廣東省的首都是..."
-+msgstr "廣東省的首都是…"
- 
- #: mapsdatatranslation.cpp:945
- msgid ""
-@@ -6215,7 +6213,7 @@
- msgid ""
- "_: china.kgm\n"
- "The capital of Guangxi Zhuang is..."
--msgstr "廣西省的首都是..."
-+msgstr "廣西省的首都是…"
- 
- #: mapsdatatranslation.cpp:950
- msgid ""
-@@ -6246,7 +6244,7 @@
- msgid ""
- "_: china.kgm\n"
- "The capital of Guizhou is..."
--msgstr "貴州省的首都是..."
-+msgstr "貴州省的首都是…"
- 
- #: mapsdatatranslation.cpp:955
- msgid ""
-@@ -6277,7 +6275,7 @@
- msgid ""
- "_: china.kgm\n"
- "The capital of Hainan is..."
--msgstr "海南省的首都是..."
-+msgstr "海南省的首都是…"
- 
- #: mapsdatatranslation.cpp:960
- msgid ""
-@@ -6308,7 +6306,7 @@
- msgid ""
- "_: china.kgm\n"
- "The capital of Hebei is..."
--msgstr "河北的首都是..."
-+msgstr "河北的首都是…"
- 
- #: mapsdatatranslation.cpp:965
- msgid ""
-@@ -6339,7 +6337,7 @@
- msgid ""
- "_: china.kgm\n"
- "The capital of Heilongjiang is..."
--msgstr "黑龍江省的首都是..."
-+msgstr "黑龍江省的首都是…"
- 
- #: mapsdatatranslation.cpp:970
- msgid ""
-@@ -6370,7 +6368,7 @@
- msgid ""
- "_: china.kgm\n"
- "The capital of Henan is..."
--msgstr "河南省的首都是..."
-+msgstr "河南省的首都是…"
- 
- #: mapsdatatranslation.cpp:975
- msgid ""
-@@ -6401,7 +6399,7 @@
- msgid ""
- "_: china.kgm\n"
- "The capital of Hubei is..."
--msgstr "湖北省的首都是..."
-+msgstr "湖北省的首都是…"
- 
- #: mapsdatatranslation.cpp:980
- msgid ""
-@@ -6432,7 +6430,7 @@
- msgid ""
- "_: china.kgm\n"
- "The capital of Hunan is..."
--msgstr "湖南省的首都是..."
-+msgstr "湖南省的首都是…"
- 
- #: mapsdatatranslation.cpp:985
- msgid ""
-@@ -6463,7 +6461,7 @@
- msgid ""
- "_: china.kgm\n"
- "The capital of Jiangsu is..."
--msgstr "江蘇省的首都是..."
-+msgstr "江蘇省的首都是…"
- 
- #: mapsdatatranslation.cpp:990
- msgid ""
-@@ -6494,7 +6492,7 @@
- msgid ""
- "_: china.kgm\n"
- "The capital of Jiangxi is..."
--msgstr "江西省的首都是..."
-+msgstr "江西省的首都是…"
- 
- #: mapsdatatranslation.cpp:995
- msgid ""
-@@ -6525,7 +6523,7 @@
- msgid ""
- "_: china.kgm\n"
- "The capital of Jilin is..."
--msgstr "吉林省的首都是..."
-+msgstr "吉林省的首都是…"
- 
- #: mapsdatatranslation.cpp:1000
- msgid ""
-@@ -6556,7 +6554,7 @@
- msgid ""
- "_: china.kgm\n"
- "The capital of Liaoning is..."
--msgstr "遼寧省的首都是..."
-+msgstr "遼寧省的首都是…"
- 
- #: mapsdatatranslation.cpp:1005
- msgid ""
-@@ -6587,7 +6585,7 @@
- msgid ""
- "_: china.kgm\n"
- "The capital of Nei Mongol is..."
--msgstr "內蒙古自治區的首都是..."
-+msgstr "內蒙古自治區的首都是…"
- 
- #: mapsdatatranslation.cpp:1010
- msgid ""
-@@ -6618,7 +6616,7 @@
- msgid ""
- "_: china.kgm\n"
- "The capital of Ningxia Hui is..."
--msgstr "寧夏回族自治區的首都是..."
-+msgstr "寧夏回族自治區的首都是…"
- 
- #: mapsdatatranslation.cpp:1015
- msgid ""
-@@ -6649,7 +6647,7 @@
- msgid ""
- "_: china.kgm\n"
- "The capital of Qinghai is..."
--msgstr "青海省的首都是..."
-+msgstr "青海省的首都是…"
- 
- #: mapsdatatranslation.cpp:1020
- msgid ""
-@@ -6680,7 +6678,7 @@
- msgid ""
- "_: china.kgm\n"
- "The capital of Shanxi is..."
--msgstr "山西省的首都是..."
-+msgstr "山西省的首都是…"
- 
- #: mapsdatatranslation.cpp:1025
- msgid ""
-@@ -6711,7 +6709,7 @@
- msgid ""
- "_: china.kgm\n"
- "The capital of Shandong is..."
--msgstr "山東省的首都是..."
-+msgstr "山東省的首都是…"
- 
- #: mapsdatatranslation.cpp:1030
- msgid ""
-@@ -6755,7 +6753,7 @@
- msgid ""
- "_: china.kgm\n"
- "The capital of Shaanxi is..."
--msgstr "陝西省的首都是..."
-+msgstr "陝西省的首都是…"
- 
- #: mapsdatatranslation.cpp:1037
- msgid ""
-@@ -6786,7 +6784,7 @@
- msgid ""
- "_: china.kgm\n"
- "The capital of Sichuan is..."
--msgstr "四川省的首都是..."
-+msgstr "四川省的首都是…"
- 
- #: mapsdatatranslation.cpp:1042
- msgid ""
-@@ -6830,7 +6828,7 @@
- msgid ""
- "_: china.kgm\n"
- "The capital of Xinjiang Uygur is..."
--msgstr "新疆維吾爾自治區的首都是..."
-+msgstr "新疆維吾爾自治區的首都是…"
- 
- #: mapsdatatranslation.cpp:1049
- msgid ""
-@@ -6861,7 +6859,7 @@
- msgid ""
- "_: china.kgm\n"
- "The capital of Xizang is..."
--msgstr "西藏自治區的首都是..."
-+msgstr "西藏自治區的首都是…"
- 
- #: mapsdatatranslation.cpp:1054
- msgid ""
-@@ -6892,7 +6890,7 @@
- msgid ""
- "_: china.kgm\n"
- "The capital of Yunnan is..."
--msgstr "雲南省的首都是..."
-+msgstr "雲南省的首都是…"
- 
- #: mapsdatatranslation.cpp:1059
- msgid ""
-@@ -6923,7 +6921,7 @@
- msgid ""
- "_: china.kgm\n"
- "The capital of Zhejiang is..."
--msgstr "浙江省的首都是..."
-+msgstr "浙江省的首都是…"
- 
- #: mapsdatatranslation.cpp:1064
- msgid ""
-@@ -6979,8 +6977,7 @@
- #: mapsdatatranslation.cpp:1072
- msgid ""
- "_: europe.kgm\n"
--"<qt>Current map:"
--"<br><b>Europe</b></qt>"
-+"<qt>Current map:<br><b>Europe</b></qt>"
- msgstr "<qt>目前地圖：<br><b>歐洲</b></qt>"
- 
- #: mapsdatatranslation.cpp:1073
-@@ -7011,7 +7008,7 @@
- msgid ""
- "_: europe.kgm\n"
- "The capital of Albania is..."
--msgstr "阿爾巴尼亞（Albania）的首都是..."
-+msgstr "阿爾巴尼亞（Albania）的首都是…"
- 
- #: mapsdatatranslation.cpp:1078
- msgid ""
-@@ -7024,7 +7021,7 @@
- msgid ""
- "_: europe.kgm\n"
- "The flag of Albania is..."
--msgstr "阿爾巴尼亞（Albania）的國旗是..."
-+msgstr "阿爾巴尼亞（Albania）的國旗是…"
- 
- #: mapsdatatranslation.cpp:1080
- msgid ""
-@@ -7054,7 +7051,7 @@
- msgid ""
- "_: europe.kgm\n"
- "The capital of Austria is..."
--msgstr "奧地利（Austria）的首都是..."
-+msgstr "奧地利（Austria）的首都是…"
- 
- #: mapsdatatranslation.cpp:1085
- msgid ""
-@@ -7067,7 +7064,7 @@
- msgid ""
- "_: europe.kgm\n"
- "The flag of Austria is..."
--msgstr "奧地利（Austria）的國旗是..."
-+msgstr "奧地利（Austria）的國旗是…"
- 
- #: mapsdatatranslation.cpp:1087
- msgid ""
-@@ -7091,7 +7088,7 @@
- msgid ""
- "_: europe.kgm\n"
- "The capital of Belarus is..."
--msgstr "白俄羅斯（Belarus）的首都是..."
-+msgstr "白俄羅斯（Belarus）的首都是…"
- 
- #: mapsdatatranslation.cpp:1091
- msgid ""
-@@ -7104,7 +7101,7 @@
- msgid ""
- "_: europe.kgm\n"
- "The flag of Belarus is..."
--msgstr "白俄羅斯（Belarus）的國旗是..."
-+msgstr "白俄羅斯（Belarus）的國旗是…"
- 
- #: mapsdatatranslation.cpp:1093
- msgid ""
-@@ -7128,7 +7125,7 @@
- msgid ""
- "_: europe.kgm\n"
- "The capital of Belgium is..."
--msgstr "比利時（Belgium）的首都是..."
-+msgstr "比利時（Belgium）的首都是…"
- 
- #: mapsdatatranslation.cpp:1097
- msgid ""
-@@ -7141,7 +7138,7 @@
- msgid ""
- "_: europe.kgm\n"
- "The flag of Belgium is..."
--msgstr "比利時（Belgium）的國旗是..."
-+msgstr "比利時（Belgium）的國旗是…"
- 
- #: mapsdatatranslation.cpp:1099
- msgid ""
-@@ -7165,7 +7162,7 @@
- msgid ""
- "_: europe.kgm\n"
- "The capital of Bosnia and Herzegovina is..."
--msgstr "波士尼亞赫塞哥維納（Bosnia and Herzegovina）的首都是..."
-+msgstr "波士尼亞赫塞哥維納（Bosnia and Herzegovina）的首都是…"
- 
- #: mapsdatatranslation.cpp:1103
- msgid ""
-@@ -7178,7 +7175,7 @@
- msgid ""
- "_: europe.kgm\n"
- "The flag of Bosnia and Herzegovina is..."
--msgstr "波士尼亞赫塞哥維納（Bosnia and Herzegovina）的國旗是..."
-+msgstr "波士尼亞赫塞哥維納（Bosnia and Herzegovina）的國旗是…"
- 
- #: mapsdatatranslation.cpp:1105
- msgid ""
-@@ -7202,7 +7199,7 @@
- msgid ""
- "_: europe.kgm\n"
- "The capital of Bulgaria is..."
--msgstr "保加利亞（Bulgaria）的首都是..."
-+msgstr "保加利亞（Bulgaria）的首都是…"
- 
- #: mapsdatatranslation.cpp:1109
- msgid ""
-@@ -7215,7 +7212,7 @@
- msgid ""
- "_: europe.kgm\n"
- "The flag of Bulgaria is..."
--msgstr "保加利亞（Bulgaria）的國旗是..."
-+msgstr "保加利亞（Bulgaria）的國旗是…"
- 
- #: mapsdatatranslation.cpp:1111
- msgid ""
-@@ -7239,7 +7236,7 @@
- msgid ""
- "_: europe.kgm\n"
- "The capital of Croatia is..."
--msgstr "克羅埃西亞（Croatia）的首都是..."
-+msgstr "克羅埃西亞（Croatia）的首都是…"
- 
- #: mapsdatatranslation.cpp:1115
- msgid ""
-@@ -7252,7 +7249,7 @@
- msgid ""
- "_: europe.kgm\n"
- "The flag of Croatia is..."
--msgstr "克羅埃西亞（Croatia）的國旗是..."
-+msgstr "克羅埃西亞（Croatia）的國旗是…"
- 
- #: mapsdatatranslation.cpp:1117
- msgid ""
-@@ -7276,7 +7273,7 @@
- msgid ""
- "_: europe.kgm\n"
- "The capital of Czech Republic is..."
--msgstr "捷克（Czech Republic）的首都是..."
-+msgstr "捷克（Czech Republic）的首都是…"
- 
- #: mapsdatatranslation.cpp:1121
- msgid ""
-@@ -7289,7 +7286,7 @@
- msgid ""
- "_: europe.kgm\n"
- "The flag of Czech Republic is..."
--msgstr "捷克（Czech Republic）的國旗是..."
-+msgstr "捷克（Czech Republic）的國旗是…"
- 
- #: mapsdatatranslation.cpp:1123
- msgid ""
-@@ -7313,7 +7310,7 @@
- msgid ""
- "_: europe.kgm\n"
- "The capital of Denmark is..."
--msgstr "丹麥（Denmark）的首都是..."
-+msgstr "丹麥（Denmark）的首都是…"
- 
- #: mapsdatatranslation.cpp:1127
- msgid ""
-@@ -7326,7 +7323,7 @@
- msgid ""
- "_: europe.kgm\n"
- "The flag of Denmark is..."
--msgstr "丹麥（Denmark）的國旗是..."
-+msgstr "丹麥（Denmark）的國旗是…"
- 
- #: mapsdatatranslation.cpp:1129
- msgid ""
-@@ -7350,7 +7347,7 @@
- msgid ""
- "_: europe.kgm\n"
- "The capital of Estonia is..."
--msgstr "愛沙尼亞（Estonia）的首都是..."
-+msgstr "愛沙尼亞（Estonia）的首都是…"
- 
- #: mapsdatatranslation.cpp:1133
- msgid ""
-@@ -7363,7 +7360,7 @@
- msgid ""
- "_: europe.kgm\n"
- "The flag of Estonia is..."
--msgstr "愛沙尼亞（Estonia）的國旗是..."
-+msgstr "愛沙尼亞（Estonia）的國旗是…"
- 
- #: mapsdatatranslation.cpp:1135
- msgid ""
-@@ -7387,7 +7384,7 @@
- msgid ""
- "_: europe.kgm\n"
- "The capital of Finland is..."
--msgstr "芬蘭（Finland）的首都是..."
-+msgstr "芬蘭（Finland）的首都是…"
- 
- #: mapsdatatranslation.cpp:1139
- msgid ""
-@@ -7400,7 +7397,7 @@
- msgid ""
- "_: europe.kgm\n"
- "The flag of Finland is..."
--msgstr "芬蘭（Finland）的國旗是..."
-+msgstr "芬蘭（Finland）的國旗是…"
- 
- #: mapsdatatranslation.cpp:1141
- msgid ""
-@@ -7424,7 +7421,7 @@
- msgid ""
- "_: europe.kgm\n"
- "The capital of Macedonia is..."
--msgstr "馬其頓（Macedonia）的首都是..."
-+msgstr "馬其頓（Macedonia）的首都是…"
- 
- #: mapsdatatranslation.cpp:1145
- msgid ""
-@@ -7437,7 +7434,7 @@
- msgid ""
- "_: europe.kgm\n"
- "The flag of Macedonia is..."
--msgstr "馬其頓（Macedonia）的國旗是..."
-+msgstr "馬其頓（Macedonia）的國旗是…"
- 
- #: mapsdatatranslation.cpp:1147
- msgid ""
-@@ -7461,7 +7458,7 @@
- msgid ""
- "_: europe.kgm\n"
- "The capital of France is..."
--msgstr "法蘭西（France）的首都是..."
-+msgstr "法蘭西（France）的首都是…"
- 
- #: mapsdatatranslation.cpp:1151
- msgid ""
-@@ -7474,7 +7471,7 @@
- msgid ""
- "_: europe.kgm\n"
- "The flag of France is..."
--msgstr "法蘭西（France）的國旗是..."
-+msgstr "法蘭西（France）的國旗是…"
- 
- #: mapsdatatranslation.cpp:1153
- msgid ""
-@@ -7498,7 +7495,7 @@
- msgid ""
- "_: europe.kgm\n"
- "The capital of Germany is..."
--msgstr "德意志（Germany）的首都是..."
-+msgstr "德意志（Germany）的首都是…"
- 
- #: mapsdatatranslation.cpp:1157
- msgid ""
-@@ -7511,7 +7508,7 @@
- msgid ""
- "_: europe.kgm\n"
- "The flag of Germany is..."
--msgstr "德意志（Germany）的國旗是..."
-+msgstr "德意志（Germany）的國旗是…"
- 
- #: mapsdatatranslation.cpp:1159
- msgid ""
-@@ -7535,7 +7532,7 @@
- msgid ""
- "_: europe.kgm\n"
- "The capital of Greece is..."
--msgstr "希臘（Greece）的首都是..."
-+msgstr "希臘（Greece）的首都是…"
- 
- #: mapsdatatranslation.cpp:1163
- msgid ""
-@@ -7548,7 +7545,7 @@
- msgid ""
- "_: europe.kgm\n"
- "The flag of Greece is..."
--msgstr "希臘（Greece）的國旗是..."
-+msgstr "希臘（Greece）的國旗是…"
- 
- #: mapsdatatranslation.cpp:1165
- msgid ""
-@@ -7572,7 +7569,7 @@
- msgid ""
- "_: europe.kgm\n"
- "The capital of Hungary is..."
--msgstr "匈牙利（Hungary）的首都是..."
-+msgstr "匈牙利（Hungary）的首都是…"
- 
- #: mapsdatatranslation.cpp:1169
- msgid ""
-@@ -7585,7 +7582,7 @@
- msgid ""
- "_: europe.kgm\n"
- "The flag of Hungary is..."
--msgstr "匈牙利（Hungary）的國旗是..."
-+msgstr "匈牙利（Hungary）的國旗是…"
- 
- #: mapsdatatranslation.cpp:1171
- msgid ""
-@@ -7609,7 +7606,7 @@
- msgid ""
- "_: europe.kgm\n"
- "The capital of Iceland is..."
--msgstr "冰島（Iceland）的首都是..."
-+msgstr "冰島（Iceland）的首都是…"
- 
- #: mapsdatatranslation.cpp:1175
- msgid ""
-@@ -7622,7 +7619,7 @@
- msgid ""
- "_: europe.kgm\n"
- "The flag of Iceland is..."
--msgstr "冰島（Iceland）的國旗是..."
-+msgstr "冰島（Iceland）的國旗是…"
- 
- #: mapsdatatranslation.cpp:1177
- msgid ""
-@@ -7646,7 +7643,7 @@
- msgid ""
- "_: europe.kgm\n"
- "The capital of Ireland is..."
--msgstr "愛爾蘭（Ireland）的首都是..."
-+msgstr "愛爾蘭（Ireland）的首都是…"
- 
- #: mapsdatatranslation.cpp:1181
- msgid ""
-@@ -7659,7 +7656,7 @@
- msgid ""
- "_: europe.kgm\n"
- "The flag of Ireland is..."
--msgstr "愛爾蘭（Ireland）的國旗是..."
-+msgstr "愛爾蘭（Ireland）的國旗是…"
- 
- #: mapsdatatranslation.cpp:1183
- msgid ""
-@@ -7683,7 +7680,7 @@
- msgid ""
- "_: europe.kgm\n"
- "The capital of Italy is..."
--msgstr "義大利（Italy）的首都是..."
-+msgstr "義大利（Italy）的首都是…"
- 
- #: mapsdatatranslation.cpp:1187
- msgid ""
-@@ -7696,7 +7693,7 @@
- msgid ""
- "_: europe.kgm\n"
- "The flag of Italy is..."
--msgstr "義大利（Italy）的國旗是..."
-+msgstr "義大利（Italy）的國旗是…"
- 
- #: mapsdatatranslation.cpp:1189
- msgid ""
-@@ -7720,7 +7717,7 @@
- msgid ""
- "_: europe.kgm\n"
- "The capital of Latvia is..."
--msgstr "拉脫維亞（Latvia）的首都是..."
-+msgstr "拉脫維亞（Latvia）的首都是…"
- 
- #: mapsdatatranslation.cpp:1193
- msgid ""
-@@ -7733,7 +7730,7 @@
- msgid ""
- "_: europe.kgm\n"
- "The flag of Latvia is..."
--msgstr "拉脫維亞（Latvia）的國旗是..."
-+msgstr "拉脫維亞（Latvia）的國旗是…"
- 
- #: mapsdatatranslation.cpp:1195
- msgid ""
-@@ -7757,7 +7754,7 @@
- msgid ""
- "_: europe.kgm\n"
- "The capital of Lithuania is..."
--msgstr "立陶宛（Lithuania）的首都是..."
-+msgstr "立陶宛（Lithuania）的首都是…"
- 
- #: mapsdatatranslation.cpp:1199
- msgid ""
-@@ -7770,7 +7767,7 @@
- msgid ""
- "_: europe.kgm\n"
- "The flag of Lithuania is..."
--msgstr "立陶宛（Lithuania）的國旗是..."
-+msgstr "立陶宛（Lithuania）的國旗是…"
- 
- #: mapsdatatranslation.cpp:1201
- msgid ""
-@@ -7794,7 +7791,7 @@
- msgid ""
- "_: europe.kgm\n"
- "The capital of Luxembourg is..."
--msgstr "盧森堡（Luxembourg）的首都是..."
-+msgstr "盧森堡（Luxembourg）的首都是…"
- 
- #: mapsdatatranslation.cpp:1205
- msgid ""
-@@ -7807,7 +7804,7 @@
- msgid ""
- "_: europe.kgm\n"
- "The flag of Luxembourg is..."
--msgstr "盧森堡（Luxembourg）的國旗是..."
-+msgstr "盧森堡（Luxembourg）的國旗是…"
- 
- #: mapsdatatranslation.cpp:1208
- msgid ""
-@@ -7825,7 +7822,7 @@
- msgid ""
- "_: europe.kgm\n"
- "The capital of Moldova is..."
--msgstr "摩爾多瓦（Moldova）的首都是..."
-+msgstr "摩爾多瓦（Moldova）的首都是…"
- 
- #: mapsdatatranslation.cpp:1211
- msgid ""
-@@ -7838,7 +7835,7 @@
- msgid ""
- "_: europe.kgm\n"
- "The flag of Moldova is..."
--msgstr "摩爾多瓦（Moldova）的國旗是..."
-+msgstr "摩爾多瓦（Moldova）的國旗是…"
- 
- #: mapsdatatranslation.cpp:1213
- msgid ""
-@@ -7868,7 +7865,7 @@
- msgid ""
- "_: europe.kgm\n"
- "The capital of Netherlands is..."
--msgstr "荷蘭（Netherlands）的首都是..."
-+msgstr "荷蘭（Netherlands）的首都是…"
- 
- #: mapsdatatranslation.cpp:1218
- msgid ""
-@@ -7881,7 +7878,7 @@
- msgid ""
- "_: europe.kgm\n"
- "The flag of Netherlands is..."
--msgstr "荷蘭（Netherlands）的國旗是..."
-+msgstr "荷蘭（Netherlands）的國旗是…"
- 
- #: mapsdatatranslation.cpp:1220
- msgid ""
-@@ -7905,7 +7902,7 @@
- msgid ""
- "_: europe.kgm\n"
- "The capital of Norway is..."
--msgstr "挪威（Norway）的首都是..."
-+msgstr "挪威（Norway）的首都是…"
- 
- #: mapsdatatranslation.cpp:1224
- msgid ""
-@@ -7918,7 +7915,7 @@
- msgid ""
- "_: europe.kgm\n"
- "The flag of Norway is..."
--msgstr "挪威（Norway）的國旗是..."
-+msgstr "挪威（Norway）的國旗是…"
- 
- #: mapsdatatranslation.cpp:1226
- msgid ""
-@@ -7942,7 +7939,7 @@
- msgid ""
- "_: europe.kgm\n"
- "The capital of Poland is..."
--msgstr "波蘭（Poland）的首都是..."
-+msgstr "波蘭（Poland）的首都是…"
- 
- #: mapsdatatranslation.cpp:1230
- msgid ""
-@@ -7955,7 +7952,7 @@
- msgid ""
- "_: europe.kgm\n"
- "The flag of Poland is..."
--msgstr "波蘭（Poland）的國旗是..."
-+msgstr "波蘭（Poland）的國旗是…"
- 
- #: mapsdatatranslation.cpp:1232
- msgid ""
-@@ -7979,7 +7976,7 @@
- msgid ""
- "_: europe.kgm\n"
- "The capital of Portugal is..."
--msgstr "葡萄牙（Portugal）的首都是..."
-+msgstr "葡萄牙（Portugal）的首都是…"
- 
- #: mapsdatatranslation.cpp:1236
- msgid ""
-@@ -7992,7 +7989,7 @@
- msgid ""
- "_: europe.kgm\n"
- "The flag of Portugal is..."
--msgstr "葡萄牙（Portugal）的國旗是..."
-+msgstr "葡萄牙（Portugal）的國旗是…"
- 
- #: mapsdatatranslation.cpp:1238
- msgid ""
-@@ -8016,7 +8013,7 @@
- msgid ""
- "_: europe.kgm\n"
- "The capital of Romania is..."
--msgstr "羅馬尼亞（Romania）的首都是..."
-+msgstr "羅馬尼亞（Romania）的首都是…"
- 
- #: mapsdatatranslation.cpp:1242
- msgid ""
-@@ -8029,7 +8026,7 @@
- msgid ""
- "_: europe.kgm\n"
- "The flag of Romania is..."
--msgstr "羅馬尼亞（Romania）的國旗是..."
-+msgstr "羅馬尼亞（Romania）的國旗是…"
- 
- #: mapsdatatranslation.cpp:1244
- msgid ""
-@@ -8053,7 +8050,7 @@
- msgid ""
- "_: europe.kgm\n"
- "The capital of Russia is..."
--msgstr "俄羅斯（Russia）的首都是..."
-+msgstr "俄羅斯（Russia）的首都是…"
- 
- #: mapsdatatranslation.cpp:1248
- msgid ""
-@@ -8066,7 +8063,7 @@
- msgid ""
- "_: europe.kgm\n"
- "The flag of Russia is..."
--msgstr "俄羅斯（Russia）的國旗是..."
-+msgstr "俄羅斯（Russia）的國旗是…"
- 
- #: mapsdatatranslation.cpp:1250
- msgid ""
-@@ -8090,7 +8087,7 @@
- msgid ""
- "_: europe.kgm\n"
- "The capital of San Marino is..."
--msgstr "聖馬利諾（San Marino）的首都是..."
-+msgstr "聖馬利諾（San Marino）的首都是…"
- 
- #: mapsdatatranslation.cpp:1254
- msgid ""
-@@ -8103,7 +8100,7 @@
- msgid ""
- "_: europe.kgm\n"
- "The flag of San Marino is..."
--msgstr "聖馬利諾（San Marino）的國旗是..."
-+msgstr "聖馬利諾（San Marino）的國旗是…"
- 
- #: mapsdatatranslation.cpp:1257
- msgid ""
-@@ -8121,7 +8118,7 @@
- msgid ""
- "_: europe.kgm\n"
- "The capital of Serbia is..."
--msgstr "塞爾維亞（Serbia）的首都是..."
-+msgstr "塞爾維亞（Serbia）的首都是…"
- 
- #: mapsdatatranslation.cpp:1260
- msgid ""
-@@ -8134,7 +8131,7 @@
- msgid ""
- "_: europe.kgm\n"
- "The flag of Serbia is..."
--msgstr "塞爾維亞（Serbia）的國旗是..."
-+msgstr "塞爾維亞（Serbia）的國旗是…"
- 
- #: mapsdatatranslation.cpp:1262
- msgid ""
-@@ -8158,7 +8155,7 @@
- msgid ""
- "_: europe.kgm\n"
- "The capital of Montenegro is..."
--msgstr "蒙特內哥羅（Montenegro）的首都是..."
-+msgstr "蒙特內哥羅（Montenegro）的首都是…"
- 
- #: mapsdatatranslation.cpp:1266
- msgid ""
-@@ -8171,7 +8168,7 @@
- msgid ""
- "_: europe.kgm\n"
- "The flag of Montenegro is..."
--msgstr "蒙特內哥羅（Montenegro）的國旗是..."
-+msgstr "蒙特內哥羅（Montenegro）的國旗是…"
- 
- #: mapsdatatranslation.cpp:1268
- msgid ""
-@@ -8195,7 +8192,7 @@
- msgid ""
- "_: europe.kgm\n"
- "The capital of Slovakia is..."
--msgstr "斯洛伐克（Slovakia）的首都是..."
-+msgstr "斯洛伐克（Slovakia）的首都是…"
- 
- #: mapsdatatranslation.cpp:1272
- msgid ""
-@@ -8208,7 +8205,7 @@
- msgid ""
- "_: europe.kgm\n"
- "The flag of Slovakia is..."
--msgstr "斯洛伐克（Slovakia）的國旗是..."
-+msgstr "斯洛伐克（Slovakia）的國旗是…"
- 
- #: mapsdatatranslation.cpp:1274
- msgid ""
-@@ -8232,7 +8229,7 @@
- msgid ""
- "_: europe.kgm\n"
- "The capital of Slovenia is..."
--msgstr "斯洛伐尼亞（Slovenia）的首都是..."
-+msgstr "斯洛伐尼亞（Slovenia）的首都是…"
- 
- #: mapsdatatranslation.cpp:1278
- msgid ""
-@@ -8245,7 +8242,7 @@
- msgid ""
- "_: europe.kgm\n"
- "The flag of Slovenia is..."
--msgstr "斯洛伐尼亞（Slovenia）的國旗是..."
-+msgstr "斯洛伐尼亞（Slovenia）的國旗是…"
- 
- #: mapsdatatranslation.cpp:1280
- msgid ""
-@@ -8269,7 +8266,7 @@
- msgid ""
- "_: europe.kgm\n"
- "The capital of Spain is..."
--msgstr "西班牙（Spain）的首都是..."
-+msgstr "西班牙（Spain）的首都是…"
- 
- #: mapsdatatranslation.cpp:1284
- msgid ""
-@@ -8282,7 +8279,7 @@
- msgid ""
- "_: europe.kgm\n"
- "The flag of Spain is..."
--msgstr "西班牙（Spain）的國旗是..."
-+msgstr "西班牙（Spain）的國旗是…"
- 
- #: mapsdatatranslation.cpp:1286
- msgid ""
-@@ -8306,7 +8303,7 @@
- msgid ""
- "_: europe.kgm\n"
- "The capital of Sweden is..."
--msgstr "瑞典（Sweden）的首都是..."
-+msgstr "瑞典（Sweden）的首都是…"
- 
- #: mapsdatatranslation.cpp:1290
- msgid ""
-@@ -8319,7 +8316,7 @@
- msgid ""
- "_: europe.kgm\n"
- "The flag of Sweden is..."
--msgstr "瑞典（Sweden）的國旗是..."
-+msgstr "瑞典（Sweden）的國旗是…"
- 
- #: mapsdatatranslation.cpp:1292
- msgid ""
-@@ -8331,7 +8328,7 @@
- msgid ""
- "_: europe.kgm\n"
- "Stockholm is the capital of..."
--msgstr "斯德哥爾摩（Stockholm）的首都是..."
-+msgstr "斯德哥爾摩（Stockholm）的首都是…"
- 
- #: mapsdatatranslation.cpp:1294
- msgid ""
-@@ -8343,7 +8340,7 @@
- msgid ""
- "_: europe.kgm\n"
- "The capital of Switzerland is..."
--msgstr "瑞士（Switzerland）的首都是..."
-+msgstr "瑞士（Switzerland）的首都是…"
- 
- #: mapsdatatranslation.cpp:1296
- msgid ""
-@@ -8356,7 +8353,7 @@
- msgid ""
- "_: europe.kgm\n"
- "The flag of Switzerland is..."
--msgstr "瑞士（Switzerland）的國旗是..."
-+msgstr "瑞士（Switzerland）的國旗是…"
- 
- #: mapsdatatranslation.cpp:1298
- msgid ""
-@@ -8392,7 +8389,7 @@
- msgid ""
- "_: europe.kgm\n"
- "The capital of Turkey is..."
--msgstr "土耳其（Turkey）的首都是..."
-+msgstr "土耳其（Turkey）的首都是…"
- 
- #: mapsdatatranslation.cpp:1304
- msgid ""
-@@ -8405,7 +8402,7 @@
- msgid ""
- "_: europe.kgm\n"
- "The flag of Turkey is..."
--msgstr "土耳其（Turkey）的國旗是..."
-+msgstr "土耳其（Turkey）的國旗是…"
- 
- #: mapsdatatranslation.cpp:1306
- msgid ""
-@@ -8429,7 +8426,7 @@
- msgid ""
- "_: europe.kgm\n"
- "The capital of Ukraine is..."
--msgstr "烏克蘭（Ukraine）的首都是..."
-+msgstr "烏克蘭（Ukraine）的首都是…"
- 
- #: mapsdatatranslation.cpp:1310
- msgid ""
-@@ -8442,7 +8439,7 @@
- msgid ""
- "_: europe.kgm\n"
- "The flag of Ukraine is..."
--msgstr "烏克蘭（Ukraine）的國旗是..."
-+msgstr "烏克蘭（Ukraine）的國旗是…"
- 
- #: mapsdatatranslation.cpp:1312
- msgid ""
-@@ -8466,7 +8463,7 @@
- msgid ""
- "_: europe.kgm\n"
- "The capital of United Kingdom is..."
--msgstr "大英國協（United Kingdom）的首都是..."
-+msgstr "大英國協（United Kingdom）的首都是…"
- 
- #: mapsdatatranslation.cpp:1316
- msgid ""
-@@ -8479,7 +8476,7 @@
- msgid ""
- "_: europe.kgm\n"
- "The flag of United Kingdom is..."
--msgstr "大英國協（United Kingdom）的國旗是..."
-+msgstr "大英國協（United Kingdom）的國旗是…"
- 
- #: mapsdatatranslation.cpp:1318
- msgid ""
-@@ -8502,8 +8499,7 @@
- #: mapsdatatranslation.cpp:1321
- msgid ""
- "_: france.kgm\n"
--"<qt>Current map:"
--"<br><b>France</b></qt>"
-+"<qt>Current map:<br><b>France</b></qt>"
- msgstr "<qt>目前地圖：<br><b>法國</b></qt>"
- 
- #: mapsdatatranslation.cpp:1322
-@@ -8528,7 +8524,7 @@
- msgid ""
- "_: france.kgm\n"
- "The capital of Ain is..."
--msgstr "安省（Ain）的首都是..."
-+msgstr "安省（Ain）的首都是…"
- 
- #: mapsdatatranslation.cpp:1326
- msgid ""
-@@ -8559,7 +8555,7 @@
- msgid ""
- "_: france.kgm\n"
- "The capital of Aisne is..."
--msgstr "埃納省（Aisne）的首都是..."
-+msgstr "埃納省（Aisne）的首都是…"
- 
- #: mapsdatatranslation.cpp:1331
- msgid ""
-@@ -8590,7 +8586,7 @@
- msgid ""
- "_: france.kgm\n"
- "The capital of Allier is..."
--msgstr "阿列省（Allier）的首都是..."
-+msgstr "阿列省（Allier）的首都是…"
- 
- #: mapsdatatranslation.cpp:1336
- msgid ""
-@@ -8621,7 +8617,7 @@
- msgid ""
- "_: france.kgm\n"
- "The capital of Alpes de Haute-Provence is..."
--msgstr "上普羅旺斯阿爾卑斯省（Alpes de Haute-Provence）的首都是..."
-+msgstr "上普羅旺斯阿爾卑斯省（Alpes de Haute-Provence）的首都是…"
- 
- #: mapsdatatranslation.cpp:1341
- msgid ""
-@@ -8652,7 +8648,7 @@
- msgid ""
- "_: france.kgm\n"
- "The capital of Hautes-Alpes is..."
--msgstr "上阿爾卑斯省（Hautes-Alpes）的首都是..."
-+msgstr "上阿爾卑斯省（Hautes-Alpes）的首都是…"
- 
- #: mapsdatatranslation.cpp:1346
- msgid ""
-@@ -8683,7 +8679,7 @@
- msgid ""
- "_: france.kgm\n"
- "The capital of Alpes Maritimes is..."
--msgstr "濱海阿爾卑斯省（Alpes Maritimes）的首都是..."
-+msgstr "濱海阿爾卑斯省（Alpes Maritimes）的首都是…"
- 
- #: mapsdatatranslation.cpp:1351
- msgid ""
-@@ -8714,7 +8710,7 @@
- msgid ""
- "_: france.kgm\n"
- "The capital of Ardèche is..."
--msgstr "阿爾代什省（Ardèche）的首都是..."
-+msgstr "阿爾代什省（Ardèche）的首都是…"
- 
- #: mapsdatatranslation.cpp:1356
- msgid ""
-@@ -8745,7 +8741,7 @@
- msgid ""
- "_: france.kgm\n"
- "The capital of Ardennes is..."
--msgstr "阿登省（Ardennes）的首都是..."
-+msgstr "阿登省（Ardennes）的首都是…"
- 
- #: mapsdatatranslation.cpp:1361
- msgid ""
-@@ -8776,7 +8772,7 @@
- msgid ""
- "_: france.kgm\n"
- "The capital of Ariège is..."
--msgstr "阿列日省（Ariège）的首都是..."
-+msgstr "阿列日省（Ariège）的首都是…"
- 
- #: mapsdatatranslation.cpp:1366
- msgid ""
-@@ -8807,7 +8803,7 @@
- msgid ""
- "_: france.kgm\n"
- "The capital of Aube is..."
--msgstr "奧布省（Aube）的首都是..."
-+msgstr "奧布省（Aube）的首都是…"
- 
- #: mapsdatatranslation.cpp:1371
- msgid ""
-@@ -8838,7 +8834,7 @@
- msgid ""
- "_: france.kgm\n"
- "The capital of Aude is..."
--msgstr "奧德省（Aude）的首都是..."
-+msgstr "奧德省（Aude）的首都是…"
- 
- #: mapsdatatranslation.cpp:1376
- msgid ""
-@@ -8869,7 +8865,7 @@
- msgid ""
- "_: france.kgm\n"
- "The capital of Aveyron is..."
--msgstr "阿韋龍省（Aveyron）的首都是..."
-+msgstr "阿韋龍省（Aveyron）的首都是…"
- 
- #: mapsdatatranslation.cpp:1381
- msgid ""
-@@ -8900,7 +8896,7 @@
- msgid ""
- "_: france.kgm\n"
- "The capital of Bouches-du-Rhône is..."
--msgstr "羅訥河口省（Bouches-du-Rhône）的首都是..."
-+msgstr "羅訥河口省（Bouches-du-Rhône）的首都是…"
- 
- #: mapsdatatranslation.cpp:1386
- msgid ""
-@@ -8931,7 +8927,7 @@
- msgid ""
- "_: france.kgm\n"
- "The capital of Calvados is..."
--msgstr "卡爾瓦多斯省（Calvados）的首都是..."
-+msgstr "卡爾瓦多斯省（Calvados）的首都是…"
- 
- #: mapsdatatranslation.cpp:1391
- msgid ""
-@@ -8962,7 +8958,7 @@
- msgid ""
- "_: france.kgm\n"
- "The capital of Cantal is..."
--msgstr "康塔爾省（Cantal）的首都是..."
-+msgstr "康塔爾省（Cantal）的首都是…"
- 
- #: mapsdatatranslation.cpp:1396
- msgid ""
-@@ -8993,7 +8989,7 @@
- msgid ""
- "_: france.kgm\n"
- "The capital of Charente is..."
--msgstr "夏朗德省（Charente）的首都是..."
-+msgstr "夏朗德省（Charente）的首都是…"
- 
- #: mapsdatatranslation.cpp:1401
- msgid ""
-@@ -9024,7 +9020,7 @@
- msgid ""
- "_: france.kgm\n"
- "The capital of Charente-Maritime is..."
--msgstr "濱海夏朗德省（Charente-Maritime）的首都是..."
-+msgstr "濱海夏朗德省（Charente-Maritime）的首都是…"
- 
- #: mapsdatatranslation.cpp:1406
- msgid ""
-@@ -9055,7 +9051,7 @@
- msgid ""
- "_: france.kgm\n"
- "The capital of Cher is..."
--msgstr "謝爾省（Cher）的首都是..."
-+msgstr "謝爾省（Cher）的首都是…"
- 
- #: mapsdatatranslation.cpp:1411
- msgid ""
-@@ -9086,7 +9082,7 @@
- msgid ""
- "_: france.kgm\n"
- "The capital of Corrèze is..."
--msgstr "科雷茲省（Corrèze）的首都是..."
-+msgstr "科雷茲省（Corrèze）的首都是…"
- 
- #: mapsdatatranslation.cpp:1416
- msgid ""
-@@ -9105,7 +9101,7 @@
- msgid ""
- "_: france.kgm\n"
- "Tulle is the capital of..."
--msgstr "帝勒（Tulle）的首都是..."
-+msgstr "帝勒（Tulle）的首都是…"
- 
- #: mapsdatatranslation.cpp:1419
- msgid ""
-@@ -9117,7 +9113,7 @@
- msgid ""
- "_: france.kgm\n"
- "The capital of Corse du Sud is..."
--msgstr "南科西嘉（Corse du Sud）的首都是..."
-+msgstr "南科西嘉（Corse du Sud）的首都是…"
- 
- #: mapsdatatranslation.cpp:1421
- msgid ""
-@@ -9148,7 +9144,7 @@
- msgid ""
- "_: france.kgm\n"
- "The capital of Haute-Corse is..."
--msgstr "上科西嘉（Haute-Corse）的首都是..."
-+msgstr "上科西嘉（Haute-Corse）的首都是…"
- 
- #: mapsdatatranslation.cpp:1426
- msgid ""
-@@ -9167,7 +9163,7 @@
- msgid ""
- "_: france.kgm\n"
- "Bastia is the capital of..."
--msgstr "巴斯蒂亞（Bastia）的首都是..."
-+msgstr "巴斯蒂亞（Bastia）的首都是…"
- 
- #: mapsdatatranslation.cpp:1429
- msgid ""
-@@ -9179,7 +9175,7 @@
- msgid ""
- "_: france.kgm\n"
- "The capital of Côte d'Or is..."
--msgstr "科爾多省（Côte d'Or）的首都是..."
-+msgstr "科爾多省（Côte d'Or）的首都是…"
- 
- #: mapsdatatranslation.cpp:1431
- msgid ""
-@@ -9210,7 +9206,7 @@
- msgid ""
- "_: france.kgm\n"
- "The capital of Côtes d'Armor is..."
--msgstr "阿摩爾濱海省（Côtes d'Armor）的首都是..."
-+msgstr "阿摩爾濱海省（Côtes d'Armor）的首都是…"
- 
- #: mapsdatatranslation.cpp:1436
- msgid ""
-@@ -9241,7 +9237,7 @@
- msgid ""
- "_: france.kgm\n"
- "The capital of Creuse is..."
--msgstr "克勒茲省（Creuse）的首都是..."
-+msgstr "克勒茲省（Creuse）的首都是…"
- 
- #: mapsdatatranslation.cpp:1441
- msgid ""
-@@ -9272,7 +9268,7 @@
- msgid ""
- "_: france.kgm\n"
- "The capital of Dordogne is..."
--msgstr "多爾多涅省（Dordogne）的首都是..."
-+msgstr "多爾多涅省（Dordogne）的首都是…"
- 
- #: mapsdatatranslation.cpp:1446
- msgid ""
-@@ -9303,7 +9299,7 @@
- msgid ""
- "_: france.kgm\n"
- "The capital of Doubs is..."
--msgstr "杜伯省（Doubs）的首都是..."
-+msgstr "杜伯省（Doubs）的首都是…"
- 
- #: mapsdatatranslation.cpp:1451
- msgid ""
-@@ -9334,7 +9330,7 @@
- msgid ""
- "_: france.kgm\n"
- "The capital of Drôme is..."
--msgstr "德龍省（Drôme）的首都是..."
-+msgstr "德龍省（Drôme）的首都是…"
- 
- #: mapsdatatranslation.cpp:1456
- msgid ""
-@@ -9365,7 +9361,7 @@
- msgid ""
- "_: france.kgm\n"
- "The capital of Eure is..."
--msgstr "厄爾省（Eure）的首都是..."
-+msgstr "厄爾省（Eure）的首都是…"
- 
- #: mapsdatatranslation.cpp:1461
- msgid ""
-@@ -9396,7 +9392,7 @@
- msgid ""
- "_: france.kgm\n"
- "The capital of Eure et Loir is..."
--msgstr "厄爾盧瓦爾省（Eure et Loir）的首都是..."
-+msgstr "厄爾盧瓦爾省（Eure et Loir）的首都是…"
- 
- #: mapsdatatranslation.cpp:1466
- msgid ""
-@@ -9427,7 +9423,7 @@
- msgid ""
- "_: france.kgm\n"
- "The capital of Finistère is..."
--msgstr "菲尼斯泰爾省（Finistère）的首都是..."
-+msgstr "菲尼斯泰爾省（Finistère）的首都是…"
- 
- #: mapsdatatranslation.cpp:1471
- msgid ""
-@@ -9458,7 +9454,7 @@
- msgid ""
- "_: france.kgm\n"
- "The capital of Gard is..."
--msgstr "加爾省（Gard）的首都是..."
-+msgstr "加爾省（Gard）的首都是…"
- 
- #: mapsdatatranslation.cpp:1476
- msgid ""
-@@ -9489,7 +9485,7 @@
- msgid ""
- "_: france.kgm\n"
- "The capital of Haute-Garonne is..."
--msgstr "上加龍省（Haute-Garonne）的首都是..."
-+msgstr "上加龍省（Haute-Garonne）的首都是…"
- 
- #: mapsdatatranslation.cpp:1481
- msgid ""
-@@ -9520,7 +9516,7 @@
- msgid ""
- "_: france.kgm\n"
- "The capital of Gers is..."
--msgstr "熱爾省（Gers）的首都是..."
-+msgstr "熱爾省（Gers）的首都是…"
- 
- #: mapsdatatranslation.cpp:1486
- msgid ""
-@@ -9551,7 +9547,7 @@
- msgid ""
- "_: france.kgm\n"
- "The capital of Gironde is..."
--msgstr "吉倫特省（Gironde）的首都是..."
-+msgstr "吉倫特省（Gironde）的首都是…"
- 
- #: mapsdatatranslation.cpp:1491
- msgid ""
-@@ -9582,7 +9578,7 @@
- msgid ""
- "_: france.kgm\n"
- "The capital of Hérault is..."
--msgstr "埃羅省（Hérault）的首都是..."
-+msgstr "埃羅省（Hérault）的首都是…"
- 
- #: mapsdatatranslation.cpp:1496
- msgid ""
-@@ -9613,7 +9609,7 @@
- msgid ""
- "_: france.kgm\n"
- "The capital of Ille et Vilaine is..."
--msgstr "伊勒維萊納省（Ille et Vilaine）的首都是..."
-+msgstr "伊勒維萊納省（Ille et Vilaine）的首都是…"
- 
- #: mapsdatatranslation.cpp:1501
- msgid ""
-@@ -9644,7 +9640,7 @@
- msgid ""
- "_: france.kgm\n"
- "The capital of Indre is..."
--msgstr "安德爾省（Indre）的首都是..."
-+msgstr "安德爾省（Indre）的首都是…"
- 
- #: mapsdatatranslation.cpp:1506
- msgid ""
-@@ -9675,7 +9671,7 @@
- msgid ""
- "_: france.kgm\n"
- "The capital of Indre et Loire is..."
--msgstr "安德爾魯瓦爾省（Indre et Loire）的首都是..."
-+msgstr "安德爾魯瓦爾省（Indre et Loire）的首都是…"
- 
- #: mapsdatatranslation.cpp:1511
- msgid ""
-@@ -9706,7 +9702,7 @@
- msgid ""
- "_: france.kgm\n"
- "The capital of Isère is..."
--msgstr "伊澤爾省（Isère）的首都是..."
-+msgstr "伊澤爾省（Isère）的首都是…"
- 
- #: mapsdatatranslation.cpp:1516
- msgid ""
-@@ -9737,7 +9733,7 @@
- msgid ""
- "_: france.kgm\n"
- "The capital of Jura is..."
--msgstr "汝拉省（Jura）的首都是..."
-+msgstr "汝拉省（Jura）的首都是…"
- 
- #: mapsdatatranslation.cpp:1521
- msgid ""
-@@ -9768,7 +9764,7 @@
- msgid ""
- "_: france.kgm\n"
- "The capital of Landes is..."
--msgstr "朗德省（Landes）的首都是..."
-+msgstr "朗德省（Landes）的首都是…"
- 
- #: mapsdatatranslation.cpp:1526
- msgid ""
-@@ -9799,7 +9795,7 @@
- msgid ""
- "_: france.kgm\n"
- "The capital of Loir et Cher is..."
--msgstr "盧瓦爾謝爾省（Loir et Cher）的首都是..."
-+msgstr "盧瓦爾謝爾省（Loir et Cher）的首都是…"
- 
- #: mapsdatatranslation.cpp:1531
- msgid ""
-@@ -9830,7 +9826,7 @@
- msgid ""
- "_: france.kgm\n"
- "The capital of Loire is..."
--msgstr "盧瓦爾省（Loire）的首都是..."
-+msgstr "盧瓦爾省（Loire）的首都是…"
- 
- #: mapsdatatranslation.cpp:1536
- msgid ""
-@@ -9861,7 +9857,7 @@
- msgid ""
- "_: france.kgm\n"
- "The capital of Haute-Loire is..."
--msgstr "上盧瓦爾省（Haute-Loire）的首都是..."
-+msgstr "上盧瓦爾省（Haute-Loire）的首都是…"
- 
- #: mapsdatatranslation.cpp:1541
- msgid ""
-@@ -9892,7 +9888,7 @@
- msgid ""
- "_: france.kgm\n"
- "The capital of Loire-Atlantique is..."
--msgstr "大西洋盧瓦爾省（Loire-Atlantique）的首都是..."
-+msgstr "大西洋盧瓦爾省（Loire-Atlantique）的首都是…"
- 
- #: mapsdatatranslation.cpp:1546
- msgid ""
-@@ -9923,7 +9919,7 @@
- msgid ""
- "_: france.kgm\n"
- "The capital of Loiret is..."
--msgstr "盧瓦雷省（Loiret）的首都是..."
-+msgstr "盧瓦雷省（Loiret）的首都是…"
- 
- #: mapsdatatranslation.cpp:1551
- msgid ""
-@@ -9954,7 +9950,7 @@
- msgid ""
- "_: france.kgm\n"
- "The capital of Lot is..."
--msgstr "洛特省（Lot）的首都是..."
-+msgstr "洛特省（Lot）的首都是…"
- 
- #: mapsdatatranslation.cpp:1556
- msgid ""
-@@ -9985,7 +9981,7 @@
- msgid ""
- "_: france.kgm\n"
- "The capital of Lot et Garonne is..."
--msgstr "洛特加龍省（Lot et Garonne）的首都是..."
-+msgstr "洛特加龍省（Lot et Garonne）的首都是…"
- 
- #: mapsdatatranslation.cpp:1561
- msgid ""
-@@ -10016,7 +10012,7 @@
- msgid ""
- "_: france.kgm\n"
- "The capital of Lozère is..."
--msgstr "洛澤爾省（Lozère）的首都是..."
-+msgstr "洛澤爾省（Lozère）的首都是…"
- 
- #: mapsdatatranslation.cpp:1566
- msgid ""
-@@ -10047,7 +10043,7 @@
- msgid ""
- "_: france.kgm\n"
- "The capital of Maine et Loire is..."
--msgstr "曼恩盧瓦爾省（Maine et Loire）的首都是..."
-+msgstr "曼恩盧瓦爾省（Maine et Loire）的首都是…"
- 
- #: mapsdatatranslation.cpp:1571
- msgid ""
-@@ -10078,7 +10074,7 @@
- msgid ""
- "_: france.kgm\n"
- "The capital of Manche is..."
--msgstr "芒什省（Manche）的首都是..."
-+msgstr "芒什省（Manche）的首都是…"
- 
- #: mapsdatatranslation.cpp:1576
- msgid ""
-@@ -10109,7 +10105,7 @@
- msgid ""
- "_: france.kgm\n"
- "The capital of Marne is..."
--msgstr "馬恩省（Marne）的首都是..."
-+msgstr "馬恩省（Marne）的首都是…"
- 
- #: mapsdatatranslation.cpp:1581
- msgid ""
-@@ -10140,7 +10136,7 @@
- msgid ""
- "_: france.kgm\n"
- "The capital of Haute-Marne is..."
--msgstr "上馬恩省（Haute-Marne）的首都是..."
-+msgstr "上馬恩省（Haute-Marne）的首都是…"
- 
- #: mapsdatatranslation.cpp:1586
- msgid ""
-@@ -10171,7 +10167,7 @@
- msgid ""
- "_: france.kgm\n"
- "The capital of Mayenne is..."
--msgstr "馬耶訥省（Mayenne）的首都是..."
-+msgstr "馬耶訥省（Mayenne）的首都是…"
- 
- #: mapsdatatranslation.cpp:1591
- msgid ""
-@@ -10202,7 +10198,7 @@
- msgid ""
- "_: france.kgm\n"
- "The capital of Meurthe et Moselle is..."
--msgstr "默爾特摩澤爾省（Meurthe et Moselle）的首都是..."
-+msgstr "默爾特摩澤爾省（Meurthe et Moselle）的首都是…"
- 
- #: mapsdatatranslation.cpp:1596
- msgid ""
-@@ -10233,7 +10229,7 @@
- msgid ""
- "_: france.kgm\n"
- "The capital of Meuse is..."
--msgstr "默茲省（Meuse）的首都是..."
-+msgstr "默茲省（Meuse）的首都是…"
- 
- #: mapsdatatranslation.cpp:1601
- msgid ""
-@@ -10264,7 +10260,7 @@
- msgid ""
- "_: france.kgm\n"
- "The capital of Morbihan is..."
--msgstr "莫爾比昂省（Morbihan）的首都是..."
-+msgstr "莫爾比昂省（Morbihan）的首都是…"
- 
- #: mapsdatatranslation.cpp:1606
- msgid ""
-@@ -10295,7 +10291,7 @@
- msgid ""
- "_: france.kgm\n"
- "The capital of Moselle is..."
--msgstr "摩澤爾省（Moselle）的首都是..."
-+msgstr "摩澤爾省（Moselle）的首都是…"
- 
- #: mapsdatatranslation.cpp:1611
- msgid ""
-@@ -10326,7 +10322,7 @@
- msgid ""
- "_: france.kgm\n"
- "The capital of Nièvre is..."
--msgstr "涅夫勒省（Nièvre）的首都是..."
-+msgstr "涅夫勒省（Nièvre）的首都是…"
- 
- #: mapsdatatranslation.cpp:1616
- msgid ""
-@@ -10357,7 +10353,7 @@
- msgid ""
- "_: france.kgm\n"
- "The capital of Nord is..."
--msgstr "諾爾省（Nord）的首都是..."
-+msgstr "諾爾省（Nord）的首都是…"
- 
- #: mapsdatatranslation.cpp:1621
- msgid ""
-@@ -10388,7 +10384,7 @@
- msgid ""
- "_: france.kgm\n"
- "The capital of Oise is..."
--msgstr "瓦茲省（Oise）的首都是..."
-+msgstr "瓦茲省（Oise）的首都是…"
- 
- #: mapsdatatranslation.cpp:1626
- msgid ""
-@@ -10419,7 +10415,7 @@
- msgid ""
- "_: france.kgm\n"
- "The capital of Orne is..."
--msgstr "奧恩（Orne）的首都是..."
-+msgstr "奧恩（Orne）的首都是…"
- 
- #: mapsdatatranslation.cpp:1631
- msgid ""
-@@ -10450,7 +10446,7 @@
- msgid ""
- "_: france.kgm\n"
- "The capital of Pas-de-Calais is..."
--msgstr "加萊海峽省（Pas-de-Calais）的首都是..."
-+msgstr "加萊海峽省（Pas-de-Calais）的首都是…"
- 
- #: mapsdatatranslation.cpp:1636
- msgid ""
-@@ -10481,7 +10477,7 @@
- msgid ""
- "_: france.kgm\n"
- "The capital of Puy-de-Dôme is..."
--msgstr "多姆山省（Puy-de-Dôme）的首都是..."
-+msgstr "多姆山省（Puy-de-Dôme）的首都是…"
- 
- #: mapsdatatranslation.cpp:1641
- msgid ""
-@@ -10512,7 +10508,7 @@
- msgid ""
- "_: france.kgm\n"
- "The capital of Pyrénées-Atlantiques is..."
--msgstr "比利尼斯大西洋省（Pyrénées-Atlantiques）的首都是..."
-+msgstr "比利尼斯大西洋省（Pyrénées-Atlantiques）的首都是…"
- 
- #: mapsdatatranslation.cpp:1646
- msgid ""
-@@ -10543,14 +10539,14 @@
- msgid ""
- "_: france.kgm\n"
- "The capital of Hautes-Pyrénées is..."
--msgstr "上比利尼斯省（Hautes-Pyrénées）的首都是..."
-+msgstr "上比利尼斯省（Hautes-Pyrénées）的首都是…"
- 
- #: mapsdatatranslation.cpp:1651
- msgid ""
- "_: france.kgm\n"
- "Please click on:\n"
- "Hautes-Pyrénées"
--msgstr "請點選：上比利尼斯省（Hautes-Pyrénées）的首都是..."
-+msgstr "請點選：上比利尼斯省（Hautes-Pyrénées）的首都是…"
- 
- #: mapsdatatranslation.cpp:1652
- msgid ""
-@@ -10574,7 +10570,7 @@
- msgid ""
- "_: france.kgm\n"
- "The capital of Pyrénées-Orientales is..."
--msgstr "東比利尼斯省（Pyrénées-Orientales）的首都是..."
-+msgstr "東比利尼斯省（Pyrénées-Orientales）的首都是…"
- 
- #: mapsdatatranslation.cpp:1656
- msgid ""
-@@ -10605,7 +10601,7 @@
- msgid ""
- "_: france.kgm\n"
- "The capital of Bas-Rhin is..."
--msgstr "下萊茵省（Bas-Rhin）的首都是..."
-+msgstr "下萊茵省（Bas-Rhin）的首都是…"
- 
- #: mapsdatatranslation.cpp:1661
- msgid ""
-@@ -10636,7 +10632,7 @@
- msgid ""
- "_: france.kgm\n"
- "The capital of Haut-Rhin is..."
--msgstr "上萊茵省（Haut-Rhin）的首都是..."
-+msgstr "上萊茵省（Haut-Rhin）的首都是…"
- 
- #: mapsdatatranslation.cpp:1666
- msgid ""
-@@ -10667,7 +10663,7 @@
- msgid ""
- "_: france.kgm\n"
- "The capital of Rhône is..."
--msgstr "羅訥省（Rhône）的首都是..."
-+msgstr "羅訥省（Rhône）的首都是…"
- 
- #: mapsdatatranslation.cpp:1671
- msgid ""
-@@ -10698,7 +10694,7 @@
- msgid ""
- "_: france.kgm\n"
- "The capital of Haute-Saône is..."
--msgstr "上索恩省（Haute-Saône）的首都是..."
-+msgstr "上索恩省（Haute-Saône）的首都是…"
- 
- #: mapsdatatranslation.cpp:1676
- msgid ""
-@@ -10729,7 +10725,7 @@
- msgid ""
- "_: france.kgm\n"
- "The capital of Saône et Loire is..."
--msgstr "索恩盧瓦爾省（Saône et Loire）的首都是..."
-+msgstr "索恩盧瓦爾省（Saône et Loire）的首都是…"
- 
- #: mapsdatatranslation.cpp:1681
- msgid ""
-@@ -10760,7 +10756,7 @@
- msgid ""
- "_: france.kgm\n"
- "The capital of Sarthe is..."
--msgstr "薩爾特省（Sarthe）的首都是..."
-+msgstr "薩爾特省（Sarthe）的首都是…"
- 
- #: mapsdatatranslation.cpp:1686
- msgid ""
-@@ -10791,7 +10787,7 @@
- msgid ""
- "_: france.kgm\n"
- "The capital of Savoie is..."
--msgstr "薩瓦省（Savoie）的首都是..."
-+msgstr "薩瓦省（Savoie）的首都是…"
- 
- #: mapsdatatranslation.cpp:1691
- msgid ""
-@@ -10822,7 +10818,7 @@
- msgid ""
- "_: france.kgm\n"
- "The capital of Haute-Savoie is..."
--msgstr "上薩瓦省（Haute-Savoie）的首都是..."
-+msgstr "上薩瓦省（Haute-Savoie）的首都是…"
- 
- #: mapsdatatranslation.cpp:1696
- msgid ""
-@@ -10853,7 +10849,7 @@
- msgid ""
- "_: france.kgm\n"
- "The capital of Paris is..."
--msgstr "巴黎省（Paris）的首都是..."
-+msgstr "巴黎省（Paris）的首都是…"
- 
- #: mapsdatatranslation.cpp:1701
- msgid ""
-@@ -10878,7 +10874,7 @@
- msgid ""
- "_: france.kgm\n"
- "The capital of Seine-Maritime is..."
--msgstr "濱海塞納省（Seine-Maritime）的首都是..."
-+msgstr "濱海塞納省（Seine-Maritime）的首都是…"
- 
- #: mapsdatatranslation.cpp:1706
- msgid ""
-@@ -10909,7 +10905,7 @@
- msgid ""
- "_: france.kgm\n"
- "The capital of Seine et Marne is..."
--msgstr "塞納馬恩省（Seine et Marne）的首都是..."
-+msgstr "塞納馬恩省（Seine et Marne）的首都是…"
- 
- #: mapsdatatranslation.cpp:1711
- msgid ""
-@@ -10940,7 +10936,7 @@
- msgid ""
- "_: france.kgm\n"
- "The capital of Yvelines is..."
--msgstr "伊夫林省（Yvelines）的首都是..."
-+msgstr "伊夫林省（Yvelines）的首都是…"
- 
- #: mapsdatatranslation.cpp:1716
- msgid ""
-@@ -10971,7 +10967,7 @@
- msgid ""
- "_: france.kgm\n"
- "The capital of Deux-Sèvres is..."
--msgstr "德塞夫勒省（Deux-Sèvres）的首都是..."
-+msgstr "德塞夫勒省（Deux-Sèvres）的首都是…"
- 
- #: mapsdatatranslation.cpp:1721
- msgid ""
-@@ -11002,7 +10998,7 @@
- msgid ""
- "_: france.kgm\n"
- "The capital of Somme is..."
--msgstr "索姆省（Somme）的首都是..."
-+msgstr "索姆省（Somme）的首都是…"
- 
- #: mapsdatatranslation.cpp:1726
- msgid ""
-@@ -11033,7 +11029,7 @@
- msgid ""
- "_: france.kgm\n"
- "The capital of Tarn is..."
--msgstr "塔恩（Tarn）的首都是..."
-+msgstr "塔恩（Tarn）的首都是…"
- 
- #: mapsdatatranslation.cpp:1731
- msgid ""
-@@ -11064,7 +11060,7 @@
- msgid ""
- "_: france.kgm\n"
- "The capital of Tarn et Garonne is..."
--msgstr "塔恩加龍省（Tarn et Garonne）的首都是..."
-+msgstr "塔恩加龍省（Tarn et Garonne）的首都是…"
- 
- #: mapsdatatranslation.cpp:1736
- msgid ""
-@@ -11095,7 +11091,7 @@
- msgid ""
- "_: france.kgm\n"
- "The capital of Var is..."
--msgstr "瓦爾省（Var）的首都是..."
-+msgstr "瓦爾省（Var）的首都是…"
- 
- #: mapsdatatranslation.cpp:1741
- msgid ""
-@@ -11126,7 +11122,7 @@
- msgid ""
- "_: france.kgm\n"
- "The capital of Vaucluse is..."
--msgstr "沃克呂茲省（Vaucluse）的首都是..."
-+msgstr "沃克呂茲省（Vaucluse）的首都是…"
- 
- #: mapsdatatranslation.cpp:1746
- msgid ""
-@@ -11157,7 +11153,7 @@
- msgid ""
- "_: france.kgm\n"
- "The capital of Vendée is..."
--msgstr "旺代省（Vendée）的首都是..."
-+msgstr "旺代省（Vendée）的首都是…"
- 
- #: mapsdatatranslation.cpp:1751
- msgid ""
-@@ -11188,7 +11184,7 @@
- msgid ""
- "_: france.kgm\n"
- "The capital of Vienne is..."
--msgstr "維埃納省（Vienne）的首都是..."
-+msgstr "維埃納省（Vienne）的首都是…"
- 
- #: mapsdatatranslation.cpp:1756
- msgid ""
-@@ -11219,7 +11215,7 @@
- msgid ""
- "_: france.kgm\n"
- "The capital of Haute-Vienne is..."
--msgstr "上維埃納省（Haute-Vienne）的首都是..."
-+msgstr "上維埃納省（Haute-Vienne）的首都是…"
- 
- #: mapsdatatranslation.cpp:1761
- msgid ""
-@@ -11250,7 +11246,7 @@
- msgid ""
- "_: france.kgm\n"
- "The capital of Vosges is..."
--msgstr "孚日省（Vosges）的首都是..."
-+msgstr "孚日省（Vosges）的首都是…"
- 
- #: mapsdatatranslation.cpp:1766
- msgid ""
-@@ -11281,7 +11277,7 @@
- msgid ""
- "_: france.kgm\n"
- "The capital of Yonne is..."
--msgstr "約納省（Yonne）的首都是..."
-+msgstr "約納省（Yonne）的首都是…"
- 
- #: mapsdatatranslation.cpp:1771
- msgid ""
-@@ -11312,7 +11308,7 @@
- msgid ""
- "_: france.kgm\n"
- "The capital of Territoire de Belfort is..."
--msgstr "貝爾福地區（Territoire de Belfort）的首都是..."
-+msgstr "貝爾福地區（Territoire de Belfort）的首都是…"
- 
- #: mapsdatatranslation.cpp:1776
- msgid ""
-@@ -11343,7 +11339,7 @@
- msgid ""
- "_: france.kgm\n"
- "The capital of Essonne is..."
--msgstr "埃松省（Essonne）的首都是..."
-+msgstr "埃松省（Essonne）的首都是…"
- 
- #: mapsdatatranslation.cpp:1781
- msgid ""
-@@ -11374,7 +11370,7 @@
- msgid ""
- "_: france.kgm\n"
- "The capital of Hauts-de-Seine is..."
--msgstr "上塞納省（Hauts-de-Seine）的首都是..."
-+msgstr "上塞納省（Hauts-de-Seine）的首都是…"
- 
- #: mapsdatatranslation.cpp:1786
- msgid ""
-@@ -11405,7 +11401,7 @@
- msgid ""
- "_: france.kgm\n"
- "The capital of Seine-Saint-Denis is..."
--msgstr "塞納聖但尼省（Seine-Saint-Denis）的首都是..."
-+msgstr "塞納聖但尼省（Seine-Saint-Denis）的首都是…"
- 
- #: mapsdatatranslation.cpp:1791
- msgid ""
-@@ -11436,7 +11432,7 @@
- msgid ""
- "_: france.kgm\n"
- "The capital of Val-de-Marne is..."
--msgstr "瓦勒德馬恩省（Val-de-Marne）的首都是..."
-+msgstr "瓦勒德馬恩省（Val-de-Marne）的首都是…"
- 
- #: mapsdatatranslation.cpp:1796
- msgid ""
-@@ -11467,7 +11463,7 @@
- msgid ""
- "_: france.kgm\n"
- "The capital of Val d'Oise is..."
--msgstr "瓦勒德瓦茲省（Val d'Oise）的首都是..."
-+msgstr "瓦勒德瓦茲省（Val d'Oise）的首都是…"
- 
- #: mapsdatatranslation.cpp:1801
- msgid ""
-@@ -11497,8 +11493,7 @@
- #: mapsdatatranslation.cpp:1805
- msgid ""
- "_: germany.kgm\n"
--"<qt>Current map:"
--"<br><b>Germany</b></qt>"
-+"<qt>Current map:<br><b>Germany</b></qt>"
- msgstr "<qt>目前地圖：<br><b>德國</b></qt>"
- 
- #: mapsdatatranslation.cpp:1806
-@@ -11523,7 +11518,7 @@
- msgid ""
- "_: germany.kgm\n"
- "The capital of Baden-Württemberg is..."
--msgstr "巴登符騰堡（Baden-Württemberg）的首都是..."
-+msgstr "巴登符騰堡（Baden-Württemberg）的首都是…"
- 
- #: mapsdatatranslation.cpp:1810
- msgid ""
-@@ -11536,7 +11531,7 @@
- msgid ""
- "_: germany.kgm\n"
- "The flag of Baden-Württemberg is..."
--msgstr "巴登符騰堡（Baden-Württemberg）的旗幟是..."
-+msgstr "巴登符騰堡（Baden-Württemberg）的旗幟是…"
- 
- #: mapsdatatranslation.cpp:1812
- msgid ""
-@@ -11560,7 +11555,7 @@
- msgid ""
- "_: germany.kgm\n"
- "The capital of Bavaria is..."
--msgstr "巴伐利亞（Bavaria）的首都是..."
-+msgstr "巴伐利亞（Bavaria）的首都是…"
- 
- #: mapsdatatranslation.cpp:1816
- msgid ""
-@@ -11573,7 +11568,7 @@
- msgid ""
- "_: germany.kgm\n"
- "The flag of Bavaria is..."
--msgstr "巴伐利亞（Bavaria）的旗幟是..."
-+msgstr "巴伐利亞（Bavaria）的旗幟是…"
- 
- #: mapsdatatranslation.cpp:1818
- msgid ""
-@@ -11597,7 +11592,7 @@
- msgid ""
- "_: germany.kgm\n"
- "The capital of Berlin is..."
--msgstr "柏林（Berlin）的首都是..."
-+msgstr "柏林（Berlin）的首都是…"
- 
- #: mapsdatatranslation.cpp:1822
- msgid ""
-@@ -11610,7 +11605,7 @@
- msgid ""
- "_: germany.kgm\n"
- "The flag of Berlin is..."
--msgstr "柏林（Berlin）的旗幟是..."
-+msgstr "柏林（Berlin）的旗幟是…"
- 
- #: mapsdatatranslation.cpp:1825
- msgid ""
-@@ -11628,7 +11623,7 @@
- msgid ""
- "_: germany.kgm\n"
- "The capital of Brandenburg is..."
--msgstr "布蘭登堡（Brandenburg）的首都是..."
-+msgstr "布蘭登堡（Brandenburg）的首都是…"
- 
- #: mapsdatatranslation.cpp:1828
- msgid ""
-@@ -11641,7 +11636,7 @@
- msgid ""
- "_: germany.kgm\n"
- "The flag of Brandenburg is..."
--msgstr "布蘭登堡（Brandenburg）的旗幟是..."
-+msgstr "布蘭登堡（Brandenburg）的旗幟是…"
- 
- #: mapsdatatranslation.cpp:1830
- msgid ""
-@@ -11665,7 +11660,7 @@
- msgid ""
- "_: germany.kgm\n"
- "The capital of Bremen is..."
--msgstr "不來梅（Bremen）的首都是..."
-+msgstr "不來梅（Bremen）的首都是…"
- 
- #: mapsdatatranslation.cpp:1834
- msgid ""
-@@ -11678,7 +11673,7 @@
- msgid ""
- "_: germany.kgm\n"
- "The flag of Bremen is..."
--msgstr "不來梅（Bremen）的旗幟是..."
-+msgstr "不來梅（Bremen）的旗幟是…"
- 
- #: mapsdatatranslation.cpp:1837
- msgid ""
-@@ -11696,7 +11691,7 @@
- msgid ""
- "_: germany.kgm\n"
- "The capital of Hamburg is..."
--msgstr "漢堡（Hamburg）的首都是..."
-+msgstr "漢堡（Hamburg）的首都是…"
- 
- #: mapsdatatranslation.cpp:1840
- msgid ""
-@@ -11709,7 +11704,7 @@
- msgid ""
- "_: germany.kgm\n"
- "The flag of Hamburg is..."
--msgstr "漢堡（Hamburg）的旗幟是..."
-+msgstr "漢堡（Hamburg）的旗幟是…"
- 
- #: mapsdatatranslation.cpp:1843
- msgid ""
-@@ -11727,7 +11722,7 @@
- msgid ""
- "_: germany.kgm\n"
- "The capital of Hesse is..."
--msgstr "黑森（Hesse）的首都是..."
-+msgstr "黑森（Hesse）的首都是…"
- 
- #: mapsdatatranslation.cpp:1846
- msgid ""
-@@ -11740,7 +11735,7 @@
- msgid ""
- "_: germany.kgm\n"
- "The flag of Hesse is..."
--msgstr "黑森（Hesse）的旗幟是..."
-+msgstr "黑森（Hesse）的旗幟是…"
- 
- #: mapsdatatranslation.cpp:1848
- msgid ""
-@@ -11764,7 +11759,7 @@
- msgid ""
- "_: germany.kgm\n"
- "The capital of Mecklenburg-Western Pomerania is..."
--msgstr "梅克倫堡-前波莫瑞（Mecklenburg-Western Pomerania）的首都是..."
-+msgstr "梅克倫堡-前波莫瑞（Mecklenburg-Western Pomerania）的首都是…"
- 
- #: mapsdatatranslation.cpp:1852
- msgid ""
-@@ -11777,7 +11772,7 @@
- msgid ""
- "_: germany.kgm\n"
- "The flag of Mecklenburg-Western Pomerania is..."
--msgstr "梅克倫堡-前波莫瑞（Mecklenburg-Western Pomerania）的旗幟是..."
-+msgstr "梅克倫堡-前波莫瑞（Mecklenburg-Western Pomerania）的旗幟是…"
- 
- #: mapsdatatranslation.cpp:1854
- msgid ""
-@@ -11801,7 +11796,7 @@
- msgid ""
- "_: germany.kgm\n"
- "The capital of Lower Saxony is..."
--msgstr "下薩克森（Lower Saxony）的首都是..."
-+msgstr "下薩克森（Lower Saxony）的首都是…"
- 
- #: mapsdatatranslation.cpp:1858
- msgid ""
-@@ -11814,7 +11809,7 @@
- msgid ""
- "_: germany.kgm\n"
- "The flag of Lower Saxony is..."
--msgstr "下薩克森（Lower Saxony）的旗幟是..."
-+msgstr "下薩克森（Lower Saxony）的旗幟是…"
- 
- #: mapsdatatranslation.cpp:1860
- msgid ""
-@@ -11838,7 +11833,7 @@
- msgid ""
- "_: germany.kgm\n"
- "The capital of North Rhine-Westphalia is..."
--msgstr "北萊茵-威斯特法倫（North Rhine-Westphalia）的首都是..."
-+msgstr "北萊茵-威斯特法倫（North Rhine-Westphalia）的首都是…"
- 
- #: mapsdatatranslation.cpp:1864
- msgid ""
-@@ -11851,7 +11846,7 @@
- msgid ""
- "_: germany.kgm\n"
- "The flag of North Rhine-Westphalia is..."
--msgstr "北萊茵-威斯特法倫（North Rhine-Westphalia）的旗幟是..."
-+msgstr "北萊茵-威斯特法倫（North Rhine-Westphalia）的旗幟是…"
- 
- #: mapsdatatranslation.cpp:1866
- msgid ""
-@@ -11875,7 +11870,7 @@
- msgid ""
- "_: germany.kgm\n"
- "The capital of Rhineland-Palatinate is..."
--msgstr "萊茵蘭-法耳茨（Rhineland-Palatinate）的首都是..."
-+msgstr "萊茵蘭-法耳茨（Rhineland-Palatinate）的首都是…"
- 
- #: mapsdatatranslation.cpp:1870
- msgid ""
-@@ -11888,7 +11883,7 @@
- msgid ""
- "_: germany.kgm\n"
- "The flag of Rhineland-Palatinate is..."
--msgstr "萊茵蘭-法耳茨（Rhineland-Palatinate）的旗幟是..."
-+msgstr "萊茵蘭-法耳茨（Rhineland-Palatinate）的旗幟是…"
- 
- #: mapsdatatranslation.cpp:1872
- msgid ""
-@@ -11912,7 +11907,7 @@
- msgid ""
- "_: germany.kgm\n"
- "The capital of Saarland is..."
--msgstr "薩爾（Saarland）的首都是..."
-+msgstr "薩爾（Saarland）的首都是…"
- 
- #: mapsdatatranslation.cpp:1876
- msgid ""
-@@ -11925,7 +11920,7 @@
- msgid ""
- "_: germany.kgm\n"
- "The flag of Saarland is..."
--msgstr "薩爾（Saarland）的旗幟是..."
-+msgstr "薩爾（Saarland）的旗幟是…"
- 
- #: mapsdatatranslation.cpp:1878
- msgid ""
-@@ -11949,7 +11944,7 @@
- msgid ""
- "_: germany.kgm\n"
- "The capital of Saxony is..."
--msgstr "薩克森（Saxony）的首都是..."
-+msgstr "薩克森（Saxony）的首都是…"
- 
- #: mapsdatatranslation.cpp:1882
- msgid ""
-@@ -11962,7 +11957,7 @@
- msgid ""
- "_: germany.kgm\n"
- "The flag of Saxony is..."
--msgstr "薩克森（Saxony）的旗幟是..."
-+msgstr "薩克森（Saxony）的旗幟是…"
- 
- #: mapsdatatranslation.cpp:1884
- msgid ""
-@@ -11986,7 +11981,7 @@
- msgid ""
- "_: germany.kgm\n"
- "The capital of Saxony-Anhalt is..."
--msgstr "薩克森安哈特（Saxony-Anhalt）的首都是..."
-+msgstr "薩克森安哈特（Saxony-Anhalt）的首都是…"
- 
- #: mapsdatatranslation.cpp:1888
- msgid ""
-@@ -11999,7 +11994,7 @@
- msgid ""
- "_: germany.kgm\n"
- "The flag of Saxony-Anhalt is..."
--msgstr "薩克森安哈特（Saxony-Anhalt）的旗幟是..."
-+msgstr "薩克森安哈特（Saxony-Anhalt）的旗幟是…"
- 
- #: mapsdatatranslation.cpp:1890
- msgid ""
-@@ -12023,7 +12018,7 @@
- msgid ""
- "_: germany.kgm\n"
- "The capital of Schleswig-Holstein is..."
--msgstr "石勒益荷斯泰（Schleswig-Holstein）的首都是..."
-+msgstr "石勒益荷斯泰（Schleswig-Holstein）的首都是…"
- 
- #: mapsdatatranslation.cpp:1894
- msgid ""
-@@ -12036,7 +12031,7 @@
- msgid ""
- "_: germany.kgm\n"
- "The flag of Schleswig-Holstein is..."
--msgstr "石勒益荷斯泰（Schleswig-Holstein）的旗幟是..."
-+msgstr "石勒益荷斯泰（Schleswig-Holstein）的旗幟是…"
- 
- #: mapsdatatranslation.cpp:1896
- msgid ""
-@@ -12060,7 +12055,7 @@
- msgid ""
- "_: germany.kgm\n"
- "The capital of Thuringia is..."
--msgstr "圖林根（Thuringia）的首都是..."
-+msgstr "圖林根（Thuringia）的首都是…"
- 
- #: mapsdatatranslation.cpp:1900
- msgid ""
-@@ -12073,7 +12068,7 @@
- msgid ""
- "_: germany.kgm\n"
- "The flag of Thuringia is..."
--msgstr "圖林根（Thuringia）的旗幟是..."
-+msgstr "圖林根（Thuringia）的旗幟是…"
- 
- #: mapsdatatranslation.cpp:1902
- msgid ""
-@@ -12096,8 +12091,7 @@
- #: mapsdatatranslation.cpp:1905
- msgid ""
- "_: italy.kgm\n"
--"<qt>Current map:"
--"<br><b>Italy</b></qt>"
-+"<qt>Current map:<br><b>Italy</b></qt>"
- msgstr "<qt>目前地圖：<br><b>義大利</b></qt>"
- 
- #: mapsdatatranslation.cpp:1906
-@@ -12122,7 +12116,7 @@
- msgid ""
- "_: italy.kgm\n"
- "The capital of Sicily is..."
--msgstr "西西里（Sicily）的首都是..."
-+msgstr "西西里（Sicily）的首都是…"
- 
- #: mapsdatatranslation.cpp:1910
- msgid ""
-@@ -12135,7 +12129,7 @@
- msgid ""
- "_: italy.kgm\n"
- "The flag of Sicily is..."
--msgstr "西西里（Sicily）的旗幟是..."
-+msgstr "西西里（Sicily）的旗幟是…"
- 
- #: mapsdatatranslation.cpp:1912
- msgid ""
-@@ -12159,7 +12153,7 @@
- msgid ""
- "_: italy.kgm\n"
- "The capital of Friuli Venezia Giulia is..."
--msgstr "弗留利-威尼斯朱利亞（Friuli Venezia Giulia）的首都是..."
-+msgstr "弗留利-威尼斯朱利亞（Friuli Venezia Giulia）的首都是…"
- 
- #: mapsdatatranslation.cpp:1916
- msgid ""
-@@ -12172,7 +12166,7 @@
- msgid ""
- "_: italy.kgm\n"
- "The flag of Friuli Venezia Giulia is..."
--msgstr "弗留利-威尼斯朱利亞（Friuli Venezia Giulia）的旗幟是..."
-+msgstr "弗留利-威尼斯朱利亞（Friuli Venezia Giulia）的旗幟是…"
- 
- #: mapsdatatranslation.cpp:1918
- msgid ""
-@@ -12196,7 +12190,7 @@
- msgid ""
- "_: italy.kgm\n"
- "The capital of Abruzzo is..."
--msgstr "阿布魯佐（Abruzzo）的首都是..."
-+msgstr "阿布魯佐（Abruzzo）的首都是…"
- 
- #: mapsdatatranslation.cpp:1922
- msgid ""
-@@ -12209,7 +12203,7 @@
- msgid ""
- "_: italy.kgm\n"
- "The flag of Abruzzo is..."
--msgstr "阿布魯佐（Abruzzo）的旗幟是..."
-+msgstr "阿布魯佐（Abruzzo）的旗幟是…"
- 
- #: mapsdatatranslation.cpp:1924
- msgid ""
-@@ -12233,7 +12227,7 @@
- msgid ""
- "_: italy.kgm\n"
- "The capital of Latium is..."
--msgstr "拉丁姆（Latium）的首都是..."
-+msgstr "拉丁姆（Latium）的首都是…"
- 
- #: mapsdatatranslation.cpp:1928
- msgid ""
-@@ -12246,7 +12240,7 @@
- msgid ""
- "_: italy.kgm\n"
- "The flag of Latium is..."
--msgstr "拉丁姆（Latium）的旗幟是..."
-+msgstr "拉丁姆（Latium）的旗幟是…"
- 
- #: mapsdatatranslation.cpp:1930
- msgid ""
-@@ -12270,7 +12264,7 @@
- msgid ""
- "_: italy.kgm\n"
- "The capital of Calabria is..."
--msgstr "卡拉布里亞（Calabria）的首都是..."
-+msgstr "卡拉布里亞（Calabria）的首都是…"
- 
- #: mapsdatatranslation.cpp:1934
- msgid ""
-@@ -12283,7 +12277,7 @@
- msgid ""
- "_: italy.kgm\n"
- "The flag of Calabria is..."
--msgstr "卡拉布里亞（Calabria）的旗幟是..."
-+msgstr "卡拉布里亞（Calabria）的旗幟是…"
- 
- #: mapsdatatranslation.cpp:1936
- msgid ""
-@@ -12307,7 +12301,7 @@
- msgid ""
- "_: italy.kgm\n"
- "The capital of Piedmont is..."
--msgstr "皮埃蒙特（Piedmont）的首都是..."
-+msgstr "皮埃蒙特（Piedmont）的首都是…"
- 
- #: mapsdatatranslation.cpp:1940
- msgid ""
-@@ -12320,7 +12314,7 @@
- msgid ""
- "_: italy.kgm\n"
- "The flag of Piedmont is..."
--msgstr "皮埃蒙特（Piedmont）的旗幟是..."
-+msgstr "皮埃蒙特（Piedmont）的旗幟是…"
- 
- #: mapsdatatranslation.cpp:1942
- msgid ""
-@@ -12344,7 +12338,7 @@
- msgid ""
- "_: italy.kgm\n"
- "The capital of Apulia is..."
--msgstr "普利亞（Apulia）的首都是..."
-+msgstr "普利亞（Apulia）的首都是…"
- 
- #: mapsdatatranslation.cpp:1946
- msgid ""
-@@ -12357,7 +12351,7 @@
- msgid ""
- "_: italy.kgm\n"
- "The flag of Apulia is..."
--msgstr "普利亞（Apulia）的旗幟是..."
-+msgstr "普利亞（Apulia）的旗幟是…"
- 
- #: mapsdatatranslation.cpp:1948
- msgid ""
-@@ -12381,7 +12375,7 @@
- msgid ""
- "_: italy.kgm\n"
- "The capital of Lombardy is..."
--msgstr "倫巴第（Lombardy）的首都是..."
-+msgstr "倫巴第（Lombardy）的首都是…"
- 
- #: mapsdatatranslation.cpp:1952
- msgid ""
-@@ -12394,7 +12388,7 @@
- msgid ""
- "_: italy.kgm\n"
- "The flag of Lombardy is..."
--msgstr "倫巴第（Lombardy）的旗幟是..."
-+msgstr "倫巴第（Lombardy）的旗幟是…"
- 
- #: mapsdatatranslation.cpp:1954
- msgid ""
-@@ -12418,7 +12412,7 @@
- msgid ""
- "_: italy.kgm\n"
- "The capital of Umbria is..."
--msgstr "烏布里亞（Umbria）的首都是..."
-+msgstr "烏布里亞（Umbria）的首都是…"
- 
- #: mapsdatatranslation.cpp:1958
- msgid ""
-@@ -12431,7 +12425,7 @@
- msgid ""
- "_: italy.kgm\n"
- "The flag of Umbria is..."
--msgstr "烏布里亞（Umbria）的旗幟是..."
-+msgstr "烏布里亞（Umbria）的旗幟是…"
- 
- #: mapsdatatranslation.cpp:1960
- msgid ""
-@@ -12455,7 +12449,7 @@
- msgid ""
- "_: italy.kgm\n"
- "The capital of Trentino Alto Adige is..."
--msgstr "特倫蒂諾上阿迪傑（Trentino Alto Adige）的首都是..."
-+msgstr "特倫蒂諾上阿迪傑（Trentino Alto Adige）的首都是…"
- 
- #: mapsdatatranslation.cpp:1964
- msgid ""
-@@ -12468,7 +12462,7 @@
- msgid ""
- "_: italy.kgm\n"
- "The flag of Trentino Alto Adige is..."
--msgstr "特倫蒂諾上阿迪傑（Trentino Alto Adige）的旗幟是..."
-+msgstr "特倫蒂諾上阿迪傑（Trentino Alto Adige）的旗幟是…"
- 
- #: mapsdatatranslation.cpp:1966
- msgid ""
-@@ -12492,7 +12486,7 @@
- msgid ""
- "_: italy.kgm\n"
- "The capital of Molise is..."
--msgstr "莫利塞（Molise）的首都是..."
-+msgstr "莫利塞（Molise）的首都是…"
- 
- #: mapsdatatranslation.cpp:1970
- msgid ""
-@@ -12505,7 +12499,7 @@
- msgid ""
- "_: italy.kgm\n"
- "The flag of Molise is..."
--msgstr "莫利塞（Molise）的旗幟是..."
-+msgstr "莫利塞（Molise）的旗幟是…"
- 
- #: mapsdatatranslation.cpp:1972
- msgid ""
-@@ -12529,7 +12523,7 @@
- msgid ""
- "_: italy.kgm\n"
- "The capital of Tuscany is..."
--msgstr "托斯卡納（Tuscany）的首都是..."
-+msgstr "托斯卡納（Tuscany）的首都是…"
- 
- #: mapsdatatranslation.cpp:1976
- msgid ""
-@@ -12542,7 +12536,7 @@
- msgid ""
- "_: italy.kgm\n"
- "The flag of Tuscany is..."
--msgstr "托斯卡納（Tuscany）的旗幟是..."
-+msgstr "托斯卡納（Tuscany）的旗幟是…"
- 
- #: mapsdatatranslation.cpp:1978
- msgid ""
-@@ -12566,7 +12560,7 @@
- msgid ""
- "_: italy.kgm\n"
- "The capital of Emilia Romagna is..."
--msgstr "艾米利羅馬涅（Emilia Romagna）的首都是..."
-+msgstr "艾米利羅馬涅（Emilia Romagna）的首都是…"
- 
- #: mapsdatatranslation.cpp:1982
- msgid ""
-@@ -12579,7 +12573,7 @@
- msgid ""
- "_: italy.kgm\n"
- "The flag of Emilia Romagna is..."
--msgstr "艾米利羅馬涅（Emilia Romagna）的旗幟是..."
-+msgstr "艾米利羅馬涅（Emilia Romagna）的旗幟是…"
- 
- #: mapsdatatranslation.cpp:1984
- msgid ""
-@@ -12603,7 +12597,7 @@
- msgid ""
- "_: italy.kgm\n"
- "The capital of Val d'Aosta is..."
--msgstr "瓦萊達奧斯塔（Val d'Aosta）的首都是..."
-+msgstr "瓦萊達奧斯塔（Val d'Aosta）的首都是…"
- 
- #: mapsdatatranslation.cpp:1988
- msgid ""
-@@ -12616,7 +12610,7 @@
- msgid ""
- "_: italy.kgm\n"
- "The flag of Val d'Aosta is..."
--msgstr "瓦萊達奧斯塔（Val d'Aosta）的旗幟是..."
-+msgstr "瓦萊達奧斯塔（Val d'Aosta）的旗幟是…"
- 
- #: mapsdatatranslation.cpp:1990
- msgid ""
-@@ -12640,7 +12634,7 @@
- msgid ""
- "_: italy.kgm\n"
- "The capital of Campania is..."
--msgstr "坎帕尼亞（Campania）的首都是..."
-+msgstr "坎帕尼亞（Campania）的首都是…"
- 
- #: mapsdatatranslation.cpp:1994
- msgid ""
-@@ -12653,7 +12647,7 @@
- msgid ""
- "_: italy.kgm\n"
- "The flag of Campania is..."
--msgstr "坎帕尼亞（Campania）的旗幟是..."
-+msgstr "坎帕尼亞（Campania）的旗幟是…"
- 
- #: mapsdatatranslation.cpp:1996
- msgid ""
-@@ -12677,7 +12671,7 @@
- msgid ""
- "_: italy.kgm\n"
- "The capital of Basilicata is..."
--msgstr "巴斯利卡塔（Basilicata）的首都是..."
-+msgstr "巴斯利卡塔（Basilicata）的首都是…"
- 
- #: mapsdatatranslation.cpp:2000
- msgid ""
-@@ -12690,7 +12684,7 @@
- msgid ""
- "_: italy.kgm\n"
- "The flag of Basilicata is..."
--msgstr "巴斯利卡塔（Basilicata）的旗幟是..."
-+msgstr "巴斯利卡塔（Basilicata）的旗幟是…"
- 
- #: mapsdatatranslation.cpp:2002
- msgid ""
-@@ -12714,7 +12708,7 @@
- msgid ""
- "_: italy.kgm\n"
- "The capital of Liguria is..."
--msgstr "利古里亞（Liguria）的首都是..."
-+msgstr "利古里亞（Liguria）的首都是…"
- 
- #: mapsdatatranslation.cpp:2006
- msgid ""
-@@ -12727,7 +12721,7 @@
- msgid ""
- "_: italy.kgm\n"
- "The flag of Liguria is..."
--msgstr "利古里亞（Liguria）的旗幟是..."
-+msgstr "利古里亞（Liguria）的旗幟是…"
- 
- #: mapsdatatranslation.cpp:2008
- msgid ""
-@@ -12751,7 +12745,7 @@
- msgid ""
- "_: italy.kgm\n"
- "The capital of Sardinia is..."
--msgstr "薩丁（Sardinia）的首都是..."
-+msgstr "薩丁（Sardinia）的首都是…"
- 
- #: mapsdatatranslation.cpp:2012
- msgid ""
-@@ -12764,7 +12758,7 @@
- msgid ""
- "_: italy.kgm\n"
- "The flag of Sardinia is..."
--msgstr "薩丁（Sardinia）的旗幟是..."
-+msgstr "薩丁（Sardinia）的旗幟是…"
- 
- #: mapsdatatranslation.cpp:2014
- msgid ""
-@@ -12788,7 +12782,7 @@
- msgid ""
- "_: italy.kgm\n"
- "The capital of Marches is..."
--msgstr "馬爾凱（Marches）的首都是..."
-+msgstr "馬爾凱（Marches）的首都是…"
- 
- #: mapsdatatranslation.cpp:2018
- msgid ""
-@@ -12801,7 +12795,7 @@
- msgid ""
- "_: italy.kgm\n"
- "The flag of Marches is..."
--msgstr "馬爾凱（Marches）的旗幟是..."
-+msgstr "馬爾凱（Marches）的旗幟是…"
- 
- #: mapsdatatranslation.cpp:2020
- msgid ""
-@@ -12825,7 +12819,7 @@
- msgid ""
- "_: italy.kgm\n"
- "The capital of Veneto is..."
--msgstr "威尼托（Veneto）的首都是..."
-+msgstr "威尼托（Veneto）的首都是…"
- 
- #: mapsdatatranslation.cpp:2024
- msgid ""
-@@ -12838,7 +12832,7 @@
- msgid ""
- "_: italy.kgm\n"
- "The flag of Veneto is..."
--msgstr "威尼托（Veneto）的旗幟是..."
-+msgstr "威尼托（Veneto）的旗幟是…"
- 
- #: mapsdatatranslation.cpp:2026
- msgid ""
-@@ -12861,8 +12855,7 @@
- #: mapsdatatranslation.cpp:2029
- msgid ""
- "_: italyprovince.kgm\n"
--"<qt>Current map:"
--"<br><b>Italy by Provinces</b></qt>"
-+"<qt>Current map:<br><b>Italy by Provinces</b></qt>"
- msgstr "<qt>目前地圖：<br><b>義大利省份地圖</b></qt>"
- 
- #: mapsdatatranslation.cpp:2030
-@@ -12887,7 +12880,7 @@
- msgid ""
- "_: italyprovince.kgm\n"
- "The capital of Alessandria is..."
--msgstr "亞力山德（Alessandria）的首都是..."
-+msgstr "亞力山德（Alessandria）的首都是…"
- 
- #: mapsdatatranslation.cpp:2034
- msgid ""
-@@ -12912,7 +12905,7 @@
- msgid ""
- "_: italyprovince.kgm\n"
- "The capital of Asti is..."
--msgstr "阿斯蒂（Asti）的首都是..."
-+msgstr "阿斯蒂（Asti）的首都是…"
- 
- #: mapsdatatranslation.cpp:2039
- msgid ""
-@@ -12937,7 +12930,7 @@
- msgid ""
- "_: italyprovince.kgm\n"
- "The capital of Biella is..."
--msgstr "比耶拉（Biella）的首都是..."
-+msgstr "比耶拉（Biella）的首都是…"
- 
- #: mapsdatatranslation.cpp:2044
- msgid ""
-@@ -12962,7 +12955,7 @@
- msgid ""
- "_: italyprovince.kgm\n"
- "The capital of Cuneo is..."
--msgstr "卡歐（Cuneo）的首都是..."
-+msgstr "卡歐（Cuneo）的首都是…"
- 
- #: mapsdatatranslation.cpp:2049
- msgid ""
-@@ -12987,7 +12980,7 @@
- msgid ""
- "_: italyprovince.kgm\n"
- "The capital of Novara is..."
--msgstr "熱那亞（Novara）的首都是..."
-+msgstr "熱那亞（Novara）的首都是…"
- 
- #: mapsdatatranslation.cpp:2054
- msgid ""
-@@ -13012,7 +13005,7 @@
- msgid ""
- "_: italyprovince.kgm\n"
- "The capital of Turin is..."
--msgstr "都靈（Turin）的首都是..."
-+msgstr "都靈（Turin）的首都是…"
- 
- #: mapsdatatranslation.cpp:2059
- msgid ""
-@@ -13037,7 +13030,7 @@
- msgid ""
- "_: italyprovince.kgm\n"
- "The capital of Verbano-Cusio-Ossola is..."
--msgstr "韋巴諾庫西奧奧索拉（Verbano-Cusio-Ossola）的首都是..."
-+msgstr "韋巴諾庫西奧奧索拉（Verbano-Cusio-Ossola）的首都是…"
- 
- #: mapsdatatranslation.cpp:2064
- msgid ""
-@@ -13068,7 +13061,7 @@
- msgid ""
- "_: italyprovince.kgm\n"
- "The capital of Vercelli is..."
--msgstr "沃什裡（Vercelli）的首都是..."
-+msgstr "沃什裡（Vercelli）的首都是…"
- 
- #: mapsdatatranslation.cpp:2069
- msgid ""
-@@ -13093,7 +13086,7 @@
- msgid ""
- "_: italyprovince.kgm\n"
- "The capital of Bergamo is..."
--msgstr "貝加莫（Bergamo）的首都是..."
-+msgstr "貝加莫（Bergamo）的首都是…"
- 
- #: mapsdatatranslation.cpp:2074
- msgid ""
-@@ -13118,7 +13111,7 @@
- msgid ""
- "_: italyprovince.kgm\n"
- "The capital of Brescia is..."
--msgstr "布列西亞（Brescia）的首都是..."
-+msgstr "布列西亞（Brescia）的首都是…"
- 
- #: mapsdatatranslation.cpp:2079
- msgid ""
-@@ -13143,7 +13136,7 @@
- msgid ""
- "_: italyprovince.kgm\n"
- "The capital of Como is..."
--msgstr "科摩（Como）的首都是..."
-+msgstr "科摩（Como）的首都是…"
- 
- #: mapsdatatranslation.cpp:2084
- msgid ""
-@@ -13168,7 +13161,7 @@
- msgid ""
- "_: italyprovince.kgm\n"
- "The capital of Cremona is..."
--msgstr "克雷蒙納（Cremona）的首都是..."
-+msgstr "克雷蒙納（Cremona）的首都是…"
- 
- #: mapsdatatranslation.cpp:2089
- msgid ""
-@@ -13193,7 +13186,7 @@
- msgid ""
- "_: italyprovince.kgm\n"
- "The capital of Lecco is..."
--msgstr "萊科（Lecco）的首都是..."
-+msgstr "萊科（Lecco）的首都是…"
- 
- #: mapsdatatranslation.cpp:2094
- msgid ""
-@@ -13218,7 +13211,7 @@
- msgid ""
- "_: italyprovince.kgm\n"
- "The capital of Lodi is..."
--msgstr "洛迪（Lodi）的首都是..."
-+msgstr "洛迪（Lodi）的首都是…"
- 
- #: mapsdatatranslation.cpp:2099
- msgid ""
-@@ -13243,7 +13236,7 @@
- msgid ""
- "_: italyprovince.kgm\n"
- "The capital of Mantova is..."
--msgstr "曼都瓦（Mantova）的首都是..."
-+msgstr "曼都瓦（Mantova）的首都是…"
- 
- #: mapsdatatranslation.cpp:2104
- msgid ""
-@@ -13268,7 +13261,7 @@
- msgid ""
- "_: italyprovince.kgm\n"
- "The capital of Milan is..."
--msgstr "米蘭（Milan）的首都是..."
-+msgstr "米蘭（Milan）的首都是…"
- 
- #: mapsdatatranslation.cpp:2109
- msgid ""
-@@ -13293,7 +13286,7 @@
- msgid ""
- "_: italyprovince.kgm\n"
- "The capital of Pavia is..."
--msgstr "帕維亞（Pavia）的首都是..."
-+msgstr "帕維亞（Pavia）的首都是…"
- 
- #: mapsdatatranslation.cpp:2114
- msgid ""
-@@ -13318,7 +13311,7 @@
- msgid ""
- "_: italyprovince.kgm\n"
- "The capital of Sondrio is..."
--msgstr "桑德里奧（Sondrio）的首都是..."
-+msgstr "桑德里奧（Sondrio）的首都是…"
- 
- #: mapsdatatranslation.cpp:2119
- msgid ""
-@@ -13343,7 +13336,7 @@
- msgid ""
- "_: italyprovince.kgm\n"
- "The capital of Varese is..."
--msgstr "瓦雷澤（Varese）的首都是..."
-+msgstr "瓦雷澤（Varese）的首都是…"
- 
- #: mapsdatatranslation.cpp:2124
- msgid ""
-@@ -13368,7 +13361,7 @@
- msgid ""
- "_: italyprovince.kgm\n"
- "The capital of Aosta is..."
--msgstr "奧斯塔（Aosta）的首都是..."
-+msgstr "奧斯塔（Aosta）的首都是…"
- 
- #: mapsdatatranslation.cpp:2129
- msgid ""
-@@ -13393,7 +13386,7 @@
- msgid ""
- "_: italyprovince.kgm\n"
- "The capital of Bolzano is..."
--msgstr "波扎諾（Bolzano）的首都是..."
-+msgstr "波扎諾（Bolzano）的首都是…"
- 
- #: mapsdatatranslation.cpp:2134
- msgid ""
-@@ -13418,7 +13411,7 @@
- msgid ""
- "_: italyprovince.kgm\n"
- "The capital of Trento is..."
--msgstr "特倫多（Trento）的首都是..."
-+msgstr "特倫多（Trento）的首都是…"
- 
- #: mapsdatatranslation.cpp:2139
- msgid ""
-@@ -13443,7 +13436,7 @@
- msgid ""
- "_: italyprovince.kgm\n"
- "The capital of Belluno is..."
--msgstr "貝盧諾（Belluno）的首都是..."
-+msgstr "貝盧諾（Belluno）的首都是…"
- 
- #: mapsdatatranslation.cpp:2144
- msgid ""
-@@ -13468,7 +13461,7 @@
- msgid ""
- "_: italyprovince.kgm\n"
- "The capital of Padova is..."
--msgstr "帕多瓦（Padova）的首都是..."
-+msgstr "帕多瓦（Padova）的首都是…"
- 
- #: mapsdatatranslation.cpp:2149
- msgid ""
-@@ -13493,7 +13486,7 @@
- msgid ""
- "_: italyprovince.kgm\n"
- "The capital of Rovigo is..."
--msgstr "羅維戈（Rovigo）的首都是..."
-+msgstr "羅維戈（Rovigo）的首都是…"
- 
- #: mapsdatatranslation.cpp:2154
- msgid ""
-@@ -13518,7 +13511,7 @@
- msgid ""
- "_: italyprovince.kgm\n"
- "The capital of Treviso is..."
--msgstr "特雷維索（Treviso）的首都是..."
-+msgstr "特雷維索（Treviso）的首都是…"
- 
- #: mapsdatatranslation.cpp:2159
- msgid ""
-@@ -13543,7 +13536,7 @@
- msgid ""
- "_: italyprovince.kgm\n"
- "The capital of Venice is..."
--msgstr "威尼斯（Venice）的首都是..."
-+msgstr "威尼斯（Venice）的首都是…"
- 
- #: mapsdatatranslation.cpp:2164
- msgid ""
-@@ -13568,7 +13561,7 @@
- msgid ""
- "_: italyprovince.kgm\n"
- "The capital of Verona is..."
--msgstr "維羅納（Verona）的首都是..."
-+msgstr "維羅納（Verona）的首都是…"
- 
- #: mapsdatatranslation.cpp:2169
- msgid ""
-@@ -13593,7 +13586,7 @@
- msgid ""
- "_: italyprovince.kgm\n"
- "The capital of Vicenza is..."
--msgstr "維琴察（Vicenza）的首都是..."
-+msgstr "維琴察（Vicenza）的首都是…"
- 
- #: mapsdatatranslation.cpp:2174
- msgid ""
-@@ -13618,7 +13611,7 @@
- msgid ""
- "_: italyprovince.kgm\n"
- "The capital of Gorizia is..."
--msgstr "戈里察（Gorizia）的首都是..."
-+msgstr "戈里察（Gorizia）的首都是…"
- 
- #: mapsdatatranslation.cpp:2179
- msgid ""
-@@ -13643,7 +13636,7 @@
- msgid ""
- "_: italyprovince.kgm\n"
- "The capital of Pordenone is..."
--msgstr "波登諾內（Pordenone）的首都是..."
-+msgstr "波登諾內（Pordenone）的首都是…"
- 
- #: mapsdatatranslation.cpp:2184
- msgid ""
-@@ -13668,7 +13661,7 @@
- msgid ""
- "_: italyprovince.kgm\n"
- "The capital of Trieste is..."
--msgstr "的里雅斯特（Trieste）的首都是..."
-+msgstr "的里雅斯特（Trieste）的首都是…"
- 
- #: mapsdatatranslation.cpp:2189
- msgid ""
-@@ -13693,7 +13686,7 @@
- msgid ""
- "_: italyprovince.kgm\n"
- "The capital of Udine is..."
--msgstr "烏迪內（Udine）的首都是..."
-+msgstr "烏迪內（Udine）的首都是…"
- 
- #: mapsdatatranslation.cpp:2194
- msgid ""
-@@ -13718,7 +13711,7 @@
- msgid ""
- "_: italyprovince.kgm\n"
- "The capital of Genoa is..."
--msgstr "熱那亞（Genoa）的首都是..."
-+msgstr "熱那亞（Genoa）的首都是…"
- 
- #: mapsdatatranslation.cpp:2199
- msgid ""
-@@ -13743,7 +13736,7 @@
- msgid ""
- "_: italyprovince.kgm\n"
- "The capital of Imperia is..."
--msgstr "因佩里亞（Imperia）的首都是..."
-+msgstr "因佩里亞（Imperia）的首都是…"
- 
- #: mapsdatatranslation.cpp:2204
- msgid ""
-@@ -13768,7 +13761,7 @@
- msgid ""
- "_: italyprovince.kgm\n"
- "The capital of La Spezia is..."
--msgstr "斯佩奇亞（La Spezia）的首都是..."
-+msgstr "斯佩奇亞（La Spezia）的首都是…"
- 
- #: mapsdatatranslation.cpp:2209
- msgid ""
-@@ -13793,7 +13786,7 @@
- msgid ""
- "_: italyprovince.kgm\n"
- "The capital of Savona is..."
--msgstr "薩窩那（Savona）的首都是..."
-+msgstr "薩窩那（Savona）的首都是…"
- 
- #: mapsdatatranslation.cpp:2214
- msgid ""
-@@ -13818,7 +13811,7 @@
- msgid ""
- "_: italyprovince.kgm\n"
- "The capital of Bologna is..."
--msgstr "波洛尼亞（Bologna）的首都是..."
-+msgstr "波洛尼亞（Bologna）的首都是…"
- 
- #: mapsdatatranslation.cpp:2219
- msgid ""
-@@ -13843,7 +13836,7 @@
- msgid ""
- "_: italyprovince.kgm\n"
- "The capital of Ferrara is..."
--msgstr "斐拉拉（Ferrara）的首都是..."
-+msgstr "斐拉拉（Ferrara）的首都是…"
- 
- #: mapsdatatranslation.cpp:2224
- msgid ""
-@@ -13868,7 +13861,7 @@
- msgid ""
- "_: italyprovince.kgm\n"
- "The capital of Forlì-Cesena is..."
--msgstr "佛利塞擇納（Forlì-Cesena）的首都是..."
-+msgstr "佛利塞擇納（Forlì-Cesena）的首都是…"
- 
- #: mapsdatatranslation.cpp:2229
- msgid ""
-@@ -13899,7 +13892,7 @@
- msgid ""
- "_: italyprovince.kgm\n"
- "The capital of Modena is..."
--msgstr "摩德納（Modena）的首都是..."
-+msgstr "摩德納（Modena）的首都是…"
- 
- #: mapsdatatranslation.cpp:2234
- msgid ""
-@@ -13924,7 +13917,7 @@
- msgid ""
- "_: italyprovince.kgm\n"
- "The capital of Parma is..."
--msgstr "帕爾馬（Parma）的首都是..."
-+msgstr "帕爾馬（Parma）的首都是…"
- 
- #: mapsdatatranslation.cpp:2239
- msgid ""
-@@ -13949,7 +13942,7 @@
- msgid ""
- "_: italyprovince.kgm\n"
- "The capital of Piacenza is..."
--msgstr "皮亞琴察（Piacenza）的首都是..."
-+msgstr "皮亞琴察（Piacenza）的首都是…"
- 
- #: mapsdatatranslation.cpp:2244
- msgid ""
-@@ -13974,7 +13967,7 @@
- msgid ""
- "_: italyprovince.kgm\n"
- "The capital of Ravenna is..."
--msgstr "拉文那（Ravenna）的首都是..."
-+msgstr "拉文那（Ravenna）的首都是…"
- 
- #: mapsdatatranslation.cpp:2249
- msgid ""
-@@ -13999,7 +13992,7 @@
- msgid ""
- "_: italyprovince.kgm\n"
- "The capital of Reggio nell'Emilia is..."
--msgstr "勒佐艾米利亞（Reggio nell'Emilia）的首都是..."
-+msgstr "勒佐艾米利亞（Reggio nell'Emilia）的首都是…"
- 
- #: mapsdatatranslation.cpp:2254
- msgid ""
-@@ -14024,7 +14017,7 @@
- msgid ""
- "_: italyprovince.kgm\n"
- "The capital of Rimini is..."
--msgstr "里米尼（Rimini）的首都是..."
-+msgstr "里米尼（Rimini）的首都是…"
- 
- #: mapsdatatranslation.cpp:2259
- msgid ""
-@@ -14049,7 +14042,7 @@
- msgid ""
- "_: italyprovince.kgm\n"
- "The capital of Arezzo is..."
--msgstr "阿雷佐（Arezzo）的首都是..."
-+msgstr "阿雷佐（Arezzo）的首都是…"
- 
- #: mapsdatatranslation.cpp:2264
- msgid ""
-@@ -14074,7 +14067,7 @@
- msgid ""
- "_: italyprovince.kgm\n"
- "The capital of Florence is..."
--msgstr "佛羅倫斯（Florence）的首都是..."
-+msgstr "佛羅倫斯（Florence）的首都是…"
- 
- #: mapsdatatranslation.cpp:2269
- msgid ""
-@@ -14099,7 +14092,7 @@
- msgid ""
- "_: italyprovince.kgm\n"
- "The capital of Grosseto is..."
--msgstr "格羅塞托（Grosseto）的首都是..."
-+msgstr "格羅塞托（Grosseto）的首都是…"
- 
- #: mapsdatatranslation.cpp:2274
- msgid ""
-@@ -14124,7 +14117,7 @@
- msgid ""
- "_: italyprovince.kgm\n"
- "The capital of Livorno is..."
--msgstr "里窩那（Livorno）的首都是..."
-+msgstr "里窩那（Livorno）的首都是…"
- 
- #: mapsdatatranslation.cpp:2279
- msgid ""
-@@ -14149,7 +14142,7 @@
- msgid ""
- "_: italyprovince.kgm\n"
- "The capital of Lucca is..."
--msgstr "盧卡（Lucca）的首都是..."
-+msgstr "盧卡（Lucca）的首都是…"
- 
- #: mapsdatatranslation.cpp:2284
- msgid ""
-@@ -14174,7 +14167,7 @@
- msgid ""
- "_: italyprovince.kgm\n"
- "The capital of Massa-Carrara is..."
--msgstr "馬薩卡拉拉（Massa-Carrara）的首都是..."
-+msgstr "馬薩卡拉拉（Massa-Carrara）的首都是…"
- 
- #: mapsdatatranslation.cpp:2289
- msgid ""
-@@ -14205,7 +14198,7 @@
- msgid ""
- "_: italyprovince.kgm\n"
- "The capital of Pisa is..."
--msgstr "比薩（Pisa）的首都是..."
-+msgstr "比薩（Pisa）的首都是…"
- 
- #: mapsdatatranslation.cpp:2294
- msgid ""
-@@ -14230,7 +14223,7 @@
- msgid ""
- "_: italyprovince.kgm\n"
- "The capital of Pistoia is..."
--msgstr "皮斯托亞（Pistoia）的首都是..."
-+msgstr "皮斯托亞（Pistoia）的首都是…"
- 
- #: mapsdatatranslation.cpp:2299
- msgid ""
-@@ -14255,7 +14248,7 @@
- msgid ""
- "_: italyprovince.kgm\n"
- "The capital of Prato is..."
--msgstr "普拉托（Prato）的首都是..."
-+msgstr "普拉托（Prato）的首都是…"
- 
- #: mapsdatatranslation.cpp:2304
- msgid ""
-@@ -14280,7 +14273,7 @@
- msgid ""
- "_: italyprovince.kgm\n"
- "The capital of Siena is..."
--msgstr "錫耶納（Siena）的首都是..."
-+msgstr "錫耶納（Siena）的首都是…"
- 
- #: mapsdatatranslation.cpp:2309
- msgid ""
-@@ -14305,7 +14298,7 @@
- msgid ""
- "_: italyprovince.kgm\n"
- "The capital of Perugia is..."
--msgstr "佩魯賈（Perugia）的首都是..."
-+msgstr "佩魯賈（Perugia）的首都是…"
- 
- #: mapsdatatranslation.cpp:2314
- msgid ""
-@@ -14330,7 +14323,7 @@
- msgid ""
- "_: italyprovince.kgm\n"
- "The capital of Terni is..."
--msgstr "特爾尼（Terni）的首都是..."
-+msgstr "特爾尼（Terni）的首都是…"
- 
- #: mapsdatatranslation.cpp:2319
- msgid ""
-@@ -14355,7 +14348,7 @@
- msgid ""
- "_: italyprovince.kgm\n"
- "The capital of Ancona is..."
--msgstr "安科納（Ancona）的首都是..."
-+msgstr "安科納（Ancona）的首都是…"
- 
- #: mapsdatatranslation.cpp:2324
- msgid ""
-@@ -14380,7 +14373,7 @@
- msgid ""
- "_: italyprovince.kgm\n"
- "The capital of Ascoli Piceno is..."
--msgstr "阿斯科利皮切諾（Ascoli Piceno）的首都是..."
-+msgstr "阿斯科利皮切諾（Ascoli Piceno）的首都是…"
- 
- #: mapsdatatranslation.cpp:2329
- msgid ""
-@@ -14405,7 +14398,7 @@
- msgid ""
- "_: italyprovince.kgm\n"
- "The capital of Macerata is..."
--msgstr "馬塞拉塔（Macerata）的首都是..."
-+msgstr "馬塞拉塔（Macerata）的首都是…"
- 
- #: mapsdatatranslation.cpp:2334
- msgid ""
-@@ -14430,7 +14423,7 @@
- msgid ""
- "_: italyprovince.kgm\n"
- "The capital of Pesaro and Urbino is..."
--msgstr "佩薩洛和烏爾比諾（Pesaro and Urbino）的首都是..."
-+msgstr "佩薩洛和烏爾比諾（Pesaro and Urbino）的首都是…"
- 
- #: mapsdatatranslation.cpp:2339
- msgid ""
-@@ -14461,7 +14454,7 @@
- msgid ""
- "_: italyprovince.kgm\n"
- "The capital of Frosinone is..."
--msgstr "佛羅西諾內（Frosinone）的首都是..."
-+msgstr "佛羅西諾內（Frosinone）的首都是…"
- 
- #: mapsdatatranslation.cpp:2344
- msgid ""
-@@ -14486,7 +14479,7 @@
- msgid ""
- "_: italyprovince.kgm\n"
- "The capital of Latina is..."
--msgstr "拉丁納（Latina）的首都是..."
-+msgstr "拉丁納（Latina）的首都是…"
- 
- #: mapsdatatranslation.cpp:2349
- msgid ""
-@@ -14511,7 +14504,7 @@
- msgid ""
- "_: italyprovince.kgm\n"
- "The capital of Rieti is..."
--msgstr "列蒂（Rieti）的首都是..."
-+msgstr "列蒂（Rieti）的首都是…"
- 
- #: mapsdatatranslation.cpp:2354
- msgid ""
-@@ -14536,7 +14529,7 @@
- msgid ""
- "_: italyprovince.kgm\n"
- "The capital of Rome is..."
--msgstr "羅馬（Rome）的首都是..."
-+msgstr "羅馬（Rome）的首都是…"
- 
- #: mapsdatatranslation.cpp:2359
- msgid ""
-@@ -14561,7 +14554,7 @@
- msgid ""
- "_: italyprovince.kgm\n"
- "The capital of Viterbo is..."
--msgstr "維特爾博（Viterbo）的首都是..."
-+msgstr "維特爾博（Viterbo）的首都是…"
- 
- #: mapsdatatranslation.cpp:2364
- msgid ""
-@@ -14586,7 +14579,7 @@
- msgid ""
- "_: italyprovince.kgm\n"
- "The capital of Chieti is..."
--msgstr "奇耶蒂（Chieti）的首都是..."
-+msgstr "奇耶蒂（Chieti）的首都是…"
- 
- #: mapsdatatranslation.cpp:2369
- msgid ""
-@@ -14611,7 +14604,7 @@
- msgid ""
- "_: italyprovince.kgm\n"
- "The capital of L'Aquila is..."
--msgstr "阿奎拉（L'Aquila）的首都是..."
-+msgstr "阿奎拉（L'Aquila）的首都是…"
- 
- #: mapsdatatranslation.cpp:2374
- msgid ""
-@@ -14636,7 +14629,7 @@
- msgid ""
- "_: italyprovince.kgm\n"
- "The capital of Pescara is..."
--msgstr "佩斯卡拉（Pescara）的首都是..."
-+msgstr "佩斯卡拉（Pescara）的首都是…"
- 
- #: mapsdatatranslation.cpp:2379
- msgid ""
-@@ -14661,7 +14654,7 @@
- msgid ""
- "_: italyprovince.kgm\n"
- "The capital of Teramo is..."
--msgstr "泰拉莫（Teramo）的首都是..."
-+msgstr "泰拉莫（Teramo）的首都是…"
- 
- #: mapsdatatranslation.cpp:2384
- msgid ""
-@@ -14686,7 +14679,7 @@
- msgid ""
- "_: italyprovince.kgm\n"
- "The capital of Campobasso is..."
--msgstr "坎波巴索（Campobasso）的首都是..."
-+msgstr "坎波巴索（Campobasso）的首都是…"
- 
- #: mapsdatatranslation.cpp:2389
- msgid ""
-@@ -14711,7 +14704,7 @@
- msgid ""
- "_: italyprovince.kgm\n"
- "The capital of Isernia is..."
--msgstr "伊塞尼亞（Isernia）的首都是..."
-+msgstr "伊塞尼亞（Isernia）的首都是…"
- 
- #: mapsdatatranslation.cpp:2394
- msgid ""
-@@ -14736,7 +14729,7 @@
- msgid ""
- "_: italyprovince.kgm\n"
- "The capital of Avellino is..."
--msgstr "阿韋利諾（Avellino）的首都是..."
-+msgstr "阿韋利諾（Avellino）的首都是…"
- 
- #: mapsdatatranslation.cpp:2399
- msgid ""
-@@ -14761,7 +14754,7 @@
- msgid ""
- "_: italyprovince.kgm\n"
- "The capital of Benevento is..."
--msgstr "班尼凡托（Benevento）的首都是..."
-+msgstr "班尼凡托（Benevento）的首都是…"
- 
- #: mapsdatatranslation.cpp:2404
- msgid ""
-@@ -14786,7 +14779,7 @@
- msgid ""
- "_: italyprovince.kgm\n"
- "The capital of Caserta is..."
--msgstr "卡塞塔（Caserta）的首都是..."
-+msgstr "卡塞塔（Caserta）的首都是…"
- 
- #: mapsdatatranslation.cpp:2409
- msgid ""
-@@ -14811,7 +14804,7 @@
- msgid ""
- "_: italyprovince.kgm\n"
- "The capital of Naples is..."
--msgstr "那不勒斯（Naples）的首都是..."
-+msgstr "那不勒斯（Naples）的首都是…"
- 
- #: mapsdatatranslation.cpp:2414
- msgid ""
-@@ -14836,7 +14829,7 @@
- msgid ""
- "_: italyprovince.kgm\n"
- "The capital of Salerno is..."
--msgstr "薩勒諾（Salerno）的首都是..."
-+msgstr "薩勒諾（Salerno）的首都是…"
- 
- #: mapsdatatranslation.cpp:2419
- msgid ""
-@@ -14861,7 +14854,7 @@
- msgid ""
- "_: italyprovince.kgm\n"
- "The capital of Bari is..."
--msgstr "巴里（Bari）的首都是..."
-+msgstr "巴里（Bari）的首都是…"
- 
- #: mapsdatatranslation.cpp:2424
- msgid ""
-@@ -14886,7 +14879,7 @@
- msgid ""
- "_: italyprovince.kgm\n"
- "The capital of Brindisi is..."
--msgstr "布林迪西（Brindisi）的首都是..."
-+msgstr "布林迪西（Brindisi）的首都是…"
- 
- #: mapsdatatranslation.cpp:2429
- msgid ""
-@@ -14911,7 +14904,7 @@
- msgid ""
- "_: italyprovince.kgm\n"
- "The capital of Foggia is..."
--msgstr "福賈（Foggia）的首都是..."
-+msgstr "福賈（Foggia）的首都是…"
- 
- #: mapsdatatranslation.cpp:2434
- msgid ""
-@@ -14936,7 +14929,7 @@
- msgid ""
- "_: italyprovince.kgm\n"
- "The capital of Lecce is..."
--msgstr "萊切（Lecce）的首都是..."
-+msgstr "萊切（Lecce）的首都是…"
- 
- #: mapsdatatranslation.cpp:2439
- msgid ""
-@@ -14961,7 +14954,7 @@
- msgid ""
- "_: italyprovince.kgm\n"
- "The capital of Taranto is..."
--msgstr "塔蘭托（Taranto）的首都是..."
-+msgstr "塔蘭托（Taranto）的首都是…"
- 
- #: mapsdatatranslation.cpp:2444
- msgid ""
-@@ -14986,7 +14979,7 @@
- msgid ""
- "_: italyprovince.kgm\n"
- "The capital of Matera is..."
--msgstr "梅特拉（Matera）的首都是..."
-+msgstr "梅特拉（Matera）的首都是…"
- 
- #: mapsdatatranslation.cpp:2449
- msgid ""
-@@ -15011,7 +15004,7 @@
- msgid ""
- "_: italyprovince.kgm\n"
- "The capital of Potenza is..."
--msgstr "波坦察（Potenza）的首都是..."
-+msgstr "波坦察（Potenza）的首都是…"
- 
- #: mapsdatatranslation.cpp:2454
- msgid ""
-@@ -15036,7 +15029,7 @@
- msgid ""
- "_: italyprovince.kgm\n"
- "The capital of Catanzaro is..."
--msgstr "卡坦扎羅（Catanzaro）的首都是..."
-+msgstr "卡坦扎羅（Catanzaro）的首都是…"
- 
- #: mapsdatatranslation.cpp:2459
- msgid ""
-@@ -15061,7 +15054,7 @@
- msgid ""
- "_: italyprovince.kgm\n"
- "The capital of Cosenza is..."
--msgstr "科森札（Cosenza）的首都是..."
-+msgstr "科森札（Cosenza）的首都是…"
- 
- #: mapsdatatranslation.cpp:2464
- msgid ""
-@@ -15086,7 +15079,7 @@
- msgid ""
- "_: italyprovince.kgm\n"
- "The capital of Crotone is..."
--msgstr "克羅托內（Crotone）的首都是..."
-+msgstr "克羅托內（Crotone）的首都是…"
- 
- #: mapsdatatranslation.cpp:2469
- msgid ""
-@@ -15111,7 +15104,7 @@
- msgid ""
- "_: italyprovince.kgm\n"
- "The capital of Reggio di Calabria is..."
--msgstr "勒佐卡拉布里亞（Reggio di Calabria）的首都是..."
-+msgstr "勒佐卡拉布里亞（Reggio di Calabria）的首都是…"
- 
- #: mapsdatatranslation.cpp:2474
- msgid ""
-@@ -15136,7 +15129,7 @@
- msgid ""
- "_: italyprovince.kgm\n"
- "The capital of Vibo Valentia is..."
--msgstr "維伯瓦倫蒂亞（Vibo Valentia）的首都是..."
-+msgstr "維伯瓦倫蒂亞（Vibo Valentia）的首都是…"
- 
- #: mapsdatatranslation.cpp:2479
- msgid ""
-@@ -15161,7 +15154,7 @@
- msgid ""
- "_: italyprovince.kgm\n"
- "The capital of Agrigento is..."
--msgstr "阿格里琴托（Agrigento）的首都是..."
-+msgstr "阿格里琴托（Agrigento）的首都是…"
- 
- #: mapsdatatranslation.cpp:2484
- msgid ""
-@@ -15186,7 +15179,7 @@
- msgid ""
- "_: italyprovince.kgm\n"
- "The capital of Caltanissetta is..."
--msgstr "卡爾塔尼塞塔（Caltanissetta）的首都是..."
-+msgstr "卡爾塔尼塞塔（Caltanissetta）的首都是…"
- 
- #: mapsdatatranslation.cpp:2489
- msgid ""
-@@ -15211,7 +15204,7 @@
- msgid ""
- "_: italyprovince.kgm\n"
- "The capital of Catania is..."
--msgstr "卡塔尼亞（Catania）的首都是..."
-+msgstr "卡塔尼亞（Catania）的首都是…"
- 
- #: mapsdatatranslation.cpp:2494
- msgid ""
-@@ -15236,7 +15229,7 @@
- msgid ""
- "_: italyprovince.kgm\n"
- "The capital of Enna is..."
--msgstr "恩納（Enna）的首都是..."
-+msgstr "恩納（Enna）的首都是…"
- 
- #: mapsdatatranslation.cpp:2499
- msgid ""
-@@ -15261,7 +15254,7 @@
- msgid ""
- "_: italyprovince.kgm\n"
- "The capital of Messina is..."
--msgstr "墨西拿（Messina）的首都是..."
-+msgstr "墨西拿（Messina）的首都是…"
- 
- #: mapsdatatranslation.cpp:2504
- msgid ""
-@@ -15286,7 +15279,7 @@
- msgid ""
- "_: italyprovince.kgm\n"
- "The capital of Palermo is..."
--msgstr "巴勒莫（Palermo）的首都是..."
-+msgstr "巴勒莫（Palermo）的首都是…"
- 
- #: mapsdatatranslation.cpp:2509
- msgid ""
-@@ -15311,7 +15304,7 @@
- msgid ""
- "_: italyprovince.kgm\n"
- "The capital of Ragusa is..."
--msgstr "拉古薩（Ragusa）的首都是..."
-+msgstr "拉古薩（Ragusa）的首都是…"
- 
- #: mapsdatatranslation.cpp:2514
- msgid ""
-@@ -15336,7 +15329,7 @@
- msgid ""
- "_: italyprovince.kgm\n"
- "The capital of Syracuse is..."
--msgstr "敘拉古（Syracuse）的首都是..."
-+msgstr "敘拉古（Syracuse）的首都是…"
- 
- #: mapsdatatranslation.cpp:2519
- msgid ""
-@@ -15361,7 +15354,7 @@
- msgid ""
- "_: italyprovince.kgm\n"
- "The capital of Trapani is..."
--msgstr "特拉帕尼（Trapani）的首都是..."
-+msgstr "特拉帕尼（Trapani）的首都是…"
- 
- #: mapsdatatranslation.cpp:2524
- msgid ""
-@@ -15386,7 +15379,7 @@
- msgid ""
- "_: italyprovince.kgm\n"
- "The capital of Cagliari is..."
--msgstr "卡利亞里（Cagliari）的首都是..."
-+msgstr "卡利亞里（Cagliari）的首都是…"
- 
- #: mapsdatatranslation.cpp:2529
- msgid ""
-@@ -15411,7 +15404,7 @@
- msgid ""
- "_: italyprovince.kgm\n"
- "The capital of Nuoro is..."
--msgstr "努奧羅（Nuoro）的首都是..."
-+msgstr "努奧羅（Nuoro）的首都是…"
- 
- #: mapsdatatranslation.cpp:2534
- msgid ""
-@@ -15436,7 +15429,7 @@
- msgid ""
- "_: italyprovince.kgm\n"
- "The capital of Oristano is..."
--msgstr "奧里斯塔諾（Oristano）的首都是..."
-+msgstr "奧里斯塔諾（Oristano）的首都是…"
- 
- #: mapsdatatranslation.cpp:2539
- msgid ""
-@@ -15461,7 +15454,7 @@
- msgid ""
- "_: italyprovince.kgm\n"
- "The capital of Sassari is..."
--msgstr "薩薩里（Sassari）的首都是..."
-+msgstr "薩薩里（Sassari）的首都是…"
- 
- #: mapsdatatranslation.cpp:2544
- msgid ""
-@@ -15485,8 +15478,7 @@
- #: mapsdatatranslation.cpp:2548
- msgid ""
- "_: ncamerica.kgm\n"
--"<qt>Current map:"
--"<br><b>North and Central America</b></qt>"
-+"<qt>Current map:<br><b>North and Central America</b></qt>"
- msgstr "<qt>目前地圖：<br><b>北美與中美洲</b></qt>"
- 
- #: mapsdatatranslation.cpp:2549
-@@ -15517,7 +15509,7 @@
- msgid ""
- "_: ncamerica.kgm\n"
- "The capital of Canada is..."
--msgstr "加拿大（Canada）的首都是..."
-+msgstr "加拿大（Canada）的首都是…"
- 
- #: mapsdatatranslation.cpp:2554
- msgid ""
-@@ -15530,7 +15522,7 @@
- msgid ""
- "_: ncamerica.kgm\n"
- "The flag of Canada is..."
--msgstr "加拿大（Canada）的國旗是..."
-+msgstr "加拿大（Canada）的國旗是…"
- 
- #: mapsdatatranslation.cpp:2556
- msgid ""
-@@ -15554,7 +15546,7 @@
- msgid ""
- "_: ncamerica.kgm\n"
- "The capital of El Salvador is..."
--msgstr "薩爾瓦多（El Salvador）的首都是..."
-+msgstr "薩爾瓦多（El Salvador）的首都是…"
- 
- #: mapsdatatranslation.cpp:2560
- msgid ""
-@@ -15567,7 +15559,7 @@
- msgid ""
- "_: ncamerica.kgm\n"
- "The flag of El Salvador is..."
--msgstr "薩爾瓦多（El Salvador）的國旗是..."
-+msgstr "薩爾瓦多（El Salvador）的國旗是…"
- 
- #: mapsdatatranslation.cpp:2562
- msgid ""
-@@ -15591,7 +15583,7 @@
- msgid ""
- "_: ncamerica.kgm\n"
- "The capital of The United States of America is..."
--msgstr "美利堅合眾國（The United States of America）的首都是..."
-+msgstr "美利堅合眾國（The United States of America）的首都是…"
- 
- #: mapsdatatranslation.cpp:2566
- msgid ""
-@@ -15604,7 +15596,7 @@
- msgid ""
- "_: ncamerica.kgm\n"
- "The flag of The United States of America is..."
--msgstr "美利堅合眾國（The United States of America）的國旗是..."
-+msgstr "美利堅合眾國（The United States of America）的國旗是…"
- 
- #: mapsdatatranslation.cpp:2568
- msgid ""
-@@ -15628,7 +15620,7 @@
- msgid ""
- "_: ncamerica.kgm\n"
- "The capital of The Bahamas is..."
--msgstr "巴哈馬（The Bahamas）的首都是..."
-+msgstr "巴哈馬（The Bahamas）的首都是…"
- 
- #: mapsdatatranslation.cpp:2572
- msgid ""
-@@ -15641,7 +15633,7 @@
- msgid ""
- "_: ncamerica.kgm\n"
- "The flag of The Bahamas is..."
--msgstr "巴哈馬（The Bahamas）的國旗是..."
-+msgstr "巴哈馬（The Bahamas）的國旗是…"
- 
- #: mapsdatatranslation.cpp:2574
- msgid ""
-@@ -15665,7 +15657,7 @@
- msgid ""
- "_: ncamerica.kgm\n"
- "The capital of The Dominican Republic is..."
--msgstr "多明尼加（The Dominican Republic）的首都是..."
-+msgstr "多明尼加（The Dominican Republic）的首都是…"
- 
- #: mapsdatatranslation.cpp:2578
- msgid ""
-@@ -15678,7 +15670,7 @@
- msgid ""
- "_: ncamerica.kgm\n"
- "The flag of The Dominican Republic is..."
--msgstr "多明尼加（The Dominican Republic）的國旗是..."
-+msgstr "多明尼加（The Dominican Republic）的國旗是…"
- 
- #: mapsdatatranslation.cpp:2580
- msgid ""
-@@ -15702,7 +15694,7 @@
- msgid ""
- "_: ncamerica.kgm\n"
- "The capital of Haiti is..."
--msgstr "海地（Haiti）的首都是..."
-+msgstr "海地（Haiti）的首都是…"
- 
- #: mapsdatatranslation.cpp:2584
- msgid ""
-@@ -15715,7 +15707,7 @@
- msgid ""
- "_: ncamerica.kgm\n"
- "The flag of Haiti is..."
--msgstr "海地（Haiti）的國旗是..."
-+msgstr "海地（Haiti）的國旗是…"
- 
- #: mapsdatatranslation.cpp:2586
- msgid ""
-@@ -15739,7 +15731,7 @@
- msgid ""
- "_: ncamerica.kgm\n"
- "The capital of Cuba is..."
--msgstr "古巴（Cuba）的首都是..."
-+msgstr "古巴（Cuba）的首都是…"
- 
- #: mapsdatatranslation.cpp:2590
- msgid ""
-@@ -15752,7 +15744,7 @@
- msgid ""
- "_: ncamerica.kgm\n"
- "The flag of Cuba is..."
--msgstr "古巴（Cuba）的國旗是..."
-+msgstr "古巴（Cuba）的國旗是…"
- 
- #: mapsdatatranslation.cpp:2592
- msgid ""
-@@ -15776,7 +15768,7 @@
- msgid ""
- "_: ncamerica.kgm\n"
- "The capital of Jamaica is..."
--msgstr "牙買加（Jamaica）的首都是..."
-+msgstr "牙買加（Jamaica）的首都是…"
- 
- #: mapsdatatranslation.cpp:2596
- msgid ""
-@@ -15789,7 +15781,7 @@
- msgid ""
- "_: ncamerica.kgm\n"
- "The flag of Jamaica is..."
--msgstr "牙買加（Jamaica）的國旗是..."
-+msgstr "牙買加（Jamaica）的國旗是…"
- 
- #: mapsdatatranslation.cpp:2598
- msgid ""
-@@ -15813,7 +15805,7 @@
- msgid ""
- "_: ncamerica.kgm\n"
- "The capital of Dominica is..."
--msgstr "多米尼克（Dominica）的首都是..."
-+msgstr "多米尼克（Dominica）的首都是…"
- 
- #: mapsdatatranslation.cpp:2602
- msgid ""
-@@ -15826,7 +15818,7 @@
- msgid ""
- "_: ncamerica.kgm\n"
- "The flag of Dominica is..."
--msgstr "多米尼克（Dominica）的國旗是..."
-+msgstr "多米尼克（Dominica）的國旗是…"
- 
- #: mapsdatatranslation.cpp:2604
- msgid ""
-@@ -15850,7 +15842,7 @@
- msgid ""
- "_: ncamerica.kgm\n"
- "The capital of Antigua and Barbuda is..."
--msgstr "安地卡（Antigua and Barbuda）的首都是..."
-+msgstr "安地卡（Antigua and Barbuda）的首都是…"
- 
- #: mapsdatatranslation.cpp:2608
- msgid ""
-@@ -15863,7 +15855,7 @@
- msgid ""
- "_: ncamerica.kgm\n"
- "The flag of Antigua and Barbuda is..."
--msgstr "安地卡（Antigua and Barbuda）的國旗是..."
-+msgstr "安地卡（Antigua and Barbuda）的國旗是…"
- 
- #: mapsdatatranslation.cpp:2610
- msgid ""
-@@ -15887,7 +15879,7 @@
- msgid ""
- "_: ncamerica.kgm\n"
- "The capital of Barbados is..."
--msgstr "巴貝多（Barbados）的首都是..."
-+msgstr "巴貝多（Barbados）的首都是…"
- 
- #: mapsdatatranslation.cpp:2614
- msgid ""
-@@ -15900,7 +15892,7 @@
- msgid ""
- "_: ncamerica.kgm\n"
- "The flag of Barbados is..."
--msgstr "巴貝多（Barbados）的國旗是..."
-+msgstr "巴貝多（Barbados）的國旗是…"
- 
- #: mapsdatatranslation.cpp:2616
- msgid ""
-@@ -15924,7 +15916,7 @@
- msgid ""
- "_: ncamerica.kgm\n"
- "The capital of Trinidad and Tobago is..."
--msgstr "千里達（Trinidad and Tobago）的首都是..."
-+msgstr "千里達（Trinidad and Tobago）的首都是…"
- 
- #: mapsdatatranslation.cpp:2620
- msgid ""
-@@ -15937,7 +15929,7 @@
- msgid ""
- "_: ncamerica.kgm\n"
- "The flag of Trinidad and Tobago is..."
--msgstr "千里達（Trinidad and Tobago）的國旗是..."
-+msgstr "千里達（Trinidad and Tobago）的國旗是…"
- 
- #: mapsdatatranslation.cpp:2622
- msgid ""
-@@ -15961,7 +15953,7 @@
- msgid ""
- "_: ncamerica.kgm\n"
- "The capital of Mexico is..."
--msgstr "墨西哥（Mexico）的首都是..."
-+msgstr "墨西哥（Mexico）的首都是…"
- 
- #: mapsdatatranslation.cpp:2626
- msgid ""
-@@ -15974,7 +15966,7 @@
- msgid ""
- "_: ncamerica.kgm\n"
- "The flag of Mexico is..."
--msgstr "墨西哥（Mexico）的國旗是..."
-+msgstr "墨西哥（Mexico）的國旗是…"
- 
- #: mapsdatatranslation.cpp:2628
- msgid ""
-@@ -15998,7 +15990,7 @@
- msgid ""
- "_: ncamerica.kgm\n"
- "The capital of Guatemala is..."
--msgstr "瓜地馬拉（Guatemala）的首都是..."
-+msgstr "瓜地馬拉（Guatemala）的首都是…"
- 
- #: mapsdatatranslation.cpp:2632
- msgid ""
-@@ -16011,7 +16003,7 @@
- msgid ""
- "_: ncamerica.kgm\n"
- "The flag of Guatemala is..."
--msgstr "瓜地馬拉（Guatemala）的國旗是..."
-+msgstr "瓜地馬拉（Guatemala）的國旗是…"
- 
- #: mapsdatatranslation.cpp:2634
- msgid ""
-@@ -16035,7 +16027,7 @@
- msgid ""
- "_: ncamerica.kgm\n"
- "The capital of Belize is..."
--msgstr "貝里斯（Belize）的首都是..."
-+msgstr "貝里斯（Belize）的首都是…"
- 
- #: mapsdatatranslation.cpp:2638
- msgid ""
-@@ -16048,7 +16040,7 @@
- msgid ""
- "_: ncamerica.kgm\n"
- "The flag of Belize is..."
--msgstr "貝里斯（Belize）的國旗是..."
-+msgstr "貝里斯（Belize）的國旗是…"
- 
- #: mapsdatatranslation.cpp:2640
- msgid ""
-@@ -16072,7 +16064,7 @@
- msgid ""
- "_: ncamerica.kgm\n"
- "The capital of Honduras is..."
--msgstr "宏都拉斯（Honduras）的首都是..."
-+msgstr "宏都拉斯（Honduras）的首都是…"
- 
- #: mapsdatatranslation.cpp:2644
- msgid ""
-@@ -16085,7 +16077,7 @@
- msgid ""
- "_: ncamerica.kgm\n"
- "The flag of Honduras is..."
--msgstr "宏都拉斯（Honduras）的國旗是..."
-+msgstr "宏都拉斯（Honduras）的國旗是…"
- 
- #: mapsdatatranslation.cpp:2646
- msgid ""
-@@ -16109,7 +16101,7 @@
- msgid ""
- "_: ncamerica.kgm\n"
- "The capital of Nicaragua is..."
--msgstr "尼加拉瓜（Nicaragua）的首都是..."
-+msgstr "尼加拉瓜（Nicaragua）的首都是…"
- 
- #: mapsdatatranslation.cpp:2650
- msgid ""
-@@ -16122,7 +16114,7 @@
- msgid ""
- "_: ncamerica.kgm\n"
- "The flag of Nicaragua is..."
--msgstr "尼加拉瓜（Nicaragua）的國旗是..."
-+msgstr "尼加拉瓜（Nicaragua）的國旗是…"
- 
- #: mapsdatatranslation.cpp:2652
- msgid ""
-@@ -16146,7 +16138,7 @@
- msgid ""
- "_: ncamerica.kgm\n"
- "The capital of Costa Rica is..."
--msgstr "哥斯大黎加（Costa Rica）的首都是..."
-+msgstr "哥斯大黎加（Costa Rica）的首都是…"
- 
- #: mapsdatatranslation.cpp:2656
- msgid ""
-@@ -16159,7 +16151,7 @@
- msgid ""
- "_: ncamerica.kgm\n"
- "The flag of Costa Rica is..."
--msgstr "哥斯大黎加（Costa Rica）的國旗是..."
-+msgstr "哥斯大黎加（Costa Rica）的國旗是…"
- 
- #: mapsdatatranslation.cpp:2658
- msgid ""
-@@ -16183,7 +16175,7 @@
- msgid ""
- "_: ncamerica.kgm\n"
- "The capital of Panama is..."
--msgstr "巴拿馬（Panama）的首都是..."
-+msgstr "巴拿馬（Panama）的首都是…"
- 
- #: mapsdatatranslation.cpp:2662
- msgid ""
-@@ -16196,7 +16188,7 @@
- msgid ""
- "_: ncamerica.kgm\n"
- "The flag of Panama is..."
--msgstr "巴拿馬（Panama）的國旗是..."
-+msgstr "巴拿馬（Panama）的國旗是…"
- 
- #: mapsdatatranslation.cpp:2664
- msgid ""
-@@ -16243,8 +16235,7 @@
- #: mapsdatatranslation.cpp:2671
- msgid ""
- "_: netherlands.kgm\n"
--"<qt>Current map:"
--"<br><b>The Netherlands</b></qt>"
-+"<qt>Current map:<br><b>The Netherlands</b></qt>"
- msgstr "<qt>目前地圖：<br><b>荷蘭</b></qt>"
- 
- #: mapsdatatranslation.cpp:2672
-@@ -16275,7 +16266,7 @@
- msgid ""
- "_: netherlands.kgm\n"
- "The capital of Friesland is..."
--msgstr "弗裡斯蘭（Friesland）的首都是..."
-+msgstr "弗裡斯蘭（Friesland）的首都是…"
- 
- #: mapsdatatranslation.cpp:2677
- msgid ""
-@@ -16306,7 +16297,7 @@
- msgid ""
- "_: netherlands.kgm\n"
- "The capital of Groningen is..."
--msgstr "格羅寧根（Groningen）的首都是..."
-+msgstr "格羅寧根（Groningen）的首都是…"
- 
- #: mapsdatatranslation.cpp:2682
- msgid ""
-@@ -16331,7 +16322,7 @@
- msgid ""
- "_: netherlands.kgm\n"
- "The capital of Drenthe is..."
--msgstr "德倫特（Drenthe）的首都是..."
-+msgstr "德倫特（Drenthe）的首都是…"
- 
- #: mapsdatatranslation.cpp:2687
- msgid ""
-@@ -16362,7 +16353,7 @@
- msgid ""
- "_: netherlands.kgm\n"
- "The capital of Overijssel is..."
--msgstr "上艾瑟爾（Overijssel）的首都是..."
-+msgstr "上艾瑟爾（Overijssel）的首都是…"
- 
- #: mapsdatatranslation.cpp:2692
- msgid ""
-@@ -16393,7 +16384,7 @@
- msgid ""
- "_: netherlands.kgm\n"
- "The capital of Gelderland is..."
--msgstr "海爾德蘭（Gelderland）的首都是..."
-+msgstr "海爾德蘭（Gelderland）的首都是…"
- 
- #: mapsdatatranslation.cpp:2697
- msgid ""
-@@ -16424,7 +16415,7 @@
- msgid ""
- "_: netherlands.kgm\n"
- "The capital of North Brabant is..."
--msgstr "北布拉班特（North Brabant）的首都是..."
-+msgstr "北布拉班特（North Brabant）的首都是…"
- 
- #: mapsdatatranslation.cpp:2702
- msgid ""
-@@ -16455,7 +16446,7 @@
- msgid ""
- "_: netherlands.kgm\n"
- "The capital of Limburg is..."
--msgstr "林堡（Limburg）的首都是..."
-+msgstr "林堡（Limburg）的首都是…"
- 
- #: mapsdatatranslation.cpp:2707
- msgid ""
-@@ -16486,7 +16477,7 @@
- msgid ""
- "_: netherlands.kgm\n"
- "The capital of Flevoland is..."
--msgstr "弗萊福蘭（Flevoland）的首都是..."
-+msgstr "弗萊福蘭（Flevoland）的首都是…"
- 
- #: mapsdatatranslation.cpp:2712
- msgid ""
-@@ -16517,7 +16508,7 @@
- msgid ""
- "_: netherlands.kgm\n"
- "The capital of Utrecht is..."
--msgstr "烏德勒支（Utrecht）的首都是..."
-+msgstr "烏德勒支（Utrecht）的首都是…"
- 
- #: mapsdatatranslation.cpp:2717
- msgid ""
-@@ -16542,7 +16533,7 @@
- msgid ""
- "_: netherlands.kgm\n"
- "The capital of Zeeland is..."
--msgstr "澤蘭（Zeeland）的首都是..."
-+msgstr "澤蘭（Zeeland）的首都是…"
- 
- #: mapsdatatranslation.cpp:2722
- msgid ""
-@@ -16573,7 +16564,7 @@
- msgid ""
- "_: netherlands.kgm\n"
- "The capital of North Holland is..."
--msgstr "北荷蘭（North Holland）的首都是..."
-+msgstr "北荷蘭（North Holland）的首都是…"
- 
- #: mapsdatatranslation.cpp:2727
- msgid ""
-@@ -16604,7 +16595,7 @@
- msgid ""
- "_: netherlands.kgm\n"
- "The capital of South Holland is..."
--msgstr "南荷蘭（South Holland）的首都是..."
-+msgstr "南荷蘭（South Holland）的首都是…"
- 
- #: mapsdatatranslation.cpp:2732
- msgid ""
-@@ -16634,8 +16625,7 @@
- #: mapsdatatranslation.cpp:2736
- msgid ""
- "_: norway.kgm\n"
--"<qt>Current map:"
--"<br><b>Norway</b></qt>"
-+"<qt>Current map:<br><b>Norway</b></qt>"
- msgstr "<qt>目前地圖：<br><b>挪威</b></qt>"
- 
- #: mapsdatatranslation.cpp:2737
-@@ -16660,7 +16650,7 @@
- msgid ""
- "_: norway.kgm\n"
- "The capital of Finnmark is..."
--msgstr "芬馬克（Finnmark）的首都是..."
-+msgstr "芬馬克（Finnmark）的首都是…"
- 
- #: mapsdatatranslation.cpp:2741
- msgid ""
-@@ -16691,7 +16681,7 @@
- msgid ""
- "_: norway.kgm\n"
- "The capital of Troms is..."
--msgstr "特羅姆斯（Troms）的首都是..."
-+msgstr "特羅姆斯（Troms）的首都是…"
- 
- #: mapsdatatranslation.cpp:2746
- msgid ""
-@@ -16722,7 +16712,7 @@
- msgid ""
- "_: norway.kgm\n"
- "The capital of Nordland is..."
--msgstr "諾爾蘭（Nordland）的首都是..."
-+msgstr "諾爾蘭（Nordland）的首都是…"
- 
- #: mapsdatatranslation.cpp:2751
- msgid ""
-@@ -16753,7 +16743,7 @@
- msgid ""
- "_: norway.kgm\n"
- "The capital of Nord-Trøndelag is..."
--msgstr "北特倫德拉格（Nord-Trøndelag）的首都是..."
-+msgstr "北特倫德拉格（Nord-Trøndelag）的首都是…"
- 
- #: mapsdatatranslation.cpp:2756
- msgid ""
-@@ -16784,7 +16774,7 @@
- msgid ""
- "_: norway.kgm\n"
- "The capital of Sør-Trøndelag is..."
--msgstr "南特倫德拉格（Sør-Trøndelag）的首都是..."
-+msgstr "南特倫德拉格（Sør-Trøndelag）的首都是…"
- 
- #: mapsdatatranslation.cpp:2761
- msgid ""
-@@ -16815,7 +16805,7 @@
- msgid ""
- "_: norway.kgm\n"
- "The capital of Møre Og Romsdal is..."
--msgstr "默勒魯姆斯達爾（Møre Og Romsdal）的首都是..."
-+msgstr "默勒魯姆斯達爾（Møre Og Romsdal）的首都是…"
- 
- #: mapsdatatranslation.cpp:2766
- msgid ""
-@@ -16846,7 +16836,7 @@
- msgid ""
- "_: norway.kgm\n"
- "The capital of Oppland is..."
--msgstr "奧普蘭（Oppland）的首都是..."
-+msgstr "奧普蘭（Oppland）的首都是…"
- 
- #: mapsdatatranslation.cpp:2771
- msgid ""
-@@ -16877,7 +16867,7 @@
- msgid ""
- "_: norway.kgm\n"
- "The capital of Hedmark is..."
--msgstr "海德馬克（Hedmark）的首都是..."
-+msgstr "海德馬克（Hedmark）的首都是…"
- 
- #: mapsdatatranslation.cpp:2776
- msgid ""
-@@ -16908,7 +16898,7 @@
- msgid ""
- "_: norway.kgm\n"
- "The capital of Sogn Og Fjordane is..."
--msgstr "松恩.菲尤拉訥（Sogn Og Fjordane）的首都是..."
-+msgstr "松恩.菲尤拉訥（Sogn Og Fjordane）的首都是…"
- 
- #: mapsdatatranslation.cpp:2781
- msgid ""
-@@ -16939,7 +16929,7 @@
- msgid ""
- "_: norway.kgm\n"
- "The capital of Hordaland is..."
--msgstr "霍達蘭（Hordaland）的首都是..."
-+msgstr "霍達蘭（Hordaland）的首都是…"
- 
- #: mapsdatatranslation.cpp:2786
- msgid ""
-@@ -16970,7 +16960,7 @@
- msgid ""
- "_: norway.kgm\n"
- "The capital of Rogaland is..."
--msgstr "羅加蘭（Rogaland）的首都是..."
-+msgstr "羅加蘭（Rogaland）的首都是…"
- 
- #: mapsdatatranslation.cpp:2791
- msgid ""
-@@ -17001,7 +16991,7 @@
- msgid ""
- "_: norway.kgm\n"
- "The capital of Vest-Agder is..."
--msgstr "西阿格德爾（Vest-Agder）的首都是..."
-+msgstr "西阿格德爾（Vest-Agder）的首都是…"
- 
- #: mapsdatatranslation.cpp:2796
- msgid ""
-@@ -17032,7 +17022,7 @@
- msgid ""
- "_: norway.kgm\n"
- "The capital of Aust-Agder is..."
--msgstr "東阿格德爾（Aust-Agder）的首都是..."
-+msgstr "東阿格德爾（Aust-Agder）的首都是…"
- 
- #: mapsdatatranslation.cpp:2801
- msgid ""
-@@ -17063,7 +17053,7 @@
- msgid ""
- "_: norway.kgm\n"
- "The capital of Telemark is..."
--msgstr "泰勒馬克（Telemark）的首都是..."
-+msgstr "泰勒馬克（Telemark）的首都是…"
- 
- #: mapsdatatranslation.cpp:2806
- msgid ""
-@@ -17094,7 +17084,7 @@
- msgid ""
- "_: norway.kgm\n"
- "The capital of Buskerud is..."
--msgstr "布斯克呂（Buskerud）的首都是..."
-+msgstr "布斯克呂（Buskerud）的首都是…"
- 
- #: mapsdatatranslation.cpp:2811
- msgid ""
-@@ -17125,7 +17115,7 @@
- msgid ""
- "_: norway.kgm\n"
- "The capital of Vestfold is..."
--msgstr "西福爾（Vestfold）的首都是..."
-+msgstr "西福爾（Vestfold）的首都是…"
- 
- #: mapsdatatranslation.cpp:2816
- msgid ""
-@@ -17157,7 +17147,7 @@
- msgid ""
- "_: norway.kgm\n"
- "The capital of Oslo is..."
--msgstr "奧斯陸（Oslo）的首都是..."
-+msgstr "奧斯陸（Oslo）的首都是…"
- 
- #: mapsdatatranslation.cpp:2821
- msgid ""
-@@ -17182,7 +17172,7 @@
- msgid ""
- "_: norway.kgm\n"
- "The capital of Akershus is..."
--msgstr "阿克什胡斯（Akershus）的首都是..."
-+msgstr "阿克什胡斯（Akershus）的首都是…"
- 
- #: mapsdatatranslation.cpp:2826
- msgid ""
-@@ -17201,7 +17191,7 @@
- msgid ""
- "_: norway.kgm\n"
- "The capital of Østfold is..."
--msgstr "東福爾（Østfold）的首都是..."
-+msgstr "東福爾（Østfold）的首都是…"
- 
- #: mapsdatatranslation.cpp:2831
- msgid ""
-@@ -17231,8 +17221,7 @@
- #: mapsdatatranslation.cpp:2835
- msgid ""
- "_: poland.kgm\n"
--"<qt>Current map:"
--"<br><b>Poland</b></qt>"
-+"<qt>Current map:<br><b>Poland</b></qt>"
- msgstr "<qt>目前地圖：<br><b>波蘭</b></qt>"
- 
- #: mapsdatatranslation.cpp:2836
-@@ -17257,7 +17246,7 @@
- msgid ""
- "_: poland.kgm\n"
- "The capital of Masovia is..."
--msgstr "馬佐維亞（Masovia）的首都是..."
-+msgstr "馬佐維亞（Masovia）的首都是…"
- 
- #: mapsdatatranslation.cpp:2840
- msgid ""
-@@ -17288,7 +17277,7 @@
- msgid ""
- "_: poland.kgm\n"
- "The capital of Warmia and Masuria is..."
--msgstr "瓦爾米亞-馬祖爾（Warmia and Masuria）的首都是..."
-+msgstr "瓦爾米亞-馬祖爾（Warmia and Masuria）的首都是…"
- 
- #: mapsdatatranslation.cpp:2845
- msgid ""
-@@ -17319,7 +17308,7 @@
- msgid ""
- "_: poland.kgm\n"
- "The capital of Podlachia is..."
--msgstr "波德拉斯（Podlachia）的首都是..."
-+msgstr "波德拉斯（Podlachia）的首都是…"
- 
- #: mapsdatatranslation.cpp:2850
- msgid ""
-@@ -17350,7 +17339,7 @@
- msgid ""
- "_: poland.kgm\n"
- "The capital of Lublin is..."
--msgstr "盧布林（Lublin）的首都是..."
-+msgstr "盧布林（Lublin）的首都是…"
- 
- #: mapsdatatranslation.cpp:2855
- msgid ""
-@@ -17375,7 +17364,7 @@
- msgid ""
- "_: poland.kgm\n"
- "The capital of Subcarpathia is..."
--msgstr "喀爾巴阡山（Subcarpathia）的首都是..."
-+msgstr "喀爾巴阡山（Subcarpathia）的首都是…"
- 
- #: mapsdatatranslation.cpp:2860
- msgid ""
-@@ -17406,7 +17395,7 @@
- msgid ""
- "_: poland.kgm\n"
- "The capital of Świętokrzyskie is..."
--msgstr "聖十字（Świętokrzyskie）的首都是..."
-+msgstr "聖十字（Świętokrzyskie）的首都是…"
- 
- #: mapsdatatranslation.cpp:2865
- msgid ""
-@@ -17437,7 +17426,7 @@
- msgid ""
- "_: poland.kgm\n"
- "The capital of Lesser Poland is..."
--msgstr "小波蘭（Lesser Poland）的首都是..."
-+msgstr "小波蘭（Lesser Poland）的首都是…"
- 
- #: mapsdatatranslation.cpp:2870
- msgid ""
-@@ -17468,7 +17457,7 @@
- msgid ""
- "_: poland.kgm\n"
- "The capital of Łódź is..."
--msgstr "羅茲（Łódź）的首都是..."
-+msgstr "羅茲（Łódź）的首都是…"
- 
- #: mapsdatatranslation.cpp:2875
- msgid ""
-@@ -17493,7 +17482,7 @@
- msgid ""
- "_: poland.kgm\n"
- "The capital of Silesia is..."
--msgstr "西里西亞（Silesia）的首都是..."
-+msgstr "西里西亞（Silesia）的首都是…"
- 
- #: mapsdatatranslation.cpp:2880
- msgid ""
-@@ -17524,7 +17513,7 @@
- msgid ""
- "_: poland.kgm\n"
- "The capital of Opole is..."
--msgstr "奧波萊（Opole）的首都是..."
-+msgstr "奧波萊（Opole）的首都是…"
- 
- #: mapsdatatranslation.cpp:2885
- msgid ""
-@@ -17549,7 +17538,7 @@
- msgid ""
- "_: poland.kgm\n"
- "The capital of Pomerania is..."
--msgstr "濱海（Pomerania）的首都是..."
-+msgstr "濱海（Pomerania）的首都是…"
- 
- #: mapsdatatranslation.cpp:2890
- msgid ""
-@@ -17580,7 +17569,7 @@
- msgid ""
- "_: poland.kgm\n"
- "The capital of West Pomerania is..."
--msgstr "西濱海（West Pomerania）的首都是..."
-+msgstr "西濱海（West Pomerania）的首都是…"
- 
- #: mapsdatatranslation.cpp:2895
- msgid ""
-@@ -17611,7 +17600,7 @@
- msgid ""
- "_: poland.kgm\n"
- "The capital of Greater Poland is..."
--msgstr "大波蘭（Greater Poland）的首都是..."
-+msgstr "大波蘭（Greater Poland）的首都是…"
- 
- #: mapsdatatranslation.cpp:2900
- msgid ""
-@@ -17642,7 +17631,7 @@
- msgid ""
- "_: poland.kgm\n"
- "The capital of Lower Silesia is..."
--msgstr "下西里西亞（Lower Silesia）的首都是..."
-+msgstr "下西里西亞（Lower Silesia）的首都是…"
- 
- #: mapsdatatranslation.cpp:2905
- msgid ""
-@@ -17673,7 +17662,7 @@
- msgid ""
- "_: poland.kgm\n"
- "The capital of Lubusz is..."
--msgstr "魯布斯卡（Lubusz）的首都是..."
-+msgstr "魯布斯卡（Lubusz）的首都是…"
- 
- #: mapsdatatranslation.cpp:2910
- msgid ""
-@@ -17704,7 +17693,7 @@
- msgid ""
- "_: poland.kgm\n"
- "The capital of Kuyavia-Pomerania is..."
--msgstr "庫亞瓦濱海（Kuyavia-Pomerania）的首都是..."
-+msgstr "庫亞瓦濱海（Kuyavia-Pomerania）的首都是…"
- 
- #: mapsdatatranslation.cpp:2915
- msgid ""
-@@ -17734,8 +17723,7 @@
- #: mapsdatatranslation.cpp:2919
- msgid ""
- "_: southamerica.kgm\n"
--"<qt>Current map:"
--"<br><b>South America</b></qt>"
-+"<qt>Current map:<br><b>South America</b></qt>"
- msgstr "<qt>目前地圖：<br><b>南美洲</b></qt>"
- 
- #: mapsdatatranslation.cpp:2920
-@@ -17772,7 +17760,7 @@
- msgid ""
- "_: southamerica.kgm\n"
- "The capital of Colombia is..."
--msgstr "哥倫比亞（Colombia）的首都是..."
-+msgstr "哥倫比亞（Colombia）的首都是…"
- 
- #: mapsdatatranslation.cpp:2926
- msgid ""
-@@ -17785,7 +17773,7 @@
- msgid ""
- "_: southamerica.kgm\n"
- "The flag of Colombia is..."
--msgstr "哥倫比亞（Colombia）的國旗是..."
-+msgstr "哥倫比亞（Colombia）的國旗是…"
- 
- #: mapsdatatranslation.cpp:2928
- msgid ""
-@@ -17809,7 +17797,7 @@
- msgid ""
- "_: southamerica.kgm\n"
- "The capital of Venezuela is..."
--msgstr "委內瑞拉（Venezuela）的首都是..."
-+msgstr "委內瑞拉（Venezuela）的首都是…"
- 
- #: mapsdatatranslation.cpp:2932
- msgid ""
-@@ -17822,7 +17810,7 @@
- msgid ""
- "_: southamerica.kgm\n"
- "The flag of Venezuela is..."
--msgstr "委內瑞拉（Venezuela）的國旗是..."
-+msgstr "委內瑞拉（Venezuela）的國旗是…"
- 
- #: mapsdatatranslation.cpp:2934
- msgid ""
-@@ -17846,7 +17834,7 @@
- msgid ""
- "_: southamerica.kgm\n"
- "The capital of Guyana is..."
--msgstr "蓋亞那（Guyana）的首都是..."
-+msgstr "蓋亞那（Guyana）的首都是…"
- 
- #: mapsdatatranslation.cpp:2938
- msgid ""
-@@ -17859,7 +17847,7 @@
- msgid ""
- "_: southamerica.kgm\n"
- "The flag of Guyana is..."
--msgstr "蓋亞那（Guyana）的國旗是..."
-+msgstr "蓋亞那（Guyana）的國旗是…"
- 
- #: mapsdatatranslation.cpp:2940
- msgid ""
-@@ -17883,7 +17871,7 @@
- msgid ""
- "_: southamerica.kgm\n"
- "The capital of Suriname is..."
--msgstr "蘇利南（Suriname）的首都是..."
-+msgstr "蘇利南（Suriname）的首都是…"
- 
- #: mapsdatatranslation.cpp:2944
- msgid ""
-@@ -17896,7 +17884,7 @@
- msgid ""
- "_: southamerica.kgm\n"
- "The flag of Suriname is..."
--msgstr "蘇利南（Suriname）的國旗是..."
-+msgstr "蘇利南（Suriname）的國旗是…"
- 
- #: mapsdatatranslation.cpp:2946
- msgid ""
-@@ -17920,7 +17908,7 @@
- msgid ""
- "_: southamerica.kgm\n"
- "The capital of French Guiana is..."
--msgstr "法屬蓋亞那（French Guiana）的首都是..."
-+msgstr "法屬蓋亞那（French Guiana）的首都是…"
- 
- #: mapsdatatranslation.cpp:2950
- msgid ""
-@@ -17933,7 +17921,7 @@
- msgid ""
- "_: southamerica.kgm\n"
- "The flag of French Guiana is..."
--msgstr "法屬蓋亞那（French Guiana）的國旗是..."
-+msgstr "法屬蓋亞那（French Guiana）的國旗是…"
- 
- #: mapsdatatranslation.cpp:2952
- msgid ""
-@@ -17957,7 +17945,7 @@
- msgid ""
- "_: southamerica.kgm\n"
- "The capital of Ecuador is..."
--msgstr "厄瓜多（Ecuador）的首都是..."
-+msgstr "厄瓜多（Ecuador）的首都是…"
- 
- #: mapsdatatranslation.cpp:2956
- msgid ""
-@@ -17970,7 +17958,7 @@
- msgid ""
- "_: southamerica.kgm\n"
- "The flag of Ecuador is..."
--msgstr "厄瓜多（Ecuador）的國旗是..."
-+msgstr "厄瓜多（Ecuador）的國旗是…"
- 
- #: mapsdatatranslation.cpp:2958
- msgid ""
-@@ -17988,26 +17976,26 @@
- msgid ""
- "_: southamerica.kgm\n"
- "Peru"
--msgstr "秘魯（Peru）"
-+msgstr "祕魯（Peru）"
- 
- #: mapsdatatranslation.cpp:2961
- msgid ""
- "_: southamerica.kgm\n"
- "The capital of Peru is..."
--msgstr "秘魯（Peru）的首都是..."
-+msgstr "祕魯（Peru）的首都是…"
- 
- #: mapsdatatranslation.cpp:2962
- msgid ""
- "_: southamerica.kgm\n"
- "Please click on:\n"
- "Peru"
--msgstr "請點選：秘魯（Peru）"
-+msgstr "請點選：祕魯（Peru）"
- 
- #: mapsdatatranslation.cpp:2963
- msgid ""
- "_: southamerica.kgm\n"
- "The flag of Peru is..."
--msgstr "秘魯（Peru）的國旗是..."
-+msgstr "祕魯（Peru）的國旗是…"
- 
- #: mapsdatatranslation.cpp:2964
- msgid ""
-@@ -18031,7 +18019,7 @@
- msgid ""
- "_: southamerica.kgm\n"
- "The capital of Brazil is..."
--msgstr "巴西（Brazil）的首都是..."
-+msgstr "巴西（Brazil）的首都是…"
- 
- #: mapsdatatranslation.cpp:2968
- msgid ""
-@@ -18044,7 +18032,7 @@
- msgid ""
- "_: southamerica.kgm\n"
- "The flag of Brazil is..."
--msgstr "巴西（Brazil）的國旗是..."
-+msgstr "巴西（Brazil）的國旗是…"
- 
- #: mapsdatatranslation.cpp:2970
- msgid ""
-@@ -18068,7 +18056,7 @@
- msgid ""
- "_: southamerica.kgm\n"
- "The capital of Bolivia is..."
--msgstr "玻利維亞（Bolivia）的首都是..."
-+msgstr "玻利維亞（Bolivia）的首都是…"
- 
- #: mapsdatatranslation.cpp:2974
- msgid ""
-@@ -18081,7 +18069,7 @@
- msgid ""
- "_: southamerica.kgm\n"
- "The flag of Bolivia is..."
--msgstr "玻利維亞（Bolivia）的國旗是..."
-+msgstr "玻利維亞（Bolivia）的國旗是…"
- 
- #: mapsdatatranslation.cpp:2976
- msgid ""
-@@ -18105,7 +18093,7 @@
- msgid ""
- "_: southamerica.kgm\n"
- "The capital of Chile is..."
--msgstr "智利（Chile）的首都是..."
-+msgstr "智利（Chile）的首都是…"
- 
- #: mapsdatatranslation.cpp:2980
- msgid ""
-@@ -18118,7 +18106,7 @@
- msgid ""
- "_: southamerica.kgm\n"
- "The flag of Chile is..."
--msgstr "智利（Chile）的國旗是..."
-+msgstr "智利（Chile）的國旗是…"
- 
- #: mapsdatatranslation.cpp:2982
- msgid ""
-@@ -18142,7 +18130,7 @@
- msgid ""
- "_: southamerica.kgm\n"
- "The capital of Paraguay is..."
--msgstr "巴拉圭（Paraguay）的首都是..."
-+msgstr "巴拉圭（Paraguay）的首都是…"
- 
- #: mapsdatatranslation.cpp:2986
- msgid ""
-@@ -18155,7 +18143,7 @@
- msgid ""
- "_: southamerica.kgm\n"
- "The flag of Paraguay is..."
--msgstr "巴拉圭（Paraguay）的國旗是..."
-+msgstr "巴拉圭（Paraguay）的國旗是…"
- 
- #: mapsdatatranslation.cpp:2988
- msgid ""
-@@ -18179,7 +18167,7 @@
- msgid ""
- "_: southamerica.kgm\n"
- "The capital of Argentina is..."
--msgstr "阿根廷（Argentina）的首都是..."
-+msgstr "阿根廷（Argentina）的首都是…"
- 
- #: mapsdatatranslation.cpp:2992
- msgid ""
-@@ -18192,7 +18180,7 @@
- msgid ""
- "_: southamerica.kgm\n"
- "The flag of Argentina is..."
--msgstr "阿根廷（Argentina）的國旗是..."
-+msgstr "阿根廷（Argentina）的國旗是…"
- 
- #: mapsdatatranslation.cpp:2994
- msgid ""
-@@ -18216,7 +18204,7 @@
- msgid ""
- "_: southamerica.kgm\n"
- "The capital of Uruguay is..."
--msgstr "烏拉圭（Uruguay）的首都是..."
-+msgstr "烏拉圭（Uruguay）的首都是…"
- 
- #: mapsdatatranslation.cpp:2998
- msgid ""
-@@ -18229,7 +18217,7 @@
- msgid ""
- "_: southamerica.kgm\n"
- "The flag of Uruguay is..."
--msgstr "烏拉圭（Uruguay）的國旗是..."
-+msgstr "烏拉圭（Uruguay）的國旗是…"
- 
- #: mapsdatatranslation.cpp:3000
- msgid ""
-@@ -18252,8 +18240,7 @@
- #: mapsdatatranslation.cpp:3003
- msgid ""
- "_: spain.kgm\n"
--"<qt>Current map:"
--"<br><b>Spain</b></qt>"
-+"<qt>Current map:<br><b>Spain</b></qt>"
- msgstr "<qt>目前地圖：<br><b>西班牙</b></qt>"
- 
- #: mapsdatatranslation.cpp:3004
-@@ -18278,7 +18265,7 @@
- msgid ""
- "_: spain.kgm\n"
- "The capital of Andalucia is..."
--msgstr "安達盧西亞（Andalucia）的首都是..."
-+msgstr "安達盧西亞（Andalucia）的首都是…"
- 
- #: mapsdatatranslation.cpp:3008
- msgid ""
-@@ -18309,7 +18296,7 @@
- msgid ""
- "_: spain.kgm\n"
- "The capital of Aragon is..."
--msgstr "亞拉岡（Aragon）的首都是..."
-+msgstr "亞拉岡（Aragon）的首都是…"
- 
- #: mapsdatatranslation.cpp:3013
- msgid ""
-@@ -18340,7 +18327,7 @@
- msgid ""
- "_: spain.kgm\n"
- "The capital of Asturias is..."
--msgstr "阿斯圖里亞斯（Asturias）的首都是..."
-+msgstr "阿斯圖里亞斯（Asturias）的首都是…"
- 
- #: mapsdatatranslation.cpp:3018
- msgid ""
-@@ -18371,7 +18358,7 @@
- msgid ""
- "_: spain.kgm\n"
- "The capital of Balearic Islands is..."
--msgstr "巴利阿里群島（Balearic Islands）的首都是..."
-+msgstr "巴利阿里群島（Balearic Islands）的首都是…"
- 
- #: mapsdatatranslation.cpp:3023
- msgid ""
-@@ -18402,7 +18389,7 @@
- msgid ""
- "_: spain.kgm\n"
- "The capital of Basque Country is..."
--msgstr "巴斯克（Basque Country）的首都是..."
-+msgstr "巴斯克（Basque Country）的首都是…"
- 
- #: mapsdatatranslation.cpp:3028
- msgid ""
-@@ -18433,7 +18420,7 @@
- msgid ""
- "_: spain.kgm\n"
- "The capital of Canary Islands is..."
--msgstr "加那利群島（Canary Islands）的首都是..."
-+msgstr "加那利群島（Canary Islands）的首都是…"
- 
- #: mapsdatatranslation.cpp:3033
- msgid ""
-@@ -18446,14 +18433,17 @@
- msgid ""
- "_: spain.kgm\n"
- "Las Palmas de Gran Canaria and Santa Cruz de Tenerife"
--msgstr "拉斯帕爾馬斯與聖克魯斯（Las Palmas de Gran Canaria and Santa Cruz de Tenerife）"
-+msgstr ""
-+"拉斯帕爾馬斯與聖克魯斯（Las Palmas de Gran Canaria and Santa Cruz de "
-+"Tenerife）"
- 
- #: mapsdatatranslation.cpp:3035
- msgid ""
- "_: spain.kgm\n"
- "Las Palmas de Gran Canaria and Santa Cruz de Tenerife is the capital of..."
- msgstr ""
--"拉斯帕爾馬斯與聖克魯斯（Las Palmas de Gran Canaria and Santa Cruz de Tenerife）是哪個自治區的首都？"
-+"拉斯帕爾馬斯與聖克魯斯（Las Palmas de Gran Canaria and Santa Cruz de "
-+"Tenerife）是哪個自治區的首都？"
- 
- #: mapsdatatranslation.cpp:3036
- msgid ""
-@@ -18465,7 +18455,7 @@
- msgid ""
- "_: spain.kgm\n"
- "The capital of Cantabria is..."
--msgstr "坎塔布里亞（Cantabria）的首都是..."
-+msgstr "坎塔布里亞（Cantabria）的首都是…"
- 
- #: mapsdatatranslation.cpp:3038
- msgid ""
-@@ -18496,7 +18486,7 @@
- msgid ""
- "_: spain.kgm\n"
- "The capital of Castile-La Mancha is..."
--msgstr "卡斯提拉曼恰（Castile-La Mancha）的首都是..."
-+msgstr "卡斯提拉曼恰（Castile-La Mancha）的首都是…"
- 
- #: mapsdatatranslation.cpp:3043
- msgid ""
-@@ -18527,7 +18517,7 @@
- msgid ""
- "_: spain.kgm\n"
- "The capital of Castile and Leon is..."
--msgstr "卡斯提和萊昂（Castile and Leon）的首都是..."
-+msgstr "卡斯提和萊昂（Castile and Leon）的首都是…"
- 
- #: mapsdatatranslation.cpp:3048
- msgid ""
-@@ -18558,7 +18548,7 @@
- msgid ""
- "_: spain.kgm\n"
- "The capital of Catalonia is..."
--msgstr "卡塔羅尼亞（Catalonia）的首都是..."
-+msgstr "卡塔羅尼亞（Catalonia）的首都是…"
- 
- #: mapsdatatranslation.cpp:3053
- msgid ""
-@@ -18589,7 +18579,7 @@
- msgid ""
- "_: spain.kgm\n"
- "The capital of Extremadura is..."
--msgstr "埃斯特雷馬杜拉（Extremadura）的首都是..."
-+msgstr "埃斯特雷馬杜拉（Extremadura）的首都是…"
- 
- #: mapsdatatranslation.cpp:3058
- msgid ""
-@@ -18620,7 +18610,7 @@
- msgid ""
- "_: spain.kgm\n"
- "The capital of Galicia is..."
--msgstr "加利西亞（Galicia）的首都是..."
-+msgstr "加利西亞（Galicia）的首都是…"
- 
- #: mapsdatatranslation.cpp:3063
- msgid ""
-@@ -18651,7 +18641,7 @@
- msgid ""
- "_: spain.kgm\n"
- "The capital of La Rioja is..."
--msgstr "里奧哈（La Rioja）的首都是..."
-+msgstr "里奧哈（La Rioja）的首都是…"
- 
- #: mapsdatatranslation.cpp:3068
- msgid ""
-@@ -18682,7 +18672,7 @@
- msgid ""
- "_: spain.kgm\n"
- "The capital of Madrid is..."
--msgstr "馬德里（Madrid）的首都是..."
-+msgstr "馬德里（Madrid）的首都是…"
- 
- #: mapsdatatranslation.cpp:3073
- msgid ""
-@@ -18707,7 +18697,7 @@
- msgid ""
- "_: spain.kgm\n"
- "The capital of Murcia is..."
--msgstr "穆爾西亞（Murcia）的首都是..."
-+msgstr "穆爾西亞（Murcia）的首都是…"
- 
- #: mapsdatatranslation.cpp:3078
- msgid ""
-@@ -18732,7 +18722,7 @@
- msgid ""
- "_: spain.kgm\n"
- "The capital of Navarre is..."
--msgstr "那瓦爾（Navarre）的首都是..."
-+msgstr "那瓦爾（Navarre）的首都是…"
- 
- #: mapsdatatranslation.cpp:3083
- msgid ""
-@@ -18763,7 +18753,7 @@
- msgid ""
- "_: spain.kgm\n"
- "The capital of Valencian Community is..."
--msgstr "巴倫西亞（Valencian Community）的首都是..."
-+msgstr "巴倫西亞（Valencian Community）的首都是…"
- 
- #: mapsdatatranslation.cpp:3088
- msgid ""
-@@ -18793,8 +18783,7 @@
- #: mapsdatatranslation.cpp:3092
- msgid ""
- "_: usa.kgm\n"
--"<qt>Current map:"
--"<br><b>USA</b></qt>"
-+"<qt>Current map:<br><b>USA</b></qt>"
- msgstr "<qt>目前地圖：<br><b>美國</b></qt>"
- 
- #: mapsdatatranslation.cpp:3093
-@@ -18891,7 +18880,7 @@
- msgid ""
- "_: usa.kgm\n"
- "The capital of Alabama is..."
--msgstr "阿拉巴馬（Alabama）的首都是..."
-+msgstr "阿拉巴馬（Alabama）的首都是…"
- 
- #: mapsdatatranslation.cpp:3109
- msgid ""
-@@ -18922,7 +18911,7 @@
- msgid ""
- "_: usa.kgm\n"
- "The capital of Alaska is..."
--msgstr "阿拉斯加（Alaska）的首都是..."
-+msgstr "阿拉斯加（Alaska）的首都是…"
- 
- #: mapsdatatranslation.cpp:3114
- msgid ""
-@@ -18953,7 +18942,7 @@
- msgid ""
- "_: usa.kgm\n"
- "The capital of Arizona is..."
--msgstr "亞利桑那（Arizona）的首都是..."
-+msgstr "亞利桑那（Arizona）的首都是…"
- 
- #: mapsdatatranslation.cpp:3119
- msgid ""
-@@ -18984,7 +18973,7 @@
- msgid ""
- "_: usa.kgm\n"
- "The capital of Arkansas is..."
--msgstr "阿肯色（Arkansas）的首都是..."
-+msgstr "阿肯色（Arkansas）的首都是…"
- 
- #: mapsdatatranslation.cpp:3124
- msgid ""
-@@ -19015,7 +19004,7 @@
- msgid ""
- "_: usa.kgm\n"
- "The capital of California is..."
--msgstr "加利福尼亞（California）的首都是..."
-+msgstr "加利福尼亞（California）的首都是…"
- 
- #: mapsdatatranslation.cpp:3129
- msgid ""
-@@ -19046,7 +19035,7 @@
- msgid ""
- "_: usa.kgm\n"
- "The capital of Colorado is..."
--msgstr "科羅拉多（Colorado）的首都是..."
-+msgstr "科羅拉多（Colorado）的首都是…"
- 
- #: mapsdatatranslation.cpp:3134
- msgid ""
-@@ -19077,7 +19066,7 @@
- msgid ""
- "_: usa.kgm\n"
- "The capital of Connecticut is..."
--msgstr "康乃狄克（Connecticut）的首都是..."
-+msgstr "康乃狄克（Connecticut）的首都是…"
- 
- #: mapsdatatranslation.cpp:3139
- msgid ""
-@@ -19108,7 +19097,7 @@
- msgid ""
- "_: usa.kgm\n"
- "The capital of Delaware is..."
--msgstr "德拉瓦（Delaware）的首都是..."
-+msgstr "德拉瓦（Delaware）的首都是…"
- 
- #: mapsdatatranslation.cpp:3144
- msgid ""
-@@ -19139,7 +19128,7 @@
- msgid ""
- "_: usa.kgm\n"
- "The capital of Florida is..."
--msgstr "佛羅里達（Florida）的首都是..."
-+msgstr "佛羅里達（Florida）的首都是…"
- 
- #: mapsdatatranslation.cpp:3149
- msgid ""
-@@ -19170,7 +19159,7 @@
- msgid ""
- "_: usa.kgm\n"
- "The capital of Georgia is..."
--msgstr "喬治亞（Georgia）的首都是..."
-+msgstr "喬治亞（Georgia）的首都是…"
- 
- #: mapsdatatranslation.cpp:3154
- msgid ""
-@@ -19201,7 +19190,7 @@
- msgid ""
- "_: usa.kgm\n"
- "The capital of Hawaii is..."
--msgstr "夏威夷（Hawaii）的首都是..."
-+msgstr "夏威夷（Hawaii）的首都是…"
- 
- #: mapsdatatranslation.cpp:3159
- msgid ""
-@@ -19232,7 +19221,7 @@
- msgid ""
- "_: usa.kgm\n"
- "The capital of Idaho is..."
--msgstr "愛德荷（Idaho）的首都是..."
-+msgstr "愛德荷（Idaho）的首都是…"
- 
- #: mapsdatatranslation.cpp:3164
- msgid ""
-@@ -19263,7 +19252,7 @@
- msgid ""
- "_: usa.kgm\n"
- "The capital of Illinois is..."
--msgstr "伊利諾（Illinois）的首都是..."
-+msgstr "伊利諾（Illinois）的首都是…"
- 
- #: mapsdatatranslation.cpp:3169
- msgid ""
-@@ -19294,7 +19283,7 @@
- msgid ""
- "_: usa.kgm\n"
- "The capital of Indiana is..."
--msgstr "印地安那（Indiana）的首都是..."
-+msgstr "印地安那（Indiana）的首都是…"
- 
- #: mapsdatatranslation.cpp:3174
- msgid ""
-@@ -19325,7 +19314,7 @@
- msgid ""
- "_: usa.kgm\n"
- "The capital of Iowa is..."
--msgstr "愛荷華（Iowa）的首都是..."
-+msgstr "愛荷華（Iowa）的首都是…"
- 
- #: mapsdatatranslation.cpp:3179
- msgid ""
-@@ -19356,7 +19345,7 @@
- msgid ""
- "_: usa.kgm\n"
- "The capital of Kansas is..."
--msgstr "堪薩斯（Kansas）的首都是..."
-+msgstr "堪薩斯（Kansas）的首都是…"
- 
- #: mapsdatatranslation.cpp:3184
- msgid ""
-@@ -19387,7 +19376,7 @@
- msgid ""
- "_: usa.kgm\n"
- "The capital of Kentucky is..."
--msgstr "肯塔基（Kentucky）的首都是..."
-+msgstr "肯塔基（Kentucky）的首都是…"
- 
- #: mapsdatatranslation.cpp:3189
- msgid ""
-@@ -19418,7 +19407,7 @@
- msgid ""
- "_: usa.kgm\n"
- "The capital of Louisiana is..."
--msgstr "路易西安那（Louisiana）的首都是..."
-+msgstr "路易西安那（Louisiana）的首都是…"
- 
- #: mapsdatatranslation.cpp:3194
- msgid ""
-@@ -19449,7 +19438,7 @@
- msgid ""
- "_: usa.kgm\n"
- "The capital of Maine is..."
--msgstr "緬因（Maine）的首都是..."
-+msgstr "緬因（Maine）的首都是…"
- 
- #: mapsdatatranslation.cpp:3199
- msgid ""
-@@ -19480,7 +19469,7 @@
- msgid ""
- "_: usa.kgm\n"
- "The capital of Maryland is..."
--msgstr "馬里蘭（Maryland）的首都是..."
-+msgstr "馬里蘭（Maryland）的首都是…"
- 
- #: mapsdatatranslation.cpp:3204
- msgid ""
-@@ -19511,7 +19500,7 @@
- msgid ""
- "_: usa.kgm\n"
- "The capital of Massachusetts is..."
--msgstr "麻塞諸塞（Massachusetts）的首都是..."
-+msgstr "麻塞諸塞（Massachusetts）的首都是…"
- 
- #: mapsdatatranslation.cpp:3209
- msgid ""
-@@ -19542,7 +19531,7 @@
- msgid ""
- "_: usa.kgm\n"
- "The capital of Michigan is..."
--msgstr "密西根（Michigan）的首都是..."
-+msgstr "密西根（Michigan）的首都是…"
- 
- #: mapsdatatranslation.cpp:3214
- msgid ""
-@@ -19573,7 +19562,7 @@
- msgid ""
- "_: usa.kgm\n"
- "The capital of Minnesota is..."
--msgstr "明尼蘇達（Minnesota）的首都是..."
-+msgstr "明尼蘇達（Minnesota）的首都是…"
- 
- #: mapsdatatranslation.cpp:3219
- msgid ""
-@@ -19604,7 +19593,7 @@
- msgid ""
- "_: usa.kgm\n"
- "The capital of Mississippi is..."
--msgstr "密西西比（Mississippi）的首都是..."
-+msgstr "密西西比（Mississippi）的首都是…"
- 
- #: mapsdatatranslation.cpp:3224
- msgid ""
-@@ -19635,7 +19624,7 @@
- msgid ""
- "_: usa.kgm\n"
- "The capital of Missouri is..."
--msgstr "密蘇里（Missouri）的首都是..."
-+msgstr "密蘇里（Missouri）的首都是…"
- 
- #: mapsdatatranslation.cpp:3229
- msgid ""
-@@ -19666,7 +19655,7 @@
- msgid ""
- "_: usa.kgm\n"
- "The capital of Montana is..."
--msgstr "蒙大拿（Montana）的首都是..."
-+msgstr "蒙大拿（Montana）的首都是…"
- 
- #: mapsdatatranslation.cpp:3234
- msgid ""
-@@ -19697,7 +19686,7 @@
- msgid ""
- "_: usa.kgm\n"
- "The capital of Nebraska is..."
--msgstr "內布拉斯加（Nebraska）的首都是..."
-+msgstr "內布拉斯加（Nebraska）的首都是…"
- 
- #: mapsdatatranslation.cpp:3239
- msgid ""
-@@ -19728,7 +19717,7 @@
- msgid ""
- "_: usa.kgm\n"
- "The capital of Nevada is..."
--msgstr "內華達（Nevada）的首都是..."
-+msgstr "內華達（Nevada）的首都是…"
- 
- #: mapsdatatranslation.cpp:3244
- msgid ""
-@@ -19759,7 +19748,7 @@
- msgid ""
- "_: usa.kgm\n"
- "The capital of New Hampshire is..."
--msgstr "新罕布夏（New Hampshire）的首都是..."
-+msgstr "新罕布夏（New Hampshire）的首都是…"
- 
- #: mapsdatatranslation.cpp:3249
- msgid ""
-@@ -19790,7 +19779,7 @@
- msgid ""
- "_: usa.kgm\n"
- "The capital of New Jersey is..."
--msgstr "紐澤西（New Jersey）的首都是..."
-+msgstr "紐澤西（New Jersey）的首都是…"
- 
- #: mapsdatatranslation.cpp:3254
- msgid ""
-@@ -19821,7 +19810,7 @@
- msgid ""
- "_: usa.kgm\n"
- "The capital of New Mexico is..."
--msgstr "新墨西哥（New Mexico）的首都是..."
-+msgstr "新墨西哥（New Mexico）的首都是…"
- 
- #: mapsdatatranslation.cpp:3259
- msgid ""
-@@ -19852,7 +19841,7 @@
- msgid ""
- "_: usa.kgm\n"
- "The capital of New York is..."
--msgstr "紐約（New York）的首都是..."
-+msgstr "紐約（New York）的首都是…"
- 
- #: mapsdatatranslation.cpp:3264
- msgid ""
-@@ -19883,7 +19872,7 @@
- msgid ""
- "_: usa.kgm\n"
- "The capital of North Carolina is..."
--msgstr "北卡羅萊納（North Carolina）的首都是..."
-+msgstr "北卡羅萊納（North Carolina）的首都是…"
- 
- #: mapsdatatranslation.cpp:3269
- msgid ""
-@@ -19914,7 +19903,7 @@
- msgid ""
- "_: usa.kgm\n"
- "The capital of North Dakota is..."
--msgstr "北達科他（North Dakota）的首都是..."
-+msgstr "北達科他（North Dakota）的首都是…"
- 
- #: mapsdatatranslation.cpp:3274
- msgid ""
-@@ -19945,7 +19934,7 @@
- msgid ""
- "_: usa.kgm\n"
- "The capital of Ohio is..."
--msgstr "俄亥俄（Ohio）的首都是..."
-+msgstr "俄亥俄（Ohio）的首都是…"
- 
- #: mapsdatatranslation.cpp:3279
- msgid ""
-@@ -19976,7 +19965,7 @@
- msgid ""
- "_: usa.kgm\n"
- "The capital of Oklahoma is..."
--msgstr "奧克拉荷馬（Oklahoma）的首都是..."
-+msgstr "奧克拉荷馬（Oklahoma）的首都是…"
- 
- #: mapsdatatranslation.cpp:3284
- msgid ""
-@@ -20007,7 +19996,7 @@
- msgid ""
- "_: usa.kgm\n"
- "The capital of Oregon is..."
--msgstr "奧勒岡（Oregon）的首都是..."
-+msgstr "奧勒岡（Oregon）的首都是…"
- 
- #: mapsdatatranslation.cpp:3289
- msgid ""
-@@ -20038,7 +20027,7 @@
- msgid ""
- "_: usa.kgm\n"
- "The capital of Pennsylvania is..."
--msgstr "賓夕法尼亞（Pennsylvania）的首都是..."
-+msgstr "賓夕法尼亞（Pennsylvania）的首都是…"
- 
- #: mapsdatatranslation.cpp:3294
- msgid ""
-@@ -20069,7 +20058,7 @@
- msgid ""
- "_: usa.kgm\n"
- "The capital of Rhode Island is..."
--msgstr "羅德島（Rhode Island）的首都是..."
-+msgstr "羅德島（Rhode Island）的首都是…"
- 
- #: mapsdatatranslation.cpp:3299
- msgid ""
-@@ -20100,7 +20089,7 @@
- msgid ""
- "_: usa.kgm\n"
- "The capital of South Carolina is..."
--msgstr "南卡羅萊納（South Carolina）的首都是..."
-+msgstr "南卡羅萊納（South Carolina）的首都是…"
- 
- #: mapsdatatranslation.cpp:3304
- msgid ""
-@@ -20131,7 +20120,7 @@
- msgid ""
- "_: usa.kgm\n"
- "The capital of South Dakota is..."
--msgstr "南達科塔（South Dakota）的首都是..."
-+msgstr "南達科塔（South Dakota）的首都是…"
- 
- #: mapsdatatranslation.cpp:3309
- msgid ""
-@@ -20162,7 +20151,7 @@
- msgid ""
- "_: usa.kgm\n"
- "The capital of Tennessee is..."
--msgstr "田納西（Tennessee）的首都是..."
-+msgstr "田納西（Tennessee）的首都是…"
- 
- #: mapsdatatranslation.cpp:3314
- msgid ""
-@@ -20193,7 +20182,7 @@
- msgid ""
- "_: usa.kgm\n"
- "The capital of Texas is..."
--msgstr "德克薩斯（Texas）的首都是..."
-+msgstr "德克薩斯（Texas）的首都是…"
- 
- #: mapsdatatranslation.cpp:3319
- msgid ""
-@@ -20224,7 +20213,7 @@
- msgid ""
- "_: usa.kgm\n"
- "The capital of Utah is..."
--msgstr "猶他（Utah）的首都是..."
-+msgstr "猶他（Utah）的首都是…"
- 
- #: mapsdatatranslation.cpp:3324
- msgid ""
-@@ -20255,7 +20244,7 @@
- msgid ""
- "_: usa.kgm\n"
- "The capital of Vermont is..."
--msgstr "佛蒙特（Vermont）的首都是..."
-+msgstr "佛蒙特（Vermont）的首都是…"
- 
- #: mapsdatatranslation.cpp:3329
- msgid ""
-@@ -20286,7 +20275,7 @@
- msgid ""
- "_: usa.kgm\n"
- "The capital of Virginia is..."
--msgstr "維吉尼亞（Virginia）的首都是..."
-+msgstr "維吉尼亞（Virginia）的首都是…"
- 
- #: mapsdatatranslation.cpp:3334
- msgid ""
-@@ -20317,7 +20306,7 @@
- msgid ""
- "_: usa.kgm\n"
- "The capital of Washington is..."
--msgstr "華盛頓（Washington）的首都是..."
-+msgstr "華盛頓（Washington）的首都是…"
- 
- #: mapsdatatranslation.cpp:3339
- msgid ""
-@@ -20348,7 +20337,7 @@
- msgid ""
- "_: usa.kgm\n"
- "The capital of West Virginia is..."
--msgstr "西維吉尼亞（West Virginia）的首都是..."
-+msgstr "西維吉尼亞（West Virginia）的首都是…"
- 
- #: mapsdatatranslation.cpp:3344
- msgid ""
-@@ -20379,7 +20368,7 @@
- msgid ""
- "_: usa.kgm\n"
- "The capital of Wisconsin is..."
--msgstr "威斯康辛（Wisconsin）的首都是..."
-+msgstr "威斯康辛（Wisconsin）的首都是…"
- 
- #: mapsdatatranslation.cpp:3349
- msgid ""
-@@ -20410,7 +20399,7 @@
- msgid ""
- "_: usa.kgm\n"
- "The capital of Wyoming is..."
--msgstr "俄懷明（Wyoming）的首都是..."
-+msgstr "俄懷明（Wyoming）的首都是…"
- 
- #: mapsdatatranslation.cpp:3354
- msgid ""
-@@ -20440,8 +20429,7 @@
- #: mapsdatatranslation.cpp:3358
- msgid ""
- "_: world.kgm\n"
--"<qt>Current map:"
--"<br><b>World</b></qt>"
-+"<qt>Current map:<br><b>World</b></qt>"
- msgstr "<qt>目前地圖：<br><b>世界</b></qt>"
- 
- #: mapsdatatranslation.cpp:3359
-@@ -20460,7 +20448,7 @@
- msgid ""
- "_: world.kgm\n"
- "The capital of Algeria is..."
--msgstr "阿爾及利亞（Algeria）的首都是..."
-+msgstr "阿爾及利亞（Algeria）的首都是…"
- 
- #: mapsdatatranslation.cpp:3362
- msgid ""
-@@ -20473,7 +20461,7 @@
- msgid ""
- "_: world.kgm\n"
- "The flag of Algeria is..."
--msgstr "阿爾及利亞（Algeria）的國旗是..."
-+msgstr "阿爾及利亞（Algeria）的國旗是…"
- 
- #: mapsdatatranslation.cpp:3364
- msgid ""
-@@ -20497,7 +20485,7 @@
- msgid ""
- "_: world.kgm\n"
- "The capital of Angola is..."
--msgstr "安哥拉（Angola）的首都是..."
-+msgstr "安哥拉（Angola）的首都是…"
- 
- #: mapsdatatranslation.cpp:3368
- msgid ""
-@@ -20510,7 +20498,7 @@
- msgid ""
- "_: world.kgm\n"
- "The flag of Angola is..."
--msgstr "安哥拉（Angola）的國旗是..."
-+msgstr "安哥拉（Angola）的國旗是…"
- 
- #: mapsdatatranslation.cpp:3370
- msgid ""
-@@ -20534,7 +20522,7 @@
- msgid ""
- "_: world.kgm\n"
- "The capital of Benin is..."
--msgstr "貝南（Benin）的首都是..."
-+msgstr "貝南（Benin）的首都是…"
- 
- #: mapsdatatranslation.cpp:3374
- msgid ""
-@@ -20547,7 +20535,7 @@
- msgid ""
- "_: world.kgm\n"
- "The flag of Benin is..."
--msgstr "貝南（Benin）的國旗是..."
-+msgstr "貝南（Benin）的國旗是…"
- 
- #: mapsdatatranslation.cpp:3376
- msgid ""
-@@ -20571,7 +20559,7 @@
- msgid ""
- "_: world.kgm\n"
- "The capital of Botswana is..."
--msgstr "波札那（Botswana）的首都是..."
-+msgstr "波札那（Botswana）的首都是…"
- 
- #: mapsdatatranslation.cpp:3380
- msgid ""
-@@ -20584,7 +20572,7 @@
- msgid ""
- "_: world.kgm\n"
- "The flag of Botswana is..."
--msgstr "波札那（Botswana）的國旗是..."
-+msgstr "波札那（Botswana）的國旗是…"
- 
- #: mapsdatatranslation.cpp:3382
- msgid ""
-@@ -20608,7 +20596,7 @@
- msgid ""
- "_: world.kgm\n"
- "The capital of Burkina Faso is..."
--msgstr "布吉納法索（Burkina Faso）的首都是..."
-+msgstr "布吉納法索（Burkina Faso）的首都是…"
- 
- #: mapsdatatranslation.cpp:3386
- msgid ""
-@@ -20621,7 +20609,7 @@
- msgid ""
- "_: world.kgm\n"
- "The flag of Burkina Faso is..."
--msgstr "布吉納法索（Burkina Faso）的國旗是..."
-+msgstr "布吉納法索（Burkina Faso）的國旗是…"
- 
- #: mapsdatatranslation.cpp:3388
- msgid ""
-@@ -20645,7 +20633,7 @@
- msgid ""
- "_: world.kgm\n"
- "The capital of Burundi is..."
--msgstr "蒲隆地（Burundi）的首都是..."
-+msgstr "蒲隆地（Burundi）的首都是…"
- 
- #: mapsdatatranslation.cpp:3392
- msgid ""
-@@ -20658,7 +20646,7 @@
- msgid ""
- "_: world.kgm\n"
- "The flag of Burundi is..."
--msgstr "蒲隆地（Burundi）的國旗是..."
-+msgstr "蒲隆地（Burundi）的國旗是…"
- 
- #: mapsdatatranslation.cpp:3394
- msgid ""
-@@ -20682,7 +20670,7 @@
- msgid ""
- "_: world.kgm\n"
- "The capital of Cameroon is..."
--msgstr "喀麥隆（Cameroon）的首都是..."
-+msgstr "喀麥隆（Cameroon）的首都是…"
- 
- #: mapsdatatranslation.cpp:3398
- msgid ""
-@@ -20695,7 +20683,7 @@
- msgid ""
- "_: world.kgm\n"
- "The flag of Cameroon is..."
--msgstr "喀麥隆（Cameroon）的國旗是..."
-+msgstr "喀麥隆（Cameroon）的國旗是…"
- 
- #: mapsdatatranslation.cpp:3400
- msgid ""
-@@ -20719,7 +20707,7 @@
- msgid ""
- "_: world.kgm\n"
- "The capital of Central African Republic is..."
--msgstr "中非共和國（Central African Republic）的首都是..."
-+msgstr "中非共和國（Central African Republic）的首都是…"
- 
- #: mapsdatatranslation.cpp:3404
- msgid ""
-@@ -20732,7 +20720,7 @@
- msgid ""
- "_: world.kgm\n"
- "The flag of Central African Republic is..."
--msgstr "中非共和國（Central African Republic）的國旗是..."
-+msgstr "中非共和國（Central African Republic）的國旗是…"
- 
- #: mapsdatatranslation.cpp:3406
- msgid ""
-@@ -20756,7 +20744,7 @@
- msgid ""
- "_: world.kgm\n"
- "The capital of Chad is..."
--msgstr "查德（Chad）的首都是..."
-+msgstr "查德（Chad）的首都是…"
- 
- #: mapsdatatranslation.cpp:3410
- msgid ""
-@@ -20769,7 +20757,7 @@
- msgid ""
- "_: world.kgm\n"
- "The flag of Chad is..."
--msgstr "查德（Chad）的國旗是..."
-+msgstr "查德（Chad）的國旗是…"
- 
- #: mapsdatatranslation.cpp:3412
- msgid ""
-@@ -20793,7 +20781,7 @@
- msgid ""
- "_: world.kgm\n"
- "The capital of Côte d'Ivoire is..."
--msgstr "象牙海岸（Côte d'Ivoire）的首都是..."
-+msgstr "象牙海岸（Côte d'Ivoire）的首都是…"
- 
- #: mapsdatatranslation.cpp:3416
- msgid ""
-@@ -20806,7 +20794,7 @@
- msgid ""
- "_: world.kgm\n"
- "The flag of Côte d'Ivoire is..."
--msgstr "象牙海岸（Côte d'Ivoire）的國旗是..."
-+msgstr "象牙海岸（Côte d'Ivoire）的國旗是…"
- 
- #: mapsdatatranslation.cpp:3418
- msgid ""
-@@ -20830,7 +20818,7 @@
- msgid ""
- "_: world.kgm\n"
- "The capital of Democratic Republic of the Congo is..."
--msgstr "剛果民主共和國（Democratic Republic of the Congo）的首都是..."
-+msgstr "剛果民主共和國（Democratic Republic of the Congo）的首都是…"
- 
- #: mapsdatatranslation.cpp:3422
- msgid ""
-@@ -20843,7 +20831,7 @@
- msgid ""
- "_: world.kgm\n"
- "The flag of Democratic Republic of the Congo is..."
--msgstr "剛果民主共和國（Democratic Republic of the Congo）的國旗是..."
-+msgstr "剛果民主共和國（Democratic Republic of the Congo）的國旗是…"
- 
- #: mapsdatatranslation.cpp:3424
- msgid ""
-@@ -20880,7 +20868,7 @@
- msgid ""
- "_: world.kgm\n"
- "The flag of Djibouti is..."
--msgstr "吉布地（Djibouti）的國旗是..."
-+msgstr "吉布地（Djibouti）的國旗是…"
- 
- #: mapsdatatranslation.cpp:3431
- msgid ""
-@@ -20898,7 +20886,7 @@
- msgid ""
- "_: world.kgm\n"
- "The capital of Egypt is..."
--msgstr "埃及（Egypt）的首都是..."
-+msgstr "埃及（Egypt）的首都是…"
- 
- #: mapsdatatranslation.cpp:3434
- msgid ""
-@@ -20911,7 +20899,7 @@
- msgid ""
- "_: world.kgm\n"
- "The flag of Egypt is..."
--msgstr "埃及（Egypt）的國旗是..."
-+msgstr "埃及（Egypt）的國旗是…"
- 
- #: mapsdatatranslation.cpp:3436
- msgid ""
-@@ -20935,7 +20923,7 @@
- msgid ""
- "_: world.kgm\n"
- "The capital of Equatorial Guinea is..."
--msgstr "赤道幾內亞（Equatorial Guinea）的首都是..."
-+msgstr "赤道幾內亞（Equatorial Guinea）的首都是…"
- 
- #: mapsdatatranslation.cpp:3440
- msgid ""
-@@ -20948,7 +20936,7 @@
- msgid ""
- "_: world.kgm\n"
- "The flag of Equatorial Guinea is..."
--msgstr "赤道幾內亞（Equatorial Guinea）的國旗是..."
-+msgstr "赤道幾內亞（Equatorial Guinea）的國旗是…"
- 
- #: mapsdatatranslation.cpp:3442
- msgid ""
-@@ -20972,7 +20960,7 @@
- msgid ""
- "_: world.kgm\n"
- "The capital of Eritrea is..."
--msgstr "厄利垂亞（Eritrea）的首都是..."
-+msgstr "厄利垂亞（Eritrea）的首都是…"
- 
- #: mapsdatatranslation.cpp:3446
- msgid ""
-@@ -20985,7 +20973,7 @@
- msgid ""
- "_: world.kgm\n"
- "The flag of Eritrea is..."
--msgstr "厄利垂亞（Eritrea）的國旗是..."
-+msgstr "厄利垂亞（Eritrea）的國旗是…"
- 
- #: mapsdatatranslation.cpp:3448
- msgid ""
-@@ -21009,7 +20997,7 @@
- msgid ""
- "_: world.kgm\n"
- "The capital of Ethiopia is..."
--msgstr "衣索匹亞（Ethiopia）的首都是..."
-+msgstr "衣索匹亞（Ethiopia）的首都是…"
- 
- #: mapsdatatranslation.cpp:3452
- msgid ""
-@@ -21022,7 +21010,7 @@
- msgid ""
- "_: world.kgm\n"
- "The flag of Ethiopia is..."
--msgstr "衣索匹亞（Ethiopia）的國旗是..."
-+msgstr "衣索匹亞（Ethiopia）的國旗是…"
- 
- #: mapsdatatranslation.cpp:3454
- msgid ""
-@@ -21046,7 +21034,7 @@
- msgid ""
- "_: world.kgm\n"
- "The capital of Gabon is..."
--msgstr "加彭（Gabon）的首都是..."
-+msgstr "加彭（Gabon）的首都是…"
- 
- #: mapsdatatranslation.cpp:3458
- msgid ""
-@@ -21059,7 +21047,7 @@
- msgid ""
- "_: world.kgm\n"
- "The flag of Gabon is..."
--msgstr "加彭（Gabon）的國旗是..."
-+msgstr "加彭（Gabon）的國旗是…"
- 
- #: mapsdatatranslation.cpp:3460
- msgid ""
-@@ -21083,7 +21071,7 @@
- msgid ""
- "_: world.kgm\n"
- "The capital of Ghana is..."
--msgstr "迦納（Ghana）的首都是..."
-+msgstr "迦納（Ghana）的首都是…"
- 
- #: mapsdatatranslation.cpp:3464
- msgid ""
-@@ -21096,7 +21084,7 @@
- msgid ""
- "_: world.kgm\n"
- "The flag of Ghana is..."
--msgstr "迦納（Ghana）的國旗是..."
-+msgstr "迦納（Ghana）的國旗是…"
- 
- #: mapsdatatranslation.cpp:3466
- msgid ""
-@@ -21108,7 +21096,7 @@
- msgid ""
- "_: world.kgm\n"
- "Accra is the capital of..."
--msgstr "阿克拉（Accra）的首都是..."
-+msgstr "阿克拉（Accra）的首都是…"
- 
- #: mapsdatatranslation.cpp:3468
- msgid ""
-@@ -21120,7 +21108,7 @@
- msgid ""
- "_: world.kgm\n"
- "The capital of Guinea is..."
--msgstr "幾內亞（Guinea）的首都是..."
-+msgstr "幾內亞（Guinea）的首都是…"
- 
- #: mapsdatatranslation.cpp:3470
- msgid ""
-@@ -21133,7 +21121,7 @@
- msgid ""
- "_: world.kgm\n"
- "The flag of Guinea is..."
--msgstr "幾內亞（Guinea）的國旗是..."
-+msgstr "幾內亞（Guinea）的國旗是…"
- 
- #: mapsdatatranslation.cpp:3472
- msgid ""
-@@ -21157,7 +21145,7 @@
- msgid ""
- "_: world.kgm\n"
- "The capital of Guinea-Bissau is..."
--msgstr "幾內亞比索（Guinea-Bissau）的首都是..."
-+msgstr "幾內亞比索（Guinea-Bissau）的首都是…"
- 
- #: mapsdatatranslation.cpp:3476
- msgid ""
-@@ -21170,7 +21158,7 @@
- msgid ""
- "_: world.kgm\n"
- "The flag of Guinea-Bissau is..."
--msgstr "幾內亞比索（Guinea-Bissau）的國旗是..."
-+msgstr "幾內亞比索（Guinea-Bissau）的國旗是…"
- 
- #: mapsdatatranslation.cpp:3478
- msgid ""
-@@ -21194,7 +21182,7 @@
- msgid ""
- "_: world.kgm\n"
- "The capital of Iran is..."
--msgstr "伊朗（Iran）的首都是..."
-+msgstr "伊朗（Iran）的首都是…"
- 
- #: mapsdatatranslation.cpp:3482
- msgid ""
-@@ -21207,7 +21195,7 @@
- msgid ""
- "_: world.kgm\n"
- "The flag of Iran is..."
--msgstr "伊朗（Iran）的國旗是..."
-+msgstr "伊朗（Iran）的國旗是…"
- 
- #: mapsdatatranslation.cpp:3484
- msgid ""
-@@ -21231,7 +21219,7 @@
- msgid ""
- "_: world.kgm\n"
- "The capital of Iraq is..."
--msgstr "伊拉克（Iraq）的首都是..."
-+msgstr "伊拉克（Iraq）的首都是…"
- 
- #: mapsdatatranslation.cpp:3488
- msgid ""
-@@ -21244,7 +21232,7 @@
- msgid ""
- "_: world.kgm\n"
- "The flag of Iraq is..."
--msgstr "伊拉克（Iraq）的國旗是..."
-+msgstr "伊拉克（Iraq）的國旗是…"
- 
- #: mapsdatatranslation.cpp:3490
- msgid ""
-@@ -21268,7 +21256,7 @@
- msgid ""
- "_: world.kgm\n"
- "The capital of Israel is..."
--msgstr "以色列（Israel）的首都是..."
-+msgstr "以色列（Israel）的首都是…"
- 
- #: mapsdatatranslation.cpp:3494
- msgid ""
-@@ -21281,7 +21269,7 @@
- msgid ""
- "_: world.kgm\n"
- "The flag of Israel is..."
--msgstr "以色列（Israel）的國旗是..."
-+msgstr "以色列（Israel）的國旗是…"
- 
- #: mapsdatatranslation.cpp:3496
- msgid ""
-@@ -21305,7 +21293,7 @@
- msgid ""
- "_: world.kgm\n"
- "The capital of Jordan is..."
--msgstr "約旦（Jordan）的首都是..."
-+msgstr "約旦（Jordan）的首都是…"
- 
- #: mapsdatatranslation.cpp:3500
- msgid ""
-@@ -21318,7 +21306,7 @@
- msgid ""
- "_: world.kgm\n"
- "The flag of Jordan is..."
--msgstr "約旦（Jordan）的國旗是..."
-+msgstr "約旦（Jordan）的國旗是…"
- 
- #: mapsdatatranslation.cpp:3502
- msgid ""
-@@ -21342,7 +21330,7 @@
- msgid ""
- "_: world.kgm\n"
- "The capital of Kenya is..."
--msgstr "肯亞（Kenya）的首都是..."
-+msgstr "肯亞（Kenya）的首都是…"
- 
- #: mapsdatatranslation.cpp:3506
- msgid ""
-@@ -21355,7 +21343,7 @@
- msgid ""
- "_: world.kgm\n"
- "The flag of Kenya is..."
--msgstr "肯亞（Kenya）的國旗是..."
-+msgstr "肯亞（Kenya）的國旗是…"
- 
- #: mapsdatatranslation.cpp:3508
- msgid ""
-@@ -21379,7 +21367,7 @@
- msgid ""
- "_: world.kgm\n"
- "The capital of Kuwait is..."
--msgstr "科威特（Kuwait）的首都是..."
-+msgstr "科威特（Kuwait）的首都是…"
- 
- #: mapsdatatranslation.cpp:3512
- msgid ""
-@@ -21392,7 +21380,7 @@
- msgid ""
- "_: world.kgm\n"
- "The flag of Kuwait is..."
--msgstr "科威特（Kuwait）的國旗是..."
-+msgstr "科威特（Kuwait）的國旗是…"
- 
- #: mapsdatatranslation.cpp:3514
- msgid ""
-@@ -21416,7 +21404,7 @@
- msgid ""
- "_: world.kgm\n"
- "The capital of Lebanon is..."
--msgstr "黎巴嫩（Lebanon）的首都是..."
-+msgstr "黎巴嫩（Lebanon）的首都是…"
- 
- #: mapsdatatranslation.cpp:3518
- msgid ""
-@@ -21429,7 +21417,7 @@
- msgid ""
- "_: world.kgm\n"
- "The flag of Lebanon is..."
--msgstr "黎巴嫩（Lebanon）的國旗是..."
-+msgstr "黎巴嫩（Lebanon）的國旗是…"
- 
- #: mapsdatatranslation.cpp:3520
- msgid ""
-@@ -21453,7 +21441,7 @@
- msgid ""
- "_: world.kgm\n"
- "The capital of Lesotho is..."
--msgstr "賴索托（Lesotho）的首都是..."
-+msgstr "賴索托（Lesotho）的首都是…"
- 
- #: mapsdatatranslation.cpp:3524
- msgid ""
-@@ -21466,7 +21454,7 @@
- msgid ""
- "_: world.kgm\n"
- "The flag of Lesotho is..."
--msgstr "賴索托（Lesotho）的國旗是..."
-+msgstr "賴索托（Lesotho）的國旗是…"
- 
- #: mapsdatatranslation.cpp:3526
- msgid ""
-@@ -21478,7 +21466,7 @@
- msgid ""
- "_: world.kgm\n"
- "Maseru is the capital of..."
--msgstr "馬賽魯（Maseru）的國旗是..."
-+msgstr "馬賽魯（Maseru）的國旗是…"
- 
- #: mapsdatatranslation.cpp:3528
- msgid ""
-@@ -21490,7 +21478,7 @@
- msgid ""
- "_: world.kgm\n"
- "The capital of Liberia is..."
--msgstr "賴比瑞亞（Liberia）的首都是..."
-+msgstr "賴比瑞亞（Liberia）的首都是…"
- 
- #: mapsdatatranslation.cpp:3530
- msgid ""
-@@ -21503,7 +21491,7 @@
- msgid ""
- "_: world.kgm\n"
- "The flag of Liberia is..."
--msgstr "賴比瑞亞（Liberia）的國旗是..."
-+msgstr "賴比瑞亞（Liberia）的國旗是…"
- 
- #: mapsdatatranslation.cpp:3532
- msgid ""
-@@ -21527,7 +21515,7 @@
- msgid ""
- "_: world.kgm\n"
- "The capital of Libya is..."
--msgstr "利比亞（Libya）的首都是..."
-+msgstr "利比亞（Libya）的首都是…"
- 
- #: mapsdatatranslation.cpp:3536
- msgid ""
-@@ -21540,7 +21528,7 @@
- msgid ""
- "_: world.kgm\n"
- "The flag of Libya is..."
--msgstr "利比亞（Libya）的國旗是..."
-+msgstr "利比亞（Libya）的國旗是…"
- 
- #: mapsdatatranslation.cpp:3538
- msgid ""
-@@ -21564,7 +21552,7 @@
- msgid ""
- "_: world.kgm\n"
- "The capital of Liechtenstein is..."
--msgstr "列支敦斯登（Liechtenstein）的首都是..."
-+msgstr "列支敦斯登（Liechtenstein）的首都是…"
- 
- #: mapsdatatranslation.cpp:3542
- msgid ""
-@@ -21577,7 +21565,7 @@
- msgid ""
- "_: world.kgm\n"
- "The flag of Liechtenstein is..."
--msgstr "列支敦斯登（Liechtenstein）的國旗是..."
-+msgstr "列支敦斯登（Liechtenstein）的國旗是…"
- 
- #: mapsdatatranslation.cpp:3544
- msgid ""
-@@ -21601,7 +21589,7 @@
- msgid ""
- "_: world.kgm\n"
- "The capital of Madagascar is..."
--msgstr "馬達加斯加（Madagascar）的首都是..."
-+msgstr "馬達加斯加（Madagascar）的首都是…"
- 
- #: mapsdatatranslation.cpp:3548
- msgid ""
-@@ -21614,7 +21602,7 @@
- msgid ""
- "_: world.kgm\n"
- "The flag of Madagascar is..."
--msgstr "馬達加斯加（Madagascar）的國旗是..."
-+msgstr "馬達加斯加（Madagascar）的國旗是…"
- 
- #: mapsdatatranslation.cpp:3550
- msgid ""
-@@ -21638,7 +21626,7 @@
- msgid ""
- "_: world.kgm\n"
- "The capital of Malawi is..."
--msgstr "馬拉威（Malawi）的首都是..."
-+msgstr "馬拉威（Malawi）的首都是…"
- 
- #: mapsdatatranslation.cpp:3554
- msgid ""
-@@ -21651,7 +21639,7 @@
- msgid ""
- "_: world.kgm\n"
- "The flag of Malawi is..."
--msgstr "馬拉威（Malawi）的國旗是..."
-+msgstr "馬拉威（Malawi）的國旗是…"
- 
- #: mapsdatatranslation.cpp:3556
- msgid ""
-@@ -21675,7 +21663,7 @@
- msgid ""
- "_: world.kgm\n"
- "The capital of Mali is..."
--msgstr "馬利（Mali）的首都是..."
-+msgstr "馬利（Mali）的首都是…"
- 
- #: mapsdatatranslation.cpp:3560
- msgid ""
-@@ -21688,7 +21676,7 @@
- msgid ""
- "_: world.kgm\n"
- "The flag of Mali is..."
--msgstr "馬利（Mali）的國旗是..."
-+msgstr "馬利（Mali）的國旗是…"
- 
- #: mapsdatatranslation.cpp:3562
- msgid ""
-@@ -21712,7 +21700,7 @@
- msgid ""
- "_: world.kgm\n"
- "The capital of Mauritania is..."
--msgstr "茅利塔尼亞（Mauritania）的首都是..."
-+msgstr "茅利塔尼亞（Mauritania）的首都是…"
- 
- #: mapsdatatranslation.cpp:3566
- msgid ""
-@@ -21725,7 +21713,7 @@
- msgid ""
- "_: world.kgm\n"
- "The flag of Mauritania is..."
--msgstr "茅利塔尼亞（Mauritania）的國旗是..."
-+msgstr "茅利塔尼亞（Mauritania）的國旗是…"
- 
- #: mapsdatatranslation.cpp:3568
- msgid ""
-@@ -21749,7 +21737,7 @@
- msgid ""
- "_: world.kgm\n"
- "The capital of Morocco is..."
--msgstr "摩洛哥（Morocco）的首都是..."
-+msgstr "摩洛哥（Morocco）的首都是…"
- 
- #: mapsdatatranslation.cpp:3572
- msgid ""
-@@ -21762,7 +21750,7 @@
- msgid ""
- "_: world.kgm\n"
- "The flag of Morocco is..."
--msgstr "摩洛哥（Morocco）的國旗是..."
-+msgstr "摩洛哥（Morocco）的國旗是…"
- 
- #: mapsdatatranslation.cpp:3574
- msgid ""
-@@ -21786,7 +21774,7 @@
- msgid ""
- "_: world.kgm\n"
- "The capital of Mozambique is..."
--msgstr "莫三比克（Mozambique）的首都是..."
-+msgstr "莫三比克（Mozambique）的首都是…"
- 
- #: mapsdatatranslation.cpp:3578
- msgid ""
-@@ -21799,7 +21787,7 @@
- msgid ""
- "_: world.kgm\n"
- "The flag of Mozambique is..."
--msgstr "莫三比克（Mozambique）的國旗是..."
-+msgstr "莫三比克（Mozambique）的國旗是…"
- 
- #: mapsdatatranslation.cpp:3580
- msgid ""
-@@ -21823,7 +21811,7 @@
- msgid ""
- "_: world.kgm\n"
- "The capital of Namibia is..."
--msgstr "納米比亞（Namibia）的首都是..."
-+msgstr "納米比亞（Namibia）的首都是…"
- 
- #: mapsdatatranslation.cpp:3584
- msgid ""
-@@ -21836,7 +21824,7 @@
- msgid ""
- "_: world.kgm\n"
- "The flag of Namibia is..."
--msgstr "納米比亞（Namibia）的國旗是..."
-+msgstr "納米比亞（Namibia）的國旗是…"
- 
- #: mapsdatatranslation.cpp:3586
- msgid ""
-@@ -21860,7 +21848,7 @@
- msgid ""
- "_: world.kgm\n"
- "The capital of Niger is..."
--msgstr "尼日（Niger）的首都是..."
-+msgstr "尼日（Niger）的首都是…"
- 
- #: mapsdatatranslation.cpp:3590
- msgid ""
-@@ -21873,7 +21861,7 @@
- msgid ""
- "_: world.kgm\n"
- "The flag of Niger is..."
--msgstr "尼日（Niger）的國旗是..."
-+msgstr "尼日（Niger）的國旗是…"
- 
- #: mapsdatatranslation.cpp:3592
- msgid ""
-@@ -21897,7 +21885,7 @@
- msgid ""
- "_: world.kgm\n"
- "The capital of Nigeria is..."
--msgstr "奈及利亞（Nigeria）的首都是..."
-+msgstr "奈及利亞（Nigeria）的首都是…"
- 
- #: mapsdatatranslation.cpp:3596
- msgid ""
-@@ -21910,7 +21898,7 @@
- msgid ""
- "_: world.kgm\n"
- "The flag of Nigeria is..."
--msgstr "奈及利亞（Nigeria）的國旗是..."
-+msgstr "奈及利亞（Nigeria）的國旗是…"
- 
- #: mapsdatatranslation.cpp:3598
- msgid ""
-@@ -21922,7 +21910,7 @@
- msgid ""
- "_: world.kgm\n"
- "Abuja is the capital of..."
--msgstr "阿布加（Abuja）的國旗是..."
-+msgstr "阿布加（Abuja）的國旗是…"
- 
- #: mapsdatatranslation.cpp:3600
- msgid ""
-@@ -21934,7 +21922,7 @@
- msgid ""
- "_: world.kgm\n"
- "The capital of Qatar is..."
--msgstr "卡達（Qatar）的首都是..."
-+msgstr "卡達（Qatar）的首都是…"
- 
- #: mapsdatatranslation.cpp:3602
- msgid ""
-@@ -21947,7 +21935,7 @@
- msgid ""
- "_: world.kgm\n"
- "The flag of Qatar is..."
--msgstr "卡達（Qatar）的國旗是..."
-+msgstr "卡達（Qatar）的國旗是…"
- 
- #: mapsdatatranslation.cpp:3604
- msgid ""
-@@ -21971,7 +21959,7 @@
- msgid ""
- "_: world.kgm\n"
- "The capital of Republic of the Congo is..."
--msgstr "剛果（Republic of the Congo）的首都是..."
-+msgstr "剛果（Republic of the Congo）的首都是…"
- 
- #: mapsdatatranslation.cpp:3608
- msgid ""
-@@ -21984,7 +21972,7 @@
- msgid ""
- "_: world.kgm\n"
- "The flag of Republic of the Congo is..."
--msgstr "剛果（Republic of the Congo）的國旗是..."
-+msgstr "剛果（Republic of the Congo）的國旗是…"
- 
- #: mapsdatatranslation.cpp:3610
- msgid ""
-@@ -21996,7 +21984,7 @@
- msgid ""
- "_: world.kgm\n"
- "Brazzaville is the capital of..."
--msgstr "布拉薩市（Brazzaville）的國旗是..."
-+msgstr "布拉薩市（Brazzaville）的國旗是…"
- 
- #: mapsdatatranslation.cpp:3612
- msgid ""
-@@ -22008,7 +21996,7 @@
- msgid ""
- "_: world.kgm\n"
- "The capital of Rwanda is..."
--msgstr "盧安達（Rwanda）的首都是..."
-+msgstr "盧安達（Rwanda）的首都是…"
- 
- #: mapsdatatranslation.cpp:3614
- msgid ""
-@@ -22021,7 +22009,7 @@
- msgid ""
- "_: world.kgm\n"
- "The flag of Rwanda is..."
--msgstr "盧安達（Rwanda）的國旗是..."
-+msgstr "盧安達（Rwanda）的國旗是…"
- 
- #: mapsdatatranslation.cpp:3616
- msgid ""
-@@ -22045,7 +22033,7 @@
- msgid ""
- "_: world.kgm\n"
- "The capital of Saudi Arabia is..."
--msgstr "沙烏地阿拉伯（Saudi Arabia）的首都是..."
-+msgstr "沙烏地阿拉伯（Saudi Arabia）的首都是…"
- 
- #: mapsdatatranslation.cpp:3620
- msgid ""
-@@ -22058,7 +22046,7 @@
- msgid ""
- "_: world.kgm\n"
- "The flag of Saudi Arabia is..."
--msgstr "沙烏地阿拉伯（Saudi Arabia）的國旗是..."
-+msgstr "沙烏地阿拉伯（Saudi Arabia）的國旗是…"
- 
- #: mapsdatatranslation.cpp:3622
- msgid ""
-@@ -22082,7 +22070,7 @@
- msgid ""
- "_: world.kgm\n"
- "The capital of Senegal is..."
--msgstr "塞內加爾（Senegal）的首都是..."
-+msgstr "塞內加爾（Senegal）的首都是…"
- 
- #: mapsdatatranslation.cpp:3626
- msgid ""
-@@ -22095,7 +22083,7 @@
- msgid ""
- "_: world.kgm\n"
- "The flag of Senegal is..."
--msgstr "塞內加爾（Senegal）的國旗是..."
-+msgstr "塞內加爾（Senegal）的國旗是…"
- 
- #: mapsdatatranslation.cpp:3628
- msgid ""
-@@ -22119,7 +22107,7 @@
- msgid ""
- "_: world.kgm\n"
- "The capital of Sierra Leone is..."
--msgstr "獅子山共和國（Sierra Leone）的首都是..."
-+msgstr "獅子山共和國（Sierra Leone）的首都是…"
- 
- #: mapsdatatranslation.cpp:3632
- msgid ""
-@@ -22132,7 +22120,7 @@
- msgid ""
- "_: world.kgm\n"
- "The flag of Sierra Leone is..."
--msgstr "獅子山共和國（Sierra Leone）的國旗是..."
-+msgstr "獅子山共和國（Sierra Leone）的國旗是…"
- 
- #: mapsdatatranslation.cpp:3634
- msgid ""
-@@ -22156,7 +22144,7 @@
- msgid ""
- "_: world.kgm\n"
- "The capital of Somalia is..."
--msgstr "索馬利亞（Somalia）的首都是..."
-+msgstr "索馬利亞（Somalia）的首都是…"
- 
- #: mapsdatatranslation.cpp:3638
- msgid ""
-@@ -22169,7 +22157,7 @@
- msgid ""
- "_: world.kgm\n"
- "The flag of Somalia is..."
--msgstr "索馬利亞（Somalia）的國旗是..."
-+msgstr "索馬利亞（Somalia）的國旗是…"
- 
- #: mapsdatatranslation.cpp:3640
- msgid ""
-@@ -22193,7 +22181,7 @@
- msgid ""
- "_: world.kgm\n"
- "The capital of South Africa is..."
--msgstr "南非（South Africa）的首都是..."
-+msgstr "南非（South Africa）的首都是…"
- 
- #: mapsdatatranslation.cpp:3644
- msgid ""
-@@ -22206,7 +22194,7 @@
- msgid ""
- "_: world.kgm\n"
- "The flag of South Africa is..."
--msgstr "南非（South Africa）的國旗是..."
-+msgstr "南非（South Africa）的國旗是…"
- 
- #: mapsdatatranslation.cpp:3646
- msgid ""
-@@ -22230,7 +22218,7 @@
- msgid ""
- "_: world.kgm\n"
- "The capital of Sudan is..."
--msgstr "蘇丹（Sudan）的首都是..."
-+msgstr "蘇丹（Sudan）的首都是…"
- 
- #: mapsdatatranslation.cpp:3650
- msgid ""
-@@ -22243,7 +22231,7 @@
- msgid ""
- "_: world.kgm\n"
- "The flag of Sudan is..."
--msgstr "蘇丹（Sudan）的國旗是..."
-+msgstr "蘇丹（Sudan）的國旗是…"
- 
- #: mapsdatatranslation.cpp:3652
- msgid ""
-@@ -22267,7 +22255,7 @@
- msgid ""
- "_: world.kgm\n"
- "The capital of Swaziland is..."
--msgstr "史瓦濟蘭（Swaziland）的首都是..."
-+msgstr "史瓦濟蘭（Swaziland）的首都是…"
- 
- #: mapsdatatranslation.cpp:3656
- msgid ""
-@@ -22280,7 +22268,7 @@
- msgid ""
- "_: world.kgm\n"
- "The flag of Swaziland is..."
--msgstr "史瓦濟蘭（Swaziland）的國旗是..."
-+msgstr "史瓦濟蘭（Swaziland）的國旗是…"
- 
- #: mapsdatatranslation.cpp:3658
- msgid ""
-@@ -22304,7 +22292,7 @@
- msgid ""
- "_: world.kgm\n"
- "The capital of Syria is..."
--msgstr "敘利亞（Syria）的首都是..."
-+msgstr "敘利亞（Syria）的首都是…"
- 
- #: mapsdatatranslation.cpp:3662
- msgid ""
-@@ -22317,7 +22305,7 @@
- msgid ""
- "_: world.kgm\n"
- "The flag of Syria is..."
--msgstr "敘利亞（Syria）的國旗是..."
-+msgstr "敘利亞（Syria）的國旗是…"
- 
- #: mapsdatatranslation.cpp:3664
- msgid ""
-@@ -22341,7 +22329,7 @@
- msgid ""
- "_: world.kgm\n"
- "The capital of Tanzania is..."
--msgstr "坦尚尼亞（Tanzania）的首都是..."
-+msgstr "坦尚尼亞（Tanzania）的首都是…"
- 
- #: mapsdatatranslation.cpp:3668
- msgid ""
-@@ -22354,7 +22342,7 @@
- msgid ""
- "_: world.kgm\n"
- "The flag of Tanzania is..."
--msgstr "坦尚尼亞（Tanzania）的國旗是..."
-+msgstr "坦尚尼亞（Tanzania）的國旗是…"
- 
- #: mapsdatatranslation.cpp:3670
- msgid ""
-@@ -22378,7 +22366,7 @@
- msgid ""
- "_: world.kgm\n"
- "The capital of The Gambia is..."
--msgstr "甘比亞（The Gambia）的首都是..."
-+msgstr "甘比亞（The Gambia）的首都是…"
- 
- #: mapsdatatranslation.cpp:3674
- msgid ""
-@@ -22391,7 +22379,7 @@
- msgid ""
- "_: world.kgm\n"
- "The flag of The Gambia is..."
--msgstr "甘比亞（The Gambia）的國旗是..."
-+msgstr "甘比亞（The Gambia）的國旗是…"
- 
- #: mapsdatatranslation.cpp:3676
- msgid ""
-@@ -22415,7 +22403,7 @@
- msgid ""
- "_: world.kgm\n"
- "The capital of Togo is..."
--msgstr "多哥（Togo）的首都是..."
-+msgstr "多哥（Togo）的首都是…"
- 
- #: mapsdatatranslation.cpp:3680
- msgid ""
-@@ -22428,7 +22416,7 @@
- msgid ""
- "_: world.kgm\n"
- "The flag of Togo is..."
--msgstr "多哥（Togo）的國旗是..."
-+msgstr "多哥（Togo）的國旗是…"
- 
- #: mapsdatatranslation.cpp:3682
- msgid ""
-@@ -22452,7 +22440,7 @@
- msgid ""
- "_: world.kgm\n"
- "The capital of Tunisia is..."
--msgstr "突尼西亞（Tunisia）的首都是..."
-+msgstr "突尼西亞（Tunisia）的首都是…"
- 
- #: mapsdatatranslation.cpp:3686
- msgid ""
-@@ -22465,7 +22453,7 @@
- msgid ""
- "_: world.kgm\n"
- "The flag of Tunisia is..."
--msgstr "突尼西亞（Tunisia）的國旗是..."
-+msgstr "突尼西亞（Tunisia）的國旗是…"
- 
- #: mapsdatatranslation.cpp:3688
- msgid ""
-@@ -22489,7 +22477,7 @@
- msgid ""
- "_: world.kgm\n"
- "The capital of Uganda is..."
--msgstr "烏干達（Uganda）的首都是..."
-+msgstr "烏干達（Uganda）的首都是…"
- 
- #: mapsdatatranslation.cpp:3692
- msgid ""
-@@ -22502,7 +22490,7 @@
- msgid ""
- "_: world.kgm\n"
- "The flag of Uganda is..."
--msgstr "烏干達（Uganda）的國旗是..."
-+msgstr "烏干達（Uganda）的國旗是…"
- 
- #: mapsdatatranslation.cpp:3694
- msgid ""
-@@ -22526,7 +22514,7 @@
- msgid ""
- "_: world.kgm\n"
- "The capital of United Arab Emirates is..."
--msgstr "阿拉伯聯合大公國（United Arab Emirates）的首都是..."
-+msgstr "阿拉伯聯合大公國（United Arab Emirates）的首都是…"
- 
- #: mapsdatatranslation.cpp:3698
- msgid ""
-@@ -22539,7 +22527,7 @@
- msgid ""
- "_: world.kgm\n"
- "The flag of United Arab Emirates is..."
--msgstr "阿拉伯聯合大公國（United Arab Emirates）的國旗是..."
-+msgstr "阿拉伯聯合大公國（United Arab Emirates）的國旗是…"
- 
- #: mapsdatatranslation.cpp:3700
- msgid ""
-@@ -22563,7 +22551,7 @@
- msgid ""
- "_: world.kgm\n"
- "The capital of Oman is..."
--msgstr "阿曼（Oman）的首都是..."
-+msgstr "阿曼（Oman）的首都是…"
- 
- #: mapsdatatranslation.cpp:3704
- msgid ""
-@@ -22576,7 +22564,7 @@
- msgid ""
- "_: world.kgm\n"
- "The flag of Oman is..."
--msgstr "阿曼（Oman）的國旗是..."
-+msgstr "阿曼（Oman）的國旗是…"
- 
- #: mapsdatatranslation.cpp:3706
- msgid ""
-@@ -22606,7 +22594,7 @@
- msgid ""
- "_: world.kgm\n"
- "The capital of Western Sahara is..."
--msgstr "西撒哈拉（Western Sahara）的首都是..."
-+msgstr "西撒哈拉（Western Sahara）的首都是…"
- 
- #: mapsdatatranslation.cpp:3711
- msgid ""
-@@ -22619,7 +22607,7 @@
- msgid ""
- "_: world.kgm\n"
- "The flag of Western Sahara is..."
--msgstr "西撒哈拉（Western Sahara）的國旗是..."
-+msgstr "西撒哈拉（Western Sahara）的國旗是…"
- 
- #: mapsdatatranslation.cpp:3713
- msgid ""
-@@ -22643,7 +22631,7 @@
- msgid ""
- "_: world.kgm\n"
- "The capital of Yemen is..."
--msgstr "葉門（Yemen）的首都是..."
-+msgstr "葉門（Yemen）的首都是…"
- 
- #: mapsdatatranslation.cpp:3717
- msgid ""
-@@ -22656,7 +22644,7 @@
- msgid ""
- "_: world.kgm\n"
- "The flag of Yemen is..."
--msgstr "葉門（Yemen）的國旗是..."
-+msgstr "葉門（Yemen）的國旗是…"
- 
- #: mapsdatatranslation.cpp:3719
- msgid ""
-@@ -22680,7 +22668,7 @@
- msgid ""
- "_: world.kgm\n"
- "The capital of Zambia is..."
--msgstr "尚比亞（Zambia）的首都是..."
-+msgstr "尚比亞（Zambia）的首都是…"
- 
- #: mapsdatatranslation.cpp:3723
- msgid ""
-@@ -22693,7 +22681,7 @@
- msgid ""
- "_: world.kgm\n"
- "The flag of Zambia is..."
--msgstr "尚比亞（Zambia）的國旗是..."
-+msgstr "尚比亞（Zambia）的國旗是…"
- 
- #: mapsdatatranslation.cpp:3725
- msgid ""
-@@ -22717,7 +22705,7 @@
- msgid ""
- "_: world.kgm\n"
- "The capital of Zimbabwe is..."
--msgstr "辛巴威（Zimbabwe）的首都是..."
-+msgstr "辛巴威（Zimbabwe）的首都是…"
- 
- #: mapsdatatranslation.cpp:3729
- msgid ""
-@@ -22730,7 +22718,7 @@
- msgid ""
- "_: world.kgm\n"
- "The flag of Zimbabwe is..."
--msgstr "辛巴威（Zimbabwe）的國旗是..."
-+msgstr "辛巴威（Zimbabwe）的國旗是…"
- 
- #: mapsdatatranslation.cpp:3731
- msgid ""
-@@ -22754,7 +22742,7 @@
- msgid ""
- "_: world.kgm\n"
- "The capital of Albania is..."
--msgstr "阿爾巴尼亞（Albania）的首都是..."
-+msgstr "阿爾巴尼亞（Albania）的首都是…"
- 
- #: mapsdatatranslation.cpp:3735
- msgid ""
-@@ -22767,7 +22755,7 @@
- msgid ""
- "_: world.kgm\n"
- "The flag of Albania is..."
--msgstr "阿爾巴尼亞（Albania）的國旗是..."
-+msgstr "阿爾巴尼亞（Albania）的國旗是…"
- 
- #: mapsdatatranslation.cpp:3737
- msgid ""
-@@ -22791,7 +22779,7 @@
- msgid ""
- "_: world.kgm\n"
- "The capital of Austria is..."
--msgstr "奧地利（Austria）的首都是..."
-+msgstr "奧地利（Austria）的首都是…"
- 
- #: mapsdatatranslation.cpp:3741
- msgid ""
-@@ -22804,7 +22792,7 @@
- msgid ""
- "_: world.kgm\n"
- "The flag of Austria is..."
--msgstr "奧地利（Austria）的國旗是..."
-+msgstr "奧地利（Austria）的國旗是…"
- 
- #: mapsdatatranslation.cpp:3743
- msgid ""
-@@ -22828,7 +22816,7 @@
- msgid ""
- "_: world.kgm\n"
- "The capital of Belarus is..."
--msgstr "白俄羅斯（Belarus）的首都是..."
-+msgstr "白俄羅斯（Belarus）的首都是…"
- 
- #: mapsdatatranslation.cpp:3747
- msgid ""
-@@ -22841,7 +22829,7 @@
- msgid ""
- "_: world.kgm\n"
- "The flag of Belarus is..."
--msgstr "白俄羅斯（Belarus）的國旗是..."
-+msgstr "白俄羅斯（Belarus）的國旗是…"
- 
- #: mapsdatatranslation.cpp:3749
- msgid ""
-@@ -22865,7 +22853,7 @@
- msgid ""
- "_: world.kgm\n"
- "The capital of Belgium is..."
--msgstr "比利時（Belgium）的首都是..."
-+msgstr "比利時（Belgium）的首都是…"
- 
- #: mapsdatatranslation.cpp:3753
- msgid ""
-@@ -22878,7 +22866,7 @@
- msgid ""
- "_: world.kgm\n"
- "The flag of Belgium is..."
--msgstr "比利時（Belgium）的國旗是..."
-+msgstr "比利時（Belgium）的國旗是…"
- 
- #: mapsdatatranslation.cpp:3755
- msgid ""
-@@ -22902,7 +22890,7 @@
- msgid ""
- "_: world.kgm\n"
- "The capital of Bosnia and Herzegovina is..."
--msgstr "波士尼亞赫塞哥維納（Bosnia and Herzegovina）的首都是..."
-+msgstr "波士尼亞赫塞哥維納（Bosnia and Herzegovina）的首都是…"
- 
- #: mapsdatatranslation.cpp:3759
- msgid ""
-@@ -22915,7 +22903,7 @@
- msgid ""
- "_: world.kgm\n"
- "The flag of Bosnia and Herzegovina is..."
--msgstr "波士尼亞赫塞哥維納（Bosnia and Herzegovina）的國旗是..."
-+msgstr "波士尼亞赫塞哥維納（Bosnia and Herzegovina）的國旗是…"
- 
- #: mapsdatatranslation.cpp:3761
- msgid ""
-@@ -22939,7 +22927,7 @@
- msgid ""
- "_: world.kgm\n"
- "The capital of Bulgaria is..."
--msgstr "保加利亞（Bulgaria）的首都是..."
-+msgstr "保加利亞（Bulgaria）的首都是…"
- 
- #: mapsdatatranslation.cpp:3765
- msgid ""
-@@ -22952,7 +22940,7 @@
- msgid ""
- "_: world.kgm\n"
- "The flag of Bulgaria is..."
--msgstr "保加利亞（Bulgaria）的國旗是..."
-+msgstr "保加利亞（Bulgaria）的國旗是…"
- 
- #: mapsdatatranslation.cpp:3767
- msgid ""
-@@ -22964,7 +22952,7 @@
- msgid ""
- "_: world.kgm\n"
- "Sofia is the capital of..."
--msgstr "索菲亞（Sofia）的國旗是..."
-+msgstr "索菲亞（Sofia）的國旗是…"
- 
- #: mapsdatatranslation.cpp:3769
- msgid ""
-@@ -22976,7 +22964,7 @@
- msgid ""
- "_: world.kgm\n"
- "The capital of Croatia is..."
--msgstr "克羅埃西亞（Croatia）的首都是..."
-+msgstr "克羅埃西亞（Croatia）的首都是…"
- 
- #: mapsdatatranslation.cpp:3771
- msgid ""
-@@ -22989,7 +22977,7 @@
- msgid ""
- "_: world.kgm\n"
- "The flag of Croatia is..."
--msgstr "克羅埃西亞（Croatia）的國旗是..."
-+msgstr "克羅埃西亞（Croatia）的國旗是…"
- 
- #: mapsdatatranslation.cpp:3773
- msgid ""
-@@ -23013,7 +23001,7 @@
- msgid ""
- "_: world.kgm\n"
- "The capital of Czech Republic is..."
--msgstr "捷克（Czech Republic）的首都是..."
-+msgstr "捷克（Czech Republic）的首都是…"
- 
- #: mapsdatatranslation.cpp:3777
- msgid ""
-@@ -23026,7 +23014,7 @@
- msgid ""
- "_: world.kgm\n"
- "The flag of Czech Republic is..."
--msgstr "捷克（Czech Republic）的國旗是..."
-+msgstr "捷克（Czech Republic）的國旗是…"
- 
- #: mapsdatatranslation.cpp:3779
- msgid ""
-@@ -23050,7 +23038,7 @@
- msgid ""
- "_: world.kgm\n"
- "The capital of Denmark is..."
--msgstr "丹麥（Denmark）的首都是..."
-+msgstr "丹麥（Denmark）的首都是…"
- 
- #: mapsdatatranslation.cpp:3783
- msgid ""
-@@ -23063,7 +23051,7 @@
- msgid ""
- "_: world.kgm\n"
- "The flag of Denmark is..."
--msgstr "丹麥（Denmark）的國旗是..."
-+msgstr "丹麥（Denmark）的國旗是…"
- 
- #: mapsdatatranslation.cpp:3785
- msgid ""
-@@ -23087,7 +23075,7 @@
- msgid ""
- "_: world.kgm\n"
- "The capital of Estonia is..."
--msgstr "愛沙尼亞（Estonia）的首都是..."
-+msgstr "愛沙尼亞（Estonia）的首都是…"
- 
- #: mapsdatatranslation.cpp:3789
- msgid ""
-@@ -23100,7 +23088,7 @@
- msgid ""
- "_: world.kgm\n"
- "The flag of Estonia is..."
--msgstr "愛沙尼亞（Estonia）的國旗是..."
-+msgstr "愛沙尼亞（Estonia）的國旗是…"
- 
- #: mapsdatatranslation.cpp:3791
- msgid ""
-@@ -23124,7 +23112,7 @@
- msgid ""
- "_: world.kgm\n"
- "The capital of Finland is..."
--msgstr "芬蘭（Finland）的首都是..."
-+msgstr "芬蘭（Finland）的首都是…"
- 
- #: mapsdatatranslation.cpp:3795
- msgid ""
-@@ -23137,7 +23125,7 @@
- msgid ""
- "_: world.kgm\n"
- "The flag of Finland is..."
--msgstr "芬蘭（Finland）的國旗是..."
-+msgstr "芬蘭（Finland）的國旗是…"
- 
- #: mapsdatatranslation.cpp:3797
- msgid ""
-@@ -23161,7 +23149,7 @@
- msgid ""
- "_: world.kgm\n"
- "The capital of Macedonia is..."
--msgstr "馬其頓（Macedonia）的首都是..."
-+msgstr "馬其頓（Macedonia）的首都是…"
- 
- #: mapsdatatranslation.cpp:3801
- msgid ""
-@@ -23174,7 +23162,7 @@
- msgid ""
- "_: world.kgm\n"
- "The flag of Macedonia is..."
--msgstr "馬其頓（Macedonia）的國旗是..."
-+msgstr "馬其頓（Macedonia）的國旗是…"
- 
- #: mapsdatatranslation.cpp:3803
- msgid ""
-@@ -23198,7 +23186,7 @@
- msgid ""
- "_: world.kgm\n"
- "The capital of France is..."
--msgstr "法蘭西（France）的首都是..."
-+msgstr "法蘭西（France）的首都是…"
- 
- #: mapsdatatranslation.cpp:3807
- msgid ""
-@@ -23211,7 +23199,7 @@
- msgid ""
- "_: world.kgm\n"
- "The flag of France is..."
--msgstr "法蘭西（France）的國旗是..."
-+msgstr "法蘭西（France）的國旗是…"
- 
- #: mapsdatatranslation.cpp:3809
- msgid ""
-@@ -23235,7 +23223,7 @@
- msgid ""
- "_: world.kgm\n"
- "The capital of Germany is..."
--msgstr "德意志（Germany）的首都是..."
-+msgstr "德意志（Germany）的首都是…"
- 
- #: mapsdatatranslation.cpp:3813
- msgid ""
-@@ -23248,7 +23236,7 @@
- msgid ""
- "_: world.kgm\n"
- "The flag of Germany is..."
--msgstr "德意志（Germany）的國旗是..."
-+msgstr "德意志（Germany）的國旗是…"
- 
- #: mapsdatatranslation.cpp:3815
- msgid ""
-@@ -23272,7 +23260,7 @@
- msgid ""
- "_: world.kgm\n"
- "The capital of Greece is..."
--msgstr "希臘（Greece）的首都是..."
-+msgstr "希臘（Greece）的首都是…"
- 
- #: mapsdatatranslation.cpp:3819
- msgid ""
-@@ -23285,7 +23273,7 @@
- msgid ""
- "_: world.kgm\n"
- "The flag of Greece is..."
--msgstr "希臘（Greece）的國旗是..."
-+msgstr "希臘（Greece）的國旗是…"
- 
- #: mapsdatatranslation.cpp:3821
- msgid ""
-@@ -23309,7 +23297,7 @@
- msgid ""
- "_: world.kgm\n"
- "The capital of Hungary is..."
--msgstr "匈牙利（Hungary）的首都是..."
-+msgstr "匈牙利（Hungary）的首都是…"
- 
- #: mapsdatatranslation.cpp:3825
- msgid ""
-@@ -23322,7 +23310,7 @@
- msgid ""
- "_: world.kgm\n"
- "The flag of Hungary is..."
--msgstr "匈牙利（Hungary）的國旗是..."
-+msgstr "匈牙利（Hungary）的國旗是…"
- 
- #: mapsdatatranslation.cpp:3827
- msgid ""
-@@ -23346,7 +23334,7 @@
- msgid ""
- "_: world.kgm\n"
- "The capital of Iceland is..."
--msgstr "冰島（Iceland）的首都是..."
-+msgstr "冰島（Iceland）的首都是…"
- 
- #: mapsdatatranslation.cpp:3831
- msgid ""
-@@ -23359,7 +23347,7 @@
- msgid ""
- "_: world.kgm\n"
- "The flag of Iceland is..."
--msgstr "冰島（Iceland）的國旗是..."
-+msgstr "冰島（Iceland）的國旗是…"
- 
- #: mapsdatatranslation.cpp:3833
- msgid ""
-@@ -23383,7 +23371,7 @@
- msgid ""
- "_: world.kgm\n"
- "The capital of Ireland is..."
--msgstr "愛爾蘭（Ireland）的首都是..."
-+msgstr "愛爾蘭（Ireland）的首都是…"
- 
- #: mapsdatatranslation.cpp:3837
- msgid ""
-@@ -23396,7 +23384,7 @@
- msgid ""
- "_: world.kgm\n"
- "The flag of Ireland is..."
--msgstr "愛爾蘭（Ireland）的國旗是..."
-+msgstr "愛爾蘭（Ireland）的國旗是…"
- 
- #: mapsdatatranslation.cpp:3839
- msgid ""
-@@ -23420,7 +23408,7 @@
- msgid ""
- "_: world.kgm\n"
- "The capital of Italy is..."
--msgstr "義大利（Italy）的首都是..."
-+msgstr "義大利（Italy）的首都是…"
- 
- #: mapsdatatranslation.cpp:3843
- msgid ""
-@@ -23433,7 +23421,7 @@
- msgid ""
- "_: world.kgm\n"
- "The flag of Italy is..."
--msgstr "義大利（Italy）的國旗是..."
-+msgstr "義大利（Italy）的國旗是…"
- 
- #: mapsdatatranslation.cpp:3845
- msgid ""
-@@ -23457,7 +23445,7 @@
- msgid ""
- "_: world.kgm\n"
- "The capital of Latvia is..."
--msgstr "拉脫維亞（Latvia）的首都是..."
-+msgstr "拉脫維亞（Latvia）的首都是…"
- 
- #: mapsdatatranslation.cpp:3849
- msgid ""
-@@ -23470,7 +23458,7 @@
- msgid ""
- "_: world.kgm\n"
- "The flag of Latvia is..."
--msgstr "拉脫維亞（Latvia）的國旗是..."
-+msgstr "拉脫維亞（Latvia）的國旗是…"
- 
- #: mapsdatatranslation.cpp:3851
- msgid ""
-@@ -23494,7 +23482,7 @@
- msgid ""
- "_: world.kgm\n"
- "The capital of Lithuania is..."
--msgstr "立陶宛（Lithuania）的首都是..."
-+msgstr "立陶宛（Lithuania）的首都是…"
- 
- #: mapsdatatranslation.cpp:3855
- msgid ""
-@@ -23507,7 +23495,7 @@
- msgid ""
- "_: world.kgm\n"
- "The flag of Lithuania is..."
--msgstr "立陶宛（Lithuania）的國旗是..."
-+msgstr "立陶宛（Lithuania）的國旗是…"
- 
- #: mapsdatatranslation.cpp:3857
- msgid ""
-@@ -23531,7 +23519,7 @@
- msgid ""
- "_: world.kgm\n"
- "The capital of Luxembourg is..."
--msgstr "盧森堡（Luxembourg）的首都是..."
-+msgstr "盧森堡（Luxembourg）的首都是…"
- 
- #: mapsdatatranslation.cpp:3861
- msgid ""
-@@ -23544,7 +23532,7 @@
- msgid ""
- "_: world.kgm\n"
- "The flag of Luxembourg is..."
--msgstr "盧森堡（Luxembourg）的國旗是..."
-+msgstr "盧森堡（Luxembourg）的國旗是…"
- 
- #: mapsdatatranslation.cpp:3864
- msgid ""
-@@ -23562,7 +23550,7 @@
- msgid ""
- "_: world.kgm\n"
- "The capital of Moldova is..."
--msgstr "摩爾多瓦（Moldova）的首都是..."
-+msgstr "摩爾多瓦（Moldova）的首都是…"
- 
- #: mapsdatatranslation.cpp:3867
- msgid ""
-@@ -23575,7 +23563,7 @@
- msgid ""
- "_: world.kgm\n"
- "The flag of Moldova is..."
--msgstr "摩爾多瓦（Moldova）的國旗是..."
-+msgstr "摩爾多瓦（Moldova）的國旗是…"
- 
- #: mapsdatatranslation.cpp:3869
- msgid ""
-@@ -23599,7 +23587,7 @@
- msgid ""
- "_: world.kgm\n"
- "The capital of Netherlands is..."
--msgstr "荷蘭（Netherlands）的首都是..."
-+msgstr "荷蘭（Netherlands）的首都是…"
- 
- #: mapsdatatranslation.cpp:3873
- msgid ""
-@@ -23612,7 +23600,7 @@
- msgid ""
- "_: world.kgm\n"
- "The flag of Netherlands is..."
--msgstr "荷蘭（Netherlands）的國旗是..."
-+msgstr "荷蘭（Netherlands）的國旗是…"
- 
- #: mapsdatatranslation.cpp:3875
- msgid ""
-@@ -23636,7 +23624,7 @@
- msgid ""
- "_: world.kgm\n"
- "The capital of Norway is..."
--msgstr "挪威（Norway）的首都是..."
-+msgstr "挪威（Norway）的首都是…"
- 
- #: mapsdatatranslation.cpp:3879
- msgid ""
-@@ -23649,7 +23637,7 @@
- msgid ""
- "_: world.kgm\n"
- "The flag of Norway is..."
--msgstr "挪威（Norway）的國旗是..."
-+msgstr "挪威（Norway）的國旗是…"
- 
- #: mapsdatatranslation.cpp:3881
- msgid ""
-@@ -23673,7 +23661,7 @@
- msgid ""
- "_: world.kgm\n"
- "The capital of Poland is..."
--msgstr "波蘭（Poland）的首都是..."
-+msgstr "波蘭（Poland）的首都是…"
- 
- #: mapsdatatranslation.cpp:3885
- msgid ""
-@@ -23686,7 +23674,7 @@
- msgid ""
- "_: world.kgm\n"
- "The flag of Poland is..."
--msgstr "波蘭（Poland）的國旗是..."
-+msgstr "波蘭（Poland）的國旗是…"
- 
- #: mapsdatatranslation.cpp:3887
- msgid ""
-@@ -23710,7 +23698,7 @@
- msgid ""
- "_: world.kgm\n"
- "The capital of Portugal is..."
--msgstr "葡萄牙（Portugal）的首都是..."
-+msgstr "葡萄牙（Portugal）的首都是…"
- 
- #: mapsdatatranslation.cpp:3891
- msgid ""
-@@ -23723,7 +23711,7 @@
- msgid ""
- "_: world.kgm\n"
- "The flag of Portugal is..."
--msgstr "葡萄牙（Portugal）的國旗是..."
-+msgstr "葡萄牙（Portugal）的國旗是…"
- 
- #: mapsdatatranslation.cpp:3893
- msgid ""
-@@ -23747,7 +23735,7 @@
- msgid ""
- "_: world.kgm\n"
- "The capital of Romania is..."
--msgstr "羅馬尼亞（Romania）的首都是..."
-+msgstr "羅馬尼亞（Romania）的首都是…"
- 
- #: mapsdatatranslation.cpp:3897
- msgid ""
-@@ -23760,7 +23748,7 @@
- msgid ""
- "_: world.kgm\n"
- "The flag of Romania is..."
--msgstr "羅馬尼亞（Romania）的國旗是..."
-+msgstr "羅馬尼亞（Romania）的國旗是…"
- 
- #: mapsdatatranslation.cpp:3899
- msgid ""
-@@ -23784,7 +23772,7 @@
- msgid ""
- "_: world.kgm\n"
- "The capital of Russia is..."
--msgstr "俄羅斯（Russia）的首都是..."
-+msgstr "俄羅斯（Russia）的首都是…"
- 
- #: mapsdatatranslation.cpp:3903
- msgid ""
-@@ -23797,7 +23785,7 @@
- msgid ""
- "_: world.kgm\n"
- "The flag of Russia is..."
--msgstr "俄羅斯（Russia）的國旗是..."
-+msgstr "俄羅斯（Russia）的國旗是…"
- 
- #: mapsdatatranslation.cpp:3905
- msgid ""
-@@ -23821,7 +23809,7 @@
- msgid ""
- "_: world.kgm\n"
- "The capital of San Marino is..."
--msgstr "聖馬利諾（San Marino）的首都是..."
-+msgstr "聖馬利諾（San Marino）的首都是…"
- 
- #: mapsdatatranslation.cpp:3909
- msgid ""
-@@ -23834,7 +23822,7 @@
- msgid ""
- "_: world.kgm\n"
- "The flag of San Marino is..."
--msgstr "聖馬利諾（San Marino）的國旗是..."
-+msgstr "聖馬利諾（San Marino）的國旗是…"
- 
- #: mapsdatatranslation.cpp:3912
- msgid ""
-@@ -23852,7 +23840,7 @@
- msgid ""
- "_: world.kgm\n"
- "The capital of Serbia is..."
--msgstr "塞爾維亞（Serbia）的首都是..."
-+msgstr "塞爾維亞（Serbia）的首都是…"
- 
- #: mapsdatatranslation.cpp:3915
- msgid ""
-@@ -23865,7 +23853,7 @@
- msgid ""
- "_: world.kgm\n"
- "The flag of Serbia is..."
--msgstr "塞爾維亞（Serbia）的國旗是..."
-+msgstr "塞爾維亞（Serbia）的國旗是…"
- 
- #: mapsdatatranslation.cpp:3917
- msgid ""
-@@ -23889,7 +23877,7 @@
- msgid ""
- "_: world.kgm\n"
- "The capital of Montenegro is..."
--msgstr "蒙特內哥羅（Montenegro）的首都是..."
-+msgstr "蒙特內哥羅（Montenegro）的首都是…"
- 
- #: mapsdatatranslation.cpp:3921
- msgid ""
-@@ -23902,7 +23890,7 @@
- msgid ""
- "_: world.kgm\n"
- "The flag of Montenegro is..."
--msgstr "蒙特內哥羅（Montenegro）的國旗是..."
-+msgstr "蒙特內哥羅（Montenegro）的國旗是…"
- 
- #: mapsdatatranslation.cpp:3923
- msgid ""
-@@ -23926,7 +23914,7 @@
- msgid ""
- "_: world.kgm\n"
- "The capital of Slovakia is..."
--msgstr "斯洛伐克（Slovakia）的首都是..."
-+msgstr "斯洛伐克（Slovakia）的首都是…"
- 
- #: mapsdatatranslation.cpp:3927
- msgid ""
-@@ -23939,7 +23927,7 @@
- msgid ""
- "_: world.kgm\n"
- "The flag of Slovakia is..."
--msgstr "斯洛伐克（Slovakia）的國旗是..."
-+msgstr "斯洛伐克（Slovakia）的國旗是…"
- 
- #: mapsdatatranslation.cpp:3929
- msgid ""
-@@ -23963,7 +23951,7 @@
- msgid ""
- "_: world.kgm\n"
- "The capital of Slovenia is..."
--msgstr "斯洛伐尼亞（Slovenia）的首都是..."
-+msgstr "斯洛伐尼亞（Slovenia）的首都是…"
- 
- #: mapsdatatranslation.cpp:3933
- msgid ""
-@@ -23976,7 +23964,7 @@
- msgid ""
- "_: world.kgm\n"
- "The flag of Slovenia is..."
--msgstr "斯洛伐尼亞（Slovenia）的國旗是..."
-+msgstr "斯洛伐尼亞（Slovenia）的國旗是…"
- 
- #: mapsdatatranslation.cpp:3935
- msgid ""
-@@ -24000,7 +23988,7 @@
- msgid ""
- "_: world.kgm\n"
- "The capital of Spain is..."
--msgstr "西班牙（Spain）的首都是..."
-+msgstr "西班牙（Spain）的首都是…"
- 
- #: mapsdatatranslation.cpp:3939
- msgid ""
-@@ -24013,7 +24001,7 @@
- msgid ""
- "_: world.kgm\n"
- "The flag of Spain is..."
--msgstr "西班牙（Spain）的國旗是..."
-+msgstr "西班牙（Spain）的國旗是…"
- 
- #: mapsdatatranslation.cpp:3941
- msgid ""
-@@ -24037,7 +24025,7 @@
- msgid ""
- "_: world.kgm\n"
- "The capital of Sweden is..."
--msgstr "瑞典（Sweden）的首都是..."
-+msgstr "瑞典（Sweden）的首都是…"
- 
- #: mapsdatatranslation.cpp:3945
- msgid ""
-@@ -24050,7 +24038,7 @@
- msgid ""
- "_: world.kgm\n"
- "The flag of Sweden is..."
--msgstr "瑞典（Sweden）的國旗是..."
-+msgstr "瑞典（Sweden）的國旗是…"
- 
- #: mapsdatatranslation.cpp:3947
- msgid ""
-@@ -24074,7 +24062,7 @@
- msgid ""
- "_: world.kgm\n"
- "The capital of Switzerland is..."
--msgstr "瑞士（Switzerland）的首都是..."
-+msgstr "瑞士（Switzerland）的首都是…"
- 
- #: mapsdatatranslation.cpp:3951
- msgid ""
-@@ -24087,7 +24075,7 @@
- msgid ""
- "_: world.kgm\n"
- "The flag of Switzerland is..."
--msgstr "瑞士（Switzerland）的國旗是..."
-+msgstr "瑞士（Switzerland）的國旗是…"
- 
- #: mapsdatatranslation.cpp:3953
- msgid ""
-@@ -24111,7 +24099,7 @@
- msgid ""
- "_: world.kgm\n"
- "The capital of Turkey is..."
--msgstr "土耳其（Turkey）的首都是..."
-+msgstr "土耳其（Turkey）的首都是…"
- 
- #: mapsdatatranslation.cpp:3957
- msgid ""
-@@ -24124,7 +24112,7 @@
- msgid ""
- "_: world.kgm\n"
- "The flag of Turkey is..."
--msgstr "土耳其（Turkey）的國旗是..."
-+msgstr "土耳其（Turkey）的國旗是…"
- 
- #: mapsdatatranslation.cpp:3959
- msgid ""
-@@ -24148,7 +24136,7 @@
- msgid ""
- "_: world.kgm\n"
- "The capital of Ukraine is..."
--msgstr "烏克蘭（Ukraine）的首都是..."
-+msgstr "烏克蘭（Ukraine）的首都是…"
- 
- #: mapsdatatranslation.cpp:3963
- msgid ""
-@@ -24161,7 +24149,7 @@
- msgid ""
- "_: world.kgm\n"
- "The flag of Ukraine is..."
--msgstr "烏克蘭（Ukraine）的國旗是..."
-+msgstr "烏克蘭（Ukraine）的國旗是…"
- 
- #: mapsdatatranslation.cpp:3965
- msgid ""
-@@ -24185,7 +24173,7 @@
- msgid ""
- "_: world.kgm\n"
- "The capital of United Kingdom is..."
--msgstr "大英國協（United Kingdom）的首都是..."
-+msgstr "大英國協（United Kingdom）的首都是…"
- 
- #: mapsdatatranslation.cpp:3969
- msgid ""
-@@ -24198,7 +24186,7 @@
- msgid ""
- "_: world.kgm\n"
- "The flag of United Kingdom is..."
--msgstr "大英國協（United Kingdom）的國旗是..."
-+msgstr "大英國協（United Kingdom）的國旗是…"
- 
- #: mapsdatatranslation.cpp:3971
- msgid ""
-@@ -24222,7 +24210,7 @@
- msgid ""
- "_: world.kgm\n"
- "The capital of Canada is..."
--msgstr "加拿大（Canada）的首都是..."
-+msgstr "加拿大（Canada）的首都是…"
- 
- #: mapsdatatranslation.cpp:3975
- msgid ""
-@@ -24235,7 +24223,7 @@
- msgid ""
- "_: world.kgm\n"
- "The flag of Canada is..."
--msgstr "加拿大（Canada）的國旗是..."
-+msgstr "加拿大（Canada）的國旗是…"
- 
- #: mapsdatatranslation.cpp:3977
- msgid ""
-@@ -24259,7 +24247,7 @@
- msgid ""
- "_: world.kgm\n"
- "The capital of El Salvador is..."
--msgstr "薩爾瓦多（El Salvador）的首都是..."
-+msgstr "薩爾瓦多（El Salvador）的首都是…"
- 
- #: mapsdatatranslation.cpp:3981
- msgid ""
-@@ -24272,7 +24260,7 @@
- msgid ""
- "_: world.kgm\n"
- "The flag of El Salvador is..."
--msgstr "薩爾瓦多（El Salvador）的國旗是..."
-+msgstr "薩爾瓦多（El Salvador）的國旗是…"
- 
- #: mapsdatatranslation.cpp:3983
- msgid ""
-@@ -24296,7 +24284,7 @@
- msgid ""
- "_: world.kgm\n"
- "The capital of The United States of America is..."
--msgstr "美利堅合眾國（The United States of America）的首都是..."
-+msgstr "美利堅合眾國（The United States of America）的首都是…"
- 
- #: mapsdatatranslation.cpp:3987
- msgid ""
-@@ -24309,7 +24297,7 @@
- msgid ""
- "_: world.kgm\n"
- "The flag of The United States of America is..."
--msgstr "美利堅合眾國（The United States of America）的國旗是..."
-+msgstr "美利堅合眾國（The United States of America）的國旗是…"
- 
- #: mapsdatatranslation.cpp:3989
- msgid ""
-@@ -24333,7 +24321,7 @@
- msgid ""
- "_: world.kgm\n"
- "The capital of The Bahamas is..."
--msgstr "巴哈馬（The Bahamas）的首都是..."
-+msgstr "巴哈馬（The Bahamas）的首都是…"
- 
- #: mapsdatatranslation.cpp:3993
- msgid ""
-@@ -24346,7 +24334,7 @@
- msgid ""
- "_: world.kgm\n"
- "The flag of The Bahamas is..."
--msgstr "巴哈馬（The Bahamas）的國旗是..."
-+msgstr "巴哈馬（The Bahamas）的國旗是…"
- 
- #: mapsdatatranslation.cpp:3995
- msgid ""
-@@ -24370,7 +24358,7 @@
- msgid ""
- "_: world.kgm\n"
- "The capital of The Dominican Republic is..."
--msgstr "多明尼加（The Dominican Republic）的首都是..."
-+msgstr "多明尼加（The Dominican Republic）的首都是…"
- 
- #: mapsdatatranslation.cpp:3999
- msgid ""
-@@ -24383,7 +24371,7 @@
- msgid ""
- "_: world.kgm\n"
- "The flag of The Dominican Republic is..."
--msgstr "多明尼加（The Dominican Republic）的國旗是..."
-+msgstr "多明尼加（The Dominican Republic）的國旗是…"
- 
- #: mapsdatatranslation.cpp:4001
- msgid ""
-@@ -24407,7 +24395,7 @@
- msgid ""
- "_: world.kgm\n"
- "The capital of Haiti is..."
--msgstr "海地（Haiti）的首都是..."
-+msgstr "海地（Haiti）的首都是…"
- 
- #: mapsdatatranslation.cpp:4005
- msgid ""
-@@ -24420,7 +24408,7 @@
- msgid ""
- "_: world.kgm\n"
- "The flag of Haiti is..."
--msgstr "海地（Haiti）的國旗是..."
-+msgstr "海地（Haiti）的國旗是…"
- 
- #: mapsdatatranslation.cpp:4007
- msgid ""
-@@ -24444,7 +24432,7 @@
- msgid ""
- "_: world.kgm\n"
- "The capital of Cuba is..."
--msgstr "古巴（Cuba）的首都是..."
-+msgstr "古巴（Cuba）的首都是…"
- 
- #: mapsdatatranslation.cpp:4011
- msgid ""
-@@ -24457,7 +24445,7 @@
- msgid ""
- "_: world.kgm\n"
- "The flag of Cuba is..."
--msgstr "古巴（Cuba）的國旗是..."
-+msgstr "古巴（Cuba）的國旗是…"
- 
- #: mapsdatatranslation.cpp:4013
- msgid ""
-@@ -24481,7 +24469,7 @@
- msgid ""
- "_: world.kgm\n"
- "The capital of Jamaica is..."
--msgstr "牙買加（Jamaica）的首都是..."
-+msgstr "牙買加（Jamaica）的首都是…"
- 
- #: mapsdatatranslation.cpp:4017
- msgid ""
-@@ -24494,7 +24482,7 @@
- msgid ""
- "_: world.kgm\n"
- "The flag of Jamaica is..."
--msgstr "牙買加（Jamaica）的國旗是..."
-+msgstr "牙買加（Jamaica）的國旗是…"
- 
- #: mapsdatatranslation.cpp:4019
- msgid ""
-@@ -24518,7 +24506,7 @@
- msgid ""
- "_: world.kgm\n"
- "The capital of Dominica is..."
--msgstr "多米尼克（Dominica）的首都是..."
-+msgstr "多米尼克（Dominica）的首都是…"
- 
- #: mapsdatatranslation.cpp:4023
- msgid ""
-@@ -24531,7 +24519,7 @@
- msgid ""
- "_: world.kgm\n"
- "The flag of Dominica is..."
--msgstr "多米尼克（Dominica）的國旗是..."
-+msgstr "多米尼克（Dominica）的國旗是…"
- 
- #: mapsdatatranslation.cpp:4025
- msgid ""
-@@ -24555,7 +24543,7 @@
- msgid ""
- "_: world.kgm\n"
- "The capital of Barbados is..."
--msgstr "巴貝多（Barbados）的首都是..."
-+msgstr "巴貝多（Barbados）的首都是…"
- 
- #: mapsdatatranslation.cpp:4029
- msgid ""
-@@ -24568,7 +24556,7 @@
- msgid ""
- "_: world.kgm\n"
- "The flag of Barbados is..."
--msgstr "巴貝多（Barbados）的國旗是..."
-+msgstr "巴貝多（Barbados）的國旗是…"
- 
- #: mapsdatatranslation.cpp:4031
- msgid ""
-@@ -24592,7 +24580,7 @@
- msgid ""
- "_: world.kgm\n"
- "The capital of Antigua and Barbuda is..."
--msgstr "安地卡（Antigua and Barbuda）的首都是..."
-+msgstr "安地卡（Antigua and Barbuda）的首都是…"
- 
- #: mapsdatatranslation.cpp:4035
- msgid ""
-@@ -24605,7 +24593,7 @@
- msgid ""
- "_: world.kgm\n"
- "The flag of Antigua and Barbuda is..."
--msgstr "安地卡（Antigua and Barbuda）的國旗是..."
-+msgstr "安地卡（Antigua and Barbuda）的國旗是…"
- 
- #: mapsdatatranslation.cpp:4037
- msgid ""
-@@ -24629,7 +24617,7 @@
- msgid ""
- "_: world.kgm\n"
- "The capital of Trinidad and Tobago is..."
--msgstr "千里達（Trinidad and Tobago）的首都是..."
-+msgstr "千里達（Trinidad and Tobago）的首都是…"
- 
- #: mapsdatatranslation.cpp:4041
- msgid ""
-@@ -24642,7 +24630,7 @@
- msgid ""
- "_: world.kgm\n"
- "The flag of Trinidad and Tobago is..."
--msgstr "千里達（Trinidad and Tobago）的國旗是..."
-+msgstr "千里達（Trinidad and Tobago）的國旗是…"
- 
- #: mapsdatatranslation.cpp:4043
- msgid ""
-@@ -24666,7 +24654,7 @@
- msgid ""
- "_: world.kgm\n"
- "The capital of Mexico is..."
--msgstr "墨西哥（Mexico）的首都是..."
-+msgstr "墨西哥（Mexico）的首都是…"
- 
- #: mapsdatatranslation.cpp:4047
- msgid ""
-@@ -24679,7 +24667,7 @@
- msgid ""
- "_: world.kgm\n"
- "The flag of Mexico is..."
--msgstr "墨西哥（Mexico）的國旗是..."
-+msgstr "墨西哥（Mexico）的國旗是…"
- 
- #: mapsdatatranslation.cpp:4049
- msgid ""
-@@ -24703,7 +24691,7 @@
- msgid ""
- "_: world.kgm\n"
- "The capital of Guatemala is..."
--msgstr "瓜地馬拉（Guatemala）的首都是..."
-+msgstr "瓜地馬拉（Guatemala）的首都是…"
- 
- #: mapsdatatranslation.cpp:4053
- msgid ""
-@@ -24716,7 +24704,7 @@
- msgid ""
- "_: world.kgm\n"
- "The flag of Guatemala is..."
--msgstr "瓜地馬拉（Guatemala）的國旗是..."
-+msgstr "瓜地馬拉（Guatemala）的國旗是…"
- 
- #: mapsdatatranslation.cpp:4055
- msgid ""
-@@ -24740,7 +24728,7 @@
- msgid ""
- "_: world.kgm\n"
- "The capital of Belize is..."
--msgstr "貝里斯（Belize）的首都是..."
-+msgstr "貝里斯（Belize）的首都是…"
- 
- #: mapsdatatranslation.cpp:4059
- msgid ""
-@@ -24753,7 +24741,7 @@
- msgid ""
- "_: world.kgm\n"
- "The flag of Belize is..."
--msgstr "貝里斯（Belize）的國旗是..."
-+msgstr "貝里斯（Belize）的國旗是…"
- 
- #: mapsdatatranslation.cpp:4061
- msgid ""
-@@ -24777,7 +24765,7 @@
- msgid ""
- "_: world.kgm\n"
- "The capital of Honduras is..."
--msgstr "宏都拉斯（Honduras）的首都是..."
-+msgstr "宏都拉斯（Honduras）的首都是…"
- 
- #: mapsdatatranslation.cpp:4065
- msgid ""
-@@ -24790,7 +24778,7 @@
- msgid ""
- "_: world.kgm\n"
- "The flag of Honduras is..."
--msgstr "宏都拉斯（Honduras）的國旗是..."
-+msgstr "宏都拉斯（Honduras）的國旗是…"
- 
- #: mapsdatatranslation.cpp:4067
- msgid ""
-@@ -24814,7 +24802,7 @@
- msgid ""
- "_: world.kgm\n"
- "The capital of Nicaragua is..."
--msgstr "尼加拉瓜（Nicaragua）的首都是..."
-+msgstr "尼加拉瓜（Nicaragua）的首都是…"
- 
- #: mapsdatatranslation.cpp:4071
- msgid ""
-@@ -24827,7 +24815,7 @@
- msgid ""
- "_: world.kgm\n"
- "The flag of Nicaragua is..."
--msgstr "尼加拉瓜（Nicaragua）的國旗是..."
-+msgstr "尼加拉瓜（Nicaragua）的國旗是…"
- 
- #: mapsdatatranslation.cpp:4073
- msgid ""
-@@ -24851,7 +24839,7 @@
- msgid ""
- "_: world.kgm\n"
- "The capital of Costa Rica is..."
--msgstr "哥斯大黎加（Costa Rica）的首都是..."
-+msgstr "哥斯大黎加（Costa Rica）的首都是…"
- 
- #: mapsdatatranslation.cpp:4077
- msgid ""
-@@ -24864,7 +24852,7 @@
- msgid ""
- "_: world.kgm\n"
- "The flag of Costa Rica is..."
--msgstr "哥斯大黎加（Costa Rica）的國旗是..."
-+msgstr "哥斯大黎加（Costa Rica）的國旗是…"
- 
- #: mapsdatatranslation.cpp:4079
- msgid ""
-@@ -24888,7 +24876,7 @@
- msgid ""
- "_: world.kgm\n"
- "The capital of Panama is..."
--msgstr "巴拿馬（Panama）的首都是..."
-+msgstr "巴拿馬（Panama）的首都是…"
- 
- #: mapsdatatranslation.cpp:4083
- msgid ""
-@@ -24901,7 +24889,7 @@
- msgid ""
- "_: world.kgm\n"
- "The flag of Panama is..."
--msgstr "巴拿馬（Panama）的國旗是..."
-+msgstr "巴拿馬（Panama）的國旗是…"
- 
- #: mapsdatatranslation.cpp:4085
- msgid ""
-@@ -24925,7 +24913,7 @@
- msgid ""
- "_: world.kgm\n"
- "The capital of Colombia is..."
--msgstr "哥倫比亞（Colombia）的首都是..."
-+msgstr "哥倫比亞（Colombia）的首都是…"
- 
- #: mapsdatatranslation.cpp:4089
- msgid ""
-@@ -24938,7 +24926,7 @@
- msgid ""
- "_: world.kgm\n"
- "The flag of Colombia is..."
--msgstr "哥倫比亞（Colombia）的國旗是..."
-+msgstr "哥倫比亞（Colombia）的國旗是…"
- 
- #: mapsdatatranslation.cpp:4091
- msgid ""
-@@ -24962,7 +24950,7 @@
- msgid ""
- "_: world.kgm\n"
- "The capital of Venezuela is..."
--msgstr "委內瑞拉（Venezuela）的首都是..."
-+msgstr "委內瑞拉（Venezuela）的首都是…"
- 
- #: mapsdatatranslation.cpp:4095
- msgid ""
-@@ -24975,7 +24963,7 @@
- msgid ""
- "_: world.kgm\n"
- "The flag of Venezuela is..."
--msgstr "委內瑞拉（Venezuela）的國旗是..."
-+msgstr "委內瑞拉（Venezuela）的國旗是…"
- 
- #: mapsdatatranslation.cpp:4097
- msgid ""
-@@ -24999,7 +24987,7 @@
- msgid ""
- "_: world.kgm\n"
- "The capital of Guyana is..."
--msgstr "蓋亞那（Guyana）的首都是..."
-+msgstr "蓋亞那（Guyana）的首都是…"
- 
- #: mapsdatatranslation.cpp:4101
- msgid ""
-@@ -25012,7 +25000,7 @@
- msgid ""
- "_: world.kgm\n"
- "The flag of Guyana is..."
--msgstr "蓋亞那（Guyana）的國旗是..."
-+msgstr "蓋亞那（Guyana）的國旗是…"
- 
- #: mapsdatatranslation.cpp:4103
- msgid ""
-@@ -25036,7 +25024,7 @@
- msgid ""
- "_: world.kgm\n"
- "The capital of Suriname is..."
--msgstr "蘇利南（Suriname）的首都是..."
-+msgstr "蘇利南（Suriname）的首都是…"
- 
- #: mapsdatatranslation.cpp:4107
- msgid ""
-@@ -25049,7 +25037,7 @@
- msgid ""
- "_: world.kgm\n"
- "The flag of Suriname is..."
--msgstr "蘇利南（Suriname）的國旗是..."
-+msgstr "蘇利南（Suriname）的國旗是…"
- 
- #: mapsdatatranslation.cpp:4109
- msgid ""
-@@ -25073,7 +25061,7 @@
- msgid ""
- "_: world.kgm\n"
- "The capital of French Guiana is..."
--msgstr "法屬蓋亞那（French Guiana）的首都是..."
-+msgstr "法屬蓋亞那（French Guiana）的首都是…"
- 
- #: mapsdatatranslation.cpp:4113
- msgid ""
-@@ -25086,7 +25074,7 @@
- msgid ""
- "_: world.kgm\n"
- "The flag of French Guiana is..."
--msgstr "法屬蓋亞那（French Guiana）的國旗是..."
-+msgstr "法屬蓋亞那（French Guiana）的國旗是…"
- 
- #: mapsdatatranslation.cpp:4115
- msgid ""
-@@ -25110,7 +25098,7 @@
- msgid ""
- "_: world.kgm\n"
- "The capital of Ecuador is..."
--msgstr "厄瓜多（Ecuador）的首都是..."
-+msgstr "厄瓜多（Ecuador）的首都是…"
- 
- #: mapsdatatranslation.cpp:4119
- msgid ""
-@@ -25123,7 +25111,7 @@
- msgid ""
- "_: world.kgm\n"
- "The flag of Ecuador is..."
--msgstr "厄瓜多（Ecuador）的國旗是..."
-+msgstr "厄瓜多（Ecuador）的國旗是…"
- 
- #: mapsdatatranslation.cpp:4121
- msgid ""
-@@ -25141,26 +25129,26 @@
- msgid ""
- "_: world.kgm\n"
- "Peru"
--msgstr "秘魯（Peru）"
-+msgstr "祕魯（Peru）"
- 
- #: mapsdatatranslation.cpp:4124
- msgid ""
- "_: world.kgm\n"
- "The capital of Peru is..."
--msgstr "秘魯（Peru）的首都是..."
-+msgstr "祕魯（Peru）的首都是…"
- 
- #: mapsdatatranslation.cpp:4125
- msgid ""
- "_: world.kgm\n"
- "Please click on:\n"
- "Peru"
--msgstr "請點選：秘魯（Peru）"
-+msgstr "請點選：祕魯（Peru）"
- 
- #: mapsdatatranslation.cpp:4126
- msgid ""
- "_: world.kgm\n"
- "The flag of Peru is..."
--msgstr "秘魯（Peru）的國旗是..."
-+msgstr "祕魯（Peru）的國旗是…"
- 
- #: mapsdatatranslation.cpp:4127
- msgid ""
-@@ -25184,7 +25172,7 @@
- msgid ""
- "_: world.kgm\n"
- "The capital of Brazil is..."
--msgstr "巴西（Brazil）的首都是..."
-+msgstr "巴西（Brazil）的首都是…"
- 
- #: mapsdatatranslation.cpp:4131
- msgid ""
-@@ -25197,7 +25185,7 @@
- msgid ""
- "_: world.kgm\n"
- "The flag of Brazil is..."
--msgstr "巴西（Brazil）的國旗是..."
-+msgstr "巴西（Brazil）的國旗是…"
- 
- #: mapsdatatranslation.cpp:4133
- msgid ""
-@@ -25221,7 +25209,7 @@
- msgid ""
- "_: world.kgm\n"
- "The capital of Bolivia is..."
--msgstr "玻利維亞（Bolivia）的首都是..."
-+msgstr "玻利維亞（Bolivia）的首都是…"
- 
- #: mapsdatatranslation.cpp:4137
- msgid ""
-@@ -25234,7 +25222,7 @@
- msgid ""
- "_: world.kgm\n"
- "The flag of Bolivia is..."
--msgstr "玻利維亞（Bolivia）的國旗是..."
-+msgstr "玻利維亞（Bolivia）的國旗是…"
- 
- #: mapsdatatranslation.cpp:4139
- msgid ""
-@@ -25258,7 +25246,7 @@
- msgid ""
- "_: world.kgm\n"
- "The capital of Chile is..."
--msgstr "智利（Chile）的首都是..."
-+msgstr "智利（Chile）的首都是…"
- 
- #: mapsdatatranslation.cpp:4143
- msgid ""
-@@ -25271,7 +25259,7 @@
- msgid ""
- "_: world.kgm\n"
- "The flag of Chile is..."
--msgstr "智利（Chile）的國旗是..."
-+msgstr "智利（Chile）的國旗是…"
- 
- #: mapsdatatranslation.cpp:4145
- msgid ""
-@@ -25295,7 +25283,7 @@
- msgid ""
- "_: world.kgm\n"
- "The capital of Paraguay is..."
--msgstr "巴拉圭（Paraguay）的首都是..."
-+msgstr "巴拉圭（Paraguay）的首都是…"
- 
- #: mapsdatatranslation.cpp:4149
- msgid ""
-@@ -25308,7 +25296,7 @@
- msgid ""
- "_: world.kgm\n"
- "The flag of Paraguay is..."
--msgstr "巴拉圭（Paraguay）的國旗是..."
-+msgstr "巴拉圭（Paraguay）的國旗是…"
- 
- #: mapsdatatranslation.cpp:4151
- msgid ""
-@@ -25332,7 +25320,7 @@
- msgid ""
- "_: world.kgm\n"
- "The capital of Argentina is..."
--msgstr "阿根廷（Argentina）的首都是..."
-+msgstr "阿根廷（Argentina）的首都是…"
- 
- #: mapsdatatranslation.cpp:4155
- msgid ""
-@@ -25345,7 +25333,7 @@
- msgid ""
- "_: world.kgm\n"
- "The flag of Argentina is..."
--msgstr "阿根廷（Argentina）的國旗是..."
-+msgstr "阿根廷（Argentina）的國旗是…"
- 
- #: mapsdatatranslation.cpp:4157
- msgid ""
-@@ -25369,7 +25357,7 @@
- msgid ""
- "_: world.kgm\n"
- "The capital of Uruguay is..."
--msgstr "烏拉圭（Uruguay）的首都是..."
-+msgstr "烏拉圭（Uruguay）的首都是…"
- 
- #: mapsdatatranslation.cpp:4161
- msgid ""
-@@ -25382,7 +25370,7 @@
- msgid ""
- "_: world.kgm\n"
- "The flag of Uruguay is..."
--msgstr "烏拉圭（Uruguay）的國旗是..."
-+msgstr "烏拉圭（Uruguay）的國旗是…"
- 
- #: mapsdatatranslation.cpp:4163
- msgid ""
-@@ -25406,7 +25394,7 @@
- msgid ""
- "_: world.kgm\n"
- "The capital of Australia is..."
--msgstr "澳大利亞（Australia）的首都是..."
-+msgstr "澳大利亞（Australia）的首都是…"
- 
- #: mapsdatatranslation.cpp:4167
- msgid ""
-@@ -25419,7 +25407,7 @@
- msgid ""
- "_: world.kgm\n"
- "The flag of Australia is..."
--msgstr "澳大利亞（Australia）的國旗是..."
-+msgstr "澳大利亞（Australia）的國旗是…"
- 
- #: mapsdatatranslation.cpp:4169
- msgid ""
-@@ -25443,7 +25431,7 @@
- msgid ""
- "_: world.kgm\n"
- "The capital of New Zealand is..."
--msgstr "紐西蘭（New Zealand）的首都是..."
-+msgstr "紐西蘭（New Zealand）的首都是…"
- 
- #: mapsdatatranslation.cpp:4173
- msgid ""
-@@ -25456,7 +25444,7 @@
- msgid ""
- "_: world.kgm\n"
- "The flag of New Zealand is..."
--msgstr "紐西蘭（New Zealand）的國旗是..."
-+msgstr "紐西蘭（New Zealand）的國旗是…"
- 
- #: mapsdatatranslation.cpp:4175
- msgid ""
-@@ -25480,7 +25468,7 @@
- msgid ""
- "_: world.kgm\n"
- "The capital of Vatican City is..."
--msgstr "梵蒂岡（Vatican City）的首都是..."
-+msgstr "梵蒂岡（Vatican City）的首都是…"
- 
- #: mapsdatatranslation.cpp:4179
- msgid ""
-@@ -25493,7 +25481,7 @@
- msgid ""
- "_: world.kgm\n"
- "The flag of Vatican City is..."
--msgstr "梵蒂岡（Vatican City）的國旗是..."
-+msgstr "梵蒂岡（Vatican City）的國旗是…"
- 
- #: mapsdatatranslation.cpp:4182
- msgid ""
-@@ -25511,7 +25499,7 @@
- msgid ""
- "_: world.kgm\n"
- "The capital of Andorra is..."
--msgstr "安道爾（Andorra）的首都是..."
-+msgstr "安道爾（Andorra）的首都是…"
- 
- #: mapsdatatranslation.cpp:4185
- msgid ""
-@@ -25524,7 +25512,7 @@
- msgid ""
- "_: world.kgm\n"
- "The flag of Andorra is..."
--msgstr "安道爾（Andorra）的國旗是..."
-+msgstr "安道爾（Andorra）的國旗是…"
- 
- #: mapsdatatranslation.cpp:4187
- msgid ""
-@@ -25548,7 +25536,7 @@
- msgid ""
- "_: world.kgm\n"
- "The capital of Monaco is..."
--msgstr "摩納哥（Monaco）的首都是..."
-+msgstr "摩納哥（Monaco）的首都是…"
- 
- #: mapsdatatranslation.cpp:4191
- msgid ""
-@@ -25561,7 +25549,7 @@
- msgid ""
- "_: world.kgm\n"
- "The flag of Monaco is..."
--msgstr "摩納哥（Monaco）的國旗是..."
-+msgstr "摩納哥（Monaco）的國旗是…"
- 
- #: mapsdatatranslation.cpp:4193
- msgid ""
-@@ -25585,7 +25573,7 @@
- msgid ""
- "_: world.kgm\n"
- "The capital of China is..."
--msgstr "中華人民共和國（China）的首都是..."
-+msgstr "中華人民共和國（China）的首都是…"
- 
- #: mapsdatatranslation.cpp:4197
- msgid ""
-@@ -25598,7 +25586,7 @@
- msgid ""
- "_: world.kgm\n"
- "The flag of China is..."
--msgstr "中華人民共和國（China）的國旗是..."
-+msgstr "中華人民共和國（China）的國旗是…"
- 
- #: mapsdatatranslation.cpp:4199
- msgid ""
-@@ -25622,7 +25610,7 @@
- msgid ""
- "_: world.kgm\n"
- "The capital of India is..."
--msgstr "印度（India）的首都是..."
-+msgstr "印度（India）的首都是…"
- 
- #: mapsdatatranslation.cpp:4203
- msgid ""
-@@ -25635,7 +25623,7 @@
- msgid ""
- "_: world.kgm\n"
- "The flag of India is..."
--msgstr "印度（India）的國旗是..."
-+msgstr "印度（India）的國旗是…"
- 
- #: mapsdatatranslation.cpp:4205
- msgid ""
-@@ -25659,7 +25647,7 @@
- msgid ""
- "_: world.kgm\n"
- "The capital of Sri Lanka is..."
--msgstr "斯里蘭卡（Sri Lanka）的首都是..."
-+msgstr "斯里蘭卡（Sri Lanka）的首都是…"
- 
- #: mapsdatatranslation.cpp:4209
- msgid ""
-@@ -25672,7 +25660,7 @@
- msgid ""
- "_: world.kgm\n"
- "The flag of Sri Lanka is..."
--msgstr "斯里蘭卡（Sri Lanka）的國旗是..."
-+msgstr "斯里蘭卡（Sri Lanka）的國旗是…"
- 
- #: mapsdatatranslation.cpp:4211
- msgid ""
-@@ -25696,7 +25684,7 @@
- msgid ""
- "_: world.kgm\n"
- "The capital of Mongolia is..."
--msgstr "蒙古（Mongolia）的首都是..."
-+msgstr "蒙古（Mongolia）的首都是…"
- 
- #: mapsdatatranslation.cpp:4215
- msgid ""
-@@ -25709,7 +25697,7 @@
- msgid ""
- "_: world.kgm\n"
- "The flag of Mongolia is..."
--msgstr "蒙古（Mongolia）的國旗是..."
-+msgstr "蒙古（Mongolia）的國旗是…"
- 
- #: mapsdatatranslation.cpp:4217
- msgid ""
-@@ -25733,7 +25721,7 @@
- msgid ""
- "_: world.kgm\n"
- "The capital of Kazakhstan is..."
--msgstr "哈薩克（Kazakhstan）的首都是..."
-+msgstr "哈薩克（Kazakhstan）的首都是…"
- 
- #: mapsdatatranslation.cpp:4221
- msgid ""
-@@ -25746,7 +25734,7 @@
- msgid ""
- "_: world.kgm\n"
- "The flag of Kazakhstan is..."
--msgstr "哈薩克（Kazakhstan）的國旗是..."
-+msgstr "哈薩克（Kazakhstan）的國旗是…"
- 
- #: mapsdatatranslation.cpp:4223
- msgid ""
-@@ -25770,7 +25758,7 @@
- msgid ""
- "_: world.kgm\n"
- "The capital of Japan is..."
--msgstr "日本（Japan）的首都是..."
-+msgstr "日本（Japan）的首都是…"
- 
- #: mapsdatatranslation.cpp:4227
- msgid ""
-@@ -25783,7 +25771,7 @@
- msgid ""
- "_: world.kgm\n"
- "The flag of Japan is..."
--msgstr "日本（Japan）的國旗是..."
-+msgstr "日本（Japan）的國旗是…"
- 
- #: mapsdatatranslation.cpp:4229
- msgid ""
-@@ -25807,7 +25795,7 @@
- msgid ""
- "_: world.kgm\n"
- "The capital of Myanmar is..."
--msgstr "緬甸（Myanmar）的首都是..."
-+msgstr "緬甸（Myanmar）的首都是…"
- 
- #: mapsdatatranslation.cpp:4233
- msgid ""
-@@ -25820,7 +25808,7 @@
- msgid ""
- "_: world.kgm\n"
- "The flag of Myanmar is..."
--msgstr "緬甸（Myanmar）的國旗是..."
-+msgstr "緬甸（Myanmar）的國旗是…"
- 
- #: mapsdatatranslation.cpp:4235
- msgid ""
-@@ -25844,7 +25832,7 @@
- msgid ""
- "_: world.kgm\n"
- "The capital of Nepal is..."
--msgstr "尼泊爾（Nepal）的首都是..."
-+msgstr "尼泊爾（Nepal）的首都是…"
- 
- #: mapsdatatranslation.cpp:4239
- msgid ""
-@@ -25857,7 +25845,7 @@
- msgid ""
- "_: world.kgm\n"
- "The flag of Nepal is..."
--msgstr "尼泊爾（Nepal）的國旗是..."
-+msgstr "尼泊爾（Nepal）的國旗是…"
- 
- #: mapsdatatranslation.cpp:4241
- msgid ""
-@@ -25881,7 +25869,7 @@
- msgid ""
- "_: world.kgm\n"
- "The capital of Bhutan is..."
--msgstr "不丹（Bhutan）的首都是..."
-+msgstr "不丹（Bhutan）的首都是…"
- 
- #: mapsdatatranslation.cpp:4245
- msgid ""
-@@ -25894,7 +25882,7 @@
- msgid ""
- "_: world.kgm\n"
- "The flag of Bhutan is..."
--msgstr "不丹（Bhutan）的國旗是..."
-+msgstr "不丹（Bhutan）的國旗是…"
- 
- #: mapsdatatranslation.cpp:4247
- msgid ""
-@@ -25918,7 +25906,7 @@
- msgid ""
- "_: world.kgm\n"
- "The capital of Indonesia is..."
--msgstr "印度尼西亞（Indonesia）的首都是..."
-+msgstr "印度尼西亞（Indonesia）的首都是…"
- 
- #: mapsdatatranslation.cpp:4251
- msgid ""
-@@ -25931,7 +25919,7 @@
- msgid ""
- "_: world.kgm\n"
- "The flag of Indonesia is..."
--msgstr "印度尼西亞（Indonesia）的國旗是..."
-+msgstr "印度尼西亞（Indonesia）的國旗是…"
- 
- #: mapsdatatranslation.cpp:4253
- msgid ""
-@@ -25955,7 +25943,7 @@
- msgid ""
- "_: world.kgm\n"
- "The capital of Malaysia is..."
--msgstr "馬來西亞（Malaysia）的首都是..."
-+msgstr "馬來西亞（Malaysia）的首都是…"
- 
- #: mapsdatatranslation.cpp:4257
- msgid ""
-@@ -25968,7 +25956,7 @@
- msgid ""
- "_: world.kgm\n"
- "The flag of Malaysia is..."
--msgstr "馬來西亞（Malaysia）的國旗是..."
-+msgstr "馬來西亞（Malaysia）的國旗是…"
- 
- #: mapsdatatranslation.cpp:4259
- msgid ""
-@@ -25992,7 +25980,7 @@
- msgid ""
- "_: world.kgm\n"
- "The capital of Bangladesh is..."
--msgstr "孟加拉（Bangladesh）的首都是..."
-+msgstr "孟加拉（Bangladesh）的首都是…"
- 
- #: mapsdatatranslation.cpp:4263
- msgid ""
-@@ -26005,7 +25993,7 @@
- msgid ""
- "_: world.kgm\n"
- "The flag of Bangladesh is..."
--msgstr "孟加拉（Bangladesh）的國旗是..."
-+msgstr "孟加拉（Bangladesh）的國旗是…"
- 
- #: mapsdatatranslation.cpp:4265
- msgid ""
-@@ -26029,7 +26017,7 @@
- msgid ""
- "_: world.kgm\n"
- "The capital of Cyprus is..."
--msgstr "賽普勒斯（Cyprus）的首都是..."
-+msgstr "賽普勒斯（Cyprus）的首都是…"
- 
- #: mapsdatatranslation.cpp:4269
- msgid ""
-@@ -26042,7 +26030,7 @@
- msgid ""
- "_: world.kgm\n"
- "The flag of Cyprus is..."
--msgstr "賽普勒斯（Cyprus）的國旗是..."
-+msgstr "賽普勒斯（Cyprus）的國旗是…"
- 
- #: mapsdatatranslation.cpp:4271
- msgid ""
-@@ -26066,7 +26054,7 @@
- msgid ""
- "_: world.kgm\n"
- "The capital of Afghanistan is..."
--msgstr "阿富汗（Afghanistan）的首都是..."
-+msgstr "阿富汗（Afghanistan）的首都是…"
- 
- #: mapsdatatranslation.cpp:4275
- msgid ""
-@@ -26079,7 +26067,7 @@
- msgid ""
- "_: world.kgm\n"
- "The flag of Afghanistan is..."
--msgstr "阿富汗（Afghanistan）的國旗是..."
-+msgstr "阿富汗（Afghanistan）的國旗是…"
- 
- #: mapsdatatranslation.cpp:4277
- msgid ""
-@@ -26103,7 +26091,7 @@
- msgid ""
- "_: world.kgm\n"
- "The capital of Azerbaijan is..."
--msgstr "亞塞拜然（Azerbaijan）的首都是..."
-+msgstr "亞塞拜然（Azerbaijan）的首都是…"
- 
- #: mapsdatatranslation.cpp:4281
- msgid ""
-@@ -26116,7 +26104,7 @@
- msgid ""
- "_: world.kgm\n"
- "The flag of Azerbaijan is..."
--msgstr "亞塞拜然（Azerbaijan）的國旗是..."
-+msgstr "亞塞拜然（Azerbaijan）的國旗是…"
- 
- #: mapsdatatranslation.cpp:4283
- msgid ""
-@@ -26140,7 +26128,7 @@
- msgid ""
- "_: world.kgm\n"
- "The capital of Armenia is..."
--msgstr "亞美尼亞（Armenia）的首都是..."
-+msgstr "亞美尼亞（Armenia）的首都是…"
- 
- #: mapsdatatranslation.cpp:4287
- msgid ""
-@@ -26153,7 +26141,7 @@
- msgid ""
- "_: world.kgm\n"
- "The flag of Armenia is..."
--msgstr "亞美尼亞（Armenia）的國旗是..."
-+msgstr "亞美尼亞（Armenia）的國旗是…"
- 
- #: mapsdatatranslation.cpp:4289
- msgid ""
-@@ -26177,7 +26165,7 @@
- msgid ""
- "_: world.kgm\n"
- "The capital of Bahrain is..."
--msgstr "巴林（Bahrain）的首都是..."
-+msgstr "巴林（Bahrain）的首都是…"
- 
- #: mapsdatatranslation.cpp:4293
- msgid ""
-@@ -26190,7 +26178,7 @@
- msgid ""
- "_: world.kgm\n"
- "The flag of Bahrain is..."
--msgstr "巴林（Bahrain）的國旗是..."
-+msgstr "巴林（Bahrain）的國旗是…"
- 
- #: mapsdatatranslation.cpp:4295
- msgid ""
-@@ -26214,7 +26202,7 @@
- msgid ""
- "_: world.kgm\n"
- "The capital of Georgia is..."
--msgstr "喬治亞（Georgia）的首都是..."
-+msgstr "喬治亞（Georgia）的首都是…"
- 
- #: mapsdatatranslation.cpp:4299
- msgid ""
-@@ -26251,7 +26239,7 @@
- msgid ""
- "_: world.kgm\n"
- "The capital of Turkmenistan is..."
--msgstr "土庫曼（Turkmenistan）的首都是..."
-+msgstr "土庫曼（Turkmenistan）的首都是…"
- 
- #: mapsdatatranslation.cpp:4305
- msgid ""
-@@ -26264,7 +26252,7 @@
- msgid ""
- "_: world.kgm\n"
- "The flag of Turkmenistan is..."
--msgstr "土庫曼（Turkmenistan）的國旗是..."
-+msgstr "土庫曼（Turkmenistan）的國旗是…"
- 
- #: mapsdatatranslation.cpp:4307
- msgid ""
-@@ -26288,7 +26276,7 @@
- msgid ""
- "_: world.kgm\n"
- "The capital of Uzbekistan is..."
--msgstr "烏茲別克（Uzbekistan）的首都是..."
-+msgstr "烏茲別克（Uzbekistan）的首都是…"
- 
- #: mapsdatatranslation.cpp:4311
- msgid ""
-@@ -26301,7 +26289,7 @@
- msgid ""
- "_: world.kgm\n"
- "The flag of Uzbekistan is..."
--msgstr "烏茲別克（Uzbekistan）的國旗是..."
-+msgstr "烏茲別克（Uzbekistan）的國旗是…"
- 
- #: mapsdatatranslation.cpp:4313
- msgid ""
-@@ -26325,7 +26313,7 @@
- msgid ""
- "_: world.kgm\n"
- "The capital of Kyrgyzstan is..."
--msgstr "吉爾吉斯（Kyrgyzstan）的首都是..."
-+msgstr "吉爾吉斯（Kyrgyzstan）的首都是…"
- 
- #: mapsdatatranslation.cpp:4317
- msgid ""
-@@ -26338,7 +26326,7 @@
- msgid ""
- "_: world.kgm\n"
- "The flag of Kyrgyzstan is..."
--msgstr "吉爾吉斯（Kyrgyzstan）的國旗是..."
-+msgstr "吉爾吉斯（Kyrgyzstan）的國旗是…"
- 
- #: mapsdatatranslation.cpp:4319
- msgid ""
-@@ -26362,7 +26350,7 @@
- msgid ""
- "_: world.kgm\n"
- "The capital of Tajikistan is..."
--msgstr "塔吉克（Tajikistan）的首都是..."
-+msgstr "塔吉克（Tajikistan）的首都是…"
- 
- #: mapsdatatranslation.cpp:4323
- msgid ""
-@@ -26375,7 +26363,7 @@
- msgid ""
- "_: world.kgm\n"
- "The flag of Tajikistan is..."
--msgstr "塔吉克（Tajikistan）的國旗是..."
-+msgstr "塔吉克（Tajikistan）的國旗是…"
- 
- #: mapsdatatranslation.cpp:4325
- msgid ""
-@@ -26399,7 +26387,7 @@
- msgid ""
- "_: world.kgm\n"
- "The capital of Pakistan is..."
--msgstr "巴基斯坦（Pakistan）的首都是..."
-+msgstr "巴基斯坦（Pakistan）的首都是…"
- 
- #: mapsdatatranslation.cpp:4329
- msgid ""
-@@ -26412,7 +26400,7 @@
- msgid ""
- "_: world.kgm\n"
- "The flag of Pakistan is..."
--msgstr "巴基斯坦（Pakistan）的國旗是..."
-+msgstr "巴基斯坦（Pakistan）的國旗是…"
- 
- #: mapsdatatranslation.cpp:4331
- msgid ""
-@@ -26436,7 +26424,7 @@
- msgid ""
- "_: world.kgm\n"
- "The capital of Laos is..."
--msgstr "寮國（Laos）的首都是..."
-+msgstr "寮國（Laos）的首都是…"
- 
- #: mapsdatatranslation.cpp:4335
- msgid ""
-@@ -26449,7 +26437,7 @@
- msgid ""
- "_: world.kgm\n"
- "The flag of Laos is..."
--msgstr "寮國（Laos）的國旗是..."
-+msgstr "寮國（Laos）的國旗是…"
- 
- #: mapsdatatranslation.cpp:4337
- msgid ""
-@@ -26473,7 +26461,7 @@
- msgid ""
- "_: world.kgm\n"
- "The capital of Cambodia is..."
--msgstr "柬埔寨（Cambodia）的首都是..."
-+msgstr "柬埔寨（Cambodia）的首都是…"
- 
- #: mapsdatatranslation.cpp:4341
- msgid ""
-@@ -26486,7 +26474,7 @@
- msgid ""
- "_: world.kgm\n"
- "The flag of Cambodia is..."
--msgstr "柬埔寨（Cambodia）的國旗是..."
-+msgstr "柬埔寨（Cambodia）的國旗是…"
- 
- #: mapsdatatranslation.cpp:4343
- msgid ""
-@@ -26510,7 +26498,7 @@
- msgid ""
- "_: world.kgm\n"
- "The capital of East Timor is..."
--msgstr "東帝汶（East Timor）的首都是..."
-+msgstr "東帝汶（East Timor）的首都是…"
- 
- #: mapsdatatranslation.cpp:4347
- msgid ""
-@@ -26523,7 +26511,7 @@
- msgid ""
- "_: world.kgm\n"
- "The flag of East Timor is..."
--msgstr "東帝汶（East Timor）的國旗是..."
-+msgstr "東帝汶（East Timor）的國旗是…"
- 
- #: mapsdatatranslation.cpp:4349
- msgid ""
-@@ -26547,7 +26535,7 @@
- msgid ""
- "_: world.kgm\n"
- "The capital of Brunei is..."
--msgstr "汶萊（Brunei）的首都是..."
-+msgstr "汶萊（Brunei）的首都是…"
- 
- #: mapsdatatranslation.cpp:4353
- msgid ""
-@@ -26560,7 +26548,7 @@
- msgid ""
- "_: world.kgm\n"
- "The flag of Brunei is..."
--msgstr "汶萊（Brunei）的國旗是..."
-+msgstr "汶萊（Brunei）的國旗是…"
- 
- #: mapsdatatranslation.cpp:4355
- msgid ""
-@@ -26584,7 +26572,7 @@
- msgid ""
- "_: world.kgm\n"
- "The capital of Philippines is..."
--msgstr "菲律賓（Philippines）的首都是..."
-+msgstr "菲律賓（Philippines）的首都是…"
- 
- #: mapsdatatranslation.cpp:4359
- msgid ""
-@@ -26597,7 +26585,7 @@
- msgid ""
- "_: world.kgm\n"
- "The flag of Philippines is..."
--msgstr "菲律賓（Philippines）的國旗是..."
-+msgstr "菲律賓（Philippines）的國旗是…"
- 
- #: mapsdatatranslation.cpp:4361
- msgid ""
-@@ -26621,7 +26609,7 @@
- msgid ""
- "_: world.kgm\n"
- "The capital of Thailand is..."
--msgstr "泰國（Thailand）的首都是..."
-+msgstr "泰國（Thailand）的首都是…"
- 
- #: mapsdatatranslation.cpp:4365
- msgid ""
-@@ -26634,7 +26622,7 @@
- msgid ""
- "_: world.kgm\n"
- "The flag of Thailand is..."
--msgstr "泰國（Thailand）的國旗是..."
-+msgstr "泰國（Thailand）的國旗是…"
- 
- #: mapsdatatranslation.cpp:4367
- msgid ""
-@@ -26658,7 +26646,7 @@
- msgid ""
- "_: world.kgm\n"
- "The capital of Vietnam is..."
--msgstr "越南（Vietnam）的首都是..."
-+msgstr "越南（Vietnam）的首都是…"
- 
- #: mapsdatatranslation.cpp:4371
- msgid ""
-@@ -26671,7 +26659,7 @@
- msgid ""
- "_: world.kgm\n"
- "The flag of Vietnam is..."
--msgstr "越南（Vietnam）的國旗是..."
-+msgstr "越南（Vietnam）的國旗是…"
- 
- #: mapsdatatranslation.cpp:4373
- msgid ""
-@@ -26689,38 +26677,38 @@
- msgid ""
- "_: world.kgm\n"
- "Republic of China (Taiwan)"
--msgstr "中華民國（台灣）"
-+msgstr "中華民國（臺灣）"
- 
- #: mapsdatatranslation.cpp:4376
- msgid ""
- "_: world.kgm\n"
- "The capital of Republic of China (Taiwan) is..."
--msgstr "中華民國（台灣）的首都是..."
-+msgstr "中華民國（臺灣）的首都是…"
- 
- #: mapsdatatranslation.cpp:4377
- msgid ""
- "_: world.kgm\n"
- "Please click on:\n"
- "Republic of China (Taiwan)"
--msgstr "請點選：中華民國（台灣）"
-+msgstr "請點選：中華民國（臺灣）"
- 
- #: mapsdatatranslation.cpp:4378
- msgid ""
- "_: world.kgm\n"
- "The flag of Republic of China (Taiwan) is..."
--msgstr "中華民國（台灣）的國旗是..."
-+msgstr "中華民國（臺灣）的國旗是…"
- 
- #: mapsdatatranslation.cpp:4379
- msgid ""
- "_: world.kgm\n"
- "Taipei"
--msgstr "台北"
-+msgstr "臺北"
- 
- #: mapsdatatranslation.cpp:4380
- msgid ""
- "_: world.kgm\n"
- "Taipei is the capital of..."
--msgstr "台北是哪個國家的首都？"
-+msgstr "臺北是哪個國家的首都？"
- 
- #: mapsdatatranslation.cpp:4381 mapsdatatranslation.cpp:4385
- msgid ""
-@@ -26732,7 +26720,7 @@
- msgid ""
- "_: world.kgm\n"
- "The capital of Singapore is..."
--msgstr "新加坡（Singapore）的首都是..."
-+msgstr "新加坡（Singapore）的首都是…"
- 
- #: mapsdatatranslation.cpp:4383
- msgid ""
-@@ -26745,7 +26733,7 @@
- msgid ""
- "_: world.kgm\n"
- "The flag of Singapore is..."
--msgstr "新加坡（Singapore）的國旗是..."
-+msgstr "新加坡（Singapore）的國旗是…"
- 
- #: mapsdatatranslation.cpp:4386
- msgid ""
-@@ -26763,7 +26751,7 @@
- msgid ""
- "_: world.kgm\n"
- "The capital of Democratic People's Republic of Korea is..."
--msgstr "朝鮮人民共和國（Democratic People's Republic of Korea）的首都是..."
-+msgstr "朝鮮人民共和國（Democratic People's Republic of Korea）的首都是…"
- 
- #: mapsdatatranslation.cpp:4389
- msgid ""
-@@ -26776,7 +26764,7 @@
- msgid ""
- "_: world.kgm\n"
- "The flag of Democratic People's Republic of Korea is..."
--msgstr "朝鮮人民共和國（Democratic People's Republic of Korea）的國旗是..."
-+msgstr "朝鮮人民共和國（Democratic People's Republic of Korea）的國旗是…"
- 
- #: mapsdatatranslation.cpp:4391
- msgid ""
-@@ -26800,7 +26788,7 @@
- msgid ""
- "_: world.kgm\n"
- "The capital of Republic of Korea is..."
--msgstr "大韓民國（Republic of Korea）的首都是..."
-+msgstr "大韓民國（Republic of Korea）的首都是…"
- 
- #: mapsdatatranslation.cpp:4395
- msgid ""
-@@ -26813,7 +26801,7 @@
- msgid ""
- "_: world.kgm\n"
- "The flag of Republic of Korea is..."
--msgstr "大韓民國（Republic of Korea）的國旗是..."
-+msgstr "大韓民國（Republic of Korea）的國旗是…"
- 
- #: mapsdatatranslation.cpp:4397
- msgid ""
-@@ -26837,7 +26825,7 @@
- msgid ""
- "_: world.kgm\n"
- "The capital of Fiji is..."
--msgstr "斐濟（Fiji）的首都是..."
-+msgstr "斐濟（Fiji）的首都是…"
- 
- #: mapsdatatranslation.cpp:4401
- msgid ""
-@@ -26850,7 +26838,7 @@
- msgid ""
- "_: world.kgm\n"
- "The flag of Fiji is..."
--msgstr "斐濟（Fiji）的國旗是..."
-+msgstr "斐濟（Fiji）的國旗是…"
- 
- #: mapsdatatranslation.cpp:4403
- msgid ""
-@@ -26874,7 +26862,7 @@
- msgid ""
- "_: world.kgm\n"
- "The capital of Tonga is..."
--msgstr "東加（Tonga）的首都是..."
-+msgstr "東加（Tonga）的首都是…"
- 
- #: mapsdatatranslation.cpp:4407
- msgid ""
-@@ -26887,7 +26875,7 @@
- msgid ""
- "_: world.kgm\n"
- "The flag of Tonga is..."
--msgstr "東加（Tonga）的國旗是..."
-+msgstr "東加（Tonga）的國旗是…"
- 
- #: mapsdatatranslation.cpp:4409
- msgid ""
-@@ -26911,7 +26899,7 @@
- msgid ""
- "_: world.kgm\n"
- "The capital of Papua New Guinea is..."
--msgstr "巴布亞紐幾內亞（Papua New Guinea）的首都是..."
-+msgstr "巴布亞紐幾內亞（Papua New Guinea）的首都是…"
- 
- #: mapsdatatranslation.cpp:4413
- msgid ""
-@@ -26924,7 +26912,7 @@
- msgid ""
- "_: world.kgm\n"
- "The flag of Papua New Guinea is..."
--msgstr "巴布亞紐幾內亞（Papua New Guinea）的國旗是..."
-+msgstr "巴布亞紐幾內亞（Papua New Guinea）的國旗是…"
- 
- #: mapsdatatranslation.cpp:4415
- msgid ""
-@@ -26948,7 +26936,7 @@
- msgid ""
- "_: world.kgm\n"
- "The capital of Greenland (Denmark) is..."
--msgstr "格陵蘭【丹麥】的首都是..."
-+msgstr "格陵蘭【丹麥】的首都是…"
- 
- #: mapsdatatranslation.cpp:4419
- msgid ""
-@@ -26961,7 +26949,7 @@
- msgid ""
- "_: world.kgm\n"
- "The flag of Greenland (Denmark) is..."
--msgstr "格陵蘭【丹麥】的國旗是..."
-+msgstr "格陵蘭【丹麥】的國旗是…"
- 
- #: mapsdatatranslation.cpp:4421
- msgid ""
-@@ -26980,3 +26968,27 @@
- #, no-c-format
- msgid "The last opened map"
- msgstr "最後開啟的地圖"
-+
-+#, fuzzy
-+#~ msgid ""
-+#~ "_: asia.kgm\n"
-+#~ "Rangoon"
-+#~ msgstr "Rangoon"
-+
-+#, fuzzy
-+#~ msgid ""
-+#~ "_: asia.kgm\n"
-+#~ "Rangoon is the capital of..."
-+#~ msgstr "-"
-+
-+#, fuzzy
-+#~ msgid ""
-+#~ "_: world.kgm\n"
-+#~ "Rangoon"
-+#~ msgstr "Rangoon"
-+
-+#, fuzzy
-+#~ msgid ""
-+#~ "_: world.kgm\n"
-+#~ "Rangoon is the capital of..."
-+#~ msgstr "-"
-diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdeedu/khangman.po kde-i18n-zh_TW-3.5.10/messages/kdeedu/khangman.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdeedu/khangman.po	2008-08-19 20:43:13.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdeedu/khangman.po	2011-11-11 15:45:17.000000000 +0100
-@@ -8,8 +8,7 @@
- "Project-Id-Version: khangman\n"
- "POT-Creation-Date: 2008-07-08 01:24+0200\n"
- "PO-Revision-Date: 2006-07-04 11:23+0800\n"
--"Last-Translator: Frank Weng (a.k.a. Franklin) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Chinese Traditional <zh-l10n@linux.org.tw>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
-@@ -244,21 +243,25 @@
- #: rc.cpp:9
- #, no-c-format
- msgid ""
--"If you check it, a hint will be displayed by right-clicking on the game window."
-+"If you check it, a hint will be displayed by right-clicking on the game "
-+"window."
- msgstr "勾選此選項的話，在遊戲視窗中點選右鍵可以看到提示。"
- 
- #. i18n: file advanced.ui line 53
- #: rc.cpp:12
- #, no-c-format
- msgid ""
--"Some languages have hints to help you guess the word more easily. If this is <b>"
--"disabled</b>, there is no such option for your current language data file.\n"
-+"Some languages have hints to help you guess the word more easily. If this is "
-+"<b>disabled</b>, there is no such option for your current language data "
-+"file.\n"
- "If this is <b>enabled</b>, then hints are available and you can get them by "
- "checking this box. You will then see the hint for the word you are trying to "
--"guess by right-clicking somewhere on the KHangMan window, the hint will then be "
--"displayed for 4 seconds in a tooltip."
-+"guess by right-clicking somewhere on the KHangMan window, the hint will then "
-+"be displayed for 4 seconds in a tooltip."
- msgstr ""
--"有些語言會有個提示來幫助您猜測單字。如果無法選取此選項，則表示您使用的語言資料檔中沒有相關選項，反之，則在您勾選此選項時，您可以在遊戲主視窗中點選右鍵獲得提示。"
-+"有些語言會有個提示來幫助您猜測單字。如果無法選取此選項，則表示您使用的語言資"
-+"料檔中沒有相關選項，反之，則在您勾選此選項時，您可以在遊戲主視窗中點選右鍵獲"
-+"得提示。"
- 
- #. i18n: file advanced.ui line 63
- #: rc.cpp:16
-@@ -284,25 +287,23 @@
- #: rc.cpp:25
- #, no-c-format
- msgid ""
--"If this is <b>disabled</b>, then the selected language does not support it. If "
--"this is <b>enabled</b> and if you check it, then you should type accented "
--"letters on their own. If it is not checked, accented letters will be displayed "
--"with normal letters."
--"<br>\n"
-+"If this is <b>disabled</b>, then the selected language does not support it. "
-+"If this is <b>enabled</b> and if you check it, then you should type accented "
-+"letters on their own. If it is not checked, accented letters will be "
-+"displayed with normal letters.<br>\n"
- "Default is that accented letters will be shown when the corresponding "
--"unaccented letter is guessed."
--"<br>\n"
--"For example, in Catalan, if this is unchecked and you type \"o\", the o and ò "
--"will be displayed in the word <b>xenofòbia</b>. If this option is checked, when "
--"you type \"o\", only \"o\" will be displayed and you will then have to type "
--"\"ò\" for this letter to be displayed."
-+"unaccented letter is guessed.<br>\n"
-+"For example, in Catalan, if this is unchecked and you type \"o\", the o and "
-+"ò will be displayed in the word <b>xenofòbia</b>. If this option is checked, "
-+"when you type \"o\", only \"o\" will be displayed and you will then have to "
-+"type \"ò\" for this letter to be displayed."
- msgstr ""
--"如果無法選取此選項，表示您所選擇的語言不支援這個功能。反之，若您勾選此選項，您必須輸入重音字母。若您沒有勾選此選項，則重音字母會以一般字母顯示。"
--"<br>\n"
--"預設是輸入相關非重音字母時，重音字母自己會顯示出來。"
--"<br>\n"
--"例如，在加泰隆語中，如果沒有勾選此選項，單字為 xenofòbia ，則您輸入 o 時，o 與 ò 會同時出現。如果有勾選此選項，在您輸入 o 時則只有 o "
--"會出現，您必須輸入 ò 才會出現這個字母。"
-+"如果無法選取此選項，表示您所選擇的語言不支援這個功能。反之，若您勾選此選項，"
-+"您必須輸入重音字母。若您沒有勾選此選項，則重音字母會以一般字母顯示。<br>\n"
-+"預設是輸入相關非重音字母時，重音字母自己會顯示出來。<br>\n"
-+"例如，在加泰隆語中，如果沒有勾選此選項，單字為 xenofòbia ，則您輸入 o 時，o "
-+"與 ò 會同時出現。如果有勾選此選項，在您輸入 o 時則只有 o 會出現，您必須輸入 "
-+"ò 才會出現這個字母。"
- 
- #. i18n: file normal.ui line 32
- #: rc.cpp:30
-@@ -321,19 +322,21 @@
- #: rc.cpp:36
- #, no-c-format
- msgid ""
--"If you check this box, only the first letter will be written if the letter is "
--"found in several places in the word. Then when you rechoose this letter, it "
--"will replace the second instance in the word until there are no more instances "
--"of this letter.\n"
--"For example, the word to guess is \"potato\". If this option is unchecked, when "
--"you try \"o\", the 2 \"o\" in the word will be discovered at the same time. If "
--"this is checked, you will need to try \"o\" twice.\n"
-+"If you check this box, only the first letter will be written if the letter "
-+"is found in several places in the word. Then when you rechoose this letter, "
-+"it will replace the second instance in the word until there are no more "
-+"instances of this letter.\n"
-+"For example, the word to guess is \"potato\". If this option is unchecked, "
-+"when you try \"o\", the 2 \"o\" in the word will be discovered at the same "
-+"time. If this is checked, you will need to try \"o\" twice.\n"
- "\n"
--"Default is that for one letter typed, all instances of that letter in the word "
--"are displayed."
-+"Default is that for one letter typed, all instances of that letter in the "
-+"word are displayed."
- msgstr ""
--"勾選此選項的話，若單字中有重複出現的字母，則在您輸入該單字時，只會出現第一個。您必須再輸入才會出現下一個字母。\n"
--"例如，單字為 potato，如果沒有勾選此選項，則在您輸入 o 時兩個 o 都會同時出現。反之，則只會出現第一個 o。 \n"
-+"勾選此選項的話，若單字中有重複出現的字母，則在您輸入該單字時，只會出現第一"
-+"個。您必須再輸入才會出現下一個字母。\n"
-+"例如，單字為 potato，如果沒有勾選此選項，則在您輸入 o 時兩個 o 都會同時出現。"
-+"反之，則只會出現第一個 o。 \n"
- "預設為不使用此選項。"
- 
- #. i18n: file normal.ui line 49
-@@ -348,23 +351,26 @@
- msgid ""
- "If checked, the dialog 'Congratulations! You won!' is not displayed. After 3 "
- "seconds, a new game will start automatically."
--msgstr "勾選此選項的話，就不會出現「恭喜！您贏了！」的對話框。遊戲會在三秒之後自動重新開始。"
-+msgstr ""
-+"勾選此選項的話，就不會出現「恭喜！您贏了！」的對話框。遊戲會在三秒之後自動重"
-+"新開始。"
- 
- #. i18n: file normal.ui line 58
- #: rc.cpp:48
- #, no-c-format
- msgid ""
--"If this option is not checked, when a game is won a dialog will appear saying "
--"'Congratulations! You won!'. It also asks you if you want to play again and you "
--"have to say Yes or No.\n"
-+"If this option is not checked, when a game is won a dialog will appear "
-+"saying 'Congratulations! You won!'. It also asks you if you want to play "
-+"again and you have to say Yes or No.\n"
- "This is the default state.\n"
- "\n"
- "If this option is checked, this dialog will not appear and a new game will "
--"automatically start after four seconds. A passive popup tells you you have won "
--"the game. When this opton is checked you don't have an intrusive dialog each "
--"time you won a game."
-+"automatically start after four seconds. A passive popup tells you you have "
-+"won the game. When this opton is checked you don't have an intrusive dialog "
-+"each time you won a game."
- msgstr ""
--"如果沒有勾選此選項的話，在您猜中單字之後，會顯示一個「恭喜！您贏了！」的對話框。它會問您是否要再玩一次。\n"
-+"如果沒有勾選此選項的話，在您猜中單字之後，會顯示一個「恭喜！您贏了！」的對話"
-+"框。它會問您是否要再玩一次。\n"
- "這是預設的狀況。\n"
- "\n"
- "如果勾選此選項的話，這個對話框就不會出現，新的遊戲會在三四秒鐘之後自動開始。"
-@@ -391,8 +397,8 @@
- #: rc.cpp:63
- #, no-c-format
- msgid ""
--"If this box is checked, you will have some sounds played for each new game and "
--"when you win a game. If this is not checked, there will be no sound in "
-+"If this box is checked, you will have some sounds played for each new game "
-+"and when you win a game. If this is not checked, there will be no sound in "
- "KHangMan.\n"
- "Default is no sound."
- msgstr ""
-@@ -415,9 +421,11 @@
- #: rc.cpp:73
- #, no-c-format
- msgid ""
--"You can set the time for displaying the Hint tooltip. Default is 3 seconds but "
--"younger children might need longer time to be able to read the Hint."
--msgstr "您可以設定提示顯示的時間。預設是三秒，不過年紀小的孩子可能會需要較長的時間來讀取提示。"
-+"You can set the time for displaying the Hint tooltip. Default is 3 seconds "
-+"but younger children might need longer time to be able to read the Hint."
-+msgstr ""
-+"您可以設定提示顯示的時間。預設是三秒，不過年紀小的孩子可能會需要較長的時間來"
-+"讀取提示。"
- 
- #. i18n: file timerdlg.ui line 120
- #: rc.cpp:76
-@@ -441,11 +449,13 @@
- #: rc.cpp:85
- #, no-c-format
- msgid ""
--"You can set the time for displaying the Already Guessed tooltip after you try a "
--"letter that was already guessed. Default is 3 seconds but younger children "
--"might need longer time to be able to understand they are trying a letter that "
--"was already guessed."
--msgstr "您可以設定顯示「已猜過的字母」的時間。預設是三秒，不過年紀小的孩子可能會需要較多的時間。"
-+"You can set the time for displaying the Already Guessed tooltip after you "
-+"try a letter that was already guessed. Default is 3 seconds but younger "
-+"children might need longer time to be able to understand they are trying a "
-+"letter that was already guessed."
-+msgstr ""
-+"您可以設定顯示「已猜過的字母」的時間。預設是三秒，不過年紀小的孩子可能會需要"
-+"較多的時間。"
- 
- #. i18n: file khangmanui.rc line 27
- #: rc.cpp:94
-@@ -469,7 +479,7 @@
- 
- #: khangman.cpp:81
- msgid "&Get Words in New Language..."
--msgstr "取得新語言的單字(&G)..."
-+msgstr "取得新語言的單字(&G)…"
- 
- #: khangman.cpp:85
- msgid "Le&vel"
-diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdeedu/kig.po kde-i18n-zh_TW-3.5.10/messages/kdeedu/kig.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdeedu/kig.po	2008-08-19 20:43:13.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdeedu/kig.po	2011-11-11 15:45:17.000000000 +0100
-@@ -9,8 +9,7 @@
- "Project-Id-Version: kig\n"
- "POT-Creation-Date: 2008-07-08 01:24+0200\n"
- "PO-Revision-Date: 2006-11-01 14:01+0800\n"
--"Last-Translator: Frank Weng (a.k.a. Franklin) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Chinese Traditional <zh-l10n@linux.org.tw>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
-@@ -24,16 +23,18 @@
- "document.  You can use them to give objects names, change their colors\n"
- "and line styles, and lots of other interesting things.</p>\n"
- msgstr ""
--"<p>Kig "
--"中最強大的工具之一，就是您在物件上或檔案空白處點選右鍵所出現的選單。您可以用此選單來命名物件，修改物件的顏色與線條樣式，還有許多有趣的東西。</p>\n"
-+"<p>Kig 中最強大的工具之一，就是您在物件上或檔案空白處點選右鍵所出現的選單。您"
-+"可以用此選單來命名物件，修改物件的顏色與線條樣式，還有許多有趣的東西。</p>\n"
- 
- #: tips.cpp:11
- msgid ""
--"<p>You can construct new points without using the menu or the toolbar, simply\n"
-+"<p>You can construct new points without using the menu or the toolbar, "
-+"simply\n"
- "clicking somewhere on the Kig document with the <em>middle mouse\n"
- "button</em>.</p>\n"
- msgstr ""
--"<p>您要建構新的點的話，不需要跑到選單裡去找，或使用工具列。只要在 Kig 檔案中的某處點選滑鼠中鍵即可。</p>\n"
-+"<p>您要建構新的點的話，不需要跑到選單裡去找，或使用工具列。只要在 Kig 檔案中"
-+"的某處點選滑鼠中鍵即可。</p>\n"
- 
- #: tips.cpp:18
- msgid ""
-@@ -41,8 +42,9 @@
- "<em>KGeo</em> files, <em>KSeg</em> files, and, partially, <em>Dr. Geo</em>\n"
- "and <em>Cabri&#8482;</em> files.</p>\n"
- msgstr ""
--"<p>Kig 可以開啟幾種不同的檔案格式：它本身的檔案（<code>.kig</code> 檔），<em>KGeo</em> 檔，<em>KSeg</em> "
--"檔，還有一部份的 <em>Dr. Geo</em> 與 <em>Cabri&#8482;</em> 檔。</p>\n"
-+"<p>Kig 可以開啟幾種不同的檔案格式：它本身的檔案（<code>.kig</code> 檔），"
-+"<em>KGeo</em> 檔，<em>KSeg</em> 檔，還有一部份的 <em>Dr. Geo</em> 與 "
-+"<em>Cabri&#8482;</em> 檔。</p>\n"
- 
- #: tips.cpp:25
- msgid ""
-@@ -50,18 +52,21 @@
- "use\n"
- "in your documents: open the <em>Objects</em> menu to see them all.</p>\n"
- msgstr ""
--"<p>在 Kig 中您可以建構超過 40 種物件與做 10 種以上的轉換，您只要在檔案中選取「物件」選單就可以看到。</p>\n"
-+"<p>在 Kig 中您可以建構超過 40 種物件與做 10 種以上的轉換，您只要在檔案中選取"
-+"「物件」選單就可以看到。</p>\n"
- 
- #: tips.cpp:31
- msgid ""
- "<p>You can use the selected objects to start the construction of an object\n"
--"which requires the selected objects as arguments. For example, if you have two\n"
--"points selected, you can choose <em>Start->Circle by Three Points</em> "
--"from the\n"
-+"which requires the selected objects as arguments. For example, if you have "
-+"two\n"
-+"points selected, you can choose <em>Start->Circle by Three Points</em> from "
-+"the\n"
- "popup menu to start constructing a circle by three points.</p>\n"
- msgstr ""
--"若是建構物件時需要現有物件做為參數，您可以選取該物件後再來建構新物件。例如，您選取兩個點，然後在彈出式選單中選取「開始」->"
--"「用三點決定圓」，就可以開始建構一個圓。</p>\n"
-+"若是建構物件時需要現有物件做為參數，您可以選取該物件後再來建構新物件。例如，"
-+"您選取兩個點，然後在彈出式選單中選取「開始」->「用三點決定圓」，就可以開始建"
-+"構一個圓。</p>\n"
- 
- #: tips.cpp:39
- msgid ""
-@@ -69,19 +74,21 @@
- "interesting macro on Kig website:\n"
- "<a href=\"http://edu.kde.org/kig\">http://edu.kde.org/kig</a>.</p>\n"
- msgstr ""
--"<p>Kig 可以使用外部巨集來延伸它的物件集。您可以在 Kig 網站 <a href=\"http://edu.kde.org/kig\">"
--"http://edu.kde.org/kig</a> 中找到一些有趣的巨集。</p>\n"
-+"<p>Kig 可以使用外部巨集來延伸它的物件集。您可以在 Kig 網站 <a href=\"http://"
-+"edu.kde.org/kig\">http://edu.kde.org/kig</a> 中找到一些有趣的巨集。</p>\n"
- 
- #: tips.cpp:46
- msgid ""
- "<p>If you have more than one object under the mouse, and you want to select "
- "any\n"
--"of them, you can click with the <em>left mouse button</em>, while holding the\n"
--"<em>Shift</em> key, to get a list of the objects under the mouse cursor which\n"
-+"of them, you can click with the <em>left mouse button</em>, while holding "
-+"the\n"
-+"<em>Shift</em> key, to get a list of the objects under the mouse cursor "
-+"which\n"
- "you can then select from.</p>\n"
- msgstr ""
--"<p>如果在滑鼠下有一個以上的物件，而您想要選取其中一個，您可以按住 <em>Shift</em> "
--"鍵，再點選滑鼠左鍵，就會出現一個在滑鼠游標下的物件清單讓您選擇。</p>\n"
-+"<p>如果在滑鼠下有一個以上的物件，而您想要選取其中一個，您可以按住 <em>Shift</"
-+"em> 鍵，再點選滑鼠左鍵，就會出現一個在滑鼠游標下的物件清單讓您選擇。</p>\n"
- 
- #. i18n: file kig/kigpartui.rc line 35
- #: rc.cpp:12
-@@ -301,7 +308,8 @@
- #: rc.cpp:166
- #, no-c-format
- msgid ""
--"Here you can modify the name, the description and the icon of this macro type."
-+"Here you can modify the name, the description and the icon of this macro "
-+"type."
- msgstr "您可在此修改此巨集類型的名稱、描述和圖示。"
- 
- #. i18n: file modes/edittypebase.ui line 79
-@@ -327,9 +335,10 @@
- #, no-c-format
- msgid ""
- "Here you can edit the description of the current macro type. This field is "
--"optional, so you can also leave this empty: if you do so, then your macro type "
--"will have no description."
--msgstr "您可以在此編輯目前巨集型態的描述。這個欄位是選擇性的，表示您可以將它留白。"
-+"optional, so you can also leave this empty: if you do so, then your macro "
-+"type will have no description."
-+msgstr ""
-+"您可以在此編輯目前巨集型態的描述。這個欄位是選擇性的，表示您可以將它留白。"
- 
- #. i18n: file modes/edittypebase.ui line 142
- #: rc.cpp:181
-@@ -400,7 +409,8 @@
- "places (e.g. \"This segment is %1 units long.\")."
- msgstr ""
- "在此輸入您的標籤上的文字，並點選「下一步」。\n"
--"如果您要顯示變數的部份，則在適當的位置上放入 %1, %2, ...（例如：「這個線段長度為 %1。」）"
-+"如果您要顯示變數的部份，則在適當的位置上放入 %1, %2, ...（例如：「這個線段長"
-+"度為 %1。」）"
- 
- #. i18n: file modes/textlabelwizardbase.ui line 51
- #: rc.cpp:230
-@@ -418,10 +428,12 @@
- #: rc.cpp:236
- #, no-c-format
- msgid ""
--"Now select the argument(s) you need.  For every argument, click on it, select "
--"an object and a property in the Kig window, and click finish when you are "
--"done..."
--msgstr "現在來選擇您需要的參數。在每個參數上點擊，在 Kig 視窗中選擇物件與屬性，並在完成後點選「完成」。"
-+"Now select the argument(s) you need.  For every argument, click on it, "
-+"select an object and a property in the Kig window, and click finish when you "
-+"are done..."
-+msgstr ""
-+"現在來選擇您需要的參數。在每個參數上點擊，在 Kig 視窗中選擇物件與屬性，並在完"
-+"成後點選「完成」。"
- 
- #. i18n: file modes/typesdialogbase.ui line 16
- #: rc.cpp:239
-@@ -433,9 +445,9 @@
- #: rc.cpp:242
- #, no-c-format
- msgid ""
--"Here you can manage types; you can remove them, and load and save them from and "
--"to files..."
--msgstr "這裡您可以管理、刪除巨集的類型，也可以從檔案載入，或儲存到檔案..."
-+"Here you can manage types; you can remove them, and load and save them from "
-+"and to files..."
-+msgstr "這裡您可以管理、刪除巨集的類型，也可以從檔案載入，或儲存到檔案…"
- 
- #. i18n: file modes/typesdialogbase.ui line 42
- #: rc.cpp:245
-@@ -453,7 +465,7 @@
- #: rc.cpp:254
- #, no-c-format
- msgid "Select types here..."
--msgstr "在此選擇類型..."
-+msgstr "在此選擇類型…"
- 
- #. i18n: file modes/typesdialogbase.ui line 86
- #: rc.cpp:257
-@@ -461,13 +473,13 @@
- msgid ""
- "This is a list of the current macro types... You can select, edit, delete, "
- "export and import them..."
--msgstr "這是目前巨集類型的列表，您可以選擇、刪除、匯出、匯入..."
-+msgstr "這是目前巨集類型的列表，您可以選擇、刪除、匯出、匯入…"
- 
- #. i18n: file modes/typesdialogbase.ui line 112
- #: rc.cpp:260
- #, no-c-format
- msgid "Edit..."
--msgstr "編輯..."
-+msgstr "編輯…"
- 
- #. i18n: file modes/typesdialogbase.ui line 115
- #: rc.cpp:263
-@@ -485,7 +497,7 @@
- #: rc.cpp:272
- #, no-c-format
- msgid "Export..."
--msgstr "匯出..."
-+msgstr "匯出…"
- 
- #. i18n: file modes/typesdialogbase.ui line 164
- #: rc.cpp:275
-@@ -497,7 +509,7 @@
- #: rc.cpp:278
- #, no-c-format
- msgid "Import..."
--msgstr "匯入..."
-+msgstr "匯入…"
- 
- #. i18n: file modes/typesdialogbase.ui line 175
- #: rc.cpp:281
-@@ -549,11 +561,11 @@
- 
- #: rc.cpp:311
- msgid "Select the line that the new circle should be tangent to..."
--msgstr "選取要與新的圓相切的線..."
-+msgstr "選取要與新的圓相切的線…"
- 
- #: objects/circle_type.cc:36 rc.cpp:312 rc.cpp:317 rc.cpp:323
- msgid "Select the center of the new circle..."
--msgstr "選擇新圓的圓心..."
-+msgstr "選擇新圓的圓心…"
- 
- #: rc.cpp:313
- msgid "Circle by Point && Segment (as the Diameter)"
-@@ -571,7 +583,7 @@
- 
- #: rc.cpp:318
- msgid "Select the segment whose length gives the diameter of the new circle..."
--msgstr "選擇要建構新圓參考直徑的線段..."
-+msgstr "選擇要建構新圓參考直徑的線段…"
- 
- #: rc.cpp:319
- msgid "Circle by Point && Segment (as the Radius)"
-@@ -588,7 +600,7 @@
- 
- #: rc.cpp:324
- msgid "Select the segment whose length gives the radius of the new circle..."
--msgstr "選擇要建構新圓參考半徑的線段..."
-+msgstr "選擇要建構新圓參考半徑的線段…"
- 
- #: rc.cpp:325
- msgid "Equilateral Triangle"
-@@ -613,7 +625,7 @@
- #: objects/centerofcurvature_type.cc:35 objects/tangent_type.cc:36 rc.cpp:330
- #: rc.cpp:335
- msgid "Select the curve..."
--msgstr "選擇曲線..."
-+msgstr "選擇曲線…"
- 
- #: rc.cpp:331
- msgid "Osculating Circle"
-@@ -633,7 +645,7 @@
- 
- #: rc.cpp:336
- msgid "Select the point..."
--msgstr "選擇點..."
-+msgstr "選擇點…"
- 
- #: rc.cpp:337
- msgid "Segment Axis"
-@@ -649,7 +661,7 @@
- 
- #: rc.cpp:340
- msgid "Select the segment of which you want to draw the axis..."
--msgstr "選擇您想要繪製垂直平分線的線段..."
-+msgstr "選擇您想要繪製垂直平分線的線段…"
- 
- #: rc.cpp:341
- msgid "Square"
-@@ -683,17 +695,17 @@
- msgid ""
- "Select the first of the two vectors of which you want to construct the "
- "difference..."
--msgstr "選擇您想要建構向量差的兩個向量中的第一個..."
-+msgstr "選擇您想要建構向量差的兩個向量中的第一個…"
- 
- #: rc.cpp:349
- msgid ""
- "Select the other of the two vectors of which you want to construct the "
- "difference..."
--msgstr "選擇您想要建構向量差的兩個向量中的另外一個..."
-+msgstr "選擇您想要建構向量差的兩個向量中的另外一個…"
- 
- #: rc.cpp:350
- msgid "Select the point to construct the difference vector in..."
--msgstr "選擇所建構向量差的起點..."
-+msgstr "選擇所建構向量差的起點…"
- 
- #: kig/aboutdata.h:26
- msgid "KDE Interactive Geometry"
-@@ -711,19 +723,24 @@
- msgid ""
- "Did a lot of important work all around Kig, including, but not limited to "
- "conics, cubics, transformations and property tests support."
--msgstr "對 Kig 做了很多很重要的貢獻，包括圓錐、三次曲線、轉換、屬性測試等，還有更多。"
-+msgstr ""
-+"對 Kig 做了很多很重要的貢獻，包括圓錐、三次曲線、轉換、屬性測試等，還有更多。"
- 
- #: kig/aboutdata.h:43
- msgid ""
- "Actual maintainer, Dr. Geo import filter, point and line styles, Italian "
- "translation, miscellaneous stuff here and there."
--msgstr "實際維護者，Dr. Geo 匯入過濾器，點與線的樣式，義大利文翻譯，以及一些其他的貢獻。"
-+msgstr ""
-+"實際維護者，Dr. Geo 匯入過濾器，點與線的樣式，義大利文翻譯，以及一些其他的貢"
-+"獻。"
- 
- #: kig/aboutdata.h:49
- msgid ""
- "Helped a lot with the implementation of the Locus object, there's quite some "
- "math involved in doing it right, and Franco wrote the most difficult parts."
--msgstr "協助實作 Locus 物件。這當中有很多跟數學有關的東西，而 Franco 幫忙寫了其中最困難的部份。"
-+msgstr ""
-+"協助實作 Locus 物件。這當中有很多跟數學有關的東西，而 Franco 幫忙寫了其中最困"
-+"難的部份。"
- 
- #: kig/aboutdata.h:55
- msgid ""
-@@ -733,14 +750,14 @@
- 
- #: kig/aboutdata.h:60
- msgid ""
--"Author of KGeo, where I got inspiration, some source, and most of the artwork "
--"from."
-+"Author of KGeo, where I got inspiration, some source, and most of the "
-+"artwork from."
- msgstr "KGeo 的作者，我從他那裡得到了靈感、一些程式碼以及大部分的美工。"
- 
- #: kig/aboutdata.h:65
- msgid ""
--"Domi's brother, who he got to write the algorithm for calculating the center of "
--"the circle with three points given."
-+"Domi's brother, who he got to write the algorithm for calculating the center "
-+"of the circle with three points given."
- msgstr "Domi 的兄弟，撰寫計算給定三點形成的圓的圓心的演算法。"
- 
- #: kig/aboutdata.h:71
-@@ -751,7 +768,9 @@
- msgid ""
- "Gave me some good feedback on Kig, some feature requests, cleanups and style "
- "fixes, and someone to chat with on irc :)"
--msgstr "給了我關於 Kig 的一些很好的回饋，一些功能需求，整理程式碼，以及樣式修補，而且給了我一些在 irc 可以聊天的人 :)"
-+msgstr ""
-+"給了我關於 Kig 的一些很好的回饋，一些功能需求，整理程式碼，以及樣式修補，而且"
-+"給了我一些在 irc 可以聊天的人 :)"
- 
- #: kig/aboutdata.h:81
- msgid "Responsible for the nice application SVG Icon."
-@@ -767,7 +786,8 @@
- 
- #: filters/cabri-filter.cc:551
- msgid ""
--"This Cabri file contains a \"%1\" object, which Kig does not currently support."
-+"This Cabri file contains a \"%1\" object, which Kig does not currently "
-+"support."
- msgstr "此 Cabri 檔案包含 %1 物件，Kig 現在不支援。"
- 
- #: filters/drgeo-filter-chooser.cc:46
-@@ -795,8 +815,8 @@
- 
- #: filters/drgeo-filter.cc:372
- msgid ""
--"This Dr. Geo file contains an intersection type, which Kig does not currently "
--"support."
-+"This Dr. Geo file contains an intersection type, which Kig does not "
-+"currently support."
- msgstr "此 Dr. Geo 檔案包含一個扇形，Kig 現在不支援。"
- 
- #: filters/exporter.cc:101
-@@ -805,7 +825,7 @@
- 
- #: filters/exporter.cc:106
- msgid "&Image..."
--msgstr "圖像(&I)..."
-+msgstr "圖像(&I)…"
- 
- #: filters/exporter.cc:125
- msgid "Export as Image"
-@@ -822,8 +842,8 @@
- #: filters/exporter.cc:158 filters/exporter.cc:594
- #: filters/latexexporter.cc:508 filters/svgexporter.cc:82
- msgid ""
--"The file \"%1\" could not be opened. Please check if the file permissions are "
--"set correctly."
-+"The file \"%1\" could not be opened. Please check if the file permissions "
-+"are set correctly."
- msgstr "檔案 %1 無法開啟。請檢查檔案權限是否設定正確。"
- 
- #: filters/exporter.cc:172
-@@ -840,7 +860,7 @@
- 
- #: filters/exporter.cc:219
- msgid "&XFig File..."
--msgstr "XFig 檔案(&X)..."
-+msgstr "XFig 檔案(&X)…"
- 
- #: filters/exporter.cc:582
- msgid "*.fig|XFig Documents (*.fig)"
-@@ -881,7 +901,8 @@
- 
- #: filters/kseg-filter.cc:559
- msgid ""
--"This KSeg file contains a filled circle, which Kig does not currently support."
-+"This KSeg file contains a filled circle, which Kig does not currently "
-+"support."
- msgstr "此 KSeg 檔案包含一個填充的圓，Kig 現在不支援。"
- 
- #: filters/kseg-filter.cc:565
-@@ -896,11 +917,11 @@
- 
- #: filters/latexexporter.cc:72
- msgid "Export to &Latex..."
--msgstr "匯出到 Latex(&L)..."
-+msgstr "匯出到 Latex(&L)…"
- 
- #: filters/latexexporter.cc:77
- msgid "&Latex..."
--msgstr "Latex(&L)..."
-+msgstr "Latex(&L)…"
- 
- #: filters/latexexporter.cc:486
- msgid "*.tex|Latex Documents (*.tex)"
-@@ -933,7 +954,8 @@
- 
- #: filters/native-filter.cc:232 filters/native-filter.cc:421
- msgid ""
--"This Kig file has a coordinate system that this Kig version does not support.\n"
-+"This Kig file has a coordinate system that this Kig version does not "
-+"support.\n"
- "A standard coordinate system will be used instead."
- msgstr ""
- "此 Kig 檔案有一個在此版本的 Kig 中不支援的座標系。\n"
-@@ -943,17 +965,19 @@
- #: misc/object_hierarchy.cc:543 objects/object_imp_factory.cc:503
- msgid ""
- "This Kig file uses an object of type \"%1\", which this Kig version does not "
--"support.Perhaps you have compiled Kig without support for this object type,or "
--"perhaps you are using an older Kig version."
--msgstr "此 Kig 檔案使用了 %1 物件類型，它不被此版本的 Kig 支援。可能您編譯時沒有支援此物件類型，或者可能您使用了一個舊版本的 Kig。"
-+"support.Perhaps you have compiled Kig without support for this object type,"
-+"or perhaps you are using an older Kig version."
-+msgstr ""
-+"此 Kig 檔案使用了 %1 物件類型，它不被此版本的 Kig 支援。可能您編譯時沒有支援"
-+"此物件類型，或者可能您使用了一個舊版本的 Kig。"
- 
- #: filters/svgexporter.cc:45
- msgid "&Export to SVG..."
--msgstr "匯出為 SVG(&E)..."
-+msgstr "匯出為 SVG(&E)…"
- 
- #: filters/svgexporter.cc:50
- msgid "&SVG..."
--msgstr "SVG(&S)..."
-+msgstr "SVG(&S)…"
- 
- #: filters/svgexporter.cc:62
- msgid "*.svg|Scalable Vector Graphics (*.svg)"
-@@ -1035,7 +1059,7 @@
- 
- #: misc/builtin_stuff.cc:121
- msgid "Select the angle you want to construct the bisector of..."
--msgstr "選擇您想要建構角平分線的角..."
-+msgstr "選擇您想要建構角平分線的角…"
- 
- #: misc/builtin_stuff.cc:122 objects/other_imp.cc:104
- msgid "Angle Bisector"
-@@ -1282,7 +1306,8 @@
- 
- #: misc/builtin_stuff.cc:379
- msgid ""
--"Scale an object over a point, by the ratio given by the length of two segments"
-+"Scale an object over a point, by the ratio given by the length of two "
-+"segments"
- msgstr "將物件根據一個點做縮放，縮放方式為給定兩個線段長度的比例。"
- 
- #: misc/builtin_stuff.cc:386
-@@ -1291,7 +1316,8 @@
- 
- #: misc/builtin_stuff.cc:387
- msgid ""
--"An object scaled over a line, by the ratio given by the length of two segments"
-+"An object scaled over a line, by the ratio given by the length of two "
-+"segments"
- msgstr "將物件根據一條直線做縮放，縮放方式為給定兩個線段長度的比例。"
- 
- #: misc/builtin_stuff.cc:394
-@@ -1300,8 +1326,8 @@
- 
- #: misc/builtin_stuff.cc:395
- msgid ""
--"Apply a similitude to an object ( the sequence of a scaling and rotation around "
--"a center )"
-+"Apply a similitude to an object ( the sequence of a scaling and rotation "
-+"around a center )"
- msgstr "對一物件產生其相似形（給定一中心點與物件上某一點，產生一個相似形）"
- 
- #: misc/builtin_stuff.cc:402
-@@ -1402,8 +1428,8 @@
- 
- #: misc/builtin_stuff.cc:535
- msgid ""
--"Test whether a given point have the same distance from a given point and from "
--"another given point"
-+"Test whether a given point have the same distance from a given point and "
-+"from another given point"
- msgstr "測試一給定點與其它兩點之間的距離是否相等"
- 
- #: misc/builtin_stuff.cc:543
-@@ -1500,14 +1526,12 @@
- 
- #: misc/kiginputdialog.cc:154
- msgid ""
--"Choose from this list the goniometric unit you want to use to modify the size "
--"of this angle."
--"<br>\n"
--"If you switch to another unit, the value in the edit field on the left will be "
--"converted to the new selected unit."
-+"Choose from this list the goniometric unit you want to use to modify the "
-+"size of this angle.<br>\n"
-+"If you switch to another unit, the value in the edit field on the left will "
-+"be converted to the new selected unit."
- msgstr ""
--"從此清單中選取您要用來改變此角的角度單位。"
--"<br>\n"
-+"從此清單中選取您要用來改變此角的角度單位。<br>\n"
- "如果您切換到其它的單位，在編輯欄位中的值會轉換成新單位的值。"
- 
- #: misc/lists.cc:304 misc/lists.cc:310
-@@ -1522,11 +1546,12 @@
- msgid ""
- "This file was created by a very old Kig version (pre-0.4). Support for this "
- "format has been removed from recent Kig versions. You can try to import this "
--"macro using a previous Kig version (0.4 to 0.6) and then export it again in the "
--"new format."
-+"macro using a previous Kig version (0.4 to 0.6) and then export it again in "
-+"the new format."
- msgstr ""
--"此檔案是 Kig 的早先版本版本（0.4 之前）建立的。而對此格式的支援已經從最近的 Kig 中刪除。您可以嘗試使用 Kig 的先前版本（0.4 到 "
--"0.6）匯入此巨集，然後再將其匯出為新格式。"
-+"此檔案是 Kig 的早先版本版本（0.4 之前）建立的。而對此格式的支援已經從最近的 "
-+"Kig 中刪除。您可以嘗試使用 Kig 的先前版本（0.4 到 0.6）匯入此巨集，然後再將其"
-+"匯出為新格式。"
- 
- #: misc/lists.cc:375
- #, c-format
-@@ -1549,8 +1574,9 @@
- 
- #: misc/special_constructors.cc:157
- msgid ""
--"Select the moving point, which will be moved around while drawing the locus..."
--msgstr "選取移動點，在繪製軌跡時會被移動..."
-+"Select the moving point, which will be moved around while drawing the "
-+"locus..."
-+msgstr "選取移動點，在繪製軌跡時會被移動…"
- 
- #: misc/special_constructors.cc:158
- msgid "Following Point"
-@@ -1558,8 +1584,9 @@
- 
- #: misc/special_constructors.cc:159
- msgid ""
--"Select the following point, whose locations the locus will be drawn through..."
--msgstr "選取跟隨點，繪製軌跡時會通過這些點..."
-+"Select the following point, whose locations the locus will be drawn "
-+"through..."
-+msgstr "選取跟隨點，繪製軌跡時會通過這些點…"
- 
- #: misc/special_constructors.cc:163
- msgid "Locus"
-@@ -1584,7 +1611,7 @@
- #: misc/special_constructors.cc:366
- msgid ""
- "... with this vertex (click on the first vertex to terminate construction)"
--msgstr "... 此為頂點（點選第一個頂點則結束建構）"
-+msgstr "… 此為頂點（點選第一個頂點則結束建構）"
- 
- #: misc/special_constructors.cc:367
- msgid "Construct a polygon with this vertex"
-@@ -1600,7 +1627,7 @@
- 
- #: misc/special_constructors.cc:430
- msgid "Construct the vertices of this polygon..."
--msgstr "建構此多邊形的頂點..."
-+msgstr "建構此多邊形的頂點…"
- 
- #: misc/special_constructors.cc:434
- msgid "Vertices of a Polygon"
-@@ -1612,7 +1639,7 @@
- 
- #: misc/special_constructors.cc:497
- msgid "Construct the sides of this polygon..."
--msgstr "建構此多邊形的邊..."
-+msgstr "建構此多邊形的邊…"
- 
- #: misc/special_constructors.cc:501
- msgid "Sides of a Polygon"
-@@ -1648,15 +1675,15 @@
- 
- #: misc/special_constructors.cc:777
- msgid "Select the center of the new polygon..."
--msgstr "選擇新多邊形的中心..."
-+msgstr "選擇新多邊形的中心…"
- 
- #: misc/special_constructors.cc:781
- msgid "Select a vertex for the new polygon..."
--msgstr "選擇新多邊形的頂點..."
-+msgstr "選擇新多邊形的頂點…"
- 
- #: misc/special_constructors.cc:785
- msgid "Move the cursor to get the desired number of sides..."
--msgstr "移動游標以取得希望的邊數..."
-+msgstr "移動游標以取得希望的邊數…"
- 
- #: misc/special_constructors.cc:977
- msgid "Construct the Radical Lines of This Circle"
-@@ -1682,9 +1709,10 @@
- 
- #: misc/special_constructors.cc:1019
- msgid ""
--"The unique projective transformation that maps four points (or a quadrilateral) "
--"onto four other points (or a quadrilateral)"
--msgstr "利用某四點（或某四邊形）映射到其他四點（或其他四邊形）產生的唯一投影轉換"
-+"The unique projective transformation that maps four points (or a "
-+"quadrilateral) onto four other points (or a quadrilateral)"
-+msgstr ""
-+"利用某四點（或某四邊形）映射到其他四點（或其他四邊形）產生的唯一投影轉換"
- 
- #: misc/special_constructors.cc:1046
- msgid "Inversion of Point, Line or Circle"
-@@ -1793,7 +1821,7 @@
- #: misc/special_constructors.cc:1371
- msgid ""
- "Select the first of the points of which you want to construct the midpoint..."
--msgstr "選擇建構中點的第一點..."
-+msgstr "選擇建構中點的第一點…"
- 
- #: misc/special_constructors.cc:1372
- msgid "Construct the midpoint of this point and another one"
-@@ -1801,15 +1829,15 @@
- 
- #: misc/special_constructors.cc:1373
- msgid "Select the other of the points of which to construct the midpoint..."
--msgstr "選擇建構中點的另外一點..."
-+msgstr "選擇建構中點的另外一點…"
- 
- #: misc/special_constructors.cc:1483
- msgid "Select the first object to intersect..."
--msgstr "選擇相交的第一個物件..."
-+msgstr "選擇相交的第一個物件…"
- 
- #: misc/special_constructors.cc:1485
- msgid "Select the second object to intersect..."
--msgstr "選擇相交的第二個物件..."
-+msgstr "選擇相交的第二個物件…"
- 
- #: misc/special_constructors.cc:1490
- msgid "Tangent"
-@@ -1873,9 +1901,9 @@
- 
- #: modes/construct_mode.cc:298
- msgid ""
--"Click the location where you want to place the new point, or the curve that you "
--"want to attach it to..."
--msgstr "點選您要放置新點的位置，或是您要附加的曲線..."
-+"Click the location where you want to place the new point, or the curve that "
-+"you want to attach it to..."
-+msgstr "點選您要放置新點的位置，或是您要附加的曲線…"
- 
- #: modes/construct_mode.cc:475
- msgid "Now select the location for the result label."
-@@ -1892,8 +1920,8 @@
- #: modes/label.cc:295
- #, c-format
- msgid ""
--"There are '%n' parts in the text that you have not selected a value for. Please "
--"remove them or select enough arguments."
-+"There are '%n' parts in the text that you have not selected a value for. "
-+"Please remove them or select enough arguments."
- msgstr "文字中有 %n 個部份沒有選取值。請將它們移除，或是選擇足夠的參數。"
- 
- #: modes/label.cc:379
-@@ -1915,14 +1943,18 @@
- "One of the result objects you selected cannot be calculated from the given "
- "objects. Kig cannot calculate this macro because of this. Please press Back, "
- "and construct the objects in the correct order..."
--msgstr "您所選取的結果物件中有一個無法根據給定的物件計算出來。Kig 因此而無法執行此巨集。請按「回去」鍵並重新依正確的順序建構物件..."
-+msgstr ""
-+"您所選取的結果物件中有一個無法根據給定的物件計算出來。Kig 因此而無法執行此巨"
-+"集。請按「回去」鍵並重新依正確的順序建構物件..."
- 
- #: modes/macro.cc:116
- msgid ""
- "One of the given objects is not used in the calculation of the resultant "
--"objects.  This probably means you are expecting Kig to do something impossible. "
--" Please check the macro and try again."
--msgstr "給定的物件中有一個並未用於計算此結果物件。這有可能是您希望 Kig 做到不可能的事。請檢查此巨集並再試一次。"
-+"objects.  This probably means you are expecting Kig to do something "
-+"impossible.  Please check the macro and try again."
-+msgstr ""
-+"給定的物件中有一個並未用於計算此結果物件。這有可能是您希望 Kig 做到不可能的"
-+"事。請檢查此巨集並再試一次。"
- 
- #: modes/moving.cc:157
- msgid "Move %1 Objects"
-@@ -1962,7 +1994,7 @@
- 
- #: modes/popup.cc:282
- msgid "Set &Pen Width"
--msgstr "設定筆寬(&L)..."
-+msgstr "設定筆寬(&L)…"
- 
- #: modes/popup.cc:283
- msgid "Set St&yle"
-@@ -1990,7 +2022,7 @@
- 
- #: modes/popup.cc:502
- msgid "Set &Name..."
--msgstr "設定名稱(&N)..."
-+msgstr "設定名稱(&N)…"
- 
- #: modes/popup.cc:506
- msgid "&Name"
-@@ -2026,7 +2058,7 @@
- 
- #: modes/popup.cc:1065
- msgid "Edit Script..."
--msgstr "編輯文稿..."
-+msgstr "編輯文稿…"
- 
- #: objects/angle_type.cc:39
- msgid "Construct an angle through this point"
-@@ -2035,7 +2067,7 @@
- #: objects/angle_type.cc:44
- msgid ""
- "Select a point that the first half-line of the angle should go through..."
--msgstr "選擇一個點，此角的第一條線會通過此點..."
-+msgstr "選擇一個點，此角的第一條線會通過此點…"
- 
- #: objects/angle_type.cc:45
- msgid "Construct an angle at this point"
-@@ -2043,12 +2075,12 @@
- 
- #: objects/angle_type.cc:46
- msgid "Select the point to construct the angle in..."
--msgstr "選擇一個點以建構此角..."
-+msgstr "選擇一個點以建構此角…"
- 
- #: objects/angle_type.cc:48
- msgid ""
- "Select a point that the second half-line of the angle should go through..."
--msgstr "選擇一個點，此角的第二條線會通過此點..."
-+msgstr "選擇一個點，此角的第二條線會通過此點…"
- 
- #: objects/angle_type.cc:103
- msgid "Set Si&ze"
-@@ -2064,7 +2096,7 @@
- 
- #: objects/arc_type.cc:46 objects/arc_type.cc:148
- msgid "Select the start point of the new arc..."
--msgstr "選擇新弧的起點..."
-+msgstr "選擇新弧的起點…"
- 
- #: objects/arc_type.cc:47
- msgid "Construct an arc through this point"
-@@ -2072,7 +2104,7 @@
- 
- #: objects/arc_type.cc:48
- msgid "Select a point for the new arc to go through..."
--msgstr "選擇新弧通過的一點..."
-+msgstr "選擇新弧通過的一點…"
- 
- #: objects/arc_type.cc:49
- msgid "Construct an arc ending at this point"
-@@ -2080,7 +2112,7 @@
- 
- #: objects/arc_type.cc:50
- msgid "Select the end point of the new arc..."
--msgstr "選擇新戶的終點..."
-+msgstr "選擇新戶的終點…"
- 
- #: objects/arc_type.cc:145
- msgid "Construct an arc with this center"
-@@ -2088,7 +2120,7 @@
- 
- #: objects/arc_type.cc:146
- msgid "Select the center of the new arc..."
--msgstr "選擇新弧的圓心..."
-+msgstr "選擇新弧的圓心…"
- 
- #: objects/arc_type.cc:149
- msgid "Construct an arc with this angle"
-@@ -2096,7 +2128,7 @@
- 
- #: objects/arc_type.cc:150
- msgid "Select the angle of the new arc..."
--msgstr "選擇新弧的角度..."
-+msgstr "選擇新弧的角度…"
- 
- #: objects/bogus_imp.cc:338
- msgid "Test Result"
-@@ -2104,7 +2136,7 @@
- 
- #: objects/centerofcurvature_type.cc:36
- msgid "Select a point on the curve..."
--msgstr "選擇曲線上的點..."
-+msgstr "選擇曲線上的點…"
- 
- #: objects/circle_imp.cc:145 objects/polygon_imp.cc:227
- msgid "Surface"
-@@ -2186,7 +2218,7 @@
- #: objects/circle_type.cc:38 objects/circle_type.cc:72
- #: objects/circle_type.cc:74 objects/circle_type.cc:76
- msgid "Select a point for the new circle to go through..."
--msgstr "選擇新圓要通過的點..."
-+msgstr "選擇新圓要通過的點…"
- 
- #: objects/conic_imp.cc:81
- msgid "Conic Type"
-@@ -2271,7 +2303,7 @@
- #: objects/conic_types.cc:46 objects/conic_types.cc:88
- #: objects/conic_types.cc:222
- msgid "Select a point for the new conic to go through..."
--msgstr "選擇新的二次曲線要通過的點..."
-+msgstr "選擇新的二次曲線要通過的點…"
- 
- #: objects/conic_types.cc:83 objects/conic_types.cc:85
- msgid "Construct a conic with this asymptote"
-@@ -2279,11 +2311,11 @@
- 
- #: objects/conic_types.cc:84
- msgid "Select the first asymptote of the new conic..."
--msgstr "擇新的二次曲線的第一條漸近線..."
-+msgstr "擇新的二次曲線的第一條漸近線…"
- 
- #: objects/conic_types.cc:86
- msgid "Select the second asymptote of the new conic..."
--msgstr "擇新的二次曲線的第二條漸近線..."
-+msgstr "擇新的二次曲線的第二條漸近線…"
- 
- #: objects/conic_types.cc:140
- msgid "Construct an ellipse with this focus"
-@@ -2291,11 +2323,11 @@
- 
- #: objects/conic_types.cc:145
- msgid "Select the first focus of the new ellipse..."
--msgstr "選擇新橢圓的第一個焦點..."
-+msgstr "選擇新橢圓的第一個焦點…"
- 
- #: objects/conic_types.cc:147
- msgid "Select the second focus of the new ellipse..."
--msgstr "選擇新橢圓的第二個焦點..."
-+msgstr "選擇新橢圓的第二個焦點…"
- 
- #: objects/conic_types.cc:148
- msgid "Construct an ellipse through this point"
-@@ -2303,7 +2335,7 @@
- 
- #: objects/conic_types.cc:149
- msgid "Select a point for the new ellipse to go through..."
--msgstr "選擇新橢圓要通過的點..."
-+msgstr "選擇新橢圓要通過的點…"
- 
- #: objects/conic_types.cc:175
- msgid "Construct a hyperbola with this focus"
-@@ -2311,11 +2343,11 @@
- 
- #: objects/conic_types.cc:180
- msgid "Select the first focus of the new hyperbola..."
--msgstr "選擇新雙曲線的第一個焦點..."
-+msgstr "選擇新雙曲線的第一個焦點…"
- 
- #: objects/conic_types.cc:182
- msgid "Select the second focus of the new hyperbola..."
--msgstr "選擇新雙曲線的第二個焦點..."
-+msgstr "選擇新雙曲線的第二個焦點…"
- 
- #: objects/conic_types.cc:183 objects/conic_types.cc:417
- msgid "Construct a hyperbola through this point"
-@@ -2325,7 +2357,7 @@
- #: objects/conic_types.cc:424 objects/conic_types.cc:426
- #: objects/conic_types.cc:428
- msgid "Select a point for the new hyperbola to go through..."
--msgstr "選擇新雙曲線要通過的點..."
-+msgstr "選擇新雙曲線要通過的點…"
- 
- #: objects/conic_types.cc:217
- msgid "Construct a conic with this line as directrix"
-@@ -2333,7 +2365,7 @@
- 
- #: objects/conic_types.cc:218
- msgid "Select the directrix of the new conic..."
--msgstr "選擇新二次曲線的準線..."
-+msgstr "選擇新二次曲線的準線…"
- 
- #: objects/conic_types.cc:219
- msgid "Construct a conic with this point as focus"
-@@ -2341,7 +2373,7 @@
- 
- #: objects/conic_types.cc:220
- msgid "Select the focus of the new conic..."
--msgstr "選擇新二次曲線的角度..."
-+msgstr "選擇新二次曲線的角度…"
- 
- #: objects/conic_types.cc:260
- msgid "Construct a parabola through this point"
-@@ -2350,7 +2382,7 @@
- #: objects/conic_types.cc:265 objects/conic_types.cc:267
- #: objects/conic_types.cc:269
- msgid "Select a point for the new parabola to go through..."
--msgstr "選擇新拋物線要通過的點..."
-+msgstr "選擇新拋物線要通過的點…"
- 
- #: objects/conic_types.cc:307
- msgid "Construct a polar point wrt. this conic"
-@@ -2366,7 +2398,7 @@
- 
- #: objects/conic_types.cc:310 objects/conic_types.cc:346
- msgid "Select the line of which you want to construct the polar point..."
--msgstr "選擇您要建構極點的直線..."
-+msgstr "選擇您要建構極點的直線…"
- 
- #: objects/conic_types.cc:343
- msgid "Construct a polar line wrt. this conic"
-@@ -2382,7 +2414,7 @@
- 
- #: objects/conic_types.cc:381
- msgid "Select the conic of which you want to construct the directrix..."
--msgstr "選擇您要建構準線的二次曲線..."
-+msgstr "選擇您要建構準線的二次曲線…"
- 
- #: objects/conic_types.cc:465
- msgid "Construct a parabola with this directrix"
-@@ -2390,7 +2422,7 @@
- 
- #: objects/conic_types.cc:466
- msgid "Select the directrix of the new parabola..."
--msgstr "選擇新拋物線的準線..."
-+msgstr "選擇新拋物線的準線…"
- 
- #: objects/conic_types.cc:467
- msgid "Construct a parabola with this focus"
-@@ -2398,7 +2430,7 @@
- 
- #: objects/conic_types.cc:468
- msgid "Select the focus of the new parabola..."
--msgstr "選擇新拋物線的焦點..."
-+msgstr "選擇新拋物線的焦點…"
- 
- #: objects/conic_types.cc:505
- msgid "Construct the asymptotes of this conic"
-@@ -2406,7 +2438,7 @@
- 
- #: objects/conic_types.cc:506
- msgid "Select the conic of which you want to construct the asymptotes..."
--msgstr "選擇您要建構漸近線的二次曲線..."
-+msgstr "選擇您要建構漸近線的二次曲線…"
- 
- #: objects/conic_types.cc:543
- msgid "Construct the radical lines of this conic"
-@@ -2414,15 +2446,15 @@
- 
- #: objects/conic_types.cc:548
- msgid ""
--"Select the first of the two conics of which you want to construct the radical "
--"line..."
--msgstr "選擇您要建構公弦的第一個二次曲線..."
-+"Select the first of the two conics of which you want to construct the "
-+"radical line..."
-+msgstr "選擇您要建構公弦的第一個二次曲線…"
- 
- #: objects/conic_types.cc:550
- msgid ""
- "Select the other of the two conic of which you want to construct the radical "
- "line..."
--msgstr "選擇您要建構公弦的第二個二次曲線..."
-+msgstr "選擇您要建構公弦的第二個二次曲線…"
- 
- #: objects/conic_types.cc:669
- msgid "Switch Radical Lines"
-@@ -2485,7 +2517,7 @@
- #: objects/cubic_type.cc:133 objects/cubic_type.cc:135
- #: objects/cubic_type.cc:137 objects/cubic_type.cc:139
- msgid "Select a point for the new cubic to go through..."
--msgstr "選擇新三次曲線通過的一點..."
-+msgstr "選擇新三次曲線通過的一點…"
- 
- #: objects/curve_imp.cc:25
- msgid "curve"
-@@ -2554,7 +2586,7 @@
- 
- #: objects/inversion_type.cc:30
- msgid "Select the circle we want to invert against..."
--msgstr "選擇要做為反演基準的圓..."
-+msgstr "選擇要做為反演基準的圓…"
- 
- #: objects/inversion_type.cc:34
- msgid "Compute the inversion of this point"
-@@ -2562,7 +2594,7 @@
- 
- #: objects/inversion_type.cc:35
- msgid "Select the point to invert..."
--msgstr "選擇要反演的點..."
-+msgstr "選擇要反演的點…"
- 
- #: objects/inversion_type.cc:80
- msgid "Compute the inversion of this line"
-@@ -2570,7 +2602,7 @@
- 
- #: objects/inversion_type.cc:81
- msgid "Select the line to invert..."
--msgstr "選擇要反演的直線..."
-+msgstr "選擇要反演的直線…"
- 
- #: objects/inversion_type.cc:133
- msgid "Compute the inversion of this segment"
-@@ -2578,7 +2610,7 @@
- 
- #: objects/inversion_type.cc:134
- msgid "Select the segment to invert..."
--msgstr "選擇要反演的線段..."
-+msgstr "選擇要反演的線段…"
- 
- #: objects/inversion_type.cc:224
- msgid "Compute the inversion of this circle"
-@@ -2586,7 +2618,7 @@
- 
- #: objects/inversion_type.cc:225
- msgid "Select the circle to invert..."
--msgstr "選擇要反演的圓..."
-+msgstr "選擇要反演的圓…"
- 
- #: objects/inversion_type.cc:289
- msgid "Compute the inversion of this arc"
-@@ -2594,7 +2626,7 @@
- 
- #: objects/inversion_type.cc:290
- msgid "Select the arc to invert..."
--msgstr "選擇要反演的弧..."
-+msgstr "選擇要反演的弧…"
- 
- #: objects/line_imp.cc:96
- msgid "Slope"
-@@ -2737,7 +2769,7 @@
- 
- #: objects/line_type.cc:39
- msgid "Select the start point of the new segment..."
--msgstr "選擇新線段的起點..."
-+msgstr "選擇新線段的起點…"
- 
- #: objects/line_type.cc:40
- msgid "Construct a segment ending at this point"
-@@ -2745,7 +2777,7 @@
- 
- #: objects/line_type.cc:41
- msgid "Select the end point of the new segment..."
--msgstr "選擇新線段的終點..."
-+msgstr "選擇新線段的終點…"
- 
- #: objects/line_type.cc:66
- msgid "Construct a line through this point"
-@@ -2753,11 +2785,11 @@
- 
- #: objects/line_type.cc:71
- msgid "Select a point for the line to go through..."
--msgstr "選擇直線通過的一點..."
-+msgstr "選擇直線通過的一點…"
- 
- #: objects/line_type.cc:73
- msgid "Select another point for the line to go through..."
--msgstr "選擇直線通過的另一點..."
-+msgstr "選擇直線通過的另一點…"
- 
- #: objects/line_type.cc:98
- msgid "Construct a half-line starting at this point"
-@@ -2765,7 +2797,7 @@
- 
- #: objects/line_type.cc:103 objects/line_type.cc:301
- msgid "Select the start point of the new half-line..."
--msgstr "選擇新半線的起點..."
-+msgstr "選擇新半線的起點…"
- 
- #: objects/line_type.cc:104
- msgid "Construct a half-line through this point"
-@@ -2773,7 +2805,7 @@
- 
- #: objects/line_type.cc:105
- msgid "Select a point for the half-line to go through..."
--msgstr "選擇半線通過的一點..."
-+msgstr "選擇半線通過的一點…"
- 
- #: objects/line_type.cc:146
- msgid "Construct a line parallel to this line"
-@@ -2781,7 +2813,7 @@
- 
- #: objects/line_type.cc:147
- msgid "Select a line parallel to the new line..."
--msgstr "選擇平行於新直線的直線..."
-+msgstr "選擇平行於新直線的直線…"
- 
- #: objects/line_type.cc:148
- msgid "Construct the parallel line through this point"
-@@ -2789,7 +2821,7 @@
- 
- #: objects/line_type.cc:149 objects/line_type.cc:182 objects/line_type.cc:261
- msgid "Select a point for the new line to go through..."
--msgstr "選擇新直線通過的一點..."
-+msgstr "選擇新直線通過的一點…"
- 
- #: objects/line_type.cc:179
- msgid "Construct a line perpendicular to this line"
-@@ -2797,7 +2829,7 @@
- 
- #: objects/line_type.cc:180
- msgid "Select a line perpendicular to the new line..."
--msgstr "選擇垂直於新直線的直線..."
-+msgstr "選擇垂直於新直線的直線…"
- 
- #: objects/line_type.cc:181
- msgid "Construct a perpendicular line through this point"
-@@ -2805,7 +2837,7 @@
- 
- #: objects/line_type.cc:224
- msgid "Set &Length..."
--msgstr "設定長度(&L)..."
-+msgstr "設定長度(&L)…"
- 
- #: objects/line_type.cc:243
- msgid "Set Segment Length"
-@@ -2825,7 +2857,7 @@
- 
- #: objects/line_type.cc:259
- msgid "Select a vector in the direction of the new line..."
--msgstr "選擇新直線方向上的向量..."
-+msgstr "選擇新直線方向上的向量…"
- 
- #: objects/line_type.cc:298
- msgid "Construct a half-line by this vector"
-@@ -2833,7 +2865,7 @@
- 
- #: objects/line_type.cc:299
- msgid "Select a vector in the direction of the new half-line..."
--msgstr "選擇新半線方向上的向量..."
-+msgstr "選擇新半線方向上的向量…"
- 
- #: objects/locus_imp.cc:357
- msgid "locus"
-@@ -3117,17 +3149,17 @@
- msgid ""
- "Select the first of the two points of which you want to construct the "
- "midpoint..."
--msgstr "選擇您要建構中點的第一個點..."
-+msgstr "選擇您要建構中點的第一個點…"
- 
- #: objects/point_type.cc:264
- msgid ""
- "Select the other of the two points of which you want to construct the "
- "midpoint..."
--msgstr "選擇您要建構中點的另一個點..."
-+msgstr "選擇您要建構中點的另一個點…"
- 
- #: objects/point_type.cc:366
- msgid "Set &Coordinate..."
--msgstr "設定座標(&C)..."
-+msgstr "設定座標(&C)…"
- 
- #: objects/point_type.cc:367 objects/point_type.cc:375
- msgid "Redefine"
-@@ -3135,7 +3167,7 @@
- 
- #: objects/point_type.cc:374
- msgid "Set &Parameter..."
--msgstr "設定參數(&P)..."
-+msgstr "設定參數(&P)…"
- 
- #: objects/point_type.cc:397
- msgid "Set Coordinate"
-@@ -3159,11 +3191,11 @@
- 
- #: objects/point_type.cc:635
- msgid "Select the circle on which to transport a measure..."
--msgstr "選擇要在哪個圓上取弧..."
-+msgstr "選擇要在哪個圓上取弧…"
- 
- #: objects/point_type.cc:637
- msgid "Select a point on the circle..."
--msgstr "選擇圓上一點..."
-+msgstr "選擇圓上一點…"
- 
- #: objects/point_type.cc:639
- msgid "Select the segment to transport on the circle..."
-@@ -3302,7 +3334,7 @@
- 
- #: objects/polygon_type.cc:37
- msgid "Select a point to be a vertex of the new triangle..."
--msgstr "選擇新三角形的頂點..."
-+msgstr "選擇新三角形的頂點…"
- 
- #: objects/polygon_type.cc:406
- msgid "Intersect this polygon with a line"
-@@ -3310,7 +3342,7 @@
- 
- #: objects/polygon_type.cc:407
- msgid "Select the polygon of which you want the intersection with a line..."
--msgstr "選擇您要相交的多邊形..."
-+msgstr "選擇您要相交的多邊形…"
- 
- #: objects/polygon_type.cc:543
- msgid "Construct the vertices of this polygon"
-@@ -3318,7 +3350,7 @@
- 
- #: objects/polygon_type.cc:544
- msgid "Select the polygon of which you want to construct the vertices..."
--msgstr "選擇您要建構頂點的多邊形..."
-+msgstr "選擇您要建構頂點的多邊形…"
- 
- #: objects/polygon_type.cc:586
- msgid "Construct the sides of this polygon"
-@@ -3326,7 +3358,7 @@
- 
- #: objects/polygon_type.cc:587
- msgid "Select the polygon of which you want to construct the sides..."
--msgstr "選擇您要建構邊的多邊形..."
-+msgstr "選擇您要建構邊的多邊形…"
- 
- #: objects/polygon_type.cc:632
- msgid "Construct the convex hull of this polygon"
-@@ -3334,7 +3366,7 @@
- 
- #: objects/polygon_type.cc:633
- msgid "Select the polygon of which you want to construct the convex hull..."
--msgstr "選擇您要建構凸包的多邊形..."
-+msgstr "選擇您要建構凸包的多邊形…"
- 
- #: objects/special_calcers.cc:23
- msgid "Project this point onto the circle"
-@@ -3342,7 +3374,7 @@
- 
- #: objects/tangent_type.cc:38
- msgid "Select the point for the tangent to go through..."
--msgstr "選擇切線要經過的點..."
-+msgstr "選擇切線要經過的點…"
- 
- #: objects/tests_type.cc:30
- msgid "Is this line parallel?"
-@@ -3350,7 +3382,7 @@
- 
- #: objects/tests_type.cc:31
- msgid "Select the first of the two possibly parallel lines..."
--msgstr "選擇要檢查是否為平行線的第一條線..."
-+msgstr "選擇要檢查是否為平行線的第一條線…"
- 
- #: objects/tests_type.cc:32
- msgid "Parallel to this line?"
-@@ -3358,7 +3390,7 @@
- 
- #: objects/tests_type.cc:33
- msgid "Select the other of the two possibly parallel lines..."
--msgstr "選擇要檢查是否為平行線的另一條線..."
-+msgstr "選擇要檢查是否為平行線的另一條線…"
- 
- #: objects/tests_type.cc:61
- msgid "These lines are parallel."
-@@ -3374,7 +3406,7 @@
- 
- #: objects/tests_type.cc:75
- msgid "Select the first of the two possibly orthogonal lines..."
--msgstr "選擇要檢查是否相互垂直的第一條線..."
-+msgstr "選擇要檢查是否相互垂直的第一條線…"
- 
- #: objects/tests_type.cc:76
- msgid "Orthogonal to this line?"
-@@ -3382,7 +3414,7 @@
- 
- #: objects/tests_type.cc:77
- msgid "Select the other of the two possibly orthogonal lines..."
--msgstr "選擇要檢查是否相互垂直的另一條線..."
-+msgstr "選擇要檢查是否相互垂直的另一條線…"
- 
- #: objects/tests_type.cc:105
- msgid "These lines are orthogonal."
-@@ -3398,7 +3430,7 @@
- 
- #: objects/tests_type.cc:119
- msgid "Select the first of the three possibly collinear points..."
--msgstr "選擇要檢查是否共線的第一個點..."
-+msgstr "選擇要檢查是否共線的第一個點…"
- 
- #: objects/tests_type.cc:120
- msgid "and this second point"
-@@ -3406,7 +3438,7 @@
- 
- #: objects/tests_type.cc:121
- msgid "Select the second of the three possibly collinear points..."
--msgstr "選擇要檢查是否共線的第二個點..."
-+msgstr "選擇要檢查是否共線的第二個點…"
- 
- #: objects/tests_type.cc:122
- msgid "with this third point"
-@@ -3414,7 +3446,7 @@
- 
- #: objects/tests_type.cc:123
- msgid "Select the last of the three possibly collinear points..."
--msgstr "選擇要檢查是否共線的第三個點..."
-+msgstr "選擇要檢查是否共線的第三個點…"
- 
- #: objects/tests_type.cc:152
- msgid "These points are collinear."
-@@ -3438,7 +3470,7 @@
- 
- #: objects/tests_type.cc:167
- msgid "Select the curve that the point might be on..."
--msgstr "選擇您要檢查的曲線..."
-+msgstr "選擇您要檢查的曲線…"
- 
- #: objects/tests_type.cc:194
- msgid "This curve contains the point."
-@@ -3458,7 +3490,7 @@
- 
- #: objects/tests_type.cc:213
- msgid "Select the polygon that the point might be in..."
--msgstr "選擇您要檢查的多邊形..."
-+msgstr "選擇您要檢查的多邊形…"
- 
- #: objects/tests_type.cc:240
- msgid "This polygon contains the point."
-@@ -3474,7 +3506,7 @@
- 
- #: objects/tests_type.cc:257
- msgid "Select the polygon you want to test for convexity..."
--msgstr "選擇您要檢查的多邊形..."
-+msgstr "選擇您要檢查的多邊形…"
- 
- #: objects/tests_type.cc:283
- msgid "This polygon is convex."
-@@ -3491,7 +3523,7 @@
- #: objects/tests_type.cc:300
- msgid ""
- "Select the point which might have the same distance from two other points..."
--msgstr "選擇要檢查是否與其他兩點等距的點..."
-+msgstr "選擇要檢查是否與其他兩點等距的點…"
- 
- #: objects/tests_type.cc:301
- msgid "from this point"
-@@ -3499,7 +3531,7 @@
- 
- #: objects/tests_type.cc:302
- msgid "Select the first of the two other points..."
--msgstr "選擇另外兩點中的第一個點..."
-+msgstr "選擇另外兩點中的第一個點…"
- 
- #: objects/tests_type.cc:303
- msgid "and from this second point"
-@@ -3507,7 +3539,7 @@
- 
- #: objects/tests_type.cc:304
- msgid "Select the other of the two other points..."
--msgstr "選擇另外兩點中的第二個點..."
-+msgstr "選擇另外兩點中的第二個點…"
- 
- #: objects/tests_type.cc:332
- msgid "The two distances are the same."
-@@ -3523,7 +3555,7 @@
- 
- #: objects/tests_type.cc:345
- msgid "Select the first of the two possibly equal vectors..."
--msgstr "選擇要檢查的第一個向量..."
-+msgstr "選擇要檢查的第一個向量…"
- 
- #: objects/tests_type.cc:346
- msgid "Check whether this vector is equal to the other vector"
-@@ -3531,7 +3563,7 @@
- 
- #: objects/tests_type.cc:347
- msgid "Select the other of the two possibly equal vectors..."
--msgstr "選擇要檢查的第二個向量..."
-+msgstr "選擇要檢查的第二個向量…"
- 
- #: objects/tests_type.cc:374
- msgid "The two vectors are the same."
-@@ -3592,7 +3624,7 @@
- 
- #: objects/text_type.cc:128
- msgid "&Redefine..."
--msgstr "重新定義(&R)..."
-+msgstr "重新定義(&R)…"
- 
- #: objects/text_type.cc:157
- msgid "Toggle Label Frame"
-@@ -3604,7 +3636,7 @@
- 
- #: objects/transform_types.cc:33
- msgid "Select the object to translate..."
--msgstr "選擇要平移的物件..."
-+msgstr "選擇要平移的物件…"
- 
- #: objects/transform_types.cc:34
- msgid "Translate by this vector"
-@@ -3612,7 +3644,7 @@
- 
- #: objects/transform_types.cc:35
- msgid "Select the vector to translate by..."
--msgstr "選擇平移的向量..."
-+msgstr "選擇平移的向量…"
- 
- #: objects/transform_types.cc:67 objects/transform_types.cc:102
- msgid "Reflect this object"
-@@ -3620,7 +3652,7 @@
- 
- #: objects/transform_types.cc:68 objects/transform_types.cc:103
- msgid "Select the object to reflect..."
--msgstr "選擇要映射的物件..."
-+msgstr "選擇要映射的物件…"
- 
- #: objects/transform_types.cc:69
- msgid "Reflect in this point"
-@@ -3628,7 +3660,7 @@
- 
- #: objects/transform_types.cc:70
- msgid "Select the point to reflect in..."
--msgstr "選擇要映射的點..."
-+msgstr "選擇要映射的點…"
- 
- #: objects/transform_types.cc:104
- msgid "Reflect in this line"
-@@ -3636,7 +3668,7 @@
- 
- #: objects/transform_types.cc:105
- msgid "Select the line to reflect in..."
--msgstr "選擇要映射的線..."
-+msgstr "選擇要映射的線…"
- 
- #: objects/transform_types.cc:137
- msgid "Rotate this object"
-@@ -3644,7 +3676,7 @@
- 
- #: objects/transform_types.cc:138
- msgid "Select the object to rotate..."
--msgstr "選擇要旋轉的物件..."
-+msgstr "選擇要旋轉的物件…"
- 
- #: objects/transform_types.cc:139
- msgid "Rotate around this point"
-@@ -3652,7 +3684,7 @@
- 
- #: objects/transform_types.cc:140
- msgid "Select the center point of the rotation..."
--msgstr "選擇旋轉的中心點..."
-+msgstr "選擇旋轉的中心點…"
- 
- #: objects/transform_types.cc:141
- msgid "Rotate by this angle"
-@@ -3660,7 +3692,7 @@
- 
- #: objects/transform_types.cc:142
- msgid "Select the angle of the rotation..."
--msgstr "選擇旋轉的角度..."
-+msgstr "選擇旋轉的角度…"
- 
- #: objects/transform_types.cc:174 objects/transform_types.cc:211
- #: objects/transform_types.cc:251 objects/transform_types.cc:285
-@@ -3669,7 +3701,7 @@
- 
- #: objects/transform_types.cc:175 objects/transform_types.cc:212
- msgid "Select the object to scale..."
--msgstr "選擇要縮放的物件..."
-+msgstr "選擇要縮放的物件…"
- 
- #: objects/transform_types.cc:176 objects/transform_types.cc:213
- msgid "Scale with this center"
-@@ -3677,7 +3709,7 @@
- 
- #: objects/transform_types.cc:177 objects/transform_types.cc:214
- msgid "Select the center point of the scaling..."
--msgstr "選擇要縮放的中心點..."
-+msgstr "選擇要縮放的中心點…"
- 
- #: objects/transform_types.cc:178 objects/transform_types.cc:253
- msgid "Scale by the length of this segment"
-@@ -3685,16 +3717,16 @@
- 
- #: objects/transform_types.cc:179
- msgid "Select a segment whose length is the factor of the scaling..."
--msgstr "選擇要用於決定縮放比例的線段長度..."
-+msgstr "選擇要用於決定縮放比例的線段長度…"
- 
- #: objects/transform_types.cc:215 objects/transform_types.cc:287
- msgid "Scale the length of this segment..."
--msgstr "將此線段的長度..."
-+msgstr "將此線段的長度…"
- 
- #: objects/transform_types.cc:216
- msgid ""
- "Select the first of two segments whose ratio is the factor of the scaling..."
--msgstr "選擇兩個用於決定縮放比例的線段的第一個..."
-+msgstr "選擇兩個用於決定縮放比例的線段的第一個…"
- 
- #: objects/transform_types.cc:217
- msgid "...to the length of this other segment"
-@@ -3703,7 +3735,7 @@
- #: objects/transform_types.cc:218
- msgid ""
- "Select the second of two segments whose ratio is the factor of the scaling..."
--msgstr "選擇兩個用於決定縮放比例的線段的第二個..."
-+msgstr "選擇兩個用於決定縮放比例的線段的第二個…"
- 
- #: objects/transform_types.cc:251 objects/transform_types.cc:285
- msgid "Select the object to scale"
-@@ -3724,7 +3756,7 @@
- #: objects/transform_types.cc:287
- msgid ""
- "Select the first of two segments whose ratio is the factor for the scaling"
--msgstr "選擇兩個用於決定縮放比例的線段的第一個..."
-+msgstr "選擇兩個用於決定縮放比例的線段的第一個…"
- 
- #: objects/transform_types.cc:288
- msgid "...to the length of this segment"
-@@ -3733,7 +3765,7 @@
- #: objects/transform_types.cc:288
- msgid ""
- "Select the second of two segments whose ratio is the factor for the scaling"
--msgstr "選擇兩個用於決定縮放比例的線段的第二個..."
-+msgstr "選擇兩個用於決定縮放比例的線段的第二個…"
- 
- #: objects/transform_types.cc:321
- msgid "Projectively rotate this object"
-@@ -3749,8 +3781,8 @@
- 
- #: objects/transform_types.cc:322
- msgid ""
--"Select the half line of the projective rotation that you want to apply to the "
--"object"
-+"Select the half line of the projective rotation that you want to apply to "
-+"the object"
- msgstr "選擇要做投影旋轉的半線"
- 
- #: objects/transform_types.cc:323
-@@ -3771,7 +3803,7 @@
- #: objects/transform_types.cc:438 objects/transform_types.cc:495
- #: objects/transform_types.cc:537 objects/transform_types.cc:860
- msgid "Select the object to transform..."
--msgstr "選擇要轉換的物件..."
-+msgstr "選擇要轉換的物件…"
- 
- #: objects/transform_types.cc:360
- msgid "Harmonic Homology with this center"
-@@ -3779,7 +3811,7 @@
- 
- #: objects/transform_types.cc:361
- msgid "Select the center point of the harmonic homology..."
--msgstr "選擇調和同調的中心點..."
-+msgstr "選擇調和同調的中心點…"
- 
- #: objects/transform_types.cc:362
- msgid "Harmonic Homology with this axis"
-@@ -3787,7 +3819,7 @@
- 
- #: objects/transform_types.cc:363
- msgid "Select the axis of the harmonic homology..."
--msgstr "選擇調和同調的軸線..."
-+msgstr "選擇調和同調的軸線…"
- 
- #: objects/transform_types.cc:395 objects/transform_types.cc:437
- msgid "Generic affinity of this object"
-@@ -3799,7 +3831,7 @@
- 
- #: objects/transform_types.cc:398
- msgid "Select the triangle that has to be transformed onto a given triangle..."
--msgstr "選擇要映射的三角形..."
-+msgstr "選擇要映射的三角形…"
- 
- #: objects/transform_types.cc:399
- msgid "onto this other triangle"
-@@ -3807,8 +3839,9 @@
- 
- #: objects/transform_types.cc:400
- msgid ""
--"Select the triangle that is the image by the affinity of the first triangle..."
--msgstr "選擇第一個三角形..."
-+"Select the triangle that is the image by the affinity of the first "
-+"triangle..."
-+msgstr "選擇第一個三角形…"
- 
- #: objects/transform_types.cc:439
- msgid "First of 3 starting points"
-@@ -3817,7 +3850,7 @@
- #: objects/transform_types.cc:440
- msgid ""
- "Select the first of the three starting points of the generic affinity..."
--msgstr "選擇三個起點中的第一個..."
-+msgstr "選擇三個起點中的第一個…"
- 
- #: objects/transform_types.cc:441
- msgid "Second of 3 starting points"
-@@ -3826,7 +3859,7 @@
- #: objects/transform_types.cc:442
- msgid ""
- "Select the second of the three starting points of the generic affinity..."
--msgstr "選擇三個起點中的第二個..."
-+msgstr "選擇三個起點中的第二個…"
- 
- #: objects/transform_types.cc:443
- msgid "Third of 3 starting points"
-@@ -3835,7 +3868,7 @@
- #: objects/transform_types.cc:444
- msgid ""
- "Select the third of the three starting points of the generic affinity..."
--msgstr "選擇三個起點中的第三個..."
-+msgstr "選擇三個起點中的第三個…"
- 
- #: objects/transform_types.cc:445 objects/transform_types.cc:546
- msgid "Transformed position of first point"
-@@ -3843,7 +3876,7 @@
- 
- #: objects/transform_types.cc:446
- msgid "Select the first of the three end points of the generic affinity..."
--msgstr "選擇三個結束點的第一個..."
-+msgstr "選擇三個結束點的第一個…"
- 
- #: objects/transform_types.cc:447 objects/transform_types.cc:548
- msgid "Transformed position of second point"
-@@ -3851,7 +3884,7 @@
- 
- #: objects/transform_types.cc:448
- msgid "Select the second of the three end points of the generic affinity..."
--msgstr "選擇三個結束點的第二個..."
-+msgstr "選擇三個結束點的第二個…"
- 
- #: objects/transform_types.cc:449 objects/transform_types.cc:550
- msgid "Transformed position of third point"
-@@ -3859,7 +3892,7 @@
- 
- #: objects/transform_types.cc:450
- msgid "Select the third of the three end points of the generic affinity..."
--msgstr "選擇三個結束點的第三個..."
-+msgstr "選擇三個結束點的第三個…"
- 
- #: objects/transform_types.cc:494 objects/transform_types.cc:536
- msgid "Generic projective transformation of this object"
-@@ -3873,7 +3906,7 @@
- msgid ""
- "Select the quadrilateral that has to be transformed onto a given "
- "quadrilateral..."
--msgstr "選擇要映射的四邊形..."
-+msgstr "選擇要映射的四邊形…"
- 
- #: objects/transform_types.cc:498
- msgid "onto this other quadrilateral"
-@@ -3881,9 +3914,9 @@
- 
- #: objects/transform_types.cc:499
- msgid ""
--"Select the quadrilateral that is the image by the projective transformation of "
--"the first quadrilateral..."
--msgstr "選擇要映射的第一個四邊形..."
-+"Select the quadrilateral that is the image by the projective transformation "
-+"of the first quadrilateral..."
-+msgstr "選擇要映射的第一個四邊形…"
- 
- #: objects/transform_types.cc:538
- msgid "First of 4 starting points"
-@@ -3923,15 +3956,15 @@
- 
- #: objects/transform_types.cc:547
- msgid "Select the first of the four end points of the generic projectivity..."
--msgstr "選擇四個結束點的第一個..."
-+msgstr "選擇四個結束點的第一個…"
- 
- #: objects/transform_types.cc:549
- msgid "Select the second of the four end points of the generic projectivity..."
--msgstr "選擇四個結束點的第二個..."
-+msgstr "選擇四個結束點的第二個…"
- 
- #: objects/transform_types.cc:551
- msgid "Select the third of the four end points of the generic projectivity..."
--msgstr "選擇四個結束點的第三個..."
-+msgstr "選擇四個結束點的第三個…"
- 
- #: objects/transform_types.cc:552
- msgid "Transformed position of fourth point"
-@@ -3939,7 +3972,7 @@
- 
- #: objects/transform_types.cc:553
- msgid "Select the fourth of the four end points of the generic projectivity..."
--msgstr "選擇四個結束點的第四個..."
-+msgstr "選擇四個結束點的第四個…"
- 
- #: objects/transform_types.cc:597
- msgid "Cast the shadow of this object"
-@@ -3947,7 +3980,7 @@
- 
- #: objects/transform_types.cc:598
- msgid "Select the object of which you want to construct the shadow..."
--msgstr "選擇您要建構陰影的物件..."
-+msgstr "選擇您要建構陰影的物件…"
- 
- #: objects/transform_types.cc:599
- msgid "Cast a shadow from this light source"
-@@ -3955,7 +3988,7 @@
- 
- #: objects/transform_types.cc:600
- msgid "Select the light source from which the shadow should originate..."
--msgstr "選擇您要產生陰影的光源..."
-+msgstr "選擇您要產生陰影的光源…"
- 
- #: objects/transform_types.cc:602
- msgid "Cast a shadow on the horizon represented by this line"
-@@ -3963,7 +3996,7 @@
- 
- #: objects/transform_types.cc:603
- msgid "Select the horizon for the shadow..."
--msgstr "選擇投影的水平面..."
-+msgstr "選擇投影的水平面…"
- 
- #: objects/transform_types.cc:785
- msgid "Transform this object"
-@@ -3983,7 +4016,7 @@
- 
- #: objects/transform_types.cc:862
- msgid "Select the center for the similitude..."
--msgstr "選擇中心點..."
-+msgstr "選擇中心點…"
- 
- #: objects/transform_types.cc:863
- msgid "Apply a similitude mapping this point onto another point"
-@@ -3991,7 +4024,7 @@
- 
- #: objects/transform_types.cc:864
- msgid "Select the point which the similitude should map onto another point..."
--msgstr "選擇要映射的點..."
-+msgstr "選擇要映射的點…"
- 
- #: objects/transform_types.cc:865
- msgid "Apply a similitude mapping a point onto this point"
-@@ -4000,7 +4033,7 @@
- #: objects/transform_types.cc:866
- msgid ""
- "Select the point onto which the similitude should map the first point..."
--msgstr "選擇第一個點要映設到哪個點..."
-+msgstr "選擇第一個點要映設到哪個點…"
- 
- #: objects/vector_type.cc:26
- msgid "Construct a vector from this point"
-@@ -4008,7 +4041,7 @@
- 
- #: objects/vector_type.cc:27
- msgid "Select the start point of the new vector..."
--msgstr "選擇新向量的起點..."
-+msgstr "選擇新向量的起點…"
- 
- #: objects/vector_type.cc:28
- msgid "Construct a vector to this point"
-@@ -4016,7 +4049,7 @@
- 
- #: objects/vector_type.cc:29
- msgid "Select the end point of the new vector..."
--msgstr "選擇新向量的終點..."
-+msgstr "選擇新向量的終點…"
- 
- #: objects/vector_type.cc:61
- msgid "Construct the vector sum of this vector and another one."
-@@ -4025,7 +4058,7 @@
- #: objects/vector_type.cc:62
- msgid ""
- "Select the first of the two vectors of which you want to construct the sum..."
--msgstr "選擇您要建構向量和的第一個向量..."
-+msgstr "選擇您要建構向量和的第一個向量…"
- 
- #: objects/vector_type.cc:63
- msgid "Construct the vector sum of this vector and the other one."
-@@ -4034,7 +4067,7 @@
- #: objects/vector_type.cc:64
- msgid ""
- "Select the other of the two vectors of which you want to construct the sum..."
--msgstr "選擇您要建構向量和的另一個向量..."
-+msgstr "選擇您要建構向量和的另一個向量…"
- 
- #: objects/vector_type.cc:65
- msgid "Construct the vector sum starting at this point."
-@@ -4042,7 +4075,7 @@
- 
- #: objects/vector_type.cc:66
- msgid "Select the point to construct the sum vector in..."
--msgstr "選擇要建構向量和的點..."
-+msgstr "選擇要建構向量和的點…"
- 
- #: scripting/script-common.cc:35
- msgid "Now fill in the Python code:"
-@@ -4051,8 +4084,8 @@
- #: scripting/script-common.cc:53
- msgid ""
- "_: Note to translators: this should be a default name for an argument in a "
--"Python function. The default is \"arg%1\" which would become arg1, arg2, etc. "
--"Give something which seems appropriate for your language.\n"
-+"Python function. The default is \"arg%1\" which would become arg1, arg2, "
-+"etc. Give something which seems appropriate for your language.\n"
- "arg%1"
- msgstr "arg%1"
- 
-@@ -4060,7 +4093,8 @@
- msgid ""
- "The Python interpreter caught an error during the execution of your script. "
- "Please fix the script and click the Finish button again."
--msgstr "Python 直譯器在執行您的文稿時發生了錯誤。請修正文稿，再點選「完成」按鈕。"
-+msgstr ""
-+"Python 直譯器在執行您的文稿時發生了錯誤。請修正文稿，再點選「完成」按鈕。"
- 
- #: scripting/script_mode.cc:207 scripting/script_mode.cc:325
- #, c-format
-@@ -4073,10 +4107,12 @@
- 
- #: scripting/script_mode.cc:212
- msgid ""
--"There seems to be an error in your script. The Python interpreter reported no "
--"errors, but the script does not generate a valid object. Please fix the script, "
--"and click the Finish button again."
--msgstr "在您的文稿中似乎有錯誤。Python 直譯器回報沒有錯誤，但是文稿並未產生合法的物件。請修正此文稿，再點選「完成」按鈕。"
-+"There seems to be an error in your script. The Python interpreter reported "
-+"no errors, but the script does not generate a valid object. Please fix the "
-+"script, and click the Finish button again."
-+msgstr ""
-+"在您的文稿中似乎有錯誤。Python 直譯器回報沒有錯誤，但是文稿並未產生合法的物"
-+"件。請修正此文稿，再點選「完成」按鈕。"
- 
- #: scripting/script_mode.cc:290
- msgid ""
-@@ -4096,9 +4132,12 @@
- 
- #: scripting/script_mode.cc:330
- msgid ""
--"There seems to be an error in your script. The Python interpreter reported no "
--"errors, but the script does not generate a valid object. Please fix the script."
--msgstr "在您的文稿中似乎有錯誤。Python 直譯器回報沒有錯誤，但是文稿並未產生合法的物件。請修正此文稿。"
-+"There seems to be an error in your script. The Python interpreter reported "
-+"no errors, but the script does not generate a valid object. Please fix the "
-+"script."
-+msgstr ""
-+"在您的文稿中似乎有錯誤。Python 直譯器回報沒有錯誤，但是文稿並未產生合法的物"
-+"件。請修正此文稿。"
- 
- #: kig/kig.cpp:88
- msgid "Could not find the necessary Kig library, check your installation."
-@@ -4176,7 +4215,7 @@
- 
- #: kig/kig_part.cpp:251
- msgid "&New Macro..."
--msgstr "新增巨集(&N)..."
-+msgstr "新增巨集(&N)…"
- 
- #: kig/kig_part.cpp:253
- msgid "Define a new macro"
-@@ -4184,7 +4223,7 @@
- 
- #: kig/kig_part.cpp:256
- msgid "Manage &Types..."
--msgstr "管理類型(&T)..."
-+msgstr "管理類型(&T)…"
- 
- #: kig/kig_part.cpp:258
- msgid "Manage macro types."
-@@ -4260,11 +4299,12 @@
- msgid ""
- "You tried to open a document of type \"%1\"; unfortunately, Kig does not "
- "support this format. If you think the format in question would be worth "
--"implementing support for, you can always ask us nicely on "
--"mailto:toscano.pino@tiscali.it or do the work yourself and send me a patch."
-+"implementing support for, you can always ask us nicely on mailto:toscano."
-+"pino@tiscali.it or do the work yourself and send me a patch."
- msgstr ""
--"您試圖開啟型態為 %1 的文件。不過，Kig 無法支援此格式。如果您認為這個格式很重要，Kig 應該要支援它，您可以寄信到 "
--"toscano.pino@tiscali.it 跟我們討論，或是您也可以自己做，並將修補檔送來給我們。"
-+"您試圖開啟型態為 %1 的文件。不過，Kig 無法支援此格式。如果您認為這個格式很重"
-+"要，Kig 應該要支援它，您可以寄信到 toscano.pino@tiscali.it 跟我們討論，或是您"
-+"也可以自己做，並將修補檔送來給我們。"
- 
- #: kig/kig_part.cpp:396 kig/kig_part.cpp:439
- msgid "Format Not Supported"
-@@ -4332,21 +4372,24 @@
- 
- #: kig/kig_view.cpp:569
- msgid ""
--"Select the zoom area by entering the coordinates of the upper left corner and "
--"the lower right corner."
-+"Select the zoom area by entering the coordinates of the upper left corner "
-+"and the lower right corner."
- msgstr "請輸入左上角與右下角的座標來選擇要縮放的區域。"
- 
- #: kig/main.cpp:35
- msgid ""
--"Do not show a GUI. Convert the specified file to the native Kig format. Output "
--"goes to stdout unless --outfile is specified."
--msgstr "不要顯示使用者介面。將指定的檔案轉換成 Kig 格式。除非有指定 --outfile 否則將輸出送到標準輸出（stdout）。"
-+"Do not show a GUI. Convert the specified file to the native Kig format. "
-+"Output goes to stdout unless --outfile is specified."
-+msgstr ""
-+"不要顯示使用者介面。將指定的檔案轉換成 Kig 格式。除非有指定 --outfile 否則將"
-+"輸出送到標準輸出（stdout）。"
- 
- #: kig/main.cpp:37
- msgid ""
--"File to output the created native file to. '-' means output to stdout. Default "
--"is stdout as well."
--msgstr "要輸出的檔案名稱。\"-\" 表示輸出到標準輸出（stdout）。預設是使用標準輸出。"
-+"File to output the created native file to. '-' means output to stdout. "
-+"Default is stdout as well."
-+msgstr ""
-+"要輸出的檔案名稱。\"-\" 表示輸出到標準輸出（stdout）。預設是使用標準輸出。"
- 
- #: kig/main.cpp:38
- msgid "Document to open"
-@@ -4366,9 +4409,10 @@
- 
- #: misc/coordinate_system.cpp:321
- msgid ""
--"Enter coordinates in the following format: <b>\"x;y\"</b>"
--", where x is the x coordinate, and y is the y coordinate."
--msgstr "請用以下格式輸入座標：<b>\"x,y\"</b>，這裡 x 是 x 軸座標，y 是 y 軸座標。"
-+"Enter coordinates in the following format: <b>\"x;y\"</b>, where x is the x "
-+"coordinate, and y is the y coordinate."
-+msgstr ""
-+"請用以下格式輸入座標：<b>\"x,y\"</b>，這裡 x 是 x 軸座標，y 是 y 軸座標。"
- 
- #: misc/coordinate_system.cpp:363
- msgid ""
-@@ -4380,8 +4424,8 @@
- 
- #: misc/coordinate_system.cpp:370
- msgid ""
--"Enter coordinates in the following format: <b>\"r; θ°\"</b>"
--", where r and θ are the polar coordinates."
-+"Enter coordinates in the following format: <b>\"r; θ°\"</b>, where r and θ "
-+"are the polar coordinates."
- msgstr "請用以下格式輸入座標：<b>\"r; θ°\"</b>，這裡 r 和 θ 是極座標。"
- 
- #: misc/coordinate_system.cpp:522
-@@ -4402,11 +4446,11 @@
- 
- #: modes/typesdialog.cpp:82
- msgid "&Edit..."
--msgstr "編輯(&E)..."
-+msgstr "編輯(&E)…"
- 
- #: modes/typesdialog.cpp:85
- msgid "E&xport..."
--msgstr "匯出(&X)..."
-+msgstr "匯出(&X)…"
- 
- #: modes/typesdialog.cpp:141
- #, c-format
-@@ -4439,7 +4483,9 @@
- msgid ""
- "There is more than one type selected. You can only edit one type at a time. "
- "Please select only the type you want to edit and try again."
--msgstr "已選取了一個以上的類型。您一次只能編輯其中一個類型。請只選擇您要編輯的類型，並且再試一次。"
-+msgstr ""
-+"已選取了一個以上的類型。您一次只能編輯其中一個類型。請只選擇您要編輯的類型，"
-+"並且再試一次。"
- 
- #: modes/typesdialog.cpp:237
- msgid "More Than One Type Selected"
-@@ -4450,8 +4496,8 @@
- "_: NAME OF TRANSLATORS\n"
- "Your names"
- msgstr ""
--"簡體中文：開源軟件國際化簡體中文組(http://i18n.linux.net.cn),陶勇慧\n"
--"繁體中文轉換與修改：Frank Weng (a.k.a. Franklin)"
-+"簡化字漢語：開源軟件國際化簡化字漢語組(http://i18n.linux.net.cn),陶勇慧\n"
-+"傳統字漢語轉換與修改：Frank Weng (a.k.a. Franklin)"
- 
- #: _translatorinfo.cpp:3
- msgid ""
-diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdeedu/kiten.po kde-i18n-zh_TW-3.5.10/messages/kdeedu/kiten.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdeedu/kiten.po	2006-07-22 10:04:14.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdeedu/kiten.po	2011-11-11 15:45:17.000000000 +0100
-@@ -10,8 +10,7 @@
- "Project-Id-Version: kiten\n"
- "POT-Creation-Date: 2005-04-20 15:09+0200\n"
- "PO-Revision-Date: 2006-06-20 15:52+0800\n"
--"Last-Translator: Frank Weng (a.k.a. Franklin) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Chinese Traditional <zh-l10n@linux.org.tw>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
-@@ -41,8 +40,8 @@
- 
- #: deinf.cpp:52
- msgid ""
--"Verb deinflection information could not be loaded, so verb deinflection cannot "
--"be used."
-+"Verb deinflection information could not be loaded, so verb deinflection "
-+"cannot be used."
- msgstr "無法載入動詞反變調資訊，所以動詞反變調無法使用。"
- 
- #: dict.cpp:115
-@@ -100,11 +99,11 @@
- 
- #: kiten.cpp:71
- msgid "&Dictionary Editor..."
--msgstr "字典編輯器(&D)..."
-+msgstr "字典編輯器(&D)…"
- 
- #: kiten.cpp:72
- msgid "Ra&dical Search..."
--msgstr "字根搜尋(&D)..."
-+msgstr "字根搜尋(&D)…"
- 
- #: kiten.cpp:73
- msgid "Search Edit"
-@@ -164,7 +163,7 @@
- 
- #: kiten.cpp:88
- msgid "Configure &Global Shortcuts..."
--msgstr "設定全域捷徑(&G)..."
-+msgstr "設定全域捷徑(&G)…"
- 
- #: kiten.cpp:90
- msgid "&History"
-@@ -184,7 +183,7 @@
- 
- #: kiten.cpp:188 kiten.cpp:226
- msgid "Searching..."
--msgstr "搜尋中..."
-+msgstr "搜尋中…"
- 
- #: kiten.cpp:260
- #, c-format
-@@ -409,7 +408,8 @@
- 
- #: main.cpp:48
- msgid ""
--"Wrote xjdic, of which Kiten borrows code, and the xjdic index file generator.\n"
-+"Wrote xjdic, of which Kiten borrows code, and the xjdic index file "
-+"generator.\n"
- "Also is main author of edict and kanjidic, which Kiten essentially require."
- msgstr ""
- "寫上 xjdic ，一個 Kiten 瀏覽碼，和 xjdic 的索引檔產生器。\n"
-@@ -457,8 +457,8 @@
- 
- #: rad.cpp:66
- msgid ""
--"Kanji radical information could not be loaded, so radical searching cannot be "
--"used."
-+"Kanji radical information could not be loaded, so radical searching cannot "
-+"be used."
- msgstr "漢字字根資訊檔無法載入，所以字根搜尋無法使用。"
- 
- #: rad.cpp:229
-@@ -515,7 +515,7 @@
- #: rc.cpp:39 rc.cpp:57
- #, no-c-format
- msgid "Add..."
--msgstr "增加..."
-+msgstr "增加…"
- 
- #. i18n: file configdictionariesbase.ui line 199
- #: rc.cpp:48 rc.cpp:117
-diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdeedu/klatin.po kde-i18n-zh_TW-3.5.10/messages/kdeedu/klatin.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdeedu/klatin.po	2008-08-19 20:43:13.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdeedu/klatin.po	2011-11-11 15:45:17.000000000 +0100
-@@ -9,8 +9,7 @@
- "Project-Id-Version: klatin\n"
- "POT-Creation-Date: 2008-07-08 01:24+0200\n"
- "PO-Revision-Date: 2006-06-20 16:19+0800\n"
--"Last-Translator: Frank Weng (a.k.a. Franklin) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Chinese Traditional <zh-l10n@linux.org.tw>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
-@@ -274,12 +273,13 @@
- #: klatinverbs.cpp:205
- msgid ""
- "_: Note: ARGUMENT %1 is an ordinal number (1st, 2nd, 3rd). ARGUMENT %2 "
--"indicates whether the person is singular or plural. ARGUMENT %3 is the tense of "
--"the verb (Present, Imperfect, Perfect). ARGUMENT %4 is the mood of the verb "
--"(Indicative, Subjunctive). ARGUMENT %5 is the voice of the verb (Active, "
--"Passive). ARGUMENT %6 is the verb name (amo, moneo etc). This is in Latin and "
--"should not be translated. The output string in English is something like: What "
--"is the first person singular present indicative active of amo?\n"
-+"indicates whether the person is singular or plural. ARGUMENT %3 is the tense "
-+"of the verb (Present, Imperfect, Perfect). ARGUMENT %4 is the mood of the "
-+"verb (Indicative, Subjunctive). ARGUMENT %5 is the voice of the verb "
-+"(Active, Passive). ARGUMENT %6 is the verb name (amo, moneo etc). This is in "
-+"Latin and should not be translated. The output string in English is "
-+"something like: What is the first person singular present indicative active "
-+"of amo?\n"
- "What is the %1 person %2 %3 %4 %5 of %6?"
- msgstr "%6 的%1人稱%2%3%4%5是？"
- 
-@@ -471,9 +471,9 @@
- "Line 4"
- msgstr ""
- "問題單字\n"
--"第二行\n"
--"第三行\n"
--"第四行"
-+"第二列\n"
-+"第三列\n"
-+"第四列"
- 
- #. i18n: file klatingrammarwidget.ui line 119
- #: rc.cpp:83 rc.cpp:269
-@@ -599,8 +599,8 @@
- #: rc.cpp:149 rc.cpp:155
- #, no-c-format
- msgid ""
--"This shows the percentage of the questions you answered correctly out of those "
--"attempted."
-+"This shows the percentage of the questions you answered correctly out of "
-+"those attempted."
- msgstr "這裡顯示您正確回答題目的百分比。"
- 
- #. i18n: file klatinresultsdialog.ui line 137
-@@ -661,8 +661,8 @@
- #: rc.cpp:194
- #, no-c-format
- msgid ""
--"Choose to be tested from your language to Latin, which means the word will be "
--"displayed in your language and you will have to choose from 4 Latin "
-+"Choose to be tested from your language to Latin, which means the word will "
-+"be displayed in your language and you will have to choose from 4 Latin "
- "translations."
- msgstr "選擇用您的語言來顯示問題，而您要從四個拉丁翻譯中選擇答案。"
- 
-@@ -682,9 +682,9 @@
- #: rc.cpp:203
- #, no-c-format
- msgid ""
--"Choose  to be tested from Latin to your language, which means the word will be "
--"displayed in Latin and you will have to choose from 4 translations in your "
--"language."
-+"Choose  to be tested from Latin to your language, which means the word will "
-+"be displayed in Latin and you will have to choose from 4 translations in "
-+"your language."
- msgstr "選擇用拉丁來顯示問題，而四個答案以您的語言顯示。"
- 
- #. i18n: file klatinsettings_vocabpage.ui line 110
-@@ -819,8 +819,8 @@
- #: rc.cpp:323
- #, no-c-format
- msgid ""
--"Your score appears on this display. Number of correct answers/total number of "
--"answers."
-+"Your score appears on this display. Number of correct answers/total number "
-+"of answers."
- msgstr "顯示您目前的分數。正確的答案數/總共答案數。"
- 
- #. i18n: file klatinvocabwidget.ui line 265
-diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdeedu/klettres.po kde-i18n-zh_TW-3.5.10/messages/kdeedu/klettres.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdeedu/klettres.po	2008-08-19 20:43:13.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdeedu/klettres.po	2011-11-11 15:45:17.000000000 +0100
-@@ -8,8 +8,7 @@
- "Project-Id-Version: klettres\n"
- "POT-Creation-Date: 2008-07-08 01:24+0200\n"
- "PO-Revision-Date: 2006-12-06 10:02+0800\n"
--"Last-Translator: Frank Weng (a.k.a. Franklin) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Chinese Traditional <zh-l10n@linux.org.tw>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
-@@ -64,7 +63,7 @@
- 
- #: klettres.cpp:201
- msgid "Get Alphabet in New Language..."
--msgstr "取得新語言的字母..."
-+msgstr "取得新語言的字母…"
- 
- #: klettres.cpp:202
- msgid "Replay Sound"
-@@ -76,8 +75,8 @@
- 
- #: klettres.cpp:204
- msgid ""
--"You can replay the same sound again by clicking this button or using the File "
--"menu, Replay Sound."
-+"You can replay the same sound again by clicking this button or using the "
-+"File menu, Replay Sound."
- msgstr "您可以按此鍵重播此發音，或是從選單中選取。"
- 
- #: klettres.cpp:208
-@@ -99,10 +98,11 @@
- #: klettres.cpp:214
- msgid ""
- "You can select the level: level 1 displays a letter and you hear it; level 2 "
--"does not display the letter, you only hear it; level 3 displays a syllable and "
--"you hear it; level 4 does not display the syllable, you only hear it."
-+"does not display the letter, you only hear it; level 3 displays a syllable "
-+"and you hear it; level 4 does not display the syllable, you only hear it."
- msgstr ""
--"您可以選擇等級：等級 1 顯示您聽到的字母；等級二不會顯示字母，您只聽得到發音；等級三顯示您所聽到的音節，等級四不會顯示音節，您只聽得到發音。"
-+"您可以選擇等級：等級 1 顯示您聽到的字母；等級二不會顯示字母，您只聽得到發音；"
-+"等級三顯示您所聽到的音節，等級四不會顯示音節，您只聽得到發音。"
- 
- #: klettres.cpp:216
- msgid "&Language"
-@@ -126,7 +126,7 @@
- 
- #: klettres.cpp:225
- msgid "Themes"
--msgstr "佈景主題"
-+msgstr "布景主題"
- 
- #: klettres.cpp:226
- msgid "Classroom"
-@@ -142,13 +142,13 @@
- 
- #: klettres.cpp:230
- msgid "Select the theme"
--msgstr "選擇一個佈景主題"
-+msgstr "選擇一個布景主題"
- 
- #: klettres.cpp:231
- msgid ""
--"Here you can change the theme for KLettres. A theme consists in the background "
--"picture and the font color for the letter displayed."
--msgstr "您可以改變 KLettres 的佈景。佈景包括背景圖片及字型顏色等。"
-+"Here you can change the theme for KLettres. A theme consists in the "
-+"background picture and the font color for the letter displayed."
-+msgstr "您可以改變 KLettres 的布景。布景包括背景圖片及字型顏色等。"
- 
- #: klettres.cpp:233
- msgid "Mode Kid"
-@@ -158,7 +158,9 @@
- msgid ""
- "If you are in the Grown-up mode, clicking on this button will set up the Kid "
- "mode. The Kid mode has no menubar and the font is bigger in the statusbar."
--msgstr "如果您在大人模式，按此鍵會進入兒童模式。兒童模式沒有選單列，狀態列中的字型也會比較大。"
-+msgstr ""
-+"如果您在大人模式，按此鍵會進入兒童模式。兒童模式沒有選單列，狀態列中的字型也"
-+"會比較大。"
- 
- #: klettres.cpp:235
- msgid "Mode Grown-up"
-@@ -239,9 +241,10 @@
- "13 languages are available: British, Czech, Danish, Dutch, English, French,\n"
- "German, Hebrew, Italian, Luganda, Romanized Hindi, Spanish and Slovak."
- msgstr ""
--"KLettres 能協助很小的孩子，或是在學習新語言的大人將語言中的字母與發音連結起來。\n"
--"目前有十三種語言可以選擇：捷克、丹麥、荷蘭、（美式與英式）英語、法語、德語、希伯來語、義大利、Luganda、Romanized "
--"Hindi、西班牙與斯洛伐克語。"
-+"KLettres 能協助很小的孩子，或是在學習新語言的大人將語言中的字母與發音連結起"
-+"來。\n"
-+"目前有十三種語言可以選擇：捷克、丹麥、荷蘭、（美式與英式）英語、法語、德語、"
-+"希伯來語、義大利、Luganda、Romanized Hindi、西班牙與斯洛伐克語。"
- 
- #: main.cpp:48
- msgid "KLettres"
-@@ -389,7 +392,7 @@
- #: rc.cpp:42
- #, no-c-format
- msgid "Theme"
--msgstr "佈景主題"
-+msgstr "布景主題"
- 
- #. i18n: file klettres.kcfg line 21
- #: rc.cpp:45
-diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdeedu/kmplot.po kde-i18n-zh_TW-3.5.10/messages/kdeedu/kmplot.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdeedu/kmplot.po	2008-08-19 20:43:13.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdeedu/kmplot.po	2011-11-11 15:45:17.000000000 +0100
-@@ -10,8 +10,7 @@
- "Project-Id-Version: kmplot\n"
- "POT-Creation-Date: 2008-07-08 01:24+0200\n"
- "PO-Revision-Date: 2006-10-30 09:40+0800\n"
--"Last-Translator: Frank Weng (a.k.a. Franklin) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Chinese Traditional <zh-l10n@linux.org.tw>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
-@@ -218,16 +217,16 @@
- "_: NAME OF TRANSLATORS\n"
- "Your names"
- msgstr ""
--"簡體中文：Sarah Smith,Funda Wang\n"
--"繁體中文轉換與修改：Frank Weng (a.k.a. Franklin)"
-+"簡化字漢語：Sarah Smith,Funda Wang\n"
-+"傳統字漢語轉換與修改：Frank Weng (a.k.a. Franklin)"
- 
- #: _translatorinfo.cpp:3
- msgid ""
- "_: EMAIL OF TRANSLATORS\n"
- "Your emails"
- msgstr ""
--"簡體中文：sarahs@redhat.com,fundawang@linux.net.cn\n"
--"繁體中文轉換與修改：Frank Weng (a.k.a. Franklin)"
-+"簡化字漢語：sarahs@redhat.com,fundawang@linux.net.cn\n"
-+"傳統字漢語轉換與修改：Frank Weng (a.k.a. Franklin)"
- 
- #: main.cpp:43
- msgid "Mathematical function plotter for KDE"
-@@ -287,9 +286,9 @@
- 
- #: kparametereditor.cpp:182
- msgid ""
--"Line %1 is not a valid parameter value and will therefore not be included. Do "
--"you want to continue?"
--msgstr "第 %1 行不是有效的參數值，所以不會被引入。您要繼續嗎？"
-+"Line %1 is not a valid parameter value and will therefore not be included. "
-+"Do you want to continue?"
-+msgstr "第 %1 列不是有效的參數值，所以不會被引入。您要繼續嗎？"
- 
- #: kparametereditor.cpp:188
- msgid "Would you like to be informed about other lines that cannot be read?"
-@@ -348,8 +347,8 @@
- #: rc.cpp:712 rc.cpp:1952 rc.cpp:2278 rc.cpp:2366
- #, no-c-format
- msgid ""
--"Enter the lower boundary of the plot range. Expressions like 2*pi are allowed, "
--"too."
-+"Enter the lower boundary of the plot range. Expressions like 2*pi are "
-+"allowed, too."
- msgstr "輸入繪圖範圍的下邊界。像 2*pi 這樣的表示式也可以。"
- 
- #: kminmax.cpp:76 kminmax.cpp:120
-@@ -361,8 +360,8 @@
- #: rc.cpp:2272 rc.cpp:2372
- #, no-c-format
- msgid ""
--"Enter the upper boundary of the plot range. Expressions like 2*pi are allowed, "
--"too."
-+"Enter the upper boundary of the plot range. Expressions like 2*pi are "
-+"allowed, too."
- msgstr "輸入繪圖範圍的上邊界。像 2*pi 這樣的表示式也可以。"
- 
- #: kminmax.cpp:81
-@@ -375,8 +374,8 @@
- 
- #: kminmax.cpp:83
- msgid ""
--"Search for the highest y-value in the x-range you specified and show the result "
--"in a message box."
-+"Search for the highest y-value in the x-range you specified and show the "
-+"result in a message box."
- msgstr "在您指定的 x 範圍內搜尋最大的 y 值，並在訊息盒中顯示結果。"
- 
- #. i18n: file qminmax.ui line 16
-@@ -391,8 +390,8 @@
- 
- #: kminmax.cpp:89
- msgid ""
--"Search for the lowest y-value in the x-range you specified and show the result "
--"in a message box."
-+"Search for the lowest y-value in the x-range you specified and show the "
-+"result in a message box."
- msgstr "在您指定的 x 範圍內搜尋最小的 y 值，並在訊息盒中顯示結果。"
- 
- #: kminmax.cpp:94
-@@ -415,7 +414,8 @@
- msgid ""
- "Here you will see the y-value which you got from the x-value in the textbox "
- "above. To calculate the y-value, press the Calculate button."
--msgstr "您將在此看到與上面文字框中 x 值對應的 y 值。要計算 y 值，請按計算按鈕。"
-+msgstr ""
-+"您將在此看到與上面文字框中 x 值對應的 y 值。要計算 y 值，請按計算按鈕。"
- 
- #: kminmax.cpp:105 kminmax.cpp:126
- msgid "&Calculate"
-@@ -444,8 +444,8 @@
- 
- #: kminmax.cpp:128
- msgid ""
--"Calculate the numeric integral between the x-values and draw the result as an "
--"area."
-+"Calculate the numeric integral between the x-values and draw the result as "
-+"an area."
- msgstr "計算 x 值和繪製結果所圍成區域的定積分"
- 
- #: kminmax.cpp:221
-@@ -486,8 +486,8 @@
- 
- #: kminmax.cpp:329
- msgid ""
--"Here you see the result of the calculation: the returned y-value you got from "
--"the x-value in the textbox above"
-+"Here you see the result of the calculation: the returned y-value you got "
-+"from the x-value in the textbox above"
- msgstr "您可在此看到計算結果：你得到的 y 值與上方文字框中的 x 值相對應"
- 
- #: kminmax.cpp:339
-@@ -592,10 +592,12 @@
- #: rc.cpp:81 rc.cpp:1735
- #, no-c-format
- msgid ""
--"Here you see the list of all functions to be plotted. The checked functions are "
--"visible, the others are hidden. Click on a checkbox to show or hide the "
-+"Here you see the list of all functions to be plotted. The checked functions "
-+"are visible, the others are hidden. Click on a checkbox to show or hide the "
- "function."
--msgstr "您可在此看到要進行繪圖的全部函數的清單。選中的函數是可見的，其它函數是不可見的。點選勾選盒可以顯示或隱藏函數。"
-+msgstr ""
-+"您可在此看到要進行繪圖的全部函數的清單。選中的函數是可見的，其它函數是不可見"
-+"的。點選勾選盒可以顯示或隱藏函數。"
- 
- #. i18n: file FktDlgData.ui line 155
- #: rc.cpp:87 rc.cpp:1741
-@@ -613,7 +615,7 @@
- #: rc.cpp:93 rc.cpp:1747
- #, no-c-format
- msgid "&Edit..."
--msgstr "編輯(&E)..."
-+msgstr "編輯(&E)…"
- 
- #. i18n: file FktDlgData.ui line 180
- #: rc.cpp:96 rc.cpp:1750
-@@ -631,7 +633,7 @@
- #: rc.cpp:102 rc.cpp:1756
- #, no-c-format
- msgid "Ne&w Function Plot..."
--msgstr "新增函數圖(&W)..."
-+msgstr "新增函數圖(&W)…"
- 
- #. i18n: file FktDlgData.ui line 205
- #: rc.cpp:105 rc.cpp:114 rc.cpp:123 rc.cpp:132 rc.cpp:141 rc.cpp:1759
-@@ -646,33 +648,35 @@
- #, no-c-format
- msgid ""
- "Click here to define a new function. There are 3 types of function, explicit "
--"given functions, parametric plots and polar plots. Choose the appropriate type "
--"from the drop down list."
--msgstr "單擊此處定義新函數。您可選擇三種函數類型之一，外部函數、參數函數和極座標函數。您可從下拉列表中選擇相應的類型。"
-+"given functions, parametric plots and polar plots. Choose the appropriate "
-+"type from the drop down list."
-+msgstr ""
-+"單擊此處定義新函數。您可選擇三種函數類型之一，外部函數、參數函數和極座標函"
-+"數。您可從下拉列表中選擇相應的類型。"
- 
- #. i18n: file FktDlgData.ui line 224
- #: rc.cpp:111 rc.cpp:1765
- #, no-c-format
- msgid "New &Parametric Plot..."
--msgstr "新增參數方程式圖(&P)..."
-+msgstr "新增參數方程式圖(&P)…"
- 
- #. i18n: file FktDlgData.ui line 246
- #: rc.cpp:120 rc.cpp:1774
- #, no-c-format
- msgid "&New Polar Plot..."
--msgstr "新增極座標圖(&N)..."
-+msgstr "新增極座標圖(&N)…"
- 
- #. i18n: file FktDlgData.ui line 288
- #: rc.cpp:129 rc.cpp:1783
- #, no-c-format
- msgid "Cop&y Function..."
--msgstr "複製函數(&Y)..."
-+msgstr "複製函數(&Y)…"
- 
- #. i18n: file FktDlgData.ui line 313
- #: rc.cpp:138 rc.cpp:1792
- #, no-c-format
- msgid "&Move Function..."
--msgstr "移動函數(&M)..."
-+msgstr "移動函數(&M)…"
- 
- #. i18n: file editderivativespage.ui line 16
- #: rc.cpp:147 rc.cpp:1801
-@@ -846,9 +850,12 @@
- #: rc.cpp:247 rc.cpp:1901
- #, no-c-format
- msgid ""
--"Check this to change the parameter value by moving a slider. Select the slider "
--"from the list box on the right. The values vary from 0 (left) to 100 (right)."
--msgstr "勾選此項目可透過移動滑動器更改參數值。從右側的列表框中選擇滑動器。值的變化範圍是 0(最左側) 到 100(最右側)。"
-+"Check this to change the parameter value by moving a slider. Select the "
-+"slider from the list box on the right. The values vary from 0 (left) to 100 "
-+"(right)."
-+msgstr ""
-+"勾選此項目可透過移動滑動器更改參數值。從右側的列表框中選擇滑動器。值的變化範"
-+"圍是 0(最左側) 到 100(最右側)。"
- 
- #. i18n: file editfunctionpage.ui line 135
- #: rc.cpp:250 rc.cpp:1904
-@@ -860,9 +867,10 @@
- #: rc.cpp:253 rc.cpp:1907
- #, no-c-format
- msgid ""
--"Select one of the sliders to change the parameter value dynamically. The values "
--"vary from 0 (left) to 100 (right)."
--msgstr "選擇滑動器之一，以便動態更改參數值。值的變化範圍是 0(最左側) 到 100(最右側)。"
-+"Select one of the sliders to change the parameter value dynamically. The "
-+"values vary from 0 (left) to 100 (right)."
-+msgstr ""
-+"選擇滑動器之一，以便動態更改參數值。值的變化範圍是 0(最左側) 到 100(最右側)。"
- 
- #. i18n: file editfunctionpage.ui line 146
- #: rc.cpp:256 rc.cpp:1910
-@@ -880,15 +888,16 @@
- #: rc.cpp:262 rc.cpp:1916
- #, no-c-format
- msgid ""
--"Check this to let KmPlot use parameter values given in a list. Edit this list "
--"by clicking the button on the right."
--msgstr "勾選此項目可讓 KmPlot 使用列表中給出的參數值。單擊右側按鈕可編輯此列表。"
-+"Check this to let KmPlot use parameter values given in a list. Edit this "
-+"list by clicking the button on the right."
-+msgstr ""
-+"勾選此項目可讓 KmPlot 使用列表中給出的參數值。單擊右側按鈕可編輯此列表。"
- 
- #. i18n: file editfunctionpage.ui line 163
- #: rc.cpp:265 rc.cpp:1919
- #, no-c-format
- msgid "Edit List..."
--msgstr "編輯列表..."
-+msgstr "編輯列表…"
- 
- #. i18n: file editfunctionpage.ui line 166
- #: rc.cpp:268 rc.cpp:1922
-@@ -1023,7 +1032,8 @@
- #: rc.cpp:364 rc.cpp:2018
- #, no-c-format
- msgid ""
--"Enter the initial x-value or expression for the integral, for example 2 or pi/2"
-+"Enter the initial x-value or expression for the integral, for example 2 or "
-+"pi/2"
- msgstr "輸入積分起始點的 x 值或表示式，如 2 或 pi/2"
- 
- #. i18n: file editintegralpage.ui line 88
-@@ -1036,7 +1046,8 @@
- #: rc.cpp:370 rc.cpp:2024
- #, no-c-format
- msgid ""
--"Enter the initial y-value or expression for the integral, for example 2 or pi/2"
-+"Enter the initial y-value or expression for the integral, for example 2 or "
-+"pi/2"
- msgstr "輸入積分起始點的 y 值或表示式，如 2 或 pi/2"
- 
- #. i18n: file editintegralpage.ui line 118
-@@ -1085,15 +1096,15 @@
- #: rc.cpp:412 rc.cpp:820 rc.cpp:2066 rc.cpp:2474
- #, no-c-format
- msgid ""
--"Click here to delete the selected constant; it can only be removed if it is not "
--"currently used by a plot."
-+"Click here to delete the selected constant; it can only be removed if it is "
-+"not currently used by a plot."
- msgstr "單擊此處刪除選中的常數；僅當該常數不被任何圖像使用時，才可刪除該常數。"
- 
- #. i18n: file qconstanteditor.ui line 47
- #: rc.cpp:415 rc.cpp:781 rc.cpp:2069 rc.cpp:2435
- #, no-c-format
- msgid "&Change Value..."
--msgstr "更改值(&C)..."
-+msgstr "更改值(&C)…"
- 
- #. i18n: file qconstanteditor.ui line 50
- #: rc.cpp:418 rc.cpp:784 rc.cpp:2072 rc.cpp:2438
-@@ -1127,13 +1138,14 @@
- msgid ""
- "Click here to Copy the selected constant to another constant. You can choose "
- "the new name from a list."
--msgstr "單擊此處將把選中的常數複製到另外一個常數中。您可以從列表中選擇一個新名稱。"
-+msgstr ""
-+"單擊此處將把選中的常數複製到另外一個常數中。您可以從列表中選擇一個新名稱。"
- 
- #. i18n: file qconstanteditor.ui line 78
- #: rc.cpp:433 rc.cpp:796 rc.cpp:2087 rc.cpp:2450
- #, no-c-format
- msgid "&New..."
--msgstr "新增(&N)..."
-+msgstr "新增(&N)…"
- 
- #. i18n: file qconstanteditor.ui line 81
- #: rc.cpp:436 rc.cpp:799 rc.cpp:2090 rc.cpp:2453
-@@ -1201,7 +1213,9 @@
- msgid ""
- "Enter the name of the constant here. User-defined constant names only have 1 "
- "character; the constant \"E\" (Euler number) is reserved."
--msgstr "在此輸入常數的名稱。使用者定義的常數只能有一個字符；常數“E”（尤拉常數，Euler number）已被保留。"
-+msgstr ""
-+"在此輸入常數的名稱。使用者定義的常數只能有一個字符；常數“E”（尤拉常數，Euler "
-+"number）已被保留。"
- 
- #. i18n: file qeditconstant.ui line 106
- #: rc.cpp:475 rc.cpp:2129
-@@ -1263,11 +1277,12 @@
- #, no-c-format
- msgid ""
- "Enter the name of the function.\n"
--"The name of a function must be unique. If you leave this line empty KmPlot will "
--"set a default name. You can change it later."
-+"The name of a function must be unique. If you leave this line empty KmPlot "
-+"will set a default name. You can change it later."
- msgstr ""
- "輸入函數名稱。\n"
--"函數名稱必須唯一。如果您將此行留空，KmPlot 將會設定一個預設名稱。您稍後可進行更改。"
-+"函數名稱必須唯一。如果您將此行留空，KmPlot 將會設定一個預設名稱。您稍後可進行"
-+"更改。"
- 
- #. i18n: file qeditparametric.ui line 110
- #: rc.cpp:508 rc.cpp:2162
-@@ -1465,7 +1480,7 @@
- #: rc.cpp:769 rc.cpp:2423
- #, no-c-format
- msgid "Choose Parameter Value..."
--msgstr "選擇參數值..."
-+msgstr "選擇參數值…"
- 
- #. i18n: file qminmax.ui line 133
- #: rc.cpp:772 rc.cpp:2426
-@@ -1513,7 +1528,7 @@
- #: rc.cpp:823 rc.cpp:2477
- #, no-c-format
- msgid "&Export..."
--msgstr "匯出(&E)..."
-+msgstr "匯出(&E)…"
- 
- #. i18n: file qparametereditor.ui line 140
- #: rc.cpp:826 rc.cpp:2480
-@@ -1525,15 +1540,15 @@
- #: rc.cpp:829 rc.cpp:2483
- #, no-c-format
- msgid ""
--"Export values to a textfile. Every value in the parameter list will be written "
--"to one line in the file."
--msgstr "將值匯出為文字檔案。參數列表中的每個值都會寫入為檔案中的一行。"
-+"Export values to a textfile. Every value in the parameter list will be "
-+"written to one line in the file."
-+msgstr "將值匯出為文字檔案。參數列表中的每個值都會寫入為檔案中的一列。"
- 
- #. i18n: file qparametereditor.ui line 171
- #: rc.cpp:832 rc.cpp:2486
- #, no-c-format
- msgid "&Import..."
--msgstr "匯入(&I)..."
-+msgstr "匯入(&I)…"
- 
- #. i18n: file qparametereditor.ui line 174
- #: rc.cpp:835 rc.cpp:2489
-@@ -1545,9 +1560,9 @@
- #: rc.cpp:838 rc.cpp:2492
- #, no-c-format
- msgid ""
--"Import values from a textfile. Every line in the file is parsed as a value or "
--"expression."
--msgstr "從文字檔案匯入值。檔案的每一行都會被分析為值或表示式。"
-+"Import values from a textfile. Every line in the file is parsed as a value "
-+"or expression."
-+msgstr "從文字檔案匯入值。檔案的每一列都會被分析為值或表示式。"
- 
- #. i18n: file settingspagecolor.ui line 28
- #: rc.cpp:841 rc.cpp:2495
-@@ -1571,8 +1586,8 @@
- #: rc.cpp:850 rc.cpp:2504
- #, no-c-format
- msgid ""
--"Specify the color of the axes. The change will appear as soon as you press the "
--"OK button."
-+"Specify the color of the axes. The change will appear as soon as you press "
-+"the OK button."
- msgstr "指定軸的顏色。當您單擊確定按鈕時，更改將會立即生效。"
- 
- #. i18n: file settingspagecolor.ui line 75
-@@ -1585,8 +1600,8 @@
- #: rc.cpp:856 rc.cpp:2510
- #, no-c-format
- msgid ""
--"Specify the color of the grid. The change will appear as soon as you press the "
--"OK button."
-+"Specify the color of the grid. The change will appear as soon as you press "
-+"the OK button."
- msgstr "指定格線的顏色。當您單擊確定按鈕時，更改將會立即生效。"
- 
- #. i18n: file settingspagecolor.ui line 86
-@@ -1612,11 +1627,13 @@
- #, no-c-format
- msgid ""
- "The default color for function number 2. Please note that this color setting "
--"only affects empty functions, so if you have defined a function at number 1 and "
--"you change the color for that number here, the setting will be shown next time "
--"you define a new function at number 1."
--msgstr ""
--"第二個函數的預設顏色。請注意，此顏色設定只影響空函數，所以如果您定義了第一個函數，而您稍後又在此更改了第一個函數的顏色，設定將會在您下次定義第一個函數時生效。"
-+"only affects empty functions, so if you have defined a function at number 1 "
-+"and you change the color for that number here, the setting will be shown "
-+"next time you define a new function at number 1."
-+msgstr ""
-+"第二個函數的預設顏色。請注意，此顏色設定只影響空函數，所以如果您定義了第一個"
-+"函數，而您稍後又在此更改了第一個函數的顏色，設定將會在您下次定義第一個函數時"
-+"生效。"
- 
- #. i18n: file settingspagecolor.ui line 162
- #: rc.cpp:871 rc.cpp:2525
-@@ -1629,11 +1646,13 @@
- #, no-c-format
- msgid ""
- "The default color for function number 5. Please note that this color setting "
--"only affects empty functions, so if you have defined a function at number 1 and "
--"you change the color for that number here, the setting will be shown next time "
--"you define a new function at number 1."
--msgstr ""
--"第五個函數的預設顏色。請注意，此顏色設定只影響空函數，所以如果您定義了第一個函數，而您稍後又在此更改了第一個函數的顏色，設定將會在您下次定義第一個函數時生效。"
-+"only affects empty functions, so if you have defined a function at number 1 "
-+"and you change the color for that number here, the setting will be shown "
-+"next time you define a new function at number 1."
-+msgstr ""
-+"第五個函數的預設顏色。請注意，此顏色設定只影響空函數，所以如果您定義了第一個"
-+"函數，而您稍後又在此更改了第一個函數的顏色，設定將會在您下次定義第一個函數時"
-+"生效。"
- 
- #. i18n: file settingspagecolor.ui line 176
- #: rc.cpp:877 rc.cpp:2531
-@@ -1646,11 +1665,13 @@
- #, no-c-format
- msgid ""
- "The default color for function number 1. Please note that this color setting "
--"only affects empty functions, so if you have defined a function at number 1 and "
--"you change the color for that number here, the setting will be shown next time "
--"you define a new function at number 1."
--msgstr ""
--"第一個函數的預設顏色。請注意，此顏色設定只影響空函數，所以如果您定義了第一個函數，而您稍後又在此更改了第一個函數的顏色，設定將會在您下次定義第一個函數時生效。"
-+"only affects empty functions, so if you have defined a function at number 1 "
-+"and you change the color for that number here, the setting will be shown "
-+"next time you define a new function at number 1."
-+msgstr ""
-+"第一個函數的預設顏色。請注意，此顏色設定只影響空函數，所以如果您定義了第一個"
-+"函數，而您稍後又在此更改了第一個函數的顏色，設定將會在您下次定義第一個函數時"
-+"生效。"
- 
- #. i18n: file settingspagecolor.ui line 187
- #: rc.cpp:883 rc.cpp:2537
-@@ -1669,11 +1690,13 @@
- #, no-c-format
- msgid ""
- "The default color for function number 3. Please note that this color setting "
--"only affects empty functions, so if you have defined a function at number 1 and "
--"you change the color for that number here, the setting will be shown next time "
--"you define a new function at number 1."
--msgstr ""
--"第三個函數的預設顏色。請注意，此顏色設定只影響空函數，所以如果您定義了第一個函數，而您稍後又在此更改了第一個函數的顏色，設定將會在您下次定義第一個函數時生效。"
-+"only affects empty functions, so if you have defined a function at number 1 "
-+"and you change the color for that number here, the setting will be shown "
-+"next time you define a new function at number 1."
-+msgstr ""
-+"第三個函數的預設顏色。請注意，此顏色設定只影響空函數，所以如果您定義了第一個"
-+"函數，而您稍後又在此更改了第一個函數的顏色，設定將會在您下次定義第一個函數時"
-+"生效。"
- 
- #. i18n: file settingspagecolor.ui line 212
- #: rc.cpp:892 rc.cpp:2546
-@@ -1704,11 +1727,13 @@
- #, no-c-format
- msgid ""
- "The default color for function number 4. Please note that this color setting "
--"only affects empty functions, so if you have defined a function at number 1 and "
--"you change the color for that number here, the setting will be shown next time "
--"you define a new function at number 1."
--msgstr ""
--"第四個函數的預設顏色。請注意，此顏色設定只影響空函數，所以如果您定義了第一個函數，而您稍後又在此更改了第一個函數的顏色，設定將會在您下次定義第一個函數時生效。"
-+"only affects empty functions, so if you have defined a function at number 1 "
-+"and you change the color for that number here, the setting will be shown "
-+"next time you define a new function at number 1."
-+msgstr ""
-+"第四個函數的預設顏色。請注意，此顏色設定只影響空函數，所以如果您定義了第一個"
-+"函數，而您稍後又在此更改了第一個函數的顏色，設定將會在您下次定義第一個函數時"
-+"生效。"
- 
- #. i18n: file settingspagecolor.ui line 259
- #: rc.cpp:907 rc.cpp:2561
-@@ -1739,11 +1764,13 @@
- #, no-c-format
- msgid ""
- "The default color for function number 9. Please note that this color setting "
--"only affects empty functions, so if you have defined a function at number 1 and "
--"you change the color for that number here, the setting will be shown next time "
--"you define a new function at number 1."
--msgstr ""
--"第九個函數的預設顏色。請注意，此顏色設定只影響空函數，所以如果您定義了第一個函數，而您稍後又在此更改了第一個函數的顏色，設定將會在您下次定義第一個函數時生效。"
-+"only affects empty functions, so if you have defined a function at number 1 "
-+"and you change the color for that number here, the setting will be shown "
-+"next time you define a new function at number 1."
-+msgstr ""
-+"第九個函數的預設顏色。請注意，此顏色設定只影響空函數，所以如果您定義了第一個"
-+"函數，而您稍後又在此更改了第一個函數的顏色，設定將會在您下次定義第一個函數時"
-+"生效。"
- 
- #. i18n: file settingspagecolor.ui line 333
- #: rc.cpp:922 rc.cpp:2576
-@@ -1762,11 +1789,13 @@
- #, no-c-format
- msgid ""
- "The default color for function number 7. Please note that this color setting "
--"only affects empty functions, so if you have defined a function at number 1 and "
--"you change the color for that number here, the setting will be shown next time "
--"you define a new function at number 1."
--msgstr ""
--"第七個函數的預設顏色。請注意，此顏色設定只影響空函數，所以如果您定義了第一個函數，而您稍後又在此更改了第一個函數的顏色，設定將會在您下次定義第一個函數時生效。"
-+"only affects empty functions, so if you have defined a function at number 1 "
-+"and you change the color for that number here, the setting will be shown "
-+"next time you define a new function at number 1."
-+msgstr ""
-+"第七個函數的預設顏色。請注意，此顏色設定只影響空函數，所以如果您定義了第一個"
-+"函數，而您稍後又在此更改了第一個函數的顏色，設定將會在您下次定義第一個函數時"
-+"生效。"
- 
- #. i18n: file settingspagecolor.ui line 361
- #: rc.cpp:931 rc.cpp:2585
-@@ -1779,11 +1808,13 @@
- #, no-c-format
- msgid ""
- "The default color for function number 8. Please note that this color setting "
--"only affects empty functions, so if you have defined a function at number 1 and "
--"you change the color for that number here, the setting will be shown next time "
--"you define a new function at number 1."
--msgstr ""
--"第八個函數的預設顏色。請注意，此顏色設定只影響空函數，所以如果您定義了第一個函數，而您稍後又在此更改了第一個函數的顏色，設定將會在您下次定義第一個函數時生效。"
-+"only affects empty functions, so if you have defined a function at number 1 "
-+"and you change the color for that number here, the setting will be shown "
-+"next time you define a new function at number 1."
-+msgstr ""
-+"第八個函數的預設顏色。請注意，此顏色設定只影響空函數，所以如果您定義了第一個"
-+"函數，而您稍後又在此更改了第一個函數的顏色，設定將會在您下次定義第一個函數時"
-+"生效。"
- 
- #. i18n: file settingspagecolor.ui line 375
- #: rc.cpp:937 rc.cpp:2591
-@@ -1796,11 +1827,13 @@
- #, no-c-format
- msgid ""
- "The default color for function number 6. Please note that this color setting "
--"only affects empty functions, so if you have defined a function at number 1 and "
--"you change the color for that number here, the setting will be shown next time "
--"you define a new function at number 1."
--msgstr ""
--"第六個函數的預設顏色。請注意，此顏色設定只影響空函數，所以如果您定義了第一個函數，而您稍後又在此更改了第一個函數的顏色，設定將會在您下次定義第一個函數時生效。"
-+"only affects empty functions, so if you have defined a function at number 1 "
-+"and you change the color for that number here, the setting will be shown "
-+"next time you define a new function at number 1."
-+msgstr ""
-+"第六個函數的預設顏色。請注意，此顏色設定只影響空函數，所以如果您定義了第一個"
-+"函數，而您稍後又在此更改了第一個函數的顏色，設定將會在您下次定義第一個函數時"
-+"生效。"
- 
- #. i18n: file settingspagecolor.ui line 386
- #: rc.cpp:943 rc.cpp:2597
-@@ -1818,12 +1851,14 @@
- #: rc.cpp:949 rc.cpp:2603
- #, no-c-format
- msgid ""
--"The default color for function number 10. Please note that this color setting "
--"only affects empty functions, so if you have defined a function at number 1 and "
--"you change the color for that number here, the setting will be shown next time "
--"you define a new function at number 1."
--msgstr ""
--"第十個函數的預設顏色。請注意，此顏色設定只影響空函數，所以如果您定義了第一個函數，而您稍後又在此更改了第一個函數的顏色，設定將會在您下次定義第一個函數時生效。"
-+"The default color for function number 10. Please note that this color "
-+"setting only affects empty functions, so if you have defined a function at "
-+"number 1 and you change the color for that number here, the setting will be "
-+"shown next time you define a new function at number 1."
-+msgstr ""
-+"第十個函數的預設顏色。請注意，此顏色設定只影響空函數，所以如果您定義了第一個"
-+"函數，而您稍後又在此更改了第一個函數的顏色，設定將會在您下次定義第一個函數時"
-+"生效。"
- 
- #. i18n: file settingspagecolor.ui line 411
- #: rc.cpp:952 rc.cpp:2606
-@@ -2131,9 +2166,11 @@
- #, no-c-format
- msgid ""
- "Select the font you want to use for the axis labels. If you cannot see the "
--"labels, check that you have enabled \"Show labels\" in the coordinate setting "
--"dialog."
--msgstr "選擇您想要為軸標籤使用的字型。如果您看不到標籤，請確定您在座標設定對話框中啟用了“顯示標籤”。"
-+"labels, check that you have enabled \"Show labels\" in the coordinate "
-+"setting dialog."
-+msgstr ""
-+"選擇您想要為軸標籤使用的字型。如果您看不到標籤，請確定您在座標設定對話框中啟"
-+"用了“顯示標籤”。"
- 
- #. i18n: file settingspagefonts.ui line 101
- #: rc.cpp:1204 rc.cpp:2858
-@@ -2207,8 +2244,8 @@
- #: rc.cpp:1243 rc.cpp:2897
- #, no-c-format
- msgid ""
--"Click on the button the choose the color of the background. This option has no "
--"effect on printing nor export."
-+"Click on the button the choose the color of the background. This option has "
-+"no effect on printing nor export."
- msgstr "單擊此按鈕可選擇背景顏色。此選項與列印或匯出無關。"
- 
- #. i18n: file settingspageprecision.ui line 166
-@@ -2233,8 +2270,8 @@
- #: rc.cpp:1255 rc.cpp:2909
- #, no-c-format
- msgid ""
--"Check this button to use radian mode to measure angles. This is important for "
--"trigonometric functions only."
-+"Check this button to use radian mode to measure angles. This is important "
-+"for trigonometric functions only."
- msgstr "選中此按鈕可使用弧度模式度量角度。這只對三角函數非常重要。"
- 
- #. i18n: file settingspageprecision.ui line 191
-@@ -2253,8 +2290,8 @@
- #: rc.cpp:1264 rc.cpp:2918
- #, no-c-format
- msgid ""
--"Check this button to use degree mode to measure angles. This is important for "
--"trigonometric functions only."
-+"Check this button to use degree mode to measure angles. This is important "
-+"for trigonometric functions only."
- msgstr "選中此按鈕可使用度數模式度量角度。這只對三角函數非常重要。"
- 
- #. i18n: file settingspageprecision.ui line 207
-@@ -2281,7 +2318,9 @@
- msgid ""
- "Enter the amount of points per pixel which shall be calculated. For slow "
- "computers or very complex plots use higher values."
--msgstr "輸入要在每個像素計算多少個點。對於較慢的計算機，或者較複雜的圖形，請使用較高的值。"
-+msgstr ""
-+"輸入要在每個像素計算多少個點。對於較慢的計算機，或者較複雜的圖形，請使用較高"
-+"的值。"
- 
- #. i18n: file settingspageprecision.ui line 256
- #: rc.cpp:1279 rc.cpp:2933
-@@ -2396,7 +2435,8 @@
- msgid ""
- "This is similar to the setting above, but this sets the distance between two "
- "x-axis-grids when printing or drawing on the screen."
--msgstr "與上面的設定類型類似，但此處設定列印或在螢幕上繪製時 x 軸上格線間的距離。"
-+msgstr ""
-+"與上面的設定類型類似，但此處設定列印或在螢幕上繪製時 x 軸上格線間的距離。"
- 
- #. i18n: file settingspagescaling.ui line 146
- #: rc.cpp:1333 rc.cpp:1414 rc.cpp:2987 rc.cpp:3068
-@@ -2436,7 +2476,8 @@
- msgid ""
- "This is similar to the setting above, but this sets the distance between two "
- "y-axis-grids when printing or drawing on the screen."
--msgstr "與上面的設定類型類似，但此處設定列印或在螢幕上繪製時 y 軸上格線間的距離。"
-+msgstr ""
-+"與上面的設定類型類似，但此處設定列印或在螢幕上繪製時 y 軸上格線間的距離。"
- 
- #. i18n: file settingspagescaling.ui line 382
- #: rc.cpp:1447 rc.cpp:3101
-@@ -3047,11 +3088,11 @@
- 
- #: MainDlg.cpp:133
- msgid "Configure KmPlot..."
--msgstr "設定 KmPlot..."
-+msgstr "設定 KmPlot…"
- 
- #: MainDlg.cpp:140
- msgid "E&xport..."
--msgstr "匯出(&X)..."
-+msgstr "匯出(&X)…"
- 
- #: MainDlg.cpp:143
- msgid "&No Zoom"
-@@ -3083,19 +3124,19 @@
- 
- #: MainDlg.cpp:160
- msgid "&Colors..."
--msgstr "顏色(&C)..."
-+msgstr "顏色(&C)…"
- 
- #: MainDlg.cpp:161
- msgid "&Coordinate System..."
--msgstr "座標系(&C)..."
-+msgstr "座標系(&C)…"
- 
- #: MainDlg.cpp:163
- msgid "&Scaling..."
--msgstr "縮放(&S)..."
-+msgstr "縮放(&S)…"
- 
- #: MainDlg.cpp:164
- msgid "&Fonts..."
--msgstr "字型(&F)..."
-+msgstr "字型(&F)…"
- 
- #: MainDlg.cpp:166
- msgid "Coordinate System I"
-@@ -3111,31 +3152,31 @@
- 
- #: MainDlg.cpp:171
- msgid "&New Function Plot..."
--msgstr "新增函數圖(&N)..."
-+msgstr "新增函數圖(&N)…"
- 
- #: MainDlg.cpp:172
- msgid "New Parametric Plot..."
--msgstr "新增參數函數圖..."
-+msgstr "新增參數函數圖…"
- 
- #: MainDlg.cpp:173
- msgid "New Polar Plot..."
--msgstr "新增極座標圖..."
-+msgstr "新增極座標圖…"
- 
- #: MainDlg.cpp:174
- msgid "Edit Plots..."
--msgstr "編輯圖..."
-+msgstr "編輯圖…"
- 
- #: MainDlg.cpp:177
- msgid "&Get y-Value..."
--msgstr "獲得 y 值(&G)..."
-+msgstr "獲得 y 值(&G)…"
- 
- #: MainDlg.cpp:178
- msgid "&Search for Minimum Value..."
--msgstr "搜尋最小值(&S)..."
-+msgstr "搜尋最小值(&S)…"
- 
- #: MainDlg.cpp:179
- msgid "&Search for Maximum Value..."
--msgstr "搜尋最大值(&S)..."
-+msgstr "搜尋最大值(&S)…"
- 
- #: MainDlg.cpp:180
- msgid "&Calculate Integral"
-@@ -3185,9 +3226,11 @@
- 
- #: MainDlg.cpp:252
- msgid ""
--"This file is saved with an old file format; if you save it, you cannot open the "
--"file with older versions of Kmplot. Are you sure you want to continue?"
--msgstr "此檔案是以舊檔案格式儲存的；如果您儲存的話，您將無法使用舊版本的 KmPlot 開啟該檔案。您確定想要繼續嗎？"
-+"This file is saved with an old file format; if you save it, you cannot open "
-+"the file with older versions of Kmplot. Are you sure you want to continue?"
-+msgstr ""
-+"此檔案是以舊檔案格式儲存的；如果您儲存的話，您將無法使用舊版本的 KmPlot 開啟"
-+"該檔案。您確定想要繼續嗎？"
- 
- #: MainDlg.cpp:252
- msgid "Save New Format"
-diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdeedu/kpercentage.po kde-i18n-zh_TW-3.5.10/messages/kdeedu/kpercentage.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdeedu/kpercentage.po	2006-07-22 10:04:14.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdeedu/kpercentage.po	2011-11-11 15:45:17.000000000 +0100
-@@ -6,8 +6,7 @@
- "Project-Id-Version: kpercentage\n"
- "POT-Creation-Date: 2005-03-18 01:27+0100\n"
- "PO-Revision-Date: 2006-06-19 12:53+0800\n"
--"Last-Translator: Frank Weng (a.k.a. Franklin) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Chinese Traditional <zh-l10n@linux.org.tw>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
-@@ -95,7 +94,8 @@
- 
- #: kpercentage.cpp:165
- msgid ""
--"Click here to start a sequence of exercises where the percent value is omitted."
-+"Click here to start a sequence of exercises where the percent value is "
-+"omitted."
- msgstr "點選以開始一連串的計算百分比率練習。"
- 
- #: kpercentage.cpp:166
-@@ -280,7 +280,7 @@
- 
- #: feedback_i18n.cpp:17
- msgid "Oh no!"
--msgstr "拜託..."
-+msgstr "拜託…"
- 
- #: feedback_i18n.cpp:18
- msgid "That's not right!"
-@@ -296,7 +296,7 @@
- 
- #: kanswer.cpp:163
- msgid "Oops!"
--msgstr "呃..."
-+msgstr "呃…"
- 
- #: kanswer.cpp:164
- msgid "Mistyped!"
-diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdeedu/kstars.po kde-i18n-zh_TW-3.5.10/messages/kdeedu/kstars.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdeedu/kstars.po	2008-08-19 20:43:13.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdeedu/kstars.po	2011-11-11 15:45:17.000000000 +0100
-@@ -9,8 +9,7 @@
- "Project-Id-Version: kstars\n"
- "POT-Creation-Date: 2008-07-08 01:24+0200\n"
- "PO-Revision-Date: 2007-01-09 12:42+0800\n"
--"Last-Translator: Frank Weng (a.k.a. Franklin) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Chinese Traditional <zh-l10n@linux.org.tw>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
-@@ -82,19 +81,19 @@
- 
- #: addcatdialog.cpp:77
- msgid ""
--"A valid custom catalog file has one line per object, with the following fields "
--"in each line:"
--msgstr "合法的自訂星表檔中，每個物件會有一行，每一行中會有以下欄位："
-+"A valid custom catalog file has one line per object, with the following "
-+"fields in each line:"
-+msgstr "合法的自訂星表檔中，每個物件會有一列，每一列中會有以下欄位："
- 
- #: addcatdialog.cpp:79
- msgid ""
- "1. Type identifier.  Must be one of: 0 (star), 3 (open cluster), 4 (globular "
--"cluster), 5 (gaseous nebula), 6 (planetary nebula), 7 (supernova remnant), or 8 "
--"(galaxy)"
-+"cluster), 5 (gaseous nebula), 6 (planetary nebula), 7 (supernova remnant), "
-+"or 8 (galaxy)"
- msgstr ""
--"1. 型態代碼。必須是以下的一種：0（星體，Star），3（開放星團，Open cluster），4（球狀星團，Globular "
--"cluster），5（氣體星雲，Gaseous nebula），6（行星星雲，Planetary nebula），7（超新星殘跡，Supernova "
--"remnant）或 8（星系，Galaxy）"
-+"1. 型態代碼。必須是以下的一種：0（星體，Star），3（開放星團，Open cluster），"
-+"4（球狀星團，Globular cluster），5（氣體星雲，Gaseous nebula），6（行星星雲，"
-+"Planetary nebula），7（超新星殘跡，Supernova remnant）或 8（星系，Galaxy）"
- 
- #: addcatdialog.cpp:81
- msgid "2. Right Ascension (floating-point value)"
-@@ -114,8 +113,11 @@
- 
- #: addcatdialog.cpp:85
- msgid ""
--"6. Star name (if type=0); otherwise object's common name. [field 6 is optional]"
--msgstr "6. 如果型態代碼為 0，則此欄為星體名稱，否則為物件的通用名稱【第 6 欄為選擇性的】"
-+"6. Star name (if type=0); otherwise object's common name. [field 6 is "
-+"optional]"
-+msgstr ""
-+"6. 如果型態代碼為 0，則此欄為星體名稱，否則為物件的通用名稱【第 6 欄為選擇性"
-+"的】"
- 
- #: addcatdialog.cpp:87
- msgid ""
-@@ -542,36 +544,39 @@
- "or a floating-point value, or space- or colon-delimited values \n"
- "specifying degrees, arcminutes and arcseconds."
- msgstr ""
--"角度值，單位為度（degree）。您可以輸入一個整數或浮點數，或者是以空白或冒號隔開的度數、弧分（arcminute）與弧秒（arcsecond）值。"
-+"角度值，單位為度（degree）。您可以輸入一個整數或浮點數，或者是以空白或冒號隔"
-+"開的度數、弧分（arcminute）與弧秒（arcsecond）值。"
- 
- #: dmsbox.cpp:95
- msgid ""
- "Enter an angle value in degrees.  The angle can be expressed as a simple "
--"integer (\"45\") or floating-point (\"45.333\") value, or as space- or "
--"colon-delimited values specifying degrees, arcminutes and arcseconds "
--"(\"45:20\", \"45:20:00\", \"45:20\", \"45 20.0\", etc.)."
--msgstr ""
--"在此輸入角度值，單位為度（degree）。角度可以為一個簡單整數（如 \"45\"）或浮點數（如 "
--"\"45.333\"），或者是以空白或冒號隔開的度數、弧分（arcminute）與弧秒（arcsecond）值（如 "
--"\"45:20\"，\"45:20:00\"，\"45 20.0\"等）。"
-+"integer (\"45\") or floating-point (\"45.333\") value, or as space- or colon-"
-+"delimited values specifying degrees, arcminutes and arcseconds (\"45:20\", "
-+"\"45:20:00\", \"45:20\", \"45 20.0\", etc.)."
-+msgstr ""
-+"在此輸入角度值，單位為度（degree）。角度可以為一個簡單整數（如 \"45\"）或浮點"
-+"數（如 \"45.333\"），或者是以空白或冒號隔開的度數、弧分（arcminute）與弧秒"
-+"（arcsecond）值（如 \"45:20\"，\"45:20:00\"，\"45 20.0\"等）。"
- 
- #: dmsbox.cpp:97
- msgid ""
- "Angle value in hours. You may enter a simple integer \n"
- "or floating-point value, or space- or colon-delimited values \n"
- "specifying hours, minutes and seconds."
--msgstr "角度值，單位為時（hour）。您可以輸入一個整數或浮點數，或者是以空白或冒號隔開的時（hour）、分（minute）與秒（second）值。"
-+msgstr ""
-+"角度值，單位為時（hour）。您可以輸入一個整數或浮點數，或者是以空白或冒號隔開"
-+"的時（hour）、分（minute）與秒（second）值。"
- 
- #: dmsbox.cpp:98
- msgid ""
--"Enter an angle value in hours.  The angle can be expressed as a simple integer "
--"(\"12\") or floating-point (\"12.333\") value, or as space- or colon-delimited "
--"values specifying hours, minutes and seconds (\"12:20\", \"12:20:00\", "
--"\"12:20\", \"12 20.0\", etc.)."
--msgstr ""
--"在此輸入角度值，單位為時（hour）。角度可以為一個簡單整數（如 \"12\"）或浮點數（如 "
--"\"12.333\"），或者是以空白或冒號隔開的時、分（minute）與秒（second）值（如 \"12:20\"，\"12:20:00\"，\"12 "
--"20.0\"等）。"
-+"Enter an angle value in hours.  The angle can be expressed as a simple "
-+"integer (\"12\") or floating-point (\"12.333\") value, or as space- or colon-"
-+"delimited values specifying hours, minutes and seconds (\"12:20\", \"12:20:00"
-+"\", \"12:20\", \"12 20.0\", etc.)."
-+msgstr ""
-+"在此輸入角度值，單位為時（hour）。角度可以為一個簡單整數（如 \"12\"）或浮點數"
-+"（如 \"12.333\"），或者是以空白或冒號隔開的時、分（minute）與秒（second）值"
-+"（如 \"12:20\"，\"12:20:00\"，\"12 20.0\"等）。"
- 
- #: finddialog.cpp:37
- msgid "Find Object"
-@@ -693,7 +698,7 @@
- 
- #: fitsimage.cpp:262
- msgid "Loading FITS..."
--msgstr "載入 FITS 中..."
-+msgstr "載入 FITS 中…"
- 
- #: fitsimage.cpp:280 fitsviewer.cpp:307
- msgid "Not enough memory to load FITS."
-@@ -705,11 +710,11 @@
- 
- #: fitsprocess.cpp:50
- msgid "Image Loading Process..."
--msgstr "影像載入中..."
-+msgstr "影像載入中…"
- 
- #: fitsprocess.cpp:263
- msgid "Image Reduction Process..."
--msgstr "影像復原進度..."
-+msgstr "影像復原進度…"
- 
- #. i18n: file imagereductionui.ui line 16
- #: fitsprocess.cpp:349 fitsviewer.cpp:134 fitsviewer.cpp:138
-@@ -755,10 +760,8 @@
- msgstr "目前的 FITS 檔中有未儲存的變更。您要在關閉前先儲存嗎？"
- 
- #: fitsviewer.cpp:314
--msgid ""
--"Unable to read FITS data from file. %1.\n"
--msgstr ""
--"無法從檔案讀取 FITS 資料。錯誤：%1。\n"
-+msgid "Unable to read FITS data from file. %1.\n"
-+msgstr "無法從檔案讀取 FITS 資料。錯誤：%1。\n"
- 
- #: fitsviewer.cpp:571
- msgid "Error: Low memory. Saving is aborted."
-@@ -818,9 +821,11 @@
- 
- #: fovdialog.cpp:187
- msgid ""
--"You have removed all FOV symbols.  If the list remains empty when you exit this "
--"tool, the default symbols will be regenerated."
--msgstr "您已移除所有的視場符號。如果在您離開此工具時此清單仍然是空的，將會自動建立預設的符號。"
-+"You have removed all FOV symbols.  If the list remains empty when you exit "
-+"this tool, the default symbols will be regenerated."
-+msgstr ""
-+"您已移除所有的視場符號。如果在您離開此工具時此清單仍然是空的，將會自動建立預"
-+"設的符號。"
- 
- #: fovdialog.cpp:188
- msgid "FOV list is empty"
-@@ -868,8 +873,8 @@
- 
- #: imagesequence.cpp:328 imagesequence.cpp:406 imagesequence.cpp:464
- msgid ""
--"%1 is disconnected. Establish a connection to the device using the INDI Control "
--"Panel."
-+"%1 is disconnected. Establish a connection to the device using the INDI "
-+"Control Panel."
- msgstr "%1 已斷線。請使用 INDI 控制面板建立到裝置的連線。"
- 
- #: imagesequence.cpp:476
-@@ -882,8 +887,8 @@
- 
- #: imagesequence.cpp:571
- msgid ""
--"Expose duration is invalid. %1 supports expose durations from %2 to %3 seconds "
--"only."
-+"Expose duration is invalid. %1 supports expose durations from %2 to %3 "
-+"seconds only."
- msgstr "曝光時間不正確。%1 只支援曝光時間從 %2 到 %3 秒。"
- 
- #: imageviewer.cpp:40
-@@ -987,8 +992,8 @@
- 
- #: indimenu.cpp:96 indimenu.cpp:102
- msgid ""
--"No INDI devices currently running. To run devices, please select devices from "
--"the Device Manager in the devices menu."
-+"No INDI devices currently running. To run devices, please select devices "
-+"from the Device Manager in the devices menu."
- msgstr "目前沒有執行中的 INDI 裝置。要執行裝置，請從「裝置管理員」中選取裝置。"
- 
- #: indiproperty.cpp:181
-@@ -1022,7 +1027,7 @@
- 
- #: indistd.cpp:83
- msgid "Downloading Data..."
--msgstr "下載資料中..."
-+msgstr "下載資料中…"
- 
- #: indistd.cpp:195
- #, c-format
-@@ -1194,11 +1199,11 @@
- 
- #: ksnewstuff.cpp:85
- msgid "Installing Steinicke NGC/IC catalog..."
--msgstr "安裝 Steinicke NGC/IC 星表中..."
-+msgstr "安裝 Steinicke NGC/IC 星表中…"
- 
- #: ksnewstuff.cpp:133
- msgid "Installing comet and asteroid ephemerides..."
--msgstr "安裝慧星與小行星星曆表中..."
-+msgstr "安裝慧星與小行星星曆表中…"
- 
- #: ksplanetbase.cpp:139
- msgid "KSPlanetBase::setRearth():  Error: Need an Earth pointer.  ("
-@@ -1237,7 +1242,7 @@
- #: kspopupmenu.cpp:132 rc.cpp:210
- #, no-c-format
- msgid "Add Link..."
--msgstr "新增連結..."
-+msgstr "新增連結…"
- 
- #: kspopupmenu.cpp:213
- msgid "Center && Track Crosshair"
-@@ -1263,7 +1268,7 @@
- 
- #: kspopupmenu.cpp:300
- msgid "Angular Distance To...            ["
--msgstr "角距離到...              ["
-+msgstr "角距離到…              ["
- 
- #: kspopupmenu.cpp:302
- msgid "Compute Angular Distance          ]"
-@@ -11732,7 +11737,7 @@
- msgid ""
- "_: City name (optional, probably does not need a translation)\n"
- "Nassau Obs."
--msgstr "Nassau Obs.（拿索天文台）"
-+msgstr "Nassau Obs.（拿索天文臺）"
- 
- #: kstars_i18n.cpp:1734
- msgid ""
-@@ -12248,7 +12253,7 @@
- msgid ""
- "_: City name (optional, probably does not need a translation)\n"
- "Obs. Milan"
--msgstr "Obs. Milan（米蘭天文台）"
-+msgstr "Obs. Milan（米蘭天文臺）"
- 
- #: kstars_i18n.cpp:1820
- msgid ""
-@@ -12926,7 +12931,7 @@
- msgid ""
- "_: City name (optional, probably does not need a translation)\n"
- "Peru"
--msgstr "Peru（秘魯）"
-+msgstr "Peru（祕魯）"
- 
- #: kstars_i18n.cpp:1933
- msgid ""
-@@ -13454,7 +13459,7 @@
- msgid ""
- "_: City name (optional, probably does not need a translation)\n"
- "Princeton Obs."
--msgstr "Princeton Obs.（普林斯頓天文台）"
-+msgstr "Princeton Obs.（普林斯頓天文臺）"
- 
- #: kstars_i18n.cpp:2021
- msgid ""
-@@ -15584,7 +15589,7 @@
- msgid ""
- "_: City name (optional, probably does not need a translation)\n"
- "Taipei"
--msgstr "Taipei（台北）"
-+msgstr "Taipei（臺北）"
- 
- #: kstars_i18n.cpp:2376
- msgid ""
-@@ -19304,7 +19309,7 @@
- msgid ""
- "_: Country name (optional, but should be translated)\n"
- "Peru"
--msgstr "Peru（秘魯）"
-+msgstr "Peru（祕魯）"
- 
- #: kstars_i18n.cpp:2997
- msgid ""
-@@ -19478,7 +19483,7 @@
- msgid ""
- "_: Country name (optional, but should be translated)\n"
- "Taiwan"
--msgstr "Taiwan（中華民國台灣）"
-+msgstr "Taiwan（中華民國臺灣）"
- 
- #: kstars_i18n.cpp:3026
- msgid ""
-@@ -20276,7 +20281,7 @@
- msgid ""
- "_: star name\n"
- "Alula Borealis"
--msgstr "下台一，三台五（Alula Borealis）"
-+msgstr "下臺一，三臺五（Alula Borealis）"
- 
- #: kstars_i18n.cpp:3163
- msgid ""
-@@ -21110,7 +21115,7 @@
- msgid ""
- "_: star name\n"
- "Sheliak"
--msgstr "漸台二（Sheliak）"
-+msgstr "漸臺二（Sheliak）"
- 
- #: kstars_i18n.cpp:3302
- msgid ""
-@@ -21146,7 +21151,7 @@
- msgid ""
- "_: star name\n"
- "Sulaphat"
--msgstr "漸台三（Sulaphat）"
-+msgstr "漸臺三（Sulaphat）"
- 
- #: kstars_i18n.cpp:3308
- msgid ""
-@@ -21176,13 +21181,13 @@
- msgid ""
- "_: star name\n"
- "Tania Australis"
--msgstr "中台二，三台四（Tania Australis）"
-+msgstr "中臺二，三臺四（Tania Australis）"
- 
- #: kstars_i18n.cpp:3313
- msgid ""
- "_: star name\n"
- "Tania Borealis"
--msgstr "中台一，三台三（Tania Borealis）"
-+msgstr "中臺一，三臺三（Tania Borealis）"
- 
- #: kstars_i18n.cpp:3314
- msgid ""
-@@ -22245,10 +22250,13 @@
- 
- #: kstarsactions.cpp:556
- msgid ""
--"The selected script contains unrecognized elements,indicating that it was not "
--"created using the KStars script builder. This script may not function properly, "
--"and it may even contain malicious code. Would you like to execute it anyway?"
--msgstr "選擇的文稿包含未知的元素，它可能不是由 KStars 文稿建立器建立的。這個文稿可能不能正確執行，也可能包含危險的程式碼。您確定要執行嗎？"
-+"The selected script contains unrecognized elements,indicating that it was "
-+"not created using the KStars script builder. This script may not function "
-+"properly, and it may even contain malicious code. Would you like to execute "
-+"it anyway?"
-+msgstr ""
-+"選擇的文稿包含未知的元素，它可能不是由 KStars 文稿建立器建立的。這個文稿可能"
-+"不能正確執行，也可能包含危險的程式碼。您確定要執行嗎？"
- 
- #: kstarsactions.cpp:560
- msgid "Script Validation Failed"
-@@ -22260,10 +22268,12 @@
- 
- #: kstarsactions.cpp:581
- msgid ""
--"You can save printer ink by using the \"Star Chart\" color scheme, which uses a "
--"white background. Would you like to temporarily switch to the Star Chart color "
--"scheme for printing?"
--msgstr "使用「星體圖表」顏色機制的話，背景為白色，可以節省印表機墨水。您要暫時切換過去嗎？"
-+"You can save printer ink by using the \"Star Chart\" color scheme, which "
-+"uses a white background. Would you like to temporarily switch to the Star "
-+"Chart color scheme for printing?"
-+msgstr ""
-+"使用「星體圖表」顏色機制的話，背景為白色，可以節省印表機墨水。您要暫時切換過"
-+"去嗎？"
- 
- #: kstarsactions.cpp:586
- msgid "Switch to Star Chart Colors?"
-@@ -22302,7 +22312,7 @@
- 
- #: kstarsactions.cpp:887 kstarsinit.cpp:342
- msgid "Edit FOV Symbols..."
--msgstr "編輯視場符號..."
-+msgstr "編輯視場符號…"
- 
- #: kstarsdata.cpp:129
- msgid "multiple star"
-@@ -22362,11 +22372,11 @@
- 
- #: kstarsdata.cpp:587 kstarsdata.cpp:1842
- msgid "Loading Star Data (%1%)"
--msgstr "載入星體資料中...（%1%）"
-+msgstr "載入星體資料中…（%1%）"
- 
- #: kstarsdata.cpp:791 kstarsdata.cpp:1853
- msgid "Loading NGC/IC Data (%1%)"
--msgstr "載入 NGC/IC 資料中...（%1%）"
-+msgstr "載入 NGC/IC 資料中…（%1%）"
- 
- #: kstarsdata.cpp:887
- msgid "Unnamed Object"
-@@ -22393,7 +22403,8 @@
- 
- #: kstarsdata.cpp:1230
- msgid ""
--"Some lines in the custom catalog could not be parsed; see error messages below."
-+"Some lines in the custom catalog could not be parsed; see error messages "
-+"below."
- msgstr "自訂星表中某些行無法剖析，請看底下的錯誤訊息。"
- 
- #: kstarsdata.cpp:1231
-@@ -22528,7 +22539,7 @@
- 
- #: kstarsdata.cpp:1543
- msgid "Cities.dat: Ran out of fields.  Line was:"
--msgstr "Cities.dat：欄位不足。行數："
-+msgstr "Cities.dat：欄位不足。列數："
- 
- #: kstarsdata.cpp:1561 kstarsdata.cpp:1567 kstarsdata.cpp:1573
- #: kstarsdata.cpp:1586 kstarsdata.cpp:1592 kstarsdata.cpp:1598
-@@ -22537,7 +22548,7 @@
- "Cities.dat: Bad integer.  Line was:\n"
- msgstr ""
- "\n"
--"Cities.dat：錯誤的整數。行數：\n"
-+"Cities.dat：錯誤的整數。列數：\n"
- 
- #: kstarsdata.cpp:1580
- msgid ""
-@@ -22545,7 +22556,7 @@
- "Cities.dat: Invalid latitude sign.  Line was:\n"
- msgstr ""
- "\n"
--"Cities.dat：錯誤的緯度符號。行數：\n"
-+"Cities.dat：錯誤的緯度符號。列數：\n"
- 
- #: kstarsdata.cpp:1605
- msgid ""
-@@ -22553,7 +22564,7 @@
- "Cities.dat: Invalid longitude sign.  Line was:\n"
- msgstr ""
- "\n"
--"Cities.dat：錯誤的經度符號。行數：\n"
-+"Cities.dat：錯誤的經度符號。列數：\n"
- 
- #: kstarsdata.cpp:1623
- msgid ""
-@@ -22561,16 +22572,17 @@
- "Cities.dat: Bad time zone.  Line was:\n"
- msgstr ""
- "\n"
--"Cities.dat：錯誤的時區。行數：\n"
-+"Cities.dat：錯誤的時區。列數：\n"
- 
- #: kstarsdata.cpp:1774
- msgid ""
--"The file %1 could not be found. KStars cannot run properly without this file. "
--"To continue loading, place the file in one of the following locations, then "
--"press Retry:\n"
-+"The file %1 could not be found. KStars cannot run properly without this "
-+"file. To continue loading, place the file in one of the following locations, "
-+"then press Retry:\n"
- "\n"
- msgstr ""
--"找不到檔案 %1，KStars 沒有此檔將無法正確執行。要繼續載入，請將此檔放到以下的位置其中之一，然後按下「重試」：\n"
-+"找不到檔案 %1，KStars 沒有此檔將無法正確執行。要繼續載入，請將此檔放到以下的"
-+"位置其中之一，然後按下「重試」：\n"
- "\n"
- 
- #: kstarsdata.cpp:1780
-@@ -22585,11 +22597,12 @@
- #: kstarsdata.cpp:1783
- msgid ""
- "The file %1 could not be found. KStars can still run without this file. "
--"However, to avoid seeing this message in the future, you can place the file in "
--"one of the following locations, then press Retry:\n"
-+"However, to avoid seeing this message in the future, you can place the file "
-+"in one of the following locations, then press Retry:\n"
- "\n"
- msgstr ""
--"找不到檔案 %1，KStars 沒有此檔還是可以執行。不過，如果您不想再看到這個訊息，請將此檔放到以下的位置其中之一，然後按下「重試」：\n"
-+"找不到檔案 %1，KStars 沒有此檔還是可以執行。不過，如果您不想再看到這個訊息，"
-+"請將此檔放到以下的位置其中之一，然後按下「重試」：\n"
- "\n"
- 
- #: kstarsdata.cpp:1789
-@@ -22718,29 +22731,29 @@
- 
- #: kstarsinit.cpp:55
- msgid "&Download Data..."
--msgstr "下載資料(&D)..."
-+msgstr "下載資料(&D)…"
- 
- #: kstarsinit.cpp:57
- msgid "Open FITS..."
--msgstr "開啟 FITS..."
-+msgstr "開啟 FITS…"
- 
- #: kstarsinit.cpp:58
- msgid "&Save Sky Image..."
--msgstr "儲存天體影像...(&S)"
-+msgstr "儲存天體影像…(&S)"
- 
- #: kstarsinit.cpp:60
- msgid "&Run Script..."
--msgstr "執行文稿(&R)..."
-+msgstr "執行文稿(&R)…"
- 
- #: kstarsinit.cpp:66
- msgid "Set Time to &Now"
--msgstr "設定時間為現在時間 (&N)"
-+msgstr "設定時間為現在時間(&N)"
- 
- #: kstarsinit.cpp:68
- msgid ""
- "_: set Clock to New Time\n"
- "&Set Time..."
--msgstr "設定時間(&S)..."
-+msgstr "設定時間(&S)…"
- 
- #: kstarsinit.cpp:70
- msgid "Stop &Clock"
-@@ -22760,7 +22773,7 @@
- 
- #: kstarsinit.cpp:81
- msgid "&Zenith"
--msgstr "天頂 (&Z)"
-+msgstr "天頂(&Z)"
- 
- #: kstarsinit.cpp:83
- msgid "&North"
-@@ -22780,7 +22793,7 @@
- 
- #: kstarsinit.cpp:93
- msgid "&Find Object..."
--msgstr "尋找物件(&F)..."
-+msgstr "尋找物件(&F)…"
- 
- #: kstarsinit.cpp:94
- msgid "Find object"
-@@ -22788,11 +22801,11 @@
- 
- #: kstarsinit.cpp:99
- msgid "Set Focus &Manually..."
--msgstr "手動設定焦點(&M)..."
-+msgstr "手動設定焦點(&M)…"
- 
- #: kstarsinit.cpp:107
- msgid "&Zoom to Angular Size..."
--msgstr "縮放角度大小(&Z)..."
-+msgstr "縮放角度大小(&Z)…"
- 
- #: kstarsinit.cpp:109
- msgid "Horizontal &Coordinates"
-@@ -22874,67 +22887,67 @@
- msgid ""
- "_: Location on Earth\n"
- "&Geographic..."
--msgstr "地理(&G)..."
-+msgstr "地理(&G)…"
- 
- #: kstarsinit.cpp:199
- msgid "Startup Wizard..."
--msgstr "啟動精靈..."
-+msgstr "啟動精靈…"
- 
- #: kstarsinit.cpp:203
- msgid "Calculator..."
--msgstr "計算機..."
-+msgstr "計算機…"
- 
- #: kstarsinit.cpp:206
- msgid "Observing List..."
--msgstr "觀測清單..."
-+msgstr "觀測清單…"
- 
- #: kstarsinit.cpp:211
- msgid "AAVSO Light Curves..."
--msgstr "AAVSO 光曲線..."
-+msgstr "AAVSO 光曲線…"
- 
- #: kstarsinit.cpp:214
- msgid "Altitude vs. Time..."
--msgstr "高度仰角vs時間..."
-+msgstr "高度仰角vs時間…"
- 
- #: kstarsinit.cpp:216
- msgid "What's up Tonight..."
--msgstr "今晚有什麼..."
-+msgstr "今晚有什麼…"
- 
- #: kstarsinit.cpp:221
- msgid "Script Builder..."
--msgstr "文稿建立器..."
-+msgstr "文稿建立器…"
- 
- #: kstarsinit.cpp:223
- msgid "Solar System..."
--msgstr "太陽系..."
-+msgstr "太陽系…"
- 
- #: kstarsinit.cpp:225
- msgid "Jupiter's Moons..."
--msgstr "木星的衛星..."
-+msgstr "木星的衛星…"
- 
- #: kstarsinit.cpp:229
- msgid "Telescope Wizard..."
--msgstr "望遠鏡精靈..."
-+msgstr "望遠鏡精靈…"
- 
- #: kstarsinit.cpp:230
- msgid "Telescope Properties..."
--msgstr "望遠鏡內容..."
-+msgstr "望遠鏡內容…"
- 
- #: kstarsinit.cpp:231
- msgid "Device Manager..."
--msgstr "裝置管理者..."
-+msgstr "裝置管理者…"
- 
- #: kstarsinit.cpp:233
- msgid "Capture Image Sequence..."
--msgstr "抓取影像序列..."
-+msgstr "抓取影像序列…"
- 
- #: kstarsinit.cpp:236
- msgid "INDI Control Panel..."
--msgstr "INDI 控制面板..."
-+msgstr "INDI 控制面板…"
- 
- #: kstarsinit.cpp:239
- msgid "Configure INDI..."
--msgstr "設定 INDI..."
-+msgstr "設定 INDI…"
- 
- #: kstarsinit.cpp:244
- msgid "Tip of the Day"
-@@ -23045,11 +23058,11 @@
- 
- #: kstarssplash.cpp:29
- msgid "Loading KStars..."
--msgstr "載入 KStars 中..."
-+msgstr "載入 KStars 中…"
- 
- #: kstarssplash.cpp:63
- msgid "Welcome to KStars. Please stand by while loading..."
--msgstr "歡迎使用 KStars。請等待程式載入..."
-+msgstr "歡迎使用 KStars。請等待程式載入…"
- 
- #: locationdialog.cpp:40
- msgid "Set Geographic Location"
-@@ -23543,9 +23556,11 @@
- #, no-c-format
- msgid ""
- "To import an existing data file, enter its filename here.  You will then "
--"describe the contents of the file below.  You can leave the filename blank to "
--"construct a catalog file with a valid header, but no data."
--msgstr "要匯入現有的資料檔，請輸入它的檔名，然後在底下描述檔案內容。您可以將檔名留白，以建立有合法標頭但沒有資料的星表檔。"
-+"describe the contents of the file below.  You can leave the filename blank "
-+"to construct a catalog file with a valid header, but no data."
-+msgstr ""
-+"要匯入現有的資料檔，請輸入它的檔名，然後在底下描述檔案內容。您可以將檔名留"
-+"白，以建立有合法標頭但沒有資料的星表檔。"
- 
- #. i18n: file addcatdialogui.ui line 57
- #: rc.cpp:15
-@@ -23557,7 +23572,8 @@
- #: rc.cpp:18
- #, no-c-format
- msgid ""
--"When you select a data file in the above line, its contents are displayed here."
-+"When you select a data file in the above line, its contents are displayed "
-+"here."
- msgstr "若您選擇了資料檔，它的內容會顯示在這裡。"
- 
- #. i18n: file addcatdialogui.ui line 70
-@@ -23584,7 +23600,9 @@
- msgid ""
- "Build a list of data fields for your import data file (in the correct order "
- "from left to right), by dragging items from the \"Available fields\" list."
--msgstr "請依序建立在您匯入資料檔案的資料欄位清單。您可以從「可用的欄位」清單中拖曳過來。"
-+msgstr ""
-+"請依序建立在您匯入資料檔案的資料欄位清單。您可以從「可用的欄位」清單中拖曳過"
-+"來。"
- 
- #. i18n: file addcatdialogui.ui line 128
- #: rc.cpp:33
-@@ -23602,8 +23620,8 @@
- #: rc.cpp:39
- #, no-c-format
- msgid ""
--"Drag items from this box to the \"Catalog fields\" box to describe the contents "
--"of your imported data file."
-+"Drag items from this box to the \"Catalog fields\" box to describe the "
-+"contents of your imported data file."
- msgstr "從此盒中拖曳到「星表欄位」盒中，以描述您匯入資料檔案的內容。"
- 
- #. i18n: file addcatdialogui.ui line 167
-@@ -23809,8 +23827,8 @@
- #: rc.cpp:162
- #, no-c-format
- msgid ""
--"A small thumbnail image of the object is shown here.  You can modify the image "
--"by clicking on it."
-+"A small thumbnail image of the object is shown here.  You can modify the "
-+"image by clicking on it."
- msgstr "此物件的小縮圖會顯示無此。您可以點選它以改變影像。"
- 
- #. i18n: file details_data.ui line 293
-@@ -23907,7 +23925,7 @@
- #: rc.cpp:213
- #, no-c-format
- msgid "Edit Link..."
--msgstr "編輯連結..."
-+msgstr "編輯連結…"
- 
- #. i18n: file details_links.ui line 153
- #: rc.cpp:216
-@@ -24124,7 +24142,7 @@
- #: rc.cpp:360 rc.cpp:513 rc.cpp:537 rc.cpp:561
- #, no-c-format
- msgid "Add..."
--msgstr "新增..."
-+msgstr "新增…"
- 
- #. i18n: file devmanager.ui line 329
- #: rc.cpp:369 rc.cpp:2315
-@@ -24239,19 +24257,19 @@
- #: rc.cpp:438
- #, no-c-format
- msgid ""
--"The list of defined field-of-view (FOV) symbols.  You can add a symbol to the "
--"list using the \"New\" button, remove a symbol using the \"Remove\" button, and "
--"modify a symbol using the \"Edit\" button.  A schematic of the highlighted "
--"symbol is drawn at right."
-+"The list of defined field-of-view (FOV) symbols.  You can add a symbol to "
-+"the list using the \"New\" button, remove a symbol using the \"Remove\" "
-+"button, and modify a symbol using the \"Edit\" button.  A schematic of the "
-+"highlighted symbol is drawn at right."
- msgstr ""
--"這個清單定義了視場（field of "
--"view，FOV）符號。您可以用「新增」按鍵新增符號到此清單中，「移除」按鍵移除清單中的符號，還有「編輯」按鍵來編輯符號。"
-+"這個清單定義了視場（field of view，FOV）符號。您可以用「新增」按鍵新增符號到"
-+"此清單中，「移除」按鍵移除清單中的符號，還有「編輯」按鍵來編輯符號。"
- 
- #. i18n: file fovdialogui.ui line 52
- #: rc.cpp:441
- #, no-c-format
- msgid "New..."
--msgstr "新增..."
-+msgstr "新增…"
- 
- #. i18n: file fovdialogui.ui line 55
- #: rc.cpp:444
-@@ -24271,7 +24289,7 @@
- #: rc.cpp:450
- #, no-c-format
- msgid "Edit..."
--msgstr "編輯..."
-+msgstr "編輯…"
- 
- #. i18n: file fovdialogui.ui line 86
- #: rc.cpp:453
-@@ -24684,13 +24702,14 @@
- #: rc.cpp:753
- #, no-c-format
- msgid ""
--"<p>This Wizard will help you set up some basic options to help you get the most "
--"out of KStars.  You can press <b>Finish</b> at any time to save the settings "
--"you've made so far, and skip the remaining steps.</p>\n"
-+"<p>This Wizard will help you set up some basic options to help you get the "
-+"most out of KStars.  You can press <b>Finish</b> at any time to save the "
-+"settings you've made so far, and skip the remaining steps.</p>\n"
- "\n"
- "<p>To get started, press the <b>Next</b> button.</p>"
- msgstr ""
--"<p>這個精靈幫您設定一些基本的選項，協助您使用 KStars。您可以在任何時間點選「完成」以儲存設定，並省略接下來的步驟。</p>\n"
-+"<p>這個精靈幫您設定一些基本的選項，協助您使用 KStars。您可以在任何時間點選"
-+"「完成」以儲存設定，並省略接下來的步驟。</p>\n"
- "\n"
- "<p>按<b>下一步</b>開始。</p>"
- 
-@@ -24718,7 +24737,8 @@
- "\n"
- "<p>Once you have selected a City, press <b>Next</b>.</p>"
- msgstr ""
--"<p>從清單中選擇靠近您的位置的城市。您可以用過濾城市的名稱、所在的省（或州）與所在的國家。</p>\n"
-+"<p>從清單中選擇靠近您的位置的城市。您可以用過濾城市的名稱、所在的省（或州）與"
-+"所在的國家。</p>\n"
- "\n"
- "<p>選定城市之後，請按<b>下一步</b>。</p>"
- 
-@@ -24783,7 +24803,9 @@
- "KStars can control most popular computerized telescope\n"
- "mounts, as well as some focusers and CCD cameras.  It\n"
- "can also control telescopes remotely over the Internet."
--msgstr "KStars 可以控制大部份常用的電腦化的望遠鏡，以及一些 CCD 相機等。它也可以透過網際網路來控制遠端的望遠鏡。"
-+msgstr ""
-+"KStars 可以控制大部份常用的電腦化的望遠鏡，以及一些 CCD 相機等。它也可以透過"
-+"網際網路來控制遠端的望遠鏡。"
- 
- #. i18n: file kswizardui.ui line 525
- #: rc.cpp:817
-@@ -24802,7 +24824,7 @@
- #: rc.cpp:823
- #, no-c-format
- msgid "Telescope Setup Wizard..."
--msgstr "望遠鏡設定精靈..."
-+msgstr "望遠鏡設定精靈…"
- 
- #. i18n: file kswizardui.ui line 578
- #: rc.cpp:826
-@@ -24816,7 +24838,8 @@
- msgid ""
- "The Telescope Setup Wizard will help you configure telescopes\n"
- "and other astronomical devices such as CCD cameras and focusers."
--msgstr "望遠鏡設定精靈能協助您設定望遠鏡及其他的天文裝置如 CCD 相機及焦距放大鏡等。"
-+msgstr ""
-+"望遠鏡設定精靈能協助您設定望遠鏡及其他的天文裝置如 CCD 相機及焦距放大鏡等。"
- 
- #. i18n: file kswizardui.ui line 634
- #: rc.cpp:833
-@@ -24842,8 +24865,8 @@
- "<p>You can also use this tool later, by selecting\n"
- "<b>Download data</b> from the <b>File</b> menu.</p>"
- msgstr ""
--"<p>您現在可以下載一下選擇性的資料檔來加強 KStars 的功能，如梅西爾物件影像，或是更完整的 NGC/IC 星表。按下「下載額外資料」就可以開始。</p>"
--"\n"
-+"<p>您現在可以下載一下選擇性的資料檔來加強 KStars 的功能，如梅西爾物件影像，或"
-+"是更完整的 NGC/IC 星表。按下「下載額外資料」就可以開始。</p>\n"
- "<p>您也可以稍後再用此工具，在「檔案」＞「下載資料」中。</p>"
- 
- #. i18n: file kswizardui.ui line 775
-@@ -24868,8 +24891,8 @@
- #: rc.cpp:860
- #, no-c-format
- msgid ""
--"The name of the field-of-view (FOV) symbol.  This name appears in the FOV menu "
--"and in the \"Edit FOV Symbols\" tool."
-+"The name of the field-of-view (FOV) symbol.  This name appears in the FOV "
-+"menu and in the \"Edit FOV Symbols\" tool."
- msgstr "視場（FOV）符號的名稱"
- 
- #. i18n: file newfovui.ui line 69
-@@ -24983,7 +25006,8 @@
- "The computed FOV angle (in arcminutes) will be displayed in the \"Field of "
- "view\" edit box."
- msgstr ""
--"這個按鍵會計算指定的目鏡/望遠鏡組合的視場角度。您必須先在上方的欄位指定望遠鏡與目鏡的焦距，還有目鏡的視場角度。\n"
-+"這個按鍵會計算指定的目鏡/望遠鏡組合的視場角度。您必須先在上方的欄位指定望遠鏡"
-+"與目鏡的焦距，還有目鏡的視場角度。\n"
- "\n"
- "計算出來的視場角度（以弧分為單位）會顯示在「視場」編輯盒內。"
- 
-@@ -24997,14 +25021,15 @@
- #: rc.cpp:928
- #, no-c-format
- msgid ""
--"This button will compute the field-of-view (FOV) angle for a specific "
--"camera/telescope combination.  You must first specify the focal length of the "
-+"This button will compute the field-of-view (FOV) angle for a specific camera/"
-+"telescope combination.  You must first specify the focal length of the "
- "telescope and the size of the CCD chip or film negative.\n"
- "\n"
- "The computed FOV angle (in arcminutes) will be displayed in the \"Field of "
- "view\" edit box."
- msgstr ""
--"這個按鍵會計算指定的相機/望遠鏡組合的視場角度。您必須先指定望遠鏡的焦距，還有 CCD 晶片或底片的尺寸。\n"
-+"這個按鍵會計算指定的相機/望遠鏡組合的視場角度。您必須先指定望遠鏡的焦距，還"
-+"有 CCD 晶片或底片的尺寸。\n"
- "\n"
- "計算出來的視場角度（以弧分為單位）會顯示在「視場」編輯盒內。"
- 
-@@ -25092,16 +25117,17 @@
- #: rc.cpp:998
- #, no-c-format
- msgid ""
--"This button will compute the Half Power Beam Width (HPBW) angle for a specific "
--"radiotelescope and observing wavelength combination, assuming no multibeam "
--"receiver is available at the telescope.  You must first specify the diameter of "
--"the radiotelescope and the observing wavelength.\n"
-+"This button will compute the Half Power Beam Width (HPBW) angle for a "
-+"specific radiotelescope and observing wavelength combination, assuming no "
-+"multibeam receiver is available at the telescope.  You must first specify "
-+"the diameter of the radiotelescope and the observing wavelength.\n"
- "\n"
- "The computed HPBW angle (in arcminutes) will be displayed in the \"Field of "
- "view\" edit box."
- msgstr ""
--"這個按鍵會計算指定的無線電望遠鏡的半功率波束寬度（Half Power Beam "
--"Width，HPBW）角度，以及觀察波長組合等。它假設望遠鏡沒有使用多重波束。您必須先指定無線電望遠鏡的直徑，及觀察波長。\n"
-+"這個按鍵會計算指定的無線電望遠鏡的半功率波束寬度（Half Power Beam Width，"
-+"HPBW）角度，以及觀察波長組合等。它假設望遠鏡沒有使用多重波束。您必須先指定無"
-+"線電望遠鏡的直徑，及觀察波長。\n"
- "\n"
- "計算出來的 HPBW 角度（以弧分為單位）會顯示在「視場」編輯盒內。"
- 
-@@ -25188,7 +25214,8 @@
- #: rc.cpp:1041
- #, no-c-format
- msgid ""
--"Select a shape for the field-of-view (FOV) symbol.  The possible shapes are:\n"
-+"Select a shape for the field-of-view (FOV) symbol.  The possible shapes "
-+"are:\n"
- "\n"
- "Circle, Square, Crosshairs, Bullseye."
- msgstr ""
-@@ -25226,9 +25253,11 @@
- msgid ""
- "The atmosphere bends light passing through it, like a lens.  If this item is "
- "checked, this \"atmospheric refraction\" will be simulated in the sky map.  "
--"Note that this correction is only applied when using the Horizontal coordinate "
--"system."
--msgstr "大氣會將光線折射，如同透鏡一般。如果勾選此選項，則會在天體圖中模擬「大氣折射」。注意，這個修正只有在使用水平座標系統時才會套用。"
-+"Note that this correction is only applied when using the Horizontal "
-+"coordinate system."
-+msgstr ""
-+"大氣會將光線折射，如同透鏡一般。如果勾選此選項，則會在天體圖中模擬「大氣折"
-+"射」。注意，這個修正只有在使用水平座標系統時才會套用。"
- 
- #. i18n: file opsadvancedui.ui line 41
- #: rc.cpp:1061
-@@ -25249,7 +25278,9 @@
- "If checked, changing the focus position will result in a visible animated "
- "\"slew\" to the new position.  Otherwise, the display will center on the new "
- "position instantaneously."
--msgstr "勾選此選項的話，改變焦點位置時會以動態旋轉的方式換到新位置，否則會直接跳過去。"
-+msgstr ""
-+"勾選此選項的話，改變焦點位置時會以動態旋轉的方式換到新位置，否則會直接跳過"
-+"去。"
- 
- #. i18n: file opsadvancedui.ui line 55
- #: rc.cpp:1070
-@@ -25267,10 +25298,12 @@
- #: rc.cpp:1076 rc.cpp:1085
- #, no-c-format
- msgid ""
--"If checked, a name label will be temporarily attached to an object while it is "
--"centered in the display.  You can attach a more persistent label to any object "
--"using the right-click popup menu."
--msgstr "勾選此選項的話，物件顯示在中央時會貼上一個暫時性的名稱標籤。您可以點選右鍵，在選單中選擇加上一個永久性的標籤。"
-+"If checked, a name label will be temporarily attached to an object while it "
-+"is centered in the display.  You can attach a more persistent label to any "
-+"object using the right-click popup menu."
-+msgstr ""
-+"勾選此選項的話，物件顯示在中央時會貼上一個暫時性的名稱標籤。您可以點選右鍵，"
-+"在選單中選擇加上一個永久性的標籤。"
- 
- #. i18n: file opsadvancedui.ui line 69
- #: rc.cpp:1079
-@@ -25312,10 +25345,12 @@
- #: rc.cpp:1103
- #, no-c-format
- msgid ""
--"When the map is in motion, smooth animation is compromised if the program has "
--"too many objects to draw on the map; check this item to temporarily hide some "
--"of the objects while the display is in motion."
--msgstr "天體圖在移動時，若是有太多的物件，則沒辦法很平順的移動。勾選此選項可以在移動時暫時隱藏物件。"
-+"When the map is in motion, smooth animation is compromised if the program "
-+"has too many objects to draw on the map; check this item to temporarily hide "
-+"some of the objects while the display is in motion."
-+msgstr ""
-+"天體圖在移動時，若是有太多的物件，則沒辦法很平順的移動。勾選此選項可以在移動"
-+"時暫時隱藏物件。"
- 
- #. i18n: file opsadvancedui.ui line 154
- #: rc.cpp:1106
-@@ -25449,8 +25484,8 @@
- #: rc.cpp:1169
- #, no-c-format
- msgid ""
--"If checked, then objects in the Messier catalog will be hidden when the map is "
--"in motion."
-+"If checked, then objects in the Messier catalog will be hidden when the map "
-+"is in motion."
- msgstr "勾選此選項的話，在移動天體圖時會隱藏梅西爾（Messier）星表中的物件。"
- 
- #. i18n: file opsadvancedui.ui line 347
-@@ -25469,7 +25504,8 @@
- #: rc.cpp:1178
- #, no-c-format
- msgid ""
--"If checked, then the coordinate grid will be hidden when the map is in motion."
-+"If checked, then the coordinate grid will be hidden when the map is in "
-+"motion."
- msgstr "勾選此選項的話，在移動天體圖時會隱藏座標格。"
- 
- #. i18n: file opsadvancedui.ui line 361
-@@ -25488,8 +25524,8 @@
- #: rc.cpp:1187
- #, no-c-format
- msgid ""
--"If checked, then objects in the NGC catalog will be hidden when the map is in "
--"motion."
-+"If checked, then objects in the NGC catalog will be hidden when the map is "
-+"in motion."
- msgstr "勾選此選項的話，在移動天體圖時會隱藏 NGC 物件。"
- 
- #. i18n: file opsadvancedui.ui line 375
-@@ -25508,7 +25544,8 @@
- #: rc.cpp:1196
- #, no-c-format
- msgid ""
--"If checked, then constellation lines will be hidden when the map is in motion."
-+"If checked, then constellation lines will be hidden when the map is in "
-+"motion."
- msgstr "勾選此選項的話，在移動天體圖時會隱藏星座線條。"
- 
- #. i18n: file opsadvancedui.ui line 389
-@@ -25527,7 +25564,8 @@
- #: rc.cpp:1205
- #, no-c-format
- msgid ""
--"If checked, then constellation names will be hidden when the map is in motion."
-+"If checked, then constellation names will be hidden when the map is in "
-+"motion."
- msgstr "勾選此選項的話，在移動天體圖時會隱藏星座名稱。"
- 
- #. i18n: file opscatalogui.ui line 16
-@@ -25554,7 +25592,8 @@
- msgid ""
- "When selected, stars are drawn in the skymap.  Use the other options in this "
- "box to control how many stars are drawn."
--msgstr "勾選此選項的話，會在天體圖上繪製星體。使用其他的選項來控制要畫出多少星體。"
-+msgstr ""
-+"勾選此選項的話，會在天體圖上繪製星體。使用其他的選項來控制要畫出多少星體。"
- 
- #. i18n: file opscatalogui.ui line 69
- #: rc.cpp:1223 rc.cpp:1320
-@@ -25566,8 +25605,8 @@
- #: rc.cpp:1226 rc.cpp:1323
- #, no-c-format
- msgid ""
--"Set the faintest magnitude that will be drawn at the maximum zoom level.  The "
--"faint limit varies smoothly between these two values, as the zoom level "
-+"Set the faintest magnitude that will be drawn at the maximum zoom level.  "
-+"The faint limit varies smoothly between these two values, as the zoom level "
- "changes.\n"
- "\n"
- "Magnitude is a measure of brightness; the larger the number, the fainter the "
-@@ -25575,7 +25614,8 @@
- msgstr ""
- "設定最大放大等級時最暗的星等。這個限制在在放大等級變更時會平順地變化。\n"
- "\n"
--"星等是用來測量亮度的。數值越大，物件就越暗。6.0 等差不多是一般人用肉眼看得到的亮度。"
-+"星等是用來測量亮度的。數值越大，物件就越暗。6.0 等差不多是一般人用肉眼看得到"
-+"的亮度。"
- 
- #. i18n: file opscatalogui.ui line 90
- #: rc.cpp:1234 rc.cpp:1331
-@@ -25593,8 +25633,8 @@
- #: rc.cpp:1243 rc.cpp:1340
- #, no-c-format
- msgid ""
--"Set the faintest magnitude that will be drawn at the minimum zoom level.  The "
--"faint limit varies smoothly between these two values, as the zoom level "
-+"Set the faintest magnitude that will be drawn at the minimum zoom level.  "
-+"The faint limit varies smoothly between these two values, as the zoom level "
- "changes.\n"
- "\n"
- "Magnitude is a measure of brightness; the larger the number, the fainter the "
-@@ -25602,7 +25642,8 @@
- msgstr ""
- "設定最小放大等級時最暗的星等。這個限制在在放大等級變更時會平順地變化。\n"
- "\n"
--"星等是用來測量亮度的。數值越大，物件就越暗。6.0 等差不多是一般人用肉眼看得到的亮度。"
-+"星等是用來測量亮度的。數值越大，物件就越暗。6.0 等差不多是一般人用肉眼看得到"
-+"的亮度。"
- 
- #. i18n: file opscatalogui.ui line 122
- #: rc.cpp:1248 rc.cpp:1345
-@@ -25626,11 +25667,13 @@
- #: rc.cpp:1257
- #, no-c-format
- msgid ""
--"Sets the faintest <b>magnitude</b> for which name and magnitude labels may be "
--"attached to stars.  Magnitude is a measure of brightness; the larger the "
--"number, the fainter the object.  Magnitude 6.0 is about as faint as the unaided "
--"human eye can see."
--msgstr "設定星體可以附加名稱與亮度標籤的最暗亮度星等。星等是用來測量亮度的。數值越大，物件就越暗。6.0 等差不多是一般人用肉眼看得到的亮度。"
-+"Sets the faintest <b>magnitude</b> for which name and magnitude labels may "
-+"be attached to stars.  Magnitude is a measure of brightness; the larger the "
-+"number, the fainter the object.  Magnitude 6.0 is about as faint as the "
-+"unaided human eye can see."
-+msgstr ""
-+"設定星體可以附加名稱與亮度標籤的最暗亮度星等。星等是用來測量亮度的。數值越"
-+"大，物件就越暗。6.0 等差不多是一般人用肉眼看得到的亮度。"
- 
- #. i18n: file opscatalogui.ui line 265
- #: rc.cpp:1263
-@@ -25690,16 +25733,18 @@
- #: rc.cpp:1290
- #, no-c-format
- msgid ""
--"The list of catalogs available, other than the star catalog.  By default, the "
--"list includes the Messier, NGC and IC catalogs.  You can add your own object "
--"catalogs as well."
--msgstr "除了星體星表之外其他可用的星表清單。預設包括梅西爾（Messier），NGC 與 IC 星表。您也可以加入您自己的星表。"
-+"The list of catalogs available, other than the star catalog.  By default, "
-+"the list includes the Messier, NGC and IC catalogs.  You can add your own "
-+"object catalogs as well."
-+msgstr ""
-+"除了星體星表之外其他可用的星表清單。預設包括梅西爾（Messier），NGC 與 IC 星"
-+"表。您也可以加入您自己的星表。"
- 
- #. i18n: file opscatalogui.ui line 376
- #: rc.cpp:1293
- #, no-c-format
- msgid "Import Catalog..."
--msgstr "匯入星表..."
-+msgstr "匯入星表…"
- 
- #. i18n: file opscatalogui.ui line 379
- #: rc.cpp:1296
-@@ -25711,16 +25756,18 @@
- #: rc.cpp:1299
- #, no-c-format
- msgid ""
--"Press this button to create a custom object catalog.  Use this button instead "
--"of \"Load Catalog\", even if you already have a data file.  We will add a "
--"header to your data file to create the catalog."
--msgstr "按此鍵以建立自訂物件星表。請用此鍵而不要用「載入星表」，即使您已經有了資料檔。我們會在您的資料檔中加入標頭以建立星表。"
-+"Press this button to create a custom object catalog.  Use this button "
-+"instead of \"Load Catalog\", even if you already have a data file.  We will "
-+"add a header to your data file to create the catalog."
-+msgstr ""
-+"按此鍵以建立自訂物件星表。請用此鍵而不要用「載入星表」，即使您已經有了資料"
-+"檔。我們會在您的資料檔中加入標頭以建立星表。"
- 
- #. i18n: file opscatalogui.ui line 390
- #: rc.cpp:1302
- #, no-c-format
- msgid "Load Catalog..."
--msgstr "載入星表..."
-+msgstr "載入星表…"
- 
- #. i18n: file opscatalogui.ui line 393
- #: rc.cpp:1305
-@@ -25734,7 +25781,9 @@
- msgid ""
- "Load an existing custom catalog.  Only use this button if you have a catalog "
- "file that was created by KStars (or one that has the proper header)."
--msgstr "載入現有的自訂星表。如果您已經有了由 KStars 建立的星表檔，或是星表檔內容中有正確的標頭，才能使用這個功能。"
-+msgstr ""
-+"載入現有的自訂星表。如果您已經有了由 KStars 建立的星表檔，或是星表檔內容中有"
-+"正確的標頭，才能使用這個功能。"
- 
- #. i18n: file opscatalogui.ui line 407
- #: rc.cpp:1311
-@@ -25755,7 +25804,8 @@
- "Press this button to remove a custom object catalog that you had added "
- "previously.  You cannot remove the Messier, NGC or IC catalogs with this "
- "button."
--msgstr "按此鍵以移除您先前加入的自訂星表。您不能用此按鍵移除梅西爾、NGC 或 IC 星表。"
-+msgstr ""
-+"按此鍵以移除您先前加入的自訂星表。您不能用此按鍵移除梅西爾、NGC 或 IC 星表。"
- 
- #. i18n: file opscolorsui.ui line 16
- #: rc.cpp:1348
-@@ -25780,9 +25830,11 @@
- #, no-c-format
- msgid ""
- "The list of all customizable colors in the program.  Next to each item is a "
--"square showing the color it is currently set to.  Click on any item to change "
--"its color."
--msgstr "此程式中所有可自訂的顏色清單。每個項目都有個小方塊顯示目前設定的顏色。點選該項目以改變顏色。"
-+"square showing the color it is currently set to.  Click on any item to "
-+"change its color."
-+msgstr ""
-+"此程式中所有可自訂的顏色清單。每個項目都有個小方塊顯示目前設定的顏色。點選該"
-+"項目以改變顏色。"
- 
- #. i18n: file opscolorsui.ui line 57
- #: rc.cpp:1360
-@@ -25825,11 +25877,13 @@
- #, no-c-format
- msgid ""
- "There are four ways to draw stars on the map.  By default, stars are circles "
--"with a white core and a rim which is tinted to reflect the star's actual color. "
--" You may also choose to draw the stars as solid white, red, or black circles, "
--"to match the needs of your overall color scheme."
--msgstr ""
--"有四種方法在天體圖上畫星體。預設畫星體的方法是畫一個圓圈，有白色的核心與該星體實際顏色的邊框。您也可以選擇用實心白、紅與黑色的圓圈，以符合您所選擇的顏色機制。"
-+"with a white core and a rim which is tinted to reflect the star's actual "
-+"color.  You may also choose to draw the stars as solid white, red, or black "
-+"circles, to match the needs of your overall color scheme."
-+msgstr ""
-+"有四種方法在天體圖上畫星體。預設畫星體的方法是畫一個圓圈，有白色的核心與該星"
-+"體實際顏色的邊框。您也可以選擇用實心白、紅與黑色的圓圈，以符合您所選擇的顏色"
-+"機制。"
- 
- #. i18n: file opscolorsui.ui line 127
- #: rc.cpp:1381
-@@ -25847,9 +25901,12 @@
- #: rc.cpp:1387
- #, no-c-format
- msgid ""
--"When using the realistic-color star mode, this option will set the saturation "
--"level of the star's colors.  A higher value means more intense colors."
--msgstr "使用實際彩色星體模式時，這個選項會設定星體顏色的飽和度。數值越高表示顏色越明亮。"
-+"When using the realistic-color star mode, this option will set the "
-+"saturation level of the star's colors.  A higher value means more intense "
-+"colors."
-+msgstr ""
-+"使用實際彩色星體模式時，這個選項會設定星體顏色的飽和度。數值越高表示顏色越明"
-+"亮。"
- 
- #. i18n: file opscolorsui.ui line 153
- #: rc.cpp:1390
-@@ -25867,8 +25924,8 @@
- #: rc.cpp:1396
- #, no-c-format
- msgid ""
--"List of all known color schemes.  Several are provided by default, and you may "
--"also define your own."
-+"List of all known color schemes.  Several are provided by default, and you "
-+"may also define your own."
- msgstr "列出所有的顏色機制。有一些是預設提供的，您也可以定義您自己的。"
- 
- #. i18n: file opscolorsui.ui line 200
-@@ -25887,15 +25944,15 @@
- #: rc.cpp:1405
- #, no-c-format
- msgid ""
--"Press this button to remove the highlighted color scheme.  This will only work "
--"on your custom color schemes."
-+"Press this button to remove the highlighted color scheme.  This will only "
-+"work on your custom color schemes."
- msgstr "按此鍵以移除所選取的顏色機制。這只能用於您自己定義的顏色機制。"
- 
- #. i18n: file opscolorsui.ui line 265
- #: rc.cpp:1408
- #, no-c-format
- msgid "Save Current Colors..."
--msgstr "儲存目前的顏色..."
-+msgstr "儲存目前的顏色…"
- 
- #. i18n: file opscolorsui.ui line 268
- #: rc.cpp:1411
-@@ -25911,7 +25968,9 @@
- "create a new scheme using those colors.  Your scheme will appear here in the "
- "list of presets, and will also be available in the \"Settings\" menu of the "
- "main window."
--msgstr "改變了一些顏色後，您可以用此按鍵來將目前的顏色儲存為新的顏色機制。儲存後您可以在此清單中看到，或是在「設定」選單中也可以看到。"
-+msgstr ""
-+"改變了一些顏色後，您可以用此按鍵來將目前的顏色儲存為新的顏色機制。儲存後您可"
-+"以在此清單中看到，或是在「設定」選單中也可以看到。"
- 
- #. i18n: file opsguidesui.ui line 16
- #: rc.cpp:1417
-@@ -26020,8 +26079,8 @@
- #: rc.cpp:1468
- #, no-c-format
- msgid ""
--"Select this to use abbreviations from the International Astronomical Union as "
--"constellation labels"
-+"Select this to use abbreviations from the International Astronomical Union "
-+"as constellation labels"
- msgstr "使用國際天文學協會（International Astronomical Union，IAU）定義的縮寫"
- 
- #. i18n: file opsguidesui.ui line 135
-@@ -26079,9 +26138,11 @@
- #: rc.cpp:1495
- #, no-c-format
- msgid ""
--"If checked, a grid of lines will be drawn every 2 hours in Right Ascension and "
--"every 20 degrees in Declination."
--msgstr "勾選此選項的話，會畫出座標格。赤經每兩小時畫一條線，赤緯則是每 20 度畫一條線。"
-+"If checked, a grid of lines will be drawn every 2 hours in Right Ascension "
-+"and every 20 degrees in Declination."
-+msgstr ""
-+"勾選此選項的話，會畫出座標格。赤經每兩小時畫一條線，赤緯則是每 20 度畫一條"
-+"線。"
- 
- #. i18n: file opsguidesui.ui line 194
- #: rc.cpp:1498
-@@ -26111,10 +26172,12 @@
- #: rc.cpp:1513
- #, no-c-format
- msgid ""
--"If checked, the ecliptic will be drawn on the sky map.  The ecliptic is a great "
--"circle on the sky that the Sun appears to follow over the course of one year.  "
--"All other solar system bodies roughly follow the ecliptic as well."
--msgstr "勾選此選項的話，會畫出黃道。黃道是天空中的一個大圓圈，太陽每年都會遵循該路線。其他太陽系的星體也會大略遵循此路線。"
-+"If checked, the ecliptic will be drawn on the sky map.  The ecliptic is a "
-+"great circle on the sky that the Sun appears to follow over the course of "
-+"one year.  All other solar system bodies roughly follow the ecliptic as well."
-+msgstr ""
-+"勾選此選項的話，會畫出黃道。黃道是天空中的一個大圓圈，太陽每年都會遵循該路"
-+"線。其他太陽系的星體也會大略遵循此路線。"
- 
- #. i18n: file opsguidesui.ui line 222
- #: rc.cpp:1516
-@@ -26154,7 +26217,9 @@
- "If checked, the area below the horizon will be filled in, to simulate the "
- "ground beneath you.  Note that the ground is never drawn when using the "
- "Equatorial coordinate system."
--msgstr "勾選的話，在水平面下的區域將被填滿，以模擬地面。注意如果使用赤道座標系統的話，則不會畫出地面。"
-+msgstr ""
-+"勾選的話，在水平面下的區域將被填滿，以模擬地面。注意如果使用赤道座標系統的"
-+"話，則不會畫出地面。"
- 
- #. i18n: file opssolarsystemui.ui line 16
- #: rc.cpp:1534
-@@ -26443,10 +26508,11 @@
- #, no-c-format
- msgid ""
- "Set the maximum distance from the Sun for a comet to have a name label, in "
--"Astronomical Units (AU).  1 AU is the distance between the Earth and the Sun, "
--"approximately 150 million km"
-+"Astronomical Units (AU).  1 AU is the distance between the Earth and the "
-+"Sun, approximately 150 million km"
- msgstr ""
--"設定慧星要貼上名稱標籤，離太陽的最大距離，以天文單位（Astronomical Units，AU）為單位。1 AU 是地球與太陽間的距離，約一億五千萬公里。"
-+"設定慧星要貼上名稱標籤，離太陽的最大距離，以天文單位（Astronomical Units，"
-+"AU）為單位。1 AU 是地球與太陽間的距離，約一億五千萬公里。"
- 
- #. i18n: file opssolarsystemui.ui line 399
- #: rc.cpp:1714
-@@ -26467,7 +26533,9 @@
- "If checked, the comets near the Sun will have name labels attached.  Comets "
- "vary in brightness in their orbits, so a faint magnitude is not effective in "
- "this case."
--msgstr "勾選此選項的話，接近太陽的慧星會附加上名稱標籤。因為慧星的亮度會依軌道位置而不同，所以亮度（星等）在此不適用。"
-+msgstr ""
-+"勾選此選項的話，接近太陽的慧星會附加上名稱標籤。因為慧星的亮度會依軌道位置而"
-+"不同，所以亮度（星等）在此不適用。"
- 
- #. i18n: file opssolarsystemui.ui line 416
- #: rc.cpp:1723
-@@ -26535,8 +26603,8 @@
- #: rc.cpp:1753
- #, no-c-format
- msgid ""
--"If checked, the color of the planet trail will be blended into the background "
--"sky color."
-+"If checked, the color of the planet trail will be blended into the "
-+"background sky color."
- msgstr "勾選此選項的話，行星軌跡會淡出為背景顏色。"
- 
- #. i18n: file opssolarsystemui.ui line 507
-@@ -26555,8 +26623,8 @@
- #: rc.cpp:1762
- #, no-c-format
- msgid ""
--"Press this to clear all orbit trails that you may have attached to solar system "
--"bodies using the right-click popup menu."
-+"Press this to clear all orbit trails that you may have attached to solar "
-+"system bodies using the right-click popup menu."
- msgstr "按下此鍵可以清除所有的軌跡。"
- 
- #. i18n: file statform.ui line 27
-@@ -26690,25 +26758,23 @@
- #, no-c-format
- msgid ""
- "Welcome to the <b>KStars Telescope Setup Wizard!</b>\n"
--"<br>"
--"<br>\n"
-+"<br><br>\n"
- "This Wizard will help you to connect to your telescope and control it from "
- "KStars. You will be asked to verify some basic information.\n"
- "<br>\n"
--"<br>You can get extended information on telescope support in KStars by pressing "
--"the <tt>help</tt> button at any point during the Wizard.\n"
--"<br>"
--"<br>\n"
-+"<br>You can get extended information on telescope support in KStars by "
-+"pressing the <tt>help</tt> button at any point during the Wizard.\n"
-+"<br><br>\n"
- "Please click next to continue."
- msgstr ""
- "歡迎來到<b>KStars 望遠鏡設定精靈</b>！\n"
--"<br>"
--"<br>\n"
--"這個精靈能協助您連接到您的望遠鏡，並從 KStars 控制。您會被詢問一些基本的資訊。\n"
--"<br>\n"
--"<br>在使用此精靈期間，您隨時可以點選「說明」鍵以取得更多關於 KStars 支援望遠鏡功能的資訊。\n"
--"<br>"
-+"<br><br>\n"
-+"這個精靈能協助您連接到您的望遠鏡，並從 KStars 控制。您會被詢問一些基本的資"
-+"訊。\n"
- "<br>\n"
-+"<br>在使用此精靈期間，您隨時可以點選「說明」鍵以取得更多關於 KStars 支援望遠"
-+"鏡功能的資訊。\n"
-+"<br><br>\n"
- "請點選「下一步」以繼續。"
- 
- #. i18n: file telescopewizard.ui line 168
-@@ -26729,11 +26795,12 @@
- #, no-c-format
- msgid ""
- "<b>Tip</b>\n"
--"<br>Some non-Meade telescopes support a subset of the LX200 command set. Select "
--"<tt>LX200 Generic</tt> to control such devices."
-+"<br>Some non-Meade telescopes support a subset of the LX200 command set. "
-+"Select <tt>LX200 Generic</tt> to control such devices."
- msgstr ""
- "<b>提示</b>\n"
--"<br>有些非 Meade 牌的望遠鏡會支援 LX200 命令集。請選擇 <tt>一般的 LX200</tt> 來控制這些裝置。"
-+"<br>有些非 Meade 牌的望遠鏡會支援 LX200 命令集。請選擇 <tt>一般的 LX200</tt> "
-+"來控制這些裝置。"
- 
- #. i18n: file telescopewizard.ui line 280
- #: rc.cpp:1876
-@@ -26743,23 +26810,18 @@
- "\n"
- "You need to align your telescope before you can control it properly from "
- "KStars. Please refer to your telescope manual for alignment instructions.\n"
--"<br>"
--"<br>\n"
--"After a successful alignment, connect your telescope's RS232 interface to your "
--"computer's serial or USB port.\n"
--"<br>"
--"<br>"
--"<br>Click next to continue."
-+"<br><br>\n"
-+"After a successful alignment, connect your telescope's RS232 interface to "
-+"your computer's serial or USB port.\n"
-+"<br><br><br>Click next to continue."
- msgstr ""
- "<h3>2. 調整（Align）您的望遠鏡</h3>\n"
- "\n"
--"在從 KStars 控制您的望遠鏡之前，您必須先調整（Align）好。請參考您的望遠鏡手冊以取得說明。\n"
--"<br>"
--"<br>\n"
-+"在從 KStars 控制您的望遠鏡之前，您必須先調整（Align）好。請參考您的望遠鏡手冊"
-+"以取得說明。\n"
-+"<br><br>\n"
- "排列好之後，請將望遠鏡的 RS232 介面連接到您的電腦的 RS232 或 USB 埠。\n"
--"<br>"
--"<br>"
--"<br> 點選「下一步」以繼續。"
-+"<br><br><br> 點選「下一步」以繼續。"
- 
- #. i18n: file telescopewizard.ui line 307
- #: rc.cpp:1884
-@@ -26767,13 +26829,14 @@
- msgid ""
- "<h3>3. Verify Local Settings</h3>\n"
- "\n"
--"Verify if the following time, date, and location settings are correct. If any "
--"of the settings are incorrect, you can correct them via the <tt>Set time</tt> "
--"and <tt>Set Location</tt> buttons.\n"
-+"Verify if the following time, date, and location settings are correct. If "
-+"any of the settings are incorrect, you can correct them via the <tt>Set "
-+"time</tt> and <tt>Set Location</tt> buttons.\n"
- msgstr ""
- "<h3>3. 檢驗本地端設定</h3>\n"
- "\n"
--"檢查底下的時間、日期與位置設定是否正確。如果有不正確的，請用「設定時間」、「設定位置」等按鍵來修正。\n"
-+"檢查底下的時間、日期與位置設定是否正確。如果有不正確的，請用「設定時間」、"
-+"「設定位置」等按鍵來修正。\n"
- 
- #. i18n: file telescopewizard.ui line 367
- #: rc.cpp:1890
-@@ -26797,13 +26860,13 @@
- #: rc.cpp:1899
- #, no-c-format
- msgid "Set Time..."
--msgstr "設定時間..."
-+msgstr "設定時間…"
- 
- #. i18n: file telescopewizard.ui line 472
- #: rc.cpp:1902
- #, no-c-format
- msgid "Set Location..."
--msgstr "設定位置..."
-+msgstr "設定位置…"
- 
- #. i18n: file telescopewizard.ui line 525
- #: rc.cpp:1905
-@@ -26813,16 +26876,16 @@
- "\n"
- "Enter the port number your telescope is connected to. If you only have one "
- "serial port in your computer, the port is usually <tt>/dev/ttyS0</tt>\n"
--"<br>"
--"<br>If you are unsure about the port number, you can leave the field empty and "
--"KStars will try to scan the ports for attached telescopes. Beware that the "
--"autoscan process might take a few minutes to complete. "
-+"<br><br>If you are unsure about the port number, you can leave the field "
-+"empty and KStars will try to scan the ports for attached telescopes. Beware "
-+"that the autoscan process might take a few minutes to complete. "
- msgstr ""
- "<h3>4. 決定連接埠</h3>\n"
- "\n"
--"輸入您的望遠鏡的連接埠。如果您的電腦只有一個序列埠，通常會是 <tt>/dev/ttyS0</tt>\n"
--"<br>"
--"<br> 如果您不確定，您可以將此欄位空白，KStars 會試著掃描連接望遠鏡的連接埠。自動掃描可能要花一點時間才能完成。"
-+"輸入您的望遠鏡的連接埠。如果您的電腦只有一個序列埠，通常會是 <tt>/dev/ttyS0</"
-+"tt>\n"
-+"<br><br> 如果您不確定，您可以將此欄位空白，KStars 會試著掃描連接望遠鏡的連接"
-+"埠。自動掃描可能要花一點時間才能完成。"
- 
- #. i18n: file telescopewizard.ui line 561
- #: rc.cpp:1911
-@@ -26882,7 +26945,7 @@
- #: rc.cpp:1938
- #, no-c-format
- msgid "Edit Ima&ge..."
--msgstr "編輯影像(&G)..."
-+msgstr "編輯影像(&G)…"
- 
- #. i18n: file thumbnailpickerui.ui line 258
- #: rc.cpp:1941
-@@ -26927,24 +26990,26 @@
- "There are two ways to use this field:  \n"
- "\n"
- "1. Simply type the name of a known object and press the \"Plot\" button (or "
--"press Enter).  The object's Altitude vs. Time curve will be added to the plot, "
--"and its coordinates will be displayed below.\n"
-+"press Enter).  The object's Altitude vs. Time curve will be added to the "
-+"plot, and its coordinates will be displayed below.\n"
- "\n"
--"2. Type a name label for a custom object.  You will also need to specify the RA "
--"and Dec coordinates of the object, and then press the \"Plot\" button to add "
--"its curve to the plot."
-+"2. Type a name label for a custom object.  You will also need to specify the "
-+"RA and Dec coordinates of the object, and then press the \"Plot\" button to "
-+"add its curve to the plot."
- msgstr ""
- "有兩種方式使用此欄位：\n"
- "\n"
--"1. 只要輸入已知的物件名稱，並按下「繪製」鍵（或按 Enter）。物件的高度仰角vs時間的曲線會加入圖中，並在底下顯示它的座標。\n"
-+"1. 只要輸入已知的物件名稱，並按下「繪製」鍵（或按 Enter）。物件的高度仰角vs時"
-+"間的曲線會加入圖中，並在底下顯示它的座標。\n"
- "\n"
--"2. 輸入自訂物件的名稱標籤。您也需要指定物件的赤經與赤緯座標，並按下「繪製」鍵。"
-+"2. 輸入自訂物件的名稱標籤。您也需要指定物件的赤經與赤緯座標，並按下「繪製」"
-+"鍵。"
- 
- #. i18n: file tools/altvstimeui.ui line 200
- #: rc.cpp:1972
- #, no-c-format
- msgid "Find Object..."
--msgstr "尋找物件..."
-+msgstr "尋找物件…"
- 
- #. i18n: file tools/altvstimeui.ui line 216
- #: rc.cpp:1975
-@@ -26976,7 +27041,7 @@
- #: rc.cpp:1990
- #, no-c-format
- msgid "Choose City..."
--msgstr "選擇城市..."
-+msgstr "選擇城市…"
- 
- #. i18n: file tools/altvstimeui.ui line 361
- #: rc.cpp:1993 rc.cpp:2758
-@@ -27008,7 +27073,9 @@
- msgid ""
- "Select an option from this list to set its value.  You may also select the "
- "option using an organized Tree List using the \"Browse Tree\" button."
--msgstr "從此清單中選擇一個選項並設定值。您也可以用「瀏覽樹狀列表」從樹狀列表中選取選項。"
-+msgstr ""
-+"從此清單中選擇一個選項並設定值。您也可以用「瀏覽樹狀列表」從樹狀列表中選取選"
-+"項。"
- 
- #. i18n: file tools/argchangeviewoption.ui line 60
- #: rc.cpp:2008
-@@ -27032,10 +27099,12 @@
- #: rc.cpp:2017
- #, no-c-format
- msgid ""
--"Press this button to select a View Option from a Tree list, in which they are "
--"grouped by subject.  Also shown are a short description of each option, and the "
--"data type of the option's value (string, integer, float or boolean)."
--msgstr "按下此鍵以從樹狀列表中選取檢視選項。樹狀列表依主題將選項群組起來，也顯示每個選項的簡短描述，資料型態等等。"
-+"Press this button to select a View Option from a Tree list, in which they "
-+"are grouped by subject.  Also shown are a short description of each option, "
-+"and the data type of the option's value (string, integer, float or boolean)."
-+msgstr ""
-+"按下此鍵以從樹狀列表中選取檢視選項。樹狀列表依主題將選項群組起來，也顯示每個"
-+"選項的簡短描述，資料型態等等。"
- 
- #. i18n: file tools/argchangeviewoption.ui line 82
- #: rc.cpp:2020
-@@ -27047,14 +27116,15 @@
- #: rc.cpp:2023
- #, no-c-format
- msgid ""
--"Set the value for the selected view option here.  Make sure the value you enter "
--"matches the data type expected by the option.  For example, the \"UseAltAz\" "
--"option expects a boolean value, so you should enter \"true\", \"false\", \"1\", "
--"or \"0\".  If you are unsure what data type is expected, examine the Tree View "
--"of options using the \"Browse Tree\" button."
--msgstr ""
--"在此設定選取檢視選項的值。請確定您輸入的值符合該選項的資料型態。例如，\"UseAltAz\" "
--"選項需要的是布林值，您可以輸入\"true\"，\"false\"，\"1\"或\"0\"。如果不確定資料型態為何，請用「瀏覽樹狀列表」來檢視選項。"
-+"Set the value for the selected view option here.  Make sure the value you "
-+"enter matches the data type expected by the option.  For example, the "
-+"\"UseAltAz\" option expects a boolean value, so you should enter \"true\", "
-+"\"false\", \"1\", or \"0\".  If you are unsure what data type is expected, "
-+"examine the Tree View of options using the \"Browse Tree\" button."
-+msgstr ""
-+"在此設定選取檢視選項的值。請確定您輸入的值符合該選項的資料型態。例如，"
-+"\"UseAltAz\" 選項需要的是布林值，您可以輸入\"true\"，\"false\"，\"1\"或\"0"
-+"\"。如果不確定資料型態為何，請用「瀏覽樹狀列表」來檢視選項。"
- 
- #. i18n: file tools/argchangeviewoption.ui line 110
- #: rc.cpp:2026
-@@ -27138,7 +27208,7 @@
- #: rc.cpp:2065
- #, no-c-format
- msgid "zenith"
--msgstr "天頂 (&Z)"
-+msgstr "天頂(&Z)"
- 
- #. i18n: file tools/arglooktoward.ui line 93
- #: rc.cpp:2068
-@@ -27151,11 +27221,13 @@
- #, no-c-format
- msgid ""
- "Select a direction or object to center on.  The combo box provides a list of "
--"known directions including cardinal compass points on the horizon, as well as "
--"the Zenith.  You may also enter the name of a known object here, or select an "
--"object from the list of known objects by pressing the \"Object\" button."
-+"known directions including cardinal compass points on the horizon, as well "
-+"as the Zenith.  You may also enter the name of a known object here, or "
-+"select an object from the list of known objects by pressing the \"Object\" "
-+"button."
- msgstr ""
--"選擇要置中的方向或物件。此下拉式選單提供了方向的清單，包括羅盤上的水平方位點，還有天頂等等。您也可以輸入物件的名稱，或按下「物件」鈕從清單中選取物件。"
-+"選擇要置中的方向或物件。此下拉式選單提供了方向的清單，包括羅盤上的水平方位"
-+"點，還有天頂等等。您也可以輸入物件的名稱，或按下「物件」鈕從清單中選取物件。"
- 
- #. i18n: file tools/arglooktoward.ui line 109
- #: rc.cpp:2074 rc.cpp:2259
-@@ -27174,9 +27246,11 @@
- #, no-c-format
- msgid ""
- "Opens the Find Object dialog, which allows you to select an object from the "
--"list of known objects.  When an object has been selected, its name will appear "
--"in the \"dir\" box at left."
--msgstr "開啟尋找物件對話框，讓您可以從清單中選取物件。選取物件之後，它的名稱會顯示在左方「方向」盒中。"
-+"list of known objects.  When an object has been selected, its name will "
-+"appear in the \"dir\" box at left."
-+msgstr ""
-+"開啟尋找物件對話框，讓您可以從清單中選取物件。選取物件之後，它的名稱會顯示在"
-+"左方「方向」盒中。"
- 
- #. i18n: file tools/argprintimage.ui line 24
- #: rc.cpp:2083
-@@ -27212,22 +27286,24 @@
- #: rc.cpp:2101
- #, no-c-format
- msgid ""
--"Set the Altitude coordinate to be focused on in the sky map, in degrees.  You "
--"can express the angle as a simple integer (\"45\") or floating-point "
--"(\"45.333\") value, or as space- or colon-delimited values specifying degrees, "
--"arcminutes and arcseconds (\"45:20\", \"45:20:00\", \"45:20\", \"45 20.0\", "
--"etc.).\n"
-+"Set the Altitude coordinate to be focused on in the sky map, in degrees.  "
-+"You can express the angle as a simple integer (\"45\") or floating-point "
-+"(\"45.333\") value, or as space- or colon-delimited values specifying "
-+"degrees, arcminutes and arcseconds (\"45:20\", \"45:20:00\", \"45:20\", \"45 "
-+"20.0\", etc.).\n"
- "\n"
--"The Altitude is one of the coordinates in the Horizontal coordinate system.  It "
--"is defined as the angle of an object above or below the horizon.  For example, "
--"the Zenith has an Altitude of 90 degrees.  Altitude is also known as Elevation."
--msgstr ""
--"設定在天體圖中聚焦的高度仰角座標，以度為單位。角度可以為一個簡單整數（如 \"45\"）或浮點數（如 "
--"\"45.333\"），或者是以空白或冒號隔開的度、弧分（arcminute）與弧秒（arcsecond）值（如 "
--"\"45:20\"，\"45:20:00\"，\"45 20.0\"等）。\n"
-+"The Altitude is one of the coordinates in the Horizontal coordinate system.  "
-+"It is defined as the angle of an object above or below the horizon.  For "
-+"example, the Zenith has an Altitude of 90 degrees.  Altitude is also known "
-+"as Elevation."
-+msgstr ""
-+"設定在天體圖中聚焦的高度仰角座標，以度為單位。角度可以為一個簡單整數（如 \"45"
-+"\"）或浮點數（如 \"45.333\"），或者是以空白或冒號隔開的度、弧分（arcminute）"
-+"與弧秒（arcsecond）值（如 \"45:20\"，\"45:20:00\"，\"45 20.0\"等）。\n"
- "\n"
--"高度仰角（Altitude）是水平座標系統裡的一種。它的定義是物件在水平上方或下方的角度。例如，天頂（Zenith）就是高度仰角 90 "
--"度。高度仰角（Altitude）英文也有人使用 Elevation。"
-+"高度仰角（Altitude）是水平座標系統裡的一種。它的定義是物件在水平上方或下方的"
-+"角度。例如，天頂（Zenith）就是高度仰角 90 度。高度仰角（Altitude）英文也有人"
-+"使用 Elevation。"
- 
- #. i18n: file tools/argsetaltaz.ui line 56
- #: rc.cpp:2106
-@@ -27245,21 +27321,23 @@
- #: rc.cpp:2112
- #, no-c-format
- msgid ""
--"Set the Azimuth coordinate to be focused on in the skymap, in degrees.  You can "
--"express the angle as a simple integer (\"45\") or floating-point (\"45.333\") "
--"value, or as space- or colon-delimited values specifying degrees, arcminutes "
--"and arcseconds (\"45:20\", \"45:20:00\", \"45:20\", \"45 20.0\", etc.).\n"
-+"Set the Azimuth coordinate to be focused on in the skymap, in degrees.  You "
-+"can express the angle as a simple integer (\"45\") or floating-point "
-+"(\"45.333\") value, or as space- or colon-delimited values specifying "
-+"degrees, arcminutes and arcseconds (\"45:20\", \"45:20:00\", \"45:20\", \"45 "
-+"20.0\", etc.).\n"
- "\n"
--"The azimuth is one of the coordinates in the horizontal coordinate system.  It "
--"is defined as the angle measured along the horizon, between the North point and "
--"the point on the horizon directly below the object.  Azimuth increases "
--"clockwise around the horizon"
--msgstr ""
--"設定在天體圖中聚焦的方位座標，以度為單位。角度可以為一個簡單整數（如 \"45\"）或浮點數（如 "
--"\"45.333\"），或者是以空白或冒號隔開的度、弧分（arcminute）與弧秒（arcsecond）值（如 "
--"\"45:20\"，\"45:20:00\"，\"45 20.0\"等）。\n"
-+"The azimuth is one of the coordinates in the horizontal coordinate system.  "
-+"It is defined as the angle measured along the horizon, between the North "
-+"point and the point on the horizon directly below the object.  Azimuth "
-+"increases clockwise around the horizon"
-+msgstr ""
-+"設定在天體圖中聚焦的方位座標，以度為單位。角度可以為一個簡單整數（如 \"45\"）"
-+"或浮點數（如 \"45.333\"），或者是以空白或冒號隔開的度、弧分（arcminute）與弧"
-+"秒（arcsecond）值（如 \"45:20\"，\"45:20:00\"，\"45 20.0\"等）。\n"
- "\n"
--"方位（Azimuth）是水平座標系統裡的一種。它的定義是物件在水平線上，在指北點與物件正下方間所形成的角度。方位度數在水平線上依順時針方向增加。"
-+"方位（Azimuth）是水平座標系統裡的一種。它的定義是物件在水平線上，在指北點與物"
-+"件正下方間所形成的角度。方位度數在水平線上依順時針方向增加。"
- 
- #. i18n: file tools/argsetaltaz.ui line 88
- #: rc.cpp:2117
-@@ -27319,9 +27397,9 @@
- #: rc.cpp:2165
- #, no-c-format
- msgid ""
--"Enter the Country name for the desired location.  It might be easier to use the "
--"\"Find City\" location to choose your location from the list of predefined "
--"cities."
-+"Enter the Country name for the desired location.  It might be easier to use "
-+"the \"Find City\" location to choose your location from the list of "
-+"predefined cities."
- msgstr "輸入所要位置的國家名稱。您也可以用「尋找城市」從底下的城市清單中選取。"
- 
- #. i18n: file tools/argsetgeolocation.ui line 83
-@@ -27350,9 +27428,10 @@
- #, no-c-format
- msgid ""
- "Enter the Province name for the desired location.  It might be easier to use "
--"the \"Find City\" location to choose your location from the list of predefined "
--"cities."
--msgstr "輸入所要位置的省份/州名稱。您也可以用「尋找城市」從底下的城市清單中選取。"
-+"the \"Find City\" location to choose your location from the list of "
-+"predefined cities."
-+msgstr ""
-+"輸入所要位置的省份/州名稱。您也可以用「尋找城市」從底下的城市清單中選取。"
- 
- #. i18n: file tools/argsetgeolocation.ui line 132
- #: rc.cpp:2186
-@@ -27374,7 +27453,9 @@
- "choose a location from our list of over 2500 cities around the word.  Once a "
- "location has been selected, the City, Province and Country fields will be "
- "filled in."
--msgstr "按此鍵開啟「設定位置」對話框，讓您從我們超過兩千五百個城市的清單中選取位置。選定位置之後，會自動填入城市、省份與國家等欄位。"
-+msgstr ""
-+"按此鍵開啟「設定位置」對話框，讓您從我們超過兩千五百個城市的清單中選取位置。"
-+"選定位置之後，會自動填入城市、省份與國家等欄位。"
- 
- #. i18n: file tools/argsetgeolocationindi.ui line 48
- #: rc.cpp:2198
-@@ -27398,46 +27479,50 @@
- #: rc.cpp:2219
- #, no-c-format
- msgid ""
--"Enter the Declination coordinate to be focused on in the skymap, in degrees.  "
--"You can express the angle as a simple integer (\"45\") or floating-point "
--"(\"45.333\") value, or as space- or colon-delimited values specifying degrees, "
--"arcminutes and arcseconds (\"45:20\", \"45:20:00\", \"45:20\", \"45 20.0\", "
--"etc.).\n"
-+"Enter the Declination coordinate to be focused on in the skymap, in "
-+"degrees.  You can express the angle as a simple integer (\"45\") or floating-"
-+"point (\"45.333\") value, or as space- or colon-delimited values specifying "
-+"degrees, arcminutes and arcseconds (\"45:20\", \"45:20:00\", \"45:20\", \"45 "
-+"20.0\", etc.).\n"
- "\n"
--"Declination is one of the coordinates in the Equatorial coordinate system; it "
--"measures the angle of an object North or South of the Celestial Equator.  The "
--"star Polaris, which is near the celestial north pole, has a Declination of "
--"nearly 90 degrees."
--msgstr ""
--"設定在天體圖中聚焦的赤緯座標，以度為單位。角度可以為一個簡單整數（如 \"45\"）或浮點數（如 "
--"\"45.333\"），或者是以空白或冒號隔開的度、弧分（arcminute）與弧秒（arcsecond）值（如 "
--"\"45:20\"，\"45:20:00\"，\"45 20.0\"等）。\n"
-+"Declination is one of the coordinates in the Equatorial coordinate system; "
-+"it measures the angle of an object North or South of the Celestial Equator.  "
-+"The star Polaris, which is near the celestial north pole, has a Declination "
-+"of nearly 90 degrees."
-+msgstr ""
-+"設定在天體圖中聚焦的赤緯座標，以度為單位。角度可以為一個簡單整數（如 \"45\"）"
-+"或浮點數（如 \"45.333\"），或者是以空白或冒號隔開的度、弧分（arcminute）與弧"
-+"秒（arcsecond）值（如 \"45:20\"，\"45:20:00\"，\"45 20.0\"等）。\n"
- "\n"
--"赤緯（Declination）是赤道座標系統中的一種。它測量物件在天體赤道（Celestial Equator）為基準的度數。以北為北赤緯（以 + "
--"表示），以南為南赤緯（以 - 表示）。北極星（Polaris）位在靠近天體北極之處，其赤緯接近 90 度。"
-+"赤緯（Declination）是赤道座標系統中的一種。它測量物件在天體赤道（Celestial "
-+"Equator）為基準的度數。以北為北赤緯（以 + 表示），以南為南赤緯（以 - 表示）。"
-+"北極星（Polaris）位在靠近天體北極之處，其赤緯接近 90 度。"
- 
- #. i18n: file tools/argsetradec.ui line 80
- #: rc.cpp:2230
- #, no-c-format
- msgid ""
--"Enter the Right Ascension coordinate to be focused on in the skymap, in hours.  "
--"You can express the angle as a simple integer (\"12\") or floating-point "
--"(\"12.333\") value, or as space- or colon-delimited values specifying hours, "
--"minutes and seconds (\"12:20\", \"12:20:00\", \"12:20\", \"12 20.0\", etc.).\n"
-+"Enter the Right Ascension coordinate to be focused on in the skymap, in "
-+"hours.  You can express the angle as a simple integer (\"12\") or floating-"
-+"point (\"12.333\") value, or as space- or colon-delimited values specifying "
-+"hours, minutes and seconds (\"12:20\", \"12:20:00\", \"12:20\", \"12 20.0\", "
-+"etc.).\n"
- "\n"
--"Right Ascension is one of the coordinates in the Equatorial coordinate system.  "
--"It measures the angle around the celestial equator from the Vernal equinox, "
--"increasing to the East.  Right Ascension (RA) is almost always expressed in "
--"Hours instead of Degrees; the Celestial Equator is divided into 24 Hours, so 1 "
--"Hour of RA is equal to 360/24=15 Degrees.  See the AstroInfo article for more "
--"details,"
--msgstr ""
--"設定在天體圖中聚焦的赤經座標，以小時為單位。角度可以為一個簡單整數（如 \"12\"）或浮點數（如 "
--"\"12.333\"），或者是以空白或冒號隔開的度、分（minute）與秒（second）值（如 \"12:20\"，\"12:20:00\"，\"12 "
--"20.0\"等）。\n"
-+"Right Ascension is one of the coordinates in the Equatorial coordinate "
-+"system.  It measures the angle around the celestial equator from the Vernal "
-+"equinox, increasing to the East.  Right Ascension (RA) is almost always "
-+"expressed in Hours instead of Degrees; the Celestial Equator is divided into "
-+"24 Hours, so 1 Hour of RA is equal to 360/24=15 Degrees.  See the AstroInfo "
-+"article for more details,"
-+msgstr ""
-+"設定在天體圖中聚焦的赤經座標，以小時為單位。角度可以為一個簡單整數（如 \"12"
-+"\"）或浮點數（如 \"12.333\"），或者是以空白或冒號隔開的度、分（minute）與秒"
-+"（second）值（如 \"12:20\"，\"12:20:00\"，\"12 20.0\"等）。\n"
- "\n"
--"赤經（Right Ascension，RA）是赤道座標系統中的一種。它的度數沿著天體赤道（Celestial Equator）由春分點（Vernal "
--"equinox）起算，往東遞增。赤經通常都以小時而不是以度來表示。天體赤道被分為廿四小時，赤經一小時等於 360/24 = 15 度。詳情請參考天體資訊文章。"
-+"赤經（Right Ascension，RA）是赤道座標系統中的一種。它的度數沿著天體赤道"
-+"（Celestial Equator）由春分點（Vernal equinox）起算，往東遞增。赤經通常都以小"
-+"時而不是以度來表示。天體赤道被分為廿四小時，赤經一小時等於 360/24 = 15 度。詳"
-+"情請參考天體資訊文章。"
- 
- #. i18n: file tools/argsettargetnameindi.ui line 48
- #: rc.cpp:2256
-@@ -27462,16 +27547,19 @@
- #, no-c-format
- msgid ""
- "If checked, the sky will remain focused on its current position or object as "
--"time passes.  This is called \"Tracking\".  Note that tracking is automatically "
--"engaged whenever an object is centered at the focus point.  So, if you use "
--"\"lookToward\" with an object name, you do not need to engage tracking.  \n"
-+"time passes.  This is called \"Tracking\".  Note that tracking is "
-+"automatically engaged whenever an object is centered at the focus point.  "
-+"So, if you use \"lookToward\" with an object name, you do not need to engage "
-+"tracking.  \n"
- "\n"
- "If unchecked, then Tracking will be forced off, even if an object has been "
- "centered,  As time passes, the sky will then appear to drift by (due to the "
- "rotation of the Earth)."
- msgstr ""
--"勾選此選項的話，不管時間過多久天體仍然會聚焦在同樣的物體會位置上。這稱為「追蹤」（Tracking）。注意當您置中某物件時，就會自動追蹤。\n"
--"取消勾選的話，則不會強迫追蹤。即使將物件置中，天體也會自動依地球的旋轉而繼續運轉。"
-+"勾選此選項的話，不管時間過多久天體仍然會聚焦在同樣的物體會位置上。這稱為「追"
-+"蹤」（Tracking）。注意當您置中某物件時，就會自動追蹤。\n"
-+"取消勾選的話，則不會強迫追蹤。即使將物件置中，天體也會自動依地球的旋轉而繼續"
-+"運轉。"
- 
- #. i18n: file tools/argsetutcindi.ui line 48
- #: rc.cpp:2282
-@@ -27501,8 +27589,8 @@
- #: rc.cpp:2330
- #, no-c-format
- msgid ""
--"Enter the number of seconds that the script should pause before executing the "
--"remaining commands."
-+"Enter the number of seconds that the script should pause before executing "
-+"the remaining commands."
- msgstr "輸入文稿要暫停的時間。"
- 
- #. i18n: file tools/argwaitforkey.ui line 32
-@@ -27521,16 +27609,17 @@
- #: rc.cpp:2339
- #, no-c-format
- msgid ""
--"The script execution will pause until the user presses the key specified here.  "
--"\n"
-+"The script execution will pause until the user presses the key specified "
-+"here.  \n"
- "\n"
- "Only simple keys can currently be used; you cannot use modifier keys such as "
--"Ctrl or Shift.  Type \"space\" to specify the spacebar, otherwise use the key "
--"itself."
-+"Ctrl or Shift.  Type \"space\" to specify the spacebar, otherwise use the "
-+"key itself."
- msgstr ""
- "文稿的執行將會暫停，直到使用者按下指定的按鍵。\n"
- "\n"
--"您只能使用簡單按鍵，而不能使用組合鍵如 Ctrl 或 Shift。如果要指定空白鍵請輸入 \"space\"。"
-+"您只能使用簡單按鍵，而不能使用組合鍵如 Ctrl 或 Shift。如果要指定空白鍵請輸入 "
-+"\"space\"。"
- 
- #. i18n: file tools/argzoom.ui line 32
- #: rc.cpp:2344
-@@ -27556,7 +27645,8 @@
- msgstr ""
- "設定顯示的縮放等級。\n"
- "\n"
--"縮放等級是指示一個弧度要用多少像素來表示。通常合理的數值從 300 到 10,000,000。\n"
-+"縮放等級是指示一個弧度要用多少像素來表示。通常合理的數值從 300 到 "
-+"10,000,000。\n"
- 
- #. i18n: file tools/modcalcangdistdlg.ui line 16
- #: rc.cpp:2356 rc.cpp:2386 tools/astrocalc.cpp:84 tools/astrocalc.cpp:140
-@@ -27669,7 +27759,7 @@
- #: rc.cpp:3067 rc.cpp:3310 rc.cpp:3391 rc.cpp:3490 rc.cpp:3634
- #, no-c-format
- msgid "Input File..."
--msgstr "輸入檔案..."
-+msgstr "輸入檔案…"
- 
- #. i18n: file tools/modcalcangdistdlg.ui line 500
- #: rc.cpp:2425 rc.cpp:2515 rc.cpp:2632 rc.cpp:2785 rc.cpp:2860 rc.cpp:2968
-@@ -27683,7 +27773,7 @@
- #: rc.cpp:3073 rc.cpp:3316 rc.cpp:3397 rc.cpp:3496 rc.cpp:3640
- #, no-c-format
- msgid "Output File..."
--msgstr "輸出檔案..."
-+msgstr "輸出檔案…"
- 
- #. i18n: file tools/modcalcangdistdlg.ui line 521
- #: rc.cpp:2431 rc.cpp:2521 rc.cpp:2638 rc.cpp:2791 rc.cpp:2866 rc.cpp:2974
-@@ -27869,8 +27959,8 @@
- #: rc.cpp:3469 rc.cpp:3475
- #, no-c-format
- msgid ""
--"If checked, value will be read from input file. If not, value will be read from "
--"adjacent box"
-+"If checked, value will be read from input file. If not, value will be read "
-+"from adjacent box"
- msgstr "勾選此選項的話，會從輸入檔案中讀取數值，否則會從相鄰的對話盒中讀取。"
- 
- #. i18n: file tools/modcalceclipticcoordsdlg.ui line 594
-@@ -28357,52 +28447,59 @@
- #: rc.cpp:3652
- #, no-c-format
- msgid ""
--"<p> The Local Standard of Rest (LSR) is the location in which the mean value of "
--"the velocity of a selection of the stars in solar neighboorhood is zero. The "
--"local solar motion, that is, the velocity of the sun referred to the Local "
--"Standard of Rest is not null: the sun moves with a velocity of 20 km/s towards "
--"a point called, solar apex, whose coordinates are:</p>\n"
-+"<p> The Local Standard of Rest (LSR) is the location in which the mean value "
-+"of the velocity of a selection of the stars in solar neighboorhood is zero. "
-+"The local solar motion, that is, the velocity of the sun referred to the "
-+"Local Standard of Rest is not null: the sun moves with a velocity of 20 km/s "
-+"towards a point called, solar apex, whose coordinates are:</p>\n"
- "<li>Ra= 18:03:50.2 (J2000)</li>\n"
- "<li>Dec = 30:0:16.8 (J2000)</li>\n"
- "<p>Astronomical sources move relative to the Sun and their velocity can be "
--"decomposed in radial velocity, and velocity on the plane of the sky, also know "
--"as proper motion in right ascension and declination. The radial velocity is "
--"usually obtained by analyzing their spectral emission and the frequency shift "
--"of the lines due to Doppler effect. Observational astronomers usually refer "
--"source's radial velocity to the LSR.</p>\n"
-+"decomposed in radial velocity, and velocity on the plane of the sky, also "
-+"know as proper motion in right ascension and declination. The radial "
-+"velocity is usually obtained by analyzing their spectral emission and the "
-+"frequency shift of the lines due to Doppler effect. Observational "
-+"astronomers usually refer source's radial velocity to the LSR.</p>\n"
- "<p>This calculator module allows to obtain the radial velocity of the source "
- "referred to the center of the sun (what we call heliocentric velocity), "
--"referred to the center of the Earth (geocentric velocity) and to the observer "
--"site (topocentric velocity) from the LSR radial velocity</p>\n"
-+"referred to the center of the Earth (geocentric velocity) and to the "
-+"observer site (topocentric velocity) from the LSR radial velocity</p>\n"
- "<li>The heliocentric velocity (V<sub>hel</sub>) is computed by obtaining the "
--"scalar product of the radial velocity of the source referred to the LSR (V<sub>"
--"lsr</sub>) with the velocity of the Sun referred to the LSR (V<sub>sun</sub>:\n"
-+"scalar product of the radial velocity of the source referred to the LSR "
-+"(V<sub>lsr</sub>) with the velocity of the Sun referred to the LSR "
-+"(V<sub>sun</sub>:\n"
- "<img src=\"vlsr1.png\">\n"
- "</li>\n"
--"<li>The geocentric velocity (V<sub>geo</sub>) is obtained from the heliocentric "
--"velocity, the velocity of the Earth (V<sub>E</sub>) and its position for a "
--"given date and time:\n"
-+"<li>The geocentric velocity (V<sub>geo</sub>) is obtained from the "
-+"heliocentric velocity, the velocity of the Earth (V<sub>E</sub>) and its "
-+"position for a given date and time:\n"
- "<img src=\"vlsr2.png\">\n"
- "</li>\n"
- "<li>The topocentric velocity is obtained from the  geocentric velocity, the "
- "position on the Earth, and the date and time at which we desire to know the "
- "radial velocity of the source.</li>"
- msgstr ""
--"<p>本地靜止標準（LSR）是一個參考的基準點，在該點上選取一些跟太陽系鄰近的恆星，其速率平均值為 0。本地的太陽運動，也就是太陽對 LSR 的運動速率不是 "
--"0，而是以相對於一個叫太陽向點（Solar apex）的點，以每秒 20 公里的速率運行。此太陽向點的座標為：</p>\n"
-+"<p>本地靜止標準（LSR）是一個參考的基準點，在該點上選取一些跟太陽系鄰近的恆"
-+"星，其速率平均值為 0。本地的太陽運動，也就是太陽對 LSR 的運動速率不是 0，而是"
-+"以相對於一個叫太陽向點（Solar apex）的點，以每秒 20 公里的速率運行。此太陽向"
-+"點的座標為：</p>\n"
- "<li>赤經：18:03:50.2 （J2000）</li>\n"
- "<li>赤緯：30:0:16.8 （J2000）</li>\n"
--"<p>天文學中的物件來源會相對於太陽移動，它們的速率可以被分解為視向速率（Radial "
--"velocity），以及天體平面，也就是自行於赤經與赤緯的速率。視向速率是由分析它們的光譜的放射及都卜勒效應下的頻率位移計算而來。觀測的天文學家通常是計算物件來"
--"源對 LSR 的視向速率。</p>\n"
--"<p>這個計算模組可以從 LSR 視向速率計算來源物件對太陽中央（對日速率）、對地球中央（對地球速率）與對觀測者（對地面速率）的視向速率。</p>\n"
--"<li>對日速度（V<sub>hel</sub>）是計算來源物件對 LSR 的視向速率（V<sub>lsr</sub>）與太陽對 LSR 的速率（V<sub>"
--"sun</sub>）的內積：<img src=\"vlsr1.png\">\n"
-+"<p>天文學中的物件來源會相對於太陽移動，它們的速率可以被分解為視向速率"
-+"（Radial velocity），以及天體平面，也就是自行於赤經與赤緯的速率。視向速率是由"
-+"分析它們的光譜的放射及都卜勒效應下的頻率位移計算而來。觀測的天文學家通常是計"
-+"算物件來源對 LSR 的視向速率。</p>\n"
-+"<p>這個計算模組可以從 LSR 視向速率計算來源物件對太陽中央（對日速率）、對地球"
-+"中央（對地球速率）與對觀測者（對地面速率）的視向速率。</p>\n"
-+"<li>對日速度（V<sub>hel</sub>）是計算來源物件對 LSR 的視向速率（V<sub>lsr</"
-+"sub>）與太陽對 LSR 的速率（V<sub>sun</sub>）的內積：<img src=\"vlsr1.png\">\n"
- "</li>\n"
--"<li>對地球速度（V<sub>geo</sub>）是由對日速度，還有給定日期與時間的地球的速度（V<sub>E</sub>）及位置計算而來：\n"
-+"<li>對地球速度（V<sub>geo</sub>）是由對日速度，還有給定日期與時間的地球的速度"
-+"（V<sub>E</sub>）及位置計算而來：\n"
- "<img src=\"vlsr2.png\">\n"
- "</li>\n"
--"<li>對地面速度是從對地球速度、地球的位置、以及我們想要知道物件視向速度的日期及時間計算而來。</li>"
-+"<li>對地面速度是從對地球速度、地球的位置、以及我們想要知道物件視向速度的日期"
-+"及時間計算而來。</li>"
- 
- #. i18n: file tools/observinglistui.ui line 16
- #: rc.cpp:3666 tools/observinglist.cpp:57
-@@ -28438,7 +28535,7 @@
- #: rc.cpp:3681
- #, no-c-format
- msgid "Save observing list as..."
--msgstr "另存觀測清單為..."
-+msgstr "另存觀測清單為…"
- 
- #. i18n: file tools/observinglistui.ui line 129
- #: rc.cpp:3684
-@@ -28472,7 +28569,8 @@
- msgid ""
- "This button toggles between large and small states.  The small state may be "
- "useful if you want the Observing list open while working in the main window."
--msgstr "這個按鍵切換視窗的大小狀態。小的狀態在要在工作視窗上開啟觀測清單時有用。"
-+msgstr ""
-+"這個按鍵切換視窗的大小狀態。小的狀態在要在工作視窗上開啟觀測清單時有用。"
- 
- #. i18n: file tools/observinglistui.ui line 240
- #: rc.cpp:3699
-@@ -28538,7 +28636,8 @@
- #: rc.cpp:3732
- #, no-c-format
- msgid ""
--"Open the Altitude vs. Time tool, with curves for the highlighted objects shown"
-+"Open the Altitude vs. Time tool, with curves for the highlighted objects "
-+"shown"
- msgstr "開啟所選物件的高度仰角vs時間工具，顯示其曲線"
- 
- #. i18n: file tools/observinglistui.ui line 337
-@@ -28581,8 +28680,8 @@
- #: rc.cpp:3759
- #, no-c-format
- msgid ""
--"Table showing the current observing list.  The list can be sorted by any of the "
--"data columns"
-+"Table showing the current observing list.  The list can be sorted by any of "
-+"the data columns"
- msgstr "顯示目前觀測清單的表格。清單可以由任何資料欄位來排序。"
- 
- #. i18n: file tools/observinglistui.ui line 519
-@@ -28857,9 +28956,10 @@
- #: rc.cpp:3936
- #, no-c-format
- msgid ""
--"Discards current script and starts a new one.  Will prompt to save any unsaved "
--"changes in the current script."
--msgstr "丟棄現有的文稿並建立新的。會先問您是否要儲存目前文稿中任何尚未儲存的變更。"
-+"Discards current script and starts a new one.  Will prompt to save any "
-+"unsaved changes in the current script."
-+msgstr ""
-+"丟棄現有的文稿並建立新的。會先問您是否要儲存目前文稿中任何尚未儲存的變更。"
- 
- #. i18n: file tools/scriptbuilderui.ui line 92
- #: rc.cpp:3939
-@@ -28893,7 +28993,7 @@
- #: rc.cpp:3951
- #, no-c-format
- msgid "Save Script As..."
--msgstr "儲存文稿為..."
-+msgstr "儲存文稿為…"
- 
- #. i18n: file tools/scriptbuilderui.ui line 163
- #: rc.cpp:3954
-@@ -28913,9 +29013,11 @@
- #: rc.cpp:3960
- #, no-c-format
- msgid ""
--"Executes the script in the KStars main window.  You may want to reposition the "
--"Script Builder tool so that the Sky map is visible.  "
--msgstr "在 KStars 主視窗中執行文稿。您可能要先將文稿建立器工具移到別處，好看得見天體圖。"
-+"Executes the script in the KStars main window.  You may want to reposition "
-+"the Script Builder tool so that the Sky map is visible.  "
-+msgstr ""
-+"在 KStars 主視窗中執行文稿。您可能要先將文稿建立器工具移到別處，好看得見天體"
-+"圖。"
- 
- #. i18n: file tools/scriptbuilderui.ui line 235
- #: rc.cpp:3963
-@@ -28931,7 +29033,9 @@
- "Highlighting any command will present a widget where you can specify its "
- "arguments below.  Use the action buttons at right to copy, remove, or change "
- "the position of the selected command.  "
--msgstr "顯示目前文稿中的命令。點選任一命令會顯示一個元件讓您指定參數。用右方的按鍵來複製、移除或變更所選命令的位置。"
-+msgstr ""
-+"顯示目前文稿中的命令。點選任一命令會顯示一個元件讓您指定參數。用右方的按鍵來"
-+"複製、移除或變更所選命令的位置。"
- 
- #. i18n: file tools/scriptbuilderui.ui line 296
- #: rc.cpp:3969
-@@ -28943,11 +29047,12 @@
- #: rc.cpp:3972
- #, no-c-format
- msgid ""
--"If a function is highlighted in the \"Function Browser\" box, this button will "
--"add it to the current working script.  The new function is inserted directly "
--"after the highlighted function in the \"Current Script\" box.\n"
-+"If a function is highlighted in the \"Function Browser\" box, this button "
-+"will add it to the current working script.  The new function is inserted "
-+"directly after the highlighted function in the \"Current Script\" box.\n"
- msgstr ""
--"如果在「函式瀏覽器」盒中選擇了一個函式，此按鍵會將它加到目前的文稿中。新函式會直接插入到「目前文稿」中所選函式的後面。\n"
-+"如果在「函式瀏覽器」盒中選擇了一個函式，此按鍵會將它加到目前的文稿中。新函式"
-+"會直接插入到「目前文稿」中所選函式的後面。\n"
- 
- #. i18n: file tools/scriptbuilderui.ui line 323
- #: rc.cpp:3976
-@@ -29027,8 +29132,8 @@
- #: rc.cpp:4009
- #, no-c-format
- msgid ""
--"If a function is highlighted in the Function Browser, this area will show some "
--"brief documentation about the function."
-+"If a function is highlighted in the Function Browser, this area will show "
-+"some brief documentation about the function."
- msgstr "如果在「目前文稿」中有選擇函式，這個區域會顯示此函式的簡短說明。"
- 
- #. i18n: file tools/scriptbuilderui.ui line 576
-@@ -29117,7 +29222,7 @@
- #: rc.cpp:4057
- #, no-c-format
- msgid "Change Date..."
--msgstr "變更日期..."
-+msgstr "變更日期…"
- 
- #. i18n: file tools/wutdialogui.ui line 179
- #: rc.cpp:4060
-@@ -29131,13 +29236,14 @@
- msgid ""
- "Press this button to select a new date for the \"What's Up Tonight\" tool.  "
- "Note that the date of the main window is not changed."
--msgstr "按下此鍵以選擇新的「今晚有什麼」工具的日期。注意在主視窗的日期不會改變。"
-+msgstr ""
-+"按下此鍵以選擇新的「今晚有什麼」工具的日期。注意在主視窗的日期不會改變。"
- 
- #. i18n: file tools/wutdialogui.ui line 190
- #: rc.cpp:4066
- #, no-c-format
- msgid "Change Location..."
--msgstr "變更位置..."
-+msgstr "變更位置…"
- 
- #. i18n: file tools/wutdialogui.ui line 193
- #: rc.cpp:4069
-@@ -29151,7 +29257,9 @@
- msgid ""
- "Press this button to select a new geographic location for the \"What's Up "
- "Tonight\" tool.  Note that the location of the main window is not changed."
--msgstr "按下此鍵以選擇新的「今晚有什麼」工具的地理位置。注意在主視窗的地理位置不會改變。"
-+msgstr ""
-+"按下此鍵以選擇新的「今晚有什麼」工具的地理位置。注意在主視窗的地理位置不會改"
-+"變。"
- 
- #. i18n: file tools/wutdialogui.ui line 202
- #: rc.cpp:4075
-@@ -29181,14 +29289,15 @@
- #: rc.cpp:4087
- #, no-c-format
- msgid ""
--"By default, the \"What's Up Tonight\" tool displays all objects which are above "
--"the horizon between sunset and midnight (i.e., \"in the evening\").  You can "
--"also choose to show objects which are up between midnight and dawn (i.e., \"in "
--"the morning\"), or objects which are up at any time between sunset and sunrise "
--"(i.e., \"any time tonight\")"
--msgstr ""
--"「今晚有什麼」工具預設顯示所有在日落到午夜間（也就是「在傍晚」），在午夜到黎明間（也就是「在早上」），或是在日落跟日出之間（也就是「在今晚任何時間」），會出現在"
--"地平線之上的物件。"
-+"By default, the \"What's Up Tonight\" tool displays all objects which are "
-+"above the horizon between sunset and midnight (i.e., \"in the evening\").  "
-+"You can also choose to show objects which are up between midnight and dawn "
-+"(i.e., \"in the morning\"), or objects which are up at any time between "
-+"sunset and sunrise (i.e., \"any time tonight\")"
-+msgstr ""
-+"「今晚有什麼」工具預設顯示所有在日落到午夜間（也就是「在傍晚」），在午夜到黎"
-+"明間（也就是「在早上」），或是在日落跟日出之間（也就是「在今晚任何時間」），"
-+"會出現在地平線之上的物件。"
- 
- #. i18n: file tools/wutdialogui.ui line 234
- #: rc.cpp:4090
-@@ -29322,7 +29431,9 @@
- msgid ""
- "Objects listed here are above the horizon on the selected date, and have the "
- "object type which is highlighted in the \"Choose a Category\" list."
--msgstr "列在此的物件是會在所選日期時在地平線之上的物件，並且屬於「選擇星表」清單中被選取的物件型態。"
-+msgstr ""
-+"列在此的物件是會在所選日期時在地平線之上的物件，並且屬於「選擇星表」清單中被"
-+"選取的物件型態。"
- 
- #. i18n: file tools/wutdialogui.ui line 423
- #: rc.cpp:4156
-@@ -29368,8 +29479,8 @@
- #: rc.cpp:4174
- #, no-c-format
- msgid ""
--"Displays the time at which the highlighted object sets below the horizon on the "
--"selected date."
-+"Displays the time at which the highlighted object sets below the horizon on "
-+"the selected date."
- msgstr "顯示所選物件在所選日期的落下地平線的時間。"
- 
- #. i18n: file tools/wutdialogui.ui line 493
-@@ -29414,9 +29525,10 @@
- #: rc.cpp:4198
- #, no-c-format
- msgid ""
--"Select an item in the Categories list to display objects in that category which "
--"are above the horizon on the selected date."
--msgstr "在星表清單中選擇一個項目，以顯示該星表中在所選日期時在地平線之上的物件。"
-+"Select an item in the Categories list to display objects in that category "
-+"which are above the horizon on the selected date."
-+msgstr ""
-+"在星表清單中選擇一個項目，以顯示該星表中在所選日期時在地平線之上的物件。"
- 
- #. i18n: file tools/wutdialogui.ui line 546
- #: rc.cpp:4201
-@@ -29515,7 +29627,9 @@
- #: skymap.cpp:602 skymap.cpp:644
- msgid ""
- "Digitized Sky Survey image provided by the Space Telescope Science Institute."
--msgstr "將太空望遠鏡科學協會（Space Telescope Science Institute）提供的天體影像數位化。"
-+msgstr ""
-+"將太空望遠鏡科學協會（Space Telescope Science Institute）提供的天體影像數位"
-+"化。"
- 
- #: skymap.cpp:670 skymap.cpp:674
- msgid "Angular distance: "
-@@ -29682,8 +29796,8 @@
- "%1: Advanced Observing Program at Kitt Peak National Observatory [free for "
- "non-commercial use; no physical reproductions]"
- msgstr ""
--"%1：在 KPNO（Kitt Peak National Observatory）的進階觀測程式（Advanced Observing "
--"Program，AOP）【非商業用途免費，沒有實際重製】"
-+"%1：在 KPNO（Kitt Peak National Observatory）的進階觀測程式（Advanced "
-+"Observing Program，AOP）【非商業用途免費，沒有實際重製】"
- 
- #: skyobject.cpp:361
- msgid "Show NOAO Image"
-@@ -29691,16 +29805,19 @@
- 
- #: skyobject.cpp:362
- msgid ""
--"%1: National Optical Astronomy Observatories and AURA [free for non-commercial "
--"use]"
-+"%1: National Optical Astronomy Observatories and AURA [free for non-"
-+"commercial use]"
- msgstr ""
--"%1：國家光學天文台（National Optical Astronomy Observatories ，NOAO）與 AURA【非商業用途免費】"
-+"%1：國家光學天文臺（National Optical Astronomy Observatories ，NOAO）與 AURA"
-+"【非商業用途免費】"
- 
- #: skyobject.cpp:366
- msgid ""
--"%1: Very Large Telescope, operated by the European Southern Observatory [free "
--"for non-commercial use; no reproductions]"
--msgstr "%1：超大型望遠鏡，由 European Southern Observatory 操作【非商業用途免費，沒有重製】"
-+"%1: Very Large Telescope, operated by the European Southern Observatory "
-+"[free for non-commercial use; no reproductions]"
-+msgstr ""
-+"%1：超大型望遠鏡，由 European Southern Observatory 操作【非商業用途免費，沒有"
-+"重製】"
- 
- #: skyobject.cpp:369
- msgid "Show"
-@@ -29854,7 +29971,7 @@
- 
- #: telescopewizardprocess.cpp:152
- msgid "Please wait while KStars tries to connect to your telescope..."
--msgstr "請稍候，KStars 正試著與您的望遠鏡聯絡..."
-+msgstr "請稍候，KStars 正試著與您的望遠鏡聯絡…"
- 
- #: telescopewizardprocess.cpp:154
- msgid "Error. Unable to locate telescope drivers."
-@@ -29884,7 +30001,7 @@
- 
- #: thumbnailpicker.cpp:101
- msgid "Loading images..."
--msgstr "載入影像中..."
-+msgstr "載入影像中…"
- 
- #: thumbnailpicker.cpp:316
- #, c-format
-@@ -29995,20 +30112,23 @@
- 
- #: timestepbox.cpp:35
- msgid ""
--"Set the timescale for the simulation clock.  A setting of \"1 sec\" means the "
--"clock advances in real-time, keeping up perfectly with your CPU clock.  Higher "
--"values make the simulation clock run faster, lower values make it run slower.  "
--"Negative values make it run backwards.\n"
-+"Set the timescale for the simulation clock.  A setting of \"1 sec\" means "
-+"the clock advances in real-time, keeping up perfectly with your CPU clock.  "
-+"Higher values make the simulation clock run faster, lower values make it run "
-+"slower.  Negative values make it run backwards.\n"
- "\n"
--"There are two pairs of up/down buttons.  The left pair will cycle through all "
--"available timesteps in sequence.  Since there are a large number of timesteps, "
--"the right pair is provided to skip to the next higher/lower unit of time.  For "
--"example, if the timescale is currently \"1 min\", the right up button will make "
--"it \"1 hour\", and the right down button will make it \"1 sec\""
-+"There are two pairs of up/down buttons.  The left pair will cycle through "
-+"all available timesteps in sequence.  Since there are a large number of "
-+"timesteps, the right pair is provided to skip to the next higher/lower unit "
-+"of time.  For example, if the timescale is currently \"1 min\", the right up "
-+"button will make it \"1 hour\", and the right down button will make it \"1 "
-+"sec\""
- msgstr ""
--"設定模擬時中的時間刻度。設定為「1 秒」表示以實際時間進行，越高的值讓時鐘跑得越快，越低的值則跑得越慢。負值則往回跑。\n"
-+"設定模擬時中的時間刻度。設定為「1 秒」表示以實際時間進行，越高的值讓時鐘跑得"
-+"越快，越低的值則跑得越慢。負值則往回跑。\n"
- "\n"
--"有兩對上/下按鍵。左邊的那一對循環出現所有可用的時間刻度。不過因為有太多種選擇，因此右邊的那一對提供了較高/較低單位的時間。例如，若是時間刻度定為「1 "
-+"有兩對上/下按鍵。左邊的那一對循環出現所有可用的時間刻度。不過因為有太多種選"
-+"擇，因此右邊的那一對提供了較高/較低單位的時間。例如，若是時間刻度定為「1 "
- "分」，則右邊的按鍵會將刻度設為「1 小時」或「1 秒」。"
- 
- #: timezonerule.cpp:51
-@@ -30053,36 +30173,32 @@
- 
- #: tips.cpp:3
- msgid ""
--"\t\t"
--"<p>You can locate objects in the sky by their name.\n"
-+"\t\t<p>You can locate objects in the sky by their name.\n"
- "\t\t\tUse Ctrl+F, the \"Focus->Find Object\" menu item, or the \"Find\"\n"
- "\t\t\tToolbar button.\n"
- "\t\t</p>\n"
- "\t\n"
- msgstr ""
--"\t\t "
--"<p>您可以依物件的名稱在天體圖中找到物件。用 Ctrl+F，或是「焦點」＞「尋找物件」選單，或是「尋找」工具列按鍵。</p>\n"
-+"\t\t <p>您可以依物件的名稱在天體圖中找到物件。用 Ctrl+F，或是「焦點」＞「尋找"
-+"物件」選單，或是「尋找」工具列按鍵。</p>\n"
- "\t\n"
- 
- #: tips.cpp:12
- msgid ""
--"\t\t"
--"<p>To change your Geographic Location,\n"
-+"\t\t<p>To change your Geographic Location,\n"
- "\t\t\tuse Ctrl+G, the \"Settings->Set Geographic Location...\" menu item,\n"
- "\t\t\tor the \"globe\" Toolbar button.\n"
- "\t\t</p>\n"
- "\t\n"
- msgstr ""
--"\t\t "
--"<p>要改變您的地理位置，用 Ctrl+G，或是「設定」＞「設定地理位置」選單，或是「地球儀」工具列按鍵。</p>\n"
-+"\t\t <p>要改變您的地理位置，用 Ctrl+G，或是「設定」＞「設定地理位置」選單，或"
-+"是「地球儀」工具列按鍵。</p>\n"
- "\t\n"
- 
- #: tips.cpp:21
- msgid ""
--"\t\t"
--"<p>You can Track an object, so it will always be centered\n"
--"\t\t\tin the display."
--"<br/>\n"
-+"\t\t<p>You can Track an object, so it will always be centered\n"
-+"\t\t\tin the display.<br/>\n"
- "\t\t\tUse Ctrl+T, the \"Focus->Track Object\" menu item, or the \"lock\"\n"
- "\t\t\tToolbar button. You can also simply center the object by\n"
- "\t\t\tdouble-clicking on it or selecting \"Center and Track\" from the\n"
-@@ -30090,129 +30206,122 @@
- "\t\t</p>\n"
- "\t\n"
- msgstr ""
--"\t\t "
--"<p>您可以追蹤物件，讓它總是置於天體圖中央。"
--"<br/> 用 "
--"Ctrl+T，或是「焦點」＞「追蹤物件」選單，或是「鎖定」工具列按鍵。您也可以簡單地將物件置於中央，然後雙擊該物件並從選單中選擇「置中並追蹤」。</p>\n"
-+"\t\t <p>您可以追蹤物件，讓它總是置於天體圖中央。<br/> 用 Ctrl+T，或是「焦點」"
-+"＞「追蹤物件」選單，或是「鎖定」工具列按鍵。您也可以簡單地將物件置於中央，然"
-+"後雙擊該物件並從選單中選擇「置中並追蹤」。</p>\n"
- "\t\n"
- 
- #: tips.cpp:33
- msgid ""
--"\t\t"
--"<p>The KStars Handbook includes the AstroInfo Project, a series\n"
-+"\t\t<p>The KStars Handbook includes the AstroInfo Project, a series\n"
- "\t\t\tof informative articles about Astronomy.\n"
- "\t\t</p>\n"
- "\t\n"
- msgstr ""
--"\t\t "
--"<p>KStars 手冊包含了「天文資訊專案」，一系列關於天文學資訊的文章。</p>\n"
-+"\t\t <p>KStars 手冊包含了「天文資訊專案」，一系列關於天文學資訊的文章。</p>\n"
- "\t\n"
- 
- #: tips.cpp:41
- msgid ""
--"\t\t"
--"<p>There are three on-screen \"Info Boxes\" which show data related to the\n"
--"\t\t\ttime/date, your geographic location, and the current central position on "
-+"\t\t<p>There are three on-screen \"Info Boxes\" which show data related to "
- "the\n"
--"\t\t\tsky (the focus).  You can drag these boxes with the mouse, and \"shade\" "
--"them\n"
-+"\t\t\ttime/date, your geographic location, and the current central position "
-+"on the\n"
-+"\t\t\tsky (the focus).  You can drag these boxes with the mouse, and \"shade"
-+"\" them\n"
- "\t\t\tby double-clicking them to show more (or less) information.  You can "
- "hide\n"
- "\t\t\tthem altogether in the Settings->Info Boxes menu.\n"
- "\t\t</p>\n"
- "\t\n"
- msgstr ""
--"\t\t "
--"<p>在螢幕上有三個「資訊盒」，會顯示日期/時間，地理位置與目前聚焦的物件。您可以用滑鼠拖放、或雙擊以顯示更多（或更少）的資訊。您也可以在「設定」＞「資訊盒」選"
--"單中設定。</p>\n"
-+"\t\t <p>在螢幕上有三個「資訊盒」，會顯示日期/時間，地理位置與目前聚焦的物件。"
-+"您可以用滑鼠拖放、或雙擊以顯示更多（或更少）的資訊。您也可以在「設定」＞「資"
-+"訊盒」選單中設定。</p>\n"
- "\t\n"
- 
- #: tips.cpp:52
- msgid ""
--"\t\t"
--"<p>KStars has a full-screen mode; you can toggle this mode using the\n"
-+"\t\t<p>KStars has a full-screen mode; you can toggle this mode using the\n"
- "\t\t\t\"fullscreen\" toolbar button, or by pressing Ctrl+Shift+F.\n"
- "\t\t</p>\n"
- "\t\n"
- msgstr ""
--"\t\t "
--"<p>KStars 有全螢幕模式，您可以用「全螢幕」工具列來切換，或是用 Ctrl+Shift+F。</p>\n"
-+"\t\t <p>KStars 有全螢幕模式，您可以用「全螢幕」工具列來切換，或是用 Ctrl"
-+"+Shift+F。</p>\n"
- "\t\n"
- 
- #: tips.cpp:60
- msgid ""
--"\t\t"
--"<p>The N,S,E,W keys will point the display at the North,\n"
-+"\t\t<p>The N,S,E,W keys will point the display at the North,\n"
- "\t\t\tSouth, East and West points on the Horizon.  The Z key will point the\n"
- "\t\t\tdisplay at the Zenith.\n"
- "\t\t</p>\n"
- "\t\n"
- msgstr ""
--"\t\t "
--"<p>按下 N、S、E、W 等鍵可以將顯示指到水平方位的北、南、東、西。Z 鍵則指到天頂的所在。</p>\n"
-+"\t\t <p>按下 N、S、E、W 等鍵可以將顯示指到水平方位的北、南、東、西。Z 鍵則指"
-+"到天頂的所在。</p>\n"
- "\t\n"
- 
- #: tips.cpp:69
- msgid ""
--"\t\t"
--"<p>The 0-9 keys will center the display on one of the major solar system\n"
-+"\t\t<p>The 0-9 keys will center the display on one of the major solar "
-+"system\n"
- "\t\t\tbodies.  0 centers on the Sun, 3 centers on the Moon; the rest are the "
- "eight\n"
- "\t\t\tplanets, in order of their distance from the Sun.\n"
- "\t\t</p>\n"
- "\t\n"
- msgstr ""
--"\t\t "
--"<p>按下 0-9 鍵會將太陽系的幾個主星置中於天體圖。0 表示太陽，3 表示月球，其它的鍵則為行星，從離太陽最近的算起。</p>\n"
-+"\t\t <p>按下 0-9 鍵會將太陽系的幾個主星置中於天體圖。0 表示太陽，3 表示月球，"
-+"其它的鍵則為行星，從離太陽最近的算起。</p>\n"
- "\t\n"
- 
- #: tips.cpp:78
- msgid ""
--"\t\t"
--"<p>Click and Drag with the mouse to slew the skymap to a new position on\n"
-+"\t\t<p>Click and Drag with the mouse to slew the skymap to a new position "
-+"on\n"
- "\t\t\tthe sky.\n"
- "\t\t</p>\n"
- "\t\n"
- msgstr ""
--"\t\t "
--"<p>點選並拖曳滑鼠可以將天體圖旋轉到其他位置。</p>\n"
-+"\t\t <p>點選並拖曳滑鼠可以將天體圖旋轉到其他位置。</p>\n"
- "\t\n"
- 
- #: tips.cpp:86
- msgid ""
--"\t\t"
--"<p>Double-click with the mouse to center the display on the location\n"
-+"\t\t<p>Double-click with the mouse to center the display on the location\n"
- "\t\t\tof the mouse cursor.  If you double-click on an object, KStars will\n"
- "\t\t\tautomatically begin tracking it.\n"
- "\t\t</p>\n"
- "\t\n"
- msgstr ""
--"\t\t "
--"<p>雙擊滑鼠可以將天體圖置中於滑鼠游標所在的位置。如果您雙擊某物件，KStars 會自動開始追蹤該物件。</p>\n"
-+"\t\t <p>雙擊滑鼠可以將天體圖置中於滑鼠游標所在的位置。如果您雙擊某物件，"
-+"KStars 會自動開始追蹤該物件。</p>\n"
- "\t\n"
- 
- #: tips.cpp:95
- msgid ""
--"\t\t"
--"<p>The status bar displays the current sky coordinates of the mouse cursor,\n"
-+"\t\t<p>The status bar displays the current sky coordinates of the mouse "
-+"cursor,\n"
- "\t\t\tin both Equatorial and Horizontal coordinate systems.\n"
- "\t\t</p>\n"
- "\t\n"
- msgstr ""
--"\t\t "
--"<p>狀態列顯示目前滑鼠游標所在的天體座標，包括赤道座標系與水平座標系。</p>\n"
-+"\t\t <p>狀態列顯示目前滑鼠游標所在的天體座標，包括赤道座標系與水平座標系。</"
-+"p>\n"
- "\t\n"
- 
- #: tips.cpp:103
- msgid ""
--"\t\t"
--"<p>The display can be zoomed in or out by spinning your mouse's scroll wheel,\n"
--"\t\t\tor by dragging the mouse up or down with the middle mouse button pressed. "
--" You\n"
--"\t\t\tcan also use the +/- keys, or the \"Zoom In\"/\"Zoom Out\" items in the "
--"toolbar and\n"
--"\t\t\tin the View menu.  The Zoom Level can be set manually using the \"Zoom to "
--"Angular\n"
-+"\t\t<p>The display can be zoomed in or out by spinning your mouse's scroll "
-+"wheel,\n"
-+"\t\t\tor by dragging the mouse up or down with the middle mouse button "
-+"pressed.  You\n"
-+"\t\t\tcan also use the +/- keys, or the \"Zoom In\"/\"Zoom Out\" items in "
-+"the toolbar and\n"
-+"\t\t\tin the View menu.  The Zoom Level can be set manually using the \"Zoom "
-+"to Angular\n"
- "\t\t\tSize\" item in the View menu (Shift+Ctrl+Z), and you can set it "
- "graphically by\n"
- "\t\t\tholding down the Ctrl button while dragging the mouse to define a "
-@@ -30221,464 +30330,436 @@
- "\t\t</p>\n"
- "\t\n"
- msgstr ""
--"\t\t "
--"<p>您可以用滑鼠的滾輪，或是按住中鍵後上下移動滑鼠游標來放大或縮小顯示。您也可以用 + 或 - "
--"鍵，或是「檢視」選單及工具列中的「放大」、「縮小」等選項。縮放等級可以用「檢視」選單中的「縮放角度大小」（Shift+Ctrl+Z）來手動設定，您也可以按住 "
--"Ctrl 鍵然後移動滑鼠來定義一個矩形範圍。</p>\n"
-+"\t\t <p>您可以用滑鼠的滾輪，或是按住中鍵後上下移動滑鼠游標來放大或縮小顯示。"
-+"您也可以用 + 或 - 鍵，或是「檢視」選單及工具列中的「放大」、「縮小」等選項。"
-+"縮放等級可以用「檢視」選單中的「縮放角度大小」（Shift+Ctrl+Z）來手動設定，您"
-+"也可以按住 Ctrl 鍵然後移動滑鼠來定義一個矩形範圍。</p>\n"
- "\t\n"
- 
- #: tips.cpp:116
- msgid ""
--"\t\t"
--"<p>You can manually set the coordinates of the central Focus point.\n"
--"\t\t\tPress Ctrl+M, or use the \"Focus->Set Focus Manually...\" menu item, and "
--"enter\n"
-+"\t\t<p>You can manually set the coordinates of the central Focus point.\n"
-+"\t\t\tPress Ctrl+M, or use the \"Focus->Set Focus Manually...\" menu item, "
-+"and enter\n"
- "\t\t\tthe desired coordinates in the popup window.\n"
- "\t\t</p>\n"
- "\t\n"
- msgstr ""
--"\t\t "
--"<p>您可以手動設定置中焦點的座標。按 Ctrl+M，或用「焦點」＞「手動設定焦點」，並輸入想要的座標。</p>\n"
-+"\t\t <p>您可以手動設定置中焦點的座標。按 Ctrl+M，或用「焦點」＞「手動設定焦"
-+"點」，並輸入想要的座標。</p>\n"
- "\t\n"
- 
- #: tips.cpp:125
- msgid ""
--"\t\t"
--"<p>To switch between Equatorial and Horizontal coordinate\n"
--"\t\t\tsystems, use the \"View->Coordinates\" menu item, or press the spacebar.\n"
-+"\t\t<p>To switch between Equatorial and Horizontal coordinate\n"
-+"\t\t\tsystems, use the \"View->Coordinates\" menu item, or press the "
-+"spacebar.\n"
- "\t\t</p>\n"
- "\t\n"
- msgstr ""
--"\t\t "
--"<p>要在赤道座標系與水平座標系間切換，您可以用「檢視」＞「座標」選單，或按下空白鍵。</p>\n"
-+"\t\t <p>要在赤道座標系與水平座標系間切換，您可以用「檢視」＞「座標」選單，或"
-+"按下空白鍵。</p>\n"
- "\t\n"
- 
- #: tips.cpp:133
- msgid ""
--"\t\t"
--"<p>To set the Time and Date, type Ctrl+S, use the \"Time->"
--"Set Time\" menu item,\n"
--"\t\t\tor press the \"time\" toolbar button.  Note that dates in KStars can be "
--"very\n"
-+"\t\t<p>To set the Time and Date, type Ctrl+S, use the \"Time->Set Time\" "
-+"menu item,\n"
-+"\t\t\tor press the \"time\" toolbar button.  Note that dates in KStars can "
-+"be very\n"
- "\t\t\tremote; you can use any year between -50,000 and +50,000.\n"
- "\t\t</p>\n"
- "\t\n"
- msgstr ""
--"\t\t "
--"<p>要設定日期與時間，按下 Ctrl+S，或用「時間」＞「設定時間」選單，或按下時間工具列按鈕。注意在 KStars 內的日期可以很遠，可以在 -50000 "
--"到 +50000 年之間。</p>\n"
-+"\t\t <p>要設定日期與時間，按下 Ctrl+S，或用「時間」＞「設定時間」選單，或按下"
-+"時間工具列按鈕。注意在 KStars 內的日期可以很遠，可以在 -50000 到 +50000 年之"
-+"間。</p>\n"
- "\t\n"
- 
- #: tips.cpp:142
- msgid ""
--"\t\t"
--"<p>You can use Ctrl+E or the \"Time->Set Time to Now\" menu item to "
-+"\t\t<p>You can use Ctrl+E or the \"Time->Set Time to Now\" menu item to "
- "synchronize\n"
- "\t\t\tthe simulation clock with your CPU clock.\n"
- "\t\t</p>\n"
- "\t\n"
- msgstr ""
--"\t\t "
--"<p>您可以用 Ctrl+E 或「時間」＞「設定時間為現在時間」來將模擬時鐘與您 CPU 的時鐘同步。</p>\n"
-+"\t\t <p>您可以用 Ctrl+E 或「時間」＞「設定時間為現在時間」來將模擬時鐘與您 "
-+"CPU 的時鐘同步。</p>\n"
- "\t\n"
- 
- #: tips.cpp:150
- msgid ""
--"\t\t"
--"<p>The Spin Box in the Toolbar allows you to adjust the time step\n"
-+"\t\t<p>The Spin Box in the Toolbar allows you to adjust the time step\n"
- "\t\t\tused by the KStars clock; setting it to \"1.0 sec\" provides \"real "
- "time\".\n"
- "\t\t\tNote: negative values make time run backwards.\n"
- "\t\t</p>\n"
- "\t\n"
- msgstr ""
--"\t\t "
--"<p>您可以調整 KStars 時鐘的時間間隔，設定為「1 秒」表示模擬實際時間。注意：負值可以讓時間往回走。</p>\n"
-+"\t\t <p>您可以調整 KStars 時鐘的時間間隔，設定為「1 秒」表示模擬實際時間。注"
-+"意：負值可以讓時間往回走。</p>\n"
- "\t\n"
- 
- #: tips.cpp:159
- msgid ""
--"\t\t"
--"<p>You can stop and start the clock with the \"Play/Pause\" button\n"
-+"\t\t<p>You can stop and start the clock with the \"Play/Pause\" button\n"
- "\t\t\tin the Toolbar, or with the \"Time->Stop/Start Clock\" menu item.\n"
- "\t\t</p>\n"
- "\t\n"
- msgstr ""
--"\t\t "
--"<p>您可以用「播放/暫停」鍵來停止或繼續時鐘，或是「時間」＞「停止/啟動時鐘」選項。</p>\n"
-+"\t\t <p>您可以用「播放/暫停」鍵來停止或繼續時鐘，或是「時間」＞「停止/啟動時"
-+"鐘」選項。</p>\n"
- "\t\n"
- 
- #: tips.cpp:167
- msgid ""
--"\t\t"
--"<p>You can advance the simulation clock forward or backward by a single\n"
-+"\t\t<p>You can advance the simulation clock forward or backward by a single\n"
- "\t\t\ttime step by pressing the \"&gt;\" or \"&lt;\" keys.\n"
- "\t\t</p>\n"
- "\t\n"
- msgstr ""
--"\t\t "
--"<p>您可以按 \"&gt;\" 或 \"&lt;\" 鍵來讓模擬時鐘的時間間隔向前或向後調整。</p>\n"
-+"\t\t <p>您可以按 \"&gt;\" 或 \"&lt;\" 鍵來讓模擬時鐘的時間間隔向前或向後調"
-+"整。</p>\n"
- "\t\n"
- 
- #: tips.cpp:175
- msgid ""
--"\t\t"
--"<p>When you click your mouse in the map, the object in the sky nearest\n"
-+"\t\t<p>When you click your mouse in the map, the object in the sky nearest\n"
- "\t\t\tthe mouse cursor is identified in the status bar.\n"
- "\t\t</p>\n"
- "\t\n"
- msgstr ""
--"\t\t "
--"<p>若您在天體圖中點擊滑鼠，則離滑鼠游標最近的物件會在狀態列中顯示。</p>\n"
-+"\t\t <p>若您在天體圖中點擊滑鼠，則離滑鼠游標最近的物件會在狀態列中顯示。</"
-+"p>\n"
- "\t\n"
- 
- #: tips.cpp:183
- msgid ""
--"\t\t"
--"<p>When you hold the mouse cursor still for a moment, the nearest object\n"
-+"\t\t<p>When you hold the mouse cursor still for a moment, the nearest "
-+"object\n"
- "\t\t\twill be identified by a temporary name label that automatically fades\n"
- "\t\t\tout when you move the mouse again.\n"
- "\t\t</p>\n"
- "\t\n"
- msgstr ""
--"\t\t "
--"<p>若您滑鼠靜止不動一陣子，最接近的物件會顯示一個暫時的名稱標籤，若您滑鼠又再移動時，該標籤會自動淡出。</p>\n"
-+"\t\t <p>若您滑鼠靜止不動一陣子，最接近的物件會顯示一個暫時的名稱標籤，若您滑"
-+"鼠又再移動時，該標籤會自動淡出。</p>\n"
- "\t\n"
- 
- #: tips.cpp:192
- msgid ""
--"\t\t"
--"<p>Right-click with the mouse to open a popup menu of detailed options\n"
-+"\t\t<p>Right-click with the mouse to open a popup menu of detailed options\n"
- "\t\t\tfor a particular object, including links to images and information on\n"
- "\t\t\tthe Internet.\n"
- "\t\t</p>\n"
- "\t\n"
- msgstr ""
--"\t\t "
--"<p>點選滑鼠右鍵可以開啟特定物件的詳細選項選單，包括圖片的連結與網路上的資訊等。</p>\n"
-+"\t\t <p>點選滑鼠右鍵可以開啟特定物件的詳細選項選單，包括圖片的連結與網路上的"
-+"資訊等。</p>\n"
- "\t\n"
- 
- #: tips.cpp:201
- msgid ""
--"\t\t"
--"<p>The deep-sky objects with a special color (the default is Red)\n"
-+"\t\t<p>The deep-sky objects with a special color (the default is Red)\n"
- "\t\t\thave extra URL links available in their popup menu.\n"
- "\t\t</p>\n"
- "\t\n"
- msgstr ""
--"\t\t "
--"<p>有特殊顏色（預設是紅色）的深天空物件在它們的選單中有外部網址連結。</p>\n"
-+"\t\t <p>有特殊顏色（預設是紅色）的深天空物件在它們的選單中有外部網址連結。</"
-+"p>\n"
- "\t\n"
- 
- #: tips.cpp:209
- msgid ""
--"\t\t"
--"<p>By default, stars in KStars are displayed with realistic colors.\n"
-+"\t\t<p>By default, stars in KStars are displayed with realistic colors.\n"
- "\t\t\tA star's color depends on its temperature; cooler stars are red,\n"
- "\t\t\twhile hotter stars are blue.\n"
- "\t\t</p>\n"
- "\t\n"
- msgstr ""
--"\t\t "
--"<p>KStars 中，星體預設是用實際顏色來顯示。它的顏色是根據溫度來決定，溫度較低則為紅色，較高的則為藍色。</p>\n"
-+"\t\t <p>KStars 中，星體預設是用實際顏色來顯示。它的顏色是根據溫度來決定，溫度"
-+"較低則為紅色，較高的則為藍色。</p>\n"
- "\t\n"
- 
- #: tips.cpp:218
- msgid ""
--"\t\t"
--"<p>If you want the very latest orbital information for asteroids and\n"
-+"\t\t<p>If you want the very latest orbital information for asteroids and\n"
- "\t\t\tcomets (including recently-discovered objects), check the \"Download\n"
- "\t\t\tData\" tool (\"File|Download Data\" or Ctrl+D) frequently for updated\n"
- "\t\t\tephemerides.\n"
- "\t\t</p>\n"
- "\t\n"
- msgstr ""
--"\t\t "
--"<p>如果您要小行星與慧星（包括最近發現的物件）的最新軌道資訊，您可以用「下載資料」工具（「檔案」＞「下載資料」，或 Ctrl+D）來更新星曆表。</p>\n"
-+"\t\t <p>如果您要小行星與慧星（包括最近發現的物件）的最新軌道資訊，您可以用"
-+"「下載資料」工具（「檔案」＞「下載資料」，或 Ctrl+D）來更新星曆表。</p>\n"
- "\t\n"
- 
- #: tips.cpp:228
- msgid ""
--"\t\t"
--"<p>The Details window provides a large amount of information on any \n"
-+"\t\t<p>The Details window provides a large amount of information on any \n"
- "\t\t\tobject in the sky, including coordinates, rise/set times, internet \n"
- "\t\t\tlinks, and your own custom notes.  Access the Details window through \n"
- "\t\t\tthe popup menu, or by clicking on an object and then pressing \"D\".\n"
- "\t\t</p>\n"
- "\t\n"
- msgstr ""
--"\t\t "
--"<p>「詳情」視窗提供許多關於該物件的資訊，包括座標，升起/落下時間，網際網路連結，及您自訂的筆記。您可以從彈出式選單中找到，或是點選物件後按下 D "
--"鍵即可叫出。</p>\n"
-+"\t\t <p>「詳情」視窗提供許多關於該物件的資訊，包括座標，升起/落下時間，網際網"
-+"路連結，及您自訂的筆記。您可以從彈出式選單中找到，或是點選物件後按下 D 鍵即可"
-+"叫出。</p>\n"
- "\t\n"
- 
- #: tips.cpp:238
- msgid ""
--"\t\t"
--"<p>You can attach a name label to any object in the sky.  Toggle the \n"
-+"\t\t<p>You can attach a name label to any object in the sky.  Toggle the \n"
- "\t\t\tlabel in the popup menu, or by clicking on the object and then \n"
- "\t\t\tpressing \"L\".\n"
- "\t\t</p>\n"
- "\t\n"
- msgstr ""
--"\t\t "
--"<p>您可以對天體圖中任何物件附加上名稱標籤。您可以在彈出式選單中切換標籤，或是點選物件然後按下 L 鍵。</p>\n"
-+"\t\t <p>您可以對天體圖中任何物件附加上名稱標籤。您可以在彈出式選單中切換標"
-+"籤，或是點選物件然後按下 L 鍵。</p>\n"
- "\t\n"
- 
- #: tips.cpp:247
- msgid ""
--"\t\t"
--"<p>The KStars Astrocalculator (Ctrl+C) gives you direct access to many \n"
-+"\t\t<p>The KStars Astrocalculator (Ctrl+C) gives you direct access to many \n"
- "\t\t\tof the calculations that KStars does behind-the-scenes.\n"
- "\t\t</p>\n"
- "\t\n"
- msgstr ""
--"\t\t "
--"<p>KStars 天文計算機（Ctrl+C）能提供您直接存取許多 KStars 在私底下的計算。</p>\n"
-+"\t\t <p>KStars 天文計算機（Ctrl+C）能提供您直接存取許多 KStars 在私底下的計"
-+"算。</p>\n"
- "\t\n"
- 
- #: tips.cpp:255
- msgid ""
--"\t\t"
--"<p>The AAVSO Light Curve Generator tool (Ctrl+V) connects to a server at the\n"
-+"\t\t<p>The AAVSO Light Curve Generator tool (Ctrl+V) connects to a server at "
-+"the\n"
- "\t\t\tAmerican Association of Variable Star Observers, and constructs a\n"
- "\t\t\tlightcurve for any of the 6000+ variable stars that they monitor\n"
- "\t\t\ton a daily basis.\n"
- "\t\t</p>\n"
- "\t\n"
- msgstr ""
--"\t\t "
--"<p>AAVSO 光曲線產生器（Ctrl+V）能連結到美國業餘觀星協會（American Association of Variable Star "
--"Observers）的伺服器，並產生它們每日監控的 6000 個以上的可變星的光曲線。</p>\n"
-+"\t\t <p>AAVSO 光曲線產生器（Ctrl+V）能連結到美國業餘觀星協會（American "
-+"Association of Variable Star Observers）的伺服器，並產生它們每日監控的 6000 "
-+"個以上的可變星的光曲線。</p>\n"
- "\t\n"
- 
- #: tips.cpp:265
- msgid ""
--"\t\t"
--"<p>The Altitude vs. Time tool (Ctrl+A) will plot altitude curves for any group\n"
-+"\t\t<p>The Altitude vs. Time tool (Ctrl+A) will plot altitude curves for any "
-+"group\n"
- "\t\t\tof objects that you select.  This is a great tool for planning\n"
- "\t\t\tobserving sessions.\n"
- "\t\t</p>\n"
- "\t\n"
- msgstr ""
--"\t\t "
--"<p>高度仰角vs時間工具（Ctrl+A）會畫出任何您選取的物件群組的高度仰角曲線。這是計畫觀測的很好用的工具。</p>\n"
-+"\t\t <p>高度仰角vs時間工具（Ctrl+A）會畫出任何您選取的物件群組的高度仰角曲"
-+"線。這是計畫觀測的很好用的工具。</p>\n"
- "\t\n"
- 
- #: tips.cpp:274
- msgid ""
--"\t\t"
--"<p>With the What's Up Tonight? tool (Ctrl+U), you can tell at a glance what\n"
-+"\t\t<p>With the What's Up Tonight? tool (Ctrl+U), you can tell at a glance "
-+"what\n"
- "\t\t\tobjects will be visible from your location on a given night.\n"
- "\t\t</p>\n"
- "\t\n"
- msgstr ""
--"\t\t "
--"<p>您可以用「今晚有什麼？」工具（Ctrl+U）來得知在您的位置，指定的夜晚中可以看到哪些物件。</p>\n"
-+"\t\t <p>您可以用「今晚有什麼？」工具（Ctrl+U）來得知在您的位置，指定的夜晚中"
-+"可以看到哪些物件。</p>\n"
- "\t\n"
- 
- #: tips.cpp:282
- msgid ""
--"\t\t"
--"<p>The Observing List tool (Ctrl+L) gives you easy access to a selected group \n"
-+"\t\t<p>The Observing List tool (Ctrl+L) gives you easy access to a selected "
-+"group \n"
- "\t\t\tof objects.  Add objects to the list through the popup menu, or by\n"
- "\t\t\tclicking on the object, and pressing \"O\".\n"
- "\t\t</p>\n"
- "\t\n"
- msgstr ""
--"\t\t "
--"<p>觀測清單工具（Ctrl+L)讓您輕易存取所選群組的物件。您可以透過彈出式選單來將物件加入清單，或是點選該物件後按下 O 鍵。</p>\n"
-+"\t\t <p>觀測清單工具（Ctrl+L)讓您輕易存取所選群組的物件。您可以透過彈出式選單"
-+"來將物件加入清單，或是點選該物件後按下 O 鍵。</p>\n"
- "\t\n"
- 
- #: tips.cpp:291
- msgid ""
--"\t\t"
--"<p>The ScriptBuilder tool allows you to construct complex DCOP\n"
-+"\t\t<p>The ScriptBuilder tool allows you to construct complex DCOP\n"
- "\t\t\tscripts using a simple GUI.  The scripts can be played back later\n"
- "\t\t\tfrom the command line, or from within KStars.\n"
- "\t\t</p>\n"
- "\t\n"
- msgstr ""
--"\t\t "
--"<p>文稿建立器工具讓您用簡單的介面來建立複雜的 DCOP 文稿。這些文稿可以稍後從命令列執行，或是在 KStars 中執行。</p>\n"
-+"\t\t <p>文稿建立器工具讓您用簡單的介面來建立複雜的 DCOP 文稿。這些文稿可以稍"
-+"後從命令列執行，或是在 KStars 中執行。</p>\n"
- "\t\n"
- 
- #: tips.cpp:300
- msgid ""
--"\t\t"
--"<p>The Solar System Viewer tool (Ctrl+Y) shows an overhead view of the solar\n"
-+"\t\t<p>The Solar System Viewer tool (Ctrl+Y) shows an overhead view of the "
-+"solar\n"
- "\t\t\tsystem, showing the positions of the major planets for the current\n"
- "\t\t\tsimulation date.\n"
- "\t\t</p>\n"
- "\t\n"
- msgstr ""
--"\t\t "
--"<p>太陽系檢視器（Ctrl+Y）顯示太陽系主要行星目前的位置。</p>\n"
-+"\t\t <p>太陽系檢視器（Ctrl+Y）顯示太陽系主要行星目前的位置。</p>\n"
- "\t\n"
- 
- #: tips.cpp:309
- msgid ""
--"\t\t"
--"<p>The Jupiter Moons tool (Ctrl+J) shows the relative positions of Jupiter's\n"
-+"\t\t<p>The Jupiter Moons tool (Ctrl+J) shows the relative positions of "
-+"Jupiter's\n"
- "\t\t\tfour largest moons (Io, Europa, Ganymede and Callisto), as seen from\n"
- "\t\t\tEarth, and as a function of time.\n"
- "\t\t</p>\n"
- "\t\n"
- msgstr ""
--"\t\t "
--"<p>木星衛星工具（Ctrl+J）顯示從地球上在特定時間觀測木星與最大的四個衛星（艾奧（Io）、歐羅巴（Europa）、加尼美得（Ganymede)與卡利斯托（"
--"Callisto））的相對位置。</p>\n"
-+"\t\t <p>木星衛星工具（Ctrl+J）顯示從地球上在特定時間觀測木星與最大的四個衛星"
-+"（艾奧（Io）、歐羅巴（Europa）、加尼美得（Ganymede)與卡利斯托（Callisto））的"
-+"相對位置。</p>\n"
- "\t\n"
- 
- #: tips.cpp:318
- msgid ""
--"\t\t"
--"<p>You can export the sky image to a file using the \"Save Sky Image\"\n"
-+"\t\t<p>You can export the sky image to a file using the \"Save Sky Image\"\n"
- "\t\t\titem in the File menu, or by pressing Ctrl+I.  In addition, you can\n"
--"\t\t\trun KStars from a command prompt with the \"--dump\" argument to save a\n"
-+"\t\t\trun KStars from a command prompt with the \"--dump\" argument to save "
-+"a\n"
- "\t\t\tsky image to disk without even opening the program window.  This can\n"
- "\t\t\tbe used to generate dynamic wallpaper for your KDE desktop.\n"
- "\t\t</p>\n"
- "\t\n"
- msgstr ""
--"\t\t "
--"<p>您可以將天體圖影像匯出到檔案中。使用「檔案」＞「儲存天體影像」，或按下 Ctrl+I。此外，您可以從命令列執行 KStars，並給 --dump "
--"參數來儲存天體影像。這可以用於產生 KDE 桌面的動態桌布。</p>\n"
-+"\t\t <p>您可以將天體圖影像匯出到檔案中。使用「檔案」＞「儲存天體影像」，或按"
-+"下 Ctrl+I。此外，您可以從命令列執行 KStars，並給 --dump 參數來儲存天體影像。"
-+"這可以用於產生 KDE 桌面的動態桌布。</p>\n"
- "\t\n"
- 
- #: tips.cpp:329
- msgid ""
--"\t\t"
--"<p>To add your own custom Object Catalogs, select\n"
-+"\t\t<p>To add your own custom Object Catalogs, select\n"
- "\t\t\t\"Add Catalog\" from the Catalogs tab in the KStars Configuration "
- "window.\n"
- "\t\t\tSee the Handbook for instructions on formatting your catalog file.\n"
- "\t\t</p>\n"
- "\t\n"
- msgstr ""
--"\t\t "
--"<p>您可以從 KStars 設定視窗中的「星表」頁中新增您自訂的物件星表。</p>\n"
-+"\t\t <p>您可以從 KStars 設定視窗中的「星表」頁中新增您自訂的物件星表。</p>\n"
- "\t\n"
- 
- #: tips.cpp:338
- msgid ""
--"\t\t"
--"<p>To add your own custom image/information URLs to\n"
-+"\t\t<p>To add your own custom image/information URLs to\n"
- "\t\t\tany object, select \"Add Link...\" from the object's popup menu.\n"
- "\t\t</p>\n"
- "\t\n"
- msgstr ""
--"\t\t "
--"<p>要新增您自訂的影像/資訊網址到任何物件，請從彈出式選單中選擇「新增連結...」。</p>\n"
-+"\t\t <p>要新增您自訂的影像/資訊網址到任何物件，請從彈出式選單中選擇「新增連"
-+"結...」。</p>\n"
- "\t\n"
- 
- #: tips.cpp:346
- msgid ""
--"\t\t"
--"<p>You can adjust dozens of display options by clicking the\n"
--"\t\t\t\"configure\" Toolbar button, or selecting the \"Settings->"
--"Configure KStars...\"\n"
-+"\t\t<p>You can adjust dozens of display options by clicking the\n"
-+"\t\t\t\"configure\" Toolbar button, or selecting the \"Settings->Configure "
-+"KStars...\"\n"
- "\t\t\tmenu item.\n"
- "\t\t</p>\n"
- "\t\n"
- msgstr ""
--"\t\t "
--"<p>您可以點選設定工具列，或從「設定」＞「設定 KStars」來調整許多顯示選項。</p>\n"
-+"\t\t <p>您可以點選設定工具列，或從「設定」＞「設定 KStars」來調整許多顯示選"
-+"項。</p>\n"
- "\t\n"
- 
- #: tips.cpp:355
- msgid ""
--"\t\t"
--"<p>The on-screen Info Boxes can be hidden or shown using the\n"
-+"\t\t<p>The on-screen Info Boxes can be hidden or shown using the\n"
- "\t\t\t\"Settings->Info Boxes\" menu.\n"
- "\t\t</p>\n"
- "\t\n"
- msgstr ""
--"\t\t "
--"<p>您可以用「設定」＞「資訊盒」來決定是否要隱藏資訊盒。</p>\n"
-+"\t\t <p>您可以用「設定」＞「資訊盒」來決定是否要隱藏資訊盒。</p>\n"
- "\t\n"
- 
- #: tips.cpp:363
- msgid ""
--"\t\t"
--"<p>The Toolbars can be hidden or shown using the \"Settings->Toolbars\" menu.\n"
-+"\t\t<p>The Toolbars can be hidden or shown using the \"Settings->Toolbars\" "
-+"menu.\n"
- "\t\t</p>\n"
- "\t\n"
- msgstr ""
--"\t\t "
--"<p>您可以用「設定」＞「工具列」來決定是否要隱藏工具列。</p>\n"
-+"\t\t <p>您可以用「設定」＞「工具列」來決定是否要隱藏工具列。</p>\n"
- "\t\n"
- 
- #: tips.cpp:370
- msgid ""
--"\t\t"
--"<p>You can hide either the Ra/Dec or Az/Alt coordinate fields in the "
-+"\t\t<p>You can hide either the Ra/Dec or Az/Alt coordinate fields in the "
- "statusbar,\n"
- "\t\t\tor hide the stausbar completely, using the Settings|Statusbar menu.\n"
- "\t\t</p>\n"
- "\t\n"
- msgstr ""
--"\t\t "
--"<p>您可以用「設定」＞「狀態列」來決定是否要隱藏狀態列中的赤經/赤緯，方位/高度等座標欄位，或把整個狀態列隱藏起來。</p>\n"
-+"\t\t <p>您可以用「設定」＞「狀態列」來決定是否要隱藏狀態列中的赤經/赤緯，方"
-+"位/高度等座標欄位，或把整個狀態列隱藏起來。</p>\n"
- "\t\n"
- 
- #: tips.cpp:378
- msgid ""
--"\t\t"
--"<p>You can easily switch between predefined color schemes by selecting\n"
-+"\t\t<p>You can easily switch between predefined color schemes by selecting\n"
- "\t\t\tthe scheme from the \"Settings->Color Schemes\" menu.\n"
- "\t\t</p>\n"
- "\t\n"
- msgstr ""
--"\t\t "
--"<p>您可以用「設定」＞「顏色機制」來切換使用預設或自訂的顏色機制。</p>\n"
-+"\t\t <p>您可以用「設定」＞「顏色機制」來切換使用預設或自訂的顏色機制。</p>\n"
- "\t\n"
- 
- #: tips.cpp:386
- msgid ""
--"\t\t"
--"<p>You can define your own Geographic Locations.  Fill in the\n"
-+"\t\t<p>You can define your own Geographic Locations.  Fill in the\n"
- "\t\t\trequired fields in the \"Change Location\" Dialog and then press the\n"
- "\t\t\t\"Add to List\" button. Your Locations will be available in all\n"
- "\t\t\tfuture sessions.\n"
- "\t\t</p>\n"
- "\t\n"
- msgstr ""
--"\t\t "
--"<p>您可以定義自己的地理位置。您只要填入「改變位置」對話框中的必要欄位，然後按下「加到清單」鍵即可。</p>\n"
-+"\t\t <p>您可以定義自己的地理位置。您只要填入「改變位置」對話框中的必要欄位，"
-+"然後按下「加到清單」鍵即可。</p>\n"
- "\t\n"
- 
- #: tips.cpp:396
- msgid ""
--"\t\t"
--"<p>You can define your own Color Schemes.  Adjust the colors\n"
--"\t\t\tin the Configuration Window's \"Colors\" Tab, and then press the \"Save\n"
-+"\t\t<p>You can define your own Color Schemes.  Adjust the colors\n"
-+"\t\t\tin the Configuration Window's \"Colors\" Tab, and then press the "
-+"\"Save\n"
- "\t\t\tCurrent Colors\" button. Your Color Scheme will appear in the list in\n"
- "\t\t\tall future sessions.\n"
- "\t\t</p>\n"
- "\t\n"
- msgstr ""
--"\t\t "
--"<p>您可以定義自己的顏色機制。用設定視窗中的「顏色」來調整顏色，然後按下「儲存目前的顏色」鍵即可。</p>\n"
-+"\t\t <p>您可以定義自己的顏色機制。用設定視窗中的「顏色」來調整顏色，然後按下"
-+"「儲存目前的顏色」鍵即可。</p>\n"
- "\t\n"
- 
- #: tips.cpp:406
- msgid ""
--"\t\t"
--"<p>You can construct your own field-of-view (FOV) symbols, using the\n"
-+"\t\t<p>You can construct your own field-of-view (FOV) symbols, using the\n"
- "\t\t\tFOV Editor under the Tools menu.  You can set the angular size, the\n"
- "\t\t\tshape, and the color of your new symbols.\n"
- "\t\t</p>\n"
- "\t\n"
- msgstr ""
--"\t\t "
--"<p>您可以建立您自己的視場（Field of View，FOV）符號。使用「工具」＞「視場編輯器」，您可以設定角度大小，形狀及新符號的顏色。</p>\n"
-+"\t\t <p>您可以建立您自己的視場（Field of View，FOV）符號。使用「工具」＞「視"
-+"場編輯器」，您可以設定角度大小，形狀及新符號的顏色。</p>\n"
- "\t\n"
- 
- #: tips.cpp:415
- msgid ""
--"\t\t"
--"<p>The Advanced tab of the KStars Configuration window allows you to fine-tune\n"
-+"\t\t<p>The Advanced tab of the KStars Configuration window allows you to "
-+"fine-tune\n"
- "\t\t\tthe behavior of KStars. You can specify whether to correct for "
- "atmospheric\n"
- "\t\t\trefraction, and whether to use animated slewing. You can also specify "
-@@ -30687,102 +30768,95 @@
- "\t\t</p>\n"
- "\t\n"
- msgstr ""
--"\t\t "
--"<p>KStars 設定視窗中的「進階」頁能讓您微調 KStars "
--"的行為。您可以指定是否要修正大氣折射，或是使用動畫旋轉，或是在移動時是否要隱藏物件等等。</p>\n"
-+"\t\t <p>KStars 設定視窗中的「進階」頁能讓您微調 KStars 的行為。您可以指定是否"
-+"要修正大氣折射，或是使用動畫旋轉，或是在移動時是否要隱藏物件等等。</p>\n"
- "\t\n"
- 
- #: tips.cpp:425
- msgid ""
--"\t\t"
--"<p>KStars displays 126,000 stars, 13,000 deep-sky objects, 88 constellations,\n"
-+"\t\t<p>KStars displays 126,000 stars, 13,000 deep-sky objects, 88 "
-+"constellations,\n"
- "\t\t\tall planets, the Sun, the Moon, thousands of comets and asteroids, and "
- "the\n"
- "\t\t\tMilky Way.\n"
- "\t\t</p>\n"
- "\t\n"
- msgstr ""
--"\t\t "
--"<p>KStars 顯示 126,000 個星體，13,000 個深天空物件，88 "
--"個星座，太陽系所有的行星，太陽，及月球，還有數以千計的小行星與慧星，當然還有銀河。</p>\n"
-+"\t\t <p>KStars 顯示 126,000 個星體，13,000 個深天空物件，88 個星座，太陽系所"
-+"有的行星，太陽，及月球，還有數以千計的小行星與慧星，當然還有銀河。</p>\n"
- "\t\n"
- 
- #: tips.cpp:434
- msgid ""
--"\t\t"
--"<p>The line in the sky that the Sun and all the Planets seem to follow\n"
-+"\t\t<p>The line in the sky that the Sun and all the Planets seem to follow\n"
- "\t\t\tis called the Ecliptic.\n"
- "\t\t</p>\n"
- "\t\n"
- msgstr ""
--"\t\t "
--"<p>在天空中，太陽與其他行星遵循的動線稱為黃道。</p>\n"
-+"\t\t <p>在天空中，太陽與其他行星遵循的動線稱為黃道。</p>\n"
- "\t\n"
- 
- #: tips.cpp:442
- msgid ""
--"\t\t"
--"<p>Object positions in KStars include the effects of precession, nutation,\n"
--"\t\t\taberration, atmospheric refraction, and light travel time (for planets).\n"
-+"\t\t<p>Object positions in KStars include the effects of precession, "
-+"nutation,\n"
-+"\t\t\taberration, atmospheric refraction, and light travel time (for "
-+"planets).\n"
- "\t\t</p>\n"
- "\t\n"
- msgstr ""
--"\t\t "
--"<p>KStars 中的物件位置計算會包含歲差、擺動、光行差、大氣折射及光旅行時間等因素。</p>\n"
-+"\t\t <p>KStars 中的物件位置計算會包含歲差、擺動、光行差、大氣折射及光旅行時間"
-+"等因素。</p>\n"
- "\t\n"
- 
- #: tips.cpp:450
- msgid ""
--"\t\t"
--"<p>The nearest star to the Sun is Rigel Kentaurus (alpha Centauri).\n"
-+"\t\t<p>The nearest star to the Sun is Rigel Kentaurus (alpha Centauri).\n"
- "\t\t\tThe brightest star in the sky is Sirius (alpha Canis Majoris).\n"
- "\t\t</p>\n"
- "\t\n"
- msgstr ""
--"\t\t "
--"<p>最接近太陽的星球為南門二（Rigel Kentaurus，alpha Centauri）。天體圖中最亮的星為天狼星（Sirius，alpha Canis "
--"Majoris）。</p>\n"
-+"\t\t <p>最接近太陽的星球為南門二（Rigel Kentaurus，alpha Centauri）。天體圖中"
-+"最亮的星為天狼星（Sirius，alpha Canis Majoris）。</p>\n"
- "\t\n"
- 
- #: tips.cpp:458
- msgid ""
--"\t\t"
--"<p>The large group of galaxies between Leo, Virgo and Coma Berenices\n"
-+"\t\t<p>The large group of galaxies between Leo, Virgo and Coma Berenices\n"
- "\t\t\tis called the Virgo Cluster of Galaxies.\n"
- "\t\t</p>\n"
- "\t\n"
- msgstr ""
--"\t\t "
--"<p>在獅子座（Leo)，室女座（Virgo）與后髮座（Coma Berenices）之間最大群的銀河稱為室女座星系團（Virgo Cluster of "
--"Galaxies）。</p>\n"
-+"\t\t <p>在獅子座（Leo)，室女座（Virgo）與后髮座（Coma Berenices）之間最大群的"
-+"銀河稱為室女座星系團（Virgo Cluster of Galaxies）。</p>\n"
- "\t\n"
- 
- #: tips.cpp:466
- msgid ""
--"\t\t"
--"<p>The large group of clusters and nebulae near the south celestial pole\n"
-+"\t\t<p>The large group of clusters and nebulae near the south celestial "
-+"pole\n"
- "\t\t\tare objects in the Large Magellanic Cloud, which is a dwarf galaxy in\n"
- "\t\t\torbit around the Milky Way.\n"
- "\t\t</p>\n"
- "\t\n"
- msgstr ""
--"\t\t "
--"<p>靠近天體南極最大的星系團為大麥哲倫雲，在銀河軌道中的一個小銀河。</p>\n"
-+"\t\t <p>靠近天體南極最大的星系團為大麥哲倫雲，在銀河軌道中的一個小銀河。</"
-+"p>\n"
- "\t\n"
- 
- #: tips.cpp:475
- msgid ""
--"\t\t"
--"<p>The Messier Catalog is a list of 110 of the brightest non-stellar objects\n"
--"\t\t\tin the sky.  It includes such famous objects as the Orion Nebula (M 42), "
--"the\n"
-+"\t\t<p>The Messier Catalog is a list of 110 of the brightest non-stellar "
-+"objects\n"
-+"\t\t\tin the sky.  It includes such famous objects as the Orion Nebula (M "
-+"42), the\n"
- "\t\t\tAndromeda Galaxy (M 31), and the Pleiades (M 45).\n"
- "\t\t</p>\n"
- "\t\n"
- msgstr ""
--"\t\t "
--"<p>梅西爾星表是一份包含了在天體圖中 110 個最亮的非恆星的物件清單。它包括有名的像獵戶座星雲（Orion Nebula，M "
--"42），仙女座銀河（Andromeda Galaxy，M 31）及 Pleiades （M 45）等物件。</p>\n"
-+"\t\t <p>梅西爾星表是一份包含了在天體圖中 110 個最亮的非恆星的物件清單。它包括"
-+"有名的像獵戶座星雲（Orion Nebula，M 42），仙女座銀河（Andromeda Galaxy，M "
-+"31）及 Pleiades （M 45）等物件。</p>\n"
- "\t\n"
- 
- #: addlinkdialog.h:41
-@@ -30841,19 +30915,16 @@
- 
- #: tools/astrocalc.cpp:158
- msgid ""
--"<QT>Section for time-related astronomical calculations<UL><LI><B>Julian Day:</B> "
--"Julian Day/Calendar conversion</LI><LI><B>Sidereal Time:</B> "
--"Sidereal/Universal time conversion</LI><LI><B>Day duration:</B> "
--"Sunrise, Sunset and noon time and positions for those events</LI><LI><B>"
--"Equinoxes & Solstices:</B> Equinoxes, Solstices and duration of the seasons</LI>"
--"</UL></QT>"
--msgstr ""
--"<qt>跟時間有關的天文計算："
--"<ul> "
--"<li><b>儒略日：</b>日曆與儒略日的轉換</li>\n"
-+"<QT>Section for time-related astronomical calculations<UL><LI><B>Julian Day:"
-+"</B> Julian Day/Calendar conversion</LI><LI><B>Sidereal Time:</B> Sidereal/"
-+"Universal time conversion</LI><LI><B>Day duration:</B> Sunrise, Sunset and "
-+"noon time and positions for those events</LI><LI><B>Equinoxes & Solstices:</"
-+"B> Equinoxes, Solstices and duration of the seasons</LI></UL></QT>"
-+msgstr ""
-+"<qt>跟時間有關的天文計算：<ul> <li><b>儒略日：</b>日曆與儒略日的轉換</li>\n"
- "<li><b>恆星時間：</b>恆星時間與國際標準時間的轉換</li>\n"
--"<li><b>日間持續時間：</b>日出、日落與夜時間，還有相關位置</li> "
--"<li><b>春分、秋分、夏至與冬至：</b>包括這四個節氣，及季節持續時間。</li></ul></qt>"
-+"<li><b>日間持續時間：</b>日出、日落與夜時間，還有相關位置</li> <li><b>春分、"
-+"秋分、夏至與冬至：</b>包括這四個節氣，及季節持續時間。</li></ul></qt>"
- 
- #: tools/astrocalc.cpp:185
- msgid ""
-@@ -30861,23 +30932,20 @@
- "systems of coordinates<UL><LI><B>Precessor:</B> Precession of coordinates "
- "between epochs</LI><LI><B>Galactic:</B> Galactic/Equatorial coordinates "
- "conversion</LI><LI><B>Apparent:</B> Computation of current equatorial "
--"coordinates from a given epoch</LI><LI><B>Ecliptic:</B> "
--"Ecliptic/Equatorial coordinates conversion</LI><LI><B>Horizontal:</B> "
--"Computation of azimuth and elevation for a given source, time, and location on "
--"the Earth</LI><LI><B>Angular Distance:</B> Computation of angular distance "
--"between two objects whose positions are given in equatorial coordinates</LI><LI>"
--"<B>LSR Velocity:</B> Computation of the heliocentric, geocentric and "
--"topocentric radial velocity of a source from its LSR velocity</LI></UL></QT>"
--msgstr ""
--"<qt>跟不同天文座標系統轉換有關的演算法： "
--"<ul>"
--"<li><b>歲差：</b>紀元間歲差座標轉換</li> "
--"<li><b>銀河：</b>銀河/赤道座標系轉換</li> "
--"<li><b>外顯：</b>計算給定紀元的赤道座標</li> "
--"<li><b>黃道：</b>黃道/赤道座標轉換</li> "
--"<li><b>水平：</b>給定來源與時間，計算地球上的位置方位與仰角</li> "
--"<li><b>角距離：</b>給定兩個物件的赤道座標，計算兩者間的角距離</li> "
--"<li><b>LSR 速率：</b>從來源的 LSR 速率計算對日、對地球與對地面座標的速度。</li></ul></qt>"
-+"coordinates from a given epoch</LI><LI><B>Ecliptic:</B> Ecliptic/Equatorial "
-+"coordinates conversion</LI><LI><B>Horizontal:</B> Computation of azimuth and "
-+"elevation for a given source, time, and location on the Earth</"
-+"LI><LI><B>Angular Distance:</B> Computation of angular distance between two "
-+"objects whose positions are given in equatorial coordinates</LI><LI><B>LSR "
-+"Velocity:</B> Computation of the heliocentric, geocentric and topocentric "
-+"radial velocity of a source from its LSR velocity</LI></UL></QT>"
-+msgstr ""
-+"<qt>跟不同天文座標系統轉換有關的演算法： <ul><li><b>歲差：</b>紀元間歲差座標"
-+"轉換</li> <li><b>銀河：</b>銀河/赤道座標系轉換</li> <li><b>外顯：</b>計算給定"
-+"紀元的赤道座標</li> <li><b>黃道：</b>黃道/赤道座標轉換</li> <li><b>水平：</b>"
-+"給定來源與時間，計算地球上的位置方位與仰角</li> <li><b>角距離：</b>給定兩個物"
-+"件的赤道座標，計算兩者間的角距離</li> <li><b>LSR 速率：</b>從來源的 LSR 速率"
-+"計算對日、對地球與對地面座標的速度。</li></ul></qt>"
- 
- #: tools/astrocalc.cpp:221
- msgid ""
-@@ -30885,20 +30953,18 @@
- "the Earth<UL><LI><B>Geodetic Coordinates:</B> Geodetic/XYZ coordinate "
- "conversion</LI></UL></QT>"
- msgstr ""
--"<qt>與地球座標系轉換有關的演算法： "
--"<ul>"
--"<li><b>對地球座標：</b>以地球為中心/XYZ 軸的座標轉換。</li></ul></qt>"
-+"<qt>與地球座標系轉換有關的演算法： <ul><li><b>對地球座標：</b>以地球為中心/"
-+"XYZ 軸的座標轉換。</li></ul></qt>"
- 
- #: tools/astrocalc.cpp:240
- msgid ""
- "<QT>Section with algorithms regarding information on solar system bodies "
--"coordinates and times<UL><LI><B>Planets Coordinates:</B> "
--"Coordinates for the planets, moon and sun  at a given time and from a given "
--"position on Earth </LI></UL></QT>"
--msgstr ""
--"<qt>與太陽系星體座標與時間資訊有關的演算法： "
--"<ul>"
--"<li><b>行星座標：</b>給定時間及地球上的位置，計算行星，月球及太陽的座標。</li></ul></qt>"
-+"coordinates and times<UL><LI><B>Planets Coordinates:</B> Coordinates for the "
-+"planets, moon and sun  at a given time and from a given position on Earth </"
-+"LI></UL></QT>"
-+msgstr ""
-+"<qt>與太陽系星體座標與時間資訊有關的演算法： <ul><li><b>行星座標：</b>給定時"
-+"間及地球上的位置，計算行星，月球及太陽的座標。</li></ul></qt>"
- 
- #: tools/jmoontool.cpp:34
- msgid "Jupiter Moons Tool"
-@@ -31006,13 +31072,17 @@
- msgid ""
- "Invalid date format. Correct format is mm/dd/yyyy or JD, leave 'default' to "
- "generate light curves for the past 500 days."
--msgstr "不合法的日期格式。正確的格式為 mm/dd/yyyy 或 JD，「預設」則產生過去五百天的光曲線。"
-+msgstr ""
-+"不合法的日期格式。正確的格式為 mm/dd/yyyy 或 JD，「預設」則產生過去五百天的光"
-+"曲線。"
- 
- #: tools/lcgenerator.cpp:287
- msgid ""
- "Invalid date format. Correct format is mm/dd/yyyy or JD, leave 'default' to "
- "generate light curves until today."
--msgstr "不合法的日期格式。正確的格式為 mm/dd/yyyy 或 JD，「預設」則產生到今天為止的光曲線。"
-+msgstr ""
-+"不合法的日期格式。正確的格式為 mm/dd/yyyy 或 JD，「預設」則產生到今天為止的光"
-+"曲線。"
- 
- #: tools/lcgenerator.cpp:327 tools/lcgenerator.cpp:363
- #, c-format
-@@ -31021,7 +31091,9 @@
- 
- #: tools/lcgenerator.cpp:400
- msgid "Light Curve produced by the American Amateur Variable Star Observers"
--msgstr "由美國業餘觀星協會（American Amateur Variable Star Observers，AAVSO）繪製的光曲線"
-+msgstr ""
-+"由美國業餘觀星協會（American Amateur Variable Star Observers，AAVSO）繪製的光"
-+"曲線"
- 
- #: tools/lcgenerator.cpp:462
- msgid "AAVSO Star list downloaded successfully."
-@@ -31065,7 +31137,7 @@
- 
- #: tools/modcalcplanets.cpp:400
- msgid "Incorrect number of fields in line %1: "
--msgstr "在第 %1 行欄位數不正確："
-+msgstr "在第 %1 列欄位數不正確："
- 
- #: tools/modcalcplanets.cpp:401
- msgid "Present fields %1. "
-@@ -31081,15 +31153,15 @@
- 
- #: tools/modcalcplanets.cpp:422
- msgid " in line %1: "
--msgstr "於第 %1 行："
-+msgstr "於第 %1 列："
- 
- #: tools/modcalcplanets.cpp:444
- msgid "Line %1 contains an invalid time"
--msgstr "第 %1 行包含不合法的時間"
-+msgstr "第 %1 列包含不合法的時間"
- 
- #: tools/modcalcplanets.cpp:464
- msgid "Line %1 contains an invalid date: "
--msgstr "第 %1 行包含不合法的日期："
-+msgstr "第 %1 列包含不合法的日期："
- 
- #: tools/modcalcplanets.cpp:586
- msgid "Errors found while parsing some lines in the input file"
-@@ -31223,22 +31295,22 @@
- 
- #: tools/planetviewer.cpp:45
- msgid ""
--"_: axis label for x-coordinate of solar system viewer.  AU means astronomical "
--"unit.\n"
-+"_: axis label for x-coordinate of solar system viewer.  AU means "
-+"astronomical unit.\n"
- "X-position (AU)"
- msgstr "X 位置（天文單位）"
- 
- #: tools/planetviewer.cpp:46
- msgid ""
--"_: axis label for y-coordinate of solar system viewer.  AU means astronomical "
--"unit.\n"
-+"_: axis label for y-coordinate of solar system viewer.  AU means "
-+"astronomical unit.\n"
- "Y-position (AU)"
- msgstr "Y 位置（天文單位）"
- 
- #: tools/scriptbuilder.cpp:120
- msgid ""
--"Point the display at the specified location. %1 can be the name of an object, a "
--"cardinal point on the compass, or 'zenith'."
-+"Point the display at the specified location. %1 can be the name of an "
-+"object, a cardinal point on the compass, or 'zenith'."
- msgstr "根據指定的位置來指向。%1 可以是物件的名稱，羅盤上的基點，或是天頂。"
- 
- #: tools/scriptbuilder.cpp:122
-@@ -31249,8 +31321,8 @@
- 
- #: tools/scriptbuilder.cpp:124
- msgid ""
--"Point the display at the specified Alt/Az coordinates.  %1 and %2 are expressed "
--"in Degrees."
-+"Point the display at the specified Alt/Az coordinates.  %1 and %2 are "
-+"expressed in Degrees."
- msgstr "根據指定的高度/方位座標來指向。%1 跟 %2 以度為單位。"
- 
- #: tools/scriptbuilder.cpp:126
-@@ -31279,8 +31351,8 @@
- 
- #: tools/scriptbuilder.cpp:133
- msgid ""
--"Halt script execution until the key %1 is pressed.  Only single-key strokes are "
--"possible; use 'space' for the spacebar."
-+"Halt script execution until the key %1 is pressed.  Only single-key strokes "
-+"are possible; use 'space' for the spacebar."
- msgstr "暫停執行文稿直到按下 %1 鍵。只能有一個鍵，用 space 表示空白鍵。"
- 
- #: tools/scriptbuilder.cpp:135
-@@ -31313,7 +31385,9 @@
- "Print the sky image to a printer or file.  If %1 is true, it will show the "
- "print dialog.  If %2 is true, it will use the Star Chart color scheme for "
- "printing."
--msgstr "將天體影像列印到印表機或檔案。如果 %1 為真，則會顯示列印對話框。如果 %2 為真，則列印時會使用星體圖表顏色機制。"
-+msgstr ""
-+"將天體影像列印到印表機或檔案。如果 %1 為真，則會顯示列印對話框。如果 %2 為"
-+"真，則列印時會使用星體圖表顏色機制。"
- 
- #: tools/scriptbuilder.cpp:143
- msgid "Halt the simulation clock."
-@@ -31327,7 +31401,8 @@
- msgid ""
- "Set the timescale of the simulation clock to %1.  1.0 means real-time; 2.0 "
- "means twice real-time; etc."
--msgstr "設定模擬時鐘的時間刻度為 %1。1.0 表示實際時間，2.0 表示兩倍實際時間等等。"
-+msgstr ""
-+"設定模擬時鐘的時間刻度為 %1。1.0 表示實際時間，2.0 表示兩倍實際時間等等。"
- 
- #: tools/scriptbuilder.cpp:150
- msgid "Establish an INDI device either in local mode or server mode."
-@@ -31355,12 +31430,14 @@
- msgid ""
- "Set the telescope target coordinates to the RA/Dec coordinates.  RA is "
- "expressed in Hours; DEC is expressed in Degrees."
--msgstr "設定望遠鏡目標座標為赤經/赤緯座標。赤經以時（Hour）為單位，赤緯以度（Degree）為單位。"
-+msgstr ""
-+"設定望遠鏡目標座標為赤經/赤緯座標。赤經以時（Hour）為單位，赤緯以度（Degree）"
-+"為單位。"
- 
- #: tools/scriptbuilder.cpp:172
- msgid ""
--"Set the telescope target coorinates to the RA/Dec coordinates of the selected "
--"object."
-+"Set the telescope target coorinates to the RA/Dec coordinates of the "
-+"selected object."
- msgstr "設定望遠鏡目標座標為所選物件的赤經/赤緯座標。"
- 
- #: tools/scriptbuilder.cpp:176
-@@ -31379,9 +31456,11 @@
- 
- #: tools/scriptbuilder.cpp:187
- msgid ""
--"Pause script execution until action returns with OK status. The action can be "
--"the name of any INDI property supported by the device."
--msgstr "暫停執行文稿，直到動作回覆狀態為 OK。這個動作可以是任何 INDI 裝置所支援的屬性名稱。"
-+"Pause script execution until action returns with OK status. The action can "
-+"be the name of any INDI property supported by the device."
-+msgstr ""
-+"暫停執行文稿，直到動作回覆狀態為 OK。這個動作可以是任何 INDI 裝置所支援的屬性"
-+"名稱。"
- 
- #: tools/scriptbuilder.cpp:190
- msgid ""
-@@ -31391,15 +31470,16 @@
- 
- #: tools/scriptbuilder.cpp:194
- msgid ""
--"Start moving the focuser in the direction Dir, and for the duration specified "
--"by setINDIFocusTimeout."
-+"Start moving the focuser in the direction Dir, and for the duration "
-+"specified by setINDIFocusTimeout."
- msgstr "開始以 Dir 方向移動焦距放大鏡，時間由 setINDIFocusTimeout 指定。"
- 
- #: tools/scriptbuilder.cpp:198
- msgid ""
- "Set the telescope focuser timer in seconds. This is the duration of any "
- "focusing procedure performed by calling startINDIFocus."
--msgstr "設定望遠鏡對焦時間（秒）。這是呼叫 startINDIFocus 時任何對焦程序要花的時間。"
-+msgstr ""
-+"設定望遠鏡對焦時間（秒）。這是呼叫 startINDIFocus 時任何對焦程序要花的時間。"
- 
- #: tools/scriptbuilder.cpp:202
- msgid "Set the target CCD chip temperature."
-@@ -31411,10 +31491,11 @@
- 
- #: tools/scriptbuilder.cpp:210
- msgid ""
--"Set the CCD camera frame type. Available options are FRAME_LIGHT, FRAME_BIAS, "
--"FRAME_DARK, and FRAME_FLAT."
-+"Set the CCD camera frame type. Available options are FRAME_LIGHT, "
-+"FRAME_BIAS, FRAME_DARK, and FRAME_FLAT."
- msgstr ""
--"設定 CCD 相機 frame 型態。選項包括 FRAME_LIGHT，FRAME_BIAS，FRAME_DARK 與 FRAME_FLAT。"
-+"設定 CCD 相機 frame 型態。選項包括 FRAME_LIGHT，FRAME_BIAS，FRAME_DARK 與 "
-+"FRAME_FLAT。"
- 
- #: tools/scriptbuilder.cpp:214
- msgid "Start Camera/CCD exposure. The duration is in seconds."
-@@ -31742,7 +31823,8 @@
- 
- #: tools/scriptbuilder.cpp:652
- msgid ""
--"Select shape for the FOV symbol (0=Square, 1=Circle, 2=Crosshairs, 4=Bullseye)"
-+"Select shape for the FOV symbol (0=Square, 1=Circle, 2=Crosshairs, "
-+"4=Bullseye)"
- msgstr "選擇視場符號的形狀（0：方形，1：圓形，2：十字型，4：Bullseye）"
- 
- #: tools/scriptbuilder.cpp:652
-@@ -31831,14 +31913,14 @@
- 
- #: tools/scriptbuilder.cpp:860
- msgid ""
--"The current script has unsaved changes.  Would you like to save before closing "
--"it?"
-+"The current script has unsaved changes.  Would you like to save before "
-+"closing it?"
- msgstr "目前的文稿有未儲存的改變。您關閉前要先儲存嗎？"
- 
- #: tools/scriptbuilder.cpp:993
- #, c-format
- msgid "Could not parse script.  Line was: %1"
--msgstr "無法剖析文稿。在第 %1 行"
-+msgstr "無法剖析文稿。在第 %1 列"
- 
- #: tools/scriptbuilder.cpp:1311 tools/scriptbuilder.cpp:1313
- #: tools/scriptbuilder.cpp:1349 tools/scriptbuilder.cpp:2050
-diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdeedu/ktouch.po kde-i18n-zh_TW-3.5.10/messages/kdeedu/ktouch.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdeedu/ktouch.po	2008-08-19 20:43:13.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdeedu/ktouch.po	2011-11-11 15:45:17.000000000 +0100
-@@ -7,8 +7,7 @@
- "Project-Id-Version: ktouch\n"
- "POT-Creation-Date: 2008-07-08 01:24+0200\n"
- "PO-Revision-Date: 2007-04-16 12:30+0800\n"
--"Last-Translator: Frank Weng (a.k.a. Franklin) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Chinese Traditional <zh-l10n@linux.org.tw>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
-@@ -85,11 +84,11 @@
- 
- #: ktouch.cpp:686
- msgid "&Open lecture..."
--msgstr "開啟課程(&O)..."
-+msgstr "開啟課程(&O)…"
- 
- #: ktouch.cpp:688
- msgid "&Edit lecture..."
--msgstr "編輯課程(&E)..."
-+msgstr "編輯課程(&E)…"
- 
- #: ktouch.cpp:690
- msgid "&Edit color scheme..."
-@@ -113,7 +112,7 @@
- 
- #: ktouch.cpp:714
- msgid "&Keyboard Layouts"
--msgstr "鍵盤佈局(&K)"
-+msgstr "鍵盤布局(&K)"
- 
- #: ktouch.cpp:720
- msgid "&Color Schemes"
-@@ -174,7 +173,7 @@
- #: ktouchkeyboard.cpp:186 ktouchkeyboard.cpp:238 ktouchkeyboardeditor.cpp:136
- #: ktouchkeyboardeditor.cpp:176
- msgid "untitled keyboard layout"
--msgstr "未命名鍵盤佈局"
-+msgstr "未命名鍵盤布局"
- 
- #: ktouchkeyboard.cpp:289
- msgid ""
-@@ -192,7 +191,7 @@
- 
- #: ktouchkeyboardeditor.cpp:93
- msgid "Save Keyboard Layout"
--msgstr "儲存鍵盤佈局"
-+msgstr "儲存鍵盤布局"
- 
- #: ktouchkeyboardeditor.cpp:170
- msgid "Keyboard dimensions: %1 x %2"
-@@ -200,7 +199,7 @@
- 
- #: ktouchkeyboardeditor.cpp:188
- msgid "Open keyboard file ..."
--msgstr "開啟鍵盤檔案..."
-+msgstr "開啟鍵盤檔案…"
- 
- #: ktouchkeyboardeditor.cpp:189
- msgid "Which keyboard file would you like to edit?"
-@@ -244,17 +243,19 @@
- 
- #: ktouchkeyboardwidget.cpp:54
- msgid "Could not read the keyboard layout file '%1'. "
--msgstr "無法讀取鍵盤佈局檔案 %1。"
-+msgstr "無法讀取鍵盤布局檔案 %1。"
- 
- #: ktouchkeyboardwidget.cpp:59
- msgid "Could not download/open keyboard layout file from '%1'."
--msgstr "無法從 %1 下載/開啟鍵盤佈局檔。"
-+msgstr "無法從 %1 下載/開啟鍵盤布局檔。"
- 
- #: ktouchkeyboardwidget.cpp:135
- msgid ""
- "Error reading the keyboard layout; the default number keypad will be created "
- "instead. You can choose another keyboard layout in the preferences dialog."
--msgstr "讀取鍵盤佈局時發生錯誤；將會改建立預設的數字鍵。您可以在喜好設定中選擇其他的鍵盤佈局。"
-+msgstr ""
-+"讀取鍵盤布局時發生錯誤；將會改建立預設的數字鍵。您可以在喜好設定中選擇其他的"
-+"鍵盤布局。"
- 
- #: ktouchkeyboardwidget.cpp:368
- msgid "Could not open file."
-@@ -262,11 +263,11 @@
- 
- #: ktouchkeyboardwidget.cpp:424
- msgid "Missing key type in line '%1'."
--msgstr "在第 %1 行找不到鍵盤型態。"
-+msgstr "在第 %1 列找不到鍵盤型態。"
- 
- #: ktouchlecture.cpp:104
- msgid "A default lecture..."
--msgstr "預設課程..."
-+msgstr "預設課程…"
- 
- #: ktouchlectureeditor.cpp:115
- msgid "Save Training Lecture"
-@@ -292,7 +293,7 @@
- 
- #: ktouchlectureeditor.cpp:354
- msgid "Enter your lines here..."
--msgstr "請在此輸入行數..."
-+msgstr "請在此輸入列數…"
- 
- #: ktouchlectureeditor.cpp:365
- msgid "Open Lecture File"
-@@ -368,7 +369,7 @@
- 
- #: ktouchstatistics.cpp:75
- msgid "Default level..."
--msgstr "預設等級..."
-+msgstr "預設等級…"
- 
- #: ktouchstatistics.cpp:78
- msgid "***current***  "
-@@ -416,15 +417,15 @@
- 
- #: ktouchtrainer.cpp:271
- msgid "Starting training session: Waiting for first keypress..."
--msgstr "開始訓練階段：等待按下第一個鍵..."
-+msgstr "開始訓練階段：等待按下第一個鍵…"
- 
- #: ktouchtrainer.cpp:290
- msgid "Training session paused. Training continues on next keypress..."
--msgstr "暫停訓練階段。訓練將暫停到按下一個鍵後繼續..."
-+msgstr "暫停訓練階段。訓練將暫停到按下一個鍵後繼續…"
- 
- #: ktouchtrainer.cpp:303
- msgid "Training session! The time is running..."
--msgstr "訓練階段。時間正在流失中..."
-+msgstr "訓練階段。時間正在流失中…"
- 
- #: ktouchtrainer.cpp:391
- msgid "You rock!"
-@@ -608,19 +609,19 @@
- #: rc.cpp:93
- #, no-c-format
- msgid "Keyboard Layout Editor"
--msgstr "鍵盤佈局編輯器"
-+msgstr "鍵盤布局編輯器"
- 
- #. i18n: file ktouchkeyboardeditor_dlg.ui line 35
- #: rc.cpp:96 rc.cpp:183
- #, no-c-format
- msgid "Change Font..."
--msgstr "變更字型..."
-+msgstr "變更字型…"
- 
- #. i18n: file ktouchkeyboardeditor_dlg.ui line 105
- #: rc.cpp:111
- #, no-c-format
- msgid "Keyboard Layout"
--msgstr "鍵盤佈局"
-+msgstr "鍵盤布局"
- 
- #. i18n: file ktouchkeyboardeditor_dlg.ui line 116
- #: rc.cpp:114
-@@ -638,13 +639,13 @@
- #: rc.cpp:120
- #, no-c-format
- msgid "Add..."
--msgstr "新增..."
-+msgstr "新增…"
- 
- #. i18n: file ktouchkeyboardeditor_dlg.ui line 207
- #: rc.cpp:123
- #, no-c-format
- msgid "Edit..."
--msgstr "編輯..."
-+msgstr "編輯…"
- 
- #. i18n: file ktouchkeyboardeditor_dlg.ui line 233
- #: rc.cpp:129
-@@ -758,7 +759,7 @@
- #: rc.cpp:192
- #, no-c-format
- msgid "Save &As..."
--msgstr "另存為(&A)..."
-+msgstr "另存為(&A)…"
- 
- #. i18n: file ktouchopenrequest_dlg.ui line 16
- #: rc.cpp:198
-@@ -824,14 +825,15 @@
- #: rc.cpp:252
- #, no-c-format
- msgid ""
--"You can choose here the color scheme for displaying the keyboard. <i>"
--"Black & White</i> will display all keyboard letters black on white, <i>"
--"Classic</i> will colorize the same color for each finger, <i>Deep Blue</i> "
--"will display the keyboard in different deep blue colors and <i>Stripy</i> "
--"will alternate blue and gray for letters corresponding to same finger."
-+"You can choose here the color scheme for displaying the keyboard. <i>Black & "
-+"White</i> will display all keyboard letters black on white, <i>Classic</i> "
-+"will colorize the same color for each finger, <i>Deep Blue</i> will display "
-+"the keyboard in different deep blue colors and <i>Stripy</i> will alternate "
-+"blue and gray for letters corresponding to same finger."
- msgstr ""
--"您可以在此選擇顯示鍵盤的顏色機制。<i>黑與白</i>表示所有的鍵盤字母都是白底黑字。<i>傳統</i>會在用到同一根指頭的範圍內用同樣的顏色。<i>"
--"深藍</i>會顯示深藍色，而<i>條紋狀</i>則用藍色與灰色交替顯示同一根指頭的範圍。"
-+"您可以在此選擇顯示鍵盤的顏色機制。<i>黑與白</i>表示所有的鍵盤字母都是白底黑"
-+"字。<i>傳統</i>會在用到同一根指頭的範圍內用同樣的顏色。<i>深藍</i>會顯示深藍"
-+"色，而<i>條紋狀</i>則用藍色與灰色交替顯示同一根指頭的範圍。"
- 
- #. i18n: file ktouchprefcolorslayout.ui line 107
- #: rc.cpp:255
-@@ -857,7 +859,7 @@
- msgid ""
- "You can change here the background color for the teacher's line (the line of "
- "letters you have to type.)"
--msgstr "您可以在此改變教師行（也就是您要照著打字的那一行）的背景顏色"
-+msgstr "您可以在此改變教師行（也就是您要照著打字的那一列）的背景顏色"
- 
- #. i18n: file ktouchprefcolorslayout.ui line 154
- #: rc.cpp:267
-@@ -881,7 +883,7 @@
- #: rc.cpp:276
- #, no-c-format
- msgid "Here you can change the color of the text you type in the student line."
--msgstr "您可以在此改變學生行（也就是您打字的那一行）的文字顏色"
-+msgstr "您可以在此改變學生行（也就是您打字的那一列）的文字顏色"
- 
- #. i18n: file ktouchprefcolorslayout.ui line 241
- #: rc.cpp:279 rc.cpp:291 rc.cpp:309
-@@ -925,10 +927,12 @@
- #, no-c-format
- msgid ""
- "When you have checked 'Use different color on error in the typing line', you "
--"can then choose a color for the text of errors. You make an error when you type "
--"a wrong letter in the student line. This is a way to make your errors more "
--"visible."
--msgstr "若您勾選了「打字行中出現錯誤時用不同的顏色」，您可以選擇打錯字時的文字顏色。這會讓您知道您打錯字了。"
-+"can then choose a color for the text of errors. You make an error when you "
-+"type a wrong letter in the student line. This is a way to make your errors "
-+"more visible."
-+msgstr ""
-+"若您勾選了「打字行中出現錯誤時用不同的顏色」，您可以選擇打錯字時的文字顏色。"
-+"這會讓您知道您打錯字了。"
- 
- #. i18n: file ktouchprefcolorslayout.ui line 466
- #: rc.cpp:312
-@@ -942,9 +946,11 @@
- msgid ""
- "When you have checked 'Use different color on error in the typing line', you "
- "can then choose a color for the background of errors. You make an error when "
--"you type a wrong letter in the student line. This is a way to make your errors "
--"more visible."
--msgstr "若您勾選了「打字行中出現錯誤時用不同的顏色」，您可以選擇打錯字時的背景顏色。這會讓您知道您打錯字了。"
-+"you type a wrong letter in the student line. This is a way to make your "
-+"errors more visible."
-+msgstr ""
-+"若您勾選了「打字行中出現錯誤時用不同的顏色」，您可以選擇打錯字時的背景顏色。"
-+"這會讓您知道您打錯字了。"
- 
- #. i18n: file ktouchprefgenerallayout.ui line 36
- #: rc.cpp:321
-@@ -987,8 +993,8 @@
- #: rc.cpp:339
- #, no-c-format
- msgid ""
--"If this is checked (default) a sound will be played each time you automatically "
--"change of level."
-+"If this is checked (default) a sound will be played each time you "
-+"automatically change of level."
- msgstr "勾選此選項的話，在自動變更等級時會播放音效（預設是勾選）。"
- 
- #. i18n: file ktouchprefgenerallayout.ui line 77
-@@ -1044,10 +1050,12 @@
- #, no-c-format
- msgid ""
- "This button will display a font dialog where you can change the font for the "
--"student and the teacher lines. When you leave the font dialog, the new font is "
--"previewed in the line below and only applied when you click the Apply button "
--"below."
--msgstr "這個按鍵會顯示字型對話框，讓您變更學生行與教師行的字型。要套用新的字型請按「套用」鍵。"
-+"student and the teacher lines. When you leave the font dialog, the new font "
-+"is previewed in the line below and only applied when you click the Apply "
-+"button below."
-+msgstr ""
-+"這個按鍵會顯示字型對話框，讓您變更學生行與教師行的字型。要套用新的字型請按"
-+"「套用」鍵。"
- 
- #. i18n: file ktouchprefgenerallayout.ui line 303
- #: rc.cpp:369
-@@ -1059,8 +1067,8 @@
- #: rc.cpp:372
- #, no-c-format
- msgid ""
--"If you want to override the font of the training lecture check this box and set "
--"your own font."
-+"If you want to override the font of the training lecture check this box and "
-+"set your own font."
- msgstr "如果您要覆寫訓練課程的字型，請勾選此項並設定您自己的字型。"
- 
- #. i18n: file ktouchprefgenerallayout.ui line 309
-@@ -1072,7 +1080,8 @@
- "sliding line. If you check this button you can choose your own font and "
- "override the lecture font."
- msgstr ""
--"大部份的課程會有一個建議使用的字型。這對不是很常用的語言來說是有必要的，因為若用錯字型可能字元的顯示或有問題。如果勾選此選項您可以選用自己的字型。"
-+"大部份的課程會有一個建議使用的字型。這對不是很常用的語言來說是有必要的，因為"
-+"若用錯字型可能字元的顯示或有問題。如果勾選此選項您可以選用自己的字型。"
- 
- #. i18n: file ktouchprefkeyboardlayout.ui line 41
- #: rc.cpp:381
-@@ -1090,8 +1099,8 @@
- #: rc.cpp:387
- #, no-c-format
- msgid ""
--"This highlights on the keyboard the key you have to type next. It is easier to "
--"type when this is checked."
-+"This highlights on the keyboard the key you have to type next. It is easier "
-+"to type when this is checked."
- msgstr "在鍵盤上標示您應該按的按鍵。"
- 
- #. i18n: file ktouchprefkeyboardlayout.ui line 55
-@@ -1110,8 +1119,8 @@
- #: rc.cpp:396
- #, no-c-format
- msgid ""
--"If checked you can specify your own keyboard font instead of the predefined one "
--"of the keyboard layout."
-+"If checked you can specify your own keyboard font instead of the predefined "
-+"one of the keyboard layout."
- msgstr "勾選此選項的話，您可以指定您自己的鍵盤字型。"
- 
- #. i18n: file ktouchprefkeyboardlayout.ui line 94
-@@ -1119,10 +1128,12 @@
- #, no-c-format
- msgid ""
- "Every keyboard layout may specify its own font. If the predefined font of a "
--"certain keyboard layout does not work or you would like to have your own, check "
--"this button. You may then choose your own font that will be used to draw the "
--"characters on the keys."
--msgstr "每個鍵盤佈局會指定自己的字型。如果鍵盤佈局定義的字型不能用，或是您想要用自己的字型，就勾選此選項並選取自己想要的字型。"
-+"certain keyboard layout does not work or you would like to have your own, "
-+"check this button. You may then choose your own font that will be used to "
-+"draw the characters on the keys."
-+msgstr ""
-+"每個鍵盤布局會指定自己的字型。如果鍵盤布局定義的字型不能用，或是您想要用自己"
-+"的字型，就勾選此選項並選取自己想要的字型。"
- 
- #. i18n: file ktouchprefkeyboardlayout.ui line 102
- #: rc.cpp:402
-@@ -1298,10 +1309,13 @@
- #: rc.cpp:501
- #, no-c-format
- msgid ""
--"Here the characters are listed that you have missed during the typing test. The "
--"percentage shows the ratio of how often a key was missed versus how often the "
--"key was pressed in total. Large numbers indicate that the key was missed a lot."
--msgstr "您在打字測驗時打錯的字元列在下面。百分比顯示這個鍵被打錯的次數與總共次數的比例。數值越大表示這個鍵越容易被打錯。"
-+"Here the characters are listed that you have missed during the typing test. "
-+"The percentage shows the ratio of how often a key was missed versus how "
-+"often the key was pressed in total. Large numbers indicate that the key was "
-+"missed a lot."
-+msgstr ""
-+"您在打字測驗時打錯的字元列在下面。百分比顯示這個鍵被打錯的次數與總共次數的比"
-+"例。數值越大表示這個鍵越容易被打錯。"
- 
- #. i18n: file ktouchstatistics_dlg.ui line 295
- #: rc.cpp:504 rc.cpp:588
-@@ -1423,11 +1437,13 @@
- #: rc.cpp:585
- #, no-c-format
- msgid ""
--"Here the characters are listed that you have missed during the typing test. The "
--"percentage shows the ratio of how often a key was missed versus how often the "
--"key was pressed correctly. Large numbers indicate that the key was missed a "
--"lot."
--msgstr "您在打字測驗時打錯的字元列在下面。百分比顯示這個鍵被打錯的次數與總共次數的比例。數值越大表示這個鍵越容易被打錯。"
-+"Here the characters are listed that you have missed during the typing test. "
-+"The percentage shows the ratio of how often a key was missed versus how "
-+"often the key was pressed correctly. Large numbers indicate that the key was "
-+"missed a lot."
-+msgstr ""
-+"您在打字測驗時打錯的字元列在下面。百分比顯示這個鍵被打錯的次數與總共次數的比"
-+"例。數值越大表示這個鍵越容易被打錯。"
- 
- #. i18n: file ktouchstatistics_dlg.ui line 921
- #: rc.cpp:624
-@@ -1511,8 +1527,8 @@
- #: rc.cpp:675
- #, no-c-format
- msgid ""
--"Pressing this button will erase the whole training statistics for the current "
--"user."
-+"Pressing this button will erase the whole training statistics for the "
-+"current user."
- msgstr "按下此鍵會清除目前使用者的整個訓練統計。"
- 
- #. i18n: file ktouchstatuslayout.ui line 32
-@@ -1561,8 +1577,8 @@
- #: rc.cpp:702
- #, no-c-format
- msgid ""
--"This shows how fast you are typing. It measures the typing speed in characters "
--"per minute."
-+"This shows how fast you are typing. It measures the typing speed in "
-+"characters per minute."
- msgstr "顯示您打字有多快。它是以每分鐘的字元數為單位。"
- 
- #. i18n: file ktouchstatuslayout.ui line 248
-diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdeedu/kturtle.po kde-i18n-zh_TW-3.5.10/messages/kdeedu/kturtle.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdeedu/kturtle.po	2007-07-12 10:27:46.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdeedu/kturtle.po	2011-11-11 15:45:17.000000000 +0100
-@@ -6,8 +6,7 @@
- "Project-Id-Version: kturtle\n"
- "POT-Creation-Date: 2007-06-18 01:16+0200\n"
- "PO-Revision-Date: 2007-01-09 12:44+0800\n"
--"Last-Translator: Frank Weng (a.k.a. Franklin) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Chinese Traditional <zh-l10n@linux.org.tw>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
-@@ -52,9 +51,11 @@
- 
- #: dialogs.cpp:37
- msgid ""
--"Click here for help regarding the error you selected in the list. This button "
--"will not work when no error is selected."
--msgstr "點選此數，您可以閱讀在清單中選取的錯誤的說明。這個按鍵在沒有選擇錯誤時不會有作用。"
-+"Click here for help regarding the error you selected in the list. This "
-+"button will not work when no error is selected."
-+msgstr ""
-+"點選此數，您可以閱讀在清單中選取的錯誤的說明。這個按鍵在沒有選擇錯誤時不會有"
-+"作用。"
- 
- #: dialogs.cpp:38
- msgid "Click here for help regarding the error you selected."
-@@ -62,7 +63,8 @@
- 
- #: dialogs.cpp:45
- msgid ""
--"In this list you find the error(s) that resulted from running your Logo code. \n"
-+"In this list you find the error(s) that resulted from running your Logo "
-+"code. \n"
- "Good luck!"
- msgstr ""
- "在此清單中您可以找到您的 Logo 程式碼中的錯誤。\n"
-@@ -214,11 +216,11 @@
- 
- #: kturtle.cpp:127
- msgid "Open Exa&mples..."
--msgstr "開啟範例(&M)..."
-+msgstr "開啟範例(&M)…"
- 
- #: kturtle.cpp:132
- msgid "Save &Canvas..."
--msgstr "儲存畫布(&C)..."
-+msgstr "儲存畫布(&C)…"
- 
- #: kturtle.cpp:133
- msgid "Execution Speed"
-@@ -258,7 +260,7 @@
- 
- #: kturtle.cpp:161
- msgid "Show &Line Numbers"
--msgstr "顯示行號(&L)"
-+msgstr "顯示列號(&L)"
- 
- #: kturtle.cpp:166
- msgid "&Color Picker"
-@@ -286,19 +288,20 @@
- 
- #: kturtle.cpp:175
- msgid "&Configure Editor..."
--msgstr "編輯器設定(&C)..."
-+msgstr "編輯器設定(&C)…"
- 
- #: kturtle.cpp:194
- msgid ""
- "This is the code editor, here you type the Logo commands to instruct the "
--"turtle. You can also open an existing Logo program with File->"
--"Open Examples... or File->Open."
-+"turtle. You can also open an existing Logo program with File->Open "
-+"Examples... or File->Open."
- msgstr ""
--"這裡是程式碼編輯器，您可以在此輸入 Logo 的命令，指揮小烏龜行度。您也可以用「檔案＞開啟範例」或「檔案＞開啟」來開啟現有的 Logo 程式碼。"
-+"這裡是程式碼編輯器，您可以在此輸入 Logo 的命令，指揮小烏龜行度。您也可以用"
-+"「檔案＞開啟範例」或「檔案＞開啟」來開啟現有的 Logo 程式碼。"
- 
- #: kturtle.cpp:223
- msgid "Welcome to KTurtle..."
--msgstr "歡迎來到 KTurtle..."
-+msgstr "歡迎來到 KTurtle…"
- 
- #: kturtle.cpp:224
- msgid "Line: %1 Column: %2"
-@@ -314,7 +317,7 @@
- 
- #: kturtle.cpp:259
- msgid " Line: %1 Column: %2 "
--msgstr " 行：%1，位置：%2"
-+msgstr " 列：%1，位置：%2"
- 
- #: kturtle.cpp:275 kturtle.cpp:318
- msgid ""
-@@ -332,7 +335,7 @@
- 
- #: kturtle.cpp:285
- msgid "New file... Happy coding!"
--msgstr "新增檔案...祝愉快！"
-+msgstr "新增檔案…祝愉快！"
- 
- #: kturtle.cpp:295 kturtle.cpp:360
- msgid "Logo Files"
-@@ -384,8 +387,8 @@
- 
- #: kturtle.cpp:369
- msgid ""
--"A program named \"%1\" already exists in this folder. Do you want to overwrite "
--"it?"
-+"A program named \"%1\" already exists in this folder. Do you want to "
-+"overwrite it?"
- msgstr "程式 %1 已存在。您要覆寫它嗎？"
- 
- #: kturtle.cpp:371 kturtle.cpp:409
-@@ -456,12 +459,12 @@
- 
- #: kturtle.cpp:471
- msgid "Quitting KTurtle..."
--msgstr "離開 KTurtle..."
-+msgstr "離開 KTurtle…"
- 
- #: kturtle.cpp:474
- msgid ""
--"The program you are currently working on is not saved. By quitting KTurtle you "
--"may lose the changes you have made."
-+"The program you are currently working on is not saved. By quitting KTurtle "
-+"you may lose the changes you have made."
- msgstr "目前的程式尚未儲存。離開 KTurtle 的話您可能會失去先前做的變更。"
- 
- #: kturtle.cpp:476
-@@ -474,11 +477,11 @@
- 
- #: kturtle.cpp:521
- msgid "Parsing commands..."
--msgstr "剖析命令中..."
-+msgstr "剖析命令中…"
- 
- #: kturtle.cpp:540 kturtle.cpp:602
- msgid "Executing commands..."
--msgstr "執行命令中..."
-+msgstr "執行命令中…"
- 
- #: kturtle.cpp:583
- msgid "Done."
-@@ -626,7 +629,8 @@
- 
- #: main.cpp:56
- msgid ""
--"Author of \"wsbasic\" (wsbasic.sf.net) the base for the interpreter of KTurtle"
-+"Author of \"wsbasic\" (wsbasic.sf.net) the base for the interpreter of "
-+"KTurtle"
- msgstr "wsbasic （wsbasic.sf.net）的作者，KTrutle 直譯器的基礎"
- 
- #: main.cpp:59 main.cpp:62
-@@ -671,9 +675,9 @@
- 
- #: parser.cpp:97
- msgid ""
--"Unexpected intruction after the '%1' command, please use only one instruction "
--"per line"
--msgstr "非預期的指令，在 %1 之後。一行內請只使用一個指令。"
-+"Unexpected intruction after the '%1' command, please use only one "
-+"instruction per line"
-+msgstr "非預期的指令，在 %1 之後。一列內請只使用一個指令。"
- 
- #: parser.cpp:101
- msgid "Expected '['"
-diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdeedu/kverbos.po kde-i18n-zh_TW-3.5.10/messages/kdeedu/kverbos.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdeedu/kverbos.po	2008-08-19 20:43:13.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdeedu/kverbos.po	2011-11-11 15:45:17.000000000 +0100
-@@ -9,8 +9,7 @@
- "Project-Id-Version: kverbos\n"
- "POT-Creation-Date: 2008-07-08 01:24+0200\n"
- "PO-Revision-Date: 2006-10-31 13:05+0800\n"
--"Last-Translator: Frank Weng (a.k.a. Franklin) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Chinese Traditional <zh-l10n@linux.org.tw>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
-@@ -28,8 +27,8 @@
- "_: NAME OF TRANSLATORS\n"
- "Your names"
- msgstr ""
--"簡體中文：Liu Songhe\n"
--"繁體中文轉換與修改：Frank Weng (a.k.a. Franklin)"
-+"簡化字漢語：Liu Songhe\n"
-+"傳統字漢語轉換與修改：Frank Weng (a.k.a. Franklin)"
- 
- #: _translatorinfo.cpp:3
- msgid ""
-@@ -82,19 +81,19 @@
- 
- #: kverbos.cpp:132
- msgid "E&nter New Verb..."
--msgstr "輸入新動詞(&N)..."
-+msgstr "輸入新動詞(&N)…"
- 
- #: kverbos.cpp:133
- msgid "&Edit Verb List..."
--msgstr "編輯動詞列表(&E)..."
-+msgstr "編輯動詞列表(&E)…"
- 
- #: kverbos.cpp:135
- msgid "&Configure KVerbos..."
--msgstr "設定 KVerbos(&C)..."
-+msgstr "設定 KVerbos(&C)…"
- 
- #: kverbos.cpp:136
- msgid "&Username..."
--msgstr "使用者名稱(&U)..."
-+msgstr "使用者名稱(&U)…"
- 
- #: kverbos.cpp:137
- msgid "&Results"
-@@ -126,7 +125,7 @@
- 
- #: kverbos.cpp:145
- msgid "Saves the actual document as..."
--msgstr "把實際文件另存為..."
-+msgstr "把實際文件另存為…"
- 
- #: kverbos.cpp:146
- msgid "Closes the actual document"
-@@ -197,15 +196,15 @@
- 
- #: kverbos.cpp:207 kverbos.cpp:379 kverbos.cpp:404 kverbos.cpp:422
- msgid "Opening file..."
--msgstr "正在開啟檔案..."
-+msgstr "正在開啟檔案…"
- 
- #: kverbos.cpp:351
- msgid "Opening a new application window..."
--msgstr "正在開啟一個新的應用程式視窗..."
-+msgstr "正在開啟一個新的應用程式視窗…"
- 
- #: kverbos.cpp:361
- msgid "Creating new document..."
--msgstr "正在建立新文件..."
-+msgstr "正在建立新文件…"
- 
- #: kverbos.cpp:389 kverbos.cpp:464
- msgid "*|All Files"
-@@ -217,35 +216,35 @@
- 
- #: kverbos.cpp:446
- msgid "Saving file..."
--msgstr "正在儲存檔案..."
-+msgstr "正在儲存檔案…"
- 
- #: kverbos.cpp:461
- msgid "Saving file with a new filename..."
--msgstr "正在用新檔名儲存..."
-+msgstr "正在用新檔名儲存…"
- 
- #: kverbos.cpp:477
- msgid "Closing file..."
--msgstr "正在關閉檔案..."
-+msgstr "正在關閉檔案…"
- 
- #: kverbos.cpp:486
- msgid "Printing..."
--msgstr "正在列印..."
-+msgstr "正在列印…"
- 
- #: kverbos.cpp:499
- msgid "Exiting..."
--msgstr "正在退出..."
-+msgstr "正在退出…"
- 
- #: kverbos.cpp:520
- msgid "Cutting selection..."
--msgstr "正在剪下選取區..."
-+msgstr "正在剪下選取區…"
- 
- #: kverbos.cpp:527
- msgid "Copying selection to clipboard..."
--msgstr "正在把選取區複製到剪貼簿..."
-+msgstr "正在把選取區複製到剪貼簿…"
- 
- #: kverbos.cpp:534
- msgid "Inserting clipboard contents..."
--msgstr "正在插入剪貼簿內容..."
-+msgstr "正在插入剪貼簿內容…"
- 
- #: kverbos.cpp:552
- msgid "Number of verbs: "
-diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdeedu/kvoctrain.po kde-i18n-zh_TW-3.5.10/messages/kdeedu/kvoctrain.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdeedu/kvoctrain.po	2008-08-19 20:43:13.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdeedu/kvoctrain.po	2011-11-11 15:45:17.000000000 +0100
-@@ -10,7 +10,7 @@
- "Project-Id-Version: kvoctrain\n"
- "POT-Creation-Date: 2008-07-08 01:24+0200\n"
- "PO-Revision-Date: 2007-11-09 14:35+0800\n"
--"Last-Translator: Chih-Wei Huang <cwhuang@linux.org.tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Chinese Traditional <zh-l10n@linux.org.tw>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
-@@ -122,16 +122,12 @@
- msgstr "12 個月"
- 
- #: common-dialogs/blockoptions.cpp:252
--msgid ""
--"Illogical blocking times.\n"
--msgstr ""
--"無意義的封存時間。\n"
-+msgid "Illogical blocking times.\n"
-+msgstr "無意義的封存時間。\n"
- 
- #: common-dialogs/blockoptions.cpp:254 common-dialogs/blockoptions.cpp:273
--msgid ""
--"The time for level %1 should be lower than the time for level %2.\n"
--msgstr ""
--"等級 %1 的時間不能低於等級 %2 的時間。\n"
-+msgid "The time for level %1 should be lower than the time for level %2.\n"
-+msgstr "等級 %1 的時間不能低於等級 %2 的時間。\n"
- 
- #: common-dialogs/blockoptions.cpp:271
- msgid ""
-@@ -152,8 +148,7 @@
- #: common-dialogs/blockoptions.cpp:293
- msgid ""
- "The blocking time at level %1 should be lower than the expiration time.\n"
--msgstr ""
--"等級 %1 的封存時間不能低於過期時間。\n"
-+msgstr "等級 %1 的封存時間不能低於過期時間。\n"
- 
- #: common-dialogs/blockoptions.cpp:299
- msgid "Illogical Values"
-@@ -223,7 +218,7 @@
- 
- #: common-dialogs/kvoctrainprefs.cpp:91
- msgid "&Profiles..."
--msgstr "設定檔(&P)..."
-+msgstr "設定檔(&P)…"
- 
- #: common-dialogs/kvoctrainprefs.cpp:92
- msgid "Save or load specific Query settings which consist in a profile"
-@@ -232,11 +227,12 @@
- #: common-dialogs/kvoctrainprefs.cpp:93
- msgid ""
- "A Profile is a set of settings (settings related to queries) which you can "
--"save/load in order to use again later. This button allows you to see existing "
--"profiles, to load a new profile and to save your current settings in a  new "
--"profile."
-+"save/load in order to use again later. This button allows you to see "
-+"existing profiles, to load a new profile and to save your current settings "
-+"in a  new profile."
- msgstr ""
--"設定檔是將查詢相關的設定集合起來存放，您可以儲存或在需要使用時載入。這個按鈕讓您可以檢視現有的設定檔，載入設定檔或將現有的設定儲存在新的設定檔中。"
-+"設定檔是將查詢相關的設定集合起來存放，您可以儲存或在需要使用時載入。這個按鈕"
-+"讓您可以檢視現有的設定檔，載入設定檔或將現有的設定儲存在新的設定檔中。"
- 
- #: common-dialogs/kvoctrainprefs.cpp:140
- msgid "Unapplied Changes"
-@@ -922,7 +918,7 @@
- 
- #: common-dialogs/languageoptions.cpp:732
- msgid "No Picture Selected..."
--msgstr "沒有選取圖片..."
-+msgstr "沒有選取圖片…"
- 
- #: common-dialogs/languageoptions.cpp:763
- msgid "No picture selected"
-@@ -933,10 +929,8 @@
- msgstr "無效的圖片"
- 
- #: common-dialogs/languageoptions.cpp:995
--msgid ""
--"File does not contain a valid graphics format\n"
--msgstr ""
--"檔案中未含有有效的圖形格式\n"
-+msgid "File does not contain a valid graphics format\n"
-+msgstr "檔案中未含有有效的圖形格式\n"
- 
- #: common-dialogs/languageoptions.cpp:1037
- #: common-dialogs/languageoptions.cpp:1050
-@@ -1247,11 +1241,11 @@
- 
- #: kva_clip.cpp:115
- msgid "Copying selection to clipboard..."
--msgstr "正在把選取區域複製到剪貼簿..."
-+msgstr "正在把選取區域複製到剪貼簿…"
- 
- #: kva_clip.cpp:166
- msgid "Inserting clipboard contents..."
--msgstr "正在插入剪貼簿內容..."
-+msgstr "正在插入剪貼簿內容…"
- 
- #: kva_header.cpp:42
- msgid "&Sort alphabetically"
-@@ -1466,7 +1460,7 @@
- 
- #: kva_init.cpp:109
- msgid "Open &Example..."
--msgstr "開啟範例(&E)..."
-+msgstr "開啟範例(&E)…"
- 
- #: kva_init.cpp:110
- msgid "Open a vocabulary document"
-@@ -1474,7 +1468,7 @@
- 
- #: kva_init.cpp:113
- msgid "&Get New Vocabularies..."
--msgstr "取得新字彙(&G)..."
-+msgstr "取得新字彙(&G)…"
- 
- #: kva_init.cpp:114
- msgid "Downloads new vocabularies"
-@@ -1482,7 +1476,7 @@
- 
- #: kva_init.cpp:119
- msgid "&Merge..."
--msgstr "合併(&M)..."
-+msgstr "合併(&M)…"
- 
- #: kva_init.cpp:120
- msgid "Merge an existing vocabulary document with the current one"
-@@ -1526,7 +1520,7 @@
- 
- #: kva_init.cpp:163
- msgid "&Edit Selected Area..."
--msgstr "編輯選取區域(&E)..."
-+msgstr "編輯選取區域(&E)…"
- 
- #: kva_init.cpp:164
- msgid "Edit the entries in the selected rows"
-@@ -1534,7 +1528,7 @@
- 
- #: kva_init.cpp:167
- msgid "&Remove Selected Area"
--msgstr "刪除選取區域(&R)..."
-+msgstr "刪除選取區域(&R)…"
- 
- #: kva_init.cpp:168
- msgid "Delete the selected rows"
-@@ -1542,7 +1536,7 @@
- 
- #: kva_init.cpp:171
- msgid "Save E&ntries in Query As..."
--msgstr "另存問答中的項目為(&N)..."
-+msgstr "另存問答中的項目為(&N)…"
- 
- #: kva_init.cpp:172
- msgid "Save the entries in the query as a new vocabulary"
-@@ -1558,7 +1552,7 @@
- 
- #: kva_init.cpp:179
- msgid "Assign L&essons..."
--msgstr "安排課程(&E)..."
-+msgstr "安排課程(&E)…"
- 
- #: kva_init.cpp:180
- msgid "Create random lessons with unassigned entries"
-@@ -1623,52 +1617,36 @@
- msgstr "切換顯示工具列"
- 
- #: kva_io.cpp:45
--msgid ""
--"*|All Files (*)\n"
--msgstr ""
--"*|所有檔案 (*)\n"
-+msgid "*|All Files (*)\n"
-+msgstr "*|所有檔案 (*)\n"
- 
- #: kva_io.cpp:46
--msgid ""
--"*.kvtml|KVocTrain Markup (*.kvtml)\n"
--msgstr ""
--"*.kvtml|KVocTrain Markup (*.kvtml)\n"
-+msgid "*.kvtml|KVocTrain Markup (*.kvtml)\n"
-+msgstr "*.kvtml|KVocTrain Markup (*.kvtml)\n"
- 
- #: kva_io.cpp:47
--msgid ""
--"*.lex|Vocabulary Trainer 5.0 (*.lex)\n"
--msgstr ""
--"*.lex|Vocabulary Trainer 5.0 (*.lex)\n"
-+msgid "*.lex|Vocabulary Trainer 5.0 (*.lex)\n"
-+msgstr "*.lex|Vocabulary Trainer 5.0 (*.lex)\n"
- 
- #: kva_io.cpp:48
--msgid ""
--"*.vl|KVoclearn (*.vl)\n"
--msgstr ""
--"*.vl|KVoclearn (*.vl)\n"
-+msgid "*.vl|KVoclearn (*.vl)\n"
-+msgstr "*.vl|KVoclearn (*.vl)\n"
- 
- #: kva_io.cpp:49
--msgid ""
--"*.qvo|QVocab (*.qvo)\n"
--msgstr ""
--"*.qvo|QVocab (*.qvo)\n"
-+msgid "*.qvo|QVocab (*.qvo)\n"
-+msgstr "*.qvo|QVocab (*.qvo)\n"
- 
- #: kva_io.cpp:50
--msgid ""
--"*.voc|Vokabeltrainer (*.voc)\n"
--msgstr ""
--"*.voc|Vokabeltrainer (*.voc)\n"
-+msgid "*.voc|Vokabeltrainer (*.voc)\n"
-+msgstr "*.voc|Vokabeltrainer (*.voc)\n"
- 
- #: kva_io.cpp:51
--msgid ""
--"*.csv|Text (*.csv)\n"
--msgstr ""
--"*.csv|文字檔 (*.csv)\n"
-+msgid "*.csv|Text (*.csv)\n"
-+msgstr "*.csv|文字檔 (*.csv)\n"
- 
- #: kva_io.cpp:52
--msgid ""
--"*.vocab|Vocabbox (*.vocab)\n"
--msgstr ""
--"*.vocab|Vocabbox (*.vocab)\n"
-+msgid "*.vocab|Vocabbox (*.vocab)\n"
-+msgstr "*.vocab|Vocabbox (*.vocab)\n"
- 
- #: kva_io.cpp:64
- msgid "Autobackup in progress"
-@@ -1686,11 +1664,11 @@
- 
- #: kva_io.cpp:145 kva_io.cpp:181
- msgid "Opening file..."
--msgstr "正在開啟檔案..."
-+msgstr "正在開啟檔案…"
- 
- #: kva_io.cpp:157
- msgid "Creating new file..."
--msgstr "正在建立新檔案..."
-+msgstr "正在建立新檔案…"
- 
- #: kva_io.cpp:185
- msgid "Open Vocabulary File"
-@@ -1703,7 +1681,7 @@
- 
- #: kva_io.cpp:220
- msgid "Opening example file..."
--msgstr "正在開啟範例檔案..."
-+msgstr "正在開啟範例檔案…"
- 
- #: kva_io.cpp:225
- msgid "Open Example Vocabulary File"
-@@ -1711,7 +1689,7 @@
- 
- #: kva_io.cpp:244
- msgid "Merging file..."
--msgstr "正在合併檔案..."
-+msgstr "正在合併檔案…"
- 
- #: kva_io.cpp:247
- msgid "Merge Vocabulary File"
-@@ -1729,7 +1707,7 @@
- 
- #: kva_io.cpp:590
- msgid "Saving file under new filename..."
--msgstr "正在用新名字儲存檔案..."
-+msgstr "正在用新名字儲存檔案…"
- 
- #: kva_io.cpp:595 kva_io.cpp:647
- msgid "Save Vocabulary As"
-@@ -1737,9 +1715,8 @@
- 
- #: kva_io.cpp:600 kva_io.cpp:653
- msgid ""
--"<qt>The file"
--"<br><b>%1</b>"
--"<br>already exists. Do you want to overwrite it?</qt>"
-+"<qt>The file<br><b>%1</b><br>already exists. Do you want to overwrite it?</"
-+"qt>"
- msgstr "<qt>檔案<br><b>%1</b><br>已存在。您要覆寫它嗎？</qt>"
- 
- #: kva_io.cpp:601 kva_io.cpp:654 kvtnewstuff.cpp:79
-@@ -1748,7 +1725,7 @@
- 
- #: kva_io.cpp:631
- msgid "Saving selected area under new filename..."
--msgstr "將選取的區域用新檔案名儲存..."
-+msgstr "將選取的區域用新檔案名儲存…"
- 
- #: kva_io.cpp:670
- msgid "Part of: "
-@@ -1779,7 +1756,7 @@
- 
- #: kva_query.cpp:126
- msgid "Starting property query..."
--msgstr "正在開始特性問答..."
-+msgstr "正在開始特性問答…"
- 
- #: kva_query.cpp:161 kva_query.cpp:332 kva_query.cpp:609
- msgid "Starting Query"
-@@ -1791,11 +1768,11 @@
- 
- #: kva_query.cpp:298
- msgid "Starting special query..."
--msgstr "正在開始特殊問答..."
-+msgstr "正在開始特殊問答…"
- 
- #: kva_query.cpp:564
- msgid "Starting random query..."
--msgstr "正在開始隨機問答..."
-+msgstr "正在開始隨機問答…"
- 
- #: kvoctrain.cpp:98
- #, c-format
-@@ -1844,33 +1821,29 @@
- 
- #: kvoctrain.cpp:618
- msgid "Updating lesson indices..."
--msgstr "正在更新課程索引..."
-+msgstr "正在更新課程索引…"
- 
- #: kvoctrain.cpp:631
- msgid "Updating type indices..."
--msgstr "正在更新詞性索引..."
-+msgstr "正在更新詞性索引…"
- 
- #: kvoctrain.cpp:635
- msgid "Updating tense indices..."
--msgstr "正在更新時態索引..."
-+msgstr "正在更新時態索引…"
- 
- #: kvoctrain.cpp:640
- msgid ""
- "_: usage (area) of an expression\n"
- "Updating usage label indices..."
--msgstr "正在更新用法索引..."
-+msgstr "正在更新用法索引…"
- 
- #: kvoctrain.cpp:703
--msgid ""
--"Do you really want to delete the selected entry?\n"
--msgstr ""
--"您真的要刪除所選取的項目嗎？\n"
-+msgid "Do you really want to delete the selected entry?\n"
-+msgstr "您真的要刪除所選取的項目嗎？\n"
- 
- #: kvoctrain.cpp:714
--msgid ""
--"Do you really want to delete the selected range?\n"
--msgstr ""
--"您真的要刪除所選取的範圍嗎？\n"
-+msgid "Do you really want to delete the selected range?\n"
-+msgstr "您真的要刪除所選取的範圍嗎？\n"
- 
- #: kvoctrain.cpp:894
- #, c-format
-@@ -1893,15 +1866,16 @@
- 
- #: kvoctrain.cpp:913
- msgid "Creating random lessons..."
--msgstr "正在建立隨機課程..."
-+msgstr "正在建立隨機課程…"
- 
- #: kvoctrain.cpp:1002
- msgid ""
--"To append a new language which is not listed in the submenu, you must first add "
--"its data in the general options dialog.\n"
-+"To append a new language which is not listed in the submenu, you must first "
-+"add its data in the general options dialog.\n"
- "Should this dialog be invoked now?"
- msgstr ""
--"要新增在子選單中未列出的新語言，您必須先在一般選項對話框中新增該語言的資料。\n"
-+"要新增在子選單中未列出的新語言，您必須先在一般選項對話框中新增該語言的資"
-+"料。\n"
- "現在要叫出這個對話框嗎？"
- 
- #: kvoctrain.cpp:1008
-@@ -1914,7 +1888,7 @@
- 
- #: kvoctrain.cpp:1050
- msgid "Searching expression..."
--msgstr "正在搜尋詞語..."
-+msgstr "正在搜尋詞語…"
- 
- #: kvoctrain.cpp:1200
- msgid "Resume &Query"
-@@ -1926,7 +1900,7 @@
- 
- #: kvoctrain.cpp:1232
- msgid "Another Language..."
--msgstr "另一語言..."
-+msgstr "另一語言…"
- 
- #: kvoctrain.cpp:1270
- msgid "&Original"
-@@ -1942,7 +1916,7 @@
- 
- #: kvoctrain.cpp:1324
- msgid "Printing..."
--msgstr "列印中..."
-+msgstr "列印中…"
- 
- #: kvoctrain.cpp:1332
- msgid "Ready"
-@@ -2626,7 +2600,7 @@
- "Line:\t%2\n"
- msgstr ""
- "檔案：\t%1\n"
--"行號：\t%2\n"
-+"列號：\t%2\n"
- 
- #: kvt-core/kvd_rb_kvtml1.cpp:830
- msgid ""
-@@ -2646,12 +2620,13 @@
- 
- #: kvt-core/kvd_rb_kvtml1.cpp:854
- msgid ""
--"Your document contains an unknown tag <%1>.  Maybe your version of KVocTrain is "
--"too old, or the document is damaged.\n"
-+"Your document contains an unknown tag <%1>.  Maybe your version of KVocTrain "
-+"is too old, or the document is damaged.\n"
- "Loading is aborted because KVocTrain cannot read documents with unknown "
- "elements.\n"
- msgstr ""
--"您的文件中含有未知的標記 <%1>。可能您的 KVocTrain 版本太舊，或者該文件已損壞。\n"
-+"您的文件中含有未知的標記 <%1>。可能您的 KVocTrain 版本太舊，或者該文件已損"
-+"壞。\n"
- "載入已中止，因為 KVocTrain 無法讀取有未知元素的文件。\n"
- 
- #: kvt-core/kvd_rb_kvtml1.cpp:862
-@@ -2905,7 +2880,7 @@
- 
- #: query-dialogs/QueryDlgBase.cpp:38
- msgid "&Edit Expression..."
--msgstr "編輯詞語(&E)..."
-+msgstr "編輯詞語(&E)…"
- 
- #: query-dialogs/QueryDlgBase.cpp:308
- msgid "Well done, you knew the correct answer. %1% done."
-@@ -3075,13 +3050,13 @@
- #: rc.cpp:18 rc.cpp:114 rc.cpp:141 rc.cpp:159
- #, no-c-format
- msgid "&New..."
--msgstr "新增(&N)..."
-+msgstr "新增(&N)…"
- 
- #. i18n: file ./docprop-dialogs/TenseOptPageForm.ui line 91
- #: rc.cpp:21 rc.cpp:117 rc.cpp:144 rc.cpp:162
- #, no-c-format
- msgid "&Modify..."
--msgstr "修改(&M)..."
-+msgstr "修改(&M)…"
- 
- #. i18n: file ./docprop-dialogs/LangPropPageForm.ui line 33
- #: rc.cpp:33
-@@ -3507,8 +3482,8 @@
- #: rc.cpp:294 rc.cpp:297
- #, no-c-format
- msgid ""
--"If it is unchecked, you will just have black on white for the grades; if it is "
--"checked, the colors below will be chosen."
-+"If it is unchecked, you will just have black on white for the grades; if it "
-+"is checked, the colors below will be chosen."
- msgstr "如果沒勾選，等級只會以黑白顯示。勾選的話，您可以選擇顏色。"
- 
- #. i18n: file ./common-dialogs/queryoptionsbase.ui line 30
-@@ -3529,7 +3504,8 @@
- msgid ""
- "By checking this, you will use the Leitner method of learning which requires "
- "you to answer correctly to each question 4 times in a row. "
--msgstr "勾選此選項的話，將使用萊納（Leitner）學習法，會要求您每個問題連續答對四次。"
-+msgstr ""
-+"勾選此選項的話，將使用萊納（Leitner）學習法，會要求您每個問題連續答對四次。"
- 
- #. i18n: file ./common-dialogs/queryoptionsbase.ui line 44
- #: rc.cpp:309
-@@ -3559,10 +3535,11 @@
- #: rc.cpp:321
- #, no-c-format
- msgid ""
--"When this options is enabled, you can enter part of an answer, then press F5 or "
--"F6 to get a list of translations starting with or containing the text you "
-+"When this options is enabled, you can enter part of an answer, then press F5 "
-+"or F6 to get a list of translations starting with or containing the text you "
- "typed."
--msgstr "開啟此選項的話，您可以輸入答案的某一部份，然後按 F5 或 F6 來取得翻譯的列表。"
-+msgstr ""
-+"開啟此選項的話，您可以輸入答案的某一部份，然後按 F5 或 F6 來取得翻譯的列表。"
- 
- #. i18n: file ./common-dialogs/queryoptionsbase.ui line 83
- #: rc.cpp:324
-@@ -3580,12 +3557,13 @@
- #: rc.cpp:330
- #, no-c-format
- msgid ""
--"When this options is enabled, the program will split translations into several "
--"parts, show multiple answer fields, and you will need to answer each one of "
--"them. This is useful for example when a word has several meanings that have "
--"different translations in the other language."
-+"When this options is enabled, the program will split translations into "
-+"several parts, show multiple answer fields, and you will need to answer each "
-+"one of them. This is useful for example when a word has several meanings "
-+"that have different translations in the other language."
- msgstr ""
--"勾選此選項的話，程式會將翻譯分割成幾個部份，並顯示多個答案欄位，您必須每個都作答。這功能用在像是一個字有好幾種在其他語言中不同的意思的翻譯時。"
-+"勾選此選項的話，程式會將翻譯分割成幾個部份，並顯示多個答案欄位，您必須每個都"
-+"作答。這功能用在像是一個字有好幾種在其他語言中不同的意思的翻譯時。"
- 
- #. i18n: file ./common-dialogs/queryoptionsbase.ui line 97
- #: rc.cpp:333
-@@ -3606,7 +3584,9 @@
- "Enter the maximum number of answer fields you want to have. When splitting "
- "translations, the program will only split into this many parts, and the last "
- "part will contain the rest of the translation."
--msgstr "輸入您要回答的最大欄位數。分割翻譯時，程式最多只會分割成這麼多個部份，最後一部份會包含剩下的翻譯。"
-+msgstr ""
-+"輸入您要回答的最大欄位數。分割翻譯時，程式最多只會分割成這麼多個部份，最後一"
-+"部份會包含剩下的翻譯。"
- 
- #. i18n: file ./common-dialogs/queryoptionsbase.ui line 117
- #: rc.cpp:342
-@@ -3624,11 +3604,13 @@
- #: rc.cpp:348
- #, no-c-format
- msgid ""
--"If this is checked, the I Know button will be available. It allows you to tell "
--"the query that you know the result without writing it or having it checked. "
--"This is available by default. If you uncheck this, the I Know button will not "
--"be available."
--msgstr "勾選此選項的話，可以使用「我知道了」按鈕，讓您通知系統您已經知道這個問題的答案，而不必去做答。預設是使用。如果您取消勾選，則不能使用該按鈕。"
-+"If this is checked, the I Know button will be available. It allows you to "
-+"tell the query that you know the result without writing it or having it "
-+"checked. This is available by default. If you uncheck this, the I Know "
-+"button will not be available."
-+msgstr ""
-+"勾選此選項的話，可以使用「我知道了」按鈕，讓您通知系統您已經知道這個問題的答"
-+"案，而不必去做答。預設是使用。如果您取消勾選，則不能使用該按鈕。"
- 
- #. i18n: file ./common-dialogs/queryoptionsbase.ui line 139
- #: rc.cpp:351
-@@ -3672,8 +3654,8 @@
- #: rc.cpp:369
- #, no-c-format
- msgid ""
--"When this options is enabled, translations that have not been split at periods "
--"or colons will be split at semicolons if they have any."
-+"When this options is enabled, translations that have not been split at "
-+"periods or colons will be split at semicolons if they have any."
- msgstr "勾選此選項的話，翻譯會根據分號（;）分割。"
- 
- #. i18n: file ./common-dialogs/queryoptionsbase.ui line 192
-@@ -3692,8 +3674,8 @@
- #: rc.cpp:378
- #, no-c-format
- msgid ""
--"When this options is enabled, translations that have not been split at periods, "
--"colons or semicolons will be split at commas if they have any."
-+"When this options is enabled, translations that have not been split at "
-+"periods, colons or semicolons will be split at commas if they have any."
- msgstr "勾選此選項的話，翻譯會根據逗號（,）分割。"
- 
- #. i18n: file ./common-dialogs/queryoptionsbase.ui line 209
-@@ -3712,8 +3694,8 @@
- #: rc.cpp:387
- #, no-c-format
- msgid ""
--"When this options is enabled, translations that have not been split at periods "
--"will be split at colons if they have any."
-+"When this options is enabled, translations that have not been split at "
-+"periods will be split at colons if they have any."
- msgstr "勾選此選項的話，翻譯會根據冒號（:）分割。"
- 
- #. i18n: file ./common-dialogs/queryoptionsbase.ui line 226
-@@ -3733,9 +3715,12 @@
- #, no-c-format
- msgid ""
- "When this is checked, you will be able to use a Show More button which allow "
--"you to get the next letter in your answer in the query. If this is unchecked, "
--"the Show More button will not be enabled, you will not be able to use it."
--msgstr "勾選此選項的話，您可以在問答中使用「顯示更多」按鈕，讓您知道答案中的下一個字母。如果取消勾選的話，則不能使用此功能。"
-+"you to get the next letter in your answer in the query. If this is "
-+"unchecked, the Show More button will not be enabled, you will not be able to "
-+"use it."
-+msgstr ""
-+"勾選此選項的話，您可以在問答中使用「顯示更多」按鈕，讓您知道答案中的下一個字"
-+"母。如果取消勾選的話，則不能使用此功能。"
- 
- #. i18n: file ./common-dialogs/queryoptionsbase.ui line 324
- #: rc.cpp:405
-@@ -3795,8 +3780,8 @@
- #: rc.cpp:432
- #, no-c-format
- msgid ""
--"Check this button if you want to activate a progress bar to show the remaining "
--"time for each query."
-+"Check this button if you want to activate a progress bar to show the "
-+"remaining time for each query."
- msgstr "勾選此選項的話，會在問答時顯示一進度列以提醒剩餘時間。"
- 
- #. i18n: file ./common-dialogs/queryoptionsbase.ui line 460
-@@ -3809,8 +3794,8 @@
- #: rc.cpp:438
- #, no-c-format
- msgid ""
--"You may set a time limit KVocTrain grants you to remember the correct answer. "
--"Set here the maximum time you want to allow per query."
-+"You may set a time limit KVocTrain grants you to remember the correct "
-+"answer. Set here the maximum time you want to allow per query."
- msgstr "您可以在此設定 KVocTrain 中的時間限制。"
- 
- #. i18n: file ./common-dialogs/groupoptionsbase.ui line 27
-@@ -3986,8 +3971,8 @@
- #: rc.cpp:561 rc.cpp:597
- #, no-c-format
- msgid ""
--"Each column can be assigned a language. This is internally done with the usual "
--"international language codes."
-+"Each column can be assigned a language. This is internally done with the "
-+"usual international language codes."
- msgstr "每個欄位可以指定一種語言。內部會使用常用的國際語言代碼。"
- 
- #. i18n: file ./common-dialogs/languageoptionsbase.ui line 160
-@@ -4052,7 +4037,7 @@
- #: rc.cpp:591
- #, no-c-format
- msgid "Keyboard layout:"
--msgstr "鍵盤佈局："
-+msgstr "鍵盤布局："
- 
- #. i18n: file ./common-dialogs/languageoptionsbase.ui line 238
- #: rc.cpp:600
-@@ -4079,7 +4064,9 @@
- "Pressing this button opens a menu that contains all the countries that are "
- "known in your KDE installation. Ordered by country you can add your desired "
- "language properties to your personal list."
--msgstr "按下此按鍵會開啟一個選單，包含所有在您 KDE 安裝中的國家。您可以新增您想要的語言。"
-+msgstr ""
-+"按下此按鍵會開啟一個選單，包含所有在您 KDE 安裝中的國家。您可以新增您想要的語"
-+"言。"
- 
- #. i18n: file ./common-dialogs/languageoptionsbase.ui line 269
- #: rc.cpp:612
-@@ -4097,8 +4084,8 @@
- #: rc.cpp:621
- #, no-c-format
- msgid ""
--"Pressing this button opens a menu that contains all the language codes that are "
--"covered by \"ISO639-1\""
-+"Pressing this button opens a menu that contains all the language codes that "
-+"are covered by \"ISO639-1\""
- msgstr "按下此按鍵會開啟一個選單，包含所有在 ISO639-1 中看到的語言代碼。"
- 
- #. i18n: file ./common-dialogs/languageoptionsbase.ui line 286
-@@ -4196,8 +4183,8 @@
- #: rc.cpp:666
- #, no-c-format
- msgid ""
--"When checked, the items in the clipboard are assumed to be in the same language "
--"order as the current document."
-+"When checked, the items in the clipboard are assumed to be in the same "
-+"language order as the current document."
- msgstr "勾選此選項的話，在剪貼簿中的項目會被假設為與目前文件一樣的語言順序。"
- 
- #. i18n: file ./common-dialogs/ProgressDlgForm.ui line 54
-@@ -4271,10 +4258,12 @@
- #, no-c-format
- msgid ""
- "If this feature is activated, you will repeatedly be prompted with the entry "
--"dialog. After entering the first original you have to enter the corresponding "
--"translations. Afterwards you proceed with the next original and its "
--"translations until you stop by pressing the ESC key."
--msgstr "勾選此選項的話，會重複跳出項目對話框。輸入第一個原文後，輸入相關的翻譯，然後不斷重複直到您按下 ESC 鍵為止。"
-+"dialog. After entering the first original you have to enter the "
-+"corresponding translations. Afterwards you proceed with the next original "
-+"and its translations until you stop by pressing the ESC key."
-+msgstr ""
-+"勾選此選項的話，會重複跳出項目對話框。輸入第一個原文後，輸入相關的翻譯，然後"
-+"不斷重複直到您按下 ESC 鍵為止。"
- 
- #. i18n: file ./common-dialogs/generaloptionsbase.ui line 91
- #: rc.cpp:714
-@@ -4318,10 +4307,12 @@
- #: rc.cpp:732
- #, no-c-format
- msgid ""
--"KVocTrain makes each column the same width except the leftmost with the lesson "
--"names, which is half the size of the others. The second column, which contains "
--"the picture that describes the state of the row, has a fixed width."
--msgstr "KVocTrain 會將每個欄位調成一樣大小，除了最左方的課程名稱為是其他欄位的一半，並且第二個欄位會固定寬度，用以表示該列的狀態。"
-+"KVocTrain makes each column the same width except the leftmost with the "
-+"lesson names, which is half the size of the others. The second column, which "
-+"contains the picture that describes the state of the row, has a fixed width."
-+msgstr ""
-+"KVocTrain 會將每個欄位調成一樣大小，除了最左方的課程名稱為是其他欄位的一半，"
-+"並且第二個欄位會固定寬度，用以表示該列的狀態。"
- 
- #. i18n: file ./common-dialogs/generaloptionsbase.ui line 133
- #: rc.cpp:735
-@@ -4747,7 +4738,8 @@
- msgid ""
- "_: NAME OF TRANSLATORS\n"
- "Your names"
--msgstr "簡體中文：KDE 簡體中文翻譯組 繁體中文轉換與修改：Frank Weng (a.k.a. Franklin)"
-+msgstr ""
-+"簡化字漢語：KDE 簡化字漢語翻譯組 傳統字漢語轉換與修改：Frank Weng (a.k.a. Franklin)"
- 
- #: _translatorinfo.cpp:3
- msgid ""
-diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdeedu/kwordquiz.po kde-i18n-zh_TW-3.5.10/messages/kdeedu/kwordquiz.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdeedu/kwordquiz.po	2008-08-19 20:43:13.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdeedu/kwordquiz.po	2011-11-11 15:45:17.000000000 +0100
-@@ -7,8 +7,7 @@
- "Project-Id-Version: kwordquiz\n"
- "POT-Creation-Date: 2008-07-08 01:24+0200\n"
- "PO-Revision-Date: 2006-10-14 16:28+0800\n"
--"Last-Translator: Frank Weng (a.k.a. Franklin) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Chinese Traditional <zh-l10n@linux.org.tw>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
-@@ -124,16 +123,16 @@
- "_: NAME OF TRANSLATORS\n"
- "Your names"
- msgstr ""
--"簡體中文：開源軟件國際化之 KDE 簡體中文組\n"
--"繁體中文轉換與修改：Frank Weng (a.k.a. Franklin)"
-+"簡化字漢語：開源軟件國際化之 KDE 簡化字漢語組\n"
-+"傳統字漢語轉換與修改：Frank Weng (a.k.a. Franklin)"
- 
- #: _translatorinfo.cpp:3
- msgid ""
- "_: EMAIL OF TRANSLATORS\n"
- "Your emails"
- msgstr ""
--"簡體中文：i18n-translation@lists.linux.net.cn\n"
--"繁體中文轉換與修改：franklin at goodhorse dot idv dot tw"
-+"簡化字漢語：i18n-translation@lists.linux.net.cn\n"
-+"傳統字漢語轉換與修改：franklin at goodhorse dot idv dot tw"
- 
- #: main.cpp:24
- msgid "A powerful flashcard and vocabulary learning program"
-@@ -463,7 +462,8 @@
- #: rc.cpp:210 rc.cpp:219
- #, no-c-format
- msgid ""
--"The number of cards counted as correct (I know). May be shown as a percentage."
-+"The number of cards counted as correct (I know). May be shown as a "
-+"percentage."
- msgstr "答對的卡片數。可以顯示為百分比。"
- 
- #. i18n: file flashviewbase.ui line 398
-@@ -753,7 +753,7 @@
- msgid ""
- "Note: Select Settings -> Configure Shortcuts... to change the shortcut "
- "associated with each action."
--msgstr "注意：選擇設定->設定捷徑... 可修改每個動作的捷徑。"
-+msgstr "注意：選擇設定->設定捷徑… 可修改每個動作的捷徑。"
- 
- #. i18n: file prefcharacterbase.ui line 62
- #: rc.cpp:546
-@@ -951,7 +951,7 @@
- #: rc.cpp:642
- #, no-c-format
- msgid "C&haracter..."
--msgstr "字元(&H)..."
-+msgstr "字元(&H)…"
- 
- #. i18n: file prefcharacterbase.ui line 342
- #: rc.cpp:645
-@@ -1108,8 +1108,8 @@
- #: rc.cpp:738
- #, no-c-format
- msgid ""
--"Select if questions where the hint function has been used should be counted as "
--"errors"
-+"Select if questions where the hint function has been used should be counted "
-+"as errors"
- msgstr "如果想要將使用過提示功能的問題計為錯誤，請選擇此項"
- 
- #. i18n: file prefquizbase.ui line 96
-@@ -1208,8 +1208,8 @@
- #: rc.cpp:789
- #, no-c-format
- msgid ""
--"Select if the previous card should be counted as incorrect when moving to the "
--"next card"
-+"Select if the previous card should be counted as incorrect when moving to "
-+"the next card"
- msgstr "如果想要在自動翻到下一道題時將上一道題計為錯誤，請選擇此項。"
- 
- #. i18n: file prefquizbase.ui line 257
-@@ -1228,8 +1228,8 @@
- #: rc.cpp:798
- #, no-c-format
- msgid ""
--"Select if you want a card to turn over automatically after the given amount of "
--"time"
-+"Select if you want a card to turn over automatically after the given amount "
-+"of time"
- msgstr "如果您想要在給定時間後自動翻過閃卡，請選擇此項。"
- 
- #. i18n: file qaviewbase.ui line 619
-@@ -1422,7 +1422,7 @@
- 
- #: kwordquiz.cpp:118
- msgid "&Get New Vocabularies..."
--msgstr "取得新字彙(&G)..."
-+msgstr "取得新字彙(&G)…"
- 
- #: kwordquiz.cpp:119
- msgid "Downloads new vocabularies"
-@@ -1462,7 +1462,8 @@
- 
- #: kwordquiz.cpp:155
- msgid ""
--"Pastes previously cut or copied text from the clipboard into the selected cells"
-+"Pastes previously cut or copied text from the clipboard into the selected "
-+"cells"
- msgstr "將剪貼簿中的文字貼到已選取的格子中"
- 
- #: kwordquiz.cpp:159
-@@ -1503,7 +1504,7 @@
- 
- #: kwordquiz.cpp:180
- msgid "&Column Titles..."
--msgstr "自訂標題(&C)..."
-+msgstr "自訂標題(&C)…"
- 
- #: kwordquiz.cpp:181
- msgid "Defines the column titles for the active vocabulary"
-@@ -1511,7 +1512,7 @@
- 
- #: kwordquiz.cpp:184
- msgid "&Font..."
--msgstr "字型(&F)..."
-+msgstr "字型(&F)…"
- 
- #: kwordquiz.cpp:185
- msgid "Defines the font used by the editor"
-@@ -1519,17 +1520,17 @@
- 
- #: kwordquiz.cpp:190
- msgid "&Rows/Columns..."
--msgstr "行/欄(&R)..."
-+msgstr "行/欄(&R)…"
- 
- #: kwordquiz.cpp:191
- msgid ""
- "Defines the number of rows, row heights, and column widths for the active "
- "vocabulary"
--msgstr "定義當繆字彙的行數、行高和欄寬"
-+msgstr "定義當繆字彙的列數、行高和欄寬"
- 
- #: kwordquiz.cpp:194
- msgid "&Sort..."
--msgstr "排序(&S)..."
-+msgstr "排序(&S)…"
- 
- #: kwordquiz.cpp:195
- msgid ""
-@@ -1652,7 +1653,7 @@
- 
- #: kwordquiz.cpp:380 kwordquiz.cpp:494 kwordquiz.cpp:548
- msgid "Opening file..."
--msgstr "開啟檔案..."
-+msgstr "開啟檔案…"
- 
- #: kwordquiz.cpp:388 kwordquiz.cpp:489 kwordquiz.cpp:543 kwordquiz.cpp:551
- #: kwordquiz.cpp:565 kwordquiz.cpp:579 kwordquiz.cpp:657 kwordquiz.cpp:672
-@@ -1668,7 +1669,7 @@
- 
- #: kwordquiz.cpp:480
- msgid "Opening a new document window..."
--msgstr "開啟新的文件窗口..."
-+msgstr "開啟新的文件窗口…"
- 
- #: kwordquiz.cpp:496
- msgid "&Join selected files into one list"
-@@ -1694,11 +1695,11 @@
- 
- #: kwordquiz.cpp:556
- msgid "Saving file..."
--msgstr "儲存檔案..."
-+msgstr "儲存檔案…"
- 
- #: kwordquiz.cpp:577
- msgid "Saving file with a new filename..."
--msgstr "以新檔案名儲存檔案..."
-+msgstr "以新檔案名儲存檔案…"
- 
- #: kwordquiz.cpp:587
- msgid ""
-@@ -1718,62 +1719,61 @@
- 
- #: kwordquiz.cpp:612
- msgid ""
--"<qt>The file"
--"<br><b>%1</b>"
--"<br>already exists. Do you want to overwrite it?</qt>"
-+"<qt>The file<br><b>%1</b><br>already exists. Do you want to overwrite it?</"
-+"qt>"
- msgstr "<qt>檔案<br><b>%1</b><br>已存在。您想要覆蓋嗎？</qt>"
- 
- #: kwordquiz.cpp:635
- msgid "Closing file..."
--msgstr "關閉檔案..."
-+msgstr "關閉檔案…"
- 
- #: kwordquiz.cpp:662
- msgid "Printing..."
--msgstr "列印..."
-+msgstr "列印…"
- 
- #: kwordquiz.cpp:677
- msgid "Exiting..."
--msgstr "離開..."
-+msgstr "離開…"
- 
- #: kwordquiz.cpp:702
- msgid "Undoing previous command..."
--msgstr "復原上個命令..."
-+msgstr "復原上個命令…"
- 
- #: kwordquiz.cpp:709
- msgid "Cutting selection..."
--msgstr "剪下已選取內容..."
-+msgstr "剪下已選取內容…"
- 
- #: kwordquiz.cpp:716
- msgid "Copying selection to clipboard..."
--msgstr "將已選取內容複製到剪貼簿..."
-+msgstr "將已選取內容複製到剪貼簿…"
- 
- #: kwordquiz.cpp:723
- msgid "Inserting clipboard contents..."
--msgstr "插入剪貼簿內容..."
-+msgstr "插入剪貼簿內容…"
- 
- #: kwordquiz.cpp:730
- msgid "Clearing the selected cells..."
--msgstr "清除已選取單元格..."
-+msgstr "清除已選取單元格…"
- 
- #: kwordquiz.cpp:737
- msgid "Inserting rows..."
--msgstr "插入列..."
-+msgstr "插入列…"
- 
- #: kwordquiz.cpp:744
- msgid "Deleting selected rows..."
--msgstr "刪除選取列..."
-+msgstr "刪除選取列…"
- 
- #: kwordquiz.cpp:751
- msgid "Marking selected text as a blank..."
--msgstr "將選取的文字標示為空白..."
-+msgstr "將選取的文字標示為空白…"
- 
- #: kwordquiz.cpp:758
- msgid "Removing blank markings..."
--msgstr "移除空白標記..."
-+msgstr "移除空白標記…"
- 
- #: kwordquiz.cpp:765
- msgid "Searching for indicated text..."
--msgstr "搜尋辨識的文字..."
-+msgstr "搜尋辨識的文字…"
- 
- #: kwordquiz.cpp:766 kwordquiz.cpp:805
- msgid "Not implemented yet"
-@@ -1781,52 +1781,52 @@
- 
- #: kwordquiz.cpp:772
- msgid "Setting the column titles of the vocabulary..."
--msgstr "設定字彙的欄標題..."
-+msgstr "設定字彙的欄標題…"
- 
- #: kwordquiz.cpp:789
- msgid "Setting the font of the vocabulary..."
--msgstr "設定字彙的字型..."
-+msgstr "設定字彙的字型…"
- 
- #: kwordquiz.cpp:804
- msgid "Changing the keyboard layout..."
--msgstr "更改鍵盤佈局..."
-+msgstr "更改鍵盤布局…"
- 
- #: kwordquiz.cpp:811
- msgid "Inserting special character..."
--msgstr "插入特殊字元..."
-+msgstr "插入特殊字元…"
- 
- #: kwordquiz.cpp:818
- msgid "Changing row and column properties..."
--msgstr "更改列與欄屬性..."
-+msgstr "更改列與欄屬性…"
- 
- #: kwordquiz.cpp:825
- msgid "Sorting the vocabulary..."
--msgstr "排序字彙..."
-+msgstr "排序字彙…"
- 
- #: kwordquiz.cpp:832
- msgid "Randomizing the vocabulary..."
--msgstr "打亂字彙..."
-+msgstr "打亂字彙…"
- 
- #: kwordquiz.cpp:839 kwordquiz.cpp:852 kwordquiz.cpp:859 kwordquiz.cpp:866
- #: kwordquiz.cpp:873 kwordquiz.cpp:880
- msgid "Updating mode..."
--msgstr "更新模式..."
-+msgstr "更新模式…"
- 
- #: kwordquiz.cpp:887
- msgid "Starting editor session..."
--msgstr "開啟編輯器階段..."
-+msgstr "開啟編輯器階段…"
- 
- #: kwordquiz.cpp:894
- msgid "Starting flashcard session..."
--msgstr "開始閃卡階段..."
-+msgstr "開始閃卡階段…"
- 
- #: kwordquiz.cpp:901
- msgid "Starting multiple choice session..."
--msgstr "開始多重選擇題階段..."
-+msgstr "開始多重選擇題階段…"
- 
- #: kwordquiz.cpp:908
- msgid "Starting question & answer session..."
--msgstr "開始問答題階段..."
-+msgstr "開始問答題階段…"
- 
- #: kwordquiz.cpp:1077
- #, c-format
-diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdeedu/libkdeedu.po kde-i18n-zh_TW-3.5.10/messages/kdeedu/libkdeedu.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdeedu/libkdeedu.po	2007-05-14 12:22:57.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdeedu/libkdeedu.po	2011-11-11 15:45:17.000000000 +0100
-@@ -6,8 +6,7 @@
- "Project-Id-Version: libkdeedu\n"
- "POT-Creation-Date: 2007-02-14 02:46+0100\n"
- "PO-Revision-Date: 2006-06-30 14:26+0800\n"
--"Last-Translator: Frank Weng (a.k.a. Franklin) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Chinese Traditional <zh-l10n@linux.org.tw>\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/kdegames/atlantik.po kde-i18n-zh_TW-3.5.10/messages/kdegames/atlantik.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdegames/atlantik.po	2006-07-22 10:03:52.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdegames/atlantik.po	2011-11-11 15:45:17.000000000 +0100
-@@ -12,8 +12,7 @@
- "Project-Id-Version: atlantik\n"
- "POT-Creation-Date: 2005-07-24 01:33+0200\n"
- "PO-Revision-Date: 2006-01-17 14:57+0800\n"
--"Last-Translator: Frank Weng (a.k.a. Franklin) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Traditional Chinese <zh_l10n@linux.org.tw>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
-@@ -22,11 +21,11 @@
- 
- #: libatlantikclient/atlantik_network.cpp:909
- msgid "Connecting to %1:%2..."
--msgstr "連線至 %1:%2..."
-+msgstr "連線至 %1:%2…"
- 
- #: libatlantikclient/atlantik_network.cpp:915
- msgid "Server host name lookup finished..."
--msgstr "伺服器主機名稱搜尋已經完成..."
-+msgstr "伺服器主機名稱搜尋已經完成…"
- 
- #: libatlantikclient/atlantik_network.cpp:920
- msgid "Connected to %1:%2."
-@@ -138,11 +137,11 @@
- 
- #: libatlantikui/auction_widget.cpp:94
- msgid "Going once..."
--msgstr "一次..."
-+msgstr "一次…"
- 
- #: libatlantikui/auction_widget.cpp:98
- msgid "Going twice..."
--msgstr "二次..."
-+msgstr "二次…"
- 
- #: libatlantikui/auction_widget.cpp:102
- msgid "Sold!"
-@@ -293,7 +292,8 @@
- msgid ""
- "You are currently part of an active game. Are you sure you want to close "
- "Atlantik? If you do, you forfeit the game."
--msgstr "您目前正在進行遊戲中。您確定要關閉 Atlantik 嗎？如此您將會失去進行中的遊戲。"
-+msgstr ""
-+"您目前正在進行遊戲中。您確定要關閉 Atlantik 嗎？如此您將會失去進行中的遊戲。"
- 
- #: client/atlantik.cpp:843
- msgid "Close & Forfeit?"
-@@ -317,15 +317,15 @@
- 
- #: client/selectconfiguration_widget.cpp:78
- msgid "Retrieving configuration list..."
--msgstr "取回設定列表中..."
-+msgstr "取回設定列表中…"
- 
- #: client/selectconfiguration_widget.cpp:83
- msgid "Game started. Retrieving full game data..."
--msgstr "遊戲已開始：取回完整的遊戲資料..."
-+msgstr "遊戲已開始：取回完整的遊戲資料…"
- 
- #: client/selectconfiguration_widget.cpp:162
- msgid "Retrieved configuration list."
--msgstr "取回設定列表中..."
-+msgstr "取回設定列表中…"
- 
- #: client/main.cpp:29
- msgid "Connect to this host"
-@@ -530,7 +530,8 @@
- "If checked, the colored headers of street estates on the board will have a "
- "Quartz effect similar to the Quartz KWin style.\n"
- msgstr ""
--"如果選定此項，棋盤上街道財產的色彩頁眉將會有近似於 石英KWin 風格的石英效果。\n"
-+"如果選定此項，棋盤上街道財產的色彩頁眉將會有近似於 石英KWin 風格的石英效"
-+"果。\n"
- 
- #: client/selectserver_widget.cpp:39
- msgid "Enter Custom monopd Server"
-@@ -578,7 +579,7 @@
- 
- #: client/selectserver_widget.cpp:116
- msgid "Retrieving server list..."
--msgstr "取回伺服器列表中..."
-+msgstr "取回伺服器列表中…"
- 
- #: client/selectserver_widget.cpp:124
- msgid "unknown"
-@@ -590,7 +591,7 @@
- 
- #: client/selectserver_widget.cpp:144
- msgid "Error while retrieving the server list."
--msgstr "取回伺服器列表時發生錯誤..."
-+msgstr "取回伺服器列表時發生錯誤…"
- 
- #: client/selectgame_widget.cpp:43
- msgid "Create or Select monopd Game"
-diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdegames/kasteroids.po kde-i18n-zh_TW-3.5.10/messages/kdegames/kasteroids.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdegames/kasteroids.po	2006-07-22 10:03:52.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdegames/kasteroids.po	2011-11-11 15:45:17.000000000 +0100
-@@ -5,7 +5,7 @@
- "Project-Id-Version: kasteroids\n"
- "POT-Creation-Date: 2005-05-18 21:24+0200\n"
- "PO-Revision-Date: 2003-12-09 16:36+0800\n"
--"Last-Translator: Hydonsingore Sie <hydonsingore@mail.educities.edu.tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Chinese(traitional) <zh-l10n@linux.org.tw>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
-@@ -120,7 +120,7 @@
- 
- #: toplevel.cpp:596
- msgid "Start new game with"
--msgstr "以...開始新遊戲"
-+msgstr "以…開始新遊戲"
- 
- #: toplevel.cpp:599
- msgid " ships."
-diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdegames/katomic.po kde-i18n-zh_TW-3.5.10/messages/kdegames/katomic.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdegames/katomic.po	2008-08-19 20:43:06.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdegames/katomic.po	2011-11-11 15:45:17.000000000 +0100
-@@ -7,7 +7,7 @@
- "Project-Id-Version: katomic\n"
- "POT-Creation-Date: 2008-06-25 01:36+0200\n"
- "PO-Revision-Date: 2003-12-05 20:57+0800\n"
--"Last-Translator: Hydonsingore Sie <hydonsingore@mail.educities.edu.tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Chinese(traitional) <zh-l10n@linux.org.tw>\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/kdegames/kbackgammon.po kde-i18n-zh_TW-3.5.10/messages/kdegames/kbackgammon.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdegames/kbackgammon.po	2007-05-14 12:22:52.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdegames/kbackgammon.po	2011-11-11 15:45:17.000000000 +0100
-@@ -6,8 +6,7 @@
- "Project-Id-Version: kbackgammon\n"
- "POT-Creation-Date: 2007-03-09 02:17+0100\n"
- "PO-Revision-Date: 2006-01-20 10:58+0800\n"
--"Last-Translator: Frank Weng (a.k.a. Franklin) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Traditional Chinese <zh_l10n@linux.org.tw>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
-@@ -56,26 +55,31 @@
- 
- #: kbg.cpp:182
- msgid ""
--"This area contains the status messages for the game. Most of these messages are "
--"sent to you from the current engine."
-+"This area contains the status messages for the game. Most of these messages "
-+"are sent to you from the current engine."
- msgstr "這個地方顯示遊戲的訊息。大部份的訊息都是目前的遊戲引擎送過來的。"
- 
- #: kbg.cpp:186
- msgid ""
--"This is the command line. You can type special commands related to the current "
--"engine in here. Most relevant commands are also available through the menus."
--msgstr "這裡是命令列。您可以輸入目前的遊戲引擎使用的特殊命令。不過大部份常用的命令也都可以從目錄選單中選取。"
-+"This is the command line. You can type special commands related to the "
-+"current engine in here. Most relevant commands are also available through "
-+"the menus."
-+msgstr ""
-+"這裡是命令列。您可以輸入目前的遊戲引擎使用的特殊命令。不過大部份常用的命令也"
-+"都可以從目錄選單中選取。"
- 
- #: kbg.cpp:191
- msgid ""
- "This is the button bar tool bar. It gives you easy access to game related "
- "commands. You can drag the bar to a different location within the window."
--msgstr "這裡是按鈕工具列，讓您方便直接下遊戲的命令。您可以將此工具列拖曳到視窗中的其他地方。"
-+msgstr ""
-+"這裡是按鈕工具列，讓您方便直接下遊戲的命令。您可以將此工具列拖曳到視窗中的其"
-+"他地方。"
- 
- #: kbg.cpp:196
- msgid ""
--"This is the status bar. It shows you the currently selected engine in the left "
--"corner."
-+"This is the status bar. It shows you the currently selected engine in the "
-+"left corner."
- msgstr "這裡是狀態列。它會在左邊顯示您目前選取的遊戲引擎模式。"
- 
- #: kbg.cpp:509
-@@ -106,14 +110,16 @@
- #: kbg.cpp:524
- msgid ""
- "After you finished your moves, they have to be sent to the engine. You can "
--"either do that manually (in which case you should not enable this feature), or "
--"you can specify an amount of time that has to pass before the move is "
--"committed. If you undo a move during the timeout, the timeout will be reset and "
--"restarted once you finish the move. This is very useful if you would like to "
--"review the result of your move."
-+"either do that manually (in which case you should not enable this feature), "
-+"or you can specify an amount of time that has to pass before the move is "
-+"committed. If you undo a move during the timeout, the timeout will be reset "
-+"and restarted once you finish the move. This is very useful if you would "
-+"like to review the result of your move."
- msgstr ""
--"您移動您的棋子之後，這個動作會被送到遊戲引擎。如果您不打開此選項，您可以手動決定何時要把您下的這步棋送到遊戲引擎內。您也可以決定一個時間，在時間到之前都有機會反"
--"悔。如果時間到之前您決定反悔，計時器會重置。如果您希望先看看移動棋子之後的結果，您可以關掉此選項。"
-+"您移動您的棋子之後，這個動作會被送到遊戲引擎。如果您不打開此選項，您可以手動"
-+"決定何時要把您下的這步棋送到遊戲引擎內。您也可以決定一個時間，在時間到之前都"
-+"有機會反悔。如果時間到之前您決定反悔，計時器會重置。如果您希望先看看移動棋子"
-+"之後的結果，您可以關掉此選項。"
- 
- #: kbg.cpp:531
- msgid "Enable timeout"
-@@ -125,8 +131,8 @@
- 
- #: kbg.cpp:549
- msgid ""
--"Check the box to enable all the messages that you have previously disabled by "
--"choosing the \"Don't show this message again\" option."
-+"Check the box to enable all the messages that you have previously disabled "
-+"by choosing the \"Don't show this message again\" option."
- msgstr "勾選這個選項，可以將您之前選擇不要顯示的訊息通通讓它們重新顯示出來。"
- 
- #: kbg.cpp:553
-@@ -135,9 +141,11 @@
- 
- #: kbg.cpp:559
- msgid ""
--"Check the box to automatically save all window positions on program exit. They "
--"will be restored at next start."
--msgstr "勾選這個選項的話，會在遊戲離開的時候自動儲存目前視窗的狀態。下次開啟程式時會回到此狀態。"
-+"Check the box to automatically save all window positions on program exit. "
-+"They will be restored at next start."
-+msgstr ""
-+"勾選這個選項的話，會在遊戲離開的時候自動儲存目前視窗的狀態。下次開啟程式時會"
-+"回到此狀態。"
- 
- #: kbg.cpp:563
- msgid "Save settings on exit"
-@@ -145,9 +153,12 @@
- 
- #: kbg.cpp:570
- msgid ""
--"Event notification of %1 is configured as part of the system-wide notification "
--"process. Click here, and you will be able to configure system sounds, etc."
--msgstr "%1 的事件通知被設定為 KDE 的系統通知程序的一部份。點選這裡您就可以設定系統聲音之類的系統設定。"
-+"Event notification of %1 is configured as part of the system-wide "
-+"notification process. Click here, and you will be able to configure system "
-+"sounds, etc."
-+msgstr ""
-+"%1 的事件通知被設定為 KDE 的系統通知程序的一部份。點選這裡您就可以設定系統聲"
-+"音之類的系統設定。"
- 
- #: kbg.cpp:577
- msgid "Klick here to configure the event notification"
-@@ -160,7 +171,8 @@
- 
- #: kbg.cpp:671
- msgid ""
--"You can enable the menubar again with the right mouse button menu of the board."
-+"You can enable the menubar again with the right mouse button menu of the "
-+"board."
- msgstr "您在棋盤上點選滑鼠右鍵就可以把目錄選單再叫出來。"
- 
- #: kbgboard.cpp:131
-@@ -267,16 +279,17 @@
- msgstr ""
- "這裡是雙陸棋盤的「楚河漢界」。\n"
- "\n"
--"被「吃掉」的棋子會被擺在這條楚河漢界的長條框中，在下一步棋時必須先讓它們回到棋盤之中。\n"
-+"被「吃掉」的棋子會被擺在這條楚河漢界的長條框中，在下一步棋時必須先讓它們回到"
-+"棋盤之中。\n"
- "如果您有開啟「簡化移動」功能，您可以利用該功能來擺放棋子。"
- 
- #: kbgboard.cpp:1633
- msgid ""
- "This is a regular field of the backgammon board.\n"
- "\n"
--"Checkers can be placed on this field and if the current state of the game and "
--"the dice permit this, they can be moved by dragging them to their destination "
--"or by using the 'short move' feature."
-+"Checkers can be placed on this field and if the current state of the game "
-+"and the dice permit this, they can be moved by dragging them to their "
-+"destination or by using the 'short move' feature."
- msgstr ""
- "這裡是雙陸棋盤。\n"
- "\n"
-@@ -286,17 +299,18 @@
- msgid ""
- "This part of the backgammon board is the home.\n"
- "\n"
--"Depending on the direction of the game, one of the homes contains the dice and "
--"the other one contains checkers that have been moved off the board. Checkers "
--"can never be moved away from the home. If this home contains the dice and the "
--"current state of the game permits this, double clicking on the dice will roll "
--"them. Moreover, the cube might be placed on the home bar and if it can be "
--"doubled, double clicking it will do so."
-+"Depending on the direction of the game, one of the homes contains the dice "
-+"and the other one contains checkers that have been moved off the board. "
-+"Checkers can never be moved away from the home. If this home contains the "
-+"dice and the current state of the game permits this, double clicking on the "
-+"dice will roll them. Moreover, the cube might be placed on the home bar and "
-+"if it can be doubled, double clicking it will do so."
- msgstr ""
- "最旁邊的兩個區域是雙陸棋的「家區域」。\n"
- "\n"
--"這兩邊一邊是放置走出棋盤的棋子，另一邊則放骰子。一但棋子脫離了棋盤，就不能再移動。另外在遊戲進行中需要擲骰子的時候，可以用滑鼠雙擊骰子。此外，賭倍骰也有可能放在"
--"這裡，如果可以賭倍的時候也可以雙擊賭倍骰。"
-+"這兩邊一邊是放置走出棋盤的棋子，另一邊則放骰子。一但棋子脫離了棋盤，就不能再"
-+"移動。另外在遊戲進行中需要擲骰子的時候，可以用滑鼠雙擊骰子。此外，賭倍骰也有"
-+"可能放在這裡，如果可以賭倍的時候也可以雙擊賭倍骰。"
- 
- #: engines/fibs/kbgfibschat.cpp:203
- msgid "%1 user"
-@@ -318,14 +332,15 @@
- msgid ""
- "This is the chat window.\n"
- "\n"
--"The text in this window is colored depending on whether it is directed at you "
--"personally, shouted to the general FIBS population, has been said by you, or is "
--"of general interest. If you select the name of a player, the context contains "
--"entries specifically geared towards that player."
-+"The text in this window is colored depending on whether it is directed at "
-+"you personally, shouted to the general FIBS population, has been said by "
-+"you, or is of general interest. If you select the name of a player, the "
-+"context contains entries specifically geared towards that player."
- msgstr ""
- "這是聊天視窗。\n"
- "\n"
--"視窗內的文字會依據屬性呈現不同的顏色，像是對您說的悄悄話，或是對整個 FIBS 玩家喊的話，或是您說的話等等。如果您選擇某個玩家，說的話會直接傳達給他。"
-+"視窗內的文字會依據屬性呈現不同的顏色，像是對您說的悄悄話，或是對整個 FIBS 玩"
-+"家喊的話，或是您說的話等等。如果您選擇某個玩家，說的話會直接傳達給他。"
- 
- #: engines/fibs/kbgfibschat.cpp:233
- msgid "Info On"
-@@ -399,7 +414,8 @@
- msgid ""
- "Select all the users you want to remove from the gag list and then click OK. "
- "Afterwards you will again hear what they shout."
--msgstr "選擇好要移出清單的使用者，並按下「確定」。然後您就可以再聽到他們亂喊亂叫了。"
-+msgstr ""
-+"選擇好要移出清單的使用者，並按下「確定」。然後您就可以再聽到他們亂喊亂叫了。"
- 
- #: engines/fibs/kbgfibschat.cpp:381
- msgid "&Gag List"
-@@ -524,15 +540,17 @@
- 
- #: engines/fibs/kbgfibs.cpp:239
- msgid ""
--"Usually, all messages sent directly to you by other players are displayed only "
--"in the chat window. Check this box if you would like to get a copy of these "
--"messages in the main window."
--msgstr "通常，直接送給您的訊息只會顯示在聊天視窗中。勾選這個選項的話，在主視窗中也會顯示出來。"
-+"Usually, all messages sent directly to you by other players are displayed "
-+"only in the chat window. Check this box if you would like to get a copy of "
-+"these messages in the main window."
-+msgstr ""
-+"通常，直接送給您的訊息只會顯示在聊天視窗中。勾選這個選項的話，在主視窗中也會"
-+"顯示出來。"
- 
- #: engines/fibs/kbgfibs.cpp:242
- msgid ""
--"Check this box if you would like to receive information on players that invite "
--"you to games."
-+"Check this box if you would like to receive information on players that "
-+"invite you to games."
- msgstr "勾選這個選項的話，您在接受邀請時會顯示邀請您的玩家的個人資訊。"
- 
- #: engines/fibs/kbgfibs.cpp:257
-@@ -549,8 +567,8 @@
- 
- #: engines/fibs/kbgfibs.cpp:261
- msgid ""
--"If you want to send a standard greeting to your opponent whenever you start a "
--"new match, check this box and write the message into the entry field."
-+"If you want to send a standard greeting to your opponent whenever you start "
-+"a new match, check this box and write the message into the entry field."
- msgstr "勾選這個選項，並寫上打招呼的話，您在開始比賽時就會自動向對手打招呼。"
- 
- #: engines/fibs/kbgfibs.cpp:265
-@@ -595,33 +613,40 @@
- 
- #: engines/fibs/kbgfibs.cpp:320
- msgid ""
--"Enter here the host name of FIBS. With almost absolute certainty this should be "
--"\"fibs.com\". If you leave this blank, you will be asked again at connection "
--"time."
--msgstr "輸入 FIBS 主機名稱。通常都是 fibs.com。如果空白的話，連線時會詢問您要連到哪裡。"
-+"Enter here the host name of FIBS. With almost absolute certainty this should "
-+"be \"fibs.com\". If you leave this blank, you will be asked again at "
-+"connection time."
-+msgstr ""
-+"輸入 FIBS 主機名稱。通常都是 fibs.com。如果空白的話，連線時會詢問您要連到哪"
-+"裡。"
- 
- #: engines/fibs/kbgfibs.cpp:324
- msgid ""
--"Enter here the port number of FIBS. With almost absolute certainty this should "
--"be \"4321\". If you leave this blank, you will be asked again at connection "
--"time."
--msgstr "輸入 FIBS 主機連接埠。通常都是 4321。如果空白的話，連線時會詢問您要連到哪個連接埠。"
-+"Enter here the port number of FIBS. With almost absolute certainty this "
-+"should be \"4321\". If you leave this blank, you will be asked again at "
-+"connection time."
-+msgstr ""
-+"輸入 FIBS 主機連接埠。通常都是 4321。如果空白的話，連線時會詢問您要連到哪個連"
-+"接埠。"
- 
- #: engines/fibs/kbgfibs.cpp:328
- msgid ""
--"Enter your login on FIBS here. If you do not have a login yet, you should first "
--"create an account using the corresponding menu entry. If you leave this blank, "
--"you will be asked again at connection time."
--msgstr "輸入您在 FIBS 主機上的使用者名稱。如果沒有的話，您可以從選單中選擇註冊使用者。如果空白的話，連線時會請您輸入。"
-+"Enter your login on FIBS here. If you do not have a login yet, you should "
-+"first create an account using the corresponding menu entry. If you leave "
-+"this blank, you will be asked again at connection time."
-+msgstr ""
-+"輸入您在 FIBS 主機上的使用者名稱。如果沒有的話，您可以從選單中選擇註冊使用"
-+"者。如果空白的話，連線時會請您輸入。"
- 
- #: engines/fibs/kbgfibs.cpp:332
- msgid ""
- "Enter your password on FIBS here. If you do not have a login yet, you should "
--"first create an account using the corresponding menu entry. If you leave this "
--"blank, you will be asked again at connection time. The password will not be "
--"visible."
-+"first create an account using the corresponding menu entry. If you leave "
-+"this blank, you will be asked again at connection time. The password will "
-+"not be visible."
- msgstr ""
--"輸入您在 FIBS 主機上的使用者密碼。如果還沒有註冊使用者的話，您可以從選單中選擇註冊使用者。如果空白的話，連線時會請您輸入密碼。輸入時螢幕上不會顯示。"
-+"輸入您在 FIBS 主機上的使用者密碼。如果還沒有註冊使用者的話，您可以從選單中選"
-+"擇註冊使用者。如果空白的話，連線時會請您輸入密碼。輸入時螢幕上不會顯示。"
- 
- #: engines/fibs/kbgfibs.cpp:341
- msgid "Keep connections alive"
-@@ -629,13 +654,14 @@
- 
- #: engines/fibs/kbgfibs.cpp:343
- msgid ""
--"Usually, FIBS drops the connection after one hour of inactivity. When you check "
--"this box, %1 will try to keep the connection alive, even if you are not "
--"actually playing or chatting. Use this with caution if you do not have "
-+"Usually, FIBS drops the connection after one hour of inactivity. When you "
-+"check this box, %1 will try to keep the connection alive, even if you are "
-+"not actually playing or chatting. Use this with caution if you do not have "
- "flat-rate Internet access."
- msgstr ""
--"通常 FIBS 主機在連線超過一個小時沒有任何動作的話，會主動斷線。如果您勾選此選項，%1 "
--"會試著保持連線，即使您並沒有真的在玩或在聊天。不過請小心使用，因為可能影響您的網路。"
-+"通常 FIBS 主機在連線超過一個小時沒有任何動作的話，會主動斷線。如果您勾選此選"
-+"項，%1 會試著保持連線，即使您並沒有真的在玩或在聊天。不過請小心使用，因為可能"
-+"影響您的網路。"
- 
- #: engines/fibs/kbgfibs.cpp:357
- msgid "&Connection"
-@@ -656,7 +682,8 @@
- "%1 (experience %2, rating %3) wants to resume a saved match with you. If you "
- "want to play, use the corresponding menu entry to join (or type 'join %4')."
- msgstr ""
--"%1 (經驗值 %2 等級 %3)想要回復已經儲存的與您的比賽。如果您要繼續跟他玩，請在目錄選單中選取「加入」（或是在命令列中輸入 join %4）。"
-+"%1 (經驗值 %2 等級 %3)想要回復已經儲存的與您的比賽。如果您要繼續跟他玩，請在"
-+"目錄選單中選取「加入」（或是在命令列中輸入 join %4）。"
- 
- #: engines/fibs/kbgfibs.cpp:438
- msgid "%1 wants to resume a saved match with you"
-@@ -670,10 +697,12 @@
- 
- #: engines/fibs/kbgfibs.cpp:442
- msgid ""
--"%1 (experience %2, rating %3) wants to play an unlimited match with you. If you "
--"want to play, use the corresponding menu entry to join (or type 'join %4')."
-+"%1 (experience %2, rating %3) wants to play an unlimited match with you. If "
-+"you want to play, use the corresponding menu entry to join (or type 'join %"
-+"4')."
- msgstr ""
--"%1 (經驗值 %2 等級 %3)想要與您玩一場未限制賭注的比賽。如果您要跟他玩，請在目錄選單中選取「加入」（或是在命令列中輸入 join %4）。"
-+"%1 (經驗值 %2 等級 %3)想要與您玩一場未限制賭注的比賽。如果您要跟他玩，請在目"
-+"錄選單中選取「加入」（或是在命令列中輸入 join %4）。"
- 
- #: engines/fibs/kbgfibs.cpp:445
- msgid "%1 has invited you to an unlimited match"
-@@ -688,10 +717,12 @@
- 
- #: engines/fibs/kbgfibs.cpp:451
- msgid ""
--"%1 (experience %2, rating %3) wants to play a %4 point match with you. If you "
--"want to play, use the corresponding menu entry to join (or type 'join %5')."
-+"%1 (experience %2, rating %3) wants to play a %4 point match with you. If "
-+"you want to play, use the corresponding menu entry to join (or type 'join %"
-+"5')."
- msgstr ""
--"%1 (經驗值 %2 等級 %3)想要與您玩一場賭 %4 點的比賽。如果您要跟他玩，請在目錄選單中選取「加入」（或是在命令列中輸入 join %5）。"
-+"%1 (經驗值 %2 等級 %3)想要與您玩一場賭 %4 點的比賽。如果您要跟他玩，請在目錄"
-+"選單中選取「加入」（或是在命令列中輸入 join %5）。"
- 
- #: engines/fibs/kbgfibs.cpp:454
- msgid "%1 has invited you for a %2 point match"
-@@ -849,10 +880,12 @@
- 
- #: engines/fibs/kbgfibs.cpp:1611
- msgid ""
--"Your account has been created. Your new login is <u>%1</u>"
--". To fully activate this account, I will now close the connection. Once you "
--"reconnect, you can start playing backgammon on FIBS."
--msgstr "您的使用者帳號已建立。使用者名稱為 <u>%1</u>。請您重新連線，並使用新的使用者帳號登入。"
-+"Your account has been created. Your new login is <u>%1</u>. To fully "
-+"activate this account, I will now close the connection. Once you reconnect, "
-+"you can start playing backgammon on FIBS."
-+msgstr ""
-+"您的使用者帳號已建立。使用者名稱為 <u>%1</u>。請您重新連線，並使用新的使用者"
-+"帳號登入。"
- 
- #: engines/fibs/kbgfibs.cpp:1739
- msgid "%1 (%2) vs. %3 (%4) - game over"
-@@ -896,10 +929,11 @@
- 
- #: engines/fibs/kbgfibs.cpp:2062
- msgid ""
--"You should never set the 'boardstyle' variable by hand! It is vital for proper "
--"functioning of this program that it remains set to 3. It has been reset for "
--"you."
--msgstr "請不要手動設定「boardstyle」。這對此程式的某些功能很重要，此值將重設為 3。"
-+"You should never set the 'boardstyle' variable by hand! It is vital for "
-+"proper functioning of this program that it remains set to 3. It has been "
-+"reset for you."
-+msgstr ""
-+"請不要手動設定「boardstyle」。這對此程式的某些功能很重要，此值將重設為 3。"
- 
- #: engines/fibs/kbgfibs.cpp:2162
- msgid "&Connect"
-@@ -915,7 +949,7 @@
- 
- #: engines/fibs/kbgfibs.cpp:2172
- msgid "&Invite..."
--msgstr "邀請...(&I)"
-+msgstr "邀請…(&I)"
- 
- #: engines/fibs/kbgfibs.cpp:2178
- msgid "&Commands"
-@@ -1041,10 +1075,12 @@
- 
- #: engines/fibs/kplayerlist.cpp:259
- msgid ""
--"This window contains the player list. It shows all players that are currently "
--"logged into FIBS.Use the right mouse button to get a context menu with helpful "
--"information and commands."
--msgstr "這個視窗是玩家清單。它顯示所有目前登入在 FIBS 的玩家。用滑鼠右鍵可以取得資訊與命令清單。"
-+"This window contains the player list. It shows all players that are "
-+"currently logged into FIBS.Use the right mouse button to get a context menu "
-+"with helpful information and commands."
-+msgstr ""
-+"這個視窗是玩家清單。它顯示所有目前登入在 FIBS 的玩家。用滑鼠右鍵可以取得資訊"
-+"與命令清單。"
- 
- #: engines/fibs/kplayerlist.cpp:289
- msgid "Info"
-@@ -1228,14 +1264,12 @@
- 
- #: engines/gnubg/kbggnubg.cpp:442
- msgid "&Restart GNU Backgammon"
--msgstr "重新啟動 GNUBG (&R)"
-+msgstr "重新啟動 GNUBG(&R)"
- 
- #: engines/gnubg/kbggnubg.cpp:474
- msgid ""
--"This is experimental code which currently requires a specially patched version "
--"of GNU Backgammon."
--"<br/>"
--"<br/>"
-+"This is experimental code which currently requires a specially patched "
-+"version of GNU Backgammon.<br/><br/>"
- msgstr "這個功能目前還在實驗中，而且需要特殊的 GNUBG 更新。<br/><br/>"
- 
- #: engines/gnubg/kbggnubg.cpp:507
-@@ -1487,7 +1521,9 @@
- "This is a graphical backgammon program. It supports backgammon games\n"
- "with other players, games against computer engines like GNU bg and even\n"
- "on-line games on the 'First Internet Backgammon Server'."
--msgstr "這是個圖形介面的西洋雙陸棋遊戲程式。它支援兩人對戰，與電腦對戰，還有網路對戰等模式。"
-+msgstr ""
-+"這是個圖形介面的西洋雙陸棋遊戲程式。它支援兩人對戰，與電腦對戰，還有網路對戰"
-+"等模式。"
- 
- #: main.cpp:43
- msgid "KBackgammon"
-diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdegames/kbattleship.po kde-i18n-zh_TW-3.5.10/messages/kdegames/kbattleship.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdegames/kbattleship.po	2008-08-19 20:43:06.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdegames/kbattleship.po	2011-11-11 15:45:17.000000000 +0100
-@@ -10,8 +10,7 @@
- "Project-Id-Version: kbattleship\n"
- "POT-Creation-Date: 2008-07-08 01:19+0200\n"
- "PO-Revision-Date: 2006-01-17 15:48+0800\n"
--"Last-Translator: Frank Weng (a.k.a. Franklin) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Traditional Chinese <zh_l10n@linux.org.tw>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
-@@ -73,11 +72,11 @@
- 
- #: kbattleship.cpp:187
- msgid "Sending Message..."
--msgstr "傳送訊息..."
-+msgstr "傳送訊息…"
- 
- #: kbattleship.cpp:311 kbattleship.cpp:1231 kbattleship.cpp:1313
- msgid "S&ingle Player"
--msgstr "單一玩家(&i)"
-+msgstr "單一玩家(&I)"
- 
- #: kbattleship.cpp:314 kbattleship.cpp:406
- msgid "You won the game :)"
-@@ -97,7 +96,7 @@
- 
- #: kbattleship.cpp:401
- msgid "Waiting for enemy to shoot.."
--msgstr "等待敵方射擊..."
-+msgstr "等待敵方射擊…"
- 
- #: kbattleship.cpp:419 kbattleship.cpp:425
- msgid "Enemy disconnected."
-@@ -109,23 +108,23 @@
- 
- #: kbattleship.cpp:435
- msgid "&Start server"
--msgstr "起始伺服器 (&S)"
-+msgstr "起始伺服器(&S)"
- 
- #: kbattleship.cpp:436
- msgid "S&ingle game"
--msgstr "單一玩家遊戲(&i)"
-+msgstr "單一玩家遊戲(&I)"
- 
- #: kbattleship.cpp:557
- msgid "Waiting for computer player to start the match..."
--msgstr "等待電腦玩家開始競賽..."
-+msgstr "等待電腦玩家開始競賽…"
- 
- #: kbattleship.cpp:567 konnectionhandling.cpp:112 konnectionhandling.cpp:136
- msgid "Waiting for other player to place their ships..."
--msgstr "等待其他玩家放置船艦..."
-+msgstr "等待其他玩家放置船艦…"
- 
- #: kbattleship.cpp:569
- msgid "Waiting for other player to start the match..."
--msgstr "等待其他玩家開始競賽..."
-+msgstr "等待其他玩家開始競賽…"
- 
- #. i18n: file dialogs/statDlg.ui line 172
- #: kbattleship.cpp:639 kbattleship.cpp:670 rc.cpp:105
-@@ -147,7 +146,7 @@
- 
- #: kbattleship.cpp:697
- msgid "Loading Connect-Server dialog..."
--msgstr "載入連接伺服器對話視窗..."
-+msgstr "載入連接伺服器對話視窗…"
- 
- #: kbattleship.cpp:718
- msgid "The client is asking to restart the game. Do you accept?"
-@@ -181,11 +180,11 @@
- 
- #: kbattleship.cpp:770
- msgid "Waiting for an answer..."
--msgstr "等待回應..."
-+msgstr "等待回應…"
- 
- #: kbattleship.cpp:806
- msgid "Loading Start-Server dialog..."
--msgstr "載入開始伺服器對話視窗..."
-+msgstr "載入開始伺服器對話視窗…"
- 
- #: kbattleship.cpp:846
- msgid "&Stop server"
-@@ -193,7 +192,7 @@
- 
- #: kbattleship.cpp:849
- msgid "Waiting for a player..."
--msgstr "等待玩家加入..."
-+msgstr "等待玩家加入…"
- 
- #: kbattleship.cpp:1077
- msgid "The URL passed to KDE Battleship '%1' is not a valid url"
-@@ -206,7 +205,7 @@
- 
- #: kbattleship.cpp:1116
- msgid "Dis&connect from server"
--msgstr "從伺服器斷線(&c)"
-+msgstr "從伺服器斷線(&C)"
- 
- #: kbattleship.cpp:1216
- msgid "Start Game"
-@@ -222,7 +221,7 @@
- 
- #: kbattleship.cpp:1253
- msgid "Waiting for the AI player to place the ships..."
--msgstr "等在電腦玩家放置船艦..."
-+msgstr "等在電腦玩家放置船艦…"
- 
- #: kbattleship.cpp:1304 konnectionhandling.cpp:124 konnectionhandling.cpp:192
- msgid "Enemy has shot. Shoot now."
-@@ -272,8 +271,8 @@
- 
- #: konnectionhandling.cpp:97
- msgid ""
--"Connection dropped by enemy. The client's protocol implementation (%1) is not "
--"compatible with our (%2) version."
-+"Connection dropped by enemy. The client's protocol implementation (%1) is "
-+"not compatible with our (%2) version."
- msgstr "連線被敵方中斷。客戶端之通訊協定(%1)不符合我們的版本(%2)。"
- 
- #: konnectionhandling.cpp:142 konnectionhandling.cpp:203
-@@ -282,13 +281,13 @@
- 
- #: konnectionhandling.cpp:162
- msgid ""
--"Connection to client dropped. The client's protocol implementation (%1) is not "
--"compatible with our (%2) version."
-+"Connection to client dropped. The client's protocol implementation (%1) is "
-+"not compatible with our (%2) version."
- msgstr "客戶端連線中斷，客戶端之通訊協定(%1)不符合我們的版本(%2)"
- 
- #: konnectionhandling.cpp:170
- msgid "We have a player. Let's start..."
--msgstr "玩家加入，咱們開始遊戲吧..."
-+msgstr "玩家加入，咱們開始遊戲吧…"
- 
- #: konnectionhandling.cpp:180
- msgid "You can shoot now."
-@@ -327,7 +326,8 @@
- 
- #: main.cpp:28
- msgid ""
--"URL of server to attach to.  In the form kbattleship://host:port/ or host:port"
-+"URL of server to attach to.  In the form kbattleship://host:port/ or host:"
-+"port"
- msgstr "伺服器連結的 URL。格式為 kbattleship://主機:埠號/ 或是 主機:埠號"
- 
- #: main.cpp:36
-diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdegames/kblackbox.po kde-i18n-zh_TW-3.5.10/messages/kdegames/kblackbox.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdegames/kblackbox.po	2006-07-22 10:03:52.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdegames/kblackbox.po	2011-11-11 15:45:17.000000000 +0100
-@@ -5,7 +5,7 @@
- "Project-Id-Version: kblackbox\n"
- "POT-Creation-Date: 2005-07-24 01:33+0200\n"
- "PO-Revision-Date: 2003-12-23 02:10+0800\n"
--"Last-Translator: Hydonsingore Sie <hydonsingore@mail.educities.edu.tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Chinese(traditional) <zh-l10n@linux.org.tw>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
-@@ -99,7 +99,7 @@
- 
- #: kbbgame.cpp:702
- msgid "&Give Up"
--msgstr "放棄 (&G)"
-+msgstr "放棄(&G)"
- 
- #: kbbgame.cpp:703
- msgid "&Done"
-diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdegames/kbounce.po kde-i18n-zh_TW-3.5.10/messages/kdegames/kbounce.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdegames/kbounce.po	2006-07-22 10:03:52.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdegames/kbounce.po	2011-11-11 15:45:17.000000000 +0100
-@@ -7,7 +7,7 @@
- "Project-Id-Version: kbounce\n"
- "POT-Creation-Date: 2005-07-01 01:32+0200\n"
- "PO-Revision-Date: 2003-12-06 11:37+0800\n"
--"Last-Translator: Hydonsingore Sie <hydonsingore@mail.educities.edu.tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Chinese(traitional) <zh-l10n@linux.org.tw>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
-@@ -56,15 +56,15 @@
- 
- #: kbounce.cpp:135
- msgid "&Select Background Folder..."
--msgstr "選擇背景圖案所在的目錄...(&S)"
-+msgstr "選擇背景圖案所在的目錄…(&S)"
- 
- #: kbounce.cpp:138
- msgid "Show &Backgrounds"
--msgstr "顯示背景 (&B)"
-+msgstr "顯示背景(&B)"
- 
- #: kbounce.cpp:140
- msgid "Hide &Backgrounds"
--msgstr "隱藏背景 (&B)"
-+msgstr "隱藏背景(&B)"
- 
- #: kbounce.cpp:144
- msgid "&Play Sounds"
-@@ -101,28 +101,20 @@
- 
- #: kbounce.cpp:463
- #, c-format
--msgid ""
--"You have successfully cleared more than 75% of the board.\n"
--msgstr ""
--"您已經成功清除了75%的區域。\n"
-+msgid "You have successfully cleared more than 75% of the board.\n"
-+msgstr "您已經成功清除了 75% 的區域。\n"
- 
- #: kbounce.cpp:464
--msgid ""
--"%1 points: 15 points per remaining life\n"
--msgstr ""
--"%1 分: 每條剩下的命可得15分\n"
-+msgid "%1 points: 15 points per remaining life\n"
-+msgstr "%1 分: 每條剩下的命可得15分\n"
- 
- #: kbounce.cpp:465
--msgid ""
--"%1 points: Bonus\n"
--msgstr ""
--"%1 分: 額外紅利\n"
-+msgid "%1 points: Bonus\n"
-+msgstr "%1 分: 額外紅利\n"
- 
- #: kbounce.cpp:466
--msgid ""
--"%1 points: Total score for this level\n"
--msgstr ""
--"%1 分: 本關卡的總分數\n"
-+msgid "%1 points: Total score for this level\n"
-+msgstr "%1 分: 本關卡的總分數\n"
- 
- #: kbounce.cpp:467
- msgid "On to level %1. Remember you get %2 lives this time!"
-@@ -148,7 +140,7 @@
- #~ msgstr "選擇圖案目錄(&S)"
- 
- #~ msgid "Show &Images"
--#~ msgstr "顯示圖案 (&I)"
-+#~ msgstr "顯示圖案(&I)"
- 
- #, fuzzy
- #~ msgid "&Select Image Directory..."
-@@ -168,13 +160,13 @@
- #~ "準備再闖下一關吧！"
- 
- #~ msgid "S&how Highscore"
--#~ msgstr "顯示排行榜 (&H)"
-+#~ msgstr "顯示排行榜(&H)"
- 
- #~ msgid "&Pause"
--#~ msgstr "暫停 (&P)"
-+#~ msgstr "暫停(&P)"
- 
- #~ msgid "&Stop"
--#~ msgstr "停止 (&S)"
-+#~ msgstr "停止(&S)"
- 
- #~ msgid "New High Score"
- #~ msgstr "新排行榜"
-diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdegames/kenolaba.po kde-i18n-zh_TW-3.5.10/messages/kdegames/kenolaba.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdegames/kenolaba.po	2006-07-22 10:03:52.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdegames/kenolaba.po	2011-11-11 15:45:17.000000000 +0100
-@@ -6,7 +6,7 @@
- "Project-Id-Version: kenolaba\n"
- "POT-Creation-Date: 2005-05-18 21:24+0200\n"
- "PO-Revision-Date: 2004-01-09 11:45+0800\n"
--"Last-Translator: Hydonsingore Sie <hydonsingore@mail.educities.edu.tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Chinese(traditional) <zh-l10n@linux.org.tw>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
-@@ -122,7 +122,7 @@
- 
- #: AbTop.cpp:501
- msgid "I am thinking..."
--msgstr "我在思考中..."
-+msgstr "我在思考中…"
- 
- #: AbTop.cpp:501
- msgid "It is your turn!"
-@@ -283,47 +283,49 @@
- #: rc.cpp:69
- #, no-c-format
- msgid ""
--"For every ball, the given points are added to the evaluation depending on the "
--"balls position. The bonus for a given position is changed randomly in the +/- "
--"range."
--msgstr "對每一個球，給定點的評估會依據其位置而加入。每個點的分數可以在 +/- 的範圍內隨機改變。"
-+"For every ball, the given points are added to the evaluation depending on "
-+"the balls position. The bonus for a given position is changed randomly in "
-+"the +/- range."
-+msgstr ""
-+"對每一個球，給定點的評估會依據其位置而加入。每個點的分數可以在 +/- 的範圍內隨"
-+"機改變。"
- 
- #. i18n: file EvalDlg.ui line 1175
- #: rc.cpp:72
- #, no-c-format
- msgid "In-A-Row"
--msgstr "在一行"
-+msgstr "在一列"
- 
- #. i18n: file EvalDlg.ui line 1295
- #: rc.cpp:75
- #, no-c-format
- msgid "Three in-a-row:"
--msgstr "三個一行："
-+msgstr "三個一列："
- 
- #. i18n: file EvalDlg.ui line 1303
- #: rc.cpp:78
- #, no-c-format
- msgid "Two in-a-row:"
--msgstr "二個一行："
-+msgstr "二個一列："
- 
- #. i18n: file EvalDlg.ui line 1311
- #: rc.cpp:81
- #, no-c-format
- msgid "Four in-a-row:"
--msgstr "四個一行："
-+msgstr "四個一列："
- 
- #. i18n: file EvalDlg.ui line 1319
- #: rc.cpp:84
- #, no-c-format
- msgid "Five in-a-row:"
--msgstr "五個一行："
-+msgstr "五個一列："
- 
- #. i18n: file EvalDlg.ui line 1342
- #: rc.cpp:87
- #, no-c-format
- msgid ""
- "For a number of balls In-a-Row, the given points are added to the evaluation"
--msgstr "對於每一行的球數，給定的點會增加到評估中。"
-+msgstr "對於每一列的球數，給定的點會增加到評估中。"
- 
- #. i18n: file EvalDlg.ui line 1370
- #: rc.cpp:90
-@@ -379,8 +381,8 @@
- #: rc.cpp:120
- #, no-c-format
- msgid ""
--"Your evaluation scheme, defined in all other tabs of this dialog, can be stored "
--"here."
-+"Your evaluation scheme, defined in all other tabs of this dialog, can be "
-+"stored here."
- msgstr "這邊是您的評估架構，被所有這個對話窗中的標籤頁所定義，可以被儲存。"
- 
- #. i18n: file EvalDlg.ui line 1686
-diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdegames/kfouleggs.po kde-i18n-zh_TW-3.5.10/messages/kdegames/kfouleggs.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdegames/kfouleggs.po	2006-07-22 10:03:52.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdegames/kfouleggs.po	2011-11-11 15:45:17.000000000 +0100
-@@ -7,7 +7,7 @@
- "Project-Id-Version: kfouleggs\n"
- "POT-Creation-Date: 2005-05-18 21:24+0200\n"
- "PO-Revision-Date: 2003-12-16 22:12+0800\n"
--"Last-Translator: Hydonsingore Sie <hydonsingore@mail.educities.edu.tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Chinese(traitional) <zh-l10n@linux.org.tw>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
-@@ -16,7 +16,7 @@
- 
- #: ai.cpp:10
- msgid "Occupied lines:"
--msgstr "佔用的行數:"
-+msgstr "佔用的列數:"
- 
- #: ai.cpp:12
- msgid "Number of spaces:"
-@@ -98,7 +98,7 @@
- #: rc.cpp:6
- #, no-c-format
- msgid "Occupied lines"
--msgstr "佔用行數"
-+msgstr "佔用列數"
- 
- #. i18n: file kfouleggs.kcfg line 14
- #: rc.cpp:9
-diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdegames/kgoldrunner.po kde-i18n-zh_TW-3.5.10/messages/kdegames/kgoldrunner.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdegames/kgoldrunner.po	2007-01-15 10:56:21.000000000 +0100
-+++ kde-i18n-zh_TW-3.5.10/messages/kdegames/kgoldrunner.po	2011-11-11 15:45:17.000000000 +0100
-@@ -13,8 +13,7 @@
- "Project-Id-Version: kgoldrunner\n"
- "POT-Creation-Date: 2006-10-10 02:33+0200\n"
- "PO-Revision-Date: 2006-01-18 11:43+0800\n"
--"Last-Translator: Frank Weng (a.k.a. Franklin) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Traditional Chinese <zh_l10n@linux.org.tw>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
-@@ -43,18 +42,20 @@
- 
- #: data_messages.cpp:30
- msgid ""
--"Hi !  Welcome to KGoldrunner !  The idea of the game is to pick up all the gold "
--"nuggets, then climb to the top of the playing area and move up to the next "
--"level.  A hidden ladder will appear as you collect the last nugget.\n"
--"\n"
--"The hero (the green figure) is your deputy.  To collect the nuggets, just point "
--"the mouse where you want him to go.  At first gravity takes over and he falls "
--"..."
--msgstr ""
--"Hi ! 歡迎來到KGoldrunner !  這個遊戲的目標是要撿到所有的金塊，爬 到遊戲畫面的最上端然後進入下一關。當你撿到所有的金塊時，隱藏 "
--"的樓梯會出現，帶你進入下一關。\n"
-+"Hi !  Welcome to KGoldrunner !  The idea of the game is to pick up all the "
-+"gold nuggets, then climb to the top of the playing area and move up to the "
-+"next level.  A hidden ladder will appear as you collect the last nugget.\n"
-+"\n"
-+"The hero (the green figure) is your deputy.  To collect the nuggets, just "
-+"point the mouse where you want him to go.  At first gravity takes over and "
-+"he falls ..."
-+msgstr ""
-+"Hi ! 歡迎來到KGoldrunner !  這個遊戲的目標是要撿到所有的金塊，爬 到遊戲畫面的"
-+"最上端然後進入下一關。當你撿到所有的金塊時，隱藏 的樓梯會出現，帶你進入下一"
-+"關。\n"
- "\n"
--"你扮演男主角(綠色小人)。要撿到金塊，只要用滑鼠點一下你要他去的 地方，他就會跑過去。重力會讓他往下掉..."
-+"你扮演男主角(綠色小人)。要撿到金塊，只要用滑鼠點一下你要他去的 地方，他就會跑"
-+"過去。重力會讓他往下掉..."
- 
- #: data_messages.cpp:36
- msgid "Navigation"
-@@ -62,18 +63,20 @@
- 
- #: data_messages.cpp:37
- msgid ""
--"This is an exercise in moving around.  Follow the track of gold nuggets until "
--"the ladder pops up at the right.  The hero can only follow the mouse along "
--"simple paths (like _ | L or U), so be careful not to get too far ahead of him.\n"
-+"This is an exercise in moving around.  Follow the track of gold nuggets "
-+"until the ladder pops up at the right.  The hero can only follow the mouse "
-+"along simple paths (like _ | L or U), so be careful not to get too far ahead "
-+"of him.\n"
- "\n"
- "DANGER: Try not to fall off the ladder or bar into the concrete pit at the "
- "bottom right.  If you do get trapped there, the only way out is to kill the "
- "hero (press key Q for quit) and start the level again."
- msgstr ""
--"在此練習操控移動。順著著金塊分佈的路徑直到右方有梯子浮現。 主角能隨著你滑鼠移動，不過限於簡單的路徑(像是like _ | L or U)， "
--"因此滑鼠別領先他太多。\n"
-+"在此練習操控移動。順著著金塊分布的路徑直到右方有梯子浮現。 主角能隨著你滑鼠移"
-+"動，不過限於簡單的路徑(像是like _ | L or U)， 因此滑鼠別領先他太多。\n"
- "\n"
--"警告：別從梯子或橫木上掉到右下方的水泥凹窩之中。如果你真的 掉下去了，唯一的辦法是讓主角死掉(按Q)然後重新開始本關卡。"
-+"警告：別從梯子或橫木上掉到右下方的水泥凹窩之中。如果你真的 掉下去了，唯一的辦"
-+"法是讓主角死掉(按Q)然後重新開始本關卡。"
- 
- #: data_messages.cpp:43
- msgid "Digging"
-@@ -81,24 +84,26 @@
- 
- #: data_messages.cpp:44
- msgid ""
--"Now you have to dig to get the gold!  Just use the left and right mouse buttons "
--"to dig left or right of the hero's position.  The hero can then jump into and "
--"through the hole he has dug.  He can also dig several holes in a row and run "
--"sideways through the dug holes.  Be careful though.  After a while the holes "
--"close up and you can get trapped and killed.\n"
--"\n"
--"In the third box down, you have to dig two holes, jump in and quickly dig one "
--"more, to get through two layers.  On the right, you have to dig three, then two "
--"then one to get through.  There are also two little puzzles to work out along "
--"the way.  Good luck!\n"
-+"Now you have to dig to get the gold!  Just use the left and right mouse "
-+"buttons to dig left or right of the hero's position.  The hero can then jump "
-+"into and through the hole he has dug.  He can also dig several holes in a "
-+"row and run sideways through the dug holes.  Be careful though.  After a "
-+"while the holes close up and you can get trapped and killed.\n"
-+"\n"
-+"In the third box down, you have to dig two holes, jump in and quickly dig "
-+"one more, to get through two layers.  On the right, you have to dig three, "
-+"then two then one to get through.  There are also two little puzzles to work "
-+"out along the way.  Good luck!\n"
- "\n"
- "By the way, you can dig through brick, but not concrete."
- msgstr ""
--"現在你必須挖洞才能撿到金塊！使用滑鼠的左右鍵，分別在主角所 在位置的左右挖洞。這樣主角就能跳到他自己挖的洞裡，他也可以 "
--"挖成一排，開一條小路。請小心，過一會兒所挖的洞就會自動補回 你如果還在那個位置，就會身陷其中而死。\n"
--"\n"
--"在下方的第三個框框裡，你必須挖兩個洞，跳進去然後迅速地挖一 個新的洞，這樣才可以通過兩層。在右邊，你需要挖三個洞，然後 "
--"兩個，再加一個才能通過。過程中有兩個小難題需要克服，祝你好 運！\n"
-+"現在你必須挖洞才能撿到金塊！使用滑鼠的左右鍵，分別在主角所 在位置的左右挖洞。"
-+"這樣主角就能跳到他自己挖的洞裡，他也可以 挖成一排，開一條小路。請小心，過一會"
-+"兒所挖的洞就會自動補回 你如果還在那個位置，就會身陷其中而死。\n"
-+"\n"
-+"在下方的第三個框框裡，你必須挖兩個洞，跳進去然後迅速地挖一 個新的洞，這樣才可"
-+"以通過兩層。在右邊，你需要挖三個洞，然後 兩個，再加一個才能通過。過程中有兩個"
-+"小難題需要克服，祝你好 運！\n"
- "\n"
- "另外，你只能在磚牆上挖洞，水泥牆你是挖不動的。"
- 
-@@ -108,31 +113,35 @@
- 
- #: data_messages.cpp:53
- msgid ""
--"Well, it's been nice and easy up to now, but the game would be no fun without "
--"enemies.  They are after the gold too: worse still they are after you!  You die "
--"if they catch you, but maybe you will have a few lives left and can start "
--"again.\n"
--"\n"
--"You can handle enemies by running away, digging a hole or luring them into part "
--"of the playing area where they get stranded.\n"
--"\n"
--"If an enemy falls into a hole, he gives up any gold he is carrying, then gets "
--"stuck in the hole for a time and climbs out.  If the hole closes while he is in "
--"it, he dies and reappears somewhere else on the screen.  You can deliberately "
--"kill enemies by digging several holes in a row.\n"
--"\n"
--"More importantly, you can run over an enemy's head.  You must do that right at "
--"the start of this level.  Dig a hole, trap the enemy, wait for him to fall all "
--"the way in, then run over him, with the other enemy in hot pursuit..."
-+"Well, it's been nice and easy up to now, but the game would be no fun "
-+"without enemies.  They are after the gold too: worse still they are after "
-+"you!  You die if they catch you, but maybe you will have a few lives left "
-+"and can start again.\n"
-+"\n"
-+"You can handle enemies by running away, digging a hole or luring them into "
-+"part of the playing area where they get stranded.\n"
-+"\n"
-+"If an enemy falls into a hole, he gives up any gold he is carrying, then "
-+"gets stuck in the hole for a time and climbs out.  If the hole closes while "
-+"he is in it, he dies and reappears somewhere else on the screen.  You can "
-+"deliberately kill enemies by digging several holes in a row.\n"
-+"\n"
-+"More importantly, you can run over an enemy's head.  You must do that right "
-+"at the start of this level.  Dig a hole, trap the enemy, wait for him to "
-+"fall all the way in, then run over him, with the other enemy in hot "
-+"pursuit..."
- msgstr ""
--"到目前為止都還算簡單，不過遊戲沒有敵人就不好玩。他們也會偷拿金子，而且還會追著你跑！如果他們抓到你，你就死了，如果還有生命數就可以再開始玩。\n"
-+"到目前為止都還算簡單，不過遊戲沒有敵人就不好玩。他們也會偷拿金子，而且還會追"
-+"著你跑！如果他們抓到你，你就死了，如果還有生命數就可以再開始玩。\n"
- "\n"
- "您可以逃避他們的追殺，也可以挖洞並引誘他們掉下去。\n"
- "\n"
--"當敵人掉進洞時，他們偷拿的金子會跑出來。不過他們一陣子就會從洞裡爬出來。如果沒來得及在洞填上之前爬出來，他就會被埋死在裡面，然後又從某處再跑出來。您可以連續挖幾"
--"個洞，讓他們連續掉進去後最後會被埋起來。\n"
-+"當敵人掉進洞時，他們偷拿的金子會跑出來。不過他們一陣子就會從洞裡爬出來。如果"
-+"沒來得及在洞填上之前爬出來，他就會被埋死在裡面，然後又從某處再跑出來。您可以"
-+"連續挖幾個洞，讓他們連續掉進去後最後會被埋起來。\n"
- "\n"
--"更重要的是，他們掉在洞裡時您可以從他們頭上走過去。像在這一關開始您就要這樣做：挖一個洞，引誘敵人掉下去，然後從他頭上踏過去，以免其他敵人追過來..."
-+"更重要的是，他們掉在洞裡時您可以從他們頭上走過去。像在這一關開始您就要這樣"
-+"做：挖一個洞，引誘敵人掉下去，然後從他頭上踏過去，以免其他敵人追過來..."
- 
- #: data_messages.cpp:63
- msgid "Bars"
-@@ -140,9 +149,12 @@
- 
- #: data_messages.cpp:64
- msgid ""
--"You can move horizontally along bars (or poles), but if you move down you will "
--"let go and fall ....  Also, note that you can collect gold by falling onto it."
--msgstr "你可以吊在橫木上作水平移動，但如果你往下移動，你就會鬆手然後 掉落...  提醒一下，你可以藉著落下的過程取得路徑上的金塊。"
-+"You can move horizontally along bars (or poles), but if you move down you "
-+"will let go and fall ....  Also, note that you can collect gold by falling "
-+"onto it."
-+msgstr ""
-+"你可以吊在橫木上作水平移動，但如果你往下移動，你就會鬆手然後 掉落...  提醒一"
-+"下，你可以藉著落下的過程取得路徑上的金塊。"
- 
- #: data_messages.cpp:68
- msgid "False Bricks"
-@@ -150,13 +162,15 @@
- 
- #: data_messages.cpp:69
- msgid ""
--"Some of the bricks in this level are not what they seem.  If you walk onto them "
--"you fall through.  The enemies fall through them too."
--msgstr "這關裡有些看似磚牆的部份不是真的磚牆。如果你走過這些磚牆上 面，你就會往下掉。你的敵人一樣會從這些地方往下掉。"
-+"Some of the bricks in this level are not what they seem.  If you walk onto "
-+"them you fall through.  The enemies fall through them too."
-+msgstr ""
-+"這關裡有些看似磚牆的部份不是真的磚牆。如果你走過這些磚牆上 面，你就會往下掉。"
-+"你的敵人一樣會從這些地方往下掉。"
- 
- #: data_messages.cpp:73 data_messages.cpp:110
- msgid "Bye ......."
--msgstr "再會 ......"
-+msgstr "再會……"
- 
- #: data_messages.cpp:74 data_messages.cpp:111
- msgid ""
-@@ -164,15 +178,16 @@
- "games in KGoldrunner.\n"
- "\n"
- "Note that there is a game Editor in which you and your friends can make up "
--"levels and challenge each other.  There is also a KGoldrunner Handbook in the "
--"Help Menu, which contains more detail than this Tutorial.\n"
-+"levels and challenge each other.  There is also a KGoldrunner Handbook in "
-+"the Help Menu, which contains more detail than this Tutorial.\n"
- "\n"
- "It's been a pleasure showing you around.  Bye !!!"
- msgstr ""
- "這只是一個可以簡單完成的關卡，希望你在其他KGoldrunner的關卡 中能玩得愉快。\n"
- "\n"
--"注意一下，這個遊戲包含了遊戲編輯器，你可以和你的朋友製造關 卡、挑戰對方。在說明選單中也有KGoldrunner的使用手冊，在那裡 "
--"可以找到比這個體驗教學詳細的說明。\n"
-+"注意一下，這個遊戲包含了遊戲編輯器，你可以和你的朋友製造關 卡、挑戰對方。在說"
-+"明選單中也有KGoldrunner的使用手冊，在那裡 可以找到比這個體驗教學詳細的說"
-+"明。\n"
- "\n"
- "很高興能夠帶你體驗一下，再會!!!"
- 
-@@ -182,32 +197,35 @@
- 
- #: data_messages.cpp:83
- msgid ""
--"There's nowhere to dig, so you must dodge the enemies and avoid falling to the "
--"concrete at the wrong time.  Try to keep the enemies together.\n"
-+"There's nowhere to dig, so you must dodge the enemies and avoid falling to "
-+"the concrete at the wrong time.  Try to keep the enemies together.\n"
- "\n"
--"If an enemy has a gold outline, he is holding a nugget.  He might drop it as he "
--"runs over the concrete or maybe at the top of a ladder ...... patience, "
-+"If an enemy has a gold outline, he is holding a nugget.  He might drop it as "
-+"he runs over the concrete or maybe at the top of a ladder ...... patience, "
- "patience !!"
- msgstr ""
--"這裡沒有地方可以挖洞，所以您只能閃躲敵人並避免在錯誤的時間掉進水泥裡。試著讓敵人集中在一起。\n"
-+"這裡沒有地方可以挖洞，所以您只能閃躲敵人並避免在錯誤的時間掉進水泥裡。試著讓"
-+"敵人集中在一起。\n"
- "\n"
--"如果敵人有金色的輪廓，那他可能有偷拿金子。他也許會在水泥上面跑的時候把金子丟下來，也或者會放在梯子的最上方。保持耐心！"
-+"如果敵人有金色的輪廓，那他可能有偷拿金子。他也許會在水泥上面跑的時候把金子丟"
-+"下來，也或者會放在梯子的最上方。保持耐心！"
- 
- #: data_messages.cpp:89
- msgid "To kill ....."
--msgstr "殺掉他們..."
-+msgstr "殺掉他們…"
- 
- #: data_messages.cpp:90
- msgid ""
--"You cannot get up to the gold, so you must get the enemies to bring it down to "
--"you.  But how do you get them to keep going back?\n"
-+"You cannot get up to the gold, so you must get the enemies to bring it down "
-+"to you.  But how do you get them to keep going back?\n"
- "\n"
- "If you are feeling stressed, you can hit the P or Esc key and take a break.  "
- "Also, you can use the Settings menu to slow down the action."
- msgstr ""
- "您無法拿到那些金子，所以得讓敵人幫你帶下來。不過您要怎麼讓他帶下來？\n"
- "\n"
--"如果您覺得壓力很大，您可以按 P 或 ESC 鍵休息一下。您也可以在設定目錄中設定讓動作變慢一點。"
-+"如果您覺得壓力很大，您可以按 P 或 ESC 鍵休息一下。您也可以在設定目錄中設定讓"
-+"動作變慢一點。"
- 
- #: data_messages.cpp:96
- msgid "...  Or not to kill?"
-@@ -218,13 +236,14 @@
- "It is best not to kill the enemy.  Try it and you will find out why ... Heh, "
- "heh, heh !! ... ;-)\n"
- "\n"
--"If you do kill him unintentionally, before you have collected the gold at the "
--"top left, you can still finish the level by digging away the side of the pit he "
--"is in."
-+"If you do kill him unintentionally, before you have collected the gold at "
-+"the top left, you can still finish the level by digging away the side of the "
-+"pit he is in."
- msgstr ""
- "最好不要殺掉敵人。試著自己找出為什麼，嘿，嘿，嘿～\n"
- "\n"
--"如果在您拿到最左上方的金子前，您不小心殺掉敵人，您還是可以在他掉進去的洞附近挖洞來完成關卡。"
-+"如果在您拿到最左上方的金子前，您不小心殺掉敵人，您還是可以在他掉進去的洞附近"
-+"挖洞來完成關卡。"
- 
- #: data_messages.cpp:103
- msgid "Traps"
-@@ -234,15 +253,17 @@
- msgid ""
- "Some of the bricks here are not what they seem.  They are known as false "
- "bricks, fall-through bricks or traps.  If you try to walk on them, you fall "
--"through.  If the enemies walk on them, they can descend on you without warning. "
--" Sometimes you have to fall through a brick to get some gold.\n"
-+"through.  If the enemies walk on them, they can descend on you without "
-+"warning.  Sometimes you have to fall through a brick to get some gold.\n"
- "\n"
--"At the start, jump into the concrete pit, dig and drop through.  That will get "
--"one enemy tied up for a while .... :-)"
-+"At the start, jump into the concrete pit, dig and drop through.  That will "
-+"get one enemy tied up for a while .... :-)"
- msgstr ""
--"有些磚塊實際上不是磚塊，只是看起來像磚塊的陷阱。如果您走在那上面，您就會掉下去。有時您會需要掉下某些陷阱才能拿到一些金子。\n"
-+"有些磚塊實際上不是磚塊，只是看起來像磚塊的陷阱。如果您走在那上面，您就會掉下"
-+"去。有時您會需要掉下某些陷阱才能拿到一些金子。\n"
- "\n"
--"在關卡開始時，跳進水泥洞中，挖洞，然後跳下去。這樣會有一個敵人被「卡」在那裡一段時間。"
-+"在關卡開始時，跳進水泥洞中，挖洞，然後跳下去。這樣會有一個敵人被「卡」在那裡"
-+"一段時間。"
- 
- #: data_messages.cpp:157
- msgid "Don't Panic"
-@@ -636,13 +657,14 @@
- 
- #: data_messages.cpp:448
- msgid ""
--"This level is named after the famous German submarine war film and dedicated to "
--"Marco Krüger of Berlin, the original author of KGoldrunner.\n"
-+"This level is named after the famous German submarine war film and dedicated "
-+"to Marco Krüger of Berlin, the original author of KGoldrunner.\n"
- "\n"
--"Just one small hint .... if you stand on the right hand end of the boat you can "
--"get the enemy to fall towards you .... the rest is up to you !!!!"
-+"Just one small hint .... if you stand on the right hand end of the boat you "
-+"can get the enemy to fall towards you .... the rest is up to you !!!!"
- msgstr ""
--"這個關卡是根據著名的德國潛艇戰爭電影命名，要獻給 KGoldrunner 的作者，柏林的 Marco Krüger。\n"
-+"這個關卡是根據著名的德國潛艇戰爭電影命名，要獻給 KGoldrunner 的作者，柏林的 "
-+"Marco Krüger。\n"
- "\n"
- "只給一個小提示...站在船的右手邊，敵人會開始往你這兒掉下來。接下來就看你的了！"
- 
-@@ -829,13 +851,14 @@
- #: data_messages.cpp:592
- msgid ""
- "These 100 levels make an excellent introductory game, as well as a good "
--"opportunity for experts to build up high scores.  They were composed by Peter "
--"Wadham and use traditional playing rules.\n"
-+"opportunity for experts to build up high scores.  They were composed by "
-+"Peter Wadham and use traditional playing rules.\n"
- "\n"
- "The last few levels are very hard, but if you are looking for even more of a "
- "challenge, have a go at 'Vengeance of Peter W' .... ;-) ...."
- msgstr ""
--"這一百個關卡是個很好的開始，也可以讓行家得到很高的分數。這些都是 Peter Wadham 創作的，使用傳統的規則。\n"
-+"這一百個關卡是個很好的開始，也可以讓行家得到很高的分數。這些都是 Peter "
-+"Wadham 創作的，使用傳統的規則。\n"
- "\n"
- "最後幾關非常困難，不過如果您還要更多挑戰，請到「Peter W 的復仇」。"
- 
-@@ -845,10 +868,12 @@
- 
- #: data_messages.cpp:595
- msgid ""
--"These tricky little levels were composed by Peter, Simon, Genevieve and their "
--"father Ian Wadham.  They use traditional playing rules.  Enjoy! .... ;-) ...."
-+"These tricky little levels were composed by Peter, Simon, Genevieve and "
-+"their father Ian Wadham.  They use traditional playing rules.  "
-+"Enjoy! .... ;-) ...."
- msgstr ""
--"這些麻煩的小關卡是由 Peter，Simon，Genevieve 及他們的父親 Ian Wadham 創作的。他們使用傳統的規則。好好享受吧！"
-+"這些麻煩的小關卡是由 Peter，Simon，Genevieve 及他們的父親 Ian Wadham 創作的。"
-+"他們使用傳統的規則。好好享受吧！"
- 
- #: data_messages.cpp:597
- msgid "Vengeance of Peter W"
-@@ -871,8 +896,9 @@
- "KGoldrunner rules.  The enemies run fast and have an aggressive search "
- "strategy.  Enjoy! .... :-) ...."
- msgstr ""
--"這些關卡由 Marco Krüger，KGoldrunner 的原始作者及他的一些朋友，還有其他貢獻者創作的。他們使用 KGoldrunner "
--"的規則。敵人會跑得比較快，而且更具侵略性。好好享受！"
-+"這些關卡由 Marco Krüger，KGoldrunner 的原始作者及他的一些朋友，還有其他貢獻者"
-+"創作的。他們使用 KGoldrunner 的規則。敵人會跑得比較快，而且更具侵略性。好好享"
-+"受！"
- 
- #: data_messages.cpp:603
- msgid "Tutorial"
-@@ -884,12 +910,14 @@
- "KGoldrunner and helps you develop the skills you need to get started.  Each "
- "level has a brief explanation, then you play .....\n"
- "\n"
--"When you move on to play more advanced levels, you will find that KGoldrunner "
--"combines action, strategy and puzzle solving --- all in one game."
-+"When you move on to play more advanced levels, you will find that "
-+"KGoldrunner combines action, strategy and puzzle solving --- all in one game."
- msgstr ""
--"這些教學文件是用一些簡單的關卡來教導 KGoldrunner 的規則，並協助您熟練一些技巧。每個關卡都有簡單的解釋。\n"
-+"這些教學文件是用一些簡單的關卡來教導 KGoldrunner 的規則，並協助您熟練一些技"
-+"巧。每個關卡都有簡單的解釋。\n"
- "\n"
--"當您玩到更進階的關卡時，您就會發現 KGoldrunner 包含了動作、戰略及解謎...集於一身。"
-+"當您玩到更進階的關卡時，您就會發現 KGoldrunner 包含了動作、戰略及解謎...集於"
-+"一身。"
- 
- #: data_messages.cpp:606
- msgid "Advanced Tutorial"
-@@ -943,11 +971,11 @@
- 
- #: kgoldrunner.cpp:250 kgoldrunner.cpp:1007 kgrgame.cpp:772
- msgid "&Save Edits..."
--msgstr "儲存編輯(&S)..."
-+msgstr "儲存編輯(&S)…"
- 
- #: kgoldrunner.cpp:257
- msgid "&Move Level..."
--msgstr "更多關卡(&M)..."
-+msgstr "更多關卡(&M)…"
- 
- #: kgoldrunner.cpp:262
- msgid "&Delete Level..."
-@@ -1007,7 +1035,7 @@
- 
- #: kgoldrunner.cpp:396
- msgid "K&Goldrunner Rules"
--msgstr "KGoldrunner 規則 (&G)"
-+msgstr "KGoldrunner 規則(&G)"
- 
- #: kgoldrunner.cpp:410
- msgid "Larger Playing Area"
-@@ -1116,21 +1144,23 @@
- 
- #: kgoldrunner.cpp:862
- msgid ""
--"Cannot find system games sub-folder '%1/system/' in area '%2' of the KDE folder "
--"($KDEDIRS)."
-+"Cannot find system games sub-folder '%1/system/' in area '%2' of the KDE "
-+"folder ($KDEDIRS)."
- msgstr "無法在KDE資料夾($KDEDIRS)的'%2'區內找到遊戲子目錄'en/%1/'。"
- 
- #: kgoldrunner.cpp:875
- msgid ""
--"Cannot find or create user games sub-folder '%1/user/' in area '%2' of the KDE "
--"user area ($KDEHOME)."
-+"Cannot find or create user games sub-folder '%1/user/' in area '%2' of the "
-+"KDE user area ($KDEHOME)."
- msgstr "無法在KDE使用者區($KDEHOME)的'%2'區內找到遊戲 子目錄'en/%1/'。"
- 
- #: kgoldrunner.cpp:884
- msgid ""
--"Cannot find or create 'levels/' folder in sub-folder '%1/user/' in the KDE user "
--"area ($KDEHOME)."
--msgstr "在 KDE 使用者資料區 ($KDEHOME) 中的子資料夾 %1/user/ 中找不到或無法產生 levels 資料夾。"
-+"Cannot find or create 'levels/' folder in sub-folder '%1/user/' in the KDE "
-+"user area ($KDEHOME)."
-+msgstr ""
-+"在 KDE 使用者資料區 ($KDEHOME) 中的子資料夾 %1/user/ 中找不到或無法產生 "
-+"levels 資料夾。"
- 
- #: kgoldrunner.cpp:913
- msgid "Switch to Keyboard Mode"
-@@ -1138,10 +1168,12 @@
- 
- #: kgoldrunner.cpp:914
- msgid ""
--"You have pressed a key that can be used to move the Hero. Do you want to switch "
--"automatically to keyboard control? Mouse control is easier to use in the long "
--"term - like riding a bike rather than walking!"
--msgstr "您在鍵盤中按下了移動我們的主角的按鍵。您要自動切換成鍵盤控制嗎？滑鼠控制適用於長途行動，像是騎機車之類。"
-+"You have pressed a key that can be used to move the Hero. Do you want to "
-+"switch automatically to keyboard control? Mouse control is easier to use in "
-+"the long term - like riding a bike rather than walking!"
-+msgstr ""
-+"您在鍵盤中按下了移動我們的主角的按鍵。您要自動切換成鍵盤控制嗎？滑鼠控制適用"
-+"於長途行動，像是騎機車之類。"
- 
- #: kgoldrunner.cpp:918
- msgid "Switch to &Keyboard Mode"
-@@ -1213,9 +1245,10 @@
- 
- #: kgrcanvas.cpp:147
- msgid ""
--"Sorry, you cannot change the size of the playing area. That function requires "
--"Qt Library version 3 or later."
--msgstr "抱歉，您不能改變遊戲區的大小。該功能需要 Qt 函式庫 version 3 或是更新的版本。"
-+"Sorry, you cannot change the size of the playing area. That function "
-+"requires Qt Library version 3 or later."
-+msgstr ""
-+"抱歉，您不能改變遊戲區的大小。該功能需要 Qt 函式庫 version 3 或是更新的版本。"
- 
- #: kgrdialog.cpp:39 kgrdialog.cpp:86
- msgid "Select Game"
-@@ -1275,7 +1308,7 @@
- 
- #: kgrdialog.cpp:179
- msgid "Move To..."
--msgstr "移到..."
-+msgstr "移到…"
- 
- #: kgrdialog.cpp:182 kgrdialog.cpp:583 kgrdialog.cpp:655 kgrgame.cpp:2167
- msgid "Edit Game Info"
-@@ -1323,7 +1356,9 @@
- msgid ""
- "The main button at the bottom echoes the menu action you selected. Click it "
- "after choosing a game and level - or use \"Cancel\"."
--msgstr "底部的主要按鍵會回應您所選擇的選單的動作。選好遊戲與關卡後按下按鍵，或是按下「取消」。"
-+msgstr ""
-+"底部的主要按鍵會回應您所選擇的選單的動作。選好遊戲與關卡後按下按鍵，或是按下"
-+"「取消」。"
- 
- #: kgrdialog.cpp:419
- msgid ""
-@@ -1333,53 +1368,59 @@
- "\"Cancel\" and click that item in the Game or Help menu. The tutorial game "
- "gives you hints as you go.\n"
- "\n"
--"Otherwise, just click on the name of a game (in the list box), then, to start "
--"at level 001, click on the main button at the bottom. Play begins when you move "
--"the mouse or press a key."
-+"Otherwise, just click on the name of a game (in the list box), then, to "
-+"start at level 001, click on the main button at the bottom. Play begins when "
-+"you move the mouse or press a key."
- msgstr ""
- "\n"
- "\n"
--"如果您是第一次玩 KGoldrunner，請選擇教學遊戲，或按下「取消」並按下遊戲或說明選單中的項目。教學遊戲會給您一些提示。\n"
-+"如果您是第一次玩 KGoldrunner，請選擇教學遊戲，或按下「取消」並按下遊戲或說明"
-+"選單中的項目。教學遊戲會給您一些提示。\n"
- "\n"
--"不然也可以在列表中按下遊戲的名稱，然後按下底部的主要按鍵從第一關開始玩。關卡會在您移動滑鼠或按下任何鍵之後開始。"
-+"不然也可以在列表中按下遊戲的名稱，然後按下底部的主要按鍵從第一關開始玩。關卡"
-+"會在您移動滑鼠或按下任何鍵之後開始。"
- 
- #: kgrdialog.cpp:430
- msgid ""
- "\n"
- "\n"
- "You can select System levels for editing (or copying), but you must save the "
--"result in a game you have created. Use the mouse as a paintbrush and the editor "
--"toolbar buttons as a palette. Use the 'Empty Space' button to erase."
-+"result in a game you have created. Use the mouse as a paintbrush and the "
-+"editor toolbar buttons as a palette. Use the 'Empty Space' button to erase."
- msgstr ""
- "\n"
- "\n"
--"您可以選擇系統關卡來編輯，但您必須儲存您創作的關卡。從工具列選擇要填上空間的物品，移動滑鼠來填上空間。「清除空間」則可以把物品清除。"
-+"您可以選擇系統關卡來編輯，但您必須儲存您創作的關卡。從工具列選擇要填上空間的"
-+"物品，移動滑鼠來填上空間。「清除空間」則可以把物品清除。"
- 
- #: kgrdialog.cpp:437
- msgid ""
- "\n"
- "\n"
--"You can add a name and hint to your new level here, but you must save the level "
--"you have created into one of your own games. By default your new level will go "
--"at the end of your game, but you can also select a level number and save into "
--"the middle of your game."
-+"You can add a name and hint to your new level here, but you must save the "
-+"level you have created into one of your own games. By default your new level "
-+"will go at the end of your game, but you can also select a level number and "
-+"save into the middle of your game."
- msgstr ""
- "\n"
- "\n"
--"您可以在新關卡加入一個名稱或提示，但是要記得儲存。您的新關卡預設會加到最後面，但是您也可以選擇插入中間的關卡編號。"
-+"您可以在新關卡加入一個名稱或提示，但是要記得儲存。您的新關卡預設會加到最後"
-+"面，但是您也可以選擇插入中間的關卡編號。"
- 
- #: kgrdialog.cpp:444
- msgid ""
- "\n"
- "\n"
--"You can create or edit a name and hint here, before saving. If you change the "
--"game or level, you can do a copy or \"Save As\", but you must always save into "
--"one of your own games. If you save a level into the middle of a series, the "
--"other levels are automatically re-numbered."
-+"You can create or edit a name and hint here, before saving. If you change "
-+"the game or level, you can do a copy or \"Save As\", but you must always "
-+"save into one of your own games. If you save a level into the middle of a "
-+"series, the other levels are automatically re-numbered."
- msgstr ""
- "\n"
- "\n"
--"您可以在此產生或編輯名稱與提示。如果您修改了遊戲或關卡，您可以選擇「另存新檔」，但要記得至少儲存到一個地方。如果您將關卡插到中間，其他的關卡會自動重新編號。"
-+"您可以在此產生或編輯名稱與提示。如果您修改了遊戲或關卡，您可以選擇「另存新"
-+"檔」，但要記得至少儲存到一個地方。如果您將關卡插到中間，其他的關卡會自動重新"
-+"編號。"
- 
- #: kgrdialog.cpp:451
- msgid ""
-@@ -1398,12 +1439,13 @@
- "\n"
- "To move (re-number) a level, you must first select it by using \"Edit Any "
- "Level...\", then you can use \"Move Level...\" to assign it a new number or "
--"even a different game. Other levels are automatically re-numbered as required. "
--"You can only move levels within your own games."
-+"even a different game. Other levels are automatically re-numbered as "
-+"required. You can only move levels within your own games."
- msgstr ""
- "\n"
- "\n"
--"要移動關卡，您要先選擇「編輯任一關卡」，然後選擇「移動關卡」來重新指定關卡編號。其他的關卡會自動重新編號。"
-+"要移動關卡，您要先選擇「編輯任一關卡」，然後選擇「移動關卡」來重新指定關卡編"
-+"號。其他的關卡會自動重新編號。"
- 
- #: kgrdialog.cpp:463
- msgid ""
-@@ -1420,16 +1462,17 @@
- msgid ""
- "\n"
- "\n"
--"Click on the list box to choose a game.  Below the list box you can see \"More "
--"Info\" about the selected game, how many levels there are and what rules the "
--"enemies follow (see the Settings menu).\n"
-+"Click on the list box to choose a game.  Below the list box you can see "
-+"\"More Info\" about the selected game, how many levels there are and what "
-+"rules the enemies follow (see the Settings menu).\n"
- "\n"
- "You select a level number by typing it or using the scroll bar.  As you vary "
- "the game or level, the thumbnail area shows a preview of your choice."
- msgstr ""
- "\n"
- "\n"
--"在清單中選擇一個遊戲。清單底下您可以用「更多資訊」來查看關於該遊戲的資訊，遊戲中有多少關卡，使用哪種規則等等（並請參考「設定」選單）。\n"
-+"在清單中選擇一個遊戲。清單底下您可以用「更多資訊」來查看關於該遊戲的資訊，遊"
-+"戲中有多少關卡，使用哪種規則等等（並請參考「設定」選單）。\n"
- "\n"
- "您可以用鍵盤輸入或用捲軸選擇關卡編號，然後可以看到關於該遊戲或關卡的預覽。"
- 
-@@ -1506,8 +1549,8 @@
- 
- #: kgrgame.cpp:191
- msgid ""
--"<b>CONGRATULATIONS !!!!</b>"
--"<p>You have conquered the last level in the %1 game !!</p>"
-+"<b>CONGRATULATIONS !!!!</b><p>You have conquered the last level in the %1 "
-+"game !!</p>"
- msgstr "<b>恭喜！！</b> <p>您征服了遊戲 %1 的最後一個關卡！</p>"
- 
- #: kgrgame.cpp:384
-@@ -1558,9 +1601,11 @@
- 
- #: kgrgame.cpp:776
- msgid ""
--"Please note: for reasons of simplicity, your saved game position and score will "
--"be as they were at the start of this level, not as they are now."
--msgstr "請注意：為了簡化，您儲存遊戲的位址與分數會被視為關卡開始時的位址與分數，而不是現在的位址與分數。"
-+"Please note: for reasons of simplicity, your saved game position and score "
-+"will be as they were at the start of this level, not as they are now."
-+msgstr ""
-+"請注意：為了簡化，您儲存遊戲的位址與分數會被視為關卡開始時的位址與分數，而不"
-+"是現在的位址與分數。"
- 
- #: kgrgame.cpp:802 kgrgame.cpp:989 kgrgame.cpp:1587 kgrgame.cpp:2545
- msgid "Cannot open file '%1' for output."
-@@ -1593,9 +1638,11 @@
- #: kgrgame.cpp:1003
- msgid ""
- "<b>Congratulations !!!</b>  You have achieved a high score in this game.  "
--"Please enter your name so that it may be enshrined in the KGoldrunner Hall of "
--"Fame."
--msgstr "<b>恭喜！</b>您刷新了此遊戲的最高分。請輸入您的姓名，讓您的姓名可以在 KGoldrunner 名人堂中閃耀。"
-+"Please enter your name so that it may be enshrined in the KGoldrunner Hall "
-+"of Fame."
-+msgstr ""
-+"<b>恭喜！</b>您刷新了此遊戲的最高分。請輸入您的姓名，讓您的姓名可以在 "
-+"KGoldrunner 名人堂中閃耀。"
- 
- #: kgrgame.cpp:1015 kgrgame.cpp:1031 kgrgame.cpp:1106
- msgid "Save High Score"
-@@ -1623,17 +1670,11 @@
- 
- #: kgrgame.cpp:1155
- msgid ""
--"<center>"
--"<h2>KGoldrunner Hall of Fame</h2></center>"
--"<br>"
--"<center>"
--"<h3>\"%1\" Game</h3></center>"
--msgstr ""
--"<center> "
--"<h2>KGoldrunner 名人堂</h2></center> "
--"<br> "
--"<center> "
--"<h3>遊戲 %1</h3></center> "
-+"<center><h2>KGoldrunner Hall of Fame</h2></center><br><center><h3>\"%1\" "
-+"Game</h3></center>"
-+msgstr ""
-+"<center> <h2>KGoldrunner 名人堂</h2></center> <br> <center> <h3>遊戲 %1</"
-+"h3></center> "
- 
- #: kgrgame.cpp:1160
- msgid "    Name                          Level  Score       Date"
-@@ -1651,20 +1692,24 @@
- msgid ""
- "You cannot create and save a level until you have created a game to hold it. "
- "Try menu item \"Create Game\"."
--msgstr "您建立與儲存新關卡之前必須先產生新的遊戲來儲存。請試試選單中的「創造遊戲」。"
-+msgstr ""
-+"您建立與儲存新關卡之前必須先產生新的遊戲來儲存。請試試選單中的「創造遊戲」。"
- 
- #: kgrgame.cpp:1409
- msgid ""
--"You cannot edit and save a level until you have created a game and a level. Try "
--"menu item \"Create Game\"."
--msgstr "您編輯與儲存關卡之前必須先產生新的遊戲與關卡。請試試選單中的「創造遊戲」。"
-+"You cannot edit and save a level until you have created a game and a level. "
-+"Try menu item \"Create Game\"."
-+msgstr ""
-+"您編輯與儲存關卡之前必須先產生新的遊戲與關卡。請試試選單中的「創造遊戲」。"
- 
- #: kgrgame.cpp:1421
- msgid ""
--"It is OK to edit a system level, but you MUST save the level in one of your own "
--"games. You're not just taking a peek at the hidden ladders and fall-through "
--"bricks, are you? :-)"
--msgstr "您可以編輯系統關卡，但是您必須將它儲存在自己的遊戲中。我想您編輯系統關卡應該不會只是要偷看隱藏的梯子跟陷阱，是吧？"
-+"It is OK to edit a system level, but you MUST save the level in one of your "
-+"own games. You're not just taking a peek at the hidden ladders and fall-"
-+"through bricks, are you? :-)"
-+msgstr ""
-+"您可以編輯系統關卡，但是您必須將它儲存在自己的遊戲中。我想您編輯系統關卡應該"
-+"不會只是要偷看隱藏的梯子跟陷阱，是吧？"
- 
- #: kgrgame.cpp:1531 kgrgame.cpp:1568 kgrgame.cpp:1586 kgrgame.cpp:2062
- msgid "Save Level"
-@@ -1700,9 +1745,11 @@
- 
- #: kgrgame.cpp:1659
- msgid ""
--"You cannot move a level until you have created a game and at least two levels. "
--"Try menu item \"Create Game\"."
--msgstr "除非您先產生新的遊戲以及至少兩個關卡，才能做移動關卡的動作。請試試選單中的「創造遊戲」。"
-+"You cannot move a level until you have created a game and at least two "
-+"levels. Try menu item \"Create Game\"."
-+msgstr ""
-+"除非您先產生新的遊戲以及至少兩個關卡，才能做移動關卡的動作。請試試選單中的"
-+"「創造遊戲」。"
- 
- #: kgrgame.cpp:1667
- msgid "Sorry, you cannot move a system level."
-@@ -1714,8 +1761,8 @@
- 
- #: kgrgame.cpp:1744
- msgid ""
--"You cannot delete a level until you have created a game and a level. Try menu "
--"item \"Create Game\"."
-+"You cannot delete a level until you have created a game and a level. Try "
-+"menu item \"Create Game\"."
- msgstr "您要刪除"
- 
- #: kgrgame.cpp:1766
-@@ -1794,8 +1841,8 @@
- 
- #: kgrgame.cpp:2372
- msgid ""
--"There is no folder '%1' to hold levels for the '%2' game. Please make sure '%3' "
--"has been run in the '%4' folder."
-+"There is no folder '%1' to hold levels for the '%2' game. Please make sure '%"
-+"3' has been run in the '%4' folder."
- msgstr "沒有資料夾 %1，無法保存遊戲 %2。請確定 %3 已經在資料夾 %4 中執行。"
- 
- #: kgrgame.cpp:2390
-diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdegames/kjumpingcube.po kde-i18n-zh_TW-3.5.10/messages/kdegames/kjumpingcube.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdegames/kjumpingcube.po	2008-08-19 20:43:06.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdegames/kjumpingcube.po	2011-11-11 15:45:17.000000000 +0100
-@@ -7,7 +7,7 @@
- "Project-Id-Version: kjumpingcube\n"
- "POT-Creation-Date: 2008-07-08 01:19+0200\n"
- "PO-Revision-Date: 2003-12-23 02:06+0800\n"
--"Last-Translator: Hydonsingore Sie <hydonsingore@mail.educities.edu.tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Chinese(traditional) <zh-l10n@linux.org.tw>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
-@@ -32,7 +32,7 @@
- 
- #: kjumpingcube.cpp:86
- msgid "Stop &Thinking"
--msgstr "停止思考 (&T)"
-+msgstr "停止思考(&T)"
- 
- #: kjumpingcube.cpp:125
- msgid ""
-diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdegames/klickety.po kde-i18n-zh_TW-3.5.10/messages/kdegames/klickety.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdegames/klickety.po	2006-07-22 10:03:52.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdegames/klickety.po	2011-11-11 15:45:17.000000000 +0100
-@@ -8,7 +8,7 @@
- "Project-Id-Version: klickety\n"
- "POT-Creation-Date: 2005-05-18 21:24+0200\n"
- "PO-Revision-Date: 2003-12-09 16:24+0800\n"
--"Last-Translator: Hydonsingore Sie <hydonsingore@mail.educities.edu.tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Chinese(traitional) <zh-l10n@linux.org.tw>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
-@@ -25,13 +25,13 @@
- 
- #: field.cpp:20
- msgid ""
--"<qt>Display the number of remaining blocks."
--"<br/>It turns <font color=\"blue\">blue</font> if it is a highscore and <font "
--"color=\"red\">red</font> if it is the best local score.</qt>"
-+"<qt>Display the number of remaining blocks.<br/>It turns <font color=\"blue"
-+"\">blue</font> if it is a highscore and <font color=\"red\">red</font> if it "
-+"is the best local score.</qt>"
- msgstr ""
--"<qt>顯示剩下方塊的數目。"
--"<br/>當高分得入排行榜時，它會變成<font color=\"blue\">藍色</font>，成為本地最高分時，它就變成<font "
--"color=\"red\">紅色</font></qt>"
-+"<qt>顯示剩下方塊的數目。<br/>當高分得入排行榜時，它會變成<font color=\"blue"
-+"\">藍色</font>，成為本地最高分時，它就變成<font color=\"red\">紅色</font></"
-+"qt>"
- 
- #: field.cpp:29
- msgid "Elapsed time"
-diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdegames/klines.po kde-i18n-zh_TW-3.5.10/messages/kdegames/klines.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdegames/klines.po	2006-07-22 10:03:52.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdegames/klines.po	2011-11-11 15:45:17.000000000 +0100
-@@ -7,7 +7,7 @@
- "Project-Id-Version: klines\n"
- "POT-Creation-Date: 2005-07-03 01:31+0200\n"
- "PO-Revision-Date: 2003-12-09 16:16+0800\n"
--"Last-Translator: Hydonsingore Sie <hydonsingore@mail.educities.edu.tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Chinese(traitional) <zh-l10n@linux.org.tw>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
-@@ -189,7 +189,7 @@
- 
- #: klines.cpp:364
- msgid "Whenever you complete a line you get an extra turn."
--msgstr "當您消去一行時，您得到額外沒有新球的回合。"
-+msgstr "當您消去一列時，您得到額外沒有新球的回合。"
- 
- #: klines.cpp:368
- msgid ""
-diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdegames/kmahjongg.po kde-i18n-zh_TW-3.5.10/messages/kdegames/kmahjongg.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdegames/kmahjongg.po	2006-07-22 10:03:52.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdegames/kmahjongg.po	2011-11-11 15:45:17.000000000 +0100
-@@ -13,8 +13,7 @@
- "Project-Id-Version: kmahjongg\n"
- "POT-Creation-Date: 2006-06-18 03:58+0200\n"
- "PO-Revision-Date: 2006-01-17 16:18+0800\n"
--"Last-Translator: Frank Weng (a.k.a. Franklin) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Traditional Chinese <zh_l10n@linux.org.tw>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
-@@ -139,8 +138,8 @@
- 
- #: HighScore.cpp:498
- msgid ""
--"Resetting the high scores will remove all high score entries both in memory and "
--"on disk. Do you wish to proceed?"
-+"Resetting the high scores will remove all high score entries both in memory "
-+"and on disk. Do you wish to proceed?"
- msgstr ""
- "重設高分榜將會移除所有在記憶體與磁碟中的分數紀錄\n"
- "是否要繼續執行?"
-@@ -155,47 +154,39 @@
- 
- #: Preview.cpp:35
- msgid "Load..."
--msgstr "載入..."
-+msgstr "載入…"
- 
- #: Preview.cpp:86
- msgid "Change Background Image"
- msgstr "改變背景影像"
- 
- #: Preview.cpp:88
--msgid ""
--"*.bgnd|Background Image (*.bgnd)\n"
--msgstr ""
--"*.bgnd|背景影像 (*.bgnd)\n"
-+msgid "*.bgnd|Background Image (*.bgnd)\n"
-+msgstr "*.bgnd|背景影像 (*.bgnd)\n"
- 
- #: Preview.cpp:94
- msgid "Change Tile Set"
- msgstr "改變麻將牌樣式"
- 
- #: Preview.cpp:95
--msgid ""
--"*.tileset|Tile Set File (*.tileset)\n"
--msgstr ""
--"*.tileset|牌樣式設定檔 (*.tileset)\n"
-+msgid "*.tileset|Tile Set File (*.tileset)\n"
-+msgstr "*.tileset|牌樣式設定檔 (*.tileset)\n"
- 
- #: Preview.cpp:101
--msgid ""
--"*.layout|Board Layout File (*.layout)\n"
--msgstr ""
--"*.layout|版面布局檔 (*.layout)\n"
-+msgid "*.layout|Board Layout File (*.layout)\n"
-+msgstr "*.layout|版面布局檔 (*.layout)\n"
- 
- #: Preview.cpp:102
- msgid "Change Board Layout"
- msgstr "改變版面布局"
- 
- #: Preview.cpp:108
--msgid ""
--"*.theme|KMahjongg Theme File (*.theme)\n"
--msgstr ""
--"*.theme|Kmahjongg 佈景主題 (*.theme)\n"
-+msgid "*.theme|KMahjongg Theme File (*.theme)\n"
-+msgstr "*.theme|Kmahjongg 布景主題 (*.theme)\n"
- 
- #: Preview.cpp:109
- msgid "Choose Theme"
--msgstr "選擇佈景主題"
-+msgstr "選擇布景主題"
- 
- #: Preview.cpp:121
- msgid "*|All Files"
-@@ -203,11 +194,11 @@
- 
- #: Preview.cpp:210
- msgid "That is not a valid theme file."
--msgstr "這不是有效的佈景主題檔。"
-+msgstr "這不是有效的布景主題檔。"
- 
- #: Preview.cpp:386
- msgid "Save Theme"
--msgstr "儲存佈景主題"
-+msgstr "儲存布景主題"
- 
- #: Preview.cpp:405
- msgid "Overwrite"
-@@ -296,7 +287,7 @@
- 
- #: boardwidget.cpp:726
- msgid "Calculating new game..."
--msgstr "計算新版面中..."
-+msgstr "計算新版面中…"
- 
- #: boardwidget.cpp:731
- msgid "Error converting board information!"
-@@ -325,27 +316,27 @@
- 
- #: kmahjongg.cpp:136
- msgid "New Numbered Game..."
--msgstr "新編號的遊戲..."
-+msgstr "新編號的遊戲…"
- 
- #: kmahjongg.cpp:137
- msgid "Open Th&eme..."
--msgstr "開啟佈景主題...(&E)"
-+msgstr "開啟布景主題…(&E)"
- 
- #: kmahjongg.cpp:138
- msgid "Open &Tileset..."
--msgstr "開啟牌樣式...(&T)"
-+msgstr "開啟牌樣式…(&T)"
- 
- #: kmahjongg.cpp:139
- msgid "Open &Background..."
--msgstr "開啟背景圖...(&B)"
-+msgstr "開啟背景圖…(&B)"
- 
- #: kmahjongg.cpp:140
- msgid "Open La&yout..."
--msgstr "開啟版面樣式...(&Y)"
-+msgstr "開啟版面樣式…(&Y)"
- 
- #: kmahjongg.cpp:141
- msgid "Sa&ve Theme..."
--msgstr "儲存佈景主題...(&V)"
-+msgstr "儲存布景主題…(&V)"
- 
- #: kmahjongg.cpp:144
- msgid "Shu&ffle"
-diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdegames/kmines.po kde-i18n-zh_TW-3.5.10/messages/kdegames/kmines.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdegames/kmines.po	2006-07-22 10:03:52.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdegames/kmines.po	2011-11-11 15:45:17.000000000 +0100
-@@ -16,8 +16,7 @@
- "Project-Id-Version: kmines\n"
- "POT-Creation-Date: 2005-05-18 21:24+0200\n"
- "PO-Revision-Date: 2006-01-17 16:20+0800\n"
--"Last-Translator: Frank Weng (a.k.a. Franklin) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Traditional Chinese <zh_l10n@linux.org.tw>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
-@@ -210,7 +209,8 @@
- 
- #: dialogs.cpp:252
- msgid ""
--"When the \"magic\" reveal is on, you lose the ability to enter the highscores."
-+"When the \"magic\" reveal is on, you lose the ability to enter the "
-+"highscores."
- msgstr "當\"神奇\"開挖被啟動時，您就不能進入排行榜"
- 
- #: dialogs.cpp:257
-@@ -230,7 +230,7 @@
- msgid ""
- "_n: %n mine color:\n"
- "%n mines color:"
--msgstr "%n地雷顏色:"
-+msgstr "%n 地雷顏色:"
- 
- #: field.cpp:39
- msgid "Case revealed"
-@@ -310,7 +310,7 @@
- 
- #: main.cpp:106
- msgid "Solving Rate..."
--msgstr "解決速度..."
-+msgstr "解決速度…"
- 
- #: main.cpp:110
- msgid "View Log"
-@@ -366,10 +366,11 @@
- 
- #: status.cpp:68
- msgid ""
--"<qt>Mines left."
--"<br/>It turns <font color=\"red\">red</font> when you have flagged more cases "
--"than present mines.</qt>"
--msgstr "<qt>剩餘地雷<br/>當您標記超過現有的地雷數目時， 會變成<font color=\"red\">紅色</font></qt>"
-+"<qt>Mines left.<br/>It turns <font color=\"red\">red</font> when you have "
-+"flagged more cases than present mines.</qt>"
-+msgstr ""
-+"<qt>剩餘地雷<br/>當您標記超過現有的地雷數目時， 會變成<font color=\"red\">紅"
-+"色</font></qt>"
- 
- #: status.cpp:78
- msgid "Press to start a new game"
-@@ -377,13 +378,11 @@
- 
- #: status.cpp:83
- msgid ""
--"<qt>Time elapsed."
--"<br/>It turns <font color=\"blue\">blue</font> if it is a highscore and <font "
--"color=\"red\">red</font> if it is the best time.</qt>"
-+"<qt>Time elapsed.<br/>It turns <font color=\"blue\">blue</font> if it is a "
-+"highscore and <font color=\"red\">red</font> if it is the best time.</qt>"
- msgstr ""
--"<qt>剩餘時間"
--"<br/>當產生新的最高分時，會變成<font color=\"blue\">藍色</font> 當產生新的最佳時間時，會變成<font "
--"color=\"red\">紅色</font>.</qt>"
-+"<qt>剩餘時間<br/>當產生新的最高分時，會變成<font color=\"blue\">藍色</font> "
-+"當產生新的最佳時間時，會變成<font color=\"red\">紅色</font>.</qt>"
- 
- #: status.cpp:103
- msgid "Mines field."
-diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdegames/knetwalk.po kde-i18n-zh_TW-3.5.10/messages/kdegames/knetwalk.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdegames/knetwalk.po	2007-01-15 10:56:21.000000000 +0100
-+++ kde-i18n-zh_TW-3.5.10/messages/kdegames/knetwalk.po	2011-11-11 15:45:17.000000000 +0100
-@@ -6,8 +6,7 @@
- "Project-Id-Version: knetwalk\n"
- "POT-Creation-Date: 2006-12-21 02:39+0100\n"
- "PO-Revision-Date: 2006-01-18 08:57+0800\n"
--"Last-Translator: Frank Weng (a.k.a. Franklin) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Traditional Chinese <zh_l10n@linux.org.tw>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
-@@ -88,17 +87,15 @@
- 
- #: mainwindow.cpp:89
- msgid ""
--"<h3>Rules of the Game</h3>"
--"<p>You are the system administrator and your goal is to connect each computer "
--"to the central server."
--"<p>Click the right mouse button to turn the cable in a clockwise direction, and "
--"the left mouse button to turn it in a counter-clockwise direction."
--"<p>Start the LAN with as few turns as possible!"
-+"<h3>Rules of the Game</h3><p>You are the system administrator and your goal "
-+"is to connect each computer to the central server.<p>Click the right mouse "
-+"button to turn the cable in a clockwise direction, and the left mouse button "
-+"to turn it in a counter-clockwise direction.<p>Start the LAN with as few "
-+"turns as possible!"
- msgstr ""
--"<h3>遊戲規則</h3>"
--"<p>您是個系統管理員，您的目標是將每一台電腦都連接到中央伺服器上。"
--"<p>按滑鼠右鍵可以將 cable 線轉順時鐘方向，滑鼠左鍵則轉逆時鐘方向。"
--"<p>開始 LAN 連線之前，盡量讓線轉越少次越好！"
-+"<h3>遊戲規則</h3><p>您是個系統管理員，您的目標是將每一臺電腦都連接到中央伺服"
-+"器上。<p>按滑鼠右鍵可以將 cable 線轉順時鐘方向，滑鼠左鍵則轉逆時鐘方向。<p>開"
-+"始 LAN 連線之前，盡量讓線轉越少次越好！"
- 
- #: mainwindow.cpp:151 mainwindow.cpp:372
- #, c-format
-diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdegames/kolf.po kde-i18n-zh_TW-3.5.10/messages/kdegames/kolf.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdegames/kolf.po	2006-07-22 10:03:52.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdegames/kolf.po	2011-11-11 15:45:17.000000000 +0100
-@@ -9,7 +9,7 @@
- "Project-Id-Version: kolf\n"
- "POT-Creation-Date: 2005-05-18 21:24+0200\n"
- "PO-Revision-Date: 2003-12-19 19:33+0800\n"
--"Last-Translator: Hydonsingore Sie <hydonsingore@mail.educities.edu.tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Chinese(traitional) <zh-l10n@linux.org.tw>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
-@@ -212,7 +212,7 @@
- 
- #: kolf.cpp:92
- msgid "Save &Course As..."
--msgstr "將路線存為...(&C)"
-+msgstr "將路線存為…(&C)"
- 
- #: kolf.cpp:94
- msgid "&Save Game"
-@@ -220,11 +220,11 @@
- 
- #: kolf.cpp:95
- msgid "&Save Game As..."
--msgstr "將遊戲存為...(&S)"
-+msgstr "將遊戲存為…(&S)"
- 
- #: kolf.cpp:98
- msgid "Load Saved Game..."
--msgstr "載入儲存的檔案..."
-+msgstr "載入儲存的檔案…"
- 
- #: kolf.cpp:103
- msgid "&New"
-@@ -320,7 +320,7 @@
- 
- #: kolf.cpp:150
- msgid "&Tutorial"
--msgstr "體驗教學...(&T)"
-+msgstr "體驗教學…(&T)"
- 
- #: kolf.cpp:403 kolf.cpp:446 kolf.cpp:472 newgame.cpp:225 scoreboard.cpp:17
- msgid "Par"
-@@ -464,7 +464,7 @@
- 
- #: newgame.cpp:159
- msgid "Add..."
--msgstr "增加..."
-+msgstr "增加…"
- 
- #: newgame.cpp:172
- msgid "Game Options"
-@@ -552,7 +552,7 @@
- 
- #: slope.cpp:555
- msgid "Whether or not this slope can be moved by other objects, like floaters."
--msgstr "這個斜坡是否能夠被其他物(像是浮台)件所推動"
-+msgstr "這個斜坡是否能夠被其他物(像是浮臺)件所推動"
- 
- #: game.h:231
- msgid "Puddle"
-@@ -614,7 +614,9 @@
- #~ msgid "Steep"
- #~ msgstr "陡峭的"
- 
--#~ msgid "Since it's your first time playing Kolf, would you like to play on the tutorial course once?"
-+#~ msgid ""
-+#~ "Since it's your first time playing Kolf, would you like to play on the "
-+#~ "tutorial course once?"
- #~ msgstr "這是您第一次玩 Kolf ，您願意玩一次入門路線嗎？"
- 
- #~ msgid "New %1"
-diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdegames/konquest.po kde-i18n-zh_TW-3.5.10/messages/kdegames/konquest.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdegames/konquest.po	2008-08-19 20:43:06.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdegames/konquest.po	2011-11-11 15:45:17.000000000 +0100
-@@ -12,8 +12,7 @@
- "Project-Id-Version: konquest\n"
- "POT-Creation-Date: 2008-07-08 01:19+0200\n"
- "PO-Revision-Date: 2006-01-17 16:32+0800\n"
--"Last-Translator: Frank Weng (a.k.a. Franklin) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Traditional Chinese <zh_l10n@linux.org.tw>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
-@@ -36,7 +35,7 @@
- #: rc.cpp:15
- #, no-c-format
- msgid "New Column"
--msgstr "新的一行"
-+msgstr "新的一列"
- 
- #. i18n: file newGameDlg_ui.ui line 111
- #: rc.cpp:18
-@@ -104,11 +103,11 @@
- 
- #: gameboard.cc:237
- msgid "Select source planet..."
--msgstr "選擇起始的行星..."
-+msgstr "選擇起始的行星…"
- 
- #: gameboard.cc:255
- msgid "Select destination planet..."
--msgstr "選擇目標的行星..."
-+msgstr "選擇目標的行星…"
- 
- #: gameboard.cc:277
- msgid ": How many ships?"
-@@ -136,7 +135,7 @@
- 
- #: gameboard.cc:339
- msgid "Computer Player thinking..."
--msgstr "電腦玩家考慮中..."
-+msgstr "電腦玩家考慮中…"
- 
- #: gameboard.cc:434
- msgid "Turn #: %1 of %2"
-diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdegames/kpat.po kde-i18n-zh_TW-3.5.10/messages/kdegames/kpat.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdegames/kpat.po	2007-01-15 10:56:21.000000000 +0100
-+++ kde-i18n-zh_TW-3.5.10/messages/kdegames/kpat.po	2011-11-11 15:45:17.000000000 +0100
-@@ -7,8 +7,7 @@
- "Project-Id-Version: kpat\n"
- "POT-Creation-Date: 2006-10-12 02:36+0200\n"
- "PO-Revision-Date: 2006-01-17 16:27+0800\n"
--"Last-Translator: Frank Weng (a.k.a. Franklin) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Traditional Chinese <zh_l10n@linux.org.tw>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
-@@ -29,7 +28,7 @@
- 
- #: cardmaps.cpp:99
- msgid "please wait, loading cards..."
--msgstr "請稍候, 載入卡片中..."
-+msgstr "請稍候, 載入卡片中…"
- 
- #: cardmaps.cpp:100
- msgid "KPatience - a Solitaire game"
-@@ -41,19 +40,19 @@
- 
- #: computation.cpp:116
- msgid "&Calculation"
--msgstr "計算 (&C)"
-+msgstr "計算(&C)"
- 
- #: dealer.cpp:117
- msgid "&Hint"
--msgstr "提示 (&H)"
-+msgstr "提示(&H)"
- 
- #: dealer.cpp:125
- msgid "&Demo"
--msgstr "示範 (&D)"
-+msgstr "示範(&D)"
- 
- #: dealer.cpp:133
- msgid "&Redeal"
--msgstr "重新發牌 (&R)"
-+msgstr "重新發牌(&R)"
- 
- #: fortyeight.cpp:196
- msgid "Forty && &Eight"
-@@ -77,7 +76,7 @@
- 
- #: freecell.cpp:848
- msgid "&Freecell"
--msgstr "新接龍 (&F)"
-+msgstr "新接龍(&F)"
- 
- #: golf.cpp:160
- msgid "Go&lf"
-@@ -85,7 +84,7 @@
- 
- #: grandf.cpp:223
- msgid "&Grandfather"
--msgstr "老祖宗 (&G)"
-+msgstr "老祖宗(&G)"
- 
- #: gypsy.cpp:113
- msgid "Gy&psy"
-@@ -93,15 +92,15 @@
- 
- #: idiot.cpp:229
- msgid "&Aces Up"
--msgstr "Aces Up (&A)"
-+msgstr "Aces Up(&A)"
- 
- #: kings.cpp:127
- msgid "&The Kings"
--msgstr "國王 (&T)"
-+msgstr "國王(&T)"
- 
- #: klondike.cpp:483
- msgid "&Klondike"
--msgstr "Klondike (&K)"
-+msgstr "Klondike(&K)"
- 
- #: klondike.cpp:490
- msgid "Klondike (&draw 3)"
-@@ -153,43 +152,43 @@
- 
- #: mod3.cpp:303
- msgid "M&od3"
--msgstr "Mod3 (&O)"
-+msgstr "Mod3(&O)"
- 
- #: napoleon.cpp:200
- msgid "&Napoleon's Tomb"
--msgstr "拿破崙之墓 (&N)"
-+msgstr "拿破崙之墓(&N)"
- 
- #: pwidget.cpp:76
- msgid "&Choose Game..."
--msgstr "選擇遊戲 (&C)"
-+msgstr "選擇遊戲(&C)"
- 
- #: pwidget.cpp:78
- msgid "Restart &Game"
--msgstr "重新開始遊戲 (&G)"
-+msgstr "重新開始遊戲(&G)"
- 
- #: pwidget.cpp:83
- msgid "&Game Type"
--msgstr "遊戲類別 (&G)"
-+msgstr "遊戲類別(&G)"
- 
- #: pwidget.cpp:107
- msgid "&Change Background"
--msgstr "改變背景 (&C)"
-+msgstr "改變背景(&C)"
- 
- #: pwidget.cpp:134
- msgid "&Switch Cards..."
--msgstr "切換卡片 (&S)"
-+msgstr "切換卡片(&S)"
- 
- #: pwidget.cpp:137
- msgid "&Statistics"
--msgstr "統計 (&S)"
-+msgstr "統計(&S)"
- 
- #: pwidget.cpp:140
- msgid "&Animation on Startup"
--msgstr "啟動時的動畫 (&A)"
-+msgstr "啟動時的動畫(&A)"
- 
- #: pwidget.cpp:143
- msgid "&Enable Autodrop"
--msgstr "使用自動落下 (&E)"
-+msgstr "使用自動落下(&E)"
- 
- #: pwidget.cpp:146
- msgid "Disable Autodrop"
-@@ -197,8 +196,8 @@
- 
- #: pwidget.cpp:221
- msgid ""
--"The cards you have chosen have a different size than the ones you are currently "
--"using. This requires the current game to be restarted."
-+"The cards you have chosen have a different size than the ones you are "
-+"currently using. This requires the current game to be restarted."
- msgstr "您選擇的牌和目前使用的牌大小不合。您必須重新啟動本遊戲。"
- 
- #: pwidget.cpp:242
-@@ -207,11 +206,13 @@
- 
- #: pwidget.cpp:301
- msgid ""
--"You are already running an unfinished game.  If you abort the old game to start "
--"a new one, the old game will be registered as a loss in the statistics file.\n"
-+"You are already running an unfinished game.  If you abort the old game to "
-+"start a new one, the old game will be registered as a loss in the statistics "
-+"file.\n"
- "What do you want to do?"
- msgstr ""
--"您目前有一局正在進行中。如果您直接重起新的一局，舊的這一局將會被標記為失敗。\n"
-+"您目前有一局正在進行中。如果您直接重起新的一局，舊的這一局將會被標記為失"
-+"敗。\n"
- "您確定要重起牌局嗎？"
- 
- #: pwidget.cpp:306
-@@ -320,7 +321,7 @@
- 
- #: simon.cpp:152
- msgid "&Simple Simon"
--msgstr "簡單 Simon (&S)"
-+msgstr "簡單 Simon(&S)"
- 
- #: spider.cpp:461
- msgid "S&pider (Easy)"
-@@ -336,4 +337,4 @@
- 
- #: yukon.cpp:126
- msgid "&Yukon"
--msgstr "育空 (&Y)"
-+msgstr "育空(&Y)"
-diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdegames/kpoker.po kde-i18n-zh_TW-3.5.10/messages/kdegames/kpoker.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdegames/kpoker.po	2006-07-22 10:03:52.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdegames/kpoker.po	2011-11-11 15:45:17.000000000 +0100
-@@ -9,7 +9,7 @@
- "Project-Id-Version: kpoker\n"
- "POT-Creation-Date: 2005-05-18 21:24+0200\n"
- "PO-Revision-Date: 2003-12-17 21:08+0800\n"
--"Last-Translator: Hydonsingore Sie <hydonsingore@mail.educities.edu.tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Chinese(traitional) <zh-l10n@linux.org.tw>\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/kdegames/kreversi.po kde-i18n-zh_TW-3.5.10/messages/kdegames/kreversi.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdegames/kreversi.po	2008-08-19 20:43:06.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdegames/kreversi.po	2011-11-11 15:45:17.000000000 +0100
-@@ -6,8 +6,7 @@
- "Project-Id-Version: kreversi\n"
- "POT-Creation-Date: 2008-07-08 01:19+0200\n"
- "PO-Revision-Date: 2006-07-04 11:22+0800\n"
--"Last-Translator: Frank Weng (a.k.a. Franklin) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Chinese Traditional <zh-l10n@linux.org.tw>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
-@@ -25,8 +24,8 @@
- "_: EMAIL OF TRANSLATORS\n"
- "Your emails"
- msgstr ""
--"shyue@sonoma.com.tw, hydonsingore@mail.educities.edu.tw, franklin at goodhorse "
--"dot idv dot tw"
-+"shyue@sonoma.com.tw, hydonsingore@mail.educities.edu.tw, franklin at "
-+"goodhorse dot idv dot tw"
- 
- #: board.cpp:268
- msgid "Click"
-@@ -86,8 +85,9 @@
- 
- #: kreversi.cpp:224
- msgid ""
--"You are already running an unfinished game.  If you abort the old game to start "
--"a new one, the old game will be registered as a loss in the highscore file.\n"
-+"You are already running an unfinished game.  If you abort the old game to "
-+"start a new one, the old game will be registered as a loss in the highscore "
-+"file.\n"
- "What do you want to do?"
- msgstr ""
- "您正在進行一局遊戲。如果您要重起新的一局，舊的一局將會被標記為失敗。\n"
-diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdegames/ksame.po kde-i18n-zh_TW-3.5.10/messages/kdegames/ksame.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdegames/ksame.po	2006-07-22 10:03:52.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdegames/ksame.po	2011-11-11 15:45:17.000000000 +0100
-@@ -6,7 +6,7 @@
- "Project-Id-Version: ksame\n"
- "POT-Creation-Date: 2005-07-24 01:33+0200\n"
- "PO-Revision-Date: 2004-02-08 19:56+0800\n"
--"Last-Translator: Hydonsingore Sie <hydonsingore@mail.educities.edu.tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: traditional chinese <zh-l10n@linux.org.tw>\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/kdegames/kshisen.po kde-i18n-zh_TW-3.5.10/messages/kdegames/kshisen.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdegames/kshisen.po	2006-07-22 10:03:52.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdegames/kshisen.po	2011-11-11 15:45:17.000000000 +0100
-@@ -5,7 +5,7 @@
- "Project-Id-Version: kshisen\n"
- "POT-Creation-Date: 2006-06-12 04:03+0200\n"
- "PO-Revision-Date: 2003-01-08 15:32+0800\n"
--"Last-Translator: Hydonsingore Sie <hydonsingore@mail.educities.edu.tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Chinese(traitional) <zh-l10n@linux.org.tw>\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/kdegames/ksirtet.po kde-i18n-zh_TW-3.5.10/messages/kdegames/ksirtet.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdegames/ksirtet.po	2006-07-22 10:03:52.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdegames/ksirtet.po	2011-11-11 15:45:17.000000000 +0100
-@@ -8,7 +8,7 @@
- "Project-Id-Version: ksirtet\n"
- "POT-Creation-Date: 2005-05-18 21:24+0200\n"
- "PO-Revision-Date: 2003-12-19 13:28+0800\n"
--"Last-Translator: Hydonsingore Sie <hydonsingore@mail.educities.edu.tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Chinese(traitional) <zh-l10n@linux.org.tw>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
-@@ -31,7 +31,7 @@
- #: rc.cpp:9
- #, no-c-format
- msgid "Occupied lines"
--msgstr "佔用的行數"
-+msgstr "佔用的列數"
- 
- #. i18n: file ksirtet.kcfg line 20
- #: rc.cpp:12
-@@ -61,7 +61,7 @@
- #: rc.cpp:24
- #, no-c-format
- msgid "Number of full lines"
--msgstr "整行數目"
-+msgstr "整列數目"
- 
- #: piece.cpp:46
- msgid "Z piece color:"
-@@ -97,7 +97,7 @@
- 
- #: ai.cpp:8
- msgid "Occupied lines:"
--msgstr "佔用行數:"
-+msgstr "佔用列數:"
- 
- #: ai.cpp:10
- msgid "Number of holes:"
-@@ -125,7 +125,7 @@
- 
- #: field.cpp:18
- msgid "Indicate the number of garbage lines you received from your opponent."
--msgstr "顯示對手送來的行數。"
-+msgstr "顯示對手送來的列數。"
- 
- #: field.cpp:46
- msgid "Total:"
-@@ -136,7 +136,7 @@
- msgid ""
- "_n: 1 Line:\n"
- "%n Lines:"
--msgstr "%n 行："
-+msgstr "%n 列："
- 
- #: settings.cpp:15
- msgid "Old rotation style"
-@@ -152,10 +152,10 @@
- 
- #: main.cpp:28
- msgid "Removed Lines"
--msgstr "消掉的行數"
-+msgstr "消掉的列數"
- 
- #~ msgid "Display the number of lines removed simultaneously."
--#~ msgstr "即時顯示消掉的行數"
-+#~ msgstr "即時顯示消掉的列數"
- 
- #, fuzzy
- #~ msgid "Show next piece"
-@@ -201,7 +201,7 @@
- #~ msgstr "右移"
- 
- #~ msgid "One line down"
--#~ msgstr "往下一行"
-+#~ msgstr "往下一列"
- 
- #~ msgid "Rotate left"
- #~ msgstr "左旋"
-@@ -296,7 +296,7 @@
- 
- #, fuzzy
- #~ msgid "Configure Keys"
--#~ msgstr "連接中 ..."
-+#~ msgstr "連接中…"
- 
- #, fuzzy
- #~ msgid "Hostname"
-@@ -328,7 +328,7 @@
- 
- #, fuzzy
- #~ msgid "Configure AI..."
--#~ msgstr "連接中 ..."
-+#~ msgstr "連接中…"
- 
- #, fuzzy
- #~ msgid "Network meeting"
-diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdegames/ksmiletris.po kde-i18n-zh_TW-3.5.10/messages/kdegames/ksmiletris.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdegames/ksmiletris.po	2005-09-10 13:14:52.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdegames/ksmiletris.po	2011-11-11 15:45:17.000000000 +0100
-@@ -5,7 +5,7 @@
- "Project-Id-Version: ksmiletris\n"
- "POT-Creation-Date: 2005-05-18 21:24+0200\n"
- "PO-Revision-Date: 2003-12-23 01:51+0800\n"
--"Last-Translator: Hydonsingore Sie <hydonsingore@mail.educities.edu.tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Chinese(traditional) <zh-l10n@linux.org.tw>\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/kdegames/ksnake.po kde-i18n-zh_TW-3.5.10/messages/kdegames/ksnake.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdegames/ksnake.po	2008-08-19 20:43:06.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdegames/ksnake.po	2011-11-11 15:45:17.000000000 +0100
-@@ -11,8 +11,7 @@
- "Project-Id-Version: ksnake\n"
- "POT-Creation-Date: 2008-07-08 01:19+0200\n"
- "PO-Revision-Date: 2006-01-17 16:47+0800\n"
--"Last-Translator: Frank Weng (a.k.a. Franklin) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Traditional Chinese <zh_l10n@linux.org.tw>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
-@@ -30,8 +29,8 @@
- "_: EMAIL OF TRANSLATORS\n"
- "Your emails"
- msgstr ""
--"shyue@sonoma.com.tw,kenduest@i18n.linux.org.tw,"
--"hydonsingore@mail.educities.edu.tw"
-+"shyue@sonoma.com.tw,kenduest@i18n.linux.org.tw,hydonsingore@mail.educities."
-+"edu.tw"
- 
- #: game.cpp:60
- msgid "Score: 0"
-@@ -100,10 +99,8 @@
- msgstr "改進"
- 
- #: pixServer.cpp:184
--msgid ""
--"error loading %1, aborting\n"
--msgstr ""
--"%1 載入錯誤, 放棄!\n"
-+msgid "error loading %1, aborting\n"
-+msgstr "%1 載入錯誤, 放棄!\n"
- 
- #: rattler.cpp:315
- msgid ""
-diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdegames/ksokoban.po kde-i18n-zh_TW-3.5.10/messages/kdegames/ksokoban.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdegames/ksokoban.po	2005-09-10 13:14:52.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdegames/ksokoban.po	2011-11-11 15:45:17.000000000 +0100
-@@ -7,7 +7,7 @@
- "Project-Id-Version: ksokoban\n"
- "POT-Creation-Date: 2005-05-18 21:24+0200\n"
- "PO-Revision-Date: 2003-12-23 01:49+0800\n"
--"Last-Translator: Hydonsingore Sie <hydonsingore@mail.educities.edu.tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Chinese(traditional) <zh-l10n@linux.org.tw>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
-@@ -36,7 +36,7 @@
- 
- #: MainWindow.cpp:93
- msgid "&Load Levels..."
--msgstr "載入關卡(&L)..."
-+msgstr "載入關卡(&L)…"
- 
- #: MainWindow.cpp:95
- msgid "&Next Level"
-diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdegames/kspaceduel.po kde-i18n-zh_TW-3.5.10/messages/kdegames/kspaceduel.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdegames/kspaceduel.po	2005-09-10 13:14:52.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdegames/kspaceduel.po	2011-11-11 15:45:17.000000000 +0100
-@@ -7,7 +7,7 @@
- "Project-Id-Version: kspaceduel\n"
- "POT-Creation-Date: 2005-05-18 21:24+0200\n"
- "PO-Revision-Date: 2003-12-05 00:43+0800\n"
--"Last-Translator: Hydonsingore Sie <hydonsingore@mail.educities.edu.tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Chinese(traitional) <zh-l10n@linux.org.tw>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
-@@ -288,7 +288,7 @@
- 
- #: topwidget.cpp:67
- msgid "&New Round"
--msgstr "新比賽 (&N)"
-+msgstr "新比賽(&N)"
- 
- #: topwidget.cpp:84
- msgid "Player 1 Rotate Left"
-@@ -308,7 +308,7 @@
- 
- #: topwidget.cpp:96
- msgid "Player 1 Mine"
--msgstr "佈雷"
-+msgstr "布雷"
- 
- #: topwidget.cpp:100
- msgid "Player 2 Rotate Left"
-@@ -328,7 +328,7 @@
- 
- #: topwidget.cpp:112
- msgid "Player 2 Mine"
--msgstr "佈雷"
-+msgstr "布雷"
- 
- #~ msgid "Key Setup"
- #~ msgstr "按鍵設定"
-@@ -364,14 +364,14 @@
- #~ msgstr "選手按鍵 [&K]"
- 
- #~ msgid "&Handicap..."
--#~ msgstr "殘障...[&H]"
-+#~ msgstr "殘障…[&H]"
- 
- #~ msgid "Gra&phics..."
- #~ msgstr "畫面 [&P]"
- 
- #, fuzzy
- #~ msgid "&AI..."
--#~ msgstr "人工智慧...[&A]"
-+#~ msgstr "人工智慧…[&A]"
- 
- #~ msgid "New &Game"
- #~ msgstr "新遊戲 [&G]"
-diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdegames/ktron.po kde-i18n-zh_TW-3.5.10/messages/kdegames/ktron.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdegames/ktron.po	2008-08-19 20:43:06.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdegames/ktron.po	2011-11-11 15:45:17.000000000 +0100
-@@ -8,7 +8,7 @@
- "Project-Id-Version: ktron\n"
- "POT-Creation-Date: 2008-07-08 01:19+0200\n"
- "PO-Revision-Date: 2003-12-16 20:43+0800\n"
--"Last-Translator: Hydonsingore Sie <hydonsingore@mail.educities.edu.tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Chinese(traitional) <zh-l10n@linux.org.tw>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
-@@ -120,7 +120,8 @@
- msgstr ""
- "(c) 1998-2000, Matthias Kiefer\n"
- "\n"
--"部份電腦玩家的計算能力，是 Rhett D. Jacobs <rhett@hotel.canberra.edu.au>從xtron取得的。"
-+"部份電腦玩家的計算能力，是 Rhett D. Jacobs <rhett@hotel.canberra.edu.au>從"
-+"xtron取得的。"
- 
- #: main.cpp:39
- msgid "Original author"
-diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdegames/ktuberling.po kde-i18n-zh_TW-3.5.10/messages/kdegames/ktuberling.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdegames/ktuberling.po	2006-10-01 18:34:10.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdegames/ktuberling.po	2011-11-11 15:45:17.000000000 +0100
-@@ -8,8 +8,7 @@
- "Project-Id-Version: ktuberling\n"
- "POT-Creation-Date: 2006-08-13 04:05+0200\n"
- "PO-Revision-Date: 2006-08-14 13:15+0800\n"
--"Last-Translator: Frank Weng (a.k.a. Franklin) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Chinese Traditional <zh-l10n@linux.org.tw>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
-@@ -70,11 +69,11 @@
- 
- #: toplevel.cpp:262
- msgid "Save &as Picture..."
--msgstr "存成圖檔 (&A)"
-+msgstr "存成圖檔(&A)"
- 
- #: toplevel.cpp:272
- msgid "&No Sound"
--msgstr "關掉聲音 (&S)"
-+msgstr "關掉聲音(&S)"
- 
- #: toplevel.cpp:312
- msgid "Could not load file."
-diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdegames/kwin4.po kde-i18n-zh_TW-3.5.10/messages/kdegames/kwin4.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdegames/kwin4.po	2006-07-22 10:03:52.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdegames/kwin4.po	2011-11-11 15:45:17.000000000 +0100
-@@ -12,8 +12,7 @@
- "Project-Id-Version: kwin4\n"
- "POT-Creation-Date: 2005-05-18 21:24+0200\n"
- "PO-Revision-Date: 2006-01-17 16:50+0800\n"
--"Last-Translator: Frank Weng (a.k.a. Franklin) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Traditional Chinese <zh_l10n@linux.org.tw>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
-@@ -42,7 +41,7 @@
- 
- #: kwin4.cpp:79
- msgid "Configure..."
--msgstr "設定..."
-+msgstr "設定…"
- 
- #: kwin4.cpp:192
- msgid "Start a new game"
-@@ -50,15 +49,15 @@
- 
- #: kwin4.cpp:195
- msgid "Open a saved game..."
--msgstr "開啟舊遊戲..."
-+msgstr "開啟舊遊戲…"
- 
- #: kwin4.cpp:198
- msgid "Save a game..."
--msgstr "儲存遊戲..."
-+msgstr "儲存遊戲…"
- 
- #: kwin4.cpp:201
- msgid "Ending the current game..."
--msgstr "中止進行中的遊戲..."
-+msgstr "中止進行中的遊戲…"
- 
- #: kwin4.cpp:202
- msgid "Aborts a currently played game. No winner will be declared."
-@@ -70,7 +69,7 @@
- 
- #: kwin4.cpp:207
- msgid "Network Chat..."
--msgstr "網路聊天..."
-+msgstr "網路聊天…"
- 
- #: kwin4.cpp:211
- msgid "Debug KGame"
-@@ -78,7 +77,7 @@
- 
- #: kwin4.cpp:214
- msgid "&Show Statistics"
--msgstr "顯示統計資料 (&S)"
-+msgstr "顯示統計資料(&S)"
- 
- #: kwin4.cpp:216
- msgid "Show statistics."
-@@ -133,14 +132,12 @@
- msgstr "沒人  "
- 
- #: kwin4.cpp:482
--msgid ""
--"The network game ended!\n"
--msgstr ""
--"連線遊戲終止!\n"
-+msgid "The network game ended!\n"
-+msgstr "連線遊戲終止!\n"
- 
- #: kwin4.cpp:493
- msgid "Game running..."
--msgstr "遊戲執行中..."
-+msgstr "遊戲執行中…"
- 
- #: kwin4.cpp:504
- msgid "The game is drawn. Please restart next round."
-@@ -190,15 +187,15 @@
- 
- #: kwin4view.cpp:606
- msgid "Hold on... the other player has not been yet..."
--msgstr "請稍候，人家還沒下呢..."
-+msgstr "請稍候，人家還沒下呢…"
- 
- #: kwin4view.cpp:607
- msgid "Hold your horses..."
--msgstr "請稍候，別猴急..."
-+msgstr "請稍候，別猴急…"
- 
- #: kwin4view.cpp:608
- msgid "Ah ah ah... only one go at a time..."
--msgstr "請稍候，一次只能一個人下..."
-+msgstr "請稍候，一次只能一個人下…"
- 
- #: kwin4view.cpp:609
- msgid "Please wait... it is not your turn."
-@@ -222,7 +219,7 @@
- 
- #: main.cpp:46
- msgid "Code Improvements"
--msgstr "源碼改進"
-+msgstr "原始碼改進"
- 
- #. i18n: file settings.ui line 24
- #: rc.cpp:9
-diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdegames/libkdegames.po kde-i18n-zh_TW-3.5.10/messages/kdegames/libkdegames.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdegames/libkdegames.po	2007-01-15 10:56:21.000000000 +0100
-+++ kde-i18n-zh_TW-3.5.10/messages/kdegames/libkdegames.po	2011-11-11 15:45:17.000000000 +0100
-@@ -7,8 +7,7 @@
- "Project-Id-Version: libkdegames\n"
- "POT-Creation-Date: 2006-12-21 02:39+0100\n"
- "PO-Revision-Date: 2006-01-18 09:29+0800\n"
--"Last-Translator: Frank Weng (a.k.a. Franklin) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Traditional Chinese <zh_l10n@linux.org.tw>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
-@@ -46,7 +45,7 @@
- 
- #: kgame/dialogs/kgamedebugdialog.cpp:143
- msgid "Debug &KGame"
--msgstr "Debug KGame (&K)"
-+msgstr "Debug KGame(&K)"
- 
- #: kgame/dialogs/kgamedebugdialog.cpp:148
- #: kgame/dialogs/kgamedebugdialog.cpp:193
-@@ -553,13 +552,13 @@
- #: kgamemisc.cpp:55
- msgid ""
- "_: A list of language typical names ( for games ), separated by spaces\n"
--"Adam Alex Andreas Andrew Bart Ben Bernd Bill Chris Chuck Daniel Don Duncan Ed "
--"Emily Eric Gary Greg Harry Ian Jean Jeff Jan Kai Keith Ken Kirk Marc Mike Neil "
--"Paul Rik Robert Sam Sean Thomas Tim Walter"
-+"Adam Alex Andreas Andrew Bart Ben Bernd Bill Chris Chuck Daniel Don Duncan "
-+"Ed Emily Eric Gary Greg Harry Ian Jean Jeff Jan Kai Keith Ken Kirk Marc Mike "
-+"Neil Paul Rik Robert Sam Sean Thomas Tim Walter"
- msgstr ""
--"Adam Alex Andreas Andrew Bart Ben Bernd Bill Chris Chuck Daniel Don Duncan Ed "
--"Emily Eric Gary Greg Harry Ian Jean Jeff Jan Kai Keith Ken Kirk Marc Mike Neil "
--"Paul Rik Robert Sam Sean Thomas Tim Walter"
-+"Adam Alex Andreas Andrew Bart Ben Bernd Bill Chris Chuck Daniel Don Duncan "
-+"Ed Emily Eric Gary Greg Harry Ian Jean Jeff Jan Kai Keith Ken Kirk Marc Mike "
-+"Neil Paul Rik Robert Sam Sean Thomas Tim Walter"
- 
- #: kstdgameaction.cpp:60
- msgid ""
-@@ -581,7 +580,7 @@
- 
- #: kstdgameaction.cpp:65
- msgid "Save &As..."
--msgstr "另存新檔...(&A)"
-+msgstr "另存新檔…(&A)"
- 
- #: kstdgameaction.cpp:66
- msgid "&End Game"
-@@ -637,7 +636,7 @@
- 
- #: kstdgameaction.cpp:83
- msgid "Configure &Highscores..."
--msgstr "設定高分榜(&H)..."
-+msgstr "設定高分榜(&H)…"
- 
- #: highscore/khighscore.cpp:134
- msgid "Retry"
-@@ -645,8 +644,8 @@
- 
- #: highscore/khighscore.cpp:135
- msgid ""
--"Cannot access the highscore file. Another user is probably currently writing to "
--"it."
-+"Cannot access the highscore file. Another user is probably currently writing "
-+"to it."
- msgstr "無法存取高分榜的檔案。可能另一個玩家正在改寫它。"
- 
- #: highscore/kscoredialog.cpp:68
-@@ -720,11 +719,11 @@
- 
- #: highscore/kexthighscore_gui.cpp:204
- msgid "Configure..."
--msgstr "設定..."
-+msgstr "設定…"
- 
- #: highscore/kexthighscore_gui.cpp:205
- msgid "Export..."
--msgstr "匯出..."
-+msgstr "匯出…"
- 
- #: highscore/kexthighscore_gui.cpp:258
- msgid "Overwrite"
-@@ -776,8 +775,8 @@
- 
- #: highscore/kexthighscore_gui.cpp:456
- msgid ""
--"This will permanently remove your registration key. You will not be able to use "
--"the currently registered nickname anymore."
-+"This will permanently remove your registration key. You will not be able to "
-+"use the currently registered nickname anymore."
- msgstr "這樣會永遠移除您的註冊金鑰。您將無法再使用目前註冊的暱稱。"
- 
- #: highscore/kexthighscore_gui.cpp:499
-@@ -1060,11 +1059,11 @@
- 
- #: kchatdialog.cpp:86 kchatdialog.cpp:108
- msgid "Name Font..."
--msgstr "名稱字型..."
-+msgstr "名稱字型…"
- 
- #: kchatdialog.cpp:89 kchatdialog.cpp:111
- msgid "Text Font..."
--msgstr "文字字型..."
-+msgstr "文字字型…"
- 
- #: kchatdialog.cpp:98
- msgid "Player: "
-diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdegames/libksirtet.po kde-i18n-zh_TW-3.5.10/messages/kdegames/libksirtet.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdegames/libksirtet.po	2006-07-22 10:03:52.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdegames/libksirtet.po	2011-11-11 15:45:17.000000000 +0100
-@@ -7,7 +7,7 @@
- "Project-Id-Version: libksirtet\n"
- "POT-Creation-Date: 2005-11-30 03:21+0100\n"
- "PO-Revision-Date: 2006-01-17 15:30+0800\n"
--"Last-Translator: Frank Weng <franklin at goodhorse dot idv dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Chinese(traditional) <zh-l10n@linux.org.tw>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
-@@ -388,13 +388,12 @@
- 
- #: common/field.cpp:183
- msgid ""
--"<qt>Display the current score."
--"<br/>It turns <font color=\"blue\">blue</font> if it is a highscore and <font "
--"color=\"red\">red</font> if it is the best local score.</qt>"
-+"<qt>Display the current score.<br/>It turns <font color=\"blue\">blue</font> "
-+"if it is a highscore and <font color=\"red\">red</font> if it is the best "
-+"local score.</qt>"
- msgstr ""
--"<qt>顯示目前的分數 "
--"<br/>當分數高時，會變成<font color=\"blue\">藍色</font> ；當分數成為本地最高分時，會變成<font "
--"color=\"red\">紅色</font>。</qt>"
-+"<qt>顯示目前的分數 <br/>當分數高時，會變成<font color=\"blue\">藍色</font> ；"
-+"當分數成為本地最高分時，會變成<font color=\"red\">紅色</font>。</qt>"
- 
- #: common/field.cpp:184 common/highscores.cpp:14
- msgid "Level"
-@@ -418,7 +417,7 @@
- 
- #: common/inter.cpp:19
- msgid "One Line Down"
--msgstr "落下一行"
-+msgstr "落下一列"
- 
- #: common/inter.cpp:20
- msgid "Rotate Left"
-@@ -474,7 +473,7 @@
- 
- #: common/settings.cpp:27
- msgid "Show detailed \"removed lines\" field"
--msgstr "顯示詳細的\"消掉行數\"欄區"
-+msgstr "顯示詳細的\"消掉列數\"欄區"
- 
- #: common/settings.cpp:40
- msgid "Initial level:"
-@@ -510,7 +509,7 @@
- #~ msgstr "送給下一位玩家\"禮物\"時發亮。"
- 
- #~ msgid "Configure Keys..."
--#~ msgstr "設定按鍵..."
-+#~ msgstr "設定按鍵…"
- 
- #~ msgid "Fade strength:"
- #~ msgstr "淡出強度:"
-diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdegames/lskat.po kde-i18n-zh_TW-3.5.10/messages/kdegames/lskat.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdegames/lskat.po	2006-07-22 10:03:52.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdegames/lskat.po	2011-11-11 15:45:17.000000000 +0100
-@@ -9,8 +9,7 @@
- "Project-Id-Version: lskat\n"
- "POT-Creation-Date: 2005-05-18 21:24+0200\n"
- "PO-Revision-Date: 2006-01-17 15:31+0800\n"
--"Last-Translator: Frank Weng (a.k.a. Franklin) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Traditional Chinese <zh_l10n@linux.org.tw>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
-@@ -31,7 +30,7 @@
- 
- #: lskat.cpp:162 lskat.cpp:163
- msgid "Starting a new game..."
--msgstr "開啟新遊戲中..."
-+msgstr "開啟新遊戲中…"
- 
- #: lskat.cpp:164
- msgid "&End Game"
-@@ -71,7 +70,7 @@
- 
- #: lskat.cpp:177
- msgid "Exiting..."
--msgstr "離開中..."
-+msgstr "離開中…"
- 
- #: lskat.cpp:178
- msgid "Quits the program."
-@@ -155,7 +154,7 @@
- 
- #: lskat.cpp:216
- msgid "Configure card decks..."
--msgstr "設定牌面樣式..."
-+msgstr "設定牌面樣式…"
- 
- #: lskat.cpp:217
- msgid "Choose how the cards should look."
-@@ -163,11 +162,11 @@
- 
- #: lskat.cpp:219
- msgid "Change &Names..."
--msgstr "更改名稱...(&N)"
-+msgstr "更改名稱…(&N)"
- 
- #: lskat.cpp:221 lskat.cpp:222
- msgid "Configure player names..."
--msgstr "設定玩家名稱..."
-+msgstr "設定玩家名稱…"
- 
- #: lskat.cpp:238
- msgid "This leaves space for the mover"
-@@ -195,7 +194,7 @@
- 
- #: lskat.cpp:403
- msgid "Game ended...start a new one..."
--msgstr "遊戲已結束...請開新遊戲..."
-+msgstr "遊戲已結束…請開新遊戲..."
- 
- #: lskat.cpp:587
- msgid "No game running"
-@@ -203,7 +202,7 @@
- 
- #: lskat.cpp:590
- msgid "%1 to move..."
--msgstr "%1 出牌..."
-+msgstr "%1 出牌…"
- 
- #: lskat.cpp:605
- msgid ""
-@@ -219,11 +218,11 @@
- 
- #: lskat.cpp:680
- msgid "Remote connection to %1:%2..."
--msgstr "遠端連線至 %1:%2..."
-+msgstr "遠端連線至 %1:%2…"
- 
- #: lskat.cpp:684
- msgid "Offering remote connection on port %1..."
--msgstr "允許遠端連線於連接埠 %1..."
-+msgstr "允許遠端連線於連接埠 %1…"
- 
- #: lskat.cpp:686
- msgid "Abort"
-@@ -231,41 +230,39 @@
- 
- #: lskat.cpp:769
- msgid "Waiting for the computer to move..."
--msgstr "等待電腦玩家出牌..."
-+msgstr "等待電腦玩家出牌…"
- 
- #: lskat.cpp:785
- msgid "Waiting for remote player..."
--msgstr "等待遠端玩家..."
-+msgstr "等待遠端玩家…"
- 
- #: lskat.cpp:792
- msgid "Please make your move..."
--msgstr "請您出牌..."
-+msgstr "請您出牌…"
- 
- #: lskat.cpp:827
- msgid "Remote connection lost for player 1..."
--msgstr "失去與玩家 1 的遠端連線..."
-+msgstr "失去與玩家 1 的遠端連線…"
- 
- #: lskat.cpp:834
- msgid "Remote connection lost for player 2..."
--msgstr "失去與玩家 2 的遠端連線..."
-+msgstr "失去與玩家 2 的遠端連線…"
- 
- #: lskat.cpp:846
--msgid ""
--"Message from remote player:\n"
--msgstr ""
--"遠端玩家傳過來的訊息：\n"
-+msgid "Message from remote player:\n"
-+msgstr "遠端玩家傳過來的訊息：\n"
- 
- #: lskat.cpp:864
- msgid "Remote player ended game..."
--msgstr "遠端玩家結束遊戲..."
-+msgstr "遠端玩家結束遊戲…"
- 
- #: lskat.cpp:889
- msgid "You are network client...loading remote game..."
--msgstr "你是連線客戶端...載入遠端遊戲中..."
-+msgstr "你是連線客戶端…載入遠端遊戲中..."
- 
- #: lskat.cpp:902
- msgid "You are network server..."
--msgstr "你是連線伺服器..."
-+msgstr "你是連線伺服器…"
- 
- #: lskat.cpp:960
- msgid ""
-@@ -284,16 +281,12 @@
- "請再考慮！\n"
- 
- #: lskat.cpp:992
--msgid ""
--"It is not your turn.\n"
--msgstr ""
--"不是換你。\n"
-+msgid "It is not your turn.\n"
-+msgstr "不是換你。\n"
- 
- #: lskat.cpp:997
--msgid ""
--"This move is not possible.\n"
--msgstr ""
--"這步是不可能的。\n"
-+msgid "This move is not possible.\n"
-+msgstr "這步是不可能的。\n"
- 
- #: lskatdoc.cpp:749
- msgid "Alice"
-@@ -321,7 +314,7 @@
- 
- #: lskatview.cpp:428
- msgid "      Game is drawn"
--msgstr ".......本局平手"
-+msgstr "…....本局平手"
- 
- #: lskatview.cpp:432
- msgid "Player 1 - %1 won "
-@@ -369,19 +362,19 @@
- 
- #: lskatview.cpp:838
- msgid "Hold on... the other player hasn't been yet..."
--msgstr "等等...對方還沒出牌..."
-+msgstr "等等…對方還沒出牌..."
- 
- #: lskatview.cpp:841
- msgid "Hold your horses..."
--msgstr "別急阿..."
-+msgstr "別急阿…"
- 
- #: lskatview.cpp:844
- msgid "Ah ah ah... only one go at a time..."
--msgstr "誒....一次一個人出牌..."
-+msgstr "誒….一次一個人出牌..."
- 
- #: lskatview.cpp:847
- msgid "Please wait... it is not your turn."
--msgstr "再等一下...還沒該你"
-+msgstr "再等一下…還沒該你"
- 
- #: main.cpp:23
- msgid "Enter debug level"
-diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdegraphics/kcmkamera.po kde-i18n-zh_TW-3.5.10/messages/kdegraphics/kcmkamera.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdegraphics/kcmkamera.po	2007-07-12 10:27:44.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdegraphics/kcmkamera.po	2011-11-11 15:45:17.000000000 +0100
-@@ -7,8 +7,7 @@
- "Project-Id-Version: kcmkamera\n"
- "POT-Creation-Date: 2007-05-28 02:15+0200\n"
- "PO-Revision-Date: 2006-06-08 14:47+0800\n"
--"Last-Translator: Frank Weng (a.k.a. Franklin) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Traditional Chinese <zh_l10n@linux.org.tw>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
-@@ -33,24 +32,25 @@
- 
- #: kamera.cpp:131
- msgid "Configure..."
--msgstr "設定..."
-+msgstr "設定…"
- 
- #: kamera.cpp:132
- msgid ""
- "Click this button to change the configuration of the selected camera."
--"<br>"
--"<br>The availability of this feature and the contents of the Configuration "
--"dialog depend on the camera model."
--msgstr "點選這個按鈕來變更所選取照相機的設定。<br><br>設定方塊內所顯示該照相機的功能以及內容項目，會依照不同照相機型式而有所不同。"
-+"<br><br>The availability of this feature and the contents of the "
-+"Configuration dialog depend on the camera model."
-+msgstr ""
-+"點選這個按鈕來變更所選取照相機的設定。<br><br>設定方塊內所顯示該照相機的功能"
-+"以及內容項目，會依照不同照相機型式而有所不同。"
- 
- #: kamera.cpp:135
- msgid ""
- "Click this button to view a summary of the current status of the selected "
--"camera."
--"<br>"
--"<br>The availability of this feature and the contents of the Configuration "
--"dialog depend on the camera model."
--msgstr "點選這個按鈕來檢視所選取照相機目前的狀態。<br><br>設定方塊內所顯示該照相機的功能以及內容項目，會依照不同照相機型式而有所不同。"
-+"camera.<br><br>The availability of this feature and the contents of the "
-+"Configuration dialog depend on the camera model."
-+msgstr ""
-+"點選這個按鈕來檢視所選取照相機目前的狀態。<br><br>設定方塊內所顯示該照相機的"
-+"功能以及內容項目，會依照不同照相機型式而有所不同。"
- 
- #: kamera.cpp:139
- msgid "Click this button to cancel the current camera operation."
-@@ -68,17 +68,16 @@
- "to on your computer (e.g. USB, Serial, Firewire). If your camera doesn't\n"
- "appear in the list of <i>Supported Cameras</i>, go to the\n"
- "<a href=\"http://www.gphoto.org\">GPhoto web site</a> for a possible update."
--"<br>"
--"<br>\n"
-+"<br><br>\n"
- "To view and download images from the digital camera, go to address\n"
- "<a href=\"camera:/\">camera:/</a> in Konqueror and other KDE applications."
- msgstr ""
- "<h1>數位相機</h1>\n"
- "這個模組能夠讓您設定使用數位相機。\n"
--"設定過程您需要指定您的相機型號與所連結的位置 (比方 USB，序列埠等位置)。若是您的相機型號沒有列在<i>支援的照相機</i>的話，請連線到\n"
-+"設定過程您需要指定您的相機型號與所連結的位置 (比方 USB，序列埠等位置)。若是您"
-+"的相機型號沒有列在<i>支援的照相機</i>的話，請連線到\n"
- "<a href=\"http://www.gphoto.org\">GPhoto 網站</a> 來取得相關更新資訊"
--"<br>"
--"<br>\n"
-+"<br><br>\n"
- "要檢視與下載數位相機圖片，請在 Konqueror 或者是 KDE 程式上連結\n"
- "<a href=\"camera:/\">camera:/</a> 即可"
- 
-@@ -92,25 +91,26 @@
- 
- #: kameradevice.cpp:88 kameradevice.cpp:434 kameradevice.cpp:454
- msgid ""
--"Description of abilities for camera %1 is not available. Configuration options "
--"may be incorrect."
-+"Description of abilities for camera %1 is not available. Configuration "
-+"options may be incorrect."
- msgstr "關於 %1 照相機的功能描述無法使用。設定參數可能不正確。"
- 
- #: kameradevice.cpp:111
- msgid "Could not access driver. Check your gPhoto2 installation."
--msgstr "無法取用驅動程式。請檢查您的 gPhoto2。檢查 gPhoto2 程式庫是否安裝妥當。"
-+msgstr ""
-+"無法取用驅動程式。請檢查您的 gPhoto2。檢查 gPhoto2 程式庫是否安裝妥當。"
- 
- #: kameradevice.cpp:131
- msgid ""
--"Unable to initialize camera. Check your port settings and camera connectivity "
--"and try again."
--msgstr "無法對照相機進行初始化的動作。請檢查您的通訊埠設定，以及照相機是否已連接妥當，然後再行嚐試。"
-+"Unable to initialize camera. Check your port settings and camera "
-+"connectivity and try again."
-+msgstr ""
-+"無法對照相機進行初始化的動作。請檢查您的通訊埠設定，以及照相機是否已連接妥"
-+"當，然後再行嚐試。"
- 
- #: kameradevice.cpp:155
--msgid ""
--"No camera summary information is available.\n"
--msgstr ""
--"沒有相機的摘要資訊。\n"
-+msgid "No camera summary information is available.\n"
-+msgstr "沒有相機的摘要資訊。\n"
- 
- #: kameradevice.cpp:168 kameradevice.cpp:178
- msgid "Camera configuration failed."
-@@ -148,12 +148,14 @@
- msgid ""
- "If this option is checked, the camera would have to be connected one of the "
- "serial ports (known as COM in Microsoft Windows) in your computer."
--msgstr "若是這個項目開啟了，那照相機應該連結到您主機的序列埠上 ((Windows 說法就是 COM 位置上)。"
-+msgstr ""
-+"若是這個項目開啟了，那照相機應該連結到您主機的序列埠上 ((Windows 說法就是 "
-+"COM 位置上)。"
- 
- #: kameradevice.cpp:313
- msgid ""
--"If this option is checked, the camera would have to be connected to one of the "
--"USB slots in your computer or USB hub."
-+"If this option is checked, the camera would have to be connected to one of "
-+"the USB slots in your computer or USB hub."
- msgstr "若是這個項目開啟了，那照相機應該連結到您主機的 USB 位置上。"
- 
- #: kameradevice.cpp:320
-diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdegraphics/kcm_kviewcanvasconfig.po kde-i18n-zh_TW-3.5.10/messages/kdegraphics/kcm_kviewcanvasconfig.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdegraphics/kcm_kviewcanvasconfig.po	2006-07-22 10:04:05.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdegraphics/kcm_kviewcanvasconfig.po	2011-11-11 15:45:17.000000000 +0100
-@@ -6,8 +6,7 @@
- "Project-Id-Version: kcm_kviewcanvasconfig\n"
- "POT-Creation-Date: 2004-10-12 01:17+0200\n"
- "PO-Revision-Date: 2006-06-08 15:06+0800\n"
--"Last-Translator: Frank Weng (a.k.a. Franklin) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Traditional Chinese <zh_l10n@linux.org.tw>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
-@@ -26,8 +25,8 @@
- msgid ""
- "The height of the image shown will not get smaller than the size you enter "
- "here.\n"
--"A value of 10 would cause a 1x1 image to be stretched vertically by a factor of "
--"10."
-+"A value of 10 would cause a 1x1 image to be stretched vertically by a factor "
-+"of 10."
- msgstr ""
- "所顯示的影像高度不會小於您在這裡所輸入的值。\n"
- "輸入 10 的話會讓 1x1 的圖片高度放大十倍。"
-@@ -44,8 +43,8 @@
- msgid ""
- "The height of the image shown will not get bigger than the size you enter "
- "here.\n"
--"A value of 100 would cause a 1000x1000 image to be compressed vertically by a "
--"factor of 0.1."
-+"A value of 100 would cause a 1000x1000 image to be compressed vertically by "
-+"a factor of 0.1."
- msgstr ""
- "所顯示的影像高度不會大於您在這裡所輸入的值。\n"
- "輸入 100 的話會讓 1000x1000 的圖片高度縮小為 0.1 倍。"
-@@ -62,8 +61,8 @@
- msgid ""
- "The width of the image shown will not get smaller than the size you enter "
- "here.\n"
--"A value of 10 would cause a 1x1 image to be stretched horizontally by a factor "
--"of 10."
-+"A value of 10 would cause a 1x1 image to be stretched horizontally by a "
-+"factor of 10."
- msgstr ""
- "所顯示的影像寬度不會小於您在這裡所輸入的值。\n"
- "輸入 10 的話會讓 1x1 的圖片寬度放大十倍。"
-@@ -78,9 +77,10 @@
- #: rc.cpp:27
- #, no-c-format
- msgid ""
--"The width of the image shown will not get bigger than the size you enter here.\n"
--"A value of 100 would cause a 1000x1000 image to be compressed horizontally by a "
--"factor of 0.1."
-+"The width of the image shown will not get bigger than the size you enter "
-+"here.\n"
-+"A value of 100 would cause a 1000x1000 image to be compressed horizontally "
-+"by a factor of 0.1."
- msgstr ""
- "所顯示的影像寬度不會大於您在這裡所輸入的值。\n"
- "輸入 100 的話會讓 1000x1000 的圖片寬度縮小為 0.1 倍。"
-@@ -103,7 +103,8 @@
- msgid ""
- "Every effect selected may be used to create a transition effect between the "
- "images. If you select multiple effects they will be chosen randomly."
--msgstr "每一個所選取的效果都可能用在圖片間的轉換。如果您選擇多個效果，則會隨機選取。"
-+msgstr ""
-+"每一個所選取的效果都可能用在圖片間的轉換。如果您選擇多個效果，則會隨機選取。"
- 
- #. i18n: file generalconfigwidget.ui line 195
- #: rc.cpp:40
-@@ -121,10 +122,12 @@
- #: rc.cpp:46
- #, no-c-format
- msgid ""
--"If this is checked KView will always try to keep the aspect ratio. That means "
--"if the width is scaled with a factor x, the height is scaled with the same "
--"factor."
--msgstr "勾選此選項的話，KView 會試著保留長跟寬的比例。這表示如果寬度調整係數為 x，則高度也會用同樣的係數來調整。"
-+"If this is checked KView will always try to keep the aspect ratio. That "
-+"means if the width is scaled with a factor x, the height is scaled with the "
-+"same factor."
-+msgstr ""
-+"勾選此選項的話，KView 會試著保留長跟寬的比例。這表示如果寬度調整係數為 x，則"
-+"高度也會用同樣的係數來調整。"
- 
- #. i18n: file generalconfigwidget.ui line 214
- #: rc.cpp:49
-diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdegraphics/kcm_kviewgeneralconfig.po kde-i18n-zh_TW-3.5.10/messages/kdegraphics/kcm_kviewgeneralconfig.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdegraphics/kcm_kviewgeneralconfig.po	2006-07-22 10:04:05.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdegraphics/kcm_kviewgeneralconfig.po	2011-11-11 15:45:17.000000000 +0100
-@@ -6,8 +6,7 @@
- "Project-Id-Version: kcm_kviewgeneralconfig\n"
- "POT-Creation-Date: 2005-05-18 21:25+0200\n"
- "PO-Revision-Date: 2006-06-08 15:11+0800\n"
--"Last-Translator: Frank Weng (a.k.a. Franklin) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Traditional Chinese <zh_l10n@linux.org.tw>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
-@@ -39,4 +38,6 @@
- "<p>KView will resize the window to fit the image. The image will never be "
- "scaled up but if it is too large for the screen the image will be scaled "
- "down.</p>"
--msgstr "<p>KView 會調整視窗以符合圖片大小。這個圖片將不會被調整，但是若圖片大到超過螢幕，則會縮小。</p>"
-+msgstr ""
-+"<p>KView 會調整視窗以符合圖片大小。這個圖片將不會被調整，但是若圖片大到超過螢"
-+"幕，則會縮小。</p>"
-diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdegraphics/kcm_kviewpluginsconfig.po kde-i18n-zh_TW-3.5.10/messages/kdegraphics/kcm_kviewpluginsconfig.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdegraphics/kcm_kviewpluginsconfig.po	2006-07-22 10:04:05.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdegraphics/kcm_kviewpluginsconfig.po	2011-11-11 15:45:17.000000000 +0100
-@@ -6,8 +6,7 @@
- "Project-Id-Version: kcm_kviewpluginsconfig\n"
- "POT-Creation-Date: 2005-05-18 21:25+0200\n"
- "PO-Revision-Date: 2006-06-08 15:11+0800\n"
--"Last-Translator: Frank Weng (a.k.a. Franklin) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Traditional Chinese <zh_l10n@linux.org.tw>\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/kdegraphics/kcm_kviewviewerpluginsconfig.po kde-i18n-zh_TW-3.5.10/messages/kdegraphics/kcm_kviewviewerpluginsconfig.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdegraphics/kcm_kviewviewerpluginsconfig.po	2006-07-22 10:04:05.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdegraphics/kcm_kviewviewerpluginsconfig.po	2011-11-11 15:45:17.000000000 +0100
-@@ -6,8 +6,7 @@
- "Project-Id-Version: kcm_kviewviewerpluginsconfig\n"
- "POT-Creation-Date: 2005-05-18 21:25+0200\n"
- "PO-Revision-Date: 2006-06-08 15:11+0800\n"
--"Last-Translator: Frank Weng (a.k.a. Franklin) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Traditional Chinese <zh_l10n@linux.org.tw>\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/kdegraphics/kcoloredit.po kde-i18n-zh_TW-3.5.10/messages/kdegraphics/kcoloredit.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdegraphics/kcoloredit.po	2006-07-22 10:04:05.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdegraphics/kcoloredit.po	2011-11-11 15:45:17.000000000 +0100
-@@ -7,8 +7,7 @@
- "Project-Id-Version: kcoloredit\n"
- "POT-Creation-Date: 2006-06-05 03:59+0200\n"
- "PO-Revision-Date: 2006-06-19 10:25+0800\n"
--"Last-Translator: Frank Weng (a.k.a. Franklin) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Chinese Traditional <zh-l10n@linux.org.tw>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
-@@ -103,7 +102,7 @@
- 
- #: kcoloredit.cpp:77
- msgid "New &Window"
--msgstr "新視窗 (&W)"
-+msgstr "新視窗(&W)"
- 
- #: kcoloredit.cpp:92
- msgid "Show &Color Names"
-diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdegraphics/kdjview.po kde-i18n-zh_TW-3.5.10/messages/kdegraphics/kdjview.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdegraphics/kdjview.po	2006-07-22 10:04:05.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdegraphics/kdjview.po	2011-11-11 15:45:17.000000000 +0100
-@@ -6,8 +6,7 @@
- "Project-Id-Version: kdjview\n"
- "POT-Creation-Date: 2006-02-10 04:00+0100\n"
- "PO-Revision-Date: 2006-06-09 11:11+0800\n"
--"Last-Translator: Frank Weng (a.k.a. Franklin) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Traditional Chinese <zh_l10n@linux.org.tw>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
-@@ -48,7 +47,7 @@
- 
- #: djvumultipage.cpp:70
- msgid "Delete Pages..."
--msgstr "刪除頁面..."
-+msgstr "刪除頁面…"
- 
- #: djvumultipage.cpp:95
- msgid "KDjView"
-@@ -116,21 +115,21 @@
- 
- #: djvurenderer.cpp:296
- msgid ""
--"<qt><strong>File error.</strong> The specified file '%1' could not be "
--"loaded.</qt>"
-+"<qt><strong>File error.</strong> The specified file '%1' could not be loaded."
-+"</qt>"
- msgstr "<qt><strong>檔案錯誤</strong>。指定的檔案 %1 無法載入。</qt>"
- 
- #: djvurenderer.cpp:402
- msgid "Loading file. Computing page sizes..."
--msgstr "載入檔案中。計算頁面大小..."
-+msgstr "載入檔案中。計算頁面大小…"
- 
- #: djvurenderer.cpp:580
- msgid "Printing..."
--msgstr "列印中..."
-+msgstr "列印中…"
- 
- #: djvurenderer.cpp:580
- msgid "Preparing pages for printing..."
--msgstr "準備列印頁面中..."
-+msgstr "準備列印頁面中…"
- 
- #: djvurenderer.cpp:581
- msgid "Abort"
-@@ -138,11 +137,11 @@
- 
- #: djvurenderer.cpp:637
- msgid "Deleting pages..."
--msgstr "刪除頁面中..."
-+msgstr "刪除頁面中…"
- 
- #: djvurenderer.cpp:637
- msgid "Please wait while pages are removed..."
--msgstr "請稍候，正在移除頁面..."
-+msgstr "請稍候，正在移除頁面…"
- 
- #: djvurenderer.cpp:660
- #, c-format
-@@ -168,24 +167,23 @@
- 
- #: kprintDialogPage_DJVUpageoptions.cpp:50
- msgid ""
--"If this option is enabled, some pages might be rotated to better fit the paper "
--"size."
-+"If this option is enabled, some pages might be rotated to better fit the "
-+"paper size."
- msgstr "如果開啟此選項，有些頁面會改變方向，以符合紙張大小。"
- 
- #: kprintDialogPage_DJVUpageoptions.cpp:51
- msgid ""
--"<qt>"
--"<p>If this option is enabled, landscape or portrait orientation are "
-+"<qt><p>If this option is enabled, landscape or portrait orientation are "
- "automatically chosen on a page-by-page basis. This makes better use of the "
--"paper and gives more visually-appealing printouts.</p>"
--"<p><b>Note:</b> This option overrides the Portrait/Landscape option chosen in "
--"the printer properties. If this option is enabled, and if the pages in your "
--"document have different sizes, then some pages might be rotated while others "
--"are not.</p></qt>"
-+"paper and gives more visually-appealing printouts.</p><p><b>Note:</b> This "
-+"option overrides the Portrait/Landscape option chosen in the printer "
-+"properties. If this option is enabled, and if the pages in your document "
-+"have different sizes, then some pages might be rotated while others are not."
-+"</p></qt>"
- msgstr ""
--"<qt>"
--"<p>如果開啟此選項，每一頁會自動判斷要使用橫向還是直向。這會讓列印結果較不會有問題。</p>"
--"<p><b>注意：</b>這個選項會覆蓋印表機內容所設定的方向。如果開啟此選項，而且您的文件大小不同，則有些頁面會轉換，有些不會。</p></qt>"
-+"<qt><p>如果開啟此選項，每一頁會自動判斷要使用橫向還是直向。這會讓列印結果較不"
-+"會有問題。</p><p><b>注意：</b>這個選項會覆蓋印表機內容所設定的方向。如果開啟"
-+"此選項，而且您的文件大小不同，則有些頁面會轉換，有些不會。</p></qt>"
- 
- #: kprintDialogPage_DJVUpageoptions.cpp:62
- msgid "Scale pages to fit paper size"
-@@ -199,16 +197,14 @@
- 
- #: kprintDialogPage_DJVUpageoptions.cpp:64
- msgid ""
--"<qt>"
--"<p>If this option is enabled, all pages will be scaled to optimally fit the "
--"printer's paper size.</p>"
--"<p><b>Note:</b> If this option is enabled, and if the pages in your document "
--"have different sizes, then different pages might be scaled by different scaling "
--"factors.</p></qt>"
-+"<qt><p>If this option is enabled, all pages will be scaled to optimally fit "
-+"the printer's paper size.</p><p><b>Note:</b> If this option is enabled, and "
-+"if the pages in your document have different sizes, then different pages "
-+"might be scaled by different scaling factors.</p></qt>"
- msgstr ""
--"<qt>"
--"<p>如果開啟此選項，所有的頁面大小會調整，以符合紙張大小。</p>"
--"<p><b>注意：</b>若開啟此選項，而且您的文件大小不同，則不同的頁面調整的比例也有可能不同。</p></qt>"
-+"<qt><p>如果開啟此選項，所有的頁面大小會調整，以符合紙張大小。</p><p><b>注意："
-+"</b>若開啟此選項，而且您的文件大小不同，則不同的頁面調整的比例也有可能不同。"
-+"</p></qt>"
- 
- #. i18n: file kprintDialogPage_DJVUconversionoptions_basewidget.ui line 32
- #: rc.cpp:9
-@@ -248,8 +244,8 @@
- "KViewShell. The choice of a language level can dramatically affect printing "
- "speed, but has no impact on the quality of the printout.</p>\n"
- "<p><b>Level 1:</b> This is the most conservative option, because PostScript "
--"Level 1 files can be printed on all printers. The files produced are, however, "
--"extremely long, and printing can be very slow.</p>\n"
-+"Level 1 files can be printed on all printers. The files produced are, "
-+"however, extremely long, and printing can be very slow.</p>\n"
- "<p><b>Level 2:</b> Level 2 PostScript files are much smaller and print much "
- "faster than Level 1 files. Level 2 files are supported by almost all "
- "printers.</p>\n"
-@@ -257,12 +253,15 @@
- "faster than Level 2 files. However, Level 3 files are supported only by some "
- "modern printers. If Level 3 works for you, this is the best option.</p>"
- msgstr ""
--"<p>此對話框讓您選擇 KViewShell 所使用的 PostScript 語言等級。所選擇的語言等級會明顯地影響列印速度，但是不會影響品質。</p>\n"
--"<p><b>等級 1</b>最保守的選項，可以在所有印表機上列印。但是所產生的檔案會非常長，印得非常慢。</p>\n"
--"<p><b>等級 2</b>等級 2 的 PostScript 檔比等級 1 小得多，列印速度也快得多。等級 2 的檔案也能被差不多全部的印表機接受。</p>"
--"\n"
--"<p><b>等級 3</b>等級 3 的 PostScript 檔又比等級 2 的小得多，列印速度也快得多。但是等級 3 "
--"的檔案只有一些新型的印表機才有支援。如果您的印表機有支援，使用等級 3 最好。</p>"
-+"<p>此對話框讓您選擇 KViewShell 所使用的 PostScript 語言等級。所選擇的語言等級"
-+"會明顯地影響列印速度，但是不會影響品質。</p>\n"
-+"<p><b>等級 1</b>最保守的選項，可以在所有印表機上列印。但是所產生的檔案會非常"
-+"長，印得非常慢。</p>\n"
-+"<p><b>等級 2</b>等級 2 的 PostScript 檔比等級 1 小得多，列印速度也快得多。等"
-+"級 2 的檔案也能被差不多全部的印表機接受。</p>\n"
-+"<p><b>等級 3</b>等級 3 的 PostScript 檔又比等級 2 的小得多，列印速度也快得"
-+"多。但是等級 3 的檔案只有一些新型的印表機才有支援。如果您的印表機有支援，使用"
-+"等級 3 最好。</p>"
- 
- #. i18n: file kprintDialogPage_DJVUconversionoptions_basewidget.ui line 88
- #: rc.cpp:30
-@@ -293,21 +292,24 @@
- #, no-c-format
- msgid ""
- "<p>Good DJVU files are separated into foreground and background images. The "
--"foreground mostly contains the text. With the render mode you can decide what "
--"part of your page will be printed.</p>\n"
--"<p><b>Print Full Page:</b> The full page, including foreground and background "
--"will be printed, either in color or in grayscale.</p>\n"
-+"foreground mostly contains the text. With the render mode you can decide "
-+"what part of your page will be printed.</p>\n"
-+"<p><b>Print Full Page:</b> The full page, including foreground and "
-+"background will be printed, either in color or in grayscale.</p>\n"
- "<p><b>Black & White:</b> Foreground and background are printed, but only in "
--"black-and-white. If this option is chosen, the files generated will print much "
--"faster, but quality will not be as good.</p>\n"
--"<p><b>Foreground Only:</b> This option is useful if the background of the page "
--"is disturbing and affects the readability of the text.</p>\n"
-+"black-and-white. If this option is chosen, the files generated will print "
-+"much faster, but quality will not be as good.</p>\n"
-+"<p><b>Foreground Only:</b> This option is useful if the background of the "
-+"page is disturbing and affects the readability of the text.</p>\n"
- "<p><b>Background Only:</b> Print only the background of the page.</p>"
- msgstr ""
--"<p>好的 DJVU 檔會分為前景圖片與背景圖片。前景大部份只含文字。在反映模式（Render mode）下您可以決定您要列印哪一部份。</p>\n"
-+"<p>好的 DJVU 檔會分為前景圖片與背景圖片。前景大部份只含文字。在反映模式"
-+"（Render mode）下您可以決定您要列印哪一部份。</p>\n"
- "<p><b>列印完整頁面</b>：列印完整頁面，包括前景與背景，使用彩色或灰階。</p>\n"
--"<p><b>黑白</b>會印出前景與背景，但是是黑白的。這個選項產生的檔案印起來會快得多，但是品質比較不怎麼樣。</p>\n"
--"<p><b>只印前景</b>如果頁面的背景很複雜，會影響到本文的讀取時，可使用這個選項。</p>\n"
-+"<p><b>黑白</b>會印出前景與背景，但是是黑白的。這個選項產生的檔案印起來會快得"
-+"多，但是品質比較不怎麼樣。</p>\n"
-+"<p><b>只印前景</b>如果頁面的背景很複雜，會影響到本文的讀取時，可使用這個選"
-+"項。</p>\n"
- "<p><b>只印背景</b>只列印背景。</p>"
- 
- #. i18n: file pageRangeWidget_base.ui line 16
-diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdegraphics/kdvi.po kde-i18n-zh_TW-3.5.10/messages/kdegraphics/kdvi.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdegraphics/kdvi.po	2008-08-19 20:43:07.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdegraphics/kdvi.po	2011-11-11 15:45:17.000000000 +0100
-@@ -10,8 +10,7 @@
- "Project-Id-Version: kdvi\n"
- "POT-Creation-Date: 2008-07-08 01:19+0200\n"
- "PO-Revision-Date: 2006-07-04 11:23+0800\n"
--"Last-Translator: Frank Weng (a.k.a. Franklin) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Chinese Traditional <zh-l10n@linux.org.tw>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
-@@ -46,7 +45,8 @@
- 
- #: TeXFont_PFB.cpp:44
- msgid ""
--"The font file %1 could be opened and read, but its font format is unsupported."
-+"The font file %1 could be opened and read, but its font format is "
-+"unsupported."
- msgstr "這個 %1 檔案雖可讀啟，但此種字型格式不被支援。"
- 
- #: TeXFont_PFB.cpp:50
-@@ -126,10 +126,12 @@
- 
- #: dviFile.cpp:117
- msgid ""
--"The DVI file contains the wrong version of DVI output for this program. Hint: "
--"If you use the typesetting system Omega, you have to use a special program, "
--"such as oxdvi."
--msgstr "DVI 輸出檔的版本錯誤。指引：如果是使用 Omega 來排版的話，請改用專用的程式，例如 oxdvi。"
-+"The DVI file contains the wrong version of DVI output for this program. "
-+"Hint: If you use the typesetting system Omega, you have to use a special "
-+"program, such as oxdvi."
-+msgstr ""
-+"DVI 輸出檔的版本錯誤。指引：如果是使用 Omega 來排版的話，請改用專用的程式，例"
-+"如 oxdvi。"
- 
- #: dviFile.cpp:155
- msgid ""
-@@ -160,7 +162,9 @@
- msgid ""
- "<qt><strong>File corruption!</strong> KDVI had trouble interpreting your DVI "
- "file. Most likely this means that the DVI file is broken.</qt>"
--msgstr "<qt><strong>檔案有誤！</strong> KDVI 無法解譯您的 DVI 檔。很可能您的 DVI 檔已毀損。</qt>"
-+msgstr ""
-+"<qt><strong>檔案有誤！</strong> KDVI 無法解譯您的 DVI 檔。很可能您的 DVI 檔已"
-+"毀損。</qt>"
- 
- #: dviRenderer.cpp:212 dviRenderer.cpp:483
- msgid "DVI File Error"
-@@ -172,14 +176,16 @@
- 
- #: dviRenderer.cpp:277
- msgid ""
--"<qt>This DVI file contains source file information. You may click into the text "
--"with the middle mouse button, and an editor will open the TeX-source file "
--"immediately.</qt>"
--msgstr "<qt>這個 DVI 檔含有原始文稿資訊。您可以按一下滑鼠中鍵來開啟 TeX 文稿的編輯器。</qt>"
-+"<qt>This DVI file contains source file information. You may click into the "
-+"text with the middle mouse button, and an editor will open the TeX-source "
-+"file immediately.</qt>"
-+msgstr ""
-+"<qt>這個 DVI 檔含有原始文稿資訊。您可以按一下滑鼠中鍵來開啟 TeX 文稿的編輯"
-+"器。</qt>"
- 
- #: dviRenderer.cpp:286
- msgid "Explain in more detail..."
--msgstr "更詳細的解釋......"
-+msgstr "更詳細的解釋…..."
- 
- #: dviRenderer.cpp:315
- msgid "Embedding PostScript Files"
-@@ -197,9 +203,11 @@
- 
- #: dviRenderer.cpp:439
- msgid ""
--"<qt><strong>File error.</strong> The specified file '%1' does not exist. KDVI "
--"already tried to add the ending '.dvi'.</qt>"
--msgstr "<qt><strong>檔案錯誤。</strong>所指定的檔案 '%1' 不存在。KDVI 已嘗試加入 '.dvi' 副檔名。</qt>"
-+"<qt><strong>File error.</strong> The specified file '%1' does not exist. "
-+"KDVI already tried to add the ending '.dvi'.</qt>"
-+msgstr ""
-+"<qt><strong>檔案錯誤。</strong>所指定的檔案 '%1' 不存在。KDVI 已嘗試加入 '."
-+"dvi' 副檔名。</qt>"
- 
- #: dviRenderer.cpp:441
- msgid "File Error!"
-@@ -207,28 +215,29 @@
- 
- #: dviRenderer.cpp:452
- msgid ""
--"<qt>Could not open file <nobr><strong>%1</strong></nobr> which has type <strong>"
--"%2</strong>. KDVI can only load DVI (.dvi) files.</qt>"
-+"<qt>Could not open file <nobr><strong>%1</strong></nobr> which has type "
-+"<strong>%2</strong>. KDVI can only load DVI (.dvi) files.</qt>"
- msgstr ""
--"<qt>無法開啟 <nobr><strong>%1</strong></nobr>，檔案類型為 <strong>%2</strong>"
--"。KDVI 只能載入 DVI (.dvi) 檔。</qt>"
-+"<qt>無法開啟 <nobr><strong>%1</strong></nobr>，檔案類型為 <strong>%2</"
-+"strong>。KDVI 只能載入 DVI (.dvi) 檔。</qt>"
- 
- #: dviRenderer.cpp:463 dviRenderer.cpp:481
- msgid ""
--"<qt>File corruption! KDVI had trouble interpreting your DVI file. Most likely "
--"this means that the DVI file is broken.</qt>"
-+"<qt>File corruption! KDVI had trouble interpreting your DVI file. Most "
-+"likely this means that the DVI file is broken.</qt>"
- msgstr "<qt>檔案有誤！KDVI 無法解譯您的 DVI 檔。很可能您的 DVI 檔已毀損。</qt>"
- 
- #: dviRenderer.cpp:640
- msgid ""
--"<qt>You have asked KDVI to locate the place in the DVI file which corresponds "
--"to line %1 in the TeX-file <strong>%2</strong>. It seems, however, that the DVI "
--"file does not contain the necessary source file information. We refer to the "
--"manual of KDVI for a detailed explanation on how to include this information. "
--"Press the F1 key to open the manual.</qt>"
--msgstr ""
--"<qt>您要 KDVI 找到在 <strong>%2</strong> TeX 文稿的 %1 行的相對應位置。但此 DVI 檔並沒有含必要的 TeX "
--"文稿資訊。請按 F1 鍵，參考 KDVI 手冊的詳細說明。</qt>"
-+"<qt>You have asked KDVI to locate the place in the DVI file which "
-+"corresponds to line %1 in the TeX-file <strong>%2</strong>. It seems, "
-+"however, that the DVI file does not contain the necessary source file "
-+"information. We refer to the manual of KDVI for a detailed explanation on "
-+"how to include this information. Press the F1 key to open the manual.</qt>"
-+msgstr ""
-+"<qt>您要 KDVI 找到在 <strong>%2</strong> TeX 文稿的 %1 列的相對應位置。但此 "
-+"DVI 檔並沒有含必要的 TeX 文稿資訊。請按 F1 鍵，參考 KDVI 手冊的詳細說明。</"
-+"qt>"
- 
- #: dviRenderer.cpp:645 dviRenderer.cpp:685
- msgid "Could Not Find Reference"
-@@ -236,14 +245,15 @@
- 
- #: dviRenderer.cpp:683
- msgid ""
--"<qt>KDVI was not able to locate the place in the DVI file which corresponds to "
--"line %1 in the TeX-file <strong>%2</strong>.</qt>"
--msgstr "<qt>KDVI 無法找到在 <strong>%2</strong> TeX 文稿的 %1 行的相對應位置。<qt>"
-+"<qt>KDVI was not able to locate the place in the DVI file which corresponds "
-+"to line %1 in the TeX-file <strong>%2</strong>.</qt>"
-+msgstr ""
-+"<qt>KDVI 無法找到在 <strong>%2</strong> TeX 文稿的 %1 列的相對應位置。<qt>"
- 
- #: dviRenderer.cpp:737
- msgid ""
--"The DVI-file refers to the TeX-file <strong>%1</strong> "
--"which could not be found."
-+"The DVI-file refers to the TeX-file <strong>%1</strong> which could not be "
-+"found."
- msgstr "TeX 文稿 <strong>%1</strong> 的相對應 DVI 檔找不到。"
- 
- #: dviRenderer.cpp:740
-@@ -253,10 +263,11 @@
- #: dviRenderer.cpp:747
- msgid ""
- "You have not yet specified an editor for inverse search. Please choose your "
--"favorite editor in the <strong>DVI options dialog</strong> "
--"which you will find in the <strong>Settings</strong>-menu."
-+"favorite editor in the <strong>DVI options dialog</strong> which you will "
-+"find in the <strong>Settings</strong>-menu."
- msgstr ""
--"您尚未指定編輯器。請由 <strong>設定</strong>-選單 中的 <strong>DVI 選項對話框</strong> 指定您順手的編輯器。"
-+"您尚未指定編輯器。請由 <strong>設定</strong>-選單 中的 <strong>DVI 選項對話框"
-+"</strong> 指定您順手的編輯器。"
- 
- #: dviRenderer.cpp:752
- msgid "Need to Specify Editor"
-@@ -268,26 +279,21 @@
- 
- #: dviRenderer.cpp:785
- msgid ""
--"<qt>The external program"
--"<br>"
--"<br><tt><strong>%1</strong></tt>"
--"<br/>"
--"<br/>which was used to call the editor for inverse search, reported an error. "
--"You might wish to look at the <strong>document info dialog</strong> "
--"which you will find in the File-Menu for a precise error report. The manual for "
--"KDVI contains a detailed explanation how to set up your editor for use with "
--"KDVI, and a list of common problems.</qt>"
--msgstr ""
--"<qt>用來呼叫編輯器的外部程式 "
--"<br>"
--"<br><tt><strong>%1</strong></tt>"
--"<br/>"
--"<br/> 傳回錯誤。您可能需要查看一下 <strong>文件資訊對話框</strong> 的 檔案-選單 來得知詳細的情形。KDVI "
--"的使用手冊有詳細的說明如何設定編輯器及一些其他的問題說明。</qt>"
-+"<qt>The external program<br><br><tt><strong>%1</strong></tt><br/><br/>which "
-+"was used to call the editor for inverse search, reported an error. You might "
-+"wish to look at the <strong>document info dialog</strong> which you will "
-+"find in the File-Menu for a precise error report. The manual for KDVI "
-+"contains a detailed explanation how to set up your editor for use with KDVI, "
-+"and a list of common problems.</qt>"
-+msgstr ""
-+"<qt>用來呼叫編輯器的外部程式 <br><br><tt><strong>%1</strong></tt><br/><br/> "
-+"傳回錯誤。您可能需要查看一下 <strong>文件資訊對話框</strong> 的 檔案-選單 來"
-+"得知詳細的情形。KDVI 的使用手冊有詳細的說明如何設定編輯器及一些其他的問題說"
-+"明。</qt>"
- 
- #: dviRenderer.cpp:791
- msgid "Starting the editor..."
--msgstr "啟動編輯器......"
-+msgstr "啟動編輯器…..."
- 
- #: dviRenderer_draw.cpp:269
- msgid "The DVI code set a character of an unknown font."
-@@ -319,17 +325,18 @@
- 
- #: dviRenderer_export.cpp:83
- msgid ""
--"KDVI could not locate the program 'dvipdfm' on your computer. That program is "
--"essential for the export function to work. You can, however, convert the "
--"DVI-file to PDF using the print function of KDVI, but that will often produce "
--"documents which print ok, but are of inferior quality if viewed in the Acrobat "
--"Reader. It may be wise to upgrade to a more recent version of your TeX "
--"distribution which includes the 'dvipdfm' program.\n"
--"Hint to the perplexed system administrator: KDVI uses the shell's PATH variable "
--"when looking for programs."
--msgstr ""
--"KDVI 找不到 'dvipdfm' 程式。這個程式是輸出功能所必需。當然也可以由 KDVI 的列印功能來轉換 DVI 為 "
--"PDF，但通常這樣一來印表沒有問題，由 Acrobat Reader 閱覽時則品質較差。更新您的 TeX 系統至含 'dvipdfm' 程式的版本會較明智。\n"
-+"KDVI could not locate the program 'dvipdfm' on your computer. That program "
-+"is essential for the export function to work. You can, however, convert the "
-+"DVI-file to PDF using the print function of KDVI, but that will often "
-+"produce documents which print ok, but are of inferior quality if viewed in "
-+"the Acrobat Reader. It may be wise to upgrade to a more recent version of "
-+"your TeX distribution which includes the 'dvipdfm' program.\n"
-+"Hint to the perplexed system administrator: KDVI uses the shell's PATH "
-+"variable when looking for programs."
-+msgstr ""
-+"KDVI 找不到 'dvipdfm' 程式。這個程式是輸出功能所必需。當然也可以由 KDVI 的列"
-+"印功能來轉換 DVI 為 PDF，但通常這樣一來印表沒有問題，由 Acrobat Reader 閱覽時"
-+"則品質較差。更新您的 TeX 系統至含 'dvipdfm' 程式的版本會較明智。\n"
- "給還沒進入狀況的系統管理者：KDVI 使用 shell 的 PATH 環境變數來找程式。"
- 
- #: dviRenderer_export.cpp:98
-@@ -362,15 +369,16 @@
- 
- #: dviRenderer_export.cpp:113
- msgid ""
--"KDVI is currently using the external program 'dvipdfm' to convert your DVI-file "
--"to PDF. Sometimes that can take a while because dvipdfm needs to generate its "
--"own bitmap fonts Please be patient."
-+"KDVI is currently using the external program 'dvipdfm' to convert your DVI-"
-+"file to PDF. Sometimes that can take a while because dvipdfm needs to "
-+"generate its own bitmap fonts Please be patient."
- msgstr ""
--"KDVI 目前使用 'dvipdfm' 外部程式來轉換 DVI 為 PDF 格式。可能會花些時間，因為 dvipdfm 要產生所需的點陣字型，請耐心等候。"
-+"KDVI 目前使用 'dvipdfm' 外部程式來轉換 DVI 為 PDF 格式。可能會花些時間，因為 "
-+"dvipdfm 要產生所需的點陣字型，請耐心等候。"
- 
- #: dviRenderer_export.cpp:117
- msgid "Waiting for dvipdfm to finish..."
--msgstr "等待 dvipdfm 完成工作......"
-+msgstr "等待 dvipdfm 完成工作…..."
- 
- #: dviRenderer_export.cpp:118
- msgid "dvipdfm progress dialog"
-@@ -382,12 +390,13 @@
- 
- #: dviRenderer_export.cpp:136
- msgid ""
--"<qt>The external program 'dvipdf', which was used to export the file, reported "
--"an error. You might wish to look at the <strong>document info dialog</strong> "
--"which you will find in the File-Menu for a precise error report.</qt>"
-+"<qt>The external program 'dvipdf', which was used to export the file, "
-+"reported an error. You might wish to look at the <strong>document info "
-+"dialog</strong> which you will find in the File-Menu for a precise error "
-+"report.</qt>"
- msgstr ""
--"<qt>'dvipdf' 外部程式是用來輸出 PDF 檔，並報告是否有錯誤。您可以查看 <strong>文件資訊對話框</strong> "
--"的檔案選單來得到更精確的錯誤訊息。</qt>"
-+"<qt>'dvipdf' 外部程式是用來輸出 PDF 檔，並報告是否有錯誤。您可以查看 <strong>"
-+"文件資訊對話框</strong> 的檔案選單來得到更精確的錯誤訊息。</qt>"
- 
- #: dviRenderer_export.cpp:139
- msgid "Export: %1 to PDF"
-@@ -399,17 +408,16 @@
- "PostScript format, and cannot be handled by the <strong>dvips</strong> "
- "program that KDVI uses interally to print or to export to PostScript. The "
- "functionality that you require is therefore unavailable in this version of "
--"KDVI.</p>"
--"<p>As a workaround, you can use the <strong>File/Export As</strong>"
--"-Menu to save this file in PDF format, and then use a PDF viewer.</p>"
--"<p>The author of KDVI apologizes for the inconvenience. If enough users "
--"complain, the missing functionality might later be added.</p></qt>"
--msgstr ""
--"<qt>"
--"<p>與這個 DVI 檔關聯的是一個非 PostScript 格式的外部圖形檔，無法經由 <strong>dvips</strong> "
--"處理。因此在這一版的 KDVI 中無法處理您的需求。</p> "
--"<p>您可以用選單中的「檔案」→「輸出為」功能將檔案存成 PDF 格式，再使用 PDF 檢視器讀取。</p> "
--"<p>KDVI 的作者為您的不方便道歉。如果有夠多的使用者都需要此功能，我們會試著加入。</p></qt>"
-+"KDVI.</p><p>As a workaround, you can use the <strong>File/Export As</strong>-"
-+"Menu to save this file in PDF format, and then use a PDF viewer.</p><p>The "
-+"author of KDVI apologizes for the inconvenience. If enough users complain, "
-+"the missing functionality might later be added.</p></qt>"
-+msgstr ""
-+"<qt><p>與這個 DVI 檔關聯的是一個非 PostScript 格式的外部圖形檔，無法經由 "
-+"<strong>dvips</strong> 處理。因此在這一版的 KDVI 中無法處理您的需求。</p> <p>"
-+"您可以用選單中的「檔案」→「輸出為」功能將檔案存成 PDF 格式，再使用 PDF 檢視器"
-+"讀取。</p> <p>KDVI 的作者為您的不方便道歉。如果有夠多的使用者都需要此功能，我"
-+"們會試著加入。</p></qt>"
- 
- #: dviRenderer_export.cpp:187
- msgid "Functionality Unavailable"
-@@ -425,16 +433,16 @@
- 
- #: dviRenderer_export.cpp:216
- msgid ""
--"KDVI is currently using the external program 'dvips' to convert your DVI-file "
--"to PostScript. Sometimes that can take a while because dvips needs to generate "
--"its own bitmap fonts Please be patient."
-+"KDVI is currently using the external program 'dvips' to convert your DVI-"
-+"file to PostScript. Sometimes that can take a while because dvips needs to "
-+"generate its own bitmap fonts Please be patient."
- msgstr ""
--"KDVI 目前使用 'dvips' 外部程式來轉換 DVI 為 PostScript 格式。可能會花些時間，因為 dvips "
--"要產生所需的點陣字型，請耐心等候。"
-+"KDVI 目前使用 'dvips' 外部程式來轉換 DVI 為 PostScript 格式。可能會花些時間，"
-+"因為 dvips 要產生所需的點陣字型，請耐心等候。"
- 
- #: dviRenderer_export.cpp:220
- msgid "Waiting for dvips to finish..."
--msgstr "等待 dvips 完成工作......"
-+msgstr "等待 dvips 完成工作…..."
- 
- #: dviRenderer_export.cpp:221
- msgid "dvips progress dialog"
-@@ -442,12 +450,13 @@
- 
- #: dviRenderer_export.cpp:299
- msgid ""
--"<qt>The external program 'dvips', which was used to export the file, reported "
--"an error. You might wish to look at the <strong>document info dialog</strong> "
--"which you will find in the File-Menu for a precise error report.</qt>"
-+"<qt>The external program 'dvips', which was used to export the file, "
-+"reported an error. You might wish to look at the <strong>document info "
-+"dialog</strong> which you will find in the File-Menu for a precise error "
-+"report.</qt>"
- msgstr ""
--"<qt>'dvips' 外部程式是用來輸出 PostScript 檔，並報告是否有錯誤。您可以查看 <strong>文件資訊對話框</strong> "
--"的檔案選單來得到更精確的錯誤訊息。</qt>"
-+"<qt>'dvips' 外部程式是用來輸出 PostScript 檔，並報告是否有錯誤。您可以查看 "
-+"<strong>文件資訊對話框</strong> 的檔案選單來得到更精確的錯誤訊息。</qt>"
- 
- #: dviRenderer_export.cpp:302
- msgid "Export: %1 to PostScript"
-@@ -460,8 +469,7 @@
- 
- #: dviRenderer_prescan.cpp:105
- msgid ""
--"Page %1: The PostScript file <strong>%2</strong> could not be found."
--"<br>"
-+"Page %1: The PostScript file <strong>%2</strong> could not be found.<br>"
- msgstr "頁 %1：PostScript 檔案 <strong>%2</strong> 找不到。<br>"
- 
- #: dviRenderer_prescan.cpp:255
-@@ -474,7 +482,7 @@
- 
- #: fontpool.cpp:46
- msgid "KDVI is currently generating bitmap fonts..."
--msgstr "KDVI 正在產生點陣字......"
-+msgstr "KDVI 正在產生點陣字…..."
- 
- #: fontpool.cpp:47
- msgid "Aborts the font generation. Don't do this."
-@@ -483,9 +491,12 @@
- #: fontpool.cpp:48
- msgid ""
- "KDVI is currently generating bitmap fonts which are needed to display your "
--"document. For this, KDVI uses a number of external programs, such as MetaFont. "
--"You can find the output of these programs later in the document info dialog."
--msgstr "KDVI 正在產生點陣字來做為顯示文件用。KDVI 會使用一些外部程式來達到這個目的。您可以由文件資訊對話框得知這些外部程式名稱。"
-+"document. For this, KDVI uses a number of external programs, such as "
-+"MetaFont. You can find the output of these programs later in the document "
-+"info dialog."
-+msgstr ""
-+"KDVI 正在產生點陣字來做為顯示文件用。KDVI 會使用一些外部程式來達到這個目的。"
-+"您可以由文件資訊對話框得知這些外部程式名稱。"
- 
- #: fontpool.cpp:51
- msgid "KDVI is generating fonts. Please wait."
-@@ -525,10 +536,11 @@
- 
- #: fontpool.cpp:284
- msgid ""
--"<qt>"
--"<p>KDVI was not able to locate all the font files which are necessary to "
-+"<qt><p>KDVI was not able to locate all the font files which are necessary to "
- "display the current DVI file. Your document might be unreadable.</p></qt>"
--msgstr "<qt> <p>KDVI 無法找到完整的字型來顯示這個 DVI 檔。您的文件有可能沒辦法閱讀。</p></qt>"
-+msgstr ""
-+"<qt> <p>KDVI 無法找到完整的字型來顯示這個 DVI 檔。您的文件有可能沒辦法閱讀。"
-+"</p></qt>"
- 
- #: fontpool.cpp:288
- msgid "Not All Font Files Found"
-@@ -536,23 +548,25 @@
- 
- #: fontpool.cpp:299
- msgid "Locating fonts..."
--msgstr "找尋字型......"
-+msgstr "找尋字型…..."
- 
- #: fontpool.cpp:358
- msgid ""
- "<p>KDVI relies on the <b>kpsewhich</b> program to locate font files on your "
- "hard disc and to generate PK fonts, if necessary.</p>"
--msgstr "<p>KDVI 使用 <b>kpsewhich</b> 程式來尋找您硬碟中的字型檔，需要時並產生 PK 字型。</p>"
-+msgstr ""
-+"<p>KDVI 使用 <b>kpsewhich</b> 程式來尋找您硬碟中的字型檔，需要時並產生 PK 字"
-+"型。</p>"
- 
- #: fontpool.cpp:361
- msgid ""
- "<p>The shell process for the kpsewhich program could not be started. "
- "Consequently, some font files could not be found, and your document might by "
--"unreadable. If this error is reproducable please report the issue to the KDVI "
--"developers using the 'Help' menu."
--"<p>"
-+"unreadable. If this error is reproducable please report the issue to the "
-+"KDVI developers using the 'Help' menu.<p>"
- msgstr ""
--"<p>kpsewhich 程式無法啟動。因此，有些字型檔找不到，您的文件可能無法閱讀。如果可以重現此錯誤，請到「說明」選單中向 KDVI 開發團隊回報。</p>"
-+"<p>kpsewhich 程式無法啟動。因此，有些字型檔找不到，您的文件可能無法閱讀。如果"
-+"可以重現此錯誤，請到「說明」選單中向 KDVI 開發團隊回報。</p>"
- 
- #: fontpool.cpp:367 fontpool.cpp:405
- msgid "Problem locating fonts - KDVI"
-@@ -565,19 +579,20 @@
- #: fontpool.cpp:394
- msgid ""
- "<p>There were problems running kpsewhich. As a result, some font files could "
--"not be located, and your document might be unreadable.</p>"
--"<p><b>Possible reason:</b> The kpsewhich program is perhaps not installed on "
--"your system, or it cannot be found in the current search path.</p>"
--"<p><b>What you can do:</b> The kpsewhich program is normally contained in "
--"distributions of the TeX typesetting system. If TeX is not installed on your "
--"system, you could install the TeTeX distribution (www.tetex.org). If you are "
--"sure that TeX is installed, please try to use the kpsewhich program from the "
--"command line to check if it really works.</p>"
--msgstr ""
--"<p>執行 kpsewhich 時發生問題。因此，有些字型檔找不到，您的文件可能無法閱讀。</p> "
--"<p><b>可能的原因有</b>：kpsewhich 程式沒有安裝，或不在您的執行路徑上。</p> "
--"<p><b>建議處理方式</b>：kpsewhich 程式通常會跟著 Tex 系統套件一起散佈。如果您沒有安裝 Tex，您可以安裝 TeTex "
--"套件（www.tetex.org）。如果您確定 Tex 已安裝，請試著從命令列執行 kpsewhich，看看是否有問題。</p>"
-+"not be located, and your document might be unreadable.</p><p><b>Possible "
-+"reason:</b> The kpsewhich program is perhaps not installed on your system, "
-+"or it cannot be found in the current search path.</p><p><b>What you can do:</"
-+"b> The kpsewhich program is normally contained in distributions of the TeX "
-+"typesetting system. If TeX is not installed on your system, you could "
-+"install the TeTeX distribution (www.tetex.org). If you are sure that TeX is "
-+"installed, please try to use the kpsewhich program from the command line to "
-+"check if it really works.</p>"
-+msgstr ""
-+"<p>執行 kpsewhich 時發生問題。因此，有些字型檔找不到，您的文件可能無法閱讀。"
-+"</p> <p><b>可能的原因有</b>：kpsewhich 程式沒有安裝，或不在您的執行路徑上。</"
-+"p> <p><b>建議處理方式</b>：kpsewhich 程式通常會跟著 Tex 系統套件一起散布。如"
-+"果您沒有安裝 Tex，您可以安裝 TeTex 套件（www.tetex.org）。如果您確定 Tex 已安"
-+"裝，請試著從命令列執行 kpsewhich，看看是否有問題。</p>"
- 
- #: fontpool.cpp:590
- msgid "Currently generating %1 at %2 dpi"
-@@ -614,9 +629,11 @@
- #: infodialog.cpp:39
- msgid ""
- "This text field shows detailed information about the currently loaded fonts. "
--"This is useful for experts who want to locate problems in the setup of TeX or "
--"KDVI."
--msgstr "這個文字欄位會顯示所載入字型的詳細資訊。這對想解決 TeX 或 KDVI 問題的老手會很有幫助。"
-+"This is useful for experts who want to locate problems in the setup of TeX "
-+"or KDVI."
-+msgstr ""
-+"這個文字欄位會顯示所載入字型的詳細資訊。這對想解決 TeX 或 KDVI 問題的老手會很"
-+"有幫助。"
- 
- #: infodialog.cpp:43
- msgid "External Programs"
-@@ -633,11 +650,11 @@
- #: infodialog.cpp:48
- msgid ""
- "KDVI uses external programs, such as MetaFont, dvipdfm or dvips. This text "
--"field shows the output of these programs. That is useful for experts who want "
--"to find problems in the setup of TeX or KDVI."
-+"field shows the output of these programs. That is useful for experts who "
-+"want to find problems in the setup of TeX or KDVI."
- msgstr ""
--"KDVI 使用一些外部程式，例如 MetaFont, dvipdfm 或 dvips。這個文字欄位會顯示這些程式的輸出。這對想解決 TeX 或 KDVI "
--"問題的老手會很有幫助。"
-+"KDVI 使用一些外部程式，例如 MetaFont, dvipdfm 或 dvips。這個文字欄位會顯示這"
-+"些程式的輸出。這對想解決 TeX 或 KDVI 問題的老手會很有幫助。"
- 
- #: infodialog.cpp:64
- msgid "There is no DVI file loaded at the moment."
-@@ -665,11 +682,11 @@
- 
- #: kdvi_multipage.cpp:70
- msgid "Document &Info"
--msgstr "文件資訊 (&I)"
-+msgstr "文件資訊(&I)"
- 
- #: kdvi_multipage.cpp:71
- msgid "Embed External PostScript Files..."
--msgstr "嵌入外部 PostScript 檔案......"
-+msgstr "嵌入外部 PostScript 檔案…..."
- 
- #: kdvi_multipage.cpp:72
- msgid "Enable All Warnings && Messages"
-@@ -677,11 +694,11 @@
- 
- #: kdvi_multipage.cpp:73
- msgid "PostScript..."
--msgstr "PostScript..."
-+msgstr "PostScript…"
- 
- #: kdvi_multipage.cpp:74
- msgid "PDF..."
--msgstr "PDF..."
-+msgstr "PDF…"
- 
- #: kdvi_multipage.cpp:101 main.cpp:34
- msgid "KDVI"
-@@ -695,8 +712,8 @@
- 
- #: kdvi_multipage.cpp:105
- msgid ""
--"This program displays Device Independent (DVI) files which are produced by the "
--"TeX typesetting system.\n"
-+"This program displays Device Independent (DVI) files which are produced by "
-+"the TeX typesetting system.\n"
- "KDVI 1.3 is based on original code from KDVI version 0.43 and xdvik."
- msgstr ""
- "這個程式會顯示 DVI 檔，由 Tex 系統套件產生。\n"
-@@ -724,7 +741,7 @@
- 
- #: kdvi_multipage.cpp:117 main.cpp:49
- msgid "Re-organisation of source code."
--msgstr "重新組織程式源碼。"
-+msgstr "重新組織程式原始碼。"
- 
- #: kdvi_multipage.cpp:153
- msgid "Save File As"
-@@ -750,8 +767,8 @@
- #: kdvi_multipage.cpp:251
- msgid ""
- "The list of pages you selected was empty.\n"
--"Maybe you made an error in selecting the pages, e.g. by giving an invalid range "
--"like '7-2'."
-+"Maybe you made an error in selecting the pages, e.g. by giving an invalid "
-+"range like '7-2'."
- msgstr ""
- "您所選的頁數是空的。\n"
- "或許您選頁的操作有誤，例如給了個無效的範圍，如 '7-2'。"
-@@ -765,11 +782,12 @@
- "<qt>This function searches the DVI file for plain text. Unfortunately, this "
- "version of KDVI treats only plain ASCII characters properly. Symbols, "
- "ligatures, mathematical formulae, accented characters, and non-English text, "
--"such as Russian or Korean, will most likely be messed up completely. Continue "
--"anyway?</qt>"
-+"such as Russian or Korean, will most likely be messed up completely. "
-+"Continue anyway?</qt>"
- msgstr ""
--"<qt>此功能搜尋 DVI 檔中的純文字內容。很可惜，本版的 KDVI 只能正確處理純 ASCII "
--"字元。符號、連體字、數理式子、重音符號及非英文語系文字，例如俄文或韓文，將會完全變成一團亂。要繼續嗎？</qt>"
-+"<qt>此功能搜尋 DVI 檔中的純文字內容。很可惜，本版的 KDVI 只能正確處理純 "
-+"ASCII 字元。符號、連體字、數理式子、重音符號及非英文語系文字，例如俄文或韓"
-+"文，將會完全變成一團亂。要繼續嗎？</qt>"
- 
- #: kdvi_multipage.cpp:469 kdvi_multipage_texthandling.cpp:64
- msgid "Function May Not Work as Expected"
-@@ -783,7 +801,8 @@
- "such as Russian or Korean, will most likely be messed up completely.</qt>"
- msgstr ""
- "<qt>此功能會將 DVI 檔轉為純文字檔。很可惜，本版的 KDVI 只能正確處理純 ASCII "
--"字元。符號、連體字、數理式子、重音符號及非英文語系文字，例如俄文或韓文，將會完全變成一團亂。</qt>"
-+"字元。符號、連體字、數理式子、重音符號及非英文語系文字，例如俄文或韓文，將會"
-+"完全變成一團亂。</qt>"
- 
- #: kdvi_multipage_texthandling.cpp:65
- msgid "Continue Anyway"
-@@ -793,7 +812,9 @@
- msgid ""
- "Check if the file is loaded in another KDVI.\n"
- "If it is, bring up the other KDVI. Otherwise, load the file."
--msgstr "請檢查是否此檔已被其他 KDVI 實體載入。如果是的話，請叫出該實體，否則請載入檔案。"
-+msgstr ""
-+"請檢查是否此檔已被其他 KDVI 實體載入。如果是的話，請叫出該實體，否則請載入檔"
-+"案。"
- 
- #: main.cpp:23
- msgid "Navigate to this page"
-@@ -805,8 +826,8 @@
- 
- #: main.cpp:37
- msgid ""
--"This program displays Device Independent (DVI) files which are produced by the "
--"TeX typesetting system.\n"
-+"This program displays Device Independent (DVI) files which are produced by "
-+"the TeX typesetting system.\n"
- "This KDVI version is based on original code from KDVI version 0.43 and xdvik."
- msgstr ""
- "這個程式會顯示 DVI 檔，由 Tex 系統套件產生。\n"
-@@ -818,8 +839,8 @@
- 
- #: main.cpp:86
- msgid ""
--"The URL %1 does not point to a local file. You can only specify local files if "
--"you are using the '--unique' option."
-+"The URL %1 does not point to a local file. You can only specify local files "
-+"if you are using the '--unique' option."
- msgstr "網址 %1 不是本地端檔案。您使用 --unique 選項時只能指定本地端檔案。"
- 
- #: optionDialogFontsWidget.cpp:34
-@@ -833,8 +854,8 @@
- "either install the FreeType library and recompile KDVI yourself, or find a "
- "precompiled software package for your operating system."
- msgstr ""
--"KDVI 需要 FreeType 來存取 type 1 字型。KDVI 編譯時並沒有編入 FreeType。如果您要使用 type 1 字型，您需重編譯 "
--"KDVI，或找尋已編譯好的可執行檔。"
-+"KDVI 需要 FreeType 來存取 type 1 字型。KDVI 編譯時並沒有編入 FreeType。如果您"
-+"要使用 type 1 字型，您需重編譯 KDVI，或找尋已編譯好的可執行檔。"
- 
- #: optionDialogSpecialWidget.cpp:32
- msgid "User-Defined Editor"
-@@ -870,43 +891,45 @@
- 
- #: psgs.cpp:152
- msgid "Generating PostScript graphics..."
--msgstr "產生 PostScript 圖檔......"
-+msgstr "產生 PostScript 圖檔…..."
- 
- #: psgs.cpp:250
- msgid ""
- "<qt>The version of Ghostview that is installed on this computer does not "
--"contain any of the Ghostview device drivers that are known to KDVI. PostScript "
--"support has therefore been turned off in KDVI.</qt>"
-+"contain any of the Ghostview device drivers that are known to KDVI. "
-+"PostScript support has therefore been turned off in KDVI.</qt>"
- msgstr ""
--"<qt>安裝在此電腦上的 Ghostview 的版本不含任何 KDVI 能辨識的 Ghostview 裝置驅動程式。PostScript "
--"支援將被關閉。</qt>"
-+"<qt>安裝在此電腦上的 Ghostview 的版本不含任何 KDVI 能辨識的 Ghostview 裝置驅"
-+"動程式。PostScript 支援將被關閉。</qt>"
- 
- #: psgs.cpp:253
- msgid ""
--"<qt>"
--"<p>The Ghostview program, which KDVI uses internally to display the PostScript "
--"graphics that is included in this DVI file, is generally able to write its "
--"output in a variety of formats. The sub-programs that Ghostview uses for these "
--"tasks are called 'device drivers'; there is one device driver for each format "
--"that Ghostview is able to write. Different versions of Ghostview often have "
--"different sets of device drivers available. It seems that the version of "
--"Ghostview that is installed on this computer does not contain <strong>"
--"any</strong> of the device drivers that are known to KDVI.</p>"
--"<p>It seems unlikely that a regular installation of Ghostview would not contain "
--"these drivers. This error may therefore point to a serious misconfiguration of "
--"the Ghostview installation on your computer.</p>"
--"<p>If you want to fix the problems with Ghostview, you can use the command "
--"<strong>gs --help</strong> to display the list of device drivers contained in "
--"Ghostview. Among others, KDVI can use the 'png256', 'jpeg' and 'pnm' drivers. "
--"Note that KDVI needs to be restarted to re-enable PostScript support.</p></qt>"
--msgstr ""
--"<qt> "
--"<p>KDVI 內部用以顯示此 DVI 檔中的 PostScript 圖形的 GhostView 程式，可以將它的輸出寫程不同的格式。Ghostview "
--"使用的子程式稱為「裝置驅動程式」，每一種輸出格式都有自己的裝置驅動程式，不同版本的 Ghostview 也會提供不同的裝置驅動程式。看起來安裝在此電腦上的 "
--"Ghostview 版本並沒有支援 <strong>任何</strong> KDVI 能辨識的裝置驅動程式。</p> "
--"<p>看起來您安裝的 Ghostview 可能不是很正常。也有可能是 Ghostview 在安裝時設定不正確。</p> "
--"<p>如果您要修正此問題，您可以在命令列下使用 <strong>gs --help</strong> 顯示裝置驅動程式清單。此外 KDVI 還可以使用 "
--"png256、jpeg 與 pnm 驅動程式。注意，KDVI 需要重新啟動才能重新開啟 PostScript 支援。</p></qt>"
-+"<qt><p>The Ghostview program, which KDVI uses internally to display the "
-+"PostScript graphics that is included in this DVI file, is generally able to "
-+"write its output in a variety of formats. The sub-programs that Ghostview "
-+"uses for these tasks are called 'device drivers'; there is one device driver "
-+"for each format that Ghostview is able to write. Different versions of "
-+"Ghostview often have different sets of device drivers available. It seems "
-+"that the version of Ghostview that is installed on this computer does not "
-+"contain <strong>any</strong> of the device drivers that are known to KDVI.</"
-+"p><p>It seems unlikely that a regular installation of Ghostview would not "
-+"contain these drivers. This error may therefore point to a serious "
-+"misconfiguration of the Ghostview installation on your computer.</p><p>If "
-+"you want to fix the problems with Ghostview, you can use the command "
-+"<strong>gs --help</strong> to display the list of device drivers contained "
-+"in Ghostview. Among others, KDVI can use the 'png256', 'jpeg' and 'pnm' "
-+"drivers. Note that KDVI needs to be restarted to re-enable PostScript "
-+"support.</p></qt>"
-+msgstr ""
-+"<qt> <p>KDVI 內部用以顯示此 DVI 檔中的 PostScript 圖形的 GhostView 程式，可以"
-+"將它的輸出寫程不同的格式。Ghostview 使用的子程式稱為「裝置驅動程式」，每一種"
-+"輸出格式都有自己的裝置驅動程式，不同版本的 Ghostview 也會提供不同的裝置驅動程"
-+"式。看起來安裝在此電腦上的 Ghostview 版本並沒有支援 <strong>任何</strong> "
-+"KDVI 能辨識的裝置驅動程式。</p> <p>看起來您安裝的 Ghostview 可能不是很正常。"
-+"也有可能是 Ghostview 在安裝時設定不正確。</p> <p>如果您要修正此問題，您可以在"
-+"命令列下使用 <strong>gs --help</strong> 顯示裝置驅動程式清單。此外 KDVI 還可"
-+"以使用 png256、jpeg 與 pnm 驅動程式。注意，KDVI 需要重新啟動才能重新開啟 "
-+"PostScript 支援。</p></qt>"
- 
- #. i18n: file kdvi_part.rc line 6
- #: rc.cpp:6
-@@ -924,8 +947,8 @@
- #: rc.cpp:21
- #, no-c-format
- msgid ""
--"You should enable this, if the use of font hinting improves readability on your "
--"machine."
-+"You should enable this, if the use of font hinting improves readability on "
-+"your machine."
- msgstr "如果字型提示可增進可讀性，那你可以試著開啟此選項。"
- 
- #. i18n: file optionDialogFontsWidget_base.ui line 34
-@@ -933,12 +956,12 @@
- #, no-c-format
- msgid ""
- "Many modern fonts contain \"font hinting\" information which can be used to "
--"improve the appearance of a font on low-resolution displays, such as a computer "
--"monitor, or a notebook screen. However, many people find the \"improved\" fonts "
--"quite ugly and prefer to have this option disabled."
-+"improve the appearance of a font on low-resolution displays, such as a "
-+"computer monitor, or a notebook screen. However, many people find the "
-+"\"improved\" fonts quite ugly and prefer to have this option disabled."
- msgstr ""
--"目前的許多字型都含有 \"字型提示\" （font hinting）資訊，這在低解析度的螢幕可增進可讀性。但有不少朋友發現這種 \"改進\" "
--"很醜，這時可能需要把這個選項關掉。"
-+"目前的許多字型都含有 \"字型提示\" （font hinting）資訊，這在低解析度的螢幕可"
-+"增進可讀性。但有不少朋友發現這種 \"改進\" 很醜，這時可能需要把這個選項關掉。"
- 
- #. i18n: file optionDialogSpecialWidget_base.ui line 27
- #: rc.cpp:27
-@@ -957,12 +980,13 @@
- #, no-c-format
- msgid ""
- "Some DVI files contain PostScript graphics. If enabled, KDVI will use the "
--"Ghostview PostScript interpreter to display these. You probably want to enable "
--"this option, unless you have a DVI-file whose PostScript part is broken, or too "
--"large for your machine."
--msgstr ""
--"有些 DVI 檔含有 PostScript 圖形。如果打開這個功能，KDVI 會使用 ghostview 的 PostScript "
--"解譯器來顯示這些圖形。您可能得打開這個功能，除非您的 DVI 檔的 PostScript 圖形毀損，或圖形太大您的系統無法處理。"
-+"Ghostview PostScript interpreter to display these. You probably want to "
-+"enable this option, unless you have a DVI-file whose PostScript part is "
-+"broken, or too large for your machine."
-+msgstr ""
-+"有些 DVI 檔含有 PostScript 圖形。如果打開這個功能，KDVI 會使用 ghostview 的 "
-+"PostScript 解譯器來顯示這些圖形。您可能得打開這個功能，除非您的 DVI 檔的 "
-+"PostScript 圖形毀損，或圖形太大您的系統無法處理。"
- 
- #. i18n: file optionDialogSpecialWidget_base.ui line 41
- #: rc.cpp:36
-@@ -980,15 +1004,16 @@
- #: rc.cpp:42
- #, no-c-format
- msgid ""
--"<p>Some DVI files contain 'inverse search' information. If such a DVI file is "
--"loaded, you can right-click into KDVI and an editor will open, load the TeX "
--"file and jump to the correct position. You can select your favorite editor "
--"here. If in doubt, 'nedit' is usually a good choice.</p>\n"
-+"<p>Some DVI files contain 'inverse search' information. If such a DVI file "
-+"is loaded, you can right-click into KDVI and an editor will open, load the "
-+"TeX file and jump to the correct position. You can select your favorite "
-+"editor here. If in doubt, 'nedit' is usually a good choice.</p>\n"
- "<p>Check the KDVI manual to see how to prepare DVI files which support the "
- "inverse search.</p>"
- msgstr ""
--"<p>有些 DVI 檔含有反向搜尋的資訊。如果載入此種 DVI 檔，您可以按滑鼠右鍵來打開編輯器，載入 TeX "
--"文稿，並跳至相對應的位置。在此您可以選擇自己喜愛的編輯器。如果有疑問，'nedit' 常是好的選擇。</p>\n"
-+"<p>有些 DVI 檔含有反向搜尋的資訊。如果載入此種 DVI 檔，您可以按滑鼠右鍵來打開"
-+"編輯器，載入 TeX 文稿，並跳至相對應的位置。在此您可以選擇自己喜愛的編輯器。如"
-+"果有疑問，'nedit' 常是好的選擇。</p>\n"
- "<p>查閱 KDVI 的使用手冊，如何讓有反向搜尋的 DVI 檔作用。</p>"
- 
- #. i18n: file optionDialogSpecialWidget_base.ui line 80
-@@ -1019,13 +1044,15 @@
- "Otherwise, bring the window with the file to the front'. If you are using an "
- "editor like this, clicking into the DVI file will always open a new editor, "
- "even if the TeX file is already open. Likewise, many editors have no command "
--"line argument that would allow KDVI to specify the exact line which you wish to "
--"edit.</p>\n"
--"<p>If you feel that KDVI's support for a certain editor is inadequate, please "
--"write to kebekus@kde.org.</p>"
--msgstr ""
--"<p>並非所有編輯器都適合做反向搜尋。例如，許多編輯器並無「若檔案尚未載入則載入檔案，否則將檔案視窗移至前景」的功能。如果您的編輯器沒有此功能，在 DVI "
--"檔按一下滑鼠，即使 TeX 已經打開，還是會開啟一個新的編輯器。此外，有許多編輯器並無命令列參數供 KDVI 去指定特定行。</p>\n"
-+"line argument that would allow KDVI to specify the exact line which you wish "
-+"to edit.</p>\n"
-+"<p>If you feel that KDVI's support for a certain editor is inadequate, "
-+"please write to kebekus@kde.org.</p>"
-+msgstr ""
-+"<p>並非所有編輯器都適合做反向搜尋。例如，許多編輯器並無「若檔案尚未載入則載入"
-+"檔案，否則將檔案視窗移至前景」的功能。如果您的編輯器沒有此功能，在 DVI 檔按一"
-+"下滑鼠，即使 TeX 已經打開，還是會開啟一個新的編輯器。此外，有許多編輯器並無命"
-+"令列參數供 KDVI 去指定特定行。</p>\n"
- "<p>如果您覺得 KDVI 對某些編輯器支援不完整，請寫信給 kebekus@kde.org。</p>"
- 
- #. i18n: file optionDialogSpecialWidget_base.ui line 135
-@@ -1039,9 +1066,11 @@
- #, no-c-format
- msgid ""
- "If you are using inverse search, KDVI uses this command line to start the "
--"editor. The field '%f' is replaced with the filename, and '%l' is replaced with "
--"the line number."
--msgstr "如果您使用反向搜尋，KDVI 使用這個命令列去啟動編輯器。'%f' 欄位會被檔名取代，而且 '%l' 會被行數取代。"
-+"editor. The field '%f' is replaced with the filename, and '%l' is replaced "
-+"with the line number."
-+msgstr ""
-+"如果您使用反向搜尋，KDVI 使用這個命令列去啟動編輯器。'%f' 欄位會被檔名取代，"
-+"而且 '%l' 會被列數取代。"
- 
- #. i18n: file optionDialogSpecialWidget_base.ui line 154
- #: rc.cpp:65
-@@ -1074,7 +1103,9 @@
- msgid ""
- "Allows KDVI to use MetaFont to produce bitmap fonts. Unless you have a very "
- "specific reason, you probably want to enable this option."
--msgstr "允許 KDVI 使用 MetaFont 來產生點陣字。除非您有很特殊的理由，否則您最好是打開。"
-+msgstr ""
-+"允許 KDVI 使用 MetaFont 來產生點陣字。除非您有很特殊的理由，否則您最好是打"
-+"開。"
- 
- #. i18n: file kdvi.kcfg line 15
- #: rc.cpp:80
-@@ -1086,21 +1117,23 @@
- #: rc.cpp:86
- #, no-c-format
- msgid ""
--"Use font hinting. You should enable this, if the use of font hinting improves "
--"readability on your machine."
--msgstr "使用字型提示（font hinting）。如果使用字型提示可增進可讀性，那你可以試試看。"
-+"Use font hinting. You should enable this, if the use of font hinting "
-+"improves readability on your machine."
-+msgstr ""
-+"使用字型提示（font hinting）。如果使用字型提示可增進可讀性，那你可以試試看。"
- 
- #. i18n: file kdvi.kcfg line 21
- #: rc.cpp:89
- #, no-c-format
- msgid ""
- "Many modern fonts contain &quot;font hinting&quot; information which can be "
--"used to improve the appearance of a font on low-resolution displays, such as a "
--"computer monitor, or a notebook screen. However, many people find the "
--"&quot;improved&quot; fonts quite ugly and prefer to have this option disabled."
-+"used to improve the appearance of a font on low-resolution displays, such as "
-+"a computer monitor, or a notebook screen. However, many people find the "
-+"&quot;improved&quot; fonts quite ugly and prefer to have this option "
-+"disabled."
- msgstr ""
--"目前的許多字型都含有「字型提示」（font "
--"hinting）資訊，這在低解析度的螢幕可增進可讀性。但有不少朋友發現這種「改進」很醜，這時可能需要把這個選項關掉。"
-+"目前的許多字型都含有「字型提示」（font hinting）資訊，這在低解析度的螢幕可增"
-+"進可讀性。但有不少朋友發現這種「改進」很醜，這時可能需要把這個選項關掉。"
- 
- #: special.cpp:39
- msgid "That makes 25 errors. Further error messages will not be printed."
-@@ -1108,8 +1141,8 @@
- 
- #: special.cpp:224
- msgid ""
--"Error in DVIfile '%1', page %2. Color pop command issued when the color stack "
--"is empty."
-+"Error in DVIfile '%1', page %2. Color pop command issued when the color "
-+"stack is empty."
- msgstr "DVI 檔 '%1'，頁 %2 錯誤。顏色堆疊錯誤。"
- 
- #: special.cpp:309
-@@ -1140,10 +1173,8 @@
- msgstr "特殊命令 '%1' 尚未實作。"
- 
- #: tips.cpp:3
--msgid ""
--"<p>...that KDVI can also load compressed DVI-files? \n"
--msgstr ""
--"<p>......KDVI 可以載入壓縮過的 DVI 檔嗎？\n"
-+msgid "<p>...that KDVI can also load compressed DVI-files? \n"
-+msgstr "<p>…...KDVI 可以載入壓縮過的 DVI 檔嗎？\n"
- 
- #: tips.cpp:8
- msgid ""
-@@ -1155,7 +1186,8 @@
- 
- #: tips.cpp:14
- msgid ""
--"<p>...that KDVI now supports inverse search? You can click into your DVI file \n"
-+"<p>...that KDVI now supports inverse search? You can click into your DVI "
-+"file \n"
- "with the middle mouse button and your editor opens, loads the TeX file, and\n"
- "jumps to the proper line! <a href=\"help:/kdvi/inverse-search.html\">The \n"
- "manual explains how to set up your editor for this.</a> \n"
-@@ -1167,9 +1199,11 @@
- 
- #: tips.cpp:22
- msgid ""
--"<p>...that KDVI supports forward search? If you use Emacs or XEmacs, you can \n"
-+"<p>...that KDVI supports forward search? If you use Emacs or XEmacs, you "
-+"can \n"
- "jump directly from the TeX file to the associated place in the DVI file. \n"
--"<a href=\"help:/kdvi/forward-search.html\">The manual explains how to set up \n"
-+"<a href=\"help:/kdvi/forward-search.html\">The manual explains how to set "
-+"up \n"
- "your editor for this.</a> \n"
- msgstr ""
- "<p>......KDVI 支援往前搜尋？如果您使用 Emacs 或 XEmacs，您可以\n"
-@@ -1178,17 +1212,14 @@
- "設定編輯器達成此種功能。</a> \n"
- 
- #: tips.cpp:30
--msgid ""
--"<p>...that KDVI now offers full text search? \n"
--msgstr ""
--"<p>......KDVI 可以全文搜尋？\n"
-+msgid "<p>...that KDVI now offers full text search? \n"
-+msgstr "<p>…...KDVI 可以全文搜尋？\n"
- 
- #: tips.cpp:35
- msgid ""
--"<p>...that KDVI can save your DVI file as PostScript, PDF, and even plain text? "
--"\n"
--msgstr ""
--"<p>......KDVI 可以把 DVI 檔存成 PostScript，PDF 甚至純文字檔？\n"
-+"<p>...that KDVI can save your DVI file as PostScript, PDF, and even plain "
-+"text? \n"
-+msgstr "<p>…...KDVI 可以把 DVI 檔存成 PostScript，PDF 甚至純文字檔？\n"
- 
- #: util.cpp:73
- msgid "Fatal Error! "
-diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdegraphics/kfax.po kde-i18n-zh_TW-3.5.10/messages/kdegraphics/kfax.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdegraphics/kfax.po	2007-01-15 10:56:26.000000000 +0100
-+++ kde-i18n-zh_TW-3.5.10/messages/kdegraphics/kfax.po	2011-11-11 15:45:17.000000000 +0100
-@@ -5,8 +5,7 @@
- "Project-Id-Version: kfax\n"
- "POT-Creation-Date: 2006-11-13 02:37+0100\n"
- "PO-Revision-Date: 2006-06-08 16:43+0800\n"
--"Last-Translator: Frank Weng (a.k.a. Franklin) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Traditional Chinese <zh_l10n@linux.org.tw>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
-@@ -63,7 +62,7 @@
- 
- #: kfax.cpp:246
- msgid "A&dd..."
--msgstr "新增傳真(&A)..."
-+msgstr "新增傳真(&A)…"
- 
- #: kfax.cpp:258
- msgid "&Rotate Page"
-@@ -103,7 +102,7 @@
- 
- #: kfax.cpp:827
- msgid "Saving..."
--msgstr "儲存中..."
-+msgstr "儲存中…"
- 
- #: kfax.cpp:835
- msgid ""
-@@ -119,7 +118,7 @@
- 
- #: kfax.cpp:856
- msgid "Downloading..."
--msgstr "載入中..."
-+msgstr "載入中…"
- 
- #: kfax.cpp:1444
- msgid "Page: %1 of %2"
-@@ -156,7 +155,7 @@
- 
- #: kfax.cpp:1630
- msgid "Height (number of fax lines)"
--msgstr "高度 (傳真行數)"
-+msgstr "高度 (傳真列數)"
- 
- #: kfax.cpp:1632
- msgid "Width (dots per fax line)"
-@@ -203,10 +202,8 @@
- msgstr "列印重寫，還有許多程式碼修正"
- 
- #: faxinput.cpp:61
--msgid ""
--"Out of memory\n"
--msgstr ""
--"記憶體不足\n"
-+msgid "Out of memory\n"
-+msgstr "記憶體不足\n"
- 
- #: faxinput.cpp:113
- msgid ""
-@@ -238,16 +235,13 @@
- 
- #: faxinput.cpp:294
- msgid ""
--"Due to patent reasons KFax can not handle LZW (Lempel-Ziv & Welch) compressed "
--"Fax files.\n"
--msgstr ""
--"因為專利的理由，KFax 無法處理 LZW（Lempel-Ziv & Welch）壓縮傳真檔。\n"
-+"Due to patent reasons KFax can not handle LZW (Lempel-Ziv & Welch) "
-+"compressed Fax files.\n"
-+msgstr "因為專利的理由，KFax 無法處理 LZW（Lempel-Ziv & Welch）壓縮傳真檔。\n"
- 
- #: faxinput.cpp:299
--msgid ""
--"This version can only handle Fax files\n"
--msgstr ""
--"這個版本只能處理傳真檔。\n"
-+msgid "This version can only handle Fax files\n"
-+msgstr "這個版本只能處理傳真檔。\n"
- 
- #: faxinput.cpp:333
- msgid "Bad Fax File"
-@@ -266,57 +260,45 @@
- "Only the first page of the PC Research multipage file\n"
- "%1\n"
- "will be shown\n"
--msgstr ""
--"只有 PC Research multipage 檔 %1 的第一頁會被顯示\n"
-+msgstr "只有 PC Research multipage 檔 %1 的第一頁會被顯示\n"
- 
- #: faxinput.cpp:465
- msgid ""
- "No fax found in file:\n"
- "%1\n"
--msgstr ""
--"檔案 %1 中找不到傳真\n"
-+msgstr "檔案 %1 中找不到傳真\n"
- 
- #: kfax_printsettings.cpp:30
- msgid ""
--"<qt>"
--"<p><strong>'Ignore Paper Margins'</strong></p>"
--"<p>If this checkbox is enabled, the paper margins will be ignored and the fax "
--"will be printed on the full paper size.</p>"
--"<p>If this checkbox is disabled, KFax will respect the standard paper margins "
--"and print the fax inside this printable area.</p> </qt>"
--msgstr ""
--"<qt> "
--"<p><strong>忽略頁面留白</strong></p> "
--"<p>如果勾選此選項，頁面留白會被忽略，傳真會印到整個頁面。</p> "
--"<p>反之，KFax 會依標準的頁面留白設定，並在可列印的區域裡列印。</p></qt>"
-+"<qt><p><strong>'Ignore Paper Margins'</strong></p><p>If this checkbox is "
-+"enabled, the paper margins will be ignored and the fax will be printed on "
-+"the full paper size.</p><p>If this checkbox is disabled, KFax will respect "
-+"the standard paper margins and print the fax inside this printable area.</p> "
-+"</qt>"
-+msgstr ""
-+"<qt> <p><strong>忽略頁面留白</strong></p> <p>如果勾選此選項，頁面留白會被忽"
-+"略，傳真會印到整個頁面。</p> <p>反之，KFax 會依標準的頁面留白設定，並在可列印"
-+"的區域裡列印。</p></qt>"
- 
- #: kfax_printsettings.cpp:41
- msgid ""
--"<qt>"
--"<p><strong>'Horizontal centered'</strong></p>"
--"<p>If this checkbox is enabled, the fax will be centered horizontally on the "
--"page.</p>"
--"<p>If this checkbox is disabled, the fax will be printed at the left side of "
--"the page.</p> </qt>"
-+"<qt><p><strong>'Horizontal centered'</strong></p><p>If this checkbox is "
-+"enabled, the fax will be centered horizontally on the page.</p><p>If this "
-+"checkbox is disabled, the fax will be printed at the left side of the page.</"
-+"p> </qt>"
- msgstr ""
--"<qt> "
--"<p><strong>水平置中</strong></p> "
--"<p>如果勾選此選項，傳真內容會水平置中。</p> "
--"<p>反之，則會列印在左側。</p></qt>"
-+"<qt> <p><strong>水平置中</strong></p> <p>如果勾選此選項，傳真內容會水平置中。"
-+"</p> <p>反之，則會列印在左側。</p></qt>"
- 
- #: kfax_printsettings.cpp:52
- msgid ""
--"<qt>"
--"<p><strong>'Vertical centered'</strong></p>"
--"<p>If this checkbox is enabled, the fax will be centered vertically on the "
--"page.</p>"
--"<p>If this checkbox is disabled, the fax will be printed at the top of the "
--"page.</p> </qt>"
-+"<qt><p><strong>'Vertical centered'</strong></p><p>If this checkbox is "
-+"enabled, the fax will be centered vertically on the page.</p><p>If this "
-+"checkbox is disabled, the fax will be printed at the top of the page.</p> </"
-+"qt>"
- msgstr ""
--"<qt> "
--"<p><strong>垂直置中</strong></p> "
--"<p>如果勾選此選項，則傳真會垂直置中。</p> "
--"<p>反之，則傳真會印在頁面的頂端。</p></qt>"
-+"<qt> <p><strong>垂直置中</strong></p> <p>如果勾選此選項，則傳真會垂直置中。</"
-+"p> <p>反之，則傳真會印在頁面的頂端。</p></qt>"
- 
- #: kfax_printsettings.cpp:64
- msgid "&Layout"
-diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdegraphics/kfaxview.po kde-i18n-zh_TW-3.5.10/messages/kdegraphics/kfaxview.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdegraphics/kfaxview.po	2006-07-22 10:04:05.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdegraphics/kfaxview.po	2011-11-11 15:45:17.000000000 +0100
-@@ -6,8 +6,7 @@
- "Project-Id-Version: kfaxview\n"
- "POT-Creation-Date: 2005-10-15 02:46+0200\n"
- "PO-Revision-Date: 2006-06-09 09:16+0800\n"
--"Last-Translator: Frank Weng (a.k.a. Franklin) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Traditional Chinese <zh_l10n@linux.org.tw>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
-@@ -57,8 +56,8 @@
- 
- #: faxrenderer.cpp:160 faxrenderer.cpp:164
- msgid ""
--"<qt><strong>File error.</strong> The specified file '%1' could not be "
--"loaded.</qt>"
-+"<qt><strong>File error.</strong> The specified file '%1' could not be loaded."
-+"</qt>"
- msgstr "<qt><strong>檔案錯誤</strong>。指定的檔案 %1 無法載入。</qt>"
- 
- #: main.cpp:20
-@@ -108,6 +107,6 @@
- 
- #: main.cpp:106
- msgid ""
--"The URL %1 does not point to a local file. You can only specify local files if "
--"you are using the '--unique' option."
-+"The URL %1 does not point to a local file. You can only specify local files "
-+"if you are using the '--unique' option."
- msgstr "網址 %1 不是本地端檔案。您使用 --unique 選項時只能指定本地端檔案。"
-diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdegraphics/kfile_bmp.po kde-i18n-zh_TW-3.5.10/messages/kdegraphics/kfile_bmp.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdegraphics/kfile_bmp.po	2005-09-10 11:24:09.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdegraphics/kfile_bmp.po	2011-11-11 15:45:17.000000000 +0100
-@@ -7,7 +7,7 @@
- "Project-Id-Version: kfilt_bmp\n"
- "POT-Creation-Date: 2004-10-12 01:17+0200\n"
- "PO-Revision-Date: 2002-10-16 22:48+0800\n"
--"Last-Translator: Keanu <keanu@ms50.url.com.tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\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/kdegraphics/kfile_dds.po kde-i18n-zh_TW-3.5.10/messages/kdegraphics/kfile_dds.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdegraphics/kfile_dds.po	2006-07-22 10:04:05.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdegraphics/kfile_dds.po	2011-11-11 15:45:17.000000000 +0100
-@@ -6,8 +6,7 @@
- "Project-Id-Version: kfile_dds\n"
- "POT-Creation-Date: 2004-11-01 01:46+0100\n"
- "PO-Revision-Date: 2006-06-09 09:21+0800\n"
--"Last-Translator: Frank Weng (a.k.a. Franklin) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Traditional Chinese <zh_l10n@linux.org.tw>\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/kdegraphics/kfile_dvi.po kde-i18n-zh_TW-3.5.10/messages/kdegraphics/kfile_dvi.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdegraphics/kfile_dvi.po	2006-07-22 10:04:05.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdegraphics/kfile_dvi.po	2011-11-11 15:45:17.000000000 +0100
-@@ -6,8 +6,7 @@
- "Project-Id-Version: kfile_dvi\n"
- "POT-Creation-Date: 2004-10-12 01:17+0200\n"
- "PO-Revision-Date: 2006-06-09 09:48+0800\n"
--"Last-Translator: Frank Weng (a.k.a. Franklin) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Traditional Chinese <zh_l10n@linux.org.tw>\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/kdegraphics/kfile_exr.po kde-i18n-zh_TW-3.5.10/messages/kdegraphics/kfile_exr.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdegraphics/kfile_exr.po	2007-10-08 12:00:11.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdegraphics/kfile_exr.po	2011-11-11 15:45:17.000000000 +0100
-@@ -6,8 +6,7 @@
- "Project-Id-Version: kfile_exr\n"
- "POT-Creation-Date: 2007-08-23 01:13+0200\n"
- "PO-Revision-Date: 2006-06-09 10:30+0800\n"
--"Last-Translator: Frank Weng (a.k.a. Franklin) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Traditional Chinese <zh_l10n@linux.org.tw>\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/kdegraphics/kfile_gif.po kde-i18n-zh_TW-3.5.10/messages/kdegraphics/kfile_gif.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdegraphics/kfile_gif.po	2006-07-22 10:04:05.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdegraphics/kfile_gif.po	2011-11-11 15:45:17.000000000 +0100
-@@ -9,8 +9,7 @@
- "Project-Id-Version: kfile_gif\n"
- "POT-Creation-Date: 2005-03-14 01:33+0100\n"
- "PO-Revision-Date: 2006-06-09 10:31+0800\n"
--"Last-Translator: Frank Weng (a.k.a. Franklin) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Traditional Chinese <zh_l10n@linux.org.tw>\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/kdegraphics/kfile_ico.po kde-i18n-zh_TW-3.5.10/messages/kdegraphics/kfile_ico.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdegraphics/kfile_ico.po	2005-09-10 11:24:09.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdegraphics/kfile_ico.po	2011-11-11 15:45:17.000000000 +0100
-@@ -7,7 +7,7 @@
- "Project-Id-Version: kfile_ico\n"
- "POT-Creation-Date: 2004-10-12 01:17+0200\n"
- "PO-Revision-Date: 2002-10-16 22:46+0800\n"
--"Last-Translator: Keanu <keanu@ms50.url.com.tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\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/kdegraphics/kfile_jpeg.po kde-i18n-zh_TW-3.5.10/messages/kdegraphics/kfile_jpeg.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdegraphics/kfile_jpeg.po	2006-07-22 10:04:05.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdegraphics/kfile_jpeg.po	2011-11-11 15:45:17.000000000 +0100
-@@ -7,8 +7,7 @@
- "Project-Id-Version: kfile_jpeg\n"
- "POT-Creation-Date: 2004-10-12 01:17+0200\n"
- "PO-Revision-Date: 2006-06-09 10:40+0800\n"
--"Last-Translator: Frank Weng (a.k.a. Franklin) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Traditional Chinese <zh_l10n@linux.org.tw>\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/kdegraphics/kfile_pcx.po kde-i18n-zh_TW-3.5.10/messages/kdegraphics/kfile_pcx.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdegraphics/kfile_pcx.po	2006-07-22 10:04:05.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdegraphics/kfile_pcx.po	2011-11-11 15:45:17.000000000 +0100
-@@ -6,8 +6,7 @@
- "Project-Id-Version: kfile_pcx\n"
- "POT-Creation-Date: 2004-10-12 01:17+0200\n"
- "PO-Revision-Date: 2006-06-09 10:41+0800\n"
--"Last-Translator: Frank Weng (a.k.a. Franklin) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Traditional Chinese <zh_l10n@linux.org.tw>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
-@@ -41,3 +40,7 @@
- #: kfile_pcx.cpp:111
- msgid "None"
- msgstr "無"
-+
-+#, fuzzy
-+#~ msgid " dpi"
-+#~ msgstr " dpi"
-diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdegraphics/kfile_pdf.po kde-i18n-zh_TW-3.5.10/messages/kdegraphics/kfile_pdf.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdegraphics/kfile_pdf.po	2006-07-22 10:04:05.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdegraphics/kfile_pdf.po	2011-11-11 15:45:17.000000000 +0100
-@@ -10,8 +10,7 @@
- "Project-Id-Version: kfile_pdf\n"
- "POT-Creation-Date: 2005-04-20 15:05+0200\n"
- "PO-Revision-Date: 2006-06-09 10:42+0800\n"
--"Last-Translator: Frank Weng (a.k.a. Franklin) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Traditional Chinese <zh_l10n@linux.org.tw>\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/kdegraphics/kfile_png.po kde-i18n-zh_TW-3.5.10/messages/kdegraphics/kfile_png.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdegraphics/kfile_png.po	2006-07-22 10:04:05.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdegraphics/kfile_png.po	2011-11-11 15:45:17.000000000 +0100
-@@ -10,8 +10,7 @@
- "Project-Id-Version: kfile_png\n"
- "POT-Creation-Date: 2004-12-16 01:20+0100\n"
- "PO-Revision-Date: 2006-06-09 10:44+0800\n"
--"Last-Translator: Frank Weng (a.k.a. Franklin) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Traditional Chinese <zh_l10n@linux.org.tw>\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/kdegraphics/kfile_pnm.po kde-i18n-zh_TW-3.5.10/messages/kdegraphics/kfile_pnm.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdegraphics/kfile_pnm.po	2006-07-22 10:04:05.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdegraphics/kfile_pnm.po	2011-11-11 15:45:17.000000000 +0100
-@@ -6,8 +6,7 @@
- "Project-Id-Version: kfile_pnm\n"
- "POT-Creation-Date: 2004-10-12 01:17+0200\n"
- "PO-Revision-Date: 2006-06-09 10:45+0800\n"
--"Last-Translator: Frank Weng (a.k.a. Franklin) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Traditional Chinese <zh_l10n@linux.org.tw>\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/kdegraphics/kfile_ps.po kde-i18n-zh_TW-3.5.10/messages/kdegraphics/kfile_ps.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdegraphics/kfile_ps.po	2006-07-22 10:04:05.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdegraphics/kfile_ps.po	2011-11-11 15:45:17.000000000 +0100
-@@ -10,8 +10,7 @@
- "Project-Id-Version: kfile_ps\n"
- "POT-Creation-Date: 2005-03-29 01:16+0200\n"
- "PO-Revision-Date: 2006-06-09 10:45+0800\n"
--"Last-Translator: Frank Weng (a.k.a. Franklin) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Traditional Chinese <zh_l10n@linux.org.tw>\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/kdegraphics/kfile_rgb.po kde-i18n-zh_TW-3.5.10/messages/kdegraphics/kfile_rgb.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdegraphics/kfile_rgb.po	2006-07-22 10:04:05.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdegraphics/kfile_rgb.po	2011-11-11 15:45:17.000000000 +0100
-@@ -6,8 +6,7 @@
- "Project-Id-Version: kfile_rgb\n"
- "POT-Creation-Date: 2004-10-12 01:17+0200\n"
- "PO-Revision-Date: 2006-06-09 10:48+0800\n"
--"Last-Translator: Frank Weng (a.k.a. Franklin) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Traditional Chinese <zh_l10n@linux.org.tw>\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/kdegraphics/kfile_tga.po kde-i18n-zh_TW-3.5.10/messages/kdegraphics/kfile_tga.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdegraphics/kfile_tga.po	2006-07-22 10:04:05.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdegraphics/kfile_tga.po	2011-11-11 15:45:17.000000000 +0100
-@@ -7,8 +7,7 @@
- "Project-Id-Version: kfile_tga\n"
- "POT-Creation-Date: 2004-10-12 01:17+0200\n"
- "PO-Revision-Date: 2006-06-09 10:50+0800\n"
--"Last-Translator: Frank Weng (a.k.a. Franklin) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Traditional Chinese <zh_l10n@linux.org.tw>\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/kdegraphics/kfile_tiff.po kde-i18n-zh_TW-3.5.10/messages/kdegraphics/kfile_tiff.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdegraphics/kfile_tiff.po	2006-07-22 10:04:05.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdegraphics/kfile_tiff.po	2011-11-11 15:45:17.000000000 +0100
-@@ -8,8 +8,7 @@
- "Project-Id-Version: kfile_tiff\n"
- "POT-Creation-Date: 2004-10-12 01:17+0200\n"
- "PO-Revision-Date: 2006-06-09 10:51+0800\n"
--"Last-Translator: Frank Weng (a.k.a. Franklin) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Traditional Chinese <zh_l10n@linux.org.tw>\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/kdegraphics/kfile_xbm.po kde-i18n-zh_TW-3.5.10/messages/kdegraphics/kfile_xbm.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdegraphics/kfile_xbm.po	2005-09-10 11:24:09.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdegraphics/kfile_xbm.po	2011-11-11 15:45:17.000000000 +0100
-@@ -7,7 +7,7 @@
- "Project-Id-Version: kfile_xbm\n"
- "POT-Creation-Date: 2004-10-12 01:17+0200\n"
- "PO-Revision-Date: 2002-10-16 22:45+0800\n"
--"Last-Translator: Keanu <keanu@ms50.url.com.tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\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/kdegraphics/kfile_xpm.po kde-i18n-zh_TW-3.5.10/messages/kdegraphics/kfile_xpm.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdegraphics/kfile_xpm.po	2006-07-22 10:04:05.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdegraphics/kfile_xpm.po	2011-11-11 15:45:17.000000000 +0100
-@@ -6,8 +6,7 @@
- "Project-Id-Version: kfile_xpm\n"
- "POT-Creation-Date: 2004-11-15 01:37+0100\n"
- "PO-Revision-Date: 2006-06-09 10:52+0800\n"
--"Last-Translator: Frank Weng (a.k.a. Franklin) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Traditional Chinese <zh_l10n@linux.org.tw>\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/kdegraphics/kgamma.po kde-i18n-zh_TW-3.5.10/messages/kdegraphics/kgamma.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdegraphics/kgamma.po	2006-10-01 18:34:11.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdegraphics/kgamma.po	2011-11-11 15:45:17.000000000 +0100
-@@ -6,8 +6,7 @@
- "Project-Id-Version: kgamma\n"
- "POT-Creation-Date: 2006-09-24 02:37+0200\n"
- "PO-Revision-Date: 2006-06-09 10:56+0800\n"
--"Last-Translator: Frank Weng (a.k.a. Franklin) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Traditional Chinese <zh_l10n@linux.org.tw>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
-@@ -78,15 +77,16 @@
- #: kgamma.cpp:585
- msgid ""
- "<h1>Monitor Gamma</h1> This is a tool for changing monitor gamma correction. "
--"Use the four sliders to define the gamma correction either as a single value, "
--"or separately for the red, green and blue components. You may need to correct "
--"the brightness and contrast settings of your monitor for good results. The test "
--"images help you to find proper settings."
--"<br> You can save them system-wide to XF86Config (root access is required for "
--"that) or to your own KDE settings. On multi head systems you can correct the "
--"gamma values separately for all screens."
-+"Use the four sliders to define the gamma correction either as a single "
-+"value, or separately for the red, green and blue components. You may need to "
-+"correct the brightness and contrast settings of your monitor for good "
-+"results. The test images help you to find proper settings.<br> You can save "
-+"them system-wide to XF86Config (root access is required for that) or to your "
-+"own KDE settings. On multi head systems you can correct the gamma values "
-+"separately for all screens."
- msgstr ""
--"<h1>Monitor Gamma</h1>這是改變監式器 Gamma 修正的工具。用四個滑動器來定義 Gamma "
--"修正，看是要定義為單一值，還是分別調整紅綠藍三原色的值。您可能也需要修正量度、對比等設定。測試圖片可以幫您找到適合的設定值。"
--"<br> 您可以將設定值存到系統的 XF86Config 設定中（但是需要 root 權限），或是存到您自己的 KDE 設定中。在多頭系統中您修正不同螢幕的 "
--"Gamma 值。"
-+"<h1>Monitor Gamma</h1>這是改變監式器 Gamma 修正的工具。用四個滑動器來定義 "
-+"Gamma 修正，看是要定義為單一值，還是分別調整紅綠藍三原色的值。您可能也需要修"
-+"正量度、對比等設定。測試圖片可以幫您找到適合的設定值。<br> 您可以將設定值存到"
-+"系統的 XF86Config 設定中（但是需要 root 權限），或是存到您自己的 KDE 設定中。"
-+"在多頭系統中您修正不同螢幕的 Gamma 值。"
-diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdegraphics/kghostview.po kde-i18n-zh_TW-3.5.10/messages/kdegraphics/kghostview.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdegraphics/kghostview.po	2008-08-19 20:43:07.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdegraphics/kghostview.po	2011-11-11 15:45:17.000000000 +0100
-@@ -10,8 +10,7 @@
- "Project-Id-Version: kghostview\n"
- "POT-Creation-Date: 2008-07-08 01:19+0200\n"
- "PO-Revision-Date: 2006-06-09 11:22+0800\n"
--"Last-Translator: Frank Weng (a.k.a. Franklin) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Traditional Chinese <zh_l10n@linux.org.tw>\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 ""
--"ycchou@ccca.nctu.edu.tw,edt1023@speedymail.org, franklin at goodhorse dot idv "
--"dot tw"
-+"ycchou@ccca.nctu.edu.tw,edt1023@speedymail.org, franklin at goodhorse dot "
-+"idv dot tw"
- 
- #: infodialog.cpp:36
- msgid "Document Information"
-@@ -271,24 +270,22 @@
- 
- #: kgv_view.cpp:747
- msgid ""
--"<qt>An error occurred in rendering."
--"<br><strong>%1</strong>"
--"<br>The display may contain errors."
--"<br>Below are any error messages which were received from Ghostscript (<nobr>"
--"<strong>%2</strong></nobr>) which may help you.</qt>"
--msgstr ""
--"<qt>上色時發生錯誤。"
--"<br> <strong>%1</strong>"
--"<br> 顯示可能會有問題。"
--"<br> 底下是從 Ghostscript 中接收到的錯誤訊息（<nobr><strong>%2</strong></nobr>）。</qt>"
-+"<qt>An error occurred in rendering.<br><strong>%1</strong><br>The display "
-+"may contain errors.<br>Below are any error messages which were received from "
-+"Ghostscript (<nobr><strong>%2</strong></nobr>) which may help you.</qt>"
-+msgstr ""
-+"<qt>上色時發生錯誤。<br> <strong>%1</strong><br> 顯示可能會有問題。<br> 底下"
-+"是從 Ghostscript 中接收到的錯誤訊息（<nobr><strong>%2</strong></nobr>）。</"
-+"qt>"
- 
- #: kgvconfigdialog.cpp:113
- msgid ""
--"Your version of gs (version %1) is too old, since it has security issues which "
--"are impossible to resolve. Please upgrade to a newer version.\n"
--"KGhostView will try to work with it, but it may not display any files at all.\n"
--"Version %2 seems to be appropriate on your system, although newer versions will "
--"work as well."
-+"Your version of gs (version %1) is too old, since it has security issues "
-+"which are impossible to resolve. Please upgrade to a newer version.\n"
-+"KGhostView will try to work with it, but it may not display any files at "
-+"all.\n"
-+"Version %2 seems to be appropriate on your system, although newer versions "
-+"will work as well."
- msgstr ""
- "你的 gs 版本(%1)太舊，由於有安全上的問題，請更新 gs。\n"
- "KGhostView 將試著使用，但可能無法正確運作。\n"
-@@ -306,7 +303,8 @@
- 
- #: kgvdocument.cpp:99
- msgid ""
--"<qt>Could not open <nobr><strong>%1</strong></nobr>: File does not exist.</qt>"
-+"<qt>Could not open <nobr><strong>%1</strong></nobr>: File does not exist.</"
-+"qt>"
- msgstr "<qt>無法開啟 <nobr><strong>%1</strong></nobr> ：檔案不存在。</qt>"
- 
- #: kgvdocument.cpp:108
-@@ -321,13 +319,13 @@
- 
- #: kgvdocument.cpp:158
- msgid ""
--"<qt>Could not open <nobr><strong>%1</strong></nobr> which has type <strong>"
--"%2</strong>. KGhostview can only load PostScript (.ps, .eps) and Portable "
-+"<qt>Could not open <nobr><strong>%1</strong></nobr> which has type <strong>%"
-+"2</strong>. KGhostview can only load PostScript (.ps, .eps) and Portable "
- "Document Format (.pdf) files.</qt>"
- msgstr ""
--"<qt>無法開啟 <nobr><strong>%1</strong></nobr>，檔案型態為 <strong>%2</strong>"
--"。KGhostview 只能載入 PostScript (.ps, .eps) 及 Portable Document Format (.pdf) "
--"檔。</qt>"
-+"<qt>無法開啟 <nobr><strong>%1</strong></nobr>，檔案型態為 <strong>%2</"
-+"strong>。KGhostview 只能載入 PostScript (.ps, .eps) 及 Portable Document "
-+"Format (.pdf) 檔。</qt>"
- 
- #: kgvdocument.cpp:192 kgvdocument.cpp:223
- msgid "<qt>Could not uncompress <nobr><strong>%1</strong></nobr>.</qt>"
-@@ -361,8 +359,8 @@
- 
- #: kgvdocument.cpp:537
- msgid ""
--"<qt><strong>Printing failure:</strong>"
--"<br>Could not convert to PostScript</qt>"
-+"<qt><strong>Printing failure:</strong><br>Could not convert to PostScript</"
-+"qt>"
- msgstr "<qt><strong>列印失敗：</strong><br> 無法轉換成 PostScript</qt>"
- 
- #: kgvshell.cpp:82
-@@ -415,7 +413,9 @@
- msgid ""
- "Page to open. Use --page=3 to show the third page, for example. Note that if "
- "the page does not exist, any other page may be displayed"
--msgstr "要開啟的頁數。例如用 --page=3 來顯示第三頁。注意，如果該頁不存在，可能會顯示其他頁。"
-+msgstr ""
-+"要開啟的頁數。例如用 --page=3 來顯示第三頁。注意，如果該頁不存在，可能會顯示"
-+"其他頁。"
- 
- #: main.cpp:34
- msgid "Magnification of the display"
-@@ -426,7 +426,8 @@
- "The orientation of the shown image. Use either \"auto\", \"portrait\", "
- "\"landscape\", \"upsidedown\" or \"seascape\""
- msgstr ""
--"圖形顯示方向。使用 \"自動\"、\"portrait\"、\"landscape\"、\"upsidedown\" 或 \"seascape\""
-+"圖形顯示方向。使用 \"自動\"、\"portrait\"、\"landscape\"、\"upsidedown\" 或 "
-+"\"seascape\""
- 
- #: main.cpp:36
- msgid "Equivalent to orientation=portrait"
-@@ -470,7 +471,9 @@
- msgid ""
- "Anti-aliasing makes the result look better, but it makes the display take "
- "longer"
--msgstr "啟動平滑功能（Anti-alias，又叫反鋸齒功能）會讓結果看起來好一點，但是要花長一點的時間。"
-+msgstr ""
-+"啟動平滑功能（Anti-alias，又叫反鋸齒功能）會讓結果看起來好一點，但是要花長一"
-+"點的時間。"
- 
- #. i18n: file generalsettingswidget.ui line 42
- #: rc.cpp:27
-@@ -488,12 +491,10 @@
- #: rc.cpp:33
- #, no-c-format
- msgid ""
--"Ghostscript is the basic renderer (the program which draws the picture)"
--"<br>\n"
-+"Ghostscript is the basic renderer (the program which draws the picture)<br>\n"
- "In case of problems you might want to see its error messages"
- msgstr ""
--"Ghostscript 是基本的描繪程式（畫出圖片的程式）。"
--"<br>\n"
-+"Ghostscript 是基本的描繪程式（畫出圖片的程式）。<br>\n"
- "發生問題時您可能會想看它的錯誤訊息。"
- 
- #. i18n: file generalsettingswidget.ui line 62
-@@ -574,7 +575,9 @@
- msgid ""
- "Anti-aliasing makes the result look better, specially regarding text, but it "
- "makes the display take longer"
--msgstr "平滑功能（Anti-alias）會讓結果看起來比較好，尤其是文字，但是會花比較長的時間。"
-+msgstr ""
-+"平滑功能（Anti-alias）會讓結果看起來比較好，尤其是文字，但是會花比較長的時"
-+"間。"
- 
- #. i18n: file kghostview.kcfg line 20
- #: rc.cpp:82
-@@ -586,16 +589,18 @@
- #: rc.cpp:85
- #, no-c-format
- msgid ""
--"Whether to see a window with Ghostscript messages. This can give you additional "
--"information on the files you see. In case of an error, a window will popup "
--"regardless of this option."
--msgstr "決定是否要看 Ghostscript 訊息視窗。它能讓您取得更多關於檔案的資訊。如果發生問題的話，這個視窗會跳出來，不管您有沒有設定。"
-+"Whether to see a window with Ghostscript messages. This can give you "
-+"additional information on the files you see. In case of an error, a window "
-+"will popup regardless of this option."
-+msgstr ""
-+"決定是否要看 Ghostscript 訊息視窗。它能讓您取得更多關於檔案的資訊。如果發生問"
-+"題的話，這個視窗會跳出來，不管您有沒有設定。"
- 
- #. i18n: file kghostview.kcfg line 25
- #: rc.cpp:88
- #, no-c-format
- msgid "Use Platform Fonts"
--msgstr "使用平台字型(&U)"
-+msgstr "使用平臺字型(&U)"
- 
- #. i18n: file kghostview.kcfg line 30
- #: rc.cpp:91
-@@ -613,14 +618,15 @@
- #: rc.cpp:97
- #, no-c-format
- msgid ""
--"Sometimes information is available on page names which can be used in the list "
--"panner instead of just the numbers. Most often, these names are, in fact, "
--"another numbering. Often, the first few pages use roman numbering (i, ii, iii, "
--"iv ...) followed by arabic numbers from one (1, 2, 3...) when the real content "
--"starts."
-+"Sometimes information is available on page names which can be used in the "
-+"list panner instead of just the numbers. Most often, these names are, in "
-+"fact, another numbering. Often, the first few pages use roman numbering (i, "
-+"ii, iii, iv ...) followed by arabic numbers from one (1, 2, 3...) when the "
-+"real content starts."
- msgstr ""
--"有時在頁面清單中可以使用頁面名稱，而不是只顯示編號。通常頁面名稱實際上是另一個編號系統。一般來說，前幾頁介紹、目錄等會用羅馬數字編號（i, ii, iii "
--"等等），書本內容才會用數字編號。"
-+"有時在頁面清單中可以使用頁面名稱，而不是只顯示編號。通常頁面名稱實際上是另一"
-+"個編號系統。一般來說，前幾頁介紹、目錄等會用羅馬數字編號（i, ii, iii 等等），"
-+"書本內容才會用數字編號。"
- 
- #. i18n: file kghostview.kcfg line 40
- #: rc.cpp:100
-@@ -654,7 +660,9 @@
- "Kghostview does not, itself, display the document: it relies on ghostscript, "
- "and therefore needs it to be available. Here you can define the ghostscript "
- "interpreter to use."
--msgstr "Kghostview 本身不顯示文件。它是依靠 ghostscript。您可以在此定義 ghostscript 使用的解譯器。"
-+msgstr ""
-+"Kghostview 本身不顯示文件。它是依靠 ghostscript。您可以在此定義 ghostscript "
-+"使用的解譯器。"
- 
- #. i18n: file kghostview.kcfg line 57
- #: rc.cpp:115
-@@ -672,8 +680,8 @@
- #: rc.cpp:121
- #, no-c-format
- msgid ""
--"This is the version of ghostscript you are running. Normally you will not need "
--"to change this since it gets detected automatically."
-+"This is the version of ghostscript you are running. Normally you will not "
-+"need to change this since it gets detected automatically."
- msgstr "您所執行的 ghostscript 版本。通常您不需要改變這個值，它會自動偵測。"
- 
- #. i18n: file kghostview.kcfg line 71
-diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdegraphics/kiconedit.po kde-i18n-zh_TW-3.5.10/messages/kdegraphics/kiconedit.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdegraphics/kiconedit.po	2006-07-22 10:04:05.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdegraphics/kiconedit.po	2011-11-11 15:45:17.000000000 +0100
-@@ -5,8 +5,7 @@
- "Project-Id-Version: kiconedit\n"
- "POT-Creation-Date: 2006-03-05 03:45+0100\n"
- "PO-Revision-Date: 2006-06-19 10:26+0800\n"
--"Last-Translator: Frank Weng (a.k.a. Franklin) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Chinese Traditional <zh-l10n@linux.org.tw>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
-@@ -156,7 +155,7 @@
- 
- #: kiconedit.cpp:293
- msgid "Resi&ze..."
--msgstr "改變大小(&Z)..."
-+msgstr "改變大小(&Z)…"
- 
- #: kiconedit.cpp:295
- msgid ""
-@@ -452,8 +451,8 @@
- msgid ""
- "Statusbar\n"
- "\n"
--"The statusbar gives information on the status of the current icon. The fields "
--"are:\n"
-+"The statusbar gives information on the status of the current icon. The "
-+"fields are:\n"
- "\n"
- "\t- Application messages\n"
- "\t- Cursor position\n"
-@@ -514,10 +513,8 @@
- msgstr "徒手"
- 
- #: kicongrid.cpp:1020
--msgid ""
--"There was an error loading a blank image.\n"
--msgstr ""
--"載入空白圖案發生錯誤。\n"
-+msgid "There was an error loading a blank image.\n"
-+msgstr "載入空白圖案發生錯誤。\n"
- 
- #: kicongrid.cpp:1152
- msgid "All selected"
-@@ -550,10 +547,8 @@
- msgstr "已貼上"
- 
- #: kicongrid.cpp:1359 kicongrid.cpp:1394
--msgid ""
--"Invalid pixmap data in clipboard!\n"
--msgstr ""
--"剪貼簿中的圖案資料不正確。\n"
-+msgid "Invalid pixmap data in clipboard!\n"
-+msgstr "剪貼簿中的圖案資料不正確。\n"
- 
- #: kicongrid.cpp:1901
- msgid "Drawn Array"
-@@ -613,15 +608,13 @@
- msgid ""
- "The URL: %1 \n"
- "seems to be malformed.\n"
--msgstr ""
--"網址 %1 似乎是錯誤的。\n"
-+msgstr "網址 %1 似乎是錯誤的。\n"
- 
- #: kicon.cpp:89 kicon.cpp:104
- msgid ""
- "There was an error loading:\n"
- "%1\n"
--msgstr ""
--"載入 %1 時發生錯誤。\n"
-+msgstr "載入 %1 時發生錯誤。\n"
- 
- #: kicon.cpp:178
- msgid "Save Icon As"
-@@ -643,8 +636,7 @@
- msgid ""
- "There was an error saving:\n"
- "%1\n"
--msgstr ""
--"儲存 %1 時發生錯誤。\n"
-+msgstr "儲存 %1 時發生錯誤。\n"
- 
- #: kresize.cpp:36
- msgid "Size"
-@@ -749,11 +741,11 @@
- 
- #: kiconconfig.cpp:141
- msgid "&Add..."
--msgstr "新增(&A)..."
-+msgstr "新增(&A)…"
- 
- #: kiconconfig.cpp:144
- msgid "&Edit..."
--msgstr "編輯(&E)..."
-+msgstr "編輯(&E)…"
- 
- #: kiconconfig.cpp:247
- msgid "Select Background"
-@@ -769,7 +761,7 @@
- 
- #: kiconconfig.cpp:280
- msgid "Choose..."
--msgstr "選擇..."
-+msgstr "選擇…"
- 
- #: kiconconfig.cpp:283
- msgid "Preview"
-diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdegraphics/kmrml.po kde-i18n-zh_TW-3.5.10/messages/kdegraphics/kmrml.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdegraphics/kmrml.po	2007-01-15 10:56:26.000000000 +0100
-+++ kde-i18n-zh_TW-3.5.10/messages/kdegraphics/kmrml.po	2011-11-11 15:45:17.000000000 +0100
-@@ -6,8 +6,7 @@
- "Project-Id-Version: kmrml\n"
- "POT-Creation-Date: 2006-11-25 02:35+0100\n"
- "PO-Revision-Date: 2006-11-27 17:07+0800\n"
--"Last-Translator: Frank Weng (a.k.a. Franklin) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Chinese Traditional <zh-l10n@linux.org.tw>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
-@@ -74,8 +73,7 @@
- msgid ""
- "There is no image collection available\n"
- "at %1.\n"
--msgstr ""
--"在 %1 上沒有可用的影像收藏清單。\n"
-+msgstr "在 %1 上沒有可用的影像收藏清單。\n"
- 
- #: mrml_part.cpp:208
- msgid "No Image Collection"
-@@ -104,11 +102,11 @@
- 
- #: mrml_part.cpp:313
- msgid "Connecting to indexing server at %1..."
--msgstr "設定在 %1 的索引伺服器..."
-+msgstr "設定在 %1 的索引伺服器…"
- 
- #: mrml_part.cpp:354
- msgid "Downloading reference files..."
--msgstr "下載參考檔案中..."
-+msgstr "下載參考檔案中…"
- 
- #: mrml_part.cpp:497
- msgid ""
-@@ -136,11 +134,11 @@
- 
- #: mrml_part.cpp:691
- msgid "Random search..."
--msgstr "隨機搜尋..."
-+msgstr "隨機搜尋…"
- 
- #: mrml_part.cpp:692
- msgid "Searching..."
--msgstr "正在搜尋..."
-+msgstr "正在搜尋…"
- 
- #: mrml_part.cpp:701
- msgid "Ready."
-@@ -184,8 +182,8 @@
- 
- #: mrml_view.cpp:300
- msgid ""
--"You can refine queries by giving feedback about the current result and pressing "
--"the Search button again."
-+"You can refine queries by giving feedback about the current result and "
-+"pressing the Search button again."
- msgstr "您可以使用目前的結果再做更進一步的搜尋。"
- 
- #: mrml_view.cpp:301
-@@ -269,7 +267,7 @@
- 
- #: kcontrol/indexer.cpp:180
- msgid "Writing data..."
--msgstr "寫入資料中..."
-+msgstr "寫入資料中…"
- 
- #: kcontrol/kcmkmrml.cpp:51
- msgid "KCMKMrml"
-@@ -288,7 +286,9 @@
- "Cannot find executables \"gift\" and/or \"gift-add-collection.pl\" in the "
- "PATH.\n"
- "Please install the \"GNU Image Finding Tool\"."
--msgstr "在執行路徑中找不到可執行檔 \"gift\" 或 \"gift-add-connection.pl\"。請先安裝 GNU 影像尋找工具。"
-+msgstr ""
-+"在執行路徑中找不到可執行檔 \"gift\" 或 \"gift-add-connection.pl\"。請先安裝 "
-+"GNU 影像尋找工具。"
- 
- #: kcontrol/kcmkmrml.cpp:107
- msgid "Do you really want the configuration to be reset to the defaults?"
-@@ -301,19 +301,17 @@
- #: kcontrol/kcmkmrml.cpp:133
- msgid ""
- "<h1>Image Index</h1>KDE can make use of the GNU Image Finding Tool (GIFT) to "
--"perform queries based not just on filenames, but on file content."
--"<p>For example, you can search for an image by giving an example image that "
--"looks similar to the one you are looking for.</p>"
--"<p>For this to work, your image directories need to be indexed by, for example, "
--"the GIFT server.</p>"
--"<p>Here you can configure the servers (you can also query remote servers) and "
--"the directories to index.</p>"
-+"perform queries based not just on filenames, but on file content.<p>For "
-+"example, you can search for an image by giving an example image that looks "
-+"similar to the one you are looking for.</p><p>For this to work, your image "
-+"directories need to be indexed by, for example, the GIFT server.</p><p>Here "
-+"you can configure the servers (you can also query remote servers) and the "
-+"directories to index.</p>"
- msgstr ""
--"<h1>影像索引</h1> KDE 可以使用 GNU 影像搜尋工具（GNu Image Finding "
--"Tool，GIFT）來執行影像搜尋，不只是搜尋檔名，還有檔案內容。 "
--"<p>例如，您可以給一張圖片，搜尋跟這張圖片類似的圖片。</p> "
--"<p>您要先將影像目錄索引建立在 GIFT 伺服器上。</p> "
--"<p>您可以在這裡設定建索引的伺服器與目錄。</p>"
-+"<h1>影像索引</h1> KDE 可以使用 GNU 影像搜尋工具（GNu Image Finding Tool，"
-+"GIFT）來執行影像搜尋，不只是搜尋檔名，還有檔案內容。 <p>例如，您可以給一張圖"
-+"片，搜尋跟這張圖片類似的圖片。</p> <p>您要先將影像目錄索引建立在 GIFT 伺服器"
-+"上。</p> <p>您可以在這裡設定建索引的伺服器與目錄。</p>"
- 
- #: kcontrol/mainpage.cpp:64
- msgid "Indexing Server Configuration"
-@@ -329,8 +327,8 @@
- 
- #: kcontrol/mainpage.cpp:172
- msgid ""
--"You did not specify any folders to be indexed. This means you will be unable to "
--"perform queries on your computer."
-+"You did not specify any folders to be indexed. This means you will be unable "
-+"to perform queries on your computer."
- msgstr "您沒有指定要建索引的資料夾。這表示您無法在您的電腦上執行查詢。"
- 
- #: kcontrol/mainpage.cpp:312
-@@ -343,13 +341,14 @@
- 
- #: kcontrol/mainpage.cpp:388 kcontrol/mainpage.cpp:436
- msgid "Processing..."
--msgstr "處理中..."
-+msgstr "處理中…"
- 
- #: kcontrol/mainpage.cpp:426
- msgid ""
- "The settings have been saved. Now, the configured directories need to be "
- "indexed. This may take a while. Do you want to do this now?"
--msgstr "設定已儲存。現在，要來建立目錄的索引了。這可能會花一點時間，您要開始了嗎？"
-+msgstr ""
-+"設定已儲存。現在，要來建立目錄的索引了。這可能會花一點時間，您要開始了嗎？"
- 
- #: kcontrol/mainpage.cpp:430
- msgid "Start Indexing Now?"
-@@ -386,9 +385,8 @@
- 
- #: server/watcher.cpp:146
- msgid ""
--"<qt>The server with the command line"
--"<br>%1"
--"<br>is not available anymore. Do you want to restart it?"
-+"<qt>The server with the command line<br>%1<br>is not available anymore. Do "
-+"you want to restart it?"
- msgstr "<qt>伺服器命令列<br>%1<br>無法使用。您要重新啟動嗎？"
- 
- #: server/watcher.cpp:150 server/watcher.cpp:179
-diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdegraphics/kolourpaint.po kde-i18n-zh_TW-3.5.10/messages/kdegraphics/kolourpaint.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdegraphics/kolourpaint.po	2008-02-13 10:55:25.000000000 +0100
-+++ kde-i18n-zh_TW-3.5.10/messages/kdegraphics/kolourpaint.po	2011-11-11 15:45:17.000000000 +0100
-@@ -7,7 +7,7 @@
- "Project-Id-Version: kolourpaint\n"
- "POT-Creation-Date: 2007-10-23 01:13+0200\n"
- "PO-Revision-Date: 2007-06-22 12:00+0800\n"
--"Last-Translator: Franklin Weng <franklin at goodhorse dot idv dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Chinese Traditional <zh-l10n@linux.org.tw>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
-@@ -93,27 +93,33 @@
- 
- #: kpdocument.cpp:304
- msgid ""
--"The image \"%1\" may have more colors than the current screen mode. In order to "
--"display it, some colors may be changed. Try increasing your screen depth to at "
--"least %2bpp.\n"
-+"The image \"%1\" may have more colors than the current screen mode. In order "
-+"to display it, some colors may be changed. Try increasing your screen depth "
-+"to at least %2bpp.\n"
- "It also contains translucency which is not fully supported. The translucency "
- "data will be approximated with a 1-bit transparency mask."
- msgstr ""
--"影像 %1 所含的顏色可能比目前的螢幕模式還多。為了要顯示此檔，有些顏色會被改變。您可以試著將您的位元深度調高到至少 %2 bpp。\n"
--"它也包含了目前尚未完整支援的半透明資料。半透明資料將會以一位元的透明遮罩來模擬。"
-+"影像 %1 所含的顏色可能比目前的螢幕模式還多。為了要顯示此檔，有些顏色會被改"
-+"變。您可以試著將您的位元深度調高到至少 %2 bpp。\n"
-+"它也包含了目前尚未完整支援的半透明資料。半透明資料將會以一位元的透明遮罩來模"
-+"擬。"
- 
- #: kpdocument.cpp:315
- msgid ""
--"The image \"%1\" may have more colors than the current screen mode. In order to "
--"display it, some colors may be changed. Try increasing your screen depth to at "
--"least %2bpp."
--msgstr "影像 %1 所含的顏色可能比目前的螢幕模式還多。為了要顯示此檔，有些顏色會被改變。您可以試著將您的位元深度調高到至少 %2 bpp。"
-+"The image \"%1\" may have more colors than the current screen mode. In order "
-+"to display it, some colors may be changed. Try increasing your screen depth "
-+"to at least %2bpp."
-+msgstr ""
-+"影像 %1 所含的顏色可能比目前的螢幕模式還多。為了要顯示此檔，有些顏色會被改"
-+"變。您可以試著將您的位元深度調高到至少 %2 bpp。"
- 
- #: kpdocument.cpp:320
- msgid ""
- "The image \"%1\" contains translucency which is not fully supported. The "
- "translucency data will be approximated with a 1-bit transparency mask."
--msgstr "影像 %1 包含了目前尚未完整支援的半透明資料。半透明資料將會以一位元的透明遮罩來模擬。"
-+msgstr ""
-+"影像 %1 包含了目前尚未完整支援的半透明資料。半透明資料將會以一位元的透明遮罩"
-+"來模擬。"
- 
- #: kpdocument.cpp:333
- msgid "Could not open \"%1\" - out of graphics memory."
-@@ -141,11 +147,12 @@
- 
- #: kpdocument.cpp:469
- msgid ""
--"<qt>"
--"<p>The <b>%1</b> format may not be able to preserve all of the image's color "
--"information.</p>"
--"<p>Are you sure you want to save in this format?</p></qt>"
--msgstr "<qt><p>格式 <b>%1</b> 可能無法保留影像中所有的顏色資訊。</p> <p>您確定要用這個格式儲存嗎？</p></qt>"
-+"<qt><p>The <b>%1</b> format may not be able to preserve all of the image's "
-+"color information.</p><p>Are you sure you want to save in this format?</p></"
-+"qt>"
-+msgstr ""
-+"<qt><p>格式 <b>%1</b> 可能無法保留影像中所有的顏色資訊。</p> <p>您確定要用這"
-+"個格式儲存嗎？</p></qt>"
- 
- #: kpdocument.cpp:476
- msgid "Lossy File Format"
-@@ -153,14 +160,12 @@
- 
- #: kpdocument.cpp:484
- msgid ""
--"<qt>"
--"<p>Saving the image at the low color depth of %1-bit may result in the loss of "
--"color information. Any transparency will also be removed.</p>"
--"<p>Are you sure you want to save at this color depth?</p></qt>"
--msgstr ""
--"<qt>"
--"<p>將影像儲存在較低位元深度（%1 bpp）會導至顏色資訊流失。透明度資料也會被移除。</p> "
--"<p>您確定要以此位元深度儲存嗎？</p></qt>"
-+"<qt><p>Saving the image at the low color depth of %1-bit may result in the "
-+"loss of color information. Any transparency will also be removed.</p><p>Are "
-+"you sure you want to save at this color depth?</p></qt>"
-+msgstr ""
-+"<qt><p>將影像儲存在較低位元深度（%1 bpp）會導至顏色資訊流失。透明度資料也會被"
-+"移除。</p> <p>您確定要以此位元深度儲存嗎？</p></qt>"
- 
- #: kpdocument.cpp:491
- msgid "Low Color Depth"
-@@ -280,21 +285,27 @@
- "It also contains translucency which is not fully supported. The translucency "
- "data will be approximated with a 1-bit transparency mask."
- msgstr ""
--"要貼上的影像所含的顏色可能比目前的螢幕模式還多。為了要顯示此影像，有些顏色會被改變。您可以試著將您的位元深度調高到至少 %1 bpp。\n"
--"它也包含了目前尚未完整支援的半透明資料。半透明資料將會以一位元的透明遮罩來模擬。"
-+"要貼上的影像所含的顏色可能比目前的螢幕模式還多。為了要顯示此影像，有些顏色會"
-+"被改變。您可以試著將您的位元深度調高到至少 %1 bpp。\n"
-+"它也包含了目前尚未完整支援的半透明資料。半透明資料將會以一位元的透明遮罩來模"
-+"擬。"
- 
- #: kpmainwindow_edit.cpp:76
- msgid ""
- "The image to be pasted may have more colors than the current screen mode. In "
- "order to display it, some colors may be changed. Try increasing your screen "
- "depth to at least %1bpp."
--msgstr "要貼上的影像所含的顏色可能比目前的螢幕模式還多。為了要顯示此影像，有些顏色會被改變。您可以試著將您的位元深度調高到至少 %1 bpp。"
-+msgstr ""
-+"要貼上的影像所含的顏色可能比目前的螢幕模式還多。為了要顯示此影像，有些顏色會"
-+"被改變。您可以試著將您的位元深度調高到至少 %1 bpp。"
- 
- #: kpmainwindow_edit.cpp:80
- msgid ""
--"The image to be pasted contains translucency which is not fully supported. The "
--"translucency data will be approximated with a 1-bit transparency mask."
--msgstr "要貼上的影像包含了目前尚未完整支援的半透明資料。半透明資料將會以一位元的透明遮罩來模擬。"
-+"The image to be pasted contains translucency which is not fully supported. "
-+"The translucency data will be approximated with a 1-bit transparency mask."
-+msgstr ""
-+"要貼上的影像包含了目前尚未完整支援的半透明資料。半透明資料將會以一位元的透明"
-+"遮罩來模擬。"
- 
- #: kpmainwindow_edit.cpp:109
- msgid "Paste in &New Window"
-@@ -306,11 +317,11 @@
- 
- #: kpmainwindow_edit.cpp:121
- msgid "C&opy to File..."
--msgstr "複製到檔案(&O)..."
-+msgstr "複製到檔案(&O)…"
- 
- #: kpmainwindow_edit.cpp:123
- msgid "Paste &From File..."
--msgstr "從檔案貼上(&F)..."
-+msgstr "從檔案貼上(&F)…"
- 
- #: kpmainwindow_edit.cpp:460 tools/kptoolselection.cpp:718
- msgid "Text: Create Box"
-@@ -327,15 +338,12 @@
- 
- #: kpmainwindow_edit.cpp:718
- msgid ""
--"<qt>"
--"<p>KolourPaint cannot paste the contents of the clipboard as the data "
--"unexpectedly disappeared.</p>"
--"<p>This usually occurs if the application which was responsible for the "
--"clipboard contents has been closed.</p></qt>"
--msgstr ""
--"<qt>"
--"<p>KolourPaint 無法貼上剪貼簿中的內容，因為資料不見了。</p> "
--"<p>這通常是因為負責剪貼簿內容的應用程式被關閉了。</p></qt>"
-+"<qt><p>KolourPaint cannot paste the contents of the clipboard as the data "
-+"unexpectedly disappeared.</p><p>This usually occurs if the application which "
-+"was responsible for the clipboard contents has been closed.</p></qt>"
-+msgstr ""
-+"<qt><p>KolourPaint 無法貼上剪貼簿中的內容，因為資料不見了。</p> <p>這通常是因"
-+"為負責剪貼簿內容的應用程式被關閉了。</p></qt>"
- 
- #: kpmainwindow_edit.cpp:724
- msgid "Cannot Paste"
-@@ -367,11 +375,11 @@
- 
- #: kpmainwindow_file.cpp:82
- msgid "E&xport..."
--msgstr "匯出(&X)..."
-+msgstr "匯出(&X)…"
- 
- #: kpmainwindow_file.cpp:85
- msgid "Scan..."
--msgstr "掃描..."
-+msgstr "掃描…"
- 
- #: kpmainwindow_file.cpp:89
- msgid "Reloa&d"
-@@ -465,34 +473,29 @@
- #: kpmainwindow_help.cpp:133
- msgid ""
- "<p>To acquire a screenshot, press <b>%1</b>.  The screenshot will be placed "
--"into the clipboard and you will be able to paste it in KolourPaint.</p>"
--"<p>You may configure the <b>Desktop Screenshot</b> shortcut in the KDE Control "
--"Center module <a href=\"configure kde shortcuts\">Keyboard Shortcuts</a>.</p>"
--"<p>Alternatively, you may try the application <a href=\"run ksnapshot\">"
--"KSnapshot</a>.</p>"
--msgstr ""
--"<p>要取得螢幕快照，請按下 <b>%1</b>。螢幕快照會被放在剪貼簿中，您可以在 KolourPaint 中選擇貼上。</p> "
--"<p>您可以在 KDE 控制中心模組裡的「<a href=\"configure kde shortcuts\">鍵盤捷徑</a>"
--"」中設定螢幕快照的快速鍵。</p> "
--"<p>您也可以試試 <a href=\"run ksnapshot\">KSnapshot</a>。</p>"
-+"into the clipboard and you will be able to paste it in KolourPaint.</"
-+"p><p>You may configure the <b>Desktop Screenshot</b> shortcut in the KDE "
-+"Control Center module <a href=\"configure kde shortcuts\">Keyboard "
-+"Shortcuts</a>.</p><p>Alternatively, you may try the application <a href="
-+"\"run ksnapshot\">KSnapshot</a>.</p>"
-+msgstr ""
-+"<p>要取得螢幕快照，請按下 <b>%1</b>。螢幕快照會被放在剪貼簿中，您可以在 "
-+"KolourPaint 中選擇貼上。</p> <p>您可以在 KDE 控制中心模組裡的「<a href="
-+"\"configure kde shortcuts\">鍵盤捷徑</a>」中設定螢幕快照的快速鍵。</p> <p>您"
-+"也可以試試 <a href=\"run ksnapshot\">KSnapshot</a>。</p>"
- 
- #: kpmainwindow_help.cpp:154
- msgid ""
--"<p>You do not appear to be running KDE.</p>"
--"<p>Once you have loaded KDE:"
--"<br>"
--"<blockquote>To acquire a screenshot, press <b>%1</b>"
--".  The screenshot will be placed into the clipboard and you will be able to "
--"paste it in KolourPaint.</blockquote></p>"
--"<p>Alternatively, you may try the application <a href=\"run ksnapshot\">"
--"KSnapshot</a>.</p>"
--msgstr ""
--"<p>您似乎並不是使用 KDE。</p> "
--"<p>當您載入 KDE 後："
--"<br>"
--"<blockquote>要取得螢幕快照，請按下 <b>%1</b>。螢幕快照會被放在剪貼簿中，您可以在 KolourPaint "
--"中選擇貼上。</blockquote></p> "
--"<p>您也可以試試 <a href=\"run ksnapshot\">KSnapshot</a>。</p>"
-+"<p>You do not appear to be running KDE.</p><p>Once you have loaded KDE:"
-+"<br><blockquote>To acquire a screenshot, press <b>%1</b>.  The screenshot "
-+"will be placed into the clipboard and you will be able to paste it in "
-+"KolourPaint.</blockquote></p><p>Alternatively, you may try the application "
-+"<a href=\"run ksnapshot\">KSnapshot</a>.</p>"
-+msgstr ""
-+"<p>您似乎並不是使用 KDE。</p> <p>當您載入 KDE 後：<br><blockquote>要取得螢幕"
-+"快照，請按下 <b>%1</b>。螢幕快照會被放在剪貼簿中，您可以在 KolourPaint 中選擇"
-+"貼上。</blockquote></p> <p>您也可以試試 <a href=\"run ksnapshot\">KSnapshot</"
-+"a>。</p>"
- 
- #: kpmainwindow_help.cpp:183
- msgid "Acquiring Screenshots"
-@@ -500,7 +503,7 @@
- 
- #: kpmainwindow_image.cpp:92
- msgid "R&esize / Scale..."
--msgstr "改變/調整大小(&E)..."
-+msgstr "改變/調整大小(&E)…"
- 
- #: kpmainwindow_image.cpp:95
- msgid "Se&t as Image (Crop)"
-@@ -508,15 +511,15 @@
- 
- #: kpmainwindow_image.cpp:101
- msgid "&Flip..."
--msgstr "反轉(&F)..."
-+msgstr "反轉(&F)…"
- 
- #: kpmainwindow_image.cpp:104
- msgid "&Rotate..."
--msgstr "旋轉(&R)..."
-+msgstr "旋轉(&R)…"
- 
- #: kpmainwindow_image.cpp:107
- msgid "S&kew..."
--msgstr "扭曲(&K)..."
-+msgstr "扭曲(&K)…"
- 
- #: kpmainwindow_image.cpp:110
- msgid "Reduce to Mo&nochrome (Dithered)"
-@@ -536,7 +539,7 @@
- 
- #: kpmainwindow_image.cpp:122
- msgid "&More Effects..."
--msgstr "更多效果(&M)..."
-+msgstr "更多效果(&M)…"
- 
- #. i18n: file kolourpaintui.rc line 71
- #: kpmainwindow_image.cpp:160 rc.cpp:6 rc.cpp:18 rc.cpp:24 rc.cpp:36
-@@ -625,15 +628,12 @@
- 
- #: kpmainwindow_tools.cpp:525
- msgid ""
--"<qt>"
--"<p>Resizing the image to %1x%2 may take a substantial amount of memory. This "
--"can reduce system responsiveness and cause other application resource "
--"problems.</p>"
--"<p>Are you sure want to resize the image?</p></qt>"
--msgstr ""
--"<qt>"
--"<p>改變影像大小到 %1 x %2 會用到相當可觀的記憶體。這可能會造成系統效能降低，並造成其他應用程式資源的問題。</p> "
--"<p>您確定要改變影像大小嗎？</p></qt>"
-+"<qt><p>Resizing the image to %1x%2 may take a substantial amount of memory. "
-+"This can reduce system responsiveness and cause other application resource "
-+"problems.</p><p>Are you sure want to resize the image?</p></qt>"
-+msgstr ""
-+"<qt><p>改變影像大小到 %1 x %2 會用到相當可觀的記憶體。這可能會造成系統效能降"
-+"低，並造成其他應用程式資源的問題。</p> <p>您確定要改變影像大小嗎？</p></qt>"
- 
- #: kpmainwindow_tools.cpp:535 tools/kptoolresizescale.cpp:1137
- msgid "Resize Image?"
-@@ -1272,22 +1272,19 @@
- 
- #: tools/kptoolresizescale.cpp:647
- msgid ""
--"<qt>"
--"<ul>"
--"<li><b>Resize</b>: The size of the picture will be increased by creating new "
--"areas to the right and/or bottom (filled in with the background color) or "
--"decreased by cutting it at the right and/or bottom.</li>"
--"<li><b>Scale</b>: The picture will be expanded by duplicating pixels or "
--"squashed by dropping pixels.</li>"
--"<li><b>Smooth Scale</b>: This is the same as <i>Scale</i> "
--"except that it blends neighboring pixels to produce a smoother looking "
--"picture.</li></ul></qt>"
--msgstr ""
--"<qt> "
--"<ul> "
--"<li><b>改變大小</b>：圖片變大的話，會在右方與下方產生新的區域，並填滿背景顏色。若圖片變小，則會將右方與下方的區域切掉。</li> "
--"<li><b>調整大小</b>：圖片會以複製像素的方式變大，或是以丟棄像素的方式變小。</li> "
--"<li><b>平滑調整大小</b>：跟「調整大小」一樣，不過會將鄰近的像素混合，以產生較順眼的圖片。</li> </ul> </qt>"
-+"<qt><ul><li><b>Resize</b>: The size of the picture will be increased by "
-+"creating new areas to the right and/or bottom (filled in with the background "
-+"color) or decreased by cutting it at the right and/or bottom.</"
-+"li><li><b>Scale</b>: The picture will be expanded by duplicating pixels or "
-+"squashed by dropping pixels.</li><li><b>Smooth Scale</b>: This is the same "
-+"as <i>Scale</i> except that it blends neighboring pixels to produce a "
-+"smoother looking picture.</li></ul></qt>"
-+msgstr ""
-+"<qt> <ul> <li><b>改變大小</b>：圖片變大的話，會在右方與下方產生新的區域，並填"
-+"滿背景顏色。若圖片變小，則會將右方與下方的區域切掉。</li> <li><b>調整大小</"
-+"b>：圖片會以複製像素的方式變大，或是以丟棄像素的方式變小。</li> <li><b>平滑調"
-+"整大小</b>：跟「調整大小」一樣，不過會將鄰近的像素混合，以產生較順眼的圖片。"
-+"</li> </ul> </qt>"
- 
- #: tools/kptoolresizescale.cpp:669
- msgid "&Resize"
-@@ -1334,15 +1331,14 @@
- 
- #: tools/kptoolresizescale.cpp:1115
- msgid ""
--"<qt>"
--"<p>Resizing the text box to %1x%2 may take a substantial amount of memory. This "
--"can reduce system responsiveness and cause other application resource "
--"problems.</p>"
--"<p>Are you sure you want to resize the text box?</p></qt>"
--msgstr ""
--"<qt>"
--"<p>改變文字盒大小到 %1 x %2 會用到相當可觀的記憶體。這可能會造成系統效能降低，並造成其他應用程式資源的問題。</p> "
--"<p>您確定要調整文字盒大小嗎？</p></qt>"
-+"<qt><p>Resizing the text box to %1x%2 may take a substantial amount of "
-+"memory. This can reduce system responsiveness and cause other application "
-+"resource problems.</p><p>Are you sure you want to resize the text box?</p></"
-+"qt>"
-+msgstr ""
-+"<qt><p>改變文字盒大小到 %1 x %2 會用到相當可觀的記憶體。這可能會造成系統效能"
-+"降低，並造成其他應用程式資源的問題。</p> <p>您確定要調整文字盒大小嗎？</p></"
-+"qt>"
- 
- #: tools/kptoolresizescale.cpp:1123
- msgid "Resize Text Box?"
-@@ -1354,26 +1350,21 @@
- 
- #: tools/kptoolresizescale.cpp:1129
- msgid ""
--"<qt>"
--"<p>Resizing the image to %1x%2 may take a substantial amount of memory. This "
--"can reduce system responsiveness and cause other application resource "
--"problems.</p>"
--"<p>Are you sure you want to resize the image?</p></qt>"
--msgstr ""
--"<qt>"
--"<p>改變影像大小到 %1 x %2 會用到相當可觀的記憶體。這可能會造成系統效能降低，並造成其他應用程式資源的問題。</p> "
--"<p>您確定要改變影像大小嗎？</p></qt>"
-+"<qt><p>Resizing the image to %1x%2 may take a substantial amount of memory. "
-+"This can reduce system responsiveness and cause other application resource "
-+"problems.</p><p>Are you sure you want to resize the image?</p></qt>"
-+msgstr ""
-+"<qt><p>改變影像大小到 %1 x %2 會用到相當可觀的記憶體。這可能會造成系統效能降"
-+"低，並造成其他應用程式資源的問題。</p> <p>您確定要改變影像大小嗎？</p></qt>"
- 
- #: tools/kptoolresizescale.cpp:1147
- msgid ""
--"<qt>"
--"<p>Scaling the image to %1x%2 may take a substantial amount of memory. This can "
--"reduce system responsiveness and cause other application resource problems.</p>"
--"<p>Are you sure you want to scale the image?</p></qt>"
--msgstr ""
--"<qt>"
--"<p>調整影像大小到 %1 x %2 會用到相當可觀的記憶體。這可能會造成系統效能降低，並造成其他應用程式資源的問題。</p> "
--"<p>您確定要調整影像大小嗎？</p></qt>"
-+"<qt><p>Scaling the image to %1x%2 may take a substantial amount of memory. "
-+"This can reduce system responsiveness and cause other application resource "
-+"problems.</p><p>Are you sure you want to scale the image?</p></qt>"
-+msgstr ""
-+"<qt><p>調整影像大小到 %1 x %2 會用到相當可觀的記憶體。這可能會造成系統效能降"
-+"低，並造成其他應用程式資源的問題。</p> <p>您確定要調整影像大小嗎？</p></qt>"
- 
- #: tools/kptoolresizescale.cpp:1155
- msgid "Scale Image?"
-@@ -1385,15 +1376,14 @@
- 
- #: tools/kptoolresizescale.cpp:1161
- msgid ""
--"<qt>"
--"<p>Scaling the selection to %1x%2 may take a substantial amount of memory. This "
--"can reduce system responsiveness and cause other application resource "
--"problems.</p>"
--"<p>Are you sure you want to scale the selection?</p></qt>"
--msgstr ""
--"<qt>"
--"<p>調整選擇區域的大小到 %1 x %2 會用到相當可觀的記憶體。這可能會造成系統效能降低，並造成其他應用程式資源的問題。</p> "
--"<p>您確定要調整選擇區域的大小嗎？</p></qt>"
-+"<qt><p>Scaling the selection to %1x%2 may take a substantial amount of "
-+"memory. This can reduce system responsiveness and cause other application "
-+"resource problems.</p><p>Are you sure you want to scale the selection?</p></"
-+"qt>"
-+msgstr ""
-+"<qt><p>調整選擇區域的大小到 %1 x %2 會用到相當可觀的記憶體。這可能會造成系統"
-+"效能降低，並造成其他應用程式資源的問題。</p> <p>您確定要調整選擇區域的大小"
-+"嗎？</p></qt>"
- 
- #: tools/kptoolresizescale.cpp:1169
- msgid "Scale Selection?"
-@@ -1405,15 +1395,14 @@
- 
- #: tools/kptoolresizescale.cpp:1179
- msgid ""
--"<qt>"
--"<p>Smooth Scaling the image to %1x%2 may take a substantial amount of memory. "
--"This can reduce system responsiveness and cause other application resource "
--"problems.</p>"
--"<p>Are you sure you want to smooth scale the image?</p></qt>"
-+"<qt><p>Smooth Scaling the image to %1x%2 may take a substantial amount of "
-+"memory. This can reduce system responsiveness and cause other application "
-+"resource problems.</p><p>Are you sure you want to smooth scale the image?</"
-+"p></qt>"
- msgstr ""
--"<qt>"
--"<p>平滑調整影像大小到 %1 x %2 會用到相當可觀的記憶體。這可能會造成系統效能降低，並造成其他應用程式資源的問題。</p> "
--"<p>您確定要平滑調整影像大小嗎？</p></qt>"
-+"<qt><p>平滑調整影像大小到 %1 x %2 會用到相當可觀的記憶體。這可能會造成系統效"
-+"能降低，並造成其他應用程式資源的問題。</p> <p>您確定要平滑調整影像大小嗎？</"
-+"p></qt>"
- 
- #: tools/kptoolresizescale.cpp:1187
- msgid "Smooth Scale Image?"
-@@ -1425,15 +1414,14 @@
- 
- #: tools/kptoolresizescale.cpp:1193
- msgid ""
--"<qt>"
--"<p>Smooth Scaling the selection to %1x%2 may take a substantial amount of "
--"memory. This can reduce system responsiveness and cause other application "
--"resource problems.</p>"
--"<p>Are you sure you want to smooth scale the selection?</p></qt>"
--msgstr ""
--"<qt>"
--"<p>平滑調整選擇區域的大小到 %1 x %2 會用到相當可觀的記憶體。這可能會造成系統效能降低，並造成其他應用程式資源的問題。</p> "
--"<p>您確定要平滑調整選擇區域的大小嗎？</p></qt>"
-+"<qt><p>Smooth Scaling the selection to %1x%2 may take a substantial amount "
-+"of memory. This can reduce system responsiveness and cause other application "
-+"resource problems.</p><p>Are you sure you want to smooth scale the selection?"
-+"</p></qt>"
-+msgstr ""
-+"<qt><p>平滑調整選擇區域的大小到 %1 x %2 會用到相當可觀的記憶體。這可能會造成"
-+"系統效能降低，並造成其他應用程式資源的問題。</p> <p>您確定要平滑調整選擇區域"
-+"的大小嗎？</p></qt>"
- 
- #: tools/kptoolresizescale.cpp:1201
- msgid "Smooth Scale Selection?"
-@@ -1494,15 +1482,13 @@
- 
- #: tools/kptoolrotate.cpp:457
- msgid ""
--"<qt>"
--"<p>Rotating the selection to %1x%2 may take a substantial amount of memory. "
--"This can reduce system responsiveness and cause other application resource "
--"problems.</p>"
--"<p>Are you sure want to rotate the selection?</p></qt>"
-+"<qt><p>Rotating the selection to %1x%2 may take a substantial amount of "
-+"memory. This can reduce system responsiveness and cause other application "
-+"resource problems.</p><p>Are you sure want to rotate the selection?</p></qt>"
- msgstr ""
--"<qt>"
--"<p>旋轉選擇的區域到 %1 x %2 會用到相當可觀的記憶體。這可能會造成系統效能降低，並造成其他應用程式資源的問題。</p> "
--"<p>您確定要旋轉選擇的區域嗎？</p></qt>"
-+"<qt><p>旋轉選擇的區域到 %1 x %2 會用到相當可觀的記憶體。這可能會造成系統效能"
-+"降低，並造成其他應用程式資源的問題。</p> <p>您確定要旋轉選擇的區域嗎？</p></"
-+"qt>"
- 
- #: tools/kptoolrotate.cpp:465
- msgid "Rotate Selection?"
-@@ -1514,15 +1500,12 @@
- 
- #: tools/kptoolrotate.cpp:472
- msgid ""
--"<qt>"
--"<p>Rotating the image to %1x%2 may take a substantial amount of memory. This "
--"can reduce system responsiveness and cause other application resource "
--"problems.</p>"
--"<p>Are you sure want to rotate the image?</p></qt>"
--msgstr ""
--"<qt>"
--"<p>旋轉影像到 %1 x %2 會用到相當可觀的記憶體。這可能會造成系統效能降低，並造成其他應用程式資源的問題。</p> "
--"<p>您確定要旋轉影像嗎？</p></qt>"
-+"<qt><p>Rotating the image to %1x%2 may take a substantial amount of memory. "
-+"This can reduce system responsiveness and cause other application resource "
-+"problems.</p><p>Are you sure want to rotate the image?</p></qt>"
-+msgstr ""
-+"<qt><p>旋轉影像到 %1 x %2 會用到相當可觀的記憶體。這可能會造成系統效能降低，"
-+"並造成其他應用程式資源的問題。</p> <p>您確定要旋轉影像嗎？</p></qt>"
- 
- #: tools/kptoolrotate.cpp:480
- msgid "Rotate Image?"
-@@ -1622,15 +1605,13 @@
- 
- #: tools/kptoolskew.cpp:406
- msgid ""
--"<qt>"
--"<p>Skewing the selection to %1x%2 may take a substantial amount of memory. This "
--"can reduce system responsiveness and cause other application resource "
--"problems.</p>"
--"<p>Are you sure want to skew the selection?</p></qt>"
--msgstr ""
--"<qt>"
--"<p>扭曲選擇的區域到 %1 x %2 會用到相當可觀的記憶體。這可能會造成系統效能降低，並造成其他應用程式資源的問題。</p> "
--"<p>您確定要扭曲選擇的區域嗎？</p></qt>"
-+"<qt><p>Skewing the selection to %1x%2 may take a substantial amount of "
-+"memory. This can reduce system responsiveness and cause other application "
-+"resource problems.</p><p>Are you sure want to skew the selection?</p></qt>"
-+msgstr ""
-+"<qt><p>扭曲選擇的區域到 %1 x %2 會用到相當可觀的記憶體。這可能會造成系統效能"
-+"降低，並造成其他應用程式資源的問題。</p> <p>您確定要扭曲選擇的區域嗎？</p></"
-+"qt>"
- 
- #: tools/kptoolskew.cpp:414
- msgid "Skew Selection?"
-@@ -1642,14 +1623,12 @@
- 
- #: tools/kptoolskew.cpp:421
- msgid ""
--"<qt>"
--"<p>Skewing the image to %1x%2 may take a substantial amount of memory. This can "
--"reduce system responsiveness and cause other application resource problems.</p>"
--"<p>Are you sure want to skew the image?</p></qt>"
--msgstr ""
--"<qt>"
--"<p>扭曲影像到 %1 x %2 會用到相當可觀的記憶體。這可能會造成系統效能降低，並造成其他應用程式資源的問題。</p> "
--"<p>您確定要扭曲影像嗎？</p></qt>"
-+"<qt><p>Skewing the image to %1x%2 may take a substantial amount of memory. "
-+"This can reduce system responsiveness and cause other application resource "
-+"problems.</p><p>Are you sure want to skew the image?</p></qt>"
-+msgstr ""
-+"<qt><p>扭曲影像到 %1 x %2 會用到相當可觀的記憶體。這可能會造成系統效能降低，"
-+"並造成其他應用程式資源的問題。</p> <p>您確定要扭曲影像嗎？</p></qt>"
- 
- #: tools/kptoolskew.cpp:429
- msgid "Skew Image?"
-@@ -1725,34 +1704,30 @@
- 
- #: widgets/kpcolorsimilaritycube.cpp:70
- msgid ""
--"<qt>"
--"<p><b>Color Similarity</b> is how close colors must be in the RGB Color Cube to "
--"be considered the same.</p>"
--"<p>If you set it to something other than <b>Exact</b>"
--", you can work more effectively with dithered images and photos.</p>"
--"<p>This feature applies to transparent selections, as well as the Flood Fill, "
--"Color Eraser and Autocrop tools.</p>"
--"<p>To configure it, double click on the cube.</p></qt>"
--msgstr ""
--"<qt>"
--"<p><b>顏色相似度</b>是指顏色在 RGB 顏色立方體中的距離有多近則認定為相同的顏色。</p> "
--"<p>如果您設定為<b>精確</b>之外的其他值，您可以更有效率地處理抖色後圖片（dithered image）。</p> "
--"<p>這個功能會套用在透明的選擇區域，及填滿顏色、清除顏色、自動切割等工具。</p></qt>"
-+"<qt><p><b>Color Similarity</b> is how close colors must be in the RGB Color "
-+"Cube to be considered the same.</p><p>If you set it to something other than "
-+"<b>Exact</b>, you can work more effectively with dithered images and photos."
-+"</p><p>This feature applies to transparent selections, as well as the Flood "
-+"Fill, Color Eraser and Autocrop tools.</p><p>To configure it, double click "
-+"on the cube.</p></qt>"
-+msgstr ""
-+"<qt><p><b>顏色相似度</b>是指顏色在 RGB 顏色立方體中的距離有多近則認定為相同的"
-+"顏色。</p> <p>如果您設定為<b>精確</b>之外的其他值，您可以更有效率地處理抖色後"
-+"圖片（dithered image）。</p> <p>這個功能會套用在透明的選擇區域，及填滿顏色、"
-+"清除顏色、自動切割等工具。</p></qt>"
- 
- #: widgets/kpcolorsimilaritycube.cpp:91
- msgid ""
--"<qt>"
--"<p><b>Color Similarity</b> is how close colors must be in the RGB Color Cube to "
--"be considered the same.</p>"
--"<p>If you set it to something other than <b>Exact</b>"
--", you can work more effectively with dithered images and photos.</p>"
--"<p>This feature applies to transparent selections, as well as the Flood Fill, "
--"Color Eraser and Autocrop tools.</p></qt>"
--msgstr ""
--"<qt>"
--"<p><b>顏色相似度</b>是指顏色在 RGB 顏色立方體中的距離有多近則認定為相同的顏色。</p> "
--"<p>如果您設定為<b>精確</b>之外的其他值，您可以更有效率地處理抖色後圖片（dithered image）。</p> "
--"<p>這個功能會套用在透明的選擇區域，及填滿顏色、清除顏色、自動切割等工具。</p></qt>"
-+"<qt><p><b>Color Similarity</b> is how close colors must be in the RGB Color "
-+"Cube to be considered the same.</p><p>If you set it to something other than "
-+"<b>Exact</b>, you can work more effectively with dithered images and photos."
-+"</p><p>This feature applies to transparent selections, as well as the Flood "
-+"Fill, Color Eraser and Autocrop tools.</p></qt>"
-+msgstr ""
-+"<qt><p><b>顏色相似度</b>是指顏色在 RGB 顏色立方體中的距離有多近則認定為相同的"
-+"顏色。</p> <p>如果您設定為<b>精確</b>之外的其他值，您可以更有效率地處理抖色後"
-+"圖片（dithered image）。</p> <p>這個功能會套用在透明的選擇區域，及填滿顏色、"
-+"清除顏色、自動切割等工具。</p></qt>"
- 
- #: widgets/kpcolorsimilaritydialog.cpp:50
- msgid "Color Similarity"
-@@ -1781,7 +1756,7 @@
- 
- #: widgets/kpsqueezedtextlabel.cpp:114
- msgid "..."
--msgstr "..."
-+msgstr "…"
- 
- #: widgets/kptoolwidgetbrush.cpp:135
- msgid "1x1"
-diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdegraphics/kooka.po kde-i18n-zh_TW-3.5.10/messages/kdegraphics/kooka.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdegraphics/kooka.po	2006-07-22 10:04:05.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdegraphics/kooka.po	2011-11-11 15:45:17.000000000 +0100
-@@ -6,8 +6,7 @@
- "Project-Id-Version: kooka\n"
- "POT-Creation-Date: 2006-04-23 03:56+0200\n"
- "PO-Revision-Date: 2006-06-13 11:36+0800\n"
--"Last-Translator: Frank Weng (a.k.a. Franklin) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Traditional Chinese <zh_l10n@linux.org.tw>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
-@@ -194,8 +193,8 @@
- 
- #: imgprintdialog.cpp:73
- msgid ""
--"Calculates the print size from the scan resolution. Enter the scan resolution "
--"in the dialog field below."
-+"Calculates the print size from the scan resolution. Enter the scan "
-+"resolution in the dialog field below."
- msgstr "根據掃描的解析度來計算列印大小。請在底下對話框輸入掃描的解析度。"
- 
- #: imgprintdialog.cpp:77
-@@ -204,8 +203,8 @@
- 
- #: imgprintdialog.cpp:79
- msgid ""
--"Set the print size yourself in the dialog below. The image is centered on the "
--"paper."
-+"Set the print size yourself in the dialog below. The image is centered on "
-+"the paper."
- msgstr "在底下的對話框自行指定列印大小。影像會置於紙張中央。"
- 
- #: imgprintdialog.cpp:83
-@@ -214,7 +213,8 @@
- 
- #: imgprintdialog.cpp:84
- msgid ""
--"Printout uses maximum space on the selected pager. Aspect ratio is maintained."
-+"Printout uses maximum space on the selected pager. Aspect ratio is "
-+"maintained."
- msgstr "使用所選擇紙張最大可用的空間大小來縮放要列印的影像。會保持長寬比例。"
- 
- #: imgprintdialog.cpp:94
-@@ -319,13 +319,13 @@
- 
- #: kocrgocr.cpp:81
- msgid ""
--"GOCR is an Open Source project for optical character recognition.<P>"
--"The author of gocr is <B>Joerg Schulenburg</B><BR>For more information about "
-+"GOCR is an Open Source project for optical character recognition.<P>The "
-+"author of gocr is <B>Joerg Schulenburg</B><BR>For more information about "
- "gocr see <A HREF=http://jocr.sourceforge.net>http://jocr.sourceforge.net</A>"
- msgstr ""
--"GOCR 是一個可以做光學文字辨識（OCR）的自由軟體專案。<P>作者為 <B>Joerg Schulenburg</B><BR> "
--"您可以在 <A HREF=http://jocr.sourceforge.net>http://jocr.sourceforge.net</A> "
--"取得更多資訊。"
-+"GOCR 是一個可以做光學文字辨識（OCR）的自由軟體專案。<P>作者為 <B>Joerg "
-+"Schulenburg</B><BR> 您可以在 <A HREF=http://jocr.sourceforge.net>http://jocr."
-+"sourceforge.net</A> 取得更多資訊。"
- 
- #: kocrgocr.cpp:110
- msgid ""
-@@ -398,15 +398,14 @@
- 
- #: kocrkadmos.cpp:90
- msgid ""
--"This version of Kooka was linked with the <I>KADMOS OCR/ICR engine</I>"
--", a commercial engine for optical character recognition.<P>"
--"Kadmos is a product of <B>re Recognition AG</B><BR>For more information about "
--"Kadmos OCR see <A HREF=http://www.rerecognition.com>"
--"http://www.rerecognition.com</A>"
--msgstr ""
--"這個版本的 Kooka 連結到一個商業版的光學文字辨識系統，叫做 <I>KADMOS OCR/ICR</I>。 <P>Kadmos <B>"
--"re Recognition AG</B> 的產品。<BR> 您可以在 <A HREF=http://www.rerecognition.com>"
--"http://www.rerecognition.com</A> 找到更多資訊。"
-+"This version of Kooka was linked with the <I>KADMOS OCR/ICR engine</I>, a "
-+"commercial engine for optical character recognition.<P>Kadmos is a product "
-+"of <B>re Recognition AG</B><BR>For more information about Kadmos OCR see <A "
-+"HREF=http://www.rerecognition.com>http://www.rerecognition.com</A>"
-+msgstr ""
-+"這個版本的 Kooka 連結到一個商業版的光學文字辨識系統，叫做 <I>KADMOS OCR/ICR</"
-+"I>。 <P>Kadmos <B>re Recognition AG</B> 的產品。<BR> 您可以在 <A HREF=http://"
-+"www.rerecognition.com>http://www.rerecognition.com</A> 找到更多資訊。"
- 
- #: kocrkadmos.cpp:110
- msgid "European Countries"
-@@ -485,23 +484,20 @@
- 
- #: kocrocrad.cpp:82
- msgid ""
--"ocrad is a Free Software project for optical character recognition."
--"<p>The author of ocrad is <b>Antonio Diaz</b>"
--"<br>For more information about ocrad see <A "
--"HREF=\"http://www.gnu.org/software/ocrad/ocrad.html\">"
--"http://www.gnu.org/software/ocrad/ocrad.html</A>"
--"<p>Images should be scanned in black/white mode for ocrad."
--"<br>Best results are achieved if the characters are at least 20 pixels high."
--"<p>Problems arise, as usual, with very bold or very light or broken characters, "
--"the same with merged character groups."
--msgstr ""
--"ocrad 是一套可以做光學文字辨識的自由軟體專案。 "
--"<p>作者是 <b>Antonio Diaz</b>"
--"<br> 您可以在 <A HREF=\"http://www.gnu.org/software/ocrad/ocrad.html\">"
--"http://www.gnu.org/software/ocrad/ocrad.html</A> 找到更多資訊。 "
--"<p>影像在交給 ocrad 處理前要以黑白模式來掃描。"
--"<br> 若是文字至少有 20 像素以上，則辨識結果會最好。 "
--"<p>不過在遇到（非常）粗體字，或是非常淡，或不清楚的字元，辨識就容易出問題。"
-+"ocrad is a Free Software project for optical character recognition.<p>The "
-+"author of ocrad is <b>Antonio Diaz</b><br>For more information about ocrad "
-+"see <A HREF=\"http://www.gnu.org/software/ocrad/ocrad.html\">http://www.gnu."
-+"org/software/ocrad/ocrad.html</A><p>Images should be scanned in black/white "
-+"mode for ocrad.<br>Best results are achieved if the characters are at least "
-+"20 pixels high.<p>Problems arise, as usual, with very bold or very light or "
-+"broken characters, the same with merged character groups."
-+msgstr ""
-+"ocrad 是一套可以做光學文字辨識的自由軟體專案。 <p>作者是 <b>Antonio Diaz</"
-+"b><br> 您可以在 <A HREF=\"http://www.gnu.org/software/ocrad/ocrad.html"
-+"\">http://www.gnu.org/software/ocrad/ocrad.html</A> 找到更多資訊。 <p>影像在"
-+"交給 ocrad 處理前要以黑白模式來掃描。<br> 若是文字至少有 20 像素以上，則辨識"
-+"結果會最好。 <p>不過在遇到（非常）粗體字，或是非常淡，或不清楚的字元，辨識就"
-+"容易出問題。"
- 
- #: kocrocrad.cpp:121
- msgid ""
-@@ -541,11 +537,11 @@
- 
- #: kooka.cpp:140
- msgid "&OCR Image..."
--msgstr "辨識影像中的文字(&O)..."
-+msgstr "辨識影像中的文字(&O)…"
- 
- #: kooka.cpp:144
- msgid "O&CR on Selection..."
--msgstr "選擇文字辨識(&C)..."
-+msgstr "選擇文字辨識(&C)…"
- 
- #: kooka.cpp:149
- msgid "Scale to W&idth"
-@@ -565,7 +561,7 @@
- 
- #: kooka.cpp:182
- msgid "Set Zoom..."
--msgstr "設定縮放..."
-+msgstr "設定縮放…"
- 
- #: kooka.cpp:187
- msgid "Create From Selectio&n"
-@@ -601,15 +597,15 @@
- 
- #: kooka.cpp:223
- msgid "&Create Folder..."
--msgstr "建立資料夾(&C)..."
-+msgstr "建立資料夾(&C)…"
- 
- #: kooka.cpp:228
- msgid "&Save Image..."
--msgstr "儲存影像(&S)..."
-+msgstr "儲存影像(&S)…"
- 
- #: kooka.cpp:233
- msgid "&Import Image..."
--msgstr "匯入影像(&I)..."
-+msgstr "匯入影像(&I)…"
- 
- #: kooka.cpp:238
- msgid "&Delete Image"
-@@ -735,7 +731,7 @@
- "stations configured for SANE!"
- msgstr ""
- "勾選此選項，您可以在網路上查詢可用的掃描器。\n"
--"請注意，這不表示會在整個網路上尋找，而是在設定 SANE 的站台上尋找。"
-+"請注意，這不表示會在整個網路上尋找，而是在設定 SANE 的站臺上尋找。"
- 
- #: kookapref.cpp:326
- msgid "Show the scanner selection box on next startup"
-@@ -743,7 +739,8 @@
- 
- #: kookapref.cpp:329
- msgid ""
--"Check this if you once checked 'do not show the scanner selection on startup',\n"
-+"Check this if you once checked 'do not show the scanner selection on "
-+"startup',\n"
- "but you want to see it again."
- msgstr "勾選此選項的話，下次啟動就會再詢問您要使用哪個掃描器。"
- 
-@@ -753,8 +750,8 @@
- 
- #: kookapref.cpp:337
- msgid ""
--"Check this if you want Kooka to load the last selected image into the viewer on "
--"startup.\n"
-+"Check this if you want Kooka to load the last selected image into the viewer "
-+"on startup.\n"
- "If your images are large, that might slow down Kooka's start."
- msgstr ""
- "勾選此選項的話，Kooka 啟動時會載入上次檢視的最後一張影像。\n"
-@@ -831,11 +828,11 @@
- 
- #: kookapref.cpp:431
- msgid "Frame color &1: "
--msgstr "框架顏色 1 (&1)："
-+msgstr "框架顏色 1(&1)："
- 
- #: kookapref.cpp:435
- msgid "Frame color &2: "
--msgstr "框架顏色 2 (&2)："
-+msgstr "框架顏色 2(&2)："
- 
- #: kookapref.cpp:504
- msgid ""
-@@ -1014,10 +1011,8 @@
- msgstr "KADMOS 安裝問題"
- 
- #: ksaneocr.cpp:607
--msgid ""
--"The KADMOS OCR system could not be started:\n"
--msgstr ""
--"KADMOS OCR 系統無法啟動：\n"
-+msgid "The KADMOS OCR system could not be started:\n"
-+msgstr "KADMOS OCR 系統無法啟動：\n"
- 
- #: ksaneocr.cpp:609
- msgid ""
-diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdegraphics/kpdf.po kde-i18n-zh_TW-3.5.10/messages/kdegraphics/kpdf.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdegraphics/kpdf.po	2008-08-19 20:43:07.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdegraphics/kpdf.po	2011-11-11 15:45:17.000000000 +0100
-@@ -9,8 +9,7 @@
- "Project-Id-Version: kpdf\n"
- "POT-Creation-Date: 2008-07-23 01:41+0200\n"
- "PO-Revision-Date: 2007-04-12 12:11+0800\n"
--"Last-Translator: Frank Weng (a.k.a. Franklin) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Chinese Traditional <zh-l10n@linux.org.tw>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
-@@ -38,10 +37,12 @@
- 
- #: ui/presentationwidget.cpp:329
- msgid ""
--"There are two ways of exiting presentation mode, you can press either ESC key "
--"or click with the quit button that appears when placing the mouse in the "
-+"There are two ways of exiting presentation mode, you can press either ESC "
-+"key or click with the quit button that appears when placing the mouse in the "
- "top-right corner. Of course you can cycle windows (Alt+TAB by default)"
--msgstr "有兩個方法離開展示模式。您可以按下 ESC 鍵，或是將滑鼠移到右下角然後點選「離開」。當然您也可以用 ALT+TAB 切換視窗。"
-+msgstr ""
-+"有兩個方法離開展示模式。您可以按下 ESC 鍵，或是將滑鼠移到右下角然後點選「離"
-+"開」。當然您也可以用 ALT+TAB 切換視窗。"
- 
- #: ui/thumbnaillist.cpp:568
- msgid "Show bookmarked pages only"
-@@ -159,7 +160,7 @@
- 
- #: ui/pageview.cpp:1126
- msgid "Save to File..."
--msgstr "儲存到檔案..."
-+msgstr "儲存到檔案…"
- 
- #: ui/pageview.cpp:1144
- msgid "Image [%1x%2] copied to clipboard."
-@@ -224,21 +225,26 @@
- 
- #: conf/dlgperformance.ui.h:25
- msgid ""
--"Keeps used memory as low as possible. Do not reuse anything. (For systems with "
--"low memory.)"
--msgstr "盡量減少記憶體使用量。不要重複使用任何東西。（給記憶體較少的系統用的。）"
-+"Keeps used memory as low as possible. Do not reuse anything. (For systems "
-+"with low memory.)"
-+msgstr ""
-+"盡量減少記憶體使用量。不要重複使用任何東西。（給記憶體較少的系統用的。）"
- 
- #: conf/dlgperformance.ui.h:31
- msgid ""
- "A good compromise between memory usage and speed gain. Preload next page and "
- "boost searches. (For systems with 256MB of memory, typically.)"
--msgstr "這是記憶體使用量與速度增益的折衷方案。預先載入下一頁並加速搜尋。（給 256 MB 左右記憶體的系統用的。）"
-+msgstr ""
-+"這是記憶體使用量與速度增益的折衷方案。預先載入下一頁並加速搜尋。（給 256 MB "
-+"左右記憶體的系統用的。）"
- 
- #: conf/dlgperformance.ui.h:37
- msgid ""
- "Keeps everything in memory. Preload next pages. Boost searches. (For systems "
- "with more than 512MB of memory.)"
--msgstr "盡量在記憶體中保留每個東西。預先載入下一頁並加速搜尋。（給超過 512MB 記憶體的系統用的。）"
-+msgstr ""
-+"盡量在記憶體中保留每個東西。預先載入下一頁並加速搜尋。（給超過 512MB 記憶體的"
-+"系統用的。）"
- 
- #: conf/preferencesdialog.cpp:29
- msgid "General"
-@@ -286,8 +292,8 @@
- 
- #: core/document.cpp:998 core/document.cpp:1006
- msgid ""
--"The pdf file is trying to execute an external application and for your safety "
--"kpdf does not allow that."
-+"The pdf file is trying to execute an external application and for your "
-+"safety kpdf does not allow that."
- msgstr "此 PDF 檔正試著執行外部應用程式，但為了安全起見，kpdf 不允許此動作。"
- 
- #: core/document.cpp:1019
-@@ -392,9 +398,11 @@
- #: core/generator_pdf/generator_pdf.cpp:486
- msgid ""
- "The margins you specified change the page aspect ratio. Do you want to print "
--"with the aspect ratio changed or do you want the margins to be adapted so that "
--"the aspect ratio is preserved?"
--msgstr "您指定的邊界會改變頁面的比例。您要依指定的邊界來列印，還是保留頁面比例並修改邊界？"
-+"with the aspect ratio changed or do you want the margins to be adapted so "
-+"that the aspect ratio is preserved?"
-+msgstr ""
-+"您指定的邊界會改變頁面的比例。您要依指定的邊界來列印，還是保留頁面比例並修改"
-+"邊界？"
- 
- #: core/generator_pdf/generator_pdf.cpp:487
- msgid "Aspect ratio change"
-@@ -498,7 +506,7 @@
- 
- #: core/link.cpp:26
- msgid "Execute '%1'..."
--msgstr "執行 %1..."
-+msgstr "執行 %1…"
- 
- #: core/link.cpp:39
- msgid "First Page"
-@@ -530,11 +538,11 @@
- 
- #: core/link.cpp:57
- msgid "Find..."
--msgstr "尋找..."
-+msgstr "尋找…"
- 
- #: core/link.cpp:59
- msgid "Go To Page..."
--msgstr "跳到頁面..."
-+msgstr "跳到頁面…"
- 
- #: shell/main.cpp:22
- msgid "kpdf, a kde pdf viewer based on xpdf"
-@@ -604,7 +612,9 @@
- "Forces the rasterization of each page into an image before printing it. This "
- "usually gives somewhat worse results, but is useful when printing documents "
- "that appear to print incorrectly."
--msgstr "在每一頁的圖片列印前強制光柵。通常結果會變差，但是若某些文件列印結果不正確時，此選項可能有用。"
-+msgstr ""
-+"在每一頁的圖片列印前強制光柵。通常結果會變差，但是若某些文件列印結果不正確"
-+"時，此選項可能有用。"
- 
- #: part.cpp:172
- msgid "Show &Navigation Panel"
-@@ -644,7 +654,7 @@
- 
- #: part.cpp:290
- msgid "Configure KPDF..."
--msgstr "設定 KPDF..."
-+msgstr "設定 KPDF…"
- 
- #: part.cpp:294
- msgid "&Properties"
-@@ -660,7 +670,7 @@
- 
- #: part.cpp:434
- msgid "Converting from ps to pdf..."
--msgstr "從 ps 轉換為 pdf..."
-+msgstr "從 ps 轉換為 pdf…"
- 
- #: part.cpp:445
- msgid "You do not have ps2pdf installed, so kpdf cannot open postscript files."
-@@ -679,18 +689,18 @@
- 
- #: part.cpp:612
- msgid "Reloading the document..."
--msgstr "重新載入文件中..."
-+msgstr "重新載入文件中…"
- 
- #: part.cpp:641
- msgid ""
--"This link points to a close document action that does not work when using the "
--"embedded viewer."
-+"This link points to a close document action that does not work when using "
-+"the embedded viewer."
- msgstr "這個連結指到一個已關閉的文件動作，該動作在嵌入式檢視器中無法進行。"
- 
- #: part.cpp:689
- msgid ""
--"This link points to a quit application action that does not work when using the "
--"embedded viewer."
-+"This link points to a quit application action that does not work when using "
-+"the embedded viewer."
- msgstr "這個連結指到一個離開應用程式的動作，該動作在嵌入式檢視器中無法進行。"
- 
- #: part.cpp:702
-diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdegraphics/kpovmodeler.po kde-i18n-zh_TW-3.5.10/messages/kdegraphics/kpovmodeler.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdegraphics/kpovmodeler.po	2006-10-01 18:34:11.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdegraphics/kpovmodeler.po	2011-11-11 15:45:17.000000000 +0100
-@@ -1,7 +1,7 @@
- # translation of kpovmodeler.po to Chinese Traditional
- # Copyright (C) 2002,2003, 2006 Free Software Foundation, Inc.
- #
--# 繁體中文是由簡體中文翻譯轉換後修改而成，特此致謝。
-+# 傳統字漢語是由簡化字漢語翻譯轉換後修改而成，特此致謝。
- #
- # Xiong Jiang <jxiong@offtopic.org>, 2002,2003.
- # Frank Weng (a.k.a. Franklin) <franklin at goodhorse dot idv dot tw>, 2006.
-@@ -10,8 +10,7 @@
- "Project-Id-Version: kpovmodeler\n"
- "POT-Creation-Date: 2006-05-28 03:57+0200\n"
- "PO-Revision-Date: 2006-09-12 09:50+0800\n"
--"Last-Translator: Frank Weng (a.k.a. Franklin) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Chinese Traditional <zh-l10n@linux.org.tw>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
-@@ -22,7 +21,7 @@
- msgid ""
- "_: NAME OF TRANSLATORS\n"
- "Your names"
--msgstr "KDE 簡體中文翻譯組，Frank Weng (a.k.a. Franklin)"
-+msgstr "KDE 簡化字漢語翻譯組，Frank Weng (a.k.a. Franklin)"
- 
- #: _translatorinfo.cpp:3
- msgid ""
-@@ -598,7 +597,7 @@
- 
- #: pmdeclareedit.cpp:71 pmlinkedit.cpp:69
- msgid "Select..."
--msgstr "選擇..."
-+msgstr "選擇…"
- 
- #: pmdeclareedit.cpp:123
- msgid "Please enter an identifier!"
-@@ -1549,15 +1548,15 @@
- 
- #: pmlayoutsettings.cpp:49
- msgid "Default view layout:"
--msgstr "預設檢視佈局："
-+msgstr "預設檢視布局："
- 
- #: pmlayoutsettings.cpp:54
- msgid "Available View Layouts"
--msgstr "可用檢視佈局"
-+msgstr "可用檢視布局"
- 
- #: pmlayoutsettings.cpp:72 pmsettingsdialog.cpp:112
- msgid "View Layout"
--msgstr "檢視佈局"
-+msgstr "檢視布局"
- 
- #: pmlayoutsettings.cpp:77 pmnamedobjectedit.cpp:39
- msgid "Name:"
-@@ -1613,12 +1612,12 @@
- 
- #: pmlayoutsettings.cpp:213
- msgid "View layouts may not have empty names."
--msgstr "檢視佈局名稱不能為空。"
-+msgstr "檢視布局名稱不能為空。"
- 
- #: pmlayoutsettings.cpp:223
- msgid ""
- "The docking position of the first view layout entry has to be 'New Column'."
--msgstr "第一個檢視佈局項目的嵌入位置必須為「新欄」。"
-+msgstr "第一個檢視布局項目的嵌入位置必須為「新欄」。"
- 
- #: pmlayoutsettings.cpp:263 pmlayoutsettings.cpp:267
- msgid "Unnamed"
-@@ -2056,9 +2055,10 @@
- 
- #: pmmovecommand.cpp:449
- msgid ""
--"The %1 \"%2\" can't be moved because it contains a link to the declare \"%3\" "
--"and the insert point is not after the declare."
--msgstr "%1 \"%2\" 不能被移動，因為它含有到宣告 %3 的連結，並且插入點不在該宣告後面。"
-+"The %1 \"%2\" can't be moved because it contains a link to the declare \"%3"
-+"\" and the insert point is not after the declare."
-+msgstr ""
-+"%1 \"%2\" 不能被移動，因為它含有到宣告 %3 的連結，並且插入點不在該宣告後面。"
- 
- #: pmnormal.cpp:91
- msgid "normal"
-@@ -2082,7 +2082,7 @@
- 
- #: pmobjectlibrarysettings.cpp:49
- msgid "Create..."
--msgstr "建立..."
-+msgstr "建立…"
- 
- #: pmobjectlibrarysettings.cpp:63
- msgid "Library Details"
-@@ -2234,8 +2234,8 @@
- "unsupported povray code to the scene, you can put this code between the two "
- "special comments \"//*PMRawBegin\" and \"//*PMRawEnd\"."
- msgstr ""
--"注意：完整的 povray 語法還沒有支援。如果您要在場景裡新增尚未支援的 povray 代碼，您可以把該代碼放在兩個特別的註解 //*PMRawBegin "
--"和 //*PMRawEnd 之間。"
-+"注意：完整的 povray 語法還沒有支援。如果您要在場景裡新增尚未支援的 povray 代"
-+"碼，您可以把該代碼放在兩個特別的註解 //*PMRawBegin 和 //*PMRawEnd 之間。"
- 
- #: pmparser.cpp:110
- msgid "Line %1: "
-@@ -2275,11 +2275,11 @@
- 
- #: pmpart.cpp:244
- msgid "Import..."
--msgstr "匯入..."
-+msgstr "匯入…"
- 
- #: pmpart.cpp:247
- msgid "&Export..."
--msgstr "匯出(&E)..."
-+msgstr "匯出(&E)…"
- 
- #: pmpart.cpp:254 pmrendermodesdialog.cpp:41 pmrendermodesdialog.cpp:243
- msgid "Render Modes"
-@@ -2291,7 +2291,7 @@
- 
- #: pmpart.cpp:261
- msgid "Render Modes..."
--msgstr "成像模式..."
-+msgstr "成像模式…"
- 
- #: pmpart.cpp:263 pmpovraywidget.cpp:108
- msgid "Render Window"
-@@ -2598,15 +2598,15 @@
- 
- #: pmpart.cpp:1447
- msgid "Cutting selection..."
--msgstr "正在剪下選擇區..."
-+msgstr "正在剪下選擇區…"
- 
- #: pmpart.cpp:1462
- msgid "Deleting selection..."
--msgstr "正在刪除選擇區..."
-+msgstr "正在刪除選擇區…"
- 
- #: pmpart.cpp:1471
- msgid "Copying selection to clipboard..."
--msgstr "正在將選擇區複製到剪貼簿..."
-+msgstr "正在將選擇區複製到剪貼簿…"
- 
- #: pmpart.cpp:1484 pmpart.cpp:1522
- msgid "Drag"
-@@ -2618,15 +2618,15 @@
- 
- #: pmpart.cpp:1550
- msgid "Inserting clipboard contents..."
--msgstr "正在插入剪貼簿內容..."
-+msgstr "正在插入剪貼簿內容…"
- 
- #: pmpart.cpp:1679
- msgid "Undo last change..."
--msgstr "取消最後的改變..."
-+msgstr "取消最後的改變…"
- 
- #: pmpart.cpp:1697
- msgid "Redo last change..."
--msgstr "重做最後的改變..."
-+msgstr "重做最後的改變…"
- 
- #: pmpart.cpp:2230
- msgid "Declare"
-@@ -3182,16 +3182,12 @@
- msgstr "需要一個圖形物件"
- 
- #: pmpovrayrenderwidget.cpp:72
--msgid ""
--"Can't render an empty scene.\n"
--msgstr ""
--"無法成像空的場景。\n"
-+msgid "Can't render an empty scene.\n"
-+msgstr "無法成像空的場景。\n"
- 
- #: pmpovrayrenderwidget.cpp:82
--msgid ""
--"Couldn't write the scene to a temp file.\n"
--msgstr ""
--"無法將場景寫入暫存檔。\n"
-+msgid "Couldn't write the scene to a temp file.\n"
-+msgstr "無法將場景寫入暫存檔。\n"
- 
- #: pmpovrayrenderwidget.cpp:141
- msgid ""
-@@ -3227,11 +3223,11 @@
- 
- #: pmpovraysettings.cpp:97
- msgid "Add..."
--msgstr "新增..."
-+msgstr "新增…"
- 
- #: pmpovraysettings.cpp:104 pmrendermodesdialog.cpp:61
- msgid "Edit..."
--msgstr "編輯..."
-+msgstr "編輯…"
- 
- #: pmpovraysettings.cpp:108 pmrendermodesdialog.cpp:63
- msgid "Up"
-@@ -3567,7 +3563,7 @@
- 
- #: pmrawedit.cpp:38
- msgid "Povray code:"
--msgstr "Povray 源碼："
-+msgstr "Povray 原始碼："
- 
- #: pmrendermanager.cpp:1317
- msgid "not supported"
-@@ -3798,7 +3794,7 @@
- 
- #: pmsettingsdialog.cpp:113
- msgid "Display Settings for View Layouts"
--msgstr "檢視佈局的顯示設定"
-+msgstr "檢視布局的顯示設定"
- 
- #: pmsettingsdialog.cpp:120
- msgid "Object Libraries"
-@@ -3866,11 +3862,11 @@
- 
- #: pmshell.cpp:163
- msgid "View Layouts"
--msgstr "檢視佈局"
-+msgstr "檢視布局"
- 
- #: pmshell.cpp:170
- msgid "Save View Layout..."
--msgstr "儲存檢視佈局..."
-+msgstr "儲存檢視布局…"
- 
- #: pmshell.cpp:405 pmshell.cpp:438
- msgid "Povray Modeler Files (*.kpm)"
-@@ -4179,19 +4175,19 @@
- 
- #: pmviewlayoutmanager.cpp:713 pmviewlayoutmanager.cpp:752
- msgid "Could not open the view layouts file."
--msgstr "無法開啟檢視佈局檔案。"
-+msgstr "無法開啟檢視布局檔案。"
- 
- #: pmviewlayoutmanager.cpp:746
- msgid "View layouts not found."
--msgstr "找不到檢視佈局。"
-+msgstr "找不到檢視布局。"
- 
- #: pmviewlayoutmanager.cpp:871
- msgid "Save View Layout"
--msgstr "儲存檢視佈局"
-+msgstr "儲存檢視布局"
- 
- #: pmviewlayoutmanager.cpp:882
- msgid "Enter view layout name:"
--msgstr "輸入檢視佈局名稱："
-+msgstr "輸入檢視布局名稱："
- 
- #: pmwarp.cpp:106
- msgid "warp"
-@@ -4233,7 +4229,8 @@
- msgid ""
- "This document was created with a newer version of KPovModeler. The whole "
- "document may not be loaded correctly."
--msgstr "這個文件是用較新版本的 KPovModeler 建立的。因此可能不能正確載入整份文件。"
-+msgstr ""
-+"這個文件是用較新版本的 KPovModeler 建立的。因此可能不能正確載入整份文件。"
- 
- #: pmxmlparser.cpp:114 pmxmlparser.cpp:175
- msgid "Wrong top level tag"
-diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdegraphics/kruler.po kde-i18n-zh_TW-3.5.10/messages/kdegraphics/kruler.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdegraphics/kruler.po	2006-07-22 10:04:05.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdegraphics/kruler.po	2011-11-11 15:45:17.000000000 +0100
-@@ -7,8 +7,7 @@
- "Project-Id-Version: kruler\n"
- "POT-Creation-Date: 2004-10-12 01:17+0200\n"
- "PO-Revision-Date: 2006-06-13 08:44+0800\n"
--"Last-Translator: Frank Weng (a.k.a. Franklin) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Traditional Chinese <zh_l10n@linux.org.tw>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
-@@ -19,7 +18,8 @@
- msgid ""
- "This is a tool to measure pixel distances and colors on the screen. It is "
- "useful for working on layouts of dialogs, web pages etc."
--msgstr "這是一個量測螢幕圖素距離及顏色的工具。在對話框、網頁設計等排版時非常有用。"
-+msgstr ""
-+"這是一個量測螢幕圖素距離及顏色的工具。在對話框、網頁設計等排版時非常有用。"
- 
- #: klineal.cpp:122
- msgid "This is the current distance measured in pixels."
-@@ -27,10 +27,12 @@
- 
- #: klineal.cpp:134
- msgid ""
--"This is the current color in hexadecimal rgb representation as you may use it "
--"in HTML or as a QColor name. The rectangles background shows the color of the "
--"pixel inside the little square at the end of the line cursor."
--msgstr "這是目前用十六進位 RGB 表示顏色，您可以在超文字連結或 QColor 名稱上使用。矩形背景顯示游標末行小正方形內的像素顏色。"
-+"This is the current color in hexadecimal rgb representation as you may use "
-+"it in HTML or as a QColor name. The rectangles background shows the color of "
-+"the pixel inside the little square at the end of the line cursor."
-+msgstr ""
-+"這是目前用十六進位 RGB 表示顏色，您可以在超文字連結或 QColor 名稱上使用。矩形"
-+"背景顯示游標末行小正方形內的像素顏色。"
- 
- #: klineal.cpp:147
- msgid "KRuler"
-@@ -86,11 +88,11 @@
- 
- #: klineal.cpp:162
- msgid "&Choose Color..."
--msgstr "選擇顏色(&C)..."
-+msgstr "選擇顏色(&C)…"
- 
- #: klineal.cpp:163
- msgid "Choose &Font..."
--msgstr "選擇字型(&F)..."
-+msgstr "選擇字型(&F)…"
- 
- #: klineal.cpp:293
- msgid "&Full Screen Height"
-diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdegraphics/ksnapshot.po kde-i18n-zh_TW-3.5.10/messages/kdegraphics/ksnapshot.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdegraphics/ksnapshot.po	2006-07-22 10:04:05.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdegraphics/ksnapshot.po	2011-11-11 15:45:17.000000000 +0100
-@@ -7,7 +7,7 @@
- "Project-Id-Version: head\n"
- "POT-Creation-Date: 2006-07-01 03:59+0200\n"
- "PO-Revision-Date: 2006-03-23 13:11+0800\n"
--"Last-Translator: You-Cheng Hsieh <yochenhsieh@xuite.net>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Traditional Chinese <zh-l10n@linux.org.tw>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
-@@ -27,7 +27,8 @@
- msgstr ""
- "這是目前快照的預覽。\n"
- "\n"
--"這張圖片能夠拖曳至其他的程式或文件內成為完整的快照。請用 Konqueror 檔案管理員試試看。\n"
-+"這張圖片能夠拖曳至其他的程式或文件內成為完整的快照。請用 Konqueror 檔案管理員"
-+"試試看。\n"
- "\n"
- "您也可以按下 Ctrl+C 將圖片複製到剪貼簿。"
- 
-@@ -129,26 +130,25 @@
- msgid ""
- "<qt>Using this menu, you can select from the four following snapshot modes:\n"
- "<p>\n"
--"<b>Full Screen</b> - captures the entire desktop."
--"<br>\n"
--"<b>Window Under Cursor</b> - captures only the window (or menu) that is under "
--"the mouse cursor when the snapshot is taken."
--"<br>\n"
--"<b>Region</b> - captures only the region of the desktop that you specify. When "
--"taking a new snapshot in this mode you will be able to select any area of the "
--"screen by clicking and dragging the mouse.</p>\n"
--"<b>Section of Window</b> - captures only a section of the window. When taking a "
--"new snapshot in this mode you will be able to select any child window by moving "
--"the mouse over it.</p></qt>"
-+"<b>Full Screen</b> - captures the entire desktop.<br>\n"
-+"<b>Window Under Cursor</b> - captures only the window (or menu) that is "
-+"under the mouse cursor when the snapshot is taken.<br>\n"
-+"<b>Region</b> - captures only the region of the desktop that you specify. "
-+"When taking a new snapshot in this mode you will be able to select any area "
-+"of the screen by clicking and dragging the mouse.</p>\n"
-+"<b>Section of Window</b> - captures only a section of the window. When "
-+"taking a new snapshot in this mode you will be able to select any child "
-+"window by moving the mouse over it.</p></qt>"
- msgstr ""
- "<qt>使用這個選單，您可以選擇以下四種快照模式：\n"
- "<p>\n"
--"<b>全螢幕</b> - 擷取整個桌面。"
--"<br>\n"
-+"<b>全螢幕</b> - 擷取整個桌面。<br>\n"
- "<b>游標下的視窗</b> - 擷取快照時只會擷取位於滑鼠游標之下的視窗（或選單）。"
- "<br>\n"
--"<b>部份桌面區域</b> - 只擷取您指定的桌面區域。以這個模式擷取快照時您可以用滑鼠點擊並拖曳來選擇螢幕上的任何區域。</p>\n"
--"<b>部份視窗區域</b> - 只擷取部份視窗區域。以這個模式擷取快照時您可以移動滑鼠來選擇任何子視窗。</p></qt>"
-+"<b>部份桌面區域</b> - 只擷取您指定的桌面區域。以這個模式擷取快照時您可以用滑"
-+"鼠點擊並拖曳來選擇螢幕上的任何區域。</p>\n"
-+"<b>部份視窗區域</b> - 只擷取部份視窗區域。以這個模式擷取快照時您可以移動滑鼠"
-+"來選擇任何子視窗。</p></qt>"
- 
- #. i18n: file ksnapshotwidget.ui line 177
- #: rc.cpp:61
-@@ -166,7 +166,7 @@
- #: rc.cpp:67
- #, no-c-format
- msgid "&Save As..."
--msgstr "儲存快照(&S)..."
-+msgstr "儲存快照(&S)…"
- 
- #. i18n: file ksnapshotwidget.ui line 214
- #: rc.cpp:70
-@@ -175,7 +175,9 @@
- "Click this button to save the current snapshot. To quickly save the snapshot "
- "without showing the file dialog, press Ctrl+Shift+S. The filename is "
- "automatically incremented after each save."
--msgstr "按下這個按鈕來儲存目前的快照。要快速儲存快照而不顯示檔案對話窗，按下 Ctrl+Shift+S。檔案名稱會在每次儲存後自動遞增。"
-+msgstr ""
-+"按下這個按鈕來儲存目前的快照。要快速儲存快照而不顯示檔案對話窗，按下 Ctrl"
-+"+Shift+S。檔案名稱會在每次儲存後自動遞增。"
- 
- #. i18n: file ksnapshotwidget.ui line 222
- #: rc.cpp:73
-@@ -213,7 +215,7 @@
- 
- #: ksnapshot.cpp:120
- msgid "Quick Save Snapshot &As..."
--msgstr "快速儲存快照(&A)..."
-+msgstr "快速儲存快照(&A)…"
- 
- #: ksnapshot.cpp:121
- msgid ""
-@@ -223,7 +225,7 @@
- 
- #: ksnapshot.cpp:125
- msgid "Save Snapshot &As..."
--msgstr "儲存快照(&A)..."
-+msgstr "儲存快照(&A)…"
- 
- #: ksnapshot.cpp:126
- msgid "Save the snapshot to the file specified by the user."
-@@ -298,21 +300,25 @@
- #~ msgid ""
- #~ "This button creates a snapshot image of the screen.\n"
- #~ "\n"
--#~ "If the delay is set to \"No Delay\" the snapshot will be taken when you click the mouse."
-+#~ "If the delay is set to \"No Delay\" the snapshot will be taken when you "
-+#~ "click the mouse."
- #~ msgstr ""
- #~ "按下該扭將會捕捉目前螢幕的影像。\n"
- #~ "\n"
--#~ "如果抓圖延遲的時間設定為不延遲，那當您按下滑鼠按鈕時，當時的畫面就會被擷取下來。"
-+#~ "如果抓圖延遲的時間設定為不延遲，那當您按下滑鼠按鈕時，當時的畫面就會被擷取"
-+#~ "下來。"
- 
- #~ msgid "&Print Snapshot..."
--#~ msgstr "列印快照(&P)..."
-+#~ msgstr "列印快照(&P)…"
- 
- #, fuzzy
- #~ msgid "&Save Snapshot"
--#~ msgstr "儲存快照(&S)..."
-+#~ msgstr "儲存快照(&S)…"
- 
- #, fuzzy
--#~ msgid "This button saves the snapshot to the default location, then increments the filename."
-+#~ msgid ""
-+#~ "This button saves the snapshot to the default location, then increments "
-+#~ "the filename."
- #~ msgstr "按下這按鈕把這快照另存新檔。"
- 
- #~ msgid "&Only grab the window containing the pointer"
-diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdegraphics/ksvgplugin.po kde-i18n-zh_TW-3.5.10/messages/kdegraphics/ksvgplugin.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdegraphics/ksvgplugin.po	2006-07-22 10:04:05.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdegraphics/ksvgplugin.po	2011-11-11 15:45:17.000000000 +0100
-@@ -9,8 +9,7 @@
- "Project-Id-Version: ksvgplugin\n"
- "POT-Creation-Date: 2005-05-18 21:25+0200\n"
- "PO-Revision-Date: 2006-06-09 17:15+0800\n"
--"Last-Translator: Frank Weng (a.k.a. Franklin) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Traditional Chinese <zh_l10n@linux.org.tw>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
-@@ -51,7 +50,7 @@
- 
- #: ksvg_plugin.cpp:121
- msgid "Save to PNG..."
--msgstr "儲存到 PNG 檔..."
-+msgstr "儲存到 PNG 檔…"
- 
- #: ksvg_plugin.cpp:123
- msgid "About KSVG"
-diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdegraphics/kuickshow.po kde-i18n-zh_TW-3.5.10/messages/kdegraphics/kuickshow.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdegraphics/kuickshow.po	2007-05-14 12:22:53.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdegraphics/kuickshow.po	2011-11-11 15:45:17.000000000 +0100
-@@ -7,8 +7,7 @@
- "Project-Id-Version: kuickshow\n"
- "POT-Creation-Date: 2007-03-26 02:14+0200\n"
- "PO-Revision-Date: 2006-12-18 13:07+0800\n"
--"Last-Translator: Frank Weng (a.k.a. Franklin) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Chinese Traditional <zh-l10n@linux.org.tw>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
-@@ -221,7 +220,7 @@
- 
- #: imagewindow.cpp:192 kuickshow.cpp:254
- msgid "Print Image..."
--msgstr "列印影像..."
-+msgstr "列印影像…"
- 
- #: imagewindow.cpp:201
- msgid "More Brightness"
-@@ -285,7 +284,8 @@
- #: imagewindow.cpp:431
- msgid ""
- "Unable to load the image %1.\n"
--"Perhaps the file format is unsupported or your Imlib is not installed properly."
-+"Perhaps the file format is unsupported or your Imlib is not installed "
-+"properly."
- msgstr ""
- "無法載入影像 %1。\n"
- "也許該檔案格式不支援，或您的 Imlib 未安裝妥當。"
-@@ -332,7 +332,8 @@
- "resource-consuming and even make your computer hang.\n"
- "Do you want to continue?"
- msgstr ""
--"您將要檢視一個非常大的檔案（%1 x %2 像素），這可能非常消耗資源，甚至會使您的電腦當住。\n"
-+"您將要檢視一個非常大的檔案（%1 x %2 像素），這可能非常消耗資源，甚至會使您的"
-+"電腦當住。\n"
- "您想要繼續嗎？"
- 
- #: kuickconfigdlg.cpp:48
-@@ -357,7 +358,7 @@
- 
- #: kuickfile.cpp:109
- msgid "Downloading %1..."
--msgstr "下載 %1 中..."
-+msgstr "下載 %1 中…"
- 
- #: kuickfile.cpp:110
- #, c-format
-@@ -368,13 +369,15 @@
- 
- #: kuickshow.cpp:136
- msgid ""
--"_n: Do you really want to display this 1 image at the same time? This might be "
--"quite resource intensive and could overload your computer."
--"<br>If you choose %1, only the first image will be shown.\n"
--"Do you really want to display these %n images at the same time? This might be "
--"quite resource intensive and could overload your computer."
--"<br>If you choose %1, only the first image will be shown."
--msgstr "您確定要同時顯示這 %n 張圖片嗎？這可能非常耗用資源，也許會使您的電腦超載。<br>如果您選擇 %1，則只會顯示第一張圖片。"
-+"_n: Do you really want to display this 1 image at the same time? This might "
-+"be quite resource intensive and could overload your computer.<br>If you "
-+"choose %1, only the first image will be shown.\n"
-+"Do you really want to display these %n images at the same time? This might "
-+"be quite resource intensive and could overload your computer.<br>If you "
-+"choose %1, only the first image will be shown."
-+msgstr ""
-+"您確定要同時顯示這 %n 張圖片嗎？這可能非常耗用資源，也許會使您的電腦超載。"
-+"<br>如果您選擇 %1，則只會顯示第一張圖片。"
- 
- #: kuickshow.cpp:137
- msgid "Display Multiple Images?"
-@@ -382,7 +385,7 @@
- 
- #: kuickshow.cpp:256
- msgid "Configure %1..."
--msgstr "設定 %1..."
-+msgstr "設定 %1…"
- 
- #: kuickshow.cpp:260
- msgid "Start Slideshow"
-diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdegraphics/kviewbrowserplugin.po kde-i18n-zh_TW-3.5.10/messages/kdegraphics/kviewbrowserplugin.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdegraphics/kviewbrowserplugin.po	2005-09-10 11:24:09.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdegraphics/kviewbrowserplugin.po	2011-11-11 15:45:17.000000000 +0100
-@@ -7,7 +7,7 @@
- "Project-Id-Version: kviewbrowserplugin\n"
- "POT-Creation-Date: 2004-10-12 01:17+0200\n"
- "PO-Revision-Date: 2002-10-17 22:25+0800\n"
--"Last-Translator: Keanu <keanu@ms50.url.com.tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\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/kdegraphics/kviewcanvas.po kde-i18n-zh_TW-3.5.10/messages/kdegraphics/kviewcanvas.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdegraphics/kviewcanvas.po	2006-07-22 10:04:05.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdegraphics/kviewcanvas.po	2011-11-11 15:45:17.000000000 +0100
-@@ -6,8 +6,7 @@
- "Project-Id-Version: kviewcanvas\n"
- "POT-Creation-Date: 2004-10-12 01:17+0200\n"
- "PO-Revision-Date: 2006-06-09 17:08+0800\n"
--"Last-Translator: Frank Weng (a.k.a. Franklin) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Traditional Chinese <zh_l10n@linux.org.tw>\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/kdegraphics/kvieweffectsplugin.po kde-i18n-zh_TW-3.5.10/messages/kdegraphics/kvieweffectsplugin.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdegraphics/kvieweffectsplugin.po	2006-07-22 10:04:05.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdegraphics/kvieweffectsplugin.po	2011-11-11 15:45:17.000000000 +0100
-@@ -6,8 +6,7 @@
- "Project-Id-Version: kvieweffectsplugin\n"
- "POT-Creation-Date: 2005-05-18 21:25+0200\n"
- "PO-Revision-Date: 2006-06-09 17:09+0800\n"
--"Last-Translator: Frank Weng (a.k.a. Franklin) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Traditional Chinese <zh_l10n@linux.org.tw>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
-@@ -16,15 +15,15 @@
- 
- #: kvieweffects.cpp:40
- msgid "&Gamma Correction..."
--msgstr "Gamma 修正(&G)..."
-+msgstr "Gamma 修正(&G)…"
- 
- #: kvieweffects.cpp:43
- msgid "&Blend Color..."
--msgstr "混合顏色(&B)..."
-+msgstr "混合顏色(&B)…"
- 
- #: kvieweffects.cpp:46
- msgid "Change &Intensity (Brightness)..."
--msgstr "改變強度（亮度）(&I)..."
-+msgstr "改變強度（亮度）(&I)…"
- 
- #: kvieweffects.cpp:69
- msgid "Change Intensity"
-diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdegraphics/kview.po kde-i18n-zh_TW-3.5.10/messages/kdegraphics/kview.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdegraphics/kview.po	2006-07-22 10:04:05.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdegraphics/kview.po	2011-11-11 15:45:17.000000000 +0100
-@@ -5,8 +5,7 @@
- "Project-Id-Version: kview\n"
- "POT-Creation-Date: 2005-03-07 01:42+0100\n"
- "PO-Revision-Date: 2006-06-09 17:14+0800\n"
--"Last-Translator: Frank Weng (a.k.a. Franklin) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Traditional Chinese <zh_l10n@linux.org.tw>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
-@@ -31,7 +30,8 @@
- 
- #: kview.cpp:147
- msgid ""
--"An error occurred while loading the KViewViewer KPart. Check your installation."
-+"An error occurred while loading the KViewViewer KPart. Check your "
-+"installation."
- msgstr "載入 KViewViewer KPart 時發生錯誤。請檢查您的安裝。"
- 
- #: kview.cpp:471
-diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdegraphics/kviewpresenterplugin.po kde-i18n-zh_TW-3.5.10/messages/kdegraphics/kviewpresenterplugin.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdegraphics/kviewpresenterplugin.po	2006-07-22 10:04:05.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdegraphics/kviewpresenterplugin.po	2011-11-11 15:45:17.000000000 +0100
-@@ -7,8 +7,7 @@
- "Project-Id-Version: kviewpresenterplugin\n"
- "POT-Creation-Date: 2005-01-31 01:31+0100\n"
- "PO-Revision-Date: 2006-06-09 17:13+0800\n"
--"Last-Translator: Frank Weng (a.k.a. Franklin) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Traditional Chinese <zh_l10n@linux.org.tw>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
-@@ -17,7 +16,7 @@
- 
- #: kviewpresenter.cpp:70
- msgid "&Image List..."
--msgstr "影像清單(&I)..."
-+msgstr "影像清單(&I)…"
- 
- #. i18n: file imagelistdialog.ui line 155
- #: kviewpresenter.cpp:73 kviewpresenter.cpp:372 kviewpresenter.cpp:373
-@@ -36,7 +35,7 @@
- 
- #: kviewpresenter.cpp:100
- msgid "Open &Multiple Files..."
--msgstr "開啟多個檔案(&M)..."
-+msgstr "開啟多個檔案(&M)…"
- 
- #: kviewpresenter.cpp:366 kviewpresenter.cpp:367
- msgid "Stop &Slideshow"
-@@ -114,8 +113,8 @@
- #: rc.cpp:42
- #, no-c-format
- msgid ""
--"This is the interval the program will wait before showing the next image in the "
--"slideshow."
-+"This is the interval the program will wait before showing the next image in "
-+"the slideshow."
- msgstr "這是程式在播放兩張影像之間的間隔時間。"
- 
- #. i18n: file imagelistdialog.ui line 203
-@@ -128,10 +127,10 @@
- #: rc.cpp:48
- #, no-c-format
- msgid "Sa&ve List..."
--msgstr "儲存清單(&V)..."
-+msgstr "儲存清單(&V)…"
- 
- #. i18n: file imagelistdialog.ui line 233
- #: rc.cpp:51
- #, no-c-format
- msgid "&Load List..."
--msgstr "載入清單(&L)..."
-+msgstr "載入清單(&L)…"
-diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdegraphics/kview_scale.po kde-i18n-zh_TW-3.5.10/messages/kdegraphics/kview_scale.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdegraphics/kview_scale.po	2005-09-10 13:15:06.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdegraphics/kview_scale.po	2011-11-11 15:45:17.000000000 +0100
-@@ -7,7 +7,7 @@
- "Project-Id-Version: kview_scale\n"
- "POT-Creation-Date: 2005-05-18 21:25+0200\n"
- "PO-Revision-Date: 2002-10-17 22:24+0800\n"
--"Last-Translator: Keanu <keanu@ms50.url.com.tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
-@@ -15,7 +15,7 @@
- 
- #: kview_scale.cpp:49
- msgid "&Scale Image..."
--msgstr "影像比例... (&S)"
-+msgstr "影像比例…(&S)"
- 
- #: kview_scale.cpp:64
- msgid "Scale Image"
-@@ -79,13 +79,13 @@
- #: rc.cpp:3
- #, no-c-format
- msgid "&Image"
--msgstr "影像 (&I)"
-+msgstr "影像(&I)"
- 
- #. i18n: file kview_scale.rc line 10
- #: rc.cpp:6
- #, no-c-format
- msgid "&Extra Toolbar"
--msgstr "其它工具列 (&E)"
-+msgstr "其它工具列(&E)"
- 
- #: scaledlg.cpp:149
- msgid "pixels/in"
-diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdegraphics/kviewscannerplugin.po kde-i18n-zh_TW-3.5.10/messages/kdegraphics/kviewscannerplugin.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdegraphics/kviewscannerplugin.po	2006-07-22 10:04:05.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdegraphics/kviewscannerplugin.po	2011-11-11 15:45:17.000000000 +0100
-@@ -7,8 +7,7 @@
- "Project-Id-Version: kviewscannerplugin\n"
- "POT-Creation-Date: 2005-05-18 21:25+0200\n"
- "PO-Revision-Date: 2006-06-09 17:06+0800\n"
--"Last-Translator: Frank Weng (a.k.a. Franklin) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Traditional Chinese <zh_l10n@linux.org.tw>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
-@@ -17,13 +16,15 @@
- 
- #: kviewscanner.cpp:49
- msgid "&Scan Image..."
--msgstr "掃描影像... (&S)"
-+msgstr "掃描影像…(&S)"
- 
- #: kviewscanner.cpp:76
- msgid ""
- "You do not appear to have SANE support, or your scanner is not attached "
- "properly. Please check these items before scanning again."
--msgstr "您似乎沒有安裝 SANE，或是您的掃描器沒有正確地接上。請檢查這些項目後再掃描一次。"
-+msgstr ""
-+"您似乎沒有安裝 SANE，或是您的掃描器沒有正確地接上。請檢查這些項目後再掃描一"
-+"次。"
- 
- #: kviewscanner.cpp:79
- msgid "No Scan-Service Available"
-diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdegraphics/kviewshell.po kde-i18n-zh_TW-3.5.10/messages/kdegraphics/kviewshell.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdegraphics/kviewshell.po	2008-08-19 20:43:07.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdegraphics/kviewshell.po	2011-11-11 15:45:17.000000000 +0100
-@@ -7,8 +7,7 @@
- "Project-Id-Version: kviewshell\n"
- "POT-Creation-Date: 2008-07-08 01:19+0200\n"
- "PO-Revision-Date: 2006-06-15 07:59+0800\n"
--"Last-Translator: Frank Weng (a.k.a. Franklin) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Traditional Chinese <zh_l10n@linux.org.tw>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
-@@ -77,10 +76,12 @@
- 
- #: kmultipage.cpp:1475
- msgid ""
--"<qt>The search string <strong>%1</strong> could not be found by the end of the "
--"document. Should the search be restarted from the beginning of the "
-+"<qt>The search string <strong>%1</strong> could not be found by the end of "
-+"the document. Should the search be restarted from the beginning of the "
- "document?</qt>"
--msgstr "<qt>已經搜尋到文件底部，但是找不到搜尋字串 <strong>%1</strong>。要從文件的開頭繼續找嗎？</qt>"
-+msgstr ""
-+"<qt>已經搜尋到文件底部，但是找不到搜尋字串 <strong>%1</strong>。要從文件的開"
-+"頭繼續找嗎？</qt>"
- 
- #: kmultipage.cpp:1478 kmultipage.cpp:1620
- msgid "Text Not Found"
-@@ -92,10 +93,12 @@
- 
- #: kmultipage.cpp:1617
- msgid ""
--"<qt>The search string <strong>%1</strong> could not be found by the beginning "
--"of the document. Should the search be restarted from the end of the "
--"document?</qt>"
--msgstr "<qt>已經搜尋到文件自開頭，但是找不到搜尋字串 <strong>%1</strong>。要從文件的底部繼續找嗎？</qt>"
-+"<qt>The search string <strong>%1</strong> could not be found by the "
-+"beginning of the document. Should the search be restarted from the end of "
-+"the document?</qt>"
-+msgstr ""
-+"<qt>已經搜尋到文件自開頭，但是找不到搜尋字串 <strong>%1</strong>。要從文件的"
-+"底部繼續找嗎？</qt>"
- 
- #: kmultipage.cpp:1713
- #, c-format
-@@ -123,7 +126,7 @@
- 
- #: kmultipage.cpp:1926
- msgid "Exporting to text..."
--msgstr "匯出到文字..."
-+msgstr "匯出到文字…"
- 
- #: kmultipage.cpp:1926
- msgid "Abort"
-@@ -143,15 +146,13 @@
- 
- #: kprintDialogPage_pageoptions.cpp:44
- msgid ""
--"<qt>"
--"<p>If this option is enabled, the pages will be printed centered on the paper; "
--"this makes more visually-appealing printouts.</p>"
--"<p>If the option is not enabled, all pages will be placed in the top-left "
--"corner of the paper.</p></qt>"
--msgstr ""
--"<qt>"
--"<p>如果開啟此選項，頁面會被置於紙張中央，讓印出來的結果更易閱讀。</p> "
--"<p>若未開啟，則會被置於紙張的左上角。</p></qt>"
-+"<qt><p>If this option is enabled, the pages will be printed centered on the "
-+"paper; this makes more visually-appealing printouts.</p><p>If the option is "
-+"not enabled, all pages will be placed in the top-left corner of the paper.</"
-+"p></qt>"
-+msgstr ""
-+"<qt><p>如果開啟此選項，頁面會被置於紙張中央，讓印出來的結果更易閱讀。</p> <p>"
-+"若未開啟，則會被置於紙張的左上角。</p></qt>"
- 
- #: kprintDialogPage_pageoptions.cpp:52
- msgid "Automatically choose landscape or portrait orientation"
-@@ -159,24 +160,23 @@
- 
- #: kprintDialogPage_pageoptions.cpp:53
- msgid ""
--"If this option is enabled, some pages might be rotated to better fit the paper "
--"size."
-+"If this option is enabled, some pages might be rotated to better fit the "
-+"paper size."
- msgstr "如果開啟此選項，有些頁面會改變方向，以符合紙張大小。"
- 
- #: kprintDialogPage_pageoptions.cpp:54
- msgid ""
--"<qt>"
--"<p>If this option is enabled, landscape or portrait orientation are "
-+"<qt><p>If this option is enabled, landscape or portrait orientation are "
- "automatically chosen on a page-by-page basis. This makes better use of the "
--"paper and gives more visually-appealing printouts.</p>"
--"<p><b>Note:</b> This option overrides the Portrait/Landscape option chosen in "
--"the printer properties. If this option is enabled, and if the pages in your "
--"document have different sizes, then some pages might be rotated while others "
--"are not.</p></qt>"
--msgstr ""
--"<qt>"
--"<p>如果開啟此選項，每一頁會自動判斷要使用橫向還是直向。這會讓列印結果較不會有問題。</p>"
--"<p><b>注意：</b>這個選項會覆蓋印表機內容所設定的方向。如果開啟此選項，而且您的文件大小不同，則有些頁面會轉換，有些不會。</p></qt>"
-+"paper and gives more visually-appealing printouts.</p><p><b>Note:</b> This "
-+"option overrides the Portrait/Landscape option chosen in the printer "
-+"properties. If this option is enabled, and if the pages in your document "
-+"have different sizes, then some pages might be rotated while others are not."
-+"</p></qt>"
-+msgstr ""
-+"<qt><p>如果開啟此選項，每一頁會自動判斷要使用橫向還是直向。這會讓列印結果較不"
-+"會有問題。</p><p><b>注意：</b>這個選項會覆蓋印表機內容所設定的方向。如果開啟"
-+"此選項，而且您的文件大小不同，則有些頁面會轉換，有些不會。</p></qt>"
- 
- #: kprintDialogPage_pageoptions.cpp:73
- msgid "Shrink oversized pages to fit paper size"
-@@ -184,22 +184,21 @@
- 
- #: kprintDialogPage_pageoptions.cpp:74
- msgid ""
--"If this option is enabled, large pages that would not fit the printer's paper "
--"size will be shrunk."
-+"If this option is enabled, large pages that would not fit the printer's "
-+"paper size will be shrunk."
- msgstr "如果開啟此選項，超過紙張大小的頁面會被縮小以符合紙張的尺寸。"
- 
- #: kprintDialogPage_pageoptions.cpp:75
- msgid ""
--"<qt>"
--"<p>If this option is enabled, large pages that would not fit the printer's "
--"paper size will be shrunk so that edges won't be cut off during printing.</p>"
--"<p><b>Note:</b> If this option is enabled, and if the pages in your document "
--"have different sizes, then different pages might be shrunk by different scaling "
--"factors.</p></qt>"
--msgstr ""
--"<qt>"
--"<p>如果開啟此選項，超過紙張大小的頁面會被縮小以符合紙張的尺寸。</p>"
--"<p><b>注意：</b>若是開啟此選項，而您的文件每一頁大小不同，則每一頁被縮放的比例也可能不同。</p></qt>"
-+"<qt><p>If this option is enabled, large pages that would not fit the "
-+"printer's paper size will be shrunk so that edges won't be cut off during "
-+"printing.</p><p><b>Note:</b> If this option is enabled, and if the pages in "
-+"your document have different sizes, then different pages might be shrunk by "
-+"different scaling factors.</p></qt>"
-+msgstr ""
-+"<qt><p>如果開啟此選項，超過紙張大小的頁面會被縮小以符合紙張的尺寸。</p><p><b>"
-+"注意：</b>若是開啟此選項，而您的文件每一頁大小不同，則每一頁被縮放的比例也可"
-+"能不同。</p></qt>"
- 
- #: kprintDialogPage_pageoptions.cpp:84
- msgid "Expand small pages to fit paper size"
-@@ -213,16 +212,14 @@
- 
- #: kprintDialogPage_pageoptions.cpp:86
- msgid ""
--"<qt>"
--"<p>If this option is enabled, small pages will be enlarged so that they fit the "
--"printer's paper size.</p>"
--"<p><b>Note:</b> If this option is enabled, and if the pages in your document "
--"have different sizes, then different pages might be expanded by different "
--"scaling factors.</p></qt>"
--msgstr ""
--"<qt>"
--"<p>如果開啟此選項，較小的頁面會被放大以符合紙張的尺寸。</p>"
--"<p><b>注意：</b>若是開啟此選項，而您的文件每一頁大小不同，則每一頁被縮放的比例也可能不同。</p></qt>"
-+"<qt><p>If this option is enabled, small pages will be enlarged so that they "
-+"fit the printer's paper size.</p><p><b>Note:</b> If this option is enabled, "
-+"and if the pages in your document have different sizes, then different pages "
-+"might be expanded by different scaling factors.</p></qt>"
-+msgstr ""
-+"<qt><p>如果開啟此選項，較小的頁面會被放大以符合紙張的尺寸。</p><p><b>注意：</"
-+"b>若是開啟此選項，而您的文件每一頁大小不同，則每一頁被縮放的比例也可能不同。"
-+"</p></qt>"
- 
- #: kviewpart.cpp:116
- msgid "<qt>No MultiPage found.</qt>"
-@@ -240,11 +237,10 @@
- 
- #: kviewpart.cpp:139
- msgid ""
--"<qt>"
--"<p>The specified library <b>%1</b> could not be loaded. The error message "
--"returned was:</p>"
--"<p><b>%2</b></p></qt>"
--msgstr "<qt><p>無法載入指定的函式庫 <b>%1</b>。錯誤訊息為：</p> <p><b>%2</b></p></qt>"
-+"<qt><p>The specified library <b>%1</b> could not be loaded. The error "
-+"message returned was:</p><p><b>%2</b></p></qt>"
-+msgstr ""
-+"<qt><p>無法載入指定的函式庫 <b>%1</b>。錯誤訊息為：</p> <p><b>%2</b></p></qt>"
- 
- #: kviewpart.cpp:143 kviewpart.cpp:819
- msgid "<qt>The library does not export a factory for creating components.</qt>"
-@@ -252,27 +248,27 @@
- 
- #: kviewpart.cpp:146 kviewpart.cpp:822
- msgid ""
--"<qt>The factory does not support creating components of the specified type.</qt>"
-+"<qt>The factory does not support creating components of the specified type.</"
-+"qt>"
- msgstr "<qt>此工廠不支援建立指定型態的元件。</qt>"
- 
- #: kviewpart.cpp:150
- msgid ""
--"<qt>"
--"<p><b>Problem:</b> The document <b>%1</b> cannot be shown.</p>"
--"<p><b>Reason:</b> The software component <b>%2</b> which is required to display "
--"your files could not be initialized. This could point to serious "
--"misconfiguration of your KDE system, or to damaged program files.</p>"
--"<p><b>What you can do:</b> You could try to re-install the software packages in "
--"question. If that does not help, you could file an error report, either to the "
--"provider of your software (e.g. the vendor of your Linux distribution), or "
--"directly to the authors of the software. The entry <b>Report Bug...</b> "
--"in the <b>Help</b> menu helps you to contact the KDE programmers.</p></qt>"
--msgstr ""
--"<qt>"
--"<p><b>問題：</b>此文件 <b>%1</b> 無法顯示。</p> "
--"<p><b>理由：</b>需要用於顯示您的檔案的軟體元件 <b>%2</b> 無法初始化。這可能是因為您的 KDE "
--"系統設定有嚴重的問題，或是程式檔案已損毀。</p> "
--"<p><b>解決方法：</b>您可以試著重新安裝有問題的軟體套件。如果不行，您可以在「說明」選單中選擇「回報錯誤」。</p></qt>"
-+"<qt><p><b>Problem:</b> The document <b>%1</b> cannot be shown.</"
-+"p><p><b>Reason:</b> The software component <b>%2</b> which is required to "
-+"display your files could not be initialized. This could point to serious "
-+"misconfiguration of your KDE system, or to damaged program files.</"
-+"p><p><b>What you can do:</b> You could try to re-install the software "
-+"packages in question. If that does not help, you could file an error report, "
-+"either to the provider of your software (e.g. the vendor of your Linux "
-+"distribution), or directly to the authors of the software. The entry "
-+"<b>Report Bug...</b> in the <b>Help</b> menu helps you to contact the KDE "
-+"programmers.</p></qt>"
-+msgstr ""
-+"<qt><p><b>問題：</b>此文件 <b>%1</b> 無法顯示。</p> <p><b>理由：</b>需要用於"
-+"顯示您的檔案的軟體元件 <b>%2</b> 無法初始化。這可能是因為您的 KDE 系統設定有"
-+"嚴重的問題，或是程式檔案已損毀。</p> <p><b>解決方法：</b>您可以試著重新安裝有"
-+"問題的軟體套件。如果不行，您可以在「說明」選單中選擇「回報錯誤」。</p></qt>"
- 
- #: kviewpart.cpp:159 kviewpart.cpp:836
- msgid "Error Initializing Software Component"
-@@ -280,7 +276,7 @@
- 
- #: kviewpart.cpp:173
- msgid "Text..."
--msgstr "文字..."
-+msgstr "文字…"
- 
- #: kviewpart.cpp:193
- msgid "Show &Sidebar"
-@@ -292,7 +288,7 @@
- 
- #: kviewpart.cpp:196
- msgid "&Watch File"
--msgstr "監看檔案 (&W)"
-+msgstr "監看檔案(&W)"
- 
- #: kviewpart.cpp:197
- msgid "Show Scrollbars"
-@@ -332,7 +328,7 @@
- 
- #: kviewpart.cpp:232
- msgid "Custom Size..."
--msgstr "自訂大小..."
-+msgstr "自訂大小…"
- 
- #: kviewpart.cpp:236
- msgid "&Use Document Specified Paper Size"
-@@ -433,7 +429,7 @@
- 
- #: kviewpart.cpp:654
- msgid "Loading '%1'..."
--msgstr "載入 %1 中..."
-+msgstr "載入 %1 中…"
- 
- #: kviewpart.cpp:671
- msgid "<qt><strong>File Error!</strong> Could not create temporary file.</qt>"
-@@ -441,33 +437,36 @@
- 
- #: kviewpart.cpp:680
- msgid ""
--"<qt><strong>File Error!</strong> Could not create temporary file <nobr><strong>"
--"%1</strong></nobr>.</qt>"
-+"<qt><strong>File Error!</strong> Could not create temporary file "
-+"<nobr><strong>%1</strong></nobr>.</qt>"
- msgstr ""
--"<qt><strong>檔案錯誤</strong>。無法建立暫存檔 <nobr><strong>%1</strong></nobr>。</qt>"
-+"<qt><strong>檔案錯誤</strong>。無法建立暫存檔 <nobr><strong>%1</strong></"
-+"nobr>。</qt>"
- 
- #: kviewpart.cpp:701
- msgid ""
--"<qt><strong>File Error!</strong> Could not open the file <nobr><strong>"
--"%1</strong></nobr> for uncompression. The file will not be loaded.</qt>"
-+"<qt><strong>File Error!</strong> Could not open the file <nobr><strong>%1</"
-+"strong></nobr> for uncompression. The file will not be loaded.</qt>"
- msgstr ""
- "<qt><strong>檔案錯誤</strong>。無法開啟檔案 <nobr><strong>%1</strong></nobr> "
- "來解壓縮。檔案無法載入。</qt>"
- 
- #: kviewpart.cpp:704
- msgid ""
--"<qt>This error typically occurs if you do not have enough permissions to read "
--"the file. You can check ownership and permissions if you right-click on the "
--"file in the Konqueror file manager and then choose the 'Properties' menu.</qt>"
-+"<qt>This error typically occurs if you do not have enough permissions to "
-+"read the file. You can check ownership and permissions if you right-click on "
-+"the file in the Konqueror file manager and then choose the 'Properties' menu."
-+"</qt>"
- msgstr "<qt>這個錯誤通常是因為您沒有讀取檔案的權限。</qt>"
- 
- #: kviewpart.cpp:714
- msgid "Uncompressing..."
--msgstr "解壓縮中..."
-+msgstr "解壓縮中…"
- 
- #: kviewpart.cpp:715
- msgid ""
--"<qt>Uncompressing the file <nobr><strong>%1</strong></nobr>. Please wait.</qt>"
-+"<qt>Uncompressing the file <nobr><strong>%1</strong></nobr>. Please wait.</"
-+"qt>"
- msgstr "<qt>檔案 <nobr><strong>%1</strong></nobr> 解壓縮中。請稍候。</qt>"
- 
- #: kviewpart.cpp:748
-@@ -475,13 +474,15 @@
- "<qt><strong>File Error!</strong> Could not uncompress the file <nobr><strong>"
- "%1</strong></nobr>. The file will not be loaded.</qt>"
- msgstr ""
--"<qt><strong>檔案錯誤</strong>。無法解壓縮檔案 <nobr><strong>%1</strong></nobr>。檔案無法載入。</qt>"
-+"<qt><strong>檔案錯誤</strong>。無法解壓縮檔案 <nobr><strong>%1</strong></"
-+"nobr>。檔案無法載入。</qt>"
- 
- #: kviewpart.cpp:750
- msgid ""
--"<qt>This error typically occurs if the file is corrupt. If you want to be sure, "
--"try to decompress the file manually using command-line tools.</qt>"
--msgstr "<qt>這個錯誤通常是因為檔案已損毀。您可以試著用命令列手動解壓縮此檔。</qt>"
-+"<qt>This error typically occurs if the file is corrupt. If you want to be "
-+"sure, try to decompress the file manually using command-line tools.</qt>"
-+msgstr ""
-+"<qt>這個錯誤通常是因為檔案已損毀。您可以試著用命令列手動解壓縮此檔。</qt>"
- 
- #: kviewpart.cpp:776
- msgid ""
-@@ -493,34 +494,35 @@
- msgid ""
- "<qt>The file has mime type <b>%1</b> which is not supported by any of the "
- "installed KViewShell plugins.</qt>"
--msgstr "<qt>此檔案的 MIME 型態為<b>%1</b>，並未被所有安裝的 KViewShell 外掛程式支援。</qt>"
-+msgstr ""
-+"<qt>此檔案的 MIME 型態為<b>%1</b>，並未被所有安裝的 KViewShell 外掛程式支援。"
-+"</qt>"
- 
- #: kviewpart.cpp:816
- msgid ""
--"<qt>"
--"<p>The specified library <b>%1</b> could not be loaded. The error message "
--"returned was:</p> "
--"<p><b>%2</b></p></qt>"
--msgstr "<qt><p>指定的函式庫 <b>%1</b> 無法載入。錯誤訊息為：</p><p><b>%2</b></p></qt>"
-+"<qt><p>The specified library <b>%1</b> could not be loaded. The error "
-+"message returned was:</p> <p><b>%2</b></p></qt>"
-+msgstr ""
-+"<qt><p>指定的函式庫 <b>%1</b> 無法載入。錯誤訊息為：</p><p><b>%2</b></p></qt>"
- 
- #: kviewpart.cpp:826
- msgid ""
--"<qt>"
--"<p><b>Problem:</b> The document <b>%1</b> cannot be shown.</p>"
--"<p><b>Reason:</b> The software component <b>%2</b> which is required to display "
--"files of type <b>%3</b> could not be initialized. This could point to serious "
--"misconfiguration of your KDE system, or to damaged program files.</p>"
--"<p><b>What you can do:</b> You could try to re-install the software packages in "
--"question. If that does not help, you could file an error report, either to the "
--"provider of your software (e.g. the vendor of your Linux distribution), or "
--"directly to the authors of the software. The entry <b>Report Bug...</b> "
--"in the <b>Help</b> menu helps you to contact the KDE programmers.</p></qt>"
--msgstr ""
--"<qt>"
--"<p><b>問題：</b>此文件 <b>%1</b> 無法顯示。</p> "
--"<p><b>理由：</b>需要用於顯示檔案型態 <b>%3</b> 的軟體元件 <b>%2</b> 無法初始化。這可能是因為您的 KDE "
--"系統設定有嚴重的問題，或是程式檔案已損毀。</p> "
--"<p><b>解決方法：</b>您可以試著重新安裝有問題的軟體套件。如果不行，您可以在「說明」選單中選擇「回報錯誤」。</p></qt>"
-+"<qt><p><b>Problem:</b> The document <b>%1</b> cannot be shown.</"
-+"p><p><b>Reason:</b> The software component <b>%2</b> which is required to "
-+"display files of type <b>%3</b> could not be initialized. This could point "
-+"to serious misconfiguration of your KDE system, or to damaged program files."
-+"</p><p><b>What you can do:</b> You could try to re-install the software "
-+"packages in question. If that does not help, you could file an error report, "
-+"either to the provider of your software (e.g. the vendor of your Linux "
-+"distribution), or directly to the authors of the software. The entry "
-+"<b>Report Bug...</b> in the <b>Help</b> menu helps you to contact the KDE "
-+"programmers.</p></qt>"
-+msgstr ""
-+"<qt><p><b>問題：</b>此文件 <b>%1</b> 無法顯示。</p> <p><b>理由：</b>需要用於"
-+"顯示檔案型態 <b>%3</b> 的軟體元件 <b>%2</b> 無法初始化。這可能是因為您的 KDE "
-+"系統設定有嚴重的問題，或是程式檔案已損毀。</p> <p><b>解決方法：</b>您可以試著"
-+"重新安裝有問題的軟體套件。如果不行，您可以在「說明」選單中選擇「回報錯誤」。"
-+"</p></qt>"
- 
- #: kviewpart.cpp:929
- msgid "Your document has been modified. Do you really want to close it?"
-@@ -667,9 +669,11 @@
- 
- #: main.cpp:96
- msgid ""
--"The URL %1 does not point to a local file. You can only specify local files if "
--"you are using the '--unique' option."
--msgstr "網址 %1 並沒有指到本地的檔案。如果您使用 '--unique' 的選項時，您只能指定本地的檔案。"
-+"The URL %1 does not point to a local file. You can only specify local files "
-+"if you are using the '--unique' option."
-+msgstr ""
-+"網址 %1 並沒有指到本地的檔案。如果您使用 '--unique' 的選項時，您只能指定本地"
-+"的檔案。"
- 
- #: marklist.cpp:185
- msgid "Select for printing"
-@@ -811,7 +815,8 @@
- "<ul>\n"
- "<li><b>Enabled</b>: Always underline links</li>\n"
- "<li><b>Disabled</b>: Never underline links</li>\n"
--"<li><b>Only on Hover</b>: Underline when the mouse is moved over the link</li>\n"
-+"<li><b>Only on Hover</b>: Underline when the mouse is moved over the link</"
-+"li>\n"
- "</ul></qt>"
- msgstr ""
- "<qt>控制超連結如何顯示底線：\n"
-@@ -924,15 +929,11 @@
- "\n"
- "      <qt>\n"
- "        Controls how hyperlinks are underlined:\n"
--"        "
--"<ul>\n"
--"          "
--"<li><b>UL_Enabled</b>: Always underline links</li>\n"
--"          "
--"<li><b>UL_Disabled</b>: Never underline links</li>\n"
--"          "
--"<li><b>UL_OnlyOnHover</b>: Underline when the mouse is moved over the link</li>"
--"\n"
-+"        <ul>\n"
-+"          <li><b>UL_Enabled</b>: Always underline links</li>\n"
-+"          <li><b>UL_Disabled</b>: Never underline links</li>\n"
-+"          <li><b>UL_OnlyOnHover</b>: Underline when the mouse is moved over "
-+"the link</li>\n"
- "        </ul>\n"
- "      </qt>\n"
- "    "
-diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdegraphics/kviewviewer.po kde-i18n-zh_TW-3.5.10/messages/kdegraphics/kviewviewer.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdegraphics/kviewviewer.po	2006-07-22 10:04:05.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdegraphics/kviewviewer.po	2011-11-11 15:45:17.000000000 +0100
-@@ -6,8 +6,7 @@
- "Project-Id-Version: kviewviewer\n"
- "POT-Creation-Date: 2005-07-24 01:35+0200\n"
- "PO-Revision-Date: 2006-06-09 15:54+0800\n"
--"Last-Translator: Frank Weng (a.k.a. Franklin) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Traditional Chinese <zh_l10n@linux.org.tw>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
-@@ -45,17 +44,18 @@
- 
- #: kviewviewer.cpp:78
- msgid ""
--"Unable to find a suitable Image Canvas. This probably means that KView was not "
--"installed properly."
-+"Unable to find a suitable Image Canvas. This probably means that KView was "
-+"not installed properly."
- msgstr "找不到適合的影像畫布（Image Canvas）。這可能表示 KView 安裝不正確。"
- 
- #: kviewviewer.cpp:80
- msgid ""
--"Accessing the KImageViewer interface of the Image Canvas failed. Something in "
--"your setup is broken (a component claims to be a KImageViewer::Canvas but it is "
--"not)."
-+"Accessing the KImageViewer interface of the Image Canvas failed. Something "
-+"in your setup is broken (a component claims to be a KImageViewer::Canvas but "
-+"it is not)."
- msgstr ""
--"存取影像畫布的 KImageViewer 介面時失敗。您的設定中有些不正確（一個元件宣稱它為 KImageViewer::Canvas 但是實際上不是）。"
-+"存取影像畫布的 KImageViewer 介面時失敗。您的設定中有些不正確（一個元件宣稱它"
-+"為 KImageViewer::Canvas 但是實際上不是）。"
- 
- #: kviewviewer.cpp:92 kviewviewer.cpp:530
- msgid ""
-@@ -85,8 +85,8 @@
- 
- #: kviewviewer.cpp:213 kviewviewer.cpp:607
- msgid ""
--"The image could not be saved to disk. A possible causes is that you don't have "
--"permission to write to that file."
-+"The image could not be saved to disk. A possible causes is that you don't "
-+"have permission to write to that file."
- msgstr "影像無法儲存到磁碟。一個可能的原因是您沒有寫入檔案的權限。"
- 
- #: kviewviewer.cpp:298
-@@ -147,7 +147,7 @@
- 
- #: kviewviewer.cpp:757
- msgid "Save Image As..."
--msgstr "另存影像為..."
-+msgstr "另存影像為…"
- 
- #: kviewviewer.cpp:806
- #, c-format
-@@ -163,7 +163,8 @@
- msgstr ""
- "您已修改的影像 %1 在磁碟中已被別人修改。\n"
- "您要重新載入檔案，並將您所做的改變丟棄嗎？\n"
--"如果不要重新載入，而後您又儲存此檔案，別人所做的已經存在磁碟中的修改就會消失。"
-+"如果不要重新載入，而後您又儲存此檔案，別人所做的已經存在磁碟中的修改就會消"
-+"失。"
- 
- #: kviewviewer.cpp:818
- msgid "Do Not Reload"
-diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdegraphics/libkfaximgage.po kde-i18n-zh_TW-3.5.10/messages/kdegraphics/libkfaximgage.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdegraphics/libkfaximgage.po	2006-07-22 10:04:05.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdegraphics/libkfaximgage.po	2011-11-11 15:45:17.000000000 +0100
-@@ -6,8 +6,7 @@
- "Project-Id-Version: libkfaximgage\n"
- "POT-Creation-Date: 2005-10-15 02:46+0200\n"
- "PO-Revision-Date: 2006-06-09 15:47+0800\n"
--"Last-Translator: Frank Weng (a.k.a. Franklin) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Traditional Chinese <zh_l10n@linux.org.tw>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
-@@ -40,16 +39,14 @@
- 
- #: kfaximage.cpp:372
- msgid ""
--"Due to patent reasons LZW (Lempel-Ziv & Welch) compressed Fax files cannot be "
--"loaded yet.\n"
-+"Due to patent reasons LZW (Lempel-Ziv & Welch) compressed Fax files cannot "
-+"be loaded yet.\n"
- msgstr ""
- "因為專利的問題，LZW（Lempel-Ziv & Welch）壓縮傳真格式檔目前無法載入。\n"
- 
- #: kfaximage.cpp:377
--msgid ""
--"This version can only handle Fax files\n"
--msgstr ""
--"這個版本只能處理傳真檔。\n"
-+msgid "This version can only handle Fax files\n"
-+msgstr "這個版本只能處理傳真檔。\n"
- 
- #: kfaximage.cpp:406
- msgid "%1: Bad Fax File"
-diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdegraphics/libkscan.po kde-i18n-zh_TW-3.5.10/messages/kdegraphics/libkscan.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdegraphics/libkscan.po	2008-02-13 10:55:25.000000000 +0100
-+++ kde-i18n-zh_TW-3.5.10/messages/kdegraphics/libkscan.po	2011-11-11 15:45:17.000000000 +0100
-@@ -7,8 +7,7 @@
- "Project-Id-Version: libkscan\n"
- "POT-Creation-Date: 2008-02-01 01:56+0100\n"
- "PO-Revision-Date: 2006-06-09 15:44+0800\n"
--"Last-Translator: Frank Weng (a.k.a. Franklin) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Traditional Chinese <zh_l10n@linux.org.tw>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
-@@ -33,8 +32,8 @@
- 
- #: gammadialog.cpp:59
- msgid ""
--"<B>Edit the custom gamma table</B><BR>This gamma table is passed to the scanner "
--"hardware."
-+"<B>Edit the custom gamma table</B><BR>This gamma table is passed to the "
-+"scanner hardware."
- msgstr "<B>編輯自訂 gamma 表格</B><BR>這個 gamma 表格會被傳送到掃描器硬體。"
- 
- #: gammadialog.cpp:67
-@@ -278,7 +277,8 @@
- "than this are considered to be part of the image."
- msgstr ""
- "自動偵測的門檻。\n"
--"所有像素（在黑色背景時）高於或（在白色背景時）低於此值時，就被認為是此影像的一部份。"
-+"所有像素（在黑色背景時）高於或（在白色背景時）低於此值時，就被認為是此影像的"
-+"一部份。"
- 
- #: previewer.cpp:238
- msgid "Dust size:"
-@@ -323,11 +323,12 @@
- 
- #: previewer.cpp:608
- msgid ""
--"The autodetection of images on the preview depends on the background color of "
--"the preview image (Think of a preview of an empty scanner).\n"
-+"The autodetection of images on the preview depends on the background color "
-+"of the preview image (Think of a preview of an empty scanner).\n"
- "Please select whether the background of the preview image is black or white"
- msgstr ""
--"預覽時的自動偵測影像是依據預覽影像的背景顏色（把預覽想成是一個空的掃描器）。\n"
-+"預覽時的自動偵測影像是依據預覽影像的背景顏色（把預覽想成是一個空的掃描"
-+"器）。\n"
- "請選擇預覽影像時的背景是黑色或白色。"
- 
- #: previewer.cpp:609
-@@ -336,7 +337,7 @@
- 
- #: scandialog.cpp:75
- msgid "&Scanning"
--msgstr "掃描 (&S)"
-+msgstr "掃描(&S)"
- 
- #: scandialog.cpp:113
- msgid "Startup Options"
-@@ -348,7 +349,7 @@
- 
- #: scandialog.cpp:119
- msgid "&Ask for the scan device on plugin startup"
--msgstr "啟動外掛程式時詢問掃描設備 (&A)"
-+msgstr "啟動外掛程式時詢問掃描設備(&A)"
- 
- #: scandialog.cpp:121
- msgid ""
-@@ -358,11 +359,11 @@
- 
- #: scandialog.cpp:125
- msgid "&Query the network for scan devices"
--msgstr "查詢網路上的掃描設備 (&Q)"
-+msgstr "查詢網路上的掃描設備(&Q)"
- 
- #: scandialog.cpp:127
- msgid "Check this if you want to query for configured network scan stations."
--msgstr "若您想查詢已設定的網路掃描站台，您可以勾選此選項。"
-+msgstr "若您想查詢已設定的網路掃描站臺，您可以勾選此選項。"
- 
- #: scanparams.cpp:118
- msgid "<B>Scanner Settings</B>"
-@@ -374,7 +375,7 @@
- 
- #: scanparams.cpp:161
- msgid "&Preview Scan"
--msgstr "預覽掃描 (&P)"
-+msgstr "預覽掃描(&P)"
- 
- #: scanparams.cpp:166
- msgid "Scanning in progress"
-@@ -382,7 +383,7 @@
- 
- #: scanparams.cpp:279
- msgid "Source..."
--msgstr "來源..."
-+msgstr "來源…"
- 
- #: scanparams.cpp:341
- msgid "Resolution"
-@@ -394,7 +395,7 @@
- 
- #: scanparams.cpp:465
- msgid "Edit..."
--msgstr "編輯..."
-+msgstr "編輯…"
- 
- #: scanparams.cpp:500
- msgid "Acquire a gray preview even in color mode (faster)"
-@@ -402,15 +403,15 @@
- 
- #: scanparams.cpp:518
- msgid ""
--"<B>Problem: No Scanner was found</B><P>Your system does not provide a SANE <I>"
--"(Scanner Access Now Easy)</I> installation, which is required by the KDE scan "
--"support.<P>Please install and configure SANE correctly on your system.<P>"
--"Visit the SANE homepage under http://www.sane-project.org to find out more "
--"about SANE installation and configuration. "
-+"<B>Problem: No Scanner was found</B><P>Your system does not provide a SANE "
-+"<I>(Scanner Access Now Easy)</I> installation, which is required by the KDE "
-+"scan support.<P>Please install and configure SANE correctly on your system."
-+"<P>Visit the SANE homepage under http://www.sane-project.org to find out "
-+"more about SANE installation and configuration. "
- msgstr ""
--"<B>問題：沒有找到掃瞄器</B><P>您的系統上沒有安裝 SANE（Scanner Access Now Easy）。</p> "
--"<p>請安裝並設定好 SANE。</p> "
--"<p>您可以在 http://www.sane-project.org/ 找到關於 SANE 安裝與設定的資訊。"
-+"<B>問題：沒有找到掃描器</B><P>您的系統上沒有安裝 SANE（Scanner Access Now "
-+"Easy）。</p> <p>請安裝並設定好 SANE。</p> <p>您可以在 http://www.sane-"
-+"project.org/ 找到關於 SANE 安裝與設定的資訊。"
- 
- #: scanparams.cpp:589
- msgid "*|All Files (*)"
-diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdelibs/cupsdconf.po kde-i18n-zh_TW-3.5.10/messages/kdelibs/cupsdconf.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdelibs/cupsdconf.po	2005-09-10 13:15:02.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdelibs/cupsdconf.po	2011-11-11 15:45:17.000000000 +0100
-@@ -9,7 +9,7 @@
- "Project-Id-Version: cupsdconf\n"
- "POT-Creation-Date: 2005-05-18 21:23+0200\n"
- "PO-Revision-Date: 2005-08-06 21:34+0800\n"
--"Last-Translator: Chao-Hsiung Liao <j_h_liau@yahoo.com.tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
-@@ -62,8 +62,8 @@
- 
- #: cupsd.conf.template.cpp:1
- msgid ""
--"_: Do not translate the keyword between brackets (e.g. ServerName, ServerAdmin, "
--"etc.)\n"
-+"_: Do not translate the keyword between brackets (e.g. ServerName, "
-+"ServerAdmin, etc.)\n"
- "<b>Server name (ServerName)</b>\n"
- "<p>\n"
- "The hostname of your server, as advertised to the world.\n"
-@@ -75,7 +75,7 @@
- msgstr ""
- "<b>伺服器名稱 (ServerName)</b>\n"
- "<p>\n"
--"您的伺服器的主機名稱，做為對外界公佈使用。\n"
-+"您的伺服器的主機名稱，做為對外界公布使用。\n"
- "預設上 CUPS 會使用系統的主機名稱。</p>\n"
- "<p>\n"
- "要設定客戶端使用的預設伺服器，請查閱 client.conf 檔案。</p>\n"
-@@ -84,8 +84,8 @@
- 
- #: cupsd.conf.template.cpp:11
- msgid ""
--"_: Do not translate the keyword between brackets (e.g. ServerName, ServerAdmin, "
--"etc.)\n"
-+"_: Do not translate the keyword between brackets (e.g. ServerName, "
-+"ServerAdmin, etc.)\n"
- "<b>Server administrator (ServerAdmin)</b>\n"
- "<p>\n"
- "The email address to send all complaints or problems to.\n"
-@@ -102,8 +102,8 @@
- 
- #: cupsd.conf.template.cpp:19
- msgid ""
--"_: Do not translate the keyword between brackets (e.g. ServerName, ServerAdmin, "
--"etc.)\n"
-+"_: Do not translate the keyword between brackets (e.g. ServerName, "
-+"ServerAdmin, etc.)\n"
- "<b>Access log (AccessLog)</b>\n"
- "<p>\n"
- "The access log file; if this does not start with a leading /\n"
-@@ -128,8 +128,8 @@
- 
- #: cupsd.conf.template.cpp:31
- msgid ""
--"_: Do not translate the keyword between brackets (e.g. ServerName, ServerAdmin, "
--"etc.)\n"
-+"_: Do not translate the keyword between brackets (e.g. ServerName, "
-+"ServerAdmin, etc.)\n"
- "<b>Data directory (DataDir)</b>\n"
- "<p>\n"
- "The root directory for the CUPS data files.\n"
-@@ -146,8 +146,8 @@
- 
- #: cupsd.conf.template.cpp:39
- msgid ""
--"_: Do not translate the keyword between brackets (e.g. ServerName, ServerAdmin, "
--"etc.)\n"
-+"_: Do not translate the keyword between brackets (e.g. ServerName, "
-+"ServerAdmin, etc.)\n"
- "<b>Default character set (DefaultCharset)</b>\n"
- "<p>\n"
- "The default character set to use. If not specified,\n"
-@@ -166,8 +166,8 @@
- 
- #: cupsd.conf.template.cpp:48
- msgid ""
--"_: Do not translate the keyword between brackets (e.g. ServerName, ServerAdmin, "
--"etc.)\n"
-+"_: Do not translate the keyword between brackets (e.g. ServerName, "
-+"ServerAdmin, etc.)\n"
- "<b>Default language (DefaultLanguage)</b>\n"
- "<p>\n"
- "The default language if not specified by the browser.\n"
-@@ -184,8 +184,8 @@
- 
- #: cupsd.conf.template.cpp:56
- msgid ""
--"_: Do not translate the keyword between brackets (e.g. ServerName, ServerAdmin, "
--"etc.)\n"
-+"_: Do not translate the keyword between brackets (e.g. ServerName, "
-+"ServerAdmin, etc.)\n"
- "<b>Document directory (DocumentRoot)</b>\n"
- "<p>\n"
- "The root directory for HTTP documents that are served.\n"
-@@ -202,8 +202,8 @@
- 
- #: cupsd.conf.template.cpp:64
- msgid ""
--"_: Do not translate the keyword between brackets (e.g. ServerName, ServerAdmin, "
--"etc.)\n"
-+"_: Do not translate the keyword between brackets (e.g. ServerName, "
-+"ServerAdmin, etc.)\n"
- "<b>Error log (ErrorLog)</b>\n"
- "<p>\n"
- "The error log file; if this does not start with a leading /\n"
-@@ -228,8 +228,8 @@
- 
- #: cupsd.conf.template.cpp:76
- msgid ""
--"_: Do not translate the keyword between brackets (e.g. ServerName, ServerAdmin, "
--"etc.)\n"
-+"_: Do not translate the keyword between brackets (e.g. ServerName, "
-+"ServerAdmin, etc.)\n"
- "<b>Font path (FontPath)</b>\n"
- "<p>\n"
- "The path to locate all font files (currently only for pstoraster).\n"
-@@ -246,8 +246,8 @@
- 
- #: cupsd.conf.template.cpp:84
- msgid ""
--"_: Do not translate the keyword between brackets (e.g. ServerName, ServerAdmin, "
--"etc.)\n"
-+"_: Do not translate the keyword between brackets (e.g. ServerName, "
-+"ServerAdmin, etc.)\n"
- "<b>Log level (LogLevel)</b>\n"
- "<p>\n"
- "Controls the number of messages logged to the ErrorLog\n"
-@@ -259,8 +259,7 @@
- "<li><i>warn</i>:      Log errors and warnings.</li>\n"
- "<li><i>error</i>:     Log only errors.</li>\n"
- "<li><i>none</i>:      Log nothing.</li>\n"
--"</ul>"
--"<p>\n"
-+"</ul><p>\n"
- "<i>ex</i>: info</p>\n"
- msgstr ""
- "紀錄檔等級 (LogLevel)</b>\n"
-@@ -274,14 +273,13 @@
- "<li><i>warn</i>：      記錄錯誤與警告。</li>\n"
- "<li><i>error</i>：     只記錄錯誤。</li>\n"
- "<li><i>none</i>：      不記錄任何事。</li>\n"
--"</ul>"
--"<p>\n"
-+"</ul><p>\n"
- "<i>例</i>： info</p>\n"
- 
- #: cupsd.conf.template.cpp:99
- msgid ""
--"_: Do not translate the keyword between brackets (e.g. ServerName, ServerAdmin, "
--"etc.)\n"
-+"_: Do not translate the keyword between brackets (e.g. ServerName, "
-+"ServerAdmin, etc.)\n"
- "<b>Max log size (MaxLogSize)</b>\n"
- "<p>\n"
- "Controls the maximum size of each log file before they are\n"
-@@ -298,8 +296,8 @@
- 
- #: cupsd.conf.template.cpp:107
- msgid ""
--"_: Do not translate the keyword between brackets (e.g. ServerName, ServerAdmin, "
--"etc.)\n"
-+"_: Do not translate the keyword between brackets (e.g. ServerName, "
-+"ServerAdmin, etc.)\n"
- "<b>Page log (PageLog)</b>\n"
- "<p>\n"
- "The page log file; if this does not start with a leading /\n"
-@@ -324,8 +322,8 @@
- 
- #: cupsd.conf.template.cpp:119
- msgid ""
--"_: Do not translate the keyword between brackets (e.g. ServerName, ServerAdmin, "
--"etc.)\n"
-+"_: Do not translate the keyword between brackets (e.g. ServerName, "
-+"ServerAdmin, etc.)\n"
- "<b>Preserve job history (PreserveJobHistory)</b>\n"
- "<p>\n"
- "Whether or not to preserve the job history after a\n"
-@@ -342,8 +340,8 @@
- 
- #: cupsd.conf.template.cpp:127
- msgid ""
--"_: Do not translate the keyword between brackets (e.g. ServerName, ServerAdmin, "
--"etc.)\n"
-+"_: Do not translate the keyword between brackets (e.g. ServerName, "
-+"ServerAdmin, etc.)\n"
- "<b>Preserve job files (PreserveJobFiles)</b>\n"
- "<p>\n"
- "Whether or not to preserve the job files after a\n"
-@@ -360,8 +358,8 @@
- 
- #: cupsd.conf.template.cpp:135
- msgid ""
--"_: Do not translate the keyword between brackets (e.g. ServerName, ServerAdmin, "
--"etc.)\n"
-+"_: Do not translate the keyword between brackets (e.g. ServerName, "
-+"ServerAdmin, etc.)\n"
- "<b>Printcap file (Printcap)</b>\n"
- "<p>\n"
- "The name of the printcap file.  Default is no filename.\n"
-@@ -378,8 +376,8 @@
- 
- #: cupsd.conf.template.cpp:143
- msgid ""
--"_: Do not translate the keyword between brackets (e.g. ServerName, ServerAdmin, "
--"etc.)\n"
-+"_: Do not translate the keyword between brackets (e.g. ServerName, "
-+"ServerAdmin, etc.)\n"
- "<b>Request directory (RequestRoot)</b>\n"
- "<p>\n"
- "The directory where request files are stored.\n"
-@@ -396,8 +394,8 @@
- 
- #: cupsd.conf.template.cpp:151
- msgid ""
--"_: Do not translate the keyword between brackets (e.g. ServerName, ServerAdmin, "
--"etc.)\n"
-+"_: Do not translate the keyword between brackets (e.g. ServerName, "
-+"ServerAdmin, etc.)\n"
- "<b>Remote root user (RemoteRoot)</b>\n"
- "<p>\n"
- "The name of the user assigned to unauthenticated accesses\n"
-@@ -414,8 +412,8 @@
- 
- #: cupsd.conf.template.cpp:159
- msgid ""
--"_: Do not translate the keyword between brackets (e.g. ServerName, ServerAdmin, "
--"etc.)\n"
-+"_: Do not translate the keyword between brackets (e.g. ServerName, "
-+"ServerAdmin, etc.)\n"
- "<b>Server binaries (ServerBin)</b>\n"
- "<p>\n"
- "The root directory for the scheduler executables.\n"
-@@ -432,8 +430,8 @@
- 
- #: cupsd.conf.template.cpp:167
- msgid ""
--"_: Do not translate the keyword between brackets (e.g. ServerName, ServerAdmin, "
--"etc.)\n"
-+"_: Do not translate the keyword between brackets (e.g. ServerName, "
-+"ServerAdmin, etc.)\n"
- "<b>Server files (ServerRoot)</b>\n"
- "<p>\n"
- "The root directory for the scheduler.\n"
-@@ -450,8 +448,8 @@
- 
- #: cupsd.conf.template.cpp:175
- msgid ""
--"_: Do not translate the keyword between brackets (e.g. ServerName, ServerAdmin, "
--"etc.)\n"
-+"_: Do not translate the keyword between brackets (e.g. ServerName, "
-+"ServerAdmin, etc.)\n"
- "<b>User (User)</b>\n"
- "<p>\n"
- "The user the server runs under.  Normally this\n"
-@@ -478,8 +476,8 @@
- 
- #: cupsd.conf.template.cpp:188
- msgid ""
--"_: Do not translate the keyword between brackets (e.g. ServerName, ServerAdmin, "
--"etc.)\n"
-+"_: Do not translate the keyword between brackets (e.g. ServerName, "
-+"ServerAdmin, etc.)\n"
- "<b>Group (Group)</b>\n"
- "<p>\n"
- "The group the server runs under.  Normally this\n"
-@@ -498,8 +496,8 @@
- 
- #: cupsd.conf.template.cpp:197
- msgid ""
--"_: Do not translate the keyword between brackets (e.g. ServerName, ServerAdmin, "
--"etc.)\n"
-+"_: Do not translate the keyword between brackets (e.g. ServerName, "
-+"ServerAdmin, etc.)\n"
- "<b>RIP cache (RIPCache)</b>\n"
- "<p>\n"
- "The amount of memory that each RIP should use to cache\n"
-@@ -520,8 +518,8 @@
- 
- #: cupsd.conf.template.cpp:207
- msgid ""
--"_: Do not translate the keyword between brackets (e.g. ServerName, ServerAdmin, "
--"etc.)\n"
-+"_: Do not translate the keyword between brackets (e.g. ServerName, "
-+"ServerAdmin, etc.)\n"
- "<b>Temporary files (TempDir)</b>\n"
- "<p>\n"
- "The directory to put temporary files in. This directory must be\n"
-@@ -540,8 +538,8 @@
- 
- #: cupsd.conf.template.cpp:216
- msgid ""
--"_: Do not translate the keyword between brackets (e.g. ServerName, ServerAdmin, "
--"etc.)\n"
-+"_: Do not translate the keyword between brackets (e.g. ServerName, "
-+"ServerAdmin, etc.)\n"
- "<b>Filter limit (FilterLimit)</b>\n"
- "<p>\n"
- "Sets the maximum cost of all job filters that can be run\n"
-@@ -566,8 +564,8 @@
- 
- #: cupsd.conf.template.cpp:228
- msgid ""
--"_: Do not translate the keyword between brackets (e.g. ServerName, ServerAdmin, "
--"etc.)\n"
-+"_: Do not translate the keyword between brackets (e.g. ServerName, "
-+"ServerAdmin, etc.)\n"
- "<b>Listen to (Port/Listen)</b>\n"
- "<p>\n"
- "Ports/addresses that are listened to.  The default port 631 is reserved\n"
-@@ -598,12 +596,13 @@
- 
- #: cupsd.conf.template.cpp:243
- msgid ""
--"_: Do not translate the keyword between brackets (e.g. ServerName, ServerAdmin, "
--"etc.)\n"
-+"_: Do not translate the keyword between brackets (e.g. ServerName, "
-+"ServerAdmin, etc.)\n"
- "<b>Hostname lookups (HostNameLookups)</b>\n"
- "<p>\n"
- "Whether or not to do lookups on IP addresses to get a\n"
--"fully-qualified hostname.  This defaults to Off for performance reasons...</p>\n"
-+"fully-qualified hostname.  This defaults to Off for performance reasons...</"
-+"p>\n"
- "<p>\n"
- "<i>ex</i>: On</p>\n"
- msgstr ""
-@@ -616,8 +615,8 @@
- 
- #: cupsd.conf.template.cpp:251
- msgid ""
--"_: Do not translate the keyword between brackets (e.g. ServerName, ServerAdmin, "
--"etc.)\n"
-+"_: Do not translate the keyword between brackets (e.g. ServerName, "
-+"ServerAdmin, etc.)\n"
- "<b>Keep alive (KeepAlive)</b>\n"
- "<p>\n"
- "Whether or not to support the Keep-Alive connection\n"
-@@ -634,8 +633,8 @@
- 
- #: cupsd.conf.template.cpp:259
- msgid ""
--"_: Do not translate the keyword between brackets (e.g. ServerName, ServerAdmin, "
--"etc.)\n"
-+"_: Do not translate the keyword between brackets (e.g. ServerName, "
-+"ServerAdmin, etc.)\n"
- "<b>Keep-alive timeout (KeepAliveTimeout)</b>\n"
- "<p>\n"
- "The timeout (in seconds) before Keep-Alive connections are\n"
-@@ -652,8 +651,8 @@
- 
- #: cupsd.conf.template.cpp:267
- msgid ""
--"_: Do not translate the keyword between brackets (e.g. ServerName, ServerAdmin, "
--"etc.)\n"
-+"_: Do not translate the keyword between brackets (e.g. ServerName, "
-+"ServerAdmin, etc.)\n"
- "<b>Max clients (MaxClients)</b>\n"
- "<p>\n"
- "Controls the maximum number of simultaneous clients that\n"
-@@ -670,8 +669,8 @@
- 
- #: cupsd.conf.template.cpp:275
- msgid ""
--"_: Do not translate the keyword between brackets (e.g. ServerName, ServerAdmin, "
--"etc.)\n"
-+"_: Do not translate the keyword between brackets (e.g. ServerName, "
-+"ServerAdmin, etc.)\n"
- "<b>Max request size (MaxRequestSize)</b>\n"
- "<p>\n"
- "Controls the maximum size of HTTP requests and print files.\n"
-@@ -688,12 +687,12 @@
- 
- #: cupsd.conf.template.cpp:283
- msgid ""
--"_: Do not translate the keyword between brackets (e.g. ServerName, ServerAdmin, "
--"etc.)\n"
-+"_: Do not translate the keyword between brackets (e.g. ServerName, "
-+"ServerAdmin, etc.)\n"
- "<b>Client timeout (Timeout)</b>\n"
- "<p>\n"
--"The timeout (in seconds) before requests time out.  Default is 300 seconds.</p>"
--"\n"
-+"The timeout (in seconds) before requests time out.  Default is 300 seconds.</"
-+"p>\n"
- "<p>\n"
- "<i>ex</i>: 300</p>\n"
- msgstr ""
-@@ -705,8 +704,8 @@
- 
- #: cupsd.conf.template.cpp:290
- msgid ""
--"_: Do not translate the keyword between brackets (e.g. ServerName, ServerAdmin, "
--"etc.)\n"
-+"_: Do not translate the keyword between brackets (e.g. ServerName, "
-+"ServerAdmin, etc.)\n"
- "<b>Use browsing (Browsing)</b>\n"
- "<p>\n"
- "Whether or not to <b>listen</b> to printer \n"
-@@ -741,8 +740,8 @@
- 
- #: cupsd.conf.template.cpp:307
- msgid ""
--"_: Do not translate the keyword between brackets (e.g. ServerName, ServerAdmin, "
--"etc.)\n"
-+"_: Do not translate the keyword between brackets (e.g. ServerName, "
-+"ServerAdmin, etc.)\n"
- "<b>Use short names (BrowseShortNames)</b>\n"
- "<p>\n"
- "Whether or not to use \"short\" names for remote printers\n"
-@@ -761,8 +760,8 @@
- 
- #: cupsd.conf.template.cpp:316
- msgid ""
--"_: Do not translate the keyword between brackets (e.g. ServerName, ServerAdmin, "
--"etc.)\n"
-+"_: Do not translate the keyword between brackets (e.g. ServerName, "
-+"ServerAdmin, etc.)\n"
- "<b>Browse addresses (BrowseAddress)</b>\n"
- "<p>\n"
- "Specifies a broadcast address to be used.  By\n"
-@@ -785,8 +784,8 @@
- 
- #: cupsd.conf.template.cpp:327
- msgid ""
--"_: Do not translate the keyword between brackets (e.g. ServerName, ServerAdmin, "
--"etc.)\n"
-+"_: Do not translate the keyword between brackets (e.g. ServerName, "
-+"ServerAdmin, etc.)\n"
- "<b>Browse allow/deny (BrowseAllow/BrowseDeny)</b>\n"
- "<p>\n"
- "<u>BrowseAllow</u>: specifies an address mask to allow for incoming browser\n"
-@@ -809,8 +808,7 @@
- "nnn.nnn.nnn.nnn\n"
- "nnn.nnn.nnn.nnn/mm\n"
- "nnn.nnn.nnn.nnn/mmm.mmm.mmm.mmm\n"
--"</pre>"
--"<p>\n"
-+"</pre><p>\n"
- "The hostname/domainname restrictions only work if you have turned hostname\n"
- "lookups on!</p>\n"
- msgstr ""
-@@ -836,15 +834,14 @@
- "nnn.nnn.nnn.nnn\n"
- "nnn.nnn.nnn.nnn/mm\n"
- "nnn.nnn.nnn.nnn/mmm.mmm.mmm.mmm\n"
--"</pre>"
--"<p>\n"
-+"</pre><p>\n"
- "主機名稱/網域名稱的限制只有當您開啟主機名稱查詢時\n"
- "才會運作！</p>\n"
- 
- #: cupsd.conf.template.cpp:354
- msgid ""
--"_: Do not translate the keyword between brackets (e.g. ServerName, ServerAdmin, "
--"etc.)\n"
-+"_: Do not translate the keyword between brackets (e.g. ServerName, "
-+"ServerAdmin, etc.)\n"
- "<b>Browse interval (BrowseInterval)</b>\n"
- "<p>\n"
- "The time between browsing updates in seconds.  Default\n"
-@@ -867,14 +864,14 @@
- "因此這代表更新之間的最大時間間隔。</p>\n"
- "<p>\n"
- "將這個設為 0 以停止對外廣播，如此您的本機印表機就不會\n"
--"被公佈，但您仍然可以看到其他主機上的印表機</p>\n"
-+"被公布，但您仍然可以看到其他主機上的印表機</p>\n"
- "<p>\n"
- "<i>例</i>： 30</p>\n"
- 
- #: cupsd.conf.template.cpp:368
- msgid ""
--"_: Do not translate the keyword between brackets (e.g. ServerName, ServerAdmin, "
--"etc.)\n"
-+"_: Do not translate the keyword between brackets (e.g. ServerName, "
-+"ServerAdmin, etc.)\n"
- "<b>Browse order (BrowseOrder)</b>\n"
- "<p>\n"
- "Specifies the order of BrowseAllow/BrowseDeny comparisons.</p>\n"
-@@ -889,8 +886,8 @@
- 
- #: cupsd.conf.template.cpp:375
- msgid ""
--"_: Do not translate the keyword between brackets (e.g. ServerName, ServerAdmin, "
--"etc.)\n"
-+"_: Do not translate the keyword between brackets (e.g. ServerName, "
-+"ServerAdmin, etc.)\n"
- "<b>Browse poll (BrowsePoll)</b>\n"
- "<p>\n"
- "Poll the named server(s) for printers.</p>\n"
-@@ -905,8 +902,8 @@
- 
- #: cupsd.conf.template.cpp:382
- msgid ""
--"_: Do not translate the keyword between brackets (e.g. ServerName, ServerAdmin, "
--"etc.)\n"
-+"_: Do not translate the keyword between brackets (e.g. ServerName, "
-+"ServerAdmin, etc.)\n"
- "<b>Browse port (BrowsePort)</b>\n"
- "<p>\n"
- "The port used for UDP broadcasts.  By default this is\n"
-@@ -925,8 +922,8 @@
- 
- #: cupsd.conf.template.cpp:391
- msgid ""
--"_: Do not translate the keyword between brackets (e.g. ServerName, ServerAdmin, "
--"etc.)\n"
-+"_: Do not translate the keyword between brackets (e.g. ServerName, "
-+"ServerAdmin, etc.)\n"
- "<b>Browse relay (BrowseRelay)</b>\n"
- "<p>\n"
- "Relay browser packets from one address/network to another.</p>\n"
-@@ -941,8 +938,8 @@
- 
- #: cupsd.conf.template.cpp:398
- msgid ""
--"_: Do not translate the keyword between brackets (e.g. ServerName, ServerAdmin, "
--"etc.)\n"
-+"_: Do not translate the keyword between brackets (e.g. ServerName, "
-+"ServerAdmin, etc.)\n"
- "<b>Browse timeout (BrowseTimeout)</b>\n"
- "<p>\n"
- "The timeout (in seconds) for network printers - if we don't\n"
-@@ -965,8 +962,8 @@
- 
- #: cupsd.conf.template.cpp:409
- msgid ""
--"_: Do not translate the keyword between brackets (e.g. ServerName, ServerAdmin, "
--"etc.)\n"
-+"_: Do not translate the keyword between brackets (e.g. ServerName, "
-+"ServerAdmin, etc.)\n"
- "<b>Implicit classes (ImplicitClasses)</b>\n"
- "<p>\n"
- "Whether or not to use implicit classes.</p>\n"
-@@ -1003,8 +1000,8 @@
- 
- #: cupsd.conf.template.cpp:427
- msgid ""
--"_: Do not translate the keyword between brackets (e.g. ServerName, ServerAdmin, "
--"etc.)\n"
-+"_: Do not translate the keyword between brackets (e.g. ServerName, "
-+"ServerAdmin, etc.)\n"
- "<b>System group (SystemGroup)</b>\n"
- "<p>\n"
- "The group name for \"System\" (printer administration)\n"
-@@ -1024,8 +1021,8 @@
- 
- #: cupsd.conf.template.cpp:436
- msgid ""
--"_: Do not translate the keyword between brackets (e.g. ServerName, ServerAdmin, "
--"etc.)\n"
-+"_: Do not translate the keyword between brackets (e.g. ServerName, "
-+"ServerAdmin, etc.)\n"
- "<b>Encryption certificate (ServerCertificate)</b>\n"
- "<p>\n"
- "The file to read containing the server's certificate.\n"
-@@ -1042,8 +1039,8 @@
- 
- #: cupsd.conf.template.cpp:444
- msgid ""
--"_: Do not translate the keyword between brackets (e.g. ServerName, ServerAdmin, "
--"etc.)\n"
-+"_: Do not translate the keyword between brackets (e.g. ServerName, "
-+"ServerAdmin, etc.)\n"
- "<b>Encryption key (ServerKey)</b>\n"
- "<p>\n"
- "The file to read containing the server's key.\n"
-@@ -1060,8 +1057,8 @@
- 
- #: cupsd.conf.template.cpp:452
- msgid ""
--"_: Do not translate the keyword between brackets (e.g. ServerName, ServerAdmin, "
--"etc.)\n"
-+"_: Do not translate the keyword between brackets (e.g. ServerName, "
-+"ServerAdmin, etc.)\n"
- "Access permissions\n"
- "# Access permissions for each directory served by the scheduler.\n"
- "Locations are relative to DocumentRoot...\n"
-@@ -1148,40 +1145,38 @@
- 
- #: cupsd.conf.template.cpp:495
- msgid ""
--"_: Do not translate the keyword between brackets (e.g. ServerName, ServerAdmin, "
--"etc.)\n"
-+"_: Do not translate the keyword between brackets (e.g. ServerName, "
-+"ServerAdmin, etc.)\n"
- "<b>Authentication (AuthType)</b>\n"
- "<p>\n"
--"The authorization to use:"
--"<p>\n"
-+"The authorization to use:<p>\n"
- "<ul type=circle>\n"
- "<li><i>None</i>   - Perform no authentication.</li>\n"
--"<li><i>Basic</i>  - Perform authentication using the HTTP Basic method.</li>\n"
--"<li><i>Digest</i> - Perform authentication using the HTTP Digest method.</li>\n"
--"</ul>"
--"<p>\n"
-+"<li><i>Basic</i>  - Perform authentication using the HTTP Basic method.</"
-+"li>\n"
-+"<li><i>Digest</i> - Perform authentication using the HTTP Digest method.</"
-+"li>\n"
-+"</ul><p>\n"
- "Note: local certificate authentication can be substituted by\n"
- "the client for <i>Basic</i> or <i>Digest</i> when connecting to the\n"
- "localhost interface.</p>\n"
- msgstr ""
- "<b>授權 (AuthType)</b>\n"
- "<p>\n"
--"要使用的授權："
--"<p>\n"
-+"要使用的授權：<p>\n"
- "<ul type=circle>\n"
- "<li><i>無</i>   - 不進行授權。</li>\n"
- "<li><i>基礎</i>  - 使用 HTTP 基礎方法進行授權。</li>\n"
- "<li><i>摘要</i> - 使用 HTTP 摘要方法進行授權。</li>\n"
--"</ul>"
--"<p>\n"
-+"</ul><p>\n"
- "注意：當連線到 localhost 界面時，本地端\n"
- "認證授權可以被客戶端以<i>基礎</i>或<i>摘要</i>\n"
- "的方式代替。</p>\n"
- 
- #: cupsd.conf.template.cpp:508
- msgid ""
--"_: Do not translate the keyword between brackets (e.g. ServerName, ServerAdmin, "
--"etc.)\n"
-+"_: Do not translate the keyword between brackets (e.g. ServerName, "
-+"ServerAdmin, etc.)\n"
- "<b>Class (AuthClass)</b>\n"
- "<p>\n"
- "The authorization class; currently only <i>Anonymous</i>, <i>User</i>,\n"
-@@ -1196,8 +1191,8 @@
- 
- #: cupsd.conf.template.cpp:515
- msgid ""
--"_: Do not translate the keyword between brackets (e.g. ServerName, ServerAdmin, "
--"etc.)\n"
-+"_: Do not translate the keyword between brackets (e.g. ServerName, "
-+"ServerAdmin, etc.)\n"
- "<p>The user/group names allowed to access the resource. The format is a\n"
- "comma separated list.</p>\n"
- msgstr ""
-@@ -1206,8 +1201,8 @@
- 
- #: cupsd.conf.template.cpp:519
- msgid ""
--"_: Do not translate the keyword between brackets (e.g. ServerName, ServerAdmin, "
--"etc.)\n"
-+"_: Do not translate the keyword between brackets (e.g. ServerName, "
-+"ServerAdmin, etc.)\n"
- "<b>Satisfy (Satisfy)</b>\n"
- "<p>\n"
- "This directive controls whether all specified conditions must\n"
-@@ -1244,8 +1239,8 @@
- 
- #: cupsd.conf.template.cpp:537
- msgid ""
--"_: Do not translate the keyword between brackets (e.g. ServerName, ServerAdmin, "
--"etc.)\n"
-+"_: Do not translate the keyword between brackets (e.g. ServerName, "
-+"ServerAdmin, etc.)\n"
- "<b>Authentication group name (AuthGroupName)</b>\n"
- "<p>\n"
- "The group name for <i>Group</i> authorization.</p>\n"
-@@ -1256,8 +1251,8 @@
- 
- #: cupsd.conf.template.cpp:542
- msgid ""
--"_: Do not translate the keyword between brackets (e.g. ServerName, ServerAdmin, "
--"etc.)\n"
-+"_: Do not translate the keyword between brackets (e.g. ServerName, "
-+"ServerAdmin, etc.)\n"
- "<b>ACL order (Order)</b>\n"
- "<p>\n"
- "The order of Allow/Deny processing.</p>\n"
-@@ -1268,8 +1263,8 @@
- 
- #: cupsd.conf.template.cpp:547
- msgid ""
--"_: Do not translate the keyword between brackets (e.g. ServerName, ServerAdmin, "
--"etc.)\n"
-+"_: Do not translate the keyword between brackets (e.g. ServerName, "
-+"ServerAdmin, etc.)\n"
- "<b>Allow</b>\n"
- "<p>\n"
- "Allows access from the specified hostname, domain, IP address, or\n"
-@@ -1286,8 +1281,7 @@
- "nnn.nnn.nnn.nnn\n"
- "nnn.nnn.nnn.nnn/mm\n"
- "nnn.nnn.nnn.nnn/mmm.mmm.mmm.mmm\n"
--"</pre>"
--"<p>\n"
-+"</pre><p>\n"
- "The host and domain address require that you enable hostname lookups\n"
- "with \"HostNameLookups On\" above.</p>\n"
- msgstr ""
-@@ -1307,15 +1301,14 @@
- "nnn.nnn.nnn.nnn\n"
- "nnn.nnn.nnn.nnn/mm\n"
- "nnn.nnn.nnn.nnn/mmm.mmm.mmm.mmm\n"
--"</pre>"
--"<p>\n"
-+"</pre><p>\n"
- "主機與網域位址需要您在上面的「HostNameLookups On」\n"
- "啟用主機名稱查詢。</p>\n"
- 
- #: cupsd.conf.template.cpp:568
- msgid ""
--"_: Do not translate the keyword between brackets (e.g. ServerName, ServerAdmin, "
--"etc.)\n"
-+"_: Do not translate the keyword between brackets (e.g. ServerName, "
-+"ServerAdmin, etc.)\n"
- "<b>ACL addresses (Allow/Deny)</b>\n"
- "<p>\n"
- "Allows/Denies access from the specified hostname, domain, IP address, or\n"
-@@ -1332,8 +1325,7 @@
- "nnn.nnn.nnn.nnn\n"
- "nnn.nnn.nnn.nnn/mm\n"
- "nnn.nnn.nnn.nnn/mmm.mmm.mmm.mmm\n"
--"</pre>"
--"<p>\n"
-+"</pre><p>\n"
- "The host and domain address require that you enable hostname lookups\n"
- "with \"HostNameLookups On\" above.</p>\n"
- msgstr ""
-@@ -1353,15 +1345,14 @@
- "nnn.nnn.nnn.nnn\n"
- "nnn.nnn.nnn.nnn/mm\n"
- "nnn.nnn.nnn.nnn/mmm.mmm.mmm.mmm\n"
--"</pre>"
--"<p>\n"
-+"</pre><p>\n"
- "主機與網域位址需要您在上面的「HostNameLookups On」\n"
- "啟用主機名稱查詢。</p>\n"
- 
- #: cupsd.conf.template.cpp:589
- msgid ""
--"_: Do not translate the keyword between brackets (e.g. ServerName, ServerAdmin, "
--"etc.)\n"
-+"_: Do not translate the keyword between brackets (e.g. ServerName, "
-+"ServerAdmin, etc.)\n"
- "<b>Encryption (Encryption)</b>\n"
- "<p>\n"
- "Whether or not to use encryption; this depends on having\n"
-@@ -1373,8 +1364,7 @@
- "<li><i>Never</i>        - Never use encryption</li>\n"
- "<li><i>Required</i>     - Use TLS encryption upgrade</li>\n"
- "<li><i>IfRequested</i>  - Use encryption if the server requests it</li>\n"
--"</ul>"
--"<p>\n"
-+"</ul><p>\n"
- "The default value is \"IfRequested\".</p>\n"
- msgstr ""
- "<b>加密 (Encryption)</b>\n"
-@@ -1388,14 +1378,13 @@
- "<li><i>永不</i>        - 永遠不使用加密</li>\n"
- "<li><i>必須的</i>     - 使用 TLS 加密升級</li>\n"
- "<li><i>如果要求</i>  - 如果伺服器要求就使用加密</li>\n"
--"</ul>"
--"<p>\n"
-+"</ul><p>\n"
- "預設數值是「如果要求」。</p>\n"
- 
- #: cupsd.conf.template.cpp:604
- msgid ""
--"_: Do not translate the keyword between brackets (e.g. ServerName, ServerAdmin, "
--"etc.)\n"
-+"_: Do not translate the keyword between brackets (e.g. ServerName, "
-+"ServerAdmin, etc.)\n"
- "<b>Access permissions</b>\n"
- "<p>\n"
- "Access permissions for each directory served by the scheduler.\n"
-@@ -1408,8 +1397,8 @@
- 
- #: cupsd.conf.template.cpp:610
- msgid ""
--"_: Do not translate the keyword between brackets (e.g. ServerName, ServerAdmin, "
--"etc.)\n"
-+"_: Do not translate the keyword between brackets (e.g. ServerName, "
-+"ServerAdmin, etc.)\n"
- "<b>Auto purge jobs (AutoPurgeJobs)</b>\n"
- "<p>\n"
- "Automatically purge jobs when not needed for quotas.\n"
-@@ -1422,8 +1411,8 @@
- 
- #: cupsd.conf.template.cpp:616
- msgid ""
--"_: Do not translate the keyword between brackets (e.g. ServerName, ServerAdmin, "
--"etc.)\n"
-+"_: Do not translate the keyword between brackets (e.g. ServerName, "
-+"ServerAdmin, etc.)\n"
- "<b>Browse protocols (BrowseProtocols)</b>\n"
- "<p>\n"
- "Which protocols to use for browsing.  Can be\n"
-@@ -1432,8 +1421,7 @@
- "<li><i>all</i>  - Use all supported protocols.</li>\n"
- "<li><i>cups</i> - Use the CUPS browse protocol.</li>\n"
- "<li><i>slp</i>  - Use the SLPv2 protocol.</li>\n"
--"</ul>"
--"<p>\n"
-+"</ul><p>\n"
- "The default is <b>cups</b>.</p>\n"
- "<p>\n"
- "Note: If you choose to use SLPv2, it is <b>strongly</b> recommended that\n"
-@@ -1450,8 +1438,7 @@
- "<li><i>全部</i>  - 使用所有支援的協定。</li>\n"
- "<li><i>cups</i> - 使用 CUPS 瀏覽協定。</li>\n"
- "<li><i>slp</i>  - 使用 SLPv2 協定。</li>\n"
--"</ul>"
--"<p>\n"
-+"</ul><p>\n"
- "預設值為 <b>cups</b>。</p>\n"
- "<p>\n"
- "注意：如果您選擇使用 SLPv2 ，<b>強烈</b>建議\n"
-@@ -1462,8 +1449,8 @@
- 
- #: cupsd.conf.template.cpp:634
- msgid ""
--"_: Do not translate the keyword between brackets (e.g. ServerName, ServerAdmin, "
--"etc.)\n"
-+"_: Do not translate the keyword between brackets (e.g. ServerName, "
-+"ServerAdmin, etc.)\n"
- "<b>Classification (Classification)</b>\n"
- "<p>\n"
- "The classification level of the server.  If set, this\n"
-@@ -1482,8 +1469,8 @@
- 
- #: cupsd.conf.template.cpp:643
- msgid ""
--"_: Do not translate the keyword between brackets (e.g. ServerName, ServerAdmin, "
--"etc.)\n"
-+"_: Do not translate the keyword between brackets (e.g. ServerName, "
-+"ServerAdmin, etc.)\n"
- "<b>Allow overrides (ClassifyOverride)</b>\n"
- "<p>\n"
- "Whether to allow users to override the classification\n"
-@@ -1504,8 +1491,8 @@
- 
- #: cupsd.conf.template.cpp:653
- msgid ""
--"_: Do not translate the keyword between brackets (e.g. ServerName, ServerAdmin, "
--"etc.)\n"
-+"_: Do not translate the keyword between brackets (e.g. ServerName, "
-+"ServerAdmin, etc.)\n"
- "<b>Hide implicit members (HideImplicitMembers)</b>\n"
- "<p>\n"
- "Whether or not to show the members of an\n"
-@@ -1532,8 +1519,8 @@
- 
- #: cupsd.conf.template.cpp:666
- msgid ""
--"_: Do not translate the keyword between brackets (e.g. ServerName, ServerAdmin, "
--"etc.)\n"
-+"_: Do not translate the keyword between brackets (e.g. ServerName, "
-+"ServerAdmin, etc.)\n"
- "<b>Use &quot;any&quot; classes (ImplicitAnyClasses)</b>\n"
- "<p>\n"
- "Whether or not to create <b>AnyPrinter</b> implicit\n"
-@@ -1564,8 +1551,8 @@
- 
- #: cupsd.conf.template.cpp:681
- msgid ""
--"_: Do not translate the keyword between brackets (e.g. ServerName, ServerAdmin, "
--"etc.)\n"
-+"_: Do not translate the keyword between brackets (e.g. ServerName, "
-+"ServerAdmin, etc.)\n"
- "<b>Max jobs (MaxJobs)</b>\n"
- "<p>\n"
- "Maximum number of jobs to keep in memory (active and completed).\n"
-@@ -1578,8 +1565,8 @@
- 
- #: cupsd.conf.template.cpp:687
- msgid ""
--"_: Do not translate the keyword between brackets (e.g. ServerName, ServerAdmin, "
--"etc.)\n"
-+"_: Do not translate the keyword between brackets (e.g. ServerName, "
-+"ServerAdmin, etc.)\n"
- "<b>Max jobs per user (MaxJobsPerUser)</b>\n"
- "<p>\n"
- "The MaxJobsPerUser directive controls the maximum number of <i>active</i>\n"
-@@ -1604,11 +1591,12 @@
- 
- #: cupsd.conf.template.cpp:699
- msgid ""
--"_: Do not translate the keyword between brackets (e.g. ServerName, ServerAdmin, "
--"etc.)\n"
-+"_: Do not translate the keyword between brackets (e.g. ServerName, "
-+"ServerAdmin, etc.)\n"
- "<b>Max jobs per printer (MaxJobsPerPrinter)</b>\n"
- "<p>\n"
--"The MaxJobsPerPrinter directive controls the maximum number of <i>active</i>\n"
-+"The MaxJobsPerPrinter directive controls the maximum number of <i>active</"
-+"i>\n"
- "jobs that are allowed for each printer or class. Once a printer or class\n"
- "reaches the limit, new jobs will be rejected until one of the active jobs\n"
- "is completed, stopped, aborted, or canceled.</p>\n"
-@@ -1630,8 +1618,8 @@
- 
- #: cupsd.conf.template.cpp:711
- msgid ""
--"_: Do not translate the keyword between brackets (e.g. ServerName, ServerAdmin, "
--"etc.)\n"
-+"_: Do not translate the keyword between brackets (e.g. ServerName, "
-+"ServerAdmin, etc.)\n"
- "<b>Port</b>\n"
- "<p>\n"
- "The port value that the CUPS daemon is listening to. Default is 631.</p>\n"
-@@ -1642,8 +1630,8 @@
- 
- #: cupsd.conf.template.cpp:716
- msgid ""
--"_: Do not translate the keyword between brackets (e.g. ServerName, ServerAdmin, "
--"etc.)\n"
-+"_: Do not translate the keyword between brackets (e.g. ServerName, "
-+"ServerAdmin, etc.)\n"
- "<b>Address</b>\n"
- "<p>\n"
- "The address that the CUPS daemon is listening at. Leave it empty or use\n"
-@@ -1656,8 +1644,8 @@
- 
- #: cupsd.conf.template.cpp:722
- msgid ""
--"_: Do not translate the keyword between brackets (e.g. ServerName, ServerAdmin, "
--"etc.)\n"
-+"_: Do not translate the keyword between brackets (e.g. ServerName, "
-+"ServerAdmin, etc.)\n"
- "<p>Check this box if you want to use SSL encryption with this address/port.\n"
- "</p>\n"
- msgstr ""
-@@ -1782,9 +1770,10 @@
- 
- #: cupsddialog.cpp:182
- msgid ""
--"Some options were not recognized by this configuration tool. They will be left "
--"untouched and you won't be able to change them."
--msgstr "組態工具無法辨識某些選項，因此這些參數將會保留不予更動，而您將不能改變它們。"
-+"Some options were not recognized by this configuration tool. They will be "
-+"left untouched and you won't be able to change them."
-+msgstr ""
-+"組態工具無法辨識某些選項，因此這些參數將會保留不予更動，而您將不能改變它們。"
- 
- #: cupsddialog.cpp:184
- msgid "Unrecognized Options"
-@@ -1800,8 +1789,8 @@
- 
- #: cupsddialog.cpp:239
- msgid ""
--"Unable to retrieve configuration file from the CUPS server. You probably don't "
--"have the access permissions to perform this operation."
-+"Unable to retrieve configuration file from the CUPS server. You probably "
-+"don't have the access permissions to perform this operation."
- msgstr "無法連上 CUPS 主機傳回組態檔案。也許是您沒權限進行這個操作。"
- 
- #: cupsddialog.cpp:249
-@@ -1814,14 +1803,14 @@
- 
- #: cupsddialog.cpp:270
- msgid ""
--"The config file has not been uploaded to the CUPS server. The daemon will not "
--"be restarted."
-+"The config file has not been uploaded to the CUPS server. The daemon will "
-+"not be restarted."
- msgstr "設定檔案尚未上傳到 CUPS 伺服器。因此服務程式將不會重新啟動。"
- 
- #: cupsddialog.cpp:274
- msgid ""
--"Unable to upload the configuration file to CUPS server. You probably don't have "
--"the access permissions to perform this operation."
-+"Unable to upload the configuration file to CUPS server. You probably don't "
-+"have the access permissions to perform this operation."
- msgstr "組態檔案無法上傳到 CUPS 伺服器。您可能沒權限進行這個操作。"
- 
- #: cupsddialog.cpp:277
-@@ -2135,26 +2124,26 @@
- #: cupsdsplash.cpp:49
- msgid ""
- "<p>This tool will help you to configure graphically the server of the CUPS "
--"printing system. The available options are grouped into sets of related topics "
--"and can be accessed quickly through the icon view located on the left. Each "
--"option has a default value that is shown if it has not been previously set. "
--"This default value should be OK in most cases.</p>"
--"<br>"
--"<p>You can access a short help message for each option using either the '?' "
--"button in the the title bar, or the button at the bottom of this dialog.</p>"
--msgstr ""
--"<p>這個工具將可以透過圖形介面引導你設定CUPS列印系統伺服器。所有可以設定的選項都分類成為樹狀的結構，而且可以輕易的在左邊的樹狀結構中找到你需要的設定。每個"
--"選項都有預設值，如果沒有事先設定就會顯示此值。在大多數的情況下預設值應該是沒問題的。</p>"
--"<br>"
--"<p>您可以使用標題列中的「?」按鈕或此對話盒底部的按鈕來取得每個選項的簡短說明訊息。</p>"
-+"printing system. The available options are grouped into sets of related "
-+"topics and can be accessed quickly through the icon view located on the "
-+"left. Each option has a default value that is shown if it has not been "
-+"previously set. This default value should be OK in most cases.</p><br><p>You "
-+"can access a short help message for each option using either the '?' button "
-+"in the the title bar, or the button at the bottom of this dialog.</p>"
-+msgstr ""
-+"<p>這個工具將可以透過圖形介面引導你設定CUPS列印系統伺服器。所有可以設定的選項"
-+"都分類成為樹狀的結構，而且可以輕易的在左邊的樹狀結構中找到你需要的設定。每個"
-+"選項都有預設值，如果沒有事先設定就會顯示此值。在大多數的情況下預設值應該是沒"
-+"問題的。</p><br><p>您可以使用標題列中的「?」按鈕或此對話盒底部的按鈕來取得每"
-+"個選項的簡短說明訊息。</p>"
- 
- #: editlist.cpp:33
- msgid "Add..."
--msgstr "增加..."
-+msgstr "增加…"
- 
- #: editlist.cpp:34
- msgid "Edit..."
--msgstr "編輯..."
-+msgstr "編輯…"
- 
- #: editlist.cpp:36
- msgid "Default List"
-diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdelibs/kabc_dir.po kde-i18n-zh_TW-3.5.10/messages/kdelibs/kabc_dir.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdelibs/kabc_dir.po	2005-09-10 13:15:02.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdelibs/kabc_dir.po	2011-11-11 15:45:17.000000000 +0100
-@@ -8,7 +8,7 @@
- "Project-Id-Version: kabc_dir\n"
- "POT-Creation-Date: 2005-05-18 21:23+0200\n"
- "PO-Revision-Date: 2005-08-10 17:38+0800\n"
--"Last-Translator: Stanley Wong <stanley18fan0k@yahoo.com.hk>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\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/kdelibs/kabc_file.po kde-i18n-zh_TW-3.5.10/messages/kdelibs/kabc_file.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdelibs/kabc_file.po	2006-07-22 10:04:33.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdelibs/kabc_file.po	2011-11-11 15:45:17.000000000 +0100
-@@ -8,7 +8,7 @@
- "Project-Id-Version: kabc_file\n"
- "POT-Creation-Date: 2006-06-20 03:54+0200\n"
- "PO-Revision-Date: 2005-08-10 17:41+0800\n"
--"Last-Translator: Stanley Wong <stanley18fan0k@yahoo.com.hk>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\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/kdelibs/kabcformat_binary.po kde-i18n-zh_TW-3.5.10/messages/kdelibs/kabcformat_binary.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdelibs/kabcformat_binary.po	2006-07-22 10:04:33.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdelibs/kabcformat_binary.po	2011-11-11 15:45:17.000000000 +0100
-@@ -7,7 +7,7 @@
- "Project-Id-Version: kabcformat_binary\n"
- "POT-Creation-Date: 2005-05-18 21:23+0200\n"
- "PO-Revision-Date: 2002-10-07 03:23+0800\n"
--"Last-Translator: Chen Yang <chenyang@elsewhere.idv.tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\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/kdelibs/kabc_ldapkio.po kde-i18n-zh_TW-3.5.10/messages/kdelibs/kabc_ldapkio.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdelibs/kabc_ldapkio.po	2005-09-10 13:15:02.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdelibs/kabc_ldapkio.po	2011-11-11 15:45:17.000000000 +0100
-@@ -7,7 +7,7 @@
- "Project-Id-Version: kabc_ldapkio\n"
- "POT-Creation-Date: 2005-05-18 21:23+0200\n"
- "PO-Revision-Date: 2005-08-10 17:47+0800\n"
--"Last-Translator: Stanley Wong <stanley18fan0k@yahoo.com.hk>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
-@@ -19,11 +19,11 @@
- 
- #: resourceldapkioconfig.cpp:58
- msgid "Edit Attributes..."
--msgstr "編輯屬性..."
-+msgstr "編輯屬性…"
- 
- #: resourceldapkioconfig.cpp:59
- msgid "Offline Use..."
--msgstr "離線使用..."
-+msgstr "離線使用…"
- 
- #: resourceldapkioconfig.cpp:171
- msgid "Attributes Configuration"
-diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdelibs/kabc_net.po kde-i18n-zh_TW-3.5.10/messages/kdelibs/kabc_net.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdelibs/kabc_net.po	2007-05-14 12:23:06.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdelibs/kabc_net.po	2011-11-11 15:45:17.000000000 +0100
-@@ -7,7 +7,7 @@
- "Project-Id-Version: kabc_net\n"
- "POT-Creation-Date: 2007-03-05 02:37+0100\n"
- "PO-Revision-Date: 2006-03-23 14:06+0800\n"
--"Last-Translator: You-Cheng Hsieh <yochenhsieh@xuite.net>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\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/kdelibs/kabc_sql.po kde-i18n-zh_TW-3.5.10/messages/kdelibs/kabc_sql.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdelibs/kabc_sql.po	2005-09-10 13:15:02.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdelibs/kabc_sql.po	2011-11-11 15:45:17.000000000 +0100
-@@ -8,7 +8,7 @@
- "Project-Id-Version: kabc_sql\n"
- "POT-Creation-Date: 2005-05-18 21:23+0200\n"
- "PO-Revision-Date: 2005-08-10 18:23+0800\n"
--"Last-Translator: Stanley Wong <stanley18fan0k@yahoo.com.hk>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\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/kdelibs/katepart.po kde-i18n-zh_TW-3.5.10/messages/kdelibs/katepart.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdelibs/katepart.po	2008-08-19 20:43:19.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdelibs/katepart.po	2011-11-11 15:45:17.000000000 +0100
-@@ -11,8 +11,7 @@
- "Project-Id-Version: katepart\n"
- "POT-Creation-Date: 2008-05-21 01:17+0200\n"
- "PO-Revision-Date: 2006-12-18 13:07+0800\n"
--"Last-Translator: Frank Weng (a.k.a. Franklin) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Chinese Traditional <zh-l10n@linux.org.tw>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
-@@ -43,7 +42,7 @@
- 
- #: part/kateprinter.cpp:647
- msgid "Print &line numbers"
--msgstr "列印行號(&L)"
-+msgstr "列印列號(&L)"
- 
- #: part/kateprinter.cpp:650
- msgid "Print syntax &guide"
-@@ -51,19 +50,22 @@
- 
- #: part/kateprinter.cpp:659
- msgid ""
--"<p>This option is only available if some text is selected in the document.</p>"
--"<p>If available and enabled, only the selected text is printed.</p>"
--msgstr "<p>這個選項只有在文件中有某些文字被選取時才能使用。</p><p>如果可以使用並啟用它，就只會列印選擇的文字。</p>"
-+"<p>This option is only available if some text is selected in the document.</"
-+"p><p>If available and enabled, only the selected text is printed.</p>"
-+msgstr ""
-+"<p>這個選項只有在文件中有某些文字被選取時才能使用。</p><p>如果可以使用並啟用"
-+"它，就只會列印選擇的文字。</p>"
- 
- #: part/kateprinter.cpp:662
- msgid ""
--"<p>If enabled, line numbers will be printed on the left side of the page(s).</p>"
-+"<p>If enabled, line numbers will be printed on the left side of the page(s)."
-+"</p>"
- msgstr "<p>如果啟用，行的編號會印在紙張的左邊。</p>"
- 
- #: part/kateprinter.cpp:664
- msgid ""
--"<p>Print a box displaying typographical conventions for the document type, as "
--"defined by the syntax highlighting being used."
-+"<p>Print a box displaying typographical conventions for the document type, "
-+"as defined by the syntax highlighting being used."
- msgstr "<p>列印一個方塊來顯示所用語法突顯定義的文件類型的印刷協定。</p>"
- 
- #: part/kateprinter.cpp:700
-@@ -84,7 +86,7 @@
- 
- #: part/kateprinter.cpp:720
- msgid "Choo&se Font..."
--msgstr "選擇字型(&S)..."
-+msgstr "選擇字型(&S)…"
- 
- #: part/kateprinter.cpp:724
- msgid "Header Properties"
-@@ -124,29 +126,20 @@
- 
- #: part/kateprinter.cpp:790
- msgid ""
--"<ul>"
--"<li><tt>%u</tt>: current user name</li>"
--"<li><tt>%d</tt>: complete date/time in short format</li>"
--"<li><tt>%D</tt>: complete date/time in long format</li>"
--"<li><tt>%h</tt>: current time</li>"
--"<li><tt>%y</tt>: current date in short format</li>"
--"<li><tt>%Y</tt>: current date in long format</li>"
--"<li><tt>%f</tt>: file name</li>"
--"<li><tt>%U</tt>: full URL of the document</li>"
--"<li><tt>%p</tt>: page number</li></ul>"
--"<br><u>Note:</u> Do <b>not</b> use the '|' (vertical bar) character."
--msgstr ""
--"<ul>"
--"<li><tt>%u</tt>： 目前的使用者名稱</li>"
--"<li><tt>%d</tt>： 短格式的完整日期/時刻</li>"
--"<li><tt>%D</tt>： 長格式的完整日期/時刻</li>"
--"<li><tt>%h</tt>： 目前的時刻</li>"
--"<li><tt>%y</tt>： 短格式的目前日期</li>"
--"<li><tt>%Y</tt>： 長格式的目前日期</li>"
--"<li><tt>%f</tt>： 檔案名稱</li>"
--"<li><tt>%U</tt>： 文件的完整網址</li>"
--"<li><tt>%p</tt>： 頁碼</li></ul>"
--"<br><u>注意：</u> 請 <b>勿</b> 使用「|」(垂直條) 字元。"
-+"<ul><li><tt>%u</tt>: current user name</li><li><tt>%d</tt>: complete date/"
-+"time in short format</li><li><tt>%D</tt>: complete date/time in long format</"
-+"li><li><tt>%h</tt>: current time</li><li><tt>%y</tt>: current date in short "
-+"format</li><li><tt>%Y</tt>: current date in long format</li><li><tt>%f</tt>: "
-+"file name</li><li><tt>%U</tt>: full URL of the document</li><li><tt>%p</tt>: "
-+"page number</li></ul><br><u>Note:</u> Do <b>not</b> use the '|' (vertical "
-+"bar) character."
-+msgstr ""
-+"<ul><li><tt>%u</tt>： 目前的使用者名稱</li><li><tt>%d</tt>： 短格式的完整日"
-+"期/時刻</li><li><tt>%D</tt>： 長格式的完整日期/時刻</li><li><tt>%h</tt>： 目"
-+"前的時刻</li><li><tt>%y</tt>： 短格式的目前日期</li><li><tt>%Y</tt>： 長格式"
-+"的目前日期</li><li><tt>%f</tt>： 檔案名稱</li><li><tt>%U</tt>： 文件的完整網"
-+"址</li><li><tt>%p</tt>： 頁碼</li></ul><br><u>注意：</u> 請 <b>勿</b> 使用"
-+"「|」(垂直條) 字元。"
- 
- #: part/kateprinter.cpp:804
- msgid "<p>Format of the page footer. The following tags are supported:</p>"
-@@ -154,7 +147,7 @@
- 
- #: part/kateprinter.cpp:908
- msgid "L&ayout"
--msgstr "佈局(&A)"
-+msgstr "布局(&A)"
- 
- #: part/kateprinter.cpp:915 part/kateschema.cpp:834
- msgid "&Schema:"
-@@ -186,17 +179,20 @@
- 
- #: part/kateprinter.cpp:954
- msgid ""
--"<p>If enabled, the background color of the editor will be used.</p>"
--"<p>This may be useful if your color scheme is designed for a dark "
--"background.</p>"
--msgstr "<p>如果啟用，會使用編輯器的背景顏色。</p><p>這在您的配色設定是設計為暗色背景時可能很有用。</p>"
-+"<p>If enabled, the background color of the editor will be used.</p><p>This "
-+"may be useful if your color scheme is designed for a dark background.</p>"
-+msgstr ""
-+"<p>如果啟用，會使用編輯器的背景顏色。</p><p>這在您的配色設定是設計為暗色背景"
-+"時可能很有用。</p>"
- 
- #: part/kateprinter.cpp:957
- msgid ""
- "<p>If enabled, a box as defined in the properties below will be drawn around "
- "the contents of each page. The Header and Footer will be separated from the "
- "contents with a line as well.</p>"
--msgstr "<p>如果啟用，在下面的屬性中定義的方塊會畫在每一頁內容的周圍。頁首與頁尾也會以線絛來與內容隔開。</p>"
-+msgstr ""
-+"<p>如果啟用，在下面的屬性中定義的方塊會畫在每一頁內容的周圍。頁首與頁尾也會以"
-+"線絛來與內容隔開。</p>"
- 
- #: part/kateprinter.cpp:961
- msgid "The width of the box outline"
-@@ -285,7 +281,7 @@
- 
- #: part/katefactory.cpp:89
- msgid "Testing, ..."
--msgstr "測試中，..."
-+msgstr "測試中，…"
- 
- #: part/katefactory.cpp:90
- msgid "Former Core Developer"
-@@ -390,8 +386,8 @@
- 
- #: part/katesearch.cpp:78
- msgid ""
--"Look up a piece of text or regular expression and replace the result with some "
--"given text."
-+"Look up a piece of text or regular expression and replace the result with "
-+"some given text."
- msgstr "尋找文字或正規表示式中的一部份並以所給的文字來取代搜尋結果。"
- 
- #: part/katesearch.cpp:331
-@@ -479,11 +475,11 @@
- 
- #: part/katesearch.cpp:917
- msgid ""
--"<p>Usage: <code>ifind:[:bcrs] PATTERN</code>"
--"<br>ifind does incremental or 'as-you-type' search</p>"
-+"<p>Usage: <code>ifind:[:bcrs] PATTERN</code><br>ifind does incremental or "
-+"'as-you-type' search</p>"
- msgstr ""
--"<p>用法： <code>ifind:[:bcrs] PATTERN</code>"
--"<br>ifind 進行的是增加式或「如同您輸入」的搜尋</p>"
-+"<p>用法： <code>ifind:[:bcrs] PATTERN</code><br>ifind 進行的是增加式或「如同"
-+"您輸入」的搜尋</p>"
- 
- #: part/katesearch.cpp:921
- msgid "<p>Usage: <code>replace[:bceprsw] PATTERN REPLACEMENT</code></p>"
-@@ -491,36 +487,30 @@
- 
- #: part/katesearch.cpp:924
- msgid ""
--"<h4><caption>Options</h4>"
--"<p><b>b</b> - Search backward"
--"<br><b>c</b> - Search from cursor"
--"<br><b>r</b> - Pattern is a regular expression"
--"<br><b>s</b> - Case sensitive search"
--msgstr ""
--"<h4><caption>選項</h4>"
--"<p><b>b</b> - 向後搜尋"
--"<br><b>c</b> - 自游標處搜尋"
--"<br><b>r</b> - Pattern 為正規表示式"
--"<br><b>s</b> - 區分大小寫的搜尋"
-+"<h4><caption>Options</h4><p><b>b</b> - Search backward<br><b>c</b> - Search "
-+"from cursor<br><b>r</b> - Pattern is a regular expression<br><b>s</b> - Case "
-+"sensitive search"
-+msgstr ""
-+"<h4><caption>選項</h4><p><b>b</b> - 向後搜尋<br><b>c</b> - 自游標處搜尋"
-+"<br><b>r</b> - Pattern 為正規表示式<br><b>s</b> - 區分大小寫的搜尋"
- 
- #: part/katesearch.cpp:933
- msgid ""
--"<br><b>e</b> - Search in selected text only"
--"<br><b>w</b> - Search whole words only"
-+"<br><b>e</b> - Search in selected text only<br><b>w</b> - Search whole words "
-+"only"
- msgstr "<br><b>e</b> - 只在選取的文字中搜尋<br><b>w</b> - 只搜尋整個文字"
- 
- #: part/katesearch.cpp:939
- msgid ""
--"<br><b>p</b> - Prompt for replace</p>"
--"<p>If REPLACEMENT is not present, an empty string is used.</p>"
--"<p>If you want to have whitespace in your PATTERN, you need to quote both "
--"PATTERN and REPLACEMENT with either single or double quotes. To have the quote "
--"characters in the strings, prepend them with a backslash."
--msgstr ""
--"<br><b>p</b> - 取代時先提示</p>"
--"<p>若 REPLACEMENT 未出現，則使用空字串。</p>"
--"<p>如果您想要在 PATTERN 中加入空白，您需要將  PATTERN 與 REPLACEMENT "
--"兩者都以單或雙引號標示。要在字串中使用引號字元，請在引號前加上反斜線。"
-+"<br><b>p</b> - Prompt for replace</p><p>If REPLACEMENT is not present, an "
-+"empty string is used.</p><p>If you want to have whitespace in your PATTERN, "
-+"you need to quote both PATTERN and REPLACEMENT with either single or double "
-+"quotes. To have the quote characters in the strings, prepend them with a "
-+"backslash."
-+msgstr ""
-+"<br><b>p</b> - 取代時先提示</p><p>若 REPLACEMENT 未出現，則使用空字串。</"
-+"p><p>如果您想要在 PATTERN 中加入空白，您需要將  PATTERN 與 REPLACEMENT 兩者都"
-+"以單或雙引號標示。要在字串中使用引號字元，請在引號前加上反斜線。"
- 
- #: part/kateluaindentscript.cpp:86
- msgid "indenter.register requires 2 parameters (event id, function to call)"
-@@ -530,7 +520,8 @@
- msgid ""
- "indenter.register requires 2 parameters (event id (number), function to call "
- "(function))"
--msgstr "indenter.register 需要兩個參數（事件代碼,呼叫的函式）型態為（數值，函式）"
-+msgstr ""
-+"indenter.register 需要兩個參數（事件代碼,呼叫的函式）型態為（數值，函式）"
- 
- #: part/kateluaindentscript.cpp:108
- msgid "indenter.register:invalid event id"
-@@ -542,23 +533,25 @@
- 
- #: part/kateluaindentscript.cpp:126
- msgid "document.textLine:One parameter (line number) required"
--msgstr "document.textLine：需要一個參數（行號）"
-+msgstr "document.textLine：需要一個參數（列號）"
- 
- #: part/kateluaindentscript.cpp:130
- msgid "document.textLine:One parameter (line number) required (number)"
--msgstr "document.textLine：需要一個參數（行號）型態為數值"
-+msgstr "document.textLine：需要一個參數（列號）型態為數值"
- 
- #: part/kateluaindentscript.cpp:139
- msgid ""
--"document.removeText:Four parameters needed (start line, start col,end line, end "
--"col)"
-+"document.removeText:Four parameters needed (start line, start col,end line, "
-+"end col)"
- msgstr "document.removeText：需要四個參數（啟始行,啟始列,結束行,結束列）"
- 
- #: part/kateluaindentscript.cpp:143
- msgid ""
--"document.removeText:Four parameters needed (start line, start col,end line, end "
--"col) (4x number)"
--msgstr "document.removeText：需要四個參數（啟始行,啟始列,結束行,結束列），四個參數都為數值"
-+"document.removeText:Four parameters needed (start line, start col,end line, "
-+"end col) (4x number)"
-+msgstr ""
-+"document.removeText：需要四個參數（啟始行,啟始列,結束行,結束列），四個參數都"
-+"為數值"
- 
- #: part/kateluaindentscript.cpp:152
- msgid "document.insertText:Three parameters needed (line,col,text)"
-@@ -566,9 +559,10 @@
- 
- #: part/kateluaindentscript.cpp:156
- msgid ""
--"document.removeText:Three parameters needed (line,col,text) "
--"(number,number,string)"
--msgstr "document.removeText：需要三個參數(行,列,文字) 型態分別為 (數值,數值,字串)"
-+"document.removeText:Three parameters needed (line,col,text) (number,number,"
-+"string)"
-+msgstr ""
-+"document.removeText：需要三個參數(行,列,文字) 型態分別為 (數值,數值,字串)"
- 
- #: part/kateluaindentscript.cpp:253
- msgid "LUA interpreter could not be initialized"
-@@ -719,15 +713,19 @@
- 
- #: part/katedocument.cpp:2580
- msgid ""
--"Do you really want to save this file? Both your open file and the file on disk "
--"were changed. There could be some data lost."
--msgstr "您確定要儲存這個檔案？您所開啟的檔案與磁碟上的檔案都已變更。可能會有某些資料遺失。"
-+"Do you really want to save this file? Both your open file and the file on "
-+"disk were changed. There could be some data lost."
-+msgstr ""
-+"您確定要儲存這個檔案？您所開啟的檔案與磁碟上的檔案都已變更。可能會有某些資料"
-+"遺失。"
- 
- #: part/katedocument.cpp:2591
- msgid ""
--"The selected encoding cannot encode every unicode character in this document. "
--"Do you really want to save it? There could be some data lost."
--msgstr "所選的編碼無法轉換這個文件中的每一個 unicode 字元。您確定要儲存它？可能會有某些資料遺失。"
-+"The selected encoding cannot encode every unicode character in this "
-+"document. Do you really want to save it? There could be some data lost."
-+msgstr ""
-+"所選的編碼無法轉換這個文件中的每一個 unicode 字元。您確定要儲存它？可能會有某"
-+"些資料遺失。"
- 
- #: part/katedocument.cpp:2642
- msgid ""
-@@ -849,31 +847,32 @@
- 
- #: part/katefiletype.cpp:339
- msgid ""
--"<p>This string allows you to configure Kate's settings for the files selected "
--"by this mimetype using Kate variables. You can set almost any configuration "
--"option, such as highlight, indent-mode, encoding, etc.</p>"
--"<p>For a full list of known variables, see the manual.</p>"
-+"<p>This string allows you to configure Kate's settings for the files "
-+"selected by this mimetype using Kate variables. You can set almost any "
-+"configuration option, such as highlight, indent-mode, encoding, etc.</"
-+"p><p>For a full list of known variables, see the manual.</p>"
- msgstr ""
--"<p>此字串讓您可以使用 Kate 變數來設定 Kate 於此檔案類型所選定的檔案設定值。您幾乎可以設定任何組態選項，像是突顯文字、行內模式、編碼等等。</p>"
--"<p>需要可用變數的完整清單，請查閱手冊。</p>"
-+"<p>此字串讓您可以使用 Kate 變數來設定 Kate 於此檔案類型所選定的檔案設定值。您"
-+"幾乎可以設定任何組態選項，像是突顯文字、行內模式、編碼等等。</p><p>需要可用變"
-+"數的完整清單，請查閱手冊。</p>"
- 
- #: part/katefiletype.cpp:344
- msgid ""
--"The wildcards mask allows you to select files by filename. A typical mask uses "
--"an asterisk and the file extension, for example <code>*.txt; *.text</code>"
--". The string is a semicolon-separated list of masks."
-+"The wildcards mask allows you to select files by filename. A typical mask "
-+"uses an asterisk and the file extension, for example <code>*.txt; *.text</"
-+"code>. The string is a semicolon-separated list of masks."
- msgstr ""
--"萬用字元遮罩允許您以檔案名稱選擇檔案。典型的遮罩使用星號與檔案的延伸檔名，例如 <code>*.txt; *.text</code>"
--"。此字串是以分號隔開的遮罩清單。"
-+"萬用字元遮罩允許您以檔案名稱選擇檔案。典型的遮罩使用星號與檔案的延伸檔名，例"
-+"如 <code>*.txt; *.text</code>。此字串是以分號隔開的遮罩清單。"
- 
- #: part/katefiletype.cpp:349
- msgid ""
- "The mime type mask allows you to select files by mimetype. The string is a "
--"semicolon-separated list of mimetypes, for example <code>"
--"text/plain; text/english</code>."
-+"semicolon-separated list of mimetypes, for example <code>text/plain; text/"
-+"english</code>."
- msgstr ""
--"MIME 類型遮罩允許您以 MIME 類型選擇檔案。此字串為以分號隔開的 MIME 類型清單，例如 <code>"
--"text/plain; text/english</code>。"
-+"MIME 類型遮罩允許您以 MIME 類型選擇檔案。此字串為以分號隔開的 MIME 類型清單，"
-+"例如 <code>text/plain; text/english</code>。"
- 
- #: part/katefiletype.cpp:353
- msgid "Displays a wizard that helps you easily select mimetypes."
-@@ -881,9 +880,11 @@
- 
- #: part/katefiletype.cpp:355
- msgid ""
--"Sets a priority for this file type. If more than one file type selects the same "
--"file, the one with the highest priority will be used."
--msgstr "設定這個檔案類型的優先權。如果超過一個以上的檔案類型選擇同樣的檔案，具有最高優先權的將會被使用。"
-+"Sets a priority for this file type. If more than one file type selects the "
-+"same file, the one with the highest priority will be used."
-+msgstr ""
-+"設定這個檔案類型的優先權。如果超過一個以上的檔案類型選擇同樣的檔案，具有最高"
-+"優先權的將會被使用。"
- 
- #: part/katefiletype.cpp:427
- msgid "New Filetype"
-@@ -897,8 +898,8 @@
- #: part/katefiletype.cpp:504
- msgid ""
- "Select the MimeTypes you want for this file type.\n"
--"Please note that this will automatically edit the associated file extensions as "
--"well."
-+"Please note that this will automatically edit the associated file extensions "
-+"as well."
- msgstr ""
- "選擇您想要用於這個檔案類型的 MIME 類型。\n"
- "請注意這樣也會自動編輯關連的延伸檔名。"
-@@ -919,7 +920,8 @@
- 
- #: part/kateviewhelpers.cpp:239
- msgid ""
--"<p>For help on individual commands, do <code>'help &lt;command&gt;'</code></p>"
-+"<p>For help on individual commands, do <code>'help &lt;command&gt;'</code></"
-+"p>"
- msgstr "<p>需要個別指令的協助，請使用 <code>'help &lt;command&gt;'</code></p>"
- 
- #: part/kateviewhelpers.cpp:250
-@@ -932,16 +934,14 @@
- 
- #: part/kateviewhelpers.cpp:258
- msgid ""
--"<p>This is the Katepart <b>command line</b>."
--"<br>Syntax: <code><b>command [ arguments ]</b></code>"
--"<br>For a list of available commands, enter <code><b>help list</b></code>"
--"<br>For help for individual commands, enter <code><b>help &lt;command&gt;</b>"
--"</code></p>"
--msgstr ""
--"<p>這是 Katepart <b>命令列</b>。"
--"<br>語法： <code><b>command [ arguments ]</b></code>"
--"<br>需要可以用指令的清單，輸入 <code><b>help list</b></code>"
--"<br>需要個別制定的說明，輸入 <code><b>help &lt;command&gt;</b></code></p>"
-+"<p>This is the Katepart <b>command line</b>.<br>Syntax: <code><b>command "
-+"[ arguments ]</b></code><br>For a list of available commands, enter "
-+"<code><b>help list</b></code><br>For help for individual commands, enter "
-+"<code><b>help &lt;command&gt;</b></code></p>"
-+msgstr ""
-+"<p>這是 Katepart <b>命令列</b>。<br>語法： <code><b>command [ arguments ]</"
-+"b></code><br>需要可以用指令的清單，輸入 <code><b>help list</b></code><br>需要"
-+"個別制定的說明，輸入 <code><b>help &lt;command&gt;</b></code></p>"
- 
- #: part/kateviewhelpers.cpp:345
- msgid "Success: "
-@@ -1018,7 +1018,7 @@
- 
- #: part/kateschema.cpp:327
- msgid "Line numbers:"
--msgstr "行號:"
-+msgstr "列號:"
- 
- #: part/kateschema.cpp:333
- msgid "Bracket highlight:"
-@@ -1026,7 +1026,7 @@
- 
- #: part/kateschema.cpp:339
- msgid "Word wrap markers:"
--msgstr "文字折行標記:"
-+msgstr "文字折列標記:"
- 
- #: part/kateschema.cpp:345
- msgid "Tab markers:"
-@@ -1038,17 +1038,19 @@
- 
- #: part/kateschema.cpp:358
- msgid ""
--"<p>Sets the background color of the selection.</p>"
--"<p>To set the text color for selected text, use the \"<b>"
--"Configure Highlighting</b>\" dialog.</p>"
--msgstr "<p>設定選擇區的背景顏色。</p><p>要設定選取文字的文字顏色，請使用「<b>設定突顯</b>」對話盒。</p>"
-+"<p>Sets the background color of the selection.</p><p>To set the text color "
-+"for selected text, use the \"<b>Configure Highlighting</b>\" dialog.</p>"
-+msgstr ""
-+"<p>設定選擇區的背景顏色。</p><p>要設定選取文字的文字顏色，請使用「<b>設定突顯"
-+"</b>」對話盒。</p>"
- 
- #: part/kateschema.cpp:361
- msgid ""
--"<p>Sets the background color of the selected marker type.</p>"
--"<p><b>Note</b>: The marker color is displayed lightly because of "
--"transparency.</p>"
--msgstr "<p>設定選取標記類型的背景顏色。</p><p><b>注意</b>：標記的顏色因為透明度的關係看起來會比較淡。</p>"
-+"<p>Sets the background color of the selected marker type.</p><p><b>Note</b>: "
-+"The marker color is displayed lightly because of transparency.</p>"
-+msgstr ""
-+"<p>設定選取標記類型的背景顏色。</p><p><b>注意</b>：標記的顏色因為透明度的關係"
-+"看起來會比較淡。</p>"
- 
- #: part/kateschema.cpp:364
- msgid "<p>Select the marker type you want to change.</p>"
-@@ -1056,31 +1058,34 @@
- 
- #: part/kateschema.cpp:365
- msgid ""
--"<p>Sets the background color of the currently active line, which means the line "
--"where your cursor is positioned.</p>"
-+"<p>Sets the background color of the currently active line, which means the "
-+"line where your cursor is positioned.</p>"
- msgstr "<p>設定目前作用中的行的背景顏色，亦即您的游標所在的行。</p>"
- 
- #: part/kateschema.cpp:368
- msgid ""
--"<p>This color will be used to draw the line numbers (if enabled) and the lines "
--"in the code-folding pane.</p>"
--msgstr "<p>這個色彩會用來繪製行號（如果啟用）與程式碼折疊窗格中的直線。</p>"
-+"<p>This color will be used to draw the line numbers (if enabled) and the "
-+"lines in the code-folding pane.</p>"
-+msgstr "<p>這個色彩會用來繪製列號（如果啟用）與程式碼折疊窗格中的直線。</p>"
- 
- #: part/kateschema.cpp:370
- msgid ""
--"<p>Sets the bracket matching color. This means, if you place the cursor e.g. at "
--"a <b>(</b>, the matching <b>)</b> will be highlighted with this color.</p>"
--msgstr "<p>設定對應括號顏色。這表示，如果您將游標置於像<b>(</b>的位置時，對應的<b>)</b>就會以這個顏色來突顯。</p>"
-+"<p>Sets the bracket matching color. This means, if you place the cursor e.g. "
-+"at a <b>(</b>, the matching <b>)</b> will be highlighted with this color.</p>"
-+msgstr ""
-+"<p>設定對應括號顏色。這表示，如果您將游標置於像<b>(</b>的位置時，對應的<b>)</"
-+"b>就會以這個顏色來突顯。</p>"
- 
- #: part/kateschema.cpp:374
- msgid ""
--"<p>Sets the color of Word Wrap-related markers:</p><dl><dt>Static Word Wrap</dt>"
--"<dd>A vertical line which shows the column where text is going to be "
-+"<p>Sets the color of Word Wrap-related markers:</p><dl><dt>Static Word Wrap</"
-+"dt><dd>A vertical line which shows the column where text is going to be "
- "wrapped</dd><dt>Dynamic Word Wrap</dt><dd>An arrow shown to the left of "
- "visually-wrapped lines</dd></dl>"
- msgstr ""
--"<p>設定文字折行相關標記的色彩：</p><dl><dt>靜態文字折行</dt><dd>一條用來顯示文字要在何處折行的垂直直線</dd><dt>"
--"動態文字折行</dt><dd>一個用來顯示虛擬折行左方的箭頭</dd></dl>"
-+"<p>設定文字折列相關標記的色彩：</p><dl><dt>靜態文字折列</dt><dd>一條用來顯示"
-+"文字要在何處折列的垂直直線</dd><dt>動態文字折列</dt><dd>一個用來顯示虛擬折列"
-+"左方的箭頭</dd></dl>"
- 
- #: part/kateschema.cpp:380
- msgid "<p>Sets the color of the tabulator marks:</p>"
-@@ -1089,15 +1094,14 @@
- #: part/kateschema.cpp:605
- msgid ""
- "This list displays the default styles for the current schema and offers the "
--"means to edit them. The style name reflects the current style settings."
--"<p>To edit the colors, click the colored squares, or select the color to edit "
--"from the popup menu."
--"<p>You can unset the Background and Selected Background colors from the popup "
--"menu when appropriate."
--msgstr ""
--"這個清單顯示目前基模的預設風格，並且提供工具來編輯它們。風格名稱反應目前的風格設定值。"
--"<p>要編輯顏色，單擊顏色方塊，或從彈出選單選擇要編輯的顏色。"
--"<p>您可以在適當的時候從彈出式選單中取消設定背景與選擇的背景顏色。"
-+"means to edit them. The style name reflects the current style settings.<p>To "
-+"edit the colors, click the colored squares, or select the color to edit from "
-+"the popup menu.<p>You can unset the Background and Selected Background "
-+"colors from the popup menu when appropriate."
-+msgstr ""
-+"這個清單顯示目前基模的預設風格，並且提供工具來編輯它們。風格名稱反應目前的風"
-+"格設定值。<p>要編輯顏色，單擊顏色方塊，或從彈出選單選擇要編輯的顏色。<p>您可"
-+"以在適當的時候從彈出式選單中取消設定背景與選擇的背景顏色。"
- 
- #: part/katedialogs.cpp:1267 part/kateschema.cpp:689
- msgid "H&ighlight:"
-@@ -1105,23 +1109,22 @@
- 
- #: part/kateschema.cpp:711
- msgid ""
--"This list displays the contexts of the current syntax highlight mode and offers "
--"the means to edit them. The context name reflects the current style settings."
--"<p>To edit using the keyboard, press <strong>&lt;SPACE&gt;</strong> "
--"and choose a property from the popup menu."
--"<p>To edit the colors, click the colored squares, or select the color to edit "
--"from the popup menu."
--"<p>You can unset the Background and Selected Background colors from the context "
--"menu when appropriate."
--msgstr ""
--"這個清單顯示目前的語法突顯模式的背景，並且提供工具來編輯它們。背景名稱反應目前的風格設定值。"
--"<p>要使用鍵盤編輯，按<strong>&lt;空白鍵&gt;</strong>並從彈出選單選擇屬性。"
--"<p>要編輯顏色，單擊顏色方塊，或從彈出選單選擇要編輯的顏色。"
--"<p>您可以在適當的時候從快顯選單中取消設定背景與選擇的背景顏色。"
-+"This list displays the contexts of the current syntax highlight mode and "
-+"offers the means to edit them. The context name reflects the current style "
-+"settings.<p>To edit using the keyboard, press <strong>&lt;SPACE&gt;</strong> "
-+"and choose a property from the popup menu.<p>To edit the colors, click the "
-+"colored squares, or select the color to edit from the popup menu.<p>You can "
-+"unset the Background and Selected Background colors from the context menu "
-+"when appropriate."
-+msgstr ""
-+"這個清單顯示目前的語法突顯模式的背景，並且提供工具來編輯它們。背景名稱反應目"
-+"前的風格設定值。<p>要使用鍵盤編輯，按<strong>&lt;空白鍵&gt;</strong>並從彈出"
-+"選單選擇屬性。<p>要編輯顏色，單擊顏色方塊，或從彈出選單選擇要編輯的顏色。<p>"
-+"您可以在適當的時候從快顯選單中取消設定背景與選擇的背景顏色。"
- 
- #: part/kateschema.cpp:840 plugins/autobookmarker/autobookmarker.cpp:406
- msgid "&New..."
--msgstr "新的(&N)..."
-+msgstr "新的(&N)…"
- 
- #: part/kateschema.cpp:853
- msgid "Colors"
-@@ -1194,19 +1197,19 @@
- 
- #: part/kateschema.cpp:1108
- msgid "Normal &Color..."
--msgstr "一般色彩(&C)..."
-+msgstr "一般色彩(&C)…"
- 
- #: part/kateschema.cpp:1109
- msgid "&Selected Color..."
--msgstr "已選取的顏色(&S)..."
-+msgstr "已選取的顏色(&S)…"
- 
- #: part/kateschema.cpp:1110
- msgid "&Background Color..."
--msgstr "背景顏色(&B)..."
-+msgstr "背景顏色(&B)…"
- 
- #: part/kateschema.cpp:1111
- msgid "S&elected Background Color..."
--msgstr "選擇背景顏色(&E)..."
-+msgstr "選擇背景顏色(&E)…"
- 
- #: part/kateschema.cpp:1122
- msgid "Unset Background Color"
-@@ -1232,8 +1235,7 @@
- 
- #: part/katesyntaxdocument.cpp:76
- msgid ""
--"<qt>The error <b>%4</b>"
--"<br> has been detected in the file %1 at %2/%3</qt>"
-+"<qt>The error <b>%4</b><br> has been detected in the file %1 at %2/%3</qt>"
- msgstr "<qt>在檔案 %1 中的  %2/%3 偵測到<br>錯誤 <b>%4</b></qt>"
- 
- #: part/katesyntaxdocument.cpp:84
-@@ -1260,7 +1262,7 @@
- 
- #: part/katedialogs.cpp:161 part/katedialogs.cpp:1132
- msgid "Configure..."
--msgstr "設定..."
-+msgstr "設定…"
- 
- #: part/katedialogs.cpp:163
- msgid "Insert leading Doxygen \"*\" when typing"
-@@ -1268,7 +1270,7 @@
- 
- #: part/katedialogs.cpp:164
- msgid "Adjust indentation of code pasted from the clipboard"
--msgstr "從剪貼簿中貼上源碼時調整縮排"
-+msgstr "從剪貼簿中貼上原始碼時調整縮排"
- 
- #: part/katedialogs.cpp:166
- msgid "Indentation with Spaces"
-@@ -1328,7 +1330,8 @@
- 
- #: part/katedialogs.cpp:211
- msgid ""
--"Indentations of more than the selected number of spaces will not be shortened."
-+"Indentations of more than the selected number of spaces will not be "
-+"shortened."
- msgstr "超過所選取的空白部份的縮排將無法縮減。"
- 
- #: part/katedialogs.cpp:214
-@@ -1356,7 +1359,9 @@
- msgid ""
- "If this option is selected, pasted code from the clipboard is indented. "
- "Triggering the <b>undo</b>-action removes the indentation."
--msgstr "選取此選項的話，從剪貼簿中貼上程式源碼時，會做縮排。只要<b>復原</b>就可以取消縮排動作。"
-+msgstr ""
-+"選取此選項的話，從剪貼簿中貼上程式原始碼時，會做縮排。只要<b>復原</b>就可以取消"
-+"縮排動作。"
- 
- #: part/katedialogs.cpp:227
- msgid "The number of spaces to indent with."
-@@ -1364,9 +1369,10 @@
- 
- #: part/katedialogs.cpp:230
- msgid ""
--"If this button is enabled, additional indenter specific options are available "
--"and can be configured in an extra dialog."
--msgstr "如果啟用這個按鈕，就可以使用額外的縮排指定選項並且可以在特別對話盒中設定。"
-+"If this button is enabled, additional indenter specific options are "
-+"available and can be configured in an extra dialog."
-+msgstr ""
-+"如果啟用這個按鈕，就可以使用額外的縮排指定選項並且可以在特別對話盒中設定。"
- 
- #: part/katedialogs.cpp:282
- msgid "Configure Indenter"
-@@ -1382,7 +1388,7 @@
- 
- #: part/katedialogs.cpp:363
- msgid "Wrap c&ursor"
--msgstr "游標自動折行(&U)"
-+msgstr "游標自動折列(&U)"
- 
- #: part/katedialogs.cpp:367
- msgid "&PageUp/PageDown moves cursor"
-@@ -1418,29 +1424,33 @@
- msgid ""
- "Sets the number of lines to maintain visible above and below the cursor when "
- "possible."
--msgstr "設定在可能的情況下保持在游標上下方可見的行數。"
-+msgstr "設定在可能的情況下保持在游標上下方可見的列數。"
- 
- #: part/katedialogs.cpp:400
- msgid ""
--"When selected, pressing the home key will cause the cursor to skip whitespace "
--"and go to the start of a line's text. The same applies for the end key."
--msgstr "當選擇時，按下 home 按鍵會造成游標忽略空白並移動到文字行的開頭。end 按鍵也有類似的行為，除了是移到文字行的結尾之外。"
-+"When selected, pressing the home key will cause the cursor to skip "
-+"whitespace and go to the start of a line's text. The same applies for the "
-+"end key."
-+msgstr ""
-+"當選擇時，按下 home 按鍵會造成游標忽略空白並移動到文字行的開頭。end 按鍵也有"
-+"類似的行為，除了是移到文字行的結尾之外。"
- 
- #: part/katedialogs.cpp:405
- msgid ""
- "When on, moving the insertion cursor using the <b>Left</b> and <b>Right</b> "
--"keys will go on to previous/next line at beginning/end of the line, similar to "
--"most editors."
--"<p>When off, the insertion cursor cannot be moved left of the line start, but "
--"it can be moved off the line end, which can be very handy for programmers."
-+"keys will go on to previous/next line at beginning/end of the line, similar "
-+"to most editors.<p>When off, the insertion cursor cannot be moved left of "
-+"the line start, but it can be moved off the line end, which can be very "
-+"handy for programmers."
- msgstr ""
--"當開啟的時候，使用<b>Left</b>與<b>Right</b>鍵移動插入模式游標會移至上/下一行的行開頭/結尾，如同多數的編輯器一般。"
--"<p>當關閉的時候，插入模式游標不能左移至行的開頭，但是它可以移至行的結尾，這對程式設計師而言是很方便的。"
-+"當開啟的時候，使用<b>Left</b>與<b>Right</b>鍵移動插入模式游標會移至上/下一列"
-+"的行開頭/結尾，如同多數的編輯器一般。<p>當關閉的時候，插入模式游標不能左移至"
-+"行的開頭，但是它可以移至行的結尾，這對程式設計師而言是很方便的。"
- 
- #: part/katedialogs.cpp:411
- msgid ""
--"Selects whether the PageUp and PageDown keys should alter the vertical position "
--"of the cursor relative to the top of the view."
-+"Selects whether the PageUp and PageDown keys should alter the vertical "
-+"position of the cursor relative to the top of the view."
- msgstr "選擇 PageUp 與 PageDown 按鍵是否應該根據檢視的頂端替換游標的垂直位置。"
- 
- #: part/katedialogs.cpp:473
-@@ -1461,19 +1471,19 @@
- 
- #: part/katedialogs.cpp:490
- msgid "Static Word Wrap"
--msgstr "靜態文字折行"
-+msgstr "靜態文字折列"
- 
- #: part/katedialogs.cpp:492
- msgid "Enable static &word wrap"
--msgstr "啟用靜態文字折行(&W)"
-+msgstr "啟用靜態文字折列(&W)"
- 
- #: part/katedialogs.cpp:496
- msgid "&Show static word wrap marker (if applicable)"
--msgstr "顯示靜態文字折行標記（如果可以）(&S)"
-+msgstr "顯示靜態文字折列標記（如果可以）(&S)"
- 
- #: part/katedialogs.cpp:502
- msgid "Wrap words at:"
--msgstr "在第..字元自動折行:"
-+msgstr "在第..字元自動折列:"
- 
- #: part/katedialogs.cpp:507
- msgid "Remove &trailing spaces"
-@@ -1517,33 +1527,37 @@
- 
- #: part/katedialogs.cpp:542
- msgid ""
--"Automatically start a new line of text when the current line exceeds the length "
--"specified by the <b>Wrap words at:</b> option."
--"<p>This option does not wrap existing lines of text - use the <b>"
--"Apply Static Word Wrap</b> option in the <b>Tools</b> menu for that purpose."
--"<p>If you want lines to be <i>visually wrapped</i> instead, according to the "
--"width of the view, enable <b>Dynamic Word Wrap</b> in the <b>View Defaults</b> "
--"config page."
--msgstr ""
--"當目前的行超過了由 <b>文字折行於:</b> 選項指定的長度時自動開始以新的文字行。"
--"<p>這個選項不會影響文字中已存在的行 - 使用 <b>工具</b> 選單中的 <b>套用靜態文字折行</b> 選項可以達到這個目的。"
--"<p>如果您想要各行以 <i>虛擬折行</i> 取代，根據檢視的寬度，啟用 <b>檢視預設值</b> 設定頁面中的 <b>動態文字折行</b>。"
-+"Automatically start a new line of text when the current line exceeds the "
-+"length specified by the <b>Wrap words at:</b> option.<p>This option does not "
-+"wrap existing lines of text - use the <b>Apply Static Word Wrap</b> option "
-+"in the <b>Tools</b> menu for that purpose.<p>If you want lines to be "
-+"<i>visually wrapped</i> instead, according to the width of the view, enable "
-+"<b>Dynamic Word Wrap</b> in the <b>View Defaults</b> config page."
-+msgstr ""
-+"當目前的行超過了由 <b>文字折列於:</b> 選項指定的長度時自動開始以新的文字行。"
-+"<p>這個選項不會影響文字中已存在的行 - 使用 <b>工具</b> 選單中的 <b>套用靜態文"
-+"字折列</b> 選項可以達到這個目的。<p>如果您想要各行以 <i>虛擬折列</i> 取代，根"
-+"據檢視的寬度，啟用 <b>檢視預設值</b> 設定頁面中的 <b>動態文字折列</b>。"
- 
- #: part/katedialogs.cpp:550
- msgid ""
- "If the Word Wrap option is selected this entry determines the length (in "
- "characters) at which the editor will automatically start a new line."
--msgstr "自動折行將會計算編輯器上的字元數， 若是到達指定的長度則會從下一行開始。"
-+msgstr ""
-+"自動折列將會計算編輯器上的字元數， 若是到達指定的長度則會從下一列開始。"
- 
- #: part/katedialogs.cpp:553
- msgid ""
- "When the user types a left bracket ([,(, or {) KateView automatically enters "
- "the right bracket (}, ), or ]) to the right of the cursor."
--msgstr "當使用者輸入左括號([,(, 或 {)， KateView將會在游標的右邊自動補上右括號(},), 或 ])。"
-+msgstr ""
-+"當使用者輸入左括號([,(, 或 {)， KateView將會在游標的右邊自動補上右括號(},), "
-+"或 ])。"
- 
- #: part/katedialogs.cpp:556
- msgid ""
--"The editor will display a symbol to indicate the presence of a tab in the text."
-+"The editor will display a symbol to indicate the presence of a tab in the "
-+"text."
- msgstr "編輯器將會在文件中顯示一個符號來代表 tab 鍵"
- 
- #: part/katedialogs.cpp:560
-@@ -1554,36 +1568,33 @@
- #: part/katedialogs.cpp:563
- msgid ""
- "This determines where KateView will get the search text from (this will be "
--"automatically entered into the Find Text dialog): "
--"<br>"
--"<ul>"
--"<li><b>Nowhere:</b> Don't guess the search text.</li>"
--"<li><b>Selection Only:</b> Use the current text selection, if available.</li>"
--"<li><b>Selection, then Current Word:</b> Use the current selection if "
--"available, otherwise use the current word.</li>"
--"<li><b>Current Word Only:</b> Use the word that the cursor is currently resting "
--"on, if available.</li>"
--"<li><b>Current Word, then Selection:</b> Use the current word if available, "
--"otherwise use the current selection.</li></ul>Note that, in all the above "
--"modes, if a search string has not been or cannot be determined, then the Find "
--"Text Dialog will fall back to the last search text."
-+"automatically entered into the Find Text dialog): <br><ul><li><b>Nowhere:</"
-+"b> Don't guess the search text.</li><li><b>Selection Only:</b> Use the "
-+"current text selection, if available.</li><li><b>Selection, then Current "
-+"Word:</b> Use the current selection if available, otherwise use the current "
-+"word.</li><li><b>Current Word Only:</b> Use the word that the cursor is "
-+"currently resting on, if available.</li><li><b>Current Word, then Selection:"
-+"</b> Use the current word if available, otherwise use the current selection."
-+"</li></ul>Note that, in all the above modes, if a search string has not been "
-+"or cannot be determined, then the Find Text Dialog will fall back to the "
-+"last search text."
- msgstr ""
- "這裡決定 KateView 要從哪裏開始搜尋文字（這會被自動輸入到搜尋文字對話盒）："
--"<br>"
--"<ul>"
--"<li><b>完全沒有：</b> 不猜測搜尋的文字。</li>"
--"<li><b>只有選擇區：</b> 如果可以，使用目前的文字選擇區。</li>"
--"<li><b>選擇區，接著目前的文字：</b> 如果可以就使用目前的選擇區，否則使用目前的文字。</li>"
--"<li><b>只有目前的文字：</b> 如果可以，是用游標目前所處的文字。</li>"
--"<li><b>目前的文字，接著選擇區：</b> 如果可以使用目前的文字，否則使用目前的選擇區。</li></ul>"
--"請注意，在上面所有的模式中，如果搜尋字串尚未或無法決定，尋找文字對話盒將會退回到上次搜尋的文字。"
-+"<br><ul><li><b>完全沒有：</b> 不猜測搜尋的文字。</li><li><b>只有選擇區：</b> "
-+"如果可以，使用目前的文字選擇區。</li><li><b>選擇區，接著目前的文字：</b> 如果"
-+"可以就使用目前的選擇區，否則使用目前的文字。</li><li><b>只有目前的文字：</b> "
-+"如果可以，是用游標目前所處的文字。</li><li><b>目前的文字，接著選擇區：</b> 如"
-+"果可以使用目前的文字，否則使用目前的選擇區。</li></ul>請注意，在上面所有的模"
-+"式中，如果搜尋字串尚未或無法決定，尋找文字對話盒將會退回到上次搜尋的文字。"
- 
- #: part/katedialogs.cpp:588
- msgid ""
- "If this is enabled, the editor will calculate the number of spaces up to the "
--"next tab position as defined by the tab width, and insert that number of spaces "
--"instead of a TAB character."
--msgstr "如果啟用此項，編輯器將會計算達到定義的 tab 寬度前的空格數目，並插入相對數量的空格以代替 TAB 字元。"
-+"next tab position as defined by the tab width, and insert that number of "
-+"spaces instead of a TAB character."
-+msgstr ""
-+"如果啟用此項，編輯器將會計算達到定義的 tab 寬度前的空格數目，並插入相對數量的"
-+"空格以代替 TAB 字元。"
- 
- #: part/katedialogs.cpp:592
- msgid ""
-@@ -1594,27 +1605,27 @@
- #: part/katedialogs.cpp:595
- msgid ""
- "<p>If this option is checked, a vertical line will be drawn at the word wrap "
--"column as defined in the <strong>Editing</strong> properties."
--"<p>Note that the word wrap marker is only drawn if you use a fixed pitch font."
-+"column as defined in the <strong>Editing</strong> properties.<p>Note that "
-+"the word wrap marker is only drawn if you use a fixed pitch font."
- msgstr ""
--"<p>如果核取此選項，一條垂直線會出現在文字折行處（於 <strong>編輯</strong> 屬性中定義）。"
--"<p>注意文字折行標記只會在您使用固定字型時出現。"
-+"<p>如果核取此選項，一條垂直線會出現在文字折列處（於 <strong>編輯</strong> 屬"
-+"性中定義）。<p>注意文字折列標記只會在您使用固定字型時出現。"
- 
- #: part/katedialogs.cpp:651
- msgid "Word Wrap"
--msgstr "自動折行"
-+msgstr "自動折列"
- 
- #: part/katedialogs.cpp:653
- msgid "&Dynamic word wrap"
--msgstr "動態文字折行(&D)"
-+msgstr "動態文字折列(&D)"
- 
- #: part/katedialogs.cpp:656
- msgid "Dynamic word wrap indicators (if applicable):"
--msgstr "顯示動態文字折行指示器（如果可以）:"
-+msgstr "顯示動態文字折列指示器（如果可以）:"
- 
- #: part/katedialogs.cpp:659
- msgid "Follow Line Numbers"
--msgstr "跟隨行號"
-+msgstr "跟隨列號"
- 
- #: part/katedialogs.cpp:660
- msgid "Always On"
-@@ -1622,7 +1633,7 @@
- 
- #: part/katedialogs.cpp:664
- msgid "Vertically align dynamically wrapped lines to indentation depth:"
--msgstr "垂直對齊動態折行至縮排深度："
-+msgstr "垂直對齊動態折列至縮排深度："
- 
- #: part/katedialogs.cpp:667
- #, no-c-format
-@@ -1655,7 +1666,7 @@
- 
- #: part/katedialogs.cpp:683
- msgid "Show &line numbers"
--msgstr "顯示行號(&L)"
-+msgstr "顯示列號(&L)"
- 
- #: part/katedialogs.cpp:684
- msgid "Show &scrollbar marks"
-@@ -1679,56 +1690,58 @@
- 
- #: part/katedialogs.cpp:702 part/kateview.cpp:360
- msgid ""
--"If this option is checked, the text lines will be wrapped at the view border on "
--"the screen."
--msgstr "如果核取此選項，文字會根據螢幕上視窗寬度來折行。"
-+"If this option is checked, the text lines will be wrapped at the view border "
-+"on the screen."
-+msgstr "如果核取此選項，文字會根據螢幕上視窗寬度來折列。"
- 
- #: part/katedialogs.cpp:704 part/kateview.cpp:363
- msgid "Choose when the Dynamic Word Wrap Indicators should be displayed"
--msgstr "選擇何時要顯示動態文字折行指示器"
-+msgstr "選擇何時要顯示動態文字折列指示器"
- 
- #: part/katedialogs.cpp:709
- msgid ""
--"<p>Enables the start of dynamically wrapped lines to be aligned vertically to "
--"the indentation level of the first line.  This can help to make code and markup "
--"more readable.</p>"
--"<p>Additionally, this allows you to set a maximum width of the screen, as a "
--"percentage, after which dynamically wrapped lines will no longer be vertically "
--"aligned.  For example, at 50%, lines whose indentation levels are deeper than "
--"50% of the width of the screen will not have vertical alignment applied to "
--"subsequent wrapped lines.</p>"
--msgstr ""
--"<p>啟用要與縮排層級的第一行垂直對齊動態文字折行。這樣可以協助讓程式碼與標記更加容易閱讀。</p>"
--"<p>另外，這也可以讓您使用百分比設定螢幕的最大寬度，這樣一來動態文字折行就不會再進行垂直對齊。例如，在 50% 時，縮排層級深度大於螢幕寬度的 50% "
--"的行進行文字折行時將不會有垂直對齊。</p>"
-+"<p>Enables the start of dynamically wrapped lines to be aligned vertically "
-+"to the indentation level of the first line.  This can help to make code and "
-+"markup more readable.</p><p>Additionally, this allows you to set a maximum "
-+"width of the screen, as a percentage, after which dynamically wrapped lines "
-+"will no longer be vertically aligned.  For example, at 50%, lines whose "
-+"indentation levels are deeper than 50% of the width of the screen will not "
-+"have vertical alignment applied to subsequent wrapped lines.</p>"
-+msgstr ""
-+"<p>啟用要與縮排層級的第一列垂直對齊動態文字折列。這樣可以協助讓程式碼與標記更"
-+"加容易閱讀。</p><p>另外，這也可以讓您使用百分比設定螢幕的最大寬度，這樣一來動"
-+"態文字折列就不會再進行垂直對齊。例如，在 50% 時，縮排層級深度大於螢幕寬度的 "
-+"50% 的行進行文字折列時將不會有垂直對齊。</p>"
- 
- #: part/katedialogs.cpp:718
- msgid ""
--"If this option is checked, every new view will display line numbers on the left "
--"hand side."
-+"If this option is checked, every new view will display line numbers on the "
-+"left hand side."
- msgstr "如果核取此選項，每個新的檢視會在左手邊顯示行的編號。"
- 
- #: part/katedialogs.cpp:721
- msgid ""
- "If this option is checked, every new view will display an icon border on the "
--"left hand side."
--"<br>"
--"<br>The icon border shows bookmark signs, for instance."
--msgstr "如果核取此選項，每個新的檢視會在左手邊顯示圖示邊框。<br><br>例如，圖示邊框顯示書籤記號。"
-+"left hand side.<br><br>The icon border shows bookmark signs, for instance."
-+msgstr ""
-+"如果核取此選項，每個新的檢視會在左手邊顯示圖示邊框。<br><br>例如，圖示邊框顯"
-+"示書籤記號。"
- 
- #: part/katedialogs.cpp:725
- msgid ""
- "If this option is checked, every new view will show marks on the vertical "
--"scrollbar."
--"<br>"
--"<br>These marks will, for instance, show bookmarks."
--msgstr "如果核取此選項，每個新的檢視會在垂直捲動軸顯示標記。<br><br>這些標記會，例如，顯示書籤記號。"
-+"scrollbar.<br><br>These marks will, for instance, show bookmarks."
-+msgstr ""
-+"如果核取此選項，每個新的檢視會在垂直捲動軸顯示標記。<br><br>這些標記會，例"
-+"如，顯示書籤記號。"
- 
- #: part/katedialogs.cpp:729
- msgid ""
--"If this option is checked, every new view will display marks for code folding, "
--"if code folding is available."
--msgstr "如果核取此選項，而程式碼摺疊也可以使用時。每個新的檢視會在左手邊顯示程式碼摺疊標記。"
-+"If this option is checked, every new view will display marks for code "
-+"folding, if code folding is available."
-+msgstr ""
-+"如果核取此選項，而程式碼摺疊也可以使用時。每個新的檢視會在左手邊顯示程式碼摺"
-+"疊標記。"
- 
- #: part/katedialogs.cpp:732
- msgid ""
-@@ -1737,12 +1750,12 @@
- 
- #: part/katedialogs.cpp:734
- msgid "The bookmarks will be ordered by the line numbers they are placed at."
--msgstr "書籤會根據它們設置的行數來排序。"
-+msgstr "書籤會根據它們設置的列數來排序。"
- 
- #: part/katedialogs.cpp:736
- msgid ""
--"Each new bookmark will be added to the bottom, independently from where it is "
--"placed in the document."
-+"Each new bookmark will be added to the bottom, independently from where it "
-+"is placed in the document."
- msgstr "每個新的書籤會新增至底部，跟它在文件中的位置無關。"
- 
- #: part/katedialogs.cpp:739
-@@ -1835,19 +1848,21 @@
- 
- #: part/katedialogs.cpp:920
- msgid ""
--"<p>Backing up on save will cause Kate to copy the disk file to "
--"'&lt;prefix&gt;&lt;filename&gt;&lt;suffix&gt;' before saving changes."
--"<p>The suffix defaults to <strong>~</strong> and prefix is empty by default"
--msgstr ""
--"<p>儲存時備份會使 Kate 在儲存變更之前將磁碟檔案複製為 '&lt;prefix&gt;&lt;filename&gt;&lt;suffix&gt;' "
--"。"
--"<p>預設前綴為 <strong>~</strong> 而預設後綴為空白"
-+"<p>Backing up on save will cause Kate to copy the disk file to '&lt;"
-+"prefix&gt;&lt;filename&gt;&lt;suffix&gt;' before saving changes.<p>The "
-+"suffix defaults to <strong>~</strong> and prefix is empty by default"
-+msgstr ""
-+"<p>儲存時備份會使 Kate 在儲存變更之前將磁碟檔案複製為 '&lt;prefix&gt;&lt;"
-+"filename&gt;&lt;suffix&gt;' 。<p>預設前綴為 <strong>~</strong> 而預設後綴為空"
-+"白"
- 
- #: part/katedialogs.cpp:924
- msgid ""
--"Check this if you want the editor to autodetect the end of line type.The first "
--"found end of line type will be used for the whole file."
--msgstr "如果您希望編輯器自動偵測行尾類型請核取此項。第一個找到的行尾類型將被用在整個檔案。"
-+"Check this if you want the editor to autodetect the end of line type.The "
-+"first found end of line type will be used for the whole file."
-+msgstr ""
-+"如果您希望編輯器自動偵測行尾類型請核取此項。第一個找到的行尾類型將被用在整個"
-+"檔案。"
- 
- #: part/katedialogs.cpp:927
- msgid "Check this if you want backups of local files when saving"
-@@ -1867,23 +1882,24 @@
- 
- #: part/katedialogs.cpp:935
- msgid ""
--"The editor will search the given number of folder levels upwards for "
--".kateconfig file and load the settings line from it."
-+"The editor will search the given number of folder levels upwards for ."
-+"kateconfig file and load the settings line from it."
- msgstr "編輯器將向上搜尋所給資料夾層級數的 .kateconfig 檔案並從其載入設定行。"
- 
- #: part/katedialogs.cpp:938
- msgid ""
--"The editor will load given number of blocks (of around 2048 lines) of text into "
--"memory; if the filesize is bigger than this the other blocks are swapped  to "
--"disk and loaded transparently as-needed."
--"<br> This can cause little delays while navigating in the document; a larger "
--"block count increases the editing speed at the cost of memory. "
--"<br>For normal usage, just choose the highest possible block count: limit it "
--"only if you have problems with the memory usage."
--msgstr ""
--"編輯器將從文字中載入所給數目的區塊（約 2048 行）到記憶體中；如果檔案大小超過這個大小其他的區塊會暫存於磁碟中並依需要載入。"
--"<br>這會造成在文件中閱覽時有些許延遲；載入較多的區塊會增加編輯的速度並花費更多記憶體。"
--"<br>在一般的用途，只要選擇最大可能區塊：只有在您有記憶體使用量上的問題時才限制它。"
-+"The editor will load given number of blocks (of around 2048 lines) of text "
-+"into memory; if the filesize is bigger than this the other blocks are "
-+"swapped  to disk and loaded transparently as-needed.<br> This can cause "
-+"little delays while navigating in the document; a larger block count "
-+"increases the editing speed at the cost of memory. <br>For normal usage, "
-+"just choose the highest possible block count: limit it only if you have "
-+"problems with the memory usage."
-+msgstr ""
-+"編輯器將從文字中載入所給數目的區塊（約 2048 列）到記憶體中；如果檔案大小超過"
-+"這個大小其他的區塊會暫存於磁碟中並依需要載入。<br>這會造成在文件中閱覽時有些"
-+"許延遲；載入較多的區塊會增加編輯的速度並花費更多記憶體。<br>在一般的用途，只"
-+"要選擇最大可能區塊：只有在您有記憶體使用量上的問題時才限制它。"
- 
- #: part/katedialogs.cpp:977
- msgid ""
-@@ -1921,12 +1937,12 @@
- 
- #: part/katedialogs.cpp:1324
- msgid "Do&wnload..."
--msgstr "下載(&W)..."
-+msgstr "下載(&W)…"
- 
- #: part/katedialogs.cpp:1332
- msgid ""
--"Choose a <em>Syntax Highlight mode</em> from this list to view its properties "
--"below."
-+"Choose a <em>Syntax Highlight mode</em> from this list to view its "
-+"properties below."
- msgstr "從這個清單選擇<em>語法突顯模式</em>以檢視它的屬性。"
- 
- #: part/katedialogs.cpp:1335
-@@ -1938,30 +1954,33 @@
- #: part/katedialogs.cpp:1338
- msgid ""
- "The list of Mime Types used to determine which files to highlight using the "
--"current highlight mode."
--"<p>Click the wizard button on the left of the entry field to display the "
--"MimeType selection dialog."
--msgstr "MIME 類型清單是用來決定哪些檔案要使用目前的語法突顯模式來突顯。<p>按下項目欄位左方的精靈按鈕以顯示 MIME 類型選擇對話盒。"
-+"current highlight mode.<p>Click the wizard button on the left of the entry "
-+"field to display the MimeType selection dialog."
-+msgstr ""
-+"MIME 類型清單是用來決定哪些檔案要使用目前的語法突顯模式來突顯。<p>按下項目欄"
-+"位左方的精靈按鈕以顯示 MIME 類型選擇對話盒。"
- 
- #: part/katedialogs.cpp:1342
- msgid ""
- "Display a dialog with a list of all available mime types to choose from."
--"<p>The <strong>File Extensions</strong> entry will automatically be edited as "
--"well."
--msgstr "顯示含有所有可用 MIME 類型清單以供選擇的對話盒。<p><strong>延伸檔名</strong>項目也會自動被編輯。"
-+"<p>The <strong>File Extensions</strong> entry will automatically be edited "
-+"as well."
-+msgstr ""
-+"顯示含有所有可用 MIME 類型清單以供選擇的對話盒。<p><strong>延伸檔名</strong>"
-+"項目也會自動被編輯。"
- 
- #: part/katedialogs.cpp:1346
- msgid ""
--"Click this button to download new or updated syntax highlight descriptions from "
--"the Kate website."
-+"Click this button to download new or updated syntax highlight descriptions "
-+"from the Kate website."
- msgstr "按下這個按鈕以自 Kate 網站下載新的或更新過的語法突顯描述。"
- 
- #: part/katedialogs.cpp:1424
- msgid ""
- "Select the MimeTypes you want highlighted using the '%1' syntax highlight "
- "rules.\n"
--"Please note that this will automatically edit the associated file extensions as "
--"well."
-+"Please note that this will automatically edit the associated file extensions "
-+"as well."
- msgstr ""
- "選擇您想要使用「%1」語法突顯規則來突顯的 MIME 類型。\n"
- "請注意這樣也會自動編輯關連的延伸檔名。"
-@@ -2004,7 +2023,7 @@
- 
- #: part/katedialogs.cpp:1589
- msgid "&Save File As..."
--msgstr "儲存檔案為(&S)..."
-+msgstr "儲存檔案為(&S)…"
- 
- #: part/katedialogs.cpp:1590
- msgid "Lets you select a location and save the file again."
-@@ -2031,7 +2050,9 @@
- msgid ""
- "Do nothing. Next time you focus the file, or try to save it or close it, you "
- "will be prompted again."
--msgstr "不做任何事。下一次您將焦點移到這個檔案，或嘗試儲存它、關閉它時，您將會被再次提示。"
-+msgstr ""
-+"不做任何事。下一次您將焦點移到這個檔案，或嘗試儲存它、關閉它時，您將會被再次"
-+"提示。"
- 
- #: part/katedialogs.cpp:1621
- msgid "&View Difference"
-@@ -2039,9 +2060,11 @@
- 
- #: part/katedialogs.cpp:1626
- msgid ""
--"Calculates the difference between the editor contents and the disk file using "
--"diff(1) and opens the diff file with the default application for that."
--msgstr "使用 diff(1) 計算編輯器內容與磁碟檔案之間的差異，並以預設的應用程式開啟 diff 檔案。"
-+"Calculates the difference between the editor contents and the disk file "
-+"using diff(1) and opens the diff file with the default application for that."
-+msgstr ""
-+"使用 diff(1) 計算編輯器內容與磁碟檔案之間的差異，並以預設的應用程式開啟 diff "
-+"檔案。"
- 
- #: part/katedialogs.cpp:1630
- msgid "Overwrite"
-@@ -2053,8 +2076,8 @@
- 
- #: part/katedialogs.cpp:1699
- 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。"
- 
- #: part/katedialogs.cpp:1701
-@@ -2063,11 +2086,12 @@
- 
- #: part/katedialogs.cpp:1716
- msgid ""
--"Ignoring means that you will not be warned again (unless the disk file changes "
--"once more): if you save the document, you will overwrite the file on disk; if "
--"you do not save then the disk file (if present) is what you have."
-+"Ignoring means that you will not be warned again (unless the disk file "
-+"changes once more): if you save the document, you will overwrite the file on "
-+"disk; if you do not save then the disk file (if present) is what you have."
- msgstr ""
--"忽略代表您將不會再次被警告（除非磁碟檔案再次變更）：如果您儲存該文件，您將會覆蓋磁碟上的檔案；如果您不儲存那麼磁碟檔案（如果還在）就會保持原樣。"
-+"忽略代表您將不會再次被警告（除非磁碟檔案再次變更）：如果您儲存該文件，您將會"
-+"覆蓋磁碟上的檔案；如果您不儲存那麼磁碟檔案（如果還在）就會保持原樣。"
- 
- #: part/katedialogs.cpp:1720
- msgid "You Are on Your Own"
-@@ -2092,7 +2116,7 @@
- 
- #: part/katespell.cpp:57
- msgid "Spelling (from cursor)..."
--msgstr "拼字檢查（從游標處）..."
-+msgstr "拼字檢查（從游標處）…"
- 
- #: part/katespell.cpp:58
- msgid "Check the document's spelling from the cursor and forward"
-@@ -2100,7 +2124,7 @@
- 
- #: part/katespell.cpp:60
- msgid "Spellcheck Selection..."
--msgstr "拼字檢查選擇區..."
-+msgstr "拼字檢查選擇區…"
- 
- #: part/katespell.cpp:61
- msgid "Check spelling of the selected text"
-@@ -2114,7 +2138,9 @@
- msgid ""
- "The spelling program could not be started. Please make sure you have set the "
- "correct spelling program and that it is properly configured and in your PATH."
--msgstr "無法啟動拼字檢查程式。請檢查您已設定了正確的拼字檢查程式並且它已經設定完成且位於您的 PATH 中。"
-+msgstr ""
-+"無法啟動拼字檢查程式。請檢查您已設定了正確的拼字檢查程式並且它已經設定完成且"
-+"位於您的 PATH 中。"
- 
- #: part/katespell.cpp:210
- msgid "The spelling program seems to have crashed."
-@@ -2157,16 +2183,16 @@
- 
- #: part/kateview.cpp:238
- msgid "&Word Wrap Document"
--msgstr "文件自動折行(&W)"
-+msgstr "文件自動折列(&W)"
- 
- #: part/kateview.cpp:239
- msgid ""
- "Use this command to wrap all lines of the current document which are longer "
--"than the width of the current view, to fit into this view."
--"<br>"
--"<br> This is a static word wrap, meaning it is not updated when the view is "
--"resized."
--msgstr "使用這個指令讓目前文件中所有比目前視窗寬度更長的行折為多行。<br><br>這是靜態的文字折行，亦即當視窗改變大小後並不會隨之更新。"
-+"than the width of the current view, to fit into this view.<br><br> This is a "
-+"static word wrap, meaning it is not updated when the view is resized."
-+msgstr ""
-+"使用這個指令讓目前文件中所有比目前視窗寬度更長的行折為多行。<br><br>這是靜態"
-+"的文字折列，亦即當視窗改變大小後並不會隨之更新。"
- 
- #: part/kateview.cpp:244
- msgid "&Indent"
-@@ -2174,11 +2200,12 @@
- 
- #: part/kateview.cpp:245
- msgid ""
--"Use this to indent a selected block of text."
--"<br>"
--"<br>You can configure whether tabs should be honored and used or replaced with "
--"spaces, in the configuration dialog."
--msgstr "使用這個來將選擇的文字區塊縮排。<br><br>您可以在組態對話盒中設定要優先使用跳格(Tab)或以空格代替。"
-+"Use this to indent a selected block of text.<br><br>You can configure "
-+"whether tabs should be honored and used or replaced with spaces, in the "
-+"configuration dialog."
-+msgstr ""
-+"使用這個來將選擇的文字區塊縮排。<br><br>您可以在組態對話盒中設定要優先使用跳"
-+"格(Tab)或以空格代替。"
- 
- #: part/kateview.cpp:247
- msgid "&Unindent"
-@@ -2194,12 +2221,12 @@
- 
- #: part/kateview.cpp:251
- msgid ""
--"Use this to clean the indentation of a selected block of text (only tabs/only "
--"spaces)"
--"<br>"
--"<br>You can configure whether tabs should be honored and used or replaced with "
--"spaces, in the configuration dialog."
--msgstr "使用這個來清除所選文字區塊的縮排(只有跳格/只有空白)<br><br>您可以在組態對話盒中設定要優先使用跳格(Tab)或以空格代替。"
-+"Use this to clean the indentation of a selected block of text (only tabs/"
-+"only spaces)<br><br>You can configure whether tabs should be honored and "
-+"used or replaced with spaces, in the configuration dialog."
-+msgstr ""
-+"使用這個來清除所選文字區塊的縮排(只有跳格/只有空白)<br><br>您可以在組態對話盒"
-+"中設定要優先使用跳格(Tab)或以空格代替。"
- 
- #: part/kateview.cpp:254
- msgid "&Align"
-@@ -2207,7 +2234,8 @@
- 
- #: part/kateview.cpp:255
- msgid ""
--"Use this to align the current line or block of text to its proper indent level."
-+"Use this to align the current line or block of text to its proper indent "
-+"level."
- msgstr "使用這個將目前的行或文字的區塊對齊它的縮排層級。"
- 
- #: part/kateview.cpp:257
-@@ -2216,10 +2244,12 @@
- 
- #: part/kateview.cpp:259
- msgid ""
--"This command comments out the current line or a selected block of text.<BR><BR>"
--"The characters for single/multiple line comments are defined within the "
--"language's highlighting."
--msgstr "這個指令為目前的行或選擇的文字區塊加上註解。<BR><BR>單行/多行的註解字元都在語言的突顯中定義。"
-+"This command comments out the current line or a selected block of text."
-+"<BR><BR>The characters for single/multiple line comments are defined within "
-+"the language's highlighting."
-+msgstr ""
-+"這個指令為目前的行或選擇的文字區塊加上註解。<BR><BR>單行/多行的註解字元都在語"
-+"言的突顯中定義。"
- 
- #: part/kateview.cpp:262
- msgid "Unco&mment"
-@@ -2230,7 +2260,9 @@
- "This command removes comments from the current line or a selected block of "
- "text.<BR><BR>The characters for single/multiple line comments are defined "
- "within the language's highlighting."
--msgstr "這個指令會移除目前的行或選擇的文字區塊的註解。<BR><BR>單行/多行的註解字元都在語言的突顯中定義。"
-+msgstr ""
-+"這個指令會移除目前的行或選擇的文字區塊的註解。<BR><BR>單行/多行的註解字元都在"
-+"語言的突顯中定義。"
- 
- #: part/kateview.cpp:267
- msgid "&Read Only Mode"
-@@ -2246,8 +2278,8 @@
- 
- #: part/kateview.cpp:274
- msgid ""
--"Convert the selection to uppercase, or the character to the right of the cursor "
--"if no text is selected."
-+"Convert the selection to uppercase, or the character to the right of the "
-+"cursor if no text is selected."
- msgstr "將選擇區轉換為大寫，如果沒有選擇文字則使用游標右方的字元。"
- 
- #: part/kateview.cpp:277
-@@ -2256,8 +2288,8 @@
- 
- #: part/kateview.cpp:279
- msgid ""
--"Convert the selection to lowercase, or the character to the right of the cursor "
--"if no text is selected."
-+"Convert the selection to lowercase, or the character to the right of the "
-+"cursor if no text is selected."
- msgstr "將選擇區轉換為小寫，如果沒有選擇文字則使用游標右方的字元。"
- 
- #: part/kateview.cpp:282
-@@ -2266,7 +2298,8 @@
- 
- #: part/kateview.cpp:284
- msgid ""
--"Capitalize the selection, or the word under the cursor if no text is selected."
-+"Capitalize the selection, or the word under the cursor if no text is "
-+"selected."
- msgstr "將選擇區轉換為大寫，如果沒有選擇文字則使用游標下方的文字。"
- 
- #: part/kateview.cpp:287
-@@ -2291,13 +2324,13 @@
- 
- #: part/kateview.cpp:308
- msgid ""
--"This command opens a dialog and lets you choose a line that you want the cursor "
--"to move to."
--msgstr "這個指令開啟對話盒並讓您選擇您想要游標移動到哪一行。"
-+"This command opens a dialog and lets you choose a line that you want the "
-+"cursor to move to."
-+msgstr "這個指令開啟對話盒並讓您選擇您想要游標移動到哪一列。"
- 
- #: part/kateview.cpp:310
- msgid "&Configure Editor..."
--msgstr "編輯器設定(&C)..."
-+msgstr "編輯器設定(&C)…"
- 
- #: part/kateview.cpp:311
- msgid "Configure various aspects of this editor."
-@@ -2339,8 +2372,8 @@
- 
- #: part/kateview.cpp:335
- msgid ""
--"If you have selected something within the current document, this will no longer "
--"be selected."
-+"If you have selected something within the current document, this will no "
-+"longer be selected."
- msgstr "如果您在目前的文件中已經選擇某些東西，將無法選擇此項。"
- 
- #: part/kateview.cpp:337
-@@ -2381,11 +2414,11 @@
- 
- #: part/kateview.cpp:357
- msgid "&Dynamic Word Wrap"
--msgstr "動態折行(&D)"
-+msgstr "動態折列(&D)"
- 
- #: part/kateview.cpp:362
- msgid "Dynamic Word Wrap Indicators"
--msgstr "動態文字折行指示器"
-+msgstr "動態文字折列指示器"
- 
- #: part/kateview.cpp:367
- msgid "&Off"
-@@ -2393,7 +2426,7 @@
- 
- #: part/kateview.cpp:368
- msgid "Follow &Line Numbers"
--msgstr "跟隨行號(&L)"
-+msgstr "跟隨列號(&L)"
- 
- #: part/kateview.cpp:369
- msgid "&Always On"
-@@ -2419,8 +2452,8 @@
- 
- #: part/kateview.cpp:384
- msgid ""
--"Show/hide the icon border.<BR><BR> The icon border shows bookmark symbols, for "
--"instance."
-+"Show/hide the icon border.<BR><BR> The icon border shows bookmark symbols, "
-+"for instance."
- msgstr "顯示/隱藏圖示邊框。<BR><BR>例如，圖示邊框顯示書籤標記。"
- 
- #: part/kateview.cpp:385
-@@ -2429,7 +2462,7 @@
- 
- #: part/kateview.cpp:388
- msgid "Show &Line Numbers"
--msgstr "顯示行號(&L)"
-+msgstr "顯示列號(&L)"
- 
- #: part/kateview.cpp:391
- msgid "Show/hide the line numbers on the left hand side of the view."
-@@ -2437,7 +2470,7 @@
- 
- #: part/kateview.cpp:392
- msgid "Hide &Line Numbers"
--msgstr "隱藏行號(&L)"
-+msgstr "隱藏列號(&L)"
- 
- #: part/kateview.cpp:395
- msgid "Show Scroll&bar Marks"
-@@ -2445,8 +2478,8 @@
- 
- #: part/kateview.cpp:398
- msgid ""
--"Show/hide the marks on the vertical scrollbar.<BR><BR>"
--"The marks, for instance, show bookmarks."
-+"Show/hide the marks on the vertical scrollbar.<BR><BR>The marks, for "
-+"instance, show bookmarks."
- msgstr "顯示/隱藏垂直捲動軸標記。<BR><BR>例如，顯示書籤標記。"
- 
- #: part/kateview.cpp:399
-@@ -2455,17 +2488,17 @@
- 
- #: part/kateview.cpp:402
- msgid "Show Static &Word Wrap Marker"
--msgstr "顯示靜態文字折行標記(&W)"
-+msgstr "顯示靜態文字折列標記(&W)"
- 
- #: part/kateview.cpp:406
- msgid ""
--"Show/hide the Word Wrap Marker, a vertical line drawn at the word wrap column "
--"as defined in the editing properties"
--msgstr "顯示/隱藏文字折行標記，一條在編輯屬性中定義繪製於文字折行處的垂直線"
-+"Show/hide the Word Wrap Marker, a vertical line drawn at the word wrap "
-+"column as defined in the editing properties"
-+msgstr "顯示/隱藏文字折列標記，一條在編輯屬性中定義繪製於文字折列處的垂直線"
- 
- #: part/kateview.cpp:408
- msgid "Hide Static &Word Wrap Marker"
--msgstr "隱藏靜態文字折行標記(&W)"
-+msgstr "隱藏靜態文字折列標記(&W)"
- 
- #: part/kateview.cpp:411
- msgid "Switch to Command Line"
-@@ -2545,19 +2578,19 @@
- 
- #: part/kateview.cpp:504
- msgid "Select to Previous Line"
--msgstr "選擇至上一行"
-+msgstr "選擇至上一列"
- 
- #: part/kateview.cpp:508
- msgid "Scroll Line Up"
--msgstr "向上捲動一行"
-+msgstr "向上捲動一列"
- 
- #: part/kateview.cpp:512
- msgid "Move to Next Line"
--msgstr "移至下一行"
-+msgstr "移至下一列"
- 
- #: part/kateview.cpp:515
- msgid "Move to Previous Line"
--msgstr "移至上一行"
-+msgstr "移至上一列"
- 
- #: part/kateview.cpp:518
- msgid "Move Character Right"
-@@ -2569,11 +2602,11 @@
- 
- #: part/kateview.cpp:525
- msgid "Select to Next Line"
--msgstr "選擇至下一行"
-+msgstr "選擇至下一列"
- 
- #: part/kateview.cpp:529
- msgid "Scroll Line Down"
--msgstr "向下捲動一行"
-+msgstr "向下捲動一列"
- 
- #: part/kateview.cpp:534
- msgid "Scroll Page Up"
-@@ -2707,7 +2740,8 @@
- 
- #: part/katehighlight.cpp:1972
- msgid ""
--"<B>%1</B>: Deprecated syntax. Attribute (%2) not addressed by symbolic name<BR>"
-+"<B>%1</B>: Deprecated syntax. Attribute (%2) not addressed by symbolic "
-+"name<BR>"
- msgstr "<B>%1</B>：不建議的語法。屬性 (%2) 未依連結名稱排列<BR>"
- 
- #: part/katehighlight.cpp:2339
-@@ -3840,17 +3874,17 @@
- msgid ""
- "_: Translators: This is the first part of two strings wich will comprise the "
- "sentence 'Show completions when a word is at least N characters'. The first "
--"part is on the right side of the N, which is represented by a spinbox widget, "
--"followed by the second part: 'characters long'. Characters is a ingeger number "
--"between and including 1 and 30. Feel free to leave the second part of the "
--"sentence blank if it suits your language better. \n"
-+"part is on the right side of the N, which is represented by a spinbox "
-+"widget, followed by the second part: 'characters long'. Characters is a "
-+"ingeger number between and including 1 and 30. Feel free to leave the second "
-+"part of the sentence blank if it suits your language better. \n"
- "Show completions &when a word is at least"
- msgstr "顯示補齊當文字最少為(&W)"
- 
- #: plugins/wordcompletion/docwordcompletion.cpp:517
- msgid ""
--"_: This is the second part of two strings that will comprise teh sentence 'Show "
--"completions when a word is at least N characters'\n"
-+"_: This is the second part of two strings that will comprise teh sentence "
-+"'Show completions when a word is at least N characters'\n"
- "characters long."
- msgstr "字元長度."
- 
-@@ -3867,7 +3901,7 @@
- 
- #: plugins/insertfile/insertfileplugin.cpp:79
- msgid "Insert File..."
--msgstr "插入檔案..."
-+msgstr "插入檔案…"
- 
- #: plugins/insertfile/insertfileplugin.cpp:88
- msgid "Choose File to Insert"
-@@ -3912,12 +3946,13 @@
- #: plugins/kdatatool/kate_kdatatool.cpp:183
- msgid ""
- "Data tools are only available when text is selected, or when the right mouse "
--"button is clicked over a word. If no data tools are offered even when text is "
--"selected, you need to install them. Some data tools are part of the KOffice "
--"package."
-+"button is clicked over a word. If no data tools are offered even when text "
-+"is selected, you need to install them. Some data tools are part of the "
-+"KOffice package."
- msgstr ""
--"資料工具只有在文字被選擇或在文字上方按下滑鼠右鍵時才可以使用。如果即使選擇了文字仍然沒有提供資料工具，您需要安裝它們。有些資料工具是 KOffice "
--"套件的一部份。"
-+"資料工具只有在文字被選擇或在文字上方按下滑鼠右鍵時才可以使用。如果即使選擇了"
-+"文字仍然沒有提供資料工具，您需要安裝它們。有些資料工具是 KOffice 套件的一部"
-+"份。"
- 
- #: plugins/isearch/ISearchPlugin.cpp:68 plugins/isearch/ISearchPlugin.cpp:371
- msgid "Search Incrementally"
-@@ -3993,8 +4028,8 @@
- 
- #: plugins/isearch/ISearchPlugin.cpp:269
- msgid ""
--"_: Incremental Search has passed both the end of the document and the original "
--"starting position\n"
-+"_: Incremental Search has passed both the end of the document and the "
-+"original starting position\n"
- "Overwrapped I-Search:"
- msgstr "重覆折返遞增搜尋:"
- 
-@@ -4048,7 +4083,8 @@
- 
- #: plugins/autobookmarker/autobookmarker.cpp:302
- msgid ""
--"<p>If enabled, the pattern matching will be case sensitive, otherwise not.</p>"
-+"<p>If enabled, the pattern matching will be case sensitive, otherwise not.</"
-+"p>"
- msgstr "<p>如果啟用，樣式的比對將會是區分大小寫的，相反則無。</p>"
- 
- #: plugins/autobookmarker/autobookmarker.cpp:305
-@@ -4058,9 +4094,11 @@
- #: plugins/autobookmarker/autobookmarker.cpp:309
- msgid ""
- "<p>If enabled, the pattern matching will use minimal matching; if you do not "
--"know what that is, please read the appendix on regular expressions in the kate "
--"manual.</p>"
--msgstr "<p>如果啟用，樣式的比對會使用最小符合；如果您不知道那代表什麼，請閱讀 kate 手冊中正規表示式的附錄。</p>"
-+"know what that is, please read the appendix on regular expressions in the "
-+"kate manual.</p>"
-+msgstr ""
-+"<p>如果啟用，樣式的比對會使用最小符合；如果您不知道那代表什麼，請閱讀 kate 手"
-+"冊中正規表示式的附錄。</p>"
- 
- #: plugins/autobookmarker/autobookmarker.cpp:313
- msgid "&File mask:"
-@@ -4068,36 +4106,39 @@
- 
- #: plugins/autobookmarker/autobookmarker.cpp:319
- msgid ""
--"<p>A list of filename masks, separated by semicolons. This can be used to limit "
--"the usage of this entity to files with matching names.</p>"
--"<p>Use the wizard button to the right of the mimetype entry below to easily "
--"fill out both lists.</p>"
-+"<p>A list of filename masks, separated by semicolons. This can be used to "
-+"limit the usage of this entity to files with matching names.</p><p>Use the "
-+"wizard button to the right of the mimetype entry below to easily fill out "
-+"both lists.</p>"
- msgstr ""
--"<p>檔案名稱遮罩的清單，以分號隔開。這可以用來限制符合此名稱的檔案數目。</p>"
--"<p>使用 MIME 類型項目右邊的精靈按鈕可以很輕鬆的填好兩邊的清單。</p>"
-+"<p>檔案名稱遮罩的清單，以分號隔開。這可以用來限制符合此名稱的檔案數目。</"
-+"p><p>使用 MIME 類型項目右邊的精靈按鈕可以很輕鬆的填好兩邊的清單。</p>"
- 
- #: plugins/autobookmarker/autobookmarker.cpp:330
- msgid ""
--"<p>A list of mime types, separated by semicolon. This can be used to limit the "
--"usage of this entity to files with matching mime types.</p>"
--"<p>Use the wizard button on the right to get a list of existing file types to "
--"choose from, using it will fill in the file masks as well.</p>"
-+"<p>A list of mime types, separated by semicolon. This can be used to limit "
-+"the usage of this entity to files with matching mime types.</p><p>Use the "
-+"wizard button on the right to get a list of existing file types to choose "
-+"from, using it will fill in the file masks as well.</p>"
- msgstr ""
--"<p>MIME 類型的清單，以分號隔開。這可以用來限制符合此 MIME 類型的檔案項目。</p>"
--"<p>使用右邊的精靈按鈕可以取得既存檔案類型的清單以供選擇，也可以使用它來填入檔案遮罩。</p>"
-+"<p>MIME 類型的清單，以分號隔開。這可以用來限制符合此 MIME 類型的檔案項目。</"
-+"p><p>使用右邊的精靈按鈕可以取得既存檔案類型的清單以供選擇，也可以使用它來填入"
-+"檔案遮罩。</p>"
- 
- #: plugins/autobookmarker/autobookmarker.cpp:340
- msgid ""
--"<p>Click this button to display a checkable list of mimetypes available on your "
--"system. When used, the file masks entry above will be filled in with the "
--"corresponding masks.</p>"
--msgstr "<p>按下這個按鈕以顯示在你系統中可用的 MIME 類型核取清單。在使用時，上方的檔案遮罩項目將填入相對的遮罩。</p>"
-+"<p>Click this button to display a checkable list of mimetypes available on "
-+"your system. When used, the file masks entry above will be filled in with "
-+"the corresponding masks.</p>"
-+msgstr ""
-+"<p>按下這個按鈕以顯示在你系統中可用的 MIME 類型核取清單。在使用時，上方的檔案"
-+"遮罩項目將填入相對的遮罩。</p>"
- 
- #: plugins/autobookmarker/autobookmarker.cpp:365
- msgid ""
- "Select the MimeTypes for this pattern.\n"
--"Please note that this will automatically edit the associated file extensions as "
--"well."
-+"Please note that this will automatically edit the associated file extensions "
-+"as well."
- msgstr ""
- "選擇這個樣式的 MIME 類型。\n"
- "請注意這樣也會自動編輯關連的延伸檔名。"
-@@ -4121,19 +4162,16 @@
- #: plugins/autobookmarker/autobookmarker.cpp:394
- msgid ""
- "<p>This list shows your configured autobookmark entities. When a document is "
--"opened, each entity is used in the following way: "
--"<ol>"
--"<li>The entity is dismissed, if a mime and/or filename mask is defined, and "
--"neither matches the document.</li>"
--"<li>Otherwise each line of the document is tried against the pattern, and a "
--"bookmark is set on matching lines.</li></ul>"
--"<p>Use the buttons below to manage your collection of entities.</p>"
--msgstr ""
--"<p>這個清單顯示您設定的自動書籤項目。當開啟一份文件時，每個項目都會以下列方式來使用："
--"<ol>"
--"<li>此項目無效，如果 MIME 和/或檔案名稱遮罩已定義，卻無相符的文件。</li>"
--"<li>除非本文件的每一行都比對過，而書籤也設定於符合的行中。</li></ul>"
--"<p>使用下列按鈕來管理您自己收集的項目。</p>"
-+"opened, each entity is used in the following way: <ol><li>The entity is "
-+"dismissed, if a mime and/or filename mask is defined, and neither matches "
-+"the document.</li><li>Otherwise each line of the document is tried against "
-+"the pattern, and a bookmark is set on matching lines.</li></ul><p>Use the "
-+"buttons below to manage your collection of entities.</p>"
-+msgstr ""
-+"<p>這個清單顯示您設定的自動書籤項目。當開啟一份文件時，每個項目都會以下列方式"
-+"來使用：<ol><li>此項目無效，如果 MIME 和/或檔案名稱遮罩已定義，卻無相符的文"
-+"件。</li><li>除非本文件的每一列都比對過，而書籤也設定於符合的行中。</li></"
-+"ul><p>使用下列按鈕來管理您自己收集的項目。</p>"
- 
- #: plugins/autobookmarker/autobookmarker.cpp:409
- msgid "Press this button to create a new autobookmark entity."
-@@ -4145,7 +4183,7 @@
- 
- #: plugins/autobookmarker/autobookmarker.cpp:416
- msgid "&Edit..."
--msgstr "編輯(&E)..."
-+msgstr "編輯(&E)…"
- 
- #: plugins/autobookmarker/autobookmarker.cpp:419
- msgid "Press this button to edit the currently selected entity."
-diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdelibs/kcmshell.po kde-i18n-zh_TW-3.5.10/messages/kdelibs/kcmshell.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdelibs/kcmshell.po	2006-10-01 18:34:22.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdelibs/kcmshell.po	2011-11-11 15:45:17.000000000 +0100
-@@ -6,8 +6,7 @@
- "Project-Id-Version: kcmshell\n"
- "POT-Creation-Date: 2006-08-13 04:02+0200\n"
- "PO-Revision-Date: 2006-02-13 13:04+0800\n"
--"Last-Translator: Frank Weng (a.k.a. Franklin) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Traditional Chinese <zh_l10n@linux.org.tw>\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/kdelibs/kdelibs_colors.po kde-i18n-zh_TW-3.5.10/messages/kdelibs/kdelibs_colors.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdelibs/kdelibs_colors.po	2006-01-19 18:50:12.000000000 +0100
-+++ kde-i18n-zh_TW-3.5.10/messages/kdelibs/kdelibs_colors.po	2011-11-11 15:45:17.000000000 +0100
-@@ -6,7 +6,7 @@
- "Project-Id-Version: kdelibs_colors\n"
- "POT-Creation-Date: 2005-05-18 21:23+0200\n"
- "PO-Revision-Date: 2005-08-09 16:00+0800\n"
--"Last-Translator: Chao-Hsiung Liao <j_h_liau@yahoo.com.tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\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/kdelibs/kdelibs.po kde-i18n-zh_TW-3.5.10/messages/kdelibs/kdelibs.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdelibs/kdelibs.po	2008-08-19 20:43:19.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdelibs/kdelibs.po	2011-11-11 15:45:17.000000000 +0100
-@@ -12,7 +12,7 @@
- "Project-Id-Version: kdelibs\n"
- "POT-Creation-Date: 2008-07-08 01:18+0200\n"
- "PO-Revision-Date: 2007-09-18 14:32+0800\n"
--"Last-Translator: Franklin Weng <franklin at goodhorse dot idv dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Chinese Traditional <zh-l10n@linux.org.tw>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
-@@ -29,12 +29,13 @@
- #: rc.cpp:6
- #, no-c-format
- msgid ""
--"Please choose the default text editing component that you wish to use in this "
--"application. If you choose <B>System Default</B>, the application will honor "
--"your changes in the Control Center. All other choices will override that "
--"setting."
-+"Please choose the default text editing component that you wish to use in "
-+"this application. If you choose <B>System Default</B>, the application will "
-+"honor your changes in the Control Center. All other choices will override "
-+"that setting."
- msgstr ""
--"請選擇您想要在此應用程式中使用的預設文字編輯元件。如果您選擇<B>系統預設值</B>，應用程式將會遵從您在控制中心的變更。所有其他的選項都會覆蓋那個選項。"
-+"請選擇您想要在此應用程式中使用的預設文字編輯元件。如果您選擇<B>系統預設值</"
-+"B>，應用程式將會遵從您在控制中心的變更。所有其他的選項都會覆蓋那個選項。"
- 
- #. i18n: file ./kcert/kcertpart.rc line 4
- #: rc.cpp:9
-@@ -58,7 +59,8 @@
- #: rc.cpp:18
- #, no-c-format
- msgid ""
--"The currently set shortcut or the shortcut you are entering will show up here."
-+"The currently set shortcut or the shortcut you are entering will show up "
-+"here."
- msgstr "已設定的快速鍵或是你剛剛設定的快速鍵將會顯示在這邊"
- 
- #. i18n: file ./kdeui/kshortcutdialog_advanced.ui line 182
-@@ -89,12 +91,12 @@
- #: rc.cpp:39
- #, no-c-format
- msgid ""
--"Select this checkbox to enable the entry of multi-key shortcuts.  A multi-key "
--"shortcut consists of a sequence of up to 4 keys.  For example, you could assign "
--"\"Ctrl+F,B\" to Font-Bold and \"Ctrl+F,U\" to Font-Underline."
-+"Select this checkbox to enable the entry of multi-key shortcuts.  A multi-"
-+"key shortcut consists of a sequence of up to 4 keys.  For example, you could "
-+"assign \"Ctrl+F,B\" to Font-Bold and \"Ctrl+F,U\" to Font-Underline."
- msgstr ""
--"如果您要使用多重按鍵作捷徑，請選擇此項。您最多可用4個按鍵作捷徑。例如您可把 \"Ctrl+F,B\" 連至 Font-Bold 和把 "
--"\"Ctrl+F,U\" 連至 Font-Underline。"
-+"如果您要使用多重按鍵作捷徑，請選擇此項。您最多可用4個按鍵作捷徑。例如您可把 "
-+"\"Ctrl+F,B\" 連至 Font-Bold 和把 \"Ctrl+F,U\" 連至 Font-Underline。"
- 
- #. i18n: file ./kdeui/ui_standards.rc line 4
- #: common_texts.cpp:77 rc.cpp:42 rc.cpp:262
-@@ -180,26 +182,26 @@
- #: rc.cpp:93 rc.cpp:105 rc.cpp:310 rc.cpp:322
- #, no-c-format
- msgid ""
--"<qt>"
--"<p>This word was considered to be an \"unknown word\" because it does not match "
--"any entry in the dictionary currently in use. It may also be a word in a "
--"foreign language.</p>\n"
--"<p>If the word is not misspelled, you may add it to the dictionary by clicking "
--"<b>Add to Dictionary</b>. If you don't want to add the unknown word to the "
--"dictionary, but you want to leave it unchanged, click <b>Ignore</b> or <b>"
--"Ignore All</b>.</p>\n"
-+"<qt><p>This word was considered to be an \"unknown word\" because it does "
-+"not match any entry in the dictionary currently in use. It may also be a "
-+"word in a foreign language.</p>\n"
-+"<p>If the word is not misspelled, you may add it to the dictionary by "
-+"clicking <b>Add to Dictionary</b>. If you don't want to add the unknown word "
-+"to the dictionary, but you want to leave it unchanged, click <b>Ignore</b> "
-+"or <b>Ignore All</b>.</p>\n"
- "<p>However, if the word is misspelled, you can try to find the correct "
--"replacement in the list below. If you cannot find a replacement there, you may "
--"type it in the text box below, and click <b>Replace</b> or <b>Replace All</b>"
--".</p>\n"
-+"replacement in the list below. If you cannot find a replacement there, you "
-+"may type it in the text box below, and click <b>Replace</b> or <b>Replace "
-+"All</b>.</p>\n"
- "</qt>"
- msgstr ""
--"<qt>"
--"<p>由於在使用中的字典內找不到這個詞語，它被當成一個\"未知詞語\"。它也有可能是一個外語。</p>\n"
--"<p>如果它真的沒有拼錯字，您可以按<b>加到字典中</b>來把它加入字典裏。如果您不希望這樣做，但仍想這個詞語保持原狀，您可以按<b>略過</b>或<b>"
--"全部略過</b>。</p>\n"
--"<p>然而，要是它拼錯了，試在下面的相近詞語中找出一個正確的。找不到的話，您也可自行輸入一個，然後按<b>取代</b>或<b>全部取代</b>來更正它。</p>"
--"\n"
-+"<qt><p>由於在使用中的字典內找不到這個詞語，它被當成一個\"未知詞語\"。它也有可"
-+"能是一個外語。</p>\n"
-+"<p>如果它真的沒有拼錯字，您可以按<b>加到字典中</b>來把它加入字典裏。如果您不"
-+"希望這樣做，但仍想這個詞語保持原狀，您可以按<b>略過</b>或<b>全部略過</b>。</"
-+"p>\n"
-+"<p>然而，要是它拼錯了，試在下面的相近詞語中找出一個正確的。找不到的話，您也可"
-+"自行輸入一個，然後按<b>取代</b>或<b>全部取代</b>來更正它。</p>\n"
- "</qt>"
- 
- #. i18n: file ./kdeui/kspellui.ui line 52
-@@ -236,7 +238,7 @@
- #: rc.cpp:119 rc.cpp:336
- #, no-c-format
- msgid "... the <b>misspelled</b> word shown in context ..."
--msgstr "... 內文中有<b>拼字錯誤</b>的詞語 ..."
-+msgstr "… 內文中有<b>拼字錯誤</b>的詞語…"
- 
- #. i18n: file ./kdeui/kspellui.ui line 94
- #: rc.cpp:122 rc.cpp:339
-@@ -249,15 +251,16 @@
- #, no-c-format
- msgid ""
- "<qt>\n"
--"<p>Here you can see a text excerpt showing the unknown word in its context. If "
--"this information is not sufficient to choose the best replacement for the "
-+"<p>Here you can see a text excerpt showing the unknown word in its context. "
-+"If this information is not sufficient to choose the best replacement for the "
- "unknown word, you can click on the document you are proofing, read a larger "
- "part of the text and then return here to continue proofing.</p>\n"
- "</qt>"
- msgstr ""
- "<qt>\n"
--"<p>在這裏您可以找到內文中拼錯詞附近的文字。如果覺得文字太少，不能確定要用哪一個詞語作替代的話，您可以另外打開檢驗的文件，閱讀更多文字，並根據上文下理來作決定"
--"。然後回到這裏繼續。</p>\n"
-+"<p>在這裏您可以找到內文中拼錯詞附近的文字。如果覺得文字太少，不能確定要用哪一"
-+"個詞語作替代的話，您可以另外打開檢驗的文件，閱讀更多文字，並根據上文下理來作"
-+"決定。然後回到這裏繼續。</p>\n"
- "</qt>"
- 
- #. i18n: file ./kdeui/kspellui.ui line 107
-@@ -272,18 +275,17 @@
- msgid ""
- "<qt>\n"
- "<p>The unknown word was detected and considered unknown because it is not "
--"included in the dictionary."
--"<br>\n"
--"Click here if you consider that the unknown word is not misspelled and you want "
--"to avoid wrongly detecting it again in the future. If you want to let it remain "
--"as is, but not add it to the dictionary, then click <b>Ignore</b> or <b>"
--"Ignore All</b> instead.</p>\n"
-+"included in the dictionary.<br>\n"
-+"Click here if you consider that the unknown word is not misspelled and you "
-+"want to avoid wrongly detecting it again in the future. If you want to let "
-+"it remain as is, but not add it to the dictionary, then click <b>Ignore</b> "
-+"or <b>Ignore All</b> instead.</p>\n"
- "</qt>"
- msgstr ""
- "<qt>\n"
--"<p>偵測到一個未知詞語(在字典內找不到)。"
--"<br>\n"
--"如果您認為它沒有拼措，並且不要再次顯示，就請按這裏。若您認為它是對的，但不想加入字典中，可以按<b>略過</b>或<b>全部略過</b>。</p>\n"
-+"<p>偵測到一個未知詞語(在字典內找不到)。<br>\n"
-+"如果您認為它沒有拼措，並且不要再次顯示，就請按這裏。若您認為它是對的，但不想"
-+"加入字典中，可以按<b>略過</b>或<b>全部略過</b>。</p>\n"
- "</qt>"
- 
- #. i18n: file ./kdeui/kspellui.ui line 138
-@@ -297,8 +299,8 @@
- #, no-c-format
- msgid ""
- "<qt>\n"
--"<p>Click here to replace all occurrences of the unknown text with the text in "
--"the edit box above (to the left).</p>\n"
-+"<p>Click here to replace all occurrences of the unknown text with the text "
-+"in the edit box above (to the left).</p>\n"
- "</qt>"
- msgstr ""
- "<qt>\n"
-@@ -322,16 +324,20 @@
- #, no-c-format
- msgid ""
- "<qt>\n"
--"<p>If the unknown word is misspelled, you should check if the correction for it "
--"is available and if it is, click on it. If none of the words in this list is a "
--"good replacement you may type the correct word in the edit box above.</p>\n"
--"<p>To correct this word click <b>Replace</b> if you want to correct only this "
--"occurrence or <b>Replace All</b> if you want to correct all occurrences.</p>\n"
-+"<p>If the unknown word is misspelled, you should check if the correction for "
-+"it is available and if it is, click on it. If none of the words in this list "
-+"is a good replacement you may type the correct word in the edit box above.</"
-+"p>\n"
-+"<p>To correct this word click <b>Replace</b> if you want to correct only "
-+"this occurrence or <b>Replace All</b> if you want to correct all occurrences."
-+"</p>\n"
- "</qt>"
- msgstr ""
- "<qt>\n"
--"<p>如果未知詞語是拼錯字的話，您應檢查一下有沒有適當的更正。有的話，就在它上面按一下。要是沒有，您也可以在上面的方格內輸入正確的詞語。</p>\n"
--"<p>確定後，就按<b>取代</b>來更正。要一次更改全部錯誤，請按<b>全部取代</b>。</p></qt>"
-+"<p>如果未知詞語是拼錯字的話，您應檢查一下有沒有適當的更正。有的話，就在它上面"
-+"按一下。要是沒有，您也可以在上面的方格內輸入正確的詞語。</p>\n"
-+"<p>確定後，就按<b>取代</b>來更正。要一次更改全部錯誤，請按<b>全部取代</b>。</"
-+"p></qt>"
- 
- #. i18n: file ./kdeui/kspellui.ui line 179
- #: kdeui/keditcl2.cpp:833 kutils/kfinddialog.cpp:231 rc.cpp:159 rc.cpp:397
-@@ -344,8 +350,8 @@
- #, no-c-format
- msgid ""
- "<qt>\n"
--"<p>Click here to replace this occurrence of the unknown text with the text in "
--"the edit box above (to the left).</p>\n"
-+"<p>Click here to replace this occurrence of the unknown text with the text "
-+"in the edit box above (to the left).</p>\n"
- "</qt>"
- msgstr ""
- "<qt>\n"
-@@ -363,16 +369,18 @@
- #, no-c-format
- msgid ""
- "<qt>\n"
--"<p>If the unknown word is misspelled, you should type the correction for your "
--"misspelled word here or select it from the list below.</p>\n"
-+"<p>If the unknown word is misspelled, you should type the correction for "
-+"your misspelled word here or select it from the list below.</p>\n"
- "<p>You can then click <b>Replace</b> if you want to correct only this "
- "occurrence of the word or <b>Replace All</b> if you want to correct all "
- "occurrences.</p>\n"
- "</qt>"
- msgstr ""
- "<qt>\n"
--"<p>如果未知詞語是拼錯字的話，您應檢查一下有沒有適當的更正。有的話，就在它上面按一下。要是沒有，您也可以在方格內輸入正確的詞語。</p>\n"
--"<p>確定後，就按<b>取代</b>來更正這個錯誤。要一次更正全部錯誤，請按<b>全部取代</b>。</p>\n"
-+"<p>如果未知詞語是拼錯字的話，您應檢查一下有沒有適當的更正。有的話，就在它上面"
-+"按一下。要是沒有，您也可以在方格內輸入正確的詞語。</p>\n"
-+"<p>確定後，就按<b>取代</b>來更正這個錯誤。要一次更正全部錯誤，請按<b>全部取代"
-+"</b>。</p>\n"
- "</qt>"
- 
- #. i18n: file ./kdeui/kspellui.ui line 209
-@@ -387,14 +395,15 @@
- msgid ""
- "<qt>\n"
- "<p>Click here to let this occurrence of the unknown word remain as is.</p>\n"
--"<p>This action is useful when the word is a name, an acronym, a foreign word or "
--"any other unknown word that you want to use but not add to the dictionary.</p>\n"
-+"<p>This action is useful when the word is a name, an acronym, a foreign word "
-+"or any other unknown word that you want to use but not add to the dictionary."
-+"</p>\n"
- "</qt>"
- msgstr ""
- "<qt>\n"
--"<p>按這裡使這個未知詞語保持原狀。"
--"<p>\n"
--"<p>當這個詞語是一個名字、縮寫、外語或其他未知詞語，而您希望使用它，但又不想把它加入字典內時，這個選項便很有用。</p>\n"
-+"<p>按這裡使這個未知詞語保持原狀。<p>\n"
-+"<p>當這個詞語是一個名字、縮寫、外語或其他未知詞語，而您希望使用它，但又不想把"
-+"它加入字典內時，這個選項便很有用。</p>\n"
- "</qt>"
- 
- #. i18n: file ./kdeui/kspellui.ui line 223
-@@ -408,16 +417,17 @@
- #, no-c-format
- msgid ""
- "<qt>\n"
--"<p>Click here to let all occurrences of the unknown word remain as they are.</p>"
--"\n"
--"<p>This action is useful when the word is a name, an acronym, a foreign word or "
--"any other unknown word that you want to use but not add to the dictionary.</p>\n"
-+"<p>Click here to let all occurrences of the unknown word remain as they are."
-+"</p>\n"
-+"<p>This action is useful when the word is a name, an acronym, a foreign word "
-+"or any other unknown word that you want to use but not add to the dictionary."
-+"</p>\n"
- "</qt>"
- msgstr ""
- "<qt>\n"
--"<p>按這裡使所有未知詞語保持原狀。"
--"<p>\n"
--"<p>當這個詞語是一個名字、縮寫、外語或其他未知詞語，而您希望使用它，但又不想把它加入字典內時，這個選項便很有用。</p>\n"
-+"<p>按這裡使所有未知詞語保持原狀。<p>\n"
-+"<p>當這個詞語是一個名字、縮寫、外語或其他未知詞語，而您希望使用它，但又不想把"
-+"它加入字典內時，這個選項便很有用。</p>\n"
- "</qt>"
- 
- #. i18n: file ./kdeui/kspellui.ui line 248
-@@ -430,7 +440,7 @@
- #: kdeui/ksconfig.cpp:294 rc.cpp:203 rc.cpp:383
- #, no-c-format
- msgid "English"
--msgstr "英文"
-+msgstr "英語"
- 
- #. i18n: file ./kdeui/kspellui.ui line 261
- #: rc.cpp:206 rc.cpp:386
-@@ -454,16 +464,17 @@
- #: rc.cpp:220
- #, no-c-format
- msgid ""
--"This dialog provides you with notification and details of scripting errors that "
--"occur on web pages.  In many cases it is due to an error in the web site as "
--"designed by its author.  In other cases it is the result of a programming error "
--"in Konqueror.  If you suspect the former, please contact the webmaster of the "
--"site in question.  Conversely if you suspect an error in Konqueror, please file "
--"a bug report at http://bugs.kde.org/.  A test case which illustrates the "
--"problem will be appreciated."
--msgstr ""
--"這個對話框會告訴您網頁上 Javascript 錯誤的詳細資料。這些錯誤大部份是網頁作者所犯的。如果不是，那就是 Konqueror "
--"的程式碼有問題了。前者可以透過聯絡網站管理員來解決，後者則請報告至 http://bugs.kde.org/，可以附上測試案例的話更好。"
-+"This dialog provides you with notification and details of scripting errors "
-+"that occur on web pages.  In many cases it is due to an error in the web "
-+"site as designed by its author.  In other cases it is the result of a "
-+"programming error in Konqueror.  If you suspect the former, please contact "
-+"the webmaster of the site in question.  Conversely if you suspect an error "
-+"in Konqueror, please file a bug report at http://bugs.kde.org/.  A test case "
-+"which illustrates the problem will be appreciated."
-+msgstr ""
-+"這個對話框會告訴您網頁上 Javascript 錯誤的詳細資料。這些錯誤大部份是網頁作者"
-+"所犯的。如果不是，那就是 Konqueror 的程式碼有問題了。前者可以透過聯絡網站管理"
-+"員來解決，後者則請報告至 http://bugs.kde.org/，可以附上測試案例的話更好。"
- 
- #. i18n: file ./khtml/kjserrordlg.ui line 39
- #: kdeui/kstdaction_p.h:58 kdeui/kstdguiitem.cpp:161 rc.cpp:226
-@@ -529,8 +540,8 @@
- #: rc.cpp:274
- #, no-c-format
- msgid ""
--"This is the default language that the spell checker will use. The drop down box "
--"will list all of the dictionaries of your existing languages."
-+"This is the default language that the spell checker will use. The drop down "
-+"box will list all of the dictionaries of your existing languages."
- msgstr "這是拼字檢查程式預設使用的語言。對話盒中會列出您目前語言的所有字典。"
- 
- #. i18n: file ./kspell2/ui/configui.ui line 34
-@@ -550,9 +561,10 @@
- #: rc.cpp:283
- #, no-c-format
- msgid ""
--"If checked, the \"spell as you type\" mode is active and all misspelled words "
--"are immediately highlighted."
--msgstr "如果開啟此選項的話，會開啟「即時拼字檢查」模式，所有拼錯的字都會立即標出。"
-+"If checked, the \"spell as you type\" mode is active and all misspelled "
-+"words are immediately highlighted."
-+msgstr ""
-+"如果開啟此選項的話，會開啟「即時拼字檢查」模式，所有拼錯的字都會立即標出。"
- 
- #. i18n: file ./kspell2/ui/configui.ui line 56
- #: rc.cpp:286
-@@ -564,9 +576,12 @@
- #: rc.cpp:289
- #, no-c-format
- msgid ""
--"If checked, words that consist of only uppercase letters are not spell checked. "
--"This is useful if you have a lot of acronyms, such as KDE for example."
--msgstr "如果開啟此選項的話，全部大寫的單字不會做拼字檢查。如果您有一大堆的頭字語如 KDE 之類的，這應該會很有用。"
-+"If checked, words that consist of only uppercase letters are not spell "
-+"checked. This is useful if you have a lot of acronyms, such as KDE for "
-+"example."
-+msgstr ""
-+"如果開啟此選項的話，全部大寫的單字不會做拼字檢查。如果您有一大堆的頭字語如 "
-+"KDE 之類的，這應該會很有用。"
- 
- #. i18n: file ./kspell2/ui/configui.ui line 67
- #: rc.cpp:292
-@@ -580,7 +595,9 @@
- msgid ""
- "If checked, concatenated words made of existing words are not spell checked. "
- "This is useful in some languages."
--msgstr "如果開啟此選項，由已存在的字形成的連接字不會做拼字檢查。這對某些語言是滿有用的。"
-+msgstr ""
-+"如果開啟此選項，由已存在的字形成的連接字不會做拼字檢查。這對某些語言是滿有用"
-+"的。"
- 
- #. i18n: file ./kspell2/ui/configui.ui line 80
- #: rc.cpp:298
-@@ -598,9 +615,11 @@
- #: rc.cpp:304
- #, no-c-format
- msgid ""
--"To add a word you want to ignore, type it in the top edit field and click Add. "
--"To remove a word, highlight it in the list and click Remove."
--msgstr "要新增忽略的字，請在上面欄位中輸入並按下「新增」。要移除一個字，請選擇後按下「移除」。"
-+"To add a word you want to ignore, type it in the top edit field and click "
-+"Add. To remove a word, highlight it in the list and click Remove."
-+msgstr ""
-+"要新增忽略的字，請在上面欄位中輸入並按下「新增」。要移除一個字，請選擇後按下"
-+"「移除」。"
- 
- #. i18n: file ./kspell2/ui/kspell2ui.ui line 282
- #: rc.cpp:431
-@@ -630,9 +649,10 @@
- #: rc.cpp:449
- #, no-c-format
- msgid ""
--"If true .local domain will be browsed. It is always link-local, using multicast "
--"DNS."
--msgstr "如果設為真，則會瀏覽本地端網路。它會使用群體廣播 (multicast) DNS 伺服器。"
-+"If true .local domain will be browsed. It is always link-local, using "
-+"multicast DNS."
-+msgstr ""
-+"如果設為真，則會瀏覽本地端網路。它會使用群體廣播 (multicast) DNS 伺服器。"
- 
- #. i18n: file ./dnssd/kcm_kdnssd.kcfg line 18
- #: rc.cpp:452
-@@ -652,7 +672,9 @@
- msgid ""
- "Select publishing in LAN (multicast) or WAN (unicast, needs configured DNS "
- "server)"
--msgstr "請選擇要在 LAN（使用群體廣播 multicast）還是 WAN（需要設定 DNS 伺服器）上發布。"
-+msgstr ""
-+"請選擇要在 LAN（使用群體廣播 multicast）還是 WAN（需要設定 DNS 伺服器）上發"
-+"布。"
- 
- #. i18n: file ./dnssd/kcm_kdnssd.kcfg line 26
- #: rc.cpp:461
-@@ -660,7 +682,9 @@
- msgid ""
- "Specifies if publishing should be by default link-local using multicast DNS "
- "(LAN) or 'wide-area' using normal DNS server (WAN)."
--msgstr "這裡讓您指定發布時預設是要在 LAN 上，使用群體廣播 DNS 伺服器，還是在 WAN 上使用一般的 DNS 伺服器。"
-+msgstr ""
-+"這裡讓您指定發布時預設是要在 LAN 上，使用群體廣播 DNS 伺服器，還是在 WAN 上使"
-+"用一般的 DNS 伺服器。"
- 
- #. i18n: file ./dnssd/kcm_kdnssd.kcfg line 34
- #: rc.cpp:464
-@@ -672,19 +696,20 @@
- #: rc.cpp:467
- #, no-c-format
- msgid ""
--"Domain name for publishing using 'wide-area' (normal DNS) ZeroConf. This must "
--"match domain specified in /etc/mdnsd.conf. This value is used only if "
-+"Domain name for publishing using 'wide-area' (normal DNS) ZeroConf. This "
-+"must match domain specified in /etc/mdnsd.conf. This value is used only if "
- "PublishType is set to WAN.\n"
- msgstr ""
--"這裡填寫要在 WAN ZeroConf 上使用的網域名稱。必須要跟 /etc/mdnsd.conf 中指定的網域一樣。這只在發布型態設定為 WAN 時使用。\n"
-+"這裡填寫要在 WAN ZeroConf 上使用的網域名稱。必須要跟 /etc/mdnsd.conf 中指定的"
-+"網域一樣。這只在發布型態設定為 WAN 時使用。\n"
- 
- #: _translatorinfo.cpp:1
- msgid ""
- "_: NAME OF TRANSLATORS\n"
- "Your names"
- msgstr ""
--"Chih-Wei Huang,Kenduest Lee,Jouston Huang (Huang, Jiun-Jeng),Kenduest Lee,Wang "
--"Jian,Anthony Fok,Yuan-Chen Cheng,Wang Jian,Funda Wang,Sarah Smith,Xiong "
-+"Chih-Wei Huang,Kenduest Lee,Jouston Huang (Huang, Jiun-Jeng),Kenduest Lee,"
-+"Wang Jian,Anthony Fok,Yuan-Chen Cheng,Wang Jian,Funda Wang,Sarah Smith,Xiong "
- "Jiang,Chia-Lin, Kao,Stanley Wong"
- 
- #: _translatorinfo.cpp:3
-@@ -692,11 +717,11 @@
- "_: EMAIL OF TRANSLATORS\n"
- "Your emails"
- msgstr ""
--"<cwhuang@linux.org.tw>,,<kenduest@i18n.linux.org.tw>,,<jouston@housediy.com>"
--",,<kenduest@i18n.linux.org.tw>,,<lark@linux.net.cn>,,<anthony@thizlinux.com>"
--",,<ycheng@slat.org>,,<lark@linux.ustc.edu.cn>,,<fundawang@en2china.com>"
--",,<sarahs@redhat.com>,,<jxiong@offtopic.org>,,<acelan@linux.org.tw>"
--",,<stanley18fan0k@yahoo.com.hk>"
-+"<cwhuang@linux.org.tw>,,<kenduest@i18n.linux.org.tw>,,<jouston@housediy."
-+"com>,,<kenduest@i18n.linux.org.tw>,,<lark@linux.net.cn>,,<anthony@thizlinux."
-+"com>,,<ycheng@slat.org>,,<lark@linux.ustc.edu.cn>,,<fundawang@en2china.com>,,"
-+"<sarahs@redhat.com>,,<jxiong@offtopic.org>,,<acelan@linux.org.tw>,,"
-+"<stanley18fan0k@yahoo.com.hk>"
- 
- #: common_texts.cpp:24 kdeui/kconfigdialog.cpp:56 kutils/kcmultidialog.cpp:59
- #: kutils/kcmultidialog.h:104 kutils/ksettings/dialog.cpp:571
-@@ -925,11 +950,11 @@
- 
- #: common_texts.cpp:94
- msgid "&New Window..."
--msgstr "開新視窗(&N)..."
-+msgstr "開新視窗(&N)…"
- 
- #: common_texts.cpp:95
- msgid "New &Window..."
--msgstr "開新視窗(&W)..."
-+msgstr "開新視窗(&W)…"
- 
- #: common_texts.cpp:96
- msgid "&New Window"
-@@ -953,11 +978,11 @@
- 
- #: common_texts.cpp:101
- msgid "Open..."
--msgstr "開啟..."
-+msgstr "開啟…"
- 
- #: common_texts.cpp:102 kdeui/kstdaction_p.h:41 kdeui/kstdguiitem.cpp:226
- msgid "&Open..."
--msgstr "開啟(&O)..."
-+msgstr "開啟(&O)…"
- 
- #: common_texts.cpp:104
- msgid "&Cut"
-@@ -994,15 +1019,15 @@
- 
- #: common_texts.cpp:112
- msgid "Save As..."
--msgstr "另存新檔..."
-+msgstr "另存新檔…"
- 
- #: common_texts.cpp:113
- msgid "S&ave As..."
--msgstr "另存新檔...(&A)"
-+msgstr "另存新檔…(&A)"
- 
- #: common_texts.cpp:116 kdeui/kstdaction_p.h:47 kdeui/kstdguiitem.cpp:207
- msgid "&Print..."
--msgstr "列印(&P)..."
-+msgstr "列印(&P)…"
- 
- #: common_texts.cpp:117 kdeui/kmessagebox.cpp:837 kdeui/kmessagebox.cpp:867
- msgid "Sorry"
-@@ -1031,7 +1056,7 @@
- 
- #: common_texts.cpp:126
- msgid "Roman"
--msgstr "正體"
-+msgstr "羅馬體"
- 
- #: common_texts.cpp:132 kdeui/kmessagebox.cpp:913
- msgid "Information"
-@@ -1051,7 +1076,7 @@
- 
- #: common_texts.cpp:136
- msgid "Browse..."
--msgstr "瀏覽..."
-+msgstr "瀏覽…"
- 
- #: common_texts.cpp:137 kdecore/kkeyserver_x11.cpp:127 kdeui/keditcl2.cpp:107
- #: kdeui/keditcl2.cpp:120 kdeui/keditcl2.cpp:377 kdeui/keditcl2.cpp:390
-@@ -1067,7 +1092,7 @@
- 
- #: common_texts.cpp:139
- msgid "&Properties..."
--msgstr "內容(&P)..."
-+msgstr "內容(&P)…"
- 
- #: common_texts.cpp:140 kdeui/kstdguiitem.cpp:279
- msgid "Properties"
-@@ -1184,7 +1209,7 @@
- 
- #: common_texts.cpp:171 kdeui/kstdaction_p.h:65
- msgid "&Replace..."
--msgstr "取代(&R)..."
-+msgstr "取代(&R)…"
- 
- #: common_texts.cpp:173 kabc/ldapconfigwidget.cpp:156
- #: kabc/ldapconfigwidget.cpp:168 kdeui/klineedit.cpp:914
-@@ -1210,7 +1235,7 @@
- 
- #: common_texts.cpp:179 kdeui/kstdaction_p.h:61 khtml/khtml_part.cpp:4258
- msgid "&Find..."
--msgstr "尋找(&F)..."
-+msgstr "尋找(&F)…"
- 
- #: common_texts.cpp:180 kdeui/kstdaction_p.h:62
- msgid "Find &Next"
-@@ -1226,11 +1251,11 @@
- 
- #: common_texts.cpp:184
- msgid "&Edit Bookmarks..."
--msgstr "編輯書籤(&E)..."
-+msgstr "編輯書籤(&E)…"
- 
- #: common_texts.cpp:186 kdeui/kstdaction_p.h:93
- msgid "&Spelling..."
--msgstr "拼字檢查(&S)..."
-+msgstr "拼字檢查(&S)…"
- 
- #: common_texts.cpp:187 kdeui/kstdaction.cpp:238 kdeui/kstdaction_p.h:95
- msgid "Show &Menubar"
-@@ -1247,11 +1272,11 @@
- 
- #: common_texts.cpp:190
- msgid "Configure &Key Bindings..."
--msgstr "設定按鍵連結(&K)..."
-+msgstr "設定按鍵連結(&K)…"
- 
- #: common_texts.cpp:191
- msgid "&Preferences..."
--msgstr "偏好設定(&P)..."
-+msgstr "偏好設定(&P)…"
- 
- #: common_texts.cpp:193 kdeui/kmessagebox.cpp:928
- msgid "Do not show this message again"
-@@ -1684,7 +1709,9 @@
- msgid ""
- "Address book file <b>%1</b> not found! Make sure the old address book is "
- "located there and you have read permission for this file."
--msgstr "找不到地址簿檔 <b>%1</b>！請確定以往的地址簿真的位於那裡，並且您擁有它的讀取權。"
-+msgstr ""
-+"找不到地址簿檔 <b>%1</b>！請確定以往的地址簿真的位於那裡，並且您擁有它的讀取"
-+"權。"
- 
- #: kabc/kab2kabc.cpp:435
- msgid "Kab to Kabc Converter"
-@@ -1832,11 +1859,11 @@
- 
- #: kabc/distributionlistdialog.cpp:152
- msgid "New List..."
--msgstr "新清單..."
-+msgstr "新清單…"
- 
- #: kabc/distributionlistdialog.cpp:156
- msgid "Rename List..."
--msgstr "重新命名清單..."
-+msgstr "重新命名清單…"
- 
- #: kabc/distributionlistdialog.cpp:160 kabc/distributionlisteditor.cpp:137
- msgid "Remove List"
-@@ -1870,7 +1897,7 @@
- 
- #: kabc/distributionlistdialog.cpp:198
- msgid "Change Email..."
--msgstr "變更 Email..."
-+msgstr "變更 Email…"
- 
- #: kabc/distributionlistdialog.cpp:202 kabc/distributionlisteditor.cpp:152
- msgid "Remove Entry"
-@@ -2387,7 +2414,8 @@
- #: kded/kde-menu.cpp:111
- msgid ""
- "KDE Menu query tool.\n"
--"This tool can be used to find in which menu a specific application is shown.\n"
-+"This tool can be used to find in which menu a specific application is "
-+"shown.\n"
- "The --highlight option can be used to visually indicate to the user where\n"
- "in the KDE menu a specific application is located."
- msgstr ""
-@@ -2410,9 +2438,10 @@
- 
- #: kded/kde-menu.cpp:142
- msgid ""
--"You must specify at least one of --print-menu-id, --print-menu-name or "
--"--highlight"
--msgstr "你最少要指定下列一項 --print-menu-id, --print-menu-name 或 --highlight "
-+"You must specify at least one of --print-menu-id, --print-menu-name or --"
-+"highlight"
-+msgstr ""
-+"你最少要指定下列一項 --print-menu-id, --print-menu-name 或 --highlight "
- 
- #: kded/kde-menu.cpp:164
- msgid "No menu item '%1'."
-@@ -2431,16 +2460,12 @@
- msgstr "新的主機名稱"
- 
- #: kded/khostname.cpp:79
--msgid ""
--"Error: HOME environment variable not set.\n"
--msgstr ""
--"錯誤: 沒有設定 HOME 環境變數。\n"
-+msgid "Error: HOME environment variable not set.\n"
-+msgstr "錯誤: 沒有設定 HOME 環境變數。\n"
- 
- #: kded/khostname.cpp:88
--msgid ""
--"Error: DISPLAY environment variable not set.\n"
--msgstr ""
--"錯誤: 沒有設定 DISPLAY 環境變數。\n"
-+msgid "Error: DISPLAY environment variable not set.\n"
-+msgstr "錯誤: 沒有設定 DISPLAY 環境變數。\n"
- 
- #: kded/khostname.cpp:359
- msgid "KDontChangeTheHostName"
-@@ -2527,7 +2552,7 @@
- 
- #: kded/kbuildsycoca.cpp:750
- msgid "Reloading KDE configuration, please wait..."
--msgstr "正在重新載入 KDE 組態，請稍候..."
-+msgstr "正在重新載入 KDE 組態，請稍候…"
- 
- #: kded/kbuildsycoca.cpp:751
- msgid "KDE Configuration Manager"
-@@ -2563,7 +2588,7 @@
- 
- #: kmdi/kmdiguiclient.cpp:144 kmdi/kmdimainfrm.cpp:2596
- msgid "Ta&b Page Mode"
--msgstr "標籤頁模式 (&B)"
-+msgstr "標籤頁模式(&B)"
- 
- #: kmdi/kmdiguiclient.cpp:144 kmdi/kmdimainfrm.cpp:2597
- msgid "I&DEAl Mode"
-@@ -2671,7 +2696,7 @@
- 
- #: kmdi/kmdimainfrm.cpp:2633
- msgid "&Dock/Undock"
--msgstr "&Dock/Undock..."
-+msgstr "&Dock/Undock…"
- 
- #: kmdi/kmdichildfrmcaption.cpp:71 kmdi/kmdichildview.cpp:63
- #: kmdi/kmdichildview.cpp:89
-@@ -2730,15 +2755,15 @@
- 
- #: kdecore/kapplication.cpp:931
- msgid ""
--"_: Dear Translator! Translate this string to the string 'LTR' in left-to-right "
--"languages (as english) or to 'RTL' in right-to-left languages (such as Hebrew "
--"and Arabic) to get proper widget layout."
-+"_: Dear Translator! Translate this string to the string 'LTR' in left-to-"
-+"right languages (as english) or to 'RTL' in right-to-left languages (such as "
-+"Hebrew and Arabic) to get proper widget layout."
- msgstr "LTR"
- 
- #: kdecore/kapplication.cpp:1404
- msgid ""
--"There was an error setting up inter-process communications for KDE. The message "
--"returned by the system was:\n"
-+"There was an error setting up inter-process communications for KDE. The "
-+"message returned by the system was:\n"
- "\n"
- msgstr ""
- "在設定 KDE 的跨進程通訊時發生了錯誤。\n"
-@@ -2899,14 +2924,13 @@
- 
- #: kdecore/kapplication.cpp:1476
- msgid ""
--"sets the client geometry of the main widget - see man X for the argument format"
-+"sets the client geometry of the main widget - see man X for the argument "
-+"format"
- msgstr "設定主視窗部件的客戶區大小和位置 - 請參考 man X 取得參數的格式。"
- 
- #: kdecore/kapplication.cpp:1516
--msgid ""
--"The style %1 was not found\n"
--msgstr ""
--"沒有找到 %1 風格\n"
-+msgid "The style %1 was not found\n"
-+msgstr "沒有找到 %1 風格\n"
- 
- #: kdecore/kapplication.cpp:1978 kstyles/klegacy/klegacystyle.cpp:3044
- #: kstyles/web/webstyle.cpp:1604
-@@ -2959,16 +2983,12 @@
- "%1"
- 
- #: kdecore/kapplication.cpp:2637
--msgid ""
--"Could not register with DCOP.\n"
--msgstr ""
--"無法在 DCOP 上登錄。\n"
-+msgid "Could not register with DCOP.\n"
-+msgstr "無法在 DCOP 上登錄。\n"
- 
- #: kdecore/kapplication.cpp:2672
--msgid ""
--"KLauncher could not be reached via DCOP.\n"
--msgstr ""
--"無法透過 DCOP 呼叫 KLauncher。\n"
-+msgid "KLauncher could not be reached via DCOP.\n"
-+msgstr "無法透過 DCOP 呼叫 KLauncher。\n"
- 
- #: kdecore/kwinmodule.cpp:456
- #, c-format
-@@ -2976,16 +2996,12 @@
- msgstr "桌面 %1"
- 
- #: kdecore/kconfigbackend.cpp:1107 kdecore/kconfigbackend.cpp:1116
--msgid ""
--"Will not save configuration.\n"
--msgstr ""
--"將不會儲存設定。\n"
-+msgid "Will not save configuration.\n"
-+msgstr "將不會儲存設定。\n"
- 
- #: kdecore/kconfigbackend.cpp:1109 kdecore/kconfigbackend.cpp:1117
--msgid ""
--"Configuration file \"%1\" not writable.\n"
--msgstr ""
--"設定檔 \"%1\" 是不可寫入的。\n"
-+msgid "Configuration file \"%1\" not writable.\n"
-+msgstr "設定檔 \"%1\" 是不可寫入的。\n"
- 
- #: kdecore/kconfigbackend.cpp:1124
- msgid "Please contact your system administrator."
-@@ -3013,16 +3029,12 @@
- msgstr "這個應用程式是由某個不願透露姓名的人編寫。"
- 
- #: kdecore/kcmdlineargs.cpp:629
--msgid ""
--"Please use http://bugs.kde.org to report bugs.\n"
--msgstr ""
--"請使用 http://bugs.kde.org 報告問題。\n"
-+msgid "Please use http://bugs.kde.org to report bugs.\n"
-+msgstr "請使用 http://bugs.kde.org 報告問題。\n"
- 
- #: kdecore/kcmdlineargs.cpp:632 kdecore/kcmdlineargs.cpp:634
--msgid ""
--"Please report bugs to %1.\n"
--msgstr ""
--"請回報問題到 %1。\n"
-+msgid "Please report bugs to %1.\n"
-+msgstr "請回報問題到 %1。\n"
- 
- #: kdecore/kcmdlineargs.cpp:660
- msgid "Unexpected argument '%1'."
-@@ -3049,10 +3061,8 @@
- msgstr "[%1-選項]"
- 
- #: kdecore/kcmdlineargs.cpp:816
--msgid ""
--"Usage: %1 %2\n"
--msgstr ""
--"用法：%1 %2\n"
-+msgid "Usage: %1 %2\n"
-+msgstr "用法：%1 %2\n"
- 
- #: kdecore/kcmdlineargs.cpp:819
- msgid "Generic options"
-@@ -3216,7 +3226,7 @@
- 
- #: kdecore/kstdaccel.cpp:81 kdeui/keditcl2.cpp:976
- msgid "Go to Line"
--msgstr "跳至行數"
-+msgstr "跳至列數"
- 
- #: kdecore/kstdaccel.cpp:82
- msgid "Add Bookmark"
-@@ -3496,10 +3506,10 @@
- 
- #: kdecore/klocale.cpp:217
- msgid ""
--"_: Dear translator, please do not translate this string in any form, but pick "
--"the _right_ value out of NoPlural/TwoForms/French... If not sure what to do "
--"mail thd@kde.org and coolo@kde.org, they will tell you. Better leave that out "
--"if unsure, the programs will crash!!\n"
-+"_: Dear translator, please do not translate this string in any form, but "
-+"pick the _right_ value out of NoPlural/TwoForms/French... If not sure what "
-+"to do mail thd@kde.org and coolo@kde.org, they will tell you. Better leave "
-+"that out if unsure, the programs will crash!!\n"
- "Definition of PluralForm - to be set by the translator of kdelibs.po"
- msgstr "NoPlural"
- 
-@@ -4003,7 +4013,7 @@
- 
- #: kdecore/kcharsets.cpp:44 khtml/khtml_part.cpp:280
- msgid "Arabic"
--msgstr "阿拉伯文"
-+msgstr "阿拉伯語"
- 
- #: kdecore/kcharsets.cpp:45 khtml/khtml_part.cpp:281
- msgid "Baltic"
-@@ -4015,41 +4025,41 @@
- 
- #: kdecore/kcharsets.cpp:47
- msgid "Chinese Simplified"
--msgstr "簡體中文"
-+msgstr "簡化字漢語"
- 
- #: kdecore/kcharsets.cpp:48
- msgid "Chinese Traditional"
--msgstr "繁體中文"
-+msgstr "傳統字漢語"
- 
- #: kdecore/kcharsets.cpp:49
- msgid "Cyrillic"
--msgstr "斯拉夫文"
-+msgstr "斯拉夫語"
- 
- #: kdecore/kcharsets.cpp:50 khtml/khtml_part.cpp:284
- msgid "Greek"
--msgstr "希臘文"
-+msgstr "希臘語"
- 
- #: kdecore/kcharsets.cpp:51 kdeui/ksconfig.cpp:235 kdeui/ksconfig.cpp:395
- #: kdeui/ksconfig.cpp:656 khtml/khtml_part.cpp:285
- msgid "Hebrew"
--msgstr "希伯來文"
-+msgstr "希伯來語"
- 
- #: kdecore/kcharsets.cpp:52 khtml/khtml_part.cpp:286
- msgid "Japanese"
--msgstr "日文"
-+msgstr "日語"
- 
- #: kdecore/kcharsets.cpp:53
- msgid "Korean"
--msgstr "韓文"
-+msgstr "韓語"
- 
- #: kdecore/kcharsets.cpp:54
- msgid "Thai"
--msgstr "泰文"
-+msgstr "泰語"
- 
- #: kdecore/kcharsets.cpp:55 kdeui/ksconfig.cpp:240 kdeui/ksconfig.cpp:400
- #: kdeui/ksconfig.cpp:661 khtml/khtml_part.cpp:290
- msgid "Turkish"
--msgstr "土耳其文"
-+msgstr "土耳其語"
- 
- #: kdecore/kcharsets.cpp:56 khtml/khtml_part.cpp:293
- msgid "Western European"
-@@ -4057,7 +4067,7 @@
- 
- #: kdecore/kcharsets.cpp:57
- msgid "Tamil"
--msgstr "坦米爾文"
-+msgstr "坦米爾語"
- 
- #: kdecore/kcharsets.cpp:58
- msgid "Unicode"
-@@ -4065,11 +4075,11 @@
- 
- #: kdecore/kcharsets.cpp:59
- msgid "Northern Saami"
--msgstr "北部沙米文"
-+msgstr "北部沙米語"
- 
- #: kdecore/kcharsets.cpp:60
- msgid "Vietnamese"
--msgstr "越南文"
-+msgstr "越南語"
- 
- #: kdecore/kcharsets.cpp:61
- msgid "South-Eastern Europe"
-@@ -4102,10 +4112,8 @@
- "不只一項。\n"
- 
- #: kdecore/kcompletion.cpp:644
--msgid ""
--"There is no matching item available.\n"
--msgstr ""
--"找不到相符的項目。\n"
-+msgid "There is no matching item available.\n"
-+msgstr "找不到相符的項目。\n"
- 
- #: kdecore/kcalendarsystemhebrew.cpp:402
- msgid "Tishrey"
-@@ -4166,37 +4174,29 @@
- #: kdecore/kaboutdata.cpp:388
- msgid ""
- "_: replace this with information about your translation team\n"
--"<p>KDE is translated into many languages thanks to the work of the translation "
--"teams all over the world.</p>"
--"<p>For more information on KDE internationalization visit <a "
--"href=\"http://l10n.kde.org\">http://l10n.kde.org</a></p>"
--msgstr ""
--"<p>關於 KDE 的中文化</p>"
--"<blockquote>"
--"<p>KDE 的繁體中文翻譯是由<a href=\"mailto:kenduest@i18n.linux.org.tw\"><b>李爵樺</b></a>"
--"、<a href=\"http://www.kde.org/people/shyue.html\"><b>薛景中</b></a>"
--"、<a href=\"mailto:seventeen@linux.org.tw\"><b>陳更新</b></a>"
--"、以及<a href=\"mailto:jouston@housediy.com\"><b>黃峻崢</b></a>"
--"等人所領導的 ZH-L10N 中文化計劃所主導，以及來自世界各地的志願工作者所義務參與。</p>"
--"<p>如果您想要協助 KDE 的繁體中文化工作，請參考 ZH-L10N 中文化計劃："
--"<br><a href=\"http://i18n.linux.org.tw/\">http://i18n.linux.org.tw/</a>"
--"<br>"
--"<br>或加入<a href=\"mailto:zh-l10n@linux.org.tw\">zh-l10n@linux.org.tw</a>郵件論壇。</p>"
--"</blockquote>"
--"<p>特別感謝</p>"
--"<ul>"
--"<li>CLE GNU/Linux 中文計劃 <A href=\"http://cle.linux.org.tw/\">"
--"http://cle.linux.org.tw/</A>"
--"<br>協助 Linux 的國際化及中文化基礎架構</li>"
--"<li>頂高國際科技 <A href=\"http://www.toptk.com/\">http://www.toptk.com/</A>"
--"<br>協助 KDE 國際化修改、訊息翻譯</li>"
--"<li>翔威國際 <A "
--"href=\"http://www.shinewave.com.tw/\">http://www.shinewave.com.tw/</A>"
--"<br>提供訊息翻譯</li></ul>"
--"<p>KDE 能夠翻譯成各國語言要特別感謝來自各地的翻譯小組<b>大量的熬夜</b>所得出來的結果。若是需要對於 KDE 國際化更進一步的資訊，請參考 <a "
--"href=\"http://i18n.kde.org/\">http://i18n.kde.org/</a></p>"
--"<p>特別感謝的忙碌譯者們：</p>Abel Cheung (R.I.P. Deaddog), Joe Man, Jouston, T.H.Hsieh, "
--"等等。"
-+"<p>KDE is translated into many languages thanks to the work of the "
-+"translation teams all over the world.</p><p>For more information on KDE "
-+"internationalization visit <a href=\"http://l10n.kde.org\">http://l10n.kde."
-+"org</a></p>"
-+msgstr ""
-+"<p>關於 KDE 的中文化</p><blockquote><p>KDE 的傳統字漢語翻譯是由<a href="
-+"\"mailto:kenduest@i18n.linux.org.tw\"><b>李爵樺</b></a>、<a href=\"http://"
-+"www.kde.org/people/shyue.html\"><b>薛景中</b></a>、<a href=\"mailto:"
-+"seventeen@linux.org.tw\"><b>陳更新</b></a>、以及<a href=\"mailto:"
-+"jouston@housediy.com\"><b>黃峻崢</b></a>等人所領導的 ZH-L10N 中文化計劃所主"
-+"導，以及來自世界各地的志願工作者所義務參與。</p><p>如果您想要協助 KDE 的繁體"
-+"中文化工作，請參考 ZH-L10N 中文化計劃：<br><a href=\"http://i18n.linux.org."
-+"tw/\">http://i18n.linux.org.tw/</a><br><br>或加入<a href=\"mailto:zh-"
-+"l10n@linux.org.tw\">zh-l10n@linux.org.tw</a>郵件論壇。</p></blockquote><p>特"
-+"別感謝</p><ul><li>CLE GNU/Linux 中文計劃 <A href=\"http://cle.linux.org.tw/"
-+"\">http://cle.linux.org.tw/</A><br>協助 Linux 的國際化及中文化基礎架構</"
-+"li><li>頂高國際科技 <A href=\"http://www.toptk.com/\">http://www.toptk.com/</"
-+"A><br>協助 KDE 國際化修改、訊息翻譯</li><li>翔威國際 <A href=\"http://www."
-+"shinewave.com.tw/\">http://www.shinewave.com.tw/</A><br>提供訊息翻譯</li></"
-+"ul><p>KDE 能夠翻譯成各國語言要特別感謝來自各地的翻譯小組<b>大量的熬夜</b>所得"
-+"出來的結果。若是需要對於 KDE 國際化更進一步的資訊，請參考 <a href=\"http://"
-+"i18n.kde.org/\">http://i18n.kde.org/</a></p><p>特別感謝的忙碌譯者們：</"
-+"p>Abel Cheung (R.I.P. Deaddog), Joe Man, Jouston, T.H.Hsieh, 等等。"
- 
- #: kdecore/kaboutdata.cpp:444
- msgid ""
-@@ -4210,7 +4210,7 @@
- #: kdecore/kaboutdata.cpp:451
- #, c-format
- msgid "This program is distributed under the terms of the %1."
--msgstr "這個程式以 %1 的條款散佈。"
-+msgstr "這個程式以 %1 的條款散布。"
- 
- #: kdecore/kcalendarsystem.cpp:124
- msgid ""
-@@ -4612,34 +4612,24 @@
- msgstr "無法建立檔案來上傳。"
- 
- #: knewstuff/engine.cpp:293
--msgid ""
--"The files to be uploaded have been created at:\n"
--msgstr ""
--"要上傳的檔案已建立在：\n"
-+msgid "The files to be uploaded have been created at:\n"
-+msgstr "要上傳的檔案已建立在：\n"
- 
- #: knewstuff/engine.cpp:294
--msgid ""
--"Data file: %1\n"
--msgstr ""
--"資料檔案：%1 \n"
-+msgid "Data file: %1\n"
-+msgstr "資料檔案：%1 \n"
- 
- #: knewstuff/engine.cpp:296
--msgid ""
--"Preview image: %1\n"
--msgstr ""
--"預覽影像：%1\n"
-+msgid "Preview image: %1\n"
-+msgstr "預覽影像：%1\n"
- 
- #: knewstuff/engine.cpp:298
--msgid ""
--"Content information: %1\n"
--msgstr ""
--"內容資訊:：%1\n"
-+msgid "Content information: %1\n"
-+msgstr "內容資訊:：%1\n"
- 
- #: knewstuff/engine.cpp:299
--msgid ""
--"Those files can now be uploaded.\n"
--msgstr ""
--"那些檔案可以現在上傳。\n"
-+msgid "Those files can now be uploaded.\n"
-+msgstr "那些檔案可以現在上傳。\n"
- 
- #: knewstuff/engine.cpp:300
- msgid "Beware that any people might have access to them at any time."
-@@ -4671,8 +4661,8 @@
- 
- #: knewstuff/knewstuffsecure.cpp:83
- msgid ""
--"There was an error with the downloaded resource tarball file. Possible causes "
--"are damaged archive or invalid directory structure in the archive."
-+"There was an error with the downloaded resource tarball file. Possible "
-+"causes are damaged archive or invalid directory structure in the archive."
- msgstr "下載的資源套件包有錯誤。可能它已受損或裡面的目錄結構無效。"
- 
- #: knewstuff/knewstuffsecure.cpp:83
-@@ -4705,26 +4695,18 @@
- 
- #: knewstuff/knewstuffsecure.cpp:131
- msgid ""
--"The resource was signed with key <i>0x%1</i>, belonging to <i>%2 &lt;%3&gt;</i>"
--"."
-+"The resource was signed with key <i>0x%1</i>, belonging to <i>%2 &lt;%3&gt;</"
-+"i>."
- msgstr "資源被密鑰<i>0x%1</i>簽署過。這個密鑰是屬於<i>%2 &lt;%3&gt;</i>的。"
- 
- #: knewstuff/knewstuffsecure.cpp:137
- msgid ""
--"<qt>There is a problem with the resource file you have downloaded. The errors "
--"are :<b>%1</b>"
--"<br>%2"
--"<br>"
--"<br>Installation of the resource is <b>not recommended</b>."
--"<br>"
--"<br>Do you want to proceed with the installation?</qt>"
--msgstr ""
--"<qt>您下載的資源檔案有問題。錯誤是：<b>%1</b>"
--"<br>%2"
--"<br>"
--"<br>我們<b>不建議</b>您安裝它。"
--"<br>"
--"<br>您仍然要安裝嗎？</qt>"
-+"<qt>There is a problem with the resource file you have downloaded. The "
-+"errors are :<b>%1</b><br>%2<br><br>Installation of the resource is <b>not "
-+"recommended</b>.<br><br>Do you want to proceed with the installation?</qt>"
-+msgstr ""
-+"<qt>您下載的資源檔案有問題。錯誤是：<b>%1</b><br>%2<br><br>我們<b>不建議</b>"
-+"您安裝它。<br><br>您仍然要安裝嗎？</qt>"
- 
- #: knewstuff/knewstuffsecure.cpp:137
- msgid "Problematic Resource File"
-@@ -4753,23 +4735,29 @@
- 
- #: knewstuff/security.cpp:63
- msgid ""
--"<qt>Cannot start <i>gpg</i> and retrieve the available keys. Make sure that <i>"
--"gpg</i> is installed, otherwise verification of downloaded resources will not "
--"be possible.</qt>"
--msgstr "<qt>無法開啟<i>gpg</i>來取得可用的密鑰。請確定<i>gpg</i>已安裝，否則將無法對下載的資源進行檢驗。</p>"
-+"<qt>Cannot start <i>gpg</i> and retrieve the available keys. Make sure that "
-+"<i>gpg</i> is installed, otherwise verification of downloaded resources will "
-+"not be possible.</qt>"
-+msgstr ""
-+"<qt>無法開啟<i>gpg</i>來取得可用的密鑰。請確定<i>gpg</i>已安裝，否則將無法對"
-+"下載的資源進行檢驗。</p>"
- 
- #: knewstuff/security.cpp:177
- msgid ""
--"<qt>Enter passphrase for key <b>0x%1</b>, belonging to"
--"<br><i>%2&lt;%3&gt;</i>:</qt>"
--msgstr "<qt>請輸入密鑰<b>0x%1</b>的密碼短語。這個密鑰是屬於<br><i>%2&lt;%3&gt;</i>的：</qt>"
-+"<qt>Enter passphrase for key <b>0x%1</b>, belonging to<br><i>%2&lt;%3&gt;</"
-+"i>:</qt>"
-+msgstr ""
-+"<qt>請輸入密鑰<b>0x%1</b>的密碼短語。這個密鑰是屬於<br><i>%2&lt;%3&gt;</i>"
-+"的：</qt>"
- 
- #: knewstuff/security.cpp:257
- msgid ""
--"<qt>Cannot start <i>gpg</i> and check the validity of the file. Make sure that "
--"<i>gpg</i> is installed, otherwise verification of downloaded resources will "
--"not be possible.</qt>"
--msgstr "<qt>無法開啟<i>gpg</i>來檢驗檔案。請確定<i>gpg</i>已安裝，否則將無法對下載的資源進行檢驗。</p>"
-+"<qt>Cannot start <i>gpg</i> and check the validity of the file. Make sure "
-+"that <i>gpg</i> is installed, otherwise verification of downloaded resources "
-+"will not be possible.</qt>"
-+msgstr ""
-+"<qt>無法開啟<i>gpg</i>來檢驗檔案。請確定<i>gpg</i>已安裝，否則將無法對下載的"
-+"資源進行檢驗。</p>"
- 
- #: knewstuff/security.cpp:317
- msgid "Select Signing Key"
-@@ -4781,9 +4769,11 @@
- 
- #: knewstuff/security.cpp:338
- msgid ""
--"<qt>Cannot start <i>gpg</i> and sign the file. Make sure that <i>gpg</i> "
--"is installed, otherwise signing of the resources will not be possible.</qt>"
--msgstr "<qt>無法開啟<i>gpg</i>來簽署檔案。請確定<i>gpg</i>已安裝，否則將無法對資源進行簽署。</p>"
-+"<qt>Cannot start <i>gpg</i> and sign the file. Make sure that <i>gpg</i> is "
-+"installed, otherwise signing of the resources will not be possible.</qt>"
-+msgstr ""
-+"<qt>無法開啟<i>gpg</i>來簽署檔案。請確定<i>gpg</i>已安裝，否則將無法對資源進"
-+"行簽署。</p>"
- 
- #: knewstuff/ghns.cpp:50
- msgid "Get hot new stuff:"
-@@ -4821,14 +4811,17 @@
- msgid ""
- "Search interactively for shortcut names (e.g. Copy) or combination of keys "
- "(e.g. Ctrl+C) by typing them here."
--msgstr "輸入組合鍵(例如 Ctrl-C)或動作名稱(例如複製)來搜尋對應的動作/組合鍵是什麼。"
-+msgstr ""
-+"輸入組合鍵(例如 Ctrl-C)或動作名稱(例如複製)來搜尋對應的動作/組合鍵是什麼。"
- 
- #: kdeui/kkeydialog.cpp:354
- msgid ""
- "Here you can see a list of key bindings, i.e. associations between actions "
- "(e.g. 'Copy') shown in the left column and keys or combination of keys (e.g. "
- "Ctrl+V) shown in the right column."
--msgstr "在這裡您可以看到按鍵連結的清單，也就是左邊顯示的動作 (例如「複製」) 和右邊顯示的按鍵或組合鍵 (例如 Ctrl-V) 之間的關聯。"
-+msgstr ""
-+"在這裡您可以看到按鍵連結的清單，也就是左邊顯示的動作 (例如「複製」) 和右邊顯"
-+"示的按鍵或組合鍵 (例如 Ctrl-V) 之間的關聯。"
- 
- #: kdeui/kkeydialog.cpp:363
- msgid "Action"
-@@ -4880,10 +4873,12 @@
- 
- #: kdeui/kkeydialog.cpp:428
- msgid ""
--"Use this button to choose a new shortcut key. Once you click it, you can press "
--"the key-combination which you would like to be assigned to the currently "
--"selected action."
--msgstr "請使用此按扭來選擇快速鍵。一旦您按下了它，您可以按下您希望的組合鍵與目前選定的動作相連繫。"
-+"Use this button to choose a new shortcut key. Once you click it, you can "
-+"press the key-combination which you would like to be assigned to the "
-+"currently selected action."
-+msgstr ""
-+"請使用此按扭來選擇快速鍵。一旦您按下了它，您可以按下您希望的組合鍵與目前選定"
-+"的動作相連繫。"
- 
- #: kdeui/kkeydialog.cpp:470
- msgid "Shortcuts"
-@@ -4899,8 +4894,8 @@
- 
- #: kdeui/kkeydialog.cpp:715
- msgid ""
--"In order to use the '%1' key as a shortcut, it must be combined with the Win, "
--"Alt, Ctrl, and/or Shift keys."
-+"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' 鍵作為快速鍵，\n"
- "必須配合 Meta、Alt、Ctrl、和/或 Shift 鍵一同使用。"
-@@ -4936,8 +4931,8 @@
- 
- #: kdeui/kkeydialog.cpp:965
- msgid ""
--"The '%1' key combination has already been allocated to the global action "
--"\"%2\".\n"
-+"The '%1' key combination has already been allocated to the global action \"%2"
-+"\".\n"
- "Do you want to reassign it from that action to the current one?"
- msgstr ""
- "'%1' 按鍵組合已配置給 \"%2\" 動作。\n"
-@@ -4989,8 +4984,8 @@
- 
- #: kdeui/kswitchlanguagedialog.cpp:124
- msgid ""
--"Adds one more language which will be used if other translations do not contain "
--"proper translation"
-+"Adds one more language which will be used if other translations do not "
-+"contain proper translation"
- msgstr "新增一種以上的語言，如果沒有適當的翻譯時可以使用"
- 
- #: kdeui/kswitchlanguagedialog.cpp:222
-@@ -5019,8 +5014,8 @@
- 
- #: kdeui/kswitchlanguagedialog.cpp:320
- msgid ""
--"This is language which will be used if any previous languages does not contain "
--"proper translation"
-+"This is language which will be used if any previous languages does not "
-+"contain proper translation"
- msgstr "若是前一個語言中沒有適當的翻譯，則會使用這個語言。"
- 
- #: kdeui/ksconfig.cpp:102
-@@ -5061,27 +5056,27 @@
- 
- #: kdeui/ksconfig.cpp:297
- msgid "Spanish"
--msgstr "西班牙文"
-+msgstr "西班牙語"
- 
- #: kdeui/ksconfig.cpp:300
- msgid "Danish"
--msgstr "丹麥文"
-+msgstr "丹麥語"
- 
- #: kdeui/ksconfig.cpp:303
- msgid "German"
--msgstr "德文"
-+msgstr "德語"
- 
- #: kdeui/ksconfig.cpp:306
- msgid "German (new spelling)"
--msgstr "德文（新拼法）"
-+msgstr "德語（新拼法）"
- 
- #: kdeui/ksconfig.cpp:309
- msgid "Brazilian Portuguese"
--msgstr "巴西葡萄牙文"
-+msgstr "巴西葡萄牙語"
- 
- #: kdeui/ksconfig.cpp:312
- msgid "Portuguese"
--msgstr "葡萄牙文"
-+msgstr "葡萄牙語"
- 
- #: kdeui/ksconfig.cpp:315
- msgid "Esperanto"
-@@ -5109,7 +5104,7 @@
- 
- #: kdeui/ksconfig.cpp:333
- msgid "Czech"
--msgstr "捷克文"
-+msgstr "捷克語"
- 
- #: kdeui/ksconfig.cpp:336
- msgid "Swedish"
-@@ -5117,19 +5112,19 @@
- 
- #: kdeui/ksconfig.cpp:339
- msgid "Swiss German"
--msgstr "瑞士德文"
-+msgstr "瑞士德語"
- 
- #: kdeui/ksconfig.cpp:342 khtml/khtml_part.cpp:291
- msgid "Ukrainian"
--msgstr "烏克蘭文"
-+msgstr "烏克蘭語"
- 
- #: kdeui/ksconfig.cpp:345
- msgid "Lithuanian"
--msgstr "立陶宛文"
-+msgstr "立陶宛語"
- 
- #: kdeui/ksconfig.cpp:348
- msgid "French"
--msgstr "法文"
-+msgstr "法語"
- 
- #: kdeui/ksconfig.cpp:351
- msgid "Belarusian"
-@@ -5137,7 +5132,7 @@
- 
- #: kdeui/ksconfig.cpp:354
- msgid "Hungarian"
--msgstr "匈牙利文"
-+msgstr "匈牙利語"
- 
- #: kdeui/ksconfig.cpp:358
- msgid ""
-@@ -5168,7 +5163,7 @@
- 
- #: kdeui/kfontrequester.cpp:38
- msgid "Choose..."
--msgstr "選擇..."
-+msgstr "選擇…"
- 
- #: kdeui/kfontrequester.cpp:102
- msgid "Click to select a font"
-@@ -5182,7 +5177,7 @@
- msgid ""
- "This is a preview of the selected font. You can change it by clicking the "
- "\"Choose...\" button."
--msgstr "這些是選擇字型的預覽。您可以按\"選擇...\"來預覽其他字型。"
-+msgstr "這些是選擇字型的預覽。您可以按\"選擇…\"來預覽其他字型。"
- 
- #: kdeui/kfontrequester.cpp:117
- msgid "Preview of the \"%1\" font"
-@@ -5192,7 +5187,7 @@
- msgid ""
- "This is a preview of the \"%1\" font. You can change it by clicking the "
- "\"Choose...\" button."
--msgstr "這些是\"%1\"字型的預覽。您可以按\"選擇...\"來預覽其他字型。"
-+msgstr "這些是\"%1\"字型的預覽。您可以按\"選擇…\"來預覽其他字型。"
- 
- #. i18n "??" is displayed as (pseudo-)version when no data is known about the application
- #: kdeui/kaboutapplication.cpp:63
-@@ -5217,16 +5212,14 @@
- 
- #: kdeui/kaboutapplication.cpp:117
- msgid ""
--"Please use <a href=\"http://bugs.kde.org\">http://bugs.kde.org</a> "
--"to report bugs.\n"
-+"Please use <a href=\"http://bugs.kde.org\">http://bugs.kde.org</a> to report "
-+"bugs.\n"
- msgstr ""
- "請使用 <a href=\"http://bugs.kde.org\">http://bugs.kde.org</a> 報告問題。\n"
- 
- #: kdeui/kaboutapplication.cpp:121 kdeui/kaboutapplication.cpp:124
--msgid ""
--"Please report bugs to <a href=\"mailto:%1\">%2</a>.\n"
--msgstr ""
--"請報告問題到<a href=\"mailto:%1\">%2</a>。\n"
-+msgid "Please report bugs to <a href=\"mailto:%1\">%2</a>.\n"
-+msgstr "請報告問題到<a href=\"mailto:%1\">%2</a>。\n"
- 
- #: kdeui/kaboutapplication.cpp:149
- msgid "&Thanks To"
-@@ -5325,9 +5318,11 @@
- #: kdeui/kfontdialog.cpp:248
- msgid ""
- "Here you can switch between fixed font size and font size to be calculated "
--"dynamically and adjusted to changing environment (e.g. widget dimensions, paper "
--"size)."
--msgstr "在此您可以選擇使用固定大小字型，或根據環境動態計算調整字型大小 (例如根據部件大小、紙張大小等)。"
-+"dynamically and adjusted to changing environment (e.g. widget dimensions, "
-+"paper size)."
-+msgstr ""
-+"在此您可以選擇使用固定大小字型，或根據環境動態計算調整字型大小 (例如根據部件"
-+"大小、紙張大小等)。"
- 
- #: kdeui/kfontdialog.cpp:272
- msgid "Here you can choose the font size to be used."
-@@ -5359,15 +5354,11 @@
- #: kdeui/kcharselect.cpp:366
- msgid ""
- "_: Character\n"
--"<qt><font size=\"+4\" face=\"%1\">%2</font>"
--"<br>Unicode code point: U+%3"
--"<br>(In decimal: %4)"
--"<br>(Character: %5)</qt>"
--msgstr ""
--"<qt><font size=\"+4\" face=\"%1\">%2</font>"
--"<br>Unicode 編碼： U+%3"
--"<br>(十進制: %4)"
--"<br>(字元: %5)</qt>"
-+"<qt><font size=\"+4\" face=\"%1\">%2</font><br>Unicode code point: U+%3<br>"
-+"(In decimal: %4)<br>(Character: %5)</qt>"
-+msgstr ""
-+"<qt><font size=\"+4\" face=\"%1\">%2</font><br>Unicode 編碼： U+%3<br>(十進"
-+"制: %4)<br>(字元: %5)</qt>"
- 
- #: kdeui/kcharselect.cpp:394
- msgid "Table:"
-@@ -5415,93 +5406,75 @@
- 
- #: kdeui/kaboutkde.cpp:34
- msgid ""
--"The <b>K Desktop Environment</b> is written and maintained by the KDE Team, a "
--"world-wide network of software engineers committed to <a "
--"href=\"http://www.gnu.org/philosophy/free-sw.html\">Free Software</a> "
--"development."
--"<br>"
--"<br>No single group, company or organization controls the KDE source code. "
--"Everyone is welcome to contribute to KDE."
--"<br>"
--"<br>Visit <A HREF=\"http://www.kde.org/\">http://www.kde.org</A> "
--"for more information on the KDE project. "
--msgstr ""
--"<b>K Desktop Environment</b> 由 KDE 團隊所撰寫及維護。KDE 團隊是由全球網路上一群致力於<a "
--"href=\"http://www.gnu.org/philosophy/free-sw.html\">自由軟體</a>發展的軟體工程師所組成。"
--"<br>"
--"<br>沒有任何單獨的團體、公司或組織控制 KDE 的原始碼。歡迎所有人對 KDE 貢獻己力。"
--"<br>"
--"<br>請造訪 <A HREF=\"http://www.kde.org/\">http://www.kde.org/</A>，取得 KDE 專案的相關資訊。"
-+"The <b>K Desktop Environment</b> is written and maintained by the KDE Team, "
-+"a world-wide network of software engineers committed to <a href=\"http://www."
-+"gnu.org/philosophy/free-sw.html\">Free Software</a> development.<br><br>No "
-+"single group, company or organization controls the KDE source code. Everyone "
-+"is welcome to contribute to KDE.<br><br>Visit <A HREF=\"http://www.kde.org/"
-+"\">http://www.kde.org</A> for more information on the KDE project. "
-+msgstr ""
-+"<b>K Desktop Environment</b> 由 KDE 團隊所撰寫及維護。KDE 團隊是由全球網路上"
-+"一群致力於<a href=\"http://www.gnu.org/philosophy/free-sw.html\">自由軟體</a>"
-+"發展的軟體工程師所組成。<br><br>沒有任何單獨的團體、公司或組織控制 KDE 的原始"
-+"碼。歡迎所有人對 KDE 貢獻己力。<br><br>請造訪 <A HREF=\"http://www.kde.org/"
-+"\">http://www.kde.org/</A>，取得 KDE 專案的相關資訊。"
- 
- #: kdeui/kaboutkde.cpp:43
- msgid ""
--"Software can always be improved, and the KDE Team is ready to do so. However, "
--"you - the user - must tell us when something does not work as expected or could "
--"be done better."
--"<br>"
--"<br>The K Desktop Environment has a bug tracking system. Visit <A "
--"HREF=\"http://bugs.kde.org/\">http://bugs.kde.org</A> "
--"or use the \"Report Bug...\" dialog from the \"Help\" menu to report bugs."
--"<br>"
--"<br>If you have a suggestion for improvement then you are welcome to use the "
--"bug tracking system to register your wish. Make sure you use the severity "
--"called \"Wishlist\"."
--msgstr ""
--"軟體總是可以被改進的，而 KDE 團隊也樂意為此盡力。然而，當我們所做的不如預期地理想時，也懇請使用者您能不吝賜教，讓我們能做得更好。"
--"<br>"
--"<br>KDE 具有問題追蹤系統。請參觀 <A HREF=\"http://bugs.kde.org/\">http://bugs.kde.org/</A> "
--"或從 [說明] 選單中使用[報告問題]對話方塊來報告問題。"
--"<br>"
--"<br>如果您對軟體的改進有任何建議，歡迎您使用問題追蹤系統，將您的期望登錄上去。請將問題等級標示為“希望清單(Wishlist)”。"
-+"Software can always be improved, and the KDE Team is ready to do so. "
-+"However, you - the user - must tell us when something does not work as "
-+"expected or could be done better.<br><br>The K Desktop Environment has a bug "
-+"tracking system. Visit <A HREF=\"http://bugs.kde.org/\">http://bugs.kde.org</"
-+"A> or use the \"Report Bug...\" dialog from the \"Help\" menu to report bugs."
-+"<br><br>If you have a suggestion for improvement then you are welcome to use "
-+"the bug tracking system to register your wish. Make sure you use the "
-+"severity called \"Wishlist\"."
-+msgstr ""
-+"軟體總是可以被改進的，而 KDE 團隊也樂意為此盡力。然而，當我們所做的不如預期地"
-+"理想時，也懇請使用者您能不吝賜教，讓我們能做得更好。<br><br>KDE 具有問題追蹤"
-+"系統。請參觀 <A HREF=\"http://bugs.kde.org/\">http://bugs.kde.org/</A> 或從 "
-+"[說明] 選單中使用[報告問題]對話方塊來報告問題。<br><br>如果您對軟體的改進有任"
-+"何建議，歡迎您使用問題追蹤系統，將您的期望登錄上去。請將問題等級標示為“希望清"
-+"單(Wishlist)”。"
- 
- #: kdeui/kaboutkde.cpp:54
- msgid ""
--"You do not have to be a software developer to be a member of the KDE team. You "
--"can join the national teams that translate program interfaces. You can provide "
--"graphics, themes, sounds, and improved documentation. You decide!"
--"<br>"
--"<br>Visit <A HREF=\"http://www.kde.org/jobs/\">http://www.kde.org/jobs/</A> "
--"for information on some projects in which you can participate."
--"<br>"
--"<br>If you need more information or documentation, then a visit to <A "
--"HREF=\"http://developer.kde.org/\">http://developer.kde.org</A> "
--"will provide you with what you need."
--msgstr ""
--"KDE 團隊的成員並不限於軟體開發者。您可以加入翻譯程式介面的團隊，也可以提供繪圖、佈景主題、聲音和改進過的文件。一切都隨您所好！"
--"<br>"
--"<br>請造訪 <A HREF=\"http://www.kde.org/jobs.html\"> "
--"http://www.kde.org/jobs.html</A> 取得您可參與專案的相關資訊。"
--"<br>"
--"<br> 如果您需要更多的資訊或文件，請參考 <A HREF=\"http://developer.kde.org/\"> "
--"http://developer.kde.org/</A>，相信必能滿足您的需要。"
-+"You do not have to be a software developer to be a member of the KDE team. "
-+"You can join the national teams that translate program interfaces. You can "
-+"provide graphics, themes, sounds, and improved documentation. You decide!"
-+"<br><br>Visit <A HREF=\"http://www.kde.org/jobs/\">http://www.kde.org/jobs/</"
-+"A> for information on some projects in which you can participate.<br><br>If "
-+"you need more information or documentation, then a visit to <A HREF=\"http://"
-+"developer.kde.org/\">http://developer.kde.org</A> will provide you with what "
-+"you need."
-+msgstr ""
-+"KDE 團隊的成員並不限於軟體開發者。您可以加入翻譯程式介面的團隊，也可以提供繪"
-+"圖、布景主題、聲音和改進過的文件。一切都隨您所好！<br><br>請造訪 <A HREF="
-+"\"http://www.kde.org/jobs.html\"> http://www.kde.org/jobs.html</A> 取得您可參"
-+"與專案的相關資訊。<br><br> 如果您需要更多的資訊或文件，請參考 <A HREF="
-+"\"http://developer.kde.org/\"> http://developer.kde.org/</A>，相信必能滿足您"
-+"的需要。"
- 
- #: kdeui/kaboutkde.cpp:67
- msgid ""
--"KDE is available free of charge, but making it is not free."
--"<br>"
--"<br>Thus, the KDE team formed the KDE e.V., a non-profit organization legally "
--"founded in Tuebingen, Germany. The KDE e.V. represents the KDE project in legal "
--"and financial matters. See <a href=\"http://www.kde-ev.org/\">"
--"http://www.kde-ev.org</a> for information on the KDE e.V."
--"<br>"
--"<br>The KDE team does need financial support. Most of the money is used to "
--"reimburse members and others on expenses they experienced when contributing to "
--"KDE. You are encouraged to support KDE through a financial donation, using one "
--"of the ways described at <a href=\"http://www.kde.org/support/\">"
--"http://www.kde.org/support/</a>."
--"<br>"
--"<br>Thank you very much in advance for your support."
--msgstr ""
--"KDE 是可免費取得的，但 KDE 專案的工作並不是免費的!"
--"<br>"
--"<br>因此，KDE 團隊組織了 KDE e.V.，一個在德國 Tuebingen 創辦的非牟利組織。KDE e.V. 是 KDE "
--"專案在法津和財政方面的代表。請造訪<a href=\"http://www.kde-ev.org/\">http://www.kde-ev.org</a>"
--"來取得更多有關 KDE e.V. 的資訊。"
--"<br>"
--"<br>KDE 團隊需要財政上的支持。大部分捐獻是用作補償成員和其他人在貢獻 KDE 時所用的經費。我們鼓勵您透過捐獻來支持 KDE。您可以從<a "
--"href=\"http://www.kde.org/support/\">http://www.kde.org/support/</a>內其中一種途徑來捐獻。"
--"<br>"
--"<br>我們非常感謝您對 KDE 的支持。"
-+"KDE is available free of charge, but making it is not free.<br><br>Thus, the "
-+"KDE team formed the KDE e.V., a non-profit organization legally founded in "
-+"Tuebingen, Germany. The KDE e.V. represents the KDE project in legal and "
-+"financial matters. See <a href=\"http://www.kde-ev.org/\">http://www.kde-ev."
-+"org</a> for information on the KDE e.V.<br><br>The KDE team does need "
-+"financial support. Most of the money is used to reimburse members and others "
-+"on expenses they experienced when contributing to KDE. You are encouraged to "
-+"support KDE through a financial donation, using one of the ways described at "
-+"<a href=\"http://www.kde.org/support/\">http://www.kde.org/support/</a>."
-+"<br><br>Thank you very much in advance for your support."
-+msgstr ""
-+"KDE 是可免費取得的，但 KDE 專案的工作並不是免費的!<br><br>因此，KDE 團隊組織"
-+"了 KDE e.V.，一個在德國 Tuebingen 創辦的非牟利組織。KDE e.V. 是 KDE 專案在法"
-+"津和財政方面的代表。請造訪<a href=\"http://www.kde-ev.org/\">http://www.kde-"
-+"ev.org</a>來取得更多有關 KDE e.V. 的資訊。<br><br>KDE 團隊需要財政上的支持。"
-+"大部分捐獻是用作補償成員和其他人在貢獻 KDE 時所用的經費。我們鼓勵您透過捐獻來"
-+"支持 KDE。您可以從<a href=\"http://www.kde.org/support/\">http://www.kde.org/"
-+"support/</a>內其中一種途徑來捐獻。<br><br>我們非常感謝您對 KDE 的支持。"
- 
- #: kdeui/kaboutkde.cpp:81
- #, c-format
-@@ -5557,7 +5530,7 @@
- 
- #: kdeui/kstdaction_p.h:44 kdeui/kstdguiitem.cpp:138
- msgid "Save &As..."
--msgstr "另存新檔(&A)..."
-+msgstr "另存新檔(&A)…"
- 
- #: kdeui/kstdguiitem.cpp:139
- msgid "Save file with another name"
-@@ -5578,7 +5551,7 @@
- 
- #: kdeui/kstdguiitem.cpp:153
- msgid "Administrator &Mode..."
--msgstr "管理員模式(&M)..."
-+msgstr "管理員模式(&M)…"
- 
- #: kdeui/kstdguiitem.cpp:153
- msgid "Enter Administrator Mode"
-@@ -5589,7 +5562,8 @@
- "When clicking <b>Administrator Mode</b> you will be prompted for the "
- "administrator (root) password in order to make changes which require root "
- "privileges."
--msgstr "當您按下\"進入管理員模式\"後，您需要輸入管理員(root) 密碼來取得 root 的權限。"
-+msgstr ""
-+"當您按下\"進入管理員模式\"後，您需要輸入管理員(root) 密碼來取得 root 的權限。"
- 
- #: kdeui/kstdguiitem.cpp:162
- msgid "Clear input"
-@@ -5603,7 +5577,7 @@
- msgid ""
- "_: show help\n"
- "&Help"
--msgstr "說明(&H)"
-+msgstr "求助(&H)"
- 
- #: kdeui/kstdguiitem.cpp:169
- msgid "Show help"
-@@ -5677,7 +5651,7 @@
- 
- #: kdeui/kstdguiitem.cpp:249
- msgid "Confi&gure..."
--msgstr "設定(&G)..."
-+msgstr "設定(&G)…"
- 
- #: kdeui/keditcl2.cpp:701 kdeui/keditcl2.cpp:833 kdeui/kstdguiitem.cpp:254
- #: kutils/kfinddialog.cpp:239
-@@ -5775,14 +5749,14 @@
- 
- #: kdeui/kwhatsthismanager.cpp:50
- msgid ""
--"<b>Not Defined</b>"
--"<br>There is no \"What's This?\" help assigned to this widget. If you want to "
--"help us to  describe the widget, you are welcome to <a "
--"href=\"submit-whatsthis\">send us your own \"What's This?\" help</a> for it."
--msgstr ""
--"<b>未定義</b>"
--"<br>這個部件(widget)沒有\"這是什麼\"的說明。如果您要幫忙我們說明這個部件的話，我們歡迎您把它的\"這是什麼\"<a "
--"href=\"submit-whatsthis\">傳送給我們</a>。"
-+"<b>Not Defined</b><br>There is no \"What's This?\" help assigned to this "
-+"widget. If you want to help us to  describe the widget, you are welcome to "
-+"<a href=\"submit-whatsthis\">send us your own \"What's This?\" help</a> for "
-+"it."
-+msgstr ""
-+"<b>未定義</b><br>這個部件(widget)沒有\"這是什麼\"的說明。如果您要幫忙我們說明"
-+"這個部件的話，我們歡迎您把它的\"這是什麼\"<a href=\"submit-whatsthis\">傳送給"
-+"我們</a>。"
- 
- #: kdeui/kshortcutdialog.cpp:68
- msgid "Configure Shortcut"
-@@ -5794,7 +5768,7 @@
- 
- #: kdeui/kedittoolbar.cpp:49
- msgid "--- line separator ---"
--msgstr "--- 行分隔 ---"
-+msgstr "--- 列分隔 ---"
- 
- #: kdeui/kedittoolbar.cpp:50
- msgid "--- separator ---"
-@@ -5807,8 +5781,8 @@
- 
- #: kdeui/kedittoolbar.cpp:447
- msgid ""
--"Do you really want to reset all toolbars of this application to their default? "
--"The changes will be applied immediately."
-+"Do you really want to reset all toolbars of this application to their "
-+"default? The changes will be applied immediately."
- msgstr "您真的要重設這個應用程式的所有工具列嗎？這個動作會即時生效。"
- 
- #: kdeui/kedittoolbar.cpp:447
-@@ -5834,7 +5808,7 @@
- 
- #: kdeui/kedittoolbar.cpp:818
- msgid "Change &Icon..."
--msgstr "變更圖示(&I)..."
-+msgstr "變更圖示(&I)…"
- 
- #: kdeui/kedittoolbar.cpp:991
- msgid ""
-@@ -5853,7 +5827,8 @@
- msgid ""
- "This is a dynamic list of actions. You can move it, but if you remove it you "
- "won't be able to re-add it."
--msgstr "這是一個動作的動態清單。您可以移動它，但如果您移除它，您將無法再加入它。"
-+msgstr ""
-+"這是一個動作的動態清單。您可以移動它，但如果您移除它，您將無法再加入它。"
- 
- #: kdeui/kedittoolbar.cpp:1002
- #, c-format
-@@ -5904,8 +5879,7 @@
- msgid ""
- "Unable to read X11 RGB color strings. The following file location(s) were "
- "examined:\n"
--msgstr ""
--"無法讀取 X11 RGB 色彩字串。下列檔案位置已經檢查：\n"
-+msgstr "無法讀取 X11 RGB 色彩字串。下列檔案位置已經檢查：\n"
- 
- #: kdeui/kcolordialog.cpp:940
- msgid "Select Color"
-@@ -5971,9 +5945,8 @@
- 
- #: kdeui/kstdaction.cpp:243
- msgid ""
--"Hide Menubar"
--"<p>Hide the menubar. You can usually get it back using the right mouse button "
--"inside the window itself."
-+"Hide Menubar<p>Hide the menubar. You can usually get it back using the right "
-+"mouse button inside the window itself."
- msgstr "隱藏選單列<p>隱藏選單列。您通常可以在視窗中按滑鼠右鍵來再次顯示它。"
- 
- #: kdeui/kstdaction.cpp:274 kdeui/kstdaction_p.h:97
-@@ -5982,9 +5955,8 @@
- 
- #: kdeui/kstdaction.cpp:276
- msgid ""
--"Show Statusbar"
--"<p>Shows the statusbar, which is the bar at the bottom of the window used for "
--"status information."
-+"Show Statusbar<p>Shows the statusbar, which is the bar at the bottom of the "
-+"window used for status information."
- msgstr "顯示狀態列<p>顯示狀態列，它會在視窗底部顯示狀態資料。"
- 
- #: kdeui/kstdaction.cpp:278
-@@ -5993,9 +5965,8 @@
- 
- #: kdeui/kstdaction.cpp:279
- msgid ""
--"Hide Statusbar"
--"<p>Hides the statusbar, which is the bar at the bottom of the window used for "
--"status information."
-+"Hide Statusbar<p>Hides the statusbar, which is the bar at the bottom of the "
-+"window used for status information."
- msgstr "<p>隱藏狀態列--在視窗底部顯示狀態資料的工具列。"
- 
- #: kdeui/kpassdlg.cpp:372
-@@ -6016,8 +5987,8 @@
- 
- #: kdeui/kpassdlg.cpp:429
- msgid ""
--"The password strength meter gives an indication of the security of the password "
--"you have entered.  To improve the strength of the password, try:\n"
-+"The password strength meter gives an indication of the security of the "
-+"password you have entered.  To improve the strength of the password, try:\n"
- " - using a longer password;\n"
- " - using a mixture of upper- and lower-case letters;\n"
- " - using numbers or symbols, such as #, as well as letters."
-@@ -6087,7 +6058,7 @@
- 
- #: kdeui/klineeditdlg.cpp:92
- msgid "&Browse..."
--msgstr "瀏覽(&B)..."
-+msgstr "瀏覽(&B)…"
- 
- #: kdeui/kdialogbase.cpp:636
- msgid "&Try"
-@@ -6125,7 +6096,7 @@
- 
- #: kdeui/kdialogbase.cpp:1538
- msgid "Get help..."
--msgstr "取得說明..."
-+msgstr "取得說明…"
- 
- #: kdeui/keditlistbox.cpp:124
- msgid "&Add"
-@@ -6154,7 +6125,7 @@
- 
- #: kdeui/kbugreport.cpp:120
- msgid "Configure Email..."
--msgstr "設定 Email..."
-+msgstr "設定 Email…"
- 
- #: kdeui/kbugreport.cpp:127
- msgid "The email address this bug report is sent to."
-@@ -6181,7 +6152,9 @@
- msgid ""
- "The application for which you wish to submit a bug report - if incorrect, "
- "please use the Report Bug menu item of the correct application"
--msgstr "您希望提交問題報告的應用程式──如果不正確，請使用正確的應用程式的 [報告問題] 選單"
-+msgstr ""
-+"您希望提交問題報告的應用程式──如果不正確，請使用正確的應用程式的 [報告問題] "
-+"選單"
- 
- #: kdeui/kbugreport.cpp:148
- msgid "Application: "
-@@ -6248,12 +6221,13 @@
- #: kdeui/kbugreport.cpp:252
- msgid ""
- "To submit a bug report, click on the button below.\n"
--"This will open a web browser window on http://bugs.kde.org where you will find "
--"a form to fill in.\n"
-+"This will open a web browser window on http://bugs.kde.org where you will "
-+"find a form to fill in.\n"
- "The information displayed above will be transferred to that server."
- msgstr ""
- "您若要報告此錯誤，請點選底下的連結。\n"
--"它會開啟一個網頁瀏覽器並連往 http://bugs.kde.org ，在那裡您將會找到一個可填寫的表格。\n"
-+"它會開啟一個網頁瀏覽器並連往 http://bugs.kde.org ，在那裡您將會找到一個可填寫"
-+"的表格。\n"
- "以上所顯示的訊息將會被傳送到該伺服器。"
- 
- #: kdeui/kbugreport.cpp:260
-@@ -6275,40 +6249,34 @@
- #: kdeui/kbugreport.cpp:386
- msgid ""
- "<p>You chose the severity <b>Critical</b>. Please note that this severity is "
--"intended only for bugs that</p>"
--"<ul>"
--"<li>break unrelated software on the system (or the whole system)</li>"
--"<li>cause serious data loss</li>"
--"<li>introduce a security hole on the system where the affected package is "
-+"intended only for bugs that</p><ul><li>break unrelated software on the "
-+"system (or the whole system)</li><li>cause serious data loss</"
-+"li><li>introduce a security hole on the system where the affected package is "
- "installed</li></ul>\n"
- "<p>Does the bug you are reporting cause any of the above damage? If it does "
- "not, please select a lower severity. Thank you!</p>"
- msgstr ""
--"<p>您選擇了 <b>危險的 (Critical)</b> 嚴重性。請注意此嚴重性只適用於以下錯誤：</p>"
--"<ul>"
--"<li>使系統中不相關的軟體 (甚或整個系統) 出現問題</li>"
--"<li>導致嚴重的資料流失</li>"
--"<li>在安裝受影響套件的系統上引入安全漏洞</li></ul>\n"
--"<p>您正準備報告的錯誤會造成以上任一個損壞嗎？如果不會，請您選擇較低的嚴重性。謝謝！</p>"
-+"<p>您選擇了 <b>危險的 (Critical)</b> 嚴重性。請注意此嚴重性只適用於以下錯誤："
-+"</p><ul><li>使系統中不相關的軟體 (甚或整個系統) 出現問題</li><li>導致嚴重的資"
-+"料流失</li><li>在安裝受影響套件的系統上引入安全漏洞</li></ul>\n"
-+"<p>您正準備報告的錯誤會造成以上任一個損壞嗎？如果不會，請您選擇較低的嚴重性。"
-+"謝謝！</p>"
- 
- #: kdeui/kbugreport.cpp:397
- msgid ""
- "<p>You chose the severity <b>Grave</b>. Please note that this severity is "
--"intended only for bugs that</p>"
--"<ul>"
--"<li>make the package in question unusable or mostly so</li>"
--"<li>cause data loss</li>"
--"<li>introduce a security hole allowing access to the accounts of users who use "
--"the affected package</li></ul>\n"
-+"intended only for bugs that</p><ul><li>make the package in question unusable "
-+"or mostly so</li><li>cause data loss</li><li>introduce a security hole "
-+"allowing access to the accounts of users who use the affected package</li></"
-+"ul>\n"
- "<p>Does the bug you are reporting cause any of the above damage? If it does "
- "not, please select a lower severity. Thank you!</p>"
- msgstr ""
--"<p>您選擇了 <b>嚴重的 (Grave)</b> 嚴重性。請注意此嚴重性只適用於以下錯誤：</p>"
--"<ul>"
--"<li>讓此套件幾乎或完全不能使用</li>"
--"<li>導致資料流失</li>"
--"<li>在使用此套件的使用者帳號中引入安全漏洞</li></ul>\n"
--"<p>您正準備報告的錯誤會造成以上任一個損壞嗎？如果不會，請您選擇較低的嚴重性。謝謝！</p>"
-+"<p>您選擇了 <b>嚴重的 (Grave)</b> 嚴重性。請注意此嚴重性只適用於以下錯誤：</"
-+"p><ul><li>讓此套件幾乎或完全不能使用</li><li>導致資料流失</li><li>在使用此套"
-+"件的使用者帳號中引入安全漏洞</li></ul>\n"
-+"<p>您正準備報告的錯誤會造成以上任一個損壞嗎？如果不會，請您選擇較低的嚴重性。"
-+"謝謝！</p>"
- 
- #: kdeui/kbugreport.cpp:409
- msgid ""
-@@ -6338,7 +6306,7 @@
- 
- #: kdeui/kcolorcombo.cpp:187 kdeui/kcolorcombo.cpp:240
- msgid "Custom..."
--msgstr "自訂..."
-+msgstr "自訂…"
- 
- #: kdeui/ksystemtray.cpp:190
- msgid "<qt>Are you sure you want to quit <b>%1</b>?</qt>"
-@@ -6396,11 +6364,11 @@
- 
- #: kdeui/khelpmenu.cpp:150 kdeui/kstdaction_p.h:111
- msgid "&Report Bug..."
--msgstr "報告問題(&R)..."
-+msgstr "報告問題(&R)…"
- 
- #: kdeui/khelpmenu.cpp:159 kdeui/kstdaction_p.h:112
- msgid "Switch application &language..."
--msgstr "切換應用程式語言(&L)..."
-+msgstr "切換應用程式語言(&L)…"
- 
- #: kdeui/khelpmenu.cpp:170 kdeui/kstdaction_p.h:113
- #, c-format
-@@ -6442,14 +6410,12 @@
- msgstr "每日小祕訣"
- 
- #: kdeui/ktip.cpp:224
--msgid ""
--"Did you know...?\n"
--msgstr ""
--"您知道嗎...？\n"
-+msgid "Did you know...?\n"
-+msgstr "您知道嗎…？\n"
- 
- #: kdeui/ktip.cpp:287
- msgid "&Show tips on startup"
--msgstr "啟動時顯示小秘訣(&S)"
-+msgstr "啟動時顯示小祕訣(&S)"
- 
- #: kdeui/ktoolbar.cpp:2040
- msgid "Toolbar Menu"
-@@ -6601,7 +6567,7 @@
- 
- #: kdeui/keditcl2.cpp:984
- msgid "Go to line:"
--msgstr "跳至行數："
-+msgstr "跳至列數："
- 
- #: kdeui/kwindowlistmenu.cpp:129
- msgid "Unclutter Windows"
-@@ -6621,7 +6587,7 @@
- 
- #: kdeui/ktextedit.cpp:231
- msgid "Check Spelling..."
--msgstr "拼字檢查..."
-+msgstr "拼字檢查…"
- 
- #: kdeui/ktextedit.cpp:237
- msgid "Auto Spell Check"
-@@ -6710,7 +6676,7 @@
- 
- #: khtml/khtml_ext.cpp:538
- msgid "&Save Link As..."
--msgstr "另存連結為(&S)..."
-+msgstr "另存連結為(&S)…"
- 
- #: khtml/khtml_ext.cpp:540
- msgid "Copy &Link Address"
-@@ -6734,7 +6700,7 @@
- 
- #: khtml/khtml_ext.cpp:561
- msgid "Block IFrame..."
--msgstr "禁止 IFrame..."
-+msgstr "禁止 IFrame…"
- 
- #: khtml/khtml_ext.cpp:564 khtml/khtml_part.cpp:256
- msgid "View Frame Source"
-@@ -6746,19 +6712,19 @@
- 
- #: khtml/khtml_ext.cpp:570 khtml/khtml_part.cpp:404
- msgid "Print Frame..."
--msgstr "列印框架..."
-+msgstr "列印框架…"
- 
- #: khtml/khtml_ext.cpp:571 khtml/khtml_part.cpp:262
- msgid "Save &Frame As..."
--msgstr "另存框架為(&F)..."
-+msgstr "另存框架為(&F)…"
- 
- #: khtml/khtml_ext.cpp:601
- msgid "Save Image As..."
--msgstr "另存影像為..."
-+msgstr "另存影像為…"
- 
- #: khtml/khtml_ext.cpp:603
- msgid "Send Image..."
--msgstr "傳送影像..."
-+msgstr "傳送影像…"
- 
- #: khtml/khtml_ext.cpp:608
- msgid "Copy Image"
-@@ -6774,7 +6740,7 @@
- 
- #: khtml/khtml_ext.cpp:623
- msgid "Block Image..."
--msgstr "禁止影像..."
-+msgstr "禁止影像…"
- 
- #: khtml/khtml_ext.cpp:629
- #, c-format
-@@ -6808,7 +6774,8 @@
- 
- #: khtml/khtml_ext.cpp:889 kparts/browserrun.cpp:390
- msgid "The Download Manager (%1) could not be found in your $PATH "
--msgstr "找不到下載管理程式 (%1)，請檢查您的安裝是否正確，包含 PATH 路徑有設定正確。"
-+msgstr ""
-+"找不到下載管理程式 (%1)，請檢查您的安裝是否正確，包含 PATH 路徑有設定正確。"
- 
- #: khtml/khtml_ext.cpp:890 kparts/browserrun.cpp:391
- msgid ""
-@@ -6832,51 +6799,44 @@
- 
- #: khtml/khtml_printsettings.cpp:31
- msgid ""
--"<qt>"
--"<p><strong>'Print images'</strong></p>"
--"<p>If this checkbox is enabled, images contained in the HTML page will be "
--"printed. Printing may take longer and use more ink or toner.</p>"
--"<p>If this checkbox is disabled, only the text of the HTML page will be "
--"printed, without the included images. Printing will be faster and use less ink "
--"or toner.</p> </qt>"
--msgstr ""
--"<qt>"
--"<p><strong>'列印影像'</strong></p>"
--"<p>如果開啟這個選項，HTML 中的影像就會被列印出來。但它會花更多時間，並會使用更多油墨或調色劑。</p>"
--"<p>如果不開啟的話，那只會把 HTML 的文字列印出來。它會快一些，也可節省一些油墨或調色劑。</p></qt>"
-+"<qt><p><strong>'Print images'</strong></p><p>If this checkbox is enabled, "
-+"images contained in the HTML page will be printed. Printing may take longer "
-+"and use more ink or toner.</p><p>If this checkbox is disabled, only the text "
-+"of the HTML page will be printed, without the included images. Printing will "
-+"be faster and use less ink or toner.</p> </qt>"
-+msgstr ""
-+"<qt><p><strong>'列印影像'</strong></p><p>如果開啟這個選項，HTML 中的影像就會"
-+"被列印出來。但它會花更多時間，並會使用更多油墨或調色劑。</p><p>如果不開啟的"
-+"話，那只會把 HTML 的文字列印出來。它會快一些，也可節省一些油墨或調色劑。</"
-+"p></qt>"
- 
- #: khtml/khtml_printsettings.cpp:43
- msgid ""
--"<qt>"
--"<p><strong>'Print header'</strong></p>"
--"<p>If this checkbox is enabled, the printout of the HTML document will contain "
--"a header line at the top of each page. This header contains the current date, "
--"the location URL of the printed page and the page number.</p>"
--"<p>If this checkbox is disabled, the printout of the HTML document will not "
--"contain such a header line.</p> </qt>"
--msgstr ""
--"<qt>"
--"<p><strong>'列印標頭'</strong></p>"
--"<p>如果開啟這個選項，列印本會連標頭一起出來。標頭包含了目前的日期、URL 和頁數。</p>"
--"<p>如果不開啟的話，列印本將不會包含標頭。</p></qt>"
-+"<qt><p><strong>'Print header'</strong></p><p>If this checkbox is enabled, "
-+"the printout of the HTML document will contain a header line at the top of "
-+"each page. This header contains the current date, the location URL of the "
-+"printed page and the page number.</p><p>If this checkbox is disabled, the "
-+"printout of the HTML document will not contain such a header line.</p> </qt>"
-+msgstr ""
-+"<qt><p><strong>'列印標頭'</strong></p><p>如果開啟這個選項，列印本會連標頭一起"
-+"出來。標頭包含了目前的日期、URL 和頁數。</p><p>如果不開啟的話，列印本將不會包"
-+"含標頭。</p></qt>"
- 
- #: khtml/khtml_printsettings.cpp:56
- msgid ""
--"<qt>"
--"<p><strong>'Printerfriendly mode'</strong></p>"
--"<p>If this checkbox is enabled, the printout of the HTML document will be black "
--"and white only, and all colored background will be converted into white. "
--"Printout will be faster and use less ink or toner.</p>"
--"<p>If this checkbox is disabled, the printout of the HTML document will happen "
--"in the original color settings as you see in your application. This may result "
--"in areas of full-page color (or grayscale, if you use a black+white printer). "
--"Printout will possibly happen slower and will certainly use much more toner or "
--"ink.</p> </qt>"
--msgstr ""
--"<qt>"
--"<p><strong>'便於列印模式'</strong></p>"
--"<p>如果開啟這個選項，文件將會以黑白色彩列印。所有背景都會列印成白色。這樣可以使列印速度加快，並節省一些油墨或調色劑。</p>"
--"<p>如果不開啟的話，文件將會以原貌列印。這樣會使全頁以彩色列印(若使用黑白列印機，則是灰階)，減慢列印速度，並使用更多油墨或調色劑。</p></qt>"
-+"<qt><p><strong>'Printerfriendly mode'</strong></p><p>If this checkbox is "
-+"enabled, the printout of the HTML document will be black and white only, and "
-+"all colored background will be converted into white. Printout will be faster "
-+"and use less ink or toner.</p><p>If this checkbox is disabled, the printout "
-+"of the HTML document will happen in the original color settings as you see "
-+"in your application. This may result in areas of full-page color (or "
-+"grayscale, if you use a black+white printer). Printout will possibly happen "
-+"slower and will certainly use much more toner or ink.</p> </qt>"
-+msgstr ""
-+"<qt><p><strong>'便於列印模式'</strong></p><p>如果開啟這個選項，文件將會以黑白"
-+"色彩列印。所有背景都會列印成白色。這樣可以使列印速度加快，並節省一些油墨或調"
-+"色劑。</p><p>如果不開啟的話，文件將會以原貌列印。這樣會使全頁以彩色列印(若使"
-+"用黑白列印機，則是灰階)，減慢列印速度，並使用更多油墨或調色劑。</p></qt>"
- 
- #: khtml/khtml_printsettings.cpp:71
- msgid "HTML Settings"
-@@ -6904,20 +6864,21 @@
- 
- #: khtml/khtml_part.cpp:258
- msgid "Save &Background Image As..."
--msgstr "另存背景影像為(&B)..."
-+msgstr "另存背景影像為(&B)…"
- 
- #: khtml/khtml_part.cpp:263
- msgid "Security..."
--msgstr "安全性..."
-+msgstr "安全性…"
- 
- #: khtml/khtml_part.cpp:264
- msgid ""
--"Security Settings"
--"<p>Shows the certificate of the displayed page. Only pages that have been "
--"transmitted using a secure, encrypted connection have a certificate."
--"<p> Hint: If the image shows a closed lock, the page has been transmitted over "
--"a secure connection."
--msgstr "安全設定<p>顯示網頁的憑證。只有透過加密連線取得的網頁才會有憑證。<p>提示：如果有顯示一個小鎖，就表示網頁是透過加密連線取得的。"
-+"Security Settings<p>Shows the certificate of the displayed page. Only pages "
-+"that have been transmitted using a secure, encrypted connection have a "
-+"certificate.<p> Hint: If the image shows a closed lock, the page has been "
-+"transmitted over a secure connection."
-+msgstr ""
-+"安全設定<p>顯示網頁的憑證。只有透過加密連線取得的網頁才會有憑證。<p>提示：如"
-+"果有顯示一個小鎖，就表示網頁是透過加密連線取得的。"
- 
- #: khtml/khtml_part.cpp:270
- msgid "Print Rendering Tree to STDOUT"
-@@ -6933,7 +6894,7 @@
- 
- #: khtml/khtml_part.cpp:274
- msgid "Set &Encoding"
--msgstr "設定編碼(&E)..."
-+msgstr "設定編碼(&E)…"
- 
- #: khtml/khtml_part.cpp:279
- msgid "Semi-Automatic"
-@@ -6959,9 +6920,8 @@
- 
- #: khtml/khtml_part.cpp:363
- msgid ""
--"Enlarge Font"
--"<p>Make the font in this window bigger. Click and hold down the mouse button "
--"for a menu with all available font sizes."
-+"Enlarge Font<p>Make the font in this window bigger. Click and hold down the "
-+"mouse button for a menu with all available font sizes."
- msgstr "增大字型<p>使這個視窗的字型放大。按一下來顯示可用的字型大小。"
- 
- #: khtml/khtml_part.cpp:367
-@@ -6970,29 +6930,26 @@
- 
- #: khtml/khtml_part.cpp:369
- msgid ""
--"Shrink Font"
--"<p>Make the font in this window smaller. Click and hold down the mouse button "
--"for a menu with all available font sizes."
-+"Shrink Font<p>Make the font in this window smaller. Click and hold down the "
-+"mouse button for a menu with all available font sizes."
- msgstr "縮小字型<p>使這個視窗的字型縮小。按一下來顯示可用的字型大小。"
- 
- #: khtml/khtml_part.cpp:375
- msgid ""
--"Find text"
--"<p>Shows a dialog that allows you to find text on the displayed page."
-+"Find text<p>Shows a dialog that allows you to find text on the displayed "
-+"page."
- msgstr "尋找文字<p>顯示一個文字尋找對話框。"
- 
- #: khtml/khtml_part.cpp:379
- msgid ""
--"Find next"
--"<p>Find the next occurrence of the text that you have found using the <b>"
--"Find Text</b> function"
-+"Find next<p>Find the next occurrence of the text that you have found using "
-+"the <b>Find Text</b> function"
- msgstr "尋找下一個<p>尋找下一處有該<b>尋找文字</b>中的文字的地方。"
- 
- #: khtml/khtml_part.cpp:384
- msgid ""
--"Find previous"
--"<p>Find the previous occurrence of the text that you have found using the <b>"
--"Find Text</b> function"
-+"Find previous<p>Find the previous occurrence of the text that you have found "
-+"using the <b>Find Text</b> function"
- msgstr "尋找上一個<p>尋找上一處有該<b>尋找文字</b中的文字的地方。"
- 
- #: khtml/khtml_part.cpp:388
-@@ -7005,10 +6962,10 @@
- 
- #: khtml/khtml_part.cpp:405
- msgid ""
--"Print Frame"
--"<p>Some pages have several frames. To print only a single frame, click on it "
--"and then use this function."
--msgstr "列印框架<p>某些網頁使用多個框架。要列印單一框架，請按一下來使用它的功能。"
-+"Print Frame<p>Some pages have several frames. To print only a single frame, "
-+"click on it and then use this function."
-+msgstr ""
-+"列印框架<p>某些網頁使用多個框架。要列印單一框架，請按一下來使用它的功能。"
- 
- #: khtml/khtml_part.cpp:413
- msgid "Toggle Caret Mode"
-@@ -7181,7 +7138,7 @@
- 
- #: khtml/khtml_part.cpp:4256
- msgid "&Find in Frame..."
--msgstr "在框架中尋找(&F)..."
-+msgstr "在框架中尋找(&F)…"
- 
- #: khtml/khtml_part.cpp:4763
- msgid ""
-@@ -7190,7 +7147,8 @@
- "A third party may be able to intercept and view this information.\n"
- "Are you sure you wish to continue?"
- msgstr ""
--"警告：這是一個安全的表格，但是它正試圖未經加密就把您的資料傳送回去。第三者可能可以截獲並檢視這些資料。\n"
-+"警告：這是一個安全的表格，但是它正試圖未經加密就把您的資料傳送回去。第三者可"
-+"能可以截獲並檢視這些資料。\n"
- "您確定要繼續嗎？"
- 
- #: khtml/khtml_part.cpp:4766 khtml/khtml_part.cpp:4775
-@@ -7204,7 +7162,8 @@
- 
- #: khtml/khtml_part.cpp:4773
- msgid ""
--"Warning: Your data is about to be transmitted across the network unencrypted.\n"
-+"Warning: Your data is about to be transmitted across the network "
-+"unencrypted.\n"
- "Are you sure you wish to continue?"
- msgstr ""
- "警告：您的資料將未經加密就在網路上傳輸。\n"
-@@ -7224,9 +7183,11 @@
- 
- #: khtml/khtml_part.cpp:4821
- msgid ""
--"<qt>The form will be submitted to <BR><B>%1</B><BR>on your local filesystem.<BR>"
--"Do you want to submit the form?"
--msgstr "<qt>這個表格將會提交到您的本地檔案系統上的<BR><B>%1</B><BR><BR>您真的要提交表格嗎？"
-+"<qt>The form will be submitted to <BR><B>%1</B><BR>on your local filesystem."
-+"<BR>Do you want to submit the form?"
-+msgstr ""
-+"<qt>這個表格將會提交到您的本地檔案系統上的<BR><B>%1</B><BR><BR>您真的要提交表"
-+"格嗎？"
- 
- #: khtml/html/html_formimpl.cpp:1531 khtml/html/html_formimpl.cpp:2137
- #: khtml/khtml_part.cpp:4822 khtml/khtmlview.cpp:2527 khtml/khtmlview.cpp:2569
-@@ -7235,9 +7196,11 @@
- 
- #: khtml/khtml_part.cpp:4870
- msgid ""
--"This site attempted to attach a file from your computer in the form submission. "
--"The attachment was removed for your protection."
--msgstr "這個網站的表格提交時試圖在您的電腦附加一個檔案。為了保護您，這個附件已經被移除。"
-+"This site attempted to attach a file from your computer in the form "
-+"submission. The attachment was removed for your protection."
-+msgstr ""
-+"這個網站的表格提交時試圖在您的電腦附加一個檔案。為了保護您，這個附件已經被移"
-+"除。"
- 
- #: khtml/khtml_part.cpp:4870
- msgid "KDE"
-@@ -7301,7 +7264,7 @@
- 
- #: khtml/khtml_part.cpp:7416
- msgid "&Configure JavaScript New Window Policies..."
--msgstr "設定 JavaScript 新視窗規則(&C)..."
-+msgstr "設定 JavaScript 新視窗規則(&C)…"
- 
- #: khtml/khtmlview.cpp:1625
- msgid "Find stopped."
-@@ -7354,7 +7317,7 @@
- 
- #: khtml/xml/xml_tokenizer.cpp:318
- msgid "fatal parsing error: %1 in line %2, column %3"
--msgstr "嚴重解析錯誤：%1，發生在第 %2 行，第 %3 列"
-+msgstr "嚴重解析錯誤：%1，發生在第 %2 列，第 %3 行"
- 
- #: khtml/xml/xml_tokenizer.cpp:477
- msgid "XML parsing error"
-@@ -7414,7 +7377,7 @@
- 
- #: khtml/ecma/kjs_debugwin.cpp:826
- msgid "Parse error at %1 line %2"
--msgstr "%1 第 %2 行語法錯誤"
-+msgstr "%1 第 %2 列語法錯誤"
- 
- #: khtml/ecma/kjs_debugwin.cpp:837
- #, c-format
-@@ -7436,7 +7399,7 @@
- msgstr ""
- "執行命令稿時發生錯誤。\n"
- "\n"
--"%1 第 %2 行：%3"
-+"%1 第 %2 列：%3"
- 
- #: khtml/ecma/kjs_html.cpp:2160 khtml/ecma/kjs_window.cpp:1562
- msgid "Confirmation: JavaScript Popup"
-@@ -7452,12 +7415,10 @@
- 
- #: khtml/ecma/kjs_window.cpp:1568
- msgid ""
--"<qt>This site is requesting to open"
--"<p>%1</p>in a new browser window via JavaScript.<br />"
--"Do you want to allow this?</qt>"
-+"<qt>This site is requesting to open<p>%1</p>in a new browser window via "
-+"JavaScript.<br />Do you want to allow this?</qt>"
- msgstr ""
--"此網站試圖使用 Javascript 在一個新的瀏覽器視窗開啟"
--"<p>%1</p>。\n"
-+"此網站試圖使用 Javascript 在一個新的瀏覽器視窗開啟<p>%1</p>。\n"
- "您允許這個動作嗎？"
- 
- #: khtml/ecma/kjs_html.cpp:2167 khtml/ecma/kjs_window.cpp:1570
-@@ -7498,11 +7459,12 @@
- 
- #: khtml/ecma/kjs_proxy.cpp:405
- msgid ""
--"A script on this page is causing KHTML to freeze. If it continues to run, other "
--"applications may become less responsive.\n"
-+"A script on this page is causing KHTML to freeze. If it continues to run, "
-+"other applications may become less responsive.\n"
- "Do you want to abort the script?"
- msgstr ""
--"此頁面上的命令稿導致 KHTML 凍結。如果繼續執行的話，其他應用程式的回應程度會受到影響。\n"
-+"此頁面上的命令稿導致 KHTML 凍結。如果繼續執行的話，其他應用程式的回應程度會受"
-+"到影響。\n"
- "您是否想要中止該命令稿？"
- 
- #: khtml/ecma/kjs_proxy.cpp:405
-@@ -7524,10 +7486,12 @@
- 
- #: khtml/ecma/kjs_html.cpp:2165
- msgid ""
--"<qt>This site is submitting a form which will open "
--"<p>%1</p> in a new browser window via JavaScript.<br />"
--"Do you want to allow the form to be submitted?</qt>"
--msgstr "<qt>這個網站正在提交表格。這樣會使得 JavaScript 開啟一<p>%1</p>。<br />您要允許表格被提交嗎？</qt>"
-+"<qt>This site is submitting a form which will open <p>%1</p> in a new "
-+"browser window via JavaScript.<br />Do you want to allow the form to be "
-+"submitted?</qt>"
-+msgstr ""
-+"<qt>這個網站正在提交表格。這樣會使得 JavaScript 開啟一<p>%1</p>。<br />您要允"
-+"許表格被提交嗎？</qt>"
- 
- #: khtml/html/htmlparser.cpp:1709
- msgid "This is a searchable index. Enter search keywords: "
-@@ -7585,18 +7549,21 @@
- #: khtml/html/html_formimpl.cpp:618
- msgid ""
- "Konqueror has the ability to store the password in an encrypted wallet. When "
--"the wallet is unlocked, it can then automatically restore the login information "
--"next time you submit this form. Do you want to store the information now?"
-+"the wallet is unlocked, it can then automatically restore the login "
-+"information next time you submit this form. Do you want to store the "
-+"information now?"
- msgstr ""
--"Konqueror 可以把密碼存在加密的錢包(wallet)內。當錢包被解除鎖定時，它可以在下一次到訪網站時自動把登入資訊填上。您要現在儲存資訊嗎？"
-+"Konqueror 可以把密碼存在加密的錢包(wallet)內。當錢包被解除鎖定時，它可以在下"
-+"一次到訪網站時自動把登入資訊填上。您要現在儲存資訊嗎？"
- 
- #: khtml/html/html_formimpl.cpp:623
- msgid ""
- "Konqueror has the ability to store the password in an encrypted wallet. When "
--"the wallet is unlocked, it can then automatically restore the login information "
--"next time you visit %1. Do you want to store the information now?"
-+"the wallet is unlocked, it can then automatically restore the login "
-+"information next time you visit %1. Do you want to store the information now?"
- msgstr ""
--"Konqueror 可以把密碼存在加密的錢包(wallet)內。當保險箱被解除鎖定時，它可以在下一次到訪 %1 時自動把登入資訊填上。您要現在儲存資訊嗎？"
-+"Konqueror 可以把密碼存在加密的錢包(wallet)內。當保險箱被解除鎖定時，它可以在"
-+"下一次到訪 %1 時自動把登入資訊填上。您要現在儲存資訊嗎？"
- 
- #: khtml/java/kjavaappletviewer.cpp:122
- msgid "Applet Parameters"
-@@ -7624,11 +7591,11 @@
- 
- #: khtml/java/kjavaapplet.cpp:225
- msgid "Initializing Applet \"%1\"..."
--msgstr "初始化 Applet \"%1\"..."
-+msgstr "初始化 Applet \"%1\"…"
- 
- #: khtml/java/kjavaapplet.cpp:232
- msgid "Starting Applet \"%1\"..."
--msgstr "啟動 Applet \"%1\"..."
-+msgstr "啟動 Applet \"%1\"…"
- 
- #: khtml/java/kjavaapplet.cpp:239
- msgid "Applet \"%1\" started"
-@@ -7830,16 +7797,12 @@
- msgstr "啟動 %1"
- 
- #: kinit/klauncher.cpp:1281
--msgid ""
--"Unknown protocol '%1'.\n"
--msgstr ""
--"不明的協定‘%1’。\n"
-+msgid "Unknown protocol '%1'.\n"
-+msgstr "不明的協定‘%1’。\n"
- 
- #: kinit/klauncher.cpp:1334
--msgid ""
--"Error loading '%1'.\n"
--msgstr ""
--"載入‘%1’發生錯誤。\n"
-+msgid "Error loading '%1'.\n"
-+msgstr "載入‘%1’發生錯誤。\n"
- 
- #: kconf_update/kconf_update.cpp:43
- msgid "Keep output results from scripts"
-@@ -7919,8 +7882,8 @@
- 
- #: kunittest/modrunner.cpp:43
- msgid ""
--"Only run tests modules which are found in the folder. Use the query option to "
--"select modules."
-+"Only run tests modules which are found in the folder. Use the query option "
-+"to select modules."
- msgstr "僅對在資料夾下的模組進行測試。使用查詢功能來選擇模組。"
- 
- #: kunittest/modrunner.cpp:44
-@@ -7992,7 +7955,7 @@
- 
- #: kparts/browserrun.cpp:311
- msgid "&Open With..."
--msgstr "開啟用(&O)..."
-+msgstr "開啟用(&O)…"
- 
- #: kparts/browserrun.cpp:353
- msgid "&Open"
-@@ -8016,7 +7979,7 @@
- 
- #: kresources/configpage.cpp:129 kutils/kfinddialog.cpp:131
- msgid "&Edit..."
--msgstr "編輯(&E)..."
-+msgstr "編輯(&E)…"
- 
- #: kutils/kfinddialog.cpp:140
- msgid "Replace With"
-@@ -8063,7 +8026,9 @@
- "<qt>If you press the <b>Replace</b> button, the text you entered above is "
- "searched for within the document and any occurrence is replaced with the "
- "replacement text.</qt>"
--msgstr "<qt>如果您按下了<b>取代</b>，那麼文件中所有\"尋找文字\"的地方都會被取代成\"替代文字\"。</qt>"
-+msgstr ""
-+"<qt>如果您按下了<b>取代</b>，那麼文件中所有\"尋找文字\"的地方都會被取代成\"替"
-+"代文字\"。</qt>"
- 
- #: kutils/kfinddialog.cpp:240
- msgid "Start searching"
-@@ -8071,8 +8036,8 @@
- 
- #: kutils/kfinddialog.cpp:241
- msgid ""
--"<qt>If you press the <b>Find</b> button, the text you entered above is searched "
--"for within the document.</qt>"
-+"<qt>If you press the <b>Find</b> button, the text you entered above is "
-+"searched for within the document.</qt>"
- msgstr "<qt>如果您按下了<b>搜尋</b>，那麼將以上面輸入的文字搜尋文件。</qt>"
- 
- #: kutils/kfinddialog.cpp:247
-@@ -8099,17 +8064,16 @@
- # please remove it. It is between the 2 <br>s.
- #: kutils/kfinddialog.cpp:256
- msgid ""
--"<qt>If enabled, any occurrence of <code><b>\\N</b></code>, where <code><b>N</b>"
--"</code> is a integer number, will be replaced with the corresponding capture "
--"(\"parenthesized substring\") from the pattern."
--"<p>To include (a literal <code><b>\\N</b></code> in your replacement, put an "
--"extra backslash in front of it, like <code><b>\\\\N</b></code>.</qt>"
--msgstr ""
--"<qt>開啟後，所有<code><b>\\N<b></code>出現的地方(<code><b>N</b></code>"
--"是一個整數)，都會被替換成圓括號內對應的字串樣式，"
--"<br>如：([1-9])([0-4])中，\\1對應符合[1-9]的樣式，\\2對應符合[0-4]的樣式)"
--"<br>"
--"<p>要替換成普通的<code><b>\\N</b></code>，您需要多加一個反斜線，如<code><b>\\\\N</b></code>。</qt>"
-+"<qt>If enabled, any occurrence of <code><b>\\N</b></code>, where <code><b>N</"
-+"b></code> is a integer number, will be replaced with the corresponding "
-+"capture (\"parenthesized substring\") from the pattern.<p>To include (a "
-+"literal <code><b>\\N</b></code> in your replacement, put an extra backslash "
-+"in front of it, like <code><b>\\\\N</b></code>.</qt>"
-+msgstr ""
-+"<qt>開啟後，所有<code><b>\\N<b></code>出現的地方(<code><b>N</b></code>是一個"
-+"整數)，都會被替換成圓括號內對應的字串樣式，<br>如：([1-9])([0-4])中，\\1對應"
-+"符合[1-9]的樣式，\\2對應符合[0-4]的樣式)<br><p>要替換成普通的<code><b>\\N</"
-+"b></code>，您需要多加一個反斜線，如<code><b>\\\\N</b></code>。</qt>"
- 
- #: kutils/kfinddialog.cpp:263
- msgid "Click for a menu of available captures."
-@@ -8179,7 +8143,7 @@
- 
- #: kutils/kfinddialog.cpp:459
- msgid "Carriage Return"
--msgstr "換行(CR)"
-+msgstr "換列(CR)"
- 
- #: kutils/kfinddialog.cpp:460
- msgid "White Space"
-@@ -8207,15 +8171,14 @@
- 
- #: kutils/kcmoduleloader.cpp:98
- msgid ""
--"<qt>There was an error when loading the module '%1'."
--"<br>"
--"<br>The desktop file (%2) as well as the library (%3) was found but yet the "
--"module could not be loaded properly. Most likely the factory declaration was "
--"wrong, or the create_* function was missing.</qt>"
--msgstr ""
--"<qt>載入模組 '%1' 時發生錯誤。"
--"<br>"
--"<br>桌面設定檔(%2)和程式庫(%3)都找到了，但是模組仍然無法正常載入。很有可能是 factory 定義有誤，或 create_* 函式不存在。</qt>"
-+"<qt>There was an error when loading the module '%1'.<br><br>The desktop file "
-+"(%2) as well as the library (%3) was found but yet the module could not be "
-+"loaded properly. Most likely the factory declaration was wrong, or the "
-+"create_* function was missing.</qt>"
-+msgstr ""
-+"<qt>載入模組 '%1' 時發生錯誤。<br><br>桌面設定檔(%2)和程式庫(%3)都找到了，但"
-+"是模組仍然無法正常載入。很有可能是 factory 定義有誤，或 create_* 函式不存在。"
-+"</qt>"
- 
- #: kutils/kcmoduleloader.cpp:111
- msgid "The specified library %1 could not be found."
-@@ -8227,9 +8190,7 @@
- 
- #: kutils/kcmoduleloader.cpp:133
- msgid ""
--"<qt>"
--"<p>The diagnostics is:"
--"<br>The desktop file %1 could not be found.</qt>"
-+"<qt><p>The diagnostics is:<br>The desktop file %1 could not be found.</qt>"
- msgstr "<qt><p>診斷結果：<br>找不到桌面設定檔 %1。</qt>"
- 
- #: kutils/kcmoduleloader.cpp:152
-@@ -8242,9 +8203,8 @@
- 
- #: kutils/kcmoduleloader.cpp:172
- msgid ""
--"<qt>"
--"<p>The diagnostics is:"
--"<br>The desktop file %1 does not specify a library.</qt>"
-+"<qt><p>The diagnostics is:<br>The desktop file %1 does not specify a library."
-+"</qt>"
- msgstr "<qt><p>診斷結果：<br>桌面設定檔 %1 未指定一個程式庫。</qt>"
- 
- #: kutils/kcmoduleloader.cpp:206
-@@ -8253,26 +8213,17 @@
- 
- #: kutils/kcmoduleloader.cpp:206 kutils/kcmoduleloader.cpp:274
- msgid ""
--"<qt>"
--"<p>The diagnostics is:"
--"<br>%1"
--"<p>Possible reasons:</p>"
--"<ul>"
--"<li>An error occurred during your last KDE upgrade leaving an orphaned control "
--"module"
--"<li>You have old third party modules lying around.</ul>"
--"<p>Check these points carefully and try to remove the module mentioned in the "
--"error message. If this fails, consider contacting your distributor or "
--"packager.</p></qt>"
--msgstr ""
--"<qt>"
--"<p>診斷結果："
--"<br>%1"
--"<p>可能的原因：</p>"
--"<ul>"
--"<li>KDE 升級時發生錯誤，遺下了一個舊版的控制模組。"
--"<li>您正在使用一個第三方的模組。</ul>"
--"<p>請小心檢查上述的問題，並嘗試移除錯誤訊息中的模組。若是不行，請聯絡您的發行商或套件供應者。</p></qt>"
-+"<qt><p>The diagnostics is:<br>%1<p>Possible reasons:</p><ul><li>An error "
-+"occurred during your last KDE upgrade leaving an orphaned control "
-+"module<li>You have old third party modules lying around.</ul><p>Check these "
-+"points carefully and try to remove the module mentioned in the error "
-+"message. If this fails, consider contacting your distributor or packager.</"
-+"p></qt>"
-+msgstr ""
-+"<qt><p>診斷結果：<br>%1<p>可能的原因：</p><ul><li>KDE 升級時發生錯誤，遺下了"
-+"一個舊版的控制模組。<li>您正在使用一個第三方的模組。</ul><p>請小心檢查上述的"
-+"問題，並嘗試移除錯誤訊息中的模組。若是不行，請聯絡您的發行商或套件供應者。</"
-+"p></qt>"
- 
- #: kutils/kreplace.cpp:49
- msgid "&All"
-@@ -8319,35 +8270,13 @@
- 
- #: kutils/kpluginselector.cpp:111
- msgid ""
--"<qt>"
--"<table>"
--"<tr>"
--"<td><b>Description:</b></td>"
--"<td>%1</td></tr>"
--"<tr>"
--"<td><b>Author:</b></td>"
--"<td>%2</td></tr>"
--"<tr>"
--"<td><b>Version:</b></td>"
--"<td>%3</td></tr>"
--"<tr>"
--"<td><b>License:</b></td>"
--"<td>%4</td></tr></table></qt>"
--msgstr ""
--"<qt>"
--"<table>"
--"<tr>"
--"<td><b>描述：</b></td>"
--"<td>%1</td></tr>"
--"<tr>"
--"<td><b>作者：</b></td>"
--"<td>%2</td></tr>"
--"<tr>"
--"<td><b>版本：</b></td>"
--"<td>%3</td></tr>"
--"<tr>"
--"<td><b>許可證：</b></td>"
--"<td>%4</td></tr></table></qt>"
-+"<qt><table><tr><td><b>Description:</b></td><td>%1</td></tr><tr><td><b>Author:"
-+"</b></td><td>%2</td></tr><tr><td><b>Version:</b></td><td>%3</td></"
-+"tr><tr><td><b>License:</b></td><td>%4</td></tr></table></qt>"
-+msgstr ""
-+"<qt><table><tr><td><b>描述：</b></td><td>%1</td></tr><tr><td><b>作者：</b></"
-+"td><td>%2</td></tr><tr><td><b>版本：</b></td><td>%3</td></tr><tr><td><b>許可"
-+"證：</b></td><td>%4</td></tr></table></qt>"
- 
- #: kutils/kpluginselector.cpp:536
- msgid "(This plugin is not configurable)"
-@@ -8405,17 +8334,19 @@
- 
- #: kutils/kcmoduleproxy.cpp:212
- msgid ""
--"<b>Changes in this section requires root access.</b><br />"
--"Click the \"Administrator Mode\" button to allow modifications."
-+"<b>Changes in this section requires root access.</b><br />Click the "
-+"\"Administrator Mode\" button to allow modifications."
- msgstr "<b>這個部份的更改需要 root 權限。</b><br />請按\"管理員模式\"來更改。"
- 
- #: kutils/kcmoduleproxy.cpp:219
- msgid ""
- "This section requires special permissions, probably for system-wide changes; "
- "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 "這個部份需要特別權限。它的更改很有可能是系統性的。因此，它需要 root 密碼來更改這個模組的選項。如果您不輸入密碼，模組會被關閉。"
-+"change the module's properties. If you do not provide the password, the "
-+"module will be disabled."
-+msgstr ""
-+"這個部份需要特別權限。它的更改很有可能是系統性的。因此，它需要 root 密碼來更"
-+"改這個模組的選項。如果您不輸入密碼，模組會被關閉。"
- 
- #: kutils/kcmoduleproxy.cpp:251
- #, c-format
-@@ -8426,7 +8357,7 @@
- 
- #: kutils/kcmoduleproxy.cpp:324
- msgid "<big>Loading...</big>"
--msgstr "<big>載入中...</big>"
-+msgstr "<big>載入中…</big>"
- 
- #: kutils/ksettings/componentsdialog.cpp:48
- msgid "Select Components"
-@@ -8434,7 +8365,7 @@
- 
- #: kutils/ksettings/dialog.cpp:590
- msgid "Select Components..."
--msgstr "選擇元件..."
-+msgstr "選擇元件…"
- 
- #: kresources/resource.cpp:61
- msgid "resource"
-@@ -8487,7 +8418,7 @@
- 
- #: kresources/configpage.cpp:126
- msgid "&Add..."
--msgstr "新增(&A)..."
-+msgstr "新增(&A)…"
- 
- #: kresources/configpage.cpp:131
- msgid "&Use as Standard"
-@@ -8507,8 +8438,8 @@
- 
- #: kresources/configpage.cpp:360
- msgid ""
--"You cannot remove your standard resource! Please select a new standard resource "
--"first."
-+"You cannot remove your standard resource! Please select a new standard "
-+"resource first."
- msgstr "您不可移除您的標準資源！請先選擇新標準資源。"
- 
- #: kresources/configpage.cpp:394 kresources/configpage.cpp:413
-@@ -8521,14 +8452,14 @@
- 
- #: kresources/configpage.cpp:498
- msgid ""
--"You cannot deactivate the standard resource. Choose another standard resource "
--"first."
-+"You cannot deactivate the standard resource. Choose another standard "
-+"resource first."
- msgstr "您不可移除您的標準資源！請先選擇新標準資源。"
- 
- #: kresources/configpage.cpp:528
- msgid ""
--"There is no valid standard resource! Please select one which is neither "
--"read-only nor inactive."
-+"There is no valid standard resource! Please select one which is neither read-"
-+"only nor inactive."
- msgstr "沒有合法的標準資源！請選擇一個既不是唯讀的也不是非使用中的資源。"
- 
- #: kab/addressbook.cc:168
-@@ -8625,21 +8556,21 @@
- msgid ""
- "Your local kab configuration file \"%1\" could not be created. kab will "
- "probably not work correctly without it.\n"
--"Make sure you have not removed write permission from your local KDE directory "
--"(usually ~/.kde)."
-+"Make sure you have not removed write permission from your local KDE "
-+"directory (usually ~/.kde)."
- msgstr ""
--"無法建立本地端的 kab 設定檔案“%1”。若是沒有該設定檔案，kab 程式可能無法正常運作。請確認您可以對本地端 KDE 目錄 (一般在 ~/.kde) "
--"進行寫入。"
-+"無法建立本地端的 kab 設定檔案“%1”。若是沒有該設定檔案，kab 程式可能無法正常運"
-+"作。請確認您可以對本地端 KDE 目錄 (一般在 ~/.kde) 進行寫入。"
- 
- #: kab/addressbook.cc:461
- msgid ""
--"Your standard kab database file \"%1\" could not be created. kab will probably "
--"not work correctly without it.\n"
--"Make sure you have not removed write permission from your local KDE directory "
--"(usually ~/.kde)."
-+"Your standard kab database file \"%1\" could not be created. kab will "
-+"probably not work correctly without it.\n"
-+"Make sure you have not removed write permission from your local KDE "
-+"directory (usually ~/.kde)."
- msgstr ""
--"無法建立標準 kab 資料庫檔案“%1”。若是沒有該資料庫，kab 程式可能無法正常運作。請確認您可以對本地端 KDE 目錄 (一般在 ~/.kde) "
--"進行寫入。"
-+"無法建立標準 kab 資料庫檔案“%1”。若是沒有該資料庫，kab 程式可能無法正常運作。"
-+"請確認您可以對本地端 KDE 目錄 (一般在 ~/.kde) 進行寫入。"
- 
- #: kab/addressbook.cc:471
- msgid ""
-@@ -8680,7 +8611,8 @@
- 
- #: kab/addressbook.cc:572
- msgid ""
--"The currently loaded file \"%1\" cannot be reloaded. kab may close or save it.\n"
-+"The currently loaded file \"%1\" cannot be reloaded. kab may close or save "
-+"it.\n"
- "Save it if you accidentally deleted your data file.\n"
- "Close it if you intended to do so.\n"
- "Your file will be closed by default."
-@@ -9008,7 +8940,7 @@
- 
- #: kcert/kcertpart.cc:368
- msgid "&Crypto Manager..."
--msgstr "加密管理員(&C)..."
-+msgstr "加密管理員(&C)…"
- 
- #: kcert/kcertpart.cc:369
- msgid "&Import"
-@@ -9016,7 +8948,7 @@
- 
- #: kcert/kcertpart.cc:370
- msgid "&Save..."
--msgstr "儲存(&S)..."
-+msgstr "儲存(&S)…"
- 
- #: kcert/kcertpart.cc:371
- msgid "&Done"
-@@ -9064,7 +8996,7 @@
- 
- #: kcert/kcertpart.cc:619
- msgid "0 - Site Certificate"
--msgstr "0 - 站台認證憑證"
-+msgstr "0 - 站臺認證憑證"
- 
- #: kcert/kcertpart.cc:729 kcert/kcertpart.cc:745
- msgid ""
-@@ -9150,11 +9082,11 @@
- 
- #: kdeui/kstdaction_p.h:48
- msgid "Print Previe&w..."
--msgstr "預覽列印(&W)..."
-+msgstr "預覽列印(&W)…"
- 
- #: kdeui/kstdaction_p.h:49
- msgid "&Mail..."
--msgstr "郵寄(&M)..."
-+msgstr "郵寄(&M)…"
- 
- #: kdeui/kstdaction_p.h:53
- msgid "Re&do"
-@@ -9198,7 +9130,7 @@
- 
- #: kdeui/kstdaction_p.h:73
- msgid "&Zoom..."
--msgstr "縮放(&Z)..."
-+msgstr "縮放(&Z)…"
- 
- #: kdeui/kstdaction_p.h:75
- msgid "&Redisplay"
-@@ -9218,15 +9150,15 @@
- 
- #: kdeui/kstdaction_p.h:84
- msgid "&Go To..."
--msgstr "移至(&G)..."
-+msgstr "移至(&G)…"
- 
- #: kdeui/kstdaction_p.h:85
- msgid "&Go to Page..."
--msgstr "移至頁面(&G)..."
-+msgstr "移至頁面(&G)…"
- 
- #: kdeui/kstdaction_p.h:86
- msgid "&Go to Line..."
--msgstr "跳至行數(&G)..."
-+msgstr "跳至列數(&G)…"
- 
- #: kdeui/kstdaction_p.h:87
- msgid "&First Page"
-@@ -9246,19 +9178,19 @@
- 
- #: kdeui/kstdaction_p.h:100
- msgid "Configure S&hortcuts..."
--msgstr "設定快速鍵(&H)..."
-+msgstr "設定快速鍵(&H)…"
- 
- #: kdeui/kstdaction_p.h:101
- msgid "&Configure %1..."
--msgstr "設定 %1(&C)..."
-+msgstr "設定 %1(&C)…"
- 
- #: kdeui/kstdaction_p.h:102
- msgid "Configure Tool&bars..."
--msgstr "設定工具列(&B)..."
-+msgstr "設定工具列(&B)…"
- 
- #: kdeui/kstdaction_p.h:103
- msgid "Configure &Notifications..."
--msgstr "設定通知(&N)..."
-+msgstr "設定通知(&N)…"
- 
- #: kdeui/kstdaction_p.h:109
- msgid "What's &This?"
-@@ -9409,16 +9341,12 @@
- msgstr "UNIX Sockets (指定給目前主機和目前使用者)"
- 
- #: kdecore/kde-config.cpp.in:203
--msgid ""
--"%1 - unknown type\n"
--msgstr ""
--"%1 - 無法識別的類型\n"
-+msgid "%1 - unknown type\n"
-+msgstr "%1 - 無法識別的類型\n"
- 
- #: kdecore/kde-config.cpp.in:228
--msgid ""
--"%1 - unknown type of userpath\n"
--msgstr ""
--"%1 - 無法識別的用戶路徑類型\n"
-+msgid "%1 - unknown type of userpath\n"
-+msgstr "%1 - 無法識別的用戶路徑類型\n"
- 
- #: attic/qtmultilineedit.cpp:2129
- msgid "Undo"
-@@ -9442,7 +9370,7 @@
- 
- #: attic/qtmultilineedit.cpp:2137
- msgid "Paste special..."
--msgstr "貼上(特殊)..."
-+msgstr "貼上(特殊)…"
- 
- #: attic/qtmultilineedit.cpp:2140 widgets/qlineedit.cpp:2142
- #: widgets/qtextedit.cpp:5483
-@@ -9578,22 +9506,18 @@
- 
- #: dialogs/qmessagebox.cpp:588
- msgid ""
--"<h3>About Qt</h3>"
--"<p>This program uses Qt version %1.</p>"
--"<p>Qt is a C++ toolkit for multiplatform GUI &amp; application development.</p>"
--"<p>Qt provides single-source portability across MS&nbsp;Windows, "
--"Mac&nbsp;OS&nbsp;X, Linux, and all major commercial Unix variants."
--"<br>Qt is also available for embedded devices.</p>"
--"<p>Qt is a Trolltech product. See <tt>http://www.trolltech.com/qt/</tt> "
--"for more information.</p>"
--msgstr ""
--"<h3>關於 Qt</h3>"
--"<p>這個程式使用 Qt %1 版本。</p>"
--"<p>Qt 是一個來自Trolltech 的跨平台 C++ GUI 工具組。</p>"
--"<p>Qt 提供了單一原始碼移植能力，跨越了Windows 95/98/NT/2000、Linux、Solaris、HP-UX 和很多其他使用 X11 的 "
--"Unix 版本。"
--"<br>Qt 也有嵌入式系統用的版本。</p>"
--"<p>請參閱 <tt>http://www.trolltech.com/qt/</tt> 以得到更多資訊。</p>"
-+"<h3>About Qt</h3><p>This program uses Qt version %1.</p><p>Qt is a C++ "
-+"toolkit for multiplatform GUI &amp; application development.</p><p>Qt "
-+"provides single-source portability across MS&nbsp;Windows, Mac&nbsp;OS&nbsp;"
-+"X, Linux, and all major commercial Unix variants.<br>Qt is also available "
-+"for embedded devices.</p><p>Qt is a Trolltech product. See <tt>http://www."
-+"trolltech.com/qt/</tt> for more information.</p>"
-+msgstr ""
-+"<h3>關於 Qt</h3><p>這個程式使用 Qt %1 版本。</p><p>Qt 是一個來自Trolltech 的"
-+"跨平臺 C++ GUI 工具組。</p><p>Qt 提供了單一原始碼移植能力，跨越了Windows "
-+"95/98/NT/2000、Linux、Solaris、HP-UX 和很多其他使用 X11 的 Unix 版本。<br>Qt "
-+"也有嵌入式系統用的版本。</p><p>請參閱 <tt>http://www.trolltech.com/qt/</tt> "
-+"以得到更多資訊。</p>"
- 
- #: dialogs/qmessagebox.cpp:1551
- msgid "About Qt"
-@@ -9621,7 +9545,7 @@
- 
- #: dialogs/qwizard.cpp:188
- msgid "&Help"
--msgstr "說明(&H)"
-+msgstr "求助(&H)"
- 
- #: kernel/qaccel.cpp:470
- msgid "%1, %2 not defined"
-@@ -9643,31 +9567,31 @@
- msgid ""
- "_: QFont\n"
- "Latin"
--msgstr "拉丁文"
-+msgstr "拉丁語"
- 
- #: kernel/qfontdatabase.cpp:1959
- msgid ""
- "_: QFont\n"
- "Greek"
--msgstr "希臘文"
-+msgstr "希臘語"
- 
- #: kernel/qfontdatabase.cpp:1962
- msgid ""
- "_: QFont\n"
- "Cyrillic"
--msgstr "斯拉夫文"
-+msgstr "斯拉夫語"
- 
- #: kernel/qfontdatabase.cpp:1965
- msgid ""
- "_: QFont\n"
- "Armenian"
--msgstr "亞美尼亞文"
-+msgstr "亞美尼亞語"
- 
- #: kernel/qfontdatabase.cpp:1968
- msgid ""
- "_: QFont\n"
- "Georgian"
--msgstr "喬治亞文"
-+msgstr "喬治亞語"
- 
- #: kernel/qfontdatabase.cpp:1971
- msgid ""
-@@ -9697,13 +9621,13 @@
- msgid ""
- "_: QFont\n"
- "Hebrew"
--msgstr "希伯來文"
-+msgstr "希伯來語"
- 
- #: kernel/qfontdatabase.cpp:1986
- msgid ""
- "_: QFont\n"
- "Arabic"
--msgstr "阿拉伯文"
-+msgstr "阿拉伯語"
- 
- #: kernel/qfontdatabase.cpp:1989
- msgid ""
-@@ -9727,7 +9651,7 @@
- msgid ""
- "_: QFont\n"
- "Bengali"
--msgstr "孟加拉文"
-+msgstr "孟加拉語"
- 
- #: kernel/qfontdatabase.cpp:2001
- msgid ""
-@@ -9751,19 +9675,19 @@
- msgid ""
- "_: QFont\n"
- "Tamil"
--msgstr "泰米爾文"
-+msgstr "泰米爾語"
- 
- #: kernel/qfontdatabase.cpp:2013
- msgid ""
- "_: QFont\n"
- "Telugu"
--msgstr "泰盧固文"
-+msgstr "泰盧固語"
- 
- #: kernel/qfontdatabase.cpp:2016
- msgid ""
- "_: QFont\n"
- "Kannada"
--msgstr "坎那達文"
-+msgstr "坎那達語"
- 
- #: kernel/qfontdatabase.cpp:2019
- msgid ""
-@@ -9775,37 +9699,37 @@
- msgid ""
- "_: QFont\n"
- "Sinhala"
--msgstr "錫蘭文"
-+msgstr "錫蘭語"
- 
- #: kernel/qfontdatabase.cpp:2025
- msgid ""
- "_: QFont\n"
- "Thai"
--msgstr "泰文"
-+msgstr "泰語"
- 
- #: kernel/qfontdatabase.cpp:2028
- msgid ""
- "_: QFont\n"
- "Lao"
--msgstr "寮文"
-+msgstr "寮語"
- 
- #: kernel/qfontdatabase.cpp:2031
- msgid ""
- "_: QFont\n"
- "Tibetan"
--msgstr "藏文"
-+msgstr "藏語"
- 
- #: kernel/qfontdatabase.cpp:2034
- msgid ""
- "_: QFont\n"
- "Myanmar"
--msgstr "緬甸文"
-+msgstr "緬甸語"
- 
- #: kernel/qfontdatabase.cpp:2037
- msgid ""
- "_: QFont\n"
- "Khmer"
--msgstr "高棉文"
-+msgstr "高棉語"
- 
- #: kernel/qfontdatabase.cpp:2040
- msgid ""
-@@ -9829,7 +9753,7 @@
- msgid ""
- "_: QFont\n"
- "Hangul"
--msgstr "韓文"
-+msgstr "韓語"
- 
- #: kernel/qfontdatabase.cpp:2052
- msgid ""
-@@ -9841,7 +9765,7 @@
- msgid ""
- "_: QFont\n"
- "Yi"
--msgstr "彝文"
-+msgstr "彝語"
- 
- #: kernel/qfontdatabase.cpp:2058
- msgid ""
-@@ -9859,13 +9783,13 @@
- msgid ""
- "_: QFont\n"
- "Canadian Aboriginal"
--msgstr "加拿大土著文"
-+msgstr "加拿大土著語"
- 
- #: kernel/qfontdatabase.cpp:2067
- msgid ""
- "_: QFont\n"
- "Mongolian"
--msgstr "蒙古文"
-+msgstr "蒙古語"
- 
- #: kernel/qfontdatabase.cpp:2071
- msgid ""
-@@ -9931,13 +9855,13 @@
- msgid ""
- "_: QFont\n"
- "Tagalog"
--msgstr "塔加拉文"
-+msgstr "塔加拉語"
- 
- #: kernel/qfontdatabase.cpp:2115
- msgid ""
- "_: QFont\n"
- "Hanunoo"
--msgstr "菲律賓-漢奴勞族文"
-+msgstr "菲律賓-漢奴勞族語"
- 
- #: kernel/qfontdatabase.cpp:2119
- msgid ""
-@@ -9961,25 +9885,25 @@
- msgid ""
- "_: QFont\n"
- "Han (Japanese)"
--msgstr "漢字(日文)"
-+msgstr "漢字(日語)"
- 
- #: kernel/qfontdatabase.cpp:2135
- msgid ""
- "_: QFont\n"
- "Han (Simplified Chinese)"
--msgstr "漢字(簡體中文)"
-+msgstr "漢字(簡化字漢語)"
- 
- #: kernel/qfontdatabase.cpp:2139
- msgid ""
- "_: QFont\n"
- "Han (Traditional Chinese)"
--msgstr "漢字(正體中文)"
-+msgstr "漢字(傳統字漢語)"
- 
- #: kernel/qfontdatabase.cpp:2143
- msgid ""
- "_: QFont\n"
- "Han (Korean)"
--msgstr "漢字(韓文)"
-+msgstr "漢字(韓語)"
- 
- #: kernel/qfontdatabase.cpp:2147
- msgid ""
-@@ -10531,7 +10455,7 @@
- 
- #: widgets/qmainwindow.cpp:2239
- msgid "Customize..."
--msgstr "自訂..."
-+msgstr "自訂…"
- 
- #: widgets/qtitlebar.cpp:83
- msgid "System Menu"
-@@ -10559,7 +10483,7 @@
- 
- #: widgets/qtoolbar.cpp:700
- msgid "More..."
--msgstr "更多..."
-+msgstr "更多…"
- 
- #: widgets/qwhatsthis.cpp:453
- msgid "What's this?"
-@@ -10715,8 +10639,8 @@
- #: qxml_clean.cpp:65
- msgid ""
- "_: QXml\n"
--"encoding declaration or standalone declaration expected while reading the XML "
--"declaration"
-+"encoding declaration or standalone declaration expected while reading the "
-+"XML declaration"
- msgstr "讀取 XML 聲明時找不到編碼聲明或獨立聲明"
- 
- #: qxml_clean.cpp:66
-diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdelibs/kdeprint.po kde-i18n-zh_TW-3.5.10/messages/kdelibs/kdeprint.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdelibs/kdeprint.po	2008-08-19 20:43:19.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdelibs/kdeprint.po	2011-11-11 15:45:17.000000000 +0100
-@@ -14,8 +14,7 @@
- "Project-Id-Version: kdeprint\n"
- "POT-Creation-Date: 2007-08-27 01:12+0200\n"
- "PO-Revision-Date: 2006-12-18 13:08+0800\n"
--"Last-Translator: Frank Weng (a.k.a. Franklin) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Chinese Traditional <zh-l10n@linux.org.tw>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
-@@ -154,7 +153,7 @@
- 
- #: lpd/kmlpduimanager.cpp:48
- msgid "File printer (print to file)"
--msgstr "檔案印表機 (列印成檔案... 通常是 PS 檔)"
-+msgstr "檔案印表機 (列印成檔案… 通常是 PS 檔)"
- 
- #: lpd/kmlpdmanager.cpp:87
- msgid "Local printer queue (%1)"
-@@ -190,7 +189,8 @@
- 
- #: lpd/kmlpdmanager.cpp:193
- msgid ""
--"Unable to set correct permissions on spool directory %1 for printer <b>%2</b>."
-+"Unable to set correct permissions on spool directory %1 for printer <b>%2</"
-+"b>."
- msgstr "無法設定 <b>%2</b> 印表機所使用的 %1 佇列目錄的權限。"
- 
- #: lpd/kmlpdmanager.cpp:237
-@@ -223,9 +223,11 @@
- 
- #: lpd/kmlpdmanager.cpp:452
- msgid ""
--"The driver device <b>%1</b> is not compiled in your GhostScript distribution. "
--"Check your installation or use another driver."
--msgstr "您系統所使用的 GhostScript 軟體尚未支援這個驅動程式裝置 <b>%1</b>。請檢查您的安裝是否正確，或使用其他的驅動程式。"
-+"The driver device <b>%1</b> is not compiled in your GhostScript "
-+"distribution. Check your installation or use another driver."
-+msgstr ""
-+"您系統所使用的 GhostScript 軟體尚未支援這個驅動程式裝置 <b>%1</b>。請檢查您的"
-+"安裝是否正確，或使用其他的驅動程式。"
- 
- #: lpd/kmlpdmanager.cpp:560
- msgid "Unable to write driver associated files in spool directory."
-@@ -323,20 +325,22 @@
- 
- #: lpr/kmlprmanager.cpp:410
- msgid ""
--"Unable to remove spool directory %1. Check that you have write permissions for "
--"that directory."
-+"Unable to remove spool directory %1. Check that you have write permissions "
-+"for that directory."
- msgstr "無法移除列印佇列目錄 %1。請檢察您有該目錄的寫入權限。"
- 
- #: lpr/kmlprmanager.cpp:458
- msgid "&Edit printcap Entry..."
--msgstr "編輯 printcap 內容(&E)..."
-+msgstr "編輯 printcap 內容(&E)…"
- 
- #: lpr/kmlprmanager.cpp:473
- msgid ""
- "Editing a printcap entry manually should only be done by confirmed system "
- "administrator. This may prevent your printer from working. Do you want to "
- "continue?"
--msgstr "手動編輯 printcap 檔案內容應該最好由系統管理者確認該檔案內容無誤，如此列印工作才能夠正常工作。您確定要繼續嗎？"
-+msgstr ""
-+"手動編輯 printcap 檔案內容應該最好由系統管理者確認該檔案內容無誤，如此列印工"
-+"作才能夠正常工作。您確定要繼續嗎？"
- 
- #: lpr/kmlprmanager.cpp:489
- #, c-format
-@@ -388,7 +392,7 @@
- 
- #: lpr/lprngtoolhandler.cpp:162
- msgid "No driver defined for that printer. It might be a raw printer."
--msgstr "這台印表機尚未定義驅動程式，也許是一台 raw 原始印表機。"
-+msgstr "這臺印表機尚未定義驅動程式，也許是一臺 raw 原始印表機。"
- 
- #: lpr/lprngtoolhandler.cpp:170
- msgid "LPRngTool Common Driver (%1)"
-@@ -407,14 +411,18 @@
- msgid ""
- "Unable to find the executable foomatic-datafile in your PATH. Check that "
- "Foomatic is correctly installed."
--msgstr "在 PATH 中無法找到可執行的 foomatic-datafile。請檢查是否正確安裝了Foomatic 套件程式。"
-+msgstr ""
-+"在 PATH 中無法找到可執行的 foomatic-datafile。請檢查是否正確安裝了Foomatic 套"
-+"件程式。"
- 
- #: cups/kmcupsmanager.cpp:615 lpr/matichandler.cpp:286
- #: lpr/matichandler.cpp:405
- msgid ""
- "Unable to create the Foomatic driver [%1,%2]. Either that driver does not "
- "exist, or you don't have the required permissions to perform that operation."
--msgstr "無法建立 Foomatic 驅動程式 [%1,%2]。可能是該驅動程式存在，或者是您沒有權限來執行此操作。"
-+msgstr ""
-+"無法建立 Foomatic 驅動程式 [%1,%2]。可能是該驅動程式存在，或者是您沒有權限來"
-+"執行此操作。"
- 
- #: lpr/matichandler.cpp:339
- msgid ""
-@@ -423,10 +431,11 @@
- 
- #: lpr/matichandler.cpp:426
- msgid ""
--"Unable to find executable lpdomatic. Check that Foomatic is correctly installed "
--"and that lpdomatic is installed in a standard location."
-+"Unable to find executable lpdomatic. Check that Foomatic is correctly "
-+"installed and that lpdomatic is installed in a standard location."
- msgstr ""
--"找不到 lpdomatic 該執行檔案。請確認系統已經有正確安裝上 Formatic 套件，並且確認 lpdomatic 有安裝在標準的目錄內。"
-+"找不到 lpdomatic 該執行檔案。請確認系統已經有正確安裝上 Formatic 套件，並且確"
-+"認 lpdomatic 有安裝在標準的目錄內。"
- 
- #: lpr/matichandler.cpp:457
- #, c-format
-@@ -459,247 +468,250 @@
- " <qt><b>Printer Location:</b> The <em>Location</em> may describe where the "
- "selected printer is located. The Location description is created by the "
- "administrator of the print system (or may be left empty). </qt>"
--msgstr "<qt><b>印表機位置：</b>「位置」是指印表機放置的位置。通常是由列印系統管理者來填寫，當然也有可能是空白的。</qt>"
-+msgstr ""
-+"<qt><b>印表機位置：</b>「位置」是指印表機放置的位置。通常是由列印系統管理者來"
-+"填寫，當然也有可能是空白的。</qt>"
- 
- #: kprintdialog.cpp:102
- msgid ""
--" <qt><b>Printer Type:</b>  The <em>Type</em> indicates your printer type. </qt>"
-+" <qt><b>Printer Type:</b>  The <em>Type</em> indicates your printer type. </"
-+"qt>"
- msgstr "<qt><b>印表機類型：</b>「類型」指的是您的印表機類型。</qt>"
- 
- #: kprintdialog.cpp:104
- msgid ""
--" <qt><b>Printer State:</b>  The <em>State</em> indicates the state of the print "
--"queue on the print server (which could be your localhost). The state may be "
--"'Idle', 'Processing', 'Stopped', 'Paused' or similar. </qt>"
-+" <qt><b>Printer State:</b>  The <em>State</em> indicates the state of the "
-+"print queue on the print server (which could be your localhost). The state "
-+"may be 'Idle', 'Processing', 'Stopped', 'Paused' or similar. </qt>"
- msgstr ""
--"<qt><b>印表機狀態：</b>「狀態」指的是印表機伺服器（有可能是您自己的主機）上印表佇列的狀態。狀態可能包括：閒置、處理中、已停止等等。</qt>"
-+"<qt><b>印表機狀態：</b>「狀態」指的是印表機伺服器（有可能是您自己的主機）上印"
-+"表佇列的狀態。狀態可能包括：閒置、處理中、已停止等等。</qt>"
- 
- #: kprintdialog.cpp:108
- msgid ""
- " <qt><b>Printer Comment:</b>  The <em>Comment</em> may describe the selected "
--"printer. This comment is created by the administrator of the print system (or "
--"may be left empty). </qt>"
--msgstr "<qt><b>印表機備註：</b>「備註」是所選擇印表機的描述。通常是由列印系統管理者來填寫，當然也有可能是空白的。</qt>"
-+"printer. This comment is created by the administrator of the print system "
-+"(or may be left empty). </qt>"
-+msgstr ""
-+"<qt><b>印表機備註：</b>「備註」是所選擇印表機的描述。通常是由列印系統管理者來"
-+"填寫，當然也有可能是空白的。</qt>"
- 
- #: kprintdialog.cpp:112
- msgid ""
--" <qt><b>Printer Selection Menu:</b>  "
--"<p>Use this combo box to select the printer to which you want to print. "
--"Initially (if you run KDEPrint for the first time), you may only find the   <em>"
--"KDE special printers</em> (which save jobs to disk [as PostScript- or "
--"PDF-files], or deliver jobs via email (as a PDF attachment). If you are missing "
--"a real printer, you need to... "
--"<ul> "
--"<li>...either create a local printer with the help of the <em>"
--"KDE Add Printer Wizard</em>. The Wizard is available for the CUPS and RLPR "
--"printing systems (click button to the left of the <em>'Properties'</em> "
--"button),</li> "
-+" <qt><b>Printer Selection Menu:</b>  <p>Use this combo box to select the "
-+"printer to which you want to print. Initially (if you run KDEPrint for the "
-+"first time), you may only find the   <em>KDE special printers</em> (which "
-+"save jobs to disk [as PostScript- or PDF-files], or deliver jobs via email "
-+"(as a PDF attachment). If you are missing a real printer, you need to... "
-+"<ul> <li>...either create a local printer with the help of the <em>KDE Add "
-+"Printer Wizard</em>. The Wizard is available for the CUPS and RLPR printing "
-+"systems (click button to the left of the <em>'Properties'</em> button),</li> "
- "<li>...or try to connect to an existing remote CUPS print server. You can "
- "connect by clicking the <em>'System Options'</em> button below. A new dialog "
- "opens: click on the <em>'CUPS server'</em> icon: Fill in the information "
--"required to use the remote server. </li>  </ul> "
--"<p><b>Note:</b> It may happen that you successfully connected to a remote CUPS  "
--"server and still do not get a printer list. If this happens: force KDEPrint to  "
--"re-load its configuration files. To reload the configuration files, either "
--"start kprinter again, or use the  switch the print system away from CUPS and "
--"back again once. The print system switch  can be made through a selection in "
--"the drop-down menu at bottom of this dialog when  fully expanded). </p>  </qt>"
--msgstr ""
--"<qt><b>印表機選單：</b> "
--"<p>這個選單能讓您選擇您要列印的印表機。如果您第一次啟動 KDEPrint 或是尚未做任何設定，清單中可能只會有「KDE "
--"特殊印表機」。這個印表機是虛擬的，會將印表工作存成 PostScript 或 PDF 檔，也可以透過 E-mail "
--"附檔方式傳送出去。如果您要實體的印表機，您必須... "
--"<ul> "
--"<li>用「KDE 新增印表機精靈」來產生本地印表機。新增印表機精靈必須是使用 CUPS 或 RLPR "
--"列印系統才能使用，按下「內容」左邊的小按鍵即可叫出。</li> "
--"<li>或是試著連接到遠端的 CUPS 印表伺服器。您可以按下最底下的「系統選項」鍵。按下去後會跳出一個對話框，在左方選擇「CUPS "
--"伺服器」圖示，然後填入遠端伺服器及使用者等資訊即可。</li></ul> "
--"<p><b>注意：</b>有可能在您成功連接到遠端 CUPS 伺服器後卻仍然無法取得印表機清單。如果發生這種情形，請重新載入 KDEPrint "
--"的設定檔。例如關閉後重新啟動 KDEPrint，或是在底下的「目前使用的列印系統」選單，先切換到別的列印系統，再切回 CUPS 列印系統。</p></qt>"
-+"required to use the remote server. </li>  </ul> <p><b>Note:</b> It may "
-+"happen that you successfully connected to a remote CUPS  server and still do "
-+"not get a printer list. If this happens: force KDEPrint to  re-load its "
-+"configuration files. To reload the configuration files, either start "
-+"kprinter again, or use the  switch the print system away from CUPS and back "
-+"again once. The print system switch  can be made through a selection in the "
-+"drop-down menu at bottom of this dialog when  fully expanded). </p>  </qt>"
-+msgstr ""
-+"<qt><b>印表機選單：</b> <p>這個選單能讓您選擇您要列印的印表機。如果您第一次啟"
-+"動 KDEPrint 或是尚未做任何設定，清單中可能只會有「KDE 特殊印表機」。這個印表"
-+"機是虛擬的，會將印表工作存成 PostScript 或 PDF 檔，也可以透過 E-mail 附檔方式"
-+"傳送出去。如果您要實體的印表機，您必須... <ul> <li>用「KDE 新增印表機精靈」來"
-+"產生本地印表機。新增印表機精靈必須是使用 CUPS 或 RLPR 列印系統才能使用，按下"
-+"「內容」左邊的小按鍵即可叫出。</li> <li>或是試著連接到遠端的 CUPS 印表伺服"
-+"器。您可以按下最底下的「系統選項」鍵。按下去後會跳出一個對話框，在左方選擇"
-+"「CUPS 伺服器」圖示，然後填入遠端伺服器及使用者等資訊即可。</li></ul> <p><b>"
-+"注意：</b>有可能在您成功連接到遠端 CUPS 伺服器後卻仍然無法取得印表機清單。如"
-+"果發生這種情形，請重新載入 KDEPrint 的設定檔。例如關閉後重新啟動 KDEPrint，或"
-+"是在底下的「目前使用的列印系統」選單，先切換到別的列印系統，再切回 CUPS 列印"
-+"系統。</p></qt>"
- 
- #: kprintdialog.cpp:137
- msgid ""
--" <qt><b>Print Job Properties:</b>  "
--"<p>This button opens a dialog where you can make decisions regarding all "
--"supported print job options. </qt>"
--msgstr "<qt><b>印表工作內容：</b> <p>這個按鈕會開啟一個對話框，您可以設定列印工作的各種選項。</qt>"
-+" <qt><b>Print Job Properties:</b>  <p>This button opens a dialog where you "
-+"can make decisions regarding all supported print job options. </qt>"
-+msgstr ""
-+"<qt><b>印表工作內容：</b> <p>這個按鈕會開啟一個對話框，您可以設定列印工作的各"
-+"種選項。</qt>"
- 
- #: kprintdialog.cpp:141
- msgid ""
--" <qt><b>Selective View on List of Printers:</b> "
--"<p> This button reduces the list of visible printers to a shorter, more "
--"convenient, pre-defined list.</p> "
--"<p>This is particularly useful in enterprise environments with lots of "
--"printers. The default is to show <b>all</b> printers.</p> "
--"<p>To create a personal <em>'selective view list'</em>, click on the <em>"
--"'System Options'</em> button at the bottom of this dialog. Then, in the new "
--"dialog, select <em>'Filter'</em> (left column in the <em>"
--"KDE Print Configuration</em> dialog) and setup your selection..</p> "
--"<p><b>Warning:</b> Clicking this button without prior creation of a personal  "
--"<em>'selective view list'</em> will make all printers dissappear from the  "
--"view. (To re-enable all printers, just click this button again.) </p>  </qt>"
--msgstr ""
--"<qt><b>切換印表機清單：</b> "
--"<p>這個按鈕可以將印表機清單切換成另一組預先定義好的，較短、較方便的清單。</p> "
--"<p>這個功能對那些在有很多印表機的環境下特別有用。預設是會顯示<b>所有</b>的印表機。</p> "
--"<p>要產生自己的印表機清單，請按最底下的「系統選項」鍵，並在左方點選「過濾器」。</p> "
--"<p><b>警告：</b>如果您沒有預先定義好自己的清單就按下這個鍵，清單上會變成沒有實體印表機。不過只要再按一次就會切換為顯示所有的印表機。</p></qt>"
-+" <qt><b>Selective View on List of Printers:</b> <p> This button reduces the "
-+"list of visible printers to a shorter, more convenient, pre-defined list.</"
-+"p> <p>This is particularly useful in enterprise environments with lots of "
-+"printers. The default is to show <b>all</b> printers.</p> <p>To create a "
-+"personal <em>'selective view list'</em>, click on the <em>'System Options'</"
-+"em> button at the bottom of this dialog. Then, in the new dialog, select "
-+"<em>'Filter'</em> (left column in the <em>KDE Print Configuration</em> "
-+"dialog) and setup your selection..</p> <p><b>Warning:</b> Clicking this "
-+"button without prior creation of a personal  <em>'selective view list'</em> "
-+"will make all printers dissappear from the  view. (To re-enable all "
-+"printers, just click this button again.) </p>  </qt>"
-+msgstr ""
-+"<qt><b>切換印表機清單：</b> <p>這個按鈕可以將印表機清單切換成另一組預先定義好"
-+"的，較短、較方便的清單。</p> <p>這個功能對那些在有很多印表機的環境下特別有"
-+"用。預設是會顯示<b>所有</b>的印表機。</p> <p>要產生自己的印表機清單，請按最底"
-+"下的「系統選項」鍵，並在左方點選「過濾器」。</p> <p><b>警告：</b>如果您沒有預"
-+"先定義好自己的清單就按下這個鍵，清單上會變成沒有實體印表機。不過只要再按一次"
-+"就會切換為顯示所有的印表機。</p></qt>"
- 
- #: kprintdialog.cpp:154
- msgid ""
--"<qt><b>KDE Add Printer Wizard</b> "
--"<p>This button starts the <em>KDE Add Printer Wizard</em>.</p> "
--"<p>Use the Wizard (with <em>\"CUPS\"</em> or <em>\"RLPR\"</em>"
--") to add locally defined printers to your system. </p> "
--"<p><b>Note:</b> The <em>KDE Add Printer Wizard</em> does <b>not</b> "
--"work,  and this button is disabled if you use  <em>\"Generic LPD</em>\", <em>"
--"\"LPRng\"</em>, or <em>\"Print Through  an External Program</em>\".) </p>  </qt>"
-+"<qt><b>KDE Add Printer Wizard</b> <p>This button starts the <em>KDE Add "
-+"Printer Wizard</em>.</p> <p>Use the Wizard (with <em>\"CUPS\"</em> or <em>"
-+"\"RLPR\"</em>) to add locally defined printers to your system. </p> "
-+"<p><b>Note:</b> The <em>KDE Add Printer Wizard</em> does <b>not</b> work,  "
-+"and this button is disabled if you use  <em>\"Generic LPD</em>\", <em>\"LPRng"
-+"\"</em>, or <em>\"Print Through  an External Program</em>\".) </p>  </qt>"
- msgstr ""
--"<qt><b>KDE 新增印表機精靈</b> "
--"<p>這個按鈕會啟動「KDE 新增印表機精靈」。</p> "
-+"<qt><b>KDE 新增印表機精靈</b> <p>這個按鈕會啟動「KDE 新增印表機精靈」。</p> "
- "<p>如果您選擇 CUPS 或 RLPR 列印系統，您可以用這個精靈來新增本地印表機。</p> "
--"<p><b>注意：</b>「KDE 新增印表機精靈」在其他的列印系統下無法使用，按鈕也將失效。</p></qt>"
-+"<p><b>注意：</b>「KDE 新增印表機精靈」在其他的列印系統下無法使用，按鈕也將失"
-+"效。</p></qt>"
- 
- #: kprintdialog.cpp:163
- msgid ""
--" <qt><b>External Print Command</b> "
--"<p>Here you can enter any command that would also print for you in  a <em>"
--"konsole</em> window. </p> <b>Example:</b> "
-+" <qt><b>External Print Command</b> <p>Here you can enter any command that "
-+"would also print for you in  a <em>konsole</em> window. </p> <b>Example:</b> "
- "<pre>a2ps -P &lt;printername&gt; --medium=A3</pre>. </qt>"
- msgstr ""
--"<qt><b>外部列印命令</b> "
--"<p>您可以在這裡輸入列印的指令。</p> <b>例如：</b> "
-+"<qt><b>外部列印命令</b> <p>您可以在這裡輸入列印的指令。</p> <b>例如：</b> "
- "<pre>a2ps -P &lt;printername&gt; --medium=A3</pre> </qt>"
- 
- #: kprintdialog.cpp:168
- msgid ""
--" <qt><b>Additional Print Job Options</b> "
--"<p>This button shows or hides additional printing options.</qt>"
--msgstr "<qt><b>顯示/隱藏進階列印工作選項</b> <p>這個按鈕會顯示或隱藏進階的列印工作選項。</qt>"
-+" <qt><b>Additional Print Job Options</b> <p>This button shows or hides "
-+"additional printing options.</qt>"
-+msgstr ""
-+"<qt><b>顯示/隱藏進階列印工作選項</b> <p>這個按鈕會顯示或隱藏進階的列印工作選"
-+"項。</qt>"
- 
- #: kprintdialog.cpp:170
- msgid ""
--" <qt><b>System Options:</b>  "
--"<p>This button starts a new dialog where you can adjust various settings of "
--"your printing system. Amongst them: "
--"<ul>"
--"<li> Should KDE applications embed all fonts into the PostScript they generate "
--"for printing? "
--"<li> Should KDE use an external PostScript viewer like <em>gv</em> "
--"for print page previews? "
--"<li> Should KDEPrint use a local or a remote CUPS server?, </ul> "
--"and many more....  </qt>"
--msgstr ""
--"<qt><b>系統選項</b> "
--"<p>這個按鈕會開啟一個對話框，您可以在這裡調整您的列印系統的設定。例如： "
--"<ul> "
--"<li>是不是要讓 KDE 應用程式在產生列印工作時，將所有的字型嵌入 PostScript 中？</li> "
--"<li>KDE 是否要用外部的 PostScript 觀看軟體（如 gv）來預覽列印？</li> "
--"<li>KDEPrint 要用本地還是遠端的 CUPS 伺服器？</li> ......等等。</qt>"
-+" <qt><b>System Options:</b>  <p>This button starts a new dialog where you "
-+"can adjust various settings of your printing system. Amongst them: <ul><li> "
-+"Should KDE applications embed all fonts into the PostScript they generate "
-+"for printing? <li> Should KDE use an external PostScript viewer like <em>gv</"
-+"em> for print page previews? <li> Should KDEPrint use a local or a remote "
-+"CUPS server?, </ul> and many more....  </qt>"
-+msgstr ""
-+"<qt><b>系統選項</b> <p>這個按鈕會開啟一個對話框，您可以在這裡調整您的列印系統"
-+"的設定。例如： <ul> <li>是不是要讓 KDE 應用程式在產生列印工作時，將所有的字型"
-+"嵌入 PostScript 中？</li> <li>KDE 是否要用外部的 PostScript 觀看軟體（如 gv）"
-+"來預覽列印？</li> <li>KDEPrint 要用本地還是遠端的 CUPS 伺服器？</li> ......等"
-+"等。</qt>"
- 
- #: kprintdialog.cpp:182
- msgid ""
--" <qt><b>Help:</b> This button takes you to the complete <em>KDEPrint Manual</em>"
--". </qt>"
-+" <qt><b>Help:</b> This button takes you to the complete <em>KDEPrint Manual</"
-+"em>. </qt>"
- msgstr "<qt><b>說明：</b>這個按鈕會帶您到「KDEPrint 手冊」。</qt>"
- 
- #: kprintdialog.cpp:186
- msgid ""
--" <qt><b>Cancel:</b> This button cancels your print job and quits the kprinter "
--"dialog. </qt>"
--msgstr "<qt><b>取消：</b>這個按鈕會取消您的列印工作，並離開 kprinter 視窗。</qt>"
-+" <qt><b>Cancel:</b> This button cancels your print job and quits the "
-+"kprinter dialog. </qt>"
-+msgstr ""
-+"<qt><b>取消：</b>這個按鈕會取消您的列印工作，並離開 kprinter 視窗。</qt>"
- 
- #: kprintdialog.cpp:190
- msgid ""
- " <qt><b>Print:</b> This button sends the job to the printing process. If you "
--"are sending non-PostScript files, you may be asked if you want KDE to convert "
--"the files into PostScript, or if you want your print subsystem (like CUPS) to "
--"do this. </qt>"
--msgstr ""
--"<qt><b>列印：</b>這個按鈕會送出列印工作。如果您送出的是非 PostScript 檔案，系統會先詢問您是不是要將檔案轉成 "
--"PostScript，還是您要交給您的列印子系統（如 CUPS）來進行轉換的工作。</qt>"
-+"are sending non-PostScript files, you may be asked if you want KDE to "
-+"convert the files into PostScript, or if you want your print subsystem (like "
-+"CUPS) to do this. </qt>"
-+msgstr ""
-+"<qt><b>列印：</b>這個按鈕會送出列印工作。如果您送出的是非 PostScript 檔案，系"
-+"統會先詢問您是不是要將檔案轉成 PostScript，還是您要交給您的列印子系統（如 "
-+"CUPS）來進行轉換的工作。</qt>"
- 
- #: kprintdialog.cpp:196
- msgid ""
--" <qt><b>Keep Printing Dialog Open</b>"
--"<p>If you enable this checkbox, the printing dialog stays open after you hit "
--"the <em>Print</em> button.</p> "
--"<p> This is especially useful, if you need to test various print settings (like "
-+" <qt><b>Keep Printing Dialog Open</b><p>If you enable this checkbox, the "
-+"printing dialog stays open after you hit the <em>Print</em> button.</p> <p> "
-+"This is especially useful, if you need to test various print settings (like "
- "color matching for an inkjet printer) or if you want to send your job to "
--"multiple printers (one after the other) to have it finished more quickly.</p> "
--"</qt>"
-+"multiple printers (one after the other) to have it finished more quickly.</"
-+"p> </qt>"
- msgstr ""
--"<qt><b>列印過程中顯示這個對話方塊</b> "
--"<p>如果您開啟此選項，按下「列印」鍵後，這個視窗仍然會保持開啟。</p> "
--"<p>如果您是在測試不同的列印設定，如顏色調整，或是您要將一份列印工作分別送到不同的印表機去，這個選項就很有用。</p></qt>"
-+"<qt><b>列印過程中顯示這個對話方塊</b> <p>如果您開啟此選項，按下「列印」鍵後，"
-+"這個視窗仍然會保持開啟。</p> <p>如果您是在測試不同的列印設定，如顏色調整，或"
-+"是您要將一份列印工作分別送到不同的印表機去，這個選項就很有用。</p></qt>"
- 
- #: kprintdialog.cpp:206
- msgid ""
- " <qt><b>Output File Name and Path:</b> The \"Output file:\" shows  you where "
--"your file will be saved if you decide to \"Print to File\" your job, using one "
--"of the KDE <em>Special Printers</em> named \"Print to File (PostScript)\" or "
--"\"Print to File (PDF)\". Choose a name and location that suits your need by "
--"using the button and/or editing the line on the right. </qt>"
--msgstr "<qt><b>輸出檔案：</b>這裡讓您填入您的列印工作要儲存到哪個路徑哪個檔案中。您可以用右邊的小按鍵來瀏覽目錄與檔案。</qt>"
-+"your file will be saved if you decide to \"Print to File\" your job, using "
-+"one of the KDE <em>Special Printers</em> named \"Print to File (PostScript)"
-+"\" or \"Print to File (PDF)\". Choose a name and location that suits your "
-+"need by using the button and/or editing the line on the right. </qt>"
-+msgstr ""
-+"<qt><b>輸出檔案：</b>這裡讓您填入您的列印工作要儲存到哪個路徑哪個檔案中。您可"
-+"以用右邊的小按鍵來瀏覽目錄與檔案。</qt>"
- 
- #: kprintdialog.cpp:214
- msgid ""
- " <qt><b>Output File Name and Path:</b> Edit this line to create a  path and "
--"filename that suits your needs. (Button and Lineedit field are only available "
--"if you \"Print to File\") </qt>"
-+"filename that suits your needs. (Button and Lineedit field are only "
-+"available if you \"Print to File\") </qt>"
- msgstr "<qt><b>輸出檔案：</b>您可以在這裡填入您要儲存的路徑與檔名。</qt>"
- 
- #: kprintdialog.cpp:219
- msgid ""
- " <qt><b>Browse Directories button:<b> This button calls  the \"File Open / "
--"Browsed Directories\" dialog to let you choose a directory and file name where "
--"your \"Print-to-File\" job should be saved. </qt>"
--msgstr "<qt><b>瀏覽目錄：</b>這個按鈕會呼叫「開啟檔案」對話框，讓您選擇要儲存的目錄與檔案。</qt>"
-+"Browsed Directories\" dialog to let you choose a directory and file name "
-+"where your \"Print-to-File\" job should be saved. </qt>"
-+msgstr ""
-+"<qt><b>瀏覽目錄：</b>這個按鈕會呼叫「開啟檔案」對話框，讓您選擇要儲存的目錄與"
-+"檔案。</qt>"
- 
- #: kprintdialog.cpp:225
- msgid ""
--" <qt><b>Add File to Job</b> "
--"<p>This button calls the \"File Open / Browse Directories\" dialog to allow you "
--"to select a file for printing. Note, that  "
--"<ul>"
--"<li>you can select ASCII or International Text, PDF, PostScript, JPEG, TIFF, "
--"PNG, GIF and many other graphical formats. "
--"<li>you can select various files from different paths and send them as one "
--"\"multi-file job\" to the printing system. </ul> </qt>"
--msgstr ""
--"<qt><b>新增列印檔案</b> "
--"<p>這個按鈕會叫出「開啟檔案」對話框，讓您選擇您要列印的檔案。注意： "
--"<ul> "
--"<li>您可以選擇文字檔、PDF、PostScript、JPEG、TIFF、PNG、GIF 及其他許多圖片格式的檔案。</li>"
--"<li>您也可以從不同路徑選擇多個檔案，變成一個「多重檔案列印工作」並送到列印系統。</li> </ul></qt>"
-+" <qt><b>Add File to Job</b> <p>This button calls the \"File Open / Browse "
-+"Directories\" dialog to allow you to select a file for printing. Note, that  "
-+"<ul><li>you can select ASCII or International Text, PDF, PostScript, JPEG, "
-+"TIFF, PNG, GIF and many other graphical formats. <li>you can select various "
-+"files from different paths and send them as one \"multi-file job\" to the "
-+"printing system. </ul> </qt>"
-+msgstr ""
-+"<qt><b>新增列印檔案</b> <p>這個按鈕會叫出「開啟檔案」對話框，讓您選擇您要列印"
-+"的檔案。注意： <ul> <li>您可以選擇文字檔、PDF、PostScript、JPEG、TIFF、PNG、"
-+"GIF 及其他許多圖片格式的檔案。</li><li>您也可以從不同路徑選擇多個檔案，變成一"
-+"個「多重檔案列印工作」並送到列印系統。</li> </ul></qt>"
- 
- #: kprintdialog.cpp:237
- msgid ""
--" <qt><b>Print Preview</b> Enable this checkbox if you want to see a preview of "
--"your printout. A preview lets you check if, for instance, your intended "
-+" <qt><b>Print Preview</b> Enable this checkbox if you want to see a preview "
-+"of your printout. A preview lets you check if, for instance, your intended "
- "\"poster\" or \"pamphlet\" layout looks like you expected, without wasting "
- "paper first. It also lets you cancel the job if something looks wrong.  "
- "<p><b>Note:</b> The preview feature (and therefore this checkbox)  is only "
- "visible for printjobs created from inside KDE applications.  If you start "
--"kprinter from the commandline, or if you use kprinter  as a print command for "
--"non-KDE applications (like Acrobat Reader,  Firefox or OpenOffice), print "
--"preview is not available here.  </qt>"
--msgstr ""
--"<qt><b>預覽列印</b>開啟這個選項的話，您會先預覽列印的結果。您可以確認列印出來的效果如何。 "
--"<p><b>注意：</b>這個預覽列印的功能及選項只在您是透過 KDE 應用程式送出列印工作時才有效。如果您是直接從命令列啟動 kprinter，或是您用 "
--"kprinter 做為非 KDE 應用程式（如 Acrobat Reader 或 FireFox 等）列印介面，則無法使用預覽列印功能。</qt>"
-+"kprinter from the commandline, or if you use kprinter  as a print command "
-+"for non-KDE applications (like Acrobat Reader,  Firefox or OpenOffice), "
-+"print preview is not available here.  </qt>"
-+msgstr ""
-+"<qt><b>預覽列印</b>開啟這個選項的話，您會先預覽列印的結果。您可以確認列印出來"
-+"的效果如何。 <p><b>注意：</b>這個預覽列印的功能及選項只在您是透過 KDE 應用程"
-+"式送出列印工作時才有效。如果您是直接從命令列啟動 kprinter，或是您用 kprinter "
-+"做為非 KDE 應用程式（如 Acrobat Reader 或 FireFox 等）列印介面，則無法使用預"
-+"覽列印功能。</qt>"
- 
- #: kprintdialog.cpp:250
- msgid ""
--" <qt><b>Set as Default Printer</b> This button sets the current printer as the "
--"user's default.  "
--"<p><b>Note:</b> (Button is only visible if the checkbox for  <em>"
--"System Options</em> --> <em>General</em> --> <em>Miscellaneous</em>: <em>"
--"\"Defaults to the last printer used in the application\"</em> "
--"is disabled.) </qt>"
-+" <qt><b>Set as Default Printer</b> This button sets the current printer as "
-+"the user's default.  <p><b>Note:</b> (Button is only visible if the checkbox "
-+"for  <em>System Options</em> --> <em>General</em> --> <em>Miscellaneous</"
-+"em>: <em>\"Defaults to the last printer used in the application\"</em> is "
-+"disabled.) </qt>"
- msgstr ""
- "<qt><b>設成預設印表機</b>這個按鈕會將目前的印表機設成使用者預設的印表機。 "
--"<p><b>注意：</b>這個選項只在您把「系統選項」→「一般」→「預設使用該應用程式中上一次使用的印表機」這個選項關閉時才會出現。</p></qt>"
-+"<p><b>注意：</b>這個選項只在您把「系統選項」→「一般」→「預設使用該應用程式中"
-+"上一次使用的印表機」這個選項關閉時才會出現。</p></qt>"
- 
- #: kprintdialog.cpp:265 management/kmmainview.cpp:290 management/kmwend.cpp:90
- #: management/smbview.cpp:43
-@@ -747,7 +759,7 @@
- 
- #: kprintdialog.cpp:305
- msgid "Add printer..."
--msgstr "新增印表機..."
-+msgstr "新增印表機…"
- 
- #: cups/ippreportdlg.cpp:34 cups/ippreportdlg.cpp:41 kprintdialog.cpp:307
- msgid "&Print"
-@@ -803,7 +815,7 @@
- 
- #: kprintdialog.cpp:929
- msgid "Initializing printing system..."
--msgstr "正在初始化列印系統..."
-+msgstr "正在初始化列印系統…"
- 
- #: kprintdialog.cpp:965
- msgid "Print to File"
-@@ -815,120 +827,89 @@
- 
- #: cups/kpschedulepage.cpp:40
- msgid ""
--" <qt> "
--"<p><b>Print Job Billing and Accounting</b></p>  "
--"<p>Insert a meaningful string here to associate the current print job with a "
--"certain account. This string will appear in the CUPS \"page_log\" to help with "
--"the print accounting in your organization. (Leave it empty if you do not need "
--"it.) "
--"<p> It is useful for people who print on behalf of different \"customers\", "
--"like print service bureaux, letter shops, press and prepress companies, or "
--"secretaries who serve different bosses, etc.</p> "
--"<br>  "
--"<hr>  "
-+" <qt> <p><b>Print Job Billing and Accounting</b></p>  <p>Insert a meaningful "
-+"string here to associate the current print job with a certain account. This "
-+"string will appear in the CUPS \"page_log\" to help with the print "
-+"accounting in your organization. (Leave it empty if you do not need it.) <p> "
-+"It is useful for people who print on behalf of different \"customers\", like "
-+"print service bureaux, letter shops, press and prepress companies, or "
-+"secretaries who serve different bosses, etc.</p> <br>  <hr>  "
- "<p><em><b>Additional hint for power users:</b> This KDEPrint GUI element "
--"matches  with the CUPS commandline job option parameter:</em>  "
--"<pre>    -o job-billing=...         # example: \"Marketing_Department\" or "
--"\"Joe_Doe\"  </pre> </p>  </qt>"
--msgstr ""
--"<qt> "
--"<p><b>收費資訊：</b></p> "
--"<p>這裡可以定義一個字串，將目前的列印工作與目前的使用者帳號紀錄下來。這個字串會顯示在 CUPS 的 page_log "
--"中，讓您可以向使用者收費。如果您不需要此功能，將此欄位留白即可。 </p> "
--"<br>"
--"<br> "
--"<p><b>進階使用者的額外提示：</b>這個選項與以下的 CUPS 命令列選項參數是一樣的： "
--"<pre>     -o job-billing=...          # 例：\"Marketing_Department\"或\"Joe\"  "
--"</pre></p></qt>"
-+"matches  with the CUPS commandline job option parameter:</em>  <pre>    -o "
-+"job-billing=...         # example: \"Marketing_Department\" or \"Joe_Doe\"  "
-+"</pre> </p>  </qt>"
-+msgstr ""
-+"<qt> <p><b>收費資訊：</b></p> <p>這裡可以定義一個字串，將目前的列印工作與目前"
-+"的使用者帳號紀錄下來。這個字串會顯示在 CUPS 的 page_log 中，讓您可以向使用者"
-+"收費。如果您不需要此功能，將此欄位留白即可。 </p> <br><br> <p><b>進階使用者的"
-+"額外提示：</b>這個選項與以下的 CUPS 命令列選項參數是一樣的： <pre>     -o "
-+"job-billing=...          # 例：\"Marketing_Department\"或\"Joe\"  </pre></"
-+"p></qt>"
- 
- #: cups/kpschedulepage.cpp:60
- msgid ""
--" <qt> "
--"<p><b>Scheduled Printing</b></p>  "
--"<p>Scheduled printing lets you control the time of the actual printout, while "
--"you can still send away your job <b>now</b> and have it out of your way. "
--"<p> Especially useful is the \"Never (hold indefinitely)\" option. It allows "
--"you to park your job until a time when you (or a printer administrator) decides "
--"to manually release it. "
--"<p> This is often required in enterprise environments, where you normally are "
--"not allowed to directly and immediately access the huge production printers in "
--"your <em>Central Repro Department</em>. However it is okay to send jobs to the "
--"queue which is under the control of the operators (who, after all, need to make "
--"sure that the 10,000 sheets of pink paper which is required by the Marketing "
--"Department for a particular job are available and loaded into the paper "
--"trays).</p> "
--"<br>  "
--"<hr>  "
--"<p><em><b>Additional hint for power users:</b> This KDEPrint GUI element "
--"matches  with the CUPS commandline job option parameter:</em>  "
--"<pre>    -o job-hold-until=...      # example: \"indefinite\" or \"no-hold\"  "
--"</pre> </p>  </qt>"
--msgstr ""
--"<qt> "
--"<p><b>列印排程</b></p> "
--"<p>列印排程讓您可以控制實際執行列印的時間。不過您還是可以<b>馬上</b>把您的列印工作送出去。 "
--"<p>通常在這些選項當中，最有用的當屬「無限期停止列印」。這個選項讓您可以暫時停止所有的列印工作，直到您（或列印管理員）決定再開始列印為止。</p> "
--"<p>這通常在企業環境上會較常用到。不過這段期間您還是可以將列印工作送到列印佇列之中。</p> "
--"<br> "
--"<br> "
--"<p><b>進階使用者的額外提示：</b>這個選項與以下的 CUPS 命令列選項參數是一樣的： "
--"<pre>     -o job-hold-until=...          # 例：\"indefinite\"或\"no-hold\"  </pre>"
--"</p></qt>"
-+" <qt> <p><b>Scheduled Printing</b></p>  <p>Scheduled printing lets you "
-+"control the time of the actual printout, while you can still send away your "
-+"job <b>now</b> and have it out of your way. <p> Especially useful is the "
-+"\"Never (hold indefinitely)\" option. It allows you to park your job until a "
-+"time when you (or a printer administrator) decides to manually release it. "
-+"<p> This is often required in enterprise environments, where you normally "
-+"are not allowed to directly and immediately access the huge production "
-+"printers in your <em>Central Repro Department</em>. However it is okay to "
-+"send jobs to the queue which is under the control of the operators (who, "
-+"after all, need to make sure that the 10,000 sheets of pink paper which is "
-+"required by the Marketing Department for a particular job are available and "
-+"loaded into the paper trays).</p> <br>  <hr>  <p><em><b>Additional hint for "
-+"power users:</b> This KDEPrint GUI element matches  with the CUPS "
-+"commandline job option parameter:</em>  <pre>    -o job-hold-until=...      "
-+"# example: \"indefinite\" or \"no-hold\"  </pre> </p>  </qt>"
-+msgstr ""
-+"<qt> <p><b>列印排程</b></p> <p>列印排程讓您可以控制實際執行列印的時間。不過您"
-+"還是可以<b>馬上</b>把您的列印工作送出去。 <p>通常在這些選項當中，最有用的當屬"
-+"「無限期停止列印」。這個選項讓您可以暫時停止所有的列印工作，直到您（或列印管"
-+"理員）決定再開始列印為止。</p> <p>這通常在企業環境上會較常用到。不過這段期間"
-+"您還是可以將列印工作送到列印佇列之中。</p> <br> <br> <p><b>進階使用者的額外提"
-+"示：</b>這個選項與以下的 CUPS 命令列選項參數是一樣的： <pre>     -o job-hold-"
-+"until=...          # 例：\"indefinite\"或\"no-hold\"  </pre></p></qt>"
- 
- #: cups/kpschedulepage.cpp:87
- msgid ""
--" <qt> "
--"<p><b>Page Labels</b></p>  "
--"<p>Page Labels are printed by CUPS at the top and bottom of each page. They "
--"appear on the pages surrounded by a little frame box. "
--"<p>They contain any string you type into the line edit field.</p> "
--"<br>  "
--"<hr>  "
--"<p><em><b>Additional hint for power users:</b> This KDEPrint GUI element "
--"matches  with the CUPS commandline job option parameter:</em>  "
--"<pre>    -o page-label=\"...\"      # example: \"Company Confidential\"  </pre> "
--"</p>  </qt>"
--msgstr ""
--"<qt>"
--"<p><b>頁面標籤</b></p> "
--"<p>頁面標籤由 CUPS 印在每一頁的頂部或底端。</p> "
--"<p>您可以在此欄位中輸入您要使用的頁面標籤。</p>"
--"<p><b>進階使用者的額外提示：</b>這個選項與以下的 CUPS 命令列選項參數是一樣的： "
--"<pre>     -o page-label=...          # 例：\"Company Confidential\"  </pre></p>"
--"</qt>"
-+" <qt> <p><b>Page Labels</b></p>  <p>Page Labels are printed by CUPS at the "
-+"top and bottom of each page. They appear on the pages surrounded by a little "
-+"frame box. <p>They contain any string you type into the line edit field.</p> "
-+"<br>  <hr>  <p><em><b>Additional hint for power users:</b> This KDEPrint GUI "
-+"element matches  with the CUPS commandline job option parameter:</em>  "
-+"<pre>    -o page-label=\"...\"      # example: \"Company Confidential\"  </"
-+"pre> </p>  </qt>"
-+msgstr ""
-+"<qt><p><b>頁面標籤</b></p> <p>頁面標籤由 CUPS 印在每一頁的頂部或底端。</p> "
-+"<p>您可以在此欄位中輸入您要使用的頁面標籤。</p><p><b>進階使用者的額外提示：</"
-+"b>這個選項與以下的 CUPS 命令列選項參數是一樣的： <pre>     -o page-"
-+"label=...          # 例：\"Company Confidential\"  </pre></p></qt>"
- 
- #: cups/kpschedulepage.cpp:102
- msgid ""
--" <qt> "
--"<p><b>Job Priority</b></p>  "
--"<p>Usually CUPS prints all jobs per queue according to the \"FIFO\" principle: "
--"<em>First In, First Out</em>. "
--"<p> The job priority option allows you to re-order the queue according to your "
--"needs. "
--"<p> It works in both directions: you can increase as well as decrease "
--"priorities. (Usually you can only control your <b>own</b> jobs). "
--"<p> Since the default job priority is \"50\", any job sent with, for example, "
--"\"49\" will be printed only after all those others have finished. Conversely, a "
--"\"51\" or higher priority job will go right to the top of a populated queue (if "
--"no other, higher prioritized one is present).</p> "
--"<br>  "
--"<hr>  "
-+" <qt> <p><b>Job Priority</b></p>  <p>Usually CUPS prints all jobs per queue "
-+"according to the \"FIFO\" principle: <em>First In, First Out</em>. <p> The "
-+"job priority option allows you to re-order the queue according to your "
-+"needs. <p> It works in both directions: you can increase as well as decrease "
-+"priorities. (Usually you can only control your <b>own</b> jobs). <p> Since "
-+"the default job priority is \"50\", any job sent with, for example, \"49\" "
-+"will be printed only after all those others have finished. Conversely, a \"51"
-+"\" or higher priority job will go right to the top of a populated queue (if "
-+"no other, higher prioritized one is present).</p> <br>  <hr>  "
- "<p><em><b>Additional hint for power users:</b> This KDEPrint GUI element "
--"matches  with the CUPS commandline job option parameter:</em>  "
--"<pre>    -o job-priority=...   # example: \"10\" or \"66\" or \"99\"  </pre> "
--"</p>  </qt>"
-+"matches  with the CUPS commandline job option parameter:</em>  <pre>    -o "
-+"job-priority=...   # example: \"10\" or \"66\" or \"99\"  </pre> </p>  </qt>"
- msgstr ""
--"<qt> "
--"<p><b>工作優先等級</b></p> "
--"<p>通常 CUPS 的列印工作佇列是根據「先進先出」(FIFO) 的原則來排列。 </p> "
--"<p>這個選項允許您根據您的需求來重新排列佇列內的工作。</p> "
--"<p>您可以選擇要增加還是降低您的優先等級。（通常您只能改變您自己的列印工作。）</p> "
--"<p>預設值為 50，設定等級為 49 的列印工作，就要等到其他的工作都完成後才會被執行，而設定為 51 "
--"的列印工作，則會立即被排到佇列的最前面，如果沒有比它更高等級的列印工作的話。</p> "
--"<br>"
--"<br>"
--"<p><b>進階使用者的額外提示：</b>這個選項與以下的 CUPS 命令列選項參數是一樣的： "
--"<pre>     -o job-priority=...          # 例：\"10\" 或\"66\"  </pre></p></qt>"
-+"<qt> <p><b>工作優先等級</b></p> <p>通常 CUPS 的列印工作佇列是根據「先進先出」"
-+"(FIFO) 的原則來排列。 </p> <p>這個選項允許您根據您的需求來重新排列佇列內的工"
-+"作。</p> <p>您可以選擇要增加還是降低您的優先等級。（通常您只能改變您自己的列"
-+"印工作。）</p> <p>預設值為 50，設定等級為 49 的列印工作，就要等到其他的工作都"
-+"完成後才會被執行，而設定為 51 的列印工作，則會立即被排到佇列的最前面，如果沒"
-+"有比它更高等級的列印工作的話。</p> <br><br><p><b>進階使用者的額外提示：</b>這"
-+"個選項與以下的 CUPS 命令列選項參數是一樣的： <pre>     -o job-"
-+"priority=...          # 例：\"10\" 或\"66\"  </pre></p></qt>"
- 
- #: cups/kpschedulepage.cpp:126
- msgid "Advanced Options"
-@@ -1032,11 +1013,12 @@
- 
- #: cups/kmwbanners.cpp:99
- msgid ""
--"<p>Select the default banners associated with this printer. These banners will "
--"be inserted before and/or after each print job sent to the printer. If you "
--"don't want to use banners, select <b>No Banner</b>.</p>"
-+"<p>Select the default banners associated with this printer. These banners "
-+"will be inserted before and/or after each print job sent to the printer. If "
-+"you don't want to use banners, select <b>No Banner</b>.</p>"
- msgstr ""
--"<p>選擇對應這個印表機的預設旗幟。這些旗幟將被插入到送往該印表機的每項列印工作的前面和/或後面。如果您不想使用旗幟，請選擇 <b>無旗幟</b>。</p>"
-+"<p>選擇對應這個印表機的預設旗幟。這些旗幟將被插入到送往該印表機的每項列印工作"
-+"的前面和/或後面。如果您不想使用旗幟，請選擇 <b>無旗幟</b>。</p>"
- 
- #: cups/cupsaddsmb2.cpp:55 cups/cupsaddsmb2.cpp:363
- msgid "&Export"
-@@ -1060,37 +1042,40 @@
- 
- #: cups/cupsaddsmb2.cpp:79
- msgid ""
--"<p><b>Samba server</b></p>Adobe Windows PostScript driver files plus the CUPS "
--"printer PPD will be exported to the <tt>[print$]</tt> "
--"special share of the Samba server (to change the source CUPS server, use the "
--"<nobr><i>Configure Manager -> CUPS server</i></nobr> first). The <tt>"
--"[print$]</tt> share must exist on the Samba side prior to clicking the <b>"
--"Export</b> button below."
--msgstr ""
--"<p><b>Samba 伺服器</b></p>Adobe Windows PostScript 驅動程式檔案及 CUPS 印表機 PPD 檔會匯出到 "
--"Samba 伺服器設定檔中的 <tt>[print$]</tt> 這個特殊共享資源內。在按下「匯出」鍵之前，您必須先確認 <tt>[print$]</tt> "
--"這個共享資源已經在 Samba 伺服器設定檔中正確地設定完成。"
-+"<p><b>Samba server</b></p>Adobe Windows PostScript driver files plus the "
-+"CUPS printer PPD will be exported to the <tt>[print$]</tt> special share of "
-+"the Samba server (to change the source CUPS server, use the "
-+"<nobr><i>Configure Manager -> CUPS server</i></nobr> first). The <tt>[print$]"
-+"</tt> share must exist on the Samba side prior to clicking the <b>Export</b> "
-+"button below."
-+msgstr ""
-+"<p><b>Samba 伺服器</b></p>Adobe Windows PostScript 驅動程式檔案及 CUPS 印表"
-+"機 PPD 檔會匯出到 Samba 伺服器設定檔中的 <tt>[print$]</tt> 這個特殊共享資源"
-+"內。在按下「匯出」鍵之前，您必須先確認 <tt>[print$]</tt> 這個共享資源已經在 "
-+"Samba 伺服器設定檔中正確地設定完成。"
- 
- #: cups/cupsaddsmb2.cpp:88
- msgid ""
--"<p><b>Samba username</b></p>User needs to have write access to the <tt>"
--"[print$]</tt> share on the Samba server. <tt>[print$]</tt> "
--"holds printer drivers prepared for download to Windows clients. This dialog "
--"does not work for Samba servers configured with <tt>security = share</tt> "
--"(but works fine with <tt>security = user</tt>)."
--msgstr ""
--"<p><b>Samba 使用者名稱</b></p>設定使用者必須對 <tt>[print$]</tt> 有寫入的權限。<tt>[print$]</tt> "
--"中有提供給 Windows 客戶端下載的印表機驅動程式。這個對話框在 Samba 伺服器設定為 <tt>security=share</tt> "
--"時不會發生作用，但是在 <tt>security=user</tt> 則可以運作得很好。"
-+"<p><b>Samba username</b></p>User needs to have write access to the <tt>[print"
-+"$]</tt> share on the Samba server. <tt>[print$]</tt> holds printer drivers "
-+"prepared for download to Windows clients. This dialog does not work for "
-+"Samba servers configured with <tt>security = share</tt> (but works fine with "
-+"<tt>security = user</tt>)."
-+msgstr ""
-+"<p><b>Samba 使用者名稱</b></p>設定使用者必須對 <tt>[print$]</tt> 有寫入的權"
-+"限。<tt>[print$]</tt> 中有提供給 Windows 客戶端下載的印表機驅動程式。這個對話"
-+"框在 Samba 伺服器設定為 <tt>security=share</tt> 時不會發生作用，但是在 "
-+"<tt>security=user</tt> 則可以運作得很好。"
- 
- #: cups/cupsaddsmb2.cpp:96
- msgid ""
--"<p><b>Samba password</b></p>The Samba setting <tt>encrypt passwords = yes</tt> "
--"(default) requires prior use of <tt>smbpasswd -a [username]</tt> "
-+"<p><b>Samba password</b></p>The Samba setting <tt>encrypt passwords = yes</"
-+"tt> (default) requires prior use of <tt>smbpasswd -a [username]</tt> "
- "command, to create an encrypted Samba password and have Samba recognize it."
- msgstr ""
--"<p><b>Samba 密碼</b></p>若是 Samba 伺服器設定為 <tt>encrypt passwords=yes</tt>"
--"，則您需要先使用 <tt>smbpasswd -a [username]</tt> 這個指令來產生加密過的 Samba 密碼。"
-+"<p><b>Samba 密碼</b></p>若是 Samba 伺服器設定為 <tt>encrypt passwords=yes</"
-+"tt>，則您需要先使用 <tt>smbpasswd -a [username]</tt> 這個指令來產生加密過的 "
-+"Samba 密碼。"
- 
- #: cups/cupsaddsmb2.cpp:267
- #, c-format
-@@ -1119,14 +1104,14 @@
- #: cups/cupsaddsmb2.cpp:343
- msgid ""
- "Operation failed. Possible reasons are: permission denied or invalid Samba "
--"configuration (see <a href=\"man:/cupsaddsmb\">cupsaddsmb</a> "
--"manual page for detailed information, you need <a href=\"http://www.cups.org\">"
--"CUPS</a> version 1.1.11 or higher). You may want to try again with another "
--"login/password."
--msgstr ""
--"操作失敗。可能的原因是：沒有權限或無效的 Samba 設定 (詳見 <a href=\"man:/cupsaddsmb\">cupsaddsmb</a>"
--"手冊，您需要 <a href=\"http://www.cups.org\">CUPS</a> 版本 1.1.11 "
--"或更高)。您可以使用其他登入帳號/密碼再次嘗試連線。"
-+"configuration (see <a href=\"man:/cupsaddsmb\">cupsaddsmb</a> manual page "
-+"for detailed information, you need <a href=\"http://www.cups.org\">CUPS</a> "
-+"version 1.1.11 or higher). You may want to try again with another login/"
-+"password."
-+msgstr ""
-+"操作失敗。可能的原因是：沒有權限或無效的 Samba 設定 (詳見 <a href=\"man:/"
-+"cupsaddsmb\">cupsaddsmb</a>手冊，您需要 <a href=\"http://www.cups.org"
-+"\">CUPS</a> 版本 1.1.11 或更高)。您可以使用其他登入帳號/密碼再次嘗試連線。"
- 
- #: cups/cupsaddsmb2.cpp:352
- msgid "Operation aborted (process killed)."
-@@ -1139,30 +1124,30 @@
- #: cups/cupsaddsmb2.cpp:373
- msgid ""
- "You are about to prepare the <b>%1</b> driver to be shared out to Windows "
--"clients through Samba. This operation requires the <a "
--"href=\"http://www.adobe.com/products/printerdrivers/main.html\">"
--"Adobe PostScript Driver</a>, a recent version of Samba 2.2.x and a running SMB "
--"service on the target server. Click <b>Export</b> to start the operation. Read "
--"the <a href=\"man:/cupsaddsmb\">cupsaddsmb</a> manual page in Konqueror or type "
--"<tt>man cupsaddsmb</tt> in a console window to learn more about this "
--"functionality."
--msgstr ""
--"您打算要要透過 Samba 分享出 <b>%1</b> 驅動程式給 Windows 的用戶端電腦。該作業方式需要配合 <a "
--"href=\"http://www.adobe.com/products/printerdrivers/main.html\"> "
--"Adobe PostScript 驅動程式</a>，以及 Samba 2.2.x 以上的版本，另外伺服器上還要執行 SMB 服務，才能夠正常使用。請點選 <b>"
--"匯出</b> 開始作業。詳細資訊請參考 <a href=\"man:/cupsaddsmb\">man cupsaddsmb</a>。"
-+"clients through Samba. This operation requires the <a href=\"http://www."
-+"adobe.com/products/printerdrivers/main.html\">Adobe PostScript Driver</a>, a "
-+"recent version of Samba 2.2.x and a running SMB service on the target "
-+"server. Click <b>Export</b> to start the operation. Read the <a href=\"man:/"
-+"cupsaddsmb\">cupsaddsmb</a> manual page in Konqueror or type <tt>man "
-+"cupsaddsmb</tt> in a console window to learn more about this functionality."
-+msgstr ""
-+"您打算要要透過 Samba 分享出 <b>%1</b> 驅動程式給 Windows 的用戶端電腦。該作業"
-+"方式需要配合 <a href=\"http://www.adobe.com/products/printerdrivers/main.html"
-+"\"> Adobe PostScript 驅動程式</a>，以及 Samba 2.2.x 以上的版本，另外伺服器上"
-+"還要執行 SMB 服務，才能夠正常使用。請點選 <b>匯出</b> 開始作業。詳細資訊請參"
-+"考 <a href=\"man:/cupsaddsmb\">man cupsaddsmb</a>。"
- 
- #: cups/cupsaddsmb2.cpp:393
- msgid ""
--"Some driver files are missing. You can get them on <a "
--"href=\"http://www.adobe.com\">Adobe</a> web site. See <a "
--"href=\"man:/cupsaddsmb\">cupsaddsmb</a> manual page for more details (you need "
--"<a href=\"http://www.cups.org\">CUPS</a> version 1.1.11 or higher)."
--msgstr ""
--"找不到某些驅動程式的檔案。您可以由 <a href=\"http://www.adobe.com\">Adobe</a> "
--"網站取得所需要的檔案。另外請參考 <a href=\"man:/cupsaddsmb\">cupsaddsmb</a>"
--"manual page 取得更多資訊 (您還需要配合 <a href=\"http://www.cups.org\">CUPS</a> "
--"1.11.11 或更高的版本)。"
-+"Some driver files are missing. You can get them on <a href=\"http://www."
-+"adobe.com\">Adobe</a> web site. See <a href=\"man:/cupsaddsmb\">cupsaddsmb</"
-+"a> manual page for more details (you need <a href=\"http://www.cups.org"
-+"\">CUPS</a> version 1.1.11 or higher)."
-+msgstr ""
-+"找不到某些驅動程式的檔案。您可以由 <a href=\"http://www.adobe.com\">Adobe</"
-+"a> 網站取得所需要的檔案。另外請參考 <a href=\"man:/cupsaddsmb\">cupsaddsmb</"
-+"a>manual page 取得更多資訊 (您還需要配合 <a href=\"http://www.cups.org"
-+"\">CUPS</a> 1.11.11 或更高的版本)。"
- 
- #: cups/cupsaddsmb2.cpp:404
- #, c-format
-@@ -1271,9 +1256,11 @@
- 
- #: cups/kmwipp.cpp:39
- msgid ""
--"<p>Enter the information concerning the remote IPP server owning the targeted "
--"printer. This wizard will poll the server before continuing.</p>"
--msgstr "<p>輸入連結到遠端 IPP 印表機所需的資訊，這個精靈會先探尋那個伺服器是否正確才會繼續。</p>"
-+"<p>Enter the information concerning the remote IPP server owning the "
-+"targeted printer. This wizard will poll the server before continuing.</p>"
-+msgstr ""
-+"<p>輸入連結到遠端 IPP 印表機所需的資訊，這個精靈會先探尋那個伺服器是否正確才"
-+"會繼續。</p>"
- 
- #: cups/kmwipp.cpp:42 management/kmwlpd.cpp:46 rlpr/kmproprlpr.cpp:34
- #: rlpr/kmwrlpr.cpp:62
-@@ -1338,63 +1325,47 @@
- 
- #: cups/kptextpage.cpp:41
- msgid ""
--" <qt>  "
--"<p><b>Characters Per Inch</b></p>  "
--"<p>This setting controls the horizontal size of characters when printing a text "
--"file. </p> "
--"<p>The default value is 10, meaning that the font is scaled in a way that 10 "
--"characters  per inch will be printed. </p>  "
--"<hr>  "
--"<p><em><b>Additional hint for power users:</b> This KDEPrint GUI element "
--"matches  with the CUPS commandline job option parameter:</em>  "
--"<pre>    -o cpi=...          # example: \"8\" or \"12\"  </pre> </p>  </qt>"
--msgstr ""
--"<qt> "
--"<p><b>每英吋字元數</b></p> "
--"<p>這個設定控制列印文字檔時的字元的寬度。</p> "
--"<p>預設值為 10，意即字型會被調整為每英吋印 10 個字元。</p> "
--"<hr> "
--"<p><b>進階使用者的額外提示：</b>這個選項與以下的 CUPS 命令列選項參數是一樣的： "
-+" <qt>  <p><b>Characters Per Inch</b></p>  <p>This setting controls the "
-+"horizontal size of characters when printing a text file. </p> <p>The default "
-+"value is 10, meaning that the font is scaled in a way that 10 characters  "
-+"per inch will be printed. </p>  <hr>  <p><em><b>Additional hint for power "
-+"users:</b> This KDEPrint GUI element matches  with the CUPS commandline job "
-+"option parameter:</em>  <pre>    -o cpi=...          # example: \"8\" or \"12"
-+"\"  </pre> </p>  </qt>"
-+msgstr ""
-+"<qt> <p><b>每英吋字元數</b></p> <p>這個設定控制列印文字檔時的字元的寬度。</"
-+"p> <p>預設值為 10，意即字型會被調整為每英吋印 10 個字元。</p> <hr> <p><b>進階"
-+"使用者的額外提示：</b>這個選項與以下的 CUPS 命令列選項參數是一樣的： "
- "<pre>     -o cpi=...          # 例：\"8\" 或 \"12\"  </pre></p></qt>"
- 
- #: cups/kptextpage.cpp:55
- msgid ""
--" <qt>  "
--"<p><b>Lines Per Inch</b></p>  "
--"<p>This setting controls the vertical size of characters when printing a text "
--"file. </p> "
--"<p>The default value is 6, meaning that the font is scaled in a way that 6 "
--"lines  per inch will be printed. </p>  "
--"<hr>  "
--"<p><em><b>Additional hint for power users:</b> This KDEPrint GUI element "
--"matches  with the CUPS commandline job option parameter:</em>  "
--"<pre>    -o lpi=...         # example \"5\" or \"7\"  </pre> </p>  </qt>"
--msgstr ""
--"<qt> "
--"<p><b>每英吋行數</b></p> "
--"<p>這個設定控制列印文字檔時的字元的高度。</p> "
--"<p>預設值為 6，意即字型會被調整為每英吋列印六行。</p>"
--"<p><b>進階使用者的額外提示：</b>這個選項與以下的 CUPS 命令列選項參數是一樣的： "
--"<pre>     -o lpi=...          # 例：\"5\" 或 \"7\"  </pre></p></qt>"
-+" <qt>  <p><b>Lines Per Inch</b></p>  <p>This setting controls the vertical "
-+"size of characters when printing a text file. </p> <p>The default value is "
-+"6, meaning that the font is scaled in a way that 6 lines  per inch will be "
-+"printed. </p>  <hr>  <p><em><b>Additional hint for power users:</b> This "
-+"KDEPrint GUI element matches  with the CUPS commandline job option parameter:"
-+"</em>  <pre>    -o lpi=...         # example \"5\" or \"7\"  </pre> </p>  </"
-+"qt>"
-+msgstr ""
-+"<qt> <p><b>每英吋列數</b></p> <p>這個設定控制列印文字檔時的字元的高度。</p> "
-+"<p>預設值為 6，意即字型會被調整為每英吋列印六行。</p><p><b>進階使用者的額外提"
-+"示：</b>這個選項與以下的 CUPS 命令列選項參數是一樣的： <pre>     -o "
-+"lpi=...          # 例：\"5\" 或 \"7\"  </pre></p></qt>"
- 
- #: cups/kptextpage.cpp:69
- msgid ""
--" <qt>  "
--"<p><b>Columns</b></p>  "
--"<p>This setting controls how many columns of text will be printed on each page "
--"when. printing text files. </p>  "
--"<p>The default value is 1, meaning that only one column of text per page  will "
--"be printed. </p>  "
--"<hr>  "
--"<p><em><b>Additional hint for power users:</b> This KDEPrint GUI element "
--"matches  with the CUPS commandline job option parameter:</em>  "
--"<pre>    -o columns=...     # example: \"2\" or \"4\"  </pre> </p>  </qt>"
--msgstr ""
--"<qt> "
--"<p><b>欄</b></p> "
--"<p>這個設定控制列印文字檔時，在每一頁中會分成幾欄。</p>"
--"<p><b>進階使用者的額外提示：</b>這個選項與以下的 CUPS 命令列選項參數是一樣的： "
--"<pre>     -o cpi=...          # 例：\"8\" 或 \"12\"  </pre></p></qt>"
-+" <qt>  <p><b>Columns</b></p>  <p>This setting controls how many columns of "
-+"text will be printed on each page when. printing text files. </p>  <p>The "
-+"default value is 1, meaning that only one column of text per page  will be "
-+"printed. </p>  <hr>  <p><em><b>Additional hint for power users:</b> This "
-+"KDEPrint GUI element matches  with the CUPS commandline job option parameter:"
-+"</em>  <pre>    -o columns=...     # example: \"2\" or \"4\"  </pre> </p>  </"
-+"qt>"
-+msgstr ""
-+"<qt> <p><b>欄</b></p> <p>這個設定控制列印文字檔時，在每一頁中會分成幾欄。</"
-+"p><p><b>進階使用者的額外提示：</b>這個選項與以下的 CUPS 命令列選項參數是一樣"
-+"的： <pre>     -o cpi=...          # 例：\"8\" 或 \"12\"  </pre></p></qt>"
- 
- #: cups/kptextpage.cpp:84
- msgid " <qt>  Preview icon changes when you turn on or off prettyprint.  </qt>"
-@@ -1402,142 +1373,109 @@
- 
- #: cups/kptextpage.cpp:87
- msgid ""
--" <qt>  "
--"<p><b>Text Formats</b></p>  "
--"<p>These settings control the appearance of text on printouts. They are only "
--"valid for  printing text files or input directly through kprinter. </p>  "
--"<p><b>Note:</b> These settings have no effect whatsoever for other input "
--"formats than  text, or for printing from applications such as the KDE Advanced "
--"Text Editor. (Applications  in general send PostScript to the print system, and "
--"'kate' in particular has its own  knobs to control the print output. </p>. "
--"<hr>  "
--"<p><em><b>Additional hint for power users:</b> This KDEPrint GUI element "
--"matches  with the CUPS commandline job option parameter:</em>  "
--"<pre>     -o cpi=...         # example: \"8\" or \"12\"  "
--"<br>     -o lpi=...         # example: \"5\" or \"7\"  "
--"<br>     -o columns=...     # example: \"2\" or \"4\"  </pre> </p>  </qt>"
--msgstr ""
--"<qt> "
--"<p><b>文字格式</b></p> "
--"<p>這些設定控制印出文字的顯示方式。只有在列印文字檔及直接透過 kprinter 列印時才有效。</p> "
--"<p><b>進階使用者的額外提示：</b>這個選項與以下的 CUPS 命令列選項參數是一樣的： "
--"<pre>     -o cpi=...          # 例：\"8\" 或 \"12\"  "
--"<br>     -o lpi=...          # 例：\"5\" 或 \"7\"  "
-+" <qt>  <p><b>Text Formats</b></p>  <p>These settings control the appearance "
-+"of text on printouts. They are only valid for  printing text files or input "
-+"directly through kprinter. </p>  <p><b>Note:</b> These settings have no "
-+"effect whatsoever for other input formats than  text, or for printing from "
-+"applications such as the KDE Advanced Text Editor. (Applications  in general "
-+"send PostScript to the print system, and 'kate' in particular has its own  "
-+"knobs to control the print output. </p>. <hr>  <p><em><b>Additional hint for "
-+"power users:</b> This KDEPrint GUI element matches  with the CUPS "
-+"commandline job option parameter:</em>  <pre>     -o cpi=...         # "
-+"example: \"8\" or \"12\"  <br>     -o lpi=...         # example: \"5\" or \"7"
-+"\"  <br>     -o columns=...     # example: \"2\" or \"4\"  </pre> </p>  </qt>"
-+msgstr ""
-+"<qt> <p><b>文字格式</b></p> <p>這些設定控制印出文字的顯示方式。只有在列印文字"
-+"檔及直接透過 kprinter 列印時才有效。</p> <p><b>進階使用者的額外提示：</b>這個"
-+"選項與以下的 CUPS 命令列選項參數是一樣的： <pre>     -o cpi=...          # "
-+"例：\"8\" 或 \"12\"  <br>     -o lpi=...          # 例：\"5\" 或 \"7\"  "
- "<br>     -o column=...     # 例：\"2\"或\"4\"</pre></p></qt>"
- 
- #: cups/kptextpage.cpp:108
- msgid ""
--" <qt>  "
--"<p><b>Margins</b></p>  "
--"<p>These settings control the margins of printouts on the paper. They are not "
--"valid for  jobs originating from applications which define their own page "
--"layout internally and  send PostScript to KDEPrint (such as KOffice or "
--"OpenOffice.org). </p>  "
--"<p>When printing from KDE applications, such as KMail and Konqueror, or "
--"printing an ASCII text  file through kprinter, you can choose your preferred "
--"margin settings here. </p>  "
--"<p>Margins may be set individually for each edge of the paper. The combo box at "
--"the bottom lets you change  the units of measurement between Pixels, "
--"Millimeters, Centimeters, and Inches. </p>  "
--"<p>You can even use the mouse to grab one margin and drag it to the intended "
--"position (see the  preview picture on the right side). </p>  "
--"<hr>  "
--"<p><em><b>Additional hint for power users:</b> This KDEPrint GUI element "
--"matches  with the CUPS commandline job option parameter:</em>  "
--"<pre>     -o page-top=...      # example: \"72\"  "
--"<br>     -o page-bottom=...   # example: \"24\"  "
--"<br>     -o page-left=...     # example: \"36\"  "
--"<br>     -o page-right=...    # example: \"12\"  </pre> </p>  </qt>"
--msgstr ""
--"<qt> "
--"<p><b>邊界</b></p> "
--"<p>這些設定控制列印輸出在紙張上的邊界留白大小。如果是直接透過應用程式送來的列印工作，通常他們會定義自己的輸出版面，因此這個設定會無效。</p> "
--"<p>"
--"<p><b>進階使用者的額外提示：</b>這個選項與以下的 CUPS 命令列選項參數是一樣的： "
--"<pre>     -o page-top=...          # 例：\"72\"  "
--"<br>      -o page-bottom=...     # 例：\"24\"  "
--"<br>     -o page-left=...     # 例：\"36\"  "
--"<br>     -o page-right=...     # 例：\"12\"  "
--"<br></pre></p></qt>"
-+" <qt>  <p><b>Margins</b></p>  <p>These settings control the margins of "
-+"printouts on the paper. They are not valid for  jobs originating from "
-+"applications which define their own page layout internally and  send "
-+"PostScript to KDEPrint (such as KOffice or OpenOffice.org). </p>  <p>When "
-+"printing from KDE applications, such as KMail and Konqueror, or printing an "
-+"ASCII text  file through kprinter, you can choose your preferred margin "
-+"settings here. </p>  <p>Margins may be set individually for each edge of the "
-+"paper. The combo box at the bottom lets you change  the units of measurement "
-+"between Pixels, Millimeters, Centimeters, and Inches. </p>  <p>You can even "
-+"use the mouse to grab one margin and drag it to the intended position (see "
-+"the  preview picture on the right side). </p>  <hr>  <p><em><b>Additional "
-+"hint for power users:</b> This KDEPrint GUI element matches  with the CUPS "
-+"commandline job option parameter:</em>  <pre>     -o page-top=...      # "
-+"example: \"72\"  <br>     -o page-bottom=...   # example: \"24\"  <br>     -"
-+"o page-left=...     # example: \"36\"  <br>     -o page-right=...    # "
-+"example: \"12\"  </pre> </p>  </qt>"
-+msgstr ""
-+"<qt> <p><b>邊界</b></p> <p>這些設定控制列印輸出在紙張上的邊界留白大小。如果是"
-+"直接透過應用程式送來的列印工作，通常他們會定義自己的輸出版面，因此這個設定會"
-+"無效。</p> <p><p><b>進階使用者的額外提示：</b>這個選項與以下的 CUPS 命令列選"
-+"項參數是一樣的： <pre>     -o page-top=...          # 例：\"72\"  <br>      -"
-+"o page-bottom=...     # 例：\"24\"  <br>     -o page-left=...     # 例：\"36"
-+"\"  <br>     -o page-right=...     # 例：\"12\"  <br></pre></p></qt>"
- 
- #: cups/kptextpage.cpp:134
- msgid ""
--" <qt>  "
--"<p><b>Turn Text Printing with Syntax Highlighting (Prettyprint) On!</b></p>  "
--"<p>ASCII text file printouts can be 'prettyfied' by enabling this option. If "
--"you do so,  a header is printed at the top of each page. The header contains  "
--"the page number, job title (usually the filename), and the date. In addition, C "
--"and  C++ keywords are highlighted, and comment lines are italicized.</p> "
--"<p>This prettyprint option is handled by CUPS.</p>  "
--"<p>If you prefer another 'plaintext-to-prettyprint' converter, look for the <em>"
--"enscript</em>  pre-filter on the <em>Filters</em> tab. </p> "
--"<br>  "
--"<hr>  "
-+" <qt>  <p><b>Turn Text Printing with Syntax Highlighting (Prettyprint) On!</"
-+"b></p>  <p>ASCII text file printouts can be 'prettyfied' by enabling this "
-+"option. If you do so,  a header is printed at the top of each page. The "
-+"header contains  the page number, job title (usually the filename), and the "
-+"date. In addition, C and  C++ keywords are highlighted, and comment lines "
-+"are italicized.</p> <p>This prettyprint option is handled by CUPS.</p>  "
-+"<p>If you prefer another 'plaintext-to-prettyprint' converter, look for the "
-+"<em>enscript</em>  pre-filter on the <em>Filters</em> tab. </p> <br>  <hr>  "
- "<p><em><b>Additional hint for power users:</b> This KDEPrint GUI element "
--"matches  with the CUPS commandline job option parameter:</em>  "
--"<pre>     -o prettyprint=true.  </pre> </p>  </qt>"
-+"matches  with the CUPS commandline job option parameter:</em>  <pre>     -o "
-+"prettyprint=true.  </pre> </p>  </qt>"
- msgstr ""
--"<qt> "
--"<p><b>開啟語法突出顯示（Prettyprint）</b></p> "
--"<p>開啟這個選項可以在列印文字檔時「美化」輸出結果：包括在每一頁的頂端會有一個標頭，內有頁數、工作標題（通常是檔名），還有日期等。而列印的內容中，C 與 "
--"C++ 的關鍵字會被突顯(highlight)，註解則以斜體表示。</p> "
--"<p>這個選項是由 CUPS 來處理。</p> "
--"<p>如果您打算使用其他「美化純文字」的轉換器，可以參考「過濾器」頁中預先定義好的「enscript」過濾器。</p> "
--"<br>"
--"<hr>"
--"<p><b>進階使用者的額外提示：</b>這個選項與以下的 CUPS 命令列選項參數是一樣的： "
--"<pre>     -o prettyprint=true  </pre></p></qt>"
-+"<qt> <p><b>開啟語法突出顯示（Prettyprint）</b></p> <p>開啟這個選項可以在列印"
-+"文字檔時「美化」輸出結果：包括在每一頁的頂端會有一個標頭，內有頁數、工作標題"
-+"（通常是檔名），還有日期等。而列印的內容中，C 與 C++ 的關鍵字會被突顯"
-+"(highlight)，註解則以斜體表示。</p> <p>這個選項是由 CUPS 來處理。</p> <p>如果"
-+"您打算使用其他「美化純文字」的轉換器，可以參考「過濾器」頁中預先定義好的"
-+"「enscript」過濾器。</p> <br><hr><p><b>進階使用者的額外提示：</b>這個選項與以"
-+"下的 CUPS 命令列選項參數是一樣的： <pre>     -o prettyprint=true  </pre></"
-+"p></qt>"
- 
- #: cups/kptextpage.cpp:153
- msgid ""
--" <qt>  "
--"<p><b>Turn Text Printing with Syntax Highlighting (Prettyprint) Off! </b></p>  "
--"<p>ASCII text file printing with this option turned off are appearing without a "
--"page  header and without syntax highlighting. (You can still set the page "
--"margins, though.) </p>  "
--"<br>  "
--"<hr>  "
--"<p><em><b>Additional hint for power users:</b> This KDEPrint GUI element "
--"matches  with the CUPS commandline job option parameter:</em>  "
--"<pre>    -o prettyprint=false  </pre> </p>  </qt>"
--msgstr ""
--"<qt> "
--"<p><b>關閉語法突出顯示（Prettyprint）</b></p> "
--"<p>關閉這個選項會恢復成一般的輸出。</p> "
--"<br>"
--"<hr>"
--"<p><b>進階使用者的額外提示：</b>這個選項與以下的 CUPS 命令列選項參數是一樣的： "
--"<pre>     -o prettyprint=false  </pre></p></qt>"
-+" <qt>  <p><b>Turn Text Printing with Syntax Highlighting (Prettyprint) Off! "
-+"</b></p>  <p>ASCII text file printing with this option turned off are "
-+"appearing without a page  header and without syntax highlighting. (You can "
-+"still set the page margins, though.) </p>  <br>  <hr>  <p><em><b>Additional "
-+"hint for power users:</b> This KDEPrint GUI element matches  with the CUPS "
-+"commandline job option parameter:</em>  <pre>    -o prettyprint=false  </"
-+"pre> </p>  </qt>"
-+msgstr ""
-+"<qt> <p><b>關閉語法突出顯示（Prettyprint）</b></p> <p>關閉這個選項會恢復成一"
-+"般的輸出。</p> <br><hr><p><b>進階使用者的額外提示：</b>這個選項與以下的 CUPS "
-+"命令列選項參數是一樣的： <pre>     -o prettyprint=false  </pre></p></qt>"
- 
- #: cups/kptextpage.cpp:167
- msgid ""
--" <qt>  "
--"<p><b>Print Text with Syntax Highlighting (Prettyprint)</b></p>  "
--"<p>ASCII file printouts can be 'prettyfied' by enabling this option. If you do "
--"so,  a header is printed at the top of each page. The header contains  the page "
--"number, job title (usually the filename), and the date. In addition, C and  C++ "
--"keywords are highlighted, and comment lines are italicized.</p> "
--"<p>This prettyprint option is handled by CUPS.</p>  "
--"<p>If you prefer another 'plaintext-to-prettyprint' converter, look for the <em>"
--"enscript</em>  pre-filter on the <em>Filters</em> tab. </p>  "
--"<br>  "
--"<hr>  "
-+" <qt>  <p><b>Print Text with Syntax Highlighting (Prettyprint)</b></p>  "
-+"<p>ASCII file printouts can be 'prettyfied' by enabling this option. If you "
-+"do so,  a header is printed at the top of each page. The header contains  "
-+"the page number, job title (usually the filename), and the date. In "
-+"addition, C and  C++ keywords are highlighted, and comment lines are "
-+"italicized.</p> <p>This prettyprint option is handled by CUPS.</p>  <p>If "
-+"you prefer another 'plaintext-to-prettyprint' converter, look for the "
-+"<em>enscript</em>  pre-filter on the <em>Filters</em> tab. </p>  <br>  <hr>  "
- "<p><em><b>Additional hint for power users:</b> This KDEPrint GUI element "
--"matches  with the CUPS commandline job option parameter:</em>  "
--"<pre>     -o prettyprint=true.  "
--"<br>     -o prettyprint=false  </pre> </p>  </qt>"
--msgstr ""
--"<qt> "
--"<p><b>語法突出顯示（Prettyprint）</b></p> "
--"<p>開啟這個選項可以在列印文字檔時「美化」輸出結果：包括在每一頁的頂端會有一個標頭，內有頁數、工作標題（通常是檔名），還有日期等。而列印的內容中，C 與 "
--"C++ 的關鍵字會被突顯(highlight)，註解則以斜體表示。</p> "
--"<p>這個選項是由 CUPS 來處理。</p> "
--"<p>如果您打算使用其他「美化純文字」的轉換器，可以參考「過濾器」頁中預先定義好的「enscript」過濾器。</p> "
--"<br>"
--"<hr>"
--"<p><b>進階使用者的額外提示：</b>這個選項與以下的 CUPS 命令列選項參數是一樣的： "
--"<pre>     -o prettyprint=true  "
--"<br>      -o prettyprint=false  </pre></p></qt>"
-+"matches  with the CUPS commandline job option parameter:</em>  <pre>     -o "
-+"prettyprint=true.  <br>     -o prettyprint=false  </pre> </p>  </qt>"
-+msgstr ""
-+"<qt> <p><b>語法突出顯示（Prettyprint）</b></p> <p>開啟這個選項可以在列印文字"
-+"檔時「美化」輸出結果：包括在每一頁的頂端會有一個標頭，內有頁數、工作標題（通"
-+"常是檔名），還有日期等。而列印的內容中，C 與 C++ 的關鍵字會被突顯"
-+"(highlight)，註解則以斜體表示。</p> <p>這個選項是由 CUPS 來處理。</p> <p>如果"
-+"您打算使用其他「美化純文字」的轉換器，可以參考「過濾器」頁中預先定義好的"
-+"「enscript」過濾器。</p> <br><hr><p><b>進階使用者的額外提示：</b>這個選項與以"
-+"下的 CUPS 命令列選項參數是一樣的： <pre>     -o prettyprint=true  <br>      -"
-+"o prettyprint=false  </pre></p></qt>"
- 
- #: cups/kptextpage.cpp:188
- msgid "Text"
-@@ -1561,7 +1499,7 @@
- 
- #: cups/kptextpage.cpp:204
- msgid "&Lines per inch:"
--msgstr "每英吋行數(&L)："
-+msgstr "每英吋列數(&L)："
- 
- #: cups/kptextpage.cpp:208
- msgid "C&olumns:"
-@@ -1593,75 +1531,58 @@
- 
- #: cups/kptagspage.cpp:36
- msgid ""
--" <qt>"
--"<p><b>Additional Tags</b></p> You may send additional commands to the CUPS "
--"server via this editable list.  There are 3 purposes for this: "
--"<ul> "
-+" <qt><p><b>Additional Tags</b></p> You may send additional commands to the "
-+"CUPS server via this editable list.  There are 3 purposes for this: <ul> "
- "<li>Use any current or future standard CUPS job option not supported by the  "
--"KDEPrint GUI. </li> "
--"<li>Control any custom job option you may want to support in custom CUPS "
--"filters  and backends plugged into the CUPS filtering chain.</li>  "
--"<li>Send short messages to the operators of your production printers in your  "
--"<em>Central Repro Department</em>. </ul>  "
--"<p><b>Standard CUPS job options:</b> A complete list of standard CUPS job  "
--"options is in the <a href=\"http://localhost:631/sum.html\">CUPS User Manual</a>"
--".  Mappings of the kprinter user interface widgets to respective CUPS job "
-+"KDEPrint GUI. </li> <li>Control any custom job option you may want to "
-+"support in custom CUPS filters  and backends plugged into the CUPS filtering "
-+"chain.</li>  <li>Send short messages to the operators of your production "
-+"printers in your  <em>Central Repro Department</em>. </ul>  <p><b>Standard "
-+"CUPS job options:</b> A complete list of standard CUPS job  options is in "
-+"the <a href=\"http://localhost:631/sum.html\">CUPS User Manual</a>.  "
-+"Mappings of the kprinter user interface widgets to respective CUPS job "
- "option  names are named in the various <em>WhatsThis</em> help items..</p> "
- "<p><b>Custom CUPS job options:</b> CUPS print servers may be customized with "
--"additional  print filters and backends which understand custom job options. You "
--"can specify such  custom job options here. If in doubt, ask your system "
--"administrator..</p> "
--"<p><b> </b></p> "
--"<p><b>Operator Messages:</b> You may send additional messages to the "
--"operator(s) of your production printers (e.g. in your <em>"
--"Central Repro Department</p>) Messages can be read by the operator(s) (or "
--"yourself) by viewing the <em>\"Job IPP Report\"</em> for the job.</p> <b>"
--"Examples:</b>"
--"<br> "
--"<pre> A standard CUPS job option:"
--"<br>    <em>(Name) number-up</em>                -- <em>(Value) 9</em>                     "
--"<br> "
--"<br> A job option for custom CUPS filters or backends:"
--"<br>    <em>(Name) DANKA_watermark</em>          -- <em>"
--"(Value) Company_Confidential</em>   "
--"<br> "
--"<br> A message to the operator(s):"
--"<br>    <em>(Name) Deliver_after_completion</em> -- <em>"
--"(Value) to_Marketing_Departm.</em>"
--"<br> </pre> "
--"<p><b>Note:</b> the fields must not include spaces, tabs or quotes. You may "
--"need to  double-click on a field to edit it. "
--"<p><b>Warning:</b> Do not use such standard CUPS option names which also can be "
--"used  through the KDEPrint GUI. Results may be  unpredictable if they conflict, "
--" or if they are sent multiple times. For all options supported by the GUI, "
--"please do use  the GUI. (Each GUI element's  'WhatsThis' names the related CUPS "
--"option name.) </p>  </qt>"
--msgstr ""
--"<qt> "
--"<p><b>其他標記</b></p> 您可以透過這份清單對 CUPS 伺服器送出額外的命令。這樣做有三種目的： "
--"<ul> "
--"<li>這樣可以使用任何目前或將來 KDEPrint GUI 無法支援的標準 CUPS 工作選項。</li> "
--"<li>如果您的 CUPS 過濾鍊中有自定的 CUPS 過濾器及後端外掛，這可以讓您控制自定的工作選項以便有更好的支援。</li> "
--"<li>讓您送出簡短的訊息給在「中央複製部門」（Central Repro Department）的印表機管理員。</li> </ul> "
--"<p><b>標準的 CUPS 工作選項：</b><a href=\"http://localhost:631/sum.html\">CUPS 使用者手冊</a>"
--"中有一份標準的 CUPS 工作選項清單。kprinter 使用者介面對應的 CUPS 工作選項都在「這是什麼？」說明中有說明。</p> "
--"<p><b>自定的 CUPS 工作選項：</b>CUPS "
--"印表伺服器可以自定列印過濾器與後端介面，而它們可能會有自己的工作選項。您可以在這裡指定這些支援選項。如果不確定，請您詢問您的系統管理員。</p> "
--"<p><b> </b></p> "
--"<p><b>管理員訊息：</b>您可以在這裡設定送出額外的訊息給管理員。管理員（或您）可以透過「工作 IPP 報告」來閱讀關於此工作的訊息。</p> <b> "
--"例：</b> "
--"<br> "
--"<pre>標準的工作選項： "
--"<br>     <em>(Name) number-up</em>                -- <em>（數值）9</em>"
--"<br> "
--"<br> 自定的 CUPS 過濾器或後端的工作選項： "
--"<br>     <em>(Name) DANKA_watermark</em>            -- <em>"
--"（數值）Company_Confidential</em>"
--"<br> "
--"<br></pre> "
--"<p><b>注意：</b>這個欄位不能包含空白、引號、tab 等。您可能需要雙擊該欄位來編輯。 </p>"
--"<p><b>警告：</b>不要使用 KDEPrint GUI 也會使用的標準 CUPS 的選項名稱，這樣有可能造成衝突，而形成無法預知的結果。所有 GUI "
--"支援的選項都可以經由「這是什麼？」的說明得知，若要使用請直接透過 GUI 使用。</p></qt>"
-+"additional  print filters and backends which understand custom job options. "
-+"You can specify such  custom job options here. If in doubt, ask your system "
-+"administrator..</p> <p><b> </b></p> <p><b>Operator Messages:</b> You may "
-+"send additional messages to the operator(s) of your production printers (e."
-+"g. in your <em>Central Repro Department</p>) Messages can be read by the "
-+"operator(s) (or yourself) by viewing the <em>\"Job IPP Report\"</em> for the "
-+"job.</p> <b>Examples:</b><br> <pre> A standard CUPS job option:<br>    <em>"
-+"(Name) number-up</em>                -- <em>(Value) 9</"
-+"em>                     <br> <br> A job option for custom CUPS filters or "
-+"backends:<br>    <em>(Name) DANKA_watermark</em>          -- <em>(Value) "
-+"Company_Confidential</em>   <br> <br> A message to the operator(s):<br>    "
-+"<em>(Name) Deliver_after_completion</em> -- <em>(Value) to_Marketing_Departm."
-+"</em><br> </pre> <p><b>Note:</b> the fields must not include spaces, tabs or "
-+"quotes. You may need to  double-click on a field to edit it. <p><b>Warning:</"
-+"b> Do not use such standard CUPS option names which also can be used  "
-+"through the KDEPrint GUI. Results may be  unpredictable if they conflict,  "
-+"or if they are sent multiple times. For all options supported by the GUI, "
-+"please do use  the GUI. (Each GUI element's  'WhatsThis' names the related "
-+"CUPS option name.) </p>  </qt>"
-+msgstr ""
-+"<qt> <p><b>其他標記</b></p> 您可以透過這份清單對 CUPS 伺服器送出額外的命令。"
-+"這樣做有三種目的： <ul> <li>這樣可以使用任何目前或將來 KDEPrint GUI 無法支援"
-+"的標準 CUPS 工作選項。</li> <li>如果您的 CUPS 過濾鍊中有自定的 CUPS 過濾器及"
-+"後端外掛，這可以讓您控制自定的工作選項以便有更好的支援。</li> <li>讓您送出簡"
-+"短的訊息給在「中央複製部門」（Central Repro Department）的印表機管理員。</"
-+"li> </ul> <p><b>標準的 CUPS 工作選項：</b><a href=\"http://localhost:631/sum."
-+"html\">CUPS 使用者手冊</a>中有一份標準的 CUPS 工作選項清單。kprinter 使用者介"
-+"面對應的 CUPS 工作選項都在「這是什麼？」說明中有說明。</p> <p><b>自定的 CUPS "
-+"工作選項：</b>CUPS 印表伺服器可以自定列印過濾器與後端介面，而它們可能會有自己"
-+"的工作選項。您可以在這裡指定這些支援選項。如果不確定，請您詢問您的系統管理"
-+"員。</p> <p><b> </b></p> <p><b>管理員訊息：</b>您可以在這裡設定送出額外的訊息"
-+"給管理員。管理員（或您）可以透過「工作 IPP 報告」來閱讀關於此工作的訊息。</"
-+"p> <b> 例：</b> <br> <pre>標準的工作選項： <br>     <em>(Name) number-up</"
-+"em>                -- <em>（數值）9</em><br> <br> 自定的 CUPS 過濾器或後端的"
-+"工作選項： <br>     <em>(Name) DANKA_watermark</em>            -- <em>（數"
-+"值）Company_Confidential</em><br> <br></pre> <p><b>注意：</b>這個欄位不能包含"
-+"空白、引號、tab 等。您可能需要雙擊該欄位來編輯。 </p><p><b>警告：</b>不要使"
-+"用 KDEPrint GUI 也會使用的標準 CUPS 的選項名稱，這樣有可能造成衝突，而形成無"
-+"法預知的結果。所有 GUI 支援的選項都可以經由「這是什麼？」的說明得知，若要使用"
-+"請直接透過 GUI 使用。</p></qt>"
- 
- #: cups/kptagspage.cpp:77
- msgid "Additional Tags"
-@@ -1687,67 +1608,56 @@
- 
- #: cups/kmcupsuimanager.cpp:85
- msgid ""
--"<qt>"
--"<p>Print queue on remote CUPS server</p>"
--"<p>Use this for a print queue installed on a remote machine running a CUPS "
--"server. This allows to use remote printers when CUPS browsing is turned off.</p>"
--"</qt>"
--msgstr "<qt> <p>遠端 CUPS 伺服器</p> <p>使用安裝在遠端 CUPS 伺服器上的印表佇列。</p></qt>"
-+"<qt><p>Print queue on remote CUPS server</p><p>Use this for a print queue "
-+"installed on a remote machine running a CUPS server. This allows to use "
-+"remote printers when CUPS browsing is turned off.</p></qt>"
-+msgstr ""
-+"<qt> <p>遠端 CUPS 伺服器</p> <p>使用安裝在遠端 CUPS 伺服器上的印表佇列。</"
-+"p></qt>"
- 
- #: cups/kmcupsuimanager.cpp:92
- msgid ""
--"<qt>"
--"<p>Network IPP printer</p>"
--"<p>Use this for a network-enabled printer using the IPP protocol. Modern "
--"high-end printers can use this mode. Use this mode instead of TCP if your "
--"printer can do both.</p></qt>"
--msgstr ""
--"<qt> "
--"<p>網路 IPP 印表機</p> "
--"<p>使用支援 IPP 通訊協定的網路印表機。最新的高檔的印表機通常都支援 IPP 通訊協定。如果印表機同時支援 TCP 與 IPP 兩種模式的話，請選擇 "
--"IPP。</p></qt>"
-+"<qt><p>Network IPP printer</p><p>Use this for a network-enabled printer "
-+"using the IPP protocol. Modern high-end printers can use this mode. Use this "
-+"mode instead of TCP if your printer can do both.</p></qt>"
-+msgstr ""
-+"<qt> <p>網路 IPP 印表機</p> <p>使用支援 IPP 通訊協定的網路印表機。最新的高檔"
-+"的印表機通常都支援 IPP 通訊協定。如果印表機同時支援 TCP 與 IPP 兩種模式的話，"
-+"請選擇 IPP。</p></qt>"
- 
- #: cups/kmcupsuimanager.cpp:99
- msgid ""
--"<qt>"
--"<p>Fax/Modem printer</p>"
--"<p>Use this for a fax/modem printer. This requires the installation of the <a "
--"href=\"http://vigna.dsi.unimi.it/fax4CUPS/\">fax4CUPS</a> "
--"backend. Documents sent on this printer will be faxed to the given target fax "
--"number.</p></qt>"
--msgstr ""
--"<qt> "
--"<p>傳真/數據機印表機</p> "
--"<p>使用有傳真與數據機功能的印表機。這會需要安裝 <a href=\"http://vigna.dsi.unimi.it/fax4CUPS/\">"
--"fax4CUPS</a> 後端介面。送到這個印表機的文件會被傳真出去。</p></qt>"
-+"<qt><p>Fax/Modem printer</p><p>Use this for a fax/modem printer. This "
-+"requires the installation of the <a href=\"http://vigna.dsi.unimi.it/"
-+"fax4CUPS/\">fax4CUPS</a> backend. Documents sent on this printer will be "
-+"faxed to the given target fax number.</p></qt>"
-+msgstr ""
-+"<qt> <p>傳真/數據機印表機</p> <p>使用有傳真與數據機功能的印表機。這會需要安"
-+"裝 <a href=\"http://vigna.dsi.unimi.it/fax4CUPS/\">fax4CUPS</a> 後端介面。送"
-+"到這個印表機的文件會被傳真出去。</p></qt>"
- 
- #: cups/kmcupsuimanager.cpp:106
- msgid ""
--"<qt>"
--"<p>Other printer</p>"
--"<p>Use this for any printer type. To use this option, you must know the URI of "
--"the printer you want to install. Refer to the CUPS documentation for more "
--"information about the printer URI. This option is mainly useful for printer "
--"types using 3rd party backends not covered by the other possibilities.</p></qt>"
--msgstr ""
--"<qt> "
--"<p>其他印表機</p> "
--"<p>其他任何型態的印表機。要使用這個選項，您必須知道印表機的 URI。關於印表機的 URI 請參考 CUPS 的說明文件。這個選項主要是給使用第三者(3rd "
--"party)提供的後端介面的印表機使用。</p></qt>"
-+"<qt><p>Other printer</p><p>Use this for any printer type. To use this "
-+"option, you must know the URI of the printer you want to install. Refer to "
-+"the CUPS documentation for more information about the printer URI. This "
-+"option is mainly useful for printer types using 3rd party backends not "
-+"covered by the other possibilities.</p></qt>"
-+msgstr ""
-+"<qt> <p>其他印表機</p> <p>其他任何型態的印表機。要使用這個選項，您必須知道印"
-+"表機的 URI。關於印表機的 URI 請參考 CUPS 的說明文件。這個選項主要是給使用第三"
-+"者(3rd party)提供的後端介面的印表機使用。</p></qt>"
- 
- #: cups/kmcupsuimanager.cpp:114
- msgid ""
--"<qt>"
--"<p>Class of printers</p>"
--"<p>Use this to create a class of printers. When sending a document to a class, "
--"the document is actually sent to the first available (idle) printer in the "
--"class. Refer to the CUPS documentation for more information about class of "
--"printers.</p></qt>"
--msgstr ""
--"<qt> "
--"<p>印表機類別</p> "
--"<p>用這個來產生印表機類別。當一份文件送到某一個類別時，它實際上會被送到這個類別第一個可用（閒置中）的印表機去。關於印表機類別請參考 CUPS "
--"的說明文件。</p></qt>"
-+"<qt><p>Class of printers</p><p>Use this to create a class of printers. When "
-+"sending a document to a class, the document is actually sent to the first "
-+"available (idle) printer in the class. Refer to the CUPS documentation for "
-+"more information about class of printers.</p></qt>"
-+msgstr ""
-+"<qt> <p>印表機類別</p> <p>用這個來產生印表機類別。當一份文件送到某一個類別"
-+"時，它實際上會被送到這個類別第一個可用（閒置中）的印表機去。關於印表機類別請"
-+"參考 CUPS 的說明文件。</p></qt>"
- 
- #: cups/kmcupsuimanager.cpp:127
- msgid "Re&mote CUPS server (IPP/HTTP)"
-@@ -1803,7 +1713,7 @@
- 
- #: cups/kmcupsmanager.cpp:849
- msgid "&Export Driver..."
--msgstr "匯出驅動程式(&E)..."
-+msgstr "匯出驅動程式(&E)…"
- 
- #: cups/kmcupsmanager.cpp:851
- msgid "&Printer IPP Report"
-@@ -1827,7 +1737,9 @@
- msgid ""
- "Connection to CUPS server failed. Check that the CUPS server is correctly "
- "installed and running. Error: %1."
--msgstr "連線到 CUPS 伺服器失敗。請檢查 CUPS 服務主機是否安裝正確並正在執行中。錯誤： %1。"
-+msgstr ""
-+"連線到 CUPS 伺服器失敗。請檢查 CUPS 服務主機是否安裝正確並正在執行中。錯誤： "
-+"%1。"
- 
- #: cups/kmcupsmanager.cpp:955
- msgid "the IPP request failed for an unknown reason"
-@@ -1849,119 +1761,98 @@
- msgid ""
- "Connection to CUPS server failed. Check that the CUPS server is correctly "
- "installed and running. Error: %2: %1."
--msgstr "連線到 CUPS 伺服器失敗。請檢查 CUPS 服務主機是否安裝正確並正在執行中。錯誤： %2: %1。"
-+msgstr ""
-+"連線到 CUPS 伺服器失敗。請檢查 CUPS 服務主機是否安裝正確並正在執行中。錯誤： "
-+"%2: %1。"
- 
- #: cups/kphpgl2page.cpp:33
- msgid ""
--" <qt>  <b>Print in Black Only (Blackplot)</b>  "
--"<p>The 'blackplot' option specifies that all pens should plot in black-only: "
--"The default is to use the colors defined in the plot file, or the standard  pen "
--"colors defined in the HP-GL/2 reference manual from Hewlett Packard. </p>  "
--"<br>  "
--"<hr>  "
-+" <qt>  <b>Print in Black Only (Blackplot)</b>  <p>The 'blackplot' option "
-+"specifies that all pens should plot in black-only: The default is to use the "
-+"colors defined in the plot file, or the standard  pen colors defined in the "
-+"HP-GL/2 reference manual from Hewlett Packard. </p>  <br>  <hr>  "
- "<p><em><b>Additional hint for power users:</b> This KDEPrint GUI element "
--"matches  with the CUPS commandline job option parameter:</em>  "
--"<pre>    -o blackplot=true  </pre>  </p>  </qt>"
-+"matches  with the CUPS commandline job option parameter:</em>  <pre>    -o "
-+"blackplot=true  </pre>  </p>  </qt>"
- msgstr ""
--"<qt><b>只使用黑筆（Blackplot）</b> "
--"<p>Blackplot 選項會指定只以黑色來畫。預設是使用 HP-GL/2 參考手冊中定義的標準顏色，或是參考 plot 檔案中的顏色定義。</p> "
--"<br> "
--"<br> "
--"<p><b>進階使用者的額外提示：</b>這個選項與以下的 CUPS 命令列選項參數是一樣的： "
--"<pre>     -o blackplot=true</pre></p></qt>"
-+"<qt><b>只使用黑筆（Blackplot）</b> <p>Blackplot 選項會指定只以黑色來畫。預設"
-+"是使用 HP-GL/2 參考手冊中定義的標準顏色，或是參考 plot 檔案中的顏色定義。</"
-+"p> <br> <br> <p><b>進階使用者的額外提示：</b>這個選項與以下的 CUPS 命令列選項"
-+"參數是一樣的： <pre>     -o blackplot=true</pre></p></qt>"
- 
- #: cups/kphpgl2page.cpp:48
- msgid ""
--" <qt>  <b>Scale Print Image to Page Size</b>  "
--"<p>The 'fitplot' option specifies that the HP-GL image should be scaled to fill "
--" exactly the page with the (elsewhere selected) media size. </p>  "
--"<p>The default is 'fitplot is disabled'. The default will therefore use the "
--"absolute  distances specified in the plot file. (You should be aware that HP-GL "
--"files are very  often CAD drawings intended for large format plotters. On "
--"standard office printers  they will therefore lead to the drawing printout "
--"being spread across multiple pages.) </p>  "
--"<p><b>Note:</b>This feature depends upon an accurate plot size (PS) command in "
--"the  HP-GL/2 file. If no plot size is given in the file the filter converting "
--"the HP-GL  to PostScript assumes the plot is ANSI E size. </p>  "
--"<br>  "
--"<hr>  "
--"<p><em><b>Additional hint for power users:</b> This KDEPrint GUI element "
--"matches with the CUPS commandline job option parameter:</em>  "
--"<pre>     -o fitplot=true   </pre> </p>  </qt>"
--msgstr ""
--"<qt><b>調整列印圖像大小以符合紙張（Fitplot）</b> "
--"<p> fitplot 選項會調整 HP-GL 圖像大小，以完全符合紙張的尺寸。</p> "
--"<p>預設是關閉，也就是使用 plot 檔案中所定義的絕對大小。（HP-GL 檔案通常都是 CAD "
--"的大張的圖檔。在一般的辦公室印表機通常都要印出好多頁。）</p> "
--"<p><b>注意：</b>這個功能是依賴 HP-GL/2 檔案中「精確的圖像尺寸」（accurate plot size, "
--"PS）指令。如果沒有指定尺寸，那麼過濾器會假設圖像為 ANSI E 尺寸，並轉換成 PostScript 檔。</p> "
--"<br>"
--"<hr> "
--"<p><b>進階使用者的額外提示：</b>這個選項與以下的 CUPS 命令列選項參數是一樣的： "
--"<pre>     -o fitplot=true</pre></p></qt>"
-+" <qt>  <b>Scale Print Image to Page Size</b>  <p>The 'fitplot' option "
-+"specifies that the HP-GL image should be scaled to fill  exactly the page "
-+"with the (elsewhere selected) media size. </p>  <p>The default is 'fitplot "
-+"is disabled'. The default will therefore use the absolute  distances "
-+"specified in the plot file. (You should be aware that HP-GL files are very  "
-+"often CAD drawings intended for large format plotters. On standard office "
-+"printers  they will therefore lead to the drawing printout being spread "
-+"across multiple pages.) </p>  <p><b>Note:</b>This feature depends upon an "
-+"accurate plot size (PS) command in the  HP-GL/2 file. If no plot size is "
-+"given in the file the filter converting the HP-GL  to PostScript assumes the "
-+"plot is ANSI E size. </p>  <br>  <hr>  <p><em><b>Additional hint for power "
-+"users:</b> This KDEPrint GUI element matches with the CUPS commandline job "
-+"option parameter:</em>  <pre>     -o fitplot=true   </pre> </p>  </qt>"
-+msgstr ""
-+"<qt><b>調整列印圖像大小以符合紙張（Fitplot）</b> <p> fitplot 選項會調整 HP-"
-+"GL 圖像大小，以完全符合紙張的尺寸。</p> <p>預設是關閉，也就是使用 plot 檔案中"
-+"所定義的絕對大小。（HP-GL 檔案通常都是 CAD 的大張的圖檔。在一般的辦公室印表機"
-+"通常都要印出好多頁。）</p> <p><b>注意：</b>這個功能是依賴 HP-GL/2 檔案中「精"
-+"確的圖像尺寸」（accurate plot size, PS）指令。如果沒有指定尺寸，那麼過濾器會"
-+"假設圖像為 ANSI E 尺寸，並轉換成 PostScript 檔。</p> <br><hr> <p><b>進階使用"
-+"者的額外提示：</b>這個選項與以下的 CUPS 命令列選項參數是一樣的： <pre>     -"
-+"o fitplot=true</pre></p></qt>"
- 
- #: cups/kphpgl2page.cpp:68
- msgid ""
--" <qt>  <b>Set Pen Width for HP-GL (if not defined in file)</b>.  "
--"<p>The pen width value can be set here in case the original HP-GL file does not "
--"have it  set. The pen width specifies the value in micrometers. The default "
--"value of 1000 produces  lines that are 1000 micrometers == 1 millimeter in "
--"width. Specifying a pen width of 0  produces lines that are exactly 1 pixel "
--"wide. </p>  "
--"<p><b>Note:</b> The penwidth option set here is ignored if the pen widths are "
--"set inside  the plot file itself..</p>  "
--"<br>  "
--"<hr>  "
-+" <qt>  <b>Set Pen Width for HP-GL (if not defined in file)</b>.  <p>The pen "
-+"width value can be set here in case the original HP-GL file does not have "
-+"it  set. The pen width specifies the value in micrometers. The default value "
-+"of 1000 produces  lines that are 1000 micrometers == 1 millimeter in width. "
-+"Specifying a pen width of 0  produces lines that are exactly 1 pixel wide. </"
-+"p>  <p><b>Note:</b> The penwidth option set here is ignored if the pen "
-+"widths are set inside  the plot file itself..</p>  <br>  <hr>  "
- "<p><em><b>Additional hint for power users:</b> This KDEPrint GUI element "
--"matches with the CUPS commandline job option parameter:</em>  "
--"<pre>    -o penwidth=...   # example: \"2000\" or \"500\"  </pre> </p>  </qt>"
-+"matches with the CUPS commandline job option parameter:</em>  <pre>    -o "
-+"penwidth=...   # example: \"2000\" or \"500\"  </pre> </p>  </qt>"
- msgstr ""
--"<qt><b>設定 HP-GL 線條寬度（penwidth）</b> "
--"<p>若是 HP-GL 檔案中沒有設定原始線條寬度的值，那麼可以在這裡設定。指定數值的單位為微米。預設值為 1000，也就是 1 毫米。若指定為 "
--"0，則表示線條的寬度為 1 像素。</p> "
--"<p><b>注意：</b>如果 plot 檔案中有設定 penwidth 這個選項，則這裡的設定會被忽略。</p> "
--"<br>"
--"<hr> "
--"<p><b>進階使用者的額外提示：</b>這個選項與以下的 CUPS 命令列選項參數是一樣的： "
--"<pre>     -o penwidth=...     #例： \"2000\" 或 \"500\"</pre></p></qt>"
-+"<qt><b>設定 HP-GL 線條寬度（penwidth）</b> <p>若是 HP-GL 檔案中沒有設定原始線"
-+"條寬度的值，那麼可以在這裡設定。指定數值的單位為微米。預設值為 1000，也就是 "
-+"1 毫米。若指定為 0，則表示線條的寬度為 1 像素。</p> <p><b>注意：</b>如果 "
-+"plot 檔案中有設定 penwidth 這個選項，則這裡的設定會被忽略。</p> <br><hr> "
-+"<p><b>進階使用者的額外提示：</b>這個選項與以下的 CUPS 命令列選項參數是一樣"
-+"的： <pre>     -o penwidth=...     #例： \"2000\" 或 \"500\"</pre></p></qt>"
- 
- #: cups/kphpgl2page.cpp:85
- msgid ""
--" <qt>  <b>HP-GL Print Options</b>  "
--"<p>All options on this page are only applicable if you use KDEPrint to send "
--"HP-GL and  HP-GL/2 files to one of your printers. </p>  "
--"<p>HP-GL and HP-GL/2 are page description languages developed by "
--"Hewlett-Packard to drive  Pen Plotting devices. </p>  "
--"<p>KDEPrint can (with the help of CUPS) convert the HP-GL file format and print "
--"it  on any installed printer. </p>  "
--"<p><b>Note 1:</b> To print HP-GL files, start 'kprinter' and simply load the "
--"file into  the running kprinter.</p> "
--"<p><b>Note 2:</b> The 'fitplot' parameter provided on this dialog does also "
--"work for  printing PDF files (if your CUPS version is more recent than "
--"1.1.22).</p>  "
--"<br>  "
--"<hr>  "
--"<p><em><b>Additional hint for power users:</b> These KDEPrint GUI elements "
--"match with CUPS commandline job option parameters:</em>  "
--"<pre>     -o blackplot=...  # examples: \"true\" or \"false\"  "
--"<br>     -o fitplot=...    # examples: \"true\" or \"false\"  "
--"<br>     -o penwidth=...   # examples: \"true\" or \"false\"  </pre> </p>  </qt>"
--msgstr ""
--"<qt><b>HP-GL 列印選項</b> "
--"<p>這一頁中所有的選項都只在您透過 KDEPrint 送出 HP-GL 或 HP-GL/2 檔案給您的印表機才會用到。</p> "
--"<p>HP-GL 與 HP-GL/2 都是由 HP 開發出來，用來控制「筆繪圖裝置」（Pen Plotting devices）的「頁描述語言」（Page "
--"description language）。</p> "
--"<p>KDEPrint 可以透過 CUPS 的協助，將 HP-GL 檔案格式轉換並列印出來。</p> "
--"<p><b>注意：</b></p> "
--"<p>1. 要列印 HP-GL 檔案，只要開啟 kprinter 並將檔案載入即可。</p> "
--"<p>2. fitplot 參數也可以用於列印 PDF 檔（如果您的 CUPS 版本大於 1.1.22 的話）。</p> "
--"<br>"
--"<hr> "
--"<p><b>進階使用者的額外提示：</b>這些選項與以下的 CUPS 命令列選項參數是一樣的： "
--"<pre>     -o blackplot=...   #例：\"true\" 或 \"false\"  "
--"<br>      -o fitplot=...   # 例：\"true\" 或 \"false\"  "
--"<br>      -o penwidth=...   # 例：\"2000\" 或 \"500\"  "
--"<br> </pre></p></qt>"
-+" <qt>  <b>HP-GL Print Options</b>  <p>All options on this page are only "
-+"applicable if you use KDEPrint to send HP-GL and  HP-GL/2 files to one of "
-+"your printers. </p>  <p>HP-GL and HP-GL/2 are page description languages "
-+"developed by Hewlett-Packard to drive  Pen Plotting devices. </p>  "
-+"<p>KDEPrint can (with the help of CUPS) convert the HP-GL file format and "
-+"print it  on any installed printer. </p>  <p><b>Note 1:</b> To print HP-GL "
-+"files, start 'kprinter' and simply load the file into  the running kprinter."
-+"</p> <p><b>Note 2:</b> The 'fitplot' parameter provided on this dialog does "
-+"also work for  printing PDF files (if your CUPS version is more recent than "
-+"1.1.22).</p>  <br>  <hr>  <p><em><b>Additional hint for power users:</b> "
-+"These KDEPrint GUI elements match with CUPS commandline job option "
-+"parameters:</em>  <pre>     -o blackplot=...  # examples: \"true\" or \"false"
-+"\"  <br>     -o fitplot=...    # examples: \"true\" or \"false\"  <br>     -"
-+"o penwidth=...   # examples: \"true\" or \"false\"  </pre> </p>  </qt>"
-+msgstr ""
-+"<qt><b>HP-GL 列印選項</b> <p>這一頁中所有的選項都只在您透過 KDEPrint 送出 HP-"
-+"GL 或 HP-GL/2 檔案給您的印表機才會用到。</p> <p>HP-GL 與 HP-GL/2 都是由 HP 開"
-+"發出來，用來控制「筆繪圖裝置」（Pen Plotting devices）的「頁描述語言」（Page "
-+"description language）。</p> <p>KDEPrint 可以透過 CUPS 的協助，將 HP-GL 檔案"
-+"格式轉換並列印出來。</p> <p><b>注意：</b></p> <p>1. 要列印 HP-GL 檔案，只要開"
-+"啟 kprinter 並將檔案載入即可。</p> <p>2. fitplot 參數也可以用於列印 PDF 檔"
-+"（如果您的 CUPS 版本大於 1.1.22 的話）。</p> <br><hr> <p><b>進階使用者的額外"
-+"提示：</b>這些選項與以下的 CUPS 命令列選項參數是一樣的： <pre>     -o "
-+"blackplot=...   #例：\"true\" 或 \"false\"  <br>      -o fitplot=...   # 例："
-+"\"true\" 或 \"false\"  <br>      -o penwidth=...   # 例：\"2000\" 或 \"500"
-+"\"  <br> </pre></p></qt>"
- 
- #: cups/kphpgl2page.cpp:113
- msgid "HP-GL/2 Options"
-@@ -2037,7 +1928,7 @@
- 
- #: cups/kmwippprinter.cpp:189 kmjob.cpp:111 kmprinter.cpp:140
- msgid "Processing..."
--msgstr "處理中..."
-+msgstr "處理中…"
- 
- #: cups/kmwippprinter.cpp:190 kmjob.cpp:132 kmprinter.cpp:142
- msgid ""
-@@ -2064,17 +1955,12 @@
- 
- #: cups/kmwother.cpp:46
- msgid ""
--"<p>Enter the URI corresponding to the printer to be installed. Examples:</p>"
--"<ul>"
--"<li>smb://[login[:passwd]@]server/printer</li>"
--"<li>lpd://server/queue</li>"
--"<li>parallel:/dev/lp0</li></ul>"
--msgstr ""
--"<p>輸入印表機的 URI 位置。例如： </p>"
--"<ul>"
--"<li>smb://[login[:passwd]@]server/printer</li>"
--"<li>lpd://server/queue</li>"
--"<li>parallel:/dev/lp0</li></ul>"
-+"<p>Enter the URI corresponding to the printer to be installed. Examples:</"
-+"p><ul><li>smb://[login[:passwd]@]server/printer</li><li>lpd://server/queue</"
-+"li><li>parallel:/dev/lp0</li></ul>"
-+msgstr ""
-+"<p>輸入印表機的 URI 位置。例如： </p><ul><li>smb://[login[:passwd]@]server/"
-+"printer</li><li>lpd://server/queue</li><li>parallel:/dev/lp0</li></ul>"
- 
- #: cups/kmwother.cpp:51 management/kminfopage.cpp:52
- #: management/kmpropbackend.cpp:35 management/kmwlocal.cpp:54
-@@ -2148,13 +2034,14 @@
- 
- #: cups/kmwquota.cpp:104
- msgid ""
--"<p>Set here the quota for this printer. Using limits of <b>0</b> "
--"means that no quota will be used. This is equivalent to set quota period to <b>"
--"<nobr>No quota</nobr></b> (-1). Quota limits are defined on a per-user base and "
-+"<p>Set here the quota for this printer. Using limits of <b>0</b> means that "
-+"no quota will be used. This is equivalent to set quota period to <b><nobr>No "
-+"quota</nobr></b> (-1). Quota limits are defined on a per-user base and "
- "applied to all users.</p>"
- msgstr ""
--"<P> 在此設定印表機的限額設定。使用 <b>0</b> 表示不設限額。這也等於把限額時間設定為 <b><nobr>沒有限額</nobr></b> "
--"(-1) 一樣。限額可以針對個別使用者設定，也可以套用在所有使用者上。</p>"
-+"<P> 在此設定印表機的限額設定。使用 <b>0</b> 表示不設限額。這也等於把限額時間"
-+"設定為 <b><nobr>沒有限額</nobr></b> (-1) 一樣。限額可以針對個別使用者設定，也"
-+"可以套用在所有使用者上。</p>"
- 
- #: cups/kmwquota.cpp:130
- msgid "You must specify at least one quota limit."
-@@ -2182,343 +2069,212 @@
- 
- #: cups/kpimagepage.cpp:44
- msgid ""
--" <qt>  "
--"<p><b>Brightness:</b> Slider to control the brightness value of all colors "
--"used.</p> "
--"<p> The brightness value can range from 0 to 200. Values greater than 100 will  "
--"lighten the print. Values less than 100 will darken the print. </p>  "
--"<br>  "
--"<hr>  "
--"<p><em><b>Additional hint for power users:</b> This KDEPrint GUI element "
--"matches  with the CUPS commandline job option parameter:</em>  "
--"<pre>    -o brightness=...      # use range from \"0\" to \"200\"  </pre>  </p>  "
--"</qt>"
--msgstr ""
--"<qt> "
--"<p><b>亮度：</b>調整所有顏色的亮度值。</p> "
--"<p>亮度值範圍從 0 到 200。大於 100 的值會讓列印結果變淡，而小於 100 的值會讓列印結果變暗。</p> "
--"<br>"
--"<hr> "
--"<p><b>進階使用者的額外提示：</b>這個選項與以下的 CUPS 命令列選項參數是一樣的： "
--"<pre>     -o brightness=...     #範圍從 0 到 200</pre></p></qt>"
-+" <qt>  <p><b>Brightness:</b> Slider to control the brightness value of all "
-+"colors used.</p> <p> The brightness value can range from 0 to 200. Values "
-+"greater than 100 will  lighten the print. Values less than 100 will darken "
-+"the print. </p>  <br>  <hr>  <p><em><b>Additional hint for power users:</b> "
-+"This KDEPrint GUI element matches  with the CUPS commandline job option "
-+"parameter:</em>  <pre>    -o brightness=...      # use range from \"0\" to "
-+"\"200\"  </pre>  </p>  </qt>"
-+msgstr ""
-+"<qt> <p><b>亮度：</b>調整所有顏色的亮度值。</p> <p>亮度值範圍從 0 到 200。大"
-+"於 100 的值會讓列印結果變淡，而小於 100 的值會讓列印結果變暗。</p> <br><hr> "
-+"<p><b>進階使用者的額外提示：</b>這個選項與以下的 CUPS 命令列選項參數是一樣"
-+"的： <pre>     -o brightness=...     #範圍從 0 到 200</pre></p></qt>"
- 
- #: cups/kpimagepage.cpp:58
- msgid ""
--" <qt>  "
--"<p><b>Hue (Tint):</b> Slider to control the hue value for color rotation.</p> "
--"<p> The hue value is a number from -360 to 360 and represents the color hue "
--"rotation.  The following table summarizes the change you will see for the base "
--"colors:  "
--"<center>  <table border=\"1\" width=\"70%\">  "
--"<tr>"
--"<th><b>Original</b></th> "
--"<th><b>hue=-45</b></th> "
--"<th><b>hue=45</b></th>   </tr>  "
--"<tr>"
--"<td>Red</td>             "
--"<td>Purple</td>         "
--"<td>Yellow-orange</td>   </tr>  "
--"<tr>"
--"<td>Green</td>           "
--"<td>Yellow-green</td>   "
--"<td>Blue-green</td>      </tr>  "
--"<tr>"
--"<td>Yellow</td>          "
--"<td>Orange</td>         "
--"<td>Green-yellow</td>    </tr>  "
--"<tr>"
--"<td>Blue</td>            "
--"<td>Sky-blue</td>       "
--"<td>Purple</td>          </tr>  "
--"<tr>"
--"<td>Magenta</td>         "
--"<td>Indigo</td>         "
--"<td>Crimson</td>         </tr>  "
--"<tr>"
--"<td>Cyan</td>            "
--"<td>Blue-green</td>     "
--"<td>Light-navy-blue</td> </tr>  </table>  </center>  "
--"<br>  "
--"<hr>  "
--"<p><em><b>Additional hint for power users:</b> This KDEPrint GUI element "
--"matches  with the CUPS commandline job option parameter:</em>  "
--"<pre>    -o hue=...     # use range from \"-360\" to \"360\"  </pre> </p>  </qt>"
--msgstr ""
--"<qt> "
--"<p><b>色度：</b>控制顏色輪轉的色度值。</p> "
--"<p>色度值範圍從 -360 到 360。以下的表格整理了您會看到基本顏色的改變。 "
--"<center> <table border=\"1\" width=\"70%\"> "
--"<tr> "
--"<th><b>原始顏色</b></th> "
--"<th><b>色度 -45</b></th> "
--"<th><b>色度 45</b></th></tr> "
--"<tr> "
--"<td>紅</td> "
--"<td>紫</td> "
--"<td>黃橘</td></tr> "
--"<tr> "
--"<td>綠</td> "
--"<td>黃綠</td> "
--"<td>藍綠</td> </tr> "
--"<tr> "
--"<td>黃</td> "
--"<td>橘</td> "
--"<td>綠黃</td> </tr> "
--"<tr> "
--"<td>藍</td> "
--"<td>天藍</td> "
--"<td>紫</td></tr> "
--"<tr> "
--"<td>紅紫</td> "
--"<td>藍紫</td> "
--"<td>深紅</td></tr> "
--"<tr> "
--"<td>青</td> "
--"<td>藍綠</td> "
--"<td>淡藏青</td></tr> </table> </center> "
--"<br>"
--"<hr> "
--"<p><b>進階使用者的額外提示：</b>這個選項與以下的 CUPS 命令列選項參數是一樣的： "
--"<pre>     -o hue=...     #範圍從 -360 到 360</pre></p></qt>"
-+" <qt>  <p><b>Hue (Tint):</b> Slider to control the hue value for color "
-+"rotation.</p> <p> The hue value is a number from -360 to 360 and represents "
-+"the color hue rotation.  The following table summarizes the change you will "
-+"see for the base colors:  <center>  <table border=\"1\" width=\"70%\">  "
-+"<tr><th><b>Original</b></th> <th><b>hue=-45</b></th> <th><b>hue=45</b></"
-+"th>   </tr>  <tr><td>Red</td>             <td>Purple</td>         <td>Yellow-"
-+"orange</td>   </tr>  <tr><td>Green</td>           <td>Yellow-green</td>   "
-+"<td>Blue-green</td>      </tr>  <tr><td>Yellow</td>          <td>Orange</"
-+"td>         <td>Green-yellow</td>    </tr>  <tr><td>Blue</td>            "
-+"<td>Sky-blue</td>       <td>Purple</td>          </tr>  <tr><td>Magenta</"
-+"td>         <td>Indigo</td>         <td>Crimson</td>         </tr>  "
-+"<tr><td>Cyan</td>            <td>Blue-green</td>     <td>Light-navy-blue</"
-+"td> </tr>  </table>  </center>  <br>  <hr>  <p><em><b>Additional hint for "
-+"power users:</b> This KDEPrint GUI element matches  with the CUPS "
-+"commandline job option parameter:</em>  <pre>    -o hue=...     # use range "
-+"from \"-360\" to \"360\"  </pre> </p>  </qt>"
-+msgstr ""
-+"<qt> <p><b>色度：</b>控制顏色輪轉的色度值。</p> <p>色度值範圍從 -360 到 360。"
-+"以下的表格整理了您會看到基本顏色的改變。 <center> <table border=\"1\" width="
-+"\"70%\"> <tr> <th><b>原始顏色</b></th> <th><b>色度 -45</b></th> <th><b>色度 "
-+"45</b></th></tr> <tr> <td>紅</td> <td>紫</td> <td>黃橘</td></tr> <tr> <td>綠"
-+"</td> <td>黃綠</td> <td>藍綠</td> </tr> <tr> <td>黃</td> <td>橘</td> <td>綠黃"
-+"</td> </tr> <tr> <td>藍</td> <td>天藍</td> <td>紫</td></tr> <tr> <td>紅紫</"
-+"td> <td>藍紫</td> <td>深紅</td></tr> <tr> <td>青</td> <td>藍綠</td> <td>淡藏"
-+"青</td></tr> </table> </center> <br><hr> <p><b>進階使用者的額外提示：</b>這個"
-+"選項與以下的 CUPS 命令列選項參數是一樣的： <pre>     -o hue=...     #範圍從 -"
-+"360 到 360</pre></p></qt>"
- 
- #: cups/kpimagepage.cpp:83
- msgid ""
--" <qt>  "
--"<p><b>Saturation:</b> Slider to control the saturation value for all colors "
--"used.</p> "
--"<p> The saturation value adjusts the saturation of the colors in an image, "
--"similar to  the color knob on your television. The color saturation value.can "
--"range from 0 to 200. On inkjet printers, a higher saturation value uses more "
--"ink. On laserjet printers, a  higher saturation uses more toner.  A color "
--"saturation of 0 produces a black-and-white print, while a value of 200 will  "
--"make the colors extremely intense. </p> "
--"<br>  "
--"<hr>  "
--"<p><em><b>Additional hint for power users:</b> This KDEPrint GUI element "
--"matches  with the CUPS commandline job option parameter:</em>  "
--"<pre>    -o saturation=...      # use range from \"0\" to \"200\"  </pre> </p>  "
--"</qt>"
--msgstr ""
--"<qt> "
--"<p><b>飽和度：</b>控制所有顏色的飽和度。</p> "
--"<p>飽和度的數值調整的是圖片中顏色的飽和度，就有點像電視上調整顏色的鈕。範圍從 0 到 "
--"200。在噴墨式印表機中，數值越高用的墨就越多。在雷射印表機上，數值越高用的碳粉就越多。數值設為 0 則只會印出黑白的輸出，而 200 "
--"則是最鮮豔的彩色。</p> "
--"<br>"
--"<hr> "
--"<p><b>進階使用者的額外提示：</b>這個選項與以下的 CUPS 命令列選項參數是一樣的： "
--"<pre>     -o saturation=...     # 範圍從 0 到 200</pre></p></qt>"
-+" <qt>  <p><b>Saturation:</b> Slider to control the saturation value for all "
-+"colors used.</p> <p> The saturation value adjusts the saturation of the "
-+"colors in an image, similar to  the color knob on your television. The color "
-+"saturation value.can range from 0 to 200. On inkjet printers, a higher "
-+"saturation value uses more ink. On laserjet printers, a  higher saturation "
-+"uses more toner.  A color saturation of 0 produces a black-and-white print, "
-+"while a value of 200 will  make the colors extremely intense. </p> <br>  "
-+"<hr>  <p><em><b>Additional hint for power users:</b> This KDEPrint GUI "
-+"element matches  with the CUPS commandline job option parameter:</em>  "
-+"<pre>    -o saturation=...      # use range from \"0\" to \"200\"  </pre> </"
-+"p>  </qt>"
-+msgstr ""
-+"<qt> <p><b>飽和度：</b>控制所有顏色的飽和度。</p> <p>飽和度的數值調整的是圖片"
-+"中顏色的飽和度，就有點像電視上調整顏色的鈕。範圍從 0 到 200。在噴墨式印表機"
-+"中，數值越高用的墨就越多。在雷射印表機上，數值越高用的碳粉就越多。數值設為 0 "
-+"則只會印出黑白的輸出，而 200 則是最鮮豔的彩色。</p> <br><hr> <p><b>進階使用者"
-+"的額外提示：</b>這個選項與以下的 CUPS 命令列選項參數是一樣的： <pre>     -o "
-+"saturation=...     # 範圍從 0 到 200</pre></p></qt>"
- 
- #: cups/kpimagepage.cpp:101
- msgid ""
--" <qt>  "
--"<p><b>Gamma:</b> Slider to control the gamma value for color correction.</p> "
--"<p> The gamma value can range from 1 to 3000.  A gamma values greater than 1000 "
--"lightens the print. A gamma value less than 1000  darken the print. The default "
--"gamma is 1000. </p> "
--"<p><b>Note:</b></p> the gamma value adjustment is not visible in the thumbnail  "
--"preview. </p>  "
--"<br>  "
--"<hr>  "
--"<p><em><b>Additional hint for power users:</b> This KDEPrint GUI element "
--"matches  with the CUPS commandline job option parameter:</em>  "
-+" <qt>  <p><b>Gamma:</b> Slider to control the gamma value for color "
-+"correction.</p> <p> The gamma value can range from 1 to 3000.  A gamma "
-+"values greater than 1000 lightens the print. A gamma value less than 1000  "
-+"darken the print. The default gamma is 1000. </p> <p><b>Note:</b></p> the "
-+"gamma value adjustment is not visible in the thumbnail  preview. </p>  <br>  "
-+"<hr>  <p><em><b>Additional hint for power users:</b> This KDEPrint GUI "
-+"element matches  with the CUPS commandline job option parameter:</em>  "
- "<pre>    -o gamma=...      # use range from \"1\" to \"3000\"  </pre> </p>  "
- "</qt>"
- msgstr ""
--"<qt> "
--"<p><b>灰度係數（Gamma）：</b>控制顏色校正的係數。</p> "
--"<p>Gamma 值的範圍從 1 到 3000。大於 1000 會讓列印結果變淡，小於 1000 則讓列印結果變暗。預設值為 1000。</p> "
--"<p><b>注意：</b></p>Gamma 值調整的結果不會在縮圖預覽中顯現。</p> "
--"<br>"
--"<hr> "
--"<p><b>進階使用者的額外提示：</b>這個選項與以下的 CUPS 命令列選項參數是一樣的： "
--"<pre>     -o gamma=...     # 範圍從 1 到 3000</pre></p></qt>"
-+"<qt> <p><b>灰度係數（Gamma）：</b>控制顏色校正的係數。</p> <p>Gamma 值的範圍"
-+"從 1 到 3000。大於 1000 會讓列印結果變淡，小於 1000 則讓列印結果變暗。預設值"
-+"為 1000。</p> <p><b>注意：</b></p>Gamma 值調整的結果不會在縮圖預覽中顯現。</"
-+"p> <br><hr> <p><b>進階使用者的額外提示：</b>這個選項與以下的 CUPS 命令列選項"
-+"參數是一樣的： <pre>     -o gamma=...     # 範圍從 1 到 3000</pre></p></qt>"
- 
- #: cups/kpimagepage.cpp:118
- msgid ""
--" <qt>  "
--"<p><b>Image Printing Options</b></p>  "
--"<p>All options controlled on this page only apply to printing images.  Most "
--"image file formats are supported. To name a few: JPEG, TIFF, PNG, GIF,  PNM "
--"(PBM/PGM/PNM/PPM), Sun Raster, SGI RGB, Windows BMP. Options to influence color "
--"output of image printouts are:  "
--"<ul>  "
--"<li> Brightness  </li> "
--"<li> Hue         </li> "
--"<li> Saturation  </li> "
--"<li> Gamma       </li> </ul>  "
--"<p>For a more detailed explanation about Brightness, Hue, Saturation and Gamma "
--"settings, please  look at the 'WhatsThis' items provided for these controls.  "
--"</p>  </p>  </qt>"
--msgstr ""
--"<qt> "
--"<p><b>圖片列印選項</b></p> "
--"<p>這一頁中所有的選項都只在您列印圖片時才會用到。大部份的圖片檔案格式都有支援，例如 "
--"JPEG、TIFF、PNG、GIF、PNM（PBM/PGM/PNM/PPM）、Sun Raster、SGI RGB、Windows BMP "
--"等等。影響圖片列印顏色輸出的選項有： "
--"<ul> "
--"<li>亮度（Brightness）</li> "
--"<li>色度（Hue）</li> "
--"<li>飽和度（Saturation）</li> "
--"<li>灰度係數（Gamma）</li> </p>"
--"<p>關於這些設定的解釋，請參考「這是什麼？」的說明。</p></qt>"
-+" <qt>  <p><b>Image Printing Options</b></p>  <p>All options controlled on "
-+"this page only apply to printing images.  Most image file formats are "
-+"supported. To name a few: JPEG, TIFF, PNG, GIF,  PNM (PBM/PGM/PNM/PPM), Sun "
-+"Raster, SGI RGB, Windows BMP. Options to influence color output of image "
-+"printouts are:  <ul>  <li> Brightness  </li> <li> Hue         </li> <li> "
-+"Saturation  </li> <li> Gamma       </li> </ul>  <p>For a more detailed "
-+"explanation about Brightness, Hue, Saturation and Gamma settings, please  "
-+"look at the 'WhatsThis' items provided for these controls.  </p>  </p>  </qt>"
-+msgstr ""
-+"<qt> <p><b>圖片列印選項</b></p> <p>這一頁中所有的選項都只在您列印圖片時才會用"
-+"到。大部份的圖片檔案格式都有支援，例如 JPEG、TIFF、PNG、GIF、PNM（PBM/PGM/"
-+"PNM/PPM）、Sun Raster、SGI RGB、Windows BMP 等等。影響圖片列印顏色輸出的選項"
-+"有： <ul> <li>亮度（Brightness）</li> <li>色度（Hue）</li> <li>飽和度"
-+"（Saturation）</li> <li>灰度係數（Gamma）</li> </p><p>關於這些設定的解釋，請"
-+"參考「這是什麼？」的說明。</p></qt>"
- 
- #: cups/kpimagepage.cpp:136
- msgid ""
--" <qt>  "
--"<p><b>Coloration Preview Thumbnail</b></p>  "
--"<p>The coloration preview thumbnail indicates change of image coloration by "
--"different settings.  Options to influence output are:  "
--"<ul>  "
--"<li> Brightness  </li> "
--"<li> Hue (Tint)  </li> "
--"<li> Saturation  </li> "
--"<li> Gamma       </li> </ul>  </p>  "
--"<p>For a more detailed explanation about Brightness, Hue, Saturation and Gamma "
--"settings, please  look at the 'WhatsThis' items provided for these controls.  "
--"</p>  </qt>"
--msgstr ""
--"<qt> "
--"<p><b>彩色縮圖預覽</b></p> "
--"<p>彩色縮圖預覽可以讓您測試不同的顏色調整。影響輸出結果的選項包括： "
--"<ul> "
--"<li>亮度（Brightness）</li> "
--"<li>色度（Hue）</li> "
--"<li>飽和度（Saturation）</li> "
--"<li>灰度係數（Gamma）</li> </p>"
--"<p>關於這些設定的解釋，請參考「這是什麼？」的說明。</p></qt>"
-+" <qt>  <p><b>Coloration Preview Thumbnail</b></p>  <p>The coloration preview "
-+"thumbnail indicates change of image coloration by different settings.  "
-+"Options to influence output are:  <ul>  <li> Brightness  </li> <li> Hue "
-+"(Tint)  </li> <li> Saturation  </li> <li> Gamma       </li> </ul>  </p>  "
-+"<p>For a more detailed explanation about Brightness, Hue, Saturation and "
-+"Gamma settings, please  look at the 'WhatsThis' items provided for these "
-+"controls.  </p>  </qt>"
-+msgstr ""
-+"<qt> <p><b>彩色縮圖預覽</b></p> <p>彩色縮圖預覽可以讓您測試不同的顏色調整。影"
-+"響輸出結果的選項包括： <ul> <li>亮度（Brightness）</li> <li>色度（Hue）</li> "
-+"<li>飽和度（Saturation）</li> <li>灰度係數（Gamma）</li> </p><p>關於這些設定"
-+"的解釋，請參考「這是什麼？」的說明。</p></qt>"
- 
- #: cups/kpimagepage.cpp:152
- msgid ""
--" <qt>  "
--"<p><b>Image Size:</b> Dropdown menu to control the image size on the printed "
--"paper. Dropdown  works in conjunction with slider below. Dropdown options "
--"are:.</p> "
--"<ul>  "
--"<li> <b>Natural Image Size:</b> Image prints in its natural image size. If it "
--"does not fit onto  one sheet, the printout will be spread across multiple "
--"sheets. Note, that the slider is disabled  when selecting 'natural image size' "
--"in the dropdown menu. </li> "
--"<li> <b>Resolution (ppi):</b> The resolution value slider covers a number range "
-+" <qt>  <p><b>Image Size:</b> Dropdown menu to control the image size on the "
-+"printed paper. Dropdown  works in conjunction with slider below. Dropdown "
-+"options are:.</p> <ul>  <li> <b>Natural Image Size:</b> Image prints in its "
-+"natural image size. If it does not fit onto  one sheet, the printout will be "
-+"spread across multiple sheets. Note, that the slider is disabled  when "
-+"selecting 'natural image size' in the dropdown menu. </li> <li> "
-+"<b>Resolution (ppi):</b> The resolution value slider covers a number range "
- "from 1 to 1200.  It specifies the resolution of the image in Pixels Per Inch "
--"(PPI). An image that is 3000x2400 pixels  will print 10x8 inches at 300 pixels "
--"per inch, for example, but 5x4 inches at 600 pixels per inch. If the specified "
--"resolution makes the image larger than the page, multiple pages will be "
--"printed.  Resolution defaults to 72 ppi.  </li> "
--"<li> <b>% of Page Size:</b> The percent value slider covers numbers from 1 to "
--"800. It specifies the size  in relation to the page (not the image). A scaling "
--"of 100 percent will fill the page as completely  as the image aspect ratio "
-+"(PPI). An image that is 3000x2400 pixels  will print 10x8 inches at 300 "
-+"pixels per inch, for example, but 5x4 inches at 600 pixels per inch. If the "
-+"specified resolution makes the image larger than the page, multiple pages "
-+"will be printed.  Resolution defaults to 72 ppi.  </li> <li> <b>% of Page "
-+"Size:</b> The percent value slider covers numbers from 1 to 800. It "
-+"specifies the size  in relation to the page (not the image). A scaling of "
-+"100 percent will fill the page as completely  as the image aspect ratio "
- "allows (doing auto-rotation of the image as needed).  A scaling of more than "
--"100 will print the image across multiple  sheets. A scaling of 200 percent will "
--"print on up to 4 pages. </li> Scaling in % of page size defaults to 100 %.  "
--"<li> <b>% of Natural Image Size:</b> The percent value slider moves from 1 to "
--"800. It specifies  the printout size in relation  to the natural image size. A "
--"scaling of 100 percent will print the image at its natural size, while a  "
--"scaling of 50 percent will print the image at half its natural size. If the "
--"specified scaling makes  the image larger than the page, multiple pages will be "
--"printed.  Scaling in % of natural image size defaults to 100 %.  </ul>  "
--"<br>  "
--"<hr>  "
--"<p><em><b>Additional hint for power users:</b> This KDEPrint GUI element "
--"matches  with the CUPS commandline job option parameter:</em>  "
--"<pre>     -o natural-scaling=...     # range in  %  is 1....800  "
--"<br>     -o scaling=...             # range in  %  is 1....800  "
-+"100 will print the image across multiple  sheets. A scaling of 200 percent "
-+"will print on up to 4 pages. </li> Scaling in % of page size defaults to 100 "
-+"%.  <li> <b>% of Natural Image Size:</b> The percent value slider moves from "
-+"1 to 800. It specifies  the printout size in relation  to the natural image "
-+"size. A scaling of 100 percent will print the image at its natural size, "
-+"while a  scaling of 50 percent will print the image at half its natural "
-+"size. If the specified scaling makes  the image larger than the page, "
-+"multiple pages will be printed.  Scaling in % of natural image size defaults "
-+"to 100 %.  </ul>  <br>  <hr>  <p><em><b>Additional hint for power users:</b> "
-+"This KDEPrint GUI element matches  with the CUPS commandline job option "
-+"parameter:</em>  <pre>     -o natural-scaling=...     # range in  %  is "
-+"1....800  <br>     -o scaling=...             # range in  %  is 1....800  "
- "<br>     -o ppi=...                 # range in ppi is 1...1200  </pre> </p>  "
- "</qt>"
- msgstr ""
--"<qt> "
--"<p><b>圖片大小</b>這個下拉選單與底下的滑動器一起控制列印在紙上的圖像大小。下拉選單選項包括:</p> "
--"<ul> "
--"<li><b>實際圖片大小：</b>圖片以它的實際大小列印。如果尺寸超過紙張大小，則會印到兩張以上的紙上。注意：選取這個選項的話，底下的滑動器會被關閉。</li"
--"> "
--"<li><b>解析度 (ppi)：</b>解析度的範圍從 1 到 1200，單位是每英吋像素（Pixels Per Inch, PPI）。以 "
--"3000x2400 像素的圖片而言，設定 300 PPI 則會印成 10吋x8吋的大小，設定 600 PPI 則印成 "
--"5吋x4吋大小。如果轉換後的大小仍然大於紙張的尺寸，則一樣會印到兩張以上的紙上。預設值為 72 PPI。</li> "
--"<li><b>紙張尺寸比例：</b>以紙張尺寸為基準計算的百分比例。範圍從 1 到 800。設為 100 也就是 100% 符合紙張尺寸，超過 100 "
--"則會列印到兩張以上的紙上。設為 200 則會印到四張紙上。預設為 100。</li> "
--"<li><b>實際圖片大小比例：</b>以實際圖片大小為基準計算的百分比例，範圍從 1 到 800。設為 100 "
--"也就是以實際圖片大小來列印。如果計算後的大小超過紙張的尺寸，則會列印到兩張以上的紙上。預設為 100。</li> </ul>"
--"<br>"
--"<hr> "
--"<p><b>進階使用者的額外提示：</b>這個選項與以下的 CUPS 命令列選項參數是一樣的： "
--"<pre>     -o natural-scaling=...     # 範圍從 1 到 800"
--"<br>      -o scaling=...     # 範圍從 1 到 800      -o ppi=...     # 範圍從 1 到 "
--"1200</pre></p></qt>"
-+"<qt> <p><b>圖片大小</b>這個下拉選單與底下的滑動器一起控制列印在紙上的圖像大"
-+"小。下拉選單選項包括:</p> <ul> <li><b>實際圖片大小：</b>圖片以它的實際大小列"
-+"印。如果尺寸超過紙張大小，則會印到兩張以上的紙上。注意：選取這個選項的話，底"
-+"下的滑動器會被關閉。</li> <li><b>解析度 (ppi)：</b>解析度的範圍從 1 到 1200，"
-+"單位是每英吋像素（Pixels Per Inch, PPI）。以 3000x2400 像素的圖片而言，設定 "
-+"300 PPI 則會印成 10吋x8吋的大小，設定 600 PPI 則印成 5吋x4吋大小。如果轉換後"
-+"的大小仍然大於紙張的尺寸，則一樣會印到兩張以上的紙上。預設值為 72 PPI。</li> "
-+"<li><b>紙張尺寸比例：</b>以紙張尺寸為基準計算的百分比例。範圍從 1 到 800。設"
-+"為 100 也就是 100% 符合紙張尺寸，超過 100 則會列印到兩張以上的紙上。設為 200 "
-+"則會印到四張紙上。預設為 100。</li> <li><b>實際圖片大小比例：</b>以實際圖片大"
-+"小為基準計算的百分比例，範圍從 1 到 800。設為 100 也就是以實際圖片大小來列"
-+"印。如果計算後的大小超過紙張的尺寸，則會列印到兩張以上的紙上。預設為 100。</"
-+"li> </ul><br><hr> <p><b>進階使用者的額外提示：</b>這個選項與以下的 CUPS 命令"
-+"列選項參數是一樣的： <pre>     -o natural-scaling=...     # 範圍從 1 到 "
-+"800<br>      -o scaling=...     # 範圍從 1 到 800      -o ppi=...     # 範圍"
-+"從 1 到 1200</pre></p></qt>"
- 
- #: cups/kpimagepage.cpp:192
- msgid ""
--" <qt>  "
--"<p><b>Position Preview Thumbnail</b></p>  "
--"<p>This position preview thumbnail indicates the position of the image on the "
--"paper sheet.  "
--"<p>Click on horizontal and vertical radio buttons to move image alignment on "
--"paper around. Options are:  "
--"<ul>  "
--"<li> center      </li> "
--"<li> top         </li> "
--"<li> top-left    </li> "
--"<li> left        </li> "
--"<li> bottom-left </li> "
--"<li> bottom      </li> "
--"<li> bottom-right</li> "
--"<li> right       </li> "
--"<li> top-right   </li> </ul>  </p>  </qt>"
--msgstr ""
--"<qt> "
--"<p><b>位置縮圖預覽</b></p> "
--"<p>位置縮圖預覽幫助您確認圖片在紙上的位置。</p> "
--"<p>選擇水平或垂直的圓鈕來移動紙的邊界。可用的選項包括： "
--"<ul> "
--"<li>置中(center)</li> "
--"<li>置頂(top)</li> "
--"<li>置左上方(top-left)</li> "
--"<li>置左方(left)</li> "
--"<li>置左下方(bottom-left)</li> "
--"<li>置底(bottom)</li> "
--"<li>置右下方(bottom-right)</li> "
--"<li>置右方(right)</li> "
--"<li>置右上方(top-right)</li></ul></p></qt>"
-+" <qt>  <p><b>Position Preview Thumbnail</b></p>  <p>This position preview "
-+"thumbnail indicates the position of the image on the paper sheet.  <p>Click "
-+"on horizontal and vertical radio buttons to move image alignment on paper "
-+"around. Options are:  <ul>  <li> center      </li> <li> top         </li> "
-+"<li> top-left    </li> <li> left        </li> <li> bottom-left </li> <li> "
-+"bottom      </li> <li> bottom-right</li> <li> right       </li> <li> top-"
-+"right   </li> </ul>  </p>  </qt>"
-+msgstr ""
-+"<qt> <p><b>位置縮圖預覽</b></p> <p>位置縮圖預覽幫助您確認圖片在紙上的位置。</"
-+"p> <p>選擇水平或垂直的圓鈕來移動紙的邊界。可用的選項包括： <ul> <li>置中"
-+"(center)</li> <li>置頂(top)</li> <li>置左上方(top-left)</li> <li>置左方(left)"
-+"</li> <li>置左下方(bottom-left)</li> <li>置底(bottom)</li> <li>置右下方"
-+"(bottom-right)</li> <li>置右方(right)</li> <li>置右上方(top-right)</li></"
-+"ul></p></qt>"
- 
- #: cups/kpimagepage.cpp:210
- msgid ""
--" <qt>  "
--"<p><b>Reset to Default Values</b> </p>  "
--"<p> Reset all coloration settings to default values. Default values are:  "
--"<ul>  "
--"<li> Brightness: 100 </li> "
--"<li> Hue (Tint).   0 </li> "
--"<li> Saturation: 100 </li> "
--"<li> Gamma:     1000 </li> </ul>  </p>  </qt>"
--msgstr ""
--"<qt> "
--"<p><b>重置回預設值</b></p> "
--"<p>將所有顏色設定都重置回預設值。預設值為： "
--"<ul> "
--"<li>亮度：100</li> "
--"<li>色度：0</li> "
--"<li>飽和度：100</li> "
--"<li>灰度係數：1000</li></ul></p></qt>"
-+" <qt>  <p><b>Reset to Default Values</b> </p>  <p> Reset all coloration "
-+"settings to default values. Default values are:  <ul>  <li> Brightness: 100 "
-+"</li> <li> Hue (Tint).   0 </li> <li> Saturation: 100 </li> <li> Gamma:     "
-+"1000 </li> </ul>  </p>  </qt>"
-+msgstr ""
-+"<qt> <p><b>重置回預設值</b></p> <p>將所有顏色設定都重置回預設值。預設值為： "
-+"<ul> <li>亮度：100</li> <li>色度：0</li> <li>飽和度：100</li> <li>灰度係數："
-+"1000</li></ul></p></qt>"
- 
- #: cups/kpimagepage.cpp:222
- msgid ""
--" <qt>  "
--"<p><b>Image Positioning:</b></p>  "
--"<p>Select a pair of radiobuttons to  move image to the position you want on the "
--"paper printout. Default  is 'center'. </p>  "
--"<br>  "
--"<hr>  "
--"<p><em><b>Additional hint for power users:</b> This KDEPrint GUI element "
--"matches  with the CUPS commandline job option parameter:</em>  "
--"<pre>    -o position=...       # examples: \"top-left\" or \"bottom\"  </pre> "
--"</p>  </qt>"
--msgstr ""
--"<qt> "
--"<p><b>圖片位置：</b></p> "
--"<p>選擇一組圓鈕來移動圖片在紙上的位置。預設為「置中」。</p> "
--"<br>"
--"<hr>"
--"<p><b>進階使用者的額外提示：</b>這個選項與以下的 CUPS 命令列選項參數是一樣的： "
--"<pre>     -o position=...     # 例：\"top-left\" 或 \"bottom\"</pre></p></qt>"
-+" <qt>  <p><b>Image Positioning:</b></p>  <p>Select a pair of radiobuttons "
-+"to  move image to the position you want on the paper printout. Default  is "
-+"'center'. </p>  <br>  <hr>  <p><em><b>Additional hint for power users:</b> "
-+"This KDEPrint GUI element matches  with the CUPS commandline job option "
-+"parameter:</em>  <pre>    -o position=...       # examples: \"top-left\" or "
-+"\"bottom\"  </pre> </p>  </qt>"
-+msgstr ""
-+"<qt> <p><b>圖片位置：</b></p> <p>選擇一組圓鈕來移動圖片在紙上的位置。預設為"
-+"「置中」。</p> <br><hr><p><b>進階使用者的額外提示：</b>這個選項與以下的 CUPS "
-+"命令列選項參數是一樣的： <pre>     -o position=...     # 例：\"top-left\" 或 "
-+"\"bottom\"</pre></p></qt>"
- 
- #: cups/kpimagepage.cpp:237
- msgid "Image"
-@@ -2600,7 +2356,7 @@
- 
- #: cups/kmcupsjobmanager.cpp:294
- msgid "&Edit Attributes..."
--msgstr "編輯屬性(&E)..."
-+msgstr "編輯屬性(&E)…"
- 
- #: cups/kmcupsjobmanager.cpp:347
- msgid "Unable to change job priority: "
-@@ -2747,16 +2503,17 @@
- 
- #: tools/escputil/escpwidget.cpp:171
- msgid ""
--"An escputil process is still running. You must wait until its completion before "
--"continuing."
-+"An escputil process is still running. You must wait until its completion "
-+"before continuing."
- msgstr "escputil 程序仍然在執行中。您必須等待該程式執行完畢後才能夠繼續。"
- 
- #: tools/escputil/escpwidget.cpp:179
- msgid ""
--"The executable escputil cannot be found in your PATH environment variable. Make "
--"sure gimp-print is installed and that escputil is in your PATH."
-+"The executable escputil cannot be found in your PATH environment variable. "
-+"Make sure gimp-print is installed and that escputil is in your PATH."
- msgstr ""
--"escputil 程式在目前的 PATH 環境變數所指定的目錄內找尋不到。請確定 gimp-print 套件程式已經安裝了，並確認 PATH 設定正確。"
-+"escputil 程式在目前的 PATH 環境變數所指定的目錄內找尋不到。請確定 gimp-print "
-+"套件程式已經安裝了，並確認 PATH 設定正確。"
- 
- #: tools/escputil/escpwidget.cpp:204
- msgid "Internal error: unable to start escputil process."
-@@ -2772,14 +2529,14 @@
- 
- #: management/kmmainview.cpp:71
- msgid ""
--"The printer %1 already exists. Continuing will overwrite existing printer. Do "
--"you want to continue?"
-+"The printer %1 already exists. Continuing will overwrite existing printer. "
-+"Do you want to continue?"
- msgstr "印表機 %1 已經存在。若是繼續將會蓋掉目前存在的印表機。您確定要繼續嗎？"
- 
- #: management/kmmainview.cpp:132 management/kmmainview.cpp:779
- #: management/kmmainview.cpp:855 management/kmmainview.cpp:879
- msgid "Initializing manager..."
--msgstr "初始化管理員..."
-+msgstr "初始化管理員…"
- 
- #: management/kmmainview.cpp:179
- msgid "&Icons,&List,&Tree"
-@@ -2811,15 +2568,15 @@
- 
- #: management/kmmainview.cpp:194
- msgid "&Configure..."
--msgstr "設定(&C)..."
-+msgstr "設定(&C)…"
- 
- #: management/kmmainview.cpp:195
- msgid "Add &Printer/Class..."
--msgstr "新增印表機/類別(&P)..."
-+msgstr "新增印表機/類別(&P)…"
- 
- #: management/kmmainview.cpp:196
- msgid "Add &Special (pseudo) Printer..."
--msgstr "新增特殊(假的)印表機(&S)..."
-+msgstr "新增特殊(假的)印表機(&S)…"
- 
- #: management/kmmainview.cpp:197
- msgid "Set as &Local Default"
-@@ -2831,11 +2588,11 @@
- 
- #: management/kmmainview.cpp:199
- msgid "&Test Printer..."
--msgstr "測試印表機(&T)..."
-+msgstr "測試印表機(&T)…"
- 
- #: management/kmmainview.cpp:200
- msgid "Configure &Manager..."
--msgstr "設定管理員(&M)..."
-+msgstr "設定管理員(&M)…"
- 
- #: management/kmmainview.cpp:201
- msgid "Initialize Manager/&View"
-@@ -2855,7 +2612,7 @@
- 
- #: management/kmmainview.cpp:211
- msgid "Configure &Server..."
--msgstr "設定伺服器(&S)..."
-+msgstr "設定伺服器(&S)…"
- 
- #: management/kmmainview.cpp:214
- msgid "Hide &Toolbar"
-@@ -2887,7 +2644,7 @@
- 
- #: management/kmmainview.cpp:229
- msgid "%1 &Web Site"
--msgstr "%1 Web 站台(&W)"
-+msgstr "%1 Web 站臺(&W)"
- 
- #: management/kmmainview.cpp:231
- msgid "Pri&nter Tools"
-@@ -2983,7 +2740,7 @@
- 
- #: management/kmmainview.cpp:675
- msgid "Restarting server..."
--msgstr "重新啟動伺服器..."
-+msgstr "重新啟動伺服器…"
- 
- #: management/kmmainview.cpp:685
- msgid "Unable to configure print server."
-@@ -2991,16 +2748,17 @@
- 
- #: management/kmmainview.cpp:690
- msgid "Configuring server..."
--msgstr "正在設定伺服器..."
-+msgstr "正在設定伺服器…"
- 
- #: management/kmmainview.cpp:838
- msgid ""
- "Unable to start printer tool. Possible reasons are: no printer selected, the "
--"selected printer doesn't have any local device defined (printer port), or the "
--"tool library could not be found."
-+"selected printer doesn't have any local device defined (printer port), or "
-+"the tool library could not be found."
- msgstr ""
--"無法執行印表機設定工具。可能的問題是：未選擇印表機，或者是所選取的印表機並沒有設定好所位於的本地端位置 "
--"(埠號)，或者是印表機設定工具相關程式庫未正確安裝，所以無法使用。"
-+"無法執行印表機設定工具。可能的問題是：未選擇印表機，或者是所選取的印表機並沒"
-+"有設定好所位於的本地端位置 (埠號)，或者是印表機設定工具相關程式庫未正確安裝，"
-+"所以無法使用。"
- 
- #: management/kmmainview.cpp:862
- msgid "Unable to retrieve the printer list."
-@@ -3020,15 +2778,15 @@
- 
- #: management/kmconfigcommand.cpp:39
- msgid ""
--"<p>Command objects perform a conversion from input to output."
--"<br>They are used as the basis to build both print filters and special "
--"printers. They are described by a command string, a set of options, a set of "
--"requirements and associated mime types. Here you can create new command objects "
--"and edit existing ones. All changes will only be effective for you."
--msgstr ""
--"<p>命令物件執行一個由輸入到輸出的轉換。"
--"<br>它們是用來建立列印過濾器以及特殊印表機的基礎。他們是以一個命令字串、一組參數、一組需求以及特殊的 MIME "
--"型別來定義。在此您可建立新的命令物件以及編輯現有的物件。所有的修改只會影響您自己。"
-+"<p>Command objects perform a conversion from input to output.<br>They are "
-+"used as the basis to build both print filters and special printers. They are "
-+"described by a command string, a set of options, a set of requirements and "
-+"associated mime types. Here you can create new command objects and edit "
-+"existing ones. All changes will only be effective for you."
-+msgstr ""
-+"<p>命令物件執行一個由輸入到輸出的轉換。<br>它們是用來建立列印過濾器以及特殊印"
-+"表機的基礎。他們是以一個命令字串、一組參數、一組需求以及特殊的 MIME 型別來定"
-+"義。在此您可建立新的命令物件以及編輯現有的物件。所有的修改只會影響您自己。"
- 
- #: management/kmwizard.cpp:64 management/kmwizard.cpp:209
- msgid "&Next >"
-@@ -3085,9 +2843,10 @@
- 
- #: management/kmwlocal.cpp:63
- msgid ""
--"<p>Select a valid detected port, or enter directly the corresponding URI in the "
--"bottom edit field.</p>"
--msgstr "<p>從偵測出來的埠中選擇一個有效的，或者直接在底下的編輯區輸入相應的 URI。</p>"
-+"<p>Select a valid detected port, or enter directly the corresponding URI in "
-+"the bottom edit field.</p>"
-+msgstr ""
-+"<p>從偵測出來的埠中選擇一個有效的，或者直接在底下的編輯區輸入相應的 URI。</p>"
- 
- #: management/kmwlocal.cpp:78
- msgid ""
-@@ -3248,10 +3007,12 @@
- 
- #: management/networkscanner.cpp:161
- msgid ""
--"You are about to scan a subnet (%1.*) that does not correspond to the current "
--"subnet of this computer (%2.*). Do you want to scan the specified subnet "
--"anyway?"
--msgstr "您即將掃描與這部電腦的子網路 (%2.*) 不對應的子網路 (%1.*)。您仍想掃描指定的子網路嗎？"
-+"You are about to scan a subnet (%1.*) that does not correspond to the "
-+"current subnet of this computer (%2.*). Do you want to scan the specified "
-+"subnet anyway?"
-+msgstr ""
-+"您即將掃描與這部電腦的子網路 (%2.*) 不對應的子網路 (%1.*)。您仍想掃描指定的子"
-+"網路嗎？"
- 
- #: management/networkscanner.cpp:164
- msgid "&Scan"
-@@ -3294,11 +3055,12 @@
- 
- #: management/kmwfile.cpp:41
- msgid ""
--"<p>The printing will be redirected to a file. Enter here the path of the file "
--"you want to use for redirection. Use an absolute path or the browse button for "
--"graphical selection.</p>"
-+"<p>The printing will be redirected to a file. Enter here the path of the "
-+"file you want to use for redirection. Use an absolute path or the browse "
-+"button for graphical selection.</p>"
- msgstr ""
--"<p>這個列印工作將會被轉向到一個檔案。在這裡輸入那個您要轉向的檔案的路徑。請用絕對路徑或 <b>[瀏覽]</b> 按鍵來使用圖形化選擇器。</p>"
-+"<p>這個列印工作將會被轉向到一個檔案。在這裡輸入那個您要轉向的檔案的路徑。請用"
-+"絕對路徑或 <b>[瀏覽]</b> 按鍵來使用圖形化選擇器。</p>"
- 
- #: management/kmwfile.cpp:44
- msgid "Print to file:"
-@@ -3330,12 +3092,14 @@
- 
- #: management/kmconfigpreview.cpp:44
- msgid ""
--"You can use an external preview program (PS viewer) instead of the KDE built-in "
--"preview system. Note that if the KDE default PS viewer (KGhostView) cannot be "
--"found, KDE tries automatically to find another external PostScript viewer"
--msgstr ""
--"您可以另外指定外部的預覽程式 (PS 檢視程式) 取代 KDE 內建的預覽程式。請注意一下，KDE 的內建 PS 檢視程式 (KGhostView) "
--"若是找不到的話，KDE 將會自動尋找外部的 PostView 檢視程式。"
-+"You can use an external preview program (PS viewer) instead of the KDE built-"
-+"in preview system. Note that if the KDE default PS viewer (KGhostView) "
-+"cannot be found, KDE tries automatically to find another external PostScript "
-+"viewer"
-+msgstr ""
-+"您可以另外指定外部的預覽程式 (PS 檢視程式) 取代 KDE 內建的預覽程式。請注意一"
-+"下，KDE 的內建 PS 檢視程式 (KGhostView) 若是找不到的話，KDE 將會自動尋找外部"
-+"的 PostView 檢視程式。"
- 
- #: management/kmwdrivertest.cpp:41
- msgid "Printer Test"
-@@ -3359,13 +3123,14 @@
- 
- #: management/kmwdrivertest.cpp:59
- msgid ""
--"<p>Now you can test the printer before finishing installation. Use the <b>"
--"Settings</b> button to configure the printer driver and the <b>Test</b> "
--"button to test your configuration. Use the <b>Back</b> "
--"button to change the driver (your current configuration will be discarded).</p>"
--msgstr ""
--"<p>現在您在完成安裝前可以測試一下印表機。用 <b>設定</b> 按鍵來設定印表機驅動程式和 <b>測試</b> 按鍵來測試您的設定值。使用 <b>"
--"上一步</b> 按鍵改變驅動程式 (您現在的設定值將會被丟棄。</p>"
-+"<p>Now you can test the printer before finishing installation. Use the "
-+"<b>Settings</b> button to configure the printer driver and the <b>Test</b> "
-+"button to test your configuration. Use the <b>Back</b> button to change the "
-+"driver (your current configuration will be discarded).</p>"
-+msgstr ""
-+"<p>現在您在完成安裝前可以測試一下印表機。用 <b>設定</b> 按鍵來設定印表機驅動"
-+"程式和 <b>測試</b> 按鍵來測試您的設定值。使用 <b>上一步</b> 按鍵改變驅動程式 "
-+"(您現在的設定值將會被丟棄。</p>"
- 
- #: management/kmwdrivertest.cpp:117
- msgid "<qt>Unable to load the requested driver:<p>%1</p></qt>"
-@@ -3373,8 +3138,8 @@
- 
- #: management/kmwdrivertest.cpp:146
- msgid ""
--"Test page successfully sent to printer. Wait until printing is complete, then "
--"click the OK button."
-+"Test page successfully sent to printer. Wait until printing is complete, "
-+"then click the OK button."
- msgstr "測試頁已經成功的送至印表機。請等待印表完成，然後按確定按鈕。</p>"
- 
- #: management/kmwdrivertest.cpp:148
-@@ -3391,8 +3156,8 @@
- 
- #: management/kmpropwidget.cpp:50
- msgid ""
--"<qt>Unable to change printer properties. Error received from manager:"
--"<p>%1</p></qt>"
-+"<qt>Unable to change printer properties. Error received from manager:<p>%1</"
-+"p></qt>"
- msgstr "<qt>無法變更印表機的屬性設定。由管理程式傳回的錯誤資訊：<p>%1</p></qt>"
- 
- #: management/kaddprinterwizard.cpp:10
-@@ -3409,15 +3174,17 @@
- 
- #: management/kmdbcreator.cpp:92
- msgid ""
--"No executable defined for the creation of the driver database. This operation "
--"is not implemented."
-+"No executable defined for the creation of the driver database. This "
-+"operation is not implemented."
- msgstr "印表機驅動程式內尚未建立供印表列印執行檔。該功能尚未實作。"
- 
- #: management/kmdbcreator.cpp:95
- msgid ""
- "The executable %1 could not be found in your PATH. Check that this program "
- "exists and is accessible in your PATH variable."
--msgstr "在搜尋的路徑目錄內找不到 %1 執行檔案。請確定該執行檔案有正確安裝，以及能夠在 PATH 變數路徑內所找到。"
-+msgstr ""
-+"在搜尋的路徑目錄內找不到 %1 執行檔案。請確定該執行檔案有正確安裝，以及能夠在 "
-+"PATH 變數路徑內所找到。"
- 
- #: management/kmdbcreator.cpp:99
- msgid ""
-@@ -3427,7 +3194,7 @@
- 
- #: management/kmdbcreator.cpp:113
- msgid "Please wait while KDE rebuilds a driver database."
--msgstr "請稍後... KDE正在重新建立驅動程式資料庫。"
-+msgstr "請稍後… KDE正在重新建立驅動程式資料庫。"
- 
- #: management/kmdbcreator.cpp:114
- msgid "Driver Database"
-@@ -3444,9 +3211,12 @@
- 
- #: management/kmwpassword.cpp:43
- msgid ""
--"<p>This backend may require a login/password to work properly. Select the type "
--"of access to use and fill in the login and password entries if needed.</p>"
--msgstr "<p>這個後端介面可能會需要一個使用者名稱/密碼才能使用。請選擇存取的型態，並填入使用者名稱與密碼。</p>"
-+"<p>This backend may require a login/password to work properly. Select the "
-+"type of access to use and fill in the login and password entries if needed.</"
-+"p>"
-+msgstr ""
-+"<p>這個後端介面可能會需要一個使用者名稱/密碼才能使用。請選擇存取的型態，並填"
-+"入使用者名稱與密碼。</p>"
- 
- #: management/kmwpassword.cpp:49
- msgid "&Login:"
-@@ -3494,7 +3264,7 @@
- 
- #: management/kmpropcontainer.cpp:35
- msgid "Change..."
--msgstr "變更..."
-+msgstr "變更…"
- 
- #: management/kmconfigdialog.cpp:38
- msgid "KDE Print Configuration"
-@@ -3611,7 +3381,8 @@
- 
- #: management/kmjobviewer.cpp:479
- msgid ""
--"Unable to perform action \"%1\" on selected jobs. Error received from manager:"
-+"Unable to perform action \"%1\" on selected jobs. Error received from "
-+"manager:"
- msgstr "無法選取的列印工作上進行 \"%1\" 動作。由管理程式傳回錯誤資訊："
- 
- #: management/kmjobviewer.cpp:491
-@@ -3652,8 +3423,9 @@
- "This time setting controls the refresh rate of various <b>KDE Print</b> "
- "components like the print manager and the job viewer."
- msgstr ""
--"該時間指定是用來設定 <b>KDE 列印</b> "
--"元件內對於列印工作清單的顯示，要間隔多久時間更新顯示目前的狀態。一般在列印管理員以及列印工作顯示器內都會用到該時間設定"
-+"該時間指定是用來設定 <b>KDE 列印</b> 元件內對於列印工作清單的顯示，要間隔多久"
-+"時間更新顯示目前的狀態。一般在列印管理員以及列印工作顯示器內都會用到該時間設"
-+"定"
- 
- #: management/kmconfiggeneral.cpp:57
- msgid "Test Page"
-@@ -3665,7 +3437,7 @@
- 
- #: management/kmconfiggeneral.cpp:60
- msgid "Preview..."
--msgstr "預覽..."
-+msgstr "預覽…"
- 
- #: management/kmconfiggeneral.cpp:70
- msgid "Sho&w printing status message box"
-@@ -3785,21 +3557,25 @@
- 
- #: management/kmconfigfonts.cpp:85
- msgid ""
--"These options will automatically put fonts in the PostScript file which are not "
--"present on the printer. Font embedding usually produces better print results "
--"(closer to what you see on the screen), but larger print data as well."
--msgstr ""
--"這個選項將會把 PostScript "
--"檔案內所需要的字體檔案直接嵌入於檔案內，當列印時若是對方印表機檔案並沒有支援該字體時，還是能夠正常列印。將該檔案所需要的字體檔案直接嵌入於檔案內時，通常會得到比"
--"較好的列印結果 (與螢幕上的顯示內容比較近似)，但是缺點是檔案比較大，列印時間會稍微久一點。"
-+"These options will automatically put fonts in the PostScript file which are "
-+"not present on the printer. Font embedding usually produces better print "
-+"results (closer to what you see on the screen), but larger print data as "
-+"well."
-+msgstr ""
-+"這個選項將會把 PostScript 檔案內所需要的字體檔案直接嵌入於檔案內，當列印時若"
-+"是對方印表機檔案並沒有支援該字體時，還是能夠正常列印。將該檔案所需要的字體檔"
-+"案直接嵌入於檔案內時，通常會得到比較好的列印結果 (與螢幕上的顯示內容比較近"
-+"似)，但是缺點是檔案比較大，列印時間會稍微久一點。"
- 
- #: management/kmconfigfonts.cpp:89
- msgid ""
- "When using font embedding you can select additional directories where KDE "
--"should search for embeddable font files. By default, the X server font path is "
--"used, so adding those directories is not needed. The default search path should "
--"be sufficient in most cases."
--msgstr "使用字型嵌入功能時，您可以選擇可嵌入字型的目錄供 KDE 搜尋。一般來說會使用 X 伺服器的字型路徑，所以通常不需要再額外選擇目錄。"
-+"should search for embeddable font files. By default, the X server font path "
-+"is used, so adding those directories is not needed. The default search path "
-+"should be sufficient in most cases."
-+msgstr ""
-+"使用字型嵌入功能時，您可以選擇可嵌入字型的目錄供 KDE 搜尋。一般來說會使用 X "
-+"伺服器的字型路徑，所以通常不需要再額外選擇目錄。"
- 
- #: management/kmwsmb.cpp:35
- msgid "SMB Printer Settings"
-@@ -3929,9 +3705,11 @@
- 
- #: management/kxmlcommanddlg.cpp:285
- msgid ""
--"An identification string. Use only alphanumeric characters except spaces. The "
--"string <b>__root__</b> is reserved for internal use."
--msgstr "一個辨認用的字串。只能使用英文字母與數字，不能使用空白。<b>__root__</b> 這個字串是保留給內部使用的。"
-+"An identification string. Use only alphanumeric characters except spaces. "
-+"The string <b>__root__</b> is reserved for internal use."
-+msgstr ""
-+"一個辨認用的字串。只能使用英文字母與數字，不能使用空白。<b>__root__</b> 這個"
-+"字串是保留給內部使用的。"
- 
- #: management/kxmlcommanddlg.cpp:289
- msgid ""
-@@ -3941,68 +3719,67 @@
- 
- #: management/kxmlcommanddlg.cpp:293
- msgid ""
--"The type of the option. This determines how the option is presented graphically "
--"to the user."
-+"The type of the option. This determines how the option is presented "
-+"graphically to the user."
- msgstr "選項的型態，關係到這個選項要如何以圖形呈現在使用者面前。"
- 
- #: management/kxmlcommanddlg.cpp:297
- msgid ""
- "The format of the option. This determines how the option is formatted for "
--"inclusion in the global command line. The tag <b>%value</b> "
--"can be used to represent the user selection. This tag will be replaced at "
--"run-time by a string representation of the option value."
--msgstr "選項的格式，也就是選項如何在命令列上使用。<b>%value</b> 標籤用來表示使用者的選擇。這個標籤可以在執行時被選項的數值所取代。"
-+"inclusion in the global command line. The tag <b>%value</b> can be used to "
-+"represent the user selection. This tag will be replaced at run-time by a "
-+"string representation of the option value."
-+msgstr ""
-+"選項的格式，也就是選項如何在命令列上使用。<b>%value</b> 標籤用來表示使用者的"
-+"選擇。這個標籤可以在執行時被選項的數值所取代。"
- 
- #: management/kxmlcommanddlg.cpp:303
- msgid ""
--"The default value of the option. For non persistent options, nothing is added "
--"to the command line if the option has that default value. If this value does "
--"not correspond to the actual default value of the underlying utility, make the "
--"option persistent to avoid unwanted effects."
--msgstr ""
--"選項的預設值。對於非持續性的選項來說，使用預設值時就不需要在命令列中特別指定。若是預設值與底下的工具預設值不同，則應該將此選項設為持續性選項以避免無法預期的情況"
--"出現。"
-+"The default value of the option. For non persistent options, nothing is "
-+"added to the command line if the option has that default value. If this "
-+"value does not correspond to the actual default value of the underlying "
-+"utility, make the option persistent to avoid unwanted effects."
-+msgstr ""
-+"選項的預設值。對於非持續性的選項來說，使用預設值時就不需要在命令列中特別指"
-+"定。若是預設值與底下的工具預設值不同，則應該將此選項設為持續性選項以避免無法"
-+"預期的情況出現。"
- 
- #: management/kxmlcommanddlg.cpp:309
- msgid ""
- "Make the option persistent. A persistent option is always written to the "
--"command line, whatever its value. This is useful when the chosen default value "
--"does not match with the actual default value of the underlying utility."
--msgstr "將選項設為持續性選項。所謂持續性選項是指一定會被寫入命令列的選項。通常所設定的預設值與實際工具的預設值不同時就會用到。"
-+"command line, whatever its value. This is useful when the chosen default "
-+"value does not match with the actual default value of the underlying utility."
-+msgstr ""
-+"將選項設為持續性選項。所謂持續性選項是指一定會被寫入命令列的選項。通常所設定"
-+"的預設值與實際工具的預設值不同時就會用到。"
- 
- #: management/kxmlcommanddlg.cpp:313
- #, c-format
- msgid ""
- "The full command line to execute the associated underlying utility. This "
--"command line is based on a mechanism of tags that are replaced at run-time. The "
--"supported tags are:"
--"<ul>"
--"<li><b>%filterargs</b>: command options</li>"
--"<li><b>%filterinput</b>: input specification</li>"
--"<li><b>%filteroutput</b>: output specification</li>"
--"<li><b>%psu</b>: the page size in upper case</li>"
--"<li><b>%psl</b>: the page size in lower case</li></ul>"
--msgstr ""
--"工具。這個命令列中含有在執行時會被置換掉的標籤。支援的標籤有： "
--"<ul> "
--"<li><b>%filterargs</b>：命令選項</li> "
--"<li><b>%filterinput</b>：指定輸入</li> "
--"<li><b>%filteroutput</b>：指定輸出</li> "
--"<li><b>%psu</b>：紙張大小，以大寫表示</li> "
-+"command line is based on a mechanism of tags that are replaced at run-time. "
-+"The supported tags are:<ul><li><b>%filterargs</b>: command options</"
-+"li><li><b>%filterinput</b>: input specification</li><li><b>%filteroutput</"
-+"b>: output specification</li><li><b>%psu</b>: the page size in upper case</"
-+"li><li><b>%psl</b>: the page size in lower case</li></ul>"
-+msgstr ""
-+"工具。這個命令列中含有在執行時會被置換掉的標籤。支援的標籤有： <ul> <li><b>%"
-+"filterargs</b>：命令選項</li> <li><b>%filterinput</b>：指定輸入</li> <li><b>%"
-+"filteroutput</b>：指定輸出</li> <li><b>%psu</b>：紙張大小，以大寫表示</li> "
- "<li><b>%psl</b>：紙張大小，以小寫表示</li></ul>"
- 
- #: management/kxmlcommanddlg.cpp:323
- #, c-format
- msgid ""
--"Input specification when the underlying utility reads input data from a file. "
--"Use the tag <b>%in</b> to represent the input filename."
-+"Input specification when the underlying utility reads input data from a "
-+"file. Use the tag <b>%in</b> to represent the input filename."
- msgstr "指定底下的工具讀取輸入資料的檔案。用 <b>%in</b> 來表示輸入檔名。"
- 
- #: management/kxmlcommanddlg.cpp:327
- #, c-format
- msgid ""
--"Output specification when the underlying utility writes output data to a file. "
--"Use the tag <b>%out</b> to represent the output filename."
-+"Output specification when the underlying utility writes output data to a "
-+"file. Use the tag <b>%out</b> to represent the output filename."
- msgstr "指定底下的工具輸出資料的檔案。用 <b>%out</b> 來表示輸出檔名。"
- 
- #: management/kxmlcommanddlg.cpp:331
-@@ -4023,7 +3800,8 @@
- "the interface. This comment string supports basic HTML tags like &lt;a&gt;, "
- "&lt;b&gt; or &lt;i&gt;."
- msgstr ""
--"底下工具的註解，可以讓使用者從介面中讀取。註解字串支援基本的 HTML 標籤如 &lt;a&gt;, &lt;b&gt; 或 &lt;i&gt;。"
-+"底下工具的註解，可以讓使用者從介面中讀取。註解字串支援基本的 HTML 標籤如 &lt;"
-+"a&gt;, &lt;b&gt; 或 &lt;i&gt;。"
- 
- #: management/kxmlcommanddlg.cpp:568
- msgid ""
-@@ -4057,7 +3835,7 @@
- 
- #: management/kxmlcommanddlg.cpp:851
- msgid "&Edit Command..."
--msgstr "編輯命令(&E)..."
-+msgstr "編輯命令(&E)…"
- 
- #: management/kxmlcommanddlg.cpp:868
- msgid "Output &format:"
-@@ -4079,7 +3857,8 @@
- msgid ""
- "<p>Enter the information concerning the remote LPD queue; this wizard will "
- "check it before continuing.</p>"
--msgstr "<p>輸入遠端 LPD 佇列的相關資訊。這個精靈將會在繼續之前先檢查這些資訊。</p>"
-+msgstr ""
-+"<p>輸入遠端 LPD 佇列的相關資訊。這個精靈將會在繼續之前先檢查這些資訊。</p>"
- 
- #: management/kmwlpd.cpp:54
- msgid "Some information is missing."
-@@ -4105,12 +3884,13 @@
- msgid ""
- "The printer filtering allows you to view only a specific set of printers "
- "instead of all of them. This may be useful when there are a lot of printers "
--"available but you only use a few ones. Select the printers you want to see from "
--"the list on the left or enter a <b>Location</b> filter (ex: Group_1*). Both are "
--"cumulative and ignored if empty."
--msgstr ""
--"印表機過濾可以讓您檢視部分的印表機，而不是全部都顯示出來。在有很多印表機項目時，而您只希望使用其中的幾台印表機時很有用。從左邊的列表中選擇您希望看到的印表機，或"
--"者輸入一個<b>位置</b>過濾 (例如：Group_1*)。"
-+"available but you only use a few ones. Select the printers you want to see "
-+"from the list on the left or enter a <b>Location</b> filter (ex: Group_1*). "
-+"Both are cumulative and ignored if empty."
-+msgstr ""
-+"印表機過濾可以讓您檢視部分的印表機，而不是全部都顯示出來。在有很多印表機項目"
-+"時，而您只希望使用其中的幾臺印表機時很有用。從左邊的列表中選擇您希望看到的印"
-+"表機，或者輸入一個<b>位置</b>過濾 (例如：Group_1*)。"
- 
- #: management/kmconfigfilter.cpp:62
- msgid "Location filter:"
-@@ -4123,9 +3903,11 @@
- #: management/kmwdriverselect.cpp:43
- msgid ""
- "<p>Several drivers have been detected for this model. Select the driver you "
--"want to use. You will have the opportunity to test it as well as to change it "
--"if necessary.</p>"
--msgstr "<p>在這個型號上偵測到有幾個驅動程式可用。選擇一個您想要使用的驅動程式。您將會有機會測試這個驅動程式，如果有必要的話還可以更換。</p>"
-+"want to use. You will have the opportunity to test it as well as to change "
-+"it if necessary.</p>"
-+msgstr ""
-+"<p>在這個型號上偵測到有幾個驅動程式可用。選擇一個您想要使用的驅動程式。您將會"
-+"有機會測試這個驅動程式，如果有必要的話還可以更換。</p>"
- 
- #: management/kmwdriverselect.cpp:46
- msgid "Driver Information"
-@@ -4149,25 +3931,18 @@
- 
- #: management/kmwinfopage.cpp:37
- msgid ""
--"<p>Welcome,</p>"
--"<br>"
--"<p>This wizard will help to install a new printer on your computer. It will "
--"guide you through the various steps of the process of installing and "
--"configuring a printer for your printing system. At each step, you can always go "
--"back using the <b>Back</b> button.</p>"
--"<br>"
--"<p>We hope you'll enjoy this tool!</p>"
--"<br><p align=right><a href=\"http://printing.kde.org\"><i>"
--"The KDE printing team</i></a>.</p>"
--msgstr ""
--"<p>歡迎來到印表精靈</p>"
--"<br>"
--"<p>這個精靈會協助您在您的電腦上安裝一個新的印表機。它會引導您一步一步完成安裝以及設定一個印表系統的工作。在每一步您都可以利用 <b>上一步</b> "
--"按鍵重新設定前面的步驟。</p>"
--"<br>"
--"<p>我們希望您會喜歡這個工具！</p>"
--"<br><p align=right><a href=\"http://printing.kde.org\"><i>KDE printing team</i>"
--"</p>"
-+"<p>Welcome,</p><br><p>This wizard will help to install a new printer on your "
-+"computer. It will guide you through the various steps of the process of "
-+"installing and configuring a printer for your printing system. At each step, "
-+"you can always go back using the <b>Back</b> button.</p><br><p>We hope "
-+"you'll enjoy this tool!</p><br><p align=right><a href=\"http://printing.kde."
-+"org\"><i>The KDE printing team</i></a>.</p>"
-+msgstr ""
-+"<p>歡迎來到印表精靈</p><br><p>這個精靈會協助您在您的電腦上安裝一個新的印表"
-+"機。它會引導您一步一步完成安裝以及設定一個印表系統的工作。在每一步您都可以利"
-+"用 <b>上一步</b> 按鍵重新設定前面的步驟。</p><br><p>我們希望您會喜歡這個工"
-+"具！</p><br><p align=right><a href=\"http://printing.kde.org\"><i>KDE "
-+"printing team</i></p>"
- 
- #: management/kmdriverdbwidget.cpp:51
- msgid "&PostScript printer"
-@@ -4179,7 +3954,7 @@
- 
- #: management/kmdriverdbwidget.cpp:55
- msgid "&Other..."
--msgstr "其他(&O)..."
-+msgstr "其他(&O)…"
- 
- #: management/kmdriverdbwidget.cpp:56
- msgid "&Manufacturer:"
-@@ -4191,7 +3966,7 @@
- 
- #: management/kmdriverdbwidget.cpp:157 management/kmdriverdbwidget.cpp:166
- msgid "Loading..."
--msgstr "載入..."
-+msgstr "載入…"
- 
- #: management/kmdriverdbwidget.cpp:217
- msgid "Unable to find the PostScript driver."
-@@ -4227,7 +4002,7 @@
- 
- #: management/kxmlcommandselector.cpp:72
- msgid "&Browse..."
--msgstr "瀏覽(&B)..."
-+msgstr "瀏覽(&B)…"
- 
- #: management/kxmlcommandselector.cpp:73
- msgid "Use co&mmand:"
-@@ -4317,12 +4092,12 @@
- 
- #: management/kmwname.cpp:37
- msgid ""
--"<p>Enter the information concerning your printer or class. <b>Name</b> "
--"is mandatory, <b>Location</b> and <b>Description</b> "
--"are not (they may even not be used on some systems).</p>"
-+"<p>Enter the information concerning your printer or class. <b>Name</b> is "
-+"mandatory, <b>Location</b> and <b>Description</b> are not (they may even not "
-+"be used on some systems).</p>"
- msgstr ""
--"<p>輸入您的印表機或類別的相關資訊。<b>名稱</b> 是必須的，<b>位置</b> 和 <b>描述</b> "
--"則不是 (後兩者甚至在大部份的系統裡都不會用到)。</p>"
-+"<p>輸入您的印表機或類別的相關資訊。<b>名稱</b> 是必須的，<b>位置</b> 和 <b>描"
-+"述</b> 則不是 (後兩者甚至在大部份的系統裡都不會用到)。</p>"
- 
- #: management/kmwname.cpp:39
- msgid "Name:"
-@@ -4334,12 +4109,13 @@
- 
- #: management/kmwname.cpp:56
- msgid ""
--"It is usually not a good idea to include spaces in printer name: it may prevent "
--"your printer from working correctly. The wizard can strip all spaces from the "
--"string you entered, resulting in %1; what do you want to do?"
--msgstr ""
--"一般來說，提供的印表機名稱設定，最好不要包含有空白，以避免一些意外情況導致您的列印工作無法正常進行。設定精靈程式能夠將您所輸入字串內的空白加以去除，最後得到 "
--"%1。您打算要怎麼做呢？"
-+"It is usually not a good idea to include spaces in printer name: it may "
-+"prevent your printer from working correctly. The wizard can strip all spaces "
-+"from the string you entered, resulting in %1; what do you want to do?"
-+msgstr ""
-+"一般來說，提供的印表機名稱設定，最好不要包含有空白，以避免一些意外情況導致您"
-+"的列印工作無法正常進行。設定精靈程式能夠將您所輸入字串內的空白加以去除，最後"
-+"得到 %1。您打算要怎麼做呢？"
- 
- #: management/kmwname.cpp:62
- msgid "Strip"
-@@ -4363,11 +4139,11 @@
- 
- #: management/kmwbackend.cpp:116
- msgid ""
--"<qt>"
--"<p>Locally-connected printer</p>"
--"<p>Use this for a printer connected to the computer via a parallel, serial or "
--"USB port.</p></qt>"
--msgstr "<qt> <p>本地端連接的印表機</p> <p>印表機是透過平行埠、序列埠或 USB 埠直接連接到此電腦時，請選擇此項。</p></qt>"
-+"<qt><p>Locally-connected printer</p><p>Use this for a printer connected to "
-+"the computer via a parallel, serial or USB port.</p></qt>"
-+msgstr ""
-+"<qt> <p>本地端連接的印表機</p> <p>印表機是透過平行埠、序列埠或 USB 埠直接連接"
-+"到此電腦時，請選擇此項。</p></qt>"
- 
- #: management/kmwbackend.cpp:122
- msgid "&SMB shared printer (Windows)"
-@@ -4375,14 +4151,12 @@
- 
- #: management/kmwbackend.cpp:123
- msgid ""
--"<qt>"
--"<p>Shared Windows printer</p>"
--"<p>Use this for a printer installed on a Windows server and shared on the "
--"network using the SMB protocol (samba).</p></qt>"
--msgstr ""
--"<qt> "
--"<p>分享的 Windows 印表機</p> "
--"<p>若是印表機安裝在一個 Windows 伺服器並透過 SMB 協定（samba）分享出來時，請選擇此項。</p></qt>"
-+"<qt><p>Shared Windows printer</p><p>Use this for a printer installed on a "
-+"Windows server and shared on the network using the SMB protocol (samba).</"
-+"p></qt>"
-+msgstr ""
-+"<qt> <p>分享的 Windows 印表機</p> <p>若是印表機安裝在一個 Windows 伺服器並透"
-+"過 SMB 協定（samba）分享出來時，請選擇此項。</p></qt>"
- 
- #: management/kmwbackend.cpp:130
- msgid "&Remote LPD queue"
-@@ -4390,11 +4164,10 @@
- 
- #: management/kmwbackend.cpp:131
- msgid ""
--"<qt>"
--"<p>Print queue on a remote LPD server</p>"
--"<p>Use this for a print queue existing on a remote machine running a LPD print "
--"server.</p></qt>"
--msgstr "<qt> <p>遠端 LPD 佇列</p> <p>若使用遠端 LPD 印表伺服器，請選擇此項。</p></qt>"
-+"<qt><p>Print queue on a remote LPD server</p><p>Use this for a print queue "
-+"existing on a remote machine running a LPD print server.</p></qt>"
-+msgstr ""
-+"<qt> <p>遠端 LPD 佇列</p> <p>若使用遠端 LPD 印表伺服器，請選擇此項。</p></qt>"
- 
- #: management/kmwbackend.cpp:137
- msgid "Ne&twork printer (TCP)"
-@@ -4402,36 +4175,35 @@
- 
- #: management/kmwbackend.cpp:138
- msgid ""
--"<qt>"
--"<p>Network TCP printer</p>"
--"<p>Use this for a network-enabled printer using TCP (usually on port 9100) as "
--"communication protocol. Most network printers can use this mode.</p></qt>"
--msgstr ""
--"<qt> "
--"<p>TCP 網路印表機</p> "
--"<p>若是使用 TCP 網路印表機，也就是使用 TCP 網路協定（通常都使用 port "
--"9100）來連接印表機，請選擇此項。大部份的網路印表機都可以使用這個模式。</p></qt>"
-+"<qt><p>Network TCP printer</p><p>Use this for a network-enabled printer "
-+"using TCP (usually on port 9100) as communication protocol. Most network "
-+"printers can use this mode.</p></qt>"
-+msgstr ""
-+"<qt> <p>TCP 網路印表機</p> <p>若是使用 TCP 網路印表機，也就是使用 TCP 網路協"
-+"定（通常都使用 port 9100）來連接印表機，請選擇此項。大部份的網路印表機都可以"
-+"使用這個模式。</p></qt>"
- 
- #: management/kminstancepage.cpp:61
- msgid ""
--"Define/Edit here instances for the current selected printer. An instance is a "
--"combination of a real (physical) printer and a set of predefined options. For a "
--"single InkJet printer, you could define different print formats like <i>"
--"DraftQuality</i>, <i>PhotoQuality</i> or <i>TwoSided</i>"
--". Those instances appear as normal printers in the print dialog and allow you "
--"to quickly select the print format you want."
--msgstr ""
--"您可以在這裏定義/設定所選取的印表機實體。所謂的實體指的是印表機及其預先定義好的設定選項的組合。比方以一台噴墨印表機來說，您可以選擇使用 <i>草稿品質</i>"
--"、<i>相片品質</i> 或 <i>雙面列印<i> "
--"等等功能。這些實體在列印對話方塊以一般印表機的型式出現，可以讓您快速的在列印之前選擇所要列印品質等相關項目。"
-+"Define/Edit here instances for the current selected printer. An instance is "
-+"a combination of a real (physical) printer and a set of predefined options. "
-+"For a single InkJet printer, you could define different print formats like "
-+"<i>DraftQuality</i>, <i>PhotoQuality</i> or <i>TwoSided</i>. Those instances "
-+"appear as normal printers in the print dialog and allow you to quickly "
-+"select the print format you want."
-+msgstr ""
-+"您可以在這裏定義/設定所選取的印表機實體。所謂的實體指的是印表機及其預先定義好"
-+"的設定選項的組合。比方以一臺噴墨印表機來說，您可以選擇使用 <i>草稿品質</i>、"
-+"<i>相片品質</i> 或 <i>雙面列印<i> 等等功能。這些實體在列印對話方塊以一般印表"
-+"機的型式出現，可以讓您快速的在列印之前選擇所要列印品質等相關項目。"
- 
- #: management/kminstancepage.cpp:87
- msgid "New..."
--msgstr "新增..."
-+msgstr "新增…"
- 
- #: management/kminstancepage.cpp:88
- msgid "Copy..."
--msgstr "複製..."
-+msgstr "複製…"
- 
- #: kmvirtualmanager.cpp:166 management/kminstancepage.cpp:91
- msgid "Set as Default"
-@@ -4443,7 +4215,7 @@
- 
- #: management/kminstancepage.cpp:94
- msgid "Test..."
--msgstr "測試..."
-+msgstr "測試…"
- 
- #: management/kminstancepage.cpp:113 management/kminstancepage.cpp:126
- #: management/kminstancepage.cpp:138 management/kminstancepage.cpp:145
-@@ -4474,7 +4246,8 @@
- msgid ""
- "You can't remove the default instance. However all settings of %1 will be "
- "discarded. Continue?"
--msgstr "您不能移除預設的替代名稱，無論如何所有的 %1 設定都會被丟棄。確定要繼續嗎？"
-+msgstr ""
-+"您不能移除預設的替代名稱，無論如何所有的 %1 設定都會被丟棄。確定要繼續嗎？"
- 
- #: management/kminstancepage.cpp:213
- #, c-format
-@@ -4532,35 +4305,35 @@
- msgid ""
- "<p>The command will use an output file. If checked, make sure the command "
- "contains an output tag.</p>"
--msgstr "<p>當您選擇該項目時，這個命令將會使用輸出檔案，請確認另包含輸出的標籤。</p>"
-+msgstr ""
-+"<p>當您選擇該項目時，這個命令將會使用輸出檔案，請確認另包含輸出的標籤。</p>"
- 
- #: management/kmspecialprinterdlg.cpp:108
- #, c-format
- msgid ""
--"<p>The command to execute when printing on this special printer. Either enter "
--"the command to execute directly, or associate/create a command object with/for "
--"this special printer. The command object is the preferred method as it provides "
--"support for advanced settings like mime type checking, configurable options and "
--"requirement list (the plain command is only provided for backward "
--"compatibility). When using a plain command, the following tags are "
--"recognized:</p>"
--"<ul>"
--"<li><b>%in</b>: the input file (required).</li>"
--"<li><b>%out</b>: the output file (required if using an output file).</li>"
--"<li><b>%psl</b>: the paper size in lower case.</li>"
--"<li><b>%psu</b>: the paper size with the first letter in upper case.</li></ul>"
--msgstr ""
--"<p>當印列到這個特殊的印表機時，這個指令就會被執行。請直接輸入將被執行的指令，或是連結/建立一個指令物件到這個特殊的印表機。命令物件是我們比較喜歡的方式，因為"
--"他提供比較進階的檢查如 MIME 型別，組太設定以及需求表 (輸入將被執行的指令的存在只是為了往前相容)。當輸入單純的指令時，下面的標記會被認得：：</p>"
--"<ul>"
--"<li><b>%in</b>： 輸入檔案 (必要).</li>"
--"<li><b>%out</b>： 輸出檔案 (如果有使用輸出檔案時必要。)</li>"
--"<li><b>%psl</b>： 小寫的紙張大小。</li>"
--"<li><b>%psu</b>： 第一個字母大寫的只張大小。</li></ul>"
-+"<p>The command to execute when printing on this special printer. Either "
-+"enter the command to execute directly, or associate/create a command object "
-+"with/for this special printer. The command object is the preferred method as "
-+"it provides support for advanced settings like mime type checking, "
-+"configurable options and requirement list (the plain command is only "
-+"provided for backward compatibility). When using a plain command, the "
-+"following tags are recognized:</p><ul><li><b>%in</b>: the input file "
-+"(required).</li><li><b>%out</b>: the output file (required if using an "
-+"output file).</li><li><b>%psl</b>: the paper size in lower case.</li><li><b>%"
-+"psu</b>: the paper size with the first letter in upper case.</li></ul>"
-+msgstr ""
-+"<p>當印列到這個特殊的印表機時，這個指令就會被執行。請直接輸入將被執行的指令，"
-+"或是連結/建立一個指令物件到這個特殊的印表機。命令物件是我們比較喜歡的方式，因"
-+"為他提供比較進階的檢查如 MIME 型別，組太設定以及需求表 (輸入將被執行的指令的"
-+"存在只是為了往前相容)。當輸入單純的指令時，下面的標記會被認得：：</"
-+"p><ul><li><b>%in</b>： 輸入檔案 (必要).</li><li><b>%out</b>： 輸出檔案 (如果"
-+"有使用輸出檔案時必要。)</li><li><b>%psl</b>： 小寫的紙張大小。</li><li><b>%"
-+"psu</b>： 第一個字母大寫的只張大小。</li></ul>"
- 
- #: management/kmspecialprinterdlg.cpp:118
- msgid ""
--"<p>The default mimetype for the output file (e.g. application/postscript).</p>"
-+"<p>The default mimetype for the output file (e.g. application/postscript).</"
-+"p>"
- msgstr "<p>輸出檔案的預設 MIME 型態（例如：application/postscript）。</p>"
- 
- #: management/kmspecialprinterdlg.cpp:121
-@@ -4583,84 +4356,74 @@
- 
- #: kfilelist.cpp:42
- msgid ""
--" <qt> <b>Add File button</b> "
--"<p>This button calls the <em>'File Open'</em> dialog to let you select a file "
--"for printing. Note, that  "
--"<ul>"
--"<li>you can select ASCII or International Text, PDF, PostScript, JPEG, TIFF, "
--"PNG, GIF and many other graphic formats. "
--"<li>you can select various files from different paths and send them as one "
--"\"multi-file job\" to the printing system. </ul> </qt>"
--msgstr ""
--"<qt><b>新增檔案</b> "
--"<p>這個按鈕會叫出「開啟檔案」對話框，讓您選擇要列印的檔案。注意： "
--"<ul> "
--"<li>您可以選擇文字檔、PDF、PostScript、JPEG、TIFF、PNG、GIF 及其他許多圖形格式的檔案。</li> "
--"<li>您可以選擇多個檔案，並送出成一個列印工作。</li></ul></qt>"
-+" <qt> <b>Add File button</b> <p>This button calls the <em>'File Open'</em> "
-+"dialog to let you select a file for printing. Note, that  <ul><li>you can "
-+"select ASCII or International Text, PDF, PostScript, JPEG, TIFF, PNG, GIF "
-+"and many other graphic formats. <li>you can select various files from "
-+"different paths and send them as one \"multi-file job\" to the printing "
-+"system. </ul> </qt>"
-+msgstr ""
-+"<qt><b>新增檔案</b> <p>這個按鈕會叫出「開啟檔案」對話框，讓您選擇要列印的檔"
-+"案。注意： <ul> <li>您可以選擇文字檔、PDF、PostScript、JPEG、TIFF、PNG、GIF "
-+"及其他許多圖形格式的檔案。</li> <li>您可以選擇多個檔案，並送出成一個列印工"
-+"作。</li></ul></qt>"
- 
- #: kfilelist.cpp:54
- msgid ""
--" <qt> <b>Remove File button</b> "
--"<p>This button removes the highlighted file from the list of to-be-printed "
--"files. </qt>"
--msgstr "<qt><b>移除檔案</b> <p>這個按鈕會將要列印選單中所選取的檔案移除。</p></qt>"
-+" <qt> <b>Remove File button</b> <p>This button removes the highlighted file "
-+"from the list of to-be-printed files. </qt>"
-+msgstr ""
-+"<qt><b>移除檔案</b> <p>這個按鈕會將要列印選單中所選取的檔案移除。</p></qt>"
- 
- #: kfilelist.cpp:59
- msgid ""
--" <qt> <b>Move File Up button</b> "
--"<p>This button moves the highlighted file up in the list of files to be "
--"printed.</p> "
--"<p>In effect, this changes the order of the files' printout.</p> </qt>"
--msgstr ""
--"<qt><b>向上移動</b> "
--"<p>這個按鈕會將要列印檔案選單中所選取的檔案往上移動。</p> "
--"<p>這也會影響到列印檔案的先後順序。</p></qt>"
-+" <qt> <b>Move File Up button</b> <p>This button moves the highlighted file "
-+"up in the list of files to be printed.</p> <p>In effect, this changes the "
-+"order of the files' printout.</p> </qt>"
-+msgstr ""
-+"<qt><b>向上移動</b> <p>這個按鈕會將要列印檔案選單中所選取的檔案往上移動。</"
-+"p> <p>這也會影響到列印檔案的先後順序。</p></qt>"
- 
- #: kfilelist.cpp:66
- msgid ""
--" <qt> <b>Move File Down button</b> "
--"<p>This button moves the highlighted file down in the list of files to be "
--"printed.</p> "
--"<p>In effect, this changes the order of the files' printout.</p> </qt>"
--msgstr ""
--"<qt><b>向下移動</b> "
--"<p>這個按鈕會將要列印檔案選單中所選取的檔案往下移動。</p> "
--"<p>這也會影響到列印檔案的先後順序。</p></qt>"
-+" <qt> <b>Move File Down button</b> <p>This button moves the highlighted file "
-+"down in the list of files to be printed.</p> <p>In effect, this changes the "
-+"order of the files' printout.</p> </qt>"
-+msgstr ""
-+"<qt><b>向下移動</b> <p>這個按鈕會將要列印檔案選單中所選取的檔案往下移動。</"
-+"p> <p>這也會影響到列印檔案的先後順序。</p></qt>"
- 
- #: kfilelist.cpp:73
- msgid ""
--" <qt> <b>File Open button</b> "
--"<p>This button tries to open the highlighted file, so you can view or edit it "
--"before you send it to the printing system.</p> "
--"<p>If you open files, KDEPrint will use the application matching the MIME type "
--"of the file.</p> </qt>"
--msgstr ""
--"<qt><b>開啟檔案</b> "
--"<p>這個按鈕可以開啟所選取的檔案，讓您可以在送出列印之前再確認或修改。</p> "
--"<p>如果您選擇開啟檔案，KDEPrint 會根據檔案的 MIME 型態來決定用什麼應用程式開啟。</p></qt>"
-+" <qt> <b>File Open button</b> <p>This button tries to open the highlighted "
-+"file, so you can view or edit it before you send it to the printing system.</"
-+"p> <p>If you open files, KDEPrint will use the application matching the MIME "
-+"type of the file.</p> </qt>"
-+msgstr ""
-+"<qt><b>開啟檔案</b> <p>這個按鈕可以開啟所選取的檔案，讓您可以在送出列印之前再"
-+"確認或修改。</p> <p>如果您選擇開啟檔案，KDEPrint 會根據檔案的 MIME 型態來決定"
-+"用什麼應用程式開啟。</p></qt>"
- 
- #: kfilelist.cpp:82
- msgid ""
--" <qt> <b>File List view</b> "
--"<p>This list displays all the files you selected for printing. You can see the "
--"file name(s), file path(s) and the file (MIME) type(s) as determined by "
--"KDEPrint. You may re-arrange the  initial order of the list  with the help of "
--"the arrow buttons on the right.</p> "
--"<p>The files will be printed as a single job, in the same order as displayed in "
--"the list.</p> "
--"<p><b>Note:</b> You can select multiple files. The files may be in multiple "
--"locations. The files may be of multiple MIME types. The buttons on the right "
--"side let you add more files, remove already selected files from the list,  "
--"re-order the list (by moving files up or down), and open files. If you open "
--"files, KDEPrint will use the application matching the MIME type of the file.</p> "
--"</qt>"
-+" <qt> <b>File List view</b> <p>This list displays all the files you selected "
-+"for printing. You can see the file name(s), file path(s) and the file (MIME) "
-+"type(s) as determined by KDEPrint. You may re-arrange the  initial order of "
-+"the list  with the help of the arrow buttons on the right.</p> <p>The files "
-+"will be printed as a single job, in the same order as displayed in the list."
-+"</p> <p><b>Note:</b> You can select multiple files. The files may be in "
-+"multiple locations. The files may be of multiple MIME types. The buttons on "
-+"the right side let you add more files, remove already selected files from "
-+"the list,  re-order the list (by moving files up or down), and open files. "
-+"If you open files, KDEPrint will use the application matching the MIME type "
-+"of the file.</p> </qt>"
- msgstr ""
--"<qt><b>檔案列表</b> "
--"<p>這個列表顯示您選擇要列印的檔案。您可以看到檔名、路徑與 MIME 型態。您可以重新安排列印的順序。</p> "
--"<p>這些檔案以一個列印工作依序送出。</p> "
--"<p><b>注意：</b>您可以選擇多個檔案。這些檔案可以在不同的目錄之中，也可以是不同的 MIME "
--"型態。右邊的按鈕可以讓您新增、移除、開啟檔案，或重新排列列印的順序。如果您要開啟檔案，KDEPrint 會根據檔案的 MIME "
--"型態來決定要用什麼應用程式開啟。</p></qt>"
-+"<qt><b>檔案列表</b> <p>這個列表顯示您選擇要列印的檔案。您可以看到檔名、路徑"
-+"與 MIME 型態。您可以重新安排列印的順序。</p> <p>這些檔案以一個列印工作依序送"
-+"出。</p> <p><b>注意：</b>您可以選擇多個檔案。這些檔案可以在不同的目錄之中，也"
-+"可以是不同的 MIME 型態。右邊的按鈕可以讓您新增、移除、開啟檔案，或重新排列列"
-+"印的順序。如果您要開啟檔案，KDEPrint 會根據檔案的 MIME 型態來決定要用什麼應用"
-+"程式開啟。</p></qt>"
- 
- #: kfilelist.cpp:103
- msgid "Path"
-@@ -4680,9 +4443,11 @@
- 
- #: kfilelist.cpp:149
- msgid ""
--"Drag file(s) here or use the button to open a file dialog. Leave empty for <b>"
--"&lt;STDIN&gt;</b>."
--msgstr "將檔案拖曳至這裡，或者點選按鈕開啟檔案對話方塊。若是為 <b>&lt;STDIN&gt;</b> 的話，維持空白原狀即可。"
-+"Drag file(s) here or use the button to open a file dialog. Leave empty for "
-+"<b>&lt;STDIN&gt;</b>."
-+msgstr ""
-+"將檔案拖曳至這裡，或者點選按鈕開啟檔案對話方塊。若是為 <b>&lt;STDIN&gt;</b> "
-+"的話，維持空白原狀即可。"
- 
- #: driver.cpp:385 foomatic2loader.cpp:268
- msgid "Adjustments"
-@@ -4690,17 +4455,17 @@
- 
- #: plugincombobox.cpp:33
- msgid ""
--" <qt><b>Print Subsystem Selection</b> "
--"<p>This combo box shows (and lets you select) a print subsystem to be used by "
--"KDEPrint. (This print subsystem must, of course, be installed inside your "
--"Operating System.) KDEPrint usually auto-detects the correct print subsystem by "
--"itself upon first startup. Most Linux distributions have \"CUPS\", the <em>"
--"Common UNIX Printing System</em>. </qt>"
--msgstr ""
--"<qt><b>選擇列印子系統</b> "
--"<p>這個選單讓您選擇 KDEPrint 使用的列印子系統（當然，所選擇的子系統必須有安裝在您的作業系統中）。KDEPrint "
--"通常會在第一次啟動時自動偵測最適合的列印子系統。大部份的 Linux 套件都會內含「通用 Unix 列印系統」（Common UNIX Printing "
--"System, CUPS）。</p></qt>"
-+" <qt><b>Print Subsystem Selection</b> <p>This combo box shows (and lets you "
-+"select) a print subsystem to be used by KDEPrint. (This print subsystem "
-+"must, of course, be installed inside your Operating System.) KDEPrint "
-+"usually auto-detects the correct print subsystem by itself upon first "
-+"startup. Most Linux distributions have \"CUPS\", the <em>Common UNIX "
-+"Printing System</em>. </qt>"
-+msgstr ""
-+"<qt><b>選擇列印子系統</b> <p>這個選單讓您選擇 KDEPrint 使用的列印子系統（當"
-+"然，所選擇的子系統必須有安裝在您的作業系統中）。KDEPrint 通常會在第一次啟動時"
-+"自動偵測最適合的列印子系統。大部份的 Linux 套件都會內含「通用 Unix 列印系統」"
-+"（Common UNIX Printing System, CUPS）。</p></qt>"
- 
- #: plugincombobox.cpp:45
- msgid "Print s&ystem currently used:"
-@@ -4708,90 +4473,79 @@
- 
- #: plugincombobox.cpp:91
- msgid ""
--" <qt><b>Current Connection</b> "
--"<p>This line shows which CUPS server your PC is currently connected to for "
--"printing and retrieving printer info. To switch to a different CUPS server, "
--"click \"System Options\", then select \"Cups server\" and fill in the required "
--"info. </qt>"
--msgstr ""
--"<qt><b>目前的連線</b> "
--"<p>這一行顯示您的電腦目前與哪個 CUPS 伺服器連線並取得印表機資訊。要切換到不同的 CUPS 伺服器，請按「系統選項」→「CUPS "
--"伺服器」並填入適當的資訊。</p></qt>"
-+" <qt><b>Current Connection</b> <p>This line shows which CUPS server your PC "
-+"is currently connected to for printing and retrieving printer info. To "
-+"switch to a different CUPS server, click \"System Options\", then select "
-+"\"Cups server\" and fill in the required info. </qt>"
-+msgstr ""
-+"<qt><b>目前的連線</b> <p>這一列顯示您的電腦目前與哪個 CUPS 伺服器連線並取得印"
-+"表機資訊。要切換到不同的 CUPS 伺服器，請按「系統選項」→「CUPS 伺服器」並填入"
-+"適當的資訊。</p></qt>"
- 
- #: driverview.cpp:47
- msgid ""
--" <qt>  <b>List of Driver Options (from PPD)</b>.  "
--"<p>The upper pane of this dialog page contains all printjob options as laid  "
--"down in the printer's description file (PostScript Printer Description == "
--"'PPD') </p> "
--"<p>Click on any item in the list and watch the lower pane of this dialog page  "
--"display the available values. </p>  "
--"<p>Set the values as needed. Then use one of the pushbuttons below to "
--"proceed:</p>  "
--"<ul>  "
--"<li><em>'Save'</em> your settings if you want to re-use  them in your next "
--"job(s) too. <em>'Save'</em> will store your settings permanently until  you "
--"change them again. </li>. "
--"<li>Click <em>'OK'</em> (without a prior click on <em>'Save'</em>"
--", if you want to use  your selected settings just once, for the next print job. "
--"<em>'OK'</em>  will forget your current settings when kprinter is closed again, "
--"and will start next time  with the previously saved defaults. </li> "
--"<li><em>'Cancel'</em> will not change anything. If you proceed to print after "
--"clicking  <em>'Cancel'</em>, the job will print with the default settings of "
--"this queue.  </ul> "
--"<p><b>Note.</b> The number of available job options depends strongly on the "
--"actual  driver used for your print queue. <em>'Raw'</em> "
--"queues do not have a driver or a   PPD. For raw queues this tab page is not "
--"loaded by KDEPrint, and thus is not present  in the kprinter dialog.</p>  </qt>"
--msgstr ""
--"<qt><b>驅動程式選項清單</b> "
--"<p>上方為在 PostScript 印表機描述檔（ppd）中所有的列印工作選項。</p> "
--"<p>點選清單中的任一項目，並看下方顯示可用的值。</P> "
--"<p>您可以設定這些數值。並用底下的按鈕來進行動作：</p> "
--"<ul> "
--"<li>「儲存」可以將您的設定（永久）儲存起來。</li> "
--"<li>「確定」（在沒有按下「儲存」鍵的情況下）可以讓您的設定在這一次生效，但是當 kprinter 關閉後，下一次再啟動時，這次所設定的值會遺失。</li> "
--"<li>「取消」不會改變任何設定。</li></ul> "
--"<p><b>注意：</b>實際可使用的工作選項與實際使用的驅動程式非常有關係。「Raw 原始印表機」沒有任何驅動程式或 PPD 檔，因此這一頁不會出現。</p>"
--"</qt>"
-+" <qt>  <b>List of Driver Options (from PPD)</b>.  <p>The upper pane of this "
-+"dialog page contains all printjob options as laid  down in the printer's "
-+"description file (PostScript Printer Description == 'PPD') </p> <p>Click on "
-+"any item in the list and watch the lower pane of this dialog page  display "
-+"the available values. </p>  <p>Set the values as needed. Then use one of the "
-+"pushbuttons below to proceed:</p>  <ul>  <li><em>'Save'</em> your settings "
-+"if you want to re-use  them in your next job(s) too. <em>'Save'</em> will "
-+"store your settings permanently until  you change them again. </li>. "
-+"<li>Click <em>'OK'</em> (without a prior click on <em>'Save'</em>, if you "
-+"want to use  your selected settings just once, for the next print job. "
-+"<em>'OK'</em>  will forget your current settings when kprinter is closed "
-+"again, and will start next time  with the previously saved defaults. </li> "
-+"<li><em>'Cancel'</em> will not change anything. If you proceed to print "
-+"after clicking  <em>'Cancel'</em>, the job will print with the default "
-+"settings of this queue.  </ul> <p><b>Note.</b> The number of available job "
-+"options depends strongly on the actual  driver used for your print queue. "
-+"<em>'Raw'</em> queues do not have a driver or a   PPD. For raw queues this "
-+"tab page is not loaded by KDEPrint, and thus is not present  in the kprinter "
-+"dialog.</p>  </qt>"
-+msgstr ""
-+"<qt><b>驅動程式選項清單</b> <p>上方為在 PostScript 印表機描述檔（ppd）中所有"
-+"的列印工作選項。</p> <p>點選清單中的任一項目，並看下方顯示可用的值。</P> <p>"
-+"您可以設定這些數值。並用底下的按鈕來進行動作：</p> <ul> <li>「儲存」可以將您"
-+"的設定（永久）儲存起來。</li> <li>「確定」（在沒有按下「儲存」鍵的情況下）可"
-+"以讓您的設定在這一次生效，但是當 kprinter 關閉後，下一次再啟動時，這次所設定"
-+"的值會遺失。</li> <li>「取消」不會改變任何設定。</li></ul> <p><b>注意：</b>實"
-+"際可使用的工作選項與實際使用的驅動程式非常有關係。「Raw 原始印表機」沒有任何"
-+"驅動程式或 PPD 檔，因此這一頁不會出現。</p></qt>"
- 
- #: driverview.cpp:71
- msgid ""
--" <qt>  <b>List of Possible Values for given Option (from PPD)</b>.  "
--"<p>The lower pane of this dialog page contains all possible values of the "
--"printoption  highlighted above, as laid  down in the printer's description file "
--"(PostScript Printer Description == 'PPD') </p> "
--"<p>Select the value you want and proceed. </p>  "
--"<p>Then use one of the pushbuttons below to leave this dialog:</p>  "
--"<ul>  "
--"<li><em>'Save'</em> your settings if you want to re-use  them in your next "
--"job(s) too. <em>'Save'</em> will store your settings permanently until  you "
--"change them again. </li>. "
--"<li>Click <em>'OK'</em> if you want to use your selected settings just once, "
--"for the  next print job. <em>'OK'</em>  will forget your current settings when "
--"kprinter is closed again, and will start next time  with your previous "
--"defaults. </li> "
--"<li><em>'Cancel'</em> will not change anything. If you proceed to print after "
--"clicking  <em>'Cancel'</em>, the job will print with the default settings of "
--"this queue.  </ul> "
--"<p><b>Note.</b> The number of available job options depends strongly on the "
--"actual  driver used for your print queue. <em>'Raw'</em> "
--"queues do not have a driver or a   PPD. For raw queues this tab page is not "
--"loaded by KDEPrint, and thus is not present  in the kprinter dialog.</p>  </qt>"
--msgstr ""
--"<qt><b>選項可用的數值清單</b> "
--"<p>下方為在 PostScript 印表機描述檔（ppd）中，關於選取的選項所有可用的數值。</p> "
--"<p>請選擇您要使用的數值，然後選擇一個動作：</p> "
--"<ul> "
--"<li>「儲存」可以將您的設定（永久）儲存起來。</li> "
--"<li>「確定」（在沒有按下「儲存」鍵的情況下）可以讓您的設定在這一次生效，但是當 kprinter 關閉後，下一次再啟動時，這次所設定的值會遺失。</li> "
--"<li>「取消」不會改變任何設定。</li></ul> "
--"<p><b>注意：</b>實際可使用的工作選項與實際使用的驅動程式非常有關係。「Raw 原始印表機」沒有任何驅動程式或 PPD 檔，因此這一頁不會出現。</p>"
--"</qt>"
-+" <qt>  <b>List of Possible Values for given Option (from PPD)</b>.  <p>The "
-+"lower pane of this dialog page contains all possible values of the "
-+"printoption  highlighted above, as laid  down in the printer's description "
-+"file (PostScript Printer Description == 'PPD') </p> <p>Select the value you "
-+"want and proceed. </p>  <p>Then use one of the pushbuttons below to leave "
-+"this dialog:</p>  <ul>  <li><em>'Save'</em> your settings if you want to re-"
-+"use  them in your next job(s) too. <em>'Save'</em> will store your settings "
-+"permanently until  you change them again. </li>. <li>Click <em>'OK'</em> if "
-+"you want to use your selected settings just once, for the  next print job. "
-+"<em>'OK'</em>  will forget your current settings when kprinter is closed "
-+"again, and will start next time  with your previous defaults. </li> "
-+"<li><em>'Cancel'</em> will not change anything. If you proceed to print "
-+"after clicking  <em>'Cancel'</em>, the job will print with the default "
-+"settings of this queue.  </ul> <p><b>Note.</b> The number of available job "
-+"options depends strongly on the actual  driver used for your print queue. "
-+"<em>'Raw'</em> queues do not have a driver or a   PPD. For raw queues this "
-+"tab page is not loaded by KDEPrint, and thus is not present  in the kprinter "
-+"dialog.</p>  </qt>"
-+msgstr ""
-+"<qt><b>選項可用的數值清單</b> <p>下方為在 PostScript 印表機描述檔（ppd）中，"
-+"關於選取的選項所有可用的數值。</p> <p>請選擇您要使用的數值，然後選擇一個動"
-+"作：</p> <ul> <li>「儲存」可以將您的設定（永久）儲存起來。</li> <li>「確定」"
-+"（在沒有按下「儲存」鍵的情況下）可以讓您的設定在這一次生效，但是當 kprinter "
-+"關閉後，下一次再啟動時，這次所設定的值會遺失。</li> <li>「取消」不會改變任何"
-+"設定。</li></ul> <p><b>注意：</b>實際可使用的工作選項與實際使用的驅動程式非常"
-+"有關係。「Raw 原始印表機」沒有任何驅動程式或 PPD 檔，因此這一頁不會出現。</"
-+"p></qt>"
- 
- #: kprinter.cpp:280
- msgid "Initialization..."
--msgstr "初始化..."
-+msgstr "初始化…"
- 
- #: kprinter.cpp:283 kprinter.cpp:909
- #, c-format
-@@ -4800,13 +4554,13 @@
- 
- #: kprinter.cpp:429
- msgid "Previewing..."
--msgstr "預覽中..."
-+msgstr "預覽中…"
- 
- #: kdeprintd.cpp:158 kprinter.cpp:690
- #, c-format
- msgid ""
--"<p><nobr>A print error occurred. Error message received from system:</nobr></p>"
--"<br>%1"
-+"<p><nobr>A print error occurred. Error message received from system:</nobr></"
-+"p><br>%1"
- msgstr "<p><nobr>發生了列印錯誤。系統傳來的錯誤訊息：</nobr></p><br>%1"
- 
- #: foomatic/kfoomaticprinterimpl.cpp:51 lpdunix/klpdunixprinterimpl.cpp:72
-@@ -4816,7 +4570,7 @@
- 
- #: foomatic/kmfoomaticmanager.cpp:70
- msgid "This is not a Foomatic printer"
--msgstr "這並不是一台 Foomatic 印表機"
-+msgstr "這並不是一臺 Foomatic 印表機"
- 
- #: foomatic/kmfoomaticmanager.cpp:75
- msgid "Some printer information are missing"
-@@ -4868,12 +4622,12 @@
- 
- #: kmspecialmanager.cpp:53
- msgid ""
--"A file share/kdeprint/specials.desktop was found in your local KDE directory. "
--"This file probably comes from a previous KDE release and should be removed in "
--"order to manage global pseudo printers."
-+"A file share/kdeprint/specials.desktop was found in your local KDE "
-+"directory. This file probably comes from a previous KDE release and should "
-+"be removed in order to manage global pseudo printers."
- msgstr ""
--"在您的本地 KDE 目錄內發現了文件 share/kdeprint/specials.desktop。該檔案是較早版本的 KDE "
--"使用的，應該被刪除以便於能夠使用特殊(假的)印表機。"
-+"在您的本地 KDE 目錄內發現了文件 share/kdeprint/specials.desktop。該檔案是較早"
-+"版本的 KDE 使用的，應該被刪除以便於能夠使用特殊(假的)印表機。"
- 
- #: kprinterimpl.cpp:156
- msgid "Cannot copy multiple files into one file."
-@@ -4899,9 +4653,10 @@
- 
- #: kprinterimpl.cpp:281
- msgid ""
--"The KDE print server (<b>kdeprintd</b>) could not be contacted. Check that this "
--"server is running."
--msgstr "無法聯繫 KDE 列印伺服器 (<b>kdeprintd</b>)。請檢查此伺服器程式是否正在執行。"
-+"The KDE print server (<b>kdeprintd</b>) could not be contacted. Check that "
-+"this server is running."
-+msgstr ""
-+"無法聯繫 KDE 列印伺服器 (<b>kdeprintd</b>)。請檢查此伺服器程式是否正在執行。"
- 
- #: kprinterimpl.cpp:283
- msgid ""
-@@ -4918,12 +4673,12 @@
- 
- #: kprinterimpl.cpp:325
- msgid ""
--"<p>Unable to perform the requested page selection. The filter <b>psselect</b> "
--"cannot be inserted in the current filter chain. See <b>Filter</b> "
--"tab in the printer properties dialog for further information.</p>"
-+"<p>Unable to perform the requested page selection. The filter <b>psselect</"
-+"b> cannot be inserted in the current filter chain. See <b>Filter</b> tab in "
-+"the printer properties dialog for further information.</p>"
- msgstr ""
--"<p>無法執行請求的頁面選擇。過濾器 <b>psselect</b> 無法插入目前的的過濾器鏈。請閱讀印表機屬性對話方塊中的 <b>[過濾器]</b> "
--"項目以獲得更多資訊。</p>"
-+"<p>無法執行請求的頁面選擇。過濾器 <b>psselect</b> 無法插入目前的的過濾器鏈。"
-+"請閱讀印表機屬性對話方塊中的 <b>[過濾器]</b> 項目以獲得更多資訊。</p>"
- 
- #: kprinterimpl.cpp:355
- msgid "<p>Could not load filter description for <b>%1</b>.</p>"
-@@ -4931,16 +4686,19 @@
- 
- #: kprinterimpl.cpp:371
- msgid ""
--"<p>Error while reading filter description for <b>%1</b>"
--". Empty command line received.</p>"
-+"<p>Error while reading filter description for <b>%1</b>. Empty command line "
-+"received.</p>"
- msgstr "<p>讀取 <b>%1</b> 的過濾器描述說明時失敗。接收到空的命令列資料。</p>"
- 
- #: kprinterimpl.cpp:385
- msgid ""
--"The MIME type %1 is not supported as input of the filter chain (this may happen "
--"with non-CUPS spoolers when performing page selection on a non-PostScript "
--"file). Do you want KDE to convert the file to a supported format?</p>"
--msgstr "%1 這個 MIME 類型未支援作為資料輸入的過濾器。您希望 KDE 能夠將這個檔案轉換成為支援的格式嗎？</p>"
-+"The MIME type %1 is not supported as input of the filter chain (this may "
-+"happen with non-CUPS spoolers when performing page selection on a non-"
-+"PostScript file). Do you want KDE to convert the file to a supported format?"
-+"</p>"
-+msgstr ""
-+"%1 這個 MIME 類型未支援作為資料輸入的過濾器。您希望 KDE 能夠將這個檔案轉換成"
-+"為支援的格式嗎？</p>"
- 
- #: kprinterimpl.cpp:389 kprinterimpl.cpp:509
- msgid "Convert"
-@@ -4964,9 +4722,8 @@
- 
- #: kprinterimpl.cpp:423
- msgid ""
--"<qt>Operation failed with message:"
--"<br>%1"
--"<br>Select another target format.</qt>"
-+"<qt>Operation failed with message:<br>%1<br>Select another target format.</"
-+"qt>"
- msgstr "<qt>作業放棄，訊息：<br>%1<br>選取另外一個目的格式。</qt>"
- 
- #: kprinterimpl.cpp:441
-@@ -4984,36 +4741,29 @@
- #: kprinterimpl.cpp:497
- msgid ""
- "<qt>The file format <em> %1 </em> is not directly supported by the current "
--"print system. You now have 3 options: "
--"<ul> "
--"<li> KDE can attempt to convert this file automatically to a supported format. "
--"(Select <em>Convert</em>) </li>"
--"<li> You can try to send the file to the printer without any conversion. "
--"(Select <em>Keep</em>) </li>"
--"<li> You can cancel the printjob. (Select <em>Cancel</em>) </li></ul> "
--"Do you want KDE to attempt and convert this file to %2?</qt>"
--msgstr ""
--"<qt>目前使用的列印系統不直接支援 %1 的檔案格式。您有三個選擇： "
--"<ul> "
--"<li>KDE 可以嘗試將該文件自動轉換到一個被支援的格式（選擇「轉換」）。</li> "
--"<li>您也可以嘗試不經過轉換就直接送給印表機列印（選擇「保留」）。</li> "
--"<li>您還可以取消這個列印工作（選擇「取消」）。</li></ul>您想讓 KDE 嘗試轉換該檔案成為 %2 嗎？</qt>"
-+"print system. You now have 3 options: <ul> <li> KDE can attempt to convert "
-+"this file automatically to a supported format. (Select <em>Convert</em>) </"
-+"li><li> You can try to send the file to the printer without any conversion. "
-+"(Select <em>Keep</em>) </li><li> You can cancel the printjob. (Select "
-+"<em>Cancel</em>) </li></ul> Do you want KDE to attempt and convert this file "
-+"to %2?</qt>"
-+msgstr ""
-+"<qt>目前使用的列印系統不直接支援 %1 的檔案格式。您有三個選擇： <ul> <li>KDE "
-+"可以嘗試將該文件自動轉換到一個被支援的格式（選擇「轉換」）。</li> <li>您也可"
-+"以嘗試不經過轉換就直接送給印表機列印（選擇「保留」）。</li> <li>您還可以取消"
-+"這個列印工作（選擇「取消」）。</li></ul>您想讓 KDE 嘗試轉換該檔案成為 %2 嗎？"
-+"</qt>"
- 
- #: kprinterimpl.cpp:518
- msgid ""
- "<qt>No appropriate filter was found to convert the file format %1 into %2."
--"<br>"
--"<ul>"
--"<li>Go to <i>System Options -> Commands</i> to look through the list of "
--"possible filters. Each filter executes an external program.</li>"
--"<li> See if the required external program is available.on your system.</li></ul>"
--"</qt>"
--msgstr ""
--"<qt>沒有適當的過濾器可以將檔案格式 %1 轉換為 %2。 "
--"<br>"
--"<ul> "
--"<li>您可以到「系統選項」→「命令」去看看可用的過濾器清單。每一個過濾器都會執行一個外部程式。</li> "
--"<li>您也可以看看您的系統中有沒有可用的外部程式。</li></ul></qt>"
-+"<br><ul><li>Go to <i>System Options -> Commands</i> to look through the list "
-+"of possible filters. Each filter executes an external program.</li><li> See "
-+"if the required external program is available.on your system.</li></ul></qt>"
-+msgstr ""
-+"<qt>沒有適當的過濾器可以將檔案格式 %1 轉換為 %2。 <br><ul> <li>您可以到「系統"
-+"選項」→「命令」去看看可用的過濾器清單。每一個過濾器都會執行一個外部程式。</"
-+"li> <li>您也可以看看您的系統中有沒有可用的外部程式。</li></ul></qt>"
- 
- #: kpgeneralpage.cpp:85
- msgid "ISO A4"
-@@ -5077,223 +4827,168 @@
- 
- #: kpgeneralpage.cpp:123
- msgid ""
--" <qt>  "
--"<p><b>\"General\"</b> </p>  "
--"<p>This dialog page contains <em>general</em> print job settings. General "
--"settings are applicable to most printers, most jobs  and most job file types.  "
--"<p>To get more specific help, enable the \"WhatsThis\" cursor and click on any "
--"of the  text labels or GUI elements of this dialog.  </qt>"
--msgstr ""
--"<qt> "
--"<p><b>一般設定</b></p> "
--"<p>這一頁包括了一般的列印工作設定，通常可用於大部份的印表機，工作與檔案型態。</p> "
--"<p>您可以打開「這是什麼？」說明，並點選每一個 GUI 元素看看詳細說明。</p></qt>"
-+" <qt>  <p><b>\"General\"</b> </p>  <p>This dialog page contains <em>general</"
-+"em> print job settings. General settings are applicable to most printers, "
-+"most jobs  and most job file types.  <p>To get more specific help, enable "
-+"the \"WhatsThis\" cursor and click on any of the  text labels or GUI "
-+"elements of this dialog.  </qt>"
-+msgstr ""
-+"<qt> <p><b>一般設定</b></p> <p>這一頁包括了一般的列印工作設定，通常可用於大部"
-+"份的印表機，工作與檔案型態。</p> <p>您可以打開「這是什麼？」說明，並點選每一"
-+"個 GUI 元素看看詳細說明。</p></qt>"
- 
- #: kpgeneralpage.cpp:131
- msgid ""
--" <qt>  "
--"<p><b>Page size:</b> Select paper size to be printed on from  the drop-down "
--"menu. </p> "
--"<p>The exact list of choices depends on the printer driver (\"PPD\") you have "
--"installed.</p>  "
--"<br>  "
--"<hr>  "
--"<p><em><b>Additional hint for power users:</b> This KDEPrint GUI element "
--"matches  with the CUPS commandline job option parameter:</em>  "
--"<pre>    -o PageSize=...         # examples: \"A4\" or \"Letter\"  </pre> </p>  "
--"</qt>"
--msgstr ""
--"<qt> "
--"<p><b>紙張大小：</b>從下拉式選單選擇要列印的紙張大小。</p> "
--"<p>清單中可選擇的內容與您安裝的印表機驅動程式有關。</p> "
--"<br>"
--"<hr> "
--"<p><b>進階使用者的額外提示：</b>這個選項與以下的 CUPS 命令列選項參數是一樣的： "
--"<pre>     -o PageSize=...     # 例：\"A4\" 或 \"Letter\"</pre></p></qt>"
-+" <qt>  <p><b>Page size:</b> Select paper size to be printed on from  the "
-+"drop-down menu. </p> <p>The exact list of choices depends on the printer "
-+"driver (\"PPD\") you have installed.</p>  <br>  <hr>  <p><em><b>Additional "
-+"hint for power users:</b> This KDEPrint GUI element matches  with the CUPS "
-+"commandline job option parameter:</em>  <pre>    -o PageSize=...         # "
-+"examples: \"A4\" or \"Letter\"  </pre> </p>  </qt>"
-+msgstr ""
-+"<qt> <p><b>紙張大小：</b>從下拉式選單選擇要列印的紙張大小。</p> <p>清單中可選"
-+"擇的內容與您安裝的印表機驅動程式有關。</p> <br><hr> <p><b>進階使用者的額外提"
-+"示：</b>這個選項與以下的 CUPS 命令列選項參數是一樣的： <pre>     -o "
-+"PageSize=...     # 例：\"A4\" 或 \"Letter\"</pre></p></qt>"
- 
- #: kpgeneralpage.cpp:144
- msgid ""
--" <qt>  "
--"<p><b>Paper type:</b> Select paper type to be printed on from  the drop-down "
--"menu. </p> "
--"<p>The exact list of choices depends on the printer driver (\"PPD\") you have "
--"installed. </p> "
--"<br>  "
--"<hr>  "
--"<p><em><b>Additional hint for power users:</b> This KDEPrint GUI element "
--"matches  with the CUPS commandline job option parameter:</em>  "
--"<pre>    -o MediaType=...        # example: \"Transparency\"  </pre> </p>  </qt>"
--msgstr ""
--"<qt> "
--"<p><b>紙張型態：</b>從下拉式選單選擇要列印的紙張型態。</p> "
--"<p>清單中可選擇的內容與您安裝的印表機驅動程式有關。</p> "
--"<br>"
--"<hr> "
--"<p><b>進階使用者的額外提示：</b>這個選項與以下的 CUPS 命令列選項參數是一樣的： "
--"<pre>     -o MediaType=...     # 例：\"Transparency\"</pre></p></qt>"
-+" <qt>  <p><b>Paper type:</b> Select paper type to be printed on from  the "
-+"drop-down menu. </p> <p>The exact list of choices depends on the printer "
-+"driver (\"PPD\") you have installed. </p> <br>  <hr>  <p><em><b>Additional "
-+"hint for power users:</b> This KDEPrint GUI element matches  with the CUPS "
-+"commandline job option parameter:</em>  <pre>    -o MediaType=...        # "
-+"example: \"Transparency\"  </pre> </p>  </qt>"
-+msgstr ""
-+"<qt> <p><b>紙張型態：</b>從下拉式選單選擇要列印的紙張型態。</p> <p>清單中可選"
-+"擇的內容與您安裝的印表機驅動程式有關。</p> <br><hr> <p><b>進階使用者的額外提"
-+"示：</b>這個選項與以下的 CUPS 命令列選項參數是一樣的： <pre>     -o "
-+"MediaType=...     # 例：\"Transparency\"</pre></p></qt>"
- 
- #: kpgeneralpage.cpp:157
- msgid ""
--" <qt>  "
--"<p><b>Paper source:</b> Select paper source tray for the paper to be printed on "
--"from the drop-down menu.  "
--"<p>The exact list of choices depends on the printer driver (\"PPD\") you have "
--"installed. </p> "
--"<br>  "
--"<hr>  "
-+" <qt>  <p><b>Paper source:</b> Select paper source tray for the paper to be "
-+"printed on from the drop-down menu.  <p>The exact list of choices depends on "
-+"the printer driver (\"PPD\") you have installed. </p> <br>  <hr>  "
- "<p><em><b>Additional hint for power users:</b> This KDEPrint GUI element "
--"matches  with the CUPS commandline job option parameter:</em>  "
--"<pre>    -o InputSlot=...        # examples: \"Lower\" or \"LargeCapacity\"  "
--"</pre> </p>  </qt>"
--msgstr ""
--"<qt> "
--"<p><b>紙張來源：</b>從下拉式選單選擇要列印的紙張來源。</p> "
--"<p>清單中可選擇的內容與您安裝的印表機驅動程式有關。</p> "
--"<br>"
--"<hr> "
--"<p><b>進階使用者的額外提示：</b>這個選項與以下的 CUPS 命令列選項參數是一樣的： "
--"<pre>     -o InputSlot=...     # 例：\"Lower\" 或 \"LargeCapacity\"</pre></p></qt>"
-+"matches  with the CUPS commandline job option parameter:</em>  <pre>    -o "
-+"InputSlot=...        # examples: \"Lower\" or \"LargeCapacity\"  </pre> </"
-+"p>  </qt>"
-+msgstr ""
-+"<qt> <p><b>紙張來源：</b>從下拉式選單選擇要列印的紙張來源。</p> <p>清單中可選"
-+"擇的內容與您安裝的印表機驅動程式有關。</p> <br><hr> <p><b>進階使用者的額外提"
-+"示：</b>這個選項與以下的 CUPS 命令列選項參數是一樣的： <pre>     -o "
-+"InputSlot=...     # 例：\"Lower\" 或 \"LargeCapacity\"</pre></p></qt>"
- 
- #: kpgeneralpage.cpp:170
- msgid ""
--" <qt>  "
--"<p><b>Image Orientation:</b> Orientation of the printed  page image on your "
--"paper is controlled by the radio buttons. By default,  the orientation is <em>"
--"Portrait</em>  "
--"<p>You can select 4 alternatives:  "
--"<ul>  "
--"<li> <b>Portrait.</b>.Portrait is the default setting. </li>  "
--"<li> <b>Landscape.</b> </li>  "
--"<li> <b>Reverse Landscape.</b> Reverse Landscape prints the images upside down. "
--"</li>  "
--"<li> <b>Reverse Portrait.</b> Reverse Portrait prints the image upside "
--"down.</li>  </ul>  The icon changes according to your selection.</p> "
--"<br>  "
--"<hr>  "
--"<p><em><b>Additional hint for power users:</b> This KDEPrint GUI element "
--"matches  with the CUPS commandline job option parameter:</em>  "
--"<pre>    -o orientation-requested=...       # examples: \"landscape\" or "
--"\"reverse-portrait\"  </pre> </p>  </qt>"
--msgstr ""
--"<qt> "
--"<p><b>圖片方向：</b>這裡可以控制列印出的圖片的方向。預設為「縱向」（Portrait）。</p> "
--"<p>您有四種選擇： "
--"<ul> "
--"<li><b>縱向（Portrait）</b>。為預設選項。</li> "
--"<li><b>橫向（Landscape）</b>。</li> "
--"<li><b>反橫向（Reverse Landscape）</b>。印橫向，但上下顛倒。</li> "
--"<li><b>反縱向（Reverse Portrait）</b>。印縱向，但上下顛倒。</li></ul> 圖示會根據您的選擇而改變。</p> "
--"<br>"
--"<hr> "
--"<p><b>進階使用者的額外提示：</b>這個選項與以下的 CUPS 命令列選項參數是一樣的： "
--"<pre>     -o orientation-requested=...     # 例：\"landscape\" 或 "
-+" <qt>  <p><b>Image Orientation:</b> Orientation of the printed  page image "
-+"on your paper is controlled by the radio buttons. By default,  the "
-+"orientation is <em>Portrait</em>  <p>You can select 4 alternatives:  <ul>  "
-+"<li> <b>Portrait.</b>.Portrait is the default setting. </li>  <li> "
-+"<b>Landscape.</b> </li>  <li> <b>Reverse Landscape.</b> Reverse Landscape "
-+"prints the images upside down. </li>  <li> <b>Reverse Portrait.</b> Reverse "
-+"Portrait prints the image upside down.</li>  </ul>  The icon changes "
-+"according to your selection.</p> <br>  <hr>  <p><em><b>Additional hint for "
-+"power users:</b> This KDEPrint GUI element matches  with the CUPS "
-+"commandline job option parameter:</em>  <pre>    -o orientation-"
-+"requested=...       # examples: \"landscape\" or \"reverse-portrait\"  </"
-+"pre> </p>  </qt>"
-+msgstr ""
-+"<qt> <p><b>圖片方向：</b>這裡可以控制列印出的圖片的方向。預設為「縱向」"
-+"（Portrait）。</p> <p>您有四種選擇： <ul> <li><b>縱向（Portrait）</b>。為預設"
-+"選項。</li> <li><b>橫向（Landscape）</b>。</li> <li><b>反橫向（Reverse "
-+"Landscape）</b>。印橫向，但上下顛倒。</li> <li><b>反縱向（Reverse Portrait）"
-+"</b>。印縱向，但上下顛倒。</li></ul> 圖示會根據您的選擇而改變。</p> <br><hr> "
-+"<p><b>進階使用者的額外提示：</b>這個選項與以下的 CUPS 命令列選項參數是一樣"
-+"的： <pre>     -o orientation-requested=...     # 例：\"landscape\" 或 "
- "\"reverse-portrait\"</pre></p></qt>"
- 
- #: kpgeneralpage.cpp:191
- msgid ""
--" <qt>  "
--"<p><b>Duplex Printing:</b> These controls may be grayed out if your printer  "
--"does not support <em>duplex printing</em> (i.e. printing on both sides of the "
--"sheet).  These controls are active if your printer supports duplex printing.  "
--"<p>  You can choose from 3 alternatives: </p> "
--"<ul>  "
--"<li> <b>None.</b> This prints each page of the job on one side of the sheets "
--"only. </li>  "
--"<li> <b>Long Side.</b> This prints the job on both sides of the paper sheets.  "
--"It prints the job in a way so that the backside has the same orientation as the "
--"front  side if you turn the paper over the long edge. (Some printer drivers "
--"name this mode  <em>duplex-non-tumbled</em>).  </li>  "
--"<li> <b>Short Side.</b> This prints the job on both sides of the paper sheets.  "
--"It prints the job so that the backside has the reverse orientation from the "
--"front  side if you turn the paper over the long edge, but the same orientation, "
--"if you turn it over  the short edge. (Some printer drivers name this mode  <em>"
--"duplex-tumbled</em>).  </li>  </ul>  "
--"<hr>  "
-+" <qt>  <p><b>Duplex Printing:</b> These controls may be grayed out if your "
-+"printer  does not support <em>duplex printing</em> (i.e. printing on both "
-+"sides of the sheet).  These controls are active if your printer supports "
-+"duplex printing.  <p>  You can choose from 3 alternatives: </p> <ul>  <li> "
-+"<b>None.</b> This prints each page of the job on one side of the sheets "
-+"only. </li>  <li> <b>Long Side.</b> This prints the job on both sides of the "
-+"paper sheets.  It prints the job in a way so that the backside has the same "
-+"orientation as the front  side if you turn the paper over the long edge. "
-+"(Some printer drivers name this mode  <em>duplex-non-tumbled</em>).  </li>  "
-+"<li> <b>Short Side.</b> This prints the job on both sides of the paper "
-+"sheets.  It prints the job so that the backside has the reverse orientation "
-+"from the front  side if you turn the paper over the long edge, but the same "
-+"orientation, if you turn it over  the short edge. (Some printer drivers name "
-+"this mode  <em>duplex-tumbled</em>).  </li>  </ul>  <hr>  "
- "<p><em><b>Additional hint for power users:</b> This KDEPrint GUI element "
--"matches  with the CUPS commandline job option parameter:</em>  "
--"<pre>    -o duplex=...       # examples: \"tumble\" or \"two-sided-short-edge\" "
--" </pre> </p>  </qt>"
--msgstr ""
--"<qt> "
--"<p><b>雙面列印：</b> "
--"<p>如果您的印表機有支援雙面列印，您可以在這裡選取。如果沒有，這個選項會被關閉。</p> "
--"<p>您可以有三個選擇：</p> "
--"<ul> "
--"<li><b>無：</b>關閉雙面列印功能。</li> "
--"<li><b>長邊：</b>雙面列印，如果您在長邊翻面的話，正反面就會是同一個方向。有的印表機驅動程式稱此為「不翻轉雙面列印」。</li> "
--"<li><b>短邊：</b>雙面列印，如果您在短邊翻面的話，正反面就會是同一個方向，而在長邊翻面的話，正反面則方向相反。有的印表機驅動程式稱此為「翻轉雙面列印」"
--"。</li> "
--"<br>"
--"<hr> "
--"<p><b>進階使用者的額外提示：</b>這個選項與以下的 CUPS 命令列選項參數是一樣的： "
--"<pre>     -o duplex=...     # 例：\"tumble\" 或 \"two-sided-short-edge\"</pre></p>"
--"</qt>"
-+"matches  with the CUPS commandline job option parameter:</em>  <pre>    -o "
-+"duplex=...       # examples: \"tumble\" or \"two-sided-short-edge\"  </pre> "
-+"</p>  </qt>"
-+msgstr ""
-+"<qt> <p><b>雙面列印：</b> <p>如果您的印表機有支援雙面列印，您可以在這裡選取。"
-+"如果沒有，這個選項會被關閉。</p> <p>您可以有三個選擇：</p> <ul> <li><b>無：</"
-+"b>關閉雙面列印功能。</li> <li><b>長邊：</b>雙面列印，如果您在長邊翻面的話，正"
-+"反面就會是同一個方向。有的印表機驅動程式稱此為「不翻轉雙面列印」。</li> "
-+"<li><b>短邊：</b>雙面列印，如果您在短邊翻面的話，正反面就會是同一個方向，而在"
-+"長邊翻面的話，正反面則方向相反。有的印表機驅動程式稱此為「翻轉雙面列印」。</"
-+"li> <br><hr> <p><b>進階使用者的額外提示：</b>這個選項與以下的 CUPS 命令列選項"
-+"參數是一樣的： <pre>     -o duplex=...     # 例：\"tumble\" 或 \"two-sided-"
-+"short-edge\"</pre></p></qt>"
- 
- #: kpgeneralpage.cpp:217
- msgid ""
--" <qt>  "
--"<p><b>Banner Page(s):</b> Select banner(s) to print one or two special sheets  "
--"of paper just before or after your main job. </p> "
--"<p>Banners may contain some pieces of job information, such as user name, time "
--"of printing, job title and more. </p> "
--"<p>Banner pages are useful to separate different jobs more easily, especially "
--"in a multi-user  environment. </p> "
--"<p><em><b>Hint:</em></b> You can design your own banner pages. To make use of "
--"them, just put the banner  file into the standard CUPS <em>banners</em> "
--"directory (This is usually <em>\"/usr/share/cups/banner/\"</em>  "
--"Your custom banner(s) must have one of the supported printable formats.  "
--"Supported formats are ASCII text, PostScript, PDF and nearly any image format "
--"such as PNG, JPEG or  GIF. Your added banner pages will appear in the drop down "
--"menu after a restart of CUPS. </p> "
--"<p>CUPS comes with a selection of banner pages. </p> "
--"<br>  "
--"<hr>  "
--"<p><em><b>Additional hint for power users:</b> This KDEPrint GUI element "
--"matches  with the CUPS commandline job option parameter:</em>  "
--"<pre>    -o job-sheets=...       # examples: \"standard\" or \"topsecret\"  "
--"</pre> </p>  </qt>"
--msgstr ""
--"<qt> "
--"<p><b>旗幟（Banner）：</b>選擇在列印開始前或結束後，先列印一或兩張特殊的旗幟頁。</p> "
--"<p>旗幟內包含一些工作的資訊，如使用者名稱、列印時間、工作標題等等。</p> "
--"<p>旗幟頁可以讓您輕易分辨不同的列印工作，尤其是在多使用者的環境下。</p> "
--"<p><b>提示：</b>您可以設計自己的旗幟頁。要使用自己的旗幟頁，只要將檔案放到 CUPS 下的 banners 目錄（通常是放在 "
--"/usr/share/cups/banner/）。您自己的旗幟頁必須是可列印的格式，像是文字檔、PostScript、PDF 或圖片格式檔。重新啟動 CUPS "
--"後就可以在下拉式選單中看到自己的旗幟。</p> "
--"<p>CUPS 有自己內建的旗幟頁。</p> "
--"<br>"
--"<hr> "
--"<p><b>進階使用者的額外提示：</b>這個選項與以下的 CUPS 命令列選項參數是一樣的： "
--"<pre>     -o job-sheets=...     # 例：\"standard\" 或 \"topsecret\"</pre></p></qt>"
-+" <qt>  <p><b>Banner Page(s):</b> Select banner(s) to print one or two "
-+"special sheets  of paper just before or after your main job. </p> <p>Banners "
-+"may contain some pieces of job information, such as user name, time of "
-+"printing, job title and more. </p> <p>Banner pages are useful to separate "
-+"different jobs more easily, especially in a multi-user  environment. </p> "
-+"<p><em><b>Hint:</em></b> You can design your own banner pages. To make use "
-+"of them, just put the banner  file into the standard CUPS <em>banners</em> "
-+"directory (This is usually <em>\"/usr/share/cups/banner/\"</em>  Your custom "
-+"banner(s) must have one of the supported printable formats.  Supported "
-+"formats are ASCII text, PostScript, PDF and nearly any image format such as "
-+"PNG, JPEG or  GIF. Your added banner pages will appear in the drop down menu "
-+"after a restart of CUPS. </p> <p>CUPS comes with a selection of banner "
-+"pages. </p> <br>  <hr>  <p><em><b>Additional hint for power users:</b> This "
-+"KDEPrint GUI element matches  with the CUPS commandline job option parameter:"
-+"</em>  <pre>    -o job-sheets=...       # examples: \"standard\" or "
-+"\"topsecret\"  </pre> </p>  </qt>"
-+msgstr ""
-+"<qt> <p><b>旗幟（Banner）：</b>選擇在列印開始前或結束後，先列印一或兩張特殊的"
-+"旗幟頁。</p> <p>旗幟內包含一些工作的資訊，如使用者名稱、列印時間、工作標題等"
-+"等。</p> <p>旗幟頁可以讓您輕易分辨不同的列印工作，尤其是在多使用者的環境下。"
-+"</p> <p><b>提示：</b>您可以設計自己的旗幟頁。要使用自己的旗幟頁，只要將檔案放"
-+"到 CUPS 下的 banners 目錄（通常是放在 /usr/share/cups/banner/）。您自己的旗幟"
-+"頁必須是可列印的格式，像是文字檔、PostScript、PDF 或圖片格式檔。重新啟動 "
-+"CUPS 後就可以在下拉式選單中看到自己的旗幟。</p> <p>CUPS 有自己內建的旗幟頁。"
-+"</p> <br><hr> <p><b>進階使用者的額外提示：</b>這個選項與以下的 CUPS 命令列選"
-+"項參數是一樣的： <pre>     -o job-sheets=...     # 例：\"standard\" 或 "
-+"\"topsecret\"</pre></p></qt>"
- 
- #: kpgeneralpage.cpp:239
- msgid ""
--" <qt>  "
--"<p><b>Pages per Sheet:</b>  You can choose to print more than one page onto "
--"each sheet of paper.  This is sometimes useful to save paper. </p> "
--"<p><b>Note 1:</b> the page images get scaled down accordingly to print 2 or 4 "
--"pages per sheet.  The page image does not get scaled if you print 1 page per "
--"sheet (the default setting.).  "
--"<p><b>Note 2:</b> If you select multiple pages per sheet here, the scaling and "
--"re-arranging is done  by your printing system. Be aware, that some printers can "
--"by themselves print multiple pages per sheet.  In this case you find the option "
--"in the printer driver settings. Be careful: if you enable multiple  pages per "
--"sheet in both places, your printout will not look as you intended. </p> "
--"<br>  "
--"<hr>  "
-+" <qt>  <p><b>Pages per Sheet:</b>  You can choose to print more than one "
-+"page onto each sheet of paper.  This is sometimes useful to save paper. </p> "
-+"<p><b>Note 1:</b> the page images get scaled down accordingly to print 2 or "
-+"4 pages per sheet.  The page image does not get scaled if you print 1 page "
-+"per sheet (the default setting.).  <p><b>Note 2:</b> If you select multiple "
-+"pages per sheet here, the scaling and re-arranging is done  by your printing "
-+"system. Be aware, that some printers can by themselves print multiple pages "
-+"per sheet.  In this case you find the option in the printer driver settings. "
-+"Be careful: if you enable multiple  pages per sheet in both places, your "
-+"printout will not look as you intended. </p> <br>  <hr>  "
- "<p><em><b>Additional hint for power users:</b> This KDEPrint GUI element "
--"matches  with the CUPS commandline job option parameter:</em>  "
--"<pre>    -o number-up=...        # examples: \"2\" or \"4\"  </pre> </p>  </qt>"
-+"matches  with the CUPS commandline job option parameter:</em>  <pre>    -o "
-+"number-up=...        # examples: \"2\" or \"4\"  </pre> </p>  </qt>"
- msgstr ""
--"<qt> "
--"<p><b>單張多頁：</b>您可以選擇在一張紙上印出多頁內容。通常是為了節省紙張。</p> "
--"<p><b>注意：</b>列印的圖片會根據一張紙上頁數的多寡來決定要縮小多少。如果選擇一張紙上印一頁（預設值）則不會做調整。</p> "
--"<p><b>注意：</b>當您選擇一張紙上印多頁時，列印系統會自動幫您調整大小。但是，有些印表機自己就有單張多頁的功能。這種情況下您最好使用印表機自己的設定選項"
--"。如果您兩邊都使用此選項，印出來的結果可能不會是您想要的</p> "
--"<br>"
--"<hr> "
--"<p><b>進階使用者的額外提示：</b>這個選項與以下的 CUPS 命令列選項參數是一樣的： "
--"<pre>     -o number-up=...     # 例：\"2\" 或 \"4\"</pre></p></qt>"
-+"<qt> <p><b>單張多頁：</b>您可以選擇在一張紙上印出多頁內容。通常是為了節省紙"
-+"張。</p> <p><b>注意：</b>列印的圖片會根據一張紙上頁數的多寡來決定要縮小多少。"
-+"如果選擇一張紙上印一頁（預設值）則不會做調整。</p> <p><b>注意：</b>當您選擇一"
-+"張紙上印多頁時，列印系統會自動幫您調整大小。但是，有些印表機自己就有單張多頁"
-+"的功能。這種情況下您最好使用印表機自己的設定選項。如果您兩邊都使用此選項，印"
-+"出來的結果可能不會是您想要的</p> <br><hr> <p><b>進階使用者的額外提示：</b>這"
-+"個選項與以下的 CUPS 命令列選項參數是一樣的： <pre>     -o number-up=...     "
-+"# 例：\"2\" 或 \"4\"</pre></p></qt>"
- 
- #: kpgeneralpage.cpp:263 kpqtpage.cpp:118
- msgid "Page s&ize:"
-@@ -5400,11 +5095,13 @@
- 
- #: kdeprintd.cpp:176
- msgid ""
--"Some of the files to print are not readable by the KDE print daemon. This may "
--"happen if you are trying to print as a different user to the one currently "
--"logged in. To continue printing, you need to provide root's password."
-+"Some of the files to print are not readable by the KDE print daemon. This "
-+"may happen if you are trying to print as a different user to the one "
-+"currently logged in. To continue printing, you need to provide root's "
-+"password."
- msgstr ""
--"KDE 列印服務程式無法讀取某些要列印的文件。這可能是您使用非目前登入主機的身份來執行列印工作。如果要繼續列印的話，您需要輸入提供系統管理員的密碼。"
-+"KDE 列印服務程式無法讀取某些要列印的文件。這可能是您使用非目前登入主機的身分"
-+"來執行列印工作。如果要繼續列印的話，您需要輸入提供系統管理員的密碼。"
- 
- #: kdeprintd.cpp:181
- msgid "Provide root's Password"
-@@ -5431,11 +5128,12 @@
- 
- #: kpcopiespage.cpp:46
- msgid ""
--" <qt>"
--"<p><b>Page Selection</b></p>  "
--"<p>Here you can control if you print a certain selection only out of all the "
--"pages from the complete document. </p> </qt>"
--msgstr "<qt> <p><b>選擇頁數</b></p> <p>您可以控制您要列印整份文件中的哪些頁數。</p></qt>"
-+" <qt><p><b>Page Selection</b></p>  <p>Here you can control if you print a "
-+"certain selection only out of all the pages from the complete document. </p> "
-+"</qt>"
-+msgstr ""
-+"<qt> <p><b>選擇頁數</b></p> <p>您可以控制您要列印整份文件中的哪些頁數。</p></"
-+"qt>"
- 
- #: kpcopiespage.cpp:51
- msgid ""
-@@ -5445,164 +5143,133 @@
- 
- #: kpcopiespage.cpp:55
- msgid ""
--" <qt><b>Current Page:</b> Select <em>\"Current\"</em> "
--"if you want  to print the page currently visible in your KDE application.</p> "
--"<p><b>Note:</b> this field is disabled if you print from non-KDE applications "
--"like Mozilla or OpenOffice.org, since here KDEPrint has no means to determine "
--"which document page you are currently viewing.</p></qt>"
--msgstr ""
--"<qt><b>目前的頁面：</b>選擇「目前」則只印出目前您應用程式上觀看的那一頁。</p> "
--"<p><b>注意：</b>如果您不是從 KDE 應用程式中列印，則這一欄會被關閉，因為 KDEPrint 無法決定您目前在觀看文件的第幾頁。</p></qt>"
-+" <qt><b>Current Page:</b> Select <em>\"Current\"</em> if you want  to print "
-+"the page currently visible in your KDE application.</p> <p><b>Note:</b> this "
-+"field is disabled if you print from non-KDE applications like Mozilla or "
-+"OpenOffice.org, since here KDEPrint has no means to determine which document "
-+"page you are currently viewing.</p></qt>"
-+msgstr ""
-+"<qt><b>目前的頁面：</b>選擇「目前」則只印出目前您應用程式上觀看的那一頁。</"
-+"p> <p><b>注意：</b>如果您不是從 KDE 應用程式中列印，則這一欄會被關閉，因為 "
-+"KDEPrint 無法決定您目前在觀看文件的第幾頁。</p></qt>"
- 
- #: kpcopiespage.cpp:60
- msgid ""
- " <qt><b>Page Range:</b> Choose a \"Page Range\" to select a subset of the "
--"complete document pages to be printed. The format is <em>"
--"\"n,m,o-p,q,r,s-t, u\"</em>.</p> "
--"<p><b>Example:</b> <em>\"4,6,10-13,17,20,23-25\"</em> "
--"will print the pages 4, 6, 10, 11, 12, 13, 17, 20, 23, 24, 25 of your "
--"document.</p> "
--"<br>  "
--"<hr>  "
--"<p><em><b>Additional hint for power users:</b> This KDEPrint GUI element "
--"matches  with the CUPS commandline job option parameter:</em>  "
-+"complete document pages to be printed. The format is <em>\"n,m,o-p,q,r,s-t, u"
-+"\"</em>.</p> <p><b>Example:</b> <em>\"4,6,10-13,17,20,23-25\"</em> will "
-+"print the pages 4, 6, 10, 11, 12, 13, 17, 20, 23, 24, 25 of your document.</"
-+"p> <br>  <hr>  <p><em><b>Additional hint for power users:</b> This KDEPrint "
-+"GUI element matches  with the CUPS commandline job option parameter:</em>  "
- "<pre>    -o page-ranges=...     # example: \"4,6,10-13,17,20,23-25\"  </pre> "
- "</p> </qt>"
- msgstr ""
--"<qt><b>頁數範圍：</b>選擇「範圍」可以輸入您要列印整份文件中哪一部份的頁數。格式為：\"n,m,o-p,q,r,s-t,u\"。</p> "
--"<p><b>例：</b>\"4,6,10-13,17,20,23-25\" 會列印文件的第 4, 6, 10, 11, 12, 13, 17, 20, 23, "
--"24, 25 頁。"
--"<p> "
--"<br>"
--"<hr> "
--"<p><b>進階使用者的額外提示：</b>這個選項與以下的 CUPS 命令列選項參數是一樣的： "
--"<pre>     -o page-ranges=...     # 例：\"4,6,10-13,17,20,23-25\"</pre></p></qt>"
-+"<qt><b>頁數範圍：</b>選擇「範圍」可以輸入您要列印整份文件中哪一部份的頁數。格"
-+"式為：\"n,m,o-p,q,r,s-t,u\"。</p> <p><b>例：</b>\"4,6,10-13,17,20,23-25\" 會"
-+"列印文件的第 4, 6, 10, 11, 12, 13, 17, 20, 23, 24, 25 頁。<p> <br><hr> <p><b>"
-+"進階使用者的額外提示：</b>這個選項與以下的 CUPS 命令列選項參數是一樣的： "
-+"<pre>     -o page-ranges=...     # 例：\"4,6,10-13,17,20,23-25\"</pre></p></"
-+"qt>"
- 
- #: kpcopiespage.cpp:74
- msgid ""
--" <qt><b>Page Set:</b> "
--"<p>Choose <em>\"All Pages\"</em>, <em>\"Even Pages\"</em> or <em>"
--"\"Odd Pages\"</em> if you want to print a page selection matching one of these "
--"terms. The default is <em>\"All Pages\"</em>.</p> "
--"<p><b>Note:</b> If you combine a selection of a <em>\"Page Range\"</em> "
--"with a <em>\"Page Set\"</em> of <em>\"Odd\"</em> or <em>\"Even\"</em>"
--", you will only get the odd or even pages from the originally selected page "
--"range. This is useful if you odd or even pages from the originally selected "
--"page range. This is useful if you want to print a page range in duplex on a "
--"simplex-only printer. In this case you can feed the paper to the printer twice; "
--"in the first pass, select \"Odd\" or \"Even\" (depending on your printer "
--"model), in second pass select the other option. You may need to <em>"
--"\"Reverse\"</em> the output in one of the passes (depending on your printer "
--"model).</p>  "
--"<br>  "
--"<hr>  "
--"<p><em><b>Additional hint for power users:</b> This KDEPrint GUI element "
--"matches  with the CUPS commandline job option parameter:</em>  "
-+" <qt><b>Page Set:</b> <p>Choose <em>\"All Pages\"</em>, <em>\"Even Pages\"</"
-+"em> or <em>\"Odd Pages\"</em> if you want to print a page selection matching "
-+"one of these terms. The default is <em>\"All Pages\"</em>.</p> <p><b>Note:</"
-+"b> If you combine a selection of a <em>\"Page Range\"</em> with a <em>\"Page "
-+"Set\"</em> of <em>\"Odd\"</em> or <em>\"Even\"</em>, you will only get the "
-+"odd or even pages from the originally selected page range. This is useful if "
-+"you odd or even pages from the originally selected page range. This is "
-+"useful if you want to print a page range in duplex on a simplex-only "
-+"printer. In this case you can feed the paper to the printer twice; in the "
-+"first pass, select \"Odd\" or \"Even\" (depending on your printer model), in "
-+"second pass select the other option. You may need to <em>\"Reverse\"</em> "
-+"the output in one of the passes (depending on your printer model).</p>  "
-+"<br>  <hr>  <p><em><b>Additional hint for power users:</b> This KDEPrint GUI "
-+"element matches  with the CUPS commandline job option parameter:</em>  "
- "<pre>    -o page-set=...        # example: \"odd\" or \"even\"  </pre> </p>  "
- "</qt>"
- msgstr ""
--"<qt><b>頁面設定</b> "
--"<p>您可以選擇要列印「全部」、「奇數頁」或「偶數頁」。預設為列印「全部」。</p> "
--"<p><b>注意：</b>如果您組合了「範圍」與「奇數頁」或「偶數頁」，系統只會列印選擇頁數範圍中的奇數頁或偶數頁。通常這是用在您要在無法雙面列印的印表機上印雙"
--"面文件時。如此您可以先印奇數頁，再重新放入紙張的另一面印出偶數頁。此時請注意第二次餵入紙張的方向，會依印表機不同設定而不同。</p>"
--"<br>"
--"<hr> "
--"<p><b>進階使用者的額外提示：</b>這個選項與以下的 CUPS 命令列選項參數是一樣的： "
--"<pre>     -o page-set=...     # 例：\"odd\" 或 \"even</pre></p></qt>"
-+"<qt><b>頁面設定</b> <p>您可以選擇要列印「全部」、「奇數頁」或「偶數頁」。預設"
-+"為列印「全部」。</p> <p><b>注意：</b>如果您組合了「範圍」與「奇數頁」或「偶數"
-+"頁」，系統只會列印選擇頁數範圍中的奇數頁或偶數頁。通常這是用在您要在無法雙面"
-+"列印的印表機上印雙面文件時。如此您可以先印奇數頁，再重新放入紙張的另一面印出"
-+"偶數頁。此時請注意第二次餵入紙張的方向，會依印表機不同設定而不同。</"
-+"p><br><hr> <p><b>進階使用者的額外提示：</b>這個選項與以下的 CUPS 命令列選項參"
-+"數是一樣的： <pre>     -o page-set=...     # 例：\"odd\" 或 \"even</pre></"
-+"p></qt>"
- 
- #: kpcopiespage.cpp:97
- msgid ""
--" <qt><b>Output Settings:</b> Here you can determine the number of copies, the "
--"output order and the collate mode for the pages of your printjob. (Note, that "
--"the maximum number of copies  allowed to print may be restricted by your print "
--"subsystem.)</p> "
--"<p>The 'Copies' setting defaults to 1. </p>  "
--"<br>  "
--"<hr>  "
--"<p><em><b>Additional hint for power users:</b> This KDEPrint GUI element "
--"matches  with the CUPS commandline job option parameter:</em>  "
--"<pre>     -o copies=...            # examples: \"5\" or \"42\"  "
--"<br>     -o outputorder=...       # example:  \"reverse\" "
--"<br>     -o Collate=...           # example:  \"true\" or \"false\"  </pre> </p> "
--".</qt>"
--msgstr ""
--"<qt><b>輸出設定：</b>"
--"<p>您可以決定要列印幾份，列印的順序與裝訂模式。（注意，您的列印子系統可能會限制最多只能列印幾份。）</p> "
--"<p>列印份數預設值為 1。</p> "
--"<br>"
--"<hr> "
--"<p><b>進階使用者的額外提示：</b>這個選項與以下的 CUPS 命令列選項參數是一樣的： "
--"<pre>     -o copies=...     # 例：\"5\" 或 \"42\""
--"<br>      -o outputorder=...     # 例：\"reverse\""
--"<br>      -o Collate=...     # 例：\"true\" 或 \"false\""
--"<br> </pre></p></qt>"
-+" <qt><b>Output Settings:</b> Here you can determine the number of copies, "
-+"the output order and the collate mode for the pages of your printjob. (Note, "
-+"that the maximum number of copies  allowed to print may be restricted by "
-+"your print subsystem.)</p> <p>The 'Copies' setting defaults to 1. </p>  "
-+"<br>  <hr>  <p><em><b>Additional hint for power users:</b> This KDEPrint GUI "
-+"element matches  with the CUPS commandline job option parameter:</em>  "
-+"<pre>     -o copies=...            # examples: \"5\" or \"42\"  <br>     -o "
-+"outputorder=...       # example:  \"reverse\" <br>     -o "
-+"Collate=...           # example:  \"true\" or \"false\"  </pre> </p> .</qt>"
-+msgstr ""
-+"<qt><b>輸出設定：</b><p>您可以決定要列印幾份，列印的順序與裝訂模式。（注意，"
-+"您的列印子系統可能會限制最多只能列印幾份。）</p> <p>列印份數預設值為 1。</p> "
-+"<br><hr> <p><b>進階使用者的額外提示：</b>這個選項與以下的 CUPS 命令列選項參數"
-+"是一樣的： <pre>     -o copies=...     # 例：\"5\" 或 \"42\"<br>      -o "
-+"outputorder=...     # 例：\"reverse\"<br>      -o Collate=...     # 例："
-+"\"true\" 或 \"false\"<br> </pre></p></qt>"
- 
- #: kpcopiespage.cpp:115
- msgid ""
- " <qt><b>Number of Copies:</b> Determine the number of requested copies here. "
--"You can increase or decrease the number of printed copies by clicking on the up "
--"and down arrows. You can also type the figure directly into the box. </p> "
--"<br>  "
--"<hr>  "
--"<p><em><b>Additional hint for power users:</b> This KDEPrint GUI element "
--"matches  with the CUPS commandline job option parameter:</em>  "
-+"You can increase or decrease the number of printed copies by clicking on the "
-+"up and down arrows. You can also type the figure directly into the box. </p> "
-+"<br>  <hr>  <p><em><b>Additional hint for power users:</b> This KDEPrint GUI "
-+"element matches  with the CUPS commandline job option parameter:</em>  "
- "<pre>     -o copies=...            # examples: \"5\" or \"42\"  </pre> </p>  "
- "</qt>"
- msgstr ""
--"<qt><b>列印份數：</b>決定這份文件要印出幾份。您可以直接輸入份數，也可以用旁邊的小按鈕來調整。</p> "
--"<br>"
--"<hr> "
--"<p><b>進階使用者的額外提示：</b>這個選項與以下的 CUPS 命令列選項參數是一樣的： "
--"<pre>     -o copies=...     # 例：\"5\" 或 \"42\"</pre></p></qt>"
-+"<qt><b>列印份數：</b>決定這份文件要印出幾份。您可以直接輸入份數，也可以用旁邊"
-+"的小按鈕來調整。</p> <br><hr> <p><b>進階使用者的額外提示：</b>這個選項與以下"
-+"的 CUPS 命令列選項參數是一樣的： <pre>     -o copies=...     # 例：\"5\" 或 "
-+"\"42\"</pre></p></qt>"
- 
- #: kpcopiespage.cpp:128
- msgid ""
--" <qt><b>Collate Copies</b> "
--"<p>If the <em>\"Collate\"</em> checkbox is enabled (default), the output order "
--"for multiple copies of a multi-page document will be \"1-2-3-..., 1-2-3-..., "
--"1-2-3-...\".</p> "
--"<p>If the <em>\"Collate\"</em> checkbox is disabled, the output order for "
--"multiple copies of a multi-page document will be \"1-1-1-..., 2-2-2-..., "
--"3-3-3-...\".</p> "
--"<br>  "
--"<hr>  "
--"<p><em><b>Additional hint for power users:</b> This KDEPrint GUI element "
--"matches  with the CUPS commandline job option parameter:</em>  "
--"<pre>    -o Collate=...           # example:  \"true\" or \"false\"  </pre> </p>  "
--"</qt>"
-+" <qt><b>Collate Copies</b> <p>If the <em>\"Collate\"</em> checkbox is "
-+"enabled (default), the output order for multiple copies of a multi-page "
-+"document will be \"1-2-3-..., 1-2-3-..., 1-2-3-...\".</p> <p>If the <em>"
-+"\"Collate\"</em> checkbox is disabled, the output order for multiple copies "
-+"of a multi-page document will be \"1-1-1-..., 2-2-2-..., 3-3-3-...\".</p> "
-+"<br>  <hr>  <p><em><b>Additional hint for power users:</b> This KDEPrint GUI "
-+"element matches  with the CUPS commandline job option parameter:</em>  "
-+"<pre>    -o Collate=...           # example:  \"true\" or \"false\"  </pre> "
-+"</p>  </qt>"
- msgstr ""
--"<qt><b>裝訂模式</b> "
--"<p>如果打開「裝訂模式」，要列印好幾份文件的時候，輸出的順序會是 1-2-3-..., 1-2-3-..., 1-2-3-...\"。</p> "
--"<p>如果沒有打開的話，則輸出的順序會是 1-1-1-..., 2-2-2-..., 3-3-3-...\"。</p> "
--"<br>"
--"<hr> "
--"<p><b>進階使用者的額外提示：</b>這個選項與以下的 CUPS 命令列選項參數是一樣的： "
--"<pre>     -o Collate=...     # 例：\"true\" 或 \"false\"</pre></p></qt>"
-+"<qt><b>裝訂模式</b> <p>如果打開「裝訂模式」，要列印好幾份文件的時候，輸出的順"
-+"序會是 1-2-3-..., 1-2-3-..., 1-2-3-...\"。</p> <p>如果沒有打開的話，則輸出的"
-+"順序會是 1-1-1-..., 2-2-2-..., 3-3-3-...\"。</p> <br><hr> <p><b>進階使用者的"
-+"額外提示：</b>這個選項與以下的 CUPS 命令列選項參數是一樣的： <pre>     -o "
-+"Collate=...     # 例：\"true\" 或 \"false\"</pre></p></qt>"
- 
- #: kpcopiespage.cpp:142
- msgid ""
--" <qt><b>Reverse Order</b> "
--"<p> If the <em>\"Reverse\"</em> checkbox is enabled, the output order for "
--"multiple copies of a multi-page document will be \"...-3-2-1, ...-3-2-1, "
--"...-3-2-1\", if you also have <em>en</em>abled the <em>\"Collate\"</em> "
--"checkbox at the same time (the usual usecase).</p> "
-+" <qt><b>Reverse Order</b> <p> If the <em>\"Reverse\"</em> checkbox is "
-+"enabled, the output order for multiple copies of a multi-page document will "
-+"be \"...-3-2-1, ...-3-2-1, ...-3-2-1\", if you also have <em>en</em>abled "
-+"the <em>\"Collate\"</em> checkbox at the same time (the usual usecase).</p> "
- "<p>If the <em>\"Reverse\"</em> checkbox is enabled, the output order for "
--"multiple copies of a multi-page document will be \"...-3-3-3, ...-2-2-2, "
--"...-1-1-1\", if you have <em>dis</em>abled the <em>\"Collate\"</em> "
--"checkbox at the same time. </p> "
--"<br>  "
--"<hr>  "
--"<p><em><b>Additional hint for power users:</b> This KDEPrint GUI element "
--"matches  with the CUPS commandline job option parameter:</em>  "
--"<pre>    -o outputorder=...       # example:  \"reverse\"  </pre> </p>  </qt>"
-+"multiple copies of a multi-page document will be \"...-3-3-3, ...-2-2-2, ...-"
-+"1-1-1\", if you have <em>dis</em>abled the <em>\"Collate\"</em> checkbox at "
-+"the same time. </p> <br>  <hr>  <p><em><b>Additional hint for power users:</"
-+"b> This KDEPrint GUI element matches  with the CUPS commandline job option "
-+"parameter:</em>  <pre>    -o outputorder=...       # example:  \"reverse\"  "
-+"</pre> </p>  </qt>"
- msgstr ""
--"<qt><b>反序列印</b> "
--"<p>如果打開「反序列印」的話，頁面輸出的順序會是\"...-3-2-1,\"。如果您同時打開「裝訂模式」的話，則多份文件的輸出順序會是\"...-3-2-1,"
--" ...-3-2-1, ...-3-2-1\"。</p> "
--"<br>"
--"<hr> "
--"<p><b>進階使用者的額外提示：</b>這個選項與以下的 CUPS 命令列選項參數是一樣的： "
--"<pre>     -o outputorder=...     # 例：\"reverse\"</pre></p></qt>"
-+"<qt><b>反序列印</b> <p>如果打開「反序列印」的話，頁面輸出的順序會是\"...-3-2-"
-+"1,\"。如果您同時打開「裝訂模式」的話，則多份文件的輸出順序會是\"...-3-2-"
-+"1, ...-3-2-1, ...-3-2-1\"。</p> <br><hr> <p><b>進階使用者的額外提示：</b>這個"
-+"選項與以下的 CUPS 命令列選項參數是一樣的： <pre>     -o outputorder=...     "
-+"# 例：\"reverse\"</pre></p></qt>"
- 
- #: kpcopiespage.cpp:163
- msgid "C&opies"
-@@ -5678,18 +5345,23 @@
- "The preview program %1 cannot be found. Check that the program is correctly "
- "installed and located in a directory included in your PATH environment "
- "variable."
--msgstr "找不到處理 %1 預覽程式。請檢查該程式有正確安裝，並且能夠直接在 PATH環境變數所指定的目錄內尋找到。"
-+msgstr ""
-+"找不到處理 %1 預覽程式。請檢查該程式有正確安裝，並且能夠直接在 PATH環境變數所"
-+"指定的目錄內尋找到。"
- 
- #: kprintpreview.cpp:300
- msgid ""
--"Preview failed: neither the internal KDE PostScript viewer (KGhostView) nor any "
--"other external PostScript viewer could be found."
--msgstr "預覽失敗：無法找到內建的 KDE PostScript 檢視程式 (KGhostView) 或其他外部的 PostScript 檢視程式。"
-+"Preview failed: neither the internal KDE PostScript viewer (KGhostView) nor "
-+"any other external PostScript viewer could be found."
-+msgstr ""
-+"預覽失敗：無法找到內建的 KDE PostScript 檢視程式 (KGhostView) 或其他外部的 "
-+"PostScript 檢視程式。"
- 
- #: kprintpreview.cpp:304
- #, c-format
- msgid ""
--"Preview failed: KDE could not find any application to preview files of type %1."
-+"Preview failed: KDE could not find any application to preview files of type %"
-+"1."
- msgstr "預覽失敗：KDE 找不到任何應用程式來預覽 %1 型態的檔案。"
- 
- #: kprintpreview.cpp:314
-@@ -5705,23 +5377,25 @@
- msgid "<qt>There was an error loading %1. The diagnostic is:<p>%2</p></qt>"
- msgstr ""
- "<qt>在載入 %1 時發生錯誤。\n"
--"診斷結果為： "
--"<p>%2</p></qt>"
-+"診斷結果為： <p>%2</p></qt>"
- 
- #: kpdriverpage.cpp:48
- msgid ""
- "<qt>Some options selected are in conflict. You must resolve these conflicts "
--"before continuing. See <b>Driver Settings</b> tab for detailed information.</qt>"
--msgstr "<qt>部分選定的選項相衝突。您必須在繼續之前解決這些衝突。詳見<b>驅動程式設定</b>頁以取得詳細資訊。</qt>"
-+"before continuing. See <b>Driver Settings</b> tab for detailed information.</"
-+"qt>"
-+msgstr ""
-+"<qt>部分選定的選項相衝突。您必須在繼續之前解決這些衝突。詳見<b>驅動程式設定</"
-+"b>頁以取得詳細資訊。</qt>"
- 
- #: posterpreview.cpp:115
- msgid ""
--"Poster preview not available. Either the <b>poster</b> "
--"executable is not properly installed, or you don't have the required version; "
--"available at http://printing.kde.org/downloads/."
-+"Poster preview not available. Either the <b>poster</b> executable is not "
-+"properly installed, or you don't have the required version; available at "
-+"http://printing.kde.org/downloads/."
- msgstr ""
--"無法預覽海報。可能是 <b>poster</b> 程式沒有正確安裝，或是您的版本不符。您可以到 "
--"http://printing.kde.org/downloads/ 去下載。"
-+"無法預覽海報。可能是 <b>poster</b> 程式沒有正確安裝，或是您的版本不符。您可以"
-+"到 http://printing.kde.org/downloads/ 去下載。"
- 
- #: kprinterpropertydialog.cpp:78 kprinterpropertydialog.cpp:138
- msgid "Printer Configuration"
-@@ -5741,174 +5415,136 @@
- 
- #: marginwidget.cpp:37
- msgid ""
--" <qt>  "
--"<p><b>Top Margin</b></p>.  "
--"<p>This spinbox/text edit field lets you control the top margin of your "
--"printout if the printing  application does not define its margins internally. "
--"</p>  "
--"<p>The setting works for instance for ASCII text file printing, or for printing "
--"from KMail and  and Konqueror.. </p> "
--"<p><b>Note:</b></p>This margin setting is not intended for KOffice or "
--"OpenOffice.org printing,  because these applications (or rather their users) "
--"are expected to do it by themselves.  It also does not work for PostScript or "
--"PDF file, which in most cases have their margins hardcoded  internally.</p>  "
--"<br>  "
--"<hr>  "
--"<p><em><b>Additional hint for power users:</b> This KDEPrint GUI element "
--"matches  with the CUPS commandline job option parameter:</em>  "
--"<pre>    -o page-top=...      # use values from \"0\" or higher. \"72\" is "
--"equal to 1 inch.  </pre> </p>  </qt>"
--msgstr ""
--"<qt> "
--"<p><b>上邊界</b></p> "
--"<p>如果您的應用程式沒有定義上邊界的話，這裡可以讓您調整您列印輸出的上邊界。</p> "
--"<p>這個設定可用於文字檔列印，或是 KMail、Konqueror 等列印輸出。</p> "
--"<p><b>注意：</b></p>邊界設定不適用於 KOffice 或 OpenOffice.org，因為這些應用程式通常會自己定義輸出樣式。另外像 "
--"PostScript 或 PDF 檔，通常也都會內建邊界設定，因此也不適用於此設定。</p> "
--"<br>"
--"<hr> "
--"<p><b>進階使用者的額外提示：</b>這個選項與以下的 CUPS 命令列選項參數是一樣的： "
--"<pre>     -o page-top=...     # 單位為像素，設為 72 則邊界為一英吋。</pre></p></qt>"
-+" <qt>  <p><b>Top Margin</b></p>.  <p>This spinbox/text edit field lets you "
-+"control the top margin of your printout if the printing  application does "
-+"not define its margins internally. </p>  <p>The setting works for instance "
-+"for ASCII text file printing, or for printing from KMail and  and "
-+"Konqueror.. </p> <p><b>Note:</b></p>This margin setting is not intended for "
-+"KOffice or OpenOffice.org printing,  because these applications (or rather "
-+"their users) are expected to do it by themselves.  It also does not work for "
-+"PostScript or PDF file, which in most cases have their margins hardcoded  "
-+"internally.</p>  <br>  <hr>  <p><em><b>Additional hint for power users:</b> "
-+"This KDEPrint GUI element matches  with the CUPS commandline job option "
-+"parameter:</em>  <pre>    -o page-top=...      # use values from \"0\" or "
-+"higher. \"72\" is equal to 1 inch.  </pre> </p>  </qt>"
-+msgstr ""
-+"<qt> <p><b>上邊界</b></p> <p>如果您的應用程式沒有定義上邊界的話，這裡可以讓您"
-+"調整您列印輸出的上邊界。</p> <p>這個設定可用於文字檔列印，或是 KMail、"
-+"Konqueror 等列印輸出。</p> <p><b>注意：</b></p>邊界設定不適用於 KOffice 或 "
-+"OpenOffice.org，因為這些應用程式通常會自己定義輸出樣式。另外像 PostScript 或 "
-+"PDF 檔，通常也都會內建邊界設定，因此也不適用於此設定。</p> <br><hr> <p><b>進"
-+"階使用者的額外提示：</b>這個選項與以下的 CUPS 命令列選項參數是一樣的： "
-+"<pre>     -o page-top=...     # 單位為像素，設為 72 則邊界為一英吋。</pre></"
-+"p></qt>"
- 
- #: marginwidget.cpp:57
- msgid ""
--" <qt>  "
--"<p><b>Bottom Margin</b></p>.  "
--"<p>This spinbox/text edit field lets you control the bottom margin of your "
--"printout if the printing  application does not define its margins internally. "
--"</p>  "
--"<p>The setting works for instance for ASCII text file printing, or for printing "
--"from KMail and  and Konqueror. </p> "
--"<p><b>Note:</b></p>This margin setting is not intended for KOffice or "
--"OpenOffice.org printing,  because these applications (or rather their users) "
--"are expected to do it by themselves.  It also does not work for PostScript or "
--"PDF file, which in most cases have their margins hardcoded  internally.</p>  "
--"<br>  "
--"<hr>  "
--"<p><em><b>Additional hint for power users:</b> This KDEPrint GUI element "
--"matches  with the CUPS commandline job option parameter:</em>  "
--"<pre>    -o page-bottom=...      # use values from \"0\" or higher. \"72\" is "
--"equal to 1 inch.  </pre> </qt>"
--msgstr ""
--"<qt> "
--"<p><b>下邊界</b></p> "
--"<p>如果您的應用程式沒有定義下邊界的話，這裡可以讓您調整您列印輸出的下邊界。</p> "
--"<p>這個設定可用於文字檔列印，或是 KMail、Konqueror 等列印輸出。</p> "
--"<p><b>注意：</b></p>邊界設定不適用於 KOffice 或 OpenOffice.org，因為這些應用程式通常會自己定義輸出樣式。另外像 "
--"PostScript 或 PDF 檔，通常也都會內建邊界設定，因此也不適用於此設定。</p> "
--"<br>"
--"<hr> "
--"<p><b>進階使用者的額外提示：</b>這個選項與以下的 CUPS 命令列選項參數是一樣的： "
--"<pre>     -o page-bottom=...     # 單位為像素，設為 72 則邊界為一英吋。</pre></p></qt>"
-+" <qt>  <p><b>Bottom Margin</b></p>.  <p>This spinbox/text edit field lets "
-+"you control the bottom margin of your printout if the printing  application "
-+"does not define its margins internally. </p>  <p>The setting works for "
-+"instance for ASCII text file printing, or for printing from KMail and  and "
-+"Konqueror. </p> <p><b>Note:</b></p>This margin setting is not intended for "
-+"KOffice or OpenOffice.org printing,  because these applications (or rather "
-+"their users) are expected to do it by themselves.  It also does not work for "
-+"PostScript or PDF file, which in most cases have their margins hardcoded  "
-+"internally.</p>  <br>  <hr>  <p><em><b>Additional hint for power users:</b> "
-+"This KDEPrint GUI element matches  with the CUPS commandline job option "
-+"parameter:</em>  <pre>    -o page-bottom=...      # use values from \"0\" or "
-+"higher. \"72\" is equal to 1 inch.  </pre> </qt>"
-+msgstr ""
-+"<qt> <p><b>下邊界</b></p> <p>如果您的應用程式沒有定義下邊界的話，這裡可以讓您"
-+"調整您列印輸出的下邊界。</p> <p>這個設定可用於文字檔列印，或是 KMail、"
-+"Konqueror 等列印輸出。</p> <p><b>注意：</b></p>邊界設定不適用於 KOffice 或 "
-+"OpenOffice.org，因為這些應用程式通常會自己定義輸出樣式。另外像 PostScript 或 "
-+"PDF 檔，通常也都會內建邊界設定，因此也不適用於此設定。</p> <br><hr> <p><b>進"
-+"階使用者的額外提示：</b>這個選項與以下的 CUPS 命令列選項參數是一樣的： "
-+"<pre>     -o page-bottom=...     # 單位為像素，設為 72 則邊界為一英吋。</"
-+"pre></p></qt>"
- 
- #: marginwidget.cpp:76
- msgid ""
--" <qt>  "
--"<p><b>Left Margin</b></p>.  "
--"<p>This spinbox/text edit field lets you control the left margin of your "
--"printout if the printing  application does not define its margins internally. "
--"</p>  "
--"<p>The setting works for instance for ASCII text file printing, or for printing "
--"from KMail and  and Konqueror. </p> "
--"<p><b>Note:</b></p>This margin setting is not intended for KOffice or "
-+" <qt>  <p><b>Left Margin</b></p>.  <p>This spinbox/text edit field lets you "
-+"control the left margin of your printout if the printing  application does "
-+"not define its margins internally. </p>  <p>The setting works for instance "
-+"for ASCII text file printing, or for printing from KMail and  and Konqueror. "
-+"</p> <p><b>Note:</b></p>This margin setting is not intended for KOffice or "
- "OpenOffice.org printing,  because these applications (or rather their users) "
--"are expected to do it by themselves.  It also does not work for PostScript or "
--"PDF file, which in most cases have their margins hardcoded  internally.</p>  "
--"<br>  "
--"<hr>  "
--"<p><em><b>Additional hint for power users:</b> This KDEPrint GUI element "
--"matches  with the CUPS commandline job option parameter:</em>  "
-+"are expected to do it by themselves.  It also does not work for PostScript "
-+"or PDF file, which in most cases have their margins hardcoded  internally.</"
-+"p>  <br>  <hr>  <p><em><b>Additional hint for power users:</b> This KDEPrint "
-+"GUI element matches  with the CUPS commandline job option parameter:</em>  "
- "<pre>    -o page-left=...      # use values from \"0\" or higher. \"72\" is "
- "equal to 1 inch.  </pre> </qt>"
- msgstr ""
--"<qt> "
--"<p><b>左邊界</b></p> "
--"<p>如果您的應用程式沒有定義左邊界的話，這裡可以讓您調整您列印輸出的左邊界。</p> "
--"<p>這個設定可用於文字檔列印，或是 KMail、Konqueror 等列印輸出。</p> "
--"<p><b>注意：</b></p>邊界設定不適用於 KOffice 或 OpenOffice.org，因為這些應用程式通常會自己定義輸出樣式。另外像 "
--"PostScript 或 PDF 檔，通常也都會內建邊界設定，因此也不適用於此設定。</p> "
--"<br>"
--"<hr> "
--"<p><b>進階使用者的額外提示：</b>這個選項與以下的 CUPS 命令列選項參數是一樣的： "
--"<pre>     -o page-left=...     # 單位為像素，設為 72 則邊界為一英吋。</pre></p></qt>"
-+"<qt> <p><b>左邊界</b></p> <p>如果您的應用程式沒有定義左邊界的話，這裡可以讓您"
-+"調整您列印輸出的左邊界。</p> <p>這個設定可用於文字檔列印，或是 KMail、"
-+"Konqueror 等列印輸出。</p> <p><b>注意：</b></p>邊界設定不適用於 KOffice 或 "
-+"OpenOffice.org，因為這些應用程式通常會自己定義輸出樣式。另外像 PostScript 或 "
-+"PDF 檔，通常也都會內建邊界設定，因此也不適用於此設定。</p> <br><hr> <p><b>進"
-+"階使用者的額外提示：</b>這個選項與以下的 CUPS 命令列選項參數是一樣的： "
-+"<pre>     -o page-left=...     # 單位為像素，設為 72 則邊界為一英吋。</pre></"
-+"p></qt>"
- 
- #: marginwidget.cpp:95
- msgid ""
--" <qt>  "
--"<p><b>Right Margin</b></p>.  "
--"<p>This spinbox/text edit field lets you control the right margin of your "
--"printout if the printing  application does not define its margins internally. "
--"</p>  "
--"<p>The setting works for instance for ASCII text file printing, or for printing "
--"from KMail and  and Konqueror. </p> "
--"<p><b>Note:</b></p>This margin setting is not intended for KOffice or "
-+" <qt>  <p><b>Right Margin</b></p>.  <p>This spinbox/text edit field lets you "
-+"control the right margin of your printout if the printing  application does "
-+"not define its margins internally. </p>  <p>The setting works for instance "
-+"for ASCII text file printing, or for printing from KMail and  and Konqueror. "
-+"</p> <p><b>Note:</b></p>This margin setting is not intended for KOffice or "
- "OpenOffice.org printing,  because these applications (or rather their users) "
--"are expected to do it by themselves.  It also does not work for PostScript or "
--"PDF file, which in most cases have their margins hardcoded  internally.</p>  "
--"<br>  "
--"<hr>  "
--"<p><em><b>Additional hint for power users:</b> This KDEPrint GUI element "
--"matches  with the CUPS commandline job option parameter:</em>  "
-+"are expected to do it by themselves.  It also does not work for PostScript "
-+"or PDF file, which in most cases have their margins hardcoded  internally.</"
-+"p>  <br>  <hr>  <p><em><b>Additional hint for power users:</b> This KDEPrint "
-+"GUI element matches  with the CUPS commandline job option parameter:</em>  "
- "<pre>    -o page-right=...      # use values from \"0\" or higher. \"72\" is "
- "equal to 1 inch.  </pre> </qt>"
- msgstr ""
--"<qt> "
--"<p><b>右邊界</b></p> "
--"<p>如果您的應用程式沒有定義右邊界的話，這裡可以讓您調整您列印輸出的右邊界。</p> "
--"<p>這個設定可用於文字檔列印，或是 KMail、Konqueror 等列印輸出。</p> "
--"<p><b>注意：</b></p>邊界設定不適用於 KOffice 或 OpenOffice.org，因為這些應用程式通常會自己定義輸出樣式。另外像 "
--"PostScript 或 PDF 檔，通常也都會內建邊界設定，因此也不適用於此設定。</p> "
--"<br>"
--"<hr> "
--"<p><b>進階使用者的額外提示：</b>這個選項與以下的 CUPS 命令列選項參數是一樣的： "
--"<pre>     -o page-right=...     # 單位為像素，設為 72 則邊界為一英吋。</pre></p></qt>"
-+"<qt> <p><b>右邊界</b></p> <p>如果您的應用程式沒有定義右邊界的話，這裡可以讓您"
-+"調整您列印輸出的右邊界。</p> <p>這個設定可用於文字檔列印，或是 KMail、"
-+"Konqueror 等列印輸出。</p> <p><b>注意：</b></p>邊界設定不適用於 KOffice 或 "
-+"OpenOffice.org，因為這些應用程式通常會自己定義輸出樣式。另外像 PostScript 或 "
-+"PDF 檔，通常也都會內建邊界設定，因此也不適用於此設定。</p> <br><hr> <p><b>進"
-+"階使用者的額外提示：</b>這個選項與以下的 CUPS 命令列選項參數是一樣的： "
-+"<pre>     -o page-right=...     # 單位為像素，設為 72 則邊界為一英吋。</"
-+"pre></p></qt>"
- 
- #: marginwidget.cpp:114
- msgid ""
--" <qt>  "
--"<p><b>Change Measurement Unit<b></p>.  "
--"<p>You can change the units of measurement for the page margins here. Select "
--"from Millimeter, Centimeter, Inch or Pixels (1 pixel == 1/72 inch).  </p>  </qt>"
--msgstr ""
--"<qt> "
--"<p><b>變更量測單位</b></p> "
--"<p>您可以變更邊界的量測單位。可用的單位有：毫米、公分、英吋或像素（一像素為 1/72 英吋）。</p></qt>"
-+" <qt>  <p><b>Change Measurement Unit<b></p>.  <p>You can change the units of "
-+"measurement for the page margins here. Select from Millimeter, Centimeter, "
-+"Inch or Pixels (1 pixel == 1/72 inch).  </p>  </qt>"
-+msgstr ""
-+"<qt> <p><b>變更量測單位</b></p> <p>您可以變更邊界的量測單位。可用的單位有：毫"
-+"米、公分、英吋或像素（一像素為 1/72 英吋）。</p></qt>"
- 
- #: marginwidget.cpp:121
- msgid ""
--" <qt>  "
--"<p><b>Custom Margins Checkbox</b></p>.  "
--"<p>Enable this checkbox if you want to modify the margins of your printouts  "
--"<p>You can change margin settings in 4 ways:  "
--"<ul>  "
--"<li>Edit the text fields. </li>  "
--"<li>Click spinbox arrows. </li>  "
--"<li>Scroll wheel of wheelmouses. </li>  "
--"<li>Drag margins in preview frame with mouse. </li>  </ul>  <b>Note:</b> "
--"The margin setting does not work if you load such files directly into  "
--"kprinter, which have their print margins hardcoded internally, like as most  "
--"PDF or PostScript files. It works for all ASCII text files however. It also may "
--"not  work with non-KDE applications which fail to  fully utilize the KDEPrint "
--"framework, such as OpenOffice.org. </p>  </qt>"
--msgstr ""
--"<qt> "
--"<p><b>自訂邊界</b></p> "
--"<p>開啟這個選項的話，您可以變更輸出的邊界。 </p> "
--"<p>您可以用四種方式來變更： "
--"<ul> "
--"<li>直接在欄位中輸入</li> "
--"<li>點選上下鍵來遞增/遞減</li> "
--"<li>使用捲軸</li> "
--"<li>拖曳預覽圖示中的邊界線。</li> </ul> <b>注意：</b>邊界設定對某些檔案不會發生作用，包括已經內定邊界設定的檔案，如 PDF 或 "
--"PostScript 檔，還有非 KDE 應用程式，如 OpenOffice.org 等。而文字檔列印則適用此選項。</p></qt>"
-+" <qt>  <p><b>Custom Margins Checkbox</b></p>.  <p>Enable this checkbox if "
-+"you want to modify the margins of your printouts  <p>You can change margin "
-+"settings in 4 ways:  <ul>  <li>Edit the text fields. </li>  <li>Click "
-+"spinbox arrows. </li>  <li>Scroll wheel of wheelmouses. </li>  <li>Drag "
-+"margins in preview frame with mouse. </li>  </ul>  <b>Note:</b> The margin "
-+"setting does not work if you load such files directly into  kprinter, which "
-+"have their print margins hardcoded internally, like as most  PDF or "
-+"PostScript files. It works for all ASCII text files however. It also may "
-+"not  work with non-KDE applications which fail to  fully utilize the "
-+"KDEPrint framework, such as OpenOffice.org. </p>  </qt>"
-+msgstr ""
-+"<qt> <p><b>自訂邊界</b></p> <p>開啟這個選項的話，您可以變更輸出的邊界。 </p> "
-+"<p>您可以用四種方式來變更： <ul> <li>直接在欄位中輸入</li> <li>點選上下鍵來遞"
-+"增/遞減</li> <li>使用捲軸</li> <li>拖曳預覽圖示中的邊界線。</li> </ul> <b>注"
-+"意：</b>邊界設定對某些檔案不會發生作用，包括已經內定邊界設定的檔案，如 PDF "
-+"或 PostScript 檔，還有非 KDE 應用程式，如 OpenOffice.org 等。而文字檔列印則適"
-+"用此選項。</p></qt>"
- 
- #: marginwidget.cpp:138
- msgid ""
--" <qt>  "
--"<p><b>\"Drag-your-Margins\" </p>.  "
--"<p>Use your mouse to drag and set each margin on this little preview window. "
--"</p>  </qt>"
--msgstr "<qt> <p><b>拖曳您的邊界</b></p> <p>您可以用滑鼠拖曳圖示中的邊界線來設定。</p></qt>"
-+" <qt>  <p><b>\"Drag-your-Margins\" </p>.  <p>Use your mouse to drag and set "
-+"each margin on this little preview window. </p>  </qt>"
-+msgstr ""
-+"<qt> <p><b>拖曳您的邊界</b></p> <p>您可以用滑鼠拖曳圖示中的邊界線來設定。</"
-+"p></qt>"
- 
- #: marginwidget.cpp:148
- msgid "&Use custom margins"
-@@ -5953,13 +5589,14 @@
- #: kmvirtualmanager.cpp:161
- msgid ""
- "<qt>You are about to set a pseudo-printer as your personal default. This "
--"setting is specific to KDE and will not be available outside KDE applications. "
--"Note that this will only make your personal default printer as undefined for "
--"non-KDE applications and should not prevent you from printing normally. Do you "
--"really want to set <b>%1</b> as your personal default?</qt>"
--msgstr ""
--"<qt>您要將此虛擬印表機設為預設。這個虛擬印表機為 KDE 特有的，所以可能無法對非 KDE 應用程式發揮作用。注意對非 KDE "
--"應用程式而言，您等於沒有預設印表機，因此沒辦法正常列印。您確定要將 <b>%1</b> 設為您的個人預設值嗎？</qt>"
-+"setting is specific to KDE and will not be available outside KDE "
-+"applications. Note that this will only make your personal default printer as "
-+"undefined for non-KDE applications and should not prevent you from printing "
-+"normally. Do you really want to set <b>%1</b> as your personal default?</qt>"
-+msgstr ""
-+"<qt>您要將此虛擬印表機設為預設。這個虛擬印表機為 KDE 特有的，所以可能無法對"
-+"非 KDE 應用程式發揮作用。注意對非 KDE 應用程式而言，您等於沒有預設印表機，因"
-+"此沒辦法正常列印。您確定要將 <b>%1</b> 設為您的個人預設值嗎？</qt>"
- 
- #: kpposterpage.cpp:42
- msgid " <qt>  5.  </qt>"
-@@ -5967,176 +5604,153 @@
- 
- #: kpposterpage.cpp:46
- msgid ""
--" <qt>  <b>Print Poster</b> (enabled or disabled).  "
--"<p>If you enable this option, you can print posters of different sizes  The "
--"printout will happen in the form <em>'tiles'</em> printed on smaller  paper "
--"sizes, which you can stitch together later. <em>If you enable this  option "
--"here, the <em>'Poster Printing' filter</em> will be auto-loaded in  the "
--"'Filters' tab of this dialog. </p> "
--"<p>This tab is only visible if the external <em>'poster'</em> "
--"utility is  discovered by KDEPrint on your system. [<em>'poster'</em> "
--"is a commandline  utility that enables you to convert PostScript files into "
--"tiled printouts  which allow for oversized appearance of the stitched-together "
--"tiles.] </p> "
--"<p><b>Note:</b> The standard version of 'poster' will not work. Your system  "
--"must use a patched version of 'poster'. Ask your operating system vendor to  "
--"provide a patched version of 'poster' if he does not already. </p> "
--"<p><b>Additional hint for power users:</b> A patched version of 'poster' is  "
--"available from the <a href=\"http://printing.kde.org/\">KDEPrint Website</a>  "
--"at <a "
--"href=\"http://printing.kde.org/downloads/\">http://printing.kde.org/downloads/</"
--"a>.  The direct link to the patched source tarball is  <a "
--"href=\"ftp://ftp.kde.org/pub/kde/printing/poster.tar.bz2\">"
--"ftp://ftp.kde.org/pub/kde/printing/poster.tar.bz2</a>  </p>  </qt>"
--msgstr ""
--"<qt><b>列印海報</b> "
--"<p>如果開啟此選項，您可以列印不同大小的海報。列印結果會被切割，分別印到紙上，稍後您可以把它們重組起來。若是您開啟此選項，您可以在「過濾器」頁中看到「海報列印"
--"過濾器」已被自動載入。</p> "
--"<p>這一頁只在 KDEPrint 找得到 \"poster\" 這支程式時才會出現。\"poster\" 這支程式是海報列印的工具，讓您可以將 "
--"PostScript 檔做切割並分別列印。</p> "
--"<p><b>注意：</b>標準版本的 \"poster\" 程式無法運作。您必須使用更新過的版本。請詢問您的系統供應商是否有提供更新過的 poster "
--"版本。</p> "
--"<br>"
--"<hr> "
--"<p><b>進階使用者的額外提示：</b>更新過的 poster 版本可以在 <a href=\"http://printing.kde.org/\">"
--"KDEPrint 網站</a>中<a href=\"http://printing.kde.org/downloads/\">下載</a>"
--"。您也可以直接從<a href=\"ftp://ftp.kde.org/pub/kde/printing/poster.tar.bz2\"> "
--"ftp://ftp.kde.org/pub/kde/printing/poster.tar.bz2</a> 下載源碼。</p></qt>"
-+" <qt>  <b>Print Poster</b> (enabled or disabled).  <p>If you enable this "
-+"option, you can print posters of different sizes  The printout will happen "
-+"in the form <em>'tiles'</em> printed on smaller  paper sizes, which you can "
-+"stitch together later. <em>If you enable this  option here, the <em>'Poster "
-+"Printing' filter</em> will be auto-loaded in  the 'Filters' tab of this "
-+"dialog. </p> <p>This tab is only visible if the external <em>'poster'</em> "
-+"utility is  discovered by KDEPrint on your system. [<em>'poster'</em> is a "
-+"commandline  utility that enables you to convert PostScript files into tiled "
-+"printouts  which allow for oversized appearance of the stitched-together "
-+"tiles.] </p> <p><b>Note:</b> The standard version of 'poster' will not work. "
-+"Your system  must use a patched version of 'poster'. Ask your operating "
-+"system vendor to  provide a patched version of 'poster' if he does not "
-+"already. </p> <p><b>Additional hint for power users:</b> A patched version "
-+"of 'poster' is  available from the <a href=\"http://printing.kde.org/"
-+"\">KDEPrint Website</a>  at <a href=\"http://printing.kde.org/downloads/"
-+"\">http://printing.kde.org/downloads/</a>.  The direct link to the patched "
-+"source tarball is  <a href=\"ftp://ftp.kde.org/pub/kde/printing/poster.tar."
-+"bz2\">ftp://ftp.kde.org/pub/kde/printing/poster.tar.bz2</a>  </p>  </qt>"
-+msgstr ""
-+"<qt><b>列印海報</b> <p>如果開啟此選項，您可以列印不同大小的海報。列印結果會被"
-+"切割，分別印到紙上，稍後您可以把它們重組起來。若是您開啟此選項，您可以在「過"
-+"濾器」頁中看到「海報列印過濾器」已被自動載入。</p> <p>這一頁只在 KDEPrint 找"
-+"得到 \"poster\" 這支程式時才會出現。\"poster\" 這支程式是海報列印的工具，讓您"
-+"可以將 PostScript 檔做切割並分別列印。</p> <p><b>注意：</b>標準版本的 "
-+"\"poster\" 程式無法運作。您必須使用更新過的版本。請詢問您的系統供應商是否有提"
-+"供更新過的 poster 版本。</p> <br><hr> <p><b>進階使用者的額外提示：</b>更新過"
-+"的 poster 版本可以在 <a href=\"http://printing.kde.org/\">KDEPrint 網站</a>中"
-+"<a href=\"http://printing.kde.org/downloads/\">下載</a>。您也可以直接從<a "
-+"href=\"ftp://ftp.kde.org/pub/kde/printing/poster.tar.bz2\"> ftp://ftp.kde."
-+"org/pub/kde/printing/poster.tar.bz2</a> 下載原始碼。</p></qt>"
- 
- #: kpposterpage.cpp:68
- msgid ""
--" <qt>  <b>Tile Selection widget</b>  "
--"<p>This GUI element is <em>not only for viewing</em> "
--"your selections: it also  lets you interactively select the tile(s) you want to "
--"print.  </p> "
--"<p><b>Hints</b>  "
--"<ul>  "
--"<li>Click any tile to select it for printing.</li>  "
--"<li>To select multiple tiles to be printed  at once, <em>'shift-click'</em> "
--"on the tiles ('shift-click' means: hold down the  [SHIFT]-key on your keyboard "
--"and click with the mouse while [SHIFT]-key is held.)   <em>Be aware</em> "
--"that the order  of your clicking is also significant to the order of printing "
--"the different tiles. </li> </ul>  <b>Note 1:</b> The order of your selection "
--"(and the order for printout of the tiles)  is indicated by the contents of the "
--"text field below,  labelled as <em>'Tile pages (to be printed):'</em>"
--"<p> <b>Note 2:</b> By default no tile is selected. Before you can print (a part "
--" of) your poster, you must select at least one tile. </p>  </qt>"
--msgstr ""
--"<qt><b>選擇區塊</b> "
--"<p>這裡不只是可以讓您預覽海報，而且可以個別選擇您要列印的區塊。</p> "
--"<p><b>提示：</b> "
--"<ul> "
--"<li>點選您要列印的任一區塊。</li> "
--"<li>要點選多個區塊一起列印，您要按住 shift 鍵後再點選區塊。您點選的順序就是列印的順序。</li></ul> <b>注意：</b>"
--"預設沒有選取任何區塊，因此在列印之前至少要選取一個區塊。</p></qt>"
-+" <qt>  <b>Tile Selection widget</b>  <p>This GUI element is <em>not only for "
-+"viewing</em> your selections: it also  lets you interactively select the tile"
-+"(s) you want to print.  </p> <p><b>Hints</b>  <ul>  <li>Click any tile to "
-+"select it for printing.</li>  <li>To select multiple tiles to be printed  at "
-+"once, <em>'shift-click'</em> on the tiles ('shift-click' means: hold down "
-+"the  [SHIFT]-key on your keyboard and click with the mouse while [SHIFT]-key "
-+"is held.)   <em>Be aware</em> that the order  of your clicking is also "
-+"significant to the order of printing the different tiles. </li> </ul>  "
-+"<b>Note 1:</b> The order of your selection (and the order for printout of "
-+"the tiles)  is indicated by the contents of the text field below,  labelled "
-+"as <em>'Tile pages (to be printed):'</em><p> <b>Note 2:</b> By default no "
-+"tile is selected. Before you can print (a part  of) your poster, you must "
-+"select at least one tile. </p>  </qt>"
-+msgstr ""
-+"<qt><b>選擇區塊</b> <p>這裡不只是可以讓您預覽海報，而且可以個別選擇您要列印的"
-+"區塊。</p> <p><b>提示：</b> <ul> <li>點選您要列印的任一區塊。</li> <li>要點選"
-+"多個區塊一起列印，您要按住 shift 鍵後再點選區塊。您點選的順序就是列印的順序。"
-+"</li></ul> <b>注意：</b>預設沒有選取任何區塊，因此在列印之前至少要選取一個區"
-+"塊。</p></qt>"
- 
- #: kpposterpage.cpp:89
- msgid ""
--" <qt>  <b>Poster Size</b>  "
--"<p>Select the poster size you want from the dropdown list. </p>  "
--"Available sizes are all standard paper sizes up to  'A0'. [A0 is the same size "
--"as 16 sheets of A4, or '84cm x 118.2cm'.] </p>  "
--"<p><b>Notice</b>, how the little preview window below changes with your change "
--"of poster  size. It indicates to you how many tiles need to be printed to make "
--"the poster,  given the selected paper size.</p>   "
--"<p><b>Hint:</b> The little preview window below is not just a passive icon. You "
--"can click  on its individual tiles to select them for printing. To select "
--"multiple tiles to be printed  at once, you need to <em>'shift-click'</em> "
--"on the tiles ('shift-click' means: hold down the  [SHIFT]-key on your keyboard "
-+" <qt>  <b>Poster Size</b>  <p>Select the poster size you want from the "
-+"dropdown list. </p>  Available sizes are all standard paper sizes up to  "
-+"'A0'. [A0 is the same size as 16 sheets of A4, or '84cm x 118.2cm'.] </p>  "
-+"<p><b>Notice</b>, how the little preview window below changes with your "
-+"change of poster  size. It indicates to you how many tiles need to be "
-+"printed to make the poster,  given the selected paper size.</p>   <p><b>Hint:"
-+"</b> The little preview window below is not just a passive icon. You can "
-+"click  on its individual tiles to select them for printing. To select "
-+"multiple tiles to be printed  at once, you need to <em>'shift-click'</em> on "
-+"the tiles ('shift-click' means: hold down the  [SHIFT]-key on your keyboard "
- "and click with the mouse while [SHIFT]-key is held.) The order  of your "
--"clicking is significant to the order of printing the different tiles. The order "
--"of  your selection (and for the printed tiles) is indicated by the contents of "
--"the text field  labelled as <em>'Tile pages (to be printed):'</em>"
--"<p> <b>Note:</b> By default no tile is selected. Before you can print (a part  "
--"of) your poster, you must select at least one tile. </p>  </qt>"
--msgstr ""
--"<qt><b>海報尺寸</b> "
--"<p>從下拉式選單中選取您要的海報尺寸，最大到 A0（84cm x 118.2cm，16 張 A4）。</p> "
--"<p><b>注意：</b>底下的預覽視窗會根據您選擇的海報尺寸，告訴您海報會被切割成多少塊。</p> "
--"<p><b>提示：</b>您也可以在預覽圖示中點選個別被切割的區塊來列印。要選擇一次列印多個區塊，您要按住 shift "
--"鍵再點選。點選的順序就會是列印的順序。</p> "
--"<p><b>注意：</b>預設是不選取任何區塊，您要列印之前必須至少選取一個區塊。</p></qt>"
-+"clicking is significant to the order of printing the different tiles. The "
-+"order of  your selection (and for the printed tiles) is indicated by the "
-+"contents of the text field  labelled as <em>'Tile pages (to be printed):'</"
-+"em><p> <b>Note:</b> By default no tile is selected. Before you can print (a "
-+"part  of) your poster, you must select at least one tile. </p>  </qt>"
-+msgstr ""
-+"<qt><b>海報尺寸</b> <p>從下拉式選單中選取您要的海報尺寸，最大到 A0（84cm x "
-+"118.2cm，16 張 A4）。</p> <p><b>注意：</b>底下的預覽視窗會根據您選擇的海報尺"
-+"寸，告訴您海報會被切割成多少塊。</p> <p><b>提示：</b>您也可以在預覽圖示中點選"
-+"個別被切割的區塊來列印。要選擇一次列印多個區塊，您要按住 shift 鍵再點選。點選"
-+"的順序就會是列印的順序。</p> <p><b>注意：</b>預設是不選取任何區塊，您要列印之"
-+"前必須至少選取一個區塊。</p></qt>"
- 
- #: kpposterpage.cpp:108
- msgid ""
--" <qt>  <b>Paper Size</b>  "
--"<p>This field indicates the paper size the poster tiles will be printed on.  To "
--"select a different paper size for your poster tiles, go to the 'General' tab  "
--"of this dialog and select one from the dropdown list. </p>  "
--"Available sizes are most standard paper sizes supported by your printer. Your "
--"printer's  supported paper sizes are read from the printer driver info (as laid "
--"down in the <em>'PPD'</em>,  the printer description file). <em>"
--"Be aware that the 'Paper Size' selected may not be supported  by 'poster' "
--"(example: 'HalfLetter') while it may well be supported by your printer.</em>  "
--"If  you hit that obstacle, simply use another, supported Paper Size, like 'A4' "
--"or 'Letter'.  "
--"<p><b>Notice</b>, how the little preview window below changes with your change "
--"of paper  size. It indicates how many tiles need to be printed to make up the "
--"poster,  given the selected paper and poster size.</p>   "
--"<p><b>Hint:</b> The little preview window below is not just a passive icon. You "
--"can click  on its individual tiles to select them for printing. To select "
--"multiple tiles to be printed  at once, you need to <em>'shift-click'</em> "
--"on the tiles ('shift-click' means: hold down the  [SHIFT]-key on your keyboard "
--"and click with the mouse while [SHIFT]-key is held.) The order  of your "
--"clicking is significant to the order of printing the different tiles. The order "
--"of  your selection (and for the printed tiles) is indicated by the contents of "
--"the text field  labelled as <em>'Tile pages (to be printed):'</em>"
--"<p> <b>Note:</b> By default no tile is selected. Before you can print (a part  "
--"of) your poster, you must select at least one tile. </p>  </qt>"
--msgstr ""
--"<qt><b>紙張尺寸</b> "
--"<p>這裡是指海報區塊要被印在多大的紙上。要選擇不同的紙張大小來列印海報，您必須到「一般」設定中的下拉式選單中選取。可用的尺寸是由您的印表機來決定。不過要注意的"
--"是，所選擇的紙張尺寸不一定被 \"poster\" 程式所支援（如 \"HalfLetter\"）。這種狀況下請重新選取其他的尺寸。</p> "
--"<p><b>注意：</b>底下的預覽視窗會根據您選擇的海報尺寸，告訴您海報會被切割成多少塊。</p> "
--"<p><b>提示：</b>您也可以在預覽圖示中點選個別被切割的區塊來列印。要選擇一次列印多個區塊，您要按住 shift "
--"鍵再點選。點選的順序就會是列印的順序。</p> "
--"<p><b>注意：</b>預設是不選取任何區塊，您要列印之前必須至少選取一個區塊。</p></qt>"
-+" <qt>  <b>Paper Size</b>  <p>This field indicates the paper size the poster "
-+"tiles will be printed on.  To select a different paper size for your poster "
-+"tiles, go to the 'General' tab  of this dialog and select one from the "
-+"dropdown list. </p>  Available sizes are most standard paper sizes supported "
-+"by your printer. Your printer's  supported paper sizes are read from the "
-+"printer driver info (as laid down in the <em>'PPD'</em>,  the printer "
-+"description file). <em>Be aware that the 'Paper Size' selected may not be "
-+"supported  by 'poster' (example: 'HalfLetter') while it may well be "
-+"supported by your printer.</em>  If  you hit that obstacle, simply use "
-+"another, supported Paper Size, like 'A4' or 'Letter'.  <p><b>Notice</b>, how "
-+"the little preview window below changes with your change of paper  size. It "
-+"indicates how many tiles need to be printed to make up the poster,  given "
-+"the selected paper and poster size.</p>   <p><b>Hint:</b> The little preview "
-+"window below is not just a passive icon. You can click  on its individual "
-+"tiles to select them for printing. To select multiple tiles to be printed  "
-+"at once, you need to <em>'shift-click'</em> on the tiles ('shift-click' "
-+"means: hold down the  [SHIFT]-key on your keyboard and click with the mouse "
-+"while [SHIFT]-key is held.) The order  of your clicking is significant to "
-+"the order of printing the different tiles. The order of  your selection (and "
-+"for the printed tiles) is indicated by the contents of the text field  "
-+"labelled as <em>'Tile pages (to be printed):'</em><p> <b>Note:</b> By "
-+"default no tile is selected. Before you can print (a part  of) your poster, "
-+"you must select at least one tile. </p>  </qt>"
-+msgstr ""
-+"<qt><b>紙張尺寸</b> <p>這裡是指海報區塊要被印在多大的紙上。要選擇不同的紙張大"
-+"小來列印海報，您必須到「一般」設定中的下拉式選單中選取。可用的尺寸是由您的印"
-+"表機來決定。不過要注意的是，所選擇的紙張尺寸不一定被 \"poster\" 程式所支援"
-+"（如 \"HalfLetter\"）。這種狀況下請重新選取其他的尺寸。</p> <p><b>注意：</b>"
-+"底下的預覽視窗會根據您選擇的海報尺寸，告訴您海報會被切割成多少塊。</p> <p><b>"
-+"提示：</b>您也可以在預覽圖示中點選個別被切割的區塊來列印。要選擇一次列印多個"
-+"區塊，您要按住 shift 鍵再點選。點選的順序就會是列印的順序。</p> <p><b>注意："
-+"</b>預設是不選取任何區塊，您要列印之前必須至少選取一個區塊。</p></qt>"
- 
- #: kpposterpage.cpp:132
- msgid ""
--" <qt>  <b>Cut Margin selection</b>  "
--"<p>Slider and spinbox let you determine a <em>'cut margin'</em> "
--"which will be printed onto  each tile of your poster to help you cut the pieces "
--"as needed. </p> "
--"<p><b>Notice</b>, how the little preview window above changes with your change "
--"of cut  margins. It indicates to you how much space the cut margins will take "
--"away from each tile.  "
--"<p><b>Be aware</b>, that your cut margins need to be equal to or greater than "
--"the margins your  printer uses. The printer's capabilities are described in the "
--"<em>'ImageableArea'</em>  keywords of its driver PPD file. </p>  </qt>"
--msgstr ""
--"<qt><b>切割邊界</b> "
--"<p>您可以選擇在海報中的每一個區塊中，要列印的邊界。</p> "
--"<p><b>注意：</b>預覽視窗中會顯示您改變邊界之後，列印紙張的邊界會留多少空白。</p> "
--"<p><b>注意：</b>您所設定的切割邊界要大於等於您印表機所設定使用的邊界。這在印表機驅動程式的 PPD 檔案中的 ImageableArea "
--"關鍵字中有描述。</p></qt>"
-+" <qt>  <b>Cut Margin selection</b>  <p>Slider and spinbox let you determine "
-+"a <em>'cut margin'</em> which will be printed onto  each tile of your poster "
-+"to help you cut the pieces as needed. </p> <p><b>Notice</b>, how the little "
-+"preview window above changes with your change of cut  margins. It indicates "
-+"to you how much space the cut margins will take away from each tile.  "
-+"<p><b>Be aware</b>, that your cut margins need to be equal to or greater "
-+"than the margins your  printer uses. The printer's capabilities are "
-+"described in the <em>'ImageableArea'</em>  keywords of its driver PPD file. "
-+"</p>  </qt>"
-+msgstr ""
-+"<qt><b>切割邊界</b> <p>您可以選擇在海報中的每一個區塊中，要列印的邊界。</p> "
-+"<p><b>注意：</b>預覽視窗中會顯示您改變邊界之後，列印紙張的邊界會留多少空白。"
-+"</p> <p><b>注意：</b>您所設定的切割邊界要大於等於您印表機所設定使用的邊界。這"
-+"在印表機驅動程式的 PPD 檔案中的 ImageableArea 關鍵字中有描述。</p></qt>"
- 
- #: kpposterpage.cpp:143
- msgid ""
--" <qt>  <b>Order and number of tile pages to be printed</b>  "
--"<p>This field displays and sets the individual tiles to be printed, as well as "
--"the order  for their printout. </p>  You can file the field with 2 different "
--"methods:  "
--"<ul>  "
--"<li>Either use the interactive thumbnail preview above and '[SHIFT]-click' on "
--"the tiles. </li>  "
--"<li>Or edit this text field accordingly. </li>  </ul>  "
--"<p>When editing the field, you can use a '3-7' syntax instead of a '3,4,5,6,7' "
--"one. </p>  "
--"<p><b>Examples:</b></p>  "
--"<pre>    \"2,3,7,9,3\"  "
-+" <qt>  <b>Order and number of tile pages to be printed</b>  <p>This field "
-+"displays and sets the individual tiles to be printed, as well as the order  "
-+"for their printout. </p>  You can file the field with 2 different methods:  "
-+"<ul>  <li>Either use the interactive thumbnail preview above and '[SHIFT]-"
-+"click' on the tiles. </li>  <li>Or edit this text field accordingly. </li>  "
-+"</ul>  <p>When editing the field, you can use a '3-7' syntax instead of a "
-+"'3,4,5,6,7' one. </p>  <p><b>Examples:</b></p>  <pre>    \"2,3,7,9,3\"  "
- "<br>    \"1-3,6,8-11\"  </qt>"
- msgstr ""
--"<qt><b>要列印區塊的順序及編號</b> "
--"<p>這裡顯示您所選擇要列印的區塊編號，以及它們的順序。</p> "
--"<p>您有兩種方式： "
--"<ul> "
--"<li>直接點選縮圖來決定要列印哪些區塊。</li> "
--"<li>或是直接在這裡寫入編號。</li></ul> </p> "
--"<p>寫入編號的語法可以用 3-7 來取代 3,4,5,6,7。</p> "
--"<p><b>例如：</b></p> "
--"<pre>\"2,3,7,9,13\""
--"<br>\"1-3,6,8-11\"</pre></qt>"
-+"<qt><b>要列印區塊的順序及編號</b> <p>這裡顯示您所選擇要列印的區塊編號，以及它"
-+"們的順序。</p> <p>您有兩種方式： <ul> <li>直接點選縮圖來決定要列印哪些區塊。"
-+"</li> <li>或是直接在這裡寫入編號。</li></ul> </p> <p>寫入編號的語法可以用 3-"
-+"7 來取代 3,4,5,6,7。</p> <p><b>例如：</b></p> <pre>\"2,3,7,9,13\"<br>\"1-"
-+"3,6,8-11\"</pre></qt>"
- 
- #: kpposterpage.cpp:160
- msgid "Poster"
-@@ -6186,127 +5800,108 @@
- 
- #: kprintaction.cpp:117 kprintaction.cpp:122 kprintaction.cpp:127
- msgid "&Export..."
--msgstr "匯出(&E)..."
-+msgstr "匯出(&E)…"
- 
- #: kpfilterpage.cpp:42
- msgid ""
--" <qt> <b>Add Filter button</b> "
--"<p>This button calls a little dialog to let you select a filter here. </p> "
--"<p><b>Note 1:</b> You can chain different filters as long as you make  sure "
--"that the output of one fits as input of the next. (KDEPrint  checks your "
--"filtering chain and will warn you if you fail to do so.</p>  "
--"<p><b>Note 2:</b> The filters you define here are applied to your jobfile  <em>"
--"<b>before</b></em> it is handed downstream to your spooler and print  subsystem "
--"(e.g. CUPS, LPRng, LPD).</p> </ul> </qt>"
--msgstr ""
--"<qt><b>新增過濾器</b> "
--"<p>這個按鈕會叫出一個對話框，讓您選取過濾器。</p> "
--"<p><b>注意：</b>您可以將不同的過濾器串鍊起來，只要您確定其中一個過濾器的輸出適用於下一個過濾器的輸入。（KDEPrint "
--"會幫您檢查過濾鍊，並在有問題時提出警告）</p> "
--"<p><b>注意：</b>您所選取的過濾器會在列印工作送到印表子系統「之前」先處理。</p></qt>"
-+" <qt> <b>Add Filter button</b> <p>This button calls a little dialog to let "
-+"you select a filter here. </p> <p><b>Note 1:</b> You can chain different "
-+"filters as long as you make  sure that the output of one fits as input of "
-+"the next. (KDEPrint  checks your filtering chain and will warn you if you "
-+"fail to do so.</p>  <p><b>Note 2:</b> The filters you define here are "
-+"applied to your jobfile  <em><b>before</b></em> it is handed downstream to "
-+"your spooler and print  subsystem (e.g. CUPS, LPRng, LPD).</p> </ul> </qt>"
-+msgstr ""
-+"<qt><b>新增過濾器</b> <p>這個按鈕會叫出一個對話框，讓您選取過濾器。</p> "
-+"<p><b>注意：</b>您可以將不同的過濾器串鍊起來，只要您確定其中一個過濾器的輸出"
-+"適用於下一個過濾器的輸入。（KDEPrint 會幫您檢查過濾鍊，並在有問題時提出警告）"
-+"</p> <p><b>注意：</b>您所選取的過濾器會在列印工作送到印表子系統「之前」先處"
-+"理。</p></qt>"
- 
- #: kpfilterpage.cpp:54
- msgid ""
--" <qt> <b>Remove Filter button</b> "
--"<p>This button removes the highlighted filter from the list of filters. </qt>"
-+" <qt> <b>Remove Filter button</b> <p>This button removes the highlighted "
-+"filter from the list of filters. </qt>"
- msgstr "<qt><b>移除過濾器</b> <p>這個按鈕移除所選取的過濾器。</p></qt>"
- 
- #: kpfilterpage.cpp:59
- msgid ""
--" <qt> <b>Move Filter Up button</b> "
--"<p>This button moves the highlighted filter up in the list of filters, towards "
--"the front of the filtering chain. </p> </qt>"
--msgstr "<qt><b>過濾器上移</b> <p>這個按鈕將過濾鍊中所選取的過濾器往上移動。</p></qt>"
-+" <qt> <b>Move Filter Up button</b> <p>This button moves the highlighted "
-+"filter up in the list of filters, towards the front of the filtering chain. "
-+"</p> </qt>"
-+msgstr ""
-+"<qt><b>過濾器上移</b> <p>這個按鈕將過濾鍊中所選取的過濾器往上移動。</p></qt>"
- 
- #: kpfilterpage.cpp:64
- msgid ""
--" <qt> <b>Move Filter Down button</b> "
--"<p>This button moves the highlighted filter down in the list of filters, "
--"towards the end of the filtering chain..</p> </qt>"
--msgstr "<qt><b>過濾器下移</b> <p>這個按鈕將過濾鍊中所選取的過濾器往下移動。</p></qt>"
-+" <qt> <b>Move Filter Down button</b> <p>This button moves the highlighted "
-+"filter down in the list of filters, towards the end of the filtering chain.."
-+"</p> </qt>"
-+msgstr ""
-+"<qt><b>過濾器下移</b> <p>這個按鈕將過濾鍊中所選取的過濾器往下移動。</p></qt>"
- 
- #: kpfilterpage.cpp:69
- msgid ""
--" <qt> <b>Configure Filter button</b> "
--"<p>This button lets you configure the currently highlighted filter. It opens a "
--"separate dialog.  </p> </qt>"
-+" <qt> <b>Configure Filter button</b> <p>This button lets you configure the "
-+"currently highlighted filter. It opens a separate dialog.  </p> </qt>"
- msgstr "<qt><b>設定過濾器</b> <p>這個按鈕讓您設定所選取的過濾器。</p></qt>"
- 
- #: kpfilterpage.cpp:75
- msgid ""
--" <qt> <b>Filter Info Pane</b> "
--"<p>This field shows some general info about the selected filter.  Amongst them "
--"are:  "
--"<ul>  "
--"<li>the <em>filter name</em> (as displayed in the KDEPrint user interface); "
--"</li>  "
--"<li>the <em>filter requirements</em> (that is the external program that needs  "
--"to present and executable on this system); </li>  "
--"<li>the <em>filter input format</em> (in the form of one or several <em>"
--"MIME types</em> accepted by the filter); </li>  "
--"<li>the <em>filter output format</em> (in the form of a <em>MIME type</em>  "
--"generated by the filter); </li>  "
--"<li>a more or less verbose text describing the filter's operation.</li>  </ul>  "
--"</p> </qt>"
--msgstr ""
--"<qt><b>過濾器資訊</b> "
--"<p>這個欄位顯示關於所選取過濾器的一般資訊。包括： "
--"<ul> "
--"<li>過濾器名稱（顯示在 KDEPrint 使用者介面上的名稱）</li> "
--"<li>過濾器需求（需要的外部程式）</li> "
--"<li>輸入格式（一個或多個 MIME 型態）</li> "
--"<li>輸出格式（過濾器產生的 MIME 型態）</li> "
--"<li>文字描述</li> </ul></p></qt>"
-+" <qt> <b>Filter Info Pane</b> <p>This field shows some general info about "
-+"the selected filter.  Amongst them are:  <ul>  <li>the <em>filter name</em> "
-+"(as displayed in the KDEPrint user interface); </li>  <li>the <em>filter "
-+"requirements</em> (that is the external program that needs  to present and "
-+"executable on this system); </li>  <li>the <em>filter input format</em> (in "
-+"the form of one or several <em>MIME types</em> accepted by the filter); </"
-+"li>  <li>the <em>filter output format</em> (in the form of a <em>MIME type</"
-+"em>  generated by the filter); </li>  <li>a more or less verbose text "
-+"describing the filter's operation.</li>  </ul>  </p> </qt>"
-+msgstr ""
-+"<qt><b>過濾器資訊</b> <p>這個欄位顯示關於所選取過濾器的一般資訊。包括： <ul> "
-+"<li>過濾器名稱（顯示在 KDEPrint 使用者介面上的名稱）</li> <li>過濾器需求（需"
-+"要的外部程式）</li> <li>輸入格式（一個或多個 MIME 型態）</li> <li>輸出格式"
-+"（過濾器產生的 MIME 型態）</li> <li>文字描述</li> </ul></p></qt>"
- 
- #: kpfilterpage.cpp:91
- msgid ""
--" <qt> <b>Filtering Chain</b> (if enabled, is run <em>before</em> "
--"actual  job submission to print system) "
--"<p>This field shows which filters are currently selected to act as "
--"'pre-filters'  for KDEPrint. Pre-filters are processing the print files <em>"
--"before</em> they are  send downstream to your real print subsystem. </p>  "
--"<p>The list shown in this field may be empty (default). </p>  "
--"<p>The pre-filters act on the printjob in the order they are listed (from top "
--"to bottom).  This is done by acting as a <em>filtering chain</em> "
-+" <qt> <b>Filtering Chain</b> (if enabled, is run <em>before</em> actual  job "
-+"submission to print system) <p>This field shows which filters are currently "
-+"selected to act as 'pre-filters'  for KDEPrint. Pre-filters are processing "
-+"the print files <em>before</em> they are  send downstream to your real print "
-+"subsystem. </p>  <p>The list shown in this field may be empty (default). </"
-+"p>  <p>The pre-filters act on the printjob in the order they are listed "
-+"(from top to bottom).  This is done by acting as a <em>filtering chain</em> "
- "where the output of one filter  acts as input to the next. By putting the "
- "filters into the wrong order, you can make  the filtering chain fail. For "
--"example: if your file is ASCII text, and you want the  output being processed "
--"by the 'Multipage per Sheet' filter, the first filter must be  one that "
--"processes ASCII into PostScript. </p>  "
--"<p>KDEPrint can utilize <em>any</em> external filtering program which you may "
--"find useful  through this interface. </p>  "
--"<p>KDEPrint ships preconfigured with support for a selection of common filters. "
--"These  filters however need to be  installed independently from KDEPrint. These "
--"pre-filters work <em>for all</em> print subsystems supported by KDEPrint (such "
--"as CUPS, LPRng and LPD), because they are not depending on these.</p> ."
--"<p> Amongst the pre-configured filters shipping with KDEPrint are: </p>  "
--"<ul>  "
--"<li>the <em>Enscript text filter</em>  </li>  "
--"<li>a <em>Multiple Pages per Sheet filter</em </li>  "
--"<li>a <em>PostScript to PDF converter</em>.</li>  "
--"<li>a <em>Page Selection/Ordering filter</em>.</li>  "
--"<li>a <em>Poster Printing filter</em>.</li>  "
-+"example: if your file is ASCII text, and you want the  output being "
-+"processed by the 'Multipage per Sheet' filter, the first filter must be  one "
-+"that processes ASCII into PostScript. </p>  <p>KDEPrint can utilize <em>any</"
-+"em> external filtering program which you may find useful  through this "
-+"interface. </p>  <p>KDEPrint ships preconfigured with support for a "
-+"selection of common filters. These  filters however need to be  installed "
-+"independently from KDEPrint. These pre-filters work <em>for all</em> print "
-+"subsystems supported by KDEPrint (such as CUPS, LPRng and LPD), because they "
-+"are not depending on these.</p> .<p> Amongst the pre-configured filters "
-+"shipping with KDEPrint are: </p>  <ul>  <li>the <em>Enscript text filter</"
-+"em>  </li>  <li>a <em>Multiple Pages per Sheet filter</em </li>  <li>a "
-+"<em>PostScript to PDF converter</em>.</li>  <li>a <em>Page Selection/"
-+"Ordering filter</em>.</li>  <li>a <em>Poster Printing filter</em>.</li>  "
- "<li>and some more..</li>  </ul>  To insert a filter into this list, simply "
--"click on the <em>funnel</em> icon (topmost on  the right icon column group) and "
--"proceed. </p> "
--"<p>Please click on the other elements of this dialog to learn more about the "
--"KDEPrint  pre-filters.  </p> </qt>"
--msgstr ""
--"<qt><b>過濾鍊</b> "
--"<p>這個欄位顯示 KDEPrint 的「預先過濾器」清單。它們會在列印工作送到列印子系統前先行處理。</p> "
--"<p>這個清單有可能是空的（預設為空的）。</p> "
--"<p>這個清單會照所列出順序來工作，由上而下。如果過濾鍊的位置錯誤，可能會讓列印工作停擺。</p> "
--"<p>KDEPrint 可以使用外部的過濾程式。</p> "
--"<p>KDEPrint 有內建一些常用的過濾器，通常這些過濾器適用於 KDEPrint 所有支援的列印子系統。</p> "
--"<p>這些內建的過濾器包括：</p> "
--"<ul> "
--"<li>Enscript 文字過濾器</li> "
--"<li>單張多頁過濾器</li> "
--"<li>PostScript 轉 PDF 過濾器</li> "
--"<li>紙張選擇/排序過濾器</li> "
--"<li>海報列印過濾器</li> "
--"<li>其它...</li></ul> 要新增新的過濾器到清單之中，只要按下漏斗型的按鈕即可。</p> "
--"<p>點選此對話框中的其他元件可以得知關於 KDEPrint 內建過濾器的資訊。</p></qt>"
-+"click on the <em>funnel</em> icon (topmost on  the right icon column group) "
-+"and proceed. </p> <p>Please click on the other elements of this dialog to "
-+"learn more about the KDEPrint  pre-filters.  </p> </qt>"
-+msgstr ""
-+"<qt><b>過濾鍊</b> <p>這個欄位顯示 KDEPrint 的「預先過濾器」清單。它們會在列印"
-+"工作送到列印子系統前先行處理。</p> <p>這個清單有可能是空的（預設為空的）。</"
-+"p> <p>這個清單會照所列出順序來工作，由上而下。如果過濾鍊的位置錯誤，可能會讓"
-+"列印工作停擺。</p> <p>KDEPrint 可以使用外部的過濾程式。</p> <p>KDEPrint 有內"
-+"建一些常用的過濾器，通常這些過濾器適用於 KDEPrint 所有支援的列印子系統。</p> "
-+"<p>這些內建的過濾器包括：</p> <ul> <li>Enscript 文字過濾器</li> <li>單張多頁"
-+"過濾器</li> <li>PostScript 轉 PDF 過濾器</li> <li>紙張選擇/排序過濾器</li> "
-+"<li>海報列印過濾器</li> <li>其它...</li></ul> 要新增新的過濾器到清單之中，只"
-+"要按下漏斗型的按鈕即可。</p> <p>點選此對話框中的其他元件可以得知關於 "
-+"KDEPrint 內建過濾器的資訊。</p></qt>"
- 
- #: kpfilterpage.cpp:125
- msgid "Filters"
-@@ -6338,9 +5933,12 @@
- 
- #: kpfilterpage.cpp:394
- msgid ""
--"<p>The filter chain is wrong. The output format of at least one filter is not "
--"supported by its follower. See <b>Filters</b> tab for more information.</p>"
--msgstr "<p>過濾器鏈有錯誤。至少有一個過濾器的輸出格式不被其後的的過濾器所支援。查看<b>過濾器</b>以便於獲得更多資訊。</p>"
-+"<p>The filter chain is wrong. The output format of at least one filter is "
-+"not supported by its follower. See <b>Filters</b> tab for more information.</"
-+"p>"
-+msgstr ""
-+"<p>過濾器鏈有錯誤。至少有一個過濾器的輸出格式不被其後的的過濾器所支援。查看"
-+"<b>過濾器</b>以便於獲得更多資訊。</p>"
- 
- #: kpfilterpage.cpp:408
- msgid "Input"
-@@ -6349,75 +5947,65 @@
- #: kpqtpage.cpp:70
- msgid ""
- " <qt>  <b>Selection of color mode:</b> You can choose between 2 options:  "
--"<ul>"
--"<li><b>Color</b> and</li>  "
--"<li><b>Grayscale</b></li></ul>  <b>Note:</b> This selection field may be grayed "
--"out and made inactive.  This happens if KDEPrint can not retrieve  enough "
--"information about your print file. In this case the embedded color- or "
--"grayscale information  of your printfile, and the default handling of the "
--"printer take precedence.  </qt>"
--msgstr ""
--"<qt><b>選取顏色模式</b>您有兩種選擇： "
--"<ul> "
--"<li>顏色</li> "
--"<li>灰階</li></ul> <b>注意：</b>如果 KDEPrint "
--"無法從您的列印檔案中取得足夠的資訊，這個選項可能被關閉，此時會使用您列印檔案中內嵌的顏色或灰階資訊，還有預設的行為選項。</qt>"
-+"<ul><li><b>Color</b> and</li>  <li><b>Grayscale</b></li></ul>  <b>Note:</b> "
-+"This selection field may be grayed out and made inactive.  This happens if "
-+"KDEPrint can not retrieve  enough information about your print file. In this "
-+"case the embedded color- or grayscale information  of your printfile, and "
-+"the default handling of the printer take precedence.  </qt>"
-+msgstr ""
-+"<qt><b>選取顏色模式</b>您有兩種選擇： <ul> <li>顏色</li> <li>灰階</li></ul> "
-+"<b>注意：</b>如果 KDEPrint 無法從您的列印檔案中取得足夠的資訊，這個選項可能被"
-+"關閉，此時會使用您列印檔案中內嵌的顏色或灰階資訊，還有預設的行為選項。</qt>"
- 
- #: kpqtpage.cpp:79
- msgid ""
--" <qt>  <b>Selection of page size:</b> Select paper size to be printed on from  "
--"the drop-down menu.  "
--"<p>The exact list of choices depends on the printer driver (\"PPD\") you have "
--"installed.  </qt>"
--msgstr "<qt><b>選取紙張尺寸：</b> 從下拉式選單中選取紙張的尺寸。 <p>可用的選項依您安裝使用的印表機伺服器提供而不同。</qt>"
-+" <qt>  <b>Selection of page size:</b> Select paper size to be printed on "
-+"from  the drop-down menu.  <p>The exact list of choices depends on the "
-+"printer driver (\"PPD\") you have installed.  </qt>"
-+msgstr ""
-+"<qt><b>選取紙張尺寸：</b> 從下拉式選單中選取紙張的尺寸。 <p>可用的選項依您安"
-+"裝使用的印表機伺服器提供而不同。</qt>"
- 
- #: kpqtpage.cpp:84
- msgid ""
--" <qt>  <b>Selection of pages per sheet:</b>  You can choose to print more than "
--"one page onto each sheet of paper.  This is sometimes useful to save paper.  "
--"<p><b>Note 1:</b> the page images get scaled down accordingly to print 2 or 4 "
--"pages per sheet.  The page image does not get scaled if you print 1 page per "
--"sheet (the default setting.).  "
--"<p><b>Note 2:</b> If you select multiple pages per sheet here, the scaling and "
--"re-arranging is done  by your printing system.  "
--"<p><b>Note 3, regarding \"Other\":</b> You cannot really select <em>Other</em> "
--"as the number of  pages to print on one sheet.\"Other\" is checkmarked here for "
--"information purposes only.  "
--"<p>To select 8, 9, 16 or other numbers of  pages per sheet:  "
--"<ul>  "
--"<li> go to the tab headlined \"Filter\"</li> "
--"<li> enable the <em>Multiple Pages per Sheet</em> filter </li> "
--"<li> and configure it (bottom-most button on the right of the \"Filters\" tab). "
--"</li> </ul> </qt>"
--msgstr ""
--"<qt><b>選擇一張紙上有幾頁</b> 您可以選擇在一張紙上印出超過一頁的文件。通常可以節省紙張。 "
--"<p><b>注意：</b>列印的圖片會根據一張紙上頁數的多寡來決定要縮小多少。如果選擇一張紙上印一頁（預設值）則不會做調整。</p> "
--"<p><b>注意：</b>當您選擇一張紙上印多頁時，列印系統會自動幫您調整大小。</p> "
--"<p><b>注意：</b>您不能真的使用「其他」的選項。那只是提供資訊用的。</p> "
--"<p>要選擇 8、9 或 16 張的話， "
--"<ul> "
--"<li>到「過濾器」頁中。</li> "
--"<li>開啟「單張多頁過濾器」。</li> "
--"<li>設定過濾器。</li></ul></qt>但是，有些印表機自己就有單張多頁的功能。這種情況下您最好使用印表機自己的設定選項。如果您兩邊都使用此選項，印出"
--"來的結果可能不會是您想要的</p> "
--"<br>"
--"<hr> "
--"<p><b>進階使用者的額外提示：</b>這個選項與以下的 CUPS 命令列選項參數是一樣的： "
--"<pre>     -o number-up=...     # 例：\"2\" 或 \"4\"</pre></p></qt>"
-+" <qt>  <b>Selection of pages per sheet:</b>  You can choose to print more "
-+"than one page onto each sheet of paper.  This is sometimes useful to save "
-+"paper.  <p><b>Note 1:</b> the page images get scaled down accordingly to "
-+"print 2 or 4 pages per sheet.  The page image does not get scaled if you "
-+"print 1 page per sheet (the default setting.).  <p><b>Note 2:</b> If you "
-+"select multiple pages per sheet here, the scaling and re-arranging is done  "
-+"by your printing system.  <p><b>Note 3, regarding \"Other\":</b> You cannot "
-+"really select <em>Other</em> as the number of  pages to print on one sheet."
-+"\"Other\" is checkmarked here for information purposes only.  <p>To select "
-+"8, 9, 16 or other numbers of  pages per sheet:  <ul>  <li> go to the tab "
-+"headlined \"Filter\"</li> <li> enable the <em>Multiple Pages per Sheet</em> "
-+"filter </li> <li> and configure it (bottom-most button on the right of the "
-+"\"Filters\" tab). </li> </ul> </qt>"
-+msgstr ""
-+"<qt><b>選擇一張紙上有幾頁</b> 您可以選擇在一張紙上印出超過一頁的文件。通常可"
-+"以節省紙張。 <p><b>注意：</b>列印的圖片會根據一張紙上頁數的多寡來決定要縮小多"
-+"少。如果選擇一張紙上印一頁（預設值）則不會做調整。</p> <p><b>注意：</b>當您選"
-+"擇一張紙上印多頁時，列印系統會自動幫您調整大小。</p> <p><b>注意：</b>您不能真"
-+"的使用「其他」的選項。那只是提供資訊用的。</p> <p>要選擇 8、9 或 16 張的話， "
-+"<ul> <li>到「過濾器」頁中。</li> <li>開啟「單張多頁過濾器」。</li> <li>設定過"
-+"濾器。</li></ul></qt>但是，有些印表機自己就有單張多頁的功能。這種情況下您最好"
-+"使用印表機自己的設定選項。如果您兩邊都使用此選項，印出來的結果可能不會是您想"
-+"要的</p> <br><hr> <p><b>進階使用者的額外提示：</b>這個選項與以下的 CUPS 命令"
-+"列選項參數是一樣的： <pre>     -o number-up=...     # 例：\"2\" 或 \"4\"</"
-+"pre></p></qt>"
- 
- #: kpqtpage.cpp:102
- msgid ""
- " <qt>  <b>Selection of image orientation:</b> Orientation of the printed  "
- "pageimage on your paper is controlled by the radio buttons. By default,  the "
--"orientation is <em>Portrait</em>  "
--"<p>You can select 2 alternatives:  "
--"<ul>  "
--"<li> <b>Portrait.</b>.Portrait is the default setting. </li>  "
--"<li> <b>Landscape.</b> </li>  </ul>  The icon changes according to your "
-+"orientation is <em>Portrait</em>  <p>You can select 2 alternatives:  <ul>  "
-+"<li> <b>Portrait.</b>.Portrait is the default setting. </li>  <li> "
-+"<b>Landscape.</b> </li>  </ul>  The icon changes according to your "
- "selection. </qt>"
- msgstr ""
--"<qt><b>選擇圖片方向：</b> 您可以選擇列印圖片的方向。預設為「縱向」（Portrait）。 "
--"此外您還可以選擇「橫向」（Landscape）。圖示會根據您選擇的方向不同而改變。</qt>"
-+"<qt><b>選擇圖片方向：</b> 您可以選擇列印圖片的方向。預設為「縱向」"
-+"（Portrait）。 此外您還可以選擇「橫向」（Landscape）。圖示會根據您選擇的方向"
-+"不同而改變。</qt>"
- 
- #: kpqtpage.cpp:113
- msgid "Print Format"
-diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdelibs/kfileaudiopreview.po kde-i18n-zh_TW-3.5.10/messages/kdelibs/kfileaudiopreview.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdelibs/kfileaudiopreview.po	2007-01-15 10:56:41.000000000 +0100
-+++ kde-i18n-zh_TW-3.5.10/messages/kdelibs/kfileaudiopreview.po	2011-11-11 15:45:17.000000000 +0100
-@@ -6,8 +6,7 @@
- "Project-Id-Version: kfileaudiopreview\n"
- "POT-Creation-Date: 2006-10-03 02:33+0200\n"
- "PO-Revision-Date: 2006-02-13 12:49+0800\n"
--"Last-Translator: Frank Weng (a.k.a. Franklin) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Traditional Chinese <zh_l10n@linux.org.tw>\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/kdelibs/kioexec.po kde-i18n-zh_TW-3.5.10/messages/kdelibs/kioexec.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdelibs/kioexec.po	2007-05-14 12:23:06.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdelibs/kioexec.po	2011-11-11 15:45:17.000000000 +0100
-@@ -7,8 +7,7 @@
- "Project-Id-Version: kioexec\n"
- "POT-Creation-Date: 2007-04-13 02:13+0200\n"
- "PO-Revision-Date: 2006-06-19 10:29+0800\n"
--"Last-Translator: Frank Weng (a.k.a. Franklin) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Chinese Traditional <zh-l10n@linux.org.tw>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
-@@ -36,10 +35,8 @@
- msgstr "給 '命令' 用的 URL 或本地端檔案."
- 
- #: main.cpp:73
--msgid ""
--"'command' expected.\n"
--msgstr ""
--"'命令' 是被預期的.\n"
-+msgid "'command' expected.\n"
-+msgstr "'命令' 是被預期的.\n"
- 
- #: main.cpp:102
- msgid ""
-diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdelibs/kio_help.po kde-i18n-zh_TW-3.5.10/messages/kdelibs/kio_help.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdelibs/kio_help.po	2006-07-22 10:04:33.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdelibs/kio_help.po	2011-11-11 15:45:17.000000000 +0100
-@@ -9,8 +9,7 @@
- "Project-Id-Version: kio_help\n"
- "POT-Creation-Date: 2006-05-03 03:51+0200\n"
- "PO-Revision-Date: 2006-02-13 12:53+0800\n"
--"Last-Translator: Frank Weng (a.k.a. Franklin) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Traditional Chinese <zh_l10n@linux.org.tw>\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/kdelibs/kio.po kde-i18n-zh_TW-3.5.10/messages/kdelibs/kio.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdelibs/kio.po	2008-08-19 20:43:19.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdelibs/kio.po	2011-11-11 15:45:17.000000000 +0100
-@@ -14,8 +14,7 @@
- "Project-Id-Version: kio\n"
- "POT-Creation-Date: 2008-07-08 01:16+0200\n"
- "PO-Revision-Date: 2006-09-05 10:10+0800\n"
--"Last-Translator: Frank Weng (a.k.a. Franklin) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Chinese Traditional <zh-l10n@linux.org.tw>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
-@@ -146,9 +145,11 @@
- 
- #: kio/paste.cpp:123
- msgid ""
--"The clipboard has changed since you used 'paste': the chosen data format is no "
--"longer applicable. Please copy again what you wanted to paste."
--msgstr "當您使用「貼上」時剪貼簿已經改變了：所選擇的資料格式已經不適用了。請再次複製您所想要貼上的項目。"
-+"The clipboard has changed since you used 'paste': the chosen data format is "
-+"no longer applicable. Please copy again what you wanted to paste."
-+msgstr ""
-+"當您使用「貼上」時剪貼簿已經改變了：所選擇的資料格式已經不適用了。請再次複製"
-+"您所想要貼上的項目。"
- 
- #: kio/paste.cpp:201 kio/paste.cpp:224 kio/paste.cpp:251
- msgid "The clipboard is empty"
-@@ -182,9 +183,11 @@
- 
- #: kio/chmodjob.cpp:173
- msgid ""
--"<qt>Could not modify the ownership of file <b>%1</b>"
--". You have insufficient access to the file to perform the change.</qt>"
--msgstr "<qt>無法更改檔案 <b>%1</b> 的擁有權。您沒有足夠的檔案存取權來做這個改變。</qt>"
-+"<qt>Could not modify the ownership of file <b>%1</b>. You have insufficient "
-+"access to the file to perform the change.</qt>"
-+msgstr ""
-+"<qt>無法更改檔案 <b>%1</b> 的擁有權。您沒有足夠的檔案存取權來做這個改變。</"
-+"qt>"
- 
- #: kio/chmodjob.cpp:173
- msgid "&Skip File"
-@@ -257,7 +260,7 @@
- 
- #: kio/kmimetype.cpp:796
- msgid "The desktop entry file %1 has no Type=... entry."
--msgstr "桌面項目檔案 %1 中沒有 Type=... 項目。"
-+msgstr "桌面項目檔案 %1 中沒有 Type=… 項目。"
- 
- #: kio/kmimetype.cpp:817
- msgid ""
-@@ -315,7 +318,8 @@
- 
- #: kio/tcpslavebase.cpp:319
- msgid ""
--"You are about to leave secure mode. Transmissions will no longer be encrypted.\n"
-+"You are about to leave secure mode. Transmissions will no longer be "
-+"encrypted.\n"
- "This means that a third party could observe your data in transit."
- msgstr ""
- "您即將離開安全模式，資料傳輸將不再被加密。\n"
-@@ -347,8 +351,8 @@
- 
- #: kio/tcpslavebase.cpp:875
- msgid ""
--"The IP address of the host %1 does not match the one the certificate was issued "
--"to."
-+"The IP address of the host %1 does not match the one the certificate was "
-+"issued to."
- msgstr "主機 %1 的 IP 位址與憑證原先發行給的位址不相符。"
- 
- #: kio/tcpslavebase.cpp:880 kio/tcpslavebase.cpp:888 kio/tcpslavebase.cpp:923
-@@ -386,12 +390,14 @@
- msgid ""
- "You have indicated that you wish to accept this certificate, but it is not "
- "issued to the server who is presenting it. Do you wish to continue loading?"
--msgstr "您表示您想接受此憑證，但它並不是頒發給現在出示此憑證的伺服器。您真的要繼續載入嗎？"
-+msgstr ""
-+"您表示您想接受此憑證，但它並不是頒發給現在出示此憑證的伺服器。您真的要繼續載"
-+"入嗎？"
- 
- #: kio/tcpslavebase.cpp:1008
- msgid ""
--"SSL certificate is being rejected as requested. You can disable this in the KDE "
--"Control Center."
-+"SSL certificate is being rejected as requested. You can disable this in the "
-+"KDE Control Center."
- msgstr "如您所要求的，SSL 憑證正被拒絕。您可以在 KDE 控制中心停用這項設定。"
- 
- #: kio/tcpslavebase.cpp:1020
-@@ -400,8 +406,8 @@
- 
- #: kio/tcpslavebase.cpp:1076
- msgid ""
--"You are about to enter secure mode. All transmissions will be encrypted unless "
--"otherwise noted.\n"
-+"You are about to enter secure mode. All transmissions will be encrypted "
-+"unless otherwise noted.\n"
- "This means that no third party will be able to easily observe your data in "
- "transit."
- msgstr ""
-@@ -1111,7 +1117,8 @@
- msgid ""
- "Contact your appropriate computer support system, whether the system "
- "administrator, or technical support group for further assistance."
--msgstr "請聯繫合適的電腦支援組織，例如系統管理員或技術支援小組，以取得進一步的協助。"
-+msgstr ""
-+"請聯繫合適的電腦支援組織，例如系統管理員或技術支援小組，以取得進一步的協助。"
- 
- #: kio/global.cpp:569
- msgid "Contact the administrator of the server for further assistance."
-@@ -1123,8 +1130,8 @@
- 
- #: kio/global.cpp:573
- msgid ""
--"Your access permissions may be inadequate to perform the requested operation on "
--"this resource."
-+"Your access permissions may be inadequate to perform the requested operation "
-+"on this resource."
- msgstr "您可能沒有足夠權限來執行所要求的對該資源的作業。"
- 
- #: kio/global.cpp:575
-@@ -1134,8 +1141,8 @@
- 
- #: kio/global.cpp:577
- msgid ""
--"Check to make sure that no other application or user is using the file or has "
--"locked the file."
-+"Check to make sure that no other application or user is using the file or "
-+"has locked the file."
- msgstr "請檢查並確定沒有其他應用程式或使用者正在使用或鎖定該檔案。"
- 
- #: kio/global.cpp:579
-@@ -1150,7 +1157,8 @@
- msgid ""
- "This is most likely to be caused by a bug in the program. Please consider "
- "submitting a full bug report as detailed below."
--msgstr "這最有可能是程式中的錯誤所導致。請考慮提效一份詳細的問題報告，詳情如下。"
-+msgstr ""
-+"這最有可能是程式中的錯誤所導致。請考慮提效一份詳細的問題報告，詳情如下。"
- 
- #: kio/global.cpp:584
- msgid ""
-@@ -1162,16 +1170,17 @@
- msgid ""
- "When all else fails, please consider helping the KDE team or the third party "
- "maintainer of this software by submitting a high quality bug report. If the "
--"software is provided by a third party, please contact them directly. Otherwise, "
--"first look to see if the same bug has been submitted by someone else by "
--"searching at the <a href=\"http://bugs.kde.org/\">KDE bug reporting website</a>"
--". If not, take note of the details given above, and include them in your bug "
--"report, along with as many other details as you think might help."
--msgstr ""
--"如果您多番嘗試後仍然無法解決問題，請考慮幫助 KDE "
--"團隊或該軟體的第三方維護者，並提交一份高品質的錯誤報告。如果該軟體是由第三方提供的，請直接與他們聯繫。如果該軟體是 KDE 團隊提供的，請先在 <a "
--"href=\"http://bugs.kde.org/\">KDE 錯誤報告網站</a> "
--"搜尋，看看是否已經有人報告了相同的錯誤。如果沒有，請把上面的詳細資訊，以及任何您認為有幫助的細節，附入您的錯誤報告中。"
-+"software is provided by a third party, please contact them directly. "
-+"Otherwise, first look to see if the same bug has been submitted by someone "
-+"else by searching at the <a href=\"http://bugs.kde.org/\">KDE bug reporting "
-+"website</a>. If not, take note of the details given above, and include them "
-+"in your bug report, along with as many other details as you think might help."
-+msgstr ""
-+"如果您多番嘗試後仍然無法解決問題，請考慮幫助 KDE 團隊或該軟體的第三方維護者，"
-+"並提交一份高品質的錯誤報告。如果該軟體是由第三方提供的，請直接與他們聯繫。如"
-+"果該軟體是 KDE 團隊提供的，請先在 <a href=\"http://bugs.kde.org/\">KDE 錯誤報"
-+"告網站</a> 搜尋，看看是否已經有人報告了相同的錯誤。如果沒有，請把上面的詳細資"
-+"訊，以及任何您認為有幫助的細節，附入您的錯誤報告中。"
- 
- #: kio/global.cpp:594
- msgid "There may have been a problem with your network connection."
-@@ -1179,14 +1188,15 @@
- 
- #: kio/global.cpp:597
- msgid ""
--"There may have been a problem with your network configuration. If you have been "
--"accessing the Internet with no problems recently, this is unlikely."
--msgstr "您的網路設定可能有問題。如果您最近存取網際網路沒有問題，這就不太可能了。"
-+"There may have been a problem with your network configuration. If you have "
-+"been accessing the Internet with no problems recently, this is unlikely."
-+msgstr ""
-+"您的網路設定可能有問題。如果您最近存取網際網路沒有問題，這就不太可能了。"
- 
- #: kio/global.cpp:600
- msgid ""
--"There may have been a problem at some point along the network path between the "
--"server and this computer."
-+"There may have been a problem at some point along the network path between "
-+"the server and this computer."
- msgstr "在網路中這部電腦和對方伺服器之間的路徑可能有問題。"
- 
- #: kio/global.cpp:602
-@@ -1223,9 +1233,11 @@
- 
- #: kio/global.cpp:614
- msgid ""
--"This means that the contents of the requested file or folder <strong>%1</strong> "
--"could not be retrieved, as read access could not be obtained."
--msgstr "這就是說，請求的檔案或資料夾 <strong>%1</strong> 的內容無法接收，因為無法取得讀入權限。"
-+"This means that the contents of the requested file or folder <strong>%1</"
-+"strong> could not be retrieved, as read access could not be obtained."
-+msgstr ""
-+"這就是說，請求的檔案或資料夾 <strong>%1</strong> 的內容無法接收，因為無法取得"
-+"讀入權限。"
- 
- #: kio/global.cpp:617
- msgid "You may not have permissions to read the file or open the folder."
-@@ -1239,7 +1251,8 @@
- msgid ""
- "This means that the file, <strong>%1</strong>, could not be written to as "
- "requested, because access with permission to write could not be obtained."
--msgstr "這就是說，該檔案 <strong>%1</strong> 無法按請求寫入，因為無法取得寫入權限。"
-+msgstr ""
-+"這就是說，該檔案 <strong>%1</strong> 無法按請求寫入，因為無法取得寫入權限。"
- 
- #: kio/global.cpp:632
- msgid "Cannot Initiate the %1 Protocol"
-@@ -1251,16 +1264,21 @@
- 
- #: kio/global.cpp:634
- msgid ""
--"The program on your computer which provides access to the <strong>%1</strong> "
--"protocol could not be started. This is usually due to technical reasons."
--msgstr "在您的電腦上提供 <strong>%1</strong> 協定存取的程式無法啟動。這通常是由某些技術原因所致。"
-+"The program on your computer which provides access to the <strong>%1</"
-+"strong> protocol could not be started. This is usually due to technical "
-+"reasons."
-+msgstr ""
-+"在您的電腦上提供 <strong>%1</strong> 協定存取的程式無法啟動。這通常是由某些技"
-+"術原因所致。"
- 
- #: kio/global.cpp:637
- msgid ""
--"The program which provides compatibility with this protocol may not have been "
--"updated with your last update of KDE. This can cause the program to be "
-+"The program which provides compatibility with this protocol may not have "
-+"been updated with your last update of KDE. This can cause the program to be "
- "incompatible with the current version and thus not start."
--msgstr "提供此通訊協定的相容性的程式，可能並未與您的最新版 KDE 更新。這會造成該程式與目前版本不相容而無法啟動。"
-+msgstr ""
-+"提供此通訊協定的相容性的程式，可能並未與您的最新版 KDE 更新。這會造成該程式與"
-+"目前版本不相容而無法啟動。"
- 
- #: kio/global.cpp:645
- msgid "Internal Error"
-@@ -1268,9 +1286,10 @@
- 
- #: kio/global.cpp:646
- msgid ""
--"The program on your computer which provides access to the <strong>%1</strong> "
--"protocol has reported an internal error."
--msgstr "在您的電腦上提供 <strong>%1</strong> 協定存取的程式報告了一個內部錯誤。"
-+"The program on your computer which provides access to the <strong>%1</"
-+"strong> protocol has reported an internal error."
-+msgstr ""
-+"在您的電腦上提供 <strong>%1</strong> 協定存取的程式報告了一個內部錯誤。"
- 
- #: kio/global.cpp:654
- msgid "Improperly Formatted URL"
-@@ -1278,16 +1297,16 @@
- 
- #: kio/global.cpp:655
- msgid ""
--"The <strong>U</strong>niform <strong>R</strong>esource <strong>L</strong>"
--"ocator (URL) that you entered was not properly formatted. The format of a URL "
--"is generally as follows:"
--"<blockquote><strong>protocol://user:password@www.example.org:port/folder/filenam"
--"e.extension?query=value</strong></blockquote>"
--msgstr ""
--"您所輸入的 URL (<strong>U</strong>niform <strong>R</strong>esource <strong>L</strong>"
--"ocator, 統一資源定位符) 格式有誤。一般 URL 的正確格式應該是："
--"<blockquote><strong>protocol://使用者:密碼@www.example.org:埠號/資料夾/檔名.副檔名?查詢=值</strong"
--"></blockquote>"
-+"The <strong>U</strong>niform <strong>R</strong>esource <strong>L</"
-+"strong>ocator (URL) that you entered was not properly formatted. The format "
-+"of a URL is generally as follows:<blockquote><strong>protocol://user:"
-+"password@www.example.org:port/folder/filename.extension?query=value</"
-+"strong></blockquote>"
-+msgstr ""
-+"您所輸入的 URL (<strong>U</strong>niform <strong>R</strong>esource "
-+"<strong>L</strong>ocator, 統一資源定位符) 格式有誤。一般 URL 的正確格式應該"
-+"是：<blockquote><strong>protocol://使用者:密碼@www.example.org:埠號/資料夾/檔"
-+"名.副檔名?查詢=值</strong></blockquote>"
- 
- #: kio/global.cpp:664
- #, c-format
-@@ -1296,8 +1315,8 @@
- 
- #: kio/global.cpp:665
- msgid ""
--"The protocol <strong>%1</strong> is not supported by the KDE programs currently "
--"installed on this computer."
-+"The protocol <strong>%1</strong> is not supported by the KDE programs "
-+"currently installed on this computer."
- msgstr "目前安裝在此電腦上的 KDE 程式不支援 <strong>%1</strong> 通訊協定。"
- 
- #: kio/global.cpp:668
-@@ -1306,20 +1325,21 @@
- 
- #: kio/global.cpp:669
- msgid ""
--"The versions of the %1 protocol supported by this computer and the server may "
--"be incompatible."
-+"The versions of the %1 protocol supported by this computer and the server "
-+"may be incompatible."
- msgstr "此電腦支援的 %1 通訊協定的版本可能和伺服器的版本不相容。"
- 
- #: kio/global.cpp:671
- msgid ""
--"You may perform a search on the Internet for a KDE program (called a kioslave "
--"or ioslave) which supports this protocol. Places to search include <a "
--"href=\"http://kde-apps.org/\">http://kde-apps.org/</a> "
--"and <a href=\"http://freshmeat.net/\">http://freshmeat.net/</a>."
--msgstr ""
--"您可以在網際網路上搜尋一個支援此通訊協定的 KDE 程式 (叫做 kioslave 或 ioslave)。建議從 <a "
--"href=\"http://kde-apps.org/\">http://kde-apps.org/</a> "
--"和 <a href=\"http://freshmeat.net/\">http://freshmeat.net/</a> 這兩個地方搜尋。"
-+"You may perform a search on the Internet for a KDE program (called a "
-+"kioslave or ioslave) which supports this protocol. Places to search include "
-+"<a href=\"http://kde-apps.org/\">http://kde-apps.org/</a> and <a href="
-+"\"http://freshmeat.net/\">http://freshmeat.net/</a>."
-+msgstr ""
-+"您可以在網際網路上搜尋一個支援此通訊協定的 KDE 程式 (叫做 kioslave 或 "
-+"ioslave)。建議從 <a href=\"http://kde-apps.org/\">http://kde-apps.org/</a> "
-+"和 <a href=\"http://freshmeat.net/\">http://freshmeat.net/</a> 這兩個地方搜"
-+"尋。"
- 
- #: kio/global.cpp:680
- msgid "URL Does Not Refer to a Resource."
-@@ -1331,19 +1351,21 @@
- 
- #: kio/global.cpp:682
- msgid ""
--"The <strong>U</strong>niform <strong>R</strong>esource <strong>L</strong>"
--"ocator (URL) that you entered did not refer to a specific resource."
-+"The <strong>U</strong>niform <strong>R</strong>esource <strong>L</"
-+"strong>ocator (URL) that you entered did not refer to a specific resource."
- msgstr ""
--"您輸入的 URL (<strong>U</strong>niform <strong>R</strong>esource <strong>L</strong>"
--"ocator, 統一資源定位符) 並不指向特定的資源。"
-+"您輸入的 URL (<strong>U</strong>niform <strong>R</strong>esource <strong>L</"
-+"strong>ocator, 統一資源定位符) 並不指向特定的資源。"
- 
- #: kio/global.cpp:685
- msgid ""
--"KDE is able to communicate through a protocol within a protocol; the protocol "
--"specified is only for use in such situations, however this is not one of these "
--"situations. This is a rare event, and is likely to indicate a programming "
--"error."
--msgstr "KDE 能夠在一個協定裡透過另一個協定進行通訊；指定的協定只適用於那種場合，現在卻不是那種場合。這個錯誤比較罕見，大概是編程出錯了。"
-+"KDE is able to communicate through a protocol within a protocol; the "
-+"protocol specified is only for use in such situations, however this is not "
-+"one of these situations. This is a rare event, and is likely to indicate a "
-+"programming error."
-+msgstr ""
-+"KDE 能夠在一個協定裡透過另一個協定進行通訊；指定的協定只適用於那種場合，現在"
-+"卻不是那種場合。這個錯誤比較罕見，大概是編程出錯了。"
- 
- #: kio/global.cpp:693
- #, c-format
-@@ -1352,8 +1374,8 @@
- 
- #: kio/global.cpp:694
- msgid ""
--"The requested action is not supported by the KDE program which is implementing "
--"the <strong>%1</strong> protocol."
-+"The requested action is not supported by the KDE program which is "
-+"implementing the <strong>%1</strong> protocol."
- msgstr "實作 <strong>%1</strong> 協定的 KDE 程式不支援要求的動作。"
- 
- #: kio/global.cpp:697
-@@ -1361,7 +1383,9 @@
- "This error is very much dependent on the KDE program. The additional "
- "information should give you more information than is available to the KDE "
- "input/output architecture."
--msgstr "這個錯誤非常關乎於個別的 KDE 程式。[額外資訊] 應該可以比 KDE 的輸入/輸出架構給您更多的資訊。"
-+msgstr ""
-+"這個錯誤非常關乎於個別的 KDE 程式。[額外資訊] 應該可以比 KDE 的輸入/輸出架構"
-+"給您更多的資訊。"
- 
- #: kio/global.cpp:700
- msgid "Attempt to find another way to accomplish the same outcome."
-@@ -1373,8 +1397,8 @@
- 
- #: kio/global.cpp:706
- msgid ""
--"The request expected a file, however the folder <strong>%1</strong> "
--"was found instead."
-+"The request expected a file, however the folder <strong>%1</strong> was "
-+"found instead."
- msgstr "該要求需要一個檔案，然而找到的 <strong>%1</strong> 是一個資料夾。"
- 
- #: kio/global.cpp:708
-@@ -1387,8 +1411,8 @@
- 
- #: kio/global.cpp:714
- msgid ""
--"The request expected a folder, however the file <strong>%1</strong> "
--"was found instead."
-+"The request expected a folder, however the file <strong>%1</strong> was "
-+"found instead."
- msgstr "該要求需要一個資料夾，然而找到的 <strong>%1</strong> 是一個檔案。"
- 
- #: kio/global.cpp:721
-@@ -1419,8 +1443,8 @@
- 
- #: kio/global.cpp:740
- msgid ""
--"The requested folder could not be created because a folder with the same name "
--"already exists."
-+"The requested folder could not be created because a folder with the same "
-+"name already exists."
- msgstr "無法建立要求的資料夾，因為已經有另一個同名的資料夾存在了。"
- 
- #: kio/global.cpp:742
-@@ -1443,7 +1467,9 @@
- msgid ""
- "An unknown host error indicates that the server with the requested name, "
- "<strong>%1</strong>, could not be located on the Internet."
--msgstr "「不明的主機」這個錯誤，表示在網際網路上找不到所要求的、名為 <strong>%1</strong> 的伺服器。"
-+msgstr ""
-+"「不明的主機」這個錯誤，表示在網際網路上找不到所要求的、名為 <strong>%1</"
-+"strong> 的伺服器。"
- 
- #: kio/global.cpp:753
- msgid ""
-@@ -1468,7 +1494,8 @@
- 
- #: kio/global.cpp:767 kio/global.cpp:983 kio/global.cpp:995
- msgid ""
--"Retry the request and ensure your authentication details are entered correctly."
-+"Retry the request and ensure your authentication details are entered "
-+"correctly."
- msgstr "請確定輸入正確的認證細節，再重試要求。"
- 
- #: kio/global.cpp:773
-@@ -1477,8 +1504,8 @@
- 
- #: kio/global.cpp:774
- msgid ""
--"This means that an attempt to write to the file <strong>%1</strong> "
--"was rejected."
-+"This means that an attempt to write to the file <strong>%1</strong> was "
-+"rejected."
- msgstr "這就是說，試圖寫入檔案 <strong>%1</strong> 時被拒絕了。"
- 
- #: kio/global.cpp:781
-@@ -1489,7 +1516,8 @@
- msgid ""
- "This means that an attempt to enter (in other words, to open) the requested "
- "folder <strong>%1</strong> was rejected."
--msgstr "這就是說，試圖進入 (即開啟) 要求的資料夾 <strong>%1</strong> 時被拒絕了。"
-+msgstr ""
-+"這就是說，試圖進入 (即開啟) 要求的資料夾 <strong>%1</strong> 時被拒絕了。"
- 
- #: kio/global.cpp:790
- msgid "Folder Listing Unavailable"
-@@ -1501,9 +1529,12 @@
- 
- #: kio/global.cpp:792
- msgid ""
--"This means that a request was made which requires determining the contents of "
--"the folder, and the KDE program supporting this protocol is unable to do so."
--msgstr "這就是說，有個要求需要辨識該資料夾的內容，而支援這個協定的 KDE 程式卻無法這樣做。"
-+"This means that a request was made which requires determining the contents "
-+"of the folder, and the KDE program supporting this protocol is unable to do "
-+"so."
-+msgstr ""
-+"這就是說，有個要求需要辨識該資料夾的內容，而支援這個協定的 KDE 程式卻無法這樣"
-+"做。"
- 
- #: kio/global.cpp:800
- msgid "Cyclic Link Detected"
-@@ -1511,18 +1542,18 @@
- 
- #: kio/global.cpp:801
- msgid ""
--"UNIX environments are commonly able to link a file or folder to a separate name "
--"and/or location. KDE detected a link or series of links that results in an "
--"infinite loop - i.e. the file was (perhaps in a roundabout way) linked to "
-+"UNIX environments are commonly able to link a file or folder to a separate "
-+"name and/or location. KDE detected a link or series of links that results in "
-+"an infinite loop - i.e. the file was (perhaps in a roundabout way) linked to "
- "itself."
- msgstr ""
--"在 UNIX 環境下，通常可以把檔案或資料夾連結至其他的名稱或位置。 KDE 偵測到一個或一系列的連結，形成無限循環──也就是說， "
--"該檔案直接或間接地連結回自己。"
-+"在 UNIX 環境下，通常可以把檔案或資料夾連結至其他的名稱或位置。 KDE 偵測到一個"
-+"或一系列的連結，形成無限循環──也就是說， 該檔案直接或間接地連結回自己。"
- 
- #: kio/global.cpp:805 kio/global.cpp:827
- msgid ""
--"Delete one part of the loop in order that it does not cause an infinite loop, "
--"and try again."
-+"Delete one part of the loop in order that it does not cause an infinite "
-+"loop, and try again."
- msgstr "請刪除該循環的一部份，以斷開這個無限循環，再重試。"
- 
- #: kio/global.cpp:814
-@@ -1543,13 +1574,14 @@
- 
- #: kio/global.cpp:822
- msgid ""
--"UNIX environments are commonly able to link a file or folder to a separate name "
--"and/or location. During the requested copy operation, KDE detected a link or "
--"series of links that results in an infinite loop - i.e. the file was (perhaps "
--"in a roundabout way) linked to itself."
--msgstr ""
--"在 UNIX 環境下，通常可以把檔案或資料夾連結至其他的名稱或位置。 正當進行要求的複製動作時，KDE 偵測到一個或一系列的連結， "
--"形成無限循環──也就是說，該檔案直接或間接地連結回自己。"
-+"UNIX environments are commonly able to link a file or folder to a separate "
-+"name and/or location. During the requested copy operation, KDE detected a "
-+"link or series of links that results in an infinite loop - i.e. the file was "
-+"(perhaps in a roundabout way) linked to itself."
-+msgstr ""
-+"在 UNIX 環境下，通常可以把檔案或資料夾連結至其他的名稱或位置。 正當進行要求的"
-+"複製動作時，KDE 偵測到一個或一系列的連結， 形成無限循環──也就是說，該檔案直接"
-+"或間接地連結回自己。"
- 
- #: kio/global.cpp:832
- msgid "Could Not Create Network Connection"
-@@ -1563,12 +1595,13 @@
- msgid ""
- "This is a fairly technical error in which a required device for network "
- "communications (a socket) could not be created."
--msgstr "這是一個相當技術性的錯誤，無法建立所需的網路通訊裝置 (socket, 承接口)。"
-+msgstr ""
-+"這是一個相當技術性的錯誤，無法建立所需的網路通訊裝置 (socket, 承接口)。"
- 
- #: kio/global.cpp:836 kio/global.cpp:949 kio/global.cpp:960 kio/global.cpp:969
- msgid ""
--"The network connection may be incorrectly configured, or the network interface "
--"may not be enabled."
-+"The network connection may be incorrectly configured, or the network "
-+"interface may not be enabled."
- msgstr "可能是網路連線設定不正確，或是網路介面未啟動。"
- 
- #: kio/global.cpp:842
-@@ -1583,14 +1616,14 @@
- 
- #: kio/global.cpp:845
- msgid ""
--"The server, while currently connected to the Internet, may not be configured to "
--"allow requests."
-+"The server, while currently connected to the Internet, may not be configured "
-+"to allow requests."
- msgstr "該伺服器雖然在網際網路上，但可能設定為不允許外來的連線請求。"
- 
- #: kio/global.cpp:847
- msgid ""
--"The server, while currently connected to the Internet, may not be running the "
--"requested service (%1)."
-+"The server, while currently connected to the Internet, may not be running "
-+"the requested service (%1)."
- msgstr "該伺服器雖然在網際網路上，但是可能沒有執行所需的服務 (%1)。"
- 
- #: kio/global.cpp:849
-@@ -1598,7 +1631,9 @@
- "A network firewall (a device which restricts Internet requests), either "
- "protecting your network or the network of the server, may have intervened, "
- "preventing this request."
--msgstr "可能有個保護您的網路或伺服器的網路的防火牆 (限制網際網路請求的裝置) 干預，妨礙了這個要求。"
-+msgstr ""
-+"可能有個保護您的網路或伺服器的網路的防火牆 (限制網際網路請求的裝置) 干預，妨"
-+"礙了這個要求。"
- 
- #: kio/global.cpp:856
- msgid "Connection to Server Closed Unexpectedly"
-@@ -1606,14 +1641,15 @@
- 
- #: kio/global.cpp:857
- msgid ""
--"Although a connection was established to <strong>%1</strong>"
--", the connection was closed at an unexpected point in the communication."
--msgstr "雖然往 <strong>%1</strong> 的連線已經設立了，但通訊其間這個連線意外地中斷了。"
-+"Although a connection was established to <strong>%1</strong>, the connection "
-+"was closed at an unexpected point in the communication."
-+msgstr ""
-+"雖然往 <strong>%1</strong> 的連線已經設立了，但通訊其間這個連線意外地中斷了。"
- 
- #: kio/global.cpp:860
- msgid ""
--"A protocol error may have occurred, causing the server to close the connection "
--"as a response to the error."
-+"A protocol error may have occurred, causing the server to close the "
-+"connection as a response to the error."
- msgstr "可能發生了一個協定錯誤，導致伺服器回應錯誤而關閉連線。"
- 
- #: kio/global.cpp:866
-@@ -1626,21 +1662,23 @@
- 
- #: kio/global.cpp:868
- msgid ""
--"The <strong>U</strong>niform <strong>R</strong>esource <strong>L</strong>"
--"ocator (URL) that you entered did not refer to a valid mechanism of accessing "
--"the specific resource, <strong>%1%2</strong>."
--msgstr ""
--"您輸入的 <strong>U</strong>niform <strong>R</strong>esource <strong>L</strong>"
--"ocator (URL) 並不指向有效的機制，無法存取特定的資源 <strong>%1%2</strong>。"
-+"The <strong>U</strong>niform <strong>R</strong>esource <strong>L</"
-+"strong>ocator (URL) that you entered did not refer to a valid mechanism of "
-+"accessing the specific resource, <strong>%1%2</strong>."
-+msgstr ""
-+"您輸入的 <strong>U</strong>niform <strong>R</strong>esource <strong>L</"
-+"strong>ocator (URL) 並不指向有效的機制，無法存取特定的資源 <strong>%1%2</"
-+"strong>。"
- 
- #: kio/global.cpp:873
- msgid ""
--"KDE is able to communicate through a protocol within a protocol. This request "
--"specified a protocol be used as such, however this protocol is not capable of "
--"such an action. This is a rare event, and is likely to indicate a programming "
--"error."
-+"KDE is able to communicate through a protocol within a protocol. This "
-+"request specified a protocol be used as such, however this protocol is not "
-+"capable of such an action. This is a rare event, and is likely to indicate a "
-+"programming error."
- msgstr ""
--"KDE 能夠在一個協定裡透過另一個協定進行通訊。現在要求指定該協定用作這種過濾用途，但該協定不能用作過濾用途。這個錯誤比較罕見，大概是編程出錯了。"
-+"KDE 能夠在一個協定裡透過另一個協定進行通訊。現在要求指定該協定用作這種過濾用"
-+"途，但該協定不能用作過濾用途。這個錯誤比較罕見，大概是編程出錯了。"
- 
- #: kio/global.cpp:881
- msgid "Unable to Initialize Input/Output Device"
-@@ -1652,29 +1690,36 @@
- 
- #: kio/global.cpp:883
- msgid ""
--"The requested device could not be initialized (\"mounted\"). The reported error "
--"was: <strong>%1</strong>"
--msgstr "無法初始化 (裝載, mount) 您所要求的裝置。報告的錯誤是：<strong>%1</strong>"
-+"The requested device could not be initialized (\"mounted\"). The reported "
-+"error was: <strong>%1</strong>"
-+msgstr ""
-+"無法初始化 (裝載, mount) 您所要求的裝置。報告的錯誤是：<strong>%1</strong>"
- 
- #: kio/global.cpp:886
- msgid ""
--"The device may not be ready, for example there may be no media in a removable "
--"media device (i.e. no CD-ROM in a CD drive), or in the case of a "
-+"The device may not be ready, for example there may be no media in a "
-+"removable media device (i.e. no CD-ROM in a CD drive), or in the case of a "
- "peripheral/portable device, the device may not be correctly connected."
--msgstr "該裝置可能未就緒，例如某抽取式媒體裝置裡可能沒有媒體 (光碟機裡沒有光碟)，或者，對週邊/可攜式裝置而言，可能該裝置的連線不正確。"
-+msgstr ""
-+"該裝置可能未就緒，例如某抽取式媒體裝置裡可能沒有媒體 (光碟機裡沒有光碟)，或"
-+"者，對週邊/可攜式裝置而言，可能該裝置的連線不正確。"
- 
- #: kio/global.cpp:890
- msgid ""
- "You may not have permissions to initialize (\"mount\") the device. On UNIX "
- "systems, often system administrator privileges are required to initialize a "
- "device."
--msgstr "您可能沒有權限初始化 (裝載, mount) 該裝置。在 UNIX 系統上，通常需要系統管理員的權限，才能初始化裝置。"
-+msgstr ""
-+"您可能沒有權限初始化 (裝載, mount) 該裝置。在 UNIX 系統上，通常需要系統管理員"
-+"的權限，才能初始化裝置。"
- 
- #: kio/global.cpp:894
- msgid ""
- "Check that the device is ready; removable drives must contain media, and "
- "portable devices must be connected and powered on.; and try again."
--msgstr "請檢查該裝置是否就緒：抽取式磁碟機或光碟機裡必須有媒體，而可攜式裝置必須已連接和打開電源；再重試。"
-+msgstr ""
-+"請檢查該裝置是否就緒：抽取式磁碟機或光碟機裡必須有媒體，而可攜式裝置必須已連"
-+"接和打開電源；再重試。"
- 
- #: kio/global.cpp:900
- msgid "Unable to Uninitialize Input/Output Device"
-@@ -1686,24 +1731,29 @@
- 
- #: kio/global.cpp:902
- msgid ""
--"The requested device could not be uninitialized (\"unmounted\"). The reported "
--"error was: <strong>%1</strong>"
--msgstr "無法反初始化 (卸載, ummount) 您所要求的裝置。報告的錯誤是：<strong>%1</strong>"
-+"The requested device could not be uninitialized (\"unmounted\"). The "
-+"reported error was: <strong>%1</strong>"
-+msgstr ""
-+"無法反初始化 (卸載, ummount) 您所要求的裝置。報告的錯誤是：<strong>%1</"
-+"strong>"
- 
- #: kio/global.cpp:905
- msgid ""
--"The device may be busy, that is, still in use by another application or user. "
--"Even such things as having an open browser window on a location on this device "
--"may cause the device to remain in use."
-+"The device may be busy, that is, still in use by another application or "
-+"user. Even such things as having an open browser window on a location on "
-+"this device may cause the device to remain in use."
- msgstr ""
--"該裝置可能正在忙碌中，也就是說，可能有使用者或應用程式仍然在使用它。儘管只是有個開啟了的瀏覽器視窗在該裝置的某個位置上，也足以使該裝置停留在使用中狀態。"
-+"該裝置可能正在忙碌中，也就是說，可能有使用者或應用程式仍然在使用它。儘管只是"
-+"有個開啟了的瀏覽器視窗在該裝置的某個位置上，也足以使該裝置停留在使用中狀態。"
- 
- #: kio/global.cpp:909
- msgid ""
--"You may not have permissions to uninitialize (\"unmount\") the device. On UNIX "
--"systems, system administrator privileges are often required to uninitialize a "
--"device."
--msgstr "您可能沒有權限反初始化 (卸載, ummount) 該裝置。在 UNIX 系統上，通常需要系統管理員的權限，才能初始化裝置。"
-+"You may not have permissions to uninitialize (\"unmount\") the device. On "
-+"UNIX systems, system administrator privileges are often required to "
-+"uninitialize a device."
-+msgstr ""
-+"您可能沒有權限反初始化 (卸載, ummount) 該裝置。在 UNIX 系統上，通常需要系統管"
-+"理員的權限，才能初始化裝置。"
- 
- #: kio/global.cpp:913
- msgid "Check that no applications are accessing the device, and try again."
-@@ -1715,10 +1765,11 @@
- 
- #: kio/global.cpp:919
- msgid ""
--"This means that although the resource, <strong>%1</strong>"
--", was able to be opened, an error occurred while reading the contents of the "
--"resource."
--msgstr "這就是說，雖然 <strong>%1</strong> 這個資源可以開啟，但讀入這個資源的內容時發生錯誤。"
-+"This means that although the resource, <strong>%1</strong>, was able to be "
-+"opened, an error occurred while reading the contents of the resource."
-+msgstr ""
-+"這就是說，雖然 <strong>%1</strong> 這個資源可以開啟，但讀入這個資源的內容時發"
-+"生錯誤。"
- 
- #: kio/global.cpp:922
- msgid "You may not have permissions to read from the resource."
-@@ -1730,9 +1781,11 @@
- 
- #: kio/global.cpp:932
- msgid ""
--"This means that although the resource, <strong>%1</strong>"
--", was able to be opened, an error occurred while writing to the resource."
--msgstr "這就是說，雖然 <strong>%1</strong> 這個資源可以開啟，但寫入這個資源時發生錯誤。"
-+"This means that although the resource, <strong>%1</strong>, was able to be "
-+"opened, an error occurred while writing to the resource."
-+msgstr ""
-+"這就是說，雖然 <strong>%1</strong> 這個資源可以開啟，但寫入這個資源時發生錯"
-+"誤。"
- 
- #: kio/global.cpp:935
- msgid "You may not have permissions to write to the resource."
-@@ -1751,7 +1804,9 @@
- "This is a fairly technical error in which a required device for network "
- "communications (a socket) could not be established to listen for incoming "
- "network connections."
--msgstr "這是一個相當技術性的錯誤，無法設立所需的網路通訊裝置 (socket, 承接口) 以聽候 (listen) 內進的網路連線。"
-+msgstr ""
-+"這是一個相當技術性的錯誤，無法設立所需的網路通訊裝置 (socket, 承接口) 以聽候 "
-+"(listen) 內進的網路連線。"
- 
- #: kio/global.cpp:956
- msgid "Could Not Listen"
-@@ -1763,8 +1818,8 @@
- 
- #: kio/global.cpp:967
- msgid ""
--"This is a fairly technical error in which an error occurred while attempting to "
--"accept an incoming network connection."
-+"This is a fairly technical error in which an error occurred while attempting "
-+"to accept an incoming network connection."
- msgstr "這是一個相當技術性的錯誤，試圖接受 (accept) 內進的網路連線時發生錯誤。"
- 
- #: kio/global.cpp:971
-@@ -1793,7 +1848,9 @@
- msgid ""
- "An attempt to determine information about the status of the resource <strong>"
- "%1</strong>, such as the resource name, type, size, etc., was unsuccessful."
--msgstr "剛試圖查詢關於資源 <strong>%1</strong> 狀態的資訊，例如資源名稱、類型、大小等等，但不成功。"
-+msgstr ""
-+"剛試圖查詢關於資源 <strong>%1</strong> 狀態的資訊，例如資源名稱、類型、大小等"
-+"等，但不成功。"
- 
- #: kio/global.cpp:993
- msgid "The specified resource may not have existed or may not be accessible."
-@@ -1845,9 +1902,11 @@
- 
- #: kio/global.cpp:1028
- msgid ""
--"The specified request asked that the transfer of file <strong>%1</strong> "
--"be resumed at a certain point of the transfer. This was not possible."
--msgstr "在傳送檔案 <strong>%1</strong> 中途時，指定要求重新繼續傳送的請求。這是不可能的。"
-+"The specified request asked that the transfer of file <strong>%1</strong> be "
-+"resumed at a certain point of the transfer. This was not possible."
-+msgstr ""
-+"在傳送檔案 <strong>%1</strong> 中途時，指定要求重新繼續傳送的請求。這是不可能"
-+"的。"
- 
- #: kio/global.cpp:1031
- msgid "The protocol, or the server, may not support file resuming."
-@@ -1871,8 +1930,8 @@
- 
- #: kio/global.cpp:1048
- msgid ""
--"An attempt to alter the permissions on the specified resource <strong>"
--"%1</strong> failed."
-+"An attempt to alter the permissions on the specified resource <strong>%1</"
-+"strong> failed."
- msgstr "剛試圖變更指定的資源 <strong>%1</strong> 的權限，但失敗了。"
- 
- #: kio/global.cpp:1055
-@@ -1889,8 +1948,8 @@
- 
- #: kio/global.cpp:1064
- msgid ""
--"The program on your computer which provides access to the <strong>%1</strong> "
--"protocol has unexpectedly terminated."
-+"The program on your computer which provides access to the <strong>%1</"
-+"strong> protocol has unexpectedly terminated."
- msgstr "在您的電腦上提供 <strong>%1</strong> 協定存取的程式意外地突然終止了。"
- 
- #: kio/global.cpp:1072
-@@ -1899,9 +1958,11 @@
- 
- #: kio/global.cpp:1073
- msgid ""
--"The program on your computer which provides access to the <strong>%1</strong> "
--"protocol could not obtain the memory required to continue."
--msgstr "在您的電腦上提供 <strong>%1</strong> 協定存取的程式未能取得所需的記憶體，無法繼續。"
-+"The program on your computer which provides access to the <strong>%1</"
-+"strong> protocol could not obtain the memory required to continue."
-+msgstr ""
-+"在您的電腦上提供 <strong>%1</strong> 協定存取的程式未能取得所需的記憶體，無法"
-+"繼續。"
- 
- #: kio/global.cpp:1081
- msgid "Unknown Proxy Host"
-@@ -1909,18 +1970,21 @@
- 
- #: kio/global.cpp:1082
- msgid ""
--"While retrieving information about the specified proxy host, <strong>%1</strong>"
--", an Unknown Host error was encountered. An unknown host error indicates that "
--"the requested name could not be located on the Internet."
-+"While retrieving information about the specified proxy host, <strong>%1</"
-+"strong>, an Unknown Host error was encountered. An unknown host error "
-+"indicates that the requested name could not be located on the Internet."
- msgstr ""
--"當抓取特定的 proxy 主機 <strong>%1</strong> 時，發生找不到主機的錯誤。該錯誤通常代表該主機名稱在網際網路上找不到。"
-+"當抓取特定的 proxy 主機 <strong>%1</strong> 時，發生找不到主機的錯誤。該錯誤"
-+"通常代表該主機名稱在網際網路上找不到。"
- 
- #: kio/global.cpp:1086
- msgid ""
- "There may have been a problem with your network configuration, specifically "
--"your proxy's hostname. If you have been accessing the Internet with no problems "
--"recently, this is unlikely."
--msgstr "您的網路設定可能有問題，特別是您的 proxy 主機名稱。如果您最近曾經很正常的使用網路，那一定有問題。"
-+"your proxy's hostname. If you have been accessing the Internet with no "
-+"problems recently, this is unlikely."
-+msgstr ""
-+"您的網路設定可能有問題，特別是您的 proxy 主機名稱。如果您最近曾經很正常的使用"
-+"網路，那一定有問題。"
- 
- #: kio/global.cpp:1090
- msgid "Double-check your proxy settings and try again."
-@@ -1936,15 +2000,17 @@
- "Although you may have supplied the correct authentication details, the "
- "authentication failed because the method that the server is using is not "
- "supported by the KDE program implementing the protocol %1."
--msgstr "隨然您或許還沒有提供正確的授權方式，這次授權動作已經失敗了。這樣因為伺服器所提供的授權方式，KDE 程式所實做的 %1 協定中並不支援。"
-+msgstr ""
-+"隨然您或許還沒有提供正確的授權方式，這次授權動作已經失敗了。這樣因為伺服器所"
-+"提供的授權方式，KDE 程式所實做的 %1 協定中並不支援。"
- 
- #: kio/global.cpp:1101
- msgid ""
--"Please file a bug at <a href=\"http://bugs.kde.org/\">http://bugs.kde.org/</a> "
--"to inform the KDE team of the unsupported authentication method."
-+"Please file a bug at <a href=\"http://bugs.kde.org/\">http://bugs.kde.org/</"
-+"a> to inform the KDE team of the unsupported authentication method."
- msgstr ""
--"請在 <a href=\"http://bugs.kde.org/\">http://bugs.kde.org/</a> "
--"做一個錯誤登記，以便告知 KDE 團隊這個不被支援的驗證方式。"
-+"請在 <a href=\"http://bugs.kde.org/\">http://bugs.kde.org/</a> 做一個錯誤登"
-+"記，以便告知 KDE 團隊這個不被支援的驗證方式。"
- 
- #: kio/global.cpp:1107
- msgid "Request Aborted"
-@@ -1964,7 +2030,8 @@
- msgid ""
- "This is most likely to be caused by a bug in the server program. Please "
- "consider submitting a full bug report as detailed below."
--msgstr "這大概是因為該伺服器程式內部有錯誤。請考慮依照下列指示提交完整的錯誤報告。"
-+msgstr ""
-+"這大概是因為該伺服器程式內部有錯誤。請考慮依照下列指示提交完整的錯誤報告。"
- 
- #: kio/global.cpp:1121
- msgid "Contact the administrator of the server to advise them of the problem."
-@@ -1972,8 +2039,8 @@
- 
- #: kio/global.cpp:1123
- msgid ""
--"If you know who the authors of the server software are, submit the bug report "
--"directly to them."
-+"If you know who the authors of the server software are, submit the bug "
-+"report directly to them."
- msgstr "如果您知道誰是該伺服器軟體的作者，請直接把錯誤報告提交給他們。"
- 
- #: kio/global.cpp:1128
-@@ -1982,20 +2049,17 @@
- 
- #: kio/global.cpp:1129
- msgid ""
--"Although contact was made with the server, a response was not received within "
--"the amount of time allocated for the request as follows:"
--"<ul>"
--"<li>Timeout for establishing a connection: %1 seconds</li>"
--"<li>Timeout for receiving a response: %2 seconds</li>"
--"<li>Timeout for accessing proxy servers: %3 seconds</li></ul>"
--"Please note that you can alter these timeout settings in the KDE Control "
--"Center, by selecting Network -> Preferences."
--msgstr ""
--"雖然已經與伺服器聯繫，但在配置給該要求的限定時間內，未收到伺服器的回應，細節如下："
--"<ul>"
--"<li>設立連線逾時時限：%1 秒</li>"
--"<li>接收回應逾時時限：%2 秒</li>"
--"<li>存取代理伺服器逾時時限：%3 秒</li></ul>註：您可以在 KDE 控制中心，選擇 [網路] -> [偏好設定]，以變更這些逾時時限設定。"
-+"Although contact was made with the server, a response was not received "
-+"within the amount of time allocated for the request as follows:"
-+"<ul><li>Timeout for establishing a connection: %1 seconds</li><li>Timeout "
-+"for receiving a response: %2 seconds</li><li>Timeout for accessing proxy "
-+"servers: %3 seconds</li></ul>Please note that you can alter these timeout "
-+"settings in the KDE Control Center, by selecting Network -> Preferences."
-+msgstr ""
-+"雖然已經與伺服器聯繫，但在配置給該要求的限定時間內，未收到伺服器的回應，細節"
-+"如下：<ul><li>設立連線逾時時限：%1 秒</li><li>接收回應逾時時限：%2 秒</"
-+"li><li>存取代理伺服器逾時時限：%3 秒</li></ul>註：您可以在 KDE 控制中心，選"
-+"擇 [網路] -> [偏好設定]，以變更這些逾時時限設定。"
- 
- #: kio/global.cpp:1140
- msgid "The server was too busy responding to other requests to respond."
-@@ -2007,9 +2071,11 @@
- 
- #: kio/global.cpp:1147
- msgid ""
--"The program on your computer which provides access to the <strong>%1</strong> "
--"protocol has reported an unknown error: %2."
--msgstr "您的電腦上，提供 <strong>%1</strong> 協定的存取的程式，報告了一個不明的錯誤：%2。"
-+"The program on your computer which provides access to the <strong>%1</"
-+"strong> protocol has reported an unknown error: %2."
-+msgstr ""
-+"您的電腦上，提供 <strong>%1</strong> 協定的存取的程式，報告了一個不明的錯誤："
-+"%2。"
- 
- #: kio/global.cpp:1155
- msgid "Unknown Interruption"
-@@ -2017,9 +2083,11 @@
- 
- #: kio/global.cpp:1156
- msgid ""
--"The program on your computer which provides access to the <strong>%1</strong> "
--"protocol has reported an interruption of an unknown type: %2."
--msgstr "您的電腦上，提供 <strong>%1</strong> 協定的存取的程式，報告了一種類型不明的中斷：%2。"
-+"The program on your computer which provides access to the <strong>%1</"
-+"strong> protocol has reported an interruption of an unknown type: %2."
-+msgstr ""
-+"您的電腦上，提供 <strong>%1</strong> 協定的存取的程式，報告了一種類型不明的中"
-+"斷：%2。"
- 
- #: kio/global.cpp:1164
- msgid "Could Not Delete Original File"
-@@ -2027,10 +2095,12 @@
- 
- #: kio/global.cpp:1165
- msgid ""
--"The requested operation required the deleting of the original file, most likely "
--"at the end of a file move operation. The original file <strong>%1</strong> "
--"could not be deleted."
--msgstr "要求的作業需要刪除原本的檔案，多數是移動檔案時最後一個動作。可是，現在無法刪除原本的檔案 <strong>%1</strong>。"
-+"The requested operation required the deleting of the original file, most "
-+"likely at the end of a file move operation. The original file <strong>%1</"
-+"strong> could not be deleted."
-+msgstr ""
-+"要求的作業需要刪除原本的檔案，多數是移動檔案時最後一個動作。可是，現在無法刪"
-+"除原本的檔案 <strong>%1</strong>。"
- 
- #: kio/global.cpp:1174
- msgid "Could Not Delete Temporary File"
-@@ -2038,10 +2108,12 @@
- 
- #: kio/global.cpp:1175
- msgid ""
--"The requested operation required the creation of a temporary file in which to "
--"save the new file while being downloaded. This temporary file <strong>"
--"%1</strong> could not be deleted."
--msgstr "要求的作業需要建立一個暫存檔案，以儲存下載中的新檔案。可是，現在無法刪除該暫存檔案 <strong>%1</strong>。"
-+"The requested operation required the creation of a temporary file in which "
-+"to save the new file while being downloaded. This temporary file <strong>%1</"
-+"strong> could not be deleted."
-+msgstr ""
-+"要求的作業需要建立一個暫存檔案，以儲存下載中的新檔案。可是，現在無法刪除該暫"
-+"存檔案 <strong>%1</strong>。"
- 
- #: kio/global.cpp:1184
- msgid "Could Not Rename Original File"
-@@ -2049,9 +2121,11 @@
- 
- #: kio/global.cpp:1185
- msgid ""
--"The requested operation required the renaming of the original file <strong>"
--"%1</strong>, however it could not be renamed."
--msgstr "要求的作業需要重新命名原本的檔案 <strong>%1</strong>，然而現在卻無法為它重新命名。"
-+"The requested operation required the renaming of the original file <strong>%"
-+"1</strong>, however it could not be renamed."
-+msgstr ""
-+"要求的作業需要重新命名原本的檔案 <strong>%1</strong>，然而現在卻無法為它重新"
-+"命名。"
- 
- #: kio/global.cpp:1193
- msgid "Could Not Rename Temporary File"
-@@ -2059,9 +2133,11 @@
- 
- #: kio/global.cpp:1194
- msgid ""
--"The requested operation required the creation of a temporary file <strong>"
--"%1</strong>, however it could not be created."
--msgstr "要求的作業需要建立一個暫存檔案 <strong>%1</strong>，然而現在無法建立該暫存檔案。"
-+"The requested operation required the creation of a temporary file <strong>%"
-+"1</strong>, however it could not be created."
-+msgstr ""
-+"要求的作業需要建立一個暫存檔案 <strong>%1</strong>，然而現在無法建立該暫存檔"
-+"案。"
- 
- #: kio/global.cpp:1202
- msgid "Could Not Create Link"
-@@ -2092,10 +2168,11 @@
- #: kio/global.cpp:1219
- msgid ""
- "Free up enough disk space by 1) deleting unwanted and temporary files; 2) "
--"archiving files to removable media storage such as CD-Recordable discs; or 3) "
--"obtain more storage capacity."
-+"archiving files to removable media storage such as CD-Recordable discs; or "
-+"3) obtain more storage capacity."
- msgstr ""
--"請以下列方法釋放足夠的磁碟空間： 1) 刪除不需的或暫存的檔案； 2) 把檔案歸檔至抽取式媒體存儲，例如 CD-R 可燒錄光碟； 3) 取得更多存儲容量。"
-+"請以下列方法釋放足夠的磁碟空間： 1) 刪除不需的或暫存的檔案； 2) 把檔案歸檔至"
-+"抽取式媒體存儲，例如 CD-R 可燒錄光碟； 3) 取得更多存儲容量。"
- 
- #: kio/global.cpp:1226
- msgid "Source and Destination Files Identical"
-@@ -2103,8 +2180,8 @@
- 
- #: kio/global.cpp:1227
- msgid ""
--"The operation could not be completed because the source and destination files "
--"are the same file."
-+"The operation could not be completed because the source and destination "
-+"files are the same file."
- msgstr "無法完成作業，因為來源跟目的都是同一個檔案。"
- 
- #: kio/global.cpp:1229
-@@ -2190,8 +2267,8 @@
- 
- #: kio/krun.cpp:900
- msgid ""
--"<qt>Unable to run the command specified. The file or folder <b>%1</b> "
--"does not exist.</qt>"
-+"<qt>Unable to run the command specified. The file or folder <b>%1</b> does "
-+"not exist.</qt>"
- msgstr "<qt>無法執行指定的命令。這個檔案或資料夾 <b>%1</b> 不存在。</qt>"
- 
- #: kio/krun.cpp:1400
-@@ -2288,7 +2365,7 @@
- 
- #: kio/kmimetypechooser.cpp:94
- msgid "&Edit..."
--msgstr "編輯(&E)..."
-+msgstr "編輯(&E)…"
- 
- #: kio/kmimetypechooser.cpp:104
- msgid "Click this button to display the familiar KDE mime type editor."
-@@ -2316,8 +2393,8 @@
- 
- #: kssl/ksslcertdlg.cc:139
- msgid ""
--"The server <b>%1</b> requests a certificate."
--"<p>Select a certificate to use from the list below:"
-+"The server <b>%1</b> requests a certificate.<p>Select a certificate to use "
-+"from the list below:"
- msgstr "伺服器 <b>%1</b> 要求憑證。<p>請從底下的清單中選擇要使用的憑證："
- 
- #: kssl/ksslcertificate.cc:202
-@@ -2372,8 +2449,8 @@
- 
- #: kssl/ksslcertificate.cc:924
- msgid ""
--"Certificate signing authority root files could not be found so the certificate "
--"is not verified."
-+"Certificate signing authority root files could not be found so the "
-+"certificate is not verified."
- msgstr "憑證簽名授權 root 檔無法找到，所以無法驗證憑證。"
- 
- #: kssl/ksslcertificate.cc:927
-@@ -2414,7 +2491,7 @@
- 
- #: kssl/ksslcertificate.cc:946
- msgid "The certificate has not been issued for this host."
--msgstr "此認證並非由這個主機所發佈的。"
-+msgstr "此認證並非由這個主機所發布的。"
- 
- #: kssl/ksslcertificate.cc:948
- msgid "This certificate is not relevant."
-@@ -2450,7 +2527,7 @@
- 
- #: kssl/ksslkeygen.cc:97
- msgid "Please wait while the encryption keys are generated..."
--msgstr "請稍候， 正在產生加密金鑰..."
-+msgstr "請稍候， 正在產生加密金鑰…"
- 
- #: kssl/ksslkeygen.cc:107
- msgid "Do you wish to store the passphrase in your wallet file?"
-@@ -2502,7 +2579,7 @@
- 
- #: kssl/ksslinfodlg.cc:109
- msgid "C&ryptography Configuration..."
--msgstr "加密設定..."
-+msgstr "加密設定…"
- 
- #: kssl/ksslinfodlg.cc:142
- msgid ""
-@@ -2519,7 +2596,7 @@
- 
- #: kssl/ksslinfodlg.cc:193
- msgid "0 - Site Certificate"
--msgstr "0 - 站台認證憑證"
-+msgstr "0 - 站臺認證憑證"
- 
- #: kssl/ksslinfodlg.cc:210
- msgid "Peer certificate:"
-@@ -2650,13 +2727,17 @@
- msgid ""
- "List all supported metadata keys of the given file(s). If mimetype is not "
- "specified, the mimetype of the given files is used."
--msgstr "列出指定檔案所有支援的中繼資料鍵值。如果沒有指定 mime 類型，會使用指定檔案的 mime 類型。"
-+msgstr ""
-+"列出指定檔案所有支援的中繼資料鍵值。如果沒有指定 mime 類型，會使用指定檔案的 "
-+"mime 類型。"
- 
- #: misc/kfile/fileprops.cpp:210
- msgid ""
- "List all preferred metadata keys of the given file(s). If mimetype is not "
- "specified, the mimetype of the given files is used."
--msgstr "列出指定檔案所有偏好的中繼資料鍵值。如果沒有指定 mime 類型，會使用指定檔案的 mime 類型。"
-+msgstr ""
-+"列出指定檔案所有偏好的中繼資料鍵值。如果沒有指定 mime 類型，會使用指定檔案的 "
-+"mime 類型。"
- 
- #: misc/kfile/fileprops.cpp:216
- msgid "List all metadata keys which have a value in the given file(s)."
-@@ -2682,14 +2763,14 @@
- 
- #: misc/kfile/fileprops.cpp:240
- msgid ""
--"Opens a KDE properties dialog to allow viewing and modifying of metadata of the "
--"given file(s)"
-+"Opens a KDE properties dialog to allow viewing and modifying of metadata of "
-+"the given file(s)"
- msgstr "開啟 KDE 屬性對話盒以便檢視並修改指定檔案的中繼資料"
- 
- #: misc/kfile/fileprops.cpp:244
- msgid ""
--"Prints the value for 'key' of the given file(s). 'key' may also be a "
--"comma-separated list of keys"
-+"Prints the value for 'key' of the given file(s). 'key' may also be a comma-"
-+"separated list of keys"
- msgstr "列出指定檔案的「鍵」值。「鍵」值也可能是以逗號分隔的鍵值清單"
- 
- #: misc/kfile/fileprops.cpp:248
-@@ -2732,15 +2813,17 @@
- 
- #: misc/kwalletd/kwalletd.cpp:400
- msgid ""
--"<qt>KDE has requested to open the wallet '<b>%1</b>'. Please enter the password "
--"for this wallet below."
-+"<qt>KDE has requested to open the wallet '<b>%1</b>'. Please enter the "
-+"password for this wallet below."
- msgstr "<qt>KDE 被要求開啟錢包「<b>%1</b>」。請在下面輸入這個錢包的密碼。"
- 
- #: misc/kwalletd/kwalletd.cpp:402
- msgid ""
--"<qt>The application '<b>%1</b>' has requested to open the wallet '<b>%2</b>"
--"'. Please enter the password for this wallet below."
--msgstr "<qt>應用程式「<b>%1</b>」要求開啟錢包「<b>%2</b>」。請在下面輸入這個錢包的密碼。"
-+"<qt>The application '<b>%1</b>' has requested to open the wallet '<b>%2</"
-+"b>'. Please enter the password for this wallet below."
-+msgstr ""
-+"<qt>應用程式「<b>%1</b>」要求開啟錢包「<b>%2</b>」。請在下面輸入這個錢包的密"
-+"碼。"
- 
- #: kfile/kfiledialog.cpp:1833 misc/kwalletd/kwalletd.cpp:405
- #: misc/kwalletd/kwalletd.cpp:419
-@@ -2749,33 +2832,39 @@
- 
- #: misc/kwalletd/kwalletd.cpp:414
- msgid ""
--"KDE has requested to open the wallet. This is used to store sensitive data in a "
--"secure fashion. Please enter a password to use with this wallet or click cancel "
--"to deny the application's request."
--msgstr "KDE 被要求開啟錢包。這是一種很安全的儲存敏感資料的方式。請輸入密碼來使用這個錢包或者按取消來拒絕應用程式的要求。"
-+"KDE has requested to open the wallet. This is used to store sensitive data "
-+"in a secure fashion. Please enter a password to use with this wallet or "
-+"click cancel to deny the application's request."
-+msgstr ""
-+"KDE 被要求開啟錢包。這是一種很安全的儲存敏感資料的方式。請輸入密碼來使用這個"
-+"錢包或者按取消來拒絕應用程式的要求。"
- 
- #: misc/kwalletd/kwalletd.cpp:416
- msgid ""
--"<qt>The application '<b>%1</b>' has requested to open the KDE wallet. This is "
--"used to store sensitive data in a secure fashion. Please enter a password to "
--"use with this wallet or click cancel to deny the application's request."
-+"<qt>The application '<b>%1</b>' has requested to open the KDE wallet. This "
-+"is used to store sensitive data in a secure fashion. Please enter a password "
-+"to use with this wallet or click cancel to deny the application's request."
- msgstr ""
--"<qt>應用程式「<b>%1</b>」要求開啟 KDE 錢包。這是一種很安全的儲存敏感資料的方式。請輸入密碼來使用這個錢包或者按取消來拒絕應用程式的要求。"
-+"<qt>應用程式「<b>%1</b>」要求開啟 KDE 錢包。這是一種很安全的儲存敏感資料的方"
-+"式。請輸入密碼來使用這個錢包或者按取消來拒絕應用程式的要求。"
- 
- #: misc/kwalletd/kwalletd.cpp:423
- msgid ""
--"<qt>KDE has requested to create a new wallet named '<b>%1</b>"
--"'. Please choose a password for this wallet, or cancel to deny the "
--"application's request."
--msgstr "<qt>KDE 被要求建立一個新的名為「<b>%1</b>」的錢包。請選擇給這個錢包使用的密碼，或者按取消來拒絕應用程式的要求。"
-+"<qt>KDE has requested to create a new wallet named '<b>%1</b>'. Please "
-+"choose a password for this wallet, or cancel to deny the application's "
-+"request."
-+msgstr ""
-+"<qt>KDE 被要求建立一個新的名為「<b>%1</b>」的錢包。請選擇給這個錢包使用的密"
-+"碼，或者按取消來拒絕應用程式的要求。"
- 
- #: misc/kwalletd/kwalletd.cpp:425
- msgid ""
--"<qt>The application '<b>%1</b>' has requested to create a new wallet named '<b>"
--"%2</b>'. Please choose a password for this wallet, or cancel to deny the "
-+"<qt>The application '<b>%1</b>' has requested to create a new wallet named "
-+"'<b>%2</b>'. Please choose a password for this wallet, or cancel to deny the "
- "application's request."
- msgstr ""
--"<qt>應用程式「<b>%1</b>」要求建立一個新的名為「<b>%2</b>」的錢包。請選擇給這個錢包使用的密碼，或者按取消來拒絕應用程式的要求。"
-+"<qt>應用程式「<b>%1</b>」要求建立一個新的名為「<b>%2</b>」的錢包。請選擇給這"
-+"個錢包使用的密碼，或者按取消來拒絕應用程式的要求。"
- 
- #: misc/kwalletd/kwalletd.cpp:428
- msgid "C&reate"
-@@ -2789,9 +2878,10 @@
- 
- #: misc/kwalletd/kwalletd.cpp:444
- msgid ""
--"<qt>Error opening the wallet '<b>%1</b>'. Please try again."
--"<br>(Error code %2: %3)"
--msgstr "<qt>在開啟錢包「<b>%1</b>」時發生錯誤。請再試一次。<br>(錯誤代碼 %2: %3)"
-+"<qt>Error opening the wallet '<b>%1</b>'. Please try again.<br>(Error code %"
-+"2: %3)"
-+msgstr ""
-+"<qt>在開啟錢包「<b>%1</b>」時發生錯誤。請再試一次。<br>(錯誤代碼 %2: %3)"
- 
- #: misc/kwalletd/kwalletd.cpp:518
- msgid "<qt>KDE has requested access to the open wallet '<b>%1</b>'."
-@@ -2799,8 +2889,8 @@
- 
- #: misc/kwalletd/kwalletd.cpp:520
- msgid ""
--"<qt>The application '<b>%1</b>' has requested access to the open wallet '<b>"
--"%2</b>'."
-+"<qt>The application '<b>%1</b>' has requested access to the open wallet '<b>%"
-+"2</b>'."
- msgstr "<qt>應用程式「<b>%1</b>」要求存取開啟的錢包「<b>%2</b>」。"
- 
- #: misc/kwalletd/kwalletd.cpp:607
-@@ -2853,7 +2943,7 @@
- 
- #: misc/uiserver.cpp:98 misc/uiserver.cpp:603 misc/uiserver.cpp:682
- msgid "Settings..."
--msgstr "設定..."
-+msgstr "設定…"
- 
- #: misc/uiserver.cpp:126
- msgid "Configure Network Operation Window"
-@@ -3077,10 +3167,8 @@
- msgstr "給「command」使用的網址或本地檔案"
- 
- #: kioexec/main.cpp:73
--msgid ""
--"'command' expected.\n"
--msgstr ""
--"預期的「command」。\n"
-+msgid "'command' expected.\n"
-+msgstr "預期的「command」。\n"
- 
- #: kioexec/main.cpp:102
- msgid ""
-@@ -3188,7 +3276,7 @@
- 
- #: kfile/kcustommenueditor.cpp:98
- msgid "New..."
--msgstr "新增..."
-+msgstr "新增…"
- 
- #: kfile/kcustommenueditor.cpp:100
- msgid "Move Up"
-@@ -3220,9 +3308,11 @@
- 
- #: kfile/kopenwith.cpp:326
- msgid ""
--"<qt>Select the program that should be used to open <b>%1</b>"
--". If the program is not listed, enter the name or click the browse button.</qt>"
--msgstr "<qt>選取用來開啟 <b>%1</b> 的程式。如果程式不在清單中，請輸入程式名稱或按一下瀏覽按鈕。</qt>"
-+"<qt>Select the program that should be used to open <b>%1</b>. If the program "
-+"is not listed, enter the name or click the browse button.</qt>"
-+msgstr ""
-+"<qt>選取用來開啟 <b>%1</b> 的程式。如果程式不在清單中，請輸入程式名稱或按一下"
-+"瀏覽按鈕。</qt>"
- 
- #: kfile/kopenwith.cpp:332
- msgid "Choose the name of the program with which to open the selected files."
-@@ -3237,7 +3327,9 @@
- msgid ""
- "<qt>Select the program for the file type: <b>%1</b>. If the program is not "
- "listed, enter the name or click the browse button.</qt>"
--msgstr "<qt>選取開啟檔案類型 <b>%1</b> 使用的程式。如果要使用的程式不在清單中，請輸入程式名稱或按一下瀏覽按鈕。</qt>"
-+msgstr ""
-+"<qt>選取開啟檔案類型 <b>%1</b> 使用的程式。如果要使用的程式不在清單中，請輸入"
-+"程式名稱或按一下瀏覽按鈕。</qt>"
- 
- #: kfile/kopenwith.cpp:366
- msgid "Choose Application"
-@@ -3245,9 +3337,11 @@
- 
- #: kfile/kopenwith.cpp:367
- msgid ""
--"<qt>Select a program. If the program is not listed, enter the name or click the "
--"browse button.</qt>"
--msgstr "<qt>請選擇程式。如果所需程式不在清單中，請輸入程式名稱或按一下[瀏覽]按鈕。</qt>"
-+"<qt>Select a program. If the program is not listed, enter the name or click "
-+"the browse button.</qt>"
-+msgstr ""
-+"<qt>請選擇程式。如果所需程式不在清單中，請輸入程式名稱或按一下[瀏覽]按鈕。</"
-+"qt>"
- 
- #: kfile/kopenwith.cpp:406
- msgid "Clear input field"
-@@ -3258,8 +3352,8 @@
- "Following the command, you can have several place holders which will be "
- "replaced with the actual values when the actual program is run:\n"
- "%f - a single file name\n"
--"%F - a list of files; use for applications that can open several local files at "
--"once\n"
-+"%F - a list of files; use for applications that can open several local files "
-+"at once\n"
- "%u - a single URL\n"
- "%U - a list of URLs\n"
- "%d - the directory of the file to open\n"
-@@ -3311,7 +3405,7 @@
- #: kfile/kicondialog.cpp:283 kfile/kpropertiesdialog.cpp:3615 rc.cpp:288
- #, no-c-format
- msgid "&Browse..."
--msgstr "瀏覽(&B)..."
-+msgstr "瀏覽(&B)…"
- 
- #: kfile/kicondialog.cpp:293
- msgid "Clear Search"
-@@ -3415,11 +3509,11 @@
- 
- #: kfile/kacleditwidget.cpp:81
- msgid "Add Entry..."
--msgstr "新增項目..."
-+msgstr "新增項目…"
- 
- #: kfile/kacleditwidget.cpp:83
- msgid "Edit Entry..."
--msgstr "編輯項目..."
-+msgstr "編輯項目…"
- 
- #: kfile/kacleditwidget.cpp:85
- msgid "Delete Entry"
-@@ -3486,7 +3580,7 @@
- #: kfile/kdiroperator.cpp:1269 kfile/kdirselectdialog.cpp:92
- #: kfile/kdirselectdialog.cpp:125
- msgid "New Folder..."
--msgstr "新增資料夾..."
-+msgstr "新增資料夾…"
- 
- #: kfile/kdirselectdialog.cpp:109
- msgid "Folders"
-@@ -3581,21 +3675,15 @@
- 
- #: kfile/knotifydialog.cpp:309
- msgid ""
--"<qt>You may use the following macros"
--"<br>in the commandline:"
--"<br><b>%e</b>: for the event name,"
--"<br><b>%a</b>: for the name of the application that sent the event,"
--"<br><b>%s</b>: for the notification message,"
--"<br><b>%w</b>: for the numeric window ID where the event originated,"
--"<br><b>%i</b>: for the numeric event ID."
--msgstr ""
--"<qt>您可以將下列巨集"
--"<br>用在命令列中："
--"<br><b>%e</b>：為事件名稱，"
--"<br><b>%a</b>：為送出該事件的應用程式名稱，"
--"<br><b>%s</b>：為通知訊息，"
--"<br><b>%w</b>：為事件出現的視窗數字 ID ，"
--"<br><b>%i</b>：為數字式的事件 ID。"
-+"<qt>You may use the following macros<br>in the commandline:<br><b>%e</b>: "
-+"for the event name,<br><b>%a</b>: for the name of the application that sent "
-+"the event,<br><b>%s</b>: for the notification message,<br><b>%w</b>: for the "
-+"numeric window ID where the event originated,<br><b>%i</b>: for the numeric "
-+"event ID."
-+msgstr ""
-+"<qt>您可以將下列巨集<br>用在命令列中：<br><b>%e</b>：為事件名稱，<br><b>%a</"
-+"b>：為送出該事件的應用程式名稱，<br><b>%s</b>：為通知訊息，<br><b>%w</b>：為"
-+"事件出現的視窗數字 ID ，<br><b>%i</b>：為數字式的事件 ID。"
- 
- #: kfile/knotifydialog.cpp:339
- msgid "Advanced <<"
-@@ -3677,10 +3765,12 @@
- 
- #: kfile/kfiledialog.cpp:782
- msgid ""
--"<p>While typing in the text area, you may be presented with possible matches. "
--"This feature can be controlled by clicking with the right mouse button and "
--"selecting a preferred mode from the <b>Text Completion</b> menu."
--msgstr "<p>在文字區輸入時，您會看到可能的相符項目。這項功能可以按滑鼠右鍵從<b>文字補齊</b>選單選擇您所偏好的模式來控制。"
-+"<p>While typing in the text area, you may be presented with possible "
-+"matches. This feature can be controlled by clicking with the right mouse "
-+"button and selecting a preferred mode from the <b>Text Completion</b> menu."
-+msgstr ""
-+"<p>在文字區輸入時，您會看到可能的相符項目。這項功能可以按滑鼠右鍵從<b>文字補"
-+"齊</b>選單選擇您所偏好的模式來控制。"
- 
- #: kfile/kfiledialog.cpp:791
- msgid "This is the name to save the file as."
-@@ -3702,10 +3792,12 @@
- 
- #: kfile/kfiledialog.cpp:842
- msgid ""
--"This is the currently listed location. The drop-down list also lists commonly "
--"used locations. This includes standard locations, such as your home folder, as "
--"well as locations that have been visited recently."
--msgstr "這裡是目前清單的位置。常常使用的位置會列在這裡。這包含了標準位置，像是您的家目錄，還有最近參訪過的位置。"
-+"This is the currently listed location. The drop-down list also lists "
-+"commonly used locations. This includes standard locations, such as your home "
-+"folder, as well as locations that have been visited recently."
-+msgstr ""
-+"這裡是目前清單的位置。常常使用的位置會列在這裡。這包含了標準位置，像是您的家"
-+"目錄，還有最近參訪過的位置。"
- 
- #: kfile/kfiledialog.cpp:849
- #, c-format
-@@ -3729,12 +3821,12 @@
- 
- #: kfile/kfiledialog.cpp:912
- msgid ""
--"<qt>Click this button to enter the parent folder."
--"<p>For instance, if the current location is file:/home/%1 clicking this button "
--"will take you to file:/home.</qt>"
-+"<qt>Click this button to enter the parent folder.<p>For instance, if the "
-+"current location is file:/home/%1 clicking this button will take you to "
-+"file:/home.</qt>"
- msgstr ""
--"<qt>按這個按鈕來進入上一層目錄。"
--"<p>例如，如果目前位置是 file:/home/%1，按這個按鈕將把您帶到  file:/home。</qt>"
-+"<qt>按這個按鈕來進入上一層目錄。<p>例如，如果目前位置是 file:/home/%1，按這個"
-+"按鈕將把您帶到  file:/home。</qt>"
- 
- #: kfile/kfiledialog.cpp:916
- msgid "Click this button to move backwards one step in the browsing history."
-@@ -3770,24 +3862,16 @@
- 
- #: kfile/kfiledialog.cpp:938
- msgid ""
--"<qt>This is the configuration menu for the file dialog. Various options can be "
--"accessed from this menu including: "
--"<ul>"
--"<li>how files are sorted in the list</li>"
--"<li>types of view, including icon and list</li>"
--"<li>showing of hidden files</li>"
--"<li>the Quick Access navigation panel</li>"
--"<li>file previews</li>"
--"<li>separating folders from files</li></ul></qt>"
--msgstr ""
--"<qt>這是檔案對話方塊的組態設定選單。此選單中可存取的各種選項包括："
--"<ul>"
--"<li>清單中的檔案如何排序</li>"
--"<li>檢視類型，包括圖示和列表</li>"
--"<li>隱藏檔案的顯示</li>"
--"<li>快速存取導覽面板</li>"
--"<li>檔案預覽</li>"
--"<li>區分檔案和目錄</li></ul></qt>"
-+"<qt>This is the configuration menu for the file dialog. Various options can "
-+"be accessed from this menu including: <ul><li>how files are sorted in the "
-+"list</li><li>types of view, including icon and list</li><li>showing of "
-+"hidden files</li><li>the Quick Access navigation panel</li><li>file "
-+"previews</li><li>separating folders from files</li></ul></qt>"
-+msgstr ""
-+"<qt>這是檔案對話方塊的組態設定選單。此選單中可存取的各種選項包括：<ul><li>清"
-+"單中的檔案如何排序</li><li>檢視類型，包括圖示和列表</li><li>隱藏檔案的顯示</"
-+"li><li>快速存取導覽面板</li><li>檔案預覽</li><li>區分檔案和目錄</li></ul></"
-+"qt>"
- 
- #: kfile/kfiledialog.cpp:992
- msgid "&Location:"
-@@ -3795,15 +3879,14 @@
- 
- #: kfile/kfiledialog.cpp:1017
- msgid ""
--"<qt>This is the filter to apply to the file list. File names that do not match "
--"the filter will not be shown."
--"<p>You may select from one of the preset filters in the drop down menu, or you "
--"may enter a custom filter directly into the text area."
--"<p>Wildcards such as * and ? are allowed.</qt>"
--msgstr ""
--"<qt>這是應用到檔案清單的篩選器。不符合該篩選器的檔案名稱將不會被顯示。"
--"<p>您可以從下拉選單中選擇預設的篩選器，或者直接在文字區域中輸入自訂的篩選器。"
--"<p>允許使用 * 和 ? 萬用字元。</qt>"
-+"<qt>This is the filter to apply to the file list. File names that do not "
-+"match the filter will not be shown.<p>You may select from one of the preset "
-+"filters in the drop down menu, or you may enter a custom filter directly "
-+"into the text area.<p>Wildcards such as * and ? are allowed.</qt>"
-+msgstr ""
-+"<qt>這是應用到檔案清單的篩選器。不符合該篩選器的檔案名稱將不會被顯示。<p>您可"
-+"以從下拉選單中選擇預設的篩選器，或者直接在文字區域中輸入自訂的篩選器。<p>允許"
-+"使用 * 和 ? 萬用字元。</qt>"
- 
- #: kfile/kfiledialog.cpp:1023
- msgid "&Filter:"
-@@ -3859,44 +3942,36 @@
- 
- #: kfile/kfiledialog.cpp:1994
- msgid ""
--"This option enables some convenient features for saving files with extensions:"
--"<br>"
--"<ol>"
--"<li>Any extension specified in the <b>%1</b> text area will be updated if you "
--"change the file type to save in."
--"<br>"
--"<br></li>"
--"<li>If no extension is specified in the <b>%2</b> text area when you click <b>"
--"Save</b>, %3 will be added to the end of the filename (if the filename does not "
--"already exist). This extension is based on the file type that you have chosen "
--"to save in."
--"<br>"
--"<br>If you do not want KDE to supply an extension for the filename, you can "
--"either turn this option off or you can suppress it by adding a period (.) to "
--"the end of the filename (the period will be automatically removed).</li></ol>"
--"If unsure, keep this option enabled as it makes your files more manageable."
--msgstr ""
--"這個選項啟用了一些儲存檔案名稱與延伸檔名的便利功能："
--"<br>"
--"<ol>"
--"<li>如果您改變了要儲存的檔案類型，任何在 <b>%1</b> 文字區域指定的延伸檔名都會被更新。"
--"<br>"
--"<br></li>"
--"<li>當您按下<b>儲存</b>時，如果在 <b>%2</b> 文字區域中沒有指定延伸檔名，%3 "
--"會被加到檔案名稱的結尾（如果檔案名稱尚未存在）。這個延伸檔名是根據您選擇儲存的檔案類型而定。"
--"<br>"
--"<br>如果你不想要 KDE 提供任何延伸檔名，您可以將此選項關閉或者您可以在檔案名稱的結尾加上句點(.)來限制它（這個句點會自動被移除）。</li></ol>"
--"如果不確定，保持啟用此選項，因為它會讓您的檔案更容易管理。"
-+"This option enables some convenient features for saving files with "
-+"extensions:<br><ol><li>Any extension specified in the <b>%1</b> text area "
-+"will be updated if you change the file type to save in.<br><br></li><li>If "
-+"no extension is specified in the <b>%2</b> text area when you click <b>Save</"
-+"b>, %3 will be added to the end of the filename (if the filename does not "
-+"already exist). This extension is based on the file type that you have "
-+"chosen to save in.<br><br>If you do not want KDE to supply an extension for "
-+"the filename, you can either turn this option off or you can suppress it by "
-+"adding a period (.) to the end of the filename (the period will be "
-+"automatically removed).</li></ol>If unsure, keep this option enabled as it "
-+"makes your files more manageable."
-+msgstr ""
-+"這個選項啟用了一些儲存檔案名稱與延伸檔名的便利功能：<br><ol><li>如果您改變了"
-+"要儲存的檔案類型，任何在 <b>%1</b> 文字區域指定的延伸檔名都會被更新。"
-+"<br><br></li><li>當您按下<b>儲存</b>時，如果在 <b>%2</b> 文字區域中沒有指定延"
-+"伸檔名，%3 會被加到檔案名稱的結尾（如果檔案名稱尚未存在）。這個延伸檔名是根據"
-+"您選擇儲存的檔案類型而定。<br><br>如果你不想要 KDE 提供任何延伸檔名，您可以將"
-+"此選項關閉或者您可以在檔案名稱的結尾加上句點(.)來限制它（這個句點會自動被移"
-+"除）。</li></ol>如果不確定，保持啟用此選項，因為它會讓您的檔案更容易管理。"
- 
- #: kfile/kfiledialog.cpp:2268
- msgid ""
--"<qt>This button allows you to bookmark specific locations. Click on this button "
--"to open the bookmark menu where you may add, edit or select a bookmark."
--"<p>These bookmarks are specific to the file dialog, but otherwise operate like "
--"bookmarks elsewhere in KDE.</qt>"
--msgstr ""
--"<qt>這個按鈕可以讓您將指定位置加入書籤。按這個按鈕將打開書籤選單，其中您可以添加、編輯或選擇書籤。"
--"<p>這些書籤專用於檔案對話方塊，但是可以像 KDE 其他地方的書籤一樣操作。</qt>"
-+"<qt>This button allows you to bookmark specific locations. Click on this "
-+"button to open the bookmark menu where you may add, edit or select a "
-+"bookmark.<p>These bookmarks are specific to the file dialog, but otherwise "
-+"operate like bookmarks elsewhere in KDE.</qt>"
-+msgstr ""
-+"<qt>這個按鈕可以讓您將指定位置加入書籤。按這個按鈕將打開書籤選單，其中您可以"
-+"添加、編輯或選擇書籤。<p>這些書籤專用於檔案對話方塊，但是可以像 KDE 其他地方"
-+"的書籤一樣操作。</qt>"
- 
- #: kfile/kfileiconview.cpp:62
- msgid "Small Icons"
-@@ -4157,7 +4232,7 @@
- 
- #: kfile/kpropertiesdialog.cpp:1248
- msgid "Calculating..."
--msgstr "計算中..."
-+msgstr "計算中…"
- 
- #: kfile/kpropertiesdialog.cpp:1282
- msgid "Stopped"
-@@ -4172,8 +4247,8 @@
- #: kfile/kpropertiesdialog.cpp:3340 kfile/kpropertiesdialog.cpp:3836
- #: kfile/kpropertiesdialog.cpp:4079
- msgid ""
--"<qt>Could not save properties. You do not have sufficient access to write to <b>"
--"%1</b>.</qt>"
-+"<qt>Could not save properties. You do not have sufficient access to write to "
-+"<b>%1</b>.</qt>"
- msgstr "<qt>無法儲存內容。您沒有足夠的存取權來寫入 <b>%1</b>。</qt>"
- 
- #: kfile/kpropertiesdialog.cpp:1534 kfile/kpropertiesdialog.cpp:1538
-@@ -4245,8 +4320,8 @@
- 
- #: kfile/kpropertiesdialog.cpp:1689
- msgid ""
--"Specifies the actions that all users, who are neither owner nor in the group, "
--"are allowed to do."
-+"Specifies the actions that all users, who are neither owner nor in the "
-+"group, are allowed to do."
- msgstr "指定所有既非擁有者也不在群組中的使用者被允許進行的動作。"
- 
- #: kfile/kpropertiesdialog.cpp:1694
-@@ -4260,15 +4335,19 @@
- #: kfile/kpropertiesdialog.cpp:1699
- msgid ""
- "Enable this option to allow only the folder's owner to delete or rename the "
--"contained files and folders. Other users can only add new files, which requires "
--"the 'Modify Content' permission."
--msgstr "啟用此選項將指允許資料夾的擁有者可以刪除或重新命名包含的檔案與資料夾。其他的使用者只能加入新的檔案，但必須具有「編輯內容」的權限。"
-+"contained files and folders. Other users can only add new files, which "
-+"requires the 'Modify Content' permission."
-+msgstr ""
-+"啟用此選項將指允許資料夾的擁有者可以刪除或重新命名包含的檔案與資料夾。其他的"
-+"使用者只能加入新的檔案，但必須具有「編輯內容」的權限。"
- 
- #: kfile/kpropertiesdialog.cpp:1703
- msgid ""
- "Enable this option to mark the file as executable. This only makes sense for "
- "programs and scripts. It is required when you want to execute them."
--msgstr "啟用此選項會將檔案標示為可執行。這只對程式與命令稿有意義。當您要執行它們的時候，這是必須的。"
-+msgstr ""
-+"啟用此選項會將檔案標示為可執行。這只對程式與命令稿有意義。當您要執行它們的時"
-+"候，這是必須的。"
- 
- #: kfile/kpropertiesdialog.cpp:1710
- msgid "A&dvanced Permissions"
-@@ -4332,9 +4411,11 @@
- 
- #: kfile/kpropertiesdialog.cpp:1938
- msgid ""
--"This flag allows adding, renaming and deleting of files. Note that deleting and "
--"renaming can be limited using the Sticky flag."
--msgstr "這個旗標允許加入、重新命名與刪除檔案。注意刪除與重新命名可以使用相黏旗標來限制。"
-+"This flag allows adding, renaming and deleting of files. Note that deleting "
-+"and renaming can be limited using the Sticky flag."
-+msgstr ""
-+"這個旗標允許加入、重新命名與刪除檔案。注意刪除與重新命名可以使用相黏旗標來限"
-+"制。"
- 
- #: kfile/kpropertiesdialog.cpp:1941
- msgid "The Write flag allows modifying the content of the file."
-@@ -4364,9 +4445,10 @@
- 
- #: kfile/kpropertiesdialog.cpp:1965
- msgid ""
--"Special flag. Valid for the whole folder, the exact meaning of the flag can be "
--"seen in the right hand column."
--msgstr "特殊的旗標。對整個資料夾都有效，這個旗標精確的意思可以在右手邊的欄位看到。"
-+"Special flag. Valid for the whole folder, the exact meaning of the flag can "
-+"be seen in the right hand column."
-+msgstr ""
-+"特殊的旗標。對整個資料夾都有效，這個旗標精確的意思可以在右手邊的欄位看到。"
- 
- #: kfile/kpropertiesdialog.cpp:1968
- msgid ""
-@@ -4392,8 +4474,8 @@
- 
- #: kfile/kpropertiesdialog.cpp:1991
- msgid ""
--"If this file is an executable and the flag is set, it will be executed with the "
--"permissions of the owner."
-+"If this file is an executable and the flag is set, it will be executed with "
-+"the permissions of the owner."
- msgstr "如果這個檔案是可執行檔並且設定這個旗標，它將會以擁有者的權限執行。"
- 
- #: kfile/kpropertiesdialog.cpp:1995
-@@ -4407,8 +4489,8 @@
- 
- #: kfile/kpropertiesdialog.cpp:2002
- msgid ""
--"If this file is an executable and the flag is set, it will be executed with the "
--"permissions of the group."
-+"If this file is an executable and the flag is set, it will be executed with "
-+"the permissions of the group."
- msgstr "如果這個檔案是可執行檔並且設定這個旗標，它將會以群組的權限執行。"
- 
- #: kfile/kpropertiesdialog.cpp:2006
-@@ -4421,11 +4503,14 @@
- msgid ""
- "If the Sticky flag is set on a folder, only the owner and root can delete or "
- "rename files. Otherwise everybody with write permissions can do this."
--msgstr "如果在資料夾上設定相黏旗標，只有擁有者和 root 可以刪除或重新命名檔案。否則任何具有寫入權限的人都可以進行此項動作。"
-+msgstr ""
-+"如果在資料夾上設定相黏旗標，只有擁有者和 root 可以刪除或重新命名檔案。否則任"
-+"何具有寫入權限的人都可以進行此項動作。"
- 
- #: kfile/kpropertiesdialog.cpp:2014
- msgid ""
--"The Sticky flag on a file is ignored on Linux, but may be used on some systems"
-+"The Sticky flag on a file is ignored on Linux, but may be used on some "
-+"systems"
- msgstr "在檔案上的相黏旗標會被 Linux 忽略，但是可能會被某些系統使用"
- 
- #: kfile/kpropertiesdialog.cpp:2193
-@@ -4543,8 +4628,8 @@
- "Following the command, you can have several place holders which will be "
- "replaced with the actual values when the actual program is run:\n"
- "%f - a single file name\n"
--"%F - a list of files; use for applications that can open several local files at "
--"once\n"
-+"%F - a list of files; use for applications that can open several local files "
-+"at once\n"
- "%u - a single URL\n"
- "%U - a list of URLs\n"
- "%d - the folder of the file to open\n"
-@@ -4598,7 +4683,7 @@
- #: kfile/kpropertiesdialog.cpp:3696 rc.cpp:99
- #, no-c-format
- msgid "Ru&n as a different user"
--msgstr "以不同使用者身份執行(&N)"
-+msgstr "以不同使用者身分執行(&N)"
- 
- #: kfile/kpropertiesdialog.cpp:3937
- msgid "Description:"
-@@ -4632,7 +4717,8 @@
- msgid ""
- "Sharing this folder makes it available under Linux/UNIX (NFS) and Windows "
- "(Samba)."
--msgstr "共用這個目錄，將使它可以在 Linux/UNIX (NFS) 和 Windows (Samba) 中存取。"
-+msgstr ""
-+"共用這個目錄，將使它可以在 Linux/UNIX (NFS) 和 Windows (Samba) 中存取。"
- 
- #: kfile/kfilesharedlg.cpp:162
- msgid "You can also reconfigure file sharing authorization."
-@@ -4640,12 +4726,13 @@
- 
- #: kfile/kfilesharedlg.cpp:165 kfile/kfilesharedlg.cpp:189
- msgid "Configure File Sharing..."
--msgstr "設定檔案共用..."
-+msgstr "設定檔案共用…"
- 
- #: kfile/kfilesharedlg.cpp:174
- msgid ""
- "Error running 'filesharelist'. Check if installed and in $PATH or /usr/sbin."
--msgstr "執行「filesharelist」出錯。請檢查該程式是否已經安裝在 $PATH 或 /usr/sbin 中。"
-+msgstr ""
-+"執行「filesharelist」出錯。請檢查該程式是否已經安裝在 $PATH 或 /usr/sbin 中。"
- 
- #: kfile/kfilesharedlg.cpp:181
- msgid "You need to be authorized to share folders."
-@@ -4663,7 +4750,9 @@
- msgid ""
- "An error occurred while trying to share folder '%1'. Make sure that the Perl "
- "script 'fileshareset' is set suid root."
--msgstr "當嘗試分享資料夾「%1」時發生錯誤。請確定 Perl 命令稿「fileshareset」是設定 suid 為 root。"
-+msgstr ""
-+"當嘗試分享資料夾「%1」時發生錯誤。請確定 Perl 命令稿「fileshareset」是設定 "
-+"suid 為 root。"
- 
- #: kfile/kfilesharedlg.cpp:255
- msgid "Unsharing folder '%1' failed."
-@@ -4671,20 +4760,21 @@
- 
- #: kfile/kfilesharedlg.cpp:256
- msgid ""
--"An error occurred while trying to unshare folder '%1'. Make sure that the Perl "
--"script 'fileshareset' is set suid root."
--msgstr "當嘗試取消分享資料夾「%1」時發生錯誤。請確定 Perl 命令稿「fileshareset」是設定 suid 為 root。"
-+"An error occurred while trying to unshare folder '%1'. Make sure that the "
-+"Perl script 'fileshareset' is set suid root."
-+msgstr ""
-+"當嘗試取消分享資料夾「%1」時發生錯誤。請確定 Perl 命令稿「fileshareset」是設"
-+"定 suid 為 root。"
- 
- #: kfile/kurlbar.cpp:348
- msgid ""
- "<qt>The <b>Quick Access</b> panel provides easy access to commonly used file "
--"locations."
--"<p>Clicking on one of the shortcut entries will take you to that location."
--"<p>By right clicking on an entry you can add, edit and remove shortcuts.</qt>"
--msgstr ""
--"<qt><b>快速存取</b>面板提供對常使用檔案位置的簡易存取方式。"
--"<p>按下捷徑項目之一會把您帶到該位置。"
--"<p>在項目上按右鍵則可以加入、編輯和移除捷徑。</qt>"
-+"locations.<p>Clicking on one of the shortcut entries will take you to that "
-+"location.<p>By right clicking on an entry you can add, edit and remove "
-+"shortcuts.</qt>"
-+msgstr ""
-+"<qt><b>快速存取</b>面板提供對常使用檔案位置的簡易存取方式。<p>按下捷徑項目之"
-+"一會把您帶到該位置。<p>在項目上按右鍵則可以加入、編輯和移除捷徑。</qt>"
- 
- #: kfile/kurlbar.cpp:730
- msgid "&Large Icons"
-@@ -4696,11 +4786,11 @@
- 
- #: kfile/kurlbar.cpp:736
- msgid "&Edit Entry..."
--msgstr "編輯項目(&E)..."
-+msgstr "編輯項目(&E)…"
- 
- #: kfile/kurlbar.cpp:740
- msgid "&Add Entry..."
--msgstr "新增項目(&A)..."
-+msgstr "新增項目(&A)…"
- 
- #: kfile/kurlbar.cpp:744
- msgid "&Remove Entry"
-@@ -4722,10 +4812,12 @@
- 
- #: kfile/kurlbar.cpp:932
- msgid ""
--"<qt>This is the text that will appear in the Quick Access panel."
--"<p>The description should consist of one or two words that will help you "
--"remember what this entry refers to.</qt>"
--msgstr "<qt>這是會顯示在快速存取面板中的文字。<p>此描述應該是一或兩個字的組合以協助您記得這個項目參考到何處。</qt>"
-+"<qt>This is the text that will appear in the Quick Access panel.<p>The "
-+"description should consist of one or two words that will help you remember "
-+"what this entry refers to.</qt>"
-+msgstr ""
-+"<qt>這是會顯示在快速存取面板中的文字。<p>此描述應該是一或兩個字的組合以協助您"
-+"記得這個項目參考到何處。</qt>"
- 
- #. i18n: file ./kfile/kpropertiesdesktopbase.ui line 125
- #: kfile/kurlbar.cpp:935 rc.cpp:239
-@@ -4735,19 +4827,14 @@
- 
- #: kfile/kurlbar.cpp:942
- msgid ""
--"<qt>This is the location associated with the entry. Any valid URL may be used. "
--"For example:"
--"<p>%1"
--"<br>http://www.kde.org"
--"<br>ftp://ftp.kde.org/pub/kde/stable"
--"<p>By clicking on the button next to the text edit box you can browse to an "
--"appropriate URL.</qt>"
--msgstr ""
--"<qt>這是此項目所關聯的位置。可以使用任何有效的網址。例如："
--"<p>%1"
--"<br>http://www.kde.org"
--"<br>ftp://ftp.kde.org/pub/kde/stable"
--"<p>按下文字編輯方塊旁邊的按鈕可以讓您瀏覽合適的網址。</qt>"
-+"<qt>This is the location associated with the entry. Any valid URL may be "
-+"used. For example:<p>%1<br>http://www.kde.org<br>ftp://ftp.kde.org/pub/kde/"
-+"stable<p>By clicking on the button next to the text edit box you can browse "
-+"to an appropriate URL.</qt>"
-+msgstr ""
-+"<qt>這是此項目所關聯的位置。可以使用任何有效的網址。例如：<p>%1<br>http://"
-+"www.kde.org<br>ftp://ftp.kde.org/pub/kde/stable<p>按下文字編輯方塊旁邊的按鈕"
-+"可以讓您瀏覽合適的網址。</qt>"
- 
- #: kfile/kurlbar.cpp:946
- msgid "&URL:"
-@@ -4755,9 +4842,10 @@
- 
- #: kfile/kurlbar.cpp:953
- msgid ""
--"<qt>This is the icon that will appear in the Quick Access panel."
--"<p>Click on the button to select a different icon.</qt>"
--msgstr "<qt>這是會顯示在快速存取面板中的圖示。<p>按下按鈕以選擇不同的圖示。</qt>"
-+"<qt>This is the icon that will appear in the Quick Access panel.<p>Click on "
-+"the button to select a different icon.</qt>"
-+msgstr ""
-+"<qt>這是會顯示在快速存取面板中的圖示。<p>按下按鈕以選擇不同的圖示。</qt>"
- 
- #: kfile/kurlbar.cpp:955
- msgid "Choose an &icon:"
-@@ -4770,9 +4858,8 @@
- #: kfile/kurlbar.cpp:974
- msgid ""
- "<qt>Select this setting if you want this entry to show only when using the "
--"current application (%1)."
--"<p>If this setting is not selected, the entry will be available in all "
--"applications.</qt>"
-+"current application (%1).<p>If this setting is not selected, the entry will "
-+"be available in all applications.</qt>"
- msgstr ""
- "<qt>如果您希望這個項目只在使用目前的應用程式 (%1) 時顯示，請選擇此設定。\n"
- "<p>如果沒有選取這項設定，該項目將在所有應用程式中顯示。</qt>"
-@@ -4802,9 +4889,9 @@
- "_: EMAIL OF TRANSLATORS\n"
- "Your emails"
- msgstr ""
--"<ericc@shinewave.com.tw>,<cwhuang@linux.org.tw>,<kenduest@i18n.linux.org.tw>"
--",<jouston@housediy.com>,<lark@linux.net.cn>,<anthony@thizlinux.com>"
--",<ycheng@slat.org>"
-+"<ericc@shinewave.com.tw>,<cwhuang@linux.org.tw>,<kenduest@i18n.linux.org.tw>,"
-+"<jouston@housediy.com>,<lark@linux.net.cn>,<anthony@thizlinux.com>,"
-+"<ycheng@slat.org>"
- 
- #. i18n: file ./kssl/keygenwizard2.ui line 25
- #: rc.cpp:3
-@@ -4812,7 +4899,9 @@
- msgid ""
- "You must now provide a password for the certificate request. Please choose a "
- "very secure password as this will be used to encrypt your private key."
--msgstr "您現在必須就為憑證請求提供一個密碼。請選擇非常安全的密碼，因為該密碼會用來加密您的私人密鑰。"
-+msgstr ""
-+"您現在必須就為憑證請求提供一個密碼。請選擇非常安全的密碼，因為該密碼會用來加"
-+"密您的私人密鑰。"
- 
- #. i18n: file ./kssl/keygenwizard2.ui line 38
- #: rc.cpp:6
-@@ -4831,9 +4920,11 @@
- #, no-c-format
- msgid ""
- "You have indicated that you wish to obtain or purchase a secure certificate. "
--"This wizard is intended to guide you through the procedure. You may cancel at "
--"any time, and this will abort the transaction."
--msgstr "您已指明您想要取得或者購買安全性憑證。此精靈將會引導您完成這個過程。您可在任何時候取消，從而中止此項事務。"
-+"This wizard is intended to guide you through the procedure. You may cancel "
-+"at any time, and this will abort the transaction."
-+msgstr ""
-+"您已指明您想要取得或者購買安全性憑證。此精靈將會引導您完成這個過程。您可在任"
-+"何時候取消，從而中止此項事務。"
- 
- #. i18n: file ./misc/kwalletd/kwalletwizard.ui line 16
- #: rc.cpp:15
-@@ -4862,8 +4953,9 @@
- "preventing others from viewing the information.  This wizard will tell you "
- "about KWallet and help you configure it for the first time."
- msgstr ""
--"歡迎使用 KWallet，KDE 的錢包系統。KWallet "
--"讓您可以將您的密碼和其他個人資訊以加密檔案的形式儲存在磁碟上，防止別人檢視這些資訊。這個精靈會告訴您關於 KWallet 並且協助您做初次的設定。"
-+"歡迎使用 KWallet，KDE 的錢包系統。KWallet 讓您可以將您的密碼和其他個人資訊以"
-+"加密檔案的形式儲存在磁碟上，防止別人檢視這些資訊。這個精靈會告訴您關於 "
-+"KWallet 並且協助您做初次的設定。"
- 
- #. i18n: file ./misc/kwalletd/kwalletwizard.ui line 112
- #: rc.cpp:27
-@@ -4881,17 +4973,18 @@
- #: rc.cpp:36
- #, no-c-format
- msgid ""
--"The KDE Wallet system stores your data in a <i>wallet</i> "
--"file on your local hard disk.  The data is only written in encrypted form, "
--"presently using the blowfish algorithm with your password as the key.  When a "
--"wallet is opened, the wallet manager application will launch and display an "
--"icon in the system tray.  You can use this application to manage your wallets.  "
--"It even permits you to drag wallets and wallet contents, allowing you to easily "
--"copy a wallet to a remote system."
--msgstr ""
--"KDE 錢包系統將您的資料儲存在本地磁碟上的 <i>wallet</i> 檔案。該資料只會以加密的形式寫入，目前是使用 blowfish "
--"演算法（以您的密碼作為鑰匙）。當錢包開啟時，會執行錢包管理程式並在系統匣中顯示圖示。您可以使用這個應用程式來管理您的錢包。它甚至允許您拖放錢包和錢包的內容，讓您"
--"可以輕鬆的複製錢包到遠端系統。"
-+"The KDE Wallet system stores your data in a <i>wallet</i> file on your local "
-+"hard disk.  The data is only written in encrypted form, presently using the "
-+"blowfish algorithm with your password as the key.  When a wallet is opened, "
-+"the wallet manager application will launch and display an icon in the system "
-+"tray.  You can use this application to manage your wallets.  It even permits "
-+"you to drag wallets and wallet contents, allowing you to easily copy a "
-+"wallet to a remote system."
-+msgstr ""
-+"KDE 錢包系統將您的資料儲存在本地磁碟上的 <i>wallet</i> 檔案。該資料只會以加密"
-+"的形式寫入，目前是使用 blowfish 演算法（以您的密碼作為鑰匙）。當錢包開啟時，"
-+"會執行錢包管理程式並在系統匣中顯示圖示。您可以使用這個應用程式來管理您的錢"
-+"包。它甚至允許您拖放錢包和錢包的內容，讓您可以輕鬆的複製錢包到遠端系統。"
- 
- #. i18n: file ./misc/kwalletd/kwalletwizard.ui line 193
- #: rc.cpp:39
-@@ -4904,15 +4997,16 @@
- #, no-c-format
- msgid ""
- "Various applications may attempt to use the KDE wallet to store passwords or "
--"other information such as web form data and cookies.  If you would like these "
--"applications to use the wallet, you must enable it now and choose a password.  "
--"The password you choose <i>cannot</i> be recovered if it is lost, and will "
--"allow anyone who knows it to obtain all the information contained in the "
--"wallet."
-+"other information such as web form data and cookies.  If you would like "
-+"these applications to use the wallet, you must enable it now and choose a "
-+"password.  The password you choose <i>cannot</i> be recovered if it is lost, "
-+"and will allow anyone who knows it to obtain all the information contained "
-+"in the wallet."
- msgstr ""
- "許多應用程式可能嘗試使用 KDE 錢包來儲存密碼或者其他資訊，像是網頁表單資料和 "
--"cookies。如果您想要讓這些應用程式使用錢包，你必須現在啟用它並且選擇一個密碼。如果您所選擇的密碼遺失了是<i>不能</i>"
--"復原的，並且將會讓任何知道它的人得以獲得錢包中所包含的所有資訊。"
-+"cookies。如果您想要讓這些應用程式使用錢包，你必須現在啟用它並且選擇一個密碼。"
-+"如果您所選擇的密碼遺失了是<i>不能</i>復原的，並且將會讓任何知道它的人得以獲得"
-+"錢包中所包含的所有資訊。"
- 
- #. i18n: file ./misc/kwalletd/kwalletwizard.ui line 234
- #: rc.cpp:45
-@@ -4943,11 +5037,13 @@
- #, no-c-format
- msgid ""
- "The KDE Wallet system allows you to control the level of security of your "
--"personal data.  Some of these settings do impact usability.  While the default "
--"settings are generally acceptable for most users, you may wish to change some "
--"of them.  You may further tune these settings from the KWallet control module."
-+"personal data.  Some of these settings do impact usability.  While the "
-+"default settings are generally acceptable for most users, you may wish to "
-+"change some of them.  You may further tune these settings from the KWallet "
-+"control module."
- msgstr ""
--"KDE 錢包系統讓您可以控制您個人資料的安全等級。這些設定時有些非常有用。預設的設定值是適合大多數的使用者，但是您可能希望改變其中某些部分。您往後仍然可以從 "
-+"KDE 錢包系統讓您可以控制您個人資料的安全等級。這些設定時有些非常有用。預設的"
-+"設定值是適合大多數的使用者，但是您可能希望改變其中某些部分。您往後仍然可以從 "
- "KWallet 控制模組中來改變這些設定值。"
- 
- #. i18n: file ./misc/kwalletd/kwalletwizard.ui line 432
-@@ -4996,31 +5092,36 @@
- #: rc.cpp:84
- #, no-c-format
- msgid ""
--"Check this option if the application you want to run is a text mode application "
--"or if you want the information that is provided by the terminal emulator "
--"window."
--msgstr "如果你想要執行的應用程式是文字模式應用程式或者您所要的資訊是由終端機模擬視窗提供的，請核取這個選項。"
-+"Check this option if the application you want to run is a text mode "
-+"application or if you want the information that is provided by the terminal "
-+"emulator window."
-+msgstr ""
-+"如果你想要執行的應用程式是文字模式應用程式或者您所要的資訊是由終端機模擬視窗"
-+"提供的，請核取這個選項。"
- 
- #. i18n: file ./kfile/kpropertiesdesktopadvbase.ui line 80
- #: rc.cpp:93
- #, no-c-format
- msgid ""
--"Check this option if the text mode application offers relevant information on "
--"exit. Keeping the terminal emulator open allows you to retrieve this "
-+"Check this option if the text mode application offers relevant information "
-+"on exit. Keeping the terminal emulator open allows you to retrieve this "
- "information."
--msgstr "如果文字模式應用程式在結束時提供相關資訊，請核取這個選項。保持終端機模擬視窗開啟以便您取得這個資訊。"
-+msgstr ""
-+"如果文字模式應用程式在結束時提供相關資訊，請核取這個選項。保持終端機模擬視窗"
-+"開啟以便您取得這個資訊。"
- 
- #. i18n: file ./kfile/kpropertiesdesktopadvbase.ui line 109
- #: rc.cpp:102
- #, no-c-format
- msgid ""
--"Check this option if you want to run this application with a different user id. "
--"Every process has a different user id associated with it. This id code "
-+"Check this option if you want to run this application with a different user "
-+"id. Every process has a different user id associated with it. This id code "
- "determines file access and other permissions. The password of the user is "
- "required to use this option."
- msgstr ""
--"如果你想要以不同的使用者 id 來執行這個應用程式，請核取這個選項。每個程序都跟不同的使用者 id 相關聯。這個 id "
--"代碼決定了檔案存取與其他的權限。使用這個選項需要該使用者的密碼。"
-+"如果你想要以不同的使用者 id 來執行這個應用程式，請核取這個選項。每個程序都跟"
-+"不同的使用者 id 相關聯。這個 id 代碼決定了檔案存取與其他的權限。使用這個選項"
-+"需要該使用者的密碼。"
- 
- #. i18n: file ./kfile/kpropertiesdesktopadvbase.ui line 140
- #: rc.cpp:108
-@@ -5050,9 +5151,11 @@
- #: rc.cpp:120
- #, no-c-format
- msgid ""
--"Check this option if you want to make clear that your application has started. "
--"This visual feedback may appear as a busy cursor or in the taskbar."
--msgstr "如果你想要清楚您的應用程式是否已啟動，請核取這個選項。這個虛擬回饋可能顯示為忙碌的游標或者顯示在工作列中。"
-+"Check this option if you want to make clear that your application has "
-+"started. This visual feedback may appear as a busy cursor or in the taskbar."
-+msgstr ""
-+"如果你想要清楚您的應用程式是否已啟動，請核取這個選項。這個虛擬回饋可能顯示為"
-+"忙碌的游標或者顯示在工作列中。"
- 
- #. i18n: file ./kfile/kpropertiesdesktopadvbase.ui line 180
- #: rc.cpp:123
-@@ -5216,22 +5319,22 @@
- #: rc.cpp:207
- #, no-c-format
- msgid ""
--"<qt>"
--"<p>Select one or more types of file that your application can handle here. This "
--"list is organized by <u>mimetypes</u>.</p>\n"
-+"<qt><p>Select one or more types of file that your application can handle "
-+"here. This list is organized by <u>mimetypes</u>.</p>\n"
- "<p>MIME, Multipurpose Internet (e)Mail Extension, is a standard protocol for "
--"identifying the type of data based on filename extensions and correspondent <u>"
--"mimetypes</u>. Example: the \"bmp\" part that comes after the dot in flower.bmp "
--"indicates that it is a specific kind of image, <u>image/x-bmp</u>"
--". To know which application should open each type of file, the system should be "
--"informed about the abilities of each application to handle these extensions and "
--"mimetypes.</p>"
--msgstr ""
--"<qt>"
--"<p>從這裡選擇一或多個您的應用程式可以處理的檔案類型。這個列表是依照 <u>mime 類型</u> 排列的。</p>\n"
--"<p>MIME，多用途網路郵件延伸功能，是一個以延伸檔名來辨識資料類型與對應的 <u>mime 類型</u> "
--"的標準協定。 例如：在 flower.bmp 句點後面的「bmp」部份表示他是一種特定種類的圖片， <u>image/x-bmp</u>"
--"。要了解哪一個應用程式用來開啟哪種類型的檔案，系統需要了解每個應用程式可以處理這些延伸檔名以及 mime 類型的能力。"
-+"identifying the type of data based on filename extensions and correspondent "
-+"<u>mimetypes</u>. Example: the \"bmp\" part that comes after the dot in "
-+"flower.bmp indicates that it is a specific kind of image, <u>image/x-bmp</"
-+"u>. To know which application should open each type of file, the system "
-+"should be informed about the abilities of each application to handle these "
-+"extensions and mimetypes.</p>"
-+msgstr ""
-+"<qt><p>從這裡選擇一或多個您的應用程式可以處理的檔案類型。這個列表是依照 "
-+"<u>mime 類型</u> 排列的。</p>\n"
-+"<p>MIME，多用途網路郵件延伸功能，是一個以延伸檔名來辨識資料類型與對應的 "
-+"<u>mime 類型</u> 的標準協定。 例如：在 flower.bmp 句點後面的「bmp」部份表示他"
-+"是一種特定種類的圖片， <u>image/x-bmp</u>。要了解哪一個應用程式用來開啟哪種類"
-+"型的檔案，系統需要了解每個應用程式可以處理這些延伸檔名以及 mime 類型的能力。"
- 
- #. i18n: file ./kfile/kpropertiesdesktopbase.ui line 44
- #: rc.cpp:211
-@@ -5243,29 +5346,31 @@
- #: rc.cpp:214 rc.cpp:225
- #, no-c-format
- msgid ""
--"<qt>"
--"<p>This list should show the types of file that your application can handle. "
--"This list is organized by <u>mimetypes</u>.</p>\n"
-+"<qt><p>This list should show the types of file that your application can "
-+"handle. This list is organized by <u>mimetypes</u>.</p>\n"
- "<p>MIME, Multipurpose Internet (e)Mail Extension, is a standard protocol for "
--"identifying the type of data based on filename extensions and correspondent <u>"
--"mimetypes</u>. Example: the \"bmp\" part that comes after the dot in flower.bmp "
--"indicates that it is a specific kind of image, <u>image/x-bmp</u>"
--". To know which application should open each type of file, the system should be "
--"informed about the abilities of each application to handle these extensions and "
--"mimetypes.</p>\n"
-+"identifying the type of data based on filename extensions and correspondent "
-+"<u>mimetypes</u>. Example: the \"bmp\" part that comes after the dot in "
-+"flower.bmp indicates that it is a specific kind of image, <u>image/x-bmp</"
-+"u>. To know which application should open each type of file, the system "
-+"should be informed about the abilities of each application to handle these "
-+"extensions and mimetypes.</p>\n"
- "<p>If you want to associate this application with one or more mimetypes that "
--"are not in this list, click on the button <b>Add</b> "
--"below. If there are one or more filetypes that this application cannot handle, "
--"you may want to remove them from the list clicking on the button <b>Remove</b> "
--"below.</p></qt>"
--msgstr ""
--"<qt>"
--"<p>這個清單應該顯示您的應用程式可以處理的檔案類型。這個列表是依照 <u>mime 類型</u> 排列的。</p>\n"
--"<p>MIME，多用途網路郵件延伸功能，是一個以延伸檔名來辨識資料類型與對應的 <u>mime 類型</u> "
--"的標準協定。 例如：在 flower.bmp 句點後面的「bmp」部份表示他是一種特定種類的圖片， <u>image/x-bmp</u>"
--"。要了解哪一個應用程式用來開啟哪種類型的檔案，系統需要了解每個應用程式可以處理這些延伸檔名以及 mime 類型的能力。</p>\n"
--"<p>如果你想要把這個應用程式關聯到一或多個列表中沒有的 mime 類型，請按下面的按鈕 <b>加入</b>"
--"。如果有一或多個此應用程式無法處理的檔案類型，您可能會想要按下面的 <b>移除</b> 按鈕來把它們從列表中移除。</p></qt>"
-+"are not in this list, click on the button <b>Add</b> below. If there are one "
-+"or more filetypes that this application cannot handle, you may want to "
-+"remove them from the list clicking on the button <b>Remove</b> below.</p></"
-+"qt>"
-+msgstr ""
-+"<qt><p>這個清單應該顯示您的應用程式可以處理的檔案類型。這個列表是依照 "
-+"<u>mime 類型</u> 排列的。</p>\n"
-+"<p>MIME，多用途網路郵件延伸功能，是一個以延伸檔名來辨識資料類型與對應的 "
-+"<u>mime 類型</u> 的標準協定。 例如：在 flower.bmp 句點後面的「bmp」部份表示他"
-+"是一種特定種類的圖片， <u>image/x-bmp</u>。要了解哪一個應用程式用來開啟哪種類"
-+"型的檔案，系統需要了解每個應用程式可以處理這些延伸檔名以及 mime 類型的能力。"
-+"</p>\n"
-+"<p>如果你想要把這個應用程式關聯到一或多個列表中沒有的 mime 類型，請按下面的按"
-+"鈕 <b>加入</b>。如果有一或多個此應用程式無法處理的檔案類型，您可能會想要按下"
-+"面的 <b>移除</b> 按鈕來把它們從列表中移除。</p></qt>"
- 
- #. i18n: file ./kfile/kpropertiesdesktopbase.ui line 103
- #: rc.cpp:230
-@@ -5277,17 +5382,21 @@
- #: rc.cpp:233 rc.cpp:236
- #, no-c-format
- msgid ""
--"Type the name you want to give to this application here. This application will "
--"appear under this name in the applications menu and in the panel."
--msgstr "在這裡輸入您想要給這個應用程式的名稱。這個應用程式在應用程式選單以及面板中會以此名稱出現。"
-+"Type the name you want to give to this application here. This application "
-+"will appear under this name in the applications menu and in the panel."
-+msgstr ""
-+"在這裡輸入您想要給這個應用程式的名稱。這個應用程式在應用程式選單以及面板中會"
-+"以此名稱出現。"
- 
- #. i18n: file ./kfile/kpropertiesdesktopbase.ui line 131
- #: rc.cpp:242 rc.cpp:245
- #, no-c-format
- msgid ""
--"Type the description of this application, based on its use, here. Examples: a "
--"dial up application (KPPP) would be \"Dial up tool\"."
--msgstr "在這裡輸入這個應用程式的描述，可根據它的用途。例如：一個撥號應用程式 (KPPP) 應該是「撥號工具」。"
-+"Type the description of this application, based on its use, here. Examples: "
-+"a dial up application (KPPP) would be \"Dial up tool\"."
-+msgstr ""
-+"在這裡輸入這個應用程式的描述，可根據它的用途。例如：一個撥號應用程式 (KPPP) "
-+"應該是「撥號工具」。"
- 
- #. i18n: file ./kfile/kpropertiesdesktopbase.ui line 147
- #: rc.cpp:248
-@@ -5316,8 +5425,8 @@
- "Following the command, you can have several place holders which will be "
- "replaced with the actual values when the actual program is run:\n"
- "%f - a single file name\n"
--"%F - a list of files; use for applications that can open several local files at "
--"once\n"
-+"%F - a list of files; use for applications that can open several local files "
-+"at once\n"
- "%u - a single URL\n"
- "%U - a list of URLs\n"
- "%d - the directory of the file to open\n"
-@@ -5343,7 +5452,8 @@
- #: rc.cpp:291
- #, no-c-format
- msgid ""
--"Click here to browse your file system in order to find the desired executable."
-+"Click here to browse your file system in order to find the desired "
-+"executable."
- msgstr "按這裡瀏覽您的檔案系統以找出想要的可執行檔。"
- 
- #. i18n: file ./kfile/kpropertiesdesktopbase.ui line 224
-@@ -5362,7 +5472,7 @@
- #: rc.cpp:303
- #, no-c-format
- msgid "Add..."
--msgstr "加入..."
-+msgstr "加入…"
- 
- #. i18n: file ./kfile/kpropertiesdesktopbase.ui line 249
- #: rc.cpp:306
-@@ -5370,7 +5480,8 @@
- msgid ""
- "Click on this button if you want to add a type of file (mimetype) that your "
- "application can handle."
--msgstr "如果你想要加入您的應用程式可以處理的檔案類型（mime 類型），請按這個按鈕。"
-+msgstr ""
-+"如果你想要加入您的應用程式可以處理的檔案類型（mime 類型），請按這個按鈕。"
- 
- #. i18n: file ./kfile/kpropertiesdesktopbase.ui line 277
- #: rc.cpp:312
-@@ -5378,7 +5489,9 @@
- msgid ""
- "If you want to remove a type of file (mimetype) that your application cannot "
- "handle, select the mimetype in the list above and click on this button."
--msgstr "如果你想要移除您的應用程式不能處理的檔案類型（mime 類型），請在上面列表中選擇 mime 類型並且按這個按鈕。"
-+msgstr ""
-+"如果你想要移除您的應用程式不能處理的檔案類型（mime 類型），請在上面列表中選"
-+"擇 mime 類型並且按這個按鈕。"
- 
- #. i18n: file ./kfile/kpropertiesdesktopbase.ui line 302
- #: rc.cpp:315
-@@ -5390,9 +5503,11 @@
- #: rc.cpp:318
- #, no-c-format
- msgid ""
--"Click here to modify the way this application will run, launch feedback, DCOP "
--"options or to run it as a different user."
--msgstr "按這裡修改執行這個應用程式的方式，啟動回饋、 DCOP 選項或者以不同的使用者執行它。"
-+"Click here to modify the way this application will run, launch feedback, "
-+"DCOP options or to run it as a different user."
-+msgstr ""
-+"按這裡修改執行這個應用程式的方式，啟動回饋、 DCOP 選項或者以不同的使用者執行"
-+"它。"
- 
- #: ../kioslave/http/http.cc:5155 kpasswdserver/kpasswdserver.cpp:346
- msgid "  Do you want to retry?"
-@@ -5485,7 +5600,7 @@
- 
- #: bookmarks/kbookmarkmenu.cc:486
- msgid "Bookmark Tabs as Folder..."
--msgstr "書籤分頁成為資料夾..."
-+msgstr "書籤分頁成為資料夾…"
- 
- #: bookmarks/kbookmarkmenu.cc:495
- msgid "Add a folder of bookmarks for all open tabs."
-@@ -5501,7 +5616,7 @@
- 
- #: bookmarks/kbookmarkmenu.cc:538
- msgid "&New Bookmark Folder..."
--msgstr "新書籤資料夾(&N)..."
-+msgstr "新書籤資料夾(&N)…"
- 
- #: bookmarks/kbookmarkmenu.cc:550
- msgid "Create a new bookmark folder in this menu"
-@@ -5513,7 +5628,7 @@
- 
- #: bookmarks/kbookmarkmenu.cc:831
- msgid "&New Folder..."
--msgstr "新增資料夾(&N)..."
-+msgstr "新增資料夾(&N)…"
- 
- #: bookmarks/kbookmarkmenu.cc:948
- msgid "Bookmark"
-@@ -5542,10 +5657,12 @@
- 
- #: bookmarks/kbookmarkmanager.cc:365
- msgid ""
--"Unable to save bookmarks in %1. Reported error was: %2. This error message will "
--"only be shown once. The cause of the error needs to be fixed as quickly as "
--"possible, which is most likely a full hard drive."
--msgstr "無法儲存書籤於 %1。回報的錯誤為： %2。這個錯誤訊息將只會顯示一次。造成錯誤的原因需要盡速修正，大多數的情況可能是硬碟已經滿了。"
-+"Unable to save bookmarks in %1. Reported error was: %2. This error message "
-+"will only be shown once. The cause of the error needs to be fixed as quickly "
-+"as possible, which is most likely a full hard drive."
-+msgstr ""
-+"無法儲存書籤於 %1。回報的錯誤為： %2。這個錯誤訊息將只會顯示一次。造成錯誤的"
-+"原因需要盡速修正，大多數的情況可能是硬碟已經滿了。"
- 
- #: ../kioslave/ftp/ftp.cc:451
- #, c-format
-@@ -5713,8 +5830,8 @@
- 
- #: ../kioslave/http/kcookiejar/kcookiewin.cpp:149
- msgid ""
--"Select this option to accept/reject only this cookie. You will be prompted if "
--"another cookie is received. <em>(see WebBrowsing/Cookies in the Control "
-+"Select this option to accept/reject only this cookie. You will be prompted "
-+"if another cookie is received. <em>(see WebBrowsing/Cookies in the Control "
- "Center)</em>."
- msgstr ""
- "選擇這個選項來接受或拒絕這個 cookie。在收到另外一個 cookie，您會被再次提示。 "
-@@ -5726,13 +5843,14 @@
- 
- #: ../kioslave/http/kcookiejar/kcookiewin.cpp:156
- msgid ""
--"Select this option to accept/reject all cookies from this site. Choosing this "
--"option will add a new policy for the site this cookie originated from. This "
--"policy will be permanent until you manually change it from the Control Center "
--"<em>(see WebBrowsing/Cookies in the Control Center)</em>."
-+"Select this option to accept/reject all cookies from this site. Choosing "
-+"this option will add a new policy for the site this cookie originated from. "
-+"This policy will be permanent until you manually change it from the Control "
-+"Center <em>(see WebBrowsing/Cookies in the Control Center)</em>."
- msgstr ""
--"選擇這個選項來接受或拒絕所有從這個站來的 cookies。選擇這個選項將會新增原則到這個 cookie "
--"的來源站台。這個原則將會固定直到您自己手動從控制中心改變它。<em>(參照「控制中心」裡的「網頁瀏覽/Cookies」)</em>。"
-+"選擇這個選項來接受或拒絕所有從這個站來的 cookies。選擇這個選項將會新增原則到"
-+"這個 cookie 的來源站臺。這個原則將會固定直到您自己手動從控制中心改變它。<em>"
-+"(參照「控制中心」裡的「網頁瀏覽/Cookies」)</em>。"
- 
- #: ../kioslave/http/kcookiejar/kcookiewin.cpp:163
- msgid "All &cookies"
-@@ -5741,11 +5859,12 @@
- #: ../kioslave/http/kcookiejar/kcookiewin.cpp:165
- msgid ""
- "Select this option to accept/reject all cookies from anywhere. Choosing this "
--"option will change the global cookie policy set in the Control Center for all "
--"cookies <em>(see WebBrowsing/Cookies in the Control Center)</em>."
-+"option will change the global cookie policy set in the Control Center for "
-+"all cookies <em>(see WebBrowsing/Cookies in the Control Center)</em>."
- msgstr ""
--"選擇這個選項來接受/拒絕所有的 cookies 不論從那來。 選擇這個選項將會改變在控制中心給所有 cookies 的通用 cookie 原則。<em>"
--"(參照「控制中心」裡的「網頁瀏覽/Cookies」)</em>。"
-+"選擇這個選項來接受/拒絕所有的 cookies 不論從那來。 選擇這個選項將會改變在控制"
-+"中心給所有 cookies 的通用 cookie 原則。<em>(參照「控制中心」裡的「網頁瀏覽/"
-+"Cookies」)</em>。"
- 
- #: ../kioslave/http/kcookiejar/kcookiewin.cpp:182
- msgid "&Accept"
-@@ -5890,8 +6009,7 @@
- #: ../kioslave/http/http.cc:1648
- msgid ""
- "An error occurred while attempting to %1, %2. A summary of the reasons is "
--"below."
--"<ul>"
-+"below.<ul>"
- msgstr "在連線到 %1，%2 時發生錯誤。錯誤原因如下。<ul>"
- 
- #: ../kioslave/http/http.cc:1660 ../kioslave/http/http.cc:1763
-@@ -5905,17 +6023,19 @@
- 
- #: ../kioslave/http/http.cc:1673 ../kioslave/http/http.cc:1768
- msgid ""
--"A resource cannot be created at the destination until one or more intermediate "
--"collections (folders) have been created."
-+"A resource cannot be created at the destination until one or more "
-+"intermediate collections (folders) have been created."
- msgstr "資源無法在目標被建立，直到一個或多個中間集合(資料夾)已經被建立之後。"
- 
- #: ../kioslave/http/http.cc:1682
- #, c-format
- msgid ""
--"The server was unable to maintain the liveness of the properties listed in the "
--"propertybehavior XML element or you attempted to overwrite a file while "
-+"The server was unable to maintain the liveness of the properties listed in "
-+"the propertybehavior XML element or you attempted to overwrite a file while "
- "requesting that files are not overwritten. %1"
--msgstr "伺服器無法維護列表在在屬性行為的 XML 元素中的屬性的生存或是您試圖在不被覆寫的檔案裡覆寫一個檔案。 %1"
-+msgstr ""
-+"伺服器無法維護列表在在屬性行為的 XML 元素中的屬性的生存或是您試圖在不被覆寫的"
-+"檔案裡覆寫一個檔案。 %1"
- 
- #: ../kioslave/http/http.cc:1692
- #, c-format
-@@ -5942,8 +6062,8 @@
- 
- #: ../kioslave/http/http.cc:1721 ../kioslave/http/http.cc:1786
- msgid ""
--"The destination resource does not have sufficient space to record the state of "
--"the resource after the execution of this method."
-+"The destination resource does not have sufficient space to record the state "
-+"of the resource after the execution of this method."
- msgstr "目標資源需的空間並不足以紀錄在執行這個方式之後的資源狀態"
- 
- #: ../kioslave/http/http.cc:1743
-@@ -5953,7 +6073,7 @@
- 
- #: ../kioslave/http/http.cc:2062
- msgid "Connecting to %1..."
--msgstr "連線到 %1..."
-+msgstr "連線到 %1…"
- 
- #: ../kioslave/http/http.cc:2080 ../kioslave/http/http.cc:2084
- msgid "Proxy %1 at port %2"
-@@ -5969,11 +6089,11 @@
- 
- #: ../kioslave/http/http.cc:2640
- msgid "%1 contacted. Waiting for reply..."
--msgstr "%1 已聯繫上。等待回應中..."
-+msgstr "%1 已聯繫上。等待回應中…"
- 
- #: ../kioslave/http/http.cc:3008
- msgid "Server processing request, please wait..."
--msgstr "伺服器產生請求中，請稍後..."
-+msgstr "伺服器產生請求中，請稍後…"
- 
- #: ../kioslave/http/http.cc:3884
- msgid "Requesting data to send"
-@@ -5986,11 +6106,11 @@
- 
- #: ../kioslave/http/http.cc:4344
- msgid "Retrieving %1 from %2..."
--msgstr "從 %2 接收 %1 資料..."
-+msgstr "從 %2 接收 %1 資料…"
- 
- #: ../kioslave/http/http.cc:4353
- msgid "Retrieving from %1..."
--msgstr "正在從 %1 接收資料..."
-+msgstr "正在從 %1 接收資料…"
- 
- #: ../kioslave/http/http.cc:5147 ../kioslave/http/http.cc:5295
- msgid "Authentication Failed."
-@@ -6006,9 +6126,10 @@
- 
- #: ../kioslave/http/http.cc:5183
- msgid ""
--"You need to supply a username and a password for the proxy server listed below "
--"before you are allowed to access any sites."
--msgstr "您必須為下列的代理伺服器提供一組使用者名稱和密碼，才能夠取得存取網站的權限。"
-+"You need to supply a username and a password for the proxy server listed "
-+"below before you are allowed to access any sites."
-+msgstr ""
-+"您必須為下列的代理伺服器提供一組使用者名稱和密碼，才能夠取得存取網站的權限。"
- 
- #: ../kioslave/http/http.cc:5192
- msgid "Proxy:"
-diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdelibs/kmcop.po kde-i18n-zh_TW-3.5.10/messages/kdelibs/kmcop.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdelibs/kmcop.po	2006-07-22 10:04:33.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdelibs/kmcop.po	2011-11-11 15:45:17.000000000 +0100
-@@ -6,8 +6,7 @@
- "Project-Id-Version: kmcop\n"
- "POT-Creation-Date: 2005-05-18 21:23+0200\n"
- "PO-Revision-Date: 2006-02-13 12:54+0800\n"
--"Last-Translator: Frank Weng (a.k.a. Franklin) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Traditional Chinese <zh_l10n@linux.org.tw>\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/kdelibs/knotify.po kde-i18n-zh_TW-3.5.10/messages/kdelibs/knotify.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdelibs/knotify.po	2007-05-14 12:23:06.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdelibs/knotify.po	2011-11-11 15:45:17.000000000 +0100
-@@ -9,8 +9,7 @@
- "Project-Id-Version: knotify\n"
- "POT-Creation-Date: 2007-01-27 02:36+0100\n"
- "PO-Revision-Date: 2006-02-13 12:56+0800\n"
--"Last-Translator: Frank Weng (a.k.a. Franklin) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Traditional Chinese <zh_l10n@linux.org.tw>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
-@@ -39,15 +38,17 @@
- 
- #: knotify.cpp:151
- msgid ""
--"During the previous startup, KNotify crashed while creating Arts::Dispatcher. "
--"Do you want to try again or disable aRts sound output?\n"
-+"During the previous startup, KNotify crashed while creating Arts::"
-+"Dispatcher. Do you want to try again or disable aRts sound output?\n"
- "\n"
--"If you choose to disable aRts output now, you can re-enable it later or select "
--"an alternate sound player in the System Notifications control panel."
-+"If you choose to disable aRts output now, you can re-enable it later or "
-+"select an alternate sound player in the System Notifications control panel."
- msgstr ""
--"上一次啟動時，KNotify 在產生 Arts::Dispatcher 時發生錯誤而結束。您要關閉 aRts 聲音輸出並再試一次嗎？\n"
-+"上一次啟動時，KNotify 在產生 Arts::Dispatcher 時發生錯誤而結束。您要關閉 "
-+"aRts 聲音輸出並再試一次嗎？\n"
- "\n"
--"如果您選擇關閉 aRts 聲音輸入，您可以稍後再打開，或是在系統通知控制面板中選擇其他的聲音播放器。"
-+"如果您選擇關閉 aRts 聲音輸入，您可以稍後再打開，或是在系統通知控制面板中選擇"
-+"其他的聲音播放器。"
- 
- #: knotify.cpp:157 knotify.cpp:196
- msgid "KNotify Problem"
-@@ -66,12 +67,14 @@
- "During the previous startup, KNotify crashed while instantiating KNotify. Do "
- "you want to try again or disable aRts sound output?\n"
- "\n"
--"If you choose to disable aRts output now, you can re-enable it later or select "
--"an alternate sound player in the System Notifications control panel."
-+"If you choose to disable aRts output now, you can re-enable it later or "
-+"select an alternate sound player in the System Notifications control panel."
- msgstr ""
--"上一次啟動時，KNotify 在初始化時發生錯誤而結束。您要關閉 aRts 聲音輸出並再試一次嗎？\n"
-+"上一次啟動時，KNotify 在初始化時發生錯誤而結束。您要關閉 aRts 聲音輸出並再試"
-+"一次嗎？\n"
- "\n"
--"如果您選擇關閉 aRts 聲音輸入，您可以稍後再打開，或是在系統通知控制面板中選擇其他的聲音播放器。"
-+"如果您選擇關閉 aRts 聲音輸入，您可以稍後再打開，或是在系統通知控制面板中選擇"
-+"其他的聲音播放器。"
- 
- #: knotify.cpp:573
- msgid "Notification"
-diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdelibs/kstyle_highcontrast_config.po kde-i18n-zh_TW-3.5.10/messages/kdelibs/kstyle_highcontrast_config.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdelibs/kstyle_highcontrast_config.po	2006-07-22 10:04:33.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdelibs/kstyle_highcontrast_config.po	2011-11-11 15:45:17.000000000 +0100
-@@ -6,8 +6,7 @@
- "Project-Id-Version: kstyle_highcontrast_config\n"
- "POT-Creation-Date: 2005-05-18 21:23+0200\n"
- "PO-Revision-Date: 2006-02-13 15:47+0800\n"
--"Last-Translator: Frank Weng (a.k.a. Franklin) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Traditional Chinese <zh_l10n@linux.org.tw>\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/kdelibs/kstyle_plastik_config.po kde-i18n-zh_TW-3.5.10/messages/kdelibs/kstyle_plastik_config.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdelibs/kstyle_plastik_config.po	2006-07-22 10:04:33.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdelibs/kstyle_plastik_config.po	2011-11-11 15:45:17.000000000 +0100
-@@ -6,8 +6,7 @@
- "Project-Id-Version: kstyle_plastik_config\n"
- "POT-Creation-Date: 2005-05-18 21:23+0200\n"
- "PO-Revision-Date: 2006-02-13 15:50+0800\n"
--"Last-Translator: Frank Weng (a.k.a. Franklin) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Traditional Chinese <zh_l10n@linux.org.tw>\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/kdelibs/ktexteditor_autobookmarker.po kde-i18n-zh_TW-3.5.10/messages/kdelibs/ktexteditor_autobookmarker.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdelibs/ktexteditor_autobookmarker.po	2006-07-22 10:04:33.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdelibs/ktexteditor_autobookmarker.po	2011-11-11 15:45:17.000000000 +0100
-@@ -6,8 +6,7 @@
- "Project-Id-Version: ktexteditor_autobookmarker\n"
- "POT-Creation-Date: 2005-06-14 01:24+0200\n"
- "PO-Revision-Date: 2006-02-13 16:04+0800\n"
--"Last-Translator: Frank Weng (a.k.a. Franklin) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Traditional Chinese <zh_l10n@linux.org.tw>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
-@@ -40,7 +39,8 @@
- 
- #: autobookmarker.cpp:302
- msgid ""
--"<p>If enabled, the pattern matching will be case sensitive, otherwise not.</p>"
-+"<p>If enabled, the pattern matching will be case sensitive, otherwise not.</"
-+"p>"
- msgstr "<p>如果開啟此選項，樣式比對時會區分大小寫。</p>"
- 
- #: autobookmarker.cpp:305
-@@ -50,11 +50,11 @@
- #: autobookmarker.cpp:309
- msgid ""
- "<p>If enabled, the pattern matching will use minimal matching; if you do not "
--"know what that is, please read the appendix on regular expressions in the kate "
--"manual.</p>"
-+"know what that is, please read the appendix on regular expressions in the "
-+"kate manual.</p>"
- msgstr ""
--"<p>開啟此選項的話，樣式比對時會採用「最小符合」(Minimal matching)。如果您不知道這是做什麼，請參考 kate "
--"手冊中關於正規表示式的附錄。</p>"
-+"<p>開啟此選項的話，樣式比對時會採用「最小符合」(Minimal matching)。如果您不知"
-+"道這是做什麼，請參考 kate 手冊中關於正規表示式的附錄。</p>"
- 
- #: autobookmarker.cpp:313
- msgid "&File mask:"
-@@ -62,11 +62,13 @@
- 
- #: autobookmarker.cpp:319
- msgid ""
--"<p>A list of filename masks, separated by semicolons. This can be used to limit "
--"the usage of this entity to files with matching names.</p>"
--"<p>Use the wizard button to the right of the mimetype entry below to easily "
--"fill out both lists.</p>"
--msgstr "<p>檔名遮罩清單，以分號區隔。這可以用於限制只比對符合檔名的檔案。</p><p>使用右邊的精靈按鍵可以填入此清單。</p>"
-+"<p>A list of filename masks, separated by semicolons. This can be used to "
-+"limit the usage of this entity to files with matching names.</p><p>Use the "
-+"wizard button to the right of the mimetype entry below to easily fill out "
-+"both lists.</p>"
-+msgstr ""
-+"<p>檔名遮罩清單，以分號區隔。這可以用於限制只比對符合檔名的檔案。</p><p>使用"
-+"右邊的精靈按鍵可以填入此清單。</p>"
- 
- #: autobookmarker.cpp:324
- msgid "MIME &types:"
-@@ -74,26 +76,28 @@
- 
- #: autobookmarker.cpp:330
- msgid ""
--"<p>A list of mime types, separated by semicolon. This can be used to limit the "
--"usage of this entity to files with matching mime types.</p>"
--"<p>Use the wizard button on the right to get a list of existing file types to "
--"choose from, using it will fill in the file masks as well.</p>"
-+"<p>A list of mime types, separated by semicolon. This can be used to limit "
-+"the usage of this entity to files with matching mime types.</p><p>Use the "
-+"wizard button on the right to get a list of existing file types to choose "
-+"from, using it will fill in the file masks as well.</p>"
- msgstr ""
--"<p>MIME 型態清單，以分號區隔。這可以用於限制只比對符合 MIME 型態的檔案。</p>"
--"<p>使用右邊的精靈按鍵可以取得目前檔案的 MIME 型態以選擇。</p>"
-+"<p>MIME 型態清單，以分號區隔。這可以用於限制只比對符合 MIME 型態的檔案。</"
-+"p><p>使用右邊的精靈按鍵可以取得目前檔案的 MIME 型態以選擇。</p>"
- 
- #: autobookmarker.cpp:340
- msgid ""
--"<p>Click this button to display a checkable list of mimetypes available on your "
--"system. When used, the file masks entry above will be filled in with the "
--"corresponding masks.</p>"
--msgstr "<p>按此按鈕會顯示 MIME 型態的清單。使用此按鈕，上方的檔名遮罩清單也會同時被填入。</p>"
-+"<p>Click this button to display a checkable list of mimetypes available on "
-+"your system. When used, the file masks entry above will be filled in with "
-+"the corresponding masks.</p>"
-+msgstr ""
-+"<p>按此按鈕會顯示 MIME 型態的清單。使用此按鈕，上方的檔名遮罩清單也會同時被填"
-+"入。</p>"
- 
- #: autobookmarker.cpp:365
- msgid ""
- "Select the MimeTypes for this pattern.\n"
--"Please note that this will automatically edit the associated file extensions as "
--"well."
-+"Please note that this will automatically edit the associated file extensions "
-+"as well."
- msgstr ""
- "選擇此樣式的 MIME 型態。\n"
- "請注意，這會自動編輯相關的副檔名。"
-@@ -121,19 +125,16 @@
- #: autobookmarker.cpp:394
- msgid ""
- "<p>This list shows your configured autobookmark entities. When a document is "
--"opened, each entity is used in the following way: "
--"<ol>"
--"<li>The entity is dismissed, if a mime and/or filename mask is defined, and "
--"neither matches the document.</li>"
--"<li>Otherwise each line of the document is tried against the pattern, and a "
--"bookmark is set on matching lines.</li></ul>"
--"<p>Use the buttons below to manage your collection of entities.</p>"
--msgstr ""
--"<p>這個清單會顯示您所設定的 autobookmark 實體。當一份文件被開啟時，會遵照下列的規則："
--"<ul> "
--"<li>如果有預先定義好的 MIME 型態及/或檔名遮罩清單，而都不符合此文件，則該實體會被排除。</li> "
--"<li>否則此文件中的每一行都會被用來比對樣式，而符合的行會被設定書籤。</li></ul>"
--"<p>使用底下的按鍵來管理您的實體。</p>"
-+"opened, each entity is used in the following way: <ol><li>The entity is "
-+"dismissed, if a mime and/or filename mask is defined, and neither matches "
-+"the document.</li><li>Otherwise each line of the document is tried against "
-+"the pattern, and a bookmark is set on matching lines.</li></ul><p>Use the "
-+"buttons below to manage your collection of entities.</p>"
-+msgstr ""
-+"<p>這個清單會顯示您所設定的 autobookmark 實體。當一份文件被開啟時，會遵照下列"
-+"的規則：<ul> <li>如果有預先定義好的 MIME 型態及/或檔名遮罩清單，而都不符合此"
-+"文件，則該實體會被排除。</li> <li>否則此文件中的每一列都會被用來比對樣式，而"
-+"符合的行會被設定書籤。</li></ul><p>使用底下的按鍵來管理您的實體。</p>"
- 
- #: autobookmarker.cpp:406
- msgid "&New..."
-diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdelibs/ktexteditor_docwordcompletion.po kde-i18n-zh_TW-3.5.10/messages/kdelibs/ktexteditor_docwordcompletion.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdelibs/ktexteditor_docwordcompletion.po	2007-05-14 12:23:06.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdelibs/ktexteditor_docwordcompletion.po	2011-11-11 15:45:17.000000000 +0100
-@@ -6,8 +6,7 @@
- "Project-Id-Version: ktexteditor_docwordcompletion\n"
- "POT-Creation-Date: 2007-02-18 02:38+0100\n"
- "PO-Revision-Date: 2006-02-13 16:15+0800\n"
--"Last-Translator: Frank Weng (a.k.a. Franklin) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Traditional Chinese <zh_l10n@linux.org.tw>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
-@@ -50,17 +49,17 @@
- msgid ""
- "_: Translators: This is the first part of two strings wich will comprise the "
- "sentence 'Show completions when a word is at least N characters'. The first "
--"part is on the right side of the N, which is represented by a spinbox widget, "
--"followed by the second part: 'characters long'. Characters is a ingeger number "
--"between and including 1 and 30. Feel free to leave the second part of the "
--"sentence blank if it suits your language better. \n"
-+"part is on the right side of the N, which is represented by a spinbox "
-+"widget, followed by the second part: 'characters long'. Characters is a "
-+"ingeger number between and including 1 and 30. Feel free to leave the second "
-+"part of the sentence blank if it suits your language better. \n"
- "Show completions &when a word is at least"
- msgstr "在一個單字至少有"
- 
- #: docwordcompletion.cpp:517
- msgid ""
--"_: This is the second part of two strings that will comprise teh sentence 'Show "
--"completions when a word is at least N characters'\n"
-+"_: This is the second part of two strings that will comprise teh sentence "
-+"'Show completions when a word is at least N characters'\n"
- "characters long."
- msgstr "個字元長時顯示補完清單(&W)"
- 
-diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdelibs/ktexteditor_insertfile.po kde-i18n-zh_TW-3.5.10/messages/kdelibs/ktexteditor_insertfile.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdelibs/ktexteditor_insertfile.po	2006-07-22 10:04:33.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdelibs/ktexteditor_insertfile.po	2011-11-11 15:45:17.000000000 +0100
-@@ -7,7 +7,7 @@
- "Project-Id-Version: ktexteditor\n"
- "POT-Creation-Date: 2005-06-14 01:24+0200\n"
- "PO-Revision-Date: 2002-10-24 09:38+0800\n"
--"Last-Translator: Keanu <keanu@ms50.url.com.tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
-@@ -15,7 +15,7 @@
- 
- #: insertfileplugin.cpp:79
- msgid "Insert File..."
--msgstr "插入檔案..."
-+msgstr "插入檔案…"
- 
- #: insertfileplugin.cpp:88
- msgid "Choose File to Insert"
-diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdelibs/ktexteditor_isearch.po kde-i18n-zh_TW-3.5.10/messages/kdelibs/ktexteditor_isearch.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdelibs/ktexteditor_isearch.po	2007-07-12 10:27:50.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdelibs/ktexteditor_isearch.po	2011-11-11 15:45:17.000000000 +0100
-@@ -7,7 +7,7 @@
- "Project-Id-Version: ktexteditor_isearch\n"
- "POT-Creation-Date: 2007-05-29 02:14+0200\n"
- "PO-Revision-Date: 2002-08-28 16:40+0800\n"
--"Last-Translator: Keanu <keanu@ms50.url.com.tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
-@@ -87,8 +87,8 @@
- 
- #: ISearchPlugin.cpp:269
- msgid ""
--"_: Incremental Search has passed both the end of the document and the original "
--"starting position\n"
-+"_: Incremental Search has passed both the end of the document and the "
-+"original starting position\n"
- "Overwrapped I-Search:"
- msgstr "從頭開始I-Search搜尋："
- 
-diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdelibs/ktexteditor_kdatatool.po kde-i18n-zh_TW-3.5.10/messages/kdelibs/ktexteditor_kdatatool.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdelibs/ktexteditor_kdatatool.po	2005-09-10 13:15:02.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdelibs/ktexteditor_kdatatool.po	2011-11-11 15:45:17.000000000 +0100
-@@ -7,7 +7,7 @@
- "Project-Id-Version: ktexteditor_kdatatool\n"
- "POT-Creation-Date: 2005-05-18 21:23+0200\n"
- "PO-Revision-Date: 2002-10-17 22:14+0800\n"
--"Last-Translator: Keanu <keanu@ms50.url.com.tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
-@@ -24,9 +24,10 @@
- #: kate_kdatatool.cpp:183
- msgid ""
- "Data tools are only available when text is selected, or when the right mouse "
--"button is clicked over a word. If no data tools are offered even when text is "
--"selected, you need to install them. Some data tools are part of the KOffice "
--"package."
-+"button is clicked over a word. If no data tools are offered even when text "
-+"is selected, you need to install them. Some data tools are part of the "
-+"KOffice package."
- msgstr ""
--"資料工具是只能使用在當文字被選擇時，或是在文字上點擊滑鼠右鍵時。如果當文字被選擇時沒有資料工具被提供，那您需要安裝它們。一些資料工具是 KOffice "
--"套件中的一部份。"
-+"資料工具是只能使用在當文字被選擇時，或是在文字上點擊滑鼠右鍵時。如果當文字被"
-+"選擇時沒有資料工具被提供，那您需要安裝它們。一些資料工具是 KOffice 套件中的一"
-+"部份。"
-diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdelibs/libkscreensaver.po kde-i18n-zh_TW-3.5.10/messages/kdelibs/libkscreensaver.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdelibs/libkscreensaver.po	2006-07-22 10:04:33.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdelibs/libkscreensaver.po	2011-11-11 15:45:17.000000000 +0100
-@@ -5,8 +5,7 @@
- "Project-Id-Version: libkscreensaver\n"
- "POT-Creation-Date: 2005-05-18 21:23+0200\n"
- "PO-Revision-Date: 2006-02-13 12:57+0800\n"
--"Last-Translator: Frank Weng (a.k.a. Franklin) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Traditional Chinese <zh_l10n@linux.org.tw>\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/kdelibs/ppdtranslations.po kde-i18n-zh_TW-3.5.10/messages/kdelibs/ppdtranslations.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdelibs/ppdtranslations.po	2006-07-22 10:04:33.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdelibs/ppdtranslations.po	2011-11-11 15:45:17.000000000 +0100
-@@ -8,7 +8,7 @@
- "Project-Id-Version: ppdtranslations\n"
- "POT-Creation-Date: 2005-05-18 21:33+0200\n"
- "PO-Revision-Date: 2006-02-13 13:00+0800\n"
--"Last-Translator: Stanley Wong <stanley18fan0k@yahoo.com.hk>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: zh-l10n <zh-l10n@linux.org.tw>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
-@@ -5382,7 +5382,7 @@
- #: printers.cpp:2156 printers.cpp:6940
- #, no-c-format
- msgid "Number of passes per line"
--msgstr "每一行的 Pass 數目"
-+msgstr "每一列的 Pass 數目"
- 
- #: printers.cpp:2158 printers.cpp:3248
- #, no-c-format
-@@ -9702,7 +9702,7 @@
- #: printers.cpp:4146
- #, no-c-format
- msgid "Print Head Passes per Line"
--msgstr "列印 Passes 每一行開頭"
-+msgstr "列印 Passes 每一列開頭"
- 
- #: printers.cpp:4148
- #, no-c-format
-@@ -14024,7 +14024,7 @@
- #: printers.cpp:6788
- #, no-c-format
- msgid "Do not care about cartridges, each line in all colours"
--msgstr "不要注意墨水匣水平, 每行都以全部用到的墨水列印"
-+msgstr "不要注意墨水匣水平, 每列都以全部用到的墨水列印"
- 
- #: printers.cpp:6790
- #, no-c-format
-@@ -14039,7 +14039,7 @@
- #: printers.cpp:6794
- #, no-c-format
- msgid "Each line in all colours"
--msgstr "每行都以全部用到的墨水列印"
-+msgstr "每列都以全部用到的墨水列印"
- 
- #: printers.cpp:6796
- #, no-c-format
-@@ -14224,7 +14224,7 @@
- #: printers.cpp:6962
- #, no-c-format
- msgid "Photo (CMYK, gamma correction, ...)"
--msgstr "相片 (CMYK, Gamma 修正, ...)"
-+msgstr "相片 (CMYK, Gamma 修正,…)"
- 
- #: printers.cpp:6964
- #, no-c-format
-diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdelibs/timezones.po kde-i18n-zh_TW-3.5.10/messages/kdelibs/timezones.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdelibs/timezones.po	2006-07-22 10:04:33.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdelibs/timezones.po	2011-11-11 15:45:17.000000000 +0100
-@@ -8,8 +8,7 @@
- "Project-Id-Version: timezones\n"
- "POT-Creation-Date: 2006-06-07 03:56+0200\n"
- "PO-Revision-Date: 2006-02-13 13:01+0800\n"
--"Last-Translator: Frank Weng (a.k.a. Franklin) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Traditional Chinese <zh_l10n@linux.org.tw>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
-@@ -1030,7 +1029,7 @@
- 
- #: TIMEZONES:254
- msgid "Asia/Seoul"
--msgstr "亞洲/漢城(Seoul)"
-+msgstr "亞洲/首爾(Seoul)"
- 
- #: TIMEZONES:255
- msgid "Asia/Shanghai"
-@@ -1042,7 +1041,7 @@
- 
- #: TIMEZONES:257
- msgid "Asia/Taipei"
--msgstr "亞洲/台北(Taipei)"
-+msgstr "亞洲/臺北(Taipei)"
- 
- #: TIMEZONES:258
- msgid "Asia/Tashkent"
-diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdemultimedia/artsbuilder.po kde-i18n-zh_TW-3.5.10/messages/kdemultimedia/artsbuilder.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdemultimedia/artsbuilder.po	2006-07-22 10:04:36.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdemultimedia/artsbuilder.po	2011-11-11 15:45:17.000000000 +0100
-@@ -9,8 +9,7 @@
- "Project-Id-Version: artsbuilder\n"
- "POT-Creation-Date: 2005-07-24 01:37+0200\n"
- "PO-Revision-Date: 2006-02-20 15:30+0800\n"
--"Last-Translator: Frank Weng (a.k.a. Franklin) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Traditional Chinese <zh_l10n@linux.org.tw>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
-@@ -81,7 +80,7 @@
- 
- #: execdlg.cpp:65
- msgid "Synthesis running..."
--msgstr "合成器啟動..."
-+msgstr "合成器啟動…"
- 
- #: execdlg.cpp:71
- msgid "CPU usage: unknown"
-@@ -188,23 +187,23 @@
- 
- #: main.cpp:297
- msgid "Open Session..."
--msgstr "開啟工作階段..."
-+msgstr "開啟工作階段…"
- 
- #: main.cpp:300
- msgid "Open E&xample..."
--msgstr "開啟範例(&X)..."
-+msgstr "開啟範例(&X)…"
- 
- #: main.cpp:304
- msgid "&Retrieve From Server..."
--msgstr "從伺服器接收(&R)..."
-+msgstr "從伺服器接收(&R)…"
- 
- #: main.cpp:306
- msgid "&Execute Structure"
--msgstr "執行結構(&E)..."
-+msgstr "執行結構(&E)…"
- 
- #: main.cpp:308
- msgid "&Rename Structure..."
--msgstr "結構更名(&R)..."
-+msgstr "結構更名(&R)…"
- 
- #: main.cpp:310
- msgid "&Publish Structure"
-@@ -252,11 +251,11 @@
- 
- #: main.cpp:341
- msgid "Implement Interface..."
--msgstr "工具界面..."
-+msgstr "工具界面…"
- 
- #: main.cpp:343
- msgid "Change Positions/Names..."
--msgstr "改變位置/名稱..."
-+msgstr "改變位置/名稱…"
- 
- #: main.cpp:444
- msgid "The structure has been published as: '%1' on the server."
-@@ -307,8 +306,7 @@
- msgid ""
- "Could not execute your structure. Make sure that the\n"
- "sound server (artsd) is running.\n"
--msgstr ""
--"無法執行您的結構。請確認聲音伺服器 (artsd) 已啟動。\n"
-+msgstr "無法執行您的結構。請確認聲音伺服器 (artsd) 已啟動。\n"
- 
- #: main.cpp:841
- msgid ""
-@@ -359,7 +357,7 @@
- 
- #: portposdlg.cpp:126
- msgid "R&ename..."
--msgstr "重新命名(&E)..."
-+msgstr "重新命名(&E)…"
- 
- #: portposdlg.cpp:191
- msgid "Rename Port"
-diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdemultimedia/artscontrol.po kde-i18n-zh_TW-3.5.10/messages/kdemultimedia/artscontrol.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdemultimedia/artscontrol.po	2006-07-22 10:04:36.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdemultimedia/artscontrol.po	2011-11-11 15:45:17.000000000 +0100
-@@ -8,8 +8,7 @@
- "Project-Id-Version: artscontrol\n"
- "POT-Creation-Date: 2005-01-08 01:21+0100\n"
- "PO-Revision-Date: 2006-02-21 08:38+0800\n"
--"Last-Translator: Frank Weng (a.k.a. Franklin) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Traditional Chinese <zh_l10n@linux.org.tw>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
-@@ -94,8 +93,8 @@
- 
- #: artscontrolapplet.cpp:48
- msgid ""
--"Something with the ArtsServer went wrong. You probably need to restart aRts and "
--"then reload this applet."
-+"Something with the ArtsServer went wrong. You probably need to restart aRts "
-+"and then reload this applet."
- msgstr "aRts 伺服器有些問題。您可能需要重新啟動 aRts 並重新載入這個面板程式。"
- 
- #: artscontrolapplet.cpp:77
-@@ -284,7 +283,7 @@
- #: rc.cpp:18
- #, no-c-format
- msgid "&Add..."
--msgstr "加入... [&A]"
-+msgstr "加入… [&A]"
- 
- #. i18n: file midimanagerdlg.ui line 102
- #: rc.cpp:24 rc.cpp:39
-@@ -320,7 +319,9 @@
- msgid ""
- "Artsd should run with realtime scheduling,\n"
- " but it does not (Is artswrapper suid root?)."
--msgstr "Artsd 守護程式應該配合排程功能來執行，不過並沒有。(artswrapper 是否有 suid root 呢？)"
-+msgstr ""
-+"Artsd 守護程式應該配合排程功能來執行，不過並沒有。(artswrapper 是否有 suid "
-+"root 呢？)"
- 
- #: statusview.cpp:57
- msgid "Determining suspend status..."
-diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdemultimedia/artsmodules.po kde-i18n-zh_TW-3.5.10/messages/kdemultimedia/artsmodules.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdemultimedia/artsmodules.po	2008-02-13 10:55:35.000000000 +0100
-+++ kde-i18n-zh_TW-3.5.10/messages/kdemultimedia/artsmodules.po	2011-11-11 15:45:17.000000000 +0100
-@@ -6,8 +6,7 @@
- "Project-Id-Version: artsmodules\n"
- "POT-Creation-Date: 2007-10-24 01:15+0200\n"
- "PO-Revision-Date: 2006-02-22 08:41+0800\n"
--"Last-Translator: Frank Weng (a.k.a. Franklin) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Traditional Chinese <zh_l10n@linux.org.tw>\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/kdemultimedia/audiocd_encoder_lame.po kde-i18n-zh_TW-3.5.10/messages/kdemultimedia/audiocd_encoder_lame.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdemultimedia/audiocd_encoder_lame.po	2006-07-22 10:04:36.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdemultimedia/audiocd_encoder_lame.po	2011-11-11 15:45:17.000000000 +0100
-@@ -8,8 +8,7 @@
- "Project-Id-Version: audiocd_encoder_lame\n"
- "POT-Creation-Date: 2005-05-09 01:19+0200\n"
- "PO-Revision-Date: 2006-02-22 08:32+0800\n"
--"Last-Translator: Frank Weng (a.k.a. Franklin) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Traditional Chinese <zh_l10n@linux.org.tw>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
-@@ -141,10 +140,12 @@
- #: rc.cpp:69
- #, no-c-format
- msgid ""
--"This option controls whether MP3 files are recorded with one or two channels. "
--"Note that choosing <i>\"Mono\"</i> reduces file size, but also kills the stereo "
--"signal."
--msgstr "這個選項控制要用單聲道還是雙聲道來錄製 MP3 檔。注意，選擇「單聲道」可以節省空間，但是會失去立體聲的訊號。"
-+"This option controls whether MP3 files are recorded with one or two "
-+"channels. Note that choosing <i>\"Mono\"</i> reduces file size, but also "
-+"kills the stereo signal."
-+msgstr ""
-+"這個選項控制要用單聲道還是雙聲道來錄製 MP3 檔。注意，選擇「單聲道」可以節省空"
-+"間，但是會失去立體聲的訊號。"
- 
- #. i18n: file encoderlameconfig.ui line 221
- #: rc.cpp:72
-diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdemultimedia/audiocd_encoder_vorbis.po kde-i18n-zh_TW-3.5.10/messages/kdemultimedia/audiocd_encoder_vorbis.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdemultimedia/audiocd_encoder_vorbis.po	2006-07-22 10:04:36.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdemultimedia/audiocd_encoder_vorbis.po	2011-11-11 15:45:17.000000000 +0100
-@@ -6,8 +6,7 @@
- "Project-Id-Version: audiocd_encoder_vorbis\n"
- "POT-Creation-Date: 2005-05-09 01:19+0200\n"
- "PO-Revision-Date: 2006-02-21 14:07+0800\n"
--"Last-Translator: Frank Weng (a.k.a. Franklin) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Traditional Chinese <zh_l10n@linux.org.tw>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
-@@ -172,11 +171,11 @@
- msgid ""
- "Add a description of the song to the file header. This makes it easy for the "
- "user to get advanced song information shown by his media player. You can get "
--"this information automatically via the Internet. Look at the <i>"
--"\"CDDB Retrieval\"</i> control module for details."
-+"this information automatically via the Internet. Look at the <i>\"CDDB "
-+"Retrieval\"</i> control module for details."
- msgstr ""
--"在檔案標頭加入歌曲的描述。這能讓使用者較容易取得歌曲的進階資訊並顯示在播放器上。您可以自動透過網路取得這些資訊。請參考<i>取得 CDDB 資訊</li> "
--"控制模組。"
-+"在檔案標頭加入歌曲的描述。這能讓使用者較容易取得歌曲的進階資訊並顯示在播放器"
-+"上。您可以自動透過網路取得這些資訊。請參考<i>取得 CDDB 資訊</li> 控制模組。"
- 
- #. i18n: file audiocd_vorbis_encoder.kcfg line 10
- #: rc.cpp:141
-diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdemultimedia/juk.po kde-i18n-zh_TW-3.5.10/messages/kdemultimedia/juk.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdemultimedia/juk.po	2008-08-19 20:43:21.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdemultimedia/juk.po	2011-11-11 15:45:17.000000000 +0100
-@@ -6,8 +6,7 @@
- "Project-Id-Version: juk\n"
- "POT-Creation-Date: 2008-07-08 01:20+0200\n"
- "PO-Revision-Date: 2006-05-18 11:25+0800\n"
--"Last-Translator: Frank Weng (a.k.a. Franklin) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Traditional Chinese <zh_l10n@linux.org.tw>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
-@@ -60,8 +59,8 @@
- 
- #: artsplayer.cpp:232
- 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 已經被正確地設定。"
- 
- #: artsplayer.cpp:237 exampleoptions.cpp:50 main.cpp:52 systemtray.cpp:519
-@@ -71,8 +70,8 @@
- 
- #: cache.cpp:301
- msgid ""
--"The music data cache has been corrupted. JuK needs to rescan it now. This may "
--"take some time."
-+"The music data cache has been corrupted. JuK needs to rescan it now. This "
-+"may take some time."
- msgstr "音樂資料快取已損毀。JuK 需要重新掃描，可能得花一點時間。"
- 
- #: collectionlist.cpp:60
-@@ -84,12 +83,13 @@
- "Removing an item from the collection will also remove it from all of your "
- "playlists. Are you sure you want to continue?\n"
- "\n"
--"Note, however, that if the directory that these files are in is in your \"scan "
--"on startup\" list, they will be readded on startup."
-+"Note, however, that if the directory that these files are in is in your "
-+"\"scan on startup\" list, they will be readded on startup."
- msgstr ""
- "移除收藏中的項目時，在您播放清單中的此項目也會跟著被移除。您確定要繼續嗎？\n"
- "\n"
--"然而，請注意，如果這些檔案存放的目錄是在您的「啟動時掃描」的清單中，這些檔案可能會在程式重新啟動時又被讀取到。"
-+"然而，請注意，如果這些檔案存放的目錄是在您的「啟動時掃描」的清單中，這些檔案"
-+"可能會在程式重新啟動時又被讀取到。"
- 
- #: collectionlist.cpp:231
- msgid "Show Playing"
-@@ -133,7 +133,8 @@
- 
- #: filerenamer.cpp:72
- msgid ""
--"You are about to rename the following files. Are you sure you want to continue?"
-+"You are about to rename the following files. Are you sure you want to "
-+"continue?"
- msgstr "您準備將以下檔案重新命名。您確定要這樣做嗎？"
- 
- #: filerenamer.cpp:78
-@@ -171,10 +172,8 @@
- msgstr "%1 到 %2"
- 
- #: filerenamer.cpp:885
--msgid ""
--"The following rename operations failed:\n"
--msgstr ""
--"以下的重新命名動作失敗：\n"
-+msgid "The following rename operations failed:\n"
-+msgstr "以下的重新命名動作失敗：\n"
- 
- #: filerenamerconfigdlg.cpp:24
- msgid "File Renamer Options"
-@@ -294,11 +293,11 @@
- 
- #: juk.cpp:191
- msgid "&Tag Guesser..."
--msgstr "標籤猜測器(&T)..."
-+msgstr "標籤猜測器(&T)…"
- 
- #: juk.cpp:194
- msgid "&File Renamer..."
--msgstr "檔案重新命名器(&F)..."
-+msgstr "檔案重新命名器(&F)…"
- 
- #: juk.cpp:203
- msgid "Track Position"
-@@ -326,9 +325,11 @@
- 
- #: juk.cpp:399
- msgid ""
--"<qt>Closing the main window will keep JuK running in the system tray. Use Quit "
--"from the File menu to quit the application.</qt>"
--msgstr "<qt>關閉主視窗後，JuK 仍然會留在系統匣中運作。要離開 JuK 請到選單中選取「離開」。</qt>"
-+"<qt>Closing the main window will keep JuK running in the system tray. Use "
-+"Quit from the File menu to quit the application.</qt>"
-+msgstr ""
-+"<qt>關閉主視窗後，JuK 仍然會留在系統匣中運作。要離開 JuK 請到選單中選取「離"
-+"開」。</qt>"
- 
- #: juk.cpp:401
- msgid "Docking in System Tray"
-@@ -348,8 +349,8 @@
- 
- #: k3bexporter.cpp:244
- msgid ""
--"Create an audio mode CD suitable for CD players, or a data mode CD suitable for "
--"computers and other digital music players?"
-+"Create an audio mode CD suitable for CD players, or a data mode CD suitable "
-+"for computers and other digital music players?"
- msgstr "要產生音樂光碟，還是資料光碟？"
- 
- #: k3bexporter.cpp:247
-@@ -471,7 +472,7 @@
- 
- #: musicbrainzquery.cpp:37
- msgid "Querying MusicBrainz server..."
--msgstr "查詢 MusicBrainz 伺服器..."
-+msgstr "查詢 MusicBrainz 伺服器…"
- 
- #: musicbrainzquery.cpp:50
- msgid "No matches found."
-@@ -520,9 +521,11 @@
- 
- #: playlist.cpp:841
- msgid ""
--"None of the items you have selected can be assigned a cover.  A track must have "
--"both the Artist and Album tags set to be assigned a cover."
--msgstr "您所選擇的項目均無法指定封面圖片。音軌必須有演唱者與專輯標籤才能指定封面圖片。"
-+"None of the items you have selected can be assigned a cover.  A track must "
-+"have both the Artist and Album tags set to be assigned a cover."
-+msgstr ""
-+"您所選擇的項目均無法指定封面圖片。音軌必須有演唱者與專輯標籤才能指定封面圖"
-+"片。"
- 
- #: playlist.cpp:852
- msgid "Select Cover Image File"
-@@ -612,7 +615,7 @@
- 
- #: playlist.cpp:2108
- msgid "Create Playlist From Selected Items..."
--msgstr "用選擇的項目建立播放清單..."
-+msgstr "用選擇的項目建立播放清單…"
- 
- #: playlist.cpp:2130
- msgid "Edit '%1'"
-@@ -715,15 +718,15 @@
- 
- #: playlistcollection.cpp:845
- msgid "&Empty Playlist..."
--msgstr "清空播放清單(&E)..."
-+msgstr "清空播放清單(&E)…"
- 
- #: playlistcollection.cpp:847
- msgid "&Search Playlist..."
--msgstr "搜尋播放清單(&S)..."
-+msgstr "搜尋播放清單(&S)…"
- 
- #: playlistcollection.cpp:849
- msgid "Playlist From &Folder..."
--msgstr "從資料夾中取得播放清單(&F)..."
-+msgstr "從資料夾中取得播放清單(&F)…"
- 
- #: playlistcollection.cpp:855
- msgid "&Guess Tag Information"
-@@ -747,19 +750,19 @@
- 
- #: playlistcollection.cpp:872
- msgid "Add &Folder..."
--msgstr "新增資料夾(&F)..."
-+msgstr "新增資料夾(&F)…"
- 
- #: playlistcollection.cpp:873
- msgid "&Rename..."
--msgstr "重新命名(&R)..."
-+msgstr "重新命名(&R)…"
- 
- #: playlistcollection.cpp:874
- msgid "D&uplicate..."
--msgstr "複製(&U)..."
-+msgstr "複製(&U)…"
- 
- #: playlistcollection.cpp:879
- msgid "Edit Search..."
--msgstr "編輯搜尋..."
-+msgstr "編輯搜尋…"
- 
- #: playlistcollection.cpp:882
- msgid "Refresh"
-@@ -781,11 +784,11 @@
- 
- #: playlistcollection.cpp:889
- msgid "Get Cover From &File..."
--msgstr "從檔案取得封面(&F)..."
-+msgstr "從檔案取得封面(&F)…"
- 
- #: playlistcollection.cpp:893
- msgid "Get Cover From &Internet..."
--msgstr "從網路取得封面(&F)..."
-+msgstr "從網路取得封面(&F)…"
- 
- #: playlistcollection.cpp:895
- msgid "&Delete Cover"
-@@ -913,16 +916,14 @@
- #: rc.cpp:87
- #, no-c-format
- msgid ""
--"<qt>"
--"<p>If this box is checked, files will be <b>permanently removed</b> "
-+"<qt><p>If this box is checked, files will be <b>permanently removed</b> "
- "instead of being placed in the Trash Bin.</p>\n"
- "\n"
- "<p><em>Use this option with caution</em>: Most filesystems are unable to "
- "reliably undelete deleted files.</p></qt>"
- msgstr ""
--"<qt>"
--"<p>如果開啟此選項，檔案會被永久移除，而不是被丟到資源回收桶內。</p> "
--"<p>請小心使用此選項：大部份的檔案系統都無法救回被刪除的檔案。</p></qt>"
-+"<qt><p>如果開啟此選項，檔案會被永久移除，而不是被丟到資源回收桶內。</p> <p>請"
-+"小心使用此選項：大部份的檔案系統都無法救回被刪除的檔案。</p></qt>"
- 
- #. i18n: file directorylistbase.ui line 22
- #: rc.cpp:92
-@@ -934,7 +935,7 @@
- #: rc.cpp:95
- #, no-c-format
- msgid "Add Folder..."
--msgstr "新增資料夾..."
-+msgstr "新增資料夾…"
- 
- #. i18n: file directorylistbase.ui line 56
- #: rc.cpp:98
-@@ -1132,9 +1133,12 @@
- #: rc.cpp:209
- #, no-c-format
- msgid ""
--"When using the file renamer your files will be renamed to the values that you "
--"have in your track's %1 tag, plus any additional text that you specify below."
--msgstr "使用檔案重新命名功能，您的檔案會根據您的音軌 %1 標籤，外加您在底下指定的文字而重新命名。"
-+"When using the file renamer your files will be renamed to the values that "
-+"you have in your track's %1 tag, plus any additional text that you specify "
-+"below."
-+msgstr ""
-+"使用檔案重新命名功能，您的檔案會根據您的音軌 %1 標籤，外加您在底下指定的文字"
-+"而重新命名。"
- 
- #. i18n: file filerenameroptionsbase.ui line 88
- #: rc.cpp:212
-@@ -1188,8 +1192,8 @@
- #: rc.cpp:236
- #, no-c-format
- msgid ""
--"JuK can force the track used in a file name to have a minimum number of digits. "
--" You may want to do this for better sorting in file managers."
-+"JuK can force the track used in a file name to have a minimum number of "
-+"digits.  You may want to do this for better sorting in file managers."
- msgstr "JuK 能讓音軌編號固定為最少幾位數。這樣能方便您管理檔案。"
- 
- #. i18n: file filerenameroptionsbase.ui line 252
-@@ -1246,8 +1250,7 @@
- msgid ""
- "Here you can see the currently configured file name schemes which the "
- "\"Suggest\" button in the tag editor uses to extract tag information from a "
--"file name. Each string may contain one of the following placeholders:"
--"<ul>\n"
-+"file name. Each string may contain one of the following placeholders:<ul>\n"
- "<li>%t: Title</li>\n"
- "<li>%a: Artist</li>\n"
- "<li>%A: Album</li>\n"
-@@ -1255,22 +1258,22 @@
- "<li>%c: Comment</li>\n"
- "</ul>\n"
- "For example, the file name scheme \"[%T] %a - %t\" would match \"[01] Deep "
--"Purple - Smoke on the water\" but not \"(Deep Purple) Smoke on the water\". For "
--"that second name, you would use the scheme \"(%a) %t\".<p/>\n"
--"Note that the order in which the schemes appear in the list is relevant, since "
--"the tag guesser will go through the list from the top to the bottom, and use "
--"the first matching scheme."
-+"Purple - Smoke on the water\" but not \"(Deep Purple) Smoke on the water\". "
-+"For that second name, you would use the scheme \"(%a) %t\".<p/>\n"
-+"Note that the order in which the schemes appear in the list is relevant, "
-+"since the tag guesser will go through the list from the top to the bottom, "
-+"and use the first matching scheme."
- msgstr ""
--"這裡您可以看到目前設定的檔名機制，用於從檔名中取出標籤資訊給標籤編輯器。每個字串可能會包含以下的符號： "
--"<ul> "
--"<li>%t：標題</li>\n"
-+"這裡您可以看到目前設定的檔名機制，用於從檔名中取出標籤資訊給標籤編輯器。每個"
-+"字串可能會包含以下的符號： <ul> <li>%t：標題</li>\n"
- "<li>%a：演唱者</li>\n"
- "<li>%A：專輯名稱</li>\n"
- "<li>%T：音軌編號</li>\n"
- "<li>%c：註解</li>\n"
--"</ul> 例如，檔名機制為 \"[%T] %a - %t\" 的話，則檔名為 \"[01] Deep Purple - Smoke on the "
--"water\" 會符合此機制，但 \"(Deep Purple) Smoke on the water\" 則否。 "
--"注意機制出現的順序是有差別的，因為標籤猜測器會從上到下，找尋第一個符合的機制。"
-+"</ul> 例如，檔名機制為 \"[%T] %a - %t\" 的話，則檔名為 \"[01] Deep Purple - "
-+"Smoke on the water\" 會符合此機制，但 \"(Deep Purple) Smoke on the water\" 則"
-+"否。 注意機制出現的順序是有差別的，因為標籤猜測器會從上到下，找尋第一個符合的"
-+"機制。"
- 
- #. i18n: file tagguesserconfigdlgwidget.ui line 64
- #: rc.cpp:274
-@@ -1404,13 +1407,11 @@
- #: systemtray.cpp:532
- msgid ""
- "_: %1 is Cover Art, %2 is the playing track, %3 is the appname\n"
--"<center><table cellspacing=\"2\">"
--"<tr><td valign=\"middle\">%1</td><td valign=\"middle\">%2</td></tr></table><em>"
--"%3</em></center>"
-+"<center><table cellspacing=\"2\"><tr><td valign=\"middle\">%1</td><td valign="
-+"\"middle\">%2</td></tr></table><em>%3</em></center>"
- msgstr ""
--"<center><table cellspacing=\"2\">"
--"<tr><td valign=\"middle\">%1</td><td valign=\"middle\">%2</td></tr></table><em>"
--"%3</em></center>"
-+"<center><table cellspacing=\"2\"><tr><td valign=\"middle\">%1</td><td valign="
-+"\"middle\">%2</td></tr></table><em>%3</em></center>"
- 
- #: tageditor.cpp:472
- msgid "Show &Tag Editor"
-@@ -1461,10 +1462,8 @@
- msgstr "註解(&C)："
- 
- #: tageditor.cpp:703
--msgid ""
--"Do you want to save your changes to:\n"
--msgstr ""
--"您要儲存到：\n"
-+msgid "Do you want to save your changes to:\n"
-+msgstr "您要儲存到：\n"
- 
- #: tageditor.cpp:705
- msgid "Save Changes"
-@@ -1540,7 +1539,7 @@
- 
- #: webimagefetcher.cpp:205
- msgid "Searching for Images. Please Wait..."
--msgstr "搜尋圖片中。請稍候..."
-+msgstr "搜尋圖片中。請稍候…"
- 
- #: webimagefetcher.cpp:213
- msgid "Cover Downloader"
-diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdemultimedia/kaboodle.po kde-i18n-zh_TW-3.5.10/messages/kdemultimedia/kaboodle.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdemultimedia/kaboodle.po	2006-07-22 10:04:36.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdemultimedia/kaboodle.po	2011-11-11 15:45:17.000000000 +0100
-@@ -9,8 +9,7 @@
- "Project-Id-Version: kaboodle\n"
- "POT-Creation-Date: 2005-01-24 01:34+0100\n"
- "PO-Revision-Date: 2006-02-21 12:22+0800\n"
--"Last-Translator: Frank Weng (a.k.a. Franklin) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Traditional Chinese <zh_l10n@linux.org.tw>\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/kdemultimedia/kaudiocreator.po kde-i18n-zh_TW-3.5.10/messages/kdemultimedia/kaudiocreator.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdemultimedia/kaudiocreator.po	2008-08-19 20:43:21.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdemultimedia/kaudiocreator.po	2011-11-11 15:45:17.000000000 +0100
-@@ -9,8 +9,7 @@
- "Project-Id-Version: kaudiocreator\n"
- "POT-Creation-Date: 2008-07-08 01:20+0200\n"
- "PO-Revision-Date: 2006-10-18 16:06+0800\n"
--"Last-Translator: Frank Weng (a.k.a. Franklin) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Chinese Traditional <zh-l10n@linux.org.tw>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
-@@ -31,7 +30,8 @@
- 
- #: encodefileimp.cpp:72 tracksimp.cpp:419
- msgid ""
--"%1 Job(s) have been started.  You can watch their progress in the jobs section."
-+"%1 Job(s) have been started.  You can watch their progress in the jobs "
-+"section."
- msgstr "%1 個工作已經開始。您可以在工作欄內看到進度"
- 
- #: encodefileimp.cpp:74 tracksimp.cpp:421
-@@ -191,7 +191,7 @@
- 
- #: kaudiocreator.cpp:72
- msgid "&Configure KAudioCreator..."
--msgstr "設定 KAudioCreator(&C)..."
-+msgstr "設定 KAudioCreator(&C)…"
- 
- #. i18n: file tracks.ui line 135
- #: kaudiocreator.cpp:75 rc.cpp:277
-@@ -213,11 +213,11 @@
- 
- #: kaudiocreator.cpp:119
- msgid "&Edit Album..."
--msgstr "編輯專輯(&E)..."
-+msgstr "編輯專輯(&E)…"
- 
- #: kaudiocreator.cpp:124
- msgid "Encode &File..."
--msgstr "編碼檔案(&F)..."
-+msgstr "編碼檔案(&F)…"
- 
- #: kaudiocreator.cpp:127
- msgid "&CDDB Lookup"
-@@ -399,13 +399,13 @@
- #: rc.cpp:57
- #, no-c-format
- msgid "&Add..."
--msgstr "新增(&A)..."
-+msgstr "新增(&A)…"
- 
- #. i18n: file encoderconfig.ui line 48
- #: rc.cpp:63
- #, no-c-format
- msgid "&Configure..."
--msgstr "設定(&C)..."
-+msgstr "設定(&C)…"
- 
- #. i18n: file encoderconfig.ui line 70
- #: rc.cpp:66
-@@ -507,7 +507,7 @@
- #: rc.cpp:114
- #, no-c-format
- msgid "The output...."
--msgstr "輸出..."
-+msgstr "輸出…"
- 
- #. i18n: file general.ui line 30
- #: rc.cpp:123
-@@ -540,7 +540,8 @@
- "Regular expression used on all file names. For example using selection \" \" "
- "and replace with \"_\" would replace all the spaces with underlines.\n"
- msgstr ""
--"對所有檔名使用正規表示式。例如選擇 \" \" 並取代為 \"_\" 會將所有的空白換成底線。\n"
-+"對所有檔名使用正規表示式。例如選擇 \" \" 並取代為 \"_\" 會將所有的空白換成底"
-+"線。\n"
- 
- #. i18n: file general.ui line 77
- #: rc.cpp:139
-@@ -762,16 +763,17 @@
- #: rc.cpp:292
- #, no-c-format
- msgid ""
--"When files have finished being processed, they are saved based upon the <i>"
--"File Location</i>.  Information about the track should be used within that "
--"text.  There are eleven special words starting with a % that will be replaced "
--"with the corresponding track's information.  Each of the buttons below will "
--"insert its replacement word into the <i>File Location</i> "
--"where the cursor is.  Use at least one replacement string to make sure that the "
-+"When files have finished being processed, they are saved based upon the "
-+"<i>File Location</i>.  Information about the track should be used within "
-+"that text.  There are eleven special words starting with a % that will be "
-+"replaced with the corresponding track's information.  Each of the buttons "
-+"below will insert its replacement word into the <i>File Location</i> where "
-+"the cursor is.  Use at least one replacement string to make sure that the "
- "<i>File Location</i> is unique."
- msgstr ""
--"當檔案處理完成之後，會儲存到「檔案位置」中。關於音軌的資訊應該放在那些文字中。有十一個以 % "
--"開頭的符號可以被取代為音軌的資訊。下方的每個按鈕會插入這些符號到「檔案位置」欄位中。請至少使用一種符號，以便保證檔案位置不會重複。"
-+"當檔案處理完成之後，會儲存到「檔案位置」中。關於音軌的資訊應該放在那些文字"
-+"中。有十一個以 % 開頭的符號可以被取代為音軌的資訊。下方的每個按鈕會插入這些符"
-+"號到「檔案位置」欄位中。請至少使用一種符號，以便保證檔案位置不會重複。"
- 
- #. i18n: file wizard.ui line 94
- #: rc.cpp:295
-diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdemultimedia/kcmaudiocd.po kde-i18n-zh_TW-3.5.10/messages/kdemultimedia/kcmaudiocd.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdemultimedia/kcmaudiocd.po	2007-05-14 12:23:07.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdemultimedia/kcmaudiocd.po	2011-11-11 15:45:17.000000000 +0100
-@@ -10,8 +10,7 @@
- "Project-Id-Version: kcmaudiocd\n"
- "POT-Creation-Date: 2007-03-26 02:15+0200\n"
- "PO-Revision-Date: 2006-02-21 12:35+0800\n"
--"Last-Translator: Frank Weng (a.k.a. Franklin) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Traditional Chinese <zh_l10n@linux.org.tw>\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 ""
--"r5224205@ms.cc.ntu.edu.tw,pesder@seed.net.tw,franklin at goodhorse dot idv dot "
--"tw"
-+"r5224205@ms.cc.ntu.edu.tw,pesder@seed.net.tw,franklin at goodhorse dot idv "
-+"dot tw"
- 
- #: kcmaudiocd.cpp:40
- msgid "Report errors found on the cd."
-@@ -64,16 +63,18 @@
- 
- #: kcmaudiocd.cpp:251
- msgid ""
--"<h1>Audio CDs</h1> The Audio CD IO-Slave enables you to easily create wav, MP3 "
--"or Ogg Vorbis files from your audio CD-ROMs or DVDs. The slave is invoked by "
--"typing <i>\"audiocd:/\"</i> in Konqueror's location bar. In this module, you "
--"can configure encoding, and device settings. Note that MP3 and Ogg Vorbis "
--"encoding are only available if KDE was built with a recent version of the LAME "
--"or Ogg Vorbis libraries."
-+"<h1>Audio CDs</h1> The Audio CD IO-Slave enables you to easily create wav, "
-+"MP3 or Ogg Vorbis files from your audio CD-ROMs or DVDs. The slave is "
-+"invoked by typing <i>\"audiocd:/\"</i> in Konqueror's location bar. In this "
-+"module, you can configure encoding, and device settings. Note that MP3 and "
-+"Ogg Vorbis encoding are only available if KDE was built with a recent "
-+"version of the LAME or Ogg Vorbis libraries."
- msgstr ""
--"<h1>Audio CD</h1>Audio CD IO-Slave 讓您能輕易地從您的音樂 CD-ROM 或 DVD 建立 wav 、MP3 或 Ogg "
--"Vorbis 檔案。您可以在 Konqueror 的位址列鍵入 <i>“audiocd:/”</i> 來呼叫它。在此模組中，您可以設定編碼、 CDDB "
--"查詢和裝置設定。注意只有當 KDE 建構於 LAME 或 Ogg Vorbis 程式庫的最近版本時 MP3 與 Ogg Vorbis 的編碼才能使用。"
-+"<h1>Audio CD</h1>Audio CD IO-Slave 讓您能輕易地從您的音樂 CD-ROM 或 DVD 建立 "
-+"wav 、MP3 或 Ogg Vorbis 檔案。您可以在 Konqueror 的位址列鍵入 "
-+"<i>“audiocd:/”</i> 來呼叫它。在此模組中，您可以設定編碼、 CDDB 查詢和裝置設"
-+"定。注意只有當 KDE 建構於 LAME 或 Ogg Vorbis 程式庫的最近版本時 MP3 與 Ogg "
-+"Vorbis 的編碼才能使用。"
- 
- #. i18n: file audiocdconfig.ui line 50
- #: rc.cpp:3
-@@ -117,7 +118,8 @@
- msgid ""
- "Specify a location for the drive you want to use. Normally, this is a file "
- "inside the /dev folder representing your CD or DVD drive."
--msgstr "指定您想使用的裝置位置。這通常是在 /dev 目錄內代表您的 CD 或 DVD 裝置的檔案。"
-+msgstr ""
-+"指定您想使用的裝置位置。這通常是在 /dev 目錄內代表您的 CD 或 DVD 裝置的檔案。"
- 
- #. i18n: file audiocdconfig.ui line 155
- #: rc.cpp:24
-@@ -146,7 +148,9 @@
- "If you uncheck this option, the slave will not try to use error correction "
- "which can be useful for reading damaged CDs. However, this feature can be "
- "problematic in some cases, so you can switch it off here."
--msgstr "假如你不選擇此選項，程式將不會嘗試使用有助於讀取損壞 CD 的錯誤修正功能。然而此特性在某些狀況可能有問題，因此你可以在此關掉它。"
-+msgstr ""
-+"假如你不選擇此選項，程式將不會嘗試使用有助於讀取損壞 CD 的錯誤修正功能。然而"
-+"此特性在某些狀況可能有問題，因此你可以在此關掉它。"
- 
- #. i18n: file audiocdconfig.ui line 180
- #: rc.cpp:36
-@@ -263,7 +267,8 @@
- "Regular expression used on all file names. For example using selection \" \" "
- "and replace with \"_\" would replace all the spaces with underlines.\n"
- msgstr ""
--"對所有檔名套用正規表示式。例如：選擇 \" \" 並取代為 \"_\"，會將所有的空白取代為底線。\n"
-+"對所有檔名套用正規表示式。例如：選擇 \" \" 並取代為 \"_\"，會將所有的空白取代"
-+"為底線。\n"
- 
- #. i18n: file audiocdconfig.ui line 384
- #: rc.cpp:94
-diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdemultimedia/kcmcddb.po kde-i18n-zh_TW-3.5.10/messages/kdemultimedia/kcmcddb.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdemultimedia/kcmcddb.po	2006-07-22 10:04:36.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdemultimedia/kcmcddb.po	2011-11-11 15:45:17.000000000 +0100
-@@ -9,8 +9,7 @@
- "Project-Id-Version: kcmcddb\n"
- "POT-Creation-Date: 2005-01-31 01:32+0100\n"
- "PO-Revision-Date: 2006-02-21 12:28+0800\n"
--"Last-Translator: Frank Weng (a.k.a. Franklin) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Traditional Chinese <zh_l10n@linux.org.tw>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
-@@ -23,7 +22,7 @@
- 
- #: cddbconfigwidget.cpp:71
- msgid "Could not fetch mirror list."
--msgstr "無法取得鏡射站台列表。"
-+msgstr "無法取得鏡射站臺列表。"
- 
- #: cddbconfigwidget.cpp:71
- msgid "Could Not Fetch"
-@@ -31,11 +30,11 @@
- 
- #: cddbconfigwidget.cpp:75
- msgid "Select mirror"
--msgstr "選擇鏡射站台"
-+msgstr "選擇鏡射站臺"
- 
- #: cddbconfigwidget.cpp:76
- msgid "Select one of these mirrors"
--msgstr "請從這些站台中選取一個"
-+msgstr "請從這些站臺中選取一個"
- 
- #. i18n: file cddbconfigwidgetbase.ui line 148
- #: cddbconfigwidget.cpp:93 rc.cpp:42 rc.cpp:78
-@@ -56,9 +55,12 @@
- 
- #: kcmcddb.cpp:93
- msgid ""
--"freedb has been set to use HTTP for submissions because the email details you "
--"have entered are incomplete. Please review your email settings and try again."
--msgstr "因為您所輸入的電子郵件詳情不完整，因此freedb 已設定使用 HTTP。請檢查您的電子郵件設定然後再試一次。"
-+"freedb has been set to use HTTP for submissions because the email details "
-+"you have entered are incomplete. Please review your email settings and try "
-+"again."
-+msgstr ""
-+"因為您所輸入的電子郵件詳情不完整，因此freedb 已設定使用 HTTP。請檢查您的電子"
-+"郵件設定然後再試一次。"
- 
- #: kcmcddb.cpp:96
- msgid "Incorrect Email Settings"
-@@ -104,8 +106,8 @@
- #: rc.cpp:21
- #, no-c-format
- msgid ""
--"Check for locally cached CD information before trying to look up at remote CDDB "
--"server."
-+"Check for locally cached CD information before trying to look up at remote "
-+"CDDB server."
- msgstr "在試著檢查遠端 CDDB 伺服器前，先檢查當地快取 CD 資訊。"
- 
- #. i18n: file cddbconfigwidgetbase.ui line 93
-@@ -148,7 +150,7 @@
- #: rc.cpp:48
- #, no-c-format
- msgid "Show &Mirror List"
--msgstr "顯示鏡射站台清單(&M)"
-+msgstr "顯示鏡射站臺清單(&M)"
- 
- #. i18n: file cddbconfigwidgetbase.ui line 185
- #: rc.cpp:51
-diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdemultimedia/kfile_au.po kde-i18n-zh_TW-3.5.10/messages/kdemultimedia/kfile_au.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdemultimedia/kfile_au.po	2005-09-10 11:24:21.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdemultimedia/kfile_au.po	2011-11-11 15:45:17.000000000 +0100
-@@ -7,7 +7,7 @@
- "Project-Id-Version: kfile_au\n"
- "POT-Creation-Date: 2004-10-12 01:17+0200\n"
- "PO-Revision-Date: 2002-06-04 20:05+0800\n"
--"Last-Translator: Keanu <keanu@ms50.url.com.tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\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/kdemultimedia/kfile_avi.po kde-i18n-zh_TW-3.5.10/messages/kdemultimedia/kfile_avi.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdemultimedia/kfile_avi.po	2006-07-22 10:04:36.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdemultimedia/kfile_avi.po	2011-11-11 15:45:17.000000000 +0100
-@@ -9,8 +9,7 @@
- "Project-Id-Version: kfile_avi\n"
- "POT-Creation-Date: 2004-10-12 01:17+0200\n"
- "PO-Revision-Date: 2006-02-21 09:00+0800\n"
--"Last-Translator: Frank Weng (a.k.a. Franklin) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Traditional Chinese <zh_l10n@linux.org.tw>\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/kdemultimedia/kfile_flac.po kde-i18n-zh_TW-3.5.10/messages/kdemultimedia/kfile_flac.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdemultimedia/kfile_flac.po	2006-07-22 10:04:36.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdemultimedia/kfile_flac.po	2011-11-11 15:45:17.000000000 +0100
-@@ -6,8 +6,7 @@
- "Project-Id-Version: kfile_flac\n"
- "POT-Creation-Date: 2004-10-12 01:17+0200\n"
- "PO-Revision-Date: 2006-02-21 09:02+0800\n"
--"Last-Translator: Frank Weng (a.k.a. Franklin) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Traditional Chinese <zh_l10n@linux.org.tw>\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/kdemultimedia/kfile_m3u.po kde-i18n-zh_TW-3.5.10/messages/kdemultimedia/kfile_m3u.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdemultimedia/kfile_m3u.po	2005-09-10 11:24:21.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdemultimedia/kfile_m3u.po	2011-11-11 15:45:17.000000000 +0100
-@@ -7,7 +7,7 @@
- "Project-Id-Version: kfile_m3u\n"
- "POT-Creation-Date: 2004-10-12 01:17+0200\n"
- "PO-Revision-Date: 2002-06-20 02:19+0800\n"
--"Last-Translator: Keanu <keanu@ms50.url.com.tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\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/kdemultimedia/kfile_mp3.po kde-i18n-zh_TW-3.5.10/messages/kdemultimedia/kfile_mp3.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdemultimedia/kfile_mp3.po	2006-07-22 10:04:36.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdemultimedia/kfile_mp3.po	2011-11-11 15:45:17.000000000 +0100
-@@ -8,8 +8,7 @@
- "Project-Id-Version: kfile_mp3\n"
- "POT-Creation-Date: 2005-05-26 01:24+0200\n"
- "PO-Revision-Date: 2006-02-21 09:04+0800\n"
--"Last-Translator: Frank Weng (a.k.a. Franklin) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Traditional Chinese <zh_l10n@linux.org.tw>\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/kdemultimedia/kfile_mpc.po kde-i18n-zh_TW-3.5.10/messages/kdemultimedia/kfile_mpc.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdemultimedia/kfile_mpc.po	2006-07-22 10:04:36.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdemultimedia/kfile_mpc.po	2011-11-11 15:45:17.000000000 +0100
-@@ -6,8 +6,7 @@
- "Project-Id-Version: kfile_mpc\n"
- "POT-Creation-Date: 2004-10-12 01:17+0200\n"
- "PO-Revision-Date: 2006-02-21 09:05+0800\n"
--"Last-Translator: Frank Weng (a.k.a. Franklin) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Traditional Chinese <zh_l10n@linux.org.tw>\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/kdemultimedia/kfile_mpeg.po kde-i18n-zh_TW-3.5.10/messages/kdemultimedia/kfile_mpeg.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdemultimedia/kfile_mpeg.po	2006-10-01 18:34:26.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdemultimedia/kfile_mpeg.po	2011-11-11 15:45:17.000000000 +0100
-@@ -6,8 +6,7 @@
- "Project-Id-Version: kfile_mpeg\n"
- "POT-Creation-Date: 2006-08-16 04:08+0200\n"
- "PO-Revision-Date: 2006-02-21 09:06+0800\n"
--"Last-Translator: Frank Weng (a.k.a. Franklin) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Traditional Chinese <zh_l10n@linux.org.tw>\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/kdemultimedia/kfile_ogg.po kde-i18n-zh_TW-3.5.10/messages/kdemultimedia/kfile_ogg.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdemultimedia/kfile_ogg.po	2006-07-22 10:04:36.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdemultimedia/kfile_ogg.po	2011-11-11 15:45:17.000000000 +0100
-@@ -8,8 +8,7 @@
- "Project-Id-Version: kfile_ogg\n"
- "POT-Creation-Date: 2004-10-12 01:17+0200\n"
- "PO-Revision-Date: 2006-02-21 09:13+0800\n"
--"Last-Translator: Frank Weng (a.k.a. Franklin) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Traditional Chinese <zh_l10n@linux.org.tw>\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/kdemultimedia/kfile_sid.po kde-i18n-zh_TW-3.5.10/messages/kdemultimedia/kfile_sid.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdemultimedia/kfile_sid.po	2006-07-22 10:04:36.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdemultimedia/kfile_sid.po	2011-11-11 15:45:17.000000000 +0100
-@@ -6,8 +6,7 @@
- "Project-Id-Version: kfile_sid\n"
- "POT-Creation-Date: 2004-10-12 01:17+0200\n"
- "PO-Revision-Date: 2006-02-21 09:14+0800\n"
--"Last-Translator: Frank Weng (a.k.a. Franklin) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Traditional Chinese <zh_l10n@linux.org.tw>\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/kdemultimedia/kfile_theora.po kde-i18n-zh_TW-3.5.10/messages/kdemultimedia/kfile_theora.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdemultimedia/kfile_theora.po	2006-07-22 10:04:36.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdemultimedia/kfile_theora.po	2011-11-11 15:45:17.000000000 +0100
-@@ -6,8 +6,7 @@
- "Project-Id-Version: kfile_theora\n"
- "POT-Creation-Date: 2004-10-12 01:17+0200\n"
- "PO-Revision-Date: 2006-02-21 09:15+0800\n"
--"Last-Translator: Frank Weng (a.k.a. Franklin) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Traditional Chinese <zh_l10n@linux.org.tw>\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/kdemultimedia/kfile_wav.po kde-i18n-zh_TW-3.5.10/messages/kdemultimedia/kfile_wav.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdemultimedia/kfile_wav.po	2006-07-22 10:04:36.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdemultimedia/kfile_wav.po	2011-11-11 15:45:17.000000000 +0100
-@@ -9,8 +9,7 @@
- "Project-Id-Version: kfile_wav\n"
- "POT-Creation-Date: 2004-10-12 01:17+0200\n"
- "PO-Revision-Date: 2006-02-21 09:16+0800\n"
--"Last-Translator: Frank Weng (a.k.a. Franklin) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Traditional Chinese <zh_l10n@linux.org.tw>\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/kdemultimedia/kio_audiocd.po kde-i18n-zh_TW-3.5.10/messages/kdemultimedia/kio_audiocd.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdemultimedia/kio_audiocd.po	2007-05-14 12:23:07.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdemultimedia/kio_audiocd.po	2011-11-11 15:45:17.000000000 +0100
-@@ -5,8 +5,7 @@
- "Project-Id-Version: kio_audiocd\n"
- "POT-Creation-Date: 2007-01-19 02:40+0100\n"
- "PO-Revision-Date: 2006-02-21 12:20+0800\n"
--"Last-Translator: Frank Weng (a.k.a. Franklin) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Traditional Chinese <zh_l10n@linux.org.tw>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
-@@ -39,8 +38,8 @@
- 
- #: audiocd.cpp:201
- msgid ""
--"You cannot specify a host with this protocol. Please use the audiocd:/ format "
--"instead."
-+"You cannot specify a host with this protocol. Please use the audiocd:/ "
-+"format instead."
- msgstr "使用此協定不能指定主機。請改用 audiocd:/。"
- 
- #: audiocd.cpp:755
-@@ -59,15 +58,17 @@
- msgid ""
- "Unknown error.  If you have a cd in the drive try running cdparanoia -vsQ as "
- "yourself (not root). Do you see a track list? If not, make sure you have "
--"permission to access the CD device. If you are using SCSI emulation (possible "
--"if you have an IDE CD writer) then make sure you check that you have read and "
--"write permissions on the generic SCSI device, which is probably /dev/sg0, "
--"/dev/sg1, etc.. If it still does not work, try typing audiocd:/?device=/dev/sg0 "
--"(or similar) to tell kio_audiocd which device your CD-ROM is."
-+"permission to access the CD device. If you are using SCSI emulation "
-+"(possible if you have an IDE CD writer) then make sure you check that you "
-+"have read and write permissions on the generic SCSI device, which is "
-+"probably /dev/sg0, /dev/sg1, etc.. If it still does not work, try typing "
-+"audiocd:/?device=/dev/sg0 (or similar) to tell kio_audiocd which device your "
-+"CD-ROM is."
- msgstr ""
--"未知的錯誤。如果您已將 CD 放入，請試著用您自己的帳號執行 cdparanoia "
--"-vsQ。您有看到音軌的列表嗎？如果沒有的話，請確認您有光碟機裝置的讀寫權限。若是您使用的是模擬 SCSI，請確認您對通用的 SCSI "
--"裝置（例：/dev/sg0 /dev/sg1 ...）有讀寫權限。如果還是不行，請輸入 audio:/?device=/dev/sg0 （或其他裝置名稱）告訴 "
-+"未知的錯誤。如果您已將 CD 放入，請試著用您自己的帳號執行 cdparanoia -vsQ。您"
-+"有看到音軌的列表嗎？如果沒有的話，請確認您有光碟機裝置的讀寫權限。若是您使用"
-+"的是模擬 SCSI，請確認您對通用的 SCSI 裝置（例：/dev/sg0 /dev/sg1 ...）有讀寫"
-+"權限。如果還是不行，請輸入 audio:/?device=/dev/sg0 （或其他裝置名稱）告訴 "
- "kio_audiocd 您使用的光碟機裝置。"
- 
- #: audiocd.cpp:835
-diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdemultimedia/kmid.po kde-i18n-zh_TW-3.5.10/messages/kdemultimedia/kmid.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdemultimedia/kmid.po	2006-07-22 10:04:36.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdemultimedia/kmid.po	2011-11-11 15:45:17.000000000 +0100
-@@ -9,8 +9,7 @@
- "Project-Id-Version: kmid\n"
- "POT-Creation-Date: 2005-08-24 02:38+0200\n"
- "PO-Revision-Date: 2006-02-21 12:44+0800\n"
--"Last-Translator: Frank Weng (a.k.a. Franklin) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Traditional Chinese <zh_l10n@linux.org.tw>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
-@@ -68,15 +67,15 @@
- 
- #: collectdlg.cpp:85
- msgid "&New..."
--msgstr "新建(&N)..."
-+msgstr "新建(&N)…"
- 
- #: collectdlg.cpp:89
- msgid "&Copy..."
--msgstr "複製(&C)..."
-+msgstr "複製(&C)…"
- 
- #: collectdlg.cpp:98
- msgid "&Add..."
--msgstr "增加(&A)..."
-+msgstr "增加(&A)…"
- 
- #: collectdlg.cpp:158
- msgid "New Collection"
-@@ -181,7 +180,7 @@
- 
- #: kmidframe.cpp:90
- msgid "&Save Lyrics..."
--msgstr "儲存歌詞 (&S) ..."
-+msgstr "儲存歌詞(&S)…"
- 
- #: kmidframe.cpp:94
- msgid "&Play"
-@@ -213,7 +212,7 @@
- 
- #: kmidframe.cpp:116
- msgid "&Organize..."
--msgstr "組織(&O)..."
-+msgstr "組織(&O)…"
- 
- #: kmidframe.cpp:120
- msgid "In Order"
-@@ -233,11 +232,11 @@
- 
- #: kmidframe.cpp:132
- msgid "&General MIDI"
--msgstr "標準 Midi (&G)"
-+msgstr "標準 Midi(&G)"
- 
- #: kmidframe.cpp:133
- msgid "&MT-32"
--msgstr "MT-32 (&M)"
-+msgstr "MT-32(&M)"
- 
- #: kmidframe.cpp:135
- msgid "File Type"
-@@ -269,7 +268,7 @@
- 
- #: kmidframe.cpp:159
- msgid "Show &Channel View"
--msgstr "顯示聲道 (&C)"
-+msgstr "顯示聲道(&C)"
- 
- #: kmidframe.cpp:162
- msgid "Hide &Channel View"
-@@ -277,15 +276,15 @@
- 
- #: kmidframe.cpp:164
- msgid "Channel View &Options..."
--msgstr "聲道顯示選項 (&O)..."
-+msgstr "聲道顯示選項(&O)…"
- 
- #: kmidframe.cpp:168
- msgid "&Font Change..."
--msgstr "改變字型(&F)..."
-+msgstr "改變字型(&F)…"
- 
- #: kmidframe.cpp:172
- msgid "MIDI &Setup..."
--msgstr "Midi 設定(&S)..."
-+msgstr "Midi 設定(&S)…"
- 
- #: kmidframe.cpp:286 kmidframe.cpp:561 midicfgdlg.cpp:117
- msgid "Only local files are currently supported."
-@@ -349,7 +348,7 @@
- 
- #: instrname.i18n:6
- msgid "Acoustic Grand Piano"
--msgstr "平台鋼琴"
-+msgstr "平臺鋼琴"
- 
- #: instrname.i18n:7
- msgid "Bright Acoustic Piano"
-@@ -357,7 +356,7 @@
- 
- #: instrname.i18n:8
- msgid "Electric Grand Piano"
--msgstr "平台電鋼琴"
-+msgstr "平臺電鋼琴"
- 
- #: instrname.i18n:9
- msgid "Honky-Tonk"
-diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdemultimedia/kmix.po kde-i18n-zh_TW-3.5.10/messages/kdemultimedia/kmix.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdemultimedia/kmix.po	2008-08-19 20:43:21.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdemultimedia/kmix.po	2011-11-11 15:45:17.000000000 +0100
-@@ -9,8 +9,7 @@
- "Project-Id-Version: kmix\n"
- "POT-Creation-Date: 2008-08-12 01:17+0200\n"
- "PO-Revision-Date: 2006-06-28 07:50+0800\n"
--"Last-Translator: Frank Weng (a.k.a. Franklin) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Chinese Traditional <zh-l10n@linux.org.tw>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
-@@ -47,7 +46,7 @@
- 
- #: kmix.cpp:115
- msgid "Configure &Global Shortcuts..."
--msgstr "設定全域捷徑(&G)..."
-+msgstr "設定全域捷徑(&G)…"
- 
- #: kmix.cpp:119
- msgid "Hardware &Information"
-@@ -107,7 +106,8 @@
- 
- #: kmixapplet.cpp:216
- msgid ""
--"For detailed credits, please refer to the About information of the KMix program"
-+"For detailed credits, please refer to the About information of the KMix "
-+"program"
- msgstr "詳細的內容請參考「關於 Kmix」"
- 
- #: kmixapplet.cpp:323
-@@ -144,7 +144,7 @@
- 
- #: kmixdockwidget.cpp:90
- msgid "Select Master Channel..."
--msgstr "選擇主聲道..."
-+msgstr "選擇主聲道…"
- 
- #: kmixdockwidget.cpp:177
- msgid "Mixer cannot be found"
-@@ -310,7 +310,7 @@
- 
- #: mdwenum.cpp:57 mdwswitch.cpp:58
- msgid "C&onfigure Shortcuts..."
--msgstr "設定捷徑(&O)..."
-+msgstr "設定捷徑(&O)…"
- 
- #: mdwenum.cpp:63
- msgid "Next Value"
-@@ -330,7 +330,7 @@
- 
- #: mdwslider.cpp:79
- msgid "C&onfigure Global Shortcuts..."
--msgstr "設定全域捷徑(&O)..."
-+msgstr "設定全域捷徑(&O)…"
- 
- #: mdwslider.cpp:84
- msgid "Increase Volume of '%1'"
-@@ -401,7 +401,9 @@
- msgid ""
- "kmix: Mixer does not support your platform. See mixer.cpp for porting hints "
- "(PORTING)."
--msgstr "kmix：混音器並不支援您的系統。參看 mixer.cpp 原始碼內的提示，讓本程式移植到您的系統 (PORTING)。"
-+msgstr ""
-+"kmix：混音器並不支援您的系統。參看 mixer.cpp 原始碼內的提示，讓本程式移植到您"
-+"的系統 (PORTING)。"
- 
- #: mixer_backend.cpp:127
- msgid "kmix: Not enough memory."
-@@ -547,7 +549,7 @@
- "Login as root and do a 'chmod a+rw /dev/mixer*' to allow the access."
- msgstr ""
- "kmix：您沒有足夠權限去存取混音器裝置。\n"
--"用 root 身份執行 'chmod a+rw /dev/mixer*' 令您可存取這個裝置。 "
-+"用 root 身分執行 'chmod a+rw /dev/mixer*' 令您可存取這個裝置。 "
- 
- #: mixer_oss.cpp:215 mixer_oss4.cpp:345
- msgid ""
-diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdemultimedia/krec.po kde-i18n-zh_TW-3.5.10/messages/kdemultimedia/krec.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdemultimedia/krec.po	2006-10-01 18:34:26.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdemultimedia/krec.po	2011-11-11 15:45:17.000000000 +0100
-@@ -10,8 +10,7 @@
- "Project-Id-Version: krec\n"
- "POT-Creation-Date: 2006-08-20 04:11+0200\n"
- "PO-Revision-Date: 2006-02-21 13:12+0800\n"
--"Last-Translator: Frank Weng (a.k.a. Franklin) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Traditional Chinese <zh_l10n@linux.org.tw>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
-@@ -52,10 +51,12 @@
- 
- #: mp3_export/krecexport_mp3.cpp:83
- msgid ""
--"Please note that this plugin takes its qualitysettings from the corresponding "
--"section of the Audio CDs Control Center module configuration. Make use of the "
--"Control Center to configure these settings."
--msgstr "請注意，這個外掛程式是從 Audio CD 控制中心模組設定中取得音效的品質設定。請到控制中心去設定這些值。"
-+"Please note that this plugin takes its qualitysettings from the "
-+"corresponding section of the Audio CDs Control Center module configuration. "
-+"Make use of the Control Center to configure these settings."
-+msgstr ""
-+"請注意，這個外掛程式是從 Audio CD 控制中心模組設定中取得音效的品質設定。請到"
-+"控制中心去設定這些值。"
- 
- #: mp3_export/krecexport_mp3.cpp:87 ogg_export/krecexport_ogg.cpp:78
- msgid "Quality Configuration"
-@@ -67,16 +68,18 @@
- 
- #: ogg_export/krecexport_ogg.cpp:69
- msgid ""
--"At this time OGG-export only supports files in 44kHz samplingrate, 16bit and 2 "
--"channels."
-+"At this time OGG-export only supports files in 44kHz samplingrate, 16bit and "
-+"2 channels."
- msgstr "此時 OGG 匯出只支援取樣頻率為 44 千赫，十六位元及雙聲道的檔案。"
- 
- #: ogg_export/krecexport_ogg.cpp:75
- msgid ""
--"Please note that this plugin takes its qualitysettings from the corresponding "
--"section of the audiocd:/ configuration. Make use of the Control Center to "
--"configure these settings."
--msgstr "請注意，這個外掛程式是從 audiocd:/ 設定中取得音效的品質設定。請到控制中心去設定這些值。"
-+"Please note that this plugin takes its qualitysettings from the "
-+"corresponding section of the audiocd:/ configuration. Make use of the "
-+"Control Center to configure these settings."
-+msgstr ""
-+"請注意，這個外掛程式是從 audiocd:/ 設定中取得音效的品質設定。請到控制中心去設"
-+"定這些值。"
- 
- #: _translatorinfo.cpp:1
- msgid ""
-@@ -204,8 +207,8 @@
- 
- #: krecconfigure.cpp:94
- msgid ""
--"<qt><i>All messages with the \"Don't show this message again\" option are shown "
--"again after selecting this button.</i></qt>"
-+"<qt><i>All messages with the \"Don't show this message again\" option are "
-+"shown again after selecting this button.</i></qt>"
- msgstr "<qt><i>將之前所有設定「不要再顯示」的訊息通通解禁。</i></qt>"
- 
- #: krecfile.cpp:56
-@@ -222,7 +225,7 @@
- 
- #: krecfile.cpp:145
- msgid "Saving in progress..."
--msgstr "儲存中..."
-+msgstr "儲存中…"
- 
- #: krecfile.cpp:171
- msgid "Saving \"%1\" was successful."
-@@ -374,21 +377,18 @@
- 
- #: krecord.cpp:173
- msgid ""
--"<qt>This can have several reasons:"
--"<ul>"
--"<li>You did not specify an ending.</li>"
--"<li>You specified an ending but there is no plugin available for this ending. "
--"In both cases be sure to choose an ending of the list presented in the previous "
--"dialog.</li>"
--"<li>The plugin loading mechanism isn't working. If you are sure you did "
--"everything right, please file a bugreport saying what you where about to do and "
--"please quote the following line:<br />%1</li></ul></qt>"
--msgstr ""
--"<qt>這有幾個理由： "
--"<ul> "
--"<li>您沒有指定結束（ending）。</li> "
--"<li>您指定了結束，但沒有此結束的外掛。請確認您已從之前的清單中選取了結束。</li> "
--"<li>外掛載入時有問題。如果您確定您每一步驟都沒有弄錯，請回報錯誤，說明您所做的動作，並加入下一行：<br /> %1 </li></ul></qt>"
-+"<qt>This can have several reasons:<ul><li>You did not specify an ending.</"
-+"li><li>You specified an ending but there is no plugin available for this "
-+"ending. In both cases be sure to choose an ending of the list presented in "
-+"the previous dialog.</li><li>The plugin loading mechanism isn't working. If "
-+"you are sure you did everything right, please file a bugreport saying what "
-+"you where about to do and please quote the following line:<br />%1</li></"
-+"ul></qt>"
-+msgstr ""
-+"<qt>這有幾個理由： <ul> <li>您沒有指定結束（ending）。</li> <li>您指定了結"
-+"束，但沒有此結束的外掛。請確認您已從之前的清單中選取了結束。</li> <li>外掛載"
-+"入時有問題。如果您確定您每一步驟都沒有弄錯，請回報錯誤，說明您所做的動作，並"
-+"加入下一列：<br /> %1 </li></ul></qt>"
- 
- #: krecord.cpp:183
- msgid "Could not determine encodingmethod"
-@@ -400,7 +400,7 @@
- 
- #: krecord.cpp:297
- msgid "Export..."
--msgstr "匯出..."
-+msgstr "匯出…"
- 
- #: krecord.cpp:300
- msgid "&Record"
-@@ -439,7 +439,8 @@
- #: krecord.cpp:342
- msgid ""
- "Your system is missing the Synth_STEREO_COMPRESSOR aRts module.\n"
--"You will be able to use KRec but without the great functions of the compressor."
-+"You will be able to use KRec but without the great functions of the "
-+"compressor."
- msgstr ""
- "您的系統沒有 Synth_STEREO_COMPRESSOR aRts 模組。\n"
- "您可以使用 KRec 但是會沒辦法使用壓縮的功能。"
-@@ -515,64 +516,68 @@
- msgid ""
- "<h4>...that KRec does non-destructive Recording?</h4>\n"
- "<p>\n"
--"That means if you have a recording and want to record only a part for a second "
--"(third or more) time, your first (and second and later) version is still on "
--"disc and can still be restored. Only for Playback/Export the old version is "
--"overlayed by the newer one.\n"
-+"That means if you have a recording and want to record only a part for a "
-+"second (third or more) time, your first (and second and later) version is "
-+"still on disc and can still be restored. Only for Playback/Export the old "
-+"version is overlayed by the newer one.\n"
- "</p>\n"
- msgstr ""
- "<h4>KRec 可以做錄音回覆嗎？</h4>\n"
--"<p>這是指說，如果您已經有一段錄音，然後在其中一部份要錄第二次（或更多次），您第一次錄的音並不會被清掉，隨時可以回復。只有播放/匯出時，舊的錄音會被新的蓋過去"
--"。</p>\n"
-+"<p>這是指說，如果您已經有一段錄音，然後在其中一部份要錄第二次（或更多次），您"
-+"第一次錄的音並不會被清掉，隨時可以回復。只有播放/匯出時，舊的錄音會被新的蓋過"
-+"去。</p>\n"
- 
- #: tips.cpp:11
- msgid ""
- "<h4>...which event caused the first version of KRec?</h4>\n"
- "<p>\n"
--"Some friends of mine asked me whether I could do the recordings for a radioplay "
--"for them. So I was searching for an easy-to-use recording tool running on my "
--"favorite OS. After some searching (without finding something suitable) I "
--"started a first version of KRec.\n"
-+"Some friends of mine asked me whether I could do the recordings for a "
-+"radioplay for them. So I was searching for an easy-to-use recording tool "
-+"running on my favorite OS. After some searching (without finding something "
-+"suitable) I started a first version of KRec.\n"
- "</p>\n"
- msgstr ""
- "<h4>第一版的 KRec 是怎麼來的？</h4> \n"
--"<p>一些朋友問我是不是能錄下收音機裡的音樂。所以我去搜尋在我的作業系統上好用的錄音工具。找了一陣之後，我決定自己來寫第一版的 KRec。</p>\n"
-+"<p>一些朋友問我是不是能錄下收音機裡的音樂。所以我去搜尋在我的作業系統上好用的"
-+"錄音工具。找了一陣之後，我決定自己來寫第一版的 KRec。</p>\n"
- 
- #: tips.cpp:19
- msgid ""
- "<h4>...that developers are very happy to hear from the users?</h4>\n"
- "<p>\n"
--"Most developers are very happy to see their applications used by other people. "
--"So if you want to say \"Thank you\" or you have some problems, don't hesitate "
--"to mail us/me. You can find the email addresses of the author in the "
--"\"Help\"-menu under \"About KRec\".\n"
-+"Most developers are very happy to see their applications used by other "
-+"people. So if you want to say \"Thank you\" or you have some problems, don't "
-+"hesitate to mail us/me. You can find the email addresses of the author in "
-+"the \"Help\"-menu under \"About KRec\".\n"
- "</p>\n"
- msgstr ""
- "<h4>程式開發者總是喜歡從使用者那裡得到回饋。</h4>\n"
--"<p> 大部份的程式開發者都希望他們寫的應用程式能被使用者廣泛使用。所以如果您想向他們說聲「謝謝」，或是您有些問題，請寫信給我們。您可以在「關於 "
--"KRec」的「說明」中找到作者的電子郵件地址。</p>\n"
-+"<p> 大部份的程式開發者都希望他們寫的應用程式能被使用者廣泛使用。所以如果您想"
-+"向他們說聲「謝謝」，或是您有些問題，請寫信給我們。您可以在「關於 KRec」的「說"
-+"明」中找到作者的電子郵件地址。</p>\n"
- 
- #: tips.cpp:27
- msgid ""
- "<h4>...that you are invited to report bugs?</h4>\n"
- "<p>\n"
--"Altough a lot of testing is done, our capabilities of catching every possible "
--"event/configuration are limited. So if you find a bug use \"Report Bug\" in the "
--"\"Help\"-menu or go directly to http://bugs.kde.org.\n"
-+"Altough a lot of testing is done, our capabilities of catching every "
-+"possible event/configuration are limited. So if you find a bug use \"Report "
-+"Bug\" in the \"Help\"-menu or go directly to http://bugs.kde.org.\n"
- "</p>\n"
- msgstr ""
- "<h4>您能回報錯誤給我們。</h4>\n"
--"<p> 雖然已經做過很多的測試，但是還是很有限。所以如果您找到問題，請用「說明」中的「報告問題」，或是直接到 http://bugs.kde.org "
--"去回報問題。</p>\n"
-+"<p> 雖然已經做過很多的測試，但是還是很有限。所以如果您找到問題，請用「說明」"
-+"中的「報告問題」，或是直接到 http://bugs.kde.org 去回報問題。</p>\n"
- 
- #: tips.cpp:35
- msgid ""
- "<h4>...that KRec is far from complete?</h4>\n"
- "<p>\n"
--"So if you have a nice feature you think KRec should incorporate please tell us! "
--"To avoid duplicates and improve productivity please do it via bugs.kde.org or "
--"the bug reporting tools and us wishlist as severity.\n"
-+"So if you have a nice feature you think KRec should incorporate please tell "
-+"us! To avoid duplicates and improve productivity please do it via bugs.kde."
-+"org or the bug reporting tools and us wishlist as severity.\n"
- "</p>\n"
- msgstr ""
- "<h4>KRec 還沒完成。</h4>\n"
--"<p> 所以如果您對 KRec 有任何意見與好點子，請告訴我們。要避免與別人回報的意見重複，請透過 bugs.kde.org 或回報錯誤的工具。</p>\n"
-+"<p> 所以如果您對 KRec 有任何意見與好點子，請告訴我們。要避免與別人回報的意見"
-+"重複，請透過 bugs.kde.org 或回報錯誤的工具。</p>\n"
-diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdemultimedia/kscd.po kde-i18n-zh_TW-3.5.10/messages/kdemultimedia/kscd.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdemultimedia/kscd.po	2008-08-19 20:43:21.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdemultimedia/kscd.po	2011-11-11 15:45:17.000000000 +0100
-@@ -9,8 +9,7 @@
- "Project-Id-Version: kscd\n"
- "POT-Creation-Date: 2008-07-08 01:20+0200\n"
- "PO-Revision-Date: 2006-02-23 08:57+0800\n"
--"Last-Translator: Frank Weng (a.k.a. Franklin) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Traditional Chinese <zh_l10n@linux.org.tw>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
-@@ -201,7 +200,7 @@
- 
- #: kscd.cpp:194
- msgid "Configure &Global Shortcuts..."
--msgstr "設定全域捷徑(&G)..."
-+msgstr "設定全域捷徑(&G)…"
- 
- #: kscd.cpp:370
- msgid "Artist Information"
-@@ -361,13 +360,14 @@
- #: rc.cpp:15 rc.cpp:193
- #, no-c-format
- msgid ""
--"When this option is selected an icon will appear in the system tray. Note that "
--"KsCD will <i>not</i> quit when the window is closed if a system tray icon is "
--"displayed. You may quit KsCD by clicking the Quit button or right-clicking on "
--"the system tray icon and selecting the appropriate entry."
-+"When this option is selected an icon will appear in the system tray. Note "
-+"that KsCD will <i>not</i> quit when the window is closed if a system tray "
-+"icon is displayed. You may quit KsCD by clicking the Quit button or right-"
-+"clicking on the system tray icon and selecting the appropriate entry."
- msgstr ""
--"開啟此選項的話，在系統匣中會有個小圖示。注意在開啟系統匣圖示之後，即使 KsCD 主視窗關閉，也不會離開程式。您要離開 KsCD 可以按下 Quit "
--"鍵或是在系統匣圖示上點滑鼠右鍵，並選擇離開。"
-+"開啟此選項的話，在系統匣中會有個小圖示。注意在開啟系統匣圖示之後，即使 KsCD "
-+"主視窗關閉，也不會離開程式。您要離開 KsCD 可以按下 Quit 鍵或是在系統匣圖示上"
-+"點滑鼠右鍵，並選擇離開。"
- 
- #. i18n: file configWidgetUI.ui line 74
- #: rc.cpp:18
-@@ -435,8 +435,8 @@
- #: rc.cpp:48 rc.cpp:199
- #, no-c-format
- msgid ""
--"When this option is selected the CD will start playing automatically upon being "
--"inserted into the CD-ROM."
-+"When this option is selected the CD will start playing automatically upon "
-+"being inserted into the CD-ROM."
- msgstr "選取這個選項的話，光碟放入光碟機後會自動開始播放。"
- 
- #. i18n: file configWidgetUI.ui line 197
-@@ -477,10 +477,12 @@
- #: rc.cpp:66 rc.cpp:226
- #, no-c-format
- msgid ""
--"The CD-ROM device to use when playing CDs. This will typically look something "
--"like \"/dev/cdrom\". To have KsCD autodetect your CD-ROM, leave this field "
--"empty."
--msgstr "指定播放光碟的光碟機裝置。通常會是 /dev/cdrom。此欄位留白的話，KsCD 會自動偵測。"
-+"The CD-ROM device to use when playing CDs. This will typically look "
-+"something like \"/dev/cdrom\". To have KsCD autodetect your CD-ROM, leave "
-+"this field empty."
-+msgstr ""
-+"指定播放光碟的光碟機裝置。通常會是 /dev/cdrom。此欄位留白的話，KsCD 會自動偵"
-+"測。"
- 
- #. i18n: file configWidgetUI.ui line 257
- #: rc.cpp:69
-@@ -499,12 +501,13 @@
- #, no-c-format
- msgid ""
- "When this option is selected KsCD will attempt to play the CD using direct "
--"digital playback. This option is useful if the CD-ROM is not connected directly "
--"to the sound output on the computer. Note that digital playback consumes more "
--"system resources than the normal method of playback."
-+"digital playback. This option is useful if the CD-ROM is not connected "
-+"directly to the sound output on the computer. Note that digital playback "
-+"consumes more system resources than the normal method of playback."
- msgstr ""
--"開啟此選項的話，KsCD 會試著使用直接數位播放(Direct digital "
--"playback)來播放光碟。通常在光碟機沒有直接連接到電腦的聲音輸出時，這個選項就能發揮作用。不過這個選項會消耗較多的系統資源。"
-+"開啟此選項的話，KsCD 會試著使用直接數位播放(Direct digital playback)來播放光"
-+"碟。通常在光碟機沒有直接連接到電腦的聲音輸出時，這個選項就能發揮作用。不過這"
-+"個選項會消耗較多的系統資源。"
- 
- #. i18n: file configWidgetUI.ui line 285
- #: rc.cpp:78
-@@ -528,11 +531,13 @@
- #: rc.cpp:87 rc.cpp:253
- #, no-c-format
- msgid ""
--"When this option is selected, you have the ability to select encoding for the "
--"results of a CDDB request. The standard describes CDDB results as being "
-+"When this option is selected, you have the ability to select encoding for "
-+"the results of a CDDB request. The standard describes CDDB results as being "
- "strictly Latin1. This is not true, as non-English speaking users often use "
- "other 8-bit encodings."
--msgstr "開啟此選項的話，您可以選擇 CDDB 請求的編碼。標準的 CDDB 請求編碼為 Latin1，不過非英語系使用者通常會選擇八位元編碼。"
-+msgstr ""
-+"開啟此選項的話，您可以選擇 CDDB 請求的編碼。標準的 CDDB 請求編碼為 Latin1，不"
-+"過非英語系使用者通常會選擇八位元編碼。"
- 
- #. i18n: file configWidgetUI.ui line 334
- #: rc.cpp:90
-@@ -763,12 +768,13 @@
- #, no-c-format
- msgid ""
- "When this option is selected KsCD will attempt to play the CD using direct "
--"digital playback. This option is useful if the CD-ROM is not connected directly "
--"to the sound output on the computer. Note that digital playback is slower than "
--"the normal method of playback."
-+"digital playback. This option is useful if the CD-ROM is not connected "
-+"directly to the sound output on the computer. Note that digital playback is "
-+"slower than the normal method of playback."
- msgstr ""
--"開啟此選項的話，KsCD 會試著使用直接數位播放(Direct digital "
--"playback)來播放光碟。通常在光碟機沒有直接連接到電腦的聲音輸出時，這個選項就能發揮作用。不過這個選項會消耗較多的系統資源。"
-+"開啟此選項的話，KsCD 會試著使用直接數位播放(Direct digital playback)來播放光"
-+"碟。通常在光碟機沒有直接連接到電腦的聲音輸出時，這個選項就能發揮作用。不過這"
-+"個選項會消耗較多的系統資源。"
- 
- #. i18n: file kscd.kcfg line 79
- #: rc.cpp:244
-diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdemultimedia/libkcddb.po kde-i18n-zh_TW-3.5.10/messages/kdemultimedia/libkcddb.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdemultimedia/libkcddb.po	2008-08-19 20:43:21.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdemultimedia/libkcddb.po	2011-11-11 15:45:17.000000000 +0100
-@@ -6,8 +6,7 @@
- "Project-Id-Version: libkcddb\n"
- "POT-Creation-Date: 2008-07-08 01:20+0200\n"
- "PO-Revision-Date: 2006-08-28 10:11+0800\n"
--"Last-Translator: Frank Weng (a.k.a. Franklin) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Chinese Traditional <zh-l10n@linux.org.tw>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
-@@ -680,9 +679,11 @@
- #: rc.cpp:12
- #, no-c-format
- msgid ""
--"Write names as \"first last\", not \"last, first\". Omit any leading \"The\".  "
--"Use \"Various\" for compilations."
--msgstr "以「名 姓」而非「姓, 名」寫入名稱。去掉所有前面的 \"The\"。用\"Various\" 來編譯。"
-+"Write names as \"first last\", not \"last, first\". Omit any leading \"The"
-+"\".  Use \"Various\" for compilations."
-+msgstr ""
-+"以「名 姓」而非「姓, 名」寫入名稱。去掉所有前面的 \"The\"。用\"Various\" 來編"
-+"譯。"
- 
- #. i18n: file cdinfodialogbase.ui line 75
- #: rc.cpp:15
-@@ -784,7 +785,7 @@
- #: rc.cpp:63
- #, no-c-format
- msgid "Change Encoding..."
--msgstr "改變編碼..."
-+msgstr "改變編碼…"
- 
- #. i18n: file cdinfodialogbase.ui line 317
- #: rc.cpp:66
-diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdemultimedia/noatun.po kde-i18n-zh_TW-3.5.10/messages/kdemultimedia/noatun.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdemultimedia/noatun.po	2008-08-19 20:43:21.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdemultimedia/noatun.po	2011-11-11 15:45:17.000000000 +0100
-@@ -7,8 +7,7 @@
- "Project-Id-Version: noatun\n"
- "POT-Creation-Date: 2008-07-08 01:20+0200\n"
- "PO-Revision-Date: 2006-02-20 14:42+0800\n"
--"Last-Translator: Frank Weng (a.k.a. Franklin) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Traditional Chinese <zh_l10n@linux.org.tw>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
-@@ -279,8 +278,8 @@
- #, no-c-format
- msgid ""
- "Here you will see all the comments people wrote about their skins.\n"
--"It can be several lines and usually does not contain anything interesting but "
--"still this will be shown."
-+"It can be several lines and usually does not contain anything interesting "
-+"but still this will be shown."
- msgstr ""
- "您可以在這裡看到作者對這個外觀的註解。\n"
- "通常裡面沒什麼好看的，不過還是會顯示出來。"
-@@ -489,9 +488,10 @@
- 
- #: library/cmodule.cpp:40
- msgid ""
--"Starting noatun a second time will cause it to just append items from the start "
--"to the current instance."
--msgstr "只允許開啟一個 Noatun 實體。要開啟第二個的話，會把第一個執行中的實體叫出來。"
-+"Starting noatun a second time will cause it to just append items from the "
-+"start to the current instance."
-+msgstr ""
-+"只允許開啟一個 Noatun 實體。要開啟第二個的話，會把第一個執行中的實體叫出來。"
- 
- #: library/cmodule.cpp:42
- msgid "Clear playlist &when opening a file"
-@@ -510,7 +510,9 @@
- msgid ""
- "Use the hardware mixer instead of aRts'. It affects all streams, not just "
- "Noatun's, but is a little faster."
--msgstr "用硬體混音器代替 aRts 的。這會影響到所有的音效，不只是 Noatun 的。但比較快速。"
-+msgstr ""
-+"用硬體混音器代替 aRts 的。這會影響到所有的音效，不只是 Noatun 的。但比較快"
-+"速。"
- 
- #: library/cmodule.cpp:50
- msgid "Display &remaining play time"
-@@ -528,13 +530,13 @@
- 
- #: library/cmodule.cpp:59
- msgid ""
--"Select a title to use for each file (in the playlist and user interface). Each "
--"element such as $(title) is replaced with the property with the name as given "
--"in the parentheses. The properties include, but are not limited to: title, "
--"author, date, comments and album."
-+"Select a title to use for each file (in the playlist and user interface). "
-+"Each element such as $(title) is replaced with the property with the name as "
-+"given in the parentheses. The properties include, but are not limited to: "
-+"title, author, date, comments and album."
- msgstr ""
--"選擇每個檔案（在播放清單及使用者介面中）使用的標題。每個元素如 $(title) "
--"會被置換成適當的值。元素包括：title、author、date、comments 及 album 等等。"
-+"選擇每個檔案（在播放清單及使用者介面中）使用的標題。每個元素如 $(title) 會被"
-+"置換成適當的值。元素包括：title、author、date、comments 及 album 等等。"
- 
- #: library/cmodule.cpp:64
- msgid "&Download folder:"
-@@ -623,10 +625,12 @@
- 
- #: library/pluginmodule.cpp:401
- msgid ""
--"<qt>Changing your playlist plugin will stop playback. Different playlists may "
--"use different methods of storing information, so after changing playlists you "
--"may have to recreate your playlist.</qt>"
--msgstr "<qt>改變您的播放清單外掛會停止目前的播放。不同的清單會用不同的方式來儲存資訊，所以選擇更改清單之後您可能要重新建立清單。</qt>"
-+"<qt>Changing your playlist plugin will stop playback. Different playlists "
-+"may use different methods of storing information, so after changing "
-+"playlists you may have to recreate your playlist.</qt>"
-+msgstr ""
-+"<qt>改變您的播放清單外掛會停止目前的播放。不同的清單會用不同的方式來儲存資"
-+"訊，所以選擇更改清單之後您可能要重新建立清單。</qt>"
- 
- #: library/downloader.cpp:101
- msgid "Unknown"
-@@ -684,8 +688,8 @@
- 
- #: library/engine.cpp:577
- 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 已正確設定。"
- 
- #: library/app.cpp:118 modules/marquis/marquis.cpp:161
-@@ -752,11 +756,11 @@
- 
- #: library/noatunstdaction.cpp:242
- msgid "&Effects..."
--msgstr "效果(&E)..."
-+msgstr "效果(&E)…"
- 
- #: library/noatunstdaction.cpp:247
- msgid "E&qualizer..."
--msgstr "等化器(&Q)..."
-+msgstr "等化器(&Q)…"
- 
- #: library/noatunstdaction.cpp:252
- msgid "&Back"
-@@ -837,15 +841,17 @@
- 
- #: library/effectview.cpp:172
- msgid ""
--"This shows your effect chain. Noatun supports an unlimited amount of effects in "
--"any order. You can even have the same effect twice.\n"
-+"This shows your effect chain. Noatun supports an unlimited amount of effects "
-+"in any order. You can even have the same effect twice.\n"
- "\n"
--"Drag the items to and from here to add and remove them, respectively. You may "
--"also reorder them with drag-and-drop. These actions can also be performed with "
--"the buttons to the right."
-+"Drag the items to and from here to add and remove them, respectively. You "
-+"may also reorder them with drag-and-drop. These actions can also be "
-+"performed with the buttons to the right."
- msgstr ""
--"這將顯示您的效果鍊（effect chain）。Noatun 支援無限制的任意排列的效果。你甚至可以使用同一個效果兩次。\n"
--"拖曳這些效果離開或加入這裡可以移除或加入效果。你也可以用拖放它們來作重新排序，這些動作也可以用右邊的按鈕來達成。"
-+"這將顯示您的效果鍊（effect chain）。Noatun 支援無限制的任意排列的效果。你甚至"
-+"可以使用同一個效果兩次。\n"
-+"拖曳這些效果離開或加入這裡可以移除或加入效果。你也可以用拖放它們來作重新排"
-+"序，這些動作也可以用右邊的按鈕來達成。"
- 
- #: library/effectview.cpp:173
- msgid "Move the currently selected effect up in the chain."
-@@ -1028,7 +1034,7 @@
- 
- #: modules/metatag/metatag.cpp:35
- msgid "&Tag Editor..."
--msgstr "標籤編輯器(&T)..."
-+msgstr "標籤編輯器(&T)…"
- 
- #: modules/splitplaylist/find.cpp:8
- msgid "Find"
-@@ -1052,11 +1058,11 @@
- 
- #: modules/splitplaylist/view.cpp:645
- msgid "Add &Files..."
--msgstr "加入檔案(&F)..."
-+msgstr "加入檔案(&F)…"
- 
- #: modules/splitplaylist/view.cpp:646
- msgid "Add Fol&ders..."
--msgstr "加入資料夾(&D)..."
-+msgstr "加入資料夾(&D)…"
- 
- #: modules/splitplaylist/view.cpp:658
- msgid "Shuffle"
-@@ -1349,16 +1355,13 @@
- msgstr "清除顏色(&S)："
- 
- #: modules/infrared/lirc.cpp:22
--msgid ""
--"Could not create a socket to receive infrared signals. The error is:\n"
--msgstr ""
--"無法建立 socket 接收紅外線訊號。錯誤為：\n"
-+msgid "Could not create a socket to receive infrared signals. The error is:\n"
-+msgstr "無法建立 socket 接收紅外線訊號。錯誤為：\n"
- 
- #: modules/infrared/lirc.cpp:30
- msgid ""
- "Could not establish a connection to receive infrared signals. The error is:\n"
--msgstr ""
--"無法建立連線接收紅外線訊號。錯誤為：\n"
-+msgstr "無法建立連線接收紅外線訊號。錯誤為：\n"
- 
- #: modules/infrared/irprefs.cpp:55
- msgid "Infrared Control"
-@@ -1414,7 +1417,7 @@
- 
- #: modules/htmlexport/htmlexport.cpp:20
- msgid "&Export Playlist..."
--msgstr "匯出播放清單(&E)..."
-+msgstr "匯出播放清單(&E)…"
- 
- #: modules/htmlexport/htmlexport.cpp:42
- msgid "Export Playlist"
-@@ -1522,7 +1525,7 @@
- 
- #: modules/winskin/winSkinConfig.cpp:43
- msgid "&Install New Skin..."
--msgstr "安裝新面板(&I)..."
-+msgstr "安裝新面板(&I)…"
- 
- #: modules/winskin/winSkinConfig.cpp:46
- msgid "&Remove Skin"
-diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdenetwork/dcoprss.po kde-i18n-zh_TW-3.5.10/messages/kdenetwork/dcoprss.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdenetwork/dcoprss.po	2006-07-22 10:04:35.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdenetwork/dcoprss.po	2011-11-11 15:45:17.000000000 +0100
-@@ -6,8 +6,7 @@
- "Project-Id-Version: dcoprss\n"
- "POT-Creation-Date: 2004-10-12 01:17+0200\n"
- "PO-Revision-Date: 2006-02-24 08:32+0800\n"
--"Last-Translator: Frank Weng (a.k.a. Franklin) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Traditional Chinese <zh_l10n@linux.org.tw>\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/kdenetwork/kcm_krfb.po kde-i18n-zh_TW-3.5.10/messages/kdenetwork/kcm_krfb.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdenetwork/kcm_krfb.po	2008-02-13 10:55:35.000000000 +0100
-+++ kde-i18n-zh_TW-3.5.10/messages/kdenetwork/kcm_krfb.po	2011-11-11 15:45:17.000000000 +0100
-@@ -6,8 +6,7 @@
- "Project-Id-Version: kcm_krfb\n"
- "POT-Creation-Date: 2008-01-11 01:16+0100\n"
- "PO-Revision-Date: 2006-02-24 08:45+0800\n"
--"Last-Translator: Frank Weng (a.k.a. Franklin) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Traditional Chinese <zh_l10n@linux.org.tw>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
-@@ -95,9 +94,10 @@
- #: rc.cpp:24
- #, no-c-format
- msgid ""
--"Select this option to allow connecting without inviting. This is useful if you "
--"want to access your desktop remotely."
--msgstr "開啟此選項的話，就允許未被邀請的連線。通常用在您需要遠端控制您的桌面時。"
-+"Select this option to allow connecting without inviting. This is useful if "
-+"you want to access your desktop remotely."
-+msgstr ""
-+"開啟此選項的話，就允許未被邀請的連線。通常用在您需要遠端控制您的桌面時。"
- 
- #. i18n: file configurationwidget.ui line 142
- #: rc.cpp:27
-@@ -109,10 +109,12 @@
- #: rc.cpp:30
- #, no-c-format
- msgid ""
--"If you allow uninvited connections and enable this option, Desktop Sharing will "
--"announce the service and your identity on the local network, so people can find "
--"you and your computer."
--msgstr "如果您允許未被邀請的連線並開啟此選項，桌面分享將會把這個服務還有您的身份在網路上宣告，這樣網路上的人就可以找到您跟您的電腦。"
-+"If you allow uninvited connections and enable this option, Desktop Sharing "
-+"will announce the service and your identity on the local network, so people "
-+"can find you and your computer."
-+msgstr ""
-+"如果您允許未被邀請的連線並開啟此選項，桌面分享將會把這個服務還有您的身分在網"
-+"路上宣告，這樣網路上的人就可以找到您跟您的電腦。"
- 
- #. i18n: file configurationwidget.ui line 156
- #: rc.cpp:33
-@@ -124,9 +126,11 @@
- #: rc.cpp:36
- #, no-c-format
- msgid ""
--"If enabled, a dialog will appear when somebody attempts to connect, asking you "
--"whether you want to accept the connection."
--msgstr "如果開啟此選項，若有人在未被邀請的情況下試著連進您的桌面時，會跳出一個對話框要求您確認是否接受連線。"
-+"If enabled, a dialog will appear when somebody attempts to connect, asking "
-+"you whether you want to accept the connection."
-+msgstr ""
-+"如果開啟此選項，若有人在未被邀請的情況下試著連進您的桌面時，會跳出一個對話框"
-+"要求您確認是否接受連線。"
- 
- #. i18n: file configurationwidget.ui line 167
- #: rc.cpp:39
-@@ -138,8 +142,8 @@
- #: rc.cpp:42
- #, no-c-format
- msgid ""
--"Enable this option to allow uninvited user to control your desktop (using mouse "
--"and keyboard)."
-+"Enable this option to allow uninvited user to control your desktop (using "
-+"mouse and keyboard)."
- msgstr "開啟此選項的話，就允許未被邀請的連線直接控制您的桌面。"
- 
- #. i18n: file configurationwidget.ui line 216
-@@ -152,8 +156,8 @@
- #: rc.cpp:48
- #, no-c-format
- msgid ""
--"If you allow uninvited connections, it is highly recommended to set a password "
--"in order to protect your computer from unauthorized access."
-+"If you allow uninvited connections, it is highly recommended to set a "
-+"password in order to protect your computer from unauthorized access."
- msgstr "如果您允許未被邀請的連線，強烈建議您設定密碼以保護您的電腦安全。"
- 
- #. i18n: file configurationwidget.ui line 264
-@@ -179,9 +183,11 @@
- #, no-c-format
- msgid ""
- "Check this option to always disable the background image during a remote "
--"session. Otherwise the client decides whether the background will be enabled or "
--"disabled."
--msgstr "開啟此選項的話，在遠端連線期間一律將背景圖片關閉，否則就讓客戶端自己決定要不要開啟背景圖片。"
-+"session. Otherwise the client decides whether the background will be enabled "
-+"or disabled."
-+msgstr ""
-+"開啟此選項的話，在遠端連線期間一律將背景圖片關閉，否則就讓客戶端自己決定要不"
-+"要開啟背景圖片。"
- 
- #. i18n: file configurationwidget.ui line 333
- #: rc.cpp:63
-@@ -205,10 +211,12 @@
- #: rc.cpp:72
- #, no-c-format
- msgid ""
--"Check this option to assign the network port automatically. This is recommended "
--"unless your network setup requires you to use a fixed port, for example because "
--"of a firewall."
--msgstr "開啟此選項則會自動指定連接埠。除非您的網路或防火牆設定需要您使用固定的連接埠，否則建議使用此選項。"
-+"Check this option to assign the network port automatically. This is "
-+"recommended unless your network setup requires you to use a fixed port, for "
-+"example because of a firewall."
-+msgstr ""
-+"開啟此選項則會自動指定連接埠。除非您的網路或防火牆設定需要您使用固定的連接"
-+"埠，否則建議使用此選項。"
- 
- #. i18n: file configurationwidget.ui line 404
- #: rc.cpp:75
-@@ -227,12 +235,14 @@
- #, no-c-format
- msgid ""
- "Use this field to set a static port number for the desktop sharing service. "
--"Note that if the port is already in use the Desktop Sharing service will not be "
--"accessible until you free it. It is recommended to assign the port "
-+"Note that if the port is already in use the Desktop Sharing service will not "
-+"be accessible until you free it. It is recommended to assign the port "
- "automatically unless you know what you are doing.\n"
--"Most VNC clients use a display number instead of the actual port. This display "
--"number is the offset to port 5900, so port 5901 has the display number 1."
-+"Most VNC clients use a display number instead of the actual port. This "
-+"display number is the offset to port 5900, so port 5901 has the display "
-+"number 1."
- msgstr ""
--"這個欄位讓您設定固定的連接埠號。注意不能使用正在使用中的埠號。所以除非您知道自己在做什麼，否則建議您使用自動指定連接埠的功能。\n"
--"大部份的 VNC 客戶端都會使用顯示號碼(display number)而不是實際的連接埠。顯示號碼是指連接埠 5900 之後的偏移量，也就是說顯示號碼設為 "
--"1 則連接埠為 5901。"
-+"這個欄位讓您設定固定的連接埠號。注意不能使用正在使用中的埠號。所以除非您知道"
-+"自己在做什麼，否則建議您使用自動指定連接埠的功能。\n"
-+"大部份的 VNC 客戶端都會使用顯示號碼(display number)而不是實際的連接埠。顯示號"
-+"碼是指連接埠 5900 之後的偏移量，也就是說顯示號碼設為 1 則連接埠為 5901。"
-diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdenetwork/kcmktalkd.po kde-i18n-zh_TW-3.5.10/messages/kdenetwork/kcmktalkd.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdenetwork/kcmktalkd.po	2006-07-22 10:04:35.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdenetwork/kcmktalkd.po	2011-11-11 15:45:17.000000000 +0100
-@@ -5,8 +5,7 @@
- "Project-Id-Version: kcmktalkd\n"
- "POT-Creation-Date: 2005-08-24 02:37+0200\n"
- "PO-Revision-Date: 2006-02-24 09:19+0800\n"
--"Last-Translator: Frank Weng (a.k.a. Franklin) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Traditional Chinese <zh_l10n@linux.org.tw>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
-@@ -32,7 +31,7 @@
- 
- #: kcmktalkd/answmachpage.cpp:66
- msgid "Mail &first line:"
--msgstr "郵件第一行(&F)："
-+msgstr "郵件第一列(&F)："
- 
- #: kcmktalkd/answmachpage.cpp:70
- #, c-format
-@@ -83,7 +82,8 @@
- msgid ""
- "FWA: Forward announcement only. Direct connection. Not recommended.\n"
- "FWR: Forward all requests, changing info when necessary. Direct connection.\n"
--"FWT: Forward all requests and handle the talk request. No direct connection.\n"
-+"FWT: Forward all requests and handle the talk request. No direct "
-+"connection.\n"
- "\n"
- "Recommended use: FWT if you want to use it behind a firewall (and if ktalkd\n"
- "can access both networks). Otherwise choose FWR.\n"
-@@ -94,7 +94,8 @@
- "FWR：轉送所有要求，必要時變更資訊，直接連線。\n"
- "FWT：轉送所有要求並接收聊天。不直接連線。\n"
- "\n"
--"建議使用：如果您在防火牆內部，或是 ktalkd 可存取內外的網路，則建議使用 FWT。否則請選擇 FWR。\n"
-+"建議使用：如果您在防火牆內部，或是 ktalkd 可存取內外的網路，則建議使用 FWT。"
-+"否則請選擇 FWR。\n"
- "\n"
- "詳情請參考說明。\n"
- 
-@@ -171,7 +172,8 @@
- 
- #: ktalkdlg/ktalkdlg.cpp:66
- msgid ""
--"Name of the callee, if he doesn't exist on this system (we're taking his call)"
-+"Name of the callee, if he doesn't exist on this system (we're taking his "
-+"call)"
- msgstr "被呼叫人名稱，如果他不存在於本系統（我們正在處理他的呼叫）"
- 
- #: ktalkdlg/ktalkdlg.cpp:71
-diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdenetwork/kcmlanbrowser.po kde-i18n-zh_TW-3.5.10/messages/kdenetwork/kcmlanbrowser.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdenetwork/kcmlanbrowser.po	2006-07-22 10:04:35.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdenetwork/kcmlanbrowser.po	2011-11-11 15:45:17.000000000 +0100
-@@ -9,8 +9,7 @@
- "Project-Id-Version: kcmlanbrowser\n"
- "POT-Creation-Date: 2005-08-10 10:18+0200\n"
- "PO-Revision-Date: 2006-06-19 12:55+0800\n"
--"Last-Translator: Frank Weng (a.k.a. Franklin) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Chinese Traditional <zh-l10n@linux.org.tw>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
-@@ -27,44 +26,41 @@
- 
- #: setupwizard.cpp:126
- msgid ""
--"<qt>"
--"<p>This wizard will ask you a few questions about your network.</p> "
--"<p>Usually you can simply keep the suggested settings.</p> "
--"<p>After you have finished the wizard, you will be able to browse and use "
--"shared resources on your LAN, not only Samba/Windows shares, but also FTP, HTTP "
--"and NFS resources exactly the same way.</p> "
--"<p>Therefore you need to setup the <i>LAN Information Server</i> "
--"(LISa) on your machine. Think of the LISa server as an FTP or HTTP server; it "
--"has to be run by root, it should be started during the boot process and only "
--"one LISa server can run on one machine.</qt>"
--msgstr ""
--"<qt>"
--"<p>這個精靈將會問您一點點關於您網路的問題。</p>"
--"<p>通常您可以簡單地保留建議設定。</p>"
--"<p>在您結束這個精靈之後，您將可以瀏覽並且使用在您區域網路上分享的資源，不只是 Samba/Windows 的分享，還有 FTP, HTTP 和 NFS "
--"的資源。</p>"
--"<p>因此您需要在您的機器上設定<i>區域網路資訊伺服器</i>(LISa)。將 LISa 當作像是 FTP 或 HTTP 伺服器一樣，它可以以 root "
--"身份來執行，它應該在 boot 時期被啟動，並且一部機器只跑一個 LISa server 。</p></qt>"
-+"<qt><p>This wizard will ask you a few questions about your network.</p> "
-+"<p>Usually you can simply keep the suggested settings.</p> <p>After you have "
-+"finished the wizard, you will be able to browse and use shared resources on "
-+"your LAN, not only Samba/Windows shares, but also FTP, HTTP and NFS "
-+"resources exactly the same way.</p> <p>Therefore you need to setup the "
-+"<i>LAN Information Server</i> (LISa) on your machine. Think of the LISa "
-+"server as an FTP or HTTP server; it has to be run by root, it should be "
-+"started during the boot process and only one LISa server can run on one "
-+"machine.</qt>"
-+msgstr ""
-+"<qt><p>這個精靈將會問您一點點關於您網路的問題。</p><p>通常您可以簡單地保留建"
-+"議設定。</p><p>在您結束這個精靈之後，您將可以瀏覽並且使用在您區域網路上分享的"
-+"資源，不只是 Samba/Windows 的分享，還有 FTP, HTTP 和 NFS 的資源。</p><p>因此"
-+"您需要在您的機器上設定<i>區域網路資訊伺服器</i>(LISa)。將 LISa 當作像是 FTP "
-+"或 HTTP 伺服器一樣，它可以以 root 身分來執行，它應該在 boot 時期被啟動，並且"
-+"一部機器只跑一個 LISa server 。</p></qt>"
- 
- #: setupwizard.cpp:149
- msgid ""
--"<qt>"
--"<p>More than one network interface card was found on your system.</p>"
--"<p>Please choose the one to which your LAN is connected.</p></qt>"
--msgstr "<qt><p>在您的機器上發現超過一張以上的網路卡。</p><p>請選擇您的區域網路有連結的那一張。</p></qt>"
-+"<qt><p>More than one network interface card was found on your system.</"
-+"p><p>Please choose the one to which your LAN is connected.</p></qt>"
-+msgstr ""
-+"<qt><p>在您的機器上發現超過一張以上的網路卡。</p><p>請選擇您的區域網路有連結"
-+"的那一張。</p></qt>"
- 
- #: setupwizard.cpp:164
- msgid ""
--"<qt>"
--"<p><b>No network interface card was found on your system.</b></p>"
--"<p>Possible reason: no network card is installed. You probably want to cancel "
--"now or enter your IP address and network manually</p>Example: <code>"
--"192.168.0.1/255.255.255.0</code>.</qt>"
--msgstr ""
--"<qt>"
--"<p><b>在您的機器上沒有發現網路卡。</b></p>"
--"<p>可能的理由：沒有安裝網路卡。您現在也許想要離開，或是手動地輸入您的 IP 位址和網路設定。</p>例如：<code>"
--"192.168.0.1/255.255.255.0</code>。</qt>"
-+"<qt><p><b>No network interface card was found on your system.</b></"
-+"p><p>Possible reason: no network card is installed. You probably want to "
-+"cancel now or enter your IP address and network manually</p>Example: "
-+"<code>192.168.0.1/255.255.255.0</code>.</qt>"
-+msgstr ""
-+"<qt><p><b>在您的機器上沒有發現網路卡。</b></p><p>可能的理由：沒有安裝網路卡。"
-+"您現在也許想要離開，或是手動地輸入您的 IP 位址和網路設定。</p>例如："
-+"<code>192.168.0.1/255.255.255.0</code>。</qt>"
- 
- #: setupwizard.cpp:185
- msgid "There are two ways LISa can search hosts on your network."
-@@ -76,15 +72,12 @@
- 
- #: setupwizard.cpp:188
- msgid ""
--"All hosts with TCP/IP will respond,"
--"<br>whether or not they are samba servers."
-+"All hosts with TCP/IP will respond,<br>whether or not they are samba servers."
- "<br>Don't use it if your network is very large, i.e. more than 1000 hosts."
- "<br>"
- msgstr ""
--"所有 TCP/IP 的主機將回應，"
--"<br> 不論他們是否是 samba 伺服器。"
--"<br> 如果您的網路非常大，例如，超過 1000 台主機，請不要使用。"
--"<br>"
-+"所有 TCP/IP 的主機將回應，<br> 不論他們是否是 samba 伺服器。<br> 如果您的網路"
-+"非常大，例如，超過 1000 臺主機，請不要使用。<br>"
- 
- #: setupwizard.cpp:191
- msgid "Send NetBIOS broadcasts"
-@@ -92,15 +85,12 @@
- 
- #: setupwizard.cpp:192
- msgid ""
--"You need to have the samba package (nmblookup) installed."
--"<br>Only samba/windows servers will respond."
--"<br>This method is not very reliable."
--"<br>You should enable it if you are part of a large network."
--msgstr ""
--"您需要安裝 samba 套件(nmblookup)。"
--"<br> 只有 samba/windows 伺服器會回應。"
--"<br> 這個方法並不十分可靠。"
--"<br> 但是如果您所在的網路很大，您應該用此選項。"
-+"You need to have the samba package (nmblookup) installed.<br>Only samba/"
-+"windows servers will respond.<br>This method is not very reliable.<br>You "
-+"should enable it if you are part of a large network."
-+msgstr ""
-+"您需要安裝 samba 套件(nmblookup)。<br> 只有 samba/windows 伺服器會回應。<br> "
-+"這個方法並不十分可靠。<br> 但是如果您所在的網路很大，您應該用此選項。"
- 
- #: setupwizard.cpp:201 setupwizard.cpp:227 setupwizard.cpp:249
- #: setupwizard.cpp:269 setupwizard.cpp:295 setupwizard.cpp:340
-@@ -109,68 +99,61 @@
- 
- #: setupwizard.cpp:210
- msgid ""
--"All IP addresses included in the specified range will be pinged."
--"<br>If you are part of a small network, e.g. with network mask 255.255.255.0"
--"<br>use your IP address/network mask."
--"<br>"
-+"All IP addresses included in the specified range will be pinged.<br>If you "
-+"are part of a small network, e.g. with network mask 255.255.255.0<br>use "
-+"your IP address/network mask.<br>"
- msgstr ""
--"所有包含在指定範圍內的 IP 位址將會被測試。"
--"<br> 如果您是一個小型網路的一部分，例如，網路遮罩為 255.255.255.0，"
--"<br> 則請使用您的 IP 位址/網路遮罩。"
--"<br>"
-+"所有包含在指定範圍內的 IP 位址將會被測試。<br> 如果您是一個小型網路的一部分，"
-+"例如，網路遮罩為 255.255.255.0，<br> 則請使用您的 IP 位址/網路遮罩。<br>"
- 
- #: setupwizard.cpp:215
- msgid ""
--"<br>There are four ways to specify address ranges:"
--"<br>1. IP address/network mask, like <code>192.168.0.0/255.255.255.0;</code>"
--"<br>2. single IP addresses, like <code>10.0.0.23;</code>"
--"<br>3. continuous ranges, like <code>10.0.1.0-10.0.1.200;</code>"
--"<br>4. ranges for each part of the address, like <code>"
--"10-10.1-5.1-25.1-3;</code>"
--"<br>You can also enter combinations of 1 to 4, separated by \";\", like"
--"<br><code>192.168.0.0/255.255.255.0;10.0.0.0;10.0.1.1-10.0.1.100;</code>"
--"<br>"
--msgstr ""
--"<br>有四個方法來指定位址範圍："
--"<br> 1. IP 位址/網路遮罩，像是<code>192.168.0.0/255.255.255.0</code>。"
--"<br> 2. 單一 IP 位址，像是<code>10.0.0.23</code>。"
--"<br> 3. 連續的範圍，例如<code>10.0.1.0-10.0.1.200</code>。"
--"<br> 4. 位址每個部份的範圍，像是<code>10-10.1-5.1-25.1-3</code>。"
--"<br> 您也可以輸入 1 到 4 的組合，使用\";\"分開，"
--"<br> 像是<code>192.168.0.0/255.255.255.0;10.0.0.0;10.0.1.1-10.0.1.100</code>"
--"<br>"
-+"<br>There are four ways to specify address ranges:<br>1. IP address/network "
-+"mask, like <code>192.168.0.0/255.255.255.0;</code><br>2. single IP "
-+"addresses, like <code>10.0.0.23;</code><br>3. continuous ranges, like "
-+"<code>10.0.1.0-10.0.1.200;</code><br>4. ranges for each part of the address, "
-+"like <code>10-10.1-5.1-25.1-3;</code><br>You can also enter combinations of "
-+"1 to 4, separated by \";\", "
-+"like<br><code>192.168.0.0/255.255.255.0;10.0.0.0;10.0.1.1-10.0.1.100;</"
-+"code><br>"
-+msgstr ""
-+"<br>有四個方法來指定位址範圍：<br> 1. IP 位址/網路遮罩，像是"
-+"<code>192.168.0.0/255.255.255.0</code>。<br> 2. 單一 IP 位址，像是"
-+"<code>10.0.0.23</code>。<br> 3. 連續的範圍，例如<code>10.0.1.0-10.0.1.200</"
-+"code>。<br> 4. 位址每個部份的範圍，像是<code>10-10.1-5.1-25.1-3</code>。<br> "
-+"您也可以輸入 1 到 4 的組合，使用\";\"分開，<br> 像是"
-+"<code>192.168.0.0/255.255.255.0;10.0.0.0;10.0.1.1-10.0.1.100</code><br>"
- 
- #: setupwizard.cpp:236
- msgid ""
--"This is a security related setting."
--"<br>It provides a simple IP address based way to specify \"trusted\" hosts."
--"<br>Only hosts which fit into the addresses given here are accepted by LISa as "
--"clients. The list of hosts published by LISa will also only contain hosts which "
--"fit into this scheme."
--"<br>Usually you enter your IP address/network mask here."
--msgstr ""
--"這是一個安全相關的設定。"
--"<br>它提供一個簡易的以 IP 位址為基礎的方式來指定\"被信任的\"主機。"
--"<br>只有這裡提供的合適位址才會被客戶端的 LISa 所接受。由 LISa 所發佈的主機列表也只包含適合這項計劃的主機。"
--"<br>通常您可在這兒輸入您的 IP 位址/網路遮罩。"
-+"This is a security related setting.<br>It provides a simple IP address based "
-+"way to specify \"trusted\" hosts.<br>Only hosts which fit into the addresses "
-+"given here are accepted by LISa as clients. The list of hosts published by "
-+"LISa will also only contain hosts which fit into this scheme.<br>Usually you "
-+"enter your IP address/network mask here."
-+msgstr ""
-+"這是一個安全相關的設定。<br>它提供一個簡易的以 IP 位址為基礎的方式來指定\"被"
-+"信任的\"主機。<br>只有這裡提供的合適位址才會被客戶端的 LISa 所接受。由 LISa "
-+"所發布的主機列表也只包含適合這項計劃的主機。<br>通常您可在這兒輸入您的 IP 位"
-+"址/網路遮罩。"
- 
- #: setupwizard.cpp:258
- msgid ""
--"<br>Enter your IP address and network mask here, like <code>"
--"192.168.0.1/255.255.255.0</code>"
--msgstr "<br>在這兒輸入您的 IP 位址和網路遮罩，像是<code>192.168.0.1/255.255.255.0</code>"
-+"<br>Enter your IP address and network mask here, like "
-+"<code>192.168.0.1/255.255.255.0</code>"
-+msgstr ""
-+"<br>在這兒輸入您的 IP 位址和網路遮罩，像是<code>192.168.0.1/255.255.255.0</"
-+"code>"
- 
- #: setupwizard.cpp:261
- msgid ""
--"<br>To reduce the network load, the LISa servers in one network"
--"<br>cooperate with each other. Therefore you have to enter the broadcast"
--"<br>address here. If you are connected to more than one network, choose "
--"<br>one of the broadcast addresses."
--msgstr ""
--"<br>為了減少網路負載，在網路上的 LISa 伺服器"
--"<br>會彼此合作。因此您可以在此輸入廣播位址。"
--"<br>如果您連結一個以上的網路，請選則其中一個"
--"<br>廣播位址。"
-+"<br>To reduce the network load, the LISa servers in one network<br>cooperate "
-+"with each other. Therefore you have to enter the broadcast<br>address here. "
-+"If you are connected to more than one network, choose <br>one of the "
-+"broadcast addresses."
-+msgstr ""
-+"<br>為了減少網路負載，在網路上的 LISa 伺服器<br>會彼此合作。因此您可以在此輸"
-+"入廣播位址。<br>如果您連結一個以上的網路，請選則其中一個<br>廣播位址。"
- 
- #: setupwizard.cpp:280
- msgid ""
-@@ -184,17 +167,19 @@
- #: setupwizard.cpp:286
- msgid ""
- "<br>Please note that the update interval will grow automatically by up to 16 "
--"times the value you enter here, if nobody accesses the LISa server. So if you "
--"enter 300 sec = 5 min here, this does not mean that LISa will ping your whole "
--"network every 5 minutes. The interval will increase up to 16 x 5 min = 80 min."
--msgstr ""
--"<br>請注意，若是都沒有人去存取 LISa 伺服器，更新間隔會自動拉大到您所輸入數值的十六倍。若是您輸入 300 秒（五分鐘），這並不表示 LISa "
--"會每五分鐘 ping 一次您的網路。最大可能會 5x16=80 分鐘才會 ping 一次。"
-+"times the value you enter here, if nobody accesses the LISa server. So if "
-+"you enter 300 sec = 5 min here, this does not mean that LISa will ping your "
-+"whole network every 5 minutes. The interval will increase up to 16 x 5 min = "
-+"80 min."
-+msgstr ""
-+"<br>請注意，若是都沒有人去存取 LISa 伺服器，更新間隔會自動拉大到您所輸入數值"
-+"的十六倍。若是您輸入 300 秒（五分鐘），這並不表示 LISa 會每五分鐘 ping 一次您"
-+"的網路。最大可能會 5x16=80 分鐘才會 ping 一次。"
- 
- #: setupwizard.cpp:305
- msgid ""
--"This page contains several settings you usually only"
--"<br>need if LISa doesn't find all hosts in your network."
-+"This page contains several settings you usually only<br>need if LISa doesn't "
-+"find all hosts in your network."
- msgstr "如果 LISa 無法在您的網路上發現所有主機，<br>本頁包含一些您需要的設定。"
- 
- #: setupwizard.cpp:308
-@@ -204,8 +189,7 @@
- #: setupwizard.cpp:309
- msgid ""
- "Should hosts for which LISa can't resolve the name be included in the host "
--"list?"
--"<br>"
-+"list?<br>"
- msgstr "LISa 無法分析的主機名稱的主機，該被包含在主機列表裡嗎？<br>"
- 
- #: setupwizard.cpp:313
-@@ -219,10 +203,11 @@
- 
- #: setupwizard.cpp:316
- msgid ""
--"How long should LISa wait for answers to pings?"
--"<br>If LISa doesn't find all hosts, try to increase this value."
--"<br>"
--msgstr "LISa 應該等待 ping 的結果多久？<br> 如果 LISa 無法發現所有的主機，試著增加這個值。<br>"
-+"How long should LISa wait for answers to pings?<br>If LISa doesn't find all "
-+"hosts, try to increase this value.<br>"
-+msgstr ""
-+"LISa 應該等待 ping 的結果多久？<br> 如果 LISa 無法發現所有的主機，試著增加這"
-+"個值。<br>"
- 
- #: setupwizard.cpp:320
- msgid "Max. number of pings to send at once"
-@@ -230,10 +215,11 @@
- 
- #: setupwizard.cpp:323
- msgid ""
--"How many ping packets should LISa send at once?"
--"<br>If LISa doesn't find all hosts you could try to decrease this value."
--"<br>"
--msgstr "LISa 應該同時送出多少的 ping 封包？<br> 如果 LISa 無法發現所有的主機，試著減少這個值。<br>"
-+"How many ping packets should LISa send at once?<br>If LISa doesn't find all "
-+"hosts you could try to decrease this value.<br>"
-+msgstr ""
-+"LISa 應該同時送出多少的 ping 封包？<br> 如果 LISa 無法發現所有的主機，試著減"
-+"少這個值。<br>"
- 
- #: setupwizard.cpp:326
- msgid "Al&ways scan twice"
-@@ -249,27 +235,21 @@
- 
- #: setupwizard.cpp:350
- msgid ""
--"<br>Your LAN browsing has been successfully set up."
--"<br>"
--"<br>Make sure that the LISa server is started during the boot process. How this "
--"is done depends on your distribution and OS. Usually you have to insert it "
--"somewhere in a boot script under <code>/etc</code>."
--"<br>Start the LISa server as root and without any command line options."
--"<br>The config file will now be saved to <code>/etc/lisarc</code>."
--"<br>To test the server, try <code>lan:/</code> in Konqueror."
--"<br>"
--"<br>If you have problems or suggestions, visit "
--"http://lisa-home.sourceforge.net."
--msgstr ""
--"<br>成功地建立了您的區域網路瀏覽。"
--"<br>"
--"<br>請確定lisa 伺服器已在 boot 過程中被啟動。如何完成啟動端視您的版本和作業系統。通常您必需在<code>/etc</code>"
--"下的 boot script 的某處插入設定。"
--"<br>以 root 身份啟動 lisa 伺服器，並且不要其它的命令列選項。"
--"<br>設定檔將被儲存於<code>/etc/lisarc</code>。"
--"<br>然後像在 Konqueror 中試試<code>lan:/</code>並且祝玩得愉快！:-)"
--"<br>"
--"<br>如果您有任何問題或建議，請參觀 http://lisa-home.sourceforge.net 。"
-+"<br>Your LAN browsing has been successfully set up.<br><br>Make sure that "
-+"the LISa server is started during the boot process. How this is done depends "
-+"on your distribution and OS. Usually you have to insert it somewhere in a "
-+"boot script under <code>/etc</code>.<br>Start the LISa server as root and "
-+"without any command line options.<br>The config file will now be saved to "
-+"<code>/etc/lisarc</code>.<br>To test the server, try <code>lan:/</code> in "
-+"Konqueror.<br><br>If you have problems or suggestions, visit http://lisa-"
-+"home.sourceforge.net."
-+msgstr ""
-+"<br>成功地建立了您的區域網路瀏覽。<br><br>請確定lisa 伺服器已在 boot 過程中被"
-+"啟動。如何完成啟動端視您的版本和作業系統。通常您必需在<code>/etc</code>下的 "
-+"boot script 的某處插入設定。<br>以 root 身分啟動 lisa 伺服器，並且不要其它的"
-+"命令列選項。<br>設定檔將被儲存於<code>/etc/lisarc</code>。<br>然後像在 "
-+"Konqueror 中試試<code>lan:/</code>並且祝玩得愉快！:-)<br><br>如果您有任何問題"
-+"或建議，請參觀 http://lisa-home.sourceforge.net 。"
- 
- #: setupwizard.cpp:437
- msgid "Congratulations!"
-@@ -281,21 +261,18 @@
- 
- #: setupwizard.cpp:464
- msgid ""
--"There are three ways to specify IP addresses:"
--"<br>1. IP address/network mask, like<code> 192.168.0.0/255.255.255.0;</code>"
--"<br>2. continuous ranges, like<code> 10.0.1.0-10.0.1.200;</code>"
--"<br>3. single IP addresses, like<code> 10.0.0.23;</code>"
--"<br>You can also enter combinations of 1 to 3, separated by \";\", "
--"<br>like<code> 192.168.0.0/255.255.255.0;10.0.0.0;10.0.1.1-10.0.1.100;</code>"
--"<br>"
--msgstr ""
--"這裡有三個方法去指定 IP 位址："
--"<br> 1. IP 位址/網路遮罩，像是<code>192.168.0.0/255.255.255.0</code>。"
--"<br> 2. 連續範圍，像是<code> 10.0.1.0-10.0.1.200</code>。"
--"<br> 3. 單一 IP 位址，像是<code> 10.0.0.23</code>。"
--"<br> 您也可以輸入 1 到 3 的組合，其中以\";\"隔開"
--"<br> 像是<code>192.168.0.0/255.255.255.0;10.0.0.0;10.0.1.1-10.0.1.100</code>。"
--"<br>"
-+"There are three ways to specify IP addresses:<br>1. IP address/network mask, "
-+"like<code> 192.168.0.0/255.255.255.0;</code><br>2. continuous ranges, "
-+"like<code> 10.0.1.0-10.0.1.200;</code><br>3. single IP addresses, like<code> "
-+"10.0.0.23;</code><br>You can also enter combinations of 1 to 3, separated by "
-+"\";\", <br>like<code> 192.168.0.0/255.255.255.0;10.0.0.0;10.0.1.1-10.0.1.100;"
-+"</code><br>"
-+msgstr ""
-+"這裡有三個方法去指定 IP 位址：<br> 1. IP 位址/網路遮罩，像是"
-+"<code>192.168.0.0/255.255.255.0</code>。<br> 2. 連續範圍，像是<code> "
-+"10.0.1.0-10.0.1.200</code>。<br> 3. 單一 IP 位址，像是<code> 10.0.0.23</"
-+"code>。<br> 您也可以輸入 1 到 3 的組合，其中以\";\"隔開<br> 像是"
-+"<code>192.168.0.0/255.255.255.0;10.0.0.0;10.0.1.1-10.0.1.100</code>。<br>"
- 
- #: setupwizard.cpp:490
- msgid "Multiple Network Interfaces Found"
-@@ -353,7 +330,9 @@
- msgid ""
- "Enter all ranges to scan, using the format "
- "'192.168.0.1/255.255.255.0;10.0.0.1;255.0.0.0'"
--msgstr "輸入所有掃描的範圍，使用的格式為 '192.168.0.1/255.255.255.255.0;10.0.0.1;255.0.0.0'。"
-+msgstr ""
-+"輸入所有掃描的範圍，使用的格式為 "
-+"'192.168.0.1/255.255.255.255.0;10.0.0.1;255.0.0.0'。"
- 
- #: kcmlisa.cpp:88
- msgid "&Broadcast network address:"
-@@ -374,7 +353,7 @@
- 
- #: kcmlisa.cpp:110
- msgid "Setup Wizard..."
--msgstr "設定精靈..."
-+msgstr "設定精靈…"
- 
- #: kcmlisa.cpp:113 kcmreslisa.cpp:80
- msgid "&Suggest Settings"
-@@ -382,7 +361,7 @@
- 
- #: kcmlisa.cpp:117
- msgid "Ad&vanced Settings..."
--msgstr "進階設定(&V)..."
-+msgstr "進階設定(&V)…"
- 
- #: kcmlisa.cpp:119
- msgid "Advanced Settings for LISa"
-@@ -439,13 +418,12 @@
- 
- #: kcmlisa.cpp:332 kcmreslisa.cpp:232
- msgid ""
--"You have more than one network interface installed."
--"<br>Please make sure the suggested settings are correct."
--"<br>"
--"<br>The following interfaces were found:"
--"<br>"
--"<br>"
--msgstr "您安裝了一個以上的網路介面。<br> 請確定建議的設定值是正確的。<br><br> 發現以下的介面：<br><br>"
-+"You have more than one network interface installed.<br>Please make sure the "
-+"suggested settings are correct.<br><br>The following interfaces were found:"
-+"<br><br>"
-+msgstr ""
-+"您安裝了一個以上的網路介面。<br> 請確定建議的設定值是正確的。<br><br> 發現以"
-+"下的介面：<br><br>"
- 
- #: kcmlisa.cpp:381
- msgid ""
-@@ -480,7 +458,7 @@
- 
- #: kcmreslisa.cpp:77
- msgid "Use &rlan:/ instead of lan:/ in Konqueror's navigation panel"
--msgstr "在 Konqueror 的導覽面板中使用 rlan:/ 而不是 lan:/ (&R)。"
-+msgstr "在 Konqueror 的導覽面板中使用 rlan:/ 而不是 lan:/(&R)。"
- 
- #: kcmreslisa.cpp:84
- msgid "Ad&vanced Settings"
-@@ -497,9 +475,11 @@
- 
- #: kcmreslisa.cpp:242
- msgid ""
--"The ResLISa daemon is now configured correctly, hopefully."
--"<br>Make sure that the reslisa binary is installed <i>suid root</i>."
--msgstr "希望 ResLISa 守護程式現在已經被正確地設定了。<br> 請確定 reslisa 執行檔已裝好並設定為 suid root。"
-+"The ResLISa daemon is now configured correctly, hopefully.<br>Make sure that "
-+"the reslisa binary is installed <i>suid root</i>."
-+msgstr ""
-+"希望 ResLISa 守護程式現在已經被正確地設定了。<br> 請確定 reslisa 執行檔已裝好"
-+"並設定為 suid root。"
- 
- #: kcmkiolan.cpp:41
- msgid "Show Links for Following Services"
-diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdenetwork/kcmwifi.po kde-i18n-zh_TW-3.5.10/messages/kdenetwork/kcmwifi.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdenetwork/kcmwifi.po	2007-01-15 10:56:42.000000000 +0100
-+++ kde-i18n-zh_TW-3.5.10/messages/kdenetwork/kcmwifi.po	2011-11-11 15:45:17.000000000 +0100
-@@ -6,8 +6,7 @@
- "Project-Id-Version: kcmwifi\n"
- "POT-Creation-Date: 2006-11-25 02:36+0100\n"
- "PO-Revision-Date: 2006-11-01 12:28+0800\n"
--"Last-Translator: Frank Weng (a.k.a. Franklin) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Chinese Traditional <zh-l10n@linux.org.tw>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
-@@ -123,7 +122,8 @@
- msgid ""
- "The first encryption key. 5 or 13 characters are ASCII keys, 10 or 26 "
- "characters are hexadecimal keys."
--msgstr "第一個編碼金鑰。必須是 5 或 13 個 ASCII 字元，或是 10 或 26 個十六進位值。"
-+msgstr ""
-+"第一個編碼金鑰。必須是 5 或 13 個 ASCII 字元，或是 10 或 26 個十六進位值。"
- 
- #. i18n: file configcrypto.ui line 57
- #: rc.cpp:24
-@@ -137,7 +137,8 @@
- msgid ""
- "The third encryption key. 5 or 13 characters are ASCII keys, 10 or 26 "
- "characters are hexadecimal keys."
--msgstr "第三個編碼金鑰。必須是 5 或 13 個 ASCII 字元，或是 10 或 26 個十六進位值。"
-+msgstr ""
-+"第三個編碼金鑰。必須是 5 或 13 個 ASCII 字元，或是 10 或 26 個十六進位值。"
- 
- #. i18n: file configcrypto.ui line 68
- #: rc.cpp:30
-@@ -151,7 +152,8 @@
- msgid ""
- "The second encryption key. 5 or 13 characters are ASCII keys, 10 or 26 "
- "characters are hexadecimal keys."
--msgstr "第二個編碼金鑰。必須是 5 或 13 個 ASCII 字元，或是 10 或 26 個十六進位值。"
-+msgstr ""
-+"第二個編碼金鑰。必須是 5 或 13 個 ASCII 字元，或是 10 或 26 個十六進位值。"
- 
- #. i18n: file configcrypto.ui line 79
- #: rc.cpp:36
-@@ -165,7 +167,8 @@
- msgid ""
- "The fourth encryption key. 5 or 13 characters are ASCII keys, 10 or 26 "
- "characters are hexadecimal keys."
--msgstr "第四個編碼金鑰。必須是 5 或 13 個 ASCII 字元，或是 10 或 26 個十六進位值。"
-+msgstr ""
-+"第四個編碼金鑰。必須是 5 或 13 個 ASCII 字元，或是 10 或 26 個十六進位值。"
- 
- #. i18n: file configcrypto.ui line 98
- #: rc.cpp:42
-@@ -388,7 +391,7 @@
- #: rc.cpp:159 rc.cpp:243
- #, no-c-format
- msgid "Configure..."
--msgstr "設定..."
-+msgstr "設定…"
- 
- #. i18n: file ifconfigpagebase.ui line 168
- #: rc.cpp:162
-@@ -496,8 +499,8 @@
- #: rc.cpp:213
- #, no-c-format
- msgid ""
--"Operation mode of the card. For standard infrastructure networks, \"Managed\" "
--"is appropriate."
-+"Operation mode of the card. For standard infrastructure networks, \"Managed"
-+"\" is appropriate."
- msgstr "網卡的運作模式。對標準的基礎網路來說，「管理」模式是最適當的。"
- 
- #. i18n: file ifconfigpagebase.ui line 320
-@@ -540,8 +543,8 @@
- #: rc.cpp:234
- #, no-c-format
- msgid ""
--"Activates a script to perform arbitrary operations after associating with the "
--"network."
-+"Activates a script to perform arbitrary operations after associating with "
-+"the network."
- msgstr "與網路連接上以後，啟動文稿以執行命令。"
- 
- #. i18n: file ifconfigpagebase.ui line 417
-@@ -614,8 +617,8 @@
- #: rc.cpp:276
- #, no-c-format
- msgid ""
--"When this box is checked, your settings are applied when you launch the Control "
--"Center module."
-+"When this box is checked, your settings are applied when you launch the "
-+"Control Center module."
- msgstr "開啟此選項的話，您呼叫控制中心模組時，就會套用您的設定。"
- 
- #: wificonfig.cpp:239 wificonfig.cpp:261 wificonfig.cpp:280
-diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdenetwork/kdictapplet.po kde-i18n-zh_TW-3.5.10/messages/kdenetwork/kdictapplet.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdenetwork/kdictapplet.po	2006-07-22 10:04:35.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdenetwork/kdictapplet.po	2011-11-11 15:45:17.000000000 +0100
-@@ -7,8 +7,7 @@
- "Project-Id-Version: kdictapplet\n"
- "POT-Creation-Date: 2004-10-12 01:17+0200\n"
- "PO-Revision-Date: 2006-02-24 08:46+0800\n"
--"Last-Translator: Frank Weng (a.k.a. Franklin) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Traditional Chinese <zh_l10n@linux.org.tw>\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/kdenetwork/kdict.po kde-i18n-zh_TW-3.5.10/messages/kdenetwork/kdict.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdenetwork/kdict.po	2006-07-22 10:04:35.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdenetwork/kdict.po	2011-11-11 15:45:17.000000000 +0100
-@@ -7,8 +7,7 @@
- "Project-Id-Version: kdict\n"
- "POT-Creation-Date: 2005-05-16 01:23+0200\n"
- "PO-Revision-Date: 2006-02-24 12:52+0800\n"
--"Last-Translator: Frank Weng (a.k.a. Franklin) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Traditional Chinese <zh_l10n@linux.org.tw>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
-@@ -270,15 +269,15 @@
- 
- #: dict.cpp:1587
- msgid " Querying server... "
--msgstr "查詢伺服器..."
-+msgstr "查詢伺服器…"
- 
- #: dict.cpp:1593
- msgid " Fetching information... "
--msgstr "擷取資訊..."
-+msgstr "擷取資訊…"
- 
- #: dict.cpp:1596
- msgid " Updating server information... "
--msgstr "更新伺服器資訊..."
-+msgstr "更新伺服器資訊…"
- 
- #: main.cpp:26
- msgid "Define X11-clipboard content (selected text)"
-@@ -310,11 +309,11 @@
- 
- #: matchview.cpp:146
- msgid "&Get Selected"
--msgstr "取得選擇 (&G)"
-+msgstr "取得選擇(&G)"
- 
- #: matchview.cpp:153 matchview.cpp:406
- msgid "Get &All"
--msgstr "取得所有 (&A)"
-+msgstr "取得所有(&A)"
- 
- #: matchview.cpp:312
- msgid ""
-@@ -332,35 +331,35 @@
- 
- #: matchview.cpp:383
- msgid "&Get"
--msgstr "取得 (&G)"
-+msgstr "取得(&G)"
- 
- #: matchview.cpp:385 toplevel.cpp:384
- msgid "&Match"
--msgstr "符合 (&M)"
-+msgstr "符合(&M)"
- 
- #: matchview.cpp:386 toplevel.cpp:383
- msgid "&Define"
--msgstr "解釋 (&D)"
-+msgstr "解釋(&D)"
- 
- #: matchview.cpp:399
- msgid "Match &Clipboard Content"
--msgstr "符合剪貼簿內容 (&C)"
-+msgstr "符合剪貼簿內容(&C)"
- 
- #: matchview.cpp:400
- msgid "D&efine Clipboard Content"
--msgstr "解釋剪貼簿內容 (&E)"
-+msgstr "解釋剪貼簿內容(&E)"
- 
- #: matchview.cpp:404
- msgid "Get &Selected"
--msgstr "取得選擇 (&S)"
-+msgstr "取得選擇(&S)"
- 
- #: matchview.cpp:411
- msgid "E&xpand List"
--msgstr "展開列表 (&X)"
-+msgstr "展開列表(&X)"
- 
- #: matchview.cpp:412
- msgid "C&ollapse List"
--msgstr "縮小列表 (&O)"
-+msgstr "縮小列表(&O)"
- 
- #: options.cpp:72 options.cpp:100
- msgid "Text"
-@@ -432,7 +431,7 @@
- 
- #: options.cpp:533
- msgid "Command &buffer:"
--msgstr "指令緩衝區 (&B)："
-+msgstr "指令緩衝區(&B)："
- 
- #: options.cpp:550
- msgid "Encod&ing:"
-@@ -440,15 +439,15 @@
- 
- #: options.cpp:555
- msgid "Server requires a&uthentication"
--msgstr "伺服器需要使用者認證 (&U)"
-+msgstr "伺服器需要使用者認證(&U)"
- 
- #: options.cpp:563
- msgid "U&ser:"
--msgstr "使用者 (&S)："
-+msgstr "使用者(&S)："
- 
- #: options.cpp:571
- msgid "Pass&word:"
--msgstr "密碼 (&W)："
-+msgstr "密碼(&W)："
- 
- #: options.cpp:582
- msgid "Customize Visual Appearance"
-@@ -456,11 +455,11 @@
- 
- #: options.cpp:592
- msgid "&Use custom colors"
--msgstr "使用自訂顏色 (&U)"
-+msgstr "使用自訂顏色(&U)"
- 
- #: options.cpp:597
- msgid "Cha&nge..."
--msgstr "改變(&N)..."
-+msgstr "改變(&N)…"
- 
- #: options.cpp:601
- msgid "Default&s"
-@@ -472,7 +471,7 @@
- 
- #: options.cpp:617
- msgid "Chang&e..."
--msgstr "改變(&E)..."
-+msgstr "改變(&E)…"
- 
- #: options.cpp:621
- msgid "Defaul&ts"
-@@ -488,15 +487,15 @@
- 
- #: options.cpp:652
- msgid "O&ne heading for each database"
--msgstr "各資料庫擁有獨立開頭 (&N)"
-+msgstr "各資料庫擁有獨立開頭(&N)"
- 
- #: options.cpp:655
- msgid "A&s above, with separators between the definitions"
--msgstr "如前，在各解釋間放入分隔符號 (&S)"
-+msgstr "如前，在各解釋間放入分隔符號(&S)"
- 
- #: options.cpp:658
- msgid "A separate heading for &each definition"
--msgstr "各解釋以標題分開 (&E)"
-+msgstr "各解釋以標題分開(&E)"
- 
- #: options.cpp:669
- msgid "Various Settings"
-@@ -512,7 +511,7 @@
- 
- #: options.cpp:687
- msgid "Cached &results:"
--msgstr "快取結果 (&R)"
-+msgstr "快取結果(&R)"
- 
- #: options.cpp:694
- msgid "Hi&story entries:"
-@@ -524,11 +523,11 @@
- 
- #: options.cpp:709
- msgid "Sa&ve history on exit"
--msgstr "於離開時儲存歷程紀錄 (&V)"
-+msgstr "於離開時儲存歷程紀錄(&V)"
- 
- #: options.cpp:714
- msgid "D&efine selected text on start"
--msgstr "於啟動時解釋剪貼簿內容 (&E)"
-+msgstr "於啟動時解釋剪貼簿內容(&E)"
- 
- #: queryview.cpp:57
- msgid "Unable to save remote file."
-@@ -544,7 +543,7 @@
- 
- #: queryview.cpp:78
- msgid "&Replace"
--msgstr "置換 (&R)"
-+msgstr "置換(&R)"
- 
- #: queryview.cpp:84
- msgid "Unable to save file."
-@@ -556,35 +555,35 @@
- 
- #: queryview.cpp:409
- msgid "Define &Synonym"
--msgstr "解釋同義字 (&S)"
-+msgstr "解釋同義字(&S)"
- 
- #: queryview.cpp:411
- msgid "M&atch Synonym"
--msgstr "符合同義字 (&A)"
-+msgstr "符合同義字(&A)"
- 
- #: queryview.cpp:416
- msgid "D&atabase Information"
--msgstr "資料庫資訊 (&A)"
-+msgstr "資料庫資訊(&A)"
- 
- #: queryview.cpp:422 queryview.cpp:429
- msgid "&Open Link"
--msgstr "開放連結 (&O)"
-+msgstr "開放連結(&O)"
- 
- #: queryview.cpp:438
- msgid "&Define Selection"
--msgstr "解釋選擇 (&D)"
-+msgstr "解釋選擇(&D)"
- 
- #: queryview.cpp:440
- msgid "&Match Selection"
--msgstr "符合選擇 (&M)"
-+msgstr "符合選擇(&M)"
- 
- #: queryview.cpp:453 toplevel.cpp:327
- msgid "&Define Clipboard Content"
--msgstr "解釋剪貼簿內容 (&D)"
-+msgstr "解釋剪貼簿內容(&D)"
- 
- #: queryview.cpp:455 toplevel.cpp:329
- msgid "&Match Clipboard Content"
--msgstr "符合剪貼簿內容 (&M)"
-+msgstr "符合剪貼簿內容(&M)"
- 
- #: queryview.cpp:466 queryview.cpp:570
- msgid "&Back: Information"
-@@ -596,7 +595,7 @@
- 
- #: queryview.cpp:473 queryview.cpp:587 toplevel.cpp:334
- msgid "&Back"
--msgstr "向後 (&B)"
-+msgstr "向後(&B)"
- 
- #: queryview.cpp:480 queryview.cpp:594
- msgid "&Forward: Information"
-@@ -608,25 +607,25 @@
- 
- #: queryview.cpp:487 queryview.cpp:611 toplevel.cpp:339
- msgid "&Forward"
--msgstr "向前 (&F)"
-+msgstr "向前(&F)"
- 
- #. i18n: file kdictui.rc line 23
- #: rc.cpp:9
- #, no-c-format
- msgid "Hist&ory"
--msgstr "歷程紀錄 (&O)"
-+msgstr "歷程紀錄(&O)"
- 
- #. i18n: file kdictui.rc line 31
- #: rc.cpp:12
- #, no-c-format
- msgid "Ser&ver"
--msgstr "伺服器 (&V)"
-+msgstr "伺服器(&V)"
- 
- #. i18n: file kdictui.rc line 35
- #: rc.cpp:15
- #, no-c-format
- msgid "Database &Information"
--msgstr "資料庫資訊 (&I)"
-+msgstr "資料庫資訊(&I)"
- 
- #: sets.cpp:33
- msgid "Database Sets"
-@@ -634,15 +633,15 @@
- 
- #: sets.cpp:51
- msgid "&Set:"
--msgstr "群組 (&S)"
-+msgstr "群組(&S)"
- 
- #: sets.cpp:58
- msgid "S&ave"
--msgstr "儲存 (&A)"
-+msgstr "儲存(&A)"
- 
- #: sets.cpp:62
- msgid "&New"
--msgstr "開新檔案 (&N)"
-+msgstr "開新檔案(&N)"
- 
- #: sets.cpp:85
- msgid "S&elected databases:"
-@@ -658,43 +657,43 @@
- 
- #: toplevel.cpp:312
- msgid "&Save As..."
--msgstr "另存新檔(&A)..."
-+msgstr "另存新檔(&A)…"
- 
- #: toplevel.cpp:316
- msgid "St&art Query"
--msgstr "開始查詢 (&A)"
-+msgstr "開始查詢(&A)"
- 
- #: toplevel.cpp:318
- msgid "St&op Query"
--msgstr "停止查詢 (&O)"
-+msgstr "停止查詢(&O)"
- 
- #: toplevel.cpp:344
- msgid "&Clear History"
--msgstr "清除歷程紀錄 (&C)"
-+msgstr "清除歷程紀錄(&C)"
- 
- #: toplevel.cpp:348
- msgid "&Get Capabilities"
--msgstr "取得相容 (&G)"
-+msgstr "取得相容(&G)"
- 
- #: toplevel.cpp:350
- msgid "Edit &Database Sets..."
--msgstr "編輯資料庫設定 (&D)"
-+msgstr "編輯資料庫設定(&D)"
- 
- #: toplevel.cpp:352
- msgid "&Summary"
--msgstr "總結 (&S)"
-+msgstr "總結(&S)"
- 
- #: toplevel.cpp:354
- msgid "S&trategy Information"
--msgstr "計劃資訊 (&T)"
-+msgstr "計劃資訊(&T)"
- 
- #: toplevel.cpp:356
- msgid "&Server Information"
--msgstr "伺服器資訊 (&S)"
-+msgstr "伺服器資訊(&S)"
- 
- #: toplevel.cpp:363
- msgid "Show &Match List"
--msgstr "顯示符合列表 (&M)"
-+msgstr "顯示符合列表(&M)"
- 
- #: toplevel.cpp:365
- msgid "Hide &Match List"
-@@ -706,7 +705,7 @@
- 
- #: toplevel.cpp:376
- msgid "&Look for:"
--msgstr "尋找 (&L)："
-+msgstr "尋找(&L)："
- 
- #: toplevel.cpp:377
- msgid "Query"
-diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdenetwork/kfileshare.po kde-i18n-zh_TW-3.5.10/messages/kdenetwork/kfileshare.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdenetwork/kfileshare.po	2008-08-19 20:43:21.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdenetwork/kfileshare.po	2011-11-11 15:45:17.000000000 +0100
-@@ -10,7 +10,7 @@
- "Project-Id-Version: kfileshare\n"
- "POT-Creation-Date: 2008-07-08 01:20+0200\n"
- "PO-Revision-Date: 2008-02-04 08:20+0800\n"
--"Last-Translator: Franklin Weng <franklin at goodhorse dot idv dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Chinese Traditional <zh-l10n@linux.org.tw>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
-@@ -57,7 +57,7 @@
- #: rc.cpp:21 simple/groupconfigdlg.cpp:339
- #, no-c-format
- msgid "Change Group..."
--msgstr "變更群組..."
-+msgstr "變更群組…"
- 
- #. i18n: file ./simple/controlcenter.ui line 30
- #: rc.cpp:24
-@@ -83,8 +83,8 @@
- #: rc.cpp:33
- #, no-c-format
- msgid ""
--"Enable simple sharing to allow users to share folders from their HOME folder, "
--"without knowing the root password."
-+"Enable simple sharing to allow users to share folders from their HOME "
-+"folder, without knowing the root password."
- msgstr "簡單分享能讓使用者分享他們的家目錄，不需要 root 密碼。"
- 
- #. i18n: file ./simple/controlcenter.ui line 126
-@@ -100,19 +100,21 @@
- "Enable advanced sharing to allow users to share any folders, as long as they "
- "have write access to the needed configuration files, or they know the root "
- "password."
--msgstr "進階分享能讓使用者分享任何資料夾，只要他們可以寫入相關的設定檔，或他們知道 root 密碼。"
-+msgstr ""
-+"進階分享能讓使用者分享任何資料夾，只要他們可以寫入相關的設定檔，或他們知道 "
-+"root 密碼。"
- 
- #. i18n: file ./simple/controlcenter.ui line 230
- #: rc.cpp:42
- #, no-c-format
- msgid "Use &NFS (Linux/UNIX)"
--msgstr "使用 NFS (Linux/UNIX) (&N)"
-+msgstr "使用 NFS (Linux/UNIX)(&N)"
- 
- #. i18n: file ./simple/controlcenter.ui line 244
- #: rc.cpp:45
- #, no-c-format
- msgid "Use Sam&ba (Microsoft(R) Windows(R))"
--msgstr "使用 Samba (Microsoft(R) Windows(R)) (&B)"
-+msgstr "使用 Samba (Microsoft(R) Windows(R))(&B)"
- 
- #. i18n: file ./simple/controlcenter.ui line 265
- #: rc.cpp:48
-@@ -148,13 +150,13 @@
- #: rc.cpp:63
- #, no-c-format
- msgid "A&dd..."
--msgstr "新增...(&D)"
-+msgstr "新增…(&D)"
- 
- #. i18n: file ./simple/controlcenter.ui line 377
- #: rc.cpp:66
- #, no-c-format
- msgid "Chang&e..."
--msgstr "修改...(&E)"
-+msgstr "修改…(&E)"
- 
- #. i18n: file ./simple/controlcenter.ui line 388
- #: rc.cpp:69 rc.cpp:986
-@@ -178,25 +180,26 @@
- #: rc.cpp:78
- #, no-c-format
- msgid ""
--"Here you can see a list of hosts which are allowed to access this directory via "
--"NFS.\n"
--"The first column shows the name or address of the host, the second column shows "
--"the access parameters. The name '*' donates public access."
-+"Here you can see a list of hosts which are allowed to access this directory "
-+"via NFS.\n"
-+"The first column shows the name or address of the host, the second column "
-+"shows the access parameters. The name '*' donates public access."
- msgstr ""
- "您可以看到允許透過 NFS 存取此目錄的主機清單。\n"
--"第一個欄位顯示主機的名稱或位址，第二個欄位顯示存取的參數。名稱為 * 的表示公開存取。"
-+"第一個欄位顯示主機的名稱或位址，第二個欄位顯示存取的參數。名稱為 * 的表示公開"
-+"存取。"
- 
- #. i18n: file ./advanced/nfs/nfsdialoggui.ui line 57
- #: rc.cpp:82
- #, no-c-format
- msgid "&Add Host..."
--msgstr "新增主機...(&A)"
-+msgstr "新增主機…(&A)"
- 
- #. i18n: file ./advanced/nfs/nfsdialoggui.ui line 68
- #: rc.cpp:85
- #, no-c-format
- msgid "Mo&dify Host..."
--msgstr "修改主機...(&D)"
-+msgstr "修改主機…(&D)"
- 
- #. i18n: file ./advanced/nfs/nfsdialoggui.ui line 79
- #: rc.cpp:88
-@@ -234,15 +237,14 @@
- msgid ""
- "<b>Name / Address field</b>\n"
- "<p>\n"
--"Here you can enter the host name or address."
--"<br>\n"
-+"Here you can enter the host name or address.<br>\n"
- "The host may be specified in a number of ways:\n"
- "<p>\n"
- "<i>single host</i>\n"
- "<p>\n"
- " This is the most common format. You may specify a host either by an "
--"abbreviated name recognized by the resolver, the fully qualified domain name, "
--"or an IP address.\n"
-+"abbreviated name recognized by the resolver, the fully qualified domain "
-+"name, or an IP address.\n"
- "</p>\n"
- "\n"
- "<i>netgroups</i>\n"
-@@ -254,45 +256,48 @@
- "\n"
- "<i>wildcards</i>\n"
- "<p>\n"
--" Machine names may contain the wildcard characters * and ?. This can be used to "
--"make the exports file more compact; for instance, *.cs.foo.edu matches all "
--"hosts in the domain cs.foo.edu. However, these wildcard characters do not match "
--"the dots in a domain name, so the above pattern does not include hosts such as "
--"a.b.cs.foo.edu.\n"
-+" Machine names may contain the wildcard characters * and ?. This can be used "
-+"to make the exports file more compact; for instance, *.cs.foo.edu matches "
-+"all hosts in the domain cs.foo.edu. However, these wildcard characters do "
-+"not match the dots in a domain name, so the above pattern does not include "
-+"hosts such as a.b.cs.foo.edu.\n"
- "</p>\n"
- "\n"
- "<i>IP networks</i>\n"
- "<p>\n"
- " You can also export directories to all hosts on an IP (sub-) network "
- "simultaneously. This is done by specifying an IP address and netmask pair as "
--"address/netmask where the netmask can be specified in dotted-decimal format, or "
--"as a contiguous mask length (for example, either `/255.255.252.0' or `/22' "
--"appended to the network base address result in identical subnetworks with 10 "
--"bits of host).\n"
-+"address/netmask where the netmask can be specified in dotted-decimal format, "
-+"or as a contiguous mask length (for example, either `/255.255.252.0' or "
-+"`/22' appended to the network base address result in identical subnetworks "
-+"with 10 bits of host).\n"
- "</p>"
- msgstr ""
- "<b>名稱/位址欄位</b>\n"
--"<p>您可以在此輸入主機的名稱或位址。"
--"<br>\n"
-+"<p>您可以在此輸入主機的名稱或位址。<br>\n"
- "主機可以用下列的方式來指定：\n"
- "<p>\n"
- "<i>單一主機</i>\n"
- "<p>\n"
--"最常用的格式。您可以直接指定一台主機，輸入它可被辨識的名稱，完整的網址，或是 IP 位址。</p>\n"
-+"最常用的格式。您可以直接指定一臺主機，輸入它可被辨識的名稱，完整的網址，或是 "
-+"IP 位址。</p>\n"
- "\n"
- "<i>網路群組</i>\n"
- "<p>\n"
--"您可以用 @group 的格式輸入 NIS 的網路群組。在檢查成員時只會考慮主機名稱的部份。空的主機名稱或包含符號 - 的名稱會被忽略。</p>\n"
-+"您可以用 @group 的格式輸入 NIS 的網路群組。在檢查成員時只會考慮主機名稱的部"
-+"份。空的主機名稱或包含符號 - 的名稱會被忽略。</p>\n"
- "\n"
- "<i>萬用字元</i>\n"
- "<p>\n"
--"主機名稱可以使用萬用字元 * 與 ?。這可以讓 exports 檔更簡潔，例如，*.cs.foo.edu 代表所有網域為 cs.foo.edu "
--"的主機。然而，萬用字元不會對應到網域名稱中的點，因此 *.cs.foo.edu 不會對應到 a.b.cs.foo.edu。</p>\n"
-+"主機名稱可以使用萬用字元 * 與 ?。這可以讓 exports 檔更簡潔，例如，*.cs.foo."
-+"edu 代表所有網域為 cs.foo.edu 的主機。然而，萬用字元不會對應到網域名稱中的"
-+"點，因此 *.cs.foo.edu 不會對應到 a.b.cs.foo.edu。</p>\n"
- "\n"
- "<i>IP 網段</i>\n"
- "<p>\n"
--"您也可以將目錄分享給所有與自己 IP 位址同網段的主機。您可以用指定 IP 位址與網路遮罩 (IP/Netmask) 的方式來指定網段。網路遮罩可以用像 "
--"/255.255.252.0 的方式指定，或是直接指定遮罩位元 /22。</p>"
-+"您也可以將目錄分享給所有與自己 IP 位址同網段的主機。您可以用指定 IP 位址與網"
-+"路遮罩 (IP/Netmask) 的方式來指定網段。網路遮罩可以用像 /255.255.252.0 的方式"
-+"指定，或是直接指定遮罩位元 /22。</p>"
- 
- #. i18n: file ./advanced/nfs/hostprops.ui line 115
- #: rc.cpp:129
-@@ -308,7 +313,8 @@
- "<p>\n"
- "If you check this, the host address will be a single wildcard , which means "
- "public access.\n"
--"This is just the same as if you would enter a wildcard in the address field.\n"
-+"This is just the same as if you would enter a wildcard in the address "
-+"field.\n"
- "</p>"
- msgstr ""
- "<b>公開存取</b>\n"
-@@ -372,16 +378,18 @@
- msgid ""
- "<b>Sync</b>\n"
- "<p>\n"
--"This option requests that all file writes be committed to disk before the write "
--"request completes. This is required for complete safety of data in the face of "
--"a server crash, but incurs a performance hit.\n"
-+"This option requests that all file writes be committed to disk before the "
-+"write request completes. This is required for complete safety of data in the "
-+"face of a server crash, but incurs a performance hit.\n"
- "</p>\n"
- "<p>\n"
--"The default is to allow the server to write the data out whenever it is ready.\n"
-+"The default is to allow the server to write the data out whenever it is "
-+"ready.\n"
- "</p>"
- msgstr ""
- "<b>同步</b>\n"
--"<p>這個選項會要求所有檔案在寫入動作完成之前確保資料已寫入磁碟中。這可以確保資料不會因為當機而不完整或損毀，但是要犧牲效能。</p>\n"
-+"<p>這個選項會要求所有檔案在寫入動作完成之前確保資料已寫入磁碟中。這可以確保資"
-+"料不會因為當機而不完整或損毀，但是要犧牲效能。</p>\n"
- "<p>預設為允許伺服器在就緒時才將資料寫入。</p>"
- 
- #. i18n: file ./advanced/nfs/hostprops.ui line 211
-@@ -396,18 +404,19 @@
- msgid ""
- "<b>No wdelay</b>\n"
- "<p>\n"
--"This option only has effect if sync is also set. The NFS server will normally "
--"delay committing a write request to disk slightly if it suspects that another "
--"related write request may be in progress or may arrive soon. This allows "
--"multiple write requests to be committed to disk with the one operation which "
--"can improve performance. If an NFS server received mainly small unrelated "
--"requests, this behavior could actually reduce performance, so no wdelay is "
--"available to turn it off. </p>"
-+"This option only has effect if sync is also set. The NFS server will "
-+"normally delay committing a write request to disk slightly if it suspects "
-+"that another related write request may be in progress or may arrive soon. "
-+"This allows multiple write requests to be committed to disk with the one "
-+"operation which can improve performance. If an NFS server received mainly "
-+"small unrelated requests, this behavior could actually reduce performance, "
-+"so no wdelay is available to turn it off. </p>"
- msgstr ""
- "<b>沒有寫入延遲(wdelay)</b>\n"
--"<p>這個選項只會在同步開啟時有作用。NFS "
--"會自動在寫入磁碟時做一點延遲，以期待很快地會有另一個寫入的要求。這可以讓多個寫入的要求併在一次寫入磁碟，以提升效能。不過若是 NFS "
--"伺服器主要會接受到多個不相關的要求，則此功能會造成效能下降，此時就可以透過此選項將此延遲功能關閉。</p>"
-+"<p>這個選項只會在同步開啟時有作用。NFS 會自動在寫入磁碟時做一點延遲，以期待很"
-+"快地會有另一個寫入的要求。這可以讓多個寫入的要求併在一次寫入磁碟，以提升效"
-+"能。不過若是 NFS 伺服器主要會接受到多個不相關的要求，則此功能會造成效能下降，"
-+"此時就可以透過此選項將此延遲功能關閉。</p>"
- 
- #. i18n: file ./advanced/nfs/hostprops.ui line 224
- #: rc.cpp:186
-@@ -424,8 +433,8 @@
- "This option is based on the option of the same name provided in IRIX NFS. "
- "Normally, if a server exports two filesystems one of which is mounted on the "
- "other, then the client will have to mount both filesystems explicitly to get "
--"access to them. If it just mounts the parent, it will see an empty directory at "
--"the place where the other filesystem is mounted. That filesystem is "
-+"access to them. If it just mounts the parent, it will see an empty directory "
-+"at the place where the other filesystem is mounted. That filesystem is "
- "\"hidden\".\n"
- "</p>\n"
- "<p>\n"
-@@ -435,27 +444,33 @@
- "</p>\n"
- "<p>\n"
- "However, some NFS clients do not cope well with this situation as, for "
--"instance, it is then possible for two files in the one apparent filesystem to "
--"have the same inode number.\n"
-+"instance, it is then possible for two files in the one apparent filesystem "
-+"to have the same inode number.\n"
- "</p>\n"
- "<p>\n"
--"The nohide option is currently only effective on single host exports. It does "
--"not work reliably with netgroup, subnet, or wildcard exports.\n"
-+"The nohide option is currently only effective on single host exports. It "
-+"does not work reliably with netgroup, subnet, or wildcard exports.\n"
- "</p>\n"
- "<p>\n"
--"This option can be very useful in some situations, but it should be used with "
--"due care, and only after confirming that the client system copes with the "
--"situation effectively.\n"
-+"This option can be very useful in some situations, but it should be used "
-+"with due care, and only after confirming that the client system copes with "
-+"the situation effectively.\n"
- "</p>"
- msgstr ""
- "<b>不隱藏</b>\n"
- "<p>\n"
--"一般而言，如果一台伺服器分享了兩個檔案系統，其中一個掛載在另一個檔案系統之下，則客戶端需要兩個作業系統都分別掛載，才能兩個作業系統都存取。如果它只掛載父目錄的作"
--"業系統，則它在另一個作業系統應掛載的子目錄中只會看到一個空目錄。此作業系統就是「被隱藏」了。</p>\n"
--"<p> 設定此「不隱藏」選項能讓這種狀況下的子目錄不被隱藏，而客戶端可以很順利地切換到子目錄的作業系統。</p>\n"
--"<p> 然而，有些 NFS 客戶端程式在這方面做得不是很好，例如，有的時候有可能在同一個系統下的兩個檔案會變成有相同的 inode 編號。</p>\n"
--"<p> 此選項目前只對單一主機分享有作用。其他的如網路群組、網段、萬用字元等分享都可能有問題。</p>\n"
--"<p> 此選項在某些狀況下很有用，不過應該要小心使用，而且應該先確認客戶端系統能好好處理這種狀況。</p>"
-+"一般而言，如果一臺伺服器分享了兩個檔案系統，其中一個掛載在另一個檔案系統之"
-+"下，則客戶端需要兩個作業系統都分別掛載，才能兩個作業系統都存取。如果它只掛載"
-+"父目錄的作業系統，則它在另一個作業系統應掛載的子目錄中只會看到一個空目錄。此"
-+"作業系統就是「被隱藏」了。</p>\n"
-+"<p> 設定此「不隱藏」選項能讓這種狀況下的子目錄不被隱藏，而客戶端可以很順利地"
-+"切換到子目錄的作業系統。</p>\n"
-+"<p> 然而，有些 NFS 客戶端程式在這方面做得不是很好，例如，有的時候有可能在同一"
-+"個系統下的兩個檔案會變成有相同的 inode 編號。</p>\n"
-+"<p> 此選項目前只對單一主機分享有作用。其他的如網路群組、網段、萬用字元等分享"
-+"都可能有問題。</p>\n"
-+"<p> 此選項在某些狀況下很有用，不過應該要小心使用，而且應該先確認客戶端系統能"
-+"好好處理這種狀況。</p>"
- 
- #. i18n: file ./advanced/nfs/hostprops.ui line 250
- #: rc.cpp:207
-@@ -473,42 +488,45 @@
- "but can improve reliability is some circumstances.\n"
- "</p>\n"
- "<p>\n"
--"If a subdirectory of a filesystem is exported, but the whole filesystem is not, "
--"then whenever a NFS request arrives, the server must check not only that the "
--"accessed file is in the appropriate filesystem (which is easy) but also that it "
--"is in the exported tree (which is harder). This check is called the "
--"subtree_check.\n"
-+"If a subdirectory of a filesystem is exported, but the whole filesystem is "
-+"not, then whenever a NFS request arrives, the server must check not only "
-+"that the accessed file is in the appropriate filesystem (which is easy) but "
-+"also that it is in the exported tree (which is harder). This check is called "
-+"the subtree_check.\n"
- "</p>\n"
- "<p>\n"
--"In order to perform this check, the server must include some information about "
--"the location of the file in the \"filehandle\" that is given to the client. "
--"This can cause problems with accessing files that are renamed while a client "
--"has them open (though in many simple cases it will still work).\n"
-+"In order to perform this check, the server must include some information "
-+"about the location of the file in the \"filehandle\" that is given to the "
-+"client. This can cause problems with accessing files that are renamed while "
-+"a client has them open (though in many simple cases it will still work).\n"
- "</p>\n"
- "<p>\n"
- "subtree checking is also used to make sure that files inside directories to "
--"which only root has access can only be accessed if the filesystem is exported "
--"with no_root_squash (see below), even the file itself allows more general "
--"access.\n"
-+"which only root has access can only be accessed if the filesystem is "
-+"exported with no_root_squash (see below), even the file itself allows more "
-+"general access.\n"
- "</p>\n"
- "<p>\n"
--"As a general guide, a home directory filesystem, which is normally exported at "
--"the root and may see lots of file renames, should be exported with subtree "
--"checking disabled. A filesystem which is mostly read-only, and at least does "
--"not see many file renames (e.g. /usr or /var) and for which subdirectories may "
--"be exported, should probably be exported with subtree checks enabled.\n"
-+"As a general guide, a home directory filesystem, which is normally exported "
-+"at the root and may see lots of file renames, should be exported with "
-+"subtree checking disabled. A filesystem which is mostly read-only, and at "
-+"least does not see many file renames (e.g. /usr or /var) and for which "
-+"subdirectories may be exported, should probably be exported with subtree "
-+"checks enabled.\n"
- "</p>"
- msgstr ""
- "<b>不檢查子樹</b>\n"
--"<p>此選項會關閉子樹檢查。這會有一點安全上的顧慮，不過在某些狀況下可以增加穩定性。</p> "
--"<p>如果一個檔案系統的子目錄分享出來，但是整個作業系統並沒有，則當 NFS "
--"要求到達時，伺服器不只會檢查要存取的檔案是否在適當的作業系統中，而且也會檢查它是否在分享出來的目錄樹中。這個檢查叫做子樹檢查（subtree_check）。</"
--"p> "
--"<p>要做這樣的檢查，伺服器必須先引入一些關於此檔案位址的資訊，這有可能在客戶端開了某個檔案，但伺服器上卻將此檔案重新命名時發生問題。</p> "
--"<p>子樹檢查也用來確認只有 root 可存取目錄中的檔案，只在開啟 no_root_squash 選項時才可以被存取，即使檔案本身有更寬鬆的權限設定。</p> "
--"<p> "
--"一般來說，像家目錄檔案系統，通常會在根目錄下分享，並且經常會出現檔案重命名的動作，這時就應該關閉子樹檢查的選項。若是唯讀的檔案系統，或至少很少看到有檔案重命名的"
--"動作，如 /usr 或 /var，則可以開啟此選項。</p>"
-+"<p>此選項會關閉子樹檢查。這會有一點安全上的顧慮，不過在某些狀況下可以增加穩定"
-+"性。</p> <p>如果一個檔案系統的子目錄分享出來，但是整個作業系統並沒有，則當 "
-+"NFS 要求到達時，伺服器不只會檢查要存取的檔案是否在適當的作業系統中，而且也會"
-+"檢查它是否在分享出來的目錄樹中。這個檢查叫做子樹檢查（subtree_check）。</p> "
-+"<p>要做這樣的檢查，伺服器必須先引入一些關於此檔案位址的資訊，這有可能在客戶端"
-+"開了某個檔案，但伺服器上卻將此檔案重新命名時發生問題。</p> <p>子樹檢查也用來"
-+"確認只有 root 可存取目錄中的檔案，只在開啟 no_root_squash 選項時才可以被存"
-+"取，即使檔案本身有更寬鬆的權限設定。</p> <p> 一般來說，像家目錄檔案系統，通常"
-+"會在根目錄下分享，並且經常會出現檔案重命名的動作，這時就應該關閉子樹檢查的選"
-+"項。若是唯讀的檔案系統，或至少很少看到有檔案重命名的動作，如 /usr 或 /var，則"
-+"可以開啟此選項。</p>"
- 
- #. i18n: file ./advanced/nfs/hostprops.ui line 276
- #: rc.cpp:228
-@@ -524,21 +542,23 @@
- "<p>\n"
- "This option tells the NFS server not to require authentication of locking "
- "requests (i.e. requests which use the NLM protocol). Normally the NFS server "
--"will require a lock request to hold a credential for a user who has read access "
--"to the file. With this flag no access checks will be performed.\n"
-+"will require a lock request to hold a credential for a user who has read "
-+"access to the file. With this flag no access checks will be performed.\n"
- "</p>\n"
- "<p>\n"
--"Early NFS client implementations did not send credentials with lock requests, "
--"and many current NFS clients still exist which are based on the old "
--"implementations. Use this flag if you find that you can only lock files which "
--"are world readable.\n"
-+"Early NFS client implementations did not send credentials with lock "
-+"requests, and many current NFS clients still exist which are based on the "
-+"old implementations. Use this flag if you find that you can only lock files "
-+"which are world readable.\n"
- "</p>"
- msgstr ""
- "<b>不安全鎖</b>\n"
--"<p>這個選項告訴 NFS 伺服器在要求鎖定（使用 NLM 協定的要求）時不要認證。通常 NFS "
--"伺服器會要求鎖定時保存一個憑證以確認哪個使用者對該檔有讀取權限。設定此選項則不會做這樣的檢查。</p>\n"
--"<p>早期的 NFS 客戶端實作中，在要求鎖定時並不會送出憑證，而許多現在的 NFS "
--"客戶端軟體仍然保存這樣的實作。若是您發現您只能鎖定所有人都可讀的檔案的話，則請使用此選項。</p>"
-+"<p>這個選項告訴 NFS 伺服器在要求鎖定（使用 NLM 協定的要求）時不要認證。通常 "
-+"NFS 伺服器會要求鎖定時保存一個憑證以確認哪個使用者對該檔有讀取權限。設定此選"
-+"項則不會做這樣的檢查。</p>\n"
-+"<p>早期的 NFS 客戶端實作中，在要求鎖定時並不會送出憑證，而許多現在的 NFS 客戶"
-+"端軟體仍然保存這樣的實作。若是您發現您只能鎖定所有人都可讀的檔案的話，則請使"
-+"用此選項。</p>"
- 
- #. i18n: file ./advanced/nfs/hostprops.ui line 303
- #: rc.cpp:240
-@@ -558,11 +578,12 @@
- msgid ""
- "<b>All squash</b>\n"
- "<p>\n"
--"Map all uids and gids to the anonymous user. Useful for NFS-exported public FTP "
--"directories, news spool directories, etc. </p>"
-+"Map all uids and gids to the anonymous user. Useful for NFS-exported public "
-+"FTP directories, news spool directories, etc. </p>"
- msgstr ""
- "<b>全部壓制</b>\n"
--"<p>將所有的 uid 與 gid 壓制(squash) 成匿名使用者。通常對 NFS 分享的公開 FTP 目錄等有用。</p>"
-+"<p>將所有的 uid 與 gid 壓制(squash) 成匿名使用者。通常對 NFS 分享的公開 FTP "
-+"目錄等有用。</p>"
- 
- #. i18n: file ./advanced/nfs/hostprops.ui line 336
- #: rc.cpp:251
-@@ -580,14 +601,17 @@
- "</p>\n"
- "<i>root squashing</i>\n"
- "<p>\n"
--"Map requests from uid/gid 0 to the anonymous uid/gid. Note that this does not "
--"apply to any other uids that might be equally sensitive, such as user bin.\n"
-+"Map requests from uid/gid 0 to the anonymous uid/gid. Note that this does "
-+"not apply to any other uids that might be equally sensitive, such as user "
-+"bin.\n"
- "</p>"
- msgstr ""
- "<b>root 不壓制</b>\n"
--"<p>將對 root 身份壓制功能 (root squashing) 關掉。通常對無磁碟的客戶端有用。</p>\n"
-+"<p>將對 root 身分壓制功能 (root squashing) 關掉。通常對無磁碟的客戶端有用。</"
-+"p>\n"
- "<i>壓制 root (root squashing)</i>\n"
--"<p>將 uid/gid 0 的身份壓制成匿名使用者的 uid/gid。注意，這不會對其他任何的 uid 發生作用，如 bin。</p>"
-+"<p>將 uid/gid 0 的身分壓制成匿名使用者的 uid/gid。注意，這不會對其他任何的 "
-+"uid 發生作用，如 bin。</p>"
- 
- #. i18n: file ./advanced/nfs/hostprops.ui line 362
- #: rc.cpp:264
-@@ -599,13 +623,13 @@
- #: rc.cpp:267 rc.cpp:276
- #, no-c-format
- msgid ""
--"<b>Anonym. UID/GID</b> "
--"<p> These options explicitly set the uid and gid of the anonymous account. This "
--"option is primarily useful for PC/NFS clients, where you might want all "
--"requests appear to be from one user. </p>"
-+"<b>Anonym. UID/GID</b> <p> These options explicitly set the uid and gid of "
-+"the anonymous account. This option is primarily useful for PC/NFS clients, "
-+"where you might want all requests appear to be from one user. </p>"
- msgstr ""
--"<b>匿名使用者代號/群組代號 (Anonymous UID/GID)</b> "
--"<p>這些選項額外設定匿名使用者帳號的 UID 與 GID。通常對 PC/NFS 的客戶端軟體有用，因為您可能會讓所有的要求都從同一個使用者發出。</p>"
-+"<b>匿名使用者代號/群組代號 (Anonymous UID/GID)</b> <p>這些選項額外設定匿名使"
-+"用者帳號的 UID 與 GID。通常對 PC/NFS 的客戶端軟體有用，因為您可能會讓所有的要"
-+"求都從同一個使用者發出。</p>"
- 
- #. i18n: file ./advanced/nfs/hostprops.ui line 390
- #: rc.cpp:270 rc.cpp:279
-@@ -924,7 +948,7 @@
- #: rc.cpp:444
- #, no-c-format
- msgid "De&fault devmode"
--msgstr "預設 devmode (&F)"
-+msgstr "預設 devmode(&F)"
- 
- #. i18n: file ./advanced/kcm_sambaconf/kcmprinterdlg.ui line 568
- #: rc.cpp:447 rc.cpp:2225
-@@ -947,8 +971,9 @@
- "services unless the specific services have their own lists to override this "
- "one. Where the lists conflict, the allow list takes precedence."
- msgstr ""
--"跟允許的主機相反─列在這裡的主機是不被允許存取此服務的，除非個別的服務有它們自己的設定檔，會覆蓋此檔的設定。當允許與拒絕的主機清單設定中有相衝突時，會優先以「允"
--"許的主機」為主。"
-+"跟允許的主機相反─列在這裡的主機是不被允許存取此服務的，除非個別的服務有它們自"
-+"己的設定檔，會覆蓋此檔的設定。當允許與拒絕的主機清單設定中有相衝突時，會優先"
-+"以「允許的主機」為主。"
- 
- #. i18n: file ./advanced/kcm_sambaconf/kcmprinterdlg.ui line 601
- #: rc.cpp:459 rc.cpp:465 rc.cpp:732 rc.cpp:744 rc.cpp:2252 rc.cpp:2261
-@@ -958,7 +983,8 @@
- msgid ""
- "This parameter is a comma, space, or tab delimited set of hosts which are "
- "permitted to access a service."
--msgstr "這個參數是允許存取此服務的主機清單。多個主機之間由逗號、空白或 tab 隔開。"
-+msgstr ""
-+"這個參數是允許存取此服務的主機清單。多個主機之間由逗號、空白或 tab 隔開。"
- 
- #. i18n: file ./advanced/kcm_sambaconf/kcmprinterdlg.ui line 609
- #: rc.cpp:462
-@@ -983,14 +1009,15 @@
- #, no-c-format
- msgid ""
- "This is a username which will be used for access to services which are "
--"specified as guest ok. Whatever privileges this user has will be available to "
--"any client connecting to the guest service. Typically this user will exist in "
--"the password file, but will not have a valid login. The user account "
--"\\\"ftp\\\" is often a good choice for this parameter. If a username is "
--"specified in a given service, the specified username overrides this one."
-+"specified as guest ok. Whatever privileges this user has will be available "
-+"to any client connecting to the guest service. Typically this user will "
-+"exist in the password file, but will not have a valid login. The user "
-+"account \\\"ftp\\\" is often a good choice for this parameter. If a username "
-+"is specified in a given service, the specified username overrides this one."
- msgstr ""
--"這個使用者名稱是用於允許讓訪客帳號存取的服務。通常這個使用者會存在於密碼檔中，但是不能登入。例如 ftp "
--"就是常用的訪客帳號。如果服務中有特別指定使用者名稱，則會覆蓋此設定。"
-+"這個使用者名稱是用於允許讓訪客帳號存取的服務。通常這個使用者會存在於密碼檔"
-+"中，但是不能登入。例如 ftp 就是常用的訪客帳號。如果服務中有特別指定使用者名"
-+"稱，則會覆蓋此設定。"
- 
- #. i18n: file ./advanced/kcm_sambaconf/kcmprinterdlg.ui line 700
- #: rc.cpp:483
-@@ -1317,7 +1344,8 @@
- "This is a text field that is seen next to a share when a client queries the "
- "server, either via the network neighborhood or via net view, to list what "
- "shares are available."
--msgstr "這個文字欄位會在使用者查詢網路分享資源時顯示在後方，列出哪些分享資源可用。"
-+msgstr ""
-+"這個文字欄位會在使用者查詢網路分享資源時顯示在後方，列出哪些分享資源可用。"
- 
- #. i18n: file ./advanced/kcm_sambaconf/konqinterface.ui line 139
- #: rc.cpp:708
-@@ -1371,8 +1399,8 @@
- #: rc.cpp:756
- #, no-c-format
- msgid ""
--"If this is checked, then users of a service may not create or modify files in "
--"the service's directory."
-+"If this is checked, then users of a service may not create or modify files "
-+"in the service's directory."
- msgstr "勾選此選項的話，該服務的使用者不能在服務的目錄中建立或修改檔案。"
- 
- #. i18n: file ./advanced/kcm_sambaconf/konqinterface.ui line 312
-@@ -1393,9 +1421,10 @@
- #: rc.cpp:765
- #, no-c-format
- msgid ""
--"This is a username which will be used for access this directory if guests are "
--"allowed"
--msgstr "如果允許訪客帳號使用此服務的話，這裡可以設定能夠存取此目錄的使用者名稱。"
-+"This is a username which will be used for access this directory if guests "
-+"are allowed"
-+msgstr ""
-+"如果允許訪客帳號使用此服務的話，這裡可以設定能夠存取此目錄的使用者名稱。"
- 
- #. i18n: file ./advanced/kcm_sambaconf/konqinterface.ui line 347
- #: rc.cpp:768 rc.cpp:2565
-@@ -1407,17 +1436,19 @@
- #: rc.cpp:774
- #, no-c-format
- msgid ""
--"This controls whether this share is seen in the list of available shares in a "
--"net view and in the browse list."
-+"This controls whether this share is seen in the list of available shares in "
-+"a net view and in the browse list."
- msgstr "這裡決定此分享資源是否列在可使用的資源清單中，讓使用者瀏覽得到。"
- 
- #. i18n: file ./advanced/kcm_sambaconf/konqinterface.ui line 394
- #: rc.cpp:780
- #, no-c-format
- msgid ""
--"Checkbox lets you \\\"turn off\\\" a service. If not checked, then ALL attempts "
--"to connect to the service will fail. Such failures are logged."
--msgstr "這裡讓您可以「關閉」服務。如果不勾選，則所有試圖與該服務的連線要求都會失敗，並且會紀錄下來。"
-+"Checkbox lets you \\\"turn off\\\" a service. If not checked, then ALL "
-+"attempts to connect to the service will fail. Such failures are logged."
-+msgstr ""
-+"這裡讓您可以「關閉」服務。如果不勾選，則所有試圖與該服務的連線要求都會失敗，"
-+"並且會紀錄下來。"
- 
- #. i18n: file ./advanced/kcm_sambaconf/konqinterface.ui line 435
- #: rc.cpp:783
-@@ -1479,14 +1510,15 @@
- "<p>\n"
- "To remove Samba users click the <em>&gt; remove</em> button.\n"
- "The selected Samba users will be removed from the smbpasswd file\n"
--"and reappear on the right-hand side, as UNIX users which are not Samba users.\n"
-+"and reappear on the right-hand side, as UNIX users which are not Samba "
-+"users.\n"
- "</qt>"
- msgstr ""
--"<qt>您可以在此編輯 Samba 使用者，並儲存在 smbpasswd 檔中。 "
--"<p> 每個 Samba 使用者都要有 UNIX 使用者帳號。在右方您可以看到所有尚未被設定為 Samba 使用者的 UNIX 使用者帳號。左方則是已設定為 "
--"Samba 使用者的帳號。</p> "
--"<p>要新增 Samba 使用者，只要選取 UNIX 使用者帳號，並按下「新增」按鈕即可。</p> "
--"<p>要移除 Samba 使用者，則選取 Samba 使用者帳號，並按下「移除」按鈕。</p></qt>"
-+"<qt>您可以在此編輯 Samba 使用者，並儲存在 smbpasswd 檔中。 <p> 每個 Samba 使"
-+"用者都要有 UNIX 使用者帳號。在右方您可以看到所有尚未被設定為 Samba 使用者的 "
-+"UNIX 使用者帳號。左方則是已設定為 Samba 使用者的帳號。</p> <p>要新增 Samba 使"
-+"用者，只要選取 UNIX 使用者帳號，並按下「新增」按鈕即可。</p> <p>要移除 Samba "
-+"使用者，則選取 Samba 使用者帳號，並按下「移除」按鈕。</p></qt>"
- 
- #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 117
- #: rc.cpp:830
-@@ -1578,8 +1610,8 @@
- #, no-c-format
- msgid ""
- "Use the <i>share</i> security level if you have a home network or a small "
--"office network."
--"<br> It allows everyone to read all share names before a login is required."
-+"office network.<br> It allows everyone to read all share names before a "
-+"login is required."
- msgstr ""
- "若您是在家用網路中，或是小型的辦公室網路之中，則請使用<i>分享</i>安全性等級。"
- "<br> 這可以讓所有人不必登入就能讀到所有的分享資源名稱。"
-@@ -1636,19 +1668,19 @@
- #: rc.cpp:923
- #, no-c-format
- msgid "Edit Defau&lts..."
--msgstr "編輯預設值...(&L)"
-+msgstr "編輯預設值…(&L)"
- 
- #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 767
- #: rc.cpp:926
- #, no-c-format
- msgid "Add &New Share..."
--msgstr "新增分享...(&N)"
-+msgstr "新增分享…(&N)"
- 
- #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 775
- #: rc.cpp:929
- #, no-c-format
- msgid "Edit Share..."
--msgstr "編輯分享..."
-+msgstr "編輯分享…"
- 
- #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 786
- #: rc.cpp:935
-@@ -1727,7 +1759,7 @@
- #: rc.cpp:998
- #, no-c-format
- msgid "Chan&ge Password..."
--msgstr "更改密碼...(&G)"
-+msgstr "更改密碼…(&G)"
- 
- #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 1233
- #: rc.cpp:1001
-@@ -2422,7 +2454,7 @@
- #: rc.cpp:1413
- #, no-c-format
- msgid "Disab&le spools"
--msgstr "關閉 spools (&L)"
-+msgstr "關閉 spools(&L)"
- 
- #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 3682
- #: rc.cpp:1416
-@@ -2500,7 +2532,7 @@
- #: rc.cpp:1452
- #, no-c-format
- msgid "Use an&other WINS server"
--msgstr "使用另一台 WINS 伺服器"
-+msgstr "使用另一臺 WINS 伺服器"
- 
- #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 3965
- #: rc.cpp:1455
-@@ -2614,7 +2646,7 @@
- #: rc.cpp:1518
- #, no-c-format
- msgid "Use ker&nel oplocks"
--msgstr "使用核心 oplock (&N)"
-+msgstr "使用核心 oplock(&N)"
- 
- #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 4454
- #: rc.cpp:1521
-@@ -2680,7 +2712,7 @@
- #: rc.cpp:1554
- #, no-c-format
- msgid "Samba &3.x"
--msgstr "Samba 3.x (&3)"
-+msgstr "Samba 3.x(&3)"
- 
- #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 4714
- #: rc.cpp:1557
-@@ -2710,7 +2742,7 @@
- #: rc.cpp:1569
- #, no-c-format
- msgid "Samba &2.x"
--msgstr "Samba 2.x (&2)"
-+msgstr "Samba 2.x(&2)"
- 
- #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 4809
- #: rc.cpp:1572
-@@ -2932,18 +2964,20 @@
- #: rc.cpp:1695
- #, no-c-format
- msgid ""
--"This enables or disables the entire SSL mode. If it is set to no, the "
--"SSL-enabled Samba behaves exactly like the non-SSL Samba. If set to yes, it "
-+"This enables or disables the entire SSL mode. If it is set to no, the SSL-"
-+"enabled Samba behaves exactly like the non-SSL Samba. If set to yes, it "
- "depends on the variables ssl hosts and ssl hosts resign whether an SSL "
- "connection will be required.\n"
- "\n"
--"This is only available if the SSL libraries have been compiled on your system "
--"and the configure option --with-ssl was given at configure time."
-+"This is only available if the SSL libraries have been compiled on your "
-+"system and the configure option --with-ssl was given at configure time."
- msgstr ""
--"這個選項可以開啟或關閉整個 SSL 模式。如果選擇不開啟，則 Samba 會完全以沒有 SSL 的模式運作。如果設定為開啟，則會依據 SSL "
--"主機等的設定來決定是否需要 SSL 連線。\n"
-+"這個選項可以開啟或關閉整個 SSL 模式。如果選擇不開啟，則 Samba 會完全以沒有 "
-+"SSL 的模式運作。如果設定為開啟，則會依據 SSL 主機等的設定來決定是否需要 SSL "
-+"連線。\n"
- "\n"
--"這只在您的系統上有 SSL 函式庫，以及 Samba 在設定時有加上 --with-ssl 選項時才有作用。"
-+"這只在您的系統上有 SSL 函式庫，以及 Samba 在設定時有加上 --with-ssl 選項時才"
-+"有作用。"
- 
- #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 5587
- #: rc.cpp:1700
-@@ -3051,7 +3085,7 @@
- #: rc.cpp:1751
- #, no-c-format
- msgid "SS&L server cert:"
--msgstr "SSL 伺服端憑證 (&L)："
-+msgstr "SSL 伺服端憑證(&L)："
- 
- #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 5875
- #: rc.cpp:1754
-@@ -3411,7 +3445,7 @@
- #: rc.cpp:1988
- #, no-c-format
- msgid "H&ost msdfs"
--msgstr "主機 msdfs (&O)"
-+msgstr "主機 msdfs(&O)"
- 
- #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 7010
- #: rc.cpp:1991
-@@ -3693,7 +3727,7 @@
- #: rc.cpp:2162
- #, no-c-format
- msgid "A&dd User..."
--msgstr "新增使用者...(&D)"
-+msgstr "新增使用者…(&D)"
- 
- #. i18n: file ./advanced/kcm_sambaconf/usertab.ui line 133
- #: rc.cpp:2165
-@@ -3705,7 +3739,7 @@
- #: rc.cpp:2168
- #, no-c-format
- msgid "Add &Group..."
--msgstr "新增群組...(&G)"
-+msgstr "新增群組…(&G)"
- 
- #. i18n: file ./advanced/kcm_sambaconf/usertab.ui line 149
- #: rc.cpp:2171
-@@ -3992,7 +4026,7 @@
- #: rc.cpp:2439 rc.cpp:2460
- #, no-c-format
- msgid "..."
--msgstr "..."
-+msgstr "…"
- 
- #. i18n: file ./advanced/kcm_sambaconf/share.ui line 1096
- #: rc.cpp:2394 rc.cpp:2397 rc.cpp:2400 rc.cpp:2403 rc.cpp:2442 rc.cpp:2445
-@@ -4089,7 +4123,8 @@
- #: rc.cpp:2499
- #, no-c-format
- msgid "Map DOS archi&ve to UNIX owner execute"
--msgstr "將 DOS 「收集」(Archive)檔案屬性映設到 UNIX 擁有者執行(execute)屬性(&V)"
-+msgstr ""
-+"將 DOS 「收集」(Archive)檔案屬性映設到 UNIX 擁有者執行(execute)屬性(&V)"
- 
- #. i18n: file ./advanced/kcm_sambaconf/share.ui line 1570
- #: rc.cpp:2502
-@@ -4503,7 +4538,7 @@
- #: rc.cpp:2757
- #, no-c-format
- msgid "Share with &NFS (Linux/UNIX)"
--msgstr "分享 NFS (Linux/UNIX) (&N)"
-+msgstr "分享 NFS (Linux/UNIX)(&N)"
- 
- #. i18n: file ./advanced/propsdlgplugin/propertiespagegui.ui line 103
- #: advanced/nfs/nfsdialog.cpp:42 rc.cpp:2760
-@@ -4527,7 +4562,7 @@
- #: rc.cpp:2769
- #, no-c-format
- msgid "More NFS Op&tions"
--msgstr "更多 NFS 選項 (&T)"
-+msgstr "更多 NFS 選項(&T)"
- 
- #. i18n: file ./advanced/propsdlgplugin/propertiespagegui.ui line 200
- #: rc.cpp:2772
-@@ -4581,13 +4616,13 @@
- 
- #: simple/fileshare.cpp:344
- msgid ""
--"<h1>File Sharing</h1>"
--"<p>This module can be used to enable file sharing over the network using the "
--"\"Network File System\" (NFS) or SMB in Konqueror. The latter enables you to "
--"share your files with Windows(R) computers on your network.</p>"
-+"<h1>File Sharing</h1><p>This module can be used to enable file sharing over "
-+"the network using the \"Network File System\" (NFS) or SMB in Konqueror. The "
-+"latter enables you to share your files with Windows(R) computers on your "
-+"network.</p>"
- msgstr ""
--"<h1>檔案分享</h1> "
--"<p>這個模組可以用來在 Konqueror 中開啟 NFS 或 SMB 檔案分享。後者可以讓您在網路中與 Windows(R) 的電腦分享檔案。</p>"
-+"<h1>檔案分享</h1> <p>這個模組可以用來在 Konqueror 中開啟 NFS 或 SMB 檔案分"
-+"享。後者可以讓您在網路中與 Windows(R) 的電腦分享檔案。</p>"
- 
- #: simple/fileshare.cpp:358
- msgid "Share Folder"
-@@ -4643,7 +4678,7 @@
- 
- #: simple/groupconfigdlg.cpp:343
- msgid "Choose Group..."
--msgstr "選擇群組..."
-+msgstr "選擇群組…"
- 
- #: simple/groupconfigdlg.cpp:363
- msgid "Do you really want to remove all users from group '%1'?"
-@@ -4704,30 +4739,38 @@
- #: advanced/kcm_sambaconf/linuxpermissionchecker.cpp:116
- msgid ""
- "<qt>You have specified <b>public read access</b> for this directory, but the "
--"guest account <b>%1</b> does not have the necessary read permissions;"
--"<br>do you want to continue anyway?</qt>"
--msgstr "<qt>您已經指定此目錄<b>公開閱讀權限</b>，不過訪客帳號 <b>%1</b> 沒有需要的閱讀權限。<br>您確定要繼續嗎？</qt>"
-+"guest account <b>%1</b> does not have the necessary read permissions;<br>do "
-+"you want to continue anyway?</qt>"
-+msgstr ""
-+"<qt>您已經指定此目錄<b>公開閱讀權限</b>，不過訪客帳號 <b>%1</b> 沒有需要的閱"
-+"讀權限。<br>您確定要繼續嗎？</qt>"
- 
- #: advanced/kcm_sambaconf/linuxpermissionchecker.cpp:130
- msgid ""
--"<qt>You have specified <b>public write access</b> for this directory, but the "
--"guest account <b>%1</b> does not have the necessary write permissions;"
-+"<qt>You have specified <b>public write access</b> for this directory, but "
-+"the guest account <b>%1</b> does not have the necessary write permissions;"
- "<br>do you want to continue anyway?</qt>"
--msgstr "<qt>您已經指定此目錄<b>公開寫入權限</b>，不過訪客帳號 <b>%1</b> 沒有需要的寫入權限。<br>您確定要繼續嗎？</qt>"
-+msgstr ""
-+"<qt>您已經指定此目錄<b>公開寫入權限</b>，不過訪客帳號 <b>%1</b> 沒有需要的寫"
-+"入權限。<br>您確定要繼續嗎？</qt>"
- 
- #: advanced/kcm_sambaconf/linuxpermissionchecker.cpp:167
- msgid ""
--"<qt>You have specified <b>write access</b> to the user <b>%1</b> "
--"for this directory, but the user does not have the necessary write permissions;"
--"<br>do you want to continue anyway?</qt>"
--msgstr "<qt>您已經指定此目錄的<b>寫入權限</b>給使用者 <b>%1</b>，不過他沒有需要的寫入權限。<br>您確定要繼續嗎？</qt>"
-+"<qt>You have specified <b>write access</b> to the user <b>%1</b> for this "
-+"directory, but the user does not have the necessary write permissions;<br>do "
-+"you want to continue anyway?</qt>"
-+msgstr ""
-+"<qt>您已經指定此目錄的<b>寫入權限</b>給使用者 <b>%1</b>，不過他沒有需要的寫入"
-+"權限。<br>您確定要繼續嗎？</qt>"
- 
- #: advanced/kcm_sambaconf/linuxpermissionchecker.cpp:190
- msgid ""
--"<qt>You have specified <b>read access</b> to the user <b>%1</b> "
--"for this directory, but the user does not have the necessary read permissions;"
--"<br>do you want to continue anyway?</qt>"
--msgstr "<qt>您已經指定此目錄的<b>閱讀權限</b>給使用者 <b>%1</b>，不過他沒有需要的閱讀權限。<br>您確定要繼續嗎？</qt>"
-+"<qt>You have specified <b>read access</b> to the user <b>%1</b> for this "
-+"directory, but the user does not have the necessary read permissions;<br>do "
-+"you want to continue anyway?</qt>"
-+msgstr ""
-+"<qt>您已經指定此目錄的<b>閱讀權限</b>給使用者 <b>%1</b>，不過他沒有需要的閱讀"
-+"權限。<br>您確定要繼續嗎？</qt>"
- 
- #: advanced/kcm_sambaconf/kcmsambaconf.cpp:515
- msgid "Error while opening file"
-@@ -4772,9 +4815,10 @@
- 
- #: advanced/kcm_sambaconf/hiddenfileview.cpp:386
- msgid ""
--"<qt>Some files you have selected are hidden because they start with a dot; do "
--"you want to uncheck all files starting with a dot?</qt>"
--msgstr "<qt>您所選的一些檔案是隱藏檔，因為檔名以點開頭。您要取消選取這些檔案嗎？</qt>"
-+"<qt>Some files you have selected are hidden because they start with a dot; "
-+"do you want to uncheck all files starting with a dot?</qt>"
-+msgstr ""
-+"<qt>您所選的一些檔案是隱藏檔，因為檔名以點開頭。您要取消選取這些檔案嗎？</qt>"
- 
- #: advanced/kcm_sambaconf/hiddenfileview.cpp:387
- msgid "Files Starting With Dot"
-@@ -4790,8 +4834,8 @@
- 
- #: advanced/kcm_sambaconf/hiddenfileview.cpp:406
- msgid ""
--"<b></b>Some files you have selected are matched by the wildcarded string <b>"
--"'%1'</b>; do you want to uncheck all files matching <b>'%1'</b>?"
-+"<b></b>Some files you have selected are matched by the wildcarded string "
-+"<b>'%1'</b>; do you want to uncheck all files matching <b>'%1'</b>?"
- msgstr "您所選的檔案有些符合外卡字串 %1。您要將所有符合 %1 的檔案取消選取嗎？"
- 
- #: advanced/kcm_sambaconf/hiddenfileview.cpp:408
-@@ -4808,12 +4852,12 @@
- 
- #: advanced/kcm_sambaconf/smbconfconfigwidget.cpp:48
- msgid ""
--"<p>The SAMBA configuration file <strong>'smb.conf'</strong> "
--"could not be found;</p>make sure you have SAMBA installed.\n"
-+"<p>The SAMBA configuration file <strong>'smb.conf'</strong> could not be "
-+"found;</p>make sure you have SAMBA installed.\n"
- "\n"
- msgstr ""
--"<p>找不到 Samba 設定檔 <strong>smb.conf</strong>。</p> "
--"<p>請確定您的 Samba 有正確安裝。</p>\n"
-+"<p>找不到 Samba 設定檔 <strong>smb.conf</strong>。</p> <p>請確定您的 Samba 有"
-+"正確安裝。</p>\n"
- "\n"
- 
- #: advanced/kcm_sambaconf/smbconfconfigwidget.cpp:53
-@@ -4851,31 +4895,31 @@
- #: advanced/kcm_sambaconf/kcminterface.ui.h:101
- msgid ""
- "Use the <i>share</i> security level if you have a home network or a small "
--"office network."
--"<br> It allows everyone to read the list of all your shared directories and "
--"printers before a login is required."
-+"office network.<br> It allows everyone to read the list of all your shared "
-+"directories and printers before a login is required."
- msgstr ""
- "若您是在家用網路中，或是小型的辦公室網路之中，則請使用<i>分享</i>安全性等級。"
- "<br> 這可以讓所有人不必登入就能讀到所有的分享資源名稱。"
- 
- #: advanced/kcm_sambaconf/kcminterface.ui.h:106
- msgid ""
--"Use the <i>user</i> security level if you have a bigger network and you do not "
--"want to allow everyone to read your list of shared directories and printers "
--"without a login."
--"<p>If you want to run your Samba server as a <b>Primary Domain controller</b> "
--"(PDC) you also have to set this option."
-+"Use the <i>user</i> security level if you have a bigger network and you do "
-+"not want to allow everyone to read your list of shared directories and "
-+"printers without a login.<p>If you want to run your Samba server as a "
-+"<b>Primary Domain controller</b> (PDC) you also have to set this option."
- msgstr ""
--"若您在較大型網路中，或是不想讓所有人在未登入的情況下就能讀到您分享的目錄與印表機，則請使用<i>使用者</i>安全性等級。"
--"<br> "
--"<p>如果您要將您的 Samba 伺服器設定為「主要網域控制者」(PDC)，您也必須選取此項。"
-+"若您在較大型網路中，或是不想讓所有人在未登入的情況下就能讀到您分享的目錄與印"
-+"表機，則請使用<i>使用者</i>安全性等級。<br> <p>如果您要將您的 Samba 伺服器設"
-+"定為「主要網域控制者」(PDC)，您也必須選取此項。"
- 
- #: advanced/kcm_sambaconf/kcminterface.ui.h:112
- msgid ""
- "Use the <i>server</i> security level if you have a big network and the samba "
- "server should validate the username/password by passing it to another SMB "
- "server, such as an NT box."
--msgstr "若您在大型網路中，Samba 伺服器要透過另一台 SMB 伺服器來驗證使用者與密碼，則請使用<i>伺服器</i>安全性等級。"
-+msgstr ""
-+"若您在大型網路中，Samba 伺服器要透過另一臺 SMB 伺服器來驗證使用者與密碼，則請"
-+"使用<i>伺服器</i>安全性等級。"
- 
- #: advanced/kcm_sambaconf/kcminterface.ui.h:116
- msgid ""
-@@ -4883,14 +4927,16 @@
- "server should validate the username/password by passing it to a Windows NT "
- "Primary or Backup Domain Controller."
- msgstr ""
--"若您在大型網路中，Samba 伺服器要透過一台 Windows NT 主要或備份網域控制者(PDC 或 BDC)來驗證使用者與密碼，則請使用<i>網域</i>"
--"安全性等級。"
-+"若您在大型網路中，Samba 伺服器要透過一臺 Windows NT 主要或備份網域控制者(PDC "
-+"或 BDC)來驗證使用者與密碼，則請使用<i>網域</i>安全性等級。"
- 
- #: advanced/kcm_sambaconf/kcminterface.ui.h:120
- msgid ""
- "Use the <i>ADS</i> security level if you have a big network and the samba "
- "server should act as a domain member in an ADS realm."
--msgstr "若您在大型網路中，Samba 伺服器是做為 ADS realm 中的一個網域成員，則請使用<i>ADS</i>安全性等級。"
-+msgstr ""
-+"若您在大型網路中，Samba 伺服器是做為 ADS realm 中的一個網域成員，則請使用"
-+"<i>ADS</i>安全性等級。"
- 
- #: advanced/propsdlgplugin/propsdlgshareplugin.cpp:60
- msgid "&Share"
-@@ -4906,15 +4952,15 @@
- 
- #: advanced/propsdlgplugin/propsdlgshareplugin.cpp:80
- msgid "Configure File Sharing..."
--msgstr "設定檔案分享..."
-+msgstr "設定檔案分享…"
- 
- #: advanced/propsdlgplugin/propertiespage.cpp:89
- msgid "Reading Samba configuration file ..."
--msgstr "讀取 Samba 設定檔..."
-+msgstr "讀取 Samba 設定檔…"
- 
- #: advanced/propsdlgplugin/propertiespage.cpp:90
- msgid "Reading NFS configuration file ..."
--msgstr "讀取 NFS 設定檔..."
-+msgstr "讀取 NFS 設定檔…"
- 
- #: advanced/propsdlgplugin/propertiespage.cpp:292
- msgid "Please enter a valid path."
-@@ -4958,6 +5004,51 @@
- 
- #: advanced/propsdlgplugin/propertiespage.cpp:530
- msgid ""
--"<qt>There is already a share with the name <strong>%1</strong>."
--"<br> Please choose another name.</qt>"
--msgstr "<qt>此分享名稱 <strong>%1</strong> 已被使用。<br> 請輸入其他名稱。</qt>"
-+"<qt>There is already a share with the name <strong>%1</strong>.<br> Please "
-+"choose another name.</qt>"
-+msgstr ""
-+"<qt>此分享名稱 <strong>%1</strong> 已被使用。<br> 請輸入其他名稱。</qt>"
-+
-+#, fuzzy
-+#~ msgid "KcmInterface"
-+#~ msgstr "Sch&nittstellen:"
-+
-+#, fuzzy
-+#~ msgid "Alt+N"
-+#~ msgstr "Alt+"
-+
-+#, fuzzy
-+#~ msgid "Alt+G"
-+#~ msgstr "Alt+"
-+
-+#, fuzzy
-+#~ msgid "Alt+V"
-+#~ msgstr "Alt+"
-+
-+#, fuzzy
-+#~ msgid "Alt+E"
-+#~ msgstr "Alt+"
-+
-+#, fuzzy
-+#~ msgid "Alt+R"
-+#~ msgstr "Alt+"
-+
-+#, fuzzy
-+#~ msgid "Alt+D"
-+#~ msgstr "Alt+"
-+
-+#, fuzzy
-+#~ msgid "Alt+X"
-+#~ msgstr "Alt+"
-+
-+#, fuzzy
-+#~ msgid "Alt+I"
-+#~ msgstr "Alt+"
-+
-+#, fuzzy
-+#~ msgid "Alt+K"
-+#~ msgstr "Alt+"
-+
-+#, fuzzy
-+#~ msgid "Alt+W"
-+#~ msgstr "Alt+"
-diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdenetwork/kfile_torrent.po kde-i18n-zh_TW-3.5.10/messages/kdenetwork/kfile_torrent.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdenetwork/kfile_torrent.po	2006-07-22 10:04:35.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdenetwork/kfile_torrent.po	2011-11-11 15:45:17.000000000 +0100
-@@ -6,8 +6,7 @@
- "Project-Id-Version: kfile_torrent\n"
- "POT-Creation-Date: 2004-10-12 01:17+0200\n"
- "PO-Revision-Date: 2006-02-24 08:48+0800\n"
--"Last-Translator: Frank Weng (a.k.a. Franklin) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Traditional Chinese <zh_l10n@linux.org.tw>\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/kdenetwork/kget.po kde-i18n-zh_TW-3.5.10/messages/kdenetwork/kget.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdenetwork/kget.po	2008-08-19 20:43:21.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdenetwork/kget.po	2011-11-11 15:45:17.000000000 +0100
-@@ -10,8 +10,7 @@
- "Project-Id-Version: kget\n"
- "POT-Creation-Date: 2008-07-08 01:20+0200\n"
- "PO-Revision-Date: 2006-11-03 08:30+0800\n"
--"Last-Translator: Frank Weng (a.k.a. Franklin) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Traditional Chinese <zh_l10n@linux.org.tw>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
-@@ -318,35 +317,35 @@
- 
- #: kmainwidget.cpp:382
- msgid "&Use-Last-Folder Mode"
--msgstr "使用最近資料夾模式 (&U)"
-+msgstr "使用最近資料夾模式(&U)"
- 
- #: kmainwidget.cpp:383
- msgid "Auto-&Disconnect Mode"
--msgstr "自動斷線模式 (&D)"
-+msgstr "自動斷線模式(&D)"
- 
- #: kmainwidget.cpp:384
- msgid "Auto-S&hutdown Mode"
--msgstr "自動關機模式 (&H)"
-+msgstr "自動關機模式(&H)"
- 
- #: kmainwidget.cpp:385
- msgid "&Offline Mode"
--msgstr "離線模式 (&O)"
-+msgstr "離線模式(&O)"
- 
- #: kmainwidget.cpp:386
- msgid "Auto-Pas&te Mode"
--msgstr "自動貼上模式 (&T)"
-+msgstr "自動貼上模式(&T)"
- 
- #: kmainwidget.cpp:400
- msgid "Show &Log Window"
--msgstr "顯示記錄視窗 (&L)"
-+msgstr "顯示記錄視窗(&L)"
- 
- #: kmainwidget.cpp:401
- msgid "Hide &Log Window"
--msgstr "隱藏記錄視窗 (&L)"
-+msgstr "隱藏記錄視窗(&L)"
- 
- #: kmainwidget.cpp:402 kmainwidget.cpp:1906
- msgid "Show Drop &Target"
--msgstr "顯示拖放目標 (&T)"
-+msgstr "顯示拖放目標(&T)"
- 
- #: kmainwidget.cpp:403 kmainwidget.cpp:1934
- msgid "Enable &KGet as Konqueror Download Manager"
-@@ -433,12 +432,14 @@
- #: kmainwidget.cpp:458
- msgid ""
- "<b>Delayed</b> button sets the mode of selected\n"
--"transfers to <i>delayed</i>.This also causes the selected transfers to stop.\n"
-+"transfers to <i>delayed</i>.This also causes the selected transfers to "
-+"stop.\n"
- "\n"
- "It is a radio button -- you can choose between\n"
- "three modes."
- msgstr ""
--"<b>延遲</b> 按鈕設定所選擇的傳送檔案模式為 <i>已延遲</i>。它也會造成所選擇的傳送檔案停止傳送。\n"
-+"<b>延遲</b> 按鈕設定所選擇的傳送檔案模式為 <i>已延遲</i>。它也會造成所選擇的"
-+"傳送檔案停止傳送。\n"
- "\n"
- "它是一個單選按鈕，你可以在三種模式中選擇。"
- 
-@@ -506,7 +507,8 @@
- msgstr ""
- "<b>使用最近資料夾</b>使用最近存取目錄功能的啟動和關閉雙態元件按鈕。\n"
- "\n"
--"當設定了這項功能， KGet 將會忽略目錄設定值並且放置所有新增傳輸到「最近一次傳輸所放置的目錄」。"
-+"當設定了這項功能， KGet 將會忽略目錄設定值並且放置所有新增傳輸到「最近一次傳"
-+"輸所放置的目錄」。"
- 
- #: kmainwidget.cpp:476
- msgid ""
-@@ -574,7 +576,8 @@
- "<b>自動貼上</b>自動貼上模式啟動和關閉的\n"
- "雙態按鈕。\n"
- "\n"
--"當設定了這項功能， KGet 將會週期性地掃瞄剪貼簿上的URL 並且自動地貼上這些 URL。"
-+"當設定了這項功能， KGet 將會週期性地掃描剪貼簿上的URL 並且自動地貼上這些 "
-+"URL。"
- 
- #: kmainwidget.cpp:488
- msgid ""
-@@ -603,7 +606,7 @@
- 
- #: kmainwidget.cpp:707
- msgid "Quitting..."
--msgstr "離開中..."
-+msgstr "離開中…"
- 
- #: kmainwidget.cpp:712
- msgid ""
-@@ -749,7 +752,7 @@
- 
- #: kmainwidget.cpp:1902
- msgid "Hide Drop &Target"
--msgstr "隱藏拖放目標 (&T)"
-+msgstr "隱藏拖放目標(&T)"
- 
- #: kmainwidget.cpp:2171
- msgid " Size: %1 "
-@@ -793,7 +796,7 @@
- 
- #: kmainwidget.cpp:2223
- msgid "Disconnecting..."
--msgstr "斷線中..."
-+msgstr "斷線中…"
- 
- #: kmainwidget.cpp:2241
- msgid "We are online."
-@@ -1311,10 +1314,8 @@
- msgstr "檔案大小已檢查"
- 
- #: transfer.cpp:785
--msgid ""
--"Malformed URL:\n"
--msgstr ""
--"不正確的 URL：\n"
-+msgid "Malformed URL:\n"
-+msgstr "不正確的 URL：\n"
- 
- #: transfer.cpp:924
- msgid "Download resumed"
-@@ -1322,7 +1323,7 @@
- 
- #: transfer.cpp:1017
- msgid "checking if file is in cache...no"
--msgstr "檢查檔案是否在快取內...否"
-+msgstr "檢查檔案是否在快取內…否"
- 
- #: transferlist.cpp:66
- msgid "S"
-@@ -1395,7 +1396,7 @@
- 
- #: kget_plug_in/kget_plug_in.cpp:57
- msgid "Show Drop Target"
--msgstr "顯示拖放目標 (&T)"
-+msgstr "顯示拖放目標(&T)"
- 
- #: kget_plug_in/kget_plug_in.cpp:64
- msgid "List All Links"
-diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdenetwork/kinetd.po kde-i18n-zh_TW-3.5.10/messages/kdenetwork/kinetd.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdenetwork/kinetd.po	2006-10-01 18:34:24.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdenetwork/kinetd.po	2011-11-11 15:45:17.000000000 +0100
-@@ -7,7 +7,7 @@
- "Project-Id-Version: kinetd\n"
- "POT-Creation-Date: 2006-07-28 03:25+0200\n"
- "PO-Revision-Date: 2002-10-31 08:34+0800\n"
--"Last-Translator: Jupiter K.T. Ou <jupiter@ocool.org>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Chinese traditional <zh-l10n@linux.org.tw>\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/kdenetwork/kio_jabberdisco.po kde-i18n-zh_TW-3.5.10/messages/kdenetwork/kio_jabberdisco.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdenetwork/kio_jabberdisco.po	2006-07-22 10:04:35.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdenetwork/kio_jabberdisco.po	2011-11-11 15:45:17.000000000 +0100
-@@ -6,8 +6,7 @@
- "Project-Id-Version: kio_jabberdisco\n"
- "POT-Creation-Date: 2005-06-03 01:26+0200\n"
- "PO-Revision-Date: 2006-02-24 09:01+0800\n"
--"Last-Translator: Frank Weng (a.k.a. Franklin) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Traditional Chinese <zh_l10n@linux.org.tw>\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/kdenetwork/kio_lan.po kde-i18n-zh_TW-3.5.10/messages/kdenetwork/kio_lan.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdenetwork/kio_lan.po	2006-07-22 10:04:35.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdenetwork/kio_lan.po	2011-11-11 15:45:17.000000000 +0100
-@@ -7,8 +7,7 @@
- "Project-Id-Version: kio_lan\n"
- "POT-Creation-Date: 2005-03-25 01:18+0100\n"
- "PO-Revision-Date: 2006-02-24 09:03+0800\n"
--"Last-Translator: Frank Weng (a.k.a. Franklin) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Traditional Chinese <zh_l10n@linux.org.tw>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
-@@ -17,10 +16,12 @@
- 
- #: kio_lan.cpp:150
- msgid ""
--"<qt>The Lisa daemon does not appear to be running."
--"<p>In order to use the LAN Browser the Lisa daemon must be installed and "
--"activated by the system administrator."
--msgstr "<qt>Lisa 守護程式尚未執行。<p>要用 LAN 瀏覽器，必須先安裝並啟動 Lisa。</p></qt>"
-+"<qt>The Lisa daemon does not appear to be running.<p>In order to use the LAN "
-+"Browser the Lisa daemon must be installed and activated by the system "
-+"administrator."
-+msgstr ""
-+"<qt>Lisa 守護程式尚未執行。<p>要用 LAN 瀏覽器，必須先安裝並啟動 Lisa。</p></"
-+"qt>"
- 
- #: kio_lan.cpp:190 kio_lan.cpp:209 kio_lan.cpp:384
- #, c-format
-diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdenetwork/kio_zeroconf.po kde-i18n-zh_TW-3.5.10/messages/kdenetwork/kio_zeroconf.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdenetwork/kio_zeroconf.po	2007-05-14 12:23:07.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdenetwork/kio_zeroconf.po	2011-11-11 15:45:17.000000000 +0100
-@@ -6,8 +6,7 @@
- "Project-Id-Version: kio_zeroconf\n"
- "POT-Creation-Date: 2007-04-13 02:15+0200\n"
- "PO-Revision-Date: 2006-02-24 09:05+0800\n"
--"Last-Translator: Frank Weng (a.k.a. Franklin) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Traditional Chinese <zh_l10n@linux.org.tw>\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/kdenetwork/knewsticker.po kde-i18n-zh_TW-3.5.10/messages/kdenetwork/knewsticker.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdenetwork/knewsticker.po	2008-08-19 20:43:21.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdenetwork/knewsticker.po	2011-11-11 15:45:17.000000000 +0100
-@@ -10,8 +10,7 @@
- "Project-Id-Version: knewsticker\n"
- "POT-Creation-Date: 2008-07-08 01:20+0200\n"
- "PO-Revision-Date: 2006-02-24 17:25+0800\n"
--"Last-Translator: Frank Weng (a.k.a. Franklin) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Traditional Chinese <zh_l10n@linux.org.tw>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
-@@ -66,21 +65,20 @@
- 
- #: knewsticker.cpp:289
- msgid ""
--"<qt>Could not update news site '%1'."
--"<br>The supplied resource file is probably invalid or broken.</qt>"
--msgstr "<qt>無法更新新聞站台 %1。<br> 所提供的資源檔可能是無效或已毀壞。</qt>"
-+"<qt>Could not update news site '%1'.<br>The supplied resource file is "
-+"probably invalid or broken.</qt>"
-+msgstr "<qt>無法更新新聞站臺 %1。<br> 所提供的資源檔可能是無效或已毀壞。</qt>"
- 
- #: knewsticker.cpp:293
- msgid ""
- "<qt>The following news sites had problems. Their resource files are probably "
--"invalid or broken."
--"<ul>"
--msgstr "<qt>下列的新聞站台發生了問題。 它們的資源檔可能是無效或已毀壞。<ul>"
-+"invalid or broken.<ul>"
-+msgstr "<qt>下列的新聞站臺發生了問題。 它們的資源檔可能是無效或已毀壞。<ul>"
- 
- #: knewsticker.cpp:301
- msgid ""
- "Failed to update several news sites. The Internet connection might be cut."
--msgstr "無法更新某些新聞站台。Internet連線可能被切斷。"
-+msgstr "無法更新某些新聞站臺。Internet連線可能被切斷。"
- 
- #: knewsticker.cpp:432 knewsticker.cpp:463
- msgid "Check News"
-@@ -104,7 +102,7 @@
- 
- #: knewsticker.cpp:479
- msgid "Configure KNewsTicker..."
--msgstr "設定 KNewsTicker..."
-+msgstr "設定 KNewsTicker…"
- 
- #: knewstickerconfig.cpp:102
- msgid "News query interval:"
-@@ -129,8 +127,7 @@
- #: knewstickerconfig.cpp:321
- #, c-format
- msgid ""
--"_n: "
--"<p>Do you really want to remove %n news source?</p>\n"
-+"_n: <p>Do you really want to remove %n news source?</p>\n"
- "<p>Do you really want to remove these %n news sources?</p>"
- msgstr "<p>您確定要移除 %n 個新聞來源嗎？</p>"
- 
-@@ -180,11 +177,12 @@
- 
- #: newssourcedlgimpl.cpp:35
- msgid ""
--"<qt>Please wait while KNewsTicker is downloading some data necessary to suggest "
--"reasonable values."
--"<br/>"
--"<br/>This will not take longer than one minute.</qt>"
--msgstr "<qt>KNewsTicker 正在下載一些資料，請稍候。<br /> <br />這不會超過一分鐘。</qt>"
-+"<qt>Please wait while KNewsTicker is downloading some data necessary to "
-+"suggest reasonable values.<br/><br/>This will not take longer than one "
-+"minute.</qt>"
-+msgstr ""
-+"<qt>KNewsTicker 正在下載一些資料，請稍候。<br /> <br />這不會超過一分鐘。</"
-+"qt>"
- 
- #: newssourcedlgimpl.cpp:72
- msgid "Could not retrieve the specified source file."
-@@ -200,7 +198,8 @@
- 
- #: newssourcedlgimpl.cpp:219
- msgid ""
--"You have to specify the source file for this news source to be able to use it."
-+"You have to specify the source file for this news source to be able to use "
-+"it."
- msgstr "您必須為這個新聞來源指定一個來源檔案。"
- 
- #: newssourcedlgimpl.cpp:220
-@@ -246,30 +245,30 @@
- #, no-c-format
- msgid ""
- "Here you can define at what interval KNewsTicker queries the configured news "
--"sources for new headlines. This depends generally on how fast you would like to "
--"hear about news and how much load you want to put on the network:"
--"<ul>\n"
-+"sources for new headlines. This depends generally on how fast you would like "
-+"to hear about news and how much load you want to put on the network:<ul>\n"
- "<li>A lower value (lower than <b>15 minutes</b>) enables you to get notified "
--"about news very quickly if you want or need to. Please note that it increases "
--"the network traffic significantly, though. Therefore, such low values should "
--"not be used if you query popular news sites (such as <a "
--"href=\"http://slashdot.org\">Slashdot</a> or <a href=\"http://freshmeat.net\">"
--"Freshmeat</a>) as they have generally already enough work processing the "
-+"about news very quickly if you want or need to. Please note that it "
-+"increases the network traffic significantly, though. Therefore, such low "
-+"values should not be used if you query popular news sites (such as <a href="
-+"\"http://slashdot.org\">Slashdot</a> or <a href=\"http://freshmeat.net"
-+"\">Freshmeat</a>) as they have generally already enough work processing the "
- "incoming queries.</li>\n"
- "<li>A higher value (higher than <b>45 minutes</b>) will make you hear about "
- "news less quickly. For non-timecritical applications, it should be suitable, "
--"though. The positive aspect of longer intervals is that only very little load "
--"is put on the network; this saves resources and nerves, for you and the system "
--"administrators of the news sites you query.</li></ul>\n"
-+"though. The positive aspect of longer intervals is that only very little "
-+"load is put on the network; this saves resources and nerves, for you and the "
-+"system administrators of the news sites you query.</li></ul>\n"
- "The default value (30 minutes) should be appropriate and reasonable in most "
- "cases."
- msgstr ""
--"您可以決定 KNewsTicker 查詢新的新聞的時間間隔。端看您想要多常聽到這些新聞，還有您上網的頻率而定： "
--"<ul> "
--"<li>較低的數值（低於十五分鐘）能讓您馬上知道有新聞。請注意，這樣也會增加網路負擔。因此，如果您查詢的是熱門站台，如 <a "
--"href=\"http://slashdot.org\">Slashdot</a> 或 <a href=\"http://freshmeat.net\">"
--"Freshmeat</a>，最好不要用太低的值，因為它們的網路已經夠擠了。</li> "
--"<li>較高的數值（高於四十五分鐘）適用於不那麼要緊的新聞站台，也不會造成網路太大的負擔。</li></ul> \n"
-+"您可以決定 KNewsTicker 查詢新的新聞的時間間隔。端看您想要多常聽到這些新聞，還"
-+"有您上網的頻率而定： <ul> <li>較低的數值（低於十五分鐘）能讓您馬上知道有新"
-+"聞。請注意，這樣也會增加網路負擔。因此，如果您查詢的是熱門站臺，如 <a href="
-+"\"http://slashdot.org\">Slashdot</a> 或 <a href=\"http://freshmeat.net"
-+"\">Freshmeat</a>，最好不要用太低的值，因為它們的網路已經夠擠了。</li> <li>較"
-+"高的數值（高於四十五分鐘）適用於不那麼要緊的新聞站臺，也不會造成網路太大的負"
-+"擔。</li></ul> \n"
- "預設值（三十分鐘）通常對大部份狀況都已經夠用。"
- 
- #. i18n: file knewstickerconfigwidget.ui line 130
-@@ -289,16 +288,16 @@
- #: rc.cpp:30 rc.cpp:554
- #, no-c-format
- msgid ""
--"This slider allows you to define how quickly/slowly the text should be scrolled "
--"when using the mousewheel."
-+"This slider allows you to define how quickly/slowly the text should be "
-+"scrolled when using the mousewheel."
- msgstr "這個滑動器讓您定義使用滑鼠滾輪時文字捲軸的速度。　"
- 
- #. i18n: file knewstickerconfigwidget.ui line 159
- #: rc.cpp:36 rc.cpp:45 rc.cpp:54 rc.cpp:560 rc.cpp:569 rc.cpp:578
- #, no-c-format
- msgid ""
--"This slider allows you to define how fast/slow the text should be scrolled when "
--"using the mousewheel."
-+"This slider allows you to define how fast/slow the text should be scrolled "
-+"when using the mousewheel."
- msgstr "這個滑動器讓您定義使用滑鼠滾輪時文字捲軸的速度。　"
- 
- #. i18n: file knewstickerconfigwidget.ui line 167
-@@ -317,7 +316,7 @@
- #: rc.cpp:57 rc.cpp:581
- #, no-c-format
- msgid "&Use custom names for news sites"
--msgstr "對新聞站台使用自訂名稱(&U)"
-+msgstr "對新聞站臺使用自訂名稱(&U)"
- 
- #. i18n: file knewstickerconfigwidget.ui line 203
- #: rc.cpp:60 rc.cpp:584
-@@ -329,13 +328,14 @@
- #: rc.cpp:63 rc.cpp:587
- #, no-c-format
- msgid ""
--"Check this box to make the news ticker use the names you specified in the list "
--"of news sources (available on the tab labeled <i>News sources</i>"
--") instead of the ones the news sites themselves report."
--"<br>This can be handy for news sites which report a very long or useless name."
-+"Check this box to make the news ticker use the names you specified in the "
-+"list of news sources (available on the tab labeled <i>News sources</i>) "
-+"instead of the ones the news sites themselves report.<br>This can be handy "
-+"for news sites which report a very long or useless name."
- msgstr ""
--"核取這個方塊使新聞收報機顯示使用您在新聞來源列表 (在<i>新聞來源</i>標籤頁) 中所指定的名稱，而不是新聞網站所提供的名稱。"
--"<br>這可以處理使用很長名稱或罕用名稱的網站。"
-+"核取這個方塊使新聞收報機顯示使用您在新聞來源列表 (在<i>新聞來源</i>標籤頁) 中"
-+"所指定的名稱，而不是新聞網站所提供的名稱。<br>這可以處理使用很長名稱或罕用名"
-+"稱的網站。"
- 
- #. i18n: file knewstickerconfigwidget.ui line 235
- #: rc.cpp:66 rc.cpp:590
-@@ -347,7 +347,7 @@
- #: rc.cpp:69 rc.cpp:593
- #, no-c-format
- msgid "Name of Site"
--msgstr "站台名稱"
-+msgstr "站臺名稱"
- 
- #. i18n: file knewstickerconfigwidget.ui line 261
- #: rc.cpp:72 rc.cpp:596
-@@ -371,35 +371,33 @@
- #: rc.cpp:81 rc.cpp:605
- #, no-c-format
- msgid ""
--"This list lets you manage the list of news sites the news ticker will query for "
--"headlines. The news sources are arranged in a tree-like hierarchy and sorted by "
--"topic."
--"<br>The column labeled \"Max. articles\" shows how many articles will be cached "
--"for the news sites (read: how many articles will be accessible through the "
--"context menu)."
--"<ul>\n"
--"<li>To add a site, you can either drag the URL of the RDF or RSS file to this "
--"list from Konqueror or any other application, or use the <i>Add...</i> "
-+"This list lets you manage the list of news sites the news ticker will query "
-+"for headlines. The news sources are arranged in a tree-like hierarchy and "
-+"sorted by topic.<br>The column labeled \"Max. articles\" shows how many "
-+"articles will be cached for the news sites (read: how many articles will be "
-+"accessible through the context menu).<ul>\n"
-+"<li>To add a site, you can either drag the URL of the RDF or RSS file to "
-+"this list from Konqueror or any other application, or use the <i>Add...</i> "
- "button in the bottom right corner.</li>\n"
--"<li>To modify a site, just double-click on the particular news source you would "
--"like to edit and an input field will pop up which lets you edit the respective "
--"property.</li>\n"
--"<li>To remove a site, simply select a news source in the list and click on the "
--"<i>Remove</i> button in the lower right corner.</li></ul>\n"
-+"<li>To modify a site, just double-click on the particular news source you "
-+"would like to edit and an input field will pop up which lets you edit the "
-+"respective property.</li>\n"
-+"<li>To remove a site, simply select a news source in the list and click on "
-+"the <i>Remove</i> button in the lower right corner.</li></ul>\n"
- "Note that you can also right-click on the list to open a menu which lets you "
- "add and remove news sources. You can also enable or disable certain news "
- "sources temporarily by checking or unchecking the box next to it; those news "
--"sources whose boxes are checked are considered activated and will be processed "
--"by KNewsTicker."
-+"sources whose boxes are checked are considered activated and will be "
-+"processed by KNewsTicker."
- msgstr ""
--"這個列表讓您管理要查詢的新聞站台。新聞來源會以樹狀圖依序排序。"
--"<br> 「最大文章數」欄位顯示要保留多少文章（也就是說，在視窗中會顯示多少條新聞）。 "
--"<ul>\n"
--"<li>要新增站台，您可以從 Konqueror 或其他應用程式將 RDF 或 RSS 網址拖放到這個清單中，或是使用「新增」鍵。</li>\n"
--"<li>要修改站台內容，您只要雙擊該站台，就會出現一個視窗讓您編輯。</li> "
--"<li>要移除站台，您只要選擇清單中的站台，然後按下「移除」。</li></ul> "
--"您也可以在站台上面點選滑鼠右鍵，會出現一個選單讓您做新增移除等動作。站台左方的小方塊則讓您可以暫時開啟或關閉該站台。KNewsTicker "
--"只會檢查被選取的站台。"
-+"這個列表讓您管理要查詢的新聞站臺。新聞來源會以樹狀圖依序排序。<br> 「最大文章"
-+"數」欄位顯示要保留多少文章（也就是說，在視窗中會顯示多少條新聞）。 <ul>\n"
-+"<li>要新增站臺，您可以從 Konqueror 或其他應用程式將 RDF 或 RSS 網址拖放到這個"
-+"清單中，或是使用「新增」鍵。</li>\n"
-+"<li>要修改站臺內容，您只要雙擊該站臺，就會出現一個視窗讓您編輯。</li> <li>要"
-+"移除站臺，您只要選擇清單中的站臺，然後按下「移除」。</li></ul> 您也可以在站臺"
-+"上面點選滑鼠右鍵，會出現一個選單讓您做新增移除等動作。站臺左方的小方塊則讓您"
-+"可以暫時開啟或關閉該站臺。KNewsTicker 只會檢查被選取的站臺。"
- 
- #. i18n: file knewstickerconfigwidget.ui line 309
- #: rc.cpp:88 rc.cpp:141 rc.cpp:612 rc.cpp:665
-@@ -411,7 +409,7 @@
- #: rc.cpp:91 rc.cpp:615
- #, no-c-format
- msgid "Remove selected site"
--msgstr "移除選擇的站台"
-+msgstr "移除選擇的站臺"
- 
- #. i18n: file knewstickerconfigwidget.ui line 315
- #: rc.cpp:94 rc.cpp:618
-@@ -424,28 +422,29 @@
- #: rc.cpp:97 rc.cpp:621
- #, no-c-format
- msgid "Add..."
--msgstr "新增..."
-+msgstr "新增…"
- 
- #. i18n: file knewstickerconfigwidget.ui line 343
- #: rc.cpp:100 rc.cpp:624
- #, no-c-format
- msgid "Add a new site"
--msgstr "新增一個站台"
-+msgstr "新增一個站臺"
- 
- #. i18n: file knewstickerconfigwidget.ui line 346
- #: rc.cpp:103 rc.cpp:627
- #, no-c-format
- msgid ""
--"Click this button to add a new site to the list. Note that you can also drag a "
--"RDF or RSS file to this list (i.e. from Konqueror) to add it to the list."
-+"Click this button to add a new site to the list. Note that you can also drag "
-+"a RDF or RSS file to this list (i.e. from Konqueror) to add it to the list."
- msgstr ""
--"按下這個按鈕以增加新的網站到列表中。 注意您也可以拖曳一個  RFD 或 RSS 檔案到這個列表中 (從 Konqueror) 以增加至列表。"
-+"按下這個按鈕以增加新的網站到列表中。 注意您也可以拖曳一個  RFD 或 RSS 檔案到"
-+"這個列表中 (從 Konqueror) 以增加至列表。"
- 
- #. i18n: file knewstickerconfigwidget.ui line 357
- #: rc.cpp:106 rc.cpp:630
- #, no-c-format
- msgid "&Modify..."
--msgstr "變更(&M)..."
-+msgstr "變更(&M)…"
- 
- #. i18n: file knewstickerconfigwidget.ui line 360
- #: rc.cpp:109 rc.cpp:633
-@@ -457,9 +456,12 @@
- #: rc.cpp:112 rc.cpp:636
- #, no-c-format
- msgid ""
--"Click this button to open a dialog which lets you edit the properties (such as "
--"the name, the source file, or the icon) of the currently selected news source."
--msgstr "按下這個鍵會出現一個視窗，讓您可以編輯所選取站台的內容（如名稱、來源檔及圖示）。"
-+"Click this button to open a dialog which lets you edit the properties (such "
-+"as the name, the source file, or the icon) of the currently selected news "
-+"source."
-+msgstr ""
-+"按下這個鍵會出現一個視窗，讓您可以編輯所選取站臺的內容（如名稱、來源檔及圖"
-+"示）。"
- 
- #. i18n: file knewstickerconfigwidget.ui line 373
- #: rc.cpp:115 rc.cpp:639
-@@ -502,33 +504,31 @@
- #, no-c-format
- msgid ""
- "Here you can see the list of currently configured filters and manage them as "
--"well as add new filters. Managing them is fairly easy:"
--"<ul>\n"
--"<li>To <b>add</b> a new filter, specify its properties in the box below labeled "
--"<i>Filter properties</i> and press the <i>Add</i> button in the lower right "
--"corner.</li>\n"
-+"well as add new filters. Managing them is fairly easy:<ul>\n"
-+"<li>To <b>add</b> a new filter, specify its properties in the box below "
-+"labeled <i>Filter properties</i> and press the <i>Add</i> button in the "
-+"lower right corner.</li>\n"
- "<li><b>Modifying</b> an existing filter is done in a similar manner: simply "
--"select the filter you would like to edit in the list and change its properties "
--"in the box below.</li>\n"
-+"select the filter you would like to edit in the list and change its "
-+"properties in the box below.</li>\n"
- "<li>Finally, to <b>remove</b> a filter, select it in the list and press the "
- "button labeled <i>Remove</i> in the lower right corner.</li></ul>\n"
- "You can also enable or disable certain filters temporarily by checking or "
- "unchecking the box next to them; those filters whose boxes are checked are "
--"considered enabled and will be honored by KNewsTicker."
--"<br>\n"
--"Note that the filters are processed from the top to the bottom so that of two "
--"filters which might nullify each other (like \"Show...does not contain KDE\" "
--"and \"Show...contains KDE\") only the one which is lower in the list will take "
--"effect."
--msgstr ""
--"您可以看到並管理目前設定的過濾器清單。管理過濾器很簡單： "
--"<ul> "
--"<li>要新增過濾器，只要先將底下的過濾器內容填寫好，並按下「新增」鍵即可。</li>\n"
--"<li>要變更已存在的過濾器也是一樣，只要先選擇過濾器，然後在下面變更內容。</li> "
--"<li>如果要移除過濾器，只要選擇過濾器然後按下「移除」鍵。</li></ul> \n"
--"您也可以用前面的小方塊來暫時開啟或關閉過濾器。只有被選取的過濾器才會被 KNewsTicker 執行。"
--"<br>\n"
--"注意過濾器是從上到下執行，因此要注意兩個過濾器間可能會互相矛盾（如一個顯示「不含 KDE」另一個要顯示「含 KDE」），較低的那一個才會有作用。"
-+"considered enabled and will be honored by KNewsTicker.<br>\n"
-+"Note that the filters are processed from the top to the bottom so that of "
-+"two filters which might nullify each other (like \"Show...does not contain "
-+"KDE\" and \"Show...contains KDE\") only the one which is lower in the list "
-+"will take effect."
-+msgstr ""
-+"您可以看到並管理目前設定的過濾器清單。管理過濾器很簡單： <ul> <li>要新增過濾"
-+"器，只要先將底下的過濾器內容填寫好，並按下「新增」鍵即可。</li>\n"
-+"<li>要變更已存在的過濾器也是一樣，只要先選擇過濾器，然後在下面變更內容。</"
-+"li> <li>如果要移除過濾器，只要選擇過濾器然後按下「移除」鍵。</li></ul> \n"
-+"您也可以用前面的小方塊來暫時開啟或關閉過濾器。只有被選取的過濾器才會被 "
-+"KNewsTicker 執行。<br>\n"
-+"注意過濾器是從上到下執行，因此要注意兩個過濾器間可能會互相矛盾（如一個顯示"
-+"「不含 KDE」另一個要顯示「含 KDE」），較低的那一個才會有作用。"
- 
- #. i18n: file knewstickerconfigwidget.ui line 501
- #: rc.cpp:144 rc.cpp:668
-@@ -589,8 +589,8 @@
- #: rc.cpp:171 rc.cpp:695
- #, no-c-format
- msgid ""
--"Here you can define what should happen if this filter matches (e.g. whether the "
--"matching articles should be shown or hidden)."
-+"Here you can define what should happen if this filter matches (e.g. whether "
-+"the matching articles should be shown or hidden)."
- msgstr "您可以決定當過濾器符合時您要執行什麼動作（例如要不要顯示該篇文章）"
- 
- #. i18n: file knewstickerconfigwidget.ui line 581
-@@ -617,9 +617,9 @@
- #, no-c-format
- msgid ""
- "Here you can specify which news sources (or all of them) are affected. Note "
--"that only the news sources which have been activated on the <i>News sources</i> "
--"tab are shown in this combo box."
--msgstr "您可以指定哪些新聞站台被影響。注意只有被啟動的新聞來源才會顯示在這裡。"
-+"that only the news sources which have been activated on the <i>News sources</"
-+"i> tab are shown in this combo box."
-+msgstr "您可以指定哪些新聞站臺被影響。注意只有被啟動的新聞來源才會顯示在這裡。"
- 
- #. i18n: file knewstickerconfigwidget.ui line 605
- #: rc.cpp:186 rc.cpp:710
-@@ -638,27 +638,27 @@
- #, no-c-format
- msgid ""
- "Here you can type a keyword or expression to be used for this filter which "
--"depends on the condition you selected in the combo box at the right:"
--"<ul>\n"
-+"depends on the condition you selected in the combo box at the right:<ul>\n"
- "<li><b>contain</b>, <b>does not contain</b> - you should probably enter a "
- "keyword here, like \"KDE\", \"Baseball\" or \"Business\". The keyword is not "
- "case-sensitive so it does not matter whether you type \"kde\", \"KDE\" or "
- "\"kDe\".</li>\n"
--"<li><b>equals</b>, <b>does not equal</b> - enter a phrase or expression here to "
--"have the filter match only those articles whose headlines match <b>exactly</b> "
--"the text you typed. The phrase you type will be considered to be "
--"case-sensitive, so it makes a difference whether you show articles which "
-+"<li><b>equals</b>, <b>does not equal</b> - enter a phrase or expression here "
-+"to have the filter match only those articles whose headlines match "
-+"<b>exactly</b> the text you typed. The phrase you type will be considered to "
-+"be case-sensitive, so it makes a difference whether you show articles which "
- "contain \"Boeing\" or \"BOEING\".</li>\n"
--"<li><b>matches</b> - a regular expression is expected. Recommended only if you "
--"are familiar with regular expressions, i.e. it should be used by advanced users "
--"only.</li></ul>"
--msgstr ""
--"您可以輸入此過濾器使用的關鍵字或是表示式，並在右邊選擇條件： "
--"<ul>\n"
--"<li><b>包含</b>，<b>不包含</b>─您應該輸入關鍵字，如 \"KDE\"、\"Baseball\" 等。關鍵字不分大小寫。</li>\n"
--"<li><b>等於</b>，<b>不等於</b>─您可以輸入一個片段，或表示式，讓過濾器比對文章標題是否「完全」符合您輸入的文字。此時輸入的片語大小寫有區別。<"
--"/li> \n"
--"<li><b>比對</b>─您應該輸入一段正規表示式。如果您熟悉正規表示式，您可以使用此選項。</li></ul>"
-+"<li><b>matches</b> - a regular expression is expected. Recommended only if "
-+"you are familiar with regular expressions, i.e. it should be used by "
-+"advanced users only.</li></ul>"
-+msgstr ""
-+"您可以輸入此過濾器使用的關鍵字或是表示式，並在右邊選擇條件： <ul>\n"
-+"<li><b>包含</b>，<b>不包含</b>─您應該輸入關鍵字，如 \"KDE\"、\"Baseball\" "
-+"等。關鍵字不分大小寫。</li>\n"
-+"<li><b>等於</b>，<b>不等於</b>─您可以輸入一個片段，或表示式，讓過濾器比對文章"
-+"標題是否「完全」符合您輸入的文字。此時輸入的片語大小寫有區別。</li> \n"
-+"<li><b>比對</b>─您應該輸入一段正規表示式。如果您熟悉正規表示式，您可以使用此"
-+"選項。</li></ul>"
- 
- #. i18n: file knewstickerconfigwidget.ui line 644
- #: rc.cpp:198 rc.cpp:722
-@@ -707,13 +707,12 @@
- #: rc.cpp:219 rc.cpp:743
- #, no-c-format
- msgid ""
--"This combo box lets you specify the condition under which the "
--"keyword/expression you entered in the input field at the right will match. You "
--"can select one of the following values:"
--"<ul>\n"
-+"This combo box lets you specify the condition under which the keyword/"
-+"expression you entered in the input field at the right will match. You can "
-+"select one of the following values:<ul>\n"
- "<li>contain - the filter matches if the headline contains the keyword.</li>\n"
--"<li>does not contain - the filter matches if the headline does not contain the "
--"keyword.</li>\n"
-+"<li>does not contain - the filter matches if the headline does not contain "
-+"the keyword.</li>\n"
- "<li>equals - the filter matches if the headline equals the expression.</li>\n"
- "<li>does not equal - the filter matches if the headline does not equal the "
- "expression.</li>\n"
-@@ -721,13 +720,14 @@
- "expression you typed at the right will be considered a regular expression in "
- "this mode.</li>"
- msgstr ""
--"這個選單讓您指定在輸入欄位中輸入的關鍵字/表示式所使用的條件。您可以有以下選擇： "
--"<ul>\n"
-+"這個選單讓您指定在輸入欄位中輸入的關鍵字/表示式所使用的條件。您可以有以下選"
-+"擇： <ul>\n"
- "<li>包含─過濾器會比對標題包含該關鍵字。</li>\n"
- "<li>不包含─過濾器會比對標題不含該關鍵字。</li>\n"
- "<li>等於─過濾器會比對標題與該關鍵字完全相等。</li>\n"
- "<li>不等於─過濾器會比對標題與該關鍵字不相等。</li>\n"
--"<li>比對─欄位中所輸入的會被當成正規表示式，而過濾器會比對標題與該正規表示式。</li></ul>"
-+"<li>比對─欄位中所輸入的會被當成正規表示式，而過濾器會比對標題與該正規表示式。"
-+"</li></ul>"
- 
- #. i18n: file knewstickerconfigwidget.ui line 697
- #: rc.cpp:227 rc.cpp:751
-@@ -759,14 +759,15 @@
- #: rc.cpp:778 rc.cpp:787
- #, no-c-format
- msgid ""
--"Here you can define how fast the text should be scrolling. If you only have a "
--"little space on your taskbar (and therefore a rather small news ticker), you "
--"should probably set this to a slower speed so that you have a chance to read "
--"the headlines. For wider news tickers (and better eyes), faster scrolling is "
--"probably appropriate so that you do not have to wait too long for the next "
--"headline."
-+"Here you can define how fast the text should be scrolling. If you only have "
-+"a little space on your taskbar (and therefore a rather small news ticker), "
-+"you should probably set this to a slower speed so that you have a chance to "
-+"read the headlines. For wider news tickers (and better eyes), faster "
-+"scrolling is probably appropriate so that you do not have to wait too long "
-+"for the next headline."
- msgstr ""
--"您可以定義文字捲動的速度。如果您只能使用一點空間給 KNewsTicker，那麼您可能會想用慢一點的速度，反之您可以定義快一點的速度，才不會讀得太久。"
-+"您可以定義文字捲動的速度。如果您只能使用一點空間給 KNewsTicker，那麼您可能會"
-+"想用慢一點的速度，反之您可以定義快一點的速度，才不會讀得太久。"
- 
- #. i18n: file knewstickerconfigwidget.ui line 776
- #: rc.cpp:242 rc.cpp:766
-@@ -841,9 +842,11 @@
- #, no-c-format
- msgid ""
- "These options allow you to define in what direction the text should be "
--"scrolled, e.g. to the left or to the right, upwards or downwards. Rotated means "
--"the text is rotated 90 degrees."
--msgstr "這些選項讓您定義文字捲動的方向，向左右還是上下。「文字轉向」表示文字會轉 90 度角。"
-+"scrolled, e.g. to the left or to the right, upwards or downwards. Rotated "
-+"means the text is rotated 90 degrees."
-+msgstr ""
-+"這些選項讓您定義文字捲動的方向，向左右還是上下。「文字轉向」表示文字會轉 90 "
-+"度角。"
- 
- #. i18n: file knewstickerconfigwidget.ui line 911
- #: rc.cpp:302 rc.cpp:826
-@@ -861,19 +864,23 @@
- #: rc.cpp:308 rc.cpp:832
- #, no-c-format
- msgid ""
--"Click the button at the right to open a convenient color-selection dialog which "
--"lets you choose the color of the headlines when they are highlighted (when you "
--"move the mouse over them)."
--msgstr "按下右邊的按鍵會開啟顏色選擇對話框，讓您選擇標題被標註時（當滑鼠移動到該標題上面時）的顏色。"
-+"Click the button at the right to open a convenient color-selection dialog "
-+"which lets you choose the color of the headlines when they are highlighted "
-+"(when you move the mouse over them)."
-+msgstr ""
-+"按下右邊的按鍵會開啟顏色選擇對話框，讓您選擇標題被標註時（當滑鼠移動到該標題"
-+"上面時）的顏色。"
- 
- #. i18n: file knewstickerconfigwidget.ui line 934
- #: rc.cpp:314 rc.cpp:838
- #, no-c-format
- msgid ""
- "Click this button to open a convenient color-selection dialog which lets you "
--"choose the color of the headlines when they are highlighted (when you move the "
--"mouse over them)."
--msgstr "按下右邊的按鍵會開啟顏色選擇對話框，讓您選擇標題被標註時（當滑鼠移動到該標題上面時）的顏色。"
-+"choose the color of the headlines when they are highlighted (when you move "
-+"the mouse over them)."
-+msgstr ""
-+"按下右邊的按鍵會開啟顏色選擇對話框，讓您選擇標題被標註時（當滑鼠移動到該標題"
-+"上面時）的顏色。"
- 
- #. i18n: file knewstickerconfigwidget.ui line 942
- #: rc.cpp:317 rc.cpp:841
-@@ -891,8 +898,8 @@
- #: rc.cpp:323 rc.cpp:847
- #, no-c-format
- msgid ""
--"Click the button at the right to open a convenient color-selection dialog which "
--"lets you choose the background color of the scrolling text."
-+"Click the button at the right to open a convenient color-selection dialog "
-+"which lets you choose the background color of the scrolling text."
- msgstr "按下右邊的按鍵會開啟顏色選擇對話框，讓您選擇文字捲動時的背景顏色。"
- 
- #. i18n: file knewstickerconfigwidget.ui line 965
-@@ -919,8 +926,8 @@
- #: rc.cpp:338 rc.cpp:862
- #, no-c-format
- msgid ""
--"Click the button at the right to open a convenient color-selection dialog which "
--"lets you choose the color of the scrolling text."
-+"Click the button at the right to open a convenient color-selection dialog "
-+"which lets you choose the color of the scrolling text."
- msgstr "按下右邊的按鍵會開啟顏色選擇對話框，讓您選擇捲動文字的顏色。"
- 
- #. i18n: file knewstickerconfigwidget.ui line 996
-@@ -947,30 +954,32 @@
- #: rc.cpp:353 rc.cpp:877
- #, no-c-format
- msgid ""
--"Click on the button at the right labeled <i>Choose Font...</i> "
--"to choose the font which will be used for the scrolling text. Please note that "
--"certain fonts are harder to read than others, especially when they are used as "
-+"Click on the button at the right labeled <i>Choose Font...</i> to choose the "
-+"font which will be used for the scrolling text. Please note that certain "
-+"fonts are harder to read than others, especially when they are used as "
- "scrolling text. You should probably choose a font which can be easily read "
- "while it is moving."
- msgstr ""
--"按下右邊「選擇字型」的按鍵，能讓您選擇捲動文字的字型。請注意，有的字型會比較難閱讀，特別是文字在捲動時。您應該選擇一個移動時較容易閱讀的字型。"
-+"按下右邊「選擇字型」的按鍵，能讓您選擇捲動文字的字型。請注意，有的字型會比較"
-+"難閱讀，特別是文字在捲動時。您應該選擇一個移動時較容易閱讀的字型。"
- 
- #. i18n: file knewstickerconfigwidget.ui line 1021
- #: rc.cpp:356 rc.cpp:880
- #, no-c-format
- msgid "Choose Font..."
--msgstr "選擇字型..."
-+msgstr "選擇字型…"
- 
- #. i18n: file knewstickerconfigwidget.ui line 1027
- #: rc.cpp:362 rc.cpp:886
- #, no-c-format
- msgid ""
--"Click here to choose the font which will be used for the scrolling text. Please "
--"note that certain fonts are harder to read than others, especially when they "
--"are used as a scrolling text. You should probably choose a font which can be "
--"easily read while it is moving."
-+"Click here to choose the font which will be used for the scrolling text. "
-+"Please note that certain fonts are harder to read than others, especially "
-+"when they are used as a scrolling text. You should probably choose a font "
-+"which can be easily read while it is moving."
- msgstr ""
--"按下右邊「選擇字型」的按鍵，能讓您選擇捲動文字的字型。請注意，有的字型會比較難閱讀，特別是文字在捲動時。您應該選擇一個移動時較容易閱讀的字型。"
-+"按下右邊「選擇字型」的按鍵，能讓您選擇捲動文字的字型。請注意，有的字型會比較"
-+"難閱讀，特別是文字在捲動時。您應該選擇一個移動時較容易閱讀的字型。"
- 
- #. i18n: file knewstickerconfigwidget.ui line 1054
- #: rc.cpp:368 rc.cpp:892
-@@ -982,14 +991,14 @@
- #: rc.cpp:371 rc.cpp:895
- #, no-c-format
- msgid "Show only the most recent headline for each news site in the scroller"
--msgstr "只捲動每個站台中的最新的新聞"
-+msgstr "只捲動每個站臺中的最新的新聞"
- 
- #. i18n: file knewstickerconfigwidget.ui line 1060
- #: rc.cpp:374 rc.cpp:898
- #, no-c-format
- msgid ""
- "Check this button to show only the most recent headline for each news site. "
--msgstr "只捲動每個站台中的最新的新聞"
-+msgstr "只捲動每個站臺中的最新的新聞"
- 
- #. i18n: file knewstickerconfigwidget.ui line 1068
- #: rc.cpp:377 rc.cpp:901
-@@ -1007,10 +1016,12 @@
- #: rc.cpp:383 rc.cpp:907
- #, no-c-format
- msgid ""
--"Click this button to make KNewsTicker show the icons of the news site to which "
--"each headline belongs. This makes associating a headline to a news site very "
--"easy but takes up some space in the text."
--msgstr "按下此按鍵，KNewsTicker 會顯示該新聞標題屬於哪個新聞站台的圖示。這能讓您分辨新聞站台，但是會占用文字的空間。"
-+"Click this button to make KNewsTicker show the icons of the news site to "
-+"which each headline belongs. This makes associating a headline to a news "
-+"site very easy but takes up some space in the text."
-+msgstr ""
-+"按下此按鍵，KNewsTicker 會顯示該新聞標題屬於哪個新聞站臺的圖示。這能讓您分辨"
-+"新聞站臺，但是會占用文字的空間。"
- 
- #. i18n: file knewstickerconfigwidget.ui line 1082
- #: rc.cpp:386 rc.cpp:910
-@@ -1029,9 +1040,11 @@
- #, no-c-format
- msgid ""
- "Check this box to make KNewsTicker slow the scrolling down when you move the "
--"mouse cursor over the scrolling text. This makes clicking on items and dragging "
--"the icons (if enabled) away a lot easier."
--msgstr "開啟此選項的話，當滑鼠移到捲動文字上方時，捲動速度會放慢，讓您方便點選想看的新聞。"
-+"mouse cursor over the scrolling text. This makes clicking on items and "
-+"dragging the icons (if enabled) away a lot easier."
-+msgstr ""
-+"開啟此選項的話，當滑鼠移到捲動文字上方時，捲動速度會放慢，讓您方便點選想看的"
-+"新聞。"
- 
- #. i18n: file knewstickerconfigwidget.ui line 1096
- #: rc.cpp:395 rc.cpp:919
-@@ -1081,11 +1094,12 @@
- #: rc.cpp:416 rc.cpp:422 rc.cpp:940 rc.cpp:946
- #, no-c-format
- msgid ""
--"Here you can enter the name of the news source."
--"<br>Note that you can also use the button at the bottom right labeled <i>"
--"Suggest</i> to let KNewsTicker fill this field automatically, after you have "
--"entered a source file below."
--msgstr "您可以輸入新聞來源的名稱。<br> 注意在您輸入新聞來源檔案之後，您也可以用底下的「建議」鍵來讓 KNewsTicker 自動填入這個欄位。"
-+"Here you can enter the name of the news source.<br>Note that you can also "
-+"use the button at the bottom right labeled <i>Suggest</i> to let KNewsTicker "
-+"fill this field automatically, after you have entered a source file below."
-+msgstr ""
-+"您可以輸入新聞來源的名稱。<br> 注意在您輸入新聞來源檔案之後，您也可以用底下的"
-+"「建議」鍵來讓 KNewsTicker 自動填入這個欄位。"
- 
- #. i18n: file newssourcedlg.ui line 99
- #: rc.cpp:425 rc.cpp:949
-@@ -1103,11 +1117,13 @@
- #: rc.cpp:431 rc.cpp:497 rc.cpp:955 rc.cpp:1021
- #, no-c-format
- msgid ""
--"Enter the path to the source file for the news source you want to add here. If "
--"you specified a source file here, you can use the button at the bottom right "
--"labeled <i>Suggest</i> to let KNewsTicker fill in the remaining values "
-+"Enter the path to the source file for the news source you want to add here. "
-+"If you specified a source file here, you can use the button at the bottom "
-+"right labeled <i>Suggest</i> to let KNewsTicker fill in the remaining values "
- "automatically."
--msgstr "輸入您要加入的新聞來源的來源檔案路徑。在您輸入新聞來源檔案之後，您就可以用底下的「建議」鍵來讓 KNewsTicker 自動填入其他的欄位。"
-+msgstr ""
-+"輸入您要加入的新聞來源的來源檔案路徑。在您輸入新聞來源檔案之後，您就可以用底"
-+"下的「建議」鍵來讓 KNewsTicker 自動填入其他的欄位。"
- 
- #. i18n: file newssourcedlg.ui line 116
- #: rc.cpp:434 rc.cpp:958
-@@ -1125,15 +1141,15 @@
- #: rc.cpp:440 rc.cpp:446 rc.cpp:964 rc.cpp:970
- #, no-c-format
- msgid ""
--"Here you can specify the path to an icon to be used for this news source. Icons "
--"make it easier to distinguish between multiple news sources as the headlines "
--"scroll by."
--"<br>Note that you can also use the button at the bottom right labeled <i>"
--"Suggest</i> to let KNewsTicker fill this field automatically, after you have "
--"entered a source file above."
-+"Here you can specify the path to an icon to be used for this news source. "
-+"Icons make it easier to distinguish between multiple news sources as the "
-+"headlines scroll by.<br>Note that you can also use the button at the bottom "
-+"right labeled <i>Suggest</i> to let KNewsTicker fill this field "
-+"automatically, after you have entered a source file above."
- msgstr ""
--"您可以為這個新聞來源指定一個圖示的路徑。圖示能讓使用者輕易分辨不同新聞的來源。"
--"<br> 注意，在您輸入新聞來源檔案之後，您也可以用底下的「建議」鍵來讓 KNewsTicker 自動填入這個欄位。"
-+"您可以為這個新聞來源指定一個圖示的路徑。圖示能讓使用者輕易分辨不同新聞的來"
-+"源。<br> 注意，在您輸入新聞來源檔案之後，您也可以用底下的「建議」鍵來讓 "
-+"KNewsTicker 自動填入這個欄位。"
- 
- #. i18n: file newssourcedlg.ui line 158
- #: rc.cpp:449 rc.cpp:973
-@@ -1145,8 +1161,8 @@
- #: rc.cpp:452 rc.cpp:976
- #, no-c-format
- msgid ""
--"This is what the currently configured icon for this news source looks like. To "
--"change this icon, use the input field at the left."
-+"This is what the currently configured icon for this news source looks like. "
-+"To change this icon, use the input field at the left."
- msgstr "這是目前所設定的圖示。要變更圖示，請在左方欄位輸入。"
- 
- #. i18n: file newssourcedlg.ui line 169
-@@ -1166,14 +1182,14 @@
- #, no-c-format
- msgid ""
- "Here you can specify into which category this news source belongs. Arranging "
--"the news sources into categories makes it much easier to maintain large lists "
--"of news sources."
--"<br>Note that you can also use the button at the bottom right labeled <i>"
--"Suggest</i> to let KNewsTicker fill this field automatically, after you have "
--"entered a source file above."
-+"the news sources into categories makes it much easier to maintain large "
-+"lists of news sources.<br>Note that you can also use the button at the "
-+"bottom right labeled <i>Suggest</i> to let KNewsTicker fill this field "
-+"automatically, after you have entered a source file above."
- msgstr ""
--"您可以指定這個新聞來源是屬於哪個類別。這樣能讓您方便管理許多新聞來源站台。"
--"<br> 注意，在您輸入新聞來源檔案之後，您也可以用底下的「建議」鍵來讓 KNewsTicker 自動填入這個欄位。"
-+"您可以指定這個新聞來源是屬於哪個類別。這樣能讓您方便管理許多新聞來源站臺。"
-+"<br> 注意，在您輸入新聞來源檔案之後，您也可以用底下的「建議」鍵來讓 "
-+"KNewsTicker 自動填入這個欄位。"
- 
- #. i18n: file newssourcedlg.ui line 208
- #: rc.cpp:470 rc.cpp:994
-@@ -1191,14 +1207,15 @@
- #: rc.cpp:476 rc.cpp:482 rc.cpp:1000 rc.cpp:1006
- #, no-c-format
- msgid ""
--"This option lets you define how many articles KNewsTicker should cache for this "
--"news source. This value will never be exceeded."
--"<br>Note that you can also use the button at the bottom right labeled <i>"
--"Suggest</i> to let KNewsTicker fill this field automatically, after you have "
--"entered a source file above."
-+"This option lets you define how many articles KNewsTicker should cache for "
-+"this news source. This value will never be exceeded.<br>Note that you can "
-+"also use the button at the bottom right labeled <i>Suggest</i> to let "
-+"KNewsTicker fill this field automatically, after you have entered a source "
-+"file above."
- msgstr ""
--"這個選項讓您決定 KNewsTicker 要為這個新聞站台保留多少文章。"
--"<br> 注意，在您輸入新聞來源檔案之後，您也可以用底下的「建議」鍵來讓 KNewsTicker 自動填入這個欄位。"
-+"這個選項讓您決定 KNewsTicker 要為這個新聞站臺保留多少文章。<br> 注意，在您輸"
-+"入新聞來源檔案之後，您也可以用底下的「建議」鍵來讓 KNewsTicker 自動填入這個欄"
-+"位。"
- 
- #. i18n: file newssourcedlg.ui line 242
- #: rc.cpp:485 rc.cpp:1009
-@@ -1217,10 +1234,12 @@
- #, no-c-format
- msgid ""
- "Check this box to tell KNewsTicker that the file you specified in the above "
--"input field labeled <i>Source file</i> is a program and not a RDF or RSS file. "
--"KNewsTicker will then process the output (as received on <i>stdout</i>"
--") of that program."
--msgstr "如果您指定的來源檔案是支程式，而不是 RDF 或 RSS 檔案，KNewsTicker 會處理此程式的輸出。"
-+"input field labeled <i>Source file</i> is a program and not a RDF or RSS "
-+"file. KNewsTicker will then process the output (as received on <i>stdout</"
-+"i>) of that program."
-+msgstr ""
-+"如果您指定的來源檔案是支程式，而不是 RDF 或 RSS 檔案，KNewsTicker 會處理此程"
-+"式的輸出。"
- 
- #. i18n: file newssourcedlg.ui line 272
- #: rc.cpp:503 rc.cpp:1027
-@@ -1251,11 +1270,13 @@
- #: rc.cpp:515 rc.cpp:1039
- #, no-c-format
- msgid ""
--"Press this button to make KNewsTicker guess more or less reasonable values for "
--"some of the news properties (such as the name, icon or maximum number of "
--"articles)."
--"<br>Note that you have to supply a source file in order to use this function."
--msgstr "這個按鈕會請 KNewsTicker 對一些新聞來源內容的欄位提供建議值。<br> 不過您必須先指定一個來源檔案。"
-+"Press this button to make KNewsTicker guess more or less reasonable values "
-+"for some of the news properties (such as the name, icon or maximum number of "
-+"articles).<br>Note that you have to supply a source file in order to use "
-+"this function."
-+msgstr ""
-+"這個按鈕會請 KNewsTicker 對一些新聞來源內容的欄位提供建議值。<br> 不過您必須"
-+"先指定一個來源檔案。"
- 
- #. i18n: file newssourcedlg.ui line 306
- #: rc.cpp:521 rc.cpp:1045
-@@ -1267,21 +1288,21 @@
- #: rc.cpp:524 rc.cpp:1048
- #, no-c-format
- msgid ""
--"Press this button to apply the values of this dialog and return to the previous "
--"configuration dialog."
-+"Press this button to apply the values of this dialog and return to the "
-+"previous configuration dialog."
- msgstr "按下此鍵就會套用這些值並回到前一個設定視窗。"
- 
- #. i18n: file kntsrcfilepropsdlg/kntsrcfilepropsdlgwidget.ui line 64
- #: rc.cpp:1051
- #, no-c-format
- msgid "Icon of this news site"
--msgstr "新聞站台的圖示"
-+msgstr "新聞站臺的圖示"
- 
- #. i18n: file kntsrcfilepropsdlg/kntsrcfilepropsdlgwidget.ui line 67
- #: rc.cpp:1054
- #, no-c-format
- msgid "Here you can see the icon of this news site."
--msgstr "您可以看到這個新聞站台的圖示。"
-+msgstr "您可以看到這個新聞站臺的圖示。"
- 
- #. i18n: file kntsrcfilepropsdlg/kntsrcfilepropsdlgwidget.ui line 75
- #: rc.cpp:1057
-@@ -1305,14 +1326,14 @@
- #: rc.cpp:1066 rc.cpp:1081
- #, no-c-format
- msgid "Brief description of the news site"
--msgstr "這個新聞站台的簡短描述"
-+msgstr "這個新聞站臺的簡短描述"
- 
- #. i18n: file kntsrcfilepropsdlg/kntsrcfilepropsdlgwidget.ui line 92
- #: rc.cpp:1069 rc.cpp:1084
- #, no-c-format
- msgid ""
- "Here you can see a brief description about the news site and its contents."
--msgstr "您可以在這裡看到這個新聞站台的簡短描述及其內容。"
-+msgstr "您可以在這裡看到這個新聞站臺的簡短描述及其內容。"
- 
- #. i18n: file kntsrcfilepropsdlg/kntsrcfilepropsdlgwidget.ui line 100
- #: rc.cpp:1072
-@@ -1324,13 +1345,13 @@
- #: rc.cpp:1075
- #, no-c-format
- msgid "Name of the news site"
--msgstr "新聞站台的名稱"
-+msgstr "新聞站臺的名稱"
- 
- #. i18n: file kntsrcfilepropsdlg/kntsrcfilepropsdlgwidget.ui line 109
- #: rc.cpp:1078
- #, no-c-format
- msgid "This is the name of the news site."
--msgstr "新聞站台的名稱"
-+msgstr "新聞站臺的名稱"
- 
- #. i18n: file kntsrcfilepropsdlg/kntsrcfilepropsdlgwidget.ui line 167
- #: rc.cpp:1087
-@@ -1348,19 +1369,23 @@
- #: rc.cpp:1093
- #, no-c-format
- msgid ""
--"This list shows the headlines and links to the corresponding complete articles "
--"which have been stored in the source file whose properties you are watching."
-+"This list shows the headlines and links to the corresponding complete "
-+"articles which have been stored in the source file whose properties you are "
-+"watching."
- msgstr "這個列表顯示您設定的來源檔案中所有的文章標題與連結。"
- 
- #. i18n: file kntsrcfilepropsdlg/kntsrcfilepropsdlgwidget.ui line 192
- #: rc.cpp:1099
- #, no-c-format
- msgid ""
--"This list shows the headlines and links to the corresponding complete articles "
--"which have been stored in the source file whose properties you are watching."
--"<p>You can open the corresponding full article for each headline by, depending "
--"on the global KDE settings, clicking or double-clicking on a headline"
--msgstr "這個列表顯示您設定的來源檔案中所有的文章標題與連結。 <p>您可以點選文章標題，開啟該篇文章。"
-+"This list shows the headlines and links to the corresponding complete "
-+"articles which have been stored in the source file whose properties you are "
-+"watching.<p>You can open the corresponding full article for each headline "
-+"by, depending on the global KDE settings, clicking or double-clicking on a "
-+"headline"
-+msgstr ""
-+"這個列表顯示您設定的來源檔案中所有的文章標題與連結。 <p>您可以點選文章標題，"
-+"開啟該篇文章。"
- 
- #: common/newsengine.cpp:74
- msgid "Arts"
-@@ -1416,8 +1441,8 @@
- 
- #: common/newsengine.cpp:219
- msgid ""
--"<p>The program '%1' was terminated abnormally."
--"<br>This can happen if it receives the SIGKILL signal.</p>"
-+"<p>The program '%1' was terminated abnormally.<br>This can happen if it "
-+"receives the SIGKILL signal.</p>"
- msgstr "<p>程式 %1 不正常中止。<br> 這可能是收到了SIGKILL 的訊號。</P>"
- 
- #: common/newsengine.cpp:234
-@@ -1438,8 +1463,8 @@
- 
- #: common/newsengine.cpp:251
- msgid ""
--"The program '%1' tried to read or write a file or directory which could not be "
--"found."
-+"The program '%1' tried to read or write a file or directory which could not "
-+"be found."
- msgstr "程式 %1 嘗試讀取或寫入檔案或目錄，但是找不到。"
- 
- #: common/newsengine.cpp:253
-@@ -1448,8 +1473,8 @@
- 
- #: common/newsengine.cpp:255
- msgid ""
--"The program '%1' was passed too many arguments. Please adjust the command line "
--"in the configuration dialog."
-+"The program '%1' was passed too many arguments. Please adjust the command "
-+"line in the configuration dialog."
- msgstr "程式 %1 傳遞過多的參數，請在設定對話框中調整適當的命令。"
- 
- #: common/newsengine.cpp:257
-@@ -1479,14 +1504,14 @@
- 
- #: common/newsengine.cpp:267
- msgid ""
--"The program '%1' tried to call a function which is not implemented or attempted "
--"to access an external resource which does not exist."
-+"The program '%1' tried to call a function which is not implemented or "
-+"attempted to access an external resource which does not exist."
- msgstr "程式 %1 嘗試呼叫一個沒有被實作的函數或是企圖存取外部不存在的資源。"
- 
- #: common/newsengine.cpp:270
- msgid ""
--"The program '%1' was unable to retrieve input data and was therefore unable to "
--"return any XML data."
-+"The program '%1' was unable to retrieve input data and was therefore unable "
-+"to return any XML data."
- msgstr "程式 %1 無法取回輸入資料，因此無法轉換成任何的XML資料。"
- 
- #: common/newsengine.cpp:272
-@@ -1501,8 +1526,8 @@
- #: common/newsengine.cpp:276
- msgid ""
- "The program '%1' requires you to configure a destination address to retrieve "
--"data from. Please refer to the documentation of the program for information on "
--"how to do that."
-+"data from. Please refer to the documentation of the program for information "
-+"on how to do that."
- msgstr "程式 %1 要求您設定要取得的資料的目標位址。請查閱程式文件的相關資訊。"
- 
- #: common/newsengine.cpp:279
-@@ -1517,8 +1542,8 @@
- 
- #: common/newsengine.cpp:283
- msgid ""
--"The network the program '%1' was trying to access dropped the connection with a "
--"reset."
-+"The network the program '%1' was trying to access dropped the connection "
-+"with a reset."
- msgstr "程式 %1 嘗試存取被中斷並重置的連線。"
- 
- #: common/newsengine.cpp:285
-@@ -1539,26 +1564,24 @@
- 
- #: common/newsengine.cpp:293
- msgid ""
--"The host the program '%1' was trying to reach is unreachable, no route to host."
-+"The host the program '%1' was trying to reach is unreachable, no route to "
-+"host."
- msgstr "程式 %1 嘗試聯繫的主機無法到達，沒有路由到主機。"
- 
- #: common/newsengine.cpp:295
- msgid ""
--"KNewsTicker could not execute the program '%1' because its executable bit was "
--"not set. You can mark that program as executable by executing the following "
--"steps:"
--"<ul>"
--"<li>Open a Konqueror window and browse to the program</li>"
--"<li>Click on the file with the right mouse button, and select 'Properties'</li>"
--"<li>Open the 'Permissions' tab and make sure that the box in the column 'Exec' "
--"and the row 'User' is checked to ensure that the current user is allowed to "
--"execute that file.</li></ul>"
--msgstr ""
--"KNewsTicker 無法執行程式 %1，因為沒有設定可執行位元。您可以依以下的步驟開啟此程式的執行位元："
--"<ul>"
--"<li>開啟Konqueror視窗並瀏覽此程式</li>"
--"<li>用滑鼠右鍵點擊此檔案，並選擇「屬性」</li>"
--"<li>打開「權限」的標籤並在「使用者」列勾選「執行」（Exec），以允許使用者可以執行此檔。</li></ul>"
-+"KNewsTicker could not execute the program '%1' because its executable bit "
-+"was not set. You can mark that program as executable by executing the "
-+"following steps:<ul><li>Open a Konqueror window and browse to the program</"
-+"li><li>Click on the file with the right mouse button, and select "
-+"'Properties'</li><li>Open the 'Permissions' tab and make sure that the box "
-+"in the column 'Exec' and the row 'User' is checked to ensure that the "
-+"current user is allowed to execute that file.</li></ul>"
-+msgstr ""
-+"KNewsTicker 無法執行程式 %1，因為沒有設定可執行位元。您可以依以下的步驟開啟此"
-+"程式的執行位元：<ul><li>開啟Konqueror視窗並瀏覽此程式</li><li>用滑鼠右鍵點擊"
-+"此檔案，並選擇「屬性」</li><li>打開「權限」的標籤並在「使用者」列勾選「執行」"
-+"（Exec），以允許使用者可以執行此檔。</li></ul>"
- 
- #: common/newsengine.cpp:303
- msgid ""
-@@ -1567,8 +1590,8 @@
- 
- #: common/newsengine.cpp:305
- msgid ""
--"The program '%1' failed to issue an authorization for an area which needs some "
--"form of authorization before it can be accessed."
-+"The program '%1' failed to issue an authorization for an area which needs "
-+"some form of authorization before it can be accessed."
- msgstr "程式 %1 請求認證時失敗。"
- 
- #: common/newsengine.cpp:308
-@@ -1591,8 +1614,8 @@
- 
- #: common/newsengine.cpp:315
- msgid ""
--"A server error has been encountered. It is likely that you cannot do anything "
--"about it."
-+"A server error has been encountered. It is likely that you cannot do "
-+"anything about it."
- msgstr "伺服器遇到錯誤。你似乎無法做任何相關它的事。"
- 
- #: common/newsengine.cpp:317
-diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdenetwork/kopete.po kde-i18n-zh_TW-3.5.10/messages/kdenetwork/kopete.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdenetwork/kopete.po	2008-08-19 20:43:21.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdenetwork/kopete.po	2011-11-11 15:45:17.000000000 +0100
-@@ -9,7 +9,7 @@
- "Project-Id-Version: kopete\n"
- "POT-Creation-Date: 2008-07-08 01:20+0200\n"
- "PO-Revision-Date: 2008-02-04 08:21+0800\n"
--"Last-Translator: Franklin Weng <franklin at goodhorse dot idv dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Chinese Traditional <zh-l10n@linux.org.tw>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
-@@ -54,11 +54,11 @@
- 
- #: libkopete/ui/contactaddednotifydialog.cpp:73
- msgid ""
--"<qt><img src=\"kopete-account-icon:%1\" /> The contact <b>%2</b> "
--"has added you to his/her contactlist. (Account %3)</qt>"
-+"<qt><img src=\"kopete-account-icon:%1\" /> The contact <b>%2</b> has added "
-+"you to his/her contactlist. (Account %3)</qt>"
- msgstr ""
--"<qt><img src=\"kopete-account-icon:%1\" />聯絡人 <b>%2 </b>"
--"已將您加入他的聯絡人清單中（帳號 %3）</qt>"
-+"<qt><img src=\"kopete-account-icon:%1\" />聯絡人 <b>%2 </b>已將您加入他的聯絡"
-+"人清單中（帳號 %3）</qt>"
- 
- #. i18n: file ./libkopete/ui/addressbookselectorwidget_base.ui line 99
- #: libkopete/ui/addressbookselectorwidget.cpp:77
-@@ -133,15 +133,15 @@
- 
- #: libkopete/ui/kopetestdaction.cpp:43
- msgid "&Configure Kopete..."
--msgstr "設定 Kopete(&C)..."
-+msgstr "設定 Kopete(&C)…"
- 
- #: libkopete/ui/kopetestdaction.cpp:73
- msgid "Start &Chat..."
--msgstr "開始聊天(&C)..."
-+msgstr "開始聊天(&C)…"
- 
- #: libkopete/ui/kopetestdaction.cpp:78
- msgid "&Send Single Message..."
--msgstr "傳送單一訊息(&S)..."
-+msgstr "傳送單一訊息(&S)…"
- 
- #. i18n: file ./protocols/msn/ui/msneditaccountui.ui line 515
- #: libkopete/ui/kopetestdaction.cpp:83 rc.cpp:2447
-@@ -151,19 +151,19 @@
- 
- #: libkopete/ui/kopetestdaction.cpp:88
- msgid "Send &File..."
--msgstr "傳送檔案(&F)..."
-+msgstr "傳送檔案(&F)…"
- 
- #: libkopete/ui/kopetestdaction.cpp:93
- msgid "View &History..."
--msgstr "檢視歷史記錄(&H)..."
-+msgstr "檢視歷史記錄(&H)…"
- 
- #: libkopete/ui/kopetestdaction.cpp:98
- msgid "&Create Group..."
--msgstr "建立新群組(&C)..."
-+msgstr "建立新群組(&C)…"
- 
- #: libkopete/ui/kopetestdaction.cpp:103
- msgid "Cha&nge Meta Contact..."
--msgstr "變更整合聯絡人(&N)..."
-+msgstr "變更整合聯絡人(&N)…"
- 
- #: libkopete/ui/kopetestdaction.cpp:108
- msgid "&Delete Contact"
-@@ -171,7 +171,7 @@
- 
- #: libkopete/ui/kopetestdaction.cpp:113
- msgid "Change A&lias..."
--msgstr "變更別名(&L)..."
-+msgstr "變更別名(&L)…"
- 
- #: libkopete/ui/kopetestdaction.cpp:118
- msgid "&Block Contact"
-@@ -285,8 +285,8 @@
- 
- #: libkopete/kopetetransfermanager.cpp:258
- msgid ""
--"Sorry, sending files which are not stored locally is not yet supported by this "
--"protocol.\n"
-+"Sorry, sending files which are not stored locally is not yet supported by "
-+"this protocol.\n"
- "Please copy this file to your computer and try again."
- msgstr ""
- "抱歉，目前此協定尚未支援傳送非本地端檔案。\n"
-@@ -327,8 +327,8 @@
- 
- #: libkopete/kopetechatsession.cpp:451
- msgid ""
--"<qt>An error has occurred while creating a new chat window. The chat window has "
--"not been created.</qt>"
-+"<qt>An error has occurred while creating a new chat window. The chat window "
-+"has not been created.</qt>"
- msgstr "<qt>產生新的聊天視窗時發生錯誤。此視窗無法建立。</qt>"
- 
- #: libkopete/kopetechatsession.cpp:452
-@@ -342,9 +342,9 @@
- 
- #: libkopete/connectionmanager.cpp:144
- msgid ""
--"A network connection was disconnected.  The application is now in offline mode. "
--" Do you want the application to resume network operations when the network is "
--"available again?"
-+"A network connection was disconnected.  The application is now in offline "
-+"mode.  Do you want the application to resume network operations when the "
-+"network is available again?"
- msgstr "網路連線已中斷。應用程式目前為離線狀態。您要在網路恢復時恢復連線嗎？"
- 
- #: libkopete/connectionmanager.cpp:145
-@@ -353,8 +353,8 @@
- 
- #: libkopete/connectionmanager.cpp:147
- msgid ""
--"This application is currently in offline mode.  Do you want to connect in order "
--"to carry out this operation?"
-+"This application is currently in offline mode.  Do you want to connect in "
-+"order to carry out this operation?"
- msgstr "應用程式目前在離線模式。您要連線以執行此命令嗎？"
- 
- #: libkopete/connectionmanager.cpp:148
-@@ -387,7 +387,8 @@
- "connect with the same account from another location. Try connecting again "
- "later."
- msgstr ""
--"Kopete 失去了與此即時訊息系統溝通的頻道。這有可能是因為您的網路連線已中斷，服務遇到問題，或是另外有人使用此帳號連線到此服務。請稍候再試。"
-+"Kopete 失去了與此即時訊息系統溝通的頻道。這有可能是因為您的網路連線已中斷，服"
-+"務遇到問題，或是另外有人使用此帳號連線到此服務。請稍候再試。"
- 
- #: libkopete/kopeteutils.cpp:42
- msgid "Can't connect with the instant messaging server or peers."
-@@ -408,7 +409,7 @@
- 
- #: libkopete/kopeteutils.cpp:55
- msgid "More Information..."
--msgstr "更多資訊..."
-+msgstr "更多資訊…"
- 
- #: libkopete/kopeteaccount.cpp:142
- msgid "You have been disconnected"
-@@ -416,7 +417,7 @@
- 
- #: libkopete/kopeteaccount.cpp:142
- msgid "You have connected from another client or computer to the account '%1'"
--msgstr "您已經在另一台電腦使用帳號 %1 連線了。"
-+msgstr "您已經在另一臺電腦使用帳號 %1 連線了。"
- 
- #: libkopete/kopeteaccount.cpp:142
- msgid ""
-@@ -425,13 +426,13 @@
- "permission. If you need a service that supports connection from various "
- "locations at the same time, use the Jabber protocol."
- msgstr ""
--"大部份即時訊息服務都不允許一個帳號同時在兩處連線。請確認您的帳號沒有別人在使用。如果您必須要使用一個可以接受同時由多處連線的即時訊息系統，請改用 "
--"Jabber。"
-+"大部份即時訊息服務都不允許一個帳號同時在兩處連線。請確認您的帳號沒有別人在使"
-+"用。如果您必須要使用一個可以接受同時由多處連線的即時訊息系統，請改用 Jabber。"
- 
- #: libkopete/kopeteaccount.cpp:258 libkopete/kopeteaccount.cpp:324
- msgid ""
--"You are not allowed to add yourself to the contact list. The addition of \"%1\" "
--"to account \"%2\" will not take place."
-+"You are not allowed to add yourself to the contact list. The addition of \"%1"
-+"\" to account \"%2\" will not take place."
- msgstr "您不能將自己加入聯絡人清單中。將 %1 加入帳號 %2 無效。"
- 
- #: libkopete/kopeteaccount.cpp:258 libkopete/kopeteaccount.cpp:324
-@@ -454,7 +455,7 @@
- 
- #: libkopete/kopeteawayaction.cpp:86
- msgid "New Message..."
--msgstr "新的訊息..."
-+msgstr "新的訊息…"
- 
- #: libkopete/kopeteawayaction.cpp:113
- msgid "New Away Message"
-@@ -483,8 +484,8 @@
- 
- #: libkopete/kopetemimetypehandler.cpp:157
- msgid ""
--"<qt>Unable to download the requested file;"
--"<br>please check that address %1 is correct.</qt>"
-+"<qt>Unable to download the requested file;<br>please check that address %1 "
-+"is correct.</qt>"
- msgstr "<qt>無法下載要求的檔案。<br> 請檢查位址 %1 是否正確。</qt>"
- 
- #: libkopete/kabcpersistence.cpp:294
-@@ -497,15 +498,12 @@
- 
- #: libkopete/kabcpersistence.cpp:342
- msgid ""
--"<qt>An address was added to this contact by another application."
--"<br>Would you like to use it in Kopete?"
--"<br><b>Protocol:</b> %1"
--"<br><b>Address:</b> %2</qt>"
--msgstr ""
--"<qt>有另一個應用程式對這個聯絡人新增了一個地址。"
--"<br> 您要在 Kopete 使用嗎？"
--"<br> <b>協定：</b>%1"
--"<br> <b>地址：</b>%2</qt>"
-+"<qt>An address was added to this contact by another application.<br>Would "
-+"you like to use it in Kopete?<br><b>Protocol:</b> %1<br><b>Address:</b> %2</"
-+"qt>"
-+msgstr ""
-+"<qt>有另一個應用程式對這個聯絡人新增了一個地址。<br> 您要在 Kopete 使用嗎？"
-+"<br> <b>協定：</b>%1<br> <b>地址：</b>%2</qt>"
- 
- #: libkopete/kabcpersistence.cpp:342
- msgid "Import Address From Address Book"
-@@ -523,9 +521,12 @@
- 
- #: libkopete/kabcpersistence.cpp:356
- msgid ""
--"<qt>One or more of your accounts using %1 are offline.  Most systems have to be "
--"connected to add contacts.  Please connect these accounts and try again.</qt>"
--msgstr "<qt>您使用的帳號 %1 在離線模式。大部份的系統都要先連線才能新增聯絡人。請先連線後再嚐試。</qt>"
-+"<qt>One or more of your accounts using %1 are offline.  Most systems have to "
-+"be connected to add contacts.  Please connect these accounts and try again.</"
-+"qt>"
-+msgstr ""
-+"<qt>您使用的帳號 %1 在離線模式。大部份的系統都要先連線才能新增聯絡人。請先連"
-+"線後再嚐試。</qt>"
- 
- #: libkopete/kabcpersistence.cpp:357 protocols/gadu/gadusession.cpp:217
- #: protocols/gadu/gadusession.cpp:230 protocols/gadu/gadusession.cpp:242
-@@ -541,9 +542,10 @@
- 
- #: libkopete/kabcpersistence.cpp:381
- msgid ""
--"<qt>You do not have an account configured for <b>%1</b> "
--"yet.  Please create an account, connect it, and try again.</qt>"
--msgstr "<qt>您沒有建立帳號，無法設定 <b>%1</b>。請先建立帳號，連線後再嚐試。</qt>"
-+"<qt>You do not have an account configured for <b>%1</b> yet.  Please create "
-+"an account, connect it, and try again.</qt>"
-+msgstr ""
-+"<qt>您沒有建立帳號，無法設定 <b>%1</b>。請先建立帳號，連線後再嚐試。</qt>"
- 
- #: libkopete/kabcpersistence.cpp:382
- msgid "No Account Found"
-@@ -563,7 +565,9 @@
- "This user is not reachable at the moment. Please make sure you are connected "
- "and using a protocol that supports offline sending, or wait until this user "
- "comes online."
--msgstr "目前無法聯繫此使用者。請確認您已連線，並且是使用支援離線傳送訊息的協定，或是等待該使用者上線。"
-+msgstr ""
-+"目前無法聯繫此使用者。請確認您已連線，並且是使用支援離線傳送訊息的協定，或是"
-+"等待該使用者上線。"
- 
- #: libkopete/kopetecontact.cpp:453 libkopete/kopetemetacontact.cpp:346
- #: libkopete/kopetemetacontact.cpp:364 libkopete/kopetemetacontact.cpp:440
-@@ -585,8 +589,8 @@
- 
- #: libkopete/kopetepasswordedaccount.cpp:83
- msgid ""
--"<b>The password was wrong;</b> please re-enter your password for %1 account <b>"
--"%2</b>"
-+"<b>The password was wrong;</b> please re-enter your password for %1 account "
-+"<b>%2</b>"
- msgstr "<b>密碼錯了；</b>請重新輸入 %1 帳號 <b>%2</b> 的密碼。"
- 
- #: libkopete/kopetepasswordedaccount.cpp:85
-@@ -595,8 +599,8 @@
- 
- #: libkopete/kopetecommandhandler.cpp:107
- msgid ""
--"USAGE: /help [<command>] - Used to list available commands, or show help for a "
--"specified command."
-+"USAGE: /help [<command>] - Used to list available commands, or show help for "
-+"a specified command."
- msgstr "用法：/help [<命令>] －用來列出可用的命令，或是顯示指定命令的說明。"
- 
- #: libkopete/kopetecommandhandler.cpp:110
-@@ -613,7 +617,8 @@
- 
- #: libkopete/kopetecommandhandler.cpp:123
- msgid ""
--"USAGE: /away [<reason>] - Marks you as away/back for the current account only."
-+"USAGE: /away [<reason>] - Marks you as away/back for the current account "
-+"only."
- msgstr "用法：/away [<理由>] －標示您離開／回來了（僅限目前的帳號）。"
- 
- #: libkopete/kopetecommandhandler.cpp:126
-@@ -622,22 +627,24 @@
- 
- #: libkopete/kopetecommandhandler.cpp:129
- msgid ""
--"USAGE: /say <text> - Say text in this chat. This is the same as just typing a "
--"message, but is very useful for scripts."
--msgstr "用法：/say <文字> －在聊天中發言。這跟直接鍵入訊息一樣，但寫 script 時很有用。"
-+"USAGE: /say <text> - Say text in this chat. This is the same as just typing "
-+"a message, but is very useful for scripts."
-+msgstr ""
-+"用法：/say <文字> －在聊天中發言。這跟直接鍵入訊息一樣，但寫 script 時很有"
-+"用。"
- 
- #: libkopete/kopetecommandhandler.cpp:133
- msgid ""
--"USAGE: /exec [-o] <command> - Executes the specified command and displays the "
--"output in the chat buffer. If -o is specified, the output is sent to all "
-+"USAGE: /exec [-o] <command> - Executes the specified command and displays "
-+"the output in the chat buffer. If -o is specified, the output is sent to all "
- "members of the chat."
--msgstr "用法：/exec [-o] <命令> －執行指定的命令，並將結果顯示在聊天緩衝區中。如果加上 -o，結果會傳送給聊天中的所有成員。"
-+msgstr ""
-+"用法：/exec [-o] <命令> －執行指定的命令，並將結果顯示在聊天緩衝區中。如果加"
-+"上 -o，結果會傳送給聊天中的所有成員。"
- 
- #: libkopete/kopetecommandhandler.cpp:236
--msgid ""
--"Available Commands:\n"
--msgstr ""
--"可用命令：\n"
-+msgid "Available Commands:\n"
-+msgstr "可用命令：\n"
- 
- #: libkopete/kopetecommandhandler.cpp:249
- msgid ""
-@@ -653,8 +660,8 @@
- 
- #: libkopete/kopetecommandhandler.cpp:304
- msgid ""
--"ERROR: Shell access has been restricted on your system. The /exec command will "
--"not function."
-+"ERROR: Shell access has been restricted on your system. The /exec command "
-+"will not function."
- msgstr "錯誤：您的系統限制了 shell 的存取。/exec 命令將沒有作用。"
- 
- #: libkopete/kopetepassword.cpp:181
-@@ -663,10 +670,12 @@
- 
- #: libkopete/kopetepassword.cpp:293
- msgid ""
--"<qt>Kopete is unable to save your password securely in your wallet;"
--"<br>do you want to save the password in the <b>unsafe</b> "
--"configuration file instead?</qt>"
--msgstr "<qt>Kopete 無法在您的錢包中安全儲存您的密碼。<br> 您要將密碼儲存在（不安全的）設定檔中嗎？</qt>"
-+"<qt>Kopete is unable to save your password securely in your wallet;<br>do "
-+"you want to save the password in the <b>unsafe</b> configuration file "
-+"instead?</qt>"
-+msgstr ""
-+"<qt>Kopete 無法在您的錢包中安全儲存您的密碼。<br> 您要將密碼儲存在（不安全"
-+"的）設定檔中嗎？</qt>"
- 
- #: libkopete/kopetepassword.cpp:295
- msgid "Unable to Store Secure Password"
-@@ -707,8 +716,9 @@
- 
- #: libkopete/kopetecontact.cpp:280
- msgid ""
--"If you select this option, a new metacontact will be created in the top-level "
--"group with the name of this contact and the contact will be moved to it."
-+"If you select this option, a new metacontact will be created in the top-"
-+"level group with the name of this contact and the contact will be moved to "
-+"it."
- msgstr "選取此選項的話，會在頂層建立一個新的整合聯絡人群組，並將該聯絡人移入。"
- 
- #: libkopete/kopetecontact.cpp:315
-@@ -725,9 +735,11 @@
- 
- #: libkopete/kopetecontact.cpp:452
- msgid ""
--"This user is not reachable at the moment. Please try a protocol that supports "
--"offline sending, or wait until this user comes online."
--msgstr "目前無法聯繫此使用者。請確認您使用支援離線傳送訊息的協定，或是等待該使用者上線。"
-+"This user is not reachable at the moment. Please try a protocol that "
-+"supports offline sending, or wait until this user comes online."
-+msgstr ""
-+"目前無法聯繫此使用者。請確認您使用支援離線傳送訊息的協定，或是等待該使用者上"
-+"線。"
- 
- #: libkopete/kopetecontact.cpp:460
- msgid ""
-@@ -741,53 +753,44 @@
- 
- #: libkopete/kopetecontact.cpp:658
- msgid ""
--"_: <b>DISPLAY NAME</b>"
--"<br><img src=\"%2\">&nbsp;CONTACT STATUS\n"
--"<b><nobr>%3</nobr></b>"
--"<br><img src=\"%2\">&nbsp;%1"
-+"_: <b>DISPLAY NAME</b><br><img src=\"%2\">&nbsp;CONTACT STATUS\n"
-+"<b><nobr>%3</nobr></b><br><img src=\"%2\">&nbsp;%1"
- msgstr "<b><nobr>%3</nobr></b><br><img src=\"%2\">&nbsp;%1"
- 
- #: libkopete/kopetecontact.cpp:665
- msgid ""
--"_: <b>DISPLAY NAME</b> (CONTACT ID)"
--"<br><img src=\"%2\">&nbsp;CONTACT STATUS\n"
--"<nobr><b>%4</b> (%3)</nobr>"
--"<br><img src=\"%2\">&nbsp;%1"
-+"_: <b>DISPLAY NAME</b> (CONTACT ID)<br><img src=\"%2\">&nbsp;CONTACT STATUS\n"
-+"<nobr><b>%4</b> (%3)</nobr><br><img src=\"%2\">&nbsp;%1"
- msgstr "<nobr><b>%4</b> (%3)</nobr><br><img src=\"%2\">&nbsp;%1"
- 
- #: libkopete/kopetecontact.cpp:682
- msgid ""
--"_: "
--"<br><b>Full Name:</b>&nbsp;FORMATTED NAME\n"
-+"_: <br><b>Full Name:</b>&nbsp;FORMATTED NAME\n"
- "<br><b>Full Name:</b>&nbsp;<nobr>%1</nobr>"
- msgstr "<br><b>完整名稱：</b>&nbsp;<nobr>%1</nobr>"
- 
- #: libkopete/kopetecontact.cpp:691
- msgid ""
--"_: "
--"<br><b>Idle:</b>&nbsp;FORMATTED IDLE TIME\n"
-+"_: <br><b>Idle:</b>&nbsp;FORMATTED IDLE TIME\n"
- "<br><b>Idle:</b>&nbsp;<nobr>%1</nobr>"
- msgstr "<br><b>閒置：</b>&nbsp;<nobr>%1</nobr>"
- 
- #: libkopete/kopetecontact.cpp:700
- msgid ""
--"_: "
--"<br><b>Home Page:</b>&nbsp;FORMATTED URL\n"
-+"_: <br><b>Home Page:</b>&nbsp;FORMATTED URL\n"
- "<br><b>Home Page:</b>&nbsp;<a href=\"%1\"><nobr>%2</nobr></a>"
- msgstr "<br><b>個人首頁：</b>&nbsp;<a href=\"%1\"><nobr>%2</nobr></a>"
- 
- #: libkopete/kopetecontact.cpp:710
- #, c-format
- msgid ""
--"_: "
--"<br><b>Away Message:</b>&nbsp;FORMATTED AWAY MESSAGE\n"
-+"_: <br><b>Away Message:</b>&nbsp;FORMATTED AWAY MESSAGE\n"
- "<br><b>Away&nbsp;Message:</b>&nbsp;%1"
- msgstr "<br><b>離開訊息：</b>&nbsp;%1"
- 
- #: libkopete/kopetecontact.cpp:747
- msgid ""
--"_: "
--"<br><b>PROPERTY LABEL:</b>&nbsp;PROPERTY VALUE\n"
-+"_: <br><b>PROPERTY LABEL:</b>&nbsp;PROPERTY VALUE\n"
- "<br><nobr><b>%2:</b></nobr>&nbsp;%1"
- msgstr "<br><nobr><b>%2：</b></nobr>&nbsp;%1"
- 
-@@ -927,7 +930,7 @@
- 
- #: libkopete/kopeteglobal.cpp:238
- msgid "Installing Emoticon Themes..."
--msgstr "安裝新的表情圖示主題..."
-+msgstr "安裝新的表情圖示主題…"
- 
- #: libkopete/kopeteglobal.cpp:260
- msgid "Could not open \"%1\" for unpacking."
-@@ -961,8 +964,7 @@
- 
- #: kopete/systemtray.cpp:304
- msgid ""
--"<qt><nobr><b>New Message from %1:</b></nobr>"
--"<br><nobr>\"%2\"</nobr></qt>"
-+"<qt><nobr><b>New Message from %1:</b></nobr><br><nobr>\"%2\"</nobr></qt>"
- msgstr "<qt><nobr><b>來自%1的訊息：</b></nobr><br><nobr>%2</nobr></qt>"
- 
- #: kopete/kopetewindow.cpp:145
-@@ -986,7 +988,7 @@
- 
- #: kopete/kopetewindow.cpp:226
- msgid "&Export Contacts..."
--msgstr "匯出聯絡人(&E)..."
-+msgstr "匯出聯絡人(&E)…"
- 
- #: kopete/kopetewindow.cpp:240 protocols/groupwise/gwprotocol.cpp:54
- #: protocols/msn/msnprotocol.cpp:55 protocols/oscar/icq/icqpresence.cpp:75
-@@ -1020,11 +1022,11 @@
- 
- #: kopete/kopetewindow.cpp:283
- msgid "Configure Plugins..."
--msgstr "設定外掛程式..."
-+msgstr "設定外掛程式…"
- 
- #: kopete/kopetewindow.cpp:285
- msgid "Configure &Global Shortcuts..."
--msgstr "設定全域快速鍵(&G)..."
-+msgstr "設定全域快速鍵(&G)…"
- 
- #: kopete/kopetewindow.cpp:291
- msgid "Show Offline &Users"
-@@ -1072,7 +1074,7 @@
- 
- #: kopete/kopetewindow.cpp:316
- msgid "Edit Global Identity Widget"
--msgstr "編輯全域身份元件"
-+msgstr "編輯全域身分元件"
- 
- #: kopete/kopetewindow.cpp:320
- msgid "Set Status Message"
-@@ -1108,7 +1110,9 @@
- msgid ""
- "<qt>Closing the main window will keep Kopete running in the system tray. Use "
- "'Quit' from the 'File' menu to quit the application.</qt>"
--msgstr "<qt>關閉主視窗後，Kopete 會繼續在系統匣中執行。使用「檔案」選單中的「離開」來離開本程式。</qt>"
-+msgstr ""
-+"<qt>關閉主視窗後，Kopete 會繼續在系統匣中執行。使用「檔案」選單中的「離開」來"
-+"離開本程式。</qt>"
- 
- #: kopete/kopetewindow.cpp:630
- msgid "Docking in System Tray"
-@@ -1116,14 +1120,11 @@
- 
- #: kopete/kopetewindow.cpp:870
- msgid ""
--"_: Account tooltip information: <nobr>ICON <b>PROTOCOL:</b> NAME (<i>STATUS</i>"
--")"
--"<br/>\n"
--"<nobr><img src=\"kopete-account-icon:%3:%4\"> <b>%1:</b> %2 (<i>%5</i>)"
--"<br/>"
-+"_: Account tooltip information: <nobr>ICON <b>PROTOCOL:</b> NAME (<i>STATUS</"
-+"i>)<br/>\n"
-+"<nobr><img src=\"kopete-account-icon:%3:%4\"> <b>%1:</b> %2 (<i>%5</i>)<br/>"
- msgstr ""
--"<nobr><img src=\"kopete-account-icon:%3:%4\"> <b>%1:</b> %2 (<i>%5</i>)"
--"<br/>"
-+"<nobr><img src=\"kopete-account-icon:%3:%4\"> <b>%1:</b> %2 (<i>%5</i>)<br/>"
- 
- #: kopete/contactlist/kopetecontactlistview.cpp:1689
- #: kopete/kopetewindow.cpp:1059
-@@ -1132,9 +1133,11 @@
- 
- #: kopete/kimifaceimpl.cpp:383
- msgid ""
--"Another KDE application tried to use Kopete for instant messaging, but Kopete "
--"could not find the specified contact in the KDE address book."
--msgstr "另一個 KDE 程式試著使用 Kopete 做即時傳訊，但Kopete 在 KDE 通訊錄中找不到指定的聯絡人。"
-+"Another KDE application tried to use Kopete for instant messaging, but "
-+"Kopete could not find the specified contact in the KDE address book."
-+msgstr ""
-+"另一個 KDE 程式試著使用 Kopete 做即時傳訊，但Kopete 在 KDE 通訊錄中找不到指定"
-+"的聯絡人。"
- 
- #: kopete/contactlist/kopetecontactlistview.cpp:1451
- #: kopete/contactlist/kopetecontactlistview.cpp:1454
-@@ -1144,20 +1147,17 @@
- 
- #: kopete/kimifaceimpl.cpp:388
- msgid ""
--"_: Translators: %1 is the name of a person taken from the KDE address book, who "
--"Kopete doesn't know about.  Kopete must either be told that an existing contact "
--"in Kopete is this person, or add a new contact for them\n"
--"<qt>"
--"<p>The KDE Address Book has no instant messaging information for</p>"
--"<p><b>%1</b>.</p>"
--"<p>If he/she is already present in the Kopete contact list, indicate the "
--"correct addressbook entry in their properties.</p>"
--"<p>Otherwise, add a new contact using the Add Contact wizard.</p></qt>"
--msgstr ""
--"<qt> "
--"<p>KDE 通訊錄中沒有 <b>%1</b> 的即時訊息資訊。</p> "
--"<p>如果此人已經在 Kopete 的聯絡人清單中，請在該聯絡人的內容中設定其在通訊錄中的哪裡。</p> "
--"<p>否則，您可以使用新增聯絡人精靈來新增聯絡人。</p></qt>"
-+"_: Translators: %1 is the name of a person taken from the KDE address book, "
-+"who Kopete doesn't know about.  Kopete must either be told that an existing "
-+"contact in Kopete is this person, or add a new contact for them\n"
-+"<qt><p>The KDE Address Book has no instant messaging information for</"
-+"p><p><b>%1</b>.</p><p>If he/she is already present in the Kopete contact "
-+"list, indicate the correct addressbook entry in their properties.</"
-+"p><p>Otherwise, add a new contact using the Add Contact wizard.</p></qt>"
-+msgstr ""
-+"<qt> <p>KDE 通訊錄中沒有 <b>%1</b> 的即時訊息資訊。</p> <p>如果此人已經在 "
-+"Kopete 的聯絡人清單中，請在該聯絡人的內容中設定其在通訊錄中的哪裡。</p> <p>否"
-+"則，您可以使用新增聯絡人精靈來新增聯絡人。</p></qt>"
- 
- #: kopete/kimifaceimpl.cpp:390
- msgid "No Instant Messaging Address"
-@@ -1390,33 +1390,33 @@
- 
- #: kopete/config/identity/kopeteidentityconfig.cpp:416
- msgid "New Identity"
--msgstr "新身份"
-+msgstr "新身分"
- 
- #: kopete/config/identity/kopeteidentityconfig.cpp:416
- #: kopete/config/identity/kopeteidentityconfig.cpp:431
- #: kopete/config/identity/kopeteidentityconfig.cpp:456
- msgid "Identity name:"
--msgstr "身份名稱："
-+msgstr "身分名稱："
- 
- #: kopete/config/identity/kopeteidentityconfig.cpp:431
- msgid "Copy Identity"
--msgstr "複製身份"
-+msgstr "複製身分"
- 
- #: kopete/config/identity/kopeteidentityconfig.cpp:446
- #: kopete/config/identity/kopeteidentityconfig.cpp:474
- msgid "An identity with the same name was found."
--msgstr "已經有相同名稱的身份了。"
-+msgstr "已經有相同名稱的身分了。"
- 
- #: kopete/config/identity/kopeteidentityconfig.cpp:446
- #: kopete/config/identity/kopeteidentityconfig.cpp:474
- #: kopete/config/identity/kopeteidentityconfig.cpp:573
- #: kopete/config/identity/kopeteidentityconfig.cpp:582
- msgid "Identity Configuration"
--msgstr "身份設定"
-+msgstr "身分設定"
- 
- #: kopete/config/identity/kopeteidentityconfig.cpp:456
- msgid "Rename Identity"
--msgstr "重新命名身份"
-+msgstr "重新命名身分"
- 
- #: kopete/config/identity/kopeteidentityconfig.cpp:506
- msgid "Choose the person who is yourself."
-@@ -1425,11 +1425,11 @@
- #: kopete/config/identity/kopeteidentityconfig.cpp:572
- #: kopete/config/identity/kopeteidentityconfig.cpp:581
- msgid "An error occurred when trying to save the custom photo for %1 identity."
--msgstr "儲存身份 %1 的自訂相片時發生錯誤。"
-+msgstr "儲存身分 %1 的自訂相片時發生錯誤。"
- 
- #: kopete/config/identity/globalidentitiesmanager.cpp:164
- msgid "Default Identity"
--msgstr "預設身份"
-+msgstr "預設身分"
- 
- #: kopete/config/accounts/kopeteaccountconfig.cpp:234
- msgid "Are you sure you want to remove the account \"%1\"?"
-@@ -1641,9 +1641,10 @@
- #: kopete/config/appearance/appearanceconfig.cpp:826
- msgid ""
- "<qt>Are you sure you want to remove the <strong>%1</strong> emoticon theme?"
--"<br>"
--"<br>This will delete the files installed by this theme.</qt>"
--msgstr "<qt>您確定要移除表情圖示主題 <strong>%1</strong>？<br><br>這樣會刪除所有此主題安裝的檔案。</qt>"
-+"<br><br>This will delete the files installed by this theme.</qt>"
-+msgstr ""
-+"<qt>您確定要移除表情圖示主題 <strong>%1</strong>？<br><br>這樣會刪除所有此主"
-+"題安裝的檔案。</qt>"
- 
- #: kopete/config/appearance/appearanceconfig.cpp:832
- msgid "Confirmation"
-@@ -1670,7 +1671,8 @@
- msgid ""
- "An external application is attempting to add the  '%1' contact '%2' to your "
- "contact list. Do you want to allow this?"
--msgstr "有外部應用程式試著要將協定 %1 的聯絡人 %2 加入您的聯絡人清單中。您同意嗎？"
-+msgstr ""
-+"有外部應用程式試著要將協定 %1 的聯絡人 %2 加入您的聯絡人清單中。您同意嗎？"
- 
- #: kopete/kopeteiface.cpp:162
- msgid "Allow Contact?"
-@@ -1686,8 +1688,8 @@
- 
- #: kopete/kopeteiface.cpp:175
- msgid ""
--"An external application has attempted to add a contact using  the %1 protocol, "
--"which either does not exist or is not loaded."
-+"An external application has attempted to add a contact using  the %1 "
-+"protocol, which either does not exist or is not loaded."
- msgstr "有外部程式試圖加入協定 %1 的聯絡人，但此協定不存在或尚未載入。"
- 
- #: kopete/kopeteiface.cpp:177
-@@ -1699,8 +1701,8 @@
- msgid ""
- "_: 1st message shown to users on first run of Kopete. Please keep the "
- "formatting.\n"
--"<h2>Welcome to Kopete</h2>"
--"<p>Which messaging service do you want to connect to?</p>"
-+"<h2>Welcome to Kopete</h2><p>Which messaging service do you want to connect "
-+"to?</p>"
- msgstr "<h2>歡迎使用 Kopete</h2><p>您想連線到哪個傳訊服務呢？</p>"
- 
- # DECISION: 從 kde 3.5 beta 2　的中文翻譯來看，config　翻成設定的比組態多很多。
-@@ -1713,10 +1715,12 @@
- msgid ""
- "_: 2nd message shown to users on first run of Kopete. Please keep the "
- "formatting.\n"
--"<h2>Congratulations</h2>"
--"<p>You have finished configuring the account. You can add more accounts with <i>"
--"Settings->Configure</i>.  Please click the \"Finish\" button.</p>"
--msgstr "<h2>恭喜</h2><p>您已經完成了帳號的設定。您可以加入更多帳號。請按一下「完成」按鈕。</p>"
-+"<h2>Congratulations</h2><p>You have finished configuring the account. You "
-+"can add more accounts with <i>Settings->Configure</i>.  Please click the "
-+"\"Finish\" button.</p>"
-+msgstr ""
-+"<h2>恭喜</h2><p>您已經完成了帳號的設定。您可以加入更多帳號。請按一下「完成」"
-+"按鈕。</p>"
- 
- #: kopete/addaccountwizard/addaccountwizard.cpp:131
- msgid "Cannot load the %1 protocol plugin."
-@@ -1752,7 +1756,7 @@
- 
- #: kopete/contactlist/kopetelviprops.cpp:164
- msgid "Sync KABC..."
--msgstr "同步 KABC..."
-+msgstr "同步 KABC…"
- 
- #: kopete/contactlist/kopetelviprops.cpp:513
- msgid "No contacts were imported from the address book."
-@@ -1776,7 +1780,7 @@
- 
- #: kopete/contactlist/kopetecontactlistview.cpp:470
- msgid "Create New Group..."
--msgstr "建立新群組..."
-+msgstr "建立新群組…"
- 
- #: kopete/contactlist/kopetecontactlistview.cpp:478
- msgid "&Move To"
-@@ -1789,7 +1793,7 @@
- #: kopete/contactlist/kopetecontactlistview.cpp:485
- #: protocols/msn/msncontact.cpp:144
- msgid "Send Email..."
--msgstr "傳送電子郵件..."
-+msgstr "傳送電子郵件…"
- 
- #: kopete/contactlist/kopetecontactlistview.cpp:488
- #: kopete/contactlist/kopetecontactlistview.cpp:1395
-@@ -1836,8 +1840,8 @@
- 
- #: kopete/contactlist/kopetecontactlistview.cpp:989
- msgid ""
--"<qt>Would you like to add <b>%1</b> to your contact list as a member of <b>"
--"%2</b>?</qt>"
-+"<qt>Would you like to add <b>%1</b> to your contact list as a member of <b>%"
-+"2</b>?</qt>"
- msgstr "<qt>您確定要新增 <b>%1</b> 為 <b>%2</b> 的成員嗎？</qt>"
- 
- #: kopete/contactlist/kopetecontactlistview.cpp:991
-@@ -1850,14 +1854,16 @@
- 
- #: kopete/contactlist/kopetecontactlistview.cpp:1005
- msgid ""
--"<qt>Would you like to add <b>%1</b> to your contact list as a child contact of "
--"<b>%2</b>?</qt>"
--msgstr "<qt>您確定要新增 <b>%1</b> 到您的聯絡人清單中，做為 <b>%2</b> 的子聯絡人嗎？</qt>"
-+"<qt>Would you like to add <b>%1</b> to your contact list as a child contact "
-+"of <b>%2</b>?</qt>"
-+msgstr ""
-+"<qt>您確定要新增 <b>%1</b> 到您的聯絡人清單中，做為 <b>%2</b> 的子聯絡人嗎？"
-+"</qt>"
- 
- #: kopete/contactlist/kopetecontactlistview.cpp:1056
- msgid ""
--"<qt>This contact is already on your contact list. It is a child contact of <b>"
--"%1</b></qt>"
-+"<qt>This contact is already on your contact list. It is a child contact of "
-+"<b>%1</b></qt>"
- msgstr "<qt>這個聯絡人已經在您的清單中了。它是 <b>%1</b> 的子聯絡人。</qt>"
- 
- #: kopete/contactlist/kopetecontactlistview.cpp:1374
-@@ -1866,7 +1872,7 @@
- 
- #: kopete/contactlist/kopetecontactlistview.cpp:1376
- msgid "Send Single Message..."
--msgstr "傳送單一訊息..."
-+msgstr "傳送單一訊息…"
- 
- #: kopete/contactlist/kopetecontactlistview.cpp:1379
- msgid "&Add Subcontact"
-@@ -1900,13 +1906,16 @@
- msgid ""
- "This contact was not found in the KDE address book. Check that a contact is "
- "selected in the properties dialog."
--msgstr "這個聯絡人在 KDE 通訊錄中找不到。請檢查是否已經在內容對話框中選取聯絡人。"
-+msgstr ""
-+"這個聯絡人在 KDE 通訊錄中找不到。請檢查是否已經在內容對話框中選取聯絡人。"
- 
- #: kopete/contactlist/kopetecontactlistview.cpp:1454
- msgid ""
--"This contact is not associated with a KDE address book entry, where the email "
--"address is stored. Check that a contact is selected in the properties dialog."
--msgstr "您的 KDE 通訊錄中沒有這個聯絡人。請檢查您已經在內容對話框中選取聯絡人。"
-+"This contact is not associated with a KDE address book entry, where the "
-+"email address is stored. Check that a contact is selected in the properties "
-+"dialog."
-+msgstr ""
-+"您的 KDE 通訊錄中沒有這個聯絡人。請檢查您已經在內容對話框中選取聯絡人。"
- 
- #: kopete/contactlist/kopetecontactlistview.cpp:1476
- msgid "<qt>Would you like to add this contact to your contact list?</qt>"
-@@ -1914,14 +1923,14 @@
- 
- #: kopete/contactlist/kopetecontactlistview.cpp:1556
- msgid ""
--"<qt>Are you sure you want to remove the contact <b>%1</b> "
--"from your contact list?</qt>"
-+"<qt>Are you sure you want to remove the contact <b>%1</b> from your contact "
-+"list?</qt>"
- msgstr "<qt>您確定要從清單中移除聯絡人<b>%1</b>嗎？</qt>"
- 
- #: kopete/contactlist/kopetecontactlistview.cpp:1562
- msgid ""
--"<qt>Are you sure you want to remove the group <b>%1</b> "
--"and all contacts that are contained within it?</qt>"
-+"<qt>Are you sure you want to remove the group <b>%1</b> and all contacts "
-+"that are contained within it?</qt>"
- msgstr "<qt>您確定要移除群組<b>%1</b>及其包含的所有聯絡人嗎？</qt>"
- 
- #: kopete/contactlist/kopetecontactlistview.cpp:1579
-@@ -1970,17 +1979,13 @@
- 
- #: kopete/contactlist/kopetemetacontactlvi.cpp:134
- msgid ""
--"_: "
--"<tr>"
--"<td>STATUS ICON <b>PROTOCOL NAME</b> (ACCOUNT NAME)</td>"
--"<td>STATUS DESCRIPTION</td></tr>\n"
--"<tr>"
--"<td><img src=\"%1\">&nbsp;<nobr><b>%2</b></nobr>&nbsp;<nobr>(%3)</nobr></td>"
--"<td align=\"right\"><nobr>%4</nobr></td></tr>"
--msgstr ""
--"<tr>"
--"<td><img src=\"%1\">&nbsp;<nobr><b>%2</b></nobr>&nbsp;<nobr>(%3)</nobr></td>"
--"<td align=\"right\"><nobr>%4</nobr></td></tr>"
-+"_: <tr><td>STATUS ICON <b>PROTOCOL NAME</b> (ACCOUNT NAME)</td><td>STATUS "
-+"DESCRIPTION</td></tr>\n"
-+"<tr><td><img src=\"%1\">&nbsp;<nobr><b>%2</b></nobr>&nbsp;<nobr>(%3)</nobr></"
-+"td><td align=\"right\"><nobr>%4</nobr></td></tr>"
-+msgstr ""
-+"<tr><td><img src=\"%1\">&nbsp;<nobr><b>%2</b></nobr>&nbsp;<nobr>(%3)</nobr></"
-+"td><td align=\"right\"><nobr>%4</nobr></td></tr>"
- 
- #: kopete/contactlist/kopetemetacontactlvi.cpp:383
- msgid "<qt><i>%1</i> is now %2.</qt>"
-@@ -2052,16 +2057,16 @@
- 
- #: kopete/chatwindow/kopetechatwindow.cpp:357
- msgid "Set Default &Font..."
--msgstr "設定預設字型(&F)..."
-+msgstr "設定預設字型(&F)…"
- 
- #: kopete/chatwindow/kopetechatwindow.cpp:358
- msgid "Set Default Text &Color..."
--msgstr "設定預設文字顏色(&C)..."
-+msgstr "設定預設文字顏色(&C)…"
- 
- #: kopete/chatwindow/kopetechatwindow.cpp:359
- #: kopete/chatwindow/kopeteemailwindow.cpp:224
- msgid "Set &Background Color..."
--msgstr "設定背景顏色(&B)..."
-+msgstr "設定背景顏色(&B)…"
- 
- #: kopete/chatwindow/kopetechatwindow.cpp:361
- msgid "Previous History"
-@@ -2106,7 +2111,7 @@
- 
- #: kopete/chatwindow/kopetechatwindow.cpp:996
- msgid "More..."
--msgstr "更多..."
-+msgstr "更多…"
- 
- #: kopete/chatwindow/kopetechatwindow.cpp:1199
- msgid "Plugin Actions"
-@@ -2143,11 +2148,11 @@
- 
- #: kopete/chatwindow/kopeteemailwindow.cpp:220
- msgid "&Set Font..."
--msgstr "設定字型(&S)..."
-+msgstr "設定字型(&S)…"
- 
- #: kopete/chatwindow/kopeteemailwindow.cpp:222
- msgid "Set Text &Color..."
--msgstr "設定文字顏色(&C)..."
-+msgstr "設定文字顏色(&C)…"
- 
- #: kopete/chatwindow/kopeteemailwindow.cpp:347
- msgid "(%1) Next >>"
-@@ -2156,9 +2161,11 @@
- #: kopete/chatwindow/chatview.cpp:355
- #: kopete/chatwindow/kopeteemailwindow.cpp:425
- msgid ""
--"<qt>You are about to leave the group chat session <b>%1</b>."
--"<br>You will not receive future messages from this conversation.</qt>"
--msgstr "<qt>您打算離開群組聊天室 <b>%1</b> 了。<br> 您將不會再收到此對話的任何訊息。</qt>"
-+"<qt>You are about to leave the group chat session <b>%1</b>.<br>You will not "
-+"receive future messages from this conversation.</qt>"
-+msgstr ""
-+"<qt>您打算離開群組聊天室 <b>%1</b> 了。<br> 您將不會再收到此對話的任何訊息。"
-+"</qt>"
- 
- #: kopete/chatwindow/chatview.cpp:356
- #: kopete/chatwindow/kopeteemailwindow.cpp:426
-@@ -2176,8 +2183,8 @@
- #: kopete/chatwindow/chatview.cpp:362
- #: kopete/chatwindow/kopeteemailwindow.cpp:432
- msgid ""
--"<qt>You have received a message from <b>%1</b> in the last second. Are you sure "
--"you want to close this chat?</qt>"
-+"<qt>You have received a message from <b>%1</b> in the last second. Are you "
-+"sure you want to close this chat?</qt>"
- msgstr "<qt>您剛剛接收到來自 <b>%1</b> 的訊息。您確定要關閉此次聊天嗎？</qt>"
- 
- #: kopete/chatwindow/chatview.cpp:363
-@@ -2190,7 +2197,9 @@
- msgid ""
- "You have a message send in progress, which will be aborted if this chat is "
- "closed. Are you sure you want to close this chat?"
--msgstr "您有正在送出的訊息，如果此時關閉聊天視窗，訊息會被取消。您確定要關閉聊天視窗嗎？"
-+msgstr ""
-+"您有正在送出的訊息，如果此時關閉聊天視窗，訊息會被取消。您確定要關閉聊天視窗"
-+"嗎？"
- 
- #: kopete/chatwindow/chatview.cpp:370
- #: kopete/chatwindow/kopeteemailwindow.cpp:440
-@@ -2217,11 +2226,11 @@
- 
- #: kopete/chatwindow/krichtexteditpart.cpp:127
- msgid "Enable &Rich Text"
--msgstr "啟用 RichText (&R)"
-+msgstr "啟用 RichText(&R)"
- 
- #: kopete/chatwindow/krichtexteditpart.cpp:129
- msgid "Disable &Rich Text"
--msgstr "停用 RichText (&R)"
-+msgstr "停用 RichText(&R)"
- 
- #: kopete/chatwindow/krichtexteditpart.cpp:133
- msgid "Check &Spelling"
-@@ -2229,11 +2238,11 @@
- 
- #: kopete/chatwindow/krichtexteditpart.cpp:137
- msgid "Text &Color..."
--msgstr "文字顏色(&C)..."
-+msgstr "文字顏色(&C)…"
- 
- #: kopete/chatwindow/krichtexteditpart.cpp:142
- msgid "Background Co&lor..."
--msgstr "背景顏色(&L)..."
-+msgstr "背景顏色(&L)…"
- 
- #: kopete/chatwindow/krichtexteditpart.cpp:147
- msgid "&Font"
-@@ -2347,10 +2356,12 @@
- #: rc.cpp:12
- #, no-c-format
- msgid ""
--"Check this and enter your password below if you would like your password to be "
--"stored in your wallet, so Kopete does not have to ask you for it each time it "
--"is needed."
--msgstr "勾選此選項，並在底下輸入您的密碼，您可以將密碼儲存在錢包中，Kopete 就不必每次詢問您密碼。"
-+"Check this and enter your password below if you would like your password to "
-+"be stored in your wallet, so Kopete does not have to ask you for it each "
-+"time it is needed."
-+msgstr ""
-+"勾選此選項，並在底下輸入您的密碼，您可以將密碼儲存在錢包中，Kopete 就不必每次"
-+"詢問您密碼。"
- 
- #. i18n: file ./libkopete/ui/kopetepasswordwidgetbase.ui line 64
- #: rc.cpp:15
-@@ -2368,10 +2379,12 @@
- #: rc.cpp:21
- #, no-c-format
- msgid ""
--"Enter your password here. If you would rather not save your password, uncheck "
--"the Remember password checkbox above; you will then be prompted for your "
--"password whenever it is needed."
--msgstr "在此輸入您的密碼。如果您不打算儲存密碼，則將「記住密碼」小方塊取消，此後每次需要時系統就會詢問您密碼。"
-+"Enter your password here. If you would rather not save your password, "
-+"uncheck the Remember password checkbox above; you will then be prompted for "
-+"your password whenever it is needed."
-+msgstr ""
-+"在此輸入您的密碼。如果您不打算儲存密碼，則將「記住密碼」小方塊取消，此後每次"
-+"需要時系統就會詢問您密碼。"
- 
- #. i18n: file ./libkopete/ui/fileconfirmbase.ui line 33
- #: rc.cpp:27
-@@ -2381,7 +2394,9 @@
- "accept this dialog. If you do not wish to receive it, please click 'Refuse'. "
- "This file will never be executed by Kopete at any point during or after the "
- "transfer."
--msgstr "有一名使用者正打算傳送檔案給您。您同意接收後才會下載檔案。如果您不打算接收，請點選「拒絕」。Kopete 將不會執行此檔。"
-+msgstr ""
-+"有一名使用者正打算傳送檔案給您。您同意接收後才會下載檔案。如果您不打算接收，"
-+"請點選「拒絕」。Kopete 將不會執行此檔。"
- 
- #. i18n: file ./libkopete/ui/fileconfirmbase.ui line 44
- #: rc.cpp:30
-@@ -2399,7 +2414,7 @@
- #: rc.cpp:36
- #, no-c-format
- msgid "&Browse..."
--msgstr "瀏覽(&B)..."
-+msgstr "瀏覽(&B)…"
- 
- #. i18n: file ./libkopete/ui/fileconfirmbase.ui line 73
- #: rc.cpp:39
-@@ -2429,7 +2444,7 @@
- #: rc.cpp:54 rc.cpp:546
- #, no-c-format
- msgid "C&hange..."
--msgstr "變更(&H)..."
-+msgstr "變更(&H)…"
- 
- #. i18n: file ./libkopete/ui/addressbooklinkwidget_base.ui line 66
- #: rc.cpp:57
-@@ -2495,8 +2510,8 @@
- #: rc.cpp:92 rc.cpp:95
- #, no-c-format
- msgid ""
--"Enter the group where the contact should be added. Leave it empty to add it in "
--"the top level group."
-+"Enter the group where the contact should be added. Leave it empty to add it "
-+"in the top level group."
- msgstr "輸入此聯絡人要加入的群組。若是要放在頂層，則請留白。"
- 
- #. i18n: file ./libkopete/ui/contactaddednotifywidget.ui line 181
-@@ -2515,7 +2530,7 @@
- #: rc.cpp:104
- #, no-c-format
- msgid "Create New Entr&y..."
--msgstr "建立新項目(&Y)..."
-+msgstr "建立新項目(&Y)…"
- 
- #. i18n: file ./libkopete/ui/addressbookselectorwidget_base.ui line 58
- #: rc.cpp:107
-@@ -2714,7 +2729,9 @@
- "and showing a bubble. A left or middle mouse click on the icon will open the "
- "message in a new chat window. Pressing the \"View\" button in the bubble has "
- "the same effect."
--msgstr "系統匣圖示在有新訊息進來時，預設會閃爍並顯示泡泡訊息。對圖示按下滑鼠左鍵或中鍵就能開啟新的聊天視窗。在泡泡訊息中按下「檢視」也有相同效果。"
-+msgstr ""
-+"系統匣圖示在有新訊息進來時，預設會閃爍並顯示泡泡訊息。對圖示按下滑鼠左鍵或中"
-+"鍵就能開啟新的聊天視窗。在泡泡訊息中按下「檢視」也有相同效果。"
- 
- #. i18n: file ./kopete/config/behavior/behaviorconfig_general.ui line 55
- #: rc.cpp:215
-@@ -2761,7 +2778,9 @@
- "If there is no existing chat window a new window will be opened when a new "
- "message comes in. If there is already a chat window opened for the sender of "
- "the message it will be displayed there instantly."
--msgstr "如果目前沒有開啟任何聊天視窗，則新訊息到來時會開啟一個新的視窗。如果已經與某人聊天中，則對方送來的訊息會立刻顯示在聊天視窗中。"
-+msgstr ""
-+"如果目前沒有開啟任何聊天視窗，則新訊息到來時會開啟一個新的視窗。如果已經與某"
-+"人聊天中，則對方送來的訊息會立刻顯示在聊天視窗中。"
- 
- #. i18n: file ./kopete/config/behavior/behaviorconfig_general.ui line 96
- #: rc.cpp:236
-@@ -2779,10 +2798,13 @@
- #: rc.cpp:242
- #, no-c-format
- msgid ""
--"Store new incoming messages in a message queue. New messages are messages that "
--"cannot be displayed in an already open chat window. Only queued or stacked "
--"messages trigger notification via bubble, a flashing tray icon, or both.."
--msgstr "新訊息來時使用訊息佇列。新訊息不會顯示在已經開啟的聊天視窗中。只有佇列或堆疊中的訊息會啟動泡泡通知及閃爍系統匣圖示。"
-+"Store new incoming messages in a message queue. New messages are messages "
-+"that cannot be displayed in an already open chat window. Only queued or "
-+"stacked messages trigger notification via bubble, a flashing tray icon, or "
-+"both.."
-+msgstr ""
-+"新訊息來時使用訊息佇列。新訊息不會顯示在已經開啟的聊天視窗中。只有佇列或堆疊"
-+"中的訊息會啟動泡泡通知及閃爍系統匣圖示。"
- 
- #. i18n: file ./kopete/config/behavior/behaviorconfig_general.ui line 110
- #: rc.cpp:245
-@@ -2800,10 +2822,12 @@
- #: rc.cpp:251
- #, no-c-format
- msgid ""
--"Store new incoming messages in a message stack. New messages are messages that "
--"cannot be displayed in an already open chat window. Only queued or stacked "
--"messages trigger notification via bubble and flashing tray."
--msgstr "新訊息來時使用訊息堆疊。新訊息不會顯示在已經開啟的聊天視窗中。只有佇列或堆疊中的訊息會啟動泡泡通知及閃爍系統匣圖示。"
-+"Store new incoming messages in a message stack. New messages are messages "
-+"that cannot be displayed in an already open chat window. Only queued or "
-+"stacked messages trigger notification via bubble and flashing tray."
-+msgstr ""
-+"新訊息來時使用訊息堆疊。新訊息不會顯示在已經開啟的聊天視窗中。只有佇列或堆疊"
-+"中的訊息會啟動泡泡通知及閃爍系統匣圖示。"
- 
- #. i18n: file ./kopete/config/behavior/behaviorconfig_general.ui line 127
- #: rc.cpp:254
-@@ -2823,12 +2847,13 @@
- msgid ""
- "Unread messages are messages that will be displayed in an already opened but "
- "inactive chat window. Only incoming queued messages trigger notification via "
--"the bubble, the flashing tray icon, or both. With this option disabled only new "
--"incoming messages are queued, i.e. messages that cannot be displayed in an "
--"already open chat window."
--msgstr ""
--"未讀訊息是指顯示在已開啟但未取得焦點的聊天視窗中的訊息。只有佇列或堆疊中的訊息會啟動泡泡通知訊息並閃爍系統匣圖示。關閉這個選項的話，只有新的訊息，也就是尚未顯示"
--"在已開啟聊天視窗的訊息會放進佇列。"
-+"the bubble, the flashing tray icon, or both. With this option disabled only "
-+"new incoming messages are queued, i.e. messages that cannot be displayed in "
-+"an already open chat window."
-+msgstr ""
-+"未讀訊息是指顯示在已開啟但未取得焦點的聊天視窗中的訊息。只有佇列或堆疊中的訊"
-+"息會啟動泡泡通知訊息並閃爍系統匣圖示。關閉這個選項的話，只有新的訊息，也就是"
-+"尚未顯示在已開啟聊天視窗的訊息會放進佇列。"
- 
- #. i18n: file ./kopete/config/behavior/behaviorconfig_general.ui line 154
- #: rc.cpp:266
-@@ -2846,9 +2871,11 @@
- #: rc.cpp:272
- #, no-c-format
- msgid ""
--"When starting Kopete all your accounts will be connected automatically. Note: "
--"You can exclude accounts individually in their properties."
--msgstr "啟動 Kopete 時，您所有的帳號都會自動連線。注意：您可以在個別帳號設定中排除自動連線。"
-+"When starting Kopete all your accounts will be connected automatically. "
-+"Note: You can exclude accounts individually in their properties."
-+msgstr ""
-+"啟動 Kopete 時，您所有的帳號都會自動連線。注意：您可以在個別帳號設定中排除自"
-+"動連線。"
- 
- #. i18n: file ./kopete/config/behavior/behaviorconfig_events.ui line 16
- #: rc.cpp:275
-@@ -2890,18 +2917,22 @@
- #: rc.cpp:293
- #, no-c-format
- msgid ""
--"Left mouse click on flashing system tray opens message instead of "
--"restoring/minimizing contact list"
--msgstr "系統匣圖示閃爍時，對圖示點選滑鼠左鍵用於開啟訊息視窗，而非放大/縮小聯絡人清單。"
-+"Left mouse click on flashing system tray opens message instead of restoring/"
-+"minimizing contact list"
-+msgstr ""
-+"系統匣圖示閃爍時，對圖示點選滑鼠左鍵用於開啟訊息視窗，而非放大/縮小聯絡人清"
-+"單。"
- 
- #. i18n: file ./kopete/config/behavior/behaviorconfig_events.ui line 86
- #: rc.cpp:296
- #, no-c-format
- msgid ""
--"A left mouse click on the flashing system tray icon opens the incoming message "
--"instead of restoring/minimizing the contact list (e.g. to check who is sending "
--"messages). A middle click always opens this message."
--msgstr "系統匣圖示閃爍時，對圖示點選滑鼠左鍵用於開啟訊息視窗，而非放大/縮小聯絡人清單。滑鼠中鍵用於開啟此訊息。"
-+"A left mouse click on the flashing system tray icon opens the incoming "
-+"message instead of restoring/minimizing the contact list (e.g. to check who "
-+"is sending messages). A middle click always opens this message."
-+msgstr ""
-+"系統匣圖示閃爍時，對圖示點選滑鼠左鍵用於開啟訊息視窗，而非放大/縮小聯絡人清"
-+"單。滑鼠中鍵用於開啟此訊息。"
- 
- #. i18n: file ./kopete/config/behavior/behaviorconfig_events.ui line 96
- #: rc.cpp:299
-@@ -2940,7 +2971,9 @@
- msgid ""
- "If there is already a chat window opened for the sender of the message "
- "displayed in the bubble the \"Ignore\" button will close this chat window."
--msgstr "如果已經有一個聊天視窗是與送出訊息的使用者聊天中的，則按下泡泡訊息中的「忽略」鍵會將該視窗一起關閉。"
-+msgstr ""
-+"如果已經有一個聊天視窗是與送出訊息的使用者聊天中的，則按下泡泡訊息中的「忽"
-+"略」鍵會將該視窗一起關閉。"
- 
- #. i18n: file ./kopete/config/behavior/behaviorconfig_events.ui line 182
- #: rc.cpp:317
-@@ -2958,9 +2991,10 @@
- #: rc.cpp:323
- #, no-c-format
- msgid ""
--"Bubbles will automatically be closed after a fixed amount of time. A closed one "
--"will be replaced by a new one if another message is waiting."
--msgstr "在固定時間後泡泡會自動關閉。如果有新訊息進來，則會用新訊息的泡泡來取代。"
-+"Bubbles will automatically be closed after a fixed amount of time. A closed "
-+"one will be replaced by a new one if another message is waiting."
-+msgstr ""
-+"在固定時間後泡泡會自動關閉。如果有新訊息進來，則會用新訊息的泡泡來取代。"
- 
- #. i18n: file ./kopete/config/behavior/behaviorconfig_events.ui line 202
- #: rc.cpp:326 rc.cpp:685
-@@ -2984,9 +3018,11 @@
- #: rc.cpp:335
- #, no-c-format
- msgid ""
--"In very active group chats important messages can be singled out by excluding "
--"non-highlighted messages from notification."
--msgstr "在非常熱烈的群組聊天室中，您可以設定只有標示為高亮度（重要）訊息才會發出通知。"
-+"In very active group chats important messages can be singled out by "
-+"excluding non-highlighted messages from notification."
-+msgstr ""
-+"在非常熱烈的群組聊天室中，您可以設定只有標示為高亮度（重要）訊息才會發出通"
-+"知。"
- 
- #. i18n: file ./kopete/config/behavior/behaviorconfig_events.ui line 252
- #: rc.cpp:338
-@@ -3005,13 +3041,14 @@
- #: rc.cpp:344
- #, no-c-format
- msgid ""
--"This option allows you to turn off the notification of events for chat windows "
--"that are on the current desktop. If this option is turned on, then only chat "
--"windows on different desktops than the current one will notify you that an "
--"event has occured. Otherwise, all chat windows will notify you that an event "
--"has occured."
-+"This option allows you to turn off the notification of events for chat "
-+"windows that are on the current desktop. If this option is turned on, then "
-+"only chat windows on different desktops than the current one will notify you "
-+"that an event has occured. Otherwise, all chat windows will notify you that "
-+"an event has occured."
- msgstr ""
--"這個選項讓您關閉目前桌面上的聊天視窗中的事件通知。如果開啟此選項，則只有在不同桌面上的聊天視窗會通知您有事件發生。反之，則所有的聊天視窗都會送出通知。"
-+"這個選項讓您關閉目前桌面上的聊天視窗中的事件通知。如果開啟此選項，則只有在不"
-+"同桌面上的聊天視窗會通知您有事件發生。反之，則所有的聊天視窗都會送出通知。"
- 
- #. i18n: file ./kopete/config/behavior/behaviorconfig_events.ui line 279
- #: rc.cpp:350
-@@ -3032,7 +3069,9 @@
- "Enable notification events even if your account status is \"Away\" or less "
- "available, e.g. \"Not Available\" or \"Do not Disturb\". Note: This does not "
- "affect the flashing of the system tray icon."
--msgstr "即使您的帳號狀態是「離開」，或是「不在線上」，或是「勿打擾」時，仍開啟事件通知。注意：這個設定不會影響系統匣圖示閃爍的功能。"
-+msgstr ""
-+"即使您的帳號狀態是「離開」，或是「不在線上」，或是「勿打擾」時，仍開啟事件通"
-+"知。注意：這個設定不會影響系統匣圖示閃爍的功能。"
- 
- #. i18n: file ./kopete/config/behavior/behaviorconfig_events.ui line 293
- #: rc.cpp:359
-@@ -3051,9 +3090,11 @@
- #, no-c-format
- msgid ""
- "Enable notification events for incoming messages even if the receiving chat "
--"window is active. Note: Neither the system tray icon flashes nor the bubble is "
--"shown."
--msgstr "即使此視窗正在聊天中，仍開啟事件通知。注意：此時不會顯示泡泡訊息，或是閃爍系統匣圖示。"
-+"window is active. Note: Neither the system tray icon flashes nor the bubble "
-+"is shown."
-+msgstr ""
-+"即使此視窗正在聊天中，仍開啟事件通知。注意：此時不會顯示泡泡訊息，或是閃爍系"
-+"統匣圖示。"
- 
- #. i18n: file ./kopete/config/behavior/behaviorconfig_events.ui line 307
- #: rc.cpp:368
-@@ -3073,10 +3114,12 @@
- #: rc.cpp:374
- #, no-c-format
- msgid ""
--"If there is already a chat window open for the sender of the message, opening "
--"his/her message will cause a switch to the desktop which contains this chat "
--"window."
--msgstr "如果在一個已開啟的聊天室視窗中，有人發送訊息，則開啟該訊息時，會自動切換到該聊天室視窗所在的桌面。"
-+"If there is already a chat window open for the sender of the message, "
-+"opening his/her message will cause a switch to the desktop which contains "
-+"this chat window."
-+msgstr ""
-+"如果在一個已開啟的聊天室視窗中，有人發送訊息，則開啟該訊息時，會自動切換到該"
-+"聊天室視窗所在的桌面。"
- 
- #. i18n: file ./kopete/config/behavior/behaviorconfig_events.ui line 321
- #: rc.cpp:377
-@@ -3094,10 +3137,12 @@
- #: rc.cpp:383
- #, no-c-format
- msgid ""
--"If there is already a chat window opened for the sender of an incoming message "
--"this window will be put on the current desktop and in front of all other "
--"windows."
--msgstr "如果在一個已開啟的聊天室視窗中有新來的訊息，則此視窗會被提升到目前桌面的最上層。"
-+"If there is already a chat window opened for the sender of an incoming "
-+"message this window will be put on the current desktop and in front of all "
-+"other windows."
-+msgstr ""
-+"如果在一個已開啟的聊天室視窗中有新來的訊息，則此視窗會被提升到目前桌面的最上"
-+"層。"
- 
- #. i18n: file ./kopete/config/behavior/behaviorconfig_chat.ui line 27
- #: rc.cpp:389
-@@ -3149,22 +3194,22 @@
- "                                <dt><tt>Open all messages in a new chat "
- "window</tt>\n"
- "                                <dd>Every chat will have its own window.\n"
--"                                <dt><tt>Group messages from the same account in "
--"the same chat window</tt>\n"
--"                                <dd>All chats for one account get grouped in to "
--"one window by using tabs.\n"
-+"                                <dt><tt>Group messages from the same account "
-+"in the same chat window</tt>\n"
-+"                                <dd>All chats for one account get grouped in "
-+"to one window by using tabs.\n"
- "                                <dt><tt>Group all messages in the same chat "
- "window</tt>\n"
--"                                <dd>All chats get grouped in to one window by "
--"using tabs.\n"
-+"                                <dd>All chats get grouped in to one window "
-+"by using tabs.\n"
- "                                <dt><tt>Group messages from contacts in the "
- "same group in the same chat window</tt>\n"
--"                                <dd>All chats from one group get grouped in to "
--"one window by using tabs.\n"
-+"                                <dd>All chats from one group get grouped in "
-+"to one window by using tabs.\n"
- "                                <dt><tt>Group messages from the same "
- "metacontact in the same chat window</tt>\n"
--"                                <dd>All chats from one metacontact get grouped "
--"in to one window by using tabs.\n"
-+"                                <dd>All chats from one metacontact get "
-+"grouped in to one window by using tabs.\n"
- "                                </dl>\n"
- "                        "
- msgstr ""
-@@ -3209,15 +3254,15 @@
- #: rc.cpp:437
- #, no-c-format
- msgid "&Maximum number of chat window lines:"
--msgstr "聊天視窗中的最大行數(&M)："
-+msgstr "聊天視窗中的最大列數(&M)："
- 
- #. i18n: file ./kopete/config/behavior/behaviorconfig_chat.ui line 251
- #: rc.cpp:440
- #, no-c-format
- msgid ""
--"Limit the maximum number of lines visible in a chat window to improve speed for "
--"complex layouts."
--msgstr "限制聊天視窗中可見的最大行數，當版面很複雜時可提升速度。"
-+"Limit the maximum number of lines visible in a chat window to improve speed "
-+"for complex layouts."
-+msgstr "限制聊天視窗中可見的最大列數，當版面很複雜時可提升速度。"
- 
- #. i18n: file ./kopete/config/behavior/kopeteawayconfigbase.ui line 16
- #: rc.cpp:443
-@@ -3235,9 +3280,10 @@
- #: rc.cpp:452 rc.cpp:455 rc.cpp:458 rc.cpp:461
- #, no-c-format
- msgid ""
--"Kopete will remember this many away messages for use at a later date; if this "
--"limit is exceeded, the least-used message will be removed."
--msgstr "Kopete 會盡量記得最近用過的離開訊息；當數量超過的時候，最不常用的會被移除。"
-+"Kopete will remember this many away messages for use at a later date; if "
-+"this limit is exceeded, the least-used message will be removed."
-+msgstr ""
-+"Kopete 會盡量記得最近用過的離開訊息；當數量超過的時候，最不常用的會被移除。"
- 
- #. i18n: file ./kopete/config/behavior/kopeteawayconfigbase.ui line 94
- #: rc.cpp:464
-@@ -3249,15 +3295,17 @@
- #: rc.cpp:467
- #, no-c-format
- msgid ""
--"<p>If you check the <i>Use auto away</i> checkbox, Kopete will automaticaly set "
--"you globaly away when the KDE screen saver start, or after the selected minutes "
--"of user inactivity (i.e no mouse move, or key pressed)</p>\n"
--"<p>Kopete will set you available again when you come back if you checked <i>"
--"Become available when detecting activity again</i></p>"
--msgstr ""
--"<p>如果您勾選<i>自動離開</i>選項，當 KDE 螢幕保護程式啟動時，或是使用者閒置（沒有移動滑鼠，或按鍵等動作）特定時間以後，Kopete "
--"會自動將您設定為離開。</p>\n"
--"<p>若您勾選<i>偵測到動作時就設為線上</i>的話，則當您回來時 Kopete 會自動將您設回上線狀態。</p>"
-+"<p>If you check the <i>Use auto away</i> checkbox, Kopete will automaticaly "
-+"set you globaly away when the KDE screen saver start, or after the selected "
-+"minutes of user inactivity (i.e no mouse move, or key pressed)</p>\n"
-+"<p>Kopete will set you available again when you come back if you checked "
-+"<i>Become available when detecting activity again</i></p>"
-+msgstr ""
-+"<p>如果您勾選<i>自動離開</i>選項，當 KDE 螢幕保護程式啟動時，或是使用者閒置"
-+"（沒有移動滑鼠，或按鍵等動作）特定時間以後，Kopete 會自動將您設定為離開。</"
-+"p>\n"
-+"<p>若您勾選<i>偵測到動作時就設為線上</i>的話，則當您回來時 Kopete 會自動將您"
-+"設回上線狀態。</p>"
- 
- #. i18n: file ./kopete/config/behavior/kopeteawayconfigbase.ui line 109
- #: rc.cpp:471
-@@ -3317,19 +3365,19 @@
- #: rc.cpp:498
- #, no-c-format
- msgid "Ne&w Identity..."
--msgstr "新的身份(&W)..."
-+msgstr "新的身分(&W)…"
- 
- #. i18n: file ./kopete/config/identity/kopeteidentityconfigbase.ui line 83
- #: rc.cpp:501
- #, no-c-format
- msgid "Cop&y Identity..."
--msgstr "複製身份(&Y)..."
-+msgstr "複製身分(&Y)…"
- 
- #. i18n: file ./kopete/config/identity/kopeteidentityconfigbase.ui line 91
- #: rc.cpp:504
- #, no-c-format
- msgid "Rename I&dentity..."
--msgstr "重新命名身份(&D)..."
-+msgstr "重新命名身分(&D)…"
- 
- #. i18n: file ./kopete/config/identity/kopeteidentityconfigbase.ui line 99
- #: rc.cpp:507
-@@ -3427,7 +3475,7 @@
- #: rc.cpp:556 rc.cpp:2005
- #, no-c-format
- msgid "&New..."
--msgstr "新增(&N)..."
-+msgstr "新增(&N)…"
- 
- #. i18n: file ./kopete/config/accounts/kopeteaccountconfigbase.ui line 34
- #: rc.cpp:559
-@@ -3439,7 +3487,7 @@
- #: rc.cpp:562
- #, no-c-format
- msgid "&Modify..."
--msgstr "修改(&M)..."
-+msgstr "修改(&M)…"
- 
- #. i18n: file ./kopete/config/accounts/kopeteaccountconfigbase.ui line 45
- #: rc.cpp:565
-@@ -3504,7 +3552,8 @@
- "Useful if you have several accounts of the same protocol"
- msgstr ""
- "讓您設定這個帳號的顏色。\n"
--"這個帳號中所有聯絡人的圖示都會抹上這個顏色。當您有同一種即時傳訊協定的多個帳號時很有用。"
-+"這個帳號中所有聯絡人的圖示都會抹上這個顏色。當您有同一種即時傳訊協定的多個帳"
-+"號時很有用。"
- 
- #. i18n: file ./kopete/config/accounts/kopeteaccountconfigbase.ui line 163
- #: rc.cpp:602
-@@ -3522,8 +3571,9 @@
- "priority (if all contacts have the same online status.)"
- msgstr ""
- "使用這些按鈕來提高或降低優先權。\n"
--"優先權是當您按了某個整合聯絡人時，用來判斷要使用哪一個聯絡人：Kopete會使用帳號具有最高優先權的聯絡人（如果其中的整合聯絡人中的所有聯絡人都有一樣的上線狀態"
--"。）"
-+"優先權是當您按了某個整合聯絡人時，用來判斷要使用哪一個聯絡人：Kopete會使用帳"
-+"號具有最高優先權的聯絡人（如果其中的整合聯絡人中的所有聯絡人都有一樣的上線狀"
-+"態。）"
- 
- #. i18n: file ./kopete/config/accounts/kopeteaccountconfigbase.ui line 201
- #: rc.cpp:609
-@@ -3547,7 +3597,7 @@
- #: rc.cpp:622
- #, no-c-format
- msgid "&Get New..."
--msgstr "抓新的(&G)..."
-+msgstr "抓新的(&G)…"
- 
- #. i18n: file ./kopete/config/appearance/appearanceconfig_chatwindow.ui line 116
- #: rc.cpp:625
-@@ -3559,7 +3609,7 @@
- #: rc.cpp:628
- #, no-c-format
- msgid "&Install..."
--msgstr "安裝(&I)..."
-+msgstr "安裝(&I)…"
- 
- #. i18n: file ./kopete/config/appearance/appearanceconfig_chatwindow.ui line 142
- #: rc.cpp:634
-@@ -3655,10 +3705,12 @@
- #: rc.cpp:679
- #, no-c-format
- msgid ""
--"When enabled, the contact list will automatically be hidden a fixed amount of "
--"time after the mouse cursor leaves the window. You can set the amount of time "
--"in the 'Time until autohide' box below."
--msgstr "當啟用的時候，聯絡人清單在游標離開視窗後一段時間就會自動隱藏。您可以在下面的「自動隱藏時間」方塊中設定時間"
-+"When enabled, the contact list will automatically be hidden a fixed amount "
-+"of time after the mouse cursor leaves the window. You can set the amount of "
-+"time in the 'Time until autohide' box below."
-+msgstr ""
-+"當啟用的時候，聯絡人清單在游標離開視窗後一段時間就會自動隱藏。您可以在下面的"
-+"「自動隱藏時間」方塊中設定時間"
- 
- #. i18n: file ./kopete/config/appearance/appearanceconfig_contactlist.ui line 166
- #: rc.cpp:682
-@@ -3706,7 +3758,7 @@
- #: rc.cpp:706
- #, no-c-format
- msgid "Change &Tooltip Contents..."
--msgstr "變更提示內容(&T)..."
-+msgstr "變更提示內容(&T)…"
- 
- #. i18n: file ./kopete/config/appearance/tooltipeditwidget.ui line 46
- #: rc.cpp:709
-@@ -3726,8 +3778,8 @@
- #: rc.cpp:715
- #, no-c-format
- msgid ""
--"This list contains elements which are currently <b>not present</b> "
--"in the contact tooltip."
-+"This list contains elements which are currently <b>not present</b> in the "
-+"contact tooltip."
- msgstr "本清單包含目前<b>不在</b>提示中的項目。"
- 
- #. i18n: file ./kopete/config/appearance/tooltipeditwidget.ui line 128
-@@ -3770,8 +3822,8 @@
- #: rc.cpp:736
- #, no-c-format
- msgid ""
--"This list contains elements which are currently <b>present</b> "
--"in the contact tooltips."
-+"This list contains elements which are currently <b>present</b> in the "
-+"contact tooltips."
- msgstr "本清單包含目前<b>在</b>提示中的項目。"
- 
- #. i18n: file ./kopete/config/appearance/appearanceconfig_emoticons.ui line 24
-@@ -3798,8 +3850,8 @@
- #: rc.cpp:748
- #, no-c-format
- msgid ""
--"If this is checked, only emoticons that are separated from the text by spaces "
--"will be shown as images."
-+"If this is checked, only emoticons that are separated from the text by "
-+"spaces will be shown as images."
- msgstr "如果勾選此選項，則只有以空白跟文字隔開的表情圖示會以圖形來顯示。"
- 
- #. i18n: file ./kopete/config/appearance/appearanceconfig_emoticons.ui line 55
-@@ -3818,7 +3870,7 @@
- #: rc.cpp:757
- #, no-c-format
- msgid "&Get New Themes..."
--msgstr "抓取新的主題(&G)..."
-+msgstr "抓取新的主題(&G)…"
- 
- #. i18n: file ./kopete/config/appearance/appearanceconfig_emoticons.ui line 109
- #: rc.cpp:760
-@@ -3830,7 +3882,7 @@
- #: rc.cpp:763
- #, no-c-format
- msgid "&Install Theme File..."
--msgstr "安裝主題檔案(&I)..."
-+msgstr "安裝主題檔案(&I)…"
- 
- #. i18n: file ./kopete/config/appearance/appearanceconfig_emoticons.ui line 133
- #: rc.cpp:766
-@@ -3902,7 +3954,7 @@
- #: rc.cpp:802
- #, no-c-format
- msgid "Do not show user specified &rich text"
--msgstr "不要顯示使用者指定的 Rich Text (&R)"
-+msgstr "不要顯示使用者指定的 Rich Text(&R)"
- 
- #. i18n: file ./kopete/config/appearance/appearanceconfig_colors.ui line 201
- #: rc.cpp:808
-@@ -3991,10 +4043,12 @@
- #: rc.cpp:850 rc.cpp:881
- #, no-c-format
- msgid ""
--"Account are often differentiated by the protocol icon. But if you have severals "
--"accounts of the same protocol, you may apply a color filter to that icon to "
--"differentiate accounts from the same protocols."
--msgstr "通常帳號是以協定來區分。不過如果您在一個通訊協定中有多個帳號，您可以使用顏色來區別。"
-+"Account are often differentiated by the protocol icon. But if you have "
-+"severals accounts of the same protocol, you may apply a color filter to that "
-+"icon to differentiate accounts from the same protocols."
-+msgstr ""
-+"通常帳號是以協定來區分。不過如果您在一個通訊協定中有多個帳號，您可以使用顏色"
-+"來區別。"
- 
- #. i18n: file ./kopete/addaccountwizard/addaccountwizardpage2.ui line 131
- #: rc.cpp:856 rc.cpp:887
-@@ -4012,8 +4066,8 @@
- #: rc.cpp:862 rc.cpp:893
- #, no-c-format
- msgid ""
--"If this is checked, the account will be connected right after you clicked on <i>"
--"Finished</i>."
-+"If this is checked, the account will be connected right after you clicked on "
-+"<i>Finished</i>."
- msgstr "勾選此選項的話，在您按下<i>完成</i>鍵之後，就會馬上開始連線。"
- 
- #. i18n: file ./kopete/addaccountwizard/addaccountwizardpage3.ui line 41
-@@ -4033,7 +4087,7 @@
- #: rc.cpp:911
- #, no-c-format
- msgid "Global Identity Bar"
--msgstr "全域身份列"
-+msgstr "全域身分列"
- 
- #. i18n: file ./kopete/kopeteui.rc line 70
- #: rc.cpp:914
-@@ -4259,8 +4313,8 @@
- #: rc.cpp:1022
- #, no-c-format
- msgid ""
--"Check to prevent notifications common to all contacts from happening for this "
--"contact"
-+"Check to prevent notifications common to all contacts from happening for "
-+"this contact"
- msgstr "勾選此選項以避免從此聯絡人所發出的通知發給所有聯絡人"
- 
- #. i18n: file ./kopete/contactlist/kopetegvipropswidget.ui line 50
-@@ -4303,7 +4357,7 @@
- #: rc.cpp:1049
- #, no-c-format
- msgid "E&xport Details..."
--msgstr "匯出細節(&X)..."
-+msgstr "匯出細節(&X)…"
- 
- #. i18n: file ./kopete/contactlist/kopetemetalvipropswidget.ui line 80
- #: rc.cpp:1052
-@@ -4477,8 +4531,8 @@
- #: rc.cpp:1187 rc.cpp:1269
- #, no-c-format
- msgid ""
--"Select the Instant Messaging systems to message the contact.  If they use more "
--"than one IM system, select them all here"
-+"Select the Instant Messaging systems to message the contact.  If they use "
-+"more than one IM system, select them all here"
- msgstr "選擇此聯絡人使用的即時通訊系統。如果他們使用不只一個系統，請全部選擇。"
- 
- #. i18n: file ./kopete/addcontactwizard/fastaddcontactwizard_base.ui line 125
-@@ -4491,12 +4545,10 @@
- #: rc.cpp:1193
- #, no-c-format
- msgid ""
--"<p>"
--"<h2>Contact added.</h2></p>\n"
-+"<p><h2>Contact added.</h2></p>\n"
- "<p>That was <i>fast.</i></p>"
- msgstr ""
--"<p>"
--"<h2>聯絡人已加入</h2></p>\n"
-+"<p><h2>聯絡人已加入</h2></p>\n"
- "<p>夠<i>快</i>吧。</p>"
- 
- #. i18n: file ./kopete/addcontactwizard/addcontactwizard_base.ui line 16
-@@ -4531,13 +4583,14 @@
- #: rc.cpp:1208
- #, no-c-format
- msgid ""
--"<p>Kopete shares contact information with the KDE Addressbook.  This gives you "
--"seamless integration between instant messaging, e-mail and other personal "
--"information management applications.</p>\n"
-+"<p>Kopete shares contact information with the KDE Addressbook.  This gives "
-+"you seamless integration between instant messaging, e-mail and other "
-+"personal information management applications.</p>\n"
- "<p>If you prefer not to store instant messaging information in the KDE "
- "Addressbook, uncheck the box below.</p>"
- msgstr ""
--"<p>Kopete 與 KDE 通訊錄共享聯絡人資訊。這提供您在即時通訊、電子郵件及其他個人資訊管理程式之間的最佳整合。</p>\n"
-+"<p>Kopete 與 KDE 通訊錄共享聯絡人資訊。這提供您在即時通訊、電子郵件及其他個人"
-+"資訊管理程式之間的最佳整合。</p>\n"
- "<p>如果您不想在 KDE 通訊錄中儲存即時通訊的資訊，請取消勾選下面的選項。</p>"
- 
- #. i18n: file ./kopete/addcontactwizard/addcontactwizard_base.ui line 64
-@@ -4614,7 +4667,7 @@
- #: rc.cpp:1245
- #, no-c-format
- msgid "Create New G&roup..."
--msgstr "新增群組(&G)..."
-+msgstr "新增群組(&G)…"
- 
- #. i18n: file ./kopete/addcontactwizard/addcontactwizard_base.ui line 283
- #: rc.cpp:1248
-@@ -4641,10 +4694,11 @@
- #, no-c-format
- msgid ""
- "<p><i>Note</i>: If a messaging service is missing from the list, please make "
--"sure you have created an account for it in Kopete, and that it ready to add new "
--"contacts.</p>"
-+"sure you have created an account for it in Kopete, and that it ready to add "
-+"new contacts.</p>"
- msgstr ""
--"<p><i>注意</i>： 如果清單中找不到某個傳訊服務，請確定您已在 Kopete 中建立了使用該服務的帳號，並且已經準備好加入新的聯絡人了。</p>"
-+"<p><i>注意</i>： 如果清單中找不到某個傳訊服務，請確定您已在 Kopete 中建立了使"
-+"用該服務的帳號，並且已經準備好加入新的聯絡人了。</p>"
- 
- #. i18n: file ./kopete/addcontactwizard/addcontactwizard_base.ui line 399
- #: rc.cpp:1272 rc.cpp:1278
-@@ -4652,7 +4706,9 @@
- msgid ""
- "How do you want to message the contact?  If they use more than one Instant "
- "Messaging system, select them all here"
--msgstr "您要如何傳訊給這位聯絡人？如果他／她們不止使用一個即時通訊系統，請在此全部選取。"
-+msgstr ""
-+"您要如何傳訊給這位聯絡人？如果他／她們不止使用一個即時通訊系統，請在此全部選"
-+"取。"
- 
- #. i18n: file ./kopete/addcontactwizard/addcontactwizard_base.ui line 407
- #: rc.cpp:1275
-@@ -4664,22 +4720,21 @@
- #: rc.cpp:1284
- #, no-c-format
- msgid ""
--"<p>"
--"<h2>Congratulations</h2></p>\n"
-+"<p><h2>Congratulations</h2></p>\n"
- "\n"
- "<p>You have finished configuring a contact. Please click Finish and your "
- "contact will be added to your contact list.</p>\n"
- "\n"
--"<p><i>Note</i>: If adding this contact requires authorization from one or more "
--"of the messaging services, Kopete may prompt you for further information after "
--"this screen.</p>"
-+"<p><i>Note</i>: If adding this contact requires authorization from one or "
-+"more of the messaging services, Kopete may prompt you for further "
-+"information after this screen.</p>"
- msgstr ""
--"<p>"
--"<h2>恭喜</h2></p>\n"
-+"<p><h2>恭喜</h2></p>\n"
- "\n"
- "<p>您已經完成聯絡人的設定了。請按完成以加入到聯絡人清單。</p>\n"
- "\n"
--"<p><i>注意</i>：如果加入的聯絡人，所用的即時服務需要對方認可，Kopete 稍後會提示您更多資訊。</p>"
-+"<p><i>注意</i>：如果加入的聯絡人，所用的即時服務需要對方認可，Kopete 稍後會提"
-+"示您更多資訊。</p>"
- 
- #. i18n: file ./plugins/nowlistening/nowlisteningprefs.ui line 16
- #: rc.cpp:1294
-@@ -4703,7 +4758,7 @@
- #: rc.cpp:1303
- #, no-c-format
- msgid "Use this message when advertising:"
--msgstr "發佈時使用此訊息："
-+msgstr "發布時使用此訊息："
- 
- #. i18n: file ./plugins/nowlistening/nowlisteningprefs.ui line 87
- #: rc.cpp:1306
-@@ -4766,7 +4821,9 @@
- "Explicit &via \"Tools->Send Media Info\",\n"
- "or by typing \"/media\" in the chat\n"
- "window edit area."
--msgstr "手動透過「工具」－＞「傳送媒體資訊」，或是在聊天視窗中的編輯區鍵入「/media」(&V)"
-+msgstr ""
-+"手動透過「工具」－＞「傳送媒體資訊」，或是在聊天視窗中的編輯區鍵入「/media」"
-+"(&V)"
- 
- #. i18n: file ./plugins/nowlistening/nowlisteningprefs.ui line 230
- #: rc.cpp:1336
-@@ -4858,7 +4915,7 @@
- #: rc.cpp:1397
- #, no-c-format
- msgid "&Add..."
--msgstr "新增(&A)..."
-+msgstr "新增(&A)…"
- 
- #. i18n: file ./plugins/texteffect/texteffectprefs.ui line 78
- #: rc.cpp:1403
-@@ -4918,15 +4975,16 @@
- #: rc.cpp:1433
- #, no-c-format
- msgid ""
--"The NetMeeting Plugin allows you to start a video or voice chat with your MSN "
--"Messenger contacts.\n"
-+"The NetMeeting Plugin allows you to start a video or voice chat with your "
-+"MSN Messenger contacts.\n"
- "\n"
- "This is not the same as webcam chat you can find in the newer Windows "
- "Messenger®,  but uses the older NetMeeting chat you can find in old versions."
- msgstr ""
- "NetMeeting 外掛程式讓您可以啟動 MSN 上的影音聊天。\n"
- "\n"
--"這跟您在新版的 Windows Messenger®上看到的視訊聊天方式不太一樣，而是使用舊式的 NetMeeting 聊天。"
-+"這跟您在新版的 Windows Messenger®上看到的視訊聊天方式不太一樣，而是使用舊式"
-+"的 NetMeeting 聊天。"
- 
- #. i18n: file ./plugins/netmeeting/netmeetingprefs_ui.ui line 60
- #: rc.cpp:1438
-@@ -4956,13 +5014,13 @@
- #: rc.cpp:1450
- #, no-c-format
- msgid ""
--"You can download Konference here: <a "
--"href=\"http://www.kde-apps.org/content/show.php?content=10395\">"
--"http://www.kde-apps.org/content/show.php?content=10395</a>"
--msgstr ""
--"您可以在這裡下載 Konference：<a "
--"href=\"http://www.kde-apps.org/content/show.php?content=10395\">"
--"http://www.kde-apps.org/content/show.php?content=10395</a>"
-+"You can download Konference here: <a href=\"http://www.kde-apps.org/content/"
-+"show.php?content=10395\">http://www.kde-apps.org/content/show.php?"
-+"content=10395</a>"
-+msgstr ""
-+"您可以在這裡下載 Konference：<a href=\"http://www.kde-apps.org/content/show."
-+"php?content=10395\">http://www.kde-apps.org/content/show.php?content=10395</"
-+"a>"
- 
- #. i18n: file ./plugins/alias/aliasdialogbase.ui line 22
- #: rc.cpp:1453
-@@ -4986,14 +5044,15 @@
- #: rc.cpp:1462
- #, no-c-format
- msgid ""
--"This is the list of custom aliases and the commands that you have already added"
-+"This is the list of custom aliases and the commands that you have already "
-+"added"
- msgstr "這是您已經加入的自訂別名清單，以及它們所對應的命令。"
- 
- #. i18n: file ./plugins/alias/aliasdialogbase.ui line 77
- #: rc.cpp:1465
- #, no-c-format
- msgid "&Add New Alias..."
--msgstr "加入新的別名(&A)..."
-+msgstr "加入新的別名(&A)…"
- 
- #. i18n: file ./plugins/alias/aliasdialogbase.ui line 85
- #: rc.cpp:1468
-@@ -5005,7 +5064,7 @@
- #: rc.cpp:1471
- #, no-c-format
- msgid "Edit Alias..."
--msgstr "編輯別名..."
-+msgstr "編輯別名…"
- 
- #. i18n: file ./plugins/alias/aliasdialog.ui line 16
- #: rc.cpp:1474
-@@ -5031,8 +5090,8 @@
- msgid ""
- "<qt>This is the command that you want to run when you execute this alias.\n"
- "\n"
--"You can use the variables <b>%1, %2 ... %9</b> in your command, and they will "
--"be replaced with the arguments of the alias. The variable <b>%s</b> "
-+"You can use the variables <b>%1, %2 ... %9</b> in your command, and they "
-+"will be replaced with the arguments of the alias. The variable <b>%s</b> "
- "will be replaced with all arguments. <b>%n</b> expands to your nickname.\n"
- "\n"
- "Do not include the '/' in the command (if you do it will be stripped off "
-@@ -5040,8 +5099,8 @@
- msgstr ""
- "<qt>這是當您執行別名時想下的命令。\n"
- "\n"
--"您可以在命令中用變數 <b>%1, %2, ... %9</b>，它們會被取代為別名的參數。<b>%s</b> 則會取代為所有的參數。<b>%n</b> "
--"會被取代為您的暱稱。\n"
-+"您可以在命令中用變數 <b>%1, %2, ... %9</b>，它們會被取代為別名的參數。<b>%s</"
-+"b> 則會取代為所有的參數。<b>%n</b> 會被取代為您的暱稱。\n"
- "\n"
- "命令中不能有斜線 /，它們會被拿掉。</qt>"
- 
-@@ -5066,7 +5125,8 @@
- "This is the alias you are adding (what you will type after the command "
- "identifier, '/'). Do not include the '/' (it will be stripped off if you do "
- "anyway)."
--msgstr "這是您增加的別名（在 / 後面輸入的命令）。請不要有斜線 /，它們會被拿掉。"
-+msgstr ""
-+"這是您增加的別名（在 / 後面輸入的命令）。請不要有斜線 /，它們會被拿掉。"
- 
- #. i18n: file ./plugins/alias/aliasdialog.ui line 123
- #: rc.cpp:1508 rc.cpp:1511
-@@ -5086,14 +5146,15 @@
- #: rc.cpp:1520
- #, no-c-format
- msgid ""
--"<p>The <font size=\"+1\">KopeTeX</font> plugin allows <font size=\"+1\">"
--"Kopet</font>e to render Latex formulas in the chat window. The sender must "
--"enclose the formula between two $ signs. ie: $$formula$$</p>\n"
-+"<p>The <font size=\"+1\">KopeTeX</font> plugin allows <font size=\"+1"
-+"\">Kopet</font>e to render Latex formulas in the chat window. The sender "
-+"must enclose the formula between two $ signs. ie: $$formula$$</p>\n"
- "<p>This plugin requires ImageMagick convert program installed in order to "
- "work.</p>"
- msgstr ""
--"<p><font size=\"+1\">KopeTeX</font> 外掛程式讓 <font size=\"+1\">Kopet</font>"
--"e 可以在聊天視窗中合成出 LaTeX 數學公式。傳送者必須將公式夾在兩個 $$ 之間，即 $$formula$$</p>\n"
-+"<p><font size=\"+1\">KopeTeX</font> 外掛程式讓 <font size=\"+1\">Kopet</"
-+"font>e 可以在聊天視窗中合成出 LaTeX 數學公式。傳送者必須將公式夾在兩個 $$ 之"
-+"間，即 $$formula$$</p>\n"
- "<p>這個外掛程式要能動，必須安裝 ImageMagick 的 convert 程式。</p>"
- 
- #. i18n: file ./plugins/latex/latexprefsbase.ui line 73
-@@ -5144,8 +5205,8 @@
- #: rc.cpp:1548
- #, no-c-format
- msgid ""
--"HTML 4.01 Transitional formatting using ISO-8859-1 (aka. Latin 1) character set "
--"encoding.\n"
-+"HTML 4.01 Transitional formatting using ISO-8859-1 (aka. Latin 1) character "
-+"set encoding.\n"
- "\n"
- "This version should be easily opened by most web browsers."
- msgstr ""
-@@ -5178,7 +5239,8 @@
- msgstr ""
- "結果頁會被格式化為 XHTML 1.0 Strict W3C 推薦格式。字元集為 UTF-8。\n"
- "\n"
--"注意，有些網路瀏覽器不支援 XHTML。您應該確認您的網頁伺服器能正確處理其 MIME 型態，如 application/xhtml+xml。"
-+"注意，有些網路瀏覽器不支援 XHTML。您應該確認您的網頁伺服器能正確處理其 MIME "
-+"型態，如 application/xhtml+xml。"
- 
- #. i18n: file ./plugins/webpresence/webpresenceprefs.ui line 143
- #: rc.cpp:1564
-@@ -5202,7 +5264,7 @@
- #: rc.cpp:1573
- #, no-c-format
- msgid "XML transformation &using this XSLT sheet:"
--msgstr "使用 XSLT 轉換 XML (&U)"
-+msgstr "使用 XSLT 轉換 XML(&U)"
- 
- #. i18n: file ./plugins/webpresence/webpresenceprefs.ui line 200
- #: rc.cpp:1576
-@@ -5280,7 +5342,7 @@
- #: rc.cpp:1623
- #, no-c-format
- msgid "Rename..."
--msgstr "重新命名..."
-+msgstr "重新命名…"
- 
- #. i18n: file ./plugins/highlight/highlightprefsbase.ui line 75
- #: rc.cpp:1626
-@@ -5310,7 +5372,7 @@
- #: protocols/gadu/gaducontact.cpp:204 rc.cpp:1638
- #, no-c-format
- msgid "Edit..."
--msgstr "編輯..."
-+msgstr "編輯…"
- 
- #. i18n: file ./plugins/highlight/highlightprefsbase.ui line 194
- #: rc.cpp:1641
-@@ -5382,7 +5444,7 @@
- #: rc.cpp:1674 rc.cpp:1692
- #, no-c-format
- msgid "Select..."
--msgstr "選擇..."
-+msgstr "選擇…"
- 
- #. i18n: file ./plugins/cryptography/cryptographyuserkey_ui.ui line 73
- #: rc.cpp:1680
-@@ -5406,11 +5468,10 @@
- #: rc.cpp:1698
- #, no-c-format
- msgid ""
--"<qt>Check this box if you want to encrypt outgoing messages with this key, so "
--"that you will be able to decrypt them yourself later."
--"<br>\n"
--"<b>Warning:</b> This can increase the size of messages, and some protocols will "
--"refuse to send your messages because they are too large."
-+"<qt>Check this box if you want to encrypt outgoing messages with this key, "
-+"so that you will be able to decrypt them yourself later.<br>\n"
-+"<b>Warning:</b> This can increase the size of messages, and some protocols "
-+"will refuse to send your messages because they are too large."
- msgstr ""
- "<qt>如果您要以此金鑰將送出的訊息加密，以便您稍候可以自己解密，請勾選此項。"
- "<br> <b>警告：</b>這樣會增加訊息的大小。有些協定會拒絕傳送太大的訊息。</qt>"
-@@ -5473,7 +5534,8 @@
- #: rc.cpp:1732
- #, no-c-format
- msgid ""
--"The number of messages that are shown when browsing history in the chat window"
-+"The number of messages that are shown when browsing history in the chat "
-+"window"
- msgstr "在聊天視窗中保留多少訊息"
- 
- #. i18n: file ./plugins/history/historyprefsui.ui line 59
-@@ -5519,9 +5581,10 @@
- #: rc.cpp:1759
- #, no-c-format
- msgid ""
--"When a new chat is opened, automatically add the last few messages between you "
--"and that contact."
--msgstr "當開啟新的聊天視窗時，會自動將過去您們之間聊天的最後幾筆訊息加入視窗中。"
-+"When a new chat is opened, automatically add the last few messages between "
-+"you and that contact."
-+msgstr ""
-+"當開啟新的聊天視窗時，會自動將過去您們之間聊天的最後幾筆訊息加入視窗中。"
- 
- #. i18n: file ./plugins/history/historyviewer.ui line 55
- #: plugins/history/historydialog.cpp:572 rc.cpp:1765
-@@ -5725,7 +5788,7 @@
- #: rc.cpp:1876
- #, no-c-format
- msgid "&netstat - Standard method of connection status detection"
--msgstr "netstat - 標準偵測連線狀態的方法 (&N)"
-+msgstr "netstat - 標準偵測連線狀態的方法(&N)"
- 
- #. i18n: file ./plugins/smpppdcs/smpppdcsprefs.ui line 80
- #: rc.cpp:1879
-@@ -5787,13 +5850,13 @@
- #: rc.cpp:1909
- #, no-c-format
- msgid "Add a dot at the end of each sent line"
--msgstr "在每一行後面加上一個點"
-+msgstr "在每一列後面加上一個點"
- 
- #. i18n: file ./plugins/autoreplace/autoreplaceprefs.ui line 44
- #: rc.cpp:1912
- #, no-c-format
- msgid "Start each sent line with a capital letter"
--msgstr "在每一行開始的字母轉為大寫"
-+msgstr "在每一列開始的字母轉為大寫"
- 
- #. i18n: file ./plugins/autoreplace/autoreplaceprefs.ui line 54
- #: rc.cpp:1915
-@@ -5843,12 +5906,12 @@
- #, no-c-format
- msgid ""
- "<p>Motion Auto-Away can set you to be away automatically when it does not "
--"detect motion from your webcam or any video4linux device.</p> "
--"<p>It will put you online again when it detects you moving in front of the "
--"camera.</p>"
-+"detect motion from your webcam or any video4linux device.</p> <p>It will put "
-+"you online again when it detects you moving in front of the camera.</p>"
- msgstr ""
--"<p>「動作自動離開」（Motion Auto-Away）可以在您的視訊裝置或任何 video4linux 裝置偵測不到任何動作時，將您自動設為離開。</p> "
--"<p>而當裝置又偵測到您回到攝影機前時，則會自動設為上線。</p>"
-+"<p>「動作自動離開」（Motion Auto-Away）可以在您的視訊裝置或任何 video4linux "
-+"裝置偵測不到任何動作時，將您自動設為離開。</p> <p>而當裝置又偵測到您回到攝影"
-+"機前時，則會自動設為上線。</p>"
- 
- #. i18n: file ./plugins/motionautoaway/motionawayprefs.ui line 55
- #: rc.cpp:1945
-@@ -5994,7 +6057,7 @@
- #: rc.cpp:2035
- #, no-c-format
- msgid "Rena&me..."
--msgstr "重新命名(&M)..."
-+msgstr "重新命名(&M)…"
- 
- #. i18n: file ./protocols/irc/ui/networkconfig.ui line 336
- #: rc.cpp:2038
-@@ -6012,9 +6075,10 @@
- #: rc.cpp:2044
- #, no-c-format
- msgid ""
--"<p><b>Note:</b> Most IRC servers do not require a password, and only a nickname "
--"is required to connect</p>"
--msgstr "<p><b>注意：</b>大部份的 IRC 伺服器不需要密碼，只要有暱稱就可以連線了</p>"
-+"<p><b>Note:</b> Most IRC servers do not require a password, and only a "
-+"nickname is required to connect</p>"
-+msgstr ""
-+"<p><b>注意：</b>大部份的 IRC 伺服器不需要密碼，只要有暱稱就可以連線了</p>"
- 
- #. i18n: file ./protocols/irc/ui/irceditaccount.ui line 109
- #: rc.cpp:2047 rc.cpp:2335 rc.cpp:2656 rc.cpp:3066 rc.cpp:3331 rc.cpp:4037
-@@ -6053,8 +6117,8 @@
- #: rc.cpp:2065
- #, no-c-format
- msgid ""
--"The alias you would like to use on IRC.  You may change this once online with "
--"the /nick command."
-+"The alias you would like to use on IRC.  You may change this once online "
-+"with the /nick command."
- msgstr "您在 IRC 上使用的別名。您可以在線上使用 /nick 命令來修改。"
- 
- #. i18n: file ./protocols/irc/ui/irceditaccount.ui line 183
-@@ -6075,7 +6139,9 @@
- msgid ""
- "The username you would prefer to use on IRC, if your system does not have "
- "identd support.  Leave blank to use your system account name."
--msgstr "如果您的系統沒有 identd 支援，您可以在這裡設定您在 IRC 上使用的使用者名稱。若留白則使用您系統帳號的名稱。"
-+msgstr ""
-+"如果您的系統沒有 identd 支援，您可以在這裡設定您在 IRC 上使用的使用者名稱。若"
-+"留白則使用您系統帳號的名稱。"
- 
- #. i18n: file ./protocols/irc/ui/irceditaccount.ui line 241
- #: rc.cpp:2089
-@@ -6083,7 +6149,8 @@
- msgid ""
- "The username you would prefer to use on IRC, if your system does not have "
- "identd support."
--msgstr "如果您的系統沒有 identd 支援，您可以在這裡設定您在 IRC 上使用的使用者名稱。"
-+msgstr ""
-+"如果您的系統沒有 identd 支援，您可以在這裡設定您在 IRC 上使用的使用者名稱。"
- 
- #. i18n: file ./protocols/irc/ui/irceditaccount.ui line 256
- #: rc.cpp:2095 rc.cpp:4193
-@@ -6095,7 +6162,7 @@
- #: rc.cpp:2098
- #, no-c-format
- msgid "&Edit..."
--msgstr "編輯(&E)..."
-+msgstr "編輯(&E)…"
- 
- #. i18n: file ./protocols/irc/ui/irceditaccount.ui line 350
- #: rc.cpp:2101
-@@ -6130,7 +6197,9 @@
- "If you check that case, the account will not be connected when you press the "
- "\"Connect All\" button, or at startup even if you selected to automatically "
- "connect at startup"
--msgstr "勾選此選項，則在您按下「全部連線」，或是程式剛啟動時，這個帳號不會被連線，即使您設定啟動時自動連線也一樣。"
-+msgstr ""
-+"勾選此選項，則在您按下「全部連線」，或是程式剛啟動時，這個帳號不會被連線，即"
-+"使您設定啟動時自動連線也一樣。"
- 
- #. i18n: file ./protocols/irc/ui/irceditaccount.ui line 409
- #: rc.cpp:2116
-@@ -6162,15 +6231,19 @@
- msgid ""
- "The message you want people to see when you part a channel without giving a "
- "reason. Leave this field blank to use the Kopete default message."
--msgstr "您離開一個頻道而沒有給理由時，其他人會看到的訊息。留白則會使用 Kopete 預設的訊息。"
-+msgstr ""
-+"您離開一個頻道而沒有給理由時，其他人會看到的訊息。留白則會使用 Kopete 預設的"
-+"訊息。"
- 
- #. i18n: file ./protocols/irc/ui/irceditaccount.ui line 490
- #: rc.cpp:2134 rc.cpp:2137
- #, no-c-format
- msgid ""
--"The message you want people to see when you disconnect from IRC without giving "
--"a reason. Leave this field blank to use the Kopete default message."
--msgstr "您離開 IRC 而沒有給理由時，其他人會看到的訊息。留白則會使用 Kopete 預設的訊息。"
-+"The message you want people to see when you disconnect from IRC without "
-+"giving a reason. Leave this field blank to use the Kopete default message."
-+msgstr ""
-+"您離開 IRC 而沒有給理由時，其他人會看到的訊息。留白則會使用 Kopete 預設的訊"
-+"息。"
- 
- #. i18n: file ./protocols/irc/ui/irceditaccount.ui line 522
- #: rc.cpp:2140
-@@ -6261,10 +6334,11 @@
- #, no-c-format
- msgid ""
- "You can use this dialog to add custom replies for when people send CTCP "
--"requests to you. You can also use this dialog to override the built-in replies "
--"for VERSION, USERINFO, and CLIENTINFO."
-+"requests to you. You can also use this dialog to override the built-in "
-+"replies for VERSION, USERINFO, and CLIENTINFO."
- msgstr ""
--"您可以在這個視窗設定當某人送出 CTCP 要求給您時您的回應。這可以覆蓋內建對 VERSION，USERINFO 與 CLIENTINFO 的回應。"
-+"您可以在這個視窗設定當某人送出 CTCP 要求給您時您的回應。這可以覆蓋內建對 "
-+"VERSION，USERINFO 與 CLIENTINFO 的回應。"
- 
- #. i18n: file ./protocols/irc/ui/irceditaccount.ui line 823
- #: rc.cpp:2236
-@@ -6323,7 +6397,9 @@
- "The name of the IRC contact or channel you would like to add.  You may type "
- "simply the text of a person's nickname, or you may type a channel name, "
- "preceded by a pound sign ('#')."
--msgstr "您要加入的 IRC 聯絡人或頻道名稱。您可以只輸入某人的暱稱，或是某個頻道名稱（前面要加上 # 號）。"
-+msgstr ""
-+"您要加入的 IRC 聯絡人或頻道名稱。您可以只輸入某人的暱稱，或是某個頻道名稱（前"
-+"面要加上 # 號）。"
- 
- #. i18n: file ./protocols/irc/ui/ircadd.ui line 79
- #: rc.cpp:2275
-@@ -6332,7 +6408,9 @@
- "The name of the IRC contact or channel you would like to add.  You may type "
- "simply the text of a person's nickname, or you may type a channel name, "
- "preceded by a pound sign ('#')"
--msgstr "您要加入的 IRC 聯絡人或頻道名稱。您可以只輸入某人的暱稱，或是某個頻道名稱（前面要加上 # 號）。"
-+msgstr ""
-+"您要加入的 IRC 聯絡人或頻道名稱。您可以只輸入某人的暱稱，或是某個頻道名稱（前"
-+"面要加上 # 號）。"
- 
- #. i18n: file ./protocols/irc/ui/ircadd.ui line 89
- #: rc.cpp:2278
-@@ -6374,7 +6452,7 @@
- #: rc.cpp:2296
- #, no-c-format
- msgid "Add &new line"
--msgstr "增加新的一行(&N)"
-+msgstr "增加新的一列(&N)"
- 
- #. i18n: file ./protocols/msn/ui/msndebugrawcommand_base.ui line 92
- #: rc.cpp:2299
-@@ -6431,13 +6509,11 @@
- #, no-c-format
- msgid ""
- "To connect to the Microsoft network, you will need a Microsoft Passport."
--"<br>"
--"<br>If you do not currently have a Passport, please click the button to create "
--"one."
-+"<br><br>If you do not currently have a Passport, please click the button to "
-+"create one."
- msgstr ""
--"要連線到 Microsoft 網路，您需要一個 Microsoft Passport。"
--"<br>"
--"<br>如果您還沒有 Passport，請按一下按鈕來建立。"
-+"要連線到 Microsoft 網路，您需要一個 Microsoft Passport。<br><br>如果您還沒有 "
-+"Passport，請按一下按鈕來建立。"
- 
- #. i18n: file ./protocols/msn/ui/msneditaccountui.ui line 113
- #: rc.cpp:2332 rc.cpp:3097 rc.cpp:3364 rc.cpp:3623 rc.cpp:4533
-@@ -6464,15 +6540,17 @@
- #, no-c-format
- msgid ""
- "If you check this checkbox, the account will not be connected when you press "
--"the \"Connect All\" button, or at startup when automatic connection at startup "
--"is enabled."
--msgstr "勾選此選項，則在您按下「全部連線」，或是程式剛啟動時，這個帳號不會被連線，即使您設定啟動時自動連線也一樣。"
-+"the \"Connect All\" button, or at startup when automatic connection at "
-+"startup is enabled."
-+msgstr ""
-+"勾選此選項，則在您按下「全部連線」，或是程式剛啟動時，這個帳號不會被連線，即"
-+"使您設定啟動時自動連線也一樣。"
- 
- #. i18n: file ./protocols/msn/ui/msneditaccountui.ui line 202
- #: rc.cpp:2359 rc.cpp:3349 rc.cpp:3613 rc.cpp:4524
- #, no-c-format
- msgid "Exclu&de from Global Identity"
--msgstr "從通用身份中排除(&D)"
-+msgstr "從通用身分中排除(&D)"
- 
- #. i18n: file ./protocols/msn/ui/msneditaccountui.ui line 214
- #: rc.cpp:2362
-@@ -6502,9 +6580,11 @@
- #: rc.cpp:2374
- #, no-c-format
- msgid ""
--"This option will notify you when a contact starts typing their message, before "
--"the message is sent or finished."
--msgstr "當有人開始鍵入訊息時，本選項會在訊息送出或完成之前就通知您（即：抓別人開您視窗的功能）。"
-+"This option will notify you when a contact starts typing their message, "
-+"before the message is sent or finished."
-+msgstr ""
-+"當有人開始鍵入訊息時，本選項會在訊息送出或完成之前就通知您（即：抓別人開您視"
-+"窗的功能）。"
- 
- #. i18n: file ./protocols/msn/ui/msneditaccountui.ui line 279
- #: rc.cpp:2377
-@@ -6516,22 +6596,21 @@
- #: rc.cpp:2380
- #, no-c-format
- msgid ""
--"<qt>"
--"<p>Indicate when Kopete will download the display pictures of contacts</p>\n"
--"<dl><dt>Only manually</dt><dd>The picture is not downloaded automatically. It "
--"is only downloaded when the user requests it</dd>\n"
--"<dt>When a chat is open</dt><dd>The picture is downloaded when a conversation "
--"socket is opened, i.e. when you open a chat window</dd>\n"
--"<dt>Automatically</dt><dd>Always try to download the picture if the contact has "
--"one.  <b>Note:</b> this will open a socket, and let the user know you are "
--"downloading their picture.</dd></dl>"
-+"<qt><p>Indicate when Kopete will download the display pictures of contacts</"
-+"p>\n"
-+"<dl><dt>Only manually</dt><dd>The picture is not downloaded automatically. "
-+"It is only downloaded when the user requests it</dd>\n"
-+"<dt>When a chat is open</dt><dd>The picture is downloaded when a "
-+"conversation socket is opened, i.e. when you open a chat window</dd>\n"
-+"<dt>Automatically</dt><dd>Always try to download the picture if the contact "
-+"has one.  <b>Note:</b> this will open a socket, and let the user know you "
-+"are downloading their picture.</dd></dl>"
- msgstr ""
--"<qt>"
--"<p>指示 Kopete 何時下載此聯絡人的圖片。</p>\n"
-+"<qt><p>指示 Kopete 何時下載此聯絡人的圖片。</p>\n"
- "<dl><dt>手動</dt><dd>不會自動下載圖片。只有在使用者要求時下載。</dd>\n"
- "<dt>聊天視窗開啟時</dt><dd>當開啟聊天對話時下載圖片。</dd>\n"
--"<dt>自動</dt><dd>聯絡人有設定顯示圖片就下載。<b>注意：</b>這會建立一個 socket，並讓使用者知道您正在下載他們的圖片。</dd>"
--"</dl>"
-+"<dt>自動</dt><dd>聯絡人有設定顯示圖片就下載。<b>注意：</b>這會建立一個 "
-+"socket，並讓使用者知道您正在下載他們的圖片。</dd></dl>"
- 
- #. i18n: file ./protocols/msn/ui/msneditaccountui.ui line 291
- #: rc.cpp:2386
-@@ -6555,22 +6634,20 @@
- #: rc.cpp:2395
- #, no-c-format
- msgid ""
--"<qt>"
--"<p>Indicate when Kopete will download the pictures of contacts</p>\n"
--"<dl><dt>Only manually</dt><dd>The picture is not downloaded automatically. It "
--"is only downloaded when the user requests it</dd>\n"
--"<dt>When a chat is open</dt><dd>The picture is downloaded when a conversation "
--"socket is opened, i.e. when you open a chat window</dd>\n"
--"<dt>Automatically</dt><dd>Always try to download the picture if the contact has "
--"one.  <b>Note:</b> this will open a socket, and let the user know you are "
--"downloading their picture.</dd></dl>"
-+"<qt><p>Indicate when Kopete will download the pictures of contacts</p>\n"
-+"<dl><dt>Only manually</dt><dd>The picture is not downloaded automatically. "
-+"It is only downloaded when the user requests it</dd>\n"
-+"<dt>When a chat is open</dt><dd>The picture is downloaded when a "
-+"conversation socket is opened, i.e. when you open a chat window</dd>\n"
-+"<dt>Automatically</dt><dd>Always try to download the picture if the contact "
-+"has one.  <b>Note:</b> this will open a socket, and let the user know you "
-+"are downloading their picture.</dd></dl>"
- msgstr ""
--"<qt>"
--"<p>指示 Kopete 何時下載此聯絡人的圖片。</p>\n"
-+"<qt><p>指示 Kopete 何時下載此聯絡人的圖片。</p>\n"
- "<dl><dt>手動</dt><dd>不會自動下載圖片。只有在使用者要求時下載。</dd>\n"
- "<dt>聊天視窗開啟時</dt><dd>當開啟聊天對話時下載圖片。</dd>\n"
--"<dt>自動</dt><dd>聯絡人有設定顯示圖片就下載。<b>注意：</b>這會建立一個 socket，並讓使用者知道您正在下載他們的圖片。</dd>"
--"</dl>"
-+"<dt>自動</dt><dd>聯絡人有設定顯示圖片就下載。<b>注意：</b>這會建立一個 "
-+"socket，並讓使用者知道您正在下載他們的圖片。</dd></dl>"
- 
- #. i18n: file ./protocols/msn/ui/msneditaccountui.ui line 332
- #: rc.cpp:2401
-@@ -6582,9 +6659,11 @@
- #: rc.cpp:2404
- #, no-c-format
- msgid ""
--"MSN Messenger allows users to download and use custom emoticons. If this option "
--"is enabled, Kopete will download these emoticons and show them."
--msgstr "MSN 允許使用者下載並使用自訂的表情圖示。如果開啟此選項，則 Kopete 會下載這些表情圖示並顯示。"
-+"MSN Messenger allows users to download and use custom emoticons. If this "
-+"option is enabled, Kopete will download these emoticons and show them."
-+msgstr ""
-+"MSN 允許使用者下載並使用自訂的表情圖示。如果開啟此選項，則 Kopete 會下載這些"
-+"表情圖示並顯示。"
- 
- #. i18n: file ./protocols/msn/ui/msneditaccountui.ui line 346
- #: rc.cpp:2407
-@@ -6604,7 +6683,8 @@
- msgid ""
- "Export all the emoticon themes as custom emoticons.\n"
- "Only works for emoticons in the PNG format."
--msgstr "將全部的表情圖示主題匯出成自定的表情圖示。只對 PNG 格式的表情圖示有效。"
-+msgstr ""
-+"將全部的表情圖示主題匯出成自定的表情圖示。只對 PNG 格式的表情圖示有效。"
- 
- #. i18n: file ./protocols/msn/ui/msneditaccountui.ui line 363
- #: rc.cpp:2417
-@@ -6624,7 +6704,8 @@
- msgid ""
- "<qt>Make it possible for your contacts to detect if you are using Kopete."
- "<br>We recommend leaving this checked.</qt>"
--msgstr "<qt>讓您的聯絡人能偵測到您正在使用 Kopete。<br> 我們建議您勾選此選項。</qt>"
-+msgstr ""
-+"<qt>讓您的聯絡人能偵測到您正在使用 Kopete。<br> 我們建議您勾選此選項。</qt>"
- 
- #. i18n: file ./protocols/msn/ui/msneditaccountui.ui line 389
- #: rc.cpp:2426
-@@ -6633,7 +6714,9 @@
- "Third party MSN clients, such as Kopete, give users the ability to let other "
- "third party clients guess which client they are using. We recommend leaving "
- "this checkbox checked."
--msgstr "非官方 MSN 客戶端，像是 Kopete，賦與使用者讓其他客戶端猜測所使用的客戶端的能力。我們建議您勾選此選項。"
-+msgstr ""
-+"非官方 MSN 客戶端，像是 Kopete，賦與使用者讓其他客戶端猜測所使用的客戶端的能"
-+"力。我們建議您勾選此選項。"
- 
- #. i18n: file ./protocols/msn/ui/msneditaccountui.ui line 400
- #: rc.cpp:2429
-@@ -6645,10 +6728,12 @@
- #: rc.cpp:2432
- #, no-c-format
- msgid ""
--"<qt>Check this box to send <b>Typing notifications</b> "
--"to your contacts. When you are composing a message, you might want your contact "
--"to know that you are typing so that he knows you are answering.</qt>"
--msgstr "<qt>勾選此選項，以送出<b>輸入通知</b>給聯絡人。當您正輸入訊息時，對方可以知道您正在打字與回覆中。</qt>"
-+"<qt>Check this box to send <b>Typing notifications</b> to your contacts. "
-+"When you are composing a message, you might want your contact to know that "
-+"you are typing so that he knows you are answering.</qt>"
-+msgstr ""
-+"<qt>勾選此選項，以送出<b>輸入通知</b>給聯絡人。當您正輸入訊息時，對方可以知道"
-+"您正在打字與回覆中。</qt>"
- 
- #. i18n: file ./protocols/msn/ui/msneditaccountui.ui line 422
- #: rc.cpp:2435
-@@ -6660,9 +6745,11 @@
- #: rc.cpp:2438 rc.cpp:2441
- #, no-c-format
- msgid ""
--"If you have a Jabber account, you may let Jabber users on an MSN gateway know "
--"that you are also using Jabber."
--msgstr "如果您有 Jabber 帳號，您可以讓在 MSN 閘道的 Jabber 使用者，知道您也使用 Jabber。"
-+"If you have a Jabber account, you may let Jabber users on an MSN gateway "
-+"know that you are also using Jabber."
-+msgstr ""
-+"如果您有 Jabber 帳號，您可以讓在 MSN 閘道的 Jabber 使用者，知道您也使用 "
-+"Jabber。"
- 
- #. i18n: file ./protocols/msn/ui/msneditaccountui.ui line 483
- #: rc.cpp:2444
-@@ -6730,7 +6817,7 @@
- #: rc.cpp:2480
- #, no-c-format
- msgid "&Select Image..."
--msgstr "選擇影像(&S)..."
-+msgstr "選擇影像(&S)…"
- 
- #. i18n: file ./protocols/msn/ui/msneditaccountui.ui line 837
- #: rc.cpp:2483
-@@ -6748,16 +6835,15 @@
- #: rc.cpp:2489
- #, no-c-format
- msgid ""
--"<i>Italics</i> contacts are not on your contact list."
-+"<i>Italics</i> contacts are not on your contact list.<br>\n"
- "<br>\n"
--"<br>\n"
--"<b>Bold</b> contacts are in your contact list but you are not in their contact "
--"list."
-+"<b>Bold</b> contacts are in your contact list but you are not in their "
-+"contact list."
- msgstr ""
--"以<i>斜體</i>表示的聯絡人，代表沒在您的聯絡人清單中。"
--"<br>\n"
-+"以<i>斜體</i>表示的聯絡人，代表沒在您的聯絡人清單中。<br>\n"
- "<br>\n"
--"以<b>粗體</b>表示的聯絡人，代表他們在您的聯絡人清單中，但您不在他們的聯絡人清單中。"
-+"以<b>粗體</b>表示的聯絡人，代表他們在您的聯絡人清單中，但您不在他們的聯絡人清"
-+"單中。"
- 
- #. i18n: file ./protocols/msn/ui/msneditaccountui.ui line 879
- #: rc.cpp:2494
-@@ -6793,9 +6879,11 @@
- #: rc.cpp:2509
- #, no-c-format
- msgid ""
--"Checking this box will block all users not explicitly shown in the allowed list "
--"here, including any contacts not on your contact list."
--msgstr "勾選這個方塊會封鎖所有沒在允許清單中的使用者，包含沒在您的聯絡人清單上的聯絡人。"
-+"Checking this box will block all users not explicitly shown in the allowed "
-+"list here, including any contacts not on your contact list."
-+msgstr ""
-+"勾選這個方塊會封鎖所有沒在允許清單中的使用者，包含沒在您的聯絡人清單上的聯絡"
-+"人。"
- 
- #. i18n: file ./protocols/msn/ui/msneditaccountui.ui line 1042
- #: rc.cpp:2512
-@@ -6890,12 +6978,14 @@
- msgid ""
- "If you are behind a firewall, you may specify a base port to use for the "
- "incoming connection, and configure your firewall to accept connections on a "
--"range of 10 ports, starting at this one. Incoming connections are used for the "
--"webcam. If you don't specify a port yourself, the operating system will choose "
--"an available port for you. It is recommended to leave the checkbox unchecked."
--msgstr ""
--"如果您在防火牆後面，您可以指定要接收連線的連接埠，並將您的防火牆設定為接受此連接埠的連線。這個連線用在視訊。如果您未指定連接埠，系統會自己選擇可用的連接埠。建議"
--"您不要勾選此選項。"
-+"range of 10 ports, starting at this one. Incoming connections are used for "
-+"the webcam. If you don't specify a port yourself, the operating system will "
-+"choose an available port for you. It is recommended to leave the checkbox "
-+"unchecked."
-+msgstr ""
-+"如果您在防火牆後面，您可以指定要接收連線的連接埠，並將您的防火牆設定為接受此"
-+"連接埠的連線。這個連線用在視訊。如果您未指定連接埠，系統會自己選擇可用的連接"
-+"埠。建議您不要勾選此選項。"
- 
- #. i18n: file ./protocols/msn/ui/msninfo.ui line 46
- #: rc.cpp:2571
-@@ -7025,8 +7115,8 @@
- #: rc.cpp:2641 rc.cpp:2647
- #, no-c-format
- msgid ""
--"The telephone number of the contact.  This should be a number with SMS service "
--"available."
-+"The telephone number of the contact.  This should be a number with SMS "
-+"service available."
- msgstr "聯絡人的電話號碼。這應該是可以使用 SMS 服務的號碼。"
- 
- #. i18n: file ./protocols/sms/ui/smsactprefs.ui line 25
-@@ -7127,7 +7217,8 @@
- "automatically, cancel the message from being sent entirely, or have Kopete "
- "prompt you each time you enter a message that is too long."
- msgstr ""
--"如果您輸入的訊息太長，無法放在一個 SMS 訊息中時要怎麼做。您可以選擇要自動切成多筆小的訊息，取消該訊息，或是讓 Kopete 每次都提醒您。"
-+"如果您輸入的訊息太長，無法放在一個 SMS 訊息中時要怎麼做。您可以選擇要自動切成"
-+"多筆小的訊息，取消該訊息，或是讓 Kopete 每次都提醒您。"
- 
- #. i18n: file ./protocols/sms/ui/smsactprefs.ui line 265
- #: rc.cpp:2716
-@@ -7163,9 +7254,12 @@
- #: rc.cpp:2737
- #, no-c-format
- msgid ""
--"Check if you would like to enable phone number internationalization.  Without "
--"this option, you will only be able to use SMS for accounts within your country."
--msgstr "勾選此選項以將電話號碼國際化。不選擇此選項的話，您只能對自己國家的帳號使用 SMS。"
-+"Check if you would like to enable phone number internationalization.  "
-+"Without this option, you will only be able to use SMS for accounts within "
-+"your country."
-+msgstr ""
-+"勾選此選項以將電話號碼國際化。不選擇此選項的話，您只能對自己國家的帳號使用 "
-+"SMS。"
- 
- #. i18n: file ./protocols/sms/ui/smsactprefs.ui line 328
- #: rc.cpp:2740
-@@ -7343,18 +7437,20 @@
- #: rc.cpp:2887
- #, no-c-format
- msgid ""
--"This field contains an image with number that you need to type into the <b>"
--"Verification Sequence</b> field above."
-+"This field contains an image with number that you need to type into the "
-+"<b>Verification Sequence</b> field above."
- msgstr "這個欄位包含您要輸入到上方<b>檢查序列</b>欄位的數字的圖片。"
- 
- #. i18n: file ./protocols/gadu/ui/gaduregisteraccountui.ui line 375
- #: rc.cpp:2890
- #, no-c-format
- msgid ""
--"<i>Type the letters and numbers shown in the image above into the <b>"
--"Verification Sequence</b> field.  This is used to prevent automated "
-+"<i>Type the letters and numbers shown in the image above into the "
-+"<b>Verification Sequence</b> field.  This is used to prevent automated "
- "registration abuse.</i>"
--msgstr "<i>將上方影像中顯示的字母與數字輸入到<b>檢查序列</b>欄位中。這是為了避免被攻擊。</i>"
-+msgstr ""
-+"<i>將上方影像中顯示的字母與數字輸入到<b>檢查序列</b>欄位中。這是為了避免被攻"
-+"擊。</i>"
- 
- #. i18n: file ./protocols/gadu/ui/gaduadd.ui line 40
- #: rc.cpp:2893 rc.cpp:3069
-@@ -7372,9 +7468,11 @@
- #: rc.cpp:2899 rc.cpp:2905
- #, no-c-format
- msgid ""
--"The user ID of the Gadu-Gadu account you would like to add.  This should be in "
--"the form of a number (no decimals, no spaces).  This field is mandatory."
--msgstr "您要新增的 Gadu-Gadu 帳號的使用者代碼。這應該是以數字組成（沒有空白與小數點）。這個欄位必須輸入。"
-+"The user ID of the Gadu-Gadu account you would like to add.  This should be "
-+"in the form of a number (no decimals, no spaces).  This field is mandatory."
-+msgstr ""
-+"您要新增的 Gadu-Gadu 帳號的使用者代碼。這應該是以數字組成（沒有空白與小數"
-+"點）。這個欄位必須輸入。"
- 
- #. i18n: file ./protocols/gadu/ui/gaduadd.ui line 79
- #: rc.cpp:2908
-@@ -7398,8 +7496,8 @@
- #: rc.cpp:2917 rc.cpp:2959
- #, no-c-format
- msgid ""
--"The forename (first name) of the contact you wish to add.  Optionally this may "
--"include a middle name."
-+"The forename (first name) of the contact you wish to add.  Optionally this "
-+"may include a middle name."
- msgstr "您要新增的聯絡人的名字。這可以包含中間教名（middle name）。"
- 
- #. i18n: file ./protocols/gadu/ui/gaduadd.ui line 129
-@@ -7449,8 +7547,8 @@
- #: rc.cpp:2989 rc.cpp:2992
- #, no-c-format
- msgid ""
--"Check if you want to exclude this contact from the \"Just for friends\" status "
--"mode."
-+"Check if you want to exclude this contact from the \"Just for friends\" "
-+"status mode."
- msgstr "勾選此選項，在您設定為「只顯示好友」模式時，則對此聯絡人顯示離線。"
- 
- #. i18n: file ./protocols/gadu/ui/gaduadd.ui line 323
-@@ -7525,7 +7623,9 @@
- "Set status to invisible, which will hide your presence from other users (who "
- "will see you as offline).  However you may still chat, and see the online "
- "presence of others."
--msgstr "將您的狀態設定為「隱身」，讓其他使用者看不到您。然而您還是可以開啟聊天，也可以看到其他上線的聯絡人。"
-+msgstr ""
-+"將您的狀態設定為「隱身」，讓其他使用者看不到您。然而您還是可以開啟聊天，也可"
-+"以看到其他上線的聯絡人。"
- 
- #. i18n: file ./protocols/gadu/ui/gaduawayui.ui line 128
- #: rc.cpp:3039 rc.cpp:3042
-@@ -7567,8 +7667,8 @@
- #: rc.cpp:3075 rc.cpp:3081
- #, no-c-format
- msgid ""
--"The user ID of your Gadu-Gadu account.  This should be in the form of a number "
--"(no decimals, no spaces)."
-+"The user ID of your Gadu-Gadu account.  This should be in the form of a "
-+"number (no decimals, no spaces)."
- msgstr "您的 Gadu-Gadu 使用者代號。應該是一串數字（沒有空白與小數點）。"
- 
- #. i18n: file ./protocols/gadu/ui/gadueditaccountui.ui line 125
-@@ -7577,20 +7677,20 @@
- msgid ""
- "Check to disable automatic connection.  If checked, you may connect to this "
- "account manually using the icon in the bottom of the main Kopete window."
--msgstr "勾選此選項以關閉自動連線。您還是可以利用 Kopete 主視窗底下的圖示按鈕來手動連線。"
-+msgstr ""
-+"勾選此選項以關閉自動連線。您還是可以利用 Kopete 主視窗底下的圖示按鈕來手動連"
-+"線。"
- 
- #. i18n: file ./protocols/gadu/ui/gadueditaccountui.ui line 169
- #: rc.cpp:3093
- #, no-c-format
- msgid ""
- "To connect to the Gadu-Gadu network, you will need a Gadu-Gadu account."
--"<br>"
--"<br>\n"
--"If you do not currently have an account, please click the button to create one."
-+"<br><br>\n"
-+"If you do not currently have an account, please click the button to create "
-+"one."
- msgstr ""
--"要連線到 Gadu-Gadu 網路，您需要一個 Gadu-Gadu 帳號。"
--"<br>"
--"<br>\n"
-+"要連線到 Gadu-Gadu 網路，您需要一個 Gadu-Gadu 帳號。<br><br>\n"
- "如果您目前沒有帳號，請按此按鈕來建立。"
- 
- #. i18n: file ./protocols/gadu/ui/gadueditaccountui.ui line 186
-@@ -7615,17 +7715,19 @@
- #: rc.cpp:3118 rc.cpp:3133
- #, no-c-format
- msgid ""
--"Whether or not you want to enable SSL encrypted communication with the server."
-+"Whether or not you want to enable SSL encrypted communication with the "
-+"server."
- msgstr "您是否要開啟 SSL 加密通訊。"
- 
- #. i18n: file ./protocols/gadu/ui/gadueditaccountui.ui line 288
- #: rc.cpp:3121 rc.cpp:3136
- #, no-c-format
- msgid ""
--"Whether or not you want to enable SSL encrypted communication with the server.  "
--"Note that this is not end-to-end encryption, but rather encrypted communication "
--"with the server."
--msgstr "您是否要開啟 SSL 加密通訊。注意這不是點對點的加密，而是與伺服器的通訊加密。"
-+"Whether or not you want to enable SSL encrypted communication with the "
-+"server.  Note that this is not end-to-end encryption, but rather encrypted "
-+"communication with the server."
-+msgstr ""
-+"您是否要開啟 SSL 加密通訊。注意這不是點對點的加密，而是與伺服器的通訊加密。"
- 
- #. i18n: file ./protocols/gadu/ui/gadueditaccountui.ui line 294
- #: rc.cpp:3124
-@@ -7657,14 +7759,15 @@
- #: rc.cpp:3145
- #, no-c-format
- msgid ""
--"This option is used whenever the primary Gadu-Gadu load-balancing server fails. "
--" If this is checked, Kopete will try to connect to the actual servers directly "
--"using cached information about them.  This prevents connection errors when the "
--"main load-balancing server does not answer. In practice it only helps very "
--"rarely."
--msgstr ""
--"這個選項是在 Gadu-Gadu 負載平衡伺服器失效時使用。如果勾選此選項，Kopete "
--"會利用保留的快取伺服器資訊，直接連到實際使用的伺服器。這只在負載平衡伺服器失效時比較有用，其他時間很少用到。"
-+"This option is used whenever the primary Gadu-Gadu load-balancing server "
-+"fails.  If this is checked, Kopete will try to connect to the actual servers "
-+"directly using cached information about them.  This prevents connection "
-+"errors when the main load-balancing server does not answer. In practice it "
-+"only helps very rarely."
-+msgstr ""
-+"這個選項是在 Gadu-Gadu 負載平衡伺服器失效時使用。如果勾選此選項，Kopete 會利"
-+"用保留的快取伺服器資訊，直接連到實際使用的伺服器。這只在負載平衡伺服器失效時"
-+"比較有用，其他時間很少用到。"
- 
- #. i18n: file ./protocols/gadu/ui/gadueditaccountui.ui line 353
- #: rc.cpp:3148
-@@ -7770,11 +7873,11 @@
- #: rc.cpp:3199
- #, no-c-format
- msgid ""
--"<qt><p align=\"center\"><font color=\"#ff0000\">These options affect <b>all</b> "
--"Gadu-Gadu accounts.</font></p></qt>"
-+"<qt><p align=\"center\"><font color=\"#ff0000\">These options affect <b>all</"
-+"b> Gadu-Gadu accounts.</font></p></qt>"
- msgstr ""
--"<qt><p align=\"center\"><font color=\"#ff0000\">這些選項會影響<b>所有</b>"
--"的 Gadu-Gadu 帳號。</font></p></qt>"
-+"<qt><p align=\"center\"><font color=\"#ff0000\">這些選項會影響<b>所有</b>的 "
-+"Gadu-Gadu 帳號。</font></p></qt>"
- 
- #. i18n: file ./protocols/gadu/ui/gadueditaccountui.ui line 684
- #: rc.cpp:3202
-@@ -7962,21 +8065,20 @@
- msgid ""
- "The screen name of your AIM account.  This should be in the form of an "
- "alphanumeric string (spaces allowed, not case sensitive)."
--msgstr "您的 AIM 帳號的螢幕名稱。這應該是一串由字母與數字組成的字串（允許空白，不分大小寫）。"
-+msgstr ""
-+"您的 AIM 帳號的螢幕名稱。這應該是一串由字母與數字組成的字串（允許空白，不分大"
-+"小寫）。"
- 
- #. i18n: file ./protocols/oscar/aim/ui/aimeditaccountui.ui line 175
- #: rc.cpp:3361
- #, no-c-format
- msgid ""
--"To connect to the AOL Instant Messaging network, you will need to use a screen "
--"name from AIM, AOL, or .Mac."
--"<br>"
--"<br>If you do not currently have an AIM screen name, please click the button to "
--"create one."
-+"To connect to the AOL Instant Messaging network, you will need to use a "
-+"screen name from AIM, AOL, or .Mac.<br><br>If you do not currently have an "
-+"AIM screen name, please click the button to create one."
- msgstr ""
- "要連接到 AOL 即時通訊（AIM）網路，您必須使用從AIM、AOL 或 .Mac 的螢幕名稱。"
--"<br>"
--"<br> 如果您目前沒有 AIM 螢幕名稱，請按此鍵以建立。"
-+"<br><br> 如果您目前沒有 AIM 螢幕名稱，請按此鍵以建立。"
- 
- #. i18n: file ./protocols/oscar/aim/ui/aimeditaccountui.ui line 215
- #: rc.cpp:3367 rc.cpp:3626
-@@ -7994,9 +8096,11 @@
- #: rc.cpp:3382 rc.cpp:3391
- #, no-c-format
- msgid ""
--"The IP address or hostmask of the AIM server you wish to connect to.  Normally "
--"you will want the default (login.oscar.aol.com)."
--msgstr "您要連接的 AIM 伺服器的 IP 位址或主機遮罩。通常您只需要使用預設主機（login.oscar.aol.com）。"
-+"The IP address or hostmask of the AIM server you wish to connect to.  "
-+"Normally you will want the default (login.oscar.aol.com)."
-+msgstr ""
-+"您要連接的 AIM 伺服器的 IP 位址或主機遮罩。通常您只需要使用預設主機（login."
-+"oscar.aol.com）。"
- 
- #. i18n: file ./protocols/oscar/aim/ui/aimeditaccountui.ui line 279
- #: rc.cpp:3385
-@@ -8020,8 +8124,8 @@
- #: rc.cpp:3400 rc.cpp:3406
- #, no-c-format
- msgid ""
--"The port on the AIM server that you would like to connect to.  Normally this is "
--"5190."
-+"The port on the AIM server that you would like to connect to.  Normally this "
-+"is 5190."
- msgstr "您要連接到 AIM 伺服器使用的連接埠。通常是 5190。"
- 
- #. i18n: file ./protocols/oscar/aim/ui/aimeditaccountui.ui line 368
-@@ -8262,10 +8366,13 @@
- #: rc.cpp:3562
- #, no-c-format
- msgid ""
--"This is where the results from your search are displayed. If you double-click a "
--"result, the search window will close and pass the UIN of the contact you wish "
--"to add back to the Add Contact Wizard. You can only add one contact at a time."
--msgstr "這裡是您搜尋結果顯示的地方。如果您雙擊顯示結果，則搜尋視窗會關閉，並將您要新增的 UIN 傳送給新增聯絡人精靈。一次只能新增一個聯絡人。"
-+"This is where the results from your search are displayed. If you double-"
-+"click a result, the search window will close and pass the UIN of the contact "
-+"you wish to add back to the Add Contact Wizard. You can only add one contact "
-+"at a time."
-+msgstr ""
-+"這裡是您搜尋結果顯示的地方。如果您雙擊顯示結果，則搜尋視窗會關閉，並將您要新"
-+"增的 UIN 傳送給新增聯絡人精靈。一次只能新增一個聯絡人。"
- 
- #. i18n: file ./protocols/oscar/icq/ui/icqsearchbase.ui line 440
- #: rc.cpp:3565 rc.cpp:3803 rc.cpp:4740 rc.cpp:5048
-@@ -8339,15 +8446,11 @@
- #: rc.cpp:3619
- #, no-c-format
- msgid ""
--"To connect to the ICQ network, you will need an ICQ account."
--"<br>"
--"<br>\n"
--"If you do not currently have an ICQ account, please click the button to create "
--"one."
-+"To connect to the ICQ network, you will need an ICQ account.<br><br>\n"
-+"If you do not currently have an ICQ account, please click the button to "
-+"create one."
- msgstr ""
--"要連線到 ICQ 網路，您需要一個 ICQ 帳號。"
--"<br>"
--"<br>\n"
-+"要連線到 ICQ 網路，您需要一個 ICQ 帳號。<br><br>\n"
- "如果您目前沒有 ICQ 帳號，請按此鍵以建立。"
- 
- #. i18n: file ./protocols/oscar/icq/ui/icqeditaccountui.ui line 234
-@@ -8360,8 +8463,8 @@
- #: rc.cpp:3635 rc.cpp:3653
- #, no-c-format
- msgid ""
--"The port on the ICQ server that you would like to connect to.  Normally this is "
--"5190."
-+"The port on the ICQ server that you would like to connect to.  Normally this "
-+"is 5190."
- msgstr "您要連線的 ICQ 伺服器的連接埠。通常是 5190。"
- 
- #. i18n: file ./protocols/oscar/icq/ui/icqeditaccountui.ui line 248
-@@ -8380,9 +8483,11 @@
- #: rc.cpp:3644 rc.cpp:3662
- #, no-c-format
- msgid ""
--"The IP address or hostmask of the ICQ server you wish to connect to.  Normally "
--"you will want the default (login.icq.com)."
--msgstr "您要連線的 ICQ 伺服器的 IP 位址或主機遮罩。通常使用預設值（login.icq.com）即可。"
-+"The IP address or hostmask of the ICQ server you wish to connect to.  "
-+"Normally you will want the default (login.icq.com)."
-+msgstr ""
-+"您要連線的 ICQ 伺服器的 IP 位址或主機遮罩。通常使用預設值（login.icq.com）即"
-+"可。"
- 
- #. i18n: file ./protocols/oscar/icq/ui/icqeditaccountui.ui line 312
- #: rc.cpp:3668
-@@ -8412,7 +8517,9 @@
- "their contact list without authorization from you.  Check this box, and you "
- "will have to confirm any users who add you to their list before they may see "
- "your online status."
--msgstr "開啟此選項，避免其他人未經您同意就將您加入聯絡人。勾選此選項，在您尚未確認之前，他們將看不到您上線。"
-+msgstr ""
-+"開啟此選項，避免其他人未經您同意就將您加入聯絡人。勾選此選項，在您尚未確認之"
-+"前，他們將看不到您上線。"
- 
- #. i18n: file ./protocols/oscar/icq/ui/icqeditaccountui.ui line 337
- #: rc.cpp:3680
-@@ -8433,7 +8540,9 @@
- msgid ""
- "Checking this box will not allow people to see what your IP address if they "
- "view your ICQ user details such as name, address, or age."
--msgstr "勾選此選項，其他人在檢視您的 ICQ 使用者詳情如名稱、地址、年紀時，無法看到您的 IP 位址。"
-+msgstr ""
-+"勾選此選項，其他人在檢視您的 ICQ 使用者詳情如名稱、地址、年紀時，無法看到您"
-+"的 IP 位址。"
- 
- #. i18n: file ./protocols/oscar/icq/ui/icqeditaccountui.ui line 351
- #: rc.cpp:3689
-@@ -8451,11 +8560,12 @@
- #: rc.cpp:3695
- #, no-c-format
- msgid ""
--"Check this box to enable ICQ's Web Aware functionality, which allows people to "
--"see your online status from ICQ's web page, and send you a message without "
--"necessarily having ICQ themselves."
-+"Check this box to enable ICQ's Web Aware functionality, which allows people "
-+"to see your online status from ICQ's web page, and send you a message "
-+"without necessarily having ICQ themselves."
- msgstr ""
--"勾選此選項以開啟 ICQ 的網頁連線（Web Aware）功能，讓其他人可以透過 ICQ 的網頁看到您的線上狀態，並送訊息給您，不需要安裝 ICQ。"
-+"勾選此選項以開啟 ICQ 的網頁連線（Web Aware）功能，讓其他人可以透過 ICQ 的網頁"
-+"看到您的線上狀態，並送訊息給您，不需要安裝 ICQ。"
- 
- #. i18n: file ./protocols/oscar/icq/ui/icqgeneralinfo.ui line 24
- #: rc.cpp:3701
-@@ -8605,7 +8715,7 @@
- #: rc.cpp:3794
- #, no-c-format
- msgid "Some reason..."
--msgstr "某些理由..."
-+msgstr "某些理由…"
- 
- #. i18n: file ./protocols/oscar/icq/ui/icqadd.ui line 38
- #: rc.cpp:3797
-@@ -8679,8 +8789,8 @@
- #: rc.cpp:3845 rc.cpp:3851
- #, no-c-format
- msgid ""
--"The account name of the Yahoo account you would like to add.  This should be in "
--"the form of an alphanumeric string (no spaces)."
-+"The account name of the Yahoo account you would like to add.  This should be "
-+"in the form of an alphanumeric string (no spaces)."
- msgstr "您要加入的 Yahoo 帳號名稱。應該是字母與數字組成的字串（不含空白）。"
- 
- #. i18n: file ./protocols/yahoo/ui/yahooadd.ui line 71
-@@ -8855,8 +8965,7 @@
- #: rc.cpp:4025
- #, no-c-format
- msgid ""
--"Your Account has to be verified because of too many false login attempts."
--"<br>"
-+"Your Account has to be verified because of too many false login attempts.<br>"
- msgstr "必須檢查您的帳號，因為有太多登入失敗的紀錄。<br>"
- 
- #. i18n: file ./protocols/yahoo/ui/yahooverifyaccountbase.ui line 46
-@@ -8891,7 +9000,8 @@
- msgid ""
- "Check to disable automatic connection.  If checked, you may connect to this "
- "account manually using the icon in the bottom of the main Kopete window"
--msgstr "勾選此選項關閉自動連線。您還是可以用 Kopete 主視窗底下的圖示按鈕來手動連線。"
-+msgstr ""
-+"勾選此選項關閉自動連線。您還是可以用 Kopete 主視窗底下的圖示按鈕來手動連線。"
- 
- #. i18n: file ./protocols/yahoo/ui/yahooeditaccountbase.ui line 114
- #: rc.cpp:4061
-@@ -8903,11 +9013,12 @@
- #: rc.cpp:4067
- #, no-c-format
- msgid ""
--"To connect to the Yahoo network, you will need a Yahoo account."
--"<br>"
--"<br>If you do not currently have a Yahoo account, please click the button to "
--"create one."
--msgstr "要連線到 Yahoo 網路，您需要一個 Yahoo 帳號。<br><br> 如果您沒有 Yahoo 帳號，請按此鍵以建立。"
-+"To connect to the Yahoo network, you will need a Yahoo account.<br><br>If "
-+"you do not currently have a Yahoo account, please click the button to create "
-+"one."
-+msgstr ""
-+"要連線到 Yahoo 網路，您需要一個 Yahoo 帳號。<br><br> 如果您沒有 Yahoo 帳號，"
-+"請按此鍵以建立。"
- 
- #. i18n: file ./protocols/yahoo/ui/yahooeditaccountbase.ui line 171
- #: rc.cpp:4070
-@@ -8939,7 +9050,9 @@
- msgid ""
- "The IP address or hostmask of the Yahoo server you wish to connect to.  "
- "Normally you will want the default (scs.msg.yahoo.com)."
--msgstr "您要連線的 Yahoo 伺服器的 IP 位址或主機遮罩。通常使用預設值（scs.msg.yahoo.com）即可。"
-+msgstr ""
-+"您要連線的 Yahoo 伺服器的 IP 位址或主機遮罩。通常使用預設值（scs.msg.yahoo."
-+"com）即可。"
- 
- #. i18n: file ./protocols/yahoo/ui/yahooeditaccountbase.ui line 287
- #: rc.cpp:4097
-@@ -8957,9 +9070,12 @@
- #: rc.cpp:4112 rc.cpp:4118
- #, no-c-format
- msgid ""
--"The port on the Yahoo server that you would like to connect to.  Normally this "
--"is 5050, but Yahoo also allows port 80 in case you are behind a firewall."
--msgstr "您要連線的 Yahoo 伺服器連接埠。通常是 5050，但若您在防火牆之後，Yahoo 也允許使用 80。"
-+"The port on the Yahoo server that you would like to connect to.  Normally "
-+"this is 5050, but Yahoo also allows port 80 in case you are behind a "
-+"firewall."
-+msgstr ""
-+"您要連線的 Yahoo 伺服器連接埠。通常是 5050，但若您在防火牆之後，Yahoo 也允許"
-+"使用 80。"
- 
- #. i18n: file ./protocols/yahoo/ui/yahooeditaccountbase.ui line 333
- #: rc.cpp:4115
-@@ -8977,7 +9093,7 @@
- #: rc.cpp:4124
- #, no-c-format
- msgid "Select Picture..."
--msgstr "選擇圖片..."
-+msgstr "選擇圖片…"
- 
- #. i18n: file ./protocols/yahoo/ui/yahooeditaccountbase.ui line 404
- #: rc.cpp:4127
-@@ -9120,7 +9236,8 @@
- msgid ""
- "<a href=\"http://www.jabber.org/network/\">Details about free public Jabber "
- "servers</a>"
--msgstr "<a href=\"http：//www.jabber.org/network/\">關於 Jabber 伺服器的詳細資料</a>"
-+msgstr ""
-+"<a href=\"http：//www.jabber.org/network/\">關於 Jabber 伺服器的詳細資料</a>"
- 
- #. i18n: file ./protocols/jabber/ui/dlgregister.ui line 24
- #: rc.cpp:4265
-@@ -9138,7 +9255,7 @@
- #: rc.cpp:4271
- #, no-c-format
- msgid "Please wait while querying the server..."
--msgstr "請稍候，正在查詢伺服器..."
-+msgstr "請稍候，正在查詢伺服器…"
- 
- #. i18n: file ./protocols/jabber/ui/dlgregister.ui line 129
- #: protocols/gadu/gaduregisteraccount.cpp:45 rc.cpp:4274 rc.cpp:4329
-@@ -9254,7 +9371,7 @@
- #: rc.cpp:4362
- #, no-c-format
- msgid "&Select Photo..."
--msgstr "選擇圖片(&S)..."
-+msgstr "選擇圖片(&S)…"
- 
- #. i18n: file ./protocols/jabber/ui/dlgvcard.ui line 345
- #: rc.cpp:4365
-@@ -9345,9 +9462,11 @@
- #, no-c-format
- msgid ""
- "The Jabber ID for the account you would like to add.  Note that this must "
--"include the username and the domain (like an E-mail address), as there are many "
--"Jabber servers."
--msgstr "您要加入此帳號的 Jabber 代號。注意，必須包含使用者名稱與網域（像是電子郵件地址），因為有許多 Jabber 伺服器。"
-+"include the username and the domain (like an E-mail address), as there are "
-+"many Jabber servers."
-+msgstr ""
-+"您要加入此帳號的 Jabber 代號。注意，必須包含使用者名稱與網域（像是電子郵件地"
-+"址），因為有許多 Jabber 伺服器。"
- 
- #. i18n: file ./protocols/jabber/ui/dlgaddcontact.ui line 74
- #: rc.cpp:4461
-@@ -9371,7 +9490,7 @@
- #: rc.cpp:4470
- #, no-c-format
- msgid "C&hoose..."
--msgstr "選擇(&H)..."
-+msgstr "選擇(&H)…"
- 
- #. i18n: file ./protocols/jabber/ui/dlgjabberregisteraccount.ui line 122
- #: rc.cpp:4476 rc.cpp:4557
-@@ -9390,9 +9509,11 @@
- #, no-c-format
- msgid ""
- "Check this box to enable SSL encrypted communication with the server.  Note "
--"that this is not end-to-end encryption, but rather encrypted communication with "
--"the server."
--msgstr "勾選此選項以開啟與伺服器間的 SSL 加密通訊。注意這不是點對點的加密，只是與伺服器間通訊的加密。"
-+"that this is not end-to-end encryption, but rather encrypted communication "
-+"with the server."
-+msgstr ""
-+"勾選此選項以開啟與伺服器間的 SSL 加密通訊。注意這不是點對點的加密，只是與伺服"
-+"器間通訊的加密。"
- 
- #. i18n: file ./protocols/jabber/ui/dlgjabberregisteraccount.ui line 156
- #: rc.cpp:4485
-@@ -9429,27 +9550,33 @@
- #, no-c-format
- msgid ""
- "The Jabber ID for the account you would like to use.  Note that this must "
--"include the username and the domain (like an E-mail address), as there are many "
--"Jabber servers."
--msgstr "您要加入此帳號的 Jabber 代號。注意，必須包含使用者名稱與網域（像是電子郵件地址），因為有許多 Jabber 伺服器。"
-+"include the username and the domain (like an E-mail address), as there are "
-+"many Jabber servers."
-+msgstr ""
-+"您要加入此帳號的 Jabber 代號。注意，必須包含使用者名稱與網域（像是電子郵件地"
-+"址），因為有許多 Jabber 伺服器。"
- 
- #. i18n: file ./protocols/jabber/ui/dlgjabbereditaccountwidget.ui line 94
- #: rc.cpp:4515
- #, no-c-format
- msgid ""
- "The Jabber ID for the account you would like to use.  Note that this must "
--"include the username and the domain (for example, joe@jabber.org), as there are "
--"many Jabber servers."
-+"include the username and the domain (for example, joe@jabber.org), as there "
-+"are many Jabber servers."
- msgstr ""
--"您要加入此帳號的 Jabber 代號。注意，必須包含使用者名稱與網域（例如：joe@jabber.org），因為有許多 Jabber 伺服器。"
-+"您要加入此帳號的 Jabber 代號。注意，必須包含使用者名稱與網域（例如："
-+"joe@jabber.org），因為有許多 Jabber 伺服器。"
- 
- #. i18n: file ./protocols/jabber/ui/dlgjabbereditaccountwidget.ui line 163
- #: rc.cpp:4530
- #, no-c-format
- msgid ""
--"To connect to the Jabber network, you will need an account on a Jabber server.  "
--"If you do not yet have an account, please click the button to create one."
--msgstr "要連線到 Jabber 網路，您需要一個 Jabber 伺服器的帳號。如果還沒有，請按一下按鈕來建立一個。"
-+"To connect to the Jabber network, you will need an account on a Jabber "
-+"server.  If you do not yet have an account, please click the button to "
-+"create one."
-+msgstr ""
-+"要連線到 Jabber 網路，您需要一個 Jabber 伺服器的帳號。如果還沒有，請按一下按"
-+"鈕來建立一個。"
- 
- #. i18n: file ./protocols/jabber/ui/dlgjabbereditaccountwidget.ui line 198
- #: rc.cpp:4542
-@@ -9467,8 +9594,8 @@
- #: rc.cpp:4548
- #, no-c-format
- msgid ""
--"If you have an existing Jabber account and would like to change its password, "
--"you can use this button to enter a new password."
-+"If you have an existing Jabber account and would like to change its "
-+"password, you can use this button to enter a new password."
- msgstr "如果您已經有 Jabber 帳號，要變更它的密碼，請按此鍵並輸入新密碼。"
- 
- #. i18n: file ./protocols/jabber/ui/dlgjabbereditaccountwidget.ui line 296
-@@ -9526,11 +9653,13 @@
- #: rc.cpp:4611 rc.cpp:4620 rc.cpp:4629
- #, no-c-format
- msgid ""
--"The resource name you would like to use on the Jabber network.  Jabber allows "
--"you to sign on with the same account from multiple locations with different "
--"resource names, so you may wish to enter 'Home' or 'Work' here, for example."
-+"The resource name you would like to use on the Jabber network.  Jabber "
-+"allows you to sign on with the same account from multiple locations with "
-+"different resource names, so you may wish to enter 'Home' or 'Work' here, "
-+"for example."
- msgstr ""
--"您要在 Jabber 網路中使用的資源名稱。Jabber 允許您使用同一個帳號，在不同的位址使用不同的資源名稱同時簽入，您可以指定像是「家裡」或「辦公室」。"
-+"您要在 Jabber 網路中使用的資源名稱。Jabber 允許您使用同一個帳號，在不同的位址"
-+"使用不同的資源名稱同時簽入，您可以指定像是「家裡」或「辦公室」。"
- 
- #. i18n: file ./protocols/jabber/ui/dlgjabbereditaccountwidget.ui line 518
- #: rc.cpp:4623
-@@ -9542,13 +9671,14 @@
- #: rc.cpp:4632
- #, no-c-format
- msgid ""
--"<qt>Each resource can have different <b>priority </b> "
--"levels. The messages will be sent to the resource which has the highest "
--"priority level.\n"
-+"<qt>Each resource can have different <b>priority </b> levels. The messages "
-+"will be sent to the resource which has the highest priority level.\n"
- "\n"
--"If two resources have the same priority, the messages will be sent to the one "
--"connected the latest.</qt>"
--msgstr "<qt>每個資源可以有不同的<b>優先權</b>等級。訊息會送到最高優先權的資源去。</qt>"
-+"If two resources have the same priority, the messages will be sent to the "
-+"one connected the latest.</qt>"
-+msgstr ""
-+"<qt>每個資源可以有不同的<b>優先權</b>等級。訊息會送到最高優先權的資源去。</"
-+"qt>"
- 
- #. i18n: file ./protocols/jabber/ui/dlgjabbereditaccountwidget.ui line 592
- #: rc.cpp:4637
-@@ -9578,19 +9708,17 @@
- #: rc.cpp:4652
- #, no-c-format
- msgid ""
--"<i>"
--"<ul>"
--"<li>The information in the \"public IP address\" and \"port\" fields apply to "
--"all Jabber accounts.</li>\n"
--"<li>You can leave the \"public IP address\" empty if you do not use NAT.</li>\n"
-+"<i><ul><li>The information in the \"public IP address\" and \"port\" fields "
-+"apply to all Jabber accounts.</li>\n"
-+"<li>You can leave the \"public IP address\" empty if you do not use NAT.</"
-+"li>\n"
- "<li>A hostname is also valid.</li>\n"
- "<li>Changes to these fields will only take effect the next time you start "
- "Kopete.</li>\n"
- "<li>The \"Proxy JID\" can be configured per account.</li></ul></i>"
- msgstr ""
--"<i>"
--"<ul>"
--"<li>「公開 IP 位址」與「連接埠」資訊將會套用到所有的 Jabber 帳號。</li>\n"
-+"<i><ul><li>「公開 IP 位址」與「連接埠」資訊將會套用到所有的 Jabber 帳號。</"
-+"li>\n"
- "<li>如果您沒有使用 NAT，您可以將「公開 IP 位址」留白。</li>\n"
- "<li>也可以輸入主機名稱。</li>\n"
- "<li>變更這些欄位，只會在下次啟動 Kopete 時生效。</li>\n"
-@@ -9614,7 +9742,9 @@
- msgid ""
- "By default, Kopete gives the other users some info about your system and the "
- "client. You can check this box in order to  hide those infos."
--msgstr "Kopete 預設會將您的系統與客戶端資訊送給其他使用者。您可以勾選此選項以隱藏這些資訊。"
-+msgstr ""
-+"Kopete 預設會將您的系統與客戶端資訊送給其他使用者。您可以勾選此選項以隱藏這些"
-+"資訊。"
- 
- #. i18n: file ./protocols/jabber/ui/dlgjabbereditaccountwidget.ui line 776
- #: rc.cpp:4671
-@@ -9645,11 +9775,12 @@
- #: rc.cpp:4683
- #, no-c-format
- msgid ""
--"<qt>Check this box to send the <b>Delivered notification</b> "
--"to your contacts : when a message is delivered to Kopete, Kopete can notify "
--"your contact that it has received the message.</qt>"
-+"<qt>Check this box to send the <b>Delivered notification</b> to your "
-+"contacts : when a message is delivered to Kopete, Kopete can notify your "
-+"contact that it has received the message.</qt>"
- msgstr ""
--"<qt>勾選此選項以傳送<b>到達通知</b>給您的聯絡人：訊息送到 Kopete 時，Kopete 可以通知您的聯絡人訊息已經收到。</qt>"
-+"<qt>勾選此選項以傳送<b>到達通知</b>給您的聯絡人：訊息送到 Kopete 時，Kopete "
-+"可以通知您的聯絡人訊息已經收到。</qt>"
- 
- #. i18n: file ./protocols/jabber/ui/dlgjabbereditaccountwidget.ui line 857
- #: rc.cpp:4686
-@@ -9661,10 +9792,12 @@
- #: rc.cpp:4689
- #, no-c-format
- msgid ""
--"<qt>Check this box to send the <b>Displayed notification</b> "
--"to your contacts : when a message is displayed in Kopete, Kopete can notify "
--"your contact that it has displayed the message.</qt>"
--msgstr "<qt>勾選此選項以傳送<b>顯示通知</b>給您的聯絡人：當訊息在 Kopete 中顯示出來，Kopete 可以通知您的聯絡人。</qt>"
-+"<qt>Check this box to send the <b>Displayed notification</b> to your "
-+"contacts : when a message is displayed in Kopete, Kopete can notify your "
-+"contact that it has displayed the message.</qt>"
-+msgstr ""
-+"<qt>勾選此選項以傳送<b>顯示通知</b>給您的聯絡人：當訊息在 Kopete 中顯示出來，"
-+"Kopete 可以通知您的聯絡人。</qt>"
- 
- #. i18n: file ./protocols/jabber/ui/dlgjabbereditaccountwidget.ui line 874
- #: rc.cpp:4692
-@@ -9676,10 +9809,12 @@
- #: rc.cpp:4695
- #, no-c-format
- msgid ""
--"<qt>Check this box to send the <b>Typing notification</b> "
--"to your contacts : when you are composing a message, you might want your "
--"contact to know that you are typing so that he knows you are answering.</qt>"
--msgstr "<qt>勾選此選像以傳送<b>輸入通知</b>給您的聯絡人：當您正在輸入訊息時，您的聯絡人可以知道您正在輸入訊息。</qt>"
-+"<qt>Check this box to send the <b>Typing notification</b> to your contacts : "
-+"when you are composing a message, you might want your contact to know that "
-+"you are typing so that he knows you are answering.</qt>"
-+msgstr ""
-+"<qt>勾選此選像以傳送<b>輸入通知</b>給您的聯絡人：當您正在輸入訊息時，您的聯絡"
-+"人可以知道您正在輸入訊息。</qt>"
- 
- #. i18n: file ./protocols/jabber/ui/dlgjabbereditaccountwidget.ui line 888
- #: rc.cpp:4698
-@@ -9715,7 +9850,7 @@
- #: rc.cpp:4722
- #, no-c-format
- msgid "Please wait while retrieving search form..."
--msgstr "請稍候，取得伺服器表格中..."
-+msgstr "請稍候，取得伺服器表格中…"
- 
- #. i18n: file ./protocols/jabber/ui/dlgbrowse.ui line 59
- #: rc.cpp:4725
-@@ -9944,9 +10079,11 @@
- #, no-c-format
- msgid ""
- "The hostname you would like to use to send WinPopup messages as.  Note that "
--"this does not have to be the actual hostname of the machine to send messages, "
--"but it does to receive them."
--msgstr "您要用於送出 WinPopup 訊息的主機名稱。注意，這不需要是您的真實主機名稱，但是如果您要接收對方傳來的訊息，最好設定為真實主機名稱。"
-+"this does not have to be the actual hostname of the machine to send "
-+"messages, but it does to receive them."
-+msgstr ""
-+"您要用於送出 WinPopup 訊息的主機名稱。注意，這不需要是您的真實主機名稱，但是"
-+"如果您要接收對方傳來的訊息，最好設定為真實主機名稱。"
- 
- #. i18n: file ./protocols/winpopup/ui/wpeditaccountbase.ui line 106
- #: rc.cpp:4908
-@@ -9964,9 +10101,10 @@
- #: rc.cpp:4920
- #, no-c-format
- msgid ""
--"To receive WinPopup messages sent from other machines, the hostname above must "
--"be set to this machine's hostname."
--msgstr "要接收其他機器送來的 WinPopup 訊息，主機名稱必須設定為此機器的主機名稱。"
-+"To receive WinPopup messages sent from other machines, the hostname above "
-+"must be set to this machine's hostname."
-+msgstr ""
-+"要接收其他機器送來的 WinPopup 訊息，主機名稱必須設定為此機器的主機名稱。"
- 
- #. i18n: file ./protocols/winpopup/ui/wpeditaccountbase.ui line 154
- #: rc.cpp:4923
-@@ -9979,17 +10117,17 @@
- #, no-c-format
- msgid ""
- "\"Install into Samba\" is a simple method to create the directory for the "
--"temporary message files and configure your samba server."
--"<br>\n"
-+"temporary message files and configure your samba server.<br>\n"
- "However, the recommended way is to ask your administrator to create this "
- "directory ('mkdir -p -m 0777 /var/lib/winpopup') and add\n"
--"'message command = _PATH_TO_/winpopup-send.sh %s %m %t &' (substitute _PATH_TO_ "
--"by the real path) to your smb.conf [global]-section."
-+"'message command = _PATH_TO_/winpopup-send.sh %s %m %t &' (substitute "
-+"_PATH_TO_ by the real path) to your smb.conf [global]-section."
- msgstr ""
--"「安裝到 Samba」會建立一個暫時存放訊息檔案的目錄，並簡單設定您的 Samba 伺服器。"
--"<br>\n"
--"不過，比較好的方法還是請您的系統管理員建立此目錄（'mkdir -p -m 0777 /var/lib/winpopup'），並在您的 smb.conf 中的 "
--"[global] 區塊中加入此指令：'message command = _PATH_TO_/winpopup-send.sh %s %m %t &'"
-+"「安裝到 Samba」會建立一個暫時存放訊息檔案的目錄，並簡單設定您的 Samba 伺服"
-+"器。<br>\n"
-+"不過，比較好的方法還是請您的系統管理員建立此目錄（'mkdir -p -m 0777 /var/lib/"
-+"winpopup'），並在您的 smb.conf 中的 [global] 區塊中加入此指令：'message "
-+"command = _PATH_TO_/winpopup-send.sh %s %m %t &'"
- 
- #. i18n: file ./protocols/winpopup/ui/wpeditaccountbase.ui line 196
- #: rc.cpp:4931
-@@ -10043,8 +10181,8 @@
- #: rc.cpp:4964 rc.cpp:4967 rc.cpp:4976 rc.cpp:4979
- #, no-c-format
- msgid ""
--"The workgroup or domain the computer is on that you would like to use to send "
--"WinPopup messages to."
-+"The workgroup or domain the computer is on that you would like to use to "
-+"send WinPopup messages to."
- msgstr "您要送出 WinPopup 訊息所使用的主機所屬的工作群組或網域。"
- 
- #. i18n: file ./protocols/winpopup/ui/wpaddcontactbase.ui line 148
-@@ -10312,19 +10450,19 @@
- #: rc.cpp:5249
- #, no-c-format
- msgid "&Block >>"
--msgstr "封鎖>> (&B)"
-+msgstr "封鎖>>(&B)"
- 
- #. i18n: file ./protocols/groupwise/ui/gwprivacy.ui line 99
- #: rc.cpp:5252
- #, no-c-format
- msgid "<< Allo&w"
--msgstr "<<允許 (&W)"
-+msgstr "<<允許(&W)"
- 
- #. i18n: file ./protocols/groupwise/ui/gwprivacy.ui line 124
- #: rc.cpp:5255
- #, no-c-format
- msgid "A&dd..."
--msgstr "加入(&D)..."
-+msgstr "加入(&D)…"
- 
- #. i18n: file ./protocols/groupwise/ui/gwprivacy.ui line 167
- #: rc.cpp:5261
-@@ -10619,9 +10757,10 @@
- 
- #: plugins/nowlistening/nowlisteningguiclient.cpp:60
- msgid ""
--"None of the supported media players (KsCD, JuK, amaroK, Noatun or Kaffeine) are "
--"playing anything."
--msgstr "沒有支援的播放程式（KsCD、Juk、amaroK、Noatun 或是 Kaffeine）正在播放。"
-+"None of the supported media players (KsCD, JuK, amaroK, Noatun or Kaffeine) "
-+"are playing anything."
-+msgstr ""
-+"沒有支援的播放程式（KsCD、Juk、amaroK、Noatun 或是 Kaffeine）正在播放。"
- 
- #: plugins/nowlistening/nowlisteningguiclient.cpp:61
- msgid "Nothing to Send"
-@@ -10634,10 +10773,13 @@
- #: plugins/nowlistening/nowlisteningplugin.cpp:173
- msgid ""
- "_: Message from Kopete user to another user; used when sending media "
--"information even though there are no songs playing or no media players running\n"
--"Now Listening for Kopete - it would tell you what I am listening to, if I was "
--"listening to something on a supported media player."
--msgstr "注意聽 Kopete - 如果我正在使用支援的媒體播放器聽音樂，它會告訴您我現在在聽什麼。"
-+"information even though there are no songs playing or no media players "
-+"running\n"
-+"Now Listening for Kopete - it would tell you what I am listening to, if I "
-+"was listening to something on a supported media player."
-+msgstr ""
-+"注意聽 Kopete - 如果我正在使用支援的媒體播放器聽音樂，它會告訴您我現在在聽什"
-+"麼。"
- 
- #: plugins/nowlistening/nowlisteningplugin.cpp:452
- msgid "Unknown track"
-@@ -10657,43 +10799,43 @@
- 
- #: plugins/translator/translatorlanguages.cpp:36
- msgid "English"
--msgstr "英文"
-+msgstr "英語"
- 
- #: plugins/translator/translatorlanguages.cpp:37
- msgid "Chinese"
--msgstr "中文"
-+msgstr "漢語"
- 
- #: plugins/translator/translatorlanguages.cpp:38
- msgid "French"
--msgstr "法文"
-+msgstr "法語"
- 
- #: plugins/translator/translatorlanguages.cpp:39
- msgid "German"
--msgstr "德文"
-+msgstr "德語"
- 
- #: plugins/translator/translatorlanguages.cpp:40
- msgid "Italian"
--msgstr "義大利文"
-+msgstr "義大利語"
- 
- #: plugins/translator/translatorlanguages.cpp:41
- msgid "Japanese"
--msgstr "日文"
-+msgstr "日語"
- 
- #: plugins/translator/translatorlanguages.cpp:42
- msgid "Korean"
--msgstr "韓文"
-+msgstr "韓語"
- 
- #: plugins/translator/translatorlanguages.cpp:43
- msgid "Portuguese"
--msgstr "葡萄牙文"
-+msgstr "葡萄牙語"
- 
- #: plugins/translator/translatorlanguages.cpp:44
- msgid "Russian"
--msgstr "俄文"
-+msgstr "俄語"
- 
- #: plugins/translator/translatorlanguages.cpp:45
- msgid "Spanish"
--msgstr "西班牙文"
-+msgstr "西班牙語"
- 
- #: plugins/translator/translatordialog.cpp:24
- msgid "Translator Plugin"
-@@ -10757,8 +10899,8 @@
- #: plugins/alias/aliaspreferences.cpp:336
- #: plugins/alias/aliaspreferences.cpp:425
- msgid ""
--"<qt>Could not add alias <b>%1</b>. An alias name cannot contain the characters "
--"\"_\" or \"=\".</qt>"
-+"<qt>Could not add alias <b>%1</b>. An alias name cannot contain the "
-+"characters \"_\" or \"=\".</qt>"
- msgstr "<qt>無法加入別名<b>%1</b>。別名不能包含字元 _ 或 =。</qt>"
- 
- #: plugins/alias/aliaspreferences.cpp:338
-@@ -10771,7 +10913,9 @@
- msgid ""
- "<qt>Could not add alias <b>%1</b>. This command is already being handled by "
- "either another alias or Kopete itself.</qt>"
--msgstr "<qt>無法新增別名<b>%1</b>。這個命令已經被另一個別名或是 Kopete 自己處理了。</qt>"
-+msgstr ""
-+"<qt>無法新增別名<b>%1</b>。這個命令已經被另一個別名或是 Kopete 自己處理了。</"
-+"qt>"
- 
- #: plugins/alias/aliaspreferences.cpp:356
- #: plugins/alias/aliaspreferences.cpp:452
-@@ -10790,8 +10934,8 @@
- msgid ""
- "I cannot find the Magick convert program.\n"
- "convert is required to render the Latex formulas.\n"
--"Please go to www.imagemagick.org or to your distribution site and get the right "
--"package."
-+"Please go to www.imagemagick.org or to your distribution site and get the "
-+"right package."
- msgstr ""
- "找不到 Magick 轉換程式。\n"
- "要匯出 Latex 公式必須做轉換。\n"
-@@ -10954,28 +11098,30 @@
- 
- #: plugins/cryptography/popuppublic.cpp:157
- msgid ""
--"<b>ASCII encryption</b>: makes it possible to open the encrypted file/message "
--"in a text editor"
-+"<b>ASCII encryption</b>: makes it possible to open the encrypted file/"
-+"message in a text editor"
- msgstr "<b>ASCII 加密</b>：讓您可以在文字編輯器中開啟加密的檔案/訊息"
- 
- #: plugins/cryptography/popuppublic.cpp:159
- msgid ""
--"<b>Hide user ID</b>: Do not put the keyid into encrypted packets. This option "
--"hides the receiver of the message and is a countermeasure against traffic "
--"analysis. It may slow down the decryption process because all available secret "
--"keys are tried."
--msgstr ""
--"<b>隱藏使用者代號</b>：不要將 keyid "
--"放入加密封包。這個選項會隱藏這封郵件的收件者，這是一種反制傳輸分析的手段。它可能會拖慢解密程序的速度，因為所有可用的私密金鑰都會被試過。"
-+"<b>Hide user ID</b>: Do not put the keyid into encrypted packets. This "
-+"option hides the receiver of the message and is a countermeasure against "
-+"traffic analysis. It may slow down the decryption process because all "
-+"available secret keys are tried."
-+msgstr ""
-+"<b>隱藏使用者代號</b>：不要將 keyid 放入加密封包。這個選項會隱藏這封郵件的收"
-+"件者，這是一種反制傳輸分析的手段。它可能會拖慢解密程序的速度，因為所有可用的"
-+"私密金鑰都會被試過。"
- 
- #: plugins/cryptography/popuppublic.cpp:163
- msgid ""
--"<b>Allow encryption with untrusted keys</b>: when you import a public key, it "
--"is usually marked as untrusted and you cannot use it unless you sign it in "
--"order to make it 'trusted'. Checking this box enables you to use any key, even "
--"if it has not be signed."
-+"<b>Allow encryption with untrusted keys</b>: when you import a public key, "
-+"it is usually marked as untrusted and you cannot use it unless you sign it "
-+"in order to make it 'trusted'. Checking this box enables you to use any key, "
-+"even if it has not be signed."
- msgstr ""
--"<b>允許以不信任的金鑰加密</b>：當您匯入公鑰時，它通常會標記為不信任的，除非您為了讓它變成「信任的」而簽署它，否則您不能使用它。核取此方塊讓您可以使用任何"
-+"<b>允許以不信任的金鑰加密</b>：當您匯入公鑰時，它通常會標記為不信任的，除非您"
-+"為了讓它變成「信任的」而簽署它，否則您不能使用它。核取此方塊讓您可以使用任何"
- "金鑰，即使它尚未被簽署。"
- 
- #: plugins/cryptography/popuppublic.cpp:172
-@@ -10984,25 +11130,25 @@
- 
- #: plugins/cryptography/popuppublic.cpp:174
- msgid ""
--"<b>Shred source file</b>: permanently remove source file. No recovery will be "
--"possible"
-+"<b>Shred source file</b>: permanently remove source file. No recovery will "
-+"be possible"
- msgstr "<b>撕碎來源檔案</b>：永久移除來源檔案。將不可能恢復。"
- 
- #: plugins/cryptography/popuppublic.cpp:176
- msgid ""
--"<qt><b>Shred source file:</b><br />"
--"<p>Checking this option will shred (overwrite several times before erasing) the "
--"files you have encrypted. This way, it is almost impossible that the source "
--"file is recovered.</p>"
--"<p><b>But you must be aware that this is not secure</b> "
--"on all file systems, and that parts of the file may have been saved in a "
--"temporary file or in the spooler of your printer if you previously opened it in "
--"an editor or tried to print it. Only works on files (not on folders).</p></qt>"
--msgstr ""
--"<qt><b>撕碎原始檔案：</b><br />"
--"<p>勾選此選項會撕碎（在消除前複寫多次）您剛剛加密的檔案。這樣一來，此原始檔案幾乎不可能被復原。</p>"
--"<p><b>但是您必須了解這並非在所有檔案系統都是安全的</b>，而檔案的某些部分個可能在您先前在編輯器中開啟它或嘗試列印它時，被儲存在暫存的檔案中或者在您印表"
--"機的排程器裡。這只對檔案有效（不適用於資料夾）。"
-+"<qt><b>Shred source file:</b><br /><p>Checking this option will shred "
-+"(overwrite several times before erasing) the files you have encrypted. This "
-+"way, it is almost impossible that the source file is recovered.</p><p><b>But "
-+"you must be aware that this is not secure</b> on all file systems, and that "
-+"parts of the file may have been saved in a temporary file or in the spooler "
-+"of your printer if you previously opened it in an editor or tried to print "
-+"it. Only works on files (not on folders).</p></qt>"
-+msgstr ""
-+"<qt><b>撕碎原始檔案：</b><br /><p>勾選此選項會撕碎（在消除前複寫多次）您剛剛"
-+"加密的檔案。這樣一來，此原始檔案幾乎不可能被復原。</p><p><b>但是您必須了解這"
-+"並非在所有檔案系統都是安全的</b>，而檔案的某些部分個可能在您先前在編輯器中開"
-+"啟它或嘗試列印它時，被儲存在暫存的檔案中或者在您印表機的排程器裡。這只對檔案"
-+"有效（不適用於資料夾）。"
- 
- #: plugins/cryptography/popuppublic.cpp:177
- msgid "<a href=\"whatsthis:%1\">Read this before using shredding</a>"
-@@ -11014,8 +11160,8 @@
- 
- #: plugins/cryptography/popuppublic.cpp:184
- msgid ""
--"<b>Symmetrical encryption</b>: encryption does not use keys. You just need to "
--"give a password to encrypt/decrypt the file"
-+"<b>Symmetrical encryption</b>: encryption does not use keys. You just need "
-+"to give a password to encrypt/decrypt the file"
- msgstr "<b>對稱式加密</b>：加密不需使用金鑰。您只需要提供加密/解密檔案的密碼"
- 
- #: plugins/cryptography/cryptographyplugin.cpp:51
-@@ -11024,7 +11170,7 @@
- 
- #: plugins/cryptography/cryptographyplugin.cpp:71
- msgid "&Select Cryptography Public Key..."
--msgstr "選擇加密公開金鑰(&S)..."
-+msgstr "選擇加密公開金鑰(&S)…"
- 
- #: plugins/cryptography/cryptographyplugin.cpp:188
- msgid "Outgoing Encrypted Message: "
-@@ -11057,11 +11203,11 @@
- 
- #: plugins/history/historydialog.cpp:213
- msgid "Loading..."
--msgstr "載入中..."
-+msgstr "載入中…"
- 
- #: plugins/history/historydialog.cpp:470
- msgid "Searching..."
--msgstr "正在搜尋..."
-+msgstr "正在搜尋…"
- 
- #: plugins/history/historydialog.cpp:549
- msgid "History for All Contacts"
-@@ -11141,53 +11287,43 @@
- #: plugins/statistics/statisticsdialog.cpp:196
- msgid ""
- "<div class=\"statgroup\"><b><a href=\"main:generalinfo\" title=\"General "
--"summary view\">General</a></b>"
--"<br><span title=\"Select the a day or a month to view the stat for\"><b>"
--"Days: </b><a href=\"dayofweek:1\">Monday</a>&nbsp;<a href=\"dayofweek:2\">"
--"Tuesday</a>&nbsp;<a href=\"dayofweek:3\">Wednesday</a>"
--"&nbsp;<a href=\"dayofweek:4\">Thursday</a>&nbsp;<a href=\"dayofweek:5\">"
--"Friday</a>&nbsp;<a href=\"dayofweek:6\">Saturday</a>"
--"&nbsp;<a href=\"dayofweek:7\">Sunday</a>"
--"<br><b>Months: </b><a href=\"monthofyear:1\">January</a>"
--"&nbsp;<a href=\"monthofyear:2\">February</a>&nbsp;<a href=\"monthofyear:3\">"
--"March</a>&nbsp;<a href=\"monthofyear:4\">April</a>&nbsp;<a "
--"href=\"monthofyear:5\">May</a>&nbsp;<a href=\"monthofyear:6\">June</a>"
--"&nbsp;<a href=\"monthofyear:7\">July</a>&nbsp;<a href=\"monthofyear:8\">"
--"August</a>&nbsp;<a href=\"monthofyear:9\">September</a>"
--"&nbsp;<a href=\"monthofyear:10\">October</a>&nbsp;<a href=\"monthofyear:11\">"
--"November</a>&nbsp;<a href=\"monthofyear:12\">December</a>&nbsp;</span></div>"
--"<br>"
--msgstr ""
--"<div class=\"statgroup\"><b><a href=\"main：generalinfo\" title=\"一般摘要檢視\"> "
--"一般</a></b>"
--"<br><span title=\"選擇要檢視哪一天或哪個月的統計\"><b>哪一天：</b><a href=\"dayofweek：1\"> 星期一</a>"
--"&nbsp;<a href=\"dayofweek：2\"> 星期二</a>&nbsp;<a href=\"dayofweek：3\"> 星期三</a>"
--"&nbsp;<a href=\"dayofweek：4\"> 星期四</a>&nbsp;<a href=\"dayofweek：5\"> 星期五</a>"
--"&nbsp;<a href=\"dayofweek：6\"> 星期六</a>&nbsp;<a href=\"dayofweek：7\"> 星期日</a>"
--"<br><b>哪個月：</b><a href=\"monthofyear：1\"> 一月</a>&nbsp;<a href=\"monthofyear：2\"> "
--"二月</a>&nbsp;<a href=\"monthofyear：3\"> 三月</a>&nbsp;<a href=\"monthofyear：4\"> "
--"四月</a>&nbsp;<a href=\"monthofyear：5\"></a>&nbsp;<a href=\"monthofyear：6\"> "
--"六月</a>&nbsp;<a href=\"monthofyear：7\"> 七月</a>&nbsp;<a href=\"monthofyear：8\"> "
--"八月</a>&nbsp;<a href=\"monthofyear：9\"> 九月</a>&nbsp;<a href=\"monthofyear：10\"> "
--"十月</a>&nbsp;<a href=\"monthofyear：11\"> 十一月</a>&nbsp;<a href=\"monthofyear：12\"> "
--"十二月</a>&nbsp;</span></div>"
--"<br>"
-+"summary view\">General</a></b><br><span title=\"Select the a day or a month "
-+"to view the stat for\"><b>Days: </b><a href=\"dayofweek:1\">Monday</a>&nbsp;"
-+"<a href=\"dayofweek:2\">Tuesday</a>&nbsp;<a href=\"dayofweek:3\">Wednesday</"
-+"a>&nbsp;<a href=\"dayofweek:4\">Thursday</a>&nbsp;<a href=\"dayofweek:5"
-+"\">Friday</a>&nbsp;<a href=\"dayofweek:6\">Saturday</a>&nbsp;<a href="
-+"\"dayofweek:7\">Sunday</a><br><b>Months: </b><a href=\"monthofyear:1"
-+"\">January</a>&nbsp;<a href=\"monthofyear:2\">February</a>&nbsp;<a href="
-+"\"monthofyear:3\">March</a>&nbsp;<a href=\"monthofyear:4\">April</a>&nbsp;<a "
-+"href=\"monthofyear:5\">May</a>&nbsp;<a href=\"monthofyear:6\">June</a>&nbsp;"
-+"<a href=\"monthofyear:7\">July</a>&nbsp;<a href=\"monthofyear:8\">August</"
-+"a>&nbsp;<a href=\"monthofyear:9\">September</a>&nbsp;<a href=\"monthofyear:10"
-+"\">October</a>&nbsp;<a href=\"monthofyear:11\">November</a>&nbsp;<a href="
-+"\"monthofyear:12\">December</a>&nbsp;</span></div><br>"
-+msgstr ""
-+"<div class=\"statgroup\"><b><a href=\"main：generalinfo\" title=\"一般摘要檢"
-+"視\"> 一般</a></b><br><span title=\"選擇要檢視哪一天或哪個月的統計\"><b>哪一"
-+"天：</b><a href=\"dayofweek：1\"> 星期一</a>&nbsp;<a href=\"dayofweek：2\"> "
-+"星期二</a>&nbsp;<a href=\"dayofweek：3\"> 星期三</a>&nbsp;<a href="
-+"\"dayofweek：4\"> 星期四</a>&nbsp;<a href=\"dayofweek：5\"> 星期五</a>&nbsp;"
-+"<a href=\"dayofweek：6\"> 星期六</a>&nbsp;<a href=\"dayofweek：7\"> 星期日</"
-+"a><br><b>哪個月：</b><a href=\"monthofyear：1\"> 一月</a>&nbsp;<a href="
-+"\"monthofyear：2\"> 二月</a>&nbsp;<a href=\"monthofyear：3\"> 三月</a>&nbsp;"
-+"<a href=\"monthofyear：4\"> 四月</a>&nbsp;<a href=\"monthofyear：5\"></"
-+"a>&nbsp;<a href=\"monthofyear：6\"> 六月</a>&nbsp;<a href=\"monthofyear：7"
-+"\"> 七月</a>&nbsp;<a href=\"monthofyear：8\"> 八月</a>&nbsp;<a href="
-+"\"monthofyear：9\"> 九月</a>&nbsp;<a href=\"monthofyear：10\"> 十月</a>&nbsp;"
-+"<a href=\"monthofyear：11\"> 十一月</a>&nbsp;<a href=\"monthofyear：12\"> 十"
-+"二月</a>&nbsp;</span></div><br>"
- 
- #: plugins/statistics/statisticsdialog.cpp:227
- msgid ""
--"<div class=\"statgroup\" title=\"Contact status history for today\">"
--"<h2>Today</h2><table width=\"100%\">"
--"<tr>"
--"<td>Status</td>"
--"<td>From</td>"
--"<td>To</td></tr>"
--msgstr ""
--"<div class=\"statgroup\" title=\"今天的聯絡人狀態歷史記錄\">"
--"<h2>今天</h2><table width=\"100%\">"
--"<tr>"
--"<td>狀態</td>"
--"<td>自</td>"
--"<td>到</td></tr>"
-+"<div class=\"statgroup\" title=\"Contact status history for today"
-+"\"><h2>Today</h2><table width=\"100%\"><tr><td>Status</td><td>From</"
-+"td><td>To</td></tr>"
-+msgstr ""
-+"<div class=\"statgroup\" title=\"今天的聯絡人狀態歷史記錄\"><h2>今天</"
-+"h2><table width=\"100%\"><tr><td>狀態</td><td>自</td><td>到</td></tr>"
- 
- #: plugins/statistics/statisticsdialog.cpp:387
- msgid "<div class=\"statgroup\">"
-@@ -11195,29 +11331,26 @@
- 
- #: plugins/statistics/statisticsdialog.cpp:388
- msgid ""
--"<b title=\"The total time I have been able to see %1 status\">"
--"Total seen time :</b> %2 hour(s)"
--"<br>"
-+"<b title=\"The total time I have been able to see %1 status\">Total seen "
-+"time :</b> %2 hour(s)<br>"
- msgstr "<b title=\"我能看到 %1 狀態的總時間\">總共看到時間 ：</b> %2 小時<br>"
- 
- #: plugins/statistics/statisticsdialog.cpp:390
- msgid ""
--"<b title=\"The total time I have seen %1 online\">Total online time :</b> "
--"%2 hour(s)"
--"<br>"
-+"<b title=\"The total time I have seen %1 online\">Total online time :</b> %2 "
-+"hour(s)<br>"
- msgstr "<b title=\"我看到 %1 的總上線時間\">總上線時間 ：</b> %2 小時<br>"
- 
- #: plugins/statistics/statisticsdialog.cpp:392
- msgid ""
--"<b title=\"The total time I have seen %1 away\">Total busy time :</b> "
--"%2 hour(s)"
--"<br>"
-+"<b title=\"The total time I have seen %1 away\">Total busy time :</b> %2 hour"
-+"(s)<br>"
- msgstr "<b title=\"我看到 %1 的總離開時間\">總忙碌時間 ：</b> %2 小時<br>"
- 
- #: plugins/statistics/statisticsdialog.cpp:393
- msgid ""
--"<b title=\"The total time I have seen %1 offline\">Total offline time :</b> "
--"%2 hour(s)"
-+"<b title=\"The total time I have seen %1 offline\">Total offline time :</b> %"
-+"2 hour(s)"
- msgstr "<b title=\"我看到 %1 的總離線時間\">總離線時間 ：</b> %2 小時"
- 
- #: plugins/statistics/statisticsdialog.cpp:396
-@@ -11240,8 +11373,8 @@
- 
- #: plugins/statistics/statisticsdialog.cpp:408
- msgid ""
--"<b title=\"The last time I have seen %1 online or away\">"
--"Last time contact was present :</b> %2"
-+"<b title=\"The last time I have seen %1 online or away\">Last time contact "
-+"was present :</b> %2"
- msgstr "<b title=\"最後看到 %1 上線或離開的時間\">聯絡人最後出現時間：</b>%2"
- 
- #: plugins/statistics/statisticsdialog.cpp:418
-@@ -11309,7 +11442,7 @@
- 
- #: plugins/smpppdcs/smpppdcsprefsimpl.cpp:97
- msgid "Searching for a SMPPPD on the local network..."
--msgstr "在本地端網路中搜尋 SMPPPD..."
-+msgstr "在本地端網路中搜尋 SMPPPD…"
- 
- #: plugins/smpppdcs/smpppdcspreferences.cpp:57
- msgid "connection status is managed by Kopete"
-@@ -11389,10 +11522,12 @@
- 
- #: protocols/irc/ui/channellist.cpp:204 protocols/irc/ui/channellist.cpp:206
- msgid ""
--"You may search for channels on the IRC server for a text string entered here.  "
--"For instance, you may type 'linux' to find channels that have something to do "
--"with linux."
--msgstr "您可以輸入您要搜尋的 IRC 伺盧器上的頻道名稱。例如，您可以輸入 linux 來尋找某些討論 linux 的頻道。"
-+"You may search for channels on the IRC server for a text string entered "
-+"here.  For instance, you may type 'linux' to find channels that have "
-+"something to do with linux."
-+msgstr ""
-+"您可以輸入您要搜尋的 IRC 伺盧器上的頻道名稱。例如，您可以輸入 linux 來尋找某"
-+"些討論 linux 的頻道。"
- 
- #: protocols/gadu/gadupubdir.cpp:103 protocols/gadu/gadupubdir.cpp:280
- #: protocols/irc/ui/channellist.cpp:207
-@@ -11405,8 +11540,8 @@
- 
- #: protocols/irc/ui/channellist.cpp:209
- msgid ""
--"Perform a channel search.  Please be patient, as this can be slow depending on "
--"the number of channels on the server."
-+"Perform a channel search.  Please be patient, as this can be slow depending "
-+"on the number of channels on the server."
- msgstr "執行頻道搜尋。請保持耐心，這有可能會很慢，依伺服器上頻道總數而定。"
- 
- #: protocols/irc/ui/channellist.cpp:210
-@@ -11462,16 +11597,12 @@
- msgstr "閒置：%2<br />"
- 
- #: protocols/irc/ircusercontact.cpp:468
--msgid ""
--"%1 was (%2@%3): %4\n"
--msgstr ""
--"%1 為（%2@%3）：%4\n"
-+msgid "%1 was (%2@%3): %4\n"
-+msgstr "%1 為（%2@%3）：%4\n"
- 
- #: protocols/irc/ircusercontact.cpp:474
--msgid ""
--"Last Online: %1\n"
--msgstr ""
--"最後上線：%1\n"
-+msgid "Last Online: %1\n"
-+msgstr "最後上線：%1\n"
- 
- #: protocols/irc/ircusercontact.cpp:538
- msgid "C&TCP"
-@@ -11544,8 +11675,8 @@
- 
- #: protocols/irc/libkirc/ksslsocket.cpp:367
- msgid ""
--"The IP address of the host %1 does not match the one the certificate was issued "
--"to."
-+"The IP address of the host %1 does not match the one the certificate was "
-+"issued to."
- msgstr "主機 %1 的 IP 與憑證中的不符。"
- 
- #: protocols/irc/libkirc/ksslsocket.cpp:372
-@@ -11608,11 +11739,11 @@
- 
- #: protocols/irc/ircaccount.cpp:210
- msgid "Join Channel..."
--msgstr "加入頻道..."
-+msgstr "加入頻道…"
- 
- #: protocols/irc/ircaccount.cpp:212
- msgid "Search Channels..."
--msgstr "搜尋頻道..."
-+msgstr "搜尋頻道…"
- 
- #: protocols/irc/ircaccount.cpp:219
- msgid "Plugin Unloaded"
-@@ -11638,10 +11769,12 @@
- 
- #: protocols/irc/ircaccount.cpp:308
- msgid ""
--"<qt>The network associated with this account, <b>%1</b>"
--", no longer exists. Please ensure that the account has a valid network. The "
--"account will not be enabled until you do so.</qt>"
--msgstr "<qt>與此帳號 <b>%1</b> 相關的網路已不存在。請確認此帳號有一個合法的網路，然後此帳號才會被開啟。</qt>"
-+"<qt>The network associated with this account, <b>%1</b>, no longer exists. "
-+"Please ensure that the account has a valid network. The account will not be "
-+"enabled until you do so.</qt>"
-+msgstr ""
-+"<qt>與此帳號 <b>%1</b> 相關的網路已不存在。請確認此帳號有一個合法的網路，然後"
-+"此帳號才會被開啟。</qt>"
- 
- #: protocols/irc/ircaccount.cpp:310
- #, c-format
-@@ -11658,9 +11791,11 @@
- 
- #: protocols/irc/ircaccount.cpp:458
- msgid ""
--"<qt>The network associated with this account, <b>%1</b>"
--", has no valid hosts. Please ensure that the account has a valid network.</qt>"
--msgstr "<qt>與此帳號 <b>%1</b> 相關的主機已不存在。請確認此帳號有一個合法的網路。</qt>"
-+"<qt>The network associated with this account, <b>%1</b>, has no valid hosts. "
-+"Please ensure that the account has a valid network.</qt>"
-+msgstr ""
-+"<qt>與此帳號 <b>%1</b> 相關的主機已不存在。請確認此帳號有一個合法的網路。</"
-+"qt>"
- 
- #: protocols/irc/ircaccount.cpp:459
- msgid "Network is Empty"
-@@ -11670,7 +11805,9 @@
- msgid ""
- "<qt>Kopete could not connect to any of the servers in the network associated "
- "with this account (<b>%1</b>). Please try again later.</qt>"
--msgstr "<qt>Kopete 無法連接到此帳號 <b>%1</b> 相關網路上的任何伺服器。請稍候再試。</qt>"
-+msgstr ""
-+"<qt>Kopete 無法連接到此帳號 <b>%1</b> 相關網路上的任何伺服器。請稍候再試。</"
-+"qt>"
- 
- #: protocols/irc/ircaccount.cpp:466
- msgid "Network is Unavailable"
-@@ -11678,7 +11815,7 @@
- 
- #: protocols/irc/ircaccount.cpp:493
- msgid "Connecting to %1..."
--msgstr "連線到 %1 ..."
-+msgstr "連線到 %1…"
- 
- #: protocols/irc/ircaccount.cpp:495
- msgid "Using SSL"
-@@ -11772,7 +11909,7 @@
- 
- #: protocols/irc/ircchannelcontact.cpp:64
- msgid "&Secret"
--msgstr "秘密(&S)"
-+msgstr "祕密(&S)"
- 
- #: protocols/irc/ircchannelcontact.cpp:65
- msgid "&Moderated"
-@@ -11863,7 +12000,7 @@
- 
- #: protocols/irc/ircchannelcontact.cpp:663
- msgid "Change &Topic..."
--msgstr "變更標題(&T)..."
-+msgstr "變更標題(&T)…"
- 
- #: protocols/irc/ircchannelcontact.cpp:664
- msgid "Channel Modes"
-@@ -11923,8 +12060,8 @@
- 
- #: protocols/irc/ircprotocol.cpp:189
- msgid ""
--"USAGE: /motd [<server>] - Shows the message of the day for the current or the "
--"given server."
-+"USAGE: /motd [<server>] - Shows the message of the day for the current or "
-+"the given server."
- msgstr "用法：/motd [<伺服器>] - 顯示此伺服器的本日訊息。"
- 
- #: protocols/irc/ircprotocol.cpp:193
-@@ -11951,12 +12088,13 @@
- 
- #: protocols/irc/ircprotocol.cpp:214
- msgid "USAGE: /who <nickname|channel> - Display who info on this user/channel."
--msgstr "用法：/who <暱稱或頻道名稱> - 顯示此使用者的資訊或是此頻道的使用者資訊。"
-+msgstr ""
-+"用法：/who <暱稱或頻道名稱> - 顯示此使用者的資訊或是此頻道的使用者資訊。"
- 
- #: protocols/irc/ircprotocol.cpp:218
- msgid ""
- "USAGE: /query <nickname> [<message>] - Open a private chat with this user."
--msgstr "用法：/query <暱稱> [<訊息>] - 開啟與此使用者的秘密對話。"
-+msgstr "用法：/query <暱稱> [<訊息>] - 開啟與此使用者的祕密對話。"
- 
- #: protocols/irc/ircprotocol.cpp:222
- msgid "USAGE: /mode <channel> <modes> - Set modes on the given channel."
-@@ -11978,43 +12116,57 @@
- msgid ""
- "USAGE: /kick <nickname> [<reason>] - Kick someone from the channel (requires "
- "operator status)."
--msgstr "用法：/kick <暱稱> [<理由>] - 將某人從頻道中踢出去。需要管理者的權限才能執行此動作。"
-+msgstr ""
-+"用法：/kick <暱稱> [<理由>] - 將某人從頻道中踢出去。需要管理者的權限才能執行"
-+"此動作。"
- 
- #: protocols/irc/ircprotocol.cpp:243
- msgid ""
--"USAGE: /ban <mask> - Add someone to this channel's ban list. (requires operator "
--"status)."
--msgstr "用法：/ban <遮罩> - 將某人加入此頻道的黑名單中。需要管理者權限才能執行此動作。"
-+"USAGE: /ban <mask> - Add someone to this channel's ban list. (requires "
-+"operator status)."
-+msgstr ""
-+"用法：/ban <遮罩> - 將某人加入此頻道的黑名單中。需要管理者權限才能執行此動"
-+"作。"
- 
- #: protocols/irc/ircprotocol.cpp:248
- msgid ""
--"USAGE: /bannick <nickname> - Add someone to this channel's ban list. Uses the "
--"hostmask nickname!*@* (requires operator status)."
--msgstr "用法：/bannick <暱稱> - 將某人加入此頻道的黑名單中，遮罩設為 nickname!*@*。需要管理者權限才能執行此動作。"
-+"USAGE: /bannick <nickname> - Add someone to this channel's ban list. Uses "
-+"the hostmask nickname!*@* (requires operator status)."
-+msgstr ""
-+"用法：/bannick <暱稱> - 將某人加入此頻道的黑名單中，遮罩設為 nickname!*@*。需"
-+"要管理者權限才能執行此動作。"
- 
- #: protocols/irc/ircprotocol.cpp:252
- msgid ""
--"USAGE: /op <nickname 1> [<nickname 2> <...>] - Give channel operator status to "
--"someone (requires operator status)."
--msgstr "用法：/op <暱稱 1> [<暱稱 2> <...>] - 給這些人此頻道的管理者權限。需要管理者權限才能執行此動作。"
-+"USAGE: /op <nickname 1> [<nickname 2> <...>] - Give channel operator status "
-+"to someone (requires operator status)."
-+msgstr ""
-+"用法：/op <暱稱 1> [<暱稱 2> <...>] - 給這些人此頻道的管理者權限。需要管理者"
-+"權限才能執行此動作。"
- 
- #: protocols/irc/ircprotocol.cpp:257
- msgid ""
- "USAGE: /deop <nickname> [<nickname 2> <...>]- Remove channel operator status "
- "from someone (requires operator status)."
--msgstr "用法：/deop <暱稱> [<暱稱 2> <...>] - 將這些人的管理權限拔除。需要管理者權限才能執行此動作。"
-+msgstr ""
-+"用法：/deop <暱稱> [<暱稱 2> <...>] - 將這些人的管理權限拔除。需要管理者權限"
-+"才能執行此動作。"
- 
- #: protocols/irc/ircprotocol.cpp:261
- msgid ""
- "USAGE: /voice <nickname> [<nickname 2> <...>]- Give channel voice status to "
- "someone (requires operator status)."
--msgstr "用法：/voice <暱稱> [<暱稱 2> <...>] - 將這些人設為可交談。需要管理者權限才能執行此動作。"
-+msgstr ""
-+"用法：/voice <暱稱> [<暱稱 2> <...>] - 將這些人設為可交談。需要管理者權限才能"
-+"執行此動作。"
- 
- #: protocols/irc/ircprotocol.cpp:266
- msgid ""
- "USAGE: /devoice <nickname> [<nickname 2> <...>]- Remove channel voice status "
- "from someone (requires operator status)."
--msgstr "用法：/devoice <暱稱> [<暱稱 2> <...>] - 將這些人設為不可交談。需要管理者權限才能執行此動作。"
-+msgstr ""
-+"用法：/devoice <暱稱> [<暱稱 2> <...>] - 將這些人設為不可交談。需要管理者權限"
-+"才能執行此動作。"
- 
- #: protocols/irc/ircprotocol.cpp:270
- msgid ""
-@@ -12061,9 +12213,11 @@
- 
- #: protocols/irc/ircprotocol.cpp:919
- msgid ""
--"<qt>Are you sure you want to delete the network <b>%1</b>?"
--"<br>Any accounts which use this network will have to be modified.</qt>"
--msgstr "<qt>您確定您要刪除網路 <b>%1</b>？<br> 任何使用此網路的帳號都會跟著改變。</qt>"
-+"<qt>Are you sure you want to delete the network <b>%1</b>?<br>Any accounts "
-+"which use this network will have to be modified.</qt>"
-+msgstr ""
-+"<qt>您確定您要刪除網路 <b>%1</b>？<br> 任何使用此網路的帳號都會跟著改變。</"
-+"qt>"
- 
- #: protocols/irc/ircprotocol.cpp:921
- msgid "Deleting Network"
-@@ -12112,8 +12266,8 @@
- #: protocols/msn/ui/msneditaccountwidget.cpp:237
- #: protocols/msn/ui/msneditaccountwidget.cpp:355
- msgid ""
--"<qt>An error occurred when trying to change the display picture."
--"<br>Make sure that you have selected a correct image file</qt>"
-+"<qt>An error occurred when trying to change the display picture.<br>Make "
-+"sure that you have selected a correct image file</qt>"
- msgstr "<qt>改變顯示圖片時發生錯誤。<br> 請確定您選擇了正確的圖片檔。</qt>"
- 
- #: protocols/msn/msnaccount.cpp:346 protocols/msn/msnaddcontactpage.cpp:76
-@@ -12324,16 +12478,14 @@
- 
- #: protocols/msn/msnnotifysocket.cpp:133
- msgid ""
--"<qt>An internal error occurred in the MSN plugin."
--"<br>MSN Error: %1"
--"<br>please send us a detailed bug report at kopete-devel@kde.org containing the "
--"raw debug output on the console (in gzipped format, as it is probably a lot of "
-+"<qt>An internal error occurred in the MSN plugin.<br>MSN Error: %1<br>please "
-+"send us a detailed bug report at kopete-devel@kde.org containing the raw "
-+"debug output on the console (in gzipped format, as it is probably a lot of "
- "output.)"
- msgstr ""
--"<qt>MSN 外掛程式發生內部錯誤。"
--"<br>MSN 錯誤：%1"
--"<br>請將詳細的錯誤報告送到 kopete-devel@kde.org。報告內容請包含 console 中原始的除錯輸出（若訊息很多，請以 gzip "
--"格式傳送）。"
-+"<qt>MSN 外掛程式發生內部錯誤。<br>MSN 錯誤：%1<br>請將詳細的錯誤報告送到 "
-+"kopete-devel@kde.org。報告內容請包含 console 中原始的除錯輸出（若訊息很多，請"
-+"以 gzip 格式傳送）。"
- 
- #: protocols/msn/msnnotifysocket.cpp:145
- msgid ""
-@@ -12350,14 +12502,14 @@
- 
- #: protocols/msn/msnnotifysocket.cpp:166
- msgid ""
--"<qt>The user '%1' already exists in this group on the MSN server;"
--"<br>if Kopete does not show the user, please send us a detailed bug report at "
--"kopete-devel@kde.org containing the raw debug output on the console (in gzipped "
--"format, as it is probably a lot of output.)</qt>"
--msgstr ""
--"<qt>使用者 %1 以存在於 MSN 伺服器上的此群組。"
--"<br>如果 Kopete 未顯示此使用者，請將詳細的錯誤報告送到 kopete-devel@kde.org。報告內容請包含 console "
--"中原始的除錯輸出（若訊息很多，請以 gzip 格式傳送）。</qt>"
-+"<qt>The user '%1' already exists in this group on the MSN server;<br>if "
-+"Kopete does not show the user, please send us a detailed bug report at "
-+"kopete-devel@kde.org containing the raw debug output on the console (in "
-+"gzipped format, as it is probably a lot of output.)</qt>"
-+msgstr ""
-+"<qt>使用者 %1 以存在於 MSN 伺服器上的此群組。<br>如果 Kopete 未顯示此使用者，"
-+"請將詳細的錯誤報告送到 kopete-devel@kde.org。報告內容請包含 console 中原始的"
-+"除錯輸出（若訊息很多，請以 gzip 格式傳送）。</qt>"
- 
- #: protocols/msn/msnnotifysocket.cpp:183
- msgid "The user '%1' seems to already be blocked or allowed on the server."
-@@ -12373,14 +12525,15 @@
- 
- #: protocols/msn/msnnotifysocket.cpp:198
- msgid ""
--"Kopete is trying to perform an operation on a group or a contact that does not "
--"exists on the server.\n"
-+"Kopete is trying to perform an operation on a group or a contact that does "
-+"not exists on the server.\n"
- "This might happen if the Kopete contact list and the MSN-server contact list "
--"are not correctly synchronized; if this is the case, you probably should send a "
--"bug report."
-+"are not correctly synchronized; if this is the case, you probably should "
-+"send a bug report."
- msgstr ""
- "Kopete 試著對伺服器上不存在的聯絡人或群組執行某個動作。\n"
--"這有可能是因為 Kopete 上的聯絡人清單與 MSN 伺服器上的清單未同步。如果是這樣的話，可能要請您送出一份錯誤報告。"
-+"這有可能是因為 Kopete 上的聯絡人清單與 MSN 伺服器上的清單未同步。如果是這樣的"
-+"話，可能要請您送出一份錯誤報告。"
- 
- #: protocols/msn/msnnotifysocket.cpp:206
- msgid "The group name is too long; it has not been changed on the MSN server."
-@@ -12388,8 +12541,8 @@
- 
- #: protocols/msn/msnnotifysocket.cpp:212
- msgid ""
--"You cannot open a Hotmail inbox because you do not have an MSN account with a "
--"valid Hotmail or MSN mailbox."
-+"You cannot open a Hotmail inbox because you do not have an MSN account with "
-+"a valid Hotmail or MSN mailbox."
- msgstr "您無法開啟 Hotmail 收件匣，因為帳號並非使用有效的 Hotmail/MSN 信箱。"
- 
- #: protocols/msn/msnnotifysocket.cpp:245
-@@ -12413,7 +12566,7 @@
- #: protocols/msn/msnnotifysocket.cpp:757 protocols/msn/msnnotifysocket.cpp:779
- #: protocols/yahoo/yahooaccount.cpp:1491 protocols/yahoo/yahooaccount.cpp:1498
- msgid "Open Inbox..."
--msgstr "開啟收件匣..."
-+msgstr "開啟收件匣…"
- 
- #: protocols/msn/msnnotifysocket.cpp:778
- msgid "You have one new email from %1 in your MSN inbox."
-@@ -12465,8 +12618,8 @@
- #: protocols/msn/msnsocket.cpp:596
- msgid ""
- "Unhandled MSN error code %1 \n"
--"Please fill a bug report with a detailed description and if possible the last "
--"console debug output."
-+"Please fill a bug report with a detailed description and if possible the "
-+"last console debug output."
- msgstr ""
- "無法處理的 MSN 錯誤代號 %1。\n"
- "請將詳細的情況，還有 console 中的除錯輸出回報給開發者。"
-@@ -12528,7 +12681,7 @@
- 
- #: protocols/msn/msnaccount.cpp:271 protocols/msn/msnchatsession.cpp:82
- msgid "Send Raw C&ommand..."
--msgstr "傳送原始命令(&O)..."
-+msgstr "傳送原始命令(&O)…"
- 
- #: protocols/msn/msnchatsession.cpp:86
- msgid "Send Nudge"
-@@ -12549,7 +12702,7 @@
- 
- #: protocols/msn/msnchatsession.cpp:327
- msgid "Other..."
--msgstr "其他..."
-+msgstr "其他…"
- 
- #: protocols/msn/msnchatsession.cpp:357
- msgid "Please enter the email address of the person you want to invite:"
-@@ -12606,15 +12759,15 @@
- 
- #: protocols/msn/msnaccount.cpp:83 protocols/yahoo/yahooaccount.cpp:99
- msgid "Open Inbo&x..."
--msgstr "開啟收件匣(&X)..."
-+msgstr "開啟收件匣(&X)…"
- 
- #: protocols/msn/msnaccount.cpp:84
- msgid "&Change Display Name..."
--msgstr "改變顯示名稱(&C)..."
-+msgstr "改變顯示名稱(&C)…"
- 
- #: protocols/msn/msnaccount.cpp:85
- msgid "&Start Chat..."
--msgstr "開始聊天(&S)..."
-+msgstr "開始聊天(&S)…"
- 
- #: protocols/msn/msnaccount.cpp:332
- msgid "Start Chat - MSN Plugin"
-@@ -12631,8 +12784,8 @@
- 
- #: protocols/msn/msnaccount.cpp:378
- msgid ""
--"Enter the new display name by which you want to be visible to your friends on "
--"MSN:"
-+"Enter the new display name by which you want to be visible to your friends "
-+"on MSN:"
- msgstr "請輸入您想在 MSN 上讓您的朋友看到的新顯示名稱："
- 
- #: protocols/msn/msnaccount.cpp:386
-@@ -12646,8 +12799,8 @@
- #: protocols/msn/msnaccount.cpp:434
- msgid ""
- "The connection with the MSN server was lost unexpectedly.\n"
--"If you cannot reconnect now, the server might be down. In that case, please try "
--"again later."
-+"If you cannot reconnect now, the server might be down. In that case, please "
-+"try again later."
- msgstr ""
- "與 MSN 伺服器的連線意外的中斷了。\n"
- "如果您無法重新連線，可能表示伺服器已經掛了。請稍候再試。"
-@@ -12687,8 +12840,8 @@
- 
- #: protocols/sms/smsaccount.cpp:86
- msgid ""
--"This message is longer than the maximum length (%1). Should it be divided to %2 "
--"messages?"
-+"This message is longer than the maximum length (%1). Should it be divided to "
-+"%2 messages?"
- msgstr "訊息超過最大長度（%1）。要將它切割成 %2 個訊息嗎？"
- 
- #: protocols/sms/smsaccount.cpp:87
-@@ -12709,9 +12862,11 @@
- 
- #: protocols/sms/services/gsmlib.cpp:447
- msgid ""
--"<qt>GSMLib is a library (and utilities) for sending SMS via a GSM device. The "
--"program can be found on <a href=\"%1\">%1</a></qt>"
--msgstr "<qt>GSMLib 是以 GSM 裝置傳送 SMS 的函式庫。程式可以在 <a href=\"%1\">%1</a> 找到。</qt>"
-+"<qt>GSMLib is a library (and utilities) for sending SMS via a GSM device. "
-+"The program can be found on <a href=\"%1\">%1</a></qt>"
-+msgstr ""
-+"<qt>GSMLib 是以 GSM 裝置傳送 SMS 的函式庫。程式可以在 <a href=\"%1\">%1</a> "
-+"找到。</qt>"
- 
- #: protocols/sms/services/smssend.cpp:57
- msgid "No provider configured."
-@@ -12732,9 +12887,11 @@
- 
- #: protocols/sms/services/smssend.cpp:240
- msgid ""
--"<qt>SMSSend is a program for sending SMS through gateways on the web. It can be "
--"found on <a href=\"%1\">%2</a></qt>"
--msgstr "<qt>SMSSend 是一個透過網路閘道器送出 SMS 的程式。可以在 <a href=\"%1\">%2</a> 找到。</qt>"
-+"<qt>SMSSend is a program for sending SMS through gateways on the web. It can "
-+"be found on <a href=\"%1\">%2</a></qt>"
-+msgstr ""
-+"<qt>SMSSend 是一個透過網路閘道器送出 SMS 的程式。可以在 <a href=\"%1\">%2</"
-+"a> 找到。</qt>"
- 
- #: protocols/sms/services/smsclient.cpp:66
- msgid "No provider configured"
-@@ -12742,9 +12899,11 @@
- 
- #: protocols/sms/services/smsclient.cpp:179
- msgid ""
--"<qt>SMSClient is a program for sending SMS with the modem. The program can be "
--"found on <a href=\"%1\">%1</a></qt>"
--msgstr "<qt>SMSClient 是以數據機傳送 SMS 的程式。可以在 <a href=\"%1\">%1</a> 找到。</qt>"
-+"<qt>SMSClient is a program for sending SMS with the modem. The program can "
-+"be found on <a href=\"%1\">%1</a></qt>"
-+msgstr ""
-+"<qt>SMSClient 是以數據機傳送 SMS 的程式。可以在 <a href=\"%1\">%1</a> 找到。"
-+"</qt>"
- 
- #: protocols/sms/services/smssendprovider.cpp:215
- msgid "Could not determine which argument which should contain the message."
-@@ -13071,11 +13230,11 @@
- 
- #: protocols/gadu/gaduaccount.cpp:190
- msgid "Export Contacts to File..."
--msgstr "將聯絡人匯出到檔案..."
-+msgstr "將聯絡人匯出到檔案…"
- 
- #: protocols/gadu/gaduaccount.cpp:192
- msgid "Import Contacts From File..."
--msgstr "由檔案匯入聯絡人..."
-+msgstr "由檔案匯入聯絡人…"
- 
- #: protocols/gadu/gaduaccount.cpp:194
- msgid "Only for Friends"
-@@ -13103,7 +13262,7 @@
- 
- #: protocols/gadu/gaduaccount.cpp:305
- msgid "Set &Description..."
--msgstr "設定描述..."
-+msgstr "設定描述…"
- 
- #: protocols/gadu/gaduaccount.cpp:685
- msgid "connection using SSL was not possible, retrying without."
-@@ -13186,7 +13345,7 @@
- 
- #: protocols/gadu/gadupubdir.cpp:74 protocols/gadu/gadupubdir.cpp:315
- msgid "Search &More..."
--msgstr "搜尋更多(&M)..."
-+msgstr "搜尋更多(&M)…"
- 
- #: protocols/gadu/gadupubdir.cpp:95
- msgid "Gadu-Gadu Public Directory"
-@@ -13198,7 +13357,7 @@
- 
- #: protocols/gadu/gadupubdir.cpp:104
- msgid "&Add User..."
--msgstr "加入使用者(&A)..."
-+msgstr "加入使用者(&A)…"
- 
- #: protocols/gadu/gaduprotocol.cpp:57
- msgid "Blocked"
-@@ -13254,14 +13413,15 @@
- 
- #: protocols/oscar/aim/aimcontact.cpp:350
- msgid ""
--"<qt>Would you like to warn %1 anonymously or with your name?"
--"<br>(Warning a user on AIM will result in a \"Warning Level\" increasing for "
--"the user you warn. Once this level has reached a certain point, they will not "
--"be able to sign on. Please do not abuse this function, it is meant for "
--"legitimate practices.)</qt>"
--msgstr ""
--"<qt>您要匿名警告 %1，還是要附上您的名稱？"
--"<br> （在 AIM 上警告使用者，會讓該使用者的「警告等級」提升。一旦警告等級提升到一個程度，他們將無法再登入。請不要濫用此功能。）</qt>"
-+"<qt>Would you like to warn %1 anonymously or with your name?<br>(Warning a "
-+"user on AIM will result in a \"Warning Level\" increasing for the user you "
-+"warn. Once this level has reached a certain point, they will not be able to "
-+"sign on. Please do not abuse this function, it is meant for legitimate "
-+"practices.)</qt>"
-+msgstr ""
-+"<qt>您要匿名警告 %1，還是要附上您的名稱？<br> （在 AIM 上警告使用者，會讓該使"
-+"用者的「警告等級」提升。一旦警告等級提升到一個程度，他們將無法再登入。請不要"
-+"濫用此功能。）</qt>"
- 
- #: protocols/oscar/aim/aimcontact.cpp:358
- msgid "Warn User %1?"
-@@ -13288,7 +13448,7 @@
- 
- #: protocols/oscar/aim/aimuserinfo.cpp:116
- msgid "Requesting User Profile, please wait..."
--msgstr "要求使用者設定檔中。請稍候..."
-+msgstr "要求使用者設定檔中。請稍候…"
- 
- #: protocols/oscar/aim/aimuserinfo.cpp:198
- msgid "<html><body><I>No user information provided</I></body></html>"
-@@ -13296,14 +13456,15 @@
- 
- #: protocols/oscar/aim/aimaccount.cpp:211
- msgid ""
--"Visit the Kopete website at <a href=\"http://kopete.kde.org\">"
--"http://kopete.kde.org</a>"
-+"Visit the Kopete website at <a href=\"http://kopete.kde.org\">http://kopete."
-+"kde.org</a>"
- msgstr ""
--"請參考 Kopete 網站 <a href=\"http://kopete.kde.org\">http://kopete.kde.org</a>"
-+"請參考 Kopete 網站 <a href=\"http://kopete.kde.org\">http://kopete.kde.org</"
-+"a>"
- 
- #: protocols/oscar/aim/aimaccount.cpp:325
- msgid "Join Chat..."
--msgstr "加入聊天..."
-+msgstr "加入聊天…"
- 
- #: protocols/oscar/aim/aimaccount.cpp:328
- #: protocols/oscar/icq/icqaccount.cpp:137
-@@ -13313,7 +13474,7 @@
- #: protocols/jabber/jabberaccount.cpp:202
- #: protocols/oscar/aim/aimaccount.cpp:334
- msgid "Edit User Info..."
--msgstr "編輯使用者資訊..."
-+msgstr "編輯使用者資訊…"
- 
- #: protocols/oscar/aim/aimaccount.cpp:385
- msgid "Editing your user info is not possible because you are not connected."
-@@ -13373,7 +13534,7 @@
- #: protocols/oscar/aim/aimprotocol.cpp:240
- #: protocols/oscar/icq/icqpresence.cpp:129
- msgid "Connecting..."
--msgstr "連線中..."
-+msgstr "連線中…"
- 
- #: protocols/oscar/aim/aimprotocol.cpp:242
- #: protocols/oscar/icq/icqprotocol.cpp:183
-@@ -13638,62 +13799,62 @@
- #. i18n("Yoruba")
- #: protocols/oscar/icq/icqprotocol.cpp:528
- msgid "Taiwanese"
--msgstr "台語"
-+msgstr "臺語"
- 
- #: protocols/oscar/icq/icqprotocol.cpp:537
- #: protocols/oscar/oscarencodingselectiondialog.cpp:36
- msgid "Big5"
--msgstr "Big5（繁體中文）"
-+msgstr "Big5（傳統字漢語）"
- 
- #: protocols/oscar/icq/icqprotocol.cpp:538
- #: protocols/oscar/oscarencodingselectiondialog.cpp:37
- msgid "Big5-HKSCS"
--msgstr "Big5-HKSCS（繁體中文）"
-+msgstr "Big5-HKSCS（傳統字漢語）"
- 
- #: protocols/oscar/icq/icqprotocol.cpp:539
- #: protocols/oscar/oscarencodingselectiondialog.cpp:38
- msgid "euc-JP Japanese"
--msgstr "euc-JP（日文）"
-+msgstr "euc-JP（日語）"
- 
- #: protocols/oscar/icq/icqprotocol.cpp:540
- #: protocols/oscar/oscarencodingselectiondialog.cpp:39
- msgid "euc-KR Korean"
--msgstr "euc-KR（韓文）"
-+msgstr "euc-KR（韓語）"
- 
- #: protocols/oscar/icq/icqprotocol.cpp:541
- #: protocols/oscar/oscarencodingselectiondialog.cpp:40
- msgid "GB-2312 Chinese"
--msgstr "GB-2312（簡體中文）"
-+msgstr "GB-2312（簡化字漢語）"
- 
- #: protocols/oscar/icq/icqprotocol.cpp:542
- #: protocols/oscar/oscarencodingselectiondialog.cpp:41
- msgid "GBK Chinese"
--msgstr "GBK（簡體中文）"
-+msgstr "GBK（簡化字漢語）"
- 
- #: protocols/oscar/icq/icqprotocol.cpp:543
- #: protocols/oscar/oscarencodingselectiondialog.cpp:42
- msgid "GB18030 Chinese"
--msgstr "GB18030（簡體中文）"
-+msgstr "GB18030（簡化字漢語）"
- 
- #: protocols/oscar/icq/icqprotocol.cpp:545
- #: protocols/oscar/oscarencodingselectiondialog.cpp:44
- msgid "JIS Japanese"
--msgstr "JIS（日文）"
-+msgstr "JIS（日語）"
- 
- #: protocols/oscar/icq/icqprotocol.cpp:546
- #: protocols/oscar/oscarencodingselectiondialog.cpp:45
- msgid "Shift-JIS Japanese"
--msgstr "Shift-JIS（日文）"
-+msgstr "Shift-JIS（日語）"
- 
- #: protocols/oscar/icq/icqprotocol.cpp:548
- #: protocols/oscar/oscarencodingselectiondialog.cpp:47
- msgid "KOI8-R Russian"
--msgstr "KOI8-R（俄文）"
-+msgstr "KOI8-R（俄語）"
- 
- #: protocols/oscar/icq/icqprotocol.cpp:549
- #: protocols/oscar/oscarencodingselectiondialog.cpp:48
- msgid "KOI8-U Ukrainian"
--msgstr "KOI8-U （烏克蘭文）"
-+msgstr "KOI8-U （烏克蘭語）"
- 
- #: protocols/oscar/icq/icqprotocol.cpp:551
- #: protocols/oscar/oscarencodingselectiondialog.cpp:50
-@@ -14117,7 +14278,8 @@
- 
- #: protocols/oscar/icq/icqcontact.cpp:628
- msgid ""
--"<qt>You must be logged on to ICQ before you can send a message to a user.</qt>"
-+"<qt>You must be logged on to ICQ before you can send a message to a user.</"
-+"qt>"
- msgstr "<qt>您要送訊息給使用者，必須先登入 ICQ。</qt>"
- 
- #: protocols/oscar/icq/icqcontact.cpp:630
-@@ -14138,7 +14300,7 @@
- 
- #: protocols/oscar/icq/icqcontact.cpp:719
- msgid "Select Encoding..."
--msgstr "選取編碼..."
-+msgstr "選取編碼…"
- 
- #: protocols/oscar/icq/icqaccount.cpp:130
- msgid "In&visible"
-@@ -14216,7 +14378,7 @@
- 
- #: protocols/oscar/icq/icqreadaway.cpp:77
- msgid "Fetching '%2' Message for %1..."
--msgstr "抓取給 %1 的 %2 訊息..."
-+msgstr "抓取給 %1 的 %2 訊息…"
- 
- #: protocols/oscar/oscarlistnonservercontacts.cpp:28
- msgid "Add Contacts to Server List"
-@@ -14290,13 +14452,14 @@
- 
- #: protocols/oscar/oscaraccount.cpp:771
- msgid ""
--"There was an error in the protocol handling; it was not fatal, so you will not "
--"be disconnected."
-+"There was an error in the protocol handling; it was not fatal, so you will "
-+"not be disconnected."
- msgstr "處理協定時發生錯誤。這個錯誤並不嚴重，因此您不會被迫離線。"
- 
- #: protocols/oscar/oscaraccount.cpp:773
- msgid ""
--"There was an error in the protocol handling; automatic reconnection occurring."
-+"There was an error in the protocol handling; automatic reconnection "
-+"occurring."
- msgstr "處理協定時發生錯誤。自動重新連線中。"
- 
- #: protocols/oscar/oscaraccount.cpp:775
-@@ -14355,17 +14518,21 @@
- 
- #: protocols/oscar/oscaraccount.cpp:864
- msgid ""
--"Account %1 was blocked on the %2 server for sending messages too quickly. Wait "
--"ten minutes and try again. If you continue to try, you will need to wait even "
--"longer."
--msgstr "帳號 %1 在伺服器 %2 上被封鎖，因為送出訊息的速度太快。請等十分鐘後再試一次。如果您繼續試，您可能就得等更久。"
-+"Account %1 was blocked on the %2 server for sending messages too quickly. "
-+"Wait ten minutes and try again. If you continue to try, you will need to "
-+"wait even longer."
-+msgstr ""
-+"帳號 %1 在伺服器 %2 上被封鎖，因為送出訊息的速度太快。請等十分鐘後再試一次。"
-+"如果您繼續試，您可能就得等更久。"
- 
- #: protocols/oscar/oscaraccount.cpp:873
- msgid ""
--"Account %1 was blocked on the %2 server for reconnecting too quickly. Wait ten "
--"minutes and try again. If you continue to try, you will need to wait even "
--"longer."
--msgstr "帳號 %1 在伺服器 %2 上被封鎖，因為重新連線的速度太快。請等十分鐘後再試一次。如果您繼續試，您可能就得等更久。"
-+"Account %1 was blocked on the %2 server for reconnecting too quickly. Wait "
-+"ten minutes and try again. If you continue to try, you will need to wait "
-+"even longer."
-+msgstr ""
-+"帳號 %1 在伺服器 %2 上被封鎖，因為重新連線的速度太快。請等十分鐘後再試一次。"
-+"如果您繼續試，您可能就得等更久。"
- 
- #: protocols/oscar/oscaraccount.cpp:885 protocols/oscar/oscaraccount.cpp:905
- msgid "Sign on to %1 with your account %2 failed."
-@@ -14373,8 +14540,8 @@
- 
- #: protocols/oscar/oscaraccount.cpp:892
- msgid ""
--"The %1 server thinks the client you are using is too old. Please report this as "
--"a bug at http://bugs.kde.org"
-+"The %1 server thinks the client you are using is too old. Please report this "
-+"as a bug at http://bugs.kde.org"
- msgstr "伺服器 %1 認為您使用的客戶端太舊了。請回報此錯誤到 http://bugs.kde.org"
- 
- #: protocols/oscar/oscaraccount.cpp:898
-@@ -14464,7 +14631,7 @@
- 
- #: protocols/yahoo/yahoocontact.cpp:117
- msgid "%1|Stealthed"
--msgstr "%1|秘密檢視"
-+msgstr "%1|祕密檢視"
- 
- #: protocols/yahoo/yahoocontact.cpp:369
- msgid "View &Webcam"
-@@ -14481,7 +14648,7 @@
- 
- #: protocols/yahoo/yahoocontact.cpp:401
- msgid "&Stealth Setting"
--msgstr "秘密設定(&S)"
-+msgstr "祕密設定(&S)"
- 
- #: protocols/yahoo/yahoocontact.cpp:411
- msgid "&Invite to Conference"
-@@ -14493,7 +14660,7 @@
- 
- #: protocols/yahoo/yahoocontact.cpp:465
- msgid "Stealth Setting"
--msgstr "秘密設定"
-+msgstr "祕密設定"
- 
- #: protocols/yahoo/yahoocontact.cpp:519
- msgid "Buzzz!!!"
-@@ -14609,11 +14776,11 @@
- 
- #: protocols/yahoo/yahooaccount.cpp:100
- msgid "Open &Addressbook..."
--msgstr "開啟通訊錄(&A)..."
-+msgstr "開啟通訊錄(&A)…"
- 
- #: protocols/yahoo/yahooaccount.cpp:101
- msgid "&Edit my contact details..."
--msgstr "編輯我的聯絡人詳情(&E)..."
-+msgstr "編輯我的聯絡人詳情(&E)…"
- 
- #: protocols/yahoo/yahooaccount.cpp:692
- msgid ""
-@@ -14730,8 +14897,8 @@
- #: protocols/yahoo/yahooaccount.cpp:1639
- #: protocols/yahoo/yahooeditaccount.cpp:186
- msgid ""
--"<qt>The selected buddy icon could not be opened. "
--"<br>Please set a new buddy icon.</qt>"
-+"<qt>The selected buddy icon could not be opened. <br>Please set a new buddy "
-+"icon.</qt>"
- msgstr "<qt>所選取的好友圖示無法開啟。<br> 請設定新的好友圖示。</qt>"
- 
- #: protocols/yahoo/yahooaccount.cpp:1654
-@@ -15012,11 +15179,13 @@
- msgid ""
- "Unless you know what you are doing, your JID should be of the form "
- "\"username@server.com\".  In your case for example \"username@%1\"."
--msgstr "除非您知道在做什麼，不然您的 JID 應該是 username@server.com 的形式。以您的情況舉例，username@%1。"
-+msgstr ""
-+"除非您知道在做什麼，不然您的 JID 應該是 username@server.com 的形式。以您的情"
-+"況舉例，username@%1。"
- 
- #: protocols/jabber/ui/jabberregisteraccount.cpp:248
- msgid "Connecting to server..."
--msgstr "連線到伺服器..."
-+msgstr "連線到伺服器…"
- 
- #: protocols/groupwise/gwaccount.cpp:251
- #: protocols/jabber/jabberaccount.cpp:424
-@@ -15024,7 +15193,9 @@
- msgid ""
- "SSL support could not be initialized for account %1. This is most likely "
- "because the QCA TLS plugin is not installed on your system."
--msgstr "無法初始化帳號 %1 的 SSL 支援。這最有可能是因為您的系統上沒裝 QCA TLS 外掛程式。"
-+msgstr ""
-+"無法初始化帳號 %1 的 SSL 支援。這最有可能是因為您的系統上沒裝 QCA TLS 外掛程"
-+"式。"
- 
- #: protocols/jabber/jabberaccount.cpp:426
- #: protocols/jabber/ui/jabberregisteraccount.cpp:269
-@@ -15037,7 +15208,7 @@
- 
- #: protocols/jabber/ui/jabberregisteraccount.cpp:327
- msgid "Connected successfully, registering new account..."
--msgstr "已成功連線，正在註冊新帳號..."
-+msgstr "已成功連線，正在註冊新帳號…"
- 
- #: protocols/jabber/ui/jabberregisteraccount.cpp:342
- msgid "Registration successful."
-@@ -15082,7 +15253,9 @@
- msgid ""
- "The Jabber ID you have chosen is invalid. Please make sure it is in the form "
- "user@server.com, like an email address."
--msgstr "您選擇的 Jabber 代號無效。請確定已經依照 user@server.com 的格式了，它有點像電子信箱地址。"
-+msgstr ""
-+"您選擇的 Jabber 代號無效。請確定已經依照 user@server.com 的格式了，它有點像電"
-+"子信箱地址。"
- 
- #: protocols/jabber/ui/jabbereditaccountwidget.cpp:207
- msgid "Invalid Jabber ID"
-@@ -15102,7 +15275,7 @@
- 
- #: protocols/jabber/ui/dlgjabbervcard.cpp:299
- msgid "Saving vCard to server..."
--msgstr "儲存 vCard 到伺服器..."
-+msgstr "儲存 vCard 到伺服器…"
- 
- #: protocols/jabber/ui/dlgjabbervcard.cpp:421
- msgid "vCard save sucessful."
-@@ -15114,7 +15287,7 @@
- 
- #: protocols/jabber/ui/dlgjabbervcard.cpp:434
- msgid "Fetching contact vCard..."
--msgstr "抓取聯絡人的 vCard 中..."
-+msgstr "抓取聯絡人的 vCard 中…"
- 
- #: protocols/jabber/ui/dlgjabbervcard.cpp:457
- msgid "vCard fetching Done."
-@@ -15122,8 +15295,8 @@
- 
- #: protocols/jabber/ui/dlgjabbervcard.cpp:461
- msgid ""
--"Error: vCard could not be fetched correctly. Check connectivity with the Jabber "
--"server."
-+"Error: vCard could not be fetched correctly. Check connectivity with the "
-+"Jabber server."
- msgstr "錯誤：無法正確抓取 vCard。請檢查與 Jabber 伺服器的連線。"
- 
- #: protocols/jabber/ui/dlgjabbervcard.cpp:472
-@@ -15137,8 +15310,8 @@
- 
- #: protocols/jabber/ui/dlgjabbervcard.cpp:535
- msgid ""
--"<qt>An error occurred when trying to change the photo."
--"<br>Make sure that you have selected a correct image file</qt>"
-+"<qt>An error occurred when trying to change the photo.<br>Make sure that you "
-+"have selected a correct image file</qt>"
- msgstr "<qt>改變顯示圖片時發生錯誤。<br> 請確定您選擇了正確的圖片檔。</qt>"
- 
- #: protocols/jabber/ui/dlgjabberchatjoin.cpp:34
-@@ -15178,8 +15351,8 @@
- 
- #: protocols/jabber/ui/dlgjabberchangepassword.cpp:80
- msgid ""
--"Your account needs to be connected before the password can be changed. Do you "
--"want to try to connect now?"
-+"Your account needs to be connected before the password can be changed. Do "
-+"you want to try to connect now?"
- msgstr "您要變更密碼，必須先連線。您要現在連線嗎？"
- 
- #: protocols/jabber/ui/dlgjabberchangepassword.cpp:81
-@@ -15190,15 +15363,18 @@
- #: protocols/jabber/ui/dlgjabberchangepassword.cpp:120
- msgid ""
- "Your password has been changed successfully. Please note that the change may "
--"not be instantaneous. If you have problems logging in with your new password, "
--"please contact the administrator."
--msgstr "您的密碼已成功變更。請注意，此變更不會立刻生效。如果您使用新密碼無法登入，請與管理者聯絡。"
-+"not be instantaneous. If you have problems logging in with your new "
-+"password, please contact the administrator."
-+msgstr ""
-+"您的密碼已成功變更。請注意，此變更不會立刻生效。如果您使用新密碼無法登入，請"
-+"與管理者聯絡。"
- 
- #: protocols/jabber/ui/dlgjabberchangepassword.cpp:128
- msgid ""
- "Your password could not be changed. Either your server does not support this "
- "feature or the administrator does not allow you to change your password."
--msgstr "您無法變更密碼。可能是您的伺服器不支援此功能，或是管理者不允許您變更密碼。"
-+msgstr ""
-+"您無法變更密碼。可能是您的伺服器不支援此功能，或是管理者不允許您變更密碼。"
- 
- #: protocols/jabber/ui/jabberchooseserver.cpp:34
- msgid "Choose Jabber Server"
-@@ -15206,7 +15382,7 @@
- 
- #: protocols/jabber/ui/jabberchooseserver.cpp:44
- msgid "Retrieving server list..."
--msgstr "取得伺服器清單..."
-+msgstr "取得伺服器清單…"
- 
- #: protocols/jabber/ui/jabberchooseserver.cpp:111
- msgid "Could not retrieve server list."
-@@ -15243,7 +15419,7 @@
- 
- #: protocols/jabber/ui/jabberaddcontactpage.cpp:52
- msgid "Loading instruction from gateway..."
--msgstr "從閘道器載入指令..."
-+msgstr "從閘道器載入指令…"
- 
- #: protocols/jabber/ui/jabberaddcontactpage.cpp:63
- msgid "Connect to the Jabber network and try again."
-@@ -15309,16 +15485,12 @@
- 
- #: protocols/jabber/jabbercontact.cpp:267
- msgid ""
--"<qt><i>%1</i> invited you to join the conference <b>%2</b>"
--"<br>%3"
--"<br>If you want to accept and join, just <b>enter your nickname</b> "
--"and press ok"
--"<br>If you want to decline, press cancel</qt>"
--msgstr ""
--"<qt><i>%1</i> 邀請您加入會議 <b>%2</b>"
--"<br> %3"
--"<br> 如果您要接受邀請並加入，只要<b>輸入您的暱稱</b>然後按下確定。"
--"<br> 如果您要拒絕，請按下取消。</qt>"
-+"<qt><i>%1</i> invited you to join the conference <b>%2</b><br>%3<br>If you "
-+"want to accept and join, just <b>enter your nickname</b> and press ok<br>If "
-+"you want to decline, press cancel</qt>"
-+msgstr ""
-+"<qt><i>%1</i> 邀請您加入會議 <b>%2</b><br> %3<br> 如果您要接受邀請並加入，只"
-+"要<b>輸入您的暱稱</b>然後按下確定。<br> 如果您要拒絕，請按下取消。</qt>"
- 
- #: protocols/jabber/jabbercontact.cpp:273
- msgid "Invited to a conference - Jabber Plugin"
-@@ -15356,7 +15528,9 @@
- "You have preselected a resource for contact %1, but you still have open chat "
- "windows for this contact. The preselected resource will only apply to newly "
- "opened chat windows."
--msgstr "您已經預先選擇聯絡人 %1 的資源，但是已經有與此聯絡人聊天的視窗了。預先選擇的資源只會在新視窗中生效。"
-+msgstr ""
-+"您已經預先選擇聯絡人 %1 的資源，但是已經有與此聯絡人聊天的視窗了。預先選擇的"
-+"資源只會在新視窗中生效。"
- 
- #: protocols/jabber/jabbercontact.cpp:1093
- msgid "Jabber Resource Selector"
-@@ -15491,10 +15665,12 @@
- 
- #: protocols/jabber/jabberaccount.cpp:166
- msgid ""
--"Could not bind Jabber file transfer manager to local port. Please check if the "
--"file transfer port is already in use or choose another port in the account "
--"settings."
--msgstr "無法將 Jabber 檔案傳輸管理員與本地端連接埠配對。請檢查是否檔案傳輸連接埠已經在使用中，或是在帳號設定中選擇另一個連接埠。"
-+"Could not bind Jabber file transfer manager to local port. Please check if "
-+"the file transfer port is already in use or choose another port in the "
-+"account settings."
-+msgstr ""
-+"無法將 Jabber 檔案傳輸管理員與本地端連接埠配對。請檢查是否檔案傳輸連接埠已經"
-+"在使用中，或是在帳號設定中選擇另一個連接埠。"
- 
- #: protocols/jabber/jabberaccount.cpp:167
- msgid "Failed to start Jabber File Transfer Manager"
-@@ -15502,15 +15678,15 @@
- 
- #: protocols/jabber/jabberaccount.cpp:181
- msgid "Join Groupchat..."
--msgstr "加入群組聊天..."
-+msgstr "加入群組聊天…"
- 
- #: protocols/jabber/jabberaccount.cpp:192
- msgid "Services..."
--msgstr "服務..."
-+msgstr "服務…"
- 
- #: protocols/jabber/jabberaccount.cpp:197
- msgid "Send Raw Packet to Server..."
--msgstr "傳送原始封包到伺服器..."
-+msgstr "傳送原始封包到伺服器…"
- 
- #: protocols/jabber/jabberaccount.cpp:259
- msgid "Please connect first."
-@@ -15578,10 +15754,11 @@
- 
- #: protocols/jabber/jabberaccount.cpp:508
- msgid ""
--"<qt>"
--"<p>The certificate of server %1 could not be validated for account %2: %3</p>"
--"<p>Do you want to continue?</p></qt>"
--msgstr "<qt><p>伺服器 %1 的憑證無法被帳號 %2 確認：%3。</p> <p>您確定要繼續嗎？</p></qt>"
-+"<qt><p>The certificate of server %1 could not be validated for account %2: %"
-+"3</p><p>Do you want to continue?</p></qt>"
-+msgstr ""
-+"<qt><p>伺服器 %1 的憑證無法被帳號 %2 確認：%3。</p> <p>您確定要繼續嗎？</p></"
-+"qt>"
- 
- #: protocols/jabber/jabberaccount.cpp:510
- msgid "Jabber Connection Certificate Problem"
-@@ -15728,7 +15905,7 @@
- msgid ""
- "It appears we have been redirected to another server; I do not know how to "
- "handle this."
--msgstr "我們似乎被導向到另一台伺服器。我不知道怎麼處理。"
-+msgstr "我們似乎被導向到另一臺伺服器。我不知道怎麼處理。"
- 
- #: protocols/jabber/jabberaccount.cpp:866
- msgid "Unsupported protocol version."
-@@ -15754,7 +15931,7 @@
- 
- #: protocols/jabber/jabberaccount.cpp:883
- msgid "Failed to establish a secure connection."
--msgstr "建立秘密連線失敗。"
-+msgstr "建立祕密連線失敗。"
- 
- #: protocols/jabber/jabberaccount.cpp:890
- #, c-format
-@@ -15844,9 +16021,11 @@
- #: protocols/jabber/jabberaccount.cpp:1122
- msgid ""
- "The Jabber user %1 removed %2's subscription to them. This account will no "
--"longer be able to view their online/offline status. Do you want to delete the "
--"contact?"
--msgstr "Jabber 使用者 %1 已移除 %2 的同意。此帳號將無法再看到他們的上線/離線狀態。您要刪除此聯絡人嗎？"
-+"longer be able to view their online/offline status. Do you want to delete "
-+"the contact?"
-+msgstr ""
-+"Jabber 使用者 %1 已移除 %2 的同意。此帳號將無法再看到他們的上線/離線狀態。您"
-+"要刪除此聯絡人嗎？"
- 
- #: protocols/jabber/jabberaccount.cpp:1302
- msgid "Waiting for authorization"
-@@ -15885,18 +16064,19 @@
- 
- #: protocols/jabber/jabberaccount.cpp:1555
- msgid ""
--"There was an error processing your request for group chat %1. (Reason: %2, Code "
--"%3)"
-+"There was an error processing your request for group chat %1. (Reason: %2, "
-+"Code %3)"
- msgstr "處理您對群組聊天 %1 的要求時發生錯誤。（理由：%2，代碼 %3）"
- 
- #: protocols/jabber/jabberaccount.cpp:1688
- msgid ""
- "Do you want to also unregister \"%1\" from the Jabber server ?\n"
--"If you unregister, all your contact list may be removed on the server,And you "
--"will never be able to connect to this account with any client"
-+"If you unregister, all your contact list may be removed on the server,And "
-+"you will never be able to connect to this account with any client"
- msgstr ""
- "您也要從 Jabber 伺服器中解除 %1 註冊嗎？\n"
--"如果您解除註冊，您所有的聯絡人清單都會從伺服器上移除。您將無法再使用此帳號連線。"
-+"如果您解除註冊，您所有的聯絡人清單都會從伺服器上移除。您將無法再使用此帳號連"
-+"線。"
- 
- #: protocols/jabber/jabberaccount.cpp:1691
- msgid "Unregister"
-@@ -15928,11 +16108,11 @@
- 
- #: protocols/jabber/jingle/jinglevoicesessiondialog.cpp:72
- msgid "Incoming Session..."
--msgstr "新的階段..."
-+msgstr "新的階段…"
- 
- #: protocols/jabber/jingle/jinglevoicesessiondialog.cpp:98
- msgid "Waiting for other peer..."
--msgstr "等待另一端點..."
-+msgstr "等待另一端點…"
- 
- #: protocols/jabber/jingle/jinglevoicesessiondialog.cpp:109
- #: protocols/jabber/jingle/jinglevoicesessiondialog.cpp:162
-@@ -16028,7 +16208,8 @@
- "Should the directory be created? (May need root password)"
- msgstr ""
- "工作目錄 %1 不存在。\n"
--"如果您沒有設定 samba，您最好呼叫「安裝到 Samba」（在設定...＞帳號＞編輯中）。\n"
-+"如果您沒有設定 samba，您最好呼叫「安裝到 Samba」（在設定...＞帳號＞編輯"
-+"中）。\n"
- "要建立此目錄嗎？（可能需要 root 密碼）"
- 
- #: protocols/winpopup/libwinpopup/libwinpopup.cpp:111
-@@ -16111,7 +16292,8 @@
- 
- #: protocols/groupwise/ui/gweditaccountwidget.cpp:104
- msgid ""
--"The changes you just made will take effect next time you log in with GroupWise."
-+"The changes you just made will take effect next time you log in with "
-+"GroupWise."
- msgstr "您做的修改會在下一次登入 GroupWise 時生效。"
- 
- #: protocols/groupwise/ui/gweditaccountwidget.cpp:105
-@@ -16143,8 +16325,8 @@
- 
- #: protocols/groupwise/ui/gwprivacydialog.cpp:346
- msgid ""
--"You can only change privacy settings while you are logged in to the GroupWise "
--"Messenger server."
-+"You can only change privacy settings while you are logged in to the "
-+"GroupWise Messenger server."
- msgstr "只有您登入到 GroupWise Messenger 伺服器時才能更改隱私設定。"
- 
- #: protocols/groupwise/ui/gwprivacydialog.cpp:346
-@@ -16386,15 +16568,15 @@
- 
- #: protocols/groupwise/gwaccount.cpp:82
- msgid "&Set Auto-Reply..."
--msgstr "設定自動回覆(&S)..."
-+msgstr "設定自動回覆(&S)…"
- 
- #: protocols/groupwise/gwaccount.cpp:84
- msgid "&Join Channel..."
--msgstr "加入頻道(&J)..."
-+msgstr "加入頻道(&J)…"
- 
- #: protocols/groupwise/gwaccount.cpp:86
- msgid "&Manage Privacy..."
--msgstr "管理隱私(&M)..."
-+msgstr "管理隱私(&M)…"
- 
- #: protocols/groupwise/gwaccount.cpp:253
- msgid "GroupWise SSL Error"
-@@ -16408,7 +16590,7 @@
- "<wstephenson@novell.com> for analysis."
- msgstr ""
- "Kopete 無法送出最後一個訊息到帳號 %1。\n"
--"如果可以的話，請送出主控台的除錯輸出給 <wstephenson@novell.com> 來分析原因。"
-+"如果可以的話，請送出主控臺的除錯輸出給 <wstephenson@novell.com> 來分析原因。"
- 
- #: protocols/groupwise/gwaccount.cpp:367
- msgid "Unable to Send Message on Account '%1'"
-@@ -16420,8 +16602,8 @@
- 
- #: protocols/groupwise/gwaccount.cpp:577
- msgid ""
--"A change happened to your GroupWise contact list while you were offline which "
--"was impossible to reconcile."
-+"A change happened to your GroupWise contact list while you were offline "
-+"which was impossible to reconcile."
- msgstr "當您離線時，您的 GroupWise 聯絡人清單被改變了，因此無法同步。"
- 
- #: protocols/groupwise/gwaccount.cpp:650
-@@ -16430,7 +16612,9 @@
- "Kopete was not able to connect to the GroupWise Messenger server for account "
- "'%1'.\n"
- "Please check your server and port settings and try again."
--msgstr "Kopete 無法連線到帳號 %1 的 GroupWise Messenger 伺服器。請檢查您的伺服器與連接埠的設定，然後再試一次。"
-+msgstr ""
-+"Kopete 無法連線到帳號 %1 的 GroupWise Messenger 伺服器。請檢查您的伺服器與連"
-+"接埠的設定，然後再試一次。"
- 
- #: protocols/groupwise/gwaccount.cpp:650
- msgid "Unable to Connect '%1'"
-@@ -16446,8 +16630,8 @@
- 
- #: protocols/groupwise/gwaccount.cpp:826
- msgid ""
--"_: Prefix used for automatically generated auto-reply messages when the contact "
--"is Away, contains contact's name\n"
-+"_: Prefix used for automatically generated auto-reply messages when the "
-+"contact is Away, contains contact's name\n"
- "Auto reply from %1: "
- msgstr "來自 %1 的自動回覆："
- 
-@@ -16479,8 +16663,8 @@
- #: protocols/groupwise/gwaccount.cpp:1259
- msgid ""
- "_: The parameter is the user's own account id for this protocol\n"
--"You have been disconnected from GroupWise Messenger because you signed in as %1 "
--"elsewhere"
-+"You have been disconnected from GroupWise Messenger because you signed in as "
-+"%1 elsewhere"
- msgstr "您已中斷與 GroupWise Messenger 的連線，因為從別處又登入為 %1"
- 
- #: protocols/groupwise/gwaccount.cpp:1367
-@@ -16493,8 +16677,8 @@
- 
- #: protocols/groupwise/gwaccount.cpp:1394
- msgid ""
--"Please enter an Auto-Reply message that will be shown to users who message you "
--"while Away or Busy"
-+"Please enter an Auto-Reply message that will be shown to users who message "
-+"you while Away or Busy"
- msgstr "請輸入自動回覆訊息，在您離開或忙碌時會自動回覆給其他使用者。"
- 
- #: protocols/groupwise/gwmessagemanager.cpp:68
-@@ -16518,13 +16702,13 @@
- 
- #: protocols/groupwise/gwmessagemanager.cpp:226
- msgid ""
--"Your message could not be sent. You cannot send messages while your status is "
--"Appear Offline. "
-+"Your message could not be sent. You cannot send messages while your status "
-+"is Appear Offline. "
- msgstr "當您的狀態是「離線」時，您的訊息無法送出。"
- 
- #: protocols/groupwise/gwmessagemanager.cpp:319
- msgid "&Other..."
--msgstr "其他(&O)..."
-+msgstr "其他(&O)…"
- 
- #: protocols/groupwise/gwmessagemanager.cpp:338
- #: protocols/groupwise/gwmessagemanager.cpp:384
-@@ -16542,15 +16726,19 @@
- 
- #: protocols/groupwise/gwmessagemanager.cpp:398
- msgid ""
--"_: label attached to contacts who have been invited but are yet to join a chat\n"
-+"_: label attached to contacts who have been invited but are yet to join a "
-+"chat\n"
- "(pending)"
- msgstr "（已邀請）"
- 
- #: protocols/groupwise/gwmessagemanager.cpp:445
- msgid ""
--"All the other participants have left, and other invitations are still pending. "
--"Your messages will not be delivered until someone else joins the chat."
--msgstr "某些邀請還在等待回覆，而所有其他的參加者已離開。您的訊息現在無法送出，直到有人加入。"
-+"All the other participants have left, and other invitations are still "
-+"pending. Your messages will not be delivered until someone else joins the "
-+"chat."
-+msgstr ""
-+"某些邀請還在等待回覆，而所有其他的參加者已離開。您的訊息現在無法送出，直到有"
-+"人加入。"
- 
- #: protocols/groupwise/gwmessagemanager.cpp:471
- msgid "%1 has rejected an invitation to join this conversation."
-@@ -16571,3 +16759,21 @@
- #: protocols/groupwise/gwmessagemanager.cpp:513
- msgid "This conversation is being logged administratively."
- msgstr "此對話已被紀錄。"
-+
-+#, fuzzy
-+#~ msgid "Respect other contacts' &wish to require authorization"
-+#~ msgstr ""
-+#~ "Den &Wunsch anderer Kontakte, eine Autorisierung zu verlangen, "
-+#~ "respektieren"
-+
-+#, fuzzy
-+#~ msgid "Device options"
-+#~ msgstr "Geräte-Optionen"
-+
-+#, fuzzy
-+#~ msgid "&Workaround broken driver"
-+#~ msgstr "Unbrauchbare Treiber um&gehen"
-+
-+#, fuzzy
-+#~ msgid "Disable memor&y mapping"
-+#~ msgstr "Memor&y mapping deaktivieren"
-diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdenetwork/kpf.po kde-i18n-zh_TW-3.5.10/messages/kdenetwork/kpf.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdenetwork/kpf.po	2008-08-19 20:43:21.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdenetwork/kpf.po	2011-11-11 15:45:17.000000000 +0100
-@@ -10,8 +10,7 @@
- "Project-Id-Version: kpf\n"
- "POT-Creation-Date: 2008-08-12 01:17+0200\n"
- "PO-Revision-Date: 2006-02-24 12:40+0800\n"
--"Last-Translator: Frank Weng (a.k.a. Franklin) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Traditional Chinese <zh_l10n@linux.org.tw>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
-@@ -68,7 +67,7 @@
- 
- #: Applet.cpp:128 AppletItem.cpp:73
- msgid "New Server..."
--msgstr "新伺服器..."
-+msgstr "新伺服器…"
- 
- #: Applet.cpp:183
- msgid "kpf"
-@@ -80,13 +79,14 @@
- 
- #: Applet.cpp:189
- msgid ""
--"File sharing applet, using the HTTP (Hyper Text Transfer Protocol) standard to "
--"serve files."
-+"File sharing applet, using the HTTP (Hyper Text Transfer Protocol) standard "
-+"to serve files."
- msgstr "檔案分享程式，使用 HTTP（超文件傳輸協定）標準來服務檔案。"
- 
- #: Applet.cpp:199
- msgid ""
--"Permission is hereby granted, free of charge, to any person obtaining a copy\n"
-+"Permission is hereby granted, free of charge, to any person obtaining a "
-+"copy\n"
- "of this software and associated documentation files (the \"Software\"), to\n"
- "deal in the Software without restriction, including without limitation the\n"
- "rights to use, copy, modify, merge, publish, distribute, sublicense, and/or\n"
-@@ -96,14 +96,17 @@
- "The above copyright notice and this permission notice shall be included in\n"
- "all copies or substantial portions of the Software.\n"
- "\n"
--"THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\n"
-+"THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS "
-+"OR\n"
- "IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\n"
- "FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\n"
- "AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN\n"
--"ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION\n"
-+"ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN "
-+"CONNECTION\n"
- "WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.\n"
- msgstr ""
--"Permission is hereby granted, free of charge, to any person obtaining a copy\n"
-+"Permission is hereby granted, free of charge, to any person obtaining a "
-+"copy\n"
- "of this software and associated documentation files (the \"Software\"), to\n"
- "deal in the Software without restriction, including without limitation the\n"
- "rights to use, copy, modify, merge, publish, distribute, sublicense, and/or\n"
-@@ -113,11 +116,13 @@
- "The above copyright notice and this permission notice shall be included in\n"
- "all copies or substantial portions of the Software.\n"
- "\n"
--"THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\n"
-+"THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS "
-+"OR\n"
- "IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\n"
- "FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\n"
- "AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN\n"
--"ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION\n"
-+"ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN "
-+"CONNECTION\n"
- "WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.\n"
- 
- #: AppletItem.cpp:65
-@@ -131,7 +136,7 @@
- 
- #: AppletItem.cpp:81
- msgid "Preferences..."
--msgstr "內容..."
-+msgstr "內容…"
- 
- #: AppletItem.cpp:87
- msgid "Restart"
-@@ -193,11 +198,12 @@
- 
- #: ConfigDialogPage.cpp:142 PropertiesDialogPlugin.cpp:412 ServerWizard.cpp:95
- msgid ""
--"<p>Specify the maximum amount of data (in kilobytes) that will be sent out per "
--"second.</p>"
--"<p>This allows you to keep some bandwidth for yourself instead of allowing "
--"connections with kpf to hog your connection.</p>"
--msgstr "<p>指定每秒送出的最大資料(kilobytes)總數。</p><p>這准許您為自己保留某些頻寬，免得 kpf 用光您的連線頻寬。</p>"
-+"<p>Specify the maximum amount of data (in kilobytes) that will be sent out "
-+"per second.</p><p>This allows you to keep some bandwidth for yourself "
-+"instead of allowing connections with kpf to hog your connection.</p>"
-+msgstr ""
-+"<p>指定每秒送出的最大資料(kilobytes)總數。</p><p>這准許您為自己保留某些頻寬，"
-+"免得 kpf 用光您的連線頻寬。</p>"
- 
- #: ConfigDialogPage.cpp:155 PropertiesDialogPlugin.cpp:425
- msgid ""
-@@ -206,13 +212,13 @@
- 
- #: ConfigDialogPage.cpp:164
- msgid ""
--"<p>Allow serving of files which have a symbolic link in the path from / to the "
--"file, or are a symbolic link themselves.</p>"
--"<p><strong>Warning !</strong> This could be a security risk. Use only if you "
--"understand the issues involved.</p>"
-+"<p>Allow serving of files which have a symbolic link in the path from / to "
-+"the file, or are a symbolic link themselves.</p><p><strong>Warning !</"
-+"strong> This could be a security risk. Use only if you understand the issues "
-+"involved.</p>"
- msgstr ""
--"<p>允許自檔案路徑 / 而來的符號連結，或符號連結本身的檔案服務。</p>"
--"<p><strong>警告！</strong>這可能有安全上的風險。只在您了解其中問題時才可使用。</p>"
-+"<p>允許自檔案路徑 / 而來的符號連結，或符號連結本身的檔案服務。</p><p><strong>"
-+"警告！</strong>這可能有安全上的風險。只在您了解其中問題時才可使用。</p>"
- 
- #: ConfigDialogPage.cpp:178
- msgid ""
-@@ -256,18 +262,18 @@
- #: ErrorMessageConfigDialog.cpp:73
- msgid ""
- "<p>Here you may select files to use instead of the default error messages "
--"passed to a client.</p>"
--"<p>The files may contain anything you wish, but by convention you should report "
--"the error code and the English version of the error message (e.g. \"Bad "
--"request\"). Your file should also be valid HTML.</p>"
--"<p>The strings ERROR_MESSAGE, ERROR_CODE and RESOURCE, if they exist in the "
--"file, will be replaced with the English error message, the numeric error code "
--"and the path of the requested resource, respectively.</p>"
--msgstr ""
--"<p>在這裡您可能選擇檔案來用於代替傳給客戶端的預設錯誤訊息。</p>"
--"<p>這個檔案可能包含任何您希望，並依慣例您應該回報錯誤碼和錯誤訊息的英文版本（例如： \"錯誤請求\"）。您的檔案也應該是正確的 HTML。</p>"
--"<p>字串 ERROR_MESSAGE ， ERROR_CODE 和 "
--"RESOURCE，如果他們存在於檔案中，將會被英文錯誤訊息，數值錯誤碼和要求資源路徑，各別地替代。</p>"
-+"passed to a client.</p><p>The files may contain anything you wish, but by "
-+"convention you should report the error code and the English version of the "
-+"error message (e.g. \"Bad request\"). Your file should also be valid HTML.</"
-+"p><p>The strings ERROR_MESSAGE, ERROR_CODE and RESOURCE, if they exist in "
-+"the file, will be replaced with the English error message, the numeric error "
-+"code and the path of the requested resource, respectively.</p>"
-+msgstr ""
-+"<p>在這裡您可能選擇檔案來用於代替傳給客戶端的預設錯誤訊息。</p><p>這個檔案可"
-+"能包含任何您希望，並依慣例您應該回報錯誤碼和錯誤訊息的英文版本（例如： \"錯誤"
-+"請求\"）。您的檔案也應該是正確的 HTML。</p><p>字串 ERROR_MESSAGE ， "
-+"ERROR_CODE 和 RESOURCE，如果他們存在於檔案中，將會被英文錯誤訊息，數值錯誤碼"
-+"和要求資源路徑，各別地替代。</p>"
- 
- #: ErrorMessageConfigDialog.cpp:91
- msgid "%1 %2"
-@@ -275,8 +281,8 @@
- 
- #: Help.cpp:38
- msgid ""
--"<p>Specify the name that will be used when announcing this server on "
--"network.</p>"
-+"<p>Specify the name that will be used when announcing this server on network."
-+"</p>"
- msgstr "<p>指定用於在網路上宣告此伺服器的名稱。</p>"
- 
- #: Help.cpp:41
-@@ -285,24 +291,25 @@
- "<br/>Other users will not see this system when browsing the network via "
- "zeroconf, but sharing will still work.</p>"
- msgstr ""
--"<p>Zeroconf 守護程式尚未執行。請參考手冊。<br />其他使用者透過 zeroconf 瀏覽網路時將看不到這個系統，但還是可以分享。</p>"
-+"<p>Zeroconf 守護程式尚未執行。請參考手冊。<br />其他使用者透過 zeroconf 瀏覽"
-+"網路時將看不到這個系統，但還是可以分享。</p>"
- 
- #: Help.cpp:46
- msgid ""
--"<p>Zeroconf support is not available in this version of KDE. See the Handbook "
--"for more information."
--"<br/>Other users will not see this system when browsing the network via "
--"zeroconf, but sharing will still work.</p>"
-+"<p>Zeroconf support is not available in this version of KDE. See the "
-+"Handbook for more information.<br/>Other users will not see this system when "
-+"browsing the network via zeroconf, but sharing will still work.</p>"
- msgstr ""
--"<p>這個版本的 KDE 並未將 Zeroconf 支援編入。請參考手冊。<br />其他使用者透過 zeroconf "
--"瀏覽網路時將看不到這個系統，但還是可以分享。</p>"
-+"<p>這個版本的 KDE 並未將 Zeroconf 支援編入。請參考手冊。<br />其他使用者透過 "
-+"zeroconf 瀏覽網路時將看不到這個系統，但還是可以分享。</p>"
- 
- #: Help.cpp:51
- msgid ""
--"<p>Unknown error with Zeroconf."
--"<br/>Other users will not see this system when browsing the network via "
--"zeroconf, but sharing will still work.</p>"
--msgstr "<p>未知的 Zeroconf 錯誤。<br />其他使用者透過 zeroconf 瀏覽網路時將看不到這個系統，但還是可以分享。</p>"
-+"<p>Unknown error with Zeroconf.<br/>Other users will not see this system "
-+"when browsing the network via zeroconf, but sharing will still work.</p>"
-+msgstr ""
-+"<p>未知的 Zeroconf 錯誤。<br />其他使用者透過 zeroconf 瀏覽網路時將看不到這個"
-+"系統，但還是可以分享。</p>"
- 
- #: PropertiesDialogPlugin.cpp:186
- msgid "&Sharing"
-@@ -310,10 +317,11 @@
- 
- #: PropertiesDialogPlugin.cpp:285
- msgid ""
--"<p>To share files via the web, you need to be running an 'applet' in your KDE "
--"panel. This 'applet' is a small program which provides file sharing "
-+"<p>To share files via the web, you need to be running an 'applet' in your "
-+"KDE panel. This 'applet' is a small program which provides file sharing "
- "capabilities.</p>"
--msgstr "<p>要透過 web 分享檔案，您必須在您的 KDE 面板中執行一支小程式(Applet)。</p>"
-+msgstr ""
-+"<p>要透過 web 分享檔案，您必須在您的 KDE 面板中執行一支小程式(Applet)。</p>"
- 
- #: PropertiesDialogPlugin.cpp:295
- msgid "Start Applet"
-@@ -333,32 +341,32 @@
- 
- #: PropertiesDialogPlugin.cpp:378
- msgid ""
--"<p>Setting this option makes all files in this directory and any subdirectories "
--"available for reading to anyone who wishes to view them.</p>"
--"<p>To view your files, a web browser or similar program may be used.</p>"
--"<p><strong>Warning!</strong> Before sharing a directory, you should be sure "
--"that it does not contain sensitive information, such as passwords, company "
--"secrets, your addressbook, etc.</p>"
--"<p>Note that you cannot share your home directory (%1)</p>"
--msgstr ""
--"<p>設定這個選項會使得在此目錄，以及其子目錄中的所有檔案被任何想讀取得人取得。</p>"
--"<p>使用瀏覽器或相似的程式檢查您的檔案。</p>"
--"<p><strong>警告！</strong>在分享目錄之前，您應該確定其中並沒有包含敏感資訊，像是密碼、公司機密、您的地址簿，等等。</p>"
--"<p>注意：您不可以分享您的 home 目錄 (%1)</p>"
-+"<p>Setting this option makes all files in this directory and any "
-+"subdirectories available for reading to anyone who wishes to view them.</"
-+"p><p>To view your files, a web browser or similar program may be used.</"
-+"p><p><strong>Warning!</strong> Before sharing a directory, you should be "
-+"sure that it does not contain sensitive information, such as passwords, "
-+"company secrets, your addressbook, etc.</p><p>Note that you cannot share "
-+"your home directory (%1)</p>"
-+msgstr ""
-+"<p>設定這個選項會使得在此目錄，以及其子目錄中的所有檔案被任何想讀取得人取得。"
-+"</p><p>使用瀏覽器或相似的程式檢查您的檔案。</p><p><strong>警告！</strong>在分"
-+"享目錄之前，您應該確定其中並沒有包含敏感資訊，像是密碼、公司機密、您的地址"
-+"簿，等等。</p><p>注意：您不可以分享您的 home 目錄 (%1)</p>"
- 
- #: PropertiesDialogPlugin.cpp:434
- msgid ""
--"<p>Allow serving of files which have a symbolic link in the path from / to the "
--"file, or are a symbolic link themselves.</p>"
--"<p><strong>Warning!</strong> This could be a security risk. Use only if you "
--"understand the issues involved.</p>"
-+"<p>Allow serving of files which have a symbolic link in the path from / to "
-+"the file, or are a symbolic link themselves.</p><p><strong>Warning!</strong> "
-+"This could be a security risk. Use only if you understand the issues "
-+"involved.</p>"
- msgstr ""
--"<p>允許自檔案路徑 / 而來的符號連結，或符號連結本身的檔案服務。</p>"
--"<p><strong>警告！</strong>這可能有安全上的風險。只在您了解其中問題時才可使用。</p>"
-+"<p>允許自檔案路徑 / 而來的符號連結，或符號連結本身的檔案服務。</p><p><strong>"
-+"警告！</strong>這可能有安全上的風險。只在您了解其中問題時才可使用。</p>"
- 
- #: PropertiesDialogPlugin.cpp:511
- msgid "Applet status: <strong>starting...</strong>"
--msgstr "Applet 狀態： <strong>啟動中...</strong>"
-+msgstr "Applet 狀態： <strong>啟動中…</strong>"
- 
- #: PropertiesDialogPlugin.cpp:523
- msgid "Applet status: <strong>failed to start</strong>"
-@@ -370,17 +378,17 @@
- 
- #: PropertiesDialogPlugin.cpp:678
- msgid ""
--"<p>Before you share a directory, be <strong>absolutely certain</strong> "
--"that it does not contain sensitive information.</p>"
--"<p>Sharing a directory makes all information in that directory <strong>"
--"and all subdirectories</strong> available to <strong>anyone</strong> "
--"who wishes to read it.</p>"
--"<p>If you have a system administrator, please ask for permission before sharing "
--"a directory in this way.</p>"
--msgstr ""
--"<p>在您分享目錄之前，<strong>絕對確定，</strong>裡頭沒有敏感的資訊。</p>"
--"<p>分享一個目錄會讓<strong>任何人</strong>取得其中<strong>所有子目錄</strong>的所有資訊。</p>"
--"<p>如果您有一位系統管理者，請在用這種方法分享之前，詢問他是否許可。</p>"
-+"<p>Before you share a directory, be <strong>absolutely certain</strong> that "
-+"it does not contain sensitive information.</p><p>Sharing a directory makes "
-+"all information in that directory <strong>and all subdirectories</strong> "
-+"available to <strong>anyone</strong> who wishes to read it.</p><p>If you "
-+"have a system administrator, please ask for permission before sharing a "
-+"directory in this way.</p>"
-+msgstr ""
-+"<p>在您分享目錄之前，<strong>絕對確定，</strong>裡頭沒有敏感的資訊。</p><p>分"
-+"享一個目錄會讓<strong>任何人</strong>取得其中<strong>所有子目錄</strong>的所"
-+"有資訊。</p><p>如果您有一位系統管理者，請在用這種方法分享之前，詢問他是否許"
-+"可。</p>"
- 
- #: PropertiesDialogPlugin.cpp:693
- msgid "Warning - Sharing Sensitive Information?"
-@@ -397,10 +405,12 @@
- 
- #: ServerWizard.cpp:65
- msgid ""
--"<p>Specify the directory which contains the files you wish to share.</p>"
--"<p><em>Warning</em>: Do not share any directories that contain sensitive "
-+"<p>Specify the directory which contains the files you wish to share.</"
-+"p><p><em>Warning</em>: Do not share any directories that contain sensitive "
- "information!</p>"
--msgstr "<p>指定您希望分享的目錄，這包括目錄裡的檔案。</p><p><em>警告</em>：不要分享任何包含敏感資訊的目錄！</p>"
-+msgstr ""
-+"<p>指定您希望分享的目錄，這包括目錄裡的檔案。</p><p><em>警告</em>：不要分享任"
-+"何包含敏感資訊的目錄！</p>"
- 
- #: ServerWizard.cpp:129
- msgid "&Root directory:"
-@@ -437,7 +447,7 @@
- 
- #: StartingKPFDialog.cpp:70
- msgid "Starting kpf..."
--msgstr "啟動 kpf..."
-+msgstr "啟動 kpf…"
- 
- #: Utils.cpp:325
- msgid "Partial content"
-@@ -493,8 +503,8 @@
- 
- #: WebServer.cpp:178
- msgid ""
--"Failed to publish this new service to the network (ZeroConf).  The server will "
--"work fine without this, however."
-+"Failed to publish this new service to the network (ZeroConf).  The server "
-+"will work fine without this, however."
- msgstr "在網路上發布此服務時失敗。不過伺服器還是能正常運作。"
- 
- #: WebServer.cpp:178
-diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdenetwork/kppplogview.po kde-i18n-zh_TW-3.5.10/messages/kdenetwork/kppplogview.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdenetwork/kppplogview.po	2006-07-22 10:04:35.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdenetwork/kppplogview.po	2011-11-11 15:45:17.000000000 +0100
-@@ -7,8 +7,7 @@
- "Project-Id-Version: kppplogview\n"
- "POT-Creation-Date: 2004-10-12 01:17+0200\n"
- "PO-Revision-Date: 2006-02-24 10:19+0800\n"
--"Last-Translator: Frank Weng (a.k.a. Franklin) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Traditional Chinese <zh_l10n@linux.org.tw>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
-@@ -33,9 +32,11 @@
- 
- #: export.cpp:40
- msgid ""
--"Export to a text file, using semicolons as separators."
--"<p></p>Can be used for spreadsheet programs like <i>KSpread</i>."
--msgstr "<p>匯出到文字檔，用分號分隔。</p> <p>可以用於像 KSpread 之類的工作表軟體。</p>"
-+"Export to a text file, using semicolons as separators.<p></p>Can be used for "
-+"spreadsheet programs like <i>KSpread</i>."
-+msgstr ""
-+"<p>匯出到文字檔，用分號分隔。</p> <p>可以用於像 KSpread 之類的工作表軟體。</"
-+"p>"
- 
- #: export.cpp:42
- msgid "HTML"
-@@ -43,8 +44,8 @@
- 
- #: export.cpp:43
- msgid ""
--"Export to a HTML Page."
--"<p></p>Can be used for easy exchange over the <i>Internet</i>."
-+"Export to a HTML Page.<p></p>Can be used for easy exchange over the "
-+"<i>Internet</i>."
- msgstr "<p>匯出到 HTML 網頁。</p> <p>可以放到網路上。</p>"
- 
- #: export.cpp:56
-@@ -73,7 +74,7 @@
- 
- #: export.cpp:99
- msgid "&Select File..."
--msgstr "選擇檔案(&S)..."
-+msgstr "選擇檔案(&S)…"
- 
- #: export.cpp:101
- msgid "Select the filename of the exported output file"
-@@ -192,7 +193,7 @@
- 
- #: monthly.cpp:237
- msgid "&Export..."
--msgstr "匯出(&E)..."
-+msgstr "匯出(&E)…"
- 
- #: monthly.cpp:263
- msgid "Statistics:"
-diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdenetwork/kppp.po kde-i18n-zh_TW-3.5.10/messages/kdenetwork/kppp.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdenetwork/kppp.po	2006-07-22 10:04:35.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdenetwork/kppp.po	2011-11-11 15:45:17.000000000 +0100
-@@ -11,8 +11,7 @@
- "Project-Id-Version: kppp\n"
- "POT-Creation-Date: 2006-06-13 04:00+0200\n"
- "PO-Revision-Date: 2006-02-24 11:24+0800\n"
--"Last-Translator: Frank Weng (a.k.a. Franklin) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Traditional Chinese <zh_l10n@linux.org.tw>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
-@@ -30,12 +29,12 @@
- "_: EMAIL OF TRANSLATORS\n"
- "Your emails"
- msgstr ""
--"ericc@shinewave.com.tw,pesder.liao@msa.hinet.net,franklin at goodhorse dot idv "
--"dot tw"
-+"ericc@shinewave.com.tw,pesder.liao@msa.hinet.net,franklin at goodhorse dot "
-+"idv dot tw"
- 
- #: accounts.cpp:74 modems.cpp:73
- msgid "&Edit..."
--msgstr "編輯(&E)..."
-+msgstr "編輯(&E)…"
- 
- #: accounts.cpp:76 modems.cpp:75
- msgid "Allows you to modify the selected account"
-@@ -43,7 +42,7 @@
- 
- #: accounts.cpp:84 modems.cpp:83
- msgid "&New..."
--msgstr "新增(&N)..."
-+msgstr "新增(&N)…"
- 
- #: accounts.cpp:87 modems.cpp:86
- msgid ""
-@@ -95,7 +94,8 @@
- msgstr ""
- "<p>可顯示所選擇帳號的累計電話費用。\n"
- "\n"
--"<b>重要事項</b>：如果您擁有多個帳號 - 請注意，此值<b>並非</b>所有帳號的電話費總額！"
-+"<b>重要事項</b>：如果您擁有多個帳號 - 請注意，此值<b>並非</b>所有帳號的電話費"
-+"總額！"
- 
- #: accounts.cpp:132 conwindow.cpp:52
- msgid "Volume:"
-@@ -110,13 +110,14 @@
- "\n"
- "<a href=\"#volaccounting\">More on volume accounting</a>"
- msgstr ""
--"<p>可顯示所選帳號已傳輸的位元組總數（並非所有帳號的）。您可以選擇要顯示在對話框中的內容。\n"
-+"<p>可顯示所選帳號已傳輸的位元組總數（並非所有帳號的）。您可以選擇要顯示在對話"
-+"框中的內容。\n"
- "\n"
- "<a href=\"#volaccounting\">容量核算相關詳情</a>"
- 
- #: accounts.cpp:156
- msgid "&Reset..."
--msgstr "重置(&R)..."
-+msgstr "重置(&R)…"
- 
- #: accounts.cpp:162
- msgid "&View Logs"
-@@ -134,7 +135,8 @@
- "settings, you might want to try the standard, dialog-based setup."
- msgstr ""
- "您想要用精靈來建立新帳號，還是使用對話方塊式的標準設定程式？\n"
--"精靈的使用較為簡易，而且已可滿足大多數情況。如果需要極特殊的設定值，您最好改用對話方塊式的標準設定程式。"
-+"精靈的使用較為簡易，而且已可滿足大多數情況。如果需要極特殊的設定值，您最好改"
-+"用對話方塊式的標準設定程式。"
- 
- #: accounts.cpp:273 providerdb.cpp:55
- msgid "Create New Account"
-@@ -329,7 +331,7 @@
- 
- #: connect.cpp:118 connect.cpp:186 modeminfo.cpp:63
- msgid "Looking for modem..."
--msgstr "正在尋找數據機..."
-+msgstr "正在尋找數據機…"
- 
- #: connect.cpp:126
- msgid "&Log"
-@@ -342,7 +344,7 @@
- 
- #: connect.cpp:223 connect.cpp:224
- msgid "Running pre-startup command..."
--msgstr "正在執行預先啟動指令..."
-+msgstr "正在執行預先啟動指令…"
- 
- #: connect.cpp:241 miniterm.cpp:130 modeminfo.cpp:129
- msgid "Modem device is locked."
-@@ -350,7 +352,7 @@
- 
- #: connect.cpp:294 connect.cpp:295
- msgid "Initializing modem..."
--msgstr "正在起始數據機..."
-+msgstr "正在起始數據機…"
- 
- #: connect.cpp:332
- msgid "Setting "
-@@ -358,15 +360,15 @@
- 
- #: connect.cpp:355 connect.cpp:356
- msgid "Setting speaker volume..."
--msgstr "正在設定揚聲器音量..."
-+msgstr "正在設定揚聲器音量…"
- 
- #: connect.cpp:371
- msgid "Turning off dial tone waiting..."
--msgstr "關閉撥號聲等待..."
-+msgstr "關閉撥號聲等待…"
- 
- #: connect.cpp:390
- msgid "Waiting for callback..."
--msgstr "等待回撥中..."
-+msgstr "等待回撥中…"
- 
- #: connect.cpp:401
- #, c-format
-@@ -375,7 +377,7 @@
- 
- #: connect.cpp:432
- msgid "Line busy. Hanging up..."
--msgstr "線路忙碌中。掛斷..."
-+msgstr "線路忙碌中。掛斷…"
- 
- #: connect.cpp:437
- msgid "Line busy. Waiting: %1 seconds"
-@@ -413,7 +415,7 @@
- #: connect.cpp:556
- #, c-format
- msgid "Scanning %1"
--msgstr "掃瞄 %1 中"
-+msgstr "掃描 %1 中"
- 
- #: connect.cpp:566
- #, c-format
-@@ -491,12 +493,12 @@
- 
- #: connect.cpp:922
- msgid "Starting pppd..."
--msgstr "正在啟動 pppd..."
-+msgstr "正在啟動 pppd…"
- 
- #: connect.cpp:1006
- #, c-format
- msgid "Scan Var: %1"
--msgstr "掃瞄變數： %1"
-+msgstr "掃描變數： %1"
- 
- #: connect.cpp:1016
- #, c-format
-@@ -510,7 +512,7 @@
- 
- #: connect.cpp:1061 modeminfo.cpp:226
- msgid "One moment please..."
--msgstr "請稍候..."
-+msgstr "請稍候…"
- 
- #: connect.cpp:1105
- msgid "Script timed out."
-@@ -519,7 +521,7 @@
- #: connect.cpp:1120
- #, c-format
- msgid "Scanning: %1"
--msgstr "掃瞄中： %1"
-+msgstr "掃描中： %1"
- 
- #: connect.cpp:1129
- #, c-format
-@@ -528,11 +530,11 @@
- 
- #: connect.cpp:1164
- msgid "Logging on to network..."
--msgstr "正在登入網路..."
-+msgstr "正在登入網路…"
- 
- #: connect.cpp:1198
- msgid "Running startup command..."
--msgstr "正在執行預先啟動指令..."
-+msgstr "正在執行預先啟動指令…"
- 
- #: connect.cpp:1203 connect.cpp:1210
- msgid "Done"
-@@ -624,7 +626,7 @@
- 
- #: edit.cpp:80
- msgid "&Add..."
--msgstr "新增(&A)..."
-+msgstr "新增(&A)…"
- 
- #: edit.cpp:104
- msgid ""
-@@ -637,8 +639,9 @@
- "When a number is busy or fails, <i>kppp</i> will \n"
- "try the next number and so on"
- msgstr ""
--"<p>指定要撥接的電話號碼。您可以在這裡提供多組號碼，只須按下「新增」即可。您可以利用方向按鈕來安排各號碼的撥打順序。</p> "
--"<p>當某一號碼忙線或撥打失敗時，<i>kppp</i> 會接著試撥下一組號碼。</p>"
-+"<p>指定要撥接的電話號碼。您可以在這裡提供多組號碼，只須按下「新增」即可。您可"
-+"以利用方向按鈕來安排各號碼的撥打順序。</p> <p>當某一號碼忙線或撥打失敗時，"
-+"<i>kppp</i> 會接著試撥下一組號碼。</p>"
- 
- #: edit.cpp:115
- msgid "A&uthentication:"
-@@ -676,9 +679,9 @@
- "choose CHAP, because it's much safer. If you don't know\n"
- "whether PAP or CHAP is right, choose PAP/CHAP."
- msgstr ""
--"<p>指定向 PPP 伺服器認證的方法。多數大學學校仍是使用<b>終端機</b>或<b>文稿</b>式的驗證方式，而 ISP 則大多使用 <b>PAP</b>"
--"及<b>CHAP</b>。如果無法確定，請洽詢您的 ISP。</p> "
--"<p>如果可選擇 PAP 或 CHAP，請選擇 CHAP，因為較為安全。\n"
-+"<p>指定向 PPP 伺服器認證的方法。多數大學學校仍是使用<b>終端機</b>或<b>文稿</"
-+"b>式的驗證方式，而 ISP 則大多使用 <b>PAP</b>及<b>CHAP</b>。如果無法確定，請洽"
-+"詢您的 ISP。</p> <p>如果可選擇 PAP 或 CHAP，請選擇 CHAP，因為較為安全。\n"
- "如果您不知道 PAP 或 CHAP 那個好，選擇 PAP/CHAP 。</p>"
- 
- #: edit.cpp:139
-@@ -696,8 +699,9 @@
- "readable only to you. Make sure nobody\n"
- "gains access to this file!"
- msgstr ""
--"<p>開啟這個選項時，您的 ISP 密碼將會存入 <i>kppp</i> 的設定檔，如此您即不須每次都得輸入。</p> "
--"<p><b><font color=\"red\">警告：</font>您的密碼將以純文字存入設定檔，而且只有您可以讀取。請確定他人無法存取此檔案！</p>"
-+"<p>開啟這個選項時，您的 ISP 密碼將會存入 <i>kppp</i> 的設定檔，如此您即不須每"
-+"次都得輸入。</p> <p><b><font color=\"red\">警告：</font>您的密碼將以純文字存"
-+"入設定檔，而且只有您可以讀取。請確定他人無法存取此檔案！</p>"
- 
- #: edit.cpp:152
- msgid "&Callback type:"
-@@ -725,7 +729,7 @@
- 
- #: edit.cpp:180
- msgid "Customize &pppd Arguments..."
--msgstr "自訂 pppd 引數(&P)..."
-+msgstr "自訂 pppd 引數(&P)…"
- 
- #: edit.cpp:321
- msgid ""
-@@ -738,7 +742,8 @@
- "kppp might be unable to find it."
- msgstr ""
- "您可以在此選擇想在特定連線階段執行的指令。\n"
--"該指令會以您的真實使用者識別碼執行，因此您將無法在此執行需要 root 權限的任何指令，除非您是 root 使用者。\n"
-+"該指令會以您的真實使用者識別碼執行，因此您將無法在此執行需要 root 權限的任何"
-+"指令，除非您是 root 使用者。\n"
- "\n"
- "請務必提供該程式的完整路徑，否則kppp 將可能找不到它。"
- 
-@@ -857,9 +862,9 @@
- "\n"
- "If unsure, contact your Internet Service Provider"
- msgstr ""
--"<p>如果您的電腦是使用固定 IP 位址，您必須在此提供網路遮罩。在絕大部份情況下，這個網路遮罩是 <b>255.255.255.0</b>"
--"，但是還是有可能不同。</p> "
--"<p>如果無法確定，請洽詢您的 ISP。</p>"
-+"<p>如果您的電腦是使用固定 IP 位址，您必須在此提供網路遮罩。在絕大部份情況下，"
-+"這個網路遮罩是 <b>255.255.255.0</b>，但是還是有可能不同。</p> <p>如果無法確"
-+"定，請洽詢您的 ISP。</p>"
- 
- #: edit.cpp:497
- msgid "&Auto-configure hostname from this IP"
-@@ -876,20 +881,21 @@
- "\n"
- "Do not enable this unless you really need it."
- msgstr ""
--"<p>每當您連線時，此選項會重新設定主機名稱以配合您自 PPP 伺服器所取得的 IP "
--"位址。您有可能會需要使用到以此種資訊為基礎的通訊協定；但是它也可能造成一些<a href=\"kppp-7.html#autohostname\">問題</a>"
--"。</p> "
--"<p>除非真有需要，否則請勿啟用它。</p>"
-+"<p>每當您連線時，此選項會重新設定主機名稱以配合您自 PPP 伺服器所取得的 IP 位"
-+"址。您有可能會需要使用到以此種資訊為基礎的通訊協定；但是它也可能造成一些<a "
-+"href=\"kppp-7.html#autohostname\">問題</a>。</p> <p>除非真有需要，否則請勿啟"
-+"用它。</p>"
- 
- #: edit.cpp:544
- msgid ""
- "Selecting this option might cause some weird problems with the X-server and "
--"applications while kppp is connected. Don't use it until you know what you are "
--"doing!\n"
-+"applications while kppp is connected. Don't use it until you know what you "
-+"are doing!\n"
- "For more information take a look at the handbook (or help) in the section "
- "\"Frequently asked questions\"."
- msgstr ""
--"選擇這個選項可能會使 X 伺服器與應用程式在 kppp 連線時發生一些奇怪的問題。因此除非您知道您在做什麼，否則建議不要使用。\n"
-+"選擇這個選項可能會使 X 伺服器與應用程式在 kppp 連線時發生一些奇怪的問題。因此"
-+"除非您知道您在做什麼，否則建議不要使用。\n"
- "相關詳情可參閱手冊內容(或輔助說明)中的“常問問題”小節。"
- 
- #: edit.cpp:592
-@@ -938,8 +944,9 @@
- "To add a DNS server, type in the IP address of\n"
- "the DNS server here and click on <b>Add</b>"
- msgstr ""
--"<p>可供您指定新的 DNS 伺服器以便在連線時使用。當連線關閉時，這個 DNS 項目將會被移除。</p> "
--"<p>若要新增 DNS 伺服器，請在此鍵入DNS 伺服器的 IP 位址，並按下<b>新增</b>。</p>"
-+"<p>可供您指定新的 DNS 伺服器以便在連線時使用。當連線關閉時，這個 DNS 項目將會"
-+"被移除。</p> <p>若要新增 DNS 伺服器，請在此鍵入DNS 伺服器的 IP 位址，並按下"
-+"<b>新增</b>。</p>"
- 
- #: edit.cpp:656 edit.cpp:887 pppdargs.cpp:76
- msgid "&Add"
-@@ -950,7 +957,9 @@
- "Click this button to add the DNS server\n"
- "specified in the field above. The entry\n"
- "will then be added to the list below"
--msgstr "按下這個按鈕即可新增上述欄位中所指定的 DNS 伺服器。該項目會接著新增到下列清單中。"
-+msgstr ""
-+"按下這個按鈕即可新增上述欄位中所指定的 DNS 伺服器。該項目會接著新增到下列清單"
-+"中。"
- 
- #: edit.cpp:675
- msgid ""
-@@ -967,7 +976,9 @@
- "<p>This shows all defined DNS servers to use\n"
- "while you are connected. Use the <b>Add</b> and\n"
- "<b>Remove</b> buttons to modify the list"
--msgstr "<p>這個顯示連線後可供使用的所有已定義 DNS 伺服器。請使用<b>新增</b>及<b>移除</b>按鈕來修改清單。</p>"
-+msgstr ""
-+"<p>這個顯示連線後可供使用的所有已定義 DNS 伺服器。請使用<b>新增</b>及<b>移除"
-+"</b>按鈕來修改清單。</p>"
- 
- #: edit.cpp:696
- msgid "&Disable existing DNS servers during connection"
-@@ -985,9 +996,9 @@
- "option, but it may become useful under \n"
- "some circumstances."
- msgstr ""
--"<p>選擇這個選項時，在 <tt>/etc/resolv.conf</tt>中指定的所有 DNS "
--"伺服器會在建立撥號連線時被暫時關閉。待連線關閉後，各伺服器即重新啟動。</p> "
--"<p>一般來說，並無必要使用此選項，但在某些情況下它可能極有用處。</p>"
-+"<p>選擇這個選項時，在 <tt>/etc/resolv.conf</tt>中指定的所有 DNS 伺服器會在建"
-+"立撥號連線時被暫時關閉。待連線關閉後，各伺服器即重新啟動。</p> <p>一般來說，"
-+"並無必要使用此選項，但在某些情況下它可能極有用處。</p>"
- 
- #: edit.cpp:799
- msgid "Default gateway"
-@@ -1112,7 +1123,9 @@
- "the program will make a new attempt to redial\n"
- "instead of waiting for user to click <CANCEL>\n"
- "button."
--msgstr "<p>當數據機傳回「沒有載波」（No Carrier)時，程式會嘗試重新撥號，而不是等使用者按「取消」鍵。</p>"
-+msgstr ""
-+"<p>當數據機傳回「沒有載波」（No Carrier)時，程式會嘗試重新撥號，而不是等使用"
-+"者按「取消」鍵。</p>"
- 
- #: general.cpp:120
- msgid "&Show clock on caption"
-@@ -1141,8 +1154,9 @@
- "\n"
- "See <a href=\"#disxserver\">here</a> for more on this."
- msgstr ""
--"<p>核取這個選項會在 X 伺服器關機時將任何已建立的連線予以關閉。建議開啟，除非您知道您在做什麼。</p> "
--"<p>相關詳情請參閱<a href=\"#disxserver\">這裡</a>。</p>"
-+"<p>核取這個選項會在 X 伺服器關機時將任何已建立的連線予以關閉。建議開啟，除非"
-+"您知道您在做什麼。</p> <p>相關詳情請參閱<a href=\"#disxserver\">這裡</a>。</"
-+"p>"
- 
- #: general.cpp:144
- msgid "&Quit on disconnect"
-@@ -1210,8 +1224,8 @@
- "\n"
- "<b>Default</b>: CRTSCTS"
- msgstr ""
--"<p>指定序列連接埠與數據機的通訊方式。建議您不要更動此選項，除非您知道您在做什麼。</p> "
--"<p><b>預設值</b>：硬體【CRTSCTS】</p>"
-+"<p>指定序列連接埠與數據機的通訊方式。建議您不要更動此選項，除非您知道您在做什"
-+"麼。</p> <p><b>預設值</b>：硬體【CRTSCTS】</p>"
- 
- #: general.cpp:281
- msgid "&Line termination:"
-@@ -1227,9 +1241,9 @@
- "\n"
- "<b>Default</b>: CR/LF"
- msgstr ""
--"<p>指定 AT 命令送達數據機的方式。大部分的數據機皆可正常使用預設值 "
--"<i>CR/LF</i>。如果您的數據機對起始字串並無反應，請在此試用不同的設定值</p> "
--"<p><b>預設值</b>： CR/LF</p>"
-+"<p>指定 AT 命令送達數據機的方式。大部分的數據機皆可正常使用預設值 <i>CR/LF</"
-+"i>。如果您的數據機對起始字串並無反應，請在此試用不同的設定值</p> <p><b>預設值"
-+"</b>： CR/LF</p>"
- 
- #: general.cpp:302
- msgid "Co&nnection speed:"
-@@ -1246,7 +1260,8 @@
- msgstr ""
- "指定數據機與序列連接埠彼此通訊的速度。\n"
- "開始時最好使用預設值 38400 位元/秒。\n"
--"如果運作正常，即可試著調高速度值，但請勿超過 115200 位元/秒(除非您的序列連接埠支援更高速度)。"
-+"如果運作正常，即可試著調高速度值，但請勿超過 115200 位元/秒(除非您的序列連接"
-+"埠支援更高速度)。"
- 
- #: general.cpp:361
- msgid "&Use lock file"
-@@ -1264,10 +1279,10 @@
- "\n"
- "<b>Default</b>: On"
- msgstr ""
--"<p>為避免其他程式在建立連線後存取數據機，您可以建立一檔案來指明該數據機正被使用。例如在 Linux 下檔案可能為 <tt>"
--"/var/lock/LCK..ttyS1</tt>。您可以在此選擇是否要執行\n"
--"此種鎖定。</p> "
--"<p><b>預設值</b>： 開啟</p>"
-+"<p>為避免其他程式在建立連線後存取數據機，您可以建立一檔案來指明該數據機正被使"
-+"用。例如在 Linux 下檔案可能為 <tt>/var/lock/LCK..ttyS1</tt>。您可以在此選擇是"
-+"否要執行\n"
-+"此種鎖定。</p> <p><b>預設值</b>： 開啟</p>"
- 
- #: general.cpp:382
- msgid "Modem &timeout:"
-@@ -1278,7 +1293,9 @@
- "This specifies how long <i>kppp</i> waits for a\n"
- "<i>CONNECT</i> response from your modem. The\n"
- "recommended value is 30 seconds."
--msgstr "指定 <i>kppp</i> 應在多長的時間內等候數據機做出 <i>CONNECT</i> 回應。建議值為 30 秒。"
-+msgstr ""
-+"指定 <i>kppp</i> 應在多長的時間內等候數據機做出 <i>CONNECT</i> 回應。建議值"
-+"為 30 秒。"
- 
- #: general.cpp:454
- msgid "&Wait for dial tone before dialing"
-@@ -1294,8 +1311,9 @@
- "\n"
- "<b>Default:</b>: On"
- msgstr ""
--"<p>一般來說，在撥號時會先等待撥號聲以確認可以開始撥號。若是您的 modem 無法辨視撥號聲，或者是您的電話系統並不發出這樣的撥號聲，請取消選項。</p> "
--"<p><b>預設：</b>： 開啟</p>"
-+"<p>一般來說，在撥號時會先等待撥號聲以確認可以開始撥號。若是您的 modem 無法辨"
-+"視撥號聲，或者是您的電話系統並不發出這樣的撥號聲，請取消選項。</p> <p><b>預"
-+"設：</b>： 開啟</p>"
- 
- #: general.cpp:468
- msgid "B&usy wait:"
-@@ -1330,7 +1348,8 @@
- "If this does not work for your modem,\n"
- "you must modify the modem volume command."
- msgstr ""
--"大部份數據機擁有揚聲器，在撥接時會發出大量噪音。您可以在這裡將其完全關閉或選擇較低的音量。\n"
-+"大部份數據機擁有揚聲器，在撥接時會發出大量噪音。您可以在這裡將其完全關閉或選"
-+"擇較低的音量。\n"
- "\n"
- "如果此選項對數據機並無作用，您即必須修改數據機音量指令。"
- 
-@@ -1346,13 +1365,14 @@
- "\n"
- "<b>Default</b>: Off"
- msgstr ""
--"可控制 <i>kppp</i> 如何偵測數據機並無回應。除非發生了這個問題，否則請勿修改此設定。\n"
-+"可控制 <i>kppp</i> 如何偵測數據機並無回應。除非發生了這個問題，否則請勿修改此"
-+"設定。\n"
- "\n"
- "<b>預設值</b>： 關閉"
- 
- #: general.cpp:528
- msgid "Mod&em Commands..."
--msgstr "數據機指令(&E)..."
-+msgstr "數據機指令(&E)…"
- 
- #: general.cpp:530
- msgid ""
-@@ -1362,7 +1382,7 @@
- 
- #: general.cpp:533
- msgid "&Query Modem..."
--msgstr "查詢數據機(&Q)..."
-+msgstr "查詢數據機(&Q)…"
- 
- #: general.cpp:535
- msgid ""
-@@ -1379,7 +1399,7 @@
- 
- #: general.cpp:542
- msgid "&Terminal..."
--msgstr "終端機(&T)..."
-+msgstr "終端機(&T)…"
- 
- #: general.cpp:544
- msgid ""
-@@ -1434,8 +1454,9 @@
- "<b>Important</b>: case is important here:\n"
- "<i>myusername</i> is not the same as <i>MyUserName</i>."
- msgstr ""
--"<p>請鍵入您的 ISP 所提供的使用者名稱。此點對 PAP 與 CHAP 尤其重要。當您使用終端機式或文稿式認證時可以略過這個選項。</p> "
--"<p><b>重要事項</b>： 此處須區分大小寫：<i>myusername</i> 與 <i>MyUserName</i> 是不同的！</p>"
-+"<p>請鍵入您的 ISP 所提供的使用者名稱。此點對 PAP 與 CHAP 尤其重要。當您使用終"
-+"端機式或文稿式認證時可以略過這個選項。</p> <p><b>重要事項</b>： 此處須區分大"
-+"小寫：<i>myusername</i> 與 <i>MyUserName</i> 是不同的！</p>"
- 
- #: kpppwidget.cpp:142
- msgid "&Password:"
-@@ -1451,8 +1472,9 @@
- "<b>Important</b>: case is important here:\n"
- "<i>mypassword</i> is not the same as <i>MyPassword</i>."
- msgstr ""
--"<p>請鍵入您的 ISP 所提供的密碼。此點對 PAP 與 CHAP 尤其重要。當您使用終端機式或文稿式確認時可以略過這個選項。</p> "
--"<p><b>重要事項</b>： 此處須區分大小寫：<i>mypassword</i> 與 <i>MyPassword</i> 是不同的！</p>"
-+"<p>請鍵入您的 ISP 所提供的密碼。此點對 PAP 與 CHAP 尤其重要。當您使用終端機式"
-+"或文稿式確認時可以略過這個選項。</p> <p><b>重要事項</b>： 此處須區分大小寫："
-+"<i>mypassword</i> 與 <i>MyPassword</i> 是不同的！</p>"
- 
- #: kpppwidget.cpp:168
- msgid "Show lo&g window"
-@@ -1468,12 +1490,13 @@
- "Turn it off if <i>kppp</i> routinely connects without\n"
- "problems"
- msgstr ""
--"<p>此選項可控制是否顯示記錄視窗。記錄視窗會顯示 <i>kppp</i> 與您的數據機之間的通訊過程。因此可協助您追查問題。</p> "
--"<p>如果 <i>kppp</i> 可按時連線而沒有任何問題，即可關閉此選項。</p>"
-+"<p>此選項可控制是否顯示記錄視窗。記錄視窗會顯示 <i>kppp</i> 與您的數據機之間"
-+"的通訊過程。因此可協助您追查問題。</p> <p>如果 <i>kppp</i> 可按時連線而沒有任"
-+"何問題，即可關閉此選項。</p>"
- 
- #: kpppwidget.cpp:195
- msgid "Co&nfigure..."
--msgstr "設定(&N)..."
-+msgstr "設定(&N)…"
- 
- #: kpppwidget.cpp:212
- msgid "&Connect"
-@@ -1549,10 +1572,11 @@
- 
- #: kpppwidget.cpp:623
- msgid ""
--"</p>"
--"<p>See 'man pppd' for an explanation of the error codes or take a look at the "
--"kppp FAQ on   <a href=\"%1\">%2</a></p>"
--msgstr "</p><p>參閱“man pppd”以得到錯誤代碼的解釋或參閱<a href=\"%1\">%2</a> 上的 kppp FAQ。</p>"
-+"</p><p>See 'man pppd' for an explanation of the error codes or take a look "
-+"at the kppp FAQ on   <a href=\"%1\">%2</a></p>"
-+msgstr ""
-+"</p><p>參閱“man pppd”以得到錯誤代碼的解釋或參閱<a href=\"%1\">%2</a> 上的 "
-+"kppp FAQ。</p>"
- 
- #: kpppwidget.cpp:631
- msgid "&Details"
-@@ -1594,12 +1618,13 @@
- msgstr ""
- "kppp 找不到：\n"
- " %1\n"
--"請確定您已經正確地設定您的數據機且/或在設定對話盒的數據機分頁調整數據機裝置的位置。"
-+"請確定您已經正確地設定您的數據機且/或在設定對話盒的數據機分頁調整數據機裝置的"
-+"位置。"
- 
- #: kpppwidget.cpp:753
- msgid ""
--"You have selected the authentication method PAP or CHAP. This requires that you "
--"supply a username and a password."
-+"You have selected the authentication method PAP or CHAP. This requires that "
-+"you supply a username and a password."
- msgstr "您已經選擇了認證方法 PAP 或 CHAP。因此必須提供使用者名稱與密碼。"
- 
- #: kpppwidget.cpp:762
-@@ -1614,7 +1639,7 @@
- 
- #: kpppwidget.cpp:804
- msgid "Disconnecting..."
--msgstr "正在斷線..."
-+msgstr "正在斷線…"
- 
- #: kpppwidget.cpp:807
- msgid "Executing command before disconnection."
-@@ -1738,8 +1763,8 @@
- msgid ""
- "kppp has detected a %1 file.\n"
- "Another instance of kppp seems to be running under process-ID %2.\n"
--"Please click Exit, make sure that you are not running another kppp, delete the "
--"pid file, and restart kppp.\n"
-+"Please click Exit, make sure that you are not running another kppp, delete "
-+"the pid file, and restart kppp.\n"
- "Alternatively, if you have determined that there is no other kppp running, "
- "please click Continue to begin."
- msgstr ""
-@@ -1778,7 +1803,7 @@
- "(c) 1998 Mario Weilguni <mweilguni@kde.org>\n"
- "\n"
- "本程式係遵照 GNU GPL(GNU 一般公開授權)\n"
--"之規定公佈發行"
-+"之規定公布發行"
- 
- #: miniterm.cpp:72 modems.cpp:226
- msgid "&Modem"
-@@ -1802,7 +1827,7 @@
- 
- #: miniterm.cpp:192
- msgid "Hanging up..."
--msgstr "正在掛斷..."
-+msgstr "正在掛斷…"
- 
- #: miniterm.cpp:206
- msgid "Resetting Modem"
-@@ -1829,10 +1854,8 @@
- msgstr "數據機已就緒。"
- 
- #: modem.cpp:226
--msgid ""
--"Can't restore tty settings: tcsetattr()\n"
--msgstr ""
--"不能恢復 tty 設定值： tcsetattr()\n"
-+msgid "Can't restore tty settings: tcsetattr()\n"
-+msgstr "不能恢復 tty 設定值： tcsetattr()\n"
- 
- #: modem.cpp:381
- msgid "The modem does not respond."
-@@ -1936,10 +1959,12 @@
- 
- #: modemdb.cpp:49
- msgid ""
--"To set up your modem, first choose its vendor in the list to the left, and then "
--"select the model from the right list. If you don't know which modem you have, "
--"you can try out one of the \"Generic\" modems."
--msgstr "要設定您的數據機，請先在左側清單中選擇製造廠商，然後從右側清單選擇機型。如果不曉得該如何選擇，您可以嘗試使用“一般”數據機。"
-+"To set up your modem, first choose its vendor in the list to the left, and "
-+"then select the model from the right list. If you don't know which modem you "
-+"have, you can try out one of the \"Generic\" modems."
-+msgstr ""
-+"要設定您的數據機，請先在左側清單中選擇製造廠商，然後從右側清單選擇機型。如果"
-+"不曉得該如何選擇，您可以嘗試使用“一般”數據機。"
- 
- #: modemdb.cpp:149 modemdb.cpp:151 modemdb.cpp:222 modemdb.cpp:237
- msgid "<Generic>"
-@@ -2011,8 +2036,8 @@
- 
- #: pppdata.cpp:63
- msgid ""
--"The application-specific config file could not be opened in either read-write "
--"or read-only mode.\n"
-+"The application-specific config file could not be opened in either read-"
-+"write or read-only mode.\n"
- "The superuser might have to change its ownership by issuing the following "
- "command in your home directory:\n"
- "chown {YourUsername} .kde/share/config/kppprc"
-@@ -2063,9 +2088,10 @@
- 
- #: ppplog.cpp:154
- msgid ""
--"You have passed an invalid option to pppd. See 'man pppd' for a complete list "
--"of valid arguments."
--msgstr "您傳遞了無效的選項給 pppd 程式。如需有效引數的完整清單，請參閱“man pppd”。"
-+"You have passed an invalid option to pppd. See 'man pppd' for a complete "
-+"list of valid arguments."
-+msgstr ""
-+"您傳遞了無效的選項給 pppd 程式。如需有效引數的完整清單，請參閱“man pppd”。"
- 
- #: ppplog.cpp:172
- msgid ""
-@@ -2085,8 +2111,8 @@
- msgid ""
- "KPPP could not prepare a PPP log. It's very likely that pppd was started "
- "without the \"debug\" option.\n"
--"Without this option it's difficult to find out PPP problems, so you should turn "
--"on the debug option.\n"
-+"Without this option it's difficult to find out PPP problems, so you should "
-+"turn on the debug option.\n"
- "Shall I turn it on now?"
- msgstr ""
- "KPPP 無法準備 PPP 連線紀錄。可能是因為pppd 啟動時未使用“debug”參數選項。\n"
-@@ -2103,10 +2129,12 @@
- 
- #: ppplog.cpp:224
- msgid ""
--"The \"debug\" option has been added. You should now try to reconnect. If that "
--"fails again, you will get a PPP log that may help you to track down the "
-+"The \"debug\" option has been added. You should now try to reconnect. If "
-+"that fails again, you will get a PPP log that may help you to track down the "
- "connection problem."
--msgstr "“debug”選項已加入。您現在應嘗試重新連線。如果仍然失敗，所產生的 PPP 記錄可以協助您追蹤連線問題。"
-+msgstr ""
-+"“debug”選項已加入。您現在應嘗試重新連線。如果仍然失敗，所產生的 PPP 記錄可以"
-+"協助您追蹤連線問題。"
- 
- #: ppplog.cpp:238
- msgid "PPP Log"
-@@ -2244,7 +2272,8 @@
- "selection."
- msgstr ""
- "請從下方清單中選擇您的 ISP。\n"
--"如果您的 ISP 不在清單中，您必須按下“取消”， 並使用一般設定對話方塊建立此帳號。\n"
-+"如果您的 ISP 不在清單中，您必須按下“取消”， 並使用一般設定對話方塊建立此帳"
-+"號。\n"
- "\n"
- "當您完成選擇後，請按下“下一步”。"
- 
-@@ -2279,7 +2308,8 @@
- "If you have a telephone switch, you probably need\n"
- "to write \"0\" or \"0,\" here."
- msgstr ""
--"如果需要特殊的撥號前置碼(例如，如果是使用電話交換機)，您可以在這裡加以指定。此前置碼會在電話號碼之前撥號。\n"
-+"如果需要特殊的撥號前置碼(例如，如果是使用電話交換機)，您可以在這裡加以指定。"
-+"此前置碼會在電話號碼之前撥號。\n"
- "\n"
- "如果您使用電話交換機，您可能需要在這裡填寫“0”或“0,”。"
- 
-@@ -2302,54 +2332,38 @@
- "如果要檢查新建帳號的設定值，您可以使用設定對話方塊中的“編輯”。"
- 
- #: ruleset.cpp:538
--msgid ""
--"kppp: no rulefile specified\n"
--msgstr ""
--"kppp： 未指定規則檔\n"
-+msgid "kppp: no rulefile specified\n"
-+msgstr "kppp： 未指定規則檔\n"
- 
- #: ruleset.cpp:544
- #, c-format
--msgid ""
--"kppp: rulefile \"%s\" not found\n"
--msgstr ""
--"kppp： 找不到規則檔“%s”\n"
-+msgid "kppp: rulefile \"%s\" not found\n"
-+msgstr "kppp： 找不到規則檔“%s”\n"
- 
- #: ruleset.cpp:549
--msgid ""
--"kppp: rulefiles must have the extension \".rst\"\n"
--msgstr ""
--"kppp： 規則檔必須使用副檔名“.rst”\n"
-+msgid "kppp: rulefiles must have the extension \".rst\"\n"
-+msgstr "kppp： 規則檔必須使用副檔名“.rst”\n"
- 
- #: ruleset.cpp:558
--msgid ""
--"kppp: error parsing the ruleset\n"
--msgstr ""
--"kppp： 解析規則集時發生錯誤\n"
-+msgid "kppp: error parsing the ruleset\n"
-+msgstr "kppp： 解析規則集時發生錯誤\n"
- 
- #: ruleset.cpp:563
- #, c-format
--msgid ""
--"kppp: parse error in line %d\n"
--msgstr ""
--"kppp： 行 %d 發生解析錯誤\n"
-+msgid "kppp: parse error in line %d\n"
-+msgstr "kppp： 列 %d 發生解析錯誤\n"
- 
- #: ruleset.cpp:569
--msgid ""
--"kppp: rulefile does not contain a default rule\n"
--msgstr ""
--"kppp： 規則檔並未包含預設規則\n"
-+msgid "kppp: rulefile does not contain a default rule\n"
-+msgstr "kppp： 規則檔並未包含預設規則\n"
- 
- #: ruleset.cpp:574
--msgid ""
--"kppp: rulefile does not contain a \"name=...\" line\n"
--msgstr ""
--"kppp： 規則檔並未包含“name=...”行\n"
-+msgid "kppp: rulefile does not contain a \"name=...\" line\n"
-+msgstr "kppp： 規則檔並未包含“name=…”行\n"
- 
- #: ruleset.cpp:578
--msgid ""
--"kppp: rulefile is ok\n"
--msgstr ""
--"kppp： 規則檔正確\n"
-+msgid "kppp: rulefile is ok\n"
-+msgstr "kppp： 規則檔正確\n"
- 
- #: runtests.cpp:219
- msgid ""
-diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdenetwork/krdc.po kde-i18n-zh_TW-3.5.10/messages/kdenetwork/krdc.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdenetwork/krdc.po	2008-08-19 20:43:21.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdenetwork/krdc.po	2011-11-11 15:45:17.000000000 +0100
-@@ -6,8 +6,7 @@
- "Project-Id-Version: krdc\n"
- "POT-Creation-Date: 2008-07-08 01:20+0200\n"
- "PO-Revision-Date: 2006-09-19 10:31+0800\n"
--"Last-Translator: Frank Weng (a.k.a. Franklin) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Chinese Traditional <zh-l10n@linux.org.tw>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
-@@ -45,24 +44,25 @@
- #: krdc.cpp:192
- msgid ""
- "Here you can see the remote desktop. If the other side allows you to control "
--"it, you can also move the mouse, click or enter keystrokes. If the content does "
--"not fit your screen, click on the toolbar's full screen button or scale button. "
--"To end the connection, just close the window."
-+"it, you can also move the mouse, click or enter keystrokes. If the content "
-+"does not fit your screen, click on the toolbar's full screen button or scale "
-+"button. To end the connection, just close the window."
- msgstr ""
--"您可以看到遠端桌面。如果另一端允許您控制的話，您也可以用滑鼠或鍵盤來控制。如果遠端內容與您的螢幕不合，您可以在工具列上點選全畫面按鍵或調整按鍵。要結束連線，只要"
--"把視窗關閉。"
-+"您可以看到遠端桌面。如果另一端允許您控制的話，您也可以用滑鼠或鍵盤來控制。如"
-+"果遠端內容與您的螢幕不合，您可以在工具列上點選全畫面按鍵或調整按鍵。要結束連"
-+"線，只要把視窗關閉。"
- 
- #: krdc.cpp:225
- msgid "Establishing connection..."
--msgstr "建立連線..."
-+msgstr "建立連線…"
- 
- #: krdc.cpp:231
- msgid "Authenticating..."
--msgstr "認證中..."
-+msgstr "認證中…"
- 
- #: krdc.cpp:236
- msgid "Preparing desktop..."
--msgstr "預備桌面中..."
-+msgstr "預備桌面中…"
- 
- #: krdc.cpp:383
- msgid "View Only"
-@@ -95,9 +95,11 @@
- #: krdc.cpp:576
- msgid ""
- "Switches to full screen. If the remote desktop has a different screen "
--"resolution, Remote Desktop Connection will automatically switch to the nearest "
--"resolution."
--msgstr "切換到全畫面。如果遠端桌面有不同的螢幕解析度，遠端桌面連線會自動切換到最接近的解析度。"
-+"resolution, Remote Desktop Connection will automatically switch to the "
-+"nearest resolution."
-+msgstr ""
-+"切換到全畫面。如果遠端桌面有不同的螢幕解析度，遠端桌面連線會自動切換到最接近"
-+"的解析度。"
- 
- #: krdc.cpp:582
- msgid "Scale"
-@@ -223,8 +225,8 @@
- 
- #: maindialogwidget.cpp:255
- msgid ""
--"Browsing the network is not possible. You probably did not install SLP support "
--"correctly."
-+"Browsing the network is not possible. You probably did not install SLP "
-+"support correctly."
- msgstr "無法瀏覽網路。您可能沒有正確安裝 SLP 支援。"
- 
- #: maindialogwidget.cpp:257
-@@ -281,10 +283,13 @@
- #: rc.cpp:12 rc.cpp:97
- #, no-c-format
- msgid ""
--"This list shows all hosts that you have visited and a summary of your settings "
--"for them. If you want to reset the setting for a host, you can delete it using "
--"the buttons below. When you connect again you can then re-configure them."
--msgstr "這個清單顯示所有您拜訪過的主機，及您對它們的設定。如果您要重置某台主機的設定，您可以用底下的按鍵刪除，然後在重新連線過去時再重新設定。"
-+"This list shows all hosts that you have visited and a summary of your "
-+"settings for them. If you want to reset the setting for a host, you can "
-+"delete it using the buttons below. When you connect again you can then re-"
-+"configure them."
-+msgstr ""
-+"這個清單顯示所有您拜訪過的主機，及您對它們的設定。如果您要重置某臺主機的設"
-+"定，您可以用底下的按鍵刪除，然後在重新連線過去時再重新設定。"
- 
- #. i18n: file hostprofiles.ui line 97
- #: rc.cpp:15 rc.cpp:100
-@@ -340,21 +345,21 @@
- #: rc.cpp:39 rc.cpp:124
- #, no-c-format
- msgid ""
--"Enter the name and display number of the computer that you want to connect to, "
--"separated by a colon, e.g. 'mycomputer:1'. The address can be any valid "
--"Internet address. The display numbers usually start at 0. If you do not have a "
--"display number, try 0 or 1.\n"
-+"Enter the name and display number of the computer that you want to connect "
-+"to, separated by a colon, e.g. 'mycomputer:1'. The address can be any valid "
-+"Internet address. The display numbers usually start at 0. If you do not have "
-+"a display number, try 0 or 1.\n"
- "Remote Desktop Connection only supports systems that use VNC."
- msgstr ""
--"輸入您要連線主機的名稱與顯示號碼，以冒號區隔，如 mycomputer:1。您可以輸入任何合法的 IP 位址，顯示號碼通常是從 0 "
--"開始。如果您沒有顯示號碼，試試 0 或 1。\n"
-+"輸入您要連線主機的名稱與顯示號碼，以冒號區隔，如 mycomputer:1。您可以輸入任何"
-+"合法的 IP 位址，顯示號碼通常是從 0 開始。如果您沒有顯示號碼，試試 0 或 1。\n"
- "遠端桌面連線只支援使用 VNC 的系統。"
- 
- #. i18n: file maindialogbase.ui line 84
- #: rc.cpp:43 rc.cpp:128
- #, no-c-format
- msgid "&Browse <<"
--msgstr "瀏覽 << (&B)"
-+msgstr "瀏覽 <<(&B)"
- 
- #. i18n: file maindialogbase.ui line 87
- #: rc.cpp:46 rc.cpp:131
-@@ -367,34 +372,19 @@
- #, no-c-format
- msgid ""
- "Enter the address of the computer to connect to, or browse the network and "
--"select one. VNC and RDP compatible servers will be supported. <a "
--"href=\"whatsthis:"
--"<h3>Examples</h3>for a computer called 'megan':"
--"<p>"
--"<table>"
--"<tr>"
--"<td>megan:1</td>"
--"<td>connect to the VNC server on 'megan' with display number 1</td></tr>"
--"<tr>"
--"<td>vnc:/megan:1</td>"
--"<td>longer form for the same thing</td></tr>"
--"<tr>"
--"<td>rdp:/megan</td>"
--"<td>connect to the RDP server on 'megan'</td></tr></table>\">Examples</a>"
--msgstr ""
--"輸入您要連線的主機位址，或是在網路上瀏覽選擇。VNC 與 RDP 相容的伺服器都可支援。<a href=\"whatsthis:"
--"<h3>範例</h3>：以一台稱為 'megan' 的主機："
--"<p>"
--"<table>"
--"<tr>"
--"<td>megan:1</td>"
--"<td>連線到 megan 上的 VNC 伺服器，顯示號碼為 1</td></tr>"
--"<tr>"
--"<td>vnc:/megan:1</td>"
--"<td>同樣的東西，只是格式較長。</td></tr>"
--"<tr>"
--"<td>rdp:/megan</td>"
--"<td>連線到 megan 上的 RDP 伺服器。</td></tr></table>\">範例</a>"
-+"select one. VNC and RDP compatible servers will be supported. <a href="
-+"\"whatsthis:<h3>Examples</h3>for a computer called 'megan':"
-+"<p><table><tr><td>megan:1</td><td>connect to the VNC server on 'megan' with "
-+"display number 1</td></tr><tr><td>vnc:/megan:1</td><td>longer form for the "
-+"same thing</td></tr><tr><td>rdp:/megan</td><td>connect to the RDP server on "
-+"'megan'</td></tr></table>\">Examples</a>"
-+msgstr ""
-+"輸入您要連線的主機位址，或是在網路上瀏覽選擇。VNC 與 RDP 相容的伺服器都可支"
-+"援。<a href=\"whatsthis:<h3>範例</h3>：以一臺稱為 'megan' 的主機："
-+"<p><table><tr><td>megan:1</td><td>連線到 megan 上的 VNC 伺服器，顯示號碼為 "
-+"1</td></tr><tr><td>vnc:/megan:1</td><td>同樣的東西，只是格式較長。</td></"
-+"tr><tr><td>rdp:/megan</td><td>連線到 megan 上的 RDP 伺服器。</td></tr></"
-+"table>\">範例</a>"
- 
- #. i18n: file maindialogbase.ui line 136
- #: rc.cpp:52 rc.cpp:137
-@@ -406,9 +396,10 @@
- #: rc.cpp:55 rc.cpp:140
- #, no-c-format
- msgid ""
--"Rescans the network. Depending on the network configuration this may take a few "
--"seconds until all systems have responded."
--msgstr "重新掃描網路。根據您的網路設定，可能會等上一段時間，直到所有系統都回應為止。"
-+"Rescans the network. Depending on the network configuration this may take a "
-+"few seconds until all systems have responded."
-+msgstr ""
-+"重新掃描網路。根據您的網路設定，可能會等上一段時間，直到所有系統都回應為止。"
- 
- #. i18n: file maindialogbase.ui line 164
- #: rc.cpp:58 rc.cpp:143
-@@ -427,12 +418,13 @@
- #, no-c-format
- msgid ""
- "Enter a search term here if you want to search for a specific system, then "
--"press Enter or click Rescan. All systems, whose description matches the search "
--"term, will be displayed. The search is not case sensitive. If you leave the "
--"field empty all systems will be displayed."
-+"press Enter or click Rescan. All systems, whose description matches the "
-+"search term, will be displayed. The search is not case sensitive. If you "
-+"leave the field empty all systems will be displayed."
- msgstr ""
--"如果您要尋找特定的系統，請輸入搜尋字串，然後按 Enter "
--"或「重新掃描」。所有描述符合您的字串的系統都會顯示出來。搜尋字串不分大小寫，如果沒有輸入任何字串，則會顯示所有的系統。"
-+"如果您要尋找特定的系統，請輸入搜尋字串，然後按 Enter 或「重新掃描」。所有描述"
-+"符合您的字串的系統都會顯示出來。搜尋字串不分大小寫，如果沒有輸入任何字串，則"
-+"會顯示所有的系統。"
- 
- #. i18n: file maindialogbase.ui line 211
- #: rc.cpp:67 rc.cpp:152
-@@ -444,8 +436,8 @@
- #: rc.cpp:70 rc.cpp:155
- #, no-c-format
- msgid ""
--"An administrator can configure the network to have several scopes. If this is "
--"the case, you can select the scope to scan here."
-+"An administrator can configure the network to have several scopes. If this "
-+"is the case, you can select the scope to scan here."
- msgstr "系統管理員能設定網路特殊範圍。如果是這樣，您可以選擇掃描的範圍。"
- 
- #. i18n: file maindialogbase.ui line 242
-@@ -473,7 +465,9 @@
- "Here you can see the systems on the network that allow you to connect. Note "
- "that an administrator can hide systems, so the list is not always complete. "
- "Click on an item to select it, double-click it to connect immediately."
--msgstr "您可以看到網路上允許您連接的系統。注意管理者可能會隱藏某些系統，所以這份清單並不完整。您可以點選其中一個項目，雙擊該項目就直接連線。"
-+msgstr ""
-+"您可以看到網路上允許您連接的系統。注意管理者可能會隱藏某些系統，所以這份清單"
-+"並不完整。您可以點選其中一個項目，雙擊該項目就直接連線。"
- 
- #. i18n: file rdp/rdpprefs.ui line 27
- #: rc.cpp:173 rc.cpp:335
-@@ -503,7 +497,7 @@
- #: rc.cpp:185
- #, no-c-format
- msgid "Custom (...)"
--msgstr "自定(...)"
-+msgstr "自定(…)"
- 
- #. i18n: file rdp/rdpprefs.ui line 92
- #: rc.cpp:188
-@@ -737,8 +731,8 @@
- #: rc.cpp:299
- #, no-c-format
- msgid ""
--"Use this to specify your keyboard layout. This layout setting is used to send "
--"the correct keyboard codes to the server."
-+"Use this to specify your keyboard layout. This layout setting is used to "
-+"send the correct keyboard codes to the server."
- msgstr "指定您的鍵盤分布。這會用於送出正確的鍵盤碼到伺服器上。"
- 
- #. i18n: file rdp/rdpprefs.ui line 352
-@@ -806,9 +800,11 @@
- #, no-c-format
- msgid ""
- "Select this option if you do not want to be asked for the settings when "
--"connecting to a host. For hosts with existing profiles these profiles will be "
--"taken. New hosts will be configured with the defaults."
--msgstr "如果您不想在每次連到一台主機時就被詢問一次設定，您可以開啟此選項。對已經有設定檔的主機，會直接使用設定檔。新的主機則會使用預設設定。"
-+"connecting to a host. For hosts with existing profiles these profiles will "
-+"be taken. New hosts will be configured with the defaults."
-+msgstr ""
-+"如果您不想在每次連到一臺主機時就被詢問一次設定，您可以開啟此選項。對已經有設"
-+"定檔的主機，會直接使用設定檔。新的主機則會使用預設設定。"
- 
- #. i18n: file vnc/vncprefs.ui line 41
- #: rc.cpp:338
-@@ -820,10 +816,12 @@
- #: rc.cpp:341
- #, no-c-format
- msgid ""
--"Enable this option to encrypt the connection. Only newer servers support this "
--"option. Encrypting prevents others from eavesdropping, but can slow down the "
--"connection considerably."
--msgstr "開啟此選項以對連線做編碼。只有較新的伺服器才支援此選項。編碼能避免其他人偷聽，但是會讓連線變慢。"
-+"Enable this option to encrypt the connection. Only newer servers support "
-+"this option. Encrypting prevents others from eavesdropping, but can slow "
-+"down the connection considerably."
-+msgstr ""
-+"開啟此選項以對連線做編碼。只有較新的伺服器才支援此選項。編碼能避免其他人偷"
-+"聽，但是會讓連線變慢。"
- 
- #. i18n: file vnc/vncprefs.ui line 74
- #: rc.cpp:350
-@@ -856,13 +854,15 @@
- "Use this to specify the performance of your connection. Note that you should "
- "select the speed of the weakest link - even if you have a high speed "
- "connection, it will not help you if the remote computer uses a slow modem. "
--"Choosing a level of quality that is too high on a slow link will cause slower "
--"response times. Choosing a lower quality will increase latencies in high speed "
--"connections and results in lower image quality, especially in 'Low Quality' "
--"mode."
-+"Choosing a level of quality that is too high on a slow link will cause "
-+"slower response times. Choosing a lower quality will increase latencies in "
-+"high speed connections and results in lower image quality, especially in "
-+"'Low Quality' mode."
- msgstr ""
--"指定您的連線的效能。注意您應該根據較慢的那一端來決定連線效能─即使您有高速網路，但若遠端電腦使用的是慢速數據機，選擇快速也是沒用。如果在慢速網路上選擇高品質，會"
--"讓回應時間變慢。選擇低品質會增加高速網路連線的延遲，並導致畫面的品質較差，特別是在「低品質」模式。"
-+"指定您的連線的效能。注意您應該根據較慢的那一端來決定連線效能─即使您有高速網"
-+"路，但若遠端電腦使用的是慢速數據機，選擇快速也是沒用。如果在慢速網路上選擇高"
-+"品質，會讓回應時間變慢。選擇低品質會增加高速網路連線的延遲，並導致畫面的品質"
-+"較差，特別是在「低品質」模式。"
- 
- #: rdp/krdpview.cpp:170
- #, c-format
-@@ -893,9 +893,10 @@
- 
- #: rdp/rdphostpref.cpp:112
- msgid ""
--"Show Preferences: %1, Resolution: %2x%3, Color Depth: %4, Keymap: %5, KWallet: "
--"%6"
--msgstr "顯示喜好設定：%1，解析度：%2x%3，色彩深度：%4，鍵盤對應：%5，KWallet：%6"
-+"Show Preferences: %1, Resolution: %2x%3, Color Depth: %4, Keymap: %5, "
-+"KWallet: %6"
-+msgstr ""
-+"顯示喜好設定：%1，解析度：%2x%3，色彩深度：%4，鍵盤對應：%5，KWallet：%6"
- 
- #: rdp/rdphostpref.cpp:113 rdp/rdphostpref.cpp:114 vnc/vnchostpref.cpp:99
- msgid "yes"
-diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdenetwork/krfb.po kde-i18n-zh_TW-3.5.10/messages/kdenetwork/krfb.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdenetwork/krfb.po	2008-08-19 20:43:21.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdenetwork/krfb.po	2011-11-11 15:45:17.000000000 +0100
-@@ -6,8 +6,7 @@
- "Project-Id-Version: krfb\n"
- "POT-Creation-Date: 2008-07-08 01:20+0200\n"
- "PO-Revision-Date: 2006-02-24 12:26+0800\n"
--"Last-Translator: Frank Weng (a.k.a. Franklin) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Traditional Chinese <zh_l10n@linux.org.tw>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
-@@ -24,8 +23,8 @@
- #: rc.cpp:6
- #, no-c-format
- msgid ""
--"Somebody is requesting a connection to your computer. Granting this will allow "
--"the remote user to watch your desktop. "
-+"Somebody is requesting a connection to your computer. Granting this will "
-+"allow the remote user to watch your desktop. "
- msgstr "有人要求連線到您的電腦。若您同意，他將能看到您的桌面。"
- 
- #. i18n: file connectionwidget.ui line 136
-@@ -44,11 +43,14 @@
- #: rc.cpp:15
- #, no-c-format
- msgid ""
--"If you turn this option on, the remote user can enter keystrokes and use your "
--"mouse pointer. This gives them full control over your computer, so be careful. "
--"When the option is disabled the remote user can only watch your screen."
-+"If you turn this option on, the remote user can enter keystrokes and use "
-+"your mouse pointer. This gives them full control over your computer, so be "
-+"careful. When the option is disabled the remote user can only watch your "
-+"screen."
- msgstr ""
--"如果開啟此選項，遠端使用者就能輸入按鍵並使用您的滑鼠指標。這等於是將整部電腦交給他控制，所以請小心。當此選項關閉時，遠端使用者就只能看到您的桌面而無法操控。"
-+"如果開啟此選項，遠端使用者就能輸入按鍵並使用您的滑鼠指標。這等於是將整部電腦"
-+"交給他控制，所以請小心。當此選項關閉時，遠端使用者就只能看到您的桌面而無法操"
-+"控。"
- 
- #. i18n: file connectionwidget.ui line 168
- #: rc.cpp:18
-@@ -66,59 +68,62 @@
- #: rc.cpp:24
- #, no-c-format
- msgid ""
--"KDE Desktop Sharing allows you to invite somebody at a remote location to watch "
--"and possibly control your desktop.\n"
--"<a href=\"whatsthis:"
--"<p>An invitation creates a one-time password that allows the receiver to "
--"connect to your desktop. It is valid for only one successful connection and "
--"will expire after an hour if it has not been used. When somebody connects to "
--"your computer a dialog will appear and ask you for permission. The connection "
--"will not be established before you accept it. In this dialog you can also "
--"restrict the other person to view your desktop only, without the ability to "
--"move your mouse pointer or press keys.</p>"
--"<p>If you want to create a permanent password for Desktop Sharing, allow "
--"'Uninvited Connections' in the configuration.</p>\">"
--"More about invitations...</a>"
-+"KDE Desktop Sharing allows you to invite somebody at a remote location to "
-+"watch and possibly control your desktop.\n"
-+"<a href=\"whatsthis:<p>An invitation creates a one-time password that allows "
-+"the receiver to connect to your desktop. It is valid for only one successful "
-+"connection and will expire after an hour if it has not been used. When "
-+"somebody connects to your computer a dialog will appear and ask you for "
-+"permission. The connection will not be established before you accept it. In "
-+"this dialog you can also restrict the other person to view your desktop "
-+"only, without the ability to move your mouse pointer or press keys.</p><p>If "
-+"you want to create a permanent password for Desktop Sharing, allow "
-+"'Uninvited Connections' in the configuration.</p>\">More about invitations..."
-+"</a>"
- msgstr ""
- "KDE 桌面分享讓您可以邀請某人從遠端觀看或控制您的桌面。 \n"
--"<a "
--"href=\"「邀請」會產生一次性的密碼，讓接收者可以連到您的桌面。這個密碼只能使用一次，並且在一個小時未使用後失效。當有人連到您的電腦後，會有一個對話框問您要"
--"不要接受。您可以限制對方只能看您的桌面而不能控制您的桌面。如果您要產生一個永久的密碼，您可以設定「允許未邀請的連線」。\">關於邀請的詳情...</a>"
-+"<a href=\"「邀請」會產生一次性的密碼，讓接收者可以連到您的桌面。這個密碼只能"
-+"使用一次，並且在一個小時未使用後失效。當有人連到您的電腦後，會有一個對話框問"
-+"您要不要接受。您可以限制對方只能看您的桌面而不能控制您的桌面。如果您要產生一"
-+"個永久的密碼，您可以設定「允許未邀請的連線」。\">關於邀請的詳情...</a>"
- 
- #. i18n: file invitewidget.ui line 109
- #: rc.cpp:28
- #, no-c-format
- msgid "Create &Personal Invitation..."
--msgstr "建立個人邀請(&P)..."
-+msgstr "建立個人邀請(&P)…"
- 
- #. i18n: file invitewidget.ui line 115
- #: rc.cpp:31
- #, no-c-format
- msgid ""
--"Create a new invitation and display the connection data. Use this option if you "
--"want to invite somebody personally, for example, to give the connection data "
--"over the phone."
--msgstr "建立新的邀請並顯示連線資料。比方說如果您是個人要邀請某人，則使用這個選項。"
-+"Create a new invitation and display the connection data. Use this option if "
-+"you want to invite somebody personally, for example, to give the connection "
-+"data over the phone."
-+msgstr ""
-+"建立新的邀請並顯示連線資料。比方說如果您是個人要邀請某人，則使用這個選項。"
- 
- #. i18n: file invitewidget.ui line 157
- #: invitedialog.cc:62 rc.cpp:34
- #, no-c-format
- msgid "&Manage Invitations (%1)..."
--msgstr "管理邀請(%1)(&M)..."
-+msgstr "管理邀請(%1)(&M)…"
- 
- #. i18n: file invitewidget.ui line 165
- #: rc.cpp:37
- #, no-c-format
- msgid "Invite via &Email..."
--msgstr "透過電子郵件邀請(&E)..."
-+msgstr "透過電子郵件邀請(&E)…"
- 
- #. i18n: file invitewidget.ui line 168
- #: rc.cpp:40
- #, no-c-format
- msgid ""
--"This button will start your email application with a pre-configured text that "
--"explains to the recipient how to connect to your computer. "
--msgstr "這個按鍵會開啟您的電子郵件程式，並開始一封新信件，內容是向對方解釋如何連線到您的電腦。"
-+"This button will start your email application with a pre-configured text "
-+"that explains to the recipient how to connect to your computer. "
-+msgstr ""
-+"這個按鍵會開啟您的電子郵件程式，並開始一封新信件，內容是向對方解釋如何連線到"
-+"您的電腦。"
- 
- #. i18n: file manageinvitations.ui line 16
- #: rc.cpp:43
-@@ -142,21 +147,21 @@
- #: rc.cpp:52
- #, no-c-format
- msgid ""
--"Displays the open invitations. Use the buttons on the right to delete them or "
--"create a new invitation."
-+"Displays the open invitations. Use the buttons on the right to delete them "
-+"or create a new invitation."
- msgstr "顯示開放的邀請。用右邊的按鍵來刪除或建立新的邀請。"
- 
- #. i18n: file manageinvitations.ui line 112
- #: rc.cpp:55
- #, no-c-format
- msgid "New &Personal Invitation..."
--msgstr "新的個人邀請(&P)..."
-+msgstr "新的個人邀請(&P)…"
- 
- #. i18n: file manageinvitations.ui line 115
- #: rc.cpp:58
- #, no-c-format
- msgid "Create a new personal invitation..."
--msgstr "建立新的個人邀請..."
-+msgstr "建立新的個人邀請…"
- 
- #. i18n: file manageinvitations.ui line 118
- #: rc.cpp:61
-@@ -168,13 +173,13 @@
- #: rc.cpp:64
- #, no-c-format
- msgid "&New Email Invitation..."
--msgstr "新的電子郵件邀請(&N)..."
-+msgstr "新的電子郵件邀請(&N)…"
- 
- #. i18n: file manageinvitations.ui line 129
- #: rc.cpp:67
- #, no-c-format
- msgid "Send a new invitation via email..."
--msgstr "透過電子郵件送出新的邀請..."
-+msgstr "透過電子郵件送出新的邀請…"
- 
- #. i18n: file manageinvitations.ui line 132
- #: rc.cpp:70
-@@ -204,8 +209,8 @@
- #: rc.cpp:88
- #, no-c-format
- msgid ""
--"Delete the selected invitation. The invited person will not be able to connect "
--"using this invitation anymore."
-+"Delete the selected invitation. The invited person will not be able to "
-+"connect using this invitation anymore."
- msgstr "刪除所選擇的邀請。被邀請的人將無法再使用這個邀請連線。"
- 
- #. i18n: file manageinvitations.ui line 177
-@@ -219,16 +224,17 @@
- #, no-c-format
- msgid ""
- "<h2>Personal Invitation</h2>\n"
--"Give the information below to the person that you want to invite (<a "
--"href=\"whatsthis:Desktop Sharing uses the VNC protocol. You can use any VNC "
-+"Give the information below to the person that you want to invite (<a href="
-+"\"whatsthis:Desktop Sharing uses the VNC protocol. You can use any VNC "
- "client to connect. In KDE the client is called 'Remote Desktop Connection'. "
--"Enter the host information into the client and it will connect..\">"
--"how to connect</a>). Note that everybody who gets the password can connect, so "
--"be careful."
-+"Enter the host information into the client and it will connect..\">how to "
-+"connect</a>). Note that everybody who gets the password can connect, so be "
-+"careful."
- msgstr ""
- "<h2>個人邀請</h2>\n"
--"將以下的資訊送給您打算邀請的人（<a href=\"whatsthis:桌面分享是使用 VNC 通訊協定。您可以使用任何 VNC 客戶端來連接。在 KDE "
--"中的客戶端軟體叫做「遠端桌面連線」。\">如何連線</a>）。注意：取得此密碼的所有人都能連接進來，所以請小心。"
-+"將以下的資訊送給您打算邀請的人（<a href=\"whatsthis:桌面分享是使用 VNC 通訊協"
-+"定。您可以使用任何 VNC 客戶端來連接。在 KDE 中的客戶端軟體叫做「遠端桌面連"
-+"線」。\">如何連線</a>）。注意：取得此密碼的所有人都能連接進來，所以請小心。"
- 
- #. i18n: file personalinvitewidget.ui line 132
- #: rc.cpp:104
-@@ -270,16 +276,17 @@
- #: rc.cpp:122
- #, no-c-format
- msgid ""
--"(<a href=\"whatsthis:This field contains the address of your computer and the "
--"display number, separated by a colon. The address is just a hint - you can use "
--"any address that can reach your computer. Desktop Sharing tries to guess your "
--"address from your network configuration, but does not always succeed in doing "
--"so. If your computer is behind a firewall it may have a different address or be "
--"unreachable for other computers.\">Help</a>)"
-+"(<a href=\"whatsthis:This field contains the address of your computer and "
-+"the display number, separated by a colon. The address is just a hint - you "
-+"can use any address that can reach your computer. Desktop Sharing tries to "
-+"guess your address from your network configuration, but does not always "
-+"succeed in doing so. If your computer is behind a firewall it may have a "
-+"different address or be unreachable for other computers.\">Help</a>)"
- msgstr ""
--"(<a "
--"href=\"whatsthis:這個欄位包含您的電腦的位址及顯示號碼，以冒號區隔。這個位址只是個提示：您可以使用任何您的電腦可以到達的位址。桌面分享會從您的網"
--"路設定來試著猜測您的位址，但不見得每次都正確。如果您的電腦是在防火牆之後，有可能讀到的位址是無法給他人連線用的。\">說明</a>)"
-+"(<a href=\"whatsthis:這個欄位包含您的電腦的位址及顯示號碼，以冒號區隔。這個位"
-+"址只是個提示：您可以使用任何您的電腦可以到達的位址。桌面分享會從您的網路設定"
-+"來試著猜測您的位址，但不見得每次都正確。如果您的電腦是在防火牆之後，有可能讀"
-+"到的位址是無法給他人連線用的。\">說明</a>)"
- 
- #: _translatorinfo.cpp:1
- msgid ""
-@@ -337,7 +344,8 @@
- msgid ""
- "Cannot find KInetD. The KDE daemon (kded) may have crashed or has not been "
- "started at all, or the installation failed."
--msgstr "找不到 KInetD。KDE 守護程式(kded) 可能已經損毀或尚未啟動，或是安裝失敗。"
-+msgstr ""
-+"找不到 KInetD。KDE 守護程式(kded) 可能已經損毀或尚未啟動，或是安裝失敗。"
- 
- #: main.cpp:116 main.cpp:123 rfbcontroller.cc:885
- msgid "Desktop Sharing Error"
-@@ -384,13 +392,14 @@
- 
- #: configuration.cc:425
- msgid ""
--"When sending an invitation by email, note that everybody who reads this email "
--"will be able to connect to your computer for one hour, or until the first "
--"successful connection took place, whichever comes first. \n"
-+"When sending an invitation by email, note that everybody who reads this "
-+"email will be able to connect to your computer for one hour, or until the "
-+"first successful connection took place, whichever comes first. \n"
- "You should either encrypt the email or at least send it only in a secure "
- "network, but not over the Internet."
- msgstr ""
--"當透過電子郵件送出邀請時，請注意所有讀到這封信件的人都有可能在一個小時內搶先連到您的電腦。\n"
-+"當透過電子郵件送出邀請時，請注意所有讀到這封信件的人都有可能在一個小時內搶先"
-+"連到您的電腦。\n"
- "您應該對這封信件加密，或是透過私密網路送出而不要在網際網路上公開發送。"
- 
- #: configuration.cc:430
-@@ -420,7 +429,8 @@
- "\n"
- "For security reasons this invitation will expire at %9."
- msgstr ""
--"您已經被邀請至 VNC 連線。如果您有安裝 KDE 遠端桌面連線，您只要按以下的連結。\n"
-+"您已經被邀請至 VNC 連線。如果您有安裝 KDE 遠端桌面連線，您只要按以下的連"
-+"結。\n"
- "\n"
- "vnc://invitation:%1@%2:%3\n"
- "\n"
-diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdenetwork/ksirc.po kde-i18n-zh_TW-3.5.10/messages/kdenetwork/ksirc.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdenetwork/ksirc.po	2008-08-19 20:43:21.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdenetwork/ksirc.po	2011-11-11 15:45:17.000000000 +0100
-@@ -7,8 +7,7 @@
- "Project-Id-Version: ksirc\n"
- "POT-Creation-Date: 2008-07-08 01:20+0200\n"
- "PO-Revision-Date: 2006-06-05 10:52+0800\n"
--"Last-Translator: Frank Weng (a.k.a. Franklin) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Traditional Chinese <zh_l10n@linux.org.tw>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
-@@ -69,7 +68,7 @@
- 
- #: chanButtons.cpp:34
- msgid "s (secret)"
--msgstr "s (秘密)"
-+msgstr "s (祕密)"
- 
- #: chanButtons.cpp:36
- msgid "User Modes"
-@@ -113,7 +112,7 @@
- 
- #: chanButtons.cpp:66
- msgid "..."
--msgstr "..."
-+msgstr "…"
- 
- #: chanButtons.cpp:70
- msgid "More mode commands"
-@@ -320,15 +319,15 @@
- 
- #: dockservercontroller.cpp:72 servercontroller.cpp:173
- msgid "&Filter Rule Editor..."
--msgstr "過濾器規則編輯器(&F)..."
-+msgstr "過濾器規則編輯器(&F)…"
- 
- #: dockservercontroller.cpp:80
- msgid "New &Server..."
--msgstr "新伺服器(&S)..."
-+msgstr "新伺服器(&S)…"
- 
- #: dockservercontroller.cpp:82 servercontroller.cpp:166
- msgid "&Do Autoconnect..."
--msgstr "自動連接(&D)..."
-+msgstr "自動連接(&D)…"
- 
- #: dockservercontroller.cpp:106
- msgid "Raise Last Window"
-@@ -336,8 +335,8 @@
- 
- #: dockservercontroller.cpp:107
- msgid ""
--"If someone said your nick in a window, this action will make that window active "
--"for you."
-+"If someone said your nick in a window, this action will make that window "
-+"active for you."
- msgstr "如果有人在聊天視窗中提到您的暱稱，這個動作會提升該視窗。"
- 
- #: dockservercontroller.cpp:113
-@@ -346,8 +345,8 @@
- 
- #: dockservercontroller.cpp:114
- msgid ""
--"If the dock icon is blinking, but you don't want to go to the window this will "
--"clear the blinking."
-+"If the dock icon is blinking, but you don't want to go to the window this "
-+"will clear the blinking."
- msgstr "如果圖示在閃爍，但是不打算到那個視窗看，這個動作會清除閃爍的圖示。"
- 
- #: dockservercontroller.cpp:176
-@@ -388,23 +387,24 @@
- 
- #: dockservercontroller.cpp:209
- msgid "Help on Notify Popup..."
--msgstr "通知清單的說明..."
-+msgstr "通知清單的說明…"
- 
- #: dockservercontroller.cpp:210
- msgid "Configure Notify..."
--msgstr "設定通知..."
-+msgstr "設定通知…"
- 
- #: dockservercontroller.cpp:405
- msgid ""
- "This popup menu can show a list of people you have in your notify list, and "
--"their status. You can configure this list by going to Configure KSirc->Startup->"
--"Notify and adding people to the list. This will take effect the next time you "
--"connect to a server. This message appears when there is nothing in your notify "
--"list or when no one in your list is online."
-+"their status. You can configure this list by going to Configure KSirc-"
-+">Startup->Notify and adding people to the list. This will take effect the "
-+"next time you connect to a server. This message appears when there is "
-+"nothing in your notify list or when no one in your list is online."
- msgstr ""
- "這個彈出式選單會顯示您通知清單中的使用者，及他們的狀態。您可以到「設定 "
--"KSirc」→「啟動」→「通知」中設定此清單。所做的改變將會在下次連線到該伺服器時才會套用。這個訊息出現表示您的清單是空的，或是目前在您清單上的使用者都不在線上"
--"。"
-+"KSirc」→「啟動」→「通知」中設定此清單。所做的改變將會在下次連線到該伺服器時才"
-+"會套用。這個訊息出現表示您的清單是空的，或是目前在您清單上的使用者都不在線"
-+"上。"
- 
- #: dockservercontroller.cpp:417
- msgid "Help for Notification Popup"
-@@ -468,8 +468,8 @@
- 
- #: ksircprocess.cpp:353
- msgid ""
--"5 Channel windows were opened in less than 5 seconds. Someone may be trying to "
--"flood your X server with windows.\n"
-+"5 Channel windows were opened in less than 5 seconds. Someone may be trying "
-+"to flood your X server with windows.\n"
- "Shall I turn off AutoCreate windows?"
- msgstr ""
- "在五秒以內開啟了五個頻道視窗。也許有人試著用視窗擾亂您的 X 伺服器。\n"
-@@ -580,7 +580,7 @@
- #: rc.cpp:51
- #, no-c-format
- msgid "&New..."
--msgstr "新增(&N)..."
-+msgstr "新增(&N)…"
- 
- #. i18n: file dccManagerbase.ui line 123
- #: rc.cpp:54
-@@ -646,7 +646,7 @@
- #: rc.cpp:84
- #, no-c-format
- msgid "&..."
--msgstr "..."
-+msgstr "…"
- 
- #. i18n: file dccNewbase.ui line 155
- #: rc.cpp:87
-@@ -676,9 +676,11 @@
- #: rc.cpp:102
- #, no-c-format
- msgid ""
--"Usually IRC Servers are connected to a net (IRCNet, Freenode, etc.). Here, you "
--"can select the closest server for your favorite network."
--msgstr "通常，IRC 伺服器會連接到一個網路 (IRCNet, Freenode, 等等)。 您可以在此選擇最靠近您常用網路的伺服器。"
-+"Usually IRC Servers are connected to a net (IRCNet, Freenode, etc.). Here, "
-+"you can select the closest server for your favorite network."
-+msgstr ""
-+"通常，IRC 伺服器會連接到一個網路 (IRCNet, Freenode, 等等)。 您可以在此選擇最"
-+"靠近您常用網路的伺服器。"
- 
- #. i18n: file KSOpenkSirc/open_ksircData.ui line 63
- #: rc.cpp:105
-@@ -700,8 +702,9 @@
- "its servers. If you did not choose a group, you can enter your own here or "
- "select one of the recently used ones (<i>\"Quick Connect\"</i>)."
- msgstr ""
--"如果您選擇了一個在<i>群組</i>中的 IRC "
--"網路，這個視窗會顯示所有它的伺服器。假如您沒有選擇群組，您可以在此輸入您自己的，或選擇一個最近使用的群組（<i>快速連接</i>）。"
-+"如果您選擇了一個在<i>群組</i>中的 IRC 網路，這個視窗會顯示所有它的伺服器。假"
-+"如您沒有選擇群組，您可以在此輸入您自己的，或選擇一個最近使用的群組（<i>快速連"
-+"接</i>）。"
- 
- #. i18n: file KSOpenkSirc/open_ksircData.ui line 99
- #: rc.cpp:114
-@@ -713,9 +716,11 @@
- #: rc.cpp:117
- #, no-c-format
- msgid ""
--"Using <i>\"6667\"</i> or <i>\"6666\"</i> here is safe in most cases. Only use "
--"other values if you have been told so."
--msgstr "在大部份情況下，使用 <i>6667</i> 或 <i>6666</i> 是安全的。除非伺服器特別要求才使用其他值。"
-+"Using <i>\"6667\"</i> or <i>\"6666\"</i> here is safe in most cases. Only "
-+"use other values if you have been told so."
-+msgstr ""
-+"在大部份情況下，使用 <i>6667</i> 或 <i>6666</i> 是安全的。除非伺服器特別要求"
-+"才使用其他值。"
- 
- #. i18n: file KSOpenkSirc/open_ksircData.ui line 110
- #: rc.cpp:120
-@@ -751,9 +756,9 @@
- #: rc.cpp:135
- #, no-c-format
- msgid ""
--"This will use a secure connection to the server. This must be supported by the "
--"server."
--msgstr "這會建立與伺服器間的秘密連線。伺服器必須有支援此功能。"
-+"This will use a secure connection to the server. This must be supported by "
-+"the server."
-+msgstr "這會建立與伺服器間的祕密連線。伺服器必須有支援此功能。"
- 
- #. i18n: file KSOpenkSirc/open_ksircData.ui line 215
- #: rc.cpp:138
-@@ -789,9 +794,10 @@
- #: rc.cpp:159
- #, no-c-format
- msgid ""
--"Connect to the server given in <i>\"Server / Quick Connect to:\"</i> "
--"on the port given in <i>\"Port:\"</i>."
--msgstr "連線到「伺服器/快速連接到」欄位所指定的伺服器，及「連接埠」所指定的連接埠。"
-+"Connect to the server given in <i>\"Server / Quick Connect to:\"</i> on the "
-+"port given in <i>\"Port:\"</i>."
-+msgstr ""
-+"連線到「伺服器/快速連接到」欄位所指定的伺服器，及「連接埠」所指定的連接埠。"
- 
- #. i18n: file KSOpenkSirc/open_ksircData.ui line 267
- #: rc.cpp:162
-@@ -1062,7 +1068,7 @@
- #: rc.cpp:330
- #, no-c-format
- msgid " lines"
--msgstr " 行"
-+msgstr " 列"
- 
- #. i18n: file KSPrefs/page_generalbase.ui line 101
- #: rc.cpp:333
-@@ -1080,8 +1086,8 @@
- #: rc.cpp:339
- #, no-c-format
- msgid ""
--"Stores up to this many lines of chat from each window, allowing you to scroll "
--"upwards and see what has already been said."
-+"Stores up to this many lines of chat from each window, allowing you to "
-+"scroll upwards and see what has already been said."
- msgstr "在視窗中保留多少行的訊息，讓您可以用捲軸往前尋找先前的聊天內容。"
- 
- #. i18n: file KSPrefs/page_generalbase.ui line 120
-@@ -1114,19 +1120,20 @@
- #: rc.cpp:354
- #, no-c-format
- msgid "Will auto create a window for each user who sends a /msg to you"
--msgstr "當使用者送出 /msg 命令與您秘密談話時，自動建立新視窗"
-+msgstr "當使用者送出 /msg 命令與您祕密談話時，自動建立新視窗"
- 
- #. i18n: file KSPrefs/page_generalbase.ui line 140
- #: rc.cpp:357
- #, no-c-format
- msgid ""
- "If selected, KSirc  will automatically create a new window for each user who "
--"sends a /msg command to you. If not selected, any text sent to you with /msg is "
--"displayed in the current window and you can use /query username to create a "
--"window to chat to that user."
-+"sends a /msg command to you. If not selected, any text sent to you with /msg "
-+"is displayed in the current window and you can use /query username to create "
-+"a window to chat to that user."
- msgstr ""
--"如果選取此項，當有使用者送出 /msg 命令要與您私下談話時，KSirc 會自動建立新的視窗。反之，則使用者送出的 /msg "
--"命令，也會顯示在目前的視窗中，您可以用 /query <使用者名稱> 來建立與該使用者對話的新視窗。"
-+"如果選取此項，當有使用者送出 /msg 命令要與您私下談話時，KSirc 會自動建立新的"
-+"視窗。反之，則使用者送出的 /msg 命令，也會顯示在目前的視窗中，您可以用 /"
-+"query <使用者名稱> 來建立與該使用者對話的新視窗。"
- 
- #. i18n: file KSPrefs/page_generalbase.ui line 148
- #: rc.cpp:360
-@@ -1199,7 +1206,9 @@
- "If selected, a popup window from which to select the color of your text is "
- "presented when you press Ctrl K.  If not, you have to type the color codes "
- "manually."
--msgstr "選取此選項的話，您按下 Ctrl-K 時會跳出一個視窗，讓您選取文字的顏色。反之，您必須手動輸入顏色碼。"
-+msgstr ""
-+"選取此選項的話，您按下 Ctrl-K 時會跳出一個視窗，讓您選取文字的顏色。反之，您"
-+"必須手動輸入顏色碼。"
- 
- #. i18n: file KSPrefs/page_generalbase.ui line 206
- #: rc.cpp:393
-@@ -1217,8 +1226,8 @@
- #: rc.cpp:399
- #, no-c-format
- msgid ""
--"Use the colors set in the Colors tab of the Configure KSirc dialog for coloring "
--"the nicknames"
-+"Use the colors set in the Colors tab of the Configure KSirc dialog for "
-+"coloring the nicknames"
- msgstr "使用在「設定 KSirc」中的「顏色」頁裡所設定的暱稱著色設定。"
- 
- #. i18n: file KSPrefs/page_generalbase.ui line 220
-@@ -1227,7 +1236,9 @@
- msgid ""
- "If selected, it will use the colors set in the Colors tab of the Configure "
- "KSirc dialog for coloring the nicknames."
--msgstr "如果選取此選項，會使用在「設定 KSirc」對話框中的「顏色」頁中的設定來為暱稱著色。"
-+msgstr ""
-+"如果選取此選項，會使用在「設定 KSirc」對話框中的「顏色」頁中的設定來為暱稱著"
-+"色。"
- 
- #. i18n: file KSPrefs/page_generalbase.ui line 245
- #: rc.cpp:405
-@@ -1250,7 +1261,8 @@
- "text you typed will be completed to match the username, including changes in "
- "capitalization if necessary."
- msgstr ""
--"選取此選項的話，會開啟「暱稱補完」功能。暱稱補完是這樣運作的：先輸入使用者暱稱的第一個字母，按下 Tab 鍵，就會出現完整的使用者暱稱，包括可能改變大小寫。"
-+"選取此選項的話，會開啟「暱稱補完」功能。暱稱補完是這樣運作的：先輸入使用者暱"
-+"稱的第一個字母，按下 Tab 鍵，就會出現完整的使用者暱稱，包括可能改變大小寫。"
- 
- #. i18n: file KSPrefs/page_generalbase.ui line 259
- #: rc.cpp:414
-@@ -1270,11 +1282,11 @@
- msgid ""
- "This allows KSirc to be docked in the system tray. By default this is not "
- "enabled. When KSirc is docked in the system tray, you are able to access "
--"several options by clicking on the KSirc icon. When you close KSirc window, the "
--"icon stays in the systray until you quit KSirc."
-+"several options by clicking on the KSirc icon. When you close KSirc window, "
-+"the icon stays in the systray until you quit KSirc."
- msgstr ""
--"這讓 KSirc 能嵌入系統匣中。預設是關閉的。當 KSirc 嵌入系統匣時，您可以點選該圖示來設定選項。當您關閉 KSirc "
--"視窗時，系統匣圖示仍會存在，直到您離開 KSirc。"
-+"這讓 KSirc 能嵌入系統匣中。預設是關閉的。當 KSirc 嵌入系統匣時，您可以點選該"
-+"圖示來設定選項。當您關閉 KSirc 視窗時，系統匣圖示仍會存在，直到您離開 KSirc。"
- 
- #. i18n: file KSPrefs/page_generalbase.ui line 273
- #: rc.cpp:423
-@@ -1304,8 +1316,8 @@
- #: rc.cpp:435
- #, no-c-format
- msgid ""
--"Prepends each thing said in the channel with the time it was said, in the form "
--"[HH:MM:SS]."
-+"Prepends each thing said in the channel with the time it was said, in the "
-+"form [HH:MM:SS]."
- msgstr "在每個訊息前面加上時間，格式為 HH:MM:SS。"
- 
- #. i18n: file KSPrefs/page_generalbase.ui line 308
-@@ -1333,8 +1345,9 @@
- "then; this is because you probably do not want to override the existing "
- "channels options all the time."
- msgstr ""
--"如果選取此選項，在此頁中的設定會覆蓋個別頻道的設定，讓每個頻道都套用這些設定。這個選項會在下次開啟設定對話框時生效，並且會被重置，因為您可能不想每次都覆蓋目前已"
--"存在的頻道選項。"
-+"如果選取此選項，在此頁中的設定會覆蓋個別頻道的設定，讓每個頻道都套用這些設"
-+"定。這個選項會在下次開啟設定對話框時生效，並且會被重置，因為您可能不想每次都"
-+"覆蓋目前已存在的頻道選項。"
- 
- #. i18n: file KSPrefs/page_generalbase.ui line 322
- #: rc.cpp:447
-@@ -1388,14 +1401,15 @@
- #: rc.cpp:471
- #, no-c-format
- msgid ""
--"<p>This selection allows you to control what the colors displayed inline in the "
--"channel look like. These colors are used for both mIRC style colors in channels "
--"and colorful nicks. The sample box beside the button gives you an example of "
--"what it will look like in the channel. The checkbox controls if the color is "
--"used for the colorful nick features. Checked means use it.</p>"
-+"<p>This selection allows you to control what the colors displayed inline in "
-+"the channel look like. These colors are used for both mIRC style colors in "
-+"channels and colorful nicks. The sample box beside the button gives you an "
-+"example of what it will look like in the channel. The checkbox controls if "
-+"the color is used for the colorful nick features. Checked means use it.</p>"
- msgstr ""
--"<p>這個選項讓您控制頻道中的顏色顯示。這些顏色會用在 mIRC "
--"風格的頻道顏色，以及暱稱著色上。您可以參考範例盒中所顯示的樣子。這個勾選盒控制是否要將暱稱著色。</p>"
-+"<p>這個選項讓您控制頻道中的顏色顯示。這些顏色會用在 mIRC 風格的頻道顏色，以及"
-+"暱稱著色上。您可以參考範例盒中所顯示的樣子。這個勾選盒控制是否要將暱稱著色。"
-+"</p>"
- 
- #. i18n: file KSPrefs/page_irccolorsbase.ui line 42
- #: rc.cpp:474 rc.cpp:477
-@@ -1653,10 +1667,12 @@
- #: rc.cpp:603
- #, no-c-format
- msgid ""
--"This page allows configuration of the RMB Menu for the nicklist located on the "
--"right. You can define names for certain actions. Look at the predefined "
-+"This page allows configuration of the RMB Menu for the nicklist located on "
-+"the right. You can define names for certain actions. Look at the predefined "
- "commands to learn how it works."
--msgstr "這一頁能設定右方暱稱清單的 RMB。您可以定義特定動作的名稱。您可以參考預先定義好的命令以學習如何使用。"
-+msgstr ""
-+"這一頁能設定右方暱稱清單的 RMB。您可以定義特定動作的名稱。您可以參考預先定義"
-+"好的命令以學習如何使用。"
- 
- #. i18n: file KSPrefs/page_rmbmenubase.ui line 91
- #: rc.cpp:606
-@@ -1812,11 +1828,11 @@
- 
- #: servercontroller.cpp:163
- msgid "&New Server..."
--msgstr "新伺服器(&N)..."
-+msgstr "新伺服器(&N)…"
- 
- #: servercontroller.cpp:164
- msgid "&Join Channel..."
--msgstr "加入頻道(&J)..."
-+msgstr "加入頻道(&J)…"
- 
- #: servercontroller.cpp:168
- msgid "&Connections"
-@@ -1858,15 +1874,15 @@
- 
- #: toplevel.cpp:160
- msgid "New Ser&ver..."
--msgstr "新增伺服器(&V)..."
-+msgstr "新增伺服器(&V)…"
- 
- #: toplevel.cpp:162
- msgid "&DCC Manager..."
--msgstr "DCC 管理員..."
-+msgstr "DCC 管理員…"
- 
- #: toplevel.cpp:163
- msgid "&Save to Logfile..."
--msgstr "儲存到紀錄檔(&S)..."
-+msgstr "儲存到紀錄檔(&S)…"
- 
- #: toplevel.cpp:165
- msgid "Time St&amp"
-@@ -1954,7 +1970,7 @@
- "You are about to send %1 lines of text.\n"
- "Do you really want to send that much?"
- msgstr ""
--"您要送出 %1 行文字。\n"
-+"您要送出 %1 列文字。\n"
- "您確定要送那麼多嗎？"
- 
- #: toplevel.cpp:1603
-@@ -2138,11 +2154,11 @@
- 
- #: KSTicker/ksticker.cpp:58
- msgid "Font..."
--msgstr "字型..."
-+msgstr "字型…"
- 
- #: KSTicker/ksticker.cpp:59
- msgid "Scroll Rate..."
--msgstr "捲軸速率..."
-+msgstr "捲軸速率…"
- 
- #: KSTicker/ksticker.cpp:60
- msgid "Scroll Constantly"
-diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdenetwork/kwifimanager.po kde-i18n-zh_TW-3.5.10/messages/kdenetwork/kwifimanager.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdenetwork/kwifimanager.po	2007-01-15 10:56:42.000000000 +0100
-+++ kde-i18n-zh_TW-3.5.10/messages/kdenetwork/kwifimanager.po	2011-11-11 15:45:17.000000000 +0100
-@@ -6,8 +6,7 @@
- "Project-Id-Version: kwifimanager\n"
- "POT-Creation-Date: 2006-11-26 03:33+0100\n"
- "PO-Revision-Date: 2006-05-30 12:49+0800\n"
--"Last-Translator: Frank Weng (a.k.a. Franklin) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Traditional Chinese <zh_l10n@linux.org.tw>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
-@@ -102,7 +101,7 @@
- 
- #: kwifimanager.cpp:332
- msgid "Configuration &Editor..."
--msgstr "設定編輯器(&E)..."
-+msgstr "設定編輯器(&E)…"
- 
- #: kwifimanager.cpp:334
- msgid "Connection &Statistics"
-@@ -118,7 +117,7 @@
- 
- #: kwifimanager.cpp:370 kwifimanager.cpp:419
- msgid "Scan for &Networks..."
--msgstr "掃描網路(&N)..."
-+msgstr "掃描網路(&N)…"
- 
- #: kwifimanager.cpp:372
- msgid "The current signal strength"
-@@ -138,7 +137,7 @@
- 
- #: kwifimanager.cpp:416
- msgid "Scan in progress..."
--msgstr "掃描進行中..."
-+msgstr "掃描進行中…"
- 
- #: locator.cpp:36
- msgid "AccessPoint: "
-@@ -170,7 +169,7 @@
- 
- #: networkscanning.cpp:61
- msgid "Switch to Network..."
--msgstr "切換網路..."
-+msgstr "切換網路…"
- 
- #: networkscanning.cpp:82
- msgid "The scan is complete, but no networks have been found."
-diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdenetwork/kwireless.po kde-i18n-zh_TW-3.5.10/messages/kdenetwork/kwireless.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdenetwork/kwireless.po	2006-07-22 10:04:35.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdenetwork/kwireless.po	2011-11-11 15:45:17.000000000 +0100
-@@ -6,8 +6,7 @@
- "Project-Id-Version: kwireless\n"
- "POT-Creation-Date: 2004-12-11 01:20+0100\n"
- "PO-Revision-Date: 2006-02-24 09:21+0800\n"
--"Last-Translator: Frank Weng (a.k.a. Franklin) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Traditional Chinese <zh_l10n@linux.org.tw>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
-@@ -16,14 +15,12 @@
- 
- #: kwireless.cpp:40
- msgid ""
--"<qt><b>KWireLess</b>"
--"<br>Displays information about wireless network devices.<br />"
--"KWireLess is licensed to you under the terms of the GPL.<br /><i>"
--"(C) 2003 Mirko Boehm</i></qt>"
-+"<qt><b>KWireLess</b><br>Displays information about wireless network devices."
-+"<br />KWireLess is licensed to you under the terms of the GPL.<br /><i>(C) "
-+"2003 Mirko Boehm</i></qt>"
- msgstr ""
--"<qt><b>KWireLess</b>"
--"<br>顯示關於無線網路裝置的資訊。<br /> KWireLess 是以 GPL 發布的。</br > <i>(c) 2003 Mirko Boehm</i>"
--"</qt>"
-+"<qt><b>KWireLess</b><br>顯示關於無線網路裝置的資訊。<br /> KWireLess 是以 "
-+"GPL 發布的。</br > <i>(c) 2003 Mirko Boehm</i></qt>"
- 
- #: kwireless.cpp:44
- msgid "About KWireLess"
-diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdepim/akregator.po kde-i18n-zh_TW-3.5.10/messages/kdepim/akregator.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdepim/akregator.po	2008-08-19 20:43:18.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdepim/akregator.po	2011-11-11 15:45:17.000000000 +0100
-@@ -6,8 +6,7 @@
- "Project-Id-Version: akregator\n"
- "POT-Creation-Date: 2008-07-08 01:23+0200\n"
- "PO-Revision-Date: 2006-12-18 13:09+0800\n"
--"Last-Translator: Frank Weng (a.k.a. Franklin) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Chinese Traditional <zh-l10n@linux.org.tw>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
-@@ -92,7 +91,7 @@
- 
- #: actionmanagerimpl.cpp:82 actionmanagerimpl.cpp:291
- msgid "&Edit Feed..."
--msgstr "編輯 feed(&E)..."
-+msgstr "編輯 feed(&E)…"
- 
- #: actionmanagerimpl.cpp:83 actionmanagerimpl.cpp:313
- msgid "&Mark Feed as Read"
-@@ -128,27 +127,27 @@
- 
- #: actionmanagerimpl.cpp:265
- msgid "&Import Feeds..."
--msgstr "匯入 feed (&I)..."
-+msgstr "匯入 feed(&I)…"
- 
- #: actionmanagerimpl.cpp:266
- msgid "&Export Feeds..."
--msgstr "匯出 feed (&E)..."
-+msgstr "匯出 feed(&E)…"
- 
- #: actionmanagerimpl.cpp:269
- msgid "Send &Link Address..."
--msgstr "送出連結位址(&L)..."
-+msgstr "送出連結位址(&L)…"
- 
- #: actionmanagerimpl.cpp:270
- msgid "Send &File..."
--msgstr "送出檔案(&F)..."
-+msgstr "送出檔案(&F)…"
- 
- #: actionmanagerimpl.cpp:273
- msgid "Configure &Akregator..."
--msgstr "設定 Akregator(&A)..."
-+msgstr "設定 Akregator(&A)…"
- 
- #: actionmanagerimpl.cpp:284
- msgid "&New Tag..."
--msgstr "新標籤(&N)..."
-+msgstr "新標籤(&N)…"
- 
- #: actionmanagerimpl.cpp:287
- msgid "&Open Homepage"
-@@ -156,11 +155,11 @@
- 
- #: actionmanagerimpl.cpp:288
- msgid "&Add Feed..."
--msgstr "新增 feed(&A)..."
-+msgstr "新增 feed(&A)…"
- 
- #: actionmanagerimpl.cpp:289
- msgid "Ne&w Folder..."
--msgstr "新資料夾(&W)..."
-+msgstr "新資料夾(&W)…"
- 
- #: actionmanagerimpl.cpp:292
- msgid "&View Mode"
-@@ -180,7 +179,7 @@
- 
- #: actionmanagerimpl.cpp:308
- msgid "Fe&tch All Feeds"
--msgstr "抓取所有的 feed (&T)"
-+msgstr "抓取所有的 feed(&T)"
- 
- #: actionmanagerimpl.cpp:310
- msgid "&Abort Fetches"
-@@ -374,7 +373,7 @@
- 
- #: addfeeddialog.cpp:111
- msgid "Feed found, downloading..."
--msgstr "找到 feed。下載中..."
-+msgstr "找到 feed。下載中…"
- 
- #: akregator_part.cpp:171
- msgid "Unable to load storage backend plugin \"%1\". No feeds are archived."
-@@ -415,13 +414,14 @@
- 
- #: akregator_part.cpp:400
- msgid "Opening Feed List..."
--msgstr "開啟 feed 列表中..."
-+msgstr "開啟 feed 列表中…"
- 
- #: akregator_part.cpp:435
- msgid ""
- "<qt>The standard feed list is corrupted (invalid XML). A backup was created:"
- "<p><b>%2</b></p></qt>"
--msgstr "<qt>標準的 feed 列表已損毀（錯誤的 XML）。已產生備份：<p><b>%2</b></p></qt>"
-+msgstr ""
-+"<qt>標準的 feed 列表已損毀（錯誤的 XML）。已產生備份：<p><b>%2</b></p></qt>"
- 
- #: akregator_part.cpp:435
- msgid "XML Parsing Error"
-@@ -429,9 +429,11 @@
- 
- #: akregator_part.cpp:450
- msgid ""
--"<qt>The standard feed list is corrupted (no valid OPML). A backup was created:"
--"<p><b>%2</b></p></qt>"
--msgstr "<qt>標準的 feed 列表已損毀（沒有合法的 OPML）。已產生備份：<p><b>%2</b></p></qt>"
-+"<qt>The standard feed list is corrupted (no valid OPML). A backup was "
-+"created:<p><b>%2</b></p></qt>"
-+msgstr ""
-+"<qt>標準的 feed 列表已損毀（沒有合法的 OPML）。已產生備份：<p><b>%2</b></p></"
-+"qt>"
- 
- #: akregator_part.cpp:450 akregator_part.cpp:642
- msgid "OPML Parsing Error"
-@@ -455,9 +457,10 @@
- 
- #: akregator_part.cpp:645
- msgid ""
--"The file %1 could not be read, check if it exists or if it is readable for the "
--"current user."
--msgstr "無法讀取檔案 %1，請檢查該檔是否存在，或是該檔是否能被現在的使用者讀取。"
-+"The file %1 could not be read, check if it exists or if it is readable for "
-+"the current user."
-+msgstr ""
-+"無法讀取檔案 %1，請檢查該檔是否存在，或是該檔是否能被現在的使用者讀取。"
- 
- #: akregator_part.cpp:645
- msgid "Read Error"
-@@ -490,45 +493,48 @@
- 
- #: akregator_part.cpp:975
- msgid ""
--"<qt>%1 already seems to be running on another display on this machine. <b>"
--"Running %2 more than once is not supported by the %3 backend and can cause the "
--"loss of archived articles and crashes at startup.</b> "
--"You should disable the archive for now unless you are sure that %2 is not "
--"already running.</qt>"
-+"<qt>%1 already seems to be running on another display on this machine. "
-+"<b>Running %2 more than once is not supported by the %3 backend and can "
-+"cause the loss of archived articles and crashes at startup.</b> You should "
-+"disable the archive for now unless you are sure that %2 is not already "
-+"running.</qt>"
- msgstr ""
--"<qt>%1 似乎已經在這台機器上執行中了。<b>%3 的後端程式無法支援執行 %2 兩次以上，並且可能會造成收集的文章遺失，還有啟動時當機的問題。</b>"
--"您應該先關閉收集文章，直到您確定 %2 沒有被執行為止。</qt>"
-+"<qt>%1 似乎已經在這臺機器上執行中了。<b>%3 的後端程式無法支援執行 %2 兩次以"
-+"上，並且可能會造成收集的文章遺失，還有啟動時當機的問題。</b>您應該先關閉收集"
-+"文章，直到您確定 %2 沒有被執行為止。</qt>"
- 
- #: akregator_part.cpp:987
- msgid ""
--"<qt>%1 seems to be running on another display on this machine. <b>"
--"Running %1 and %2 at the same time is not supported by the %3 backend and can "
--"cause the loss of archived articles and crashes at startup.</b> "
--"You should disable the archive for now unless you are sure that %2 is not "
--"already running.</qt>"
-+"<qt>%1 seems to be running on another display on this machine. <b>Running %1 "
-+"and %2 at the same time is not supported by the %3 backend and can cause the "
-+"loss of archived articles and crashes at startup.</b> You should disable the "
-+"archive for now unless you are sure that %2 is not already running.</qt>"
- msgstr ""
--"<qt>%1 似乎已經在這台機器上執行了。<b>%3 的後端程式無法支援同時執行 %1 與 %2，並且可能會造成收集的文章遺失，還有啟動時當機的問題。</b>"
--"您應該先關閉收集文章，直到您確定 %2 沒有被執行為止。</qt>"
-+"<qt>%1 似乎已經在這臺機器上執行了。<b>%3 的後端程式無法支援同時執行 %1 與 %"
-+"2，並且可能會造成收集的文章遺失，還有啟動時當機的問題。</b>您應該先關閉收集文"
-+"章，直到您確定 %2 沒有被執行為止。</qt>"
- 
- #: akregator_part.cpp:998
- msgid ""
--"<qt>%1 already seems to be running on %2. <b>Running %1 more than once is not "
--"supported by the %3 backend and can cause the loss of archived articles and "
--"crashes at startup.</b> You should disable the archive for now unless you are "
--"sure that it is not already running on %2.</qt>"
-+"<qt>%1 already seems to be running on %2. <b>Running %1 more than once is "
-+"not supported by the %3 backend and can cause the loss of archived articles "
-+"and crashes at startup.</b> You should disable the archive for now unless "
-+"you are sure that it is not already running on %2.</qt>"
- msgstr ""
--"<qt>%1 似乎已經在 %2 上執行中了。<b>%3 的後端程式無法支援執行 %1 兩次以上，並且可能會造成收集的文章遺失，還有啟動時當機的問題。</b>"
--"您應該先關閉收集文章，直到您確定沒有在 %2 上被執行為止。</qt>"
-+"<qt>%1 似乎已經在 %2 上執行中了。<b>%3 的後端程式無法支援執行 %1 兩次以上，並"
-+"且可能會造成收集的文章遺失，還有啟動時當機的問題。</b>您應該先關閉收集文章，"
-+"直到您確定沒有在 %2 上被執行為止。</qt>"
- 
- #: akregator_part.cpp:1006
- msgid ""
--"<qt>%1 seems to be running on %3. <b>Running %1 and %2 at the same time is not "
--"supported by the %4 backend and can cause the loss of archived articles and "
--"crashes at startup.</b> You should disable the archive for now unless you are "
--"sure that %1 is not running on %3.</qt>"
-+"<qt>%1 seems to be running on %3. <b>Running %1 and %2 at the same time is "
-+"not supported by the %4 backend and can cause the loss of archived articles "
-+"and crashes at startup.</b> You should disable the archive for now unless "
-+"you are sure that %1 is not running on %3.</qt>"
- msgstr ""
--"<qt>%1 似乎已經在 %3 上執行了。<b>%4 的後端程式無法支援同時執行 %1 與 %2，並且可能會造成收集的文章遺失，還有啟動時當機的問題。</b>"
--"您應該先關閉收集文章，直到您確定 %1 沒有在 %3 上被執行為止。</qt>"
-+"<qt>%1 似乎已經在 %3 上執行了。<b>%4 的後端程式無法支援同時執行 %1 與 %2，並"
-+"且可能會造成收集的文章遺失，還有啟動時當機的問題。</b>您應該先關閉收集文章，"
-+"直到您確定 %1 沒有在 %3 上被執行為止。</qt>"
- 
- #: akregator_part.cpp:1018
- msgid "Force Access"
-@@ -540,9 +546,10 @@
- 
- #: akregator_view.cpp:148
- msgid ""
--"<qt>Are you sure you want to delete tag <b>%1</b>? The tag will be removed from "
--"all articles.</qt>"
--msgstr "<qt>您確定您要刪除標籤 <b>%1</b> 嗎？這個標籤會從所有的文章中刪除。</qt>"
-+"<qt>Are you sure you want to delete tag <b>%1</b>? The tag will be removed "
-+"from all articles.</qt>"
-+msgstr ""
-+"<qt>您確定您要刪除標籤 <b>%1</b> 嗎？這個標籤會從所有的文章中刪除。</qt>"
- 
- #: akregator_view.cpp:149
- msgid "Delete Tag"
-@@ -550,14 +557,14 @@
- 
- #: akregator_view.cpp:167
- msgid ""
--"<qt>Are you sure you want to delete this folder and its feeds and "
--"subfolders?</qt>"
-+"<qt>Are you sure you want to delete this folder and its feeds and subfolders?"
-+"</qt>"
- msgstr "<qt>您確定您要刪除這個資料夾及裡面的所有內容嗎？</qt>"
- 
- #: akregator_view.cpp:169
- msgid ""
--"<qt>Are you sure you want to delete folder <b>%1</b> "
--"and its feeds and subfolders?</qt>"
-+"<qt>Are you sure you want to delete folder <b>%1</b> and its feeds and "
-+"subfolders?</qt>"
- msgstr "<qt>您確定您要刪除資料夾 <b>%1</b> 及裡面的所有內容嗎？</qt>"
- 
- #: akregator_view.cpp:171
-@@ -618,7 +625,7 @@
- 
- #: akregator_view.cpp:1065
- msgid "Fetching Feeds..."
--msgstr "抓取 feed 中..."
-+msgstr "抓取 feed 中…"
- 
- #: akregator_view.cpp:1307
- msgid "<qt>Are you sure you want to delete article <b>%1</b>?</qt>"
-@@ -650,30 +657,31 @@
- 
- #: articlelistview.cpp:269
- msgid ""
--"<h2>Article list</h2>Here you can browse articles from the currently selected "
--"feed. You can also manage articles, as marking them as persistent (\"Keep "
--"Article\") or delete them, using the right mouse button menu.To view the web "
--"page of the article, you can open the article internally in a tab or in an "
--"external browser window."
-+"<h2>Article list</h2>Here you can browse articles from the currently "
-+"selected feed. You can also manage articles, as marking them as persistent "
-+"(\"Keep Article\") or delete them, using the right mouse button menu.To view "
-+"the web page of the article, you can open the article internally in a tab or "
-+"in an external browser window."
- msgstr ""
--"<h2>文章列表</h2>您可以在這裡瀏覽所有從目前選定的 feed "
--"中的文章。您也可以用滑鼠右鍵管理文章，標記為保留或刪除。要看文章的網頁，您可以直接在分頁中或是在外部瀏覽器開啟。"
-+"<h2>文章列表</h2>您可以在這裡瀏覽所有從目前選定的 feed 中的文章。您也可以用滑"
-+"鼠右鍵管理文章，標記為保留或刪除。要看文章的網頁，您可以直接在分頁中或是在外"
-+"部瀏覽器開啟。"
- 
- #: articlelistview.cpp:588
- msgid ""
--"<div align=center>"
--"<h3>No matches</h3>Filter does not match any articles, please change your "
--"criteria and try again.</div>"
--msgstr "<div align=center><h3>沒有符合的</h3>沒有一篇文章符合此過濾器條件。請修改您的條件再試一次。</div>"
-+"<div align=center><h3>No matches</h3>Filter does not match any articles, "
-+"please change your criteria and try again.</div>"
-+msgstr ""
-+"<div align=center><h3>沒有符合的</h3>沒有一篇文章符合此過濾器條件。請修改您的"
-+"條件再試一次。</div>"
- 
- #: articlelistview.cpp:600
- msgid ""
--"<div align=center>"
--"<h3>No feed selected</h3>This area is article list. Select a feed from the feed "
--"list and you will see its articles here.</div>"
-+"<div align=center><h3>No feed selected</h3>This area is article list. Select "
-+"a feed from the feed list and you will see its articles here.</div>"
- msgstr ""
--"<div align=center>"
--"<h3>沒有選擇 feed</h3>這裡是文章列表區。請從 feed 清單中選擇一個 feed，您就可以在這裡看到文章。"
-+"<div align=center><h3>沒有選擇 feed</h3>這裡是文章列表區。請從 feed 清單中選"
-+"擇一個 feed，您就可以在這裡看到文章。"
- 
- #: articleviewer.cpp:80 articleviewer.cpp:127 articleviewer.cpp:145
- msgid " (no unread articles)"
-@@ -704,27 +712,26 @@
- 
- #: articleviewer.cpp:381
- msgid ""
--"_: %1: Akregator version; %2: help:// URL; %3: homepage URL; --- end of comment "
--"---\n"
--"<h2 style='margin-top: 0px;'>Welcome to Akregator %1</h2>"
--"<p>Akregator is an RSS feed aggregator for the K Desktop Environment. Feed "
--"aggregators provide a convenient way to browse different kinds of content, "
--"including news, blogs, and other content from online sites. Instead of checking "
--"all your favorite web sites manually for updates, Akregator collects the "
--"content for you.</p>"
--"<p>For more information about using Akregator, check the <a href=\"%3\">"
--"Akregator website</a>. If you do not want to see this page anymore, <a "
--"href=\"config:/disable_introduction\">click here</a>.</p>"
--"<p>We hope that you will enjoy Akregator.</p>\n"
-+"_: %1: Akregator version; %2: help:// URL; %3: homepage URL; --- end of "
-+"comment ---\n"
-+"<h2 style='margin-top: 0px;'>Welcome to Akregator %1</h2><p>Akregator is an "
-+"RSS feed aggregator for the K Desktop Environment. Feed aggregators provide "
-+"a convenient way to browse different kinds of content, including news, "
-+"blogs, and other content from online sites. Instead of checking all your "
-+"favorite web sites manually for updates, Akregator collects the content for "
-+"you.</p><p>For more information about using Akregator, check the <a href=\"%3"
-+"\">Akregator website</a>. If you do not want to see this page anymore, <a "
-+"href=\"config:/disable_introduction\">click here</a>.</p><p>We hope that you "
-+"will enjoy Akregator.</p>\n"
- "<p>Thank you,</p>\n"
- "<p style='margin-bottom: 0px'>&nbsp; &nbsp; The Akregator Team</p>\n"
- msgstr ""
--"<h2 style='margin-top: 0px;'>歡迎來到 Akregator %1</h2> "
--"<p>Akregator 是 KDE 的 RSS feed "
--"集散地。這裡提供一個方便的環境瀏覽不同內容的文章，包括新聞、部落格、還有其他站台。您不需要自己檢查所有站台的最新內容，Akregator 會幫您處理。</p> "
--"<p>關於使用 Akregator 的詳情，請看 <a href=\"%3\">Akregator 網站</a>"
--"。如果您不想再看到這個簡介，請<a href=\"config:/disable_introduction\">按這裡</a>。</p> "
--"<p>我們希望您喜歡 Akregator。</p>\n"
-+"<h2 style='margin-top: 0px;'>歡迎來到 Akregator %1</h2> <p>Akregator 是 KDE "
-+"的 RSS feed 集散地。這裡提供一個方便的環境瀏覽不同內容的文章，包括新聞、部落"
-+"格、還有其他站臺。您不需要自己檢查所有站臺的最新內容，Akregator 會幫您處理。"
-+"</p> <p>關於使用 Akregator 的詳情，請看 <a href=\"%3\">Akregator 網站</a>。如"
-+"果您不想再看到這個簡介，請<a href=\"config:/disable_introduction\">按這裡</"
-+"a>。</p> <p>我們希望您喜歡 Akregator。</p>\n"
- "<p>謝謝。</p>\n"
- "<p style='margin-bottom: 0px'>&nbsp; &nbsp; Akregator 開發團隊</p>\n"
- 
-@@ -787,15 +794,16 @@
- 
- #: feedlistview.cpp:388
- msgid ""
--"<h2>Feeds tree</h2>Here you can browse tree of feeds. You can also add feeds or "
--"feed groups (folders) using right-click menu, or reorganize them using drag and "
--"drop."
-+"<h2>Feeds tree</h2>Here you can browse tree of feeds. You can also add feeds "
-+"or feed groups (folders) using right-click menu, or reorganize them using "
-+"drag and drop."
- msgstr ""
--"<h2>feed 樹狀圖</h2> 您可以瀏覽 feed 的樹狀圖。您也可以用滑鼠右鍵來新增 feed 或 feed 群組（資料夾），或是用拖放來重組。"
-+"<h2>feed 樹狀圖</h2> 您可以瀏覽 feed 的樹狀圖。您也可以用滑鼠右鍵來新增 feed "
-+"或 feed 群組（資料夾），或是用拖放來重組。"
- 
- #: frame.cpp:178
- msgid "Loading..."
--msgstr "載入中..."
-+msgstr "載入中…"
- 
- #: frame.cpp:187
- msgid "Loading canceled"
-@@ -811,16 +819,13 @@
- 
- #: mainwindow.cpp:268
- msgid ""
--"<qt>"
--"<p>Closing the main window will keep Akregator running in the system tray. Use "
--"'Quit' from the 'File' menu to quit the application.</p>"
--"<p>"
--"<center><img source=\"systray_shot\"></center></p></qt>"
-+"<qt><p>Closing the main window will keep Akregator running in the system "
-+"tray. Use 'Quit' from the 'File' menu to quit the application.</"
-+"p><p><center><img source=\"systray_shot\"></center></p></qt>"
- msgstr ""
--"<qt>"
--"<p>關閉主視窗後，Akregator 還是會在系統匣內繼續運作。要離開請從「檔案」選單中選擇「離開」。</p> "
--"<p>"
--"<center><img source=\"systray_shot\"></center></p></qt>"
-+"<qt><p>關閉主視窗後，Akregator 還是會在系統匣內繼續運作。要離開請從「檔案」選"
-+"單中選擇「離開」。</p> <p><center><img source=\"systray_shot\"></center></"
-+"p></qt>"
- 
- #: mainwindow.cpp:268
- msgid "Docking in System Tray"
-@@ -866,11 +871,11 @@
- 
- #: pluginmanager.cpp:93
- msgid ""
--"<p>KLibLoader could not load the plugin:"
--"<br/><i>%1</i></p>"
--"<p>Error message:"
-+"<p>KLibLoader could not load the plugin:<br/><i>%1</i></p><p>Error message:"
- "<br/><i>%2</i></p>"
--msgstr "<p>KLibLoader 無法載入外掛程式：<br /><i>%1</i></p> <p>錯誤訊息：<br /><i>%2</i></p>"
-+msgstr ""
-+"<p>KLibLoader 無法載入外掛程式：<br /><i>%1</i></p> <p>錯誤訊息：<br /><i>%"
-+"2</i></p>"
- 
- #: pluginmanager.cpp:170
- msgid "Name"
-@@ -1131,7 +1136,7 @@
- #: rc.cpp:144 rc.cpp:567
- #, no-c-format
- msgid "&Configure..."
--msgstr "設定(&C)..."
-+msgstr "設定(&C)…"
- 
- #. i18n: file settings_advancedbase.ui line 62
- #: rc.cpp:147 rc.cpp:570
-@@ -1555,7 +1560,9 @@
- msgid ""
- "Use the KDE-wide HTML cache settings when downloading feeds, to avoid "
- "unnecessary traffic. Disable only when necessary."
--msgstr "下載 feed 時使用 KDE 的 HTML 快取設定，避免不必要的網路交通。只在需要的時候才關閉。"
-+msgstr ""
-+"下載 feed 時使用 KDE 的 HTML 快取設定，避免不必要的網路交通。只在需要的時候才"
-+"關閉。"
- 
- #. i18n: file akregator.kcfg line 108
- #: rc.cpp:405 rc.cpp:912
-@@ -1823,4 +1830,4 @@
- 
- #: viewer.cpp:80
- msgid "&Save Link As..."
--msgstr "另存連結(&S)..."
-+msgstr "另存連結(&S)…"
-diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdepim/kabc2mutt.po kde-i18n-zh_TW-3.5.10/messages/kdepim/kabc2mutt.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdepim/kabc2mutt.po	2006-07-22 10:04:31.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdepim/kabc2mutt.po	2011-11-11 15:45:17.000000000 +0100
-@@ -7,8 +7,7 @@
- "Project-Id-Version: kabc2mutt\n"
- "POT-Creation-Date: 2005-04-12 18:18+0200\n"
- "PO-Revision-Date: 2006-03-01 18:31+0800\n"
--"Last-Translator: Frank Weng (a.k.a. Franklin) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Traditional Chinese <zh_l10n@linux.org.tw>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
-@@ -33,9 +32,11 @@
- 
- #: main.cpp:36
- msgid ""
--"Default format is 'alias'. 'query' returns email<tab>name<tab>"
--", as needed by mutt's query_command"
--msgstr "預設格式為 'alias'。'query' 會傳回 mutt 的 query_command 所需要的：地址<tab>名稱<tab>"
-+"Default format is 'alias'. 'query' returns email<tab>name<tab>, as needed by "
-+"mutt's query_command"
-+msgstr ""
-+"預設格式為 'alias'。'query' 會傳回 mutt 的 query_command 所需要的：地址<tab>"
-+"名稱<tab>"
- 
- #: main.cpp:37
- msgid "Default key format is 'JohDoe', this option turns it into 'jdoe'"
-diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdepim/kabc_slox.po kde-i18n-zh_TW-3.5.10/messages/kdepim/kabc_slox.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdepim/kabc_slox.po	2006-07-22 10:04:31.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdepim/kabc_slox.po	2011-11-11 15:45:17.000000000 +0100
-@@ -6,8 +6,7 @@
- "Project-Id-Version: kabc_slox\n"
- "POT-Creation-Date: 2006-05-17 04:02+0200\n"
- "PO-Revision-Date: 2006-03-01 18:35+0800\n"
--"Last-Translator: Frank Weng (a.k.a. Franklin) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Traditional Chinese <zh_l10n@linux.org.tw>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
-@@ -55,7 +54,7 @@
- 
- #: kabcresourcesloxconfig.cpp:70
- msgid "Select Folder..."
--msgstr "選擇資料夾..."
-+msgstr "選擇資料夾…"
- 
- #: kcalresourceslox.cpp:178
- msgid "Non-http protocol: '%1'"
-@@ -91,11 +90,11 @@
- 
- #: kcalresourcesloxconfig.cpp:73
- msgid "Calendar Folder..."
--msgstr "行事曆資料夾..."
-+msgstr "行事曆資料夾…"
- 
- #: kcalresourcesloxconfig.cpp:77
- msgid "Task Folder..."
--msgstr "事件資料夾..."
-+msgstr "事件資料夾…"
- 
- #. i18n: file kresources_kabc_slox.kcfg line 10
- #: rc.cpp:3 rc.cpp:21
-diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdepim/kaddressbook.po kde-i18n-zh_TW-3.5.10/messages/kdepim/kaddressbook.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdepim/kaddressbook.po	2008-08-19 20:43:18.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdepim/kaddressbook.po	2011-11-11 15:45:17.000000000 +0100
-@@ -11,7 +11,7 @@
- "Project-Id-Version: kaddressbook\n"
- "POT-Creation-Date: 2008-08-19 01:19+0200\n"
- "PO-Revision-Date: 2008-03-05 08:47+0800\n"
--"Last-Translator: Franklin Weng <franklin at goodhorse dot idv dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Chinese Traditional <zh-l10n@linux.org.tw>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
-@@ -44,7 +44,7 @@
- 
- #: kaddressbook_options.h:38
- msgid "Import the given vCard"
--msgstr "匯入 vCard..."
-+msgstr "匯入 vCard…"
- 
- #: typecombo.h:94
- msgid ""
-@@ -63,14 +63,14 @@
- "_: EMAIL OF TRANSLATORS\n"
- "Your emails"
- msgstr ""
--"hychan@glink.net.hk,pesder.liao@msa.hinet.net,franklin at goodhorse dot idv dot "
--"tw"
-+"hychan@glink.net.hk,pesder.liao@msa.hinet.net,franklin at goodhorse dot idv "
-+"dot tw"
- 
- #: addresseditwidget.cpp:100
- msgid ""
- "_: street/postal\n"
- "&Edit Addresses..."
--msgstr "編輯地址(&E)..."
-+msgstr "編輯地址(&E)…"
- 
- #: addresseditwidget.cpp:262
- msgid ""
-@@ -116,7 +116,7 @@
- 
- #: addresseditwidget.cpp:318
- msgid "Edit Label..."
--msgstr "編輯標籤..."
-+msgstr "編輯標籤…"
- 
- #: addresseditwidget.cpp:327
- msgid ""
-@@ -126,11 +126,11 @@
- 
- #: addresseditwidget.cpp:337
- msgid "New..."
--msgstr "新增..."
-+msgstr "新增…"
- 
- #: addresseditwidget.cpp:343
- msgid "Change Type..."
--msgstr "更改類型..."
-+msgstr "更改類型…"
- 
- #: addresseditwidget.cpp:508
- msgid "Afghanistan"
-@@ -898,7 +898,7 @@
- 
- #: addresseditwidget.cpp:575
- msgid "Taiwan"
--msgstr "台灣"
-+msgstr "中華民國（臺灣）"
- 
- #: addresseditwidget.cpp:576
- msgid "Tajikistan"
-@@ -1042,7 +1042,7 @@
- 
- #: addresseeeditorwidget.cpp:165
- msgid "Edit Name..."
--msgstr "編輯姓名..."
-+msgstr "編輯姓名…"
- 
- #: addresseeeditorwidget.cpp:166
- msgid "Edit the contact's name"
-@@ -1076,7 +1076,7 @@
- 
- #: addresseeeditorwidget.cpp:292 kabcore.cpp:1356
- msgid "Select Categories..."
--msgstr "選擇類別..."
-+msgstr "選擇類別…"
- 
- #: addresseeeditorwidget.cpp:308
- msgid "&General"
-@@ -1214,11 +1214,11 @@
- 
- #: customfieldswidget.cpp:466
- msgid "Add Field..."
--msgstr "新增欄位..."
-+msgstr "新增欄位…"
- 
- #: customfieldswidget.cpp:469
- msgid "Remove Field..."
--msgstr "移除欄位..."
-+msgstr "移除欄位…"
- 
- #: distributionlisteditor.cpp:161
- msgid "Edit Distribution List"
-@@ -1254,10 +1254,7 @@
- #: distributionlistentryview.cpp:109
- msgid ""
- "_: Formatted name, role, organization\n"
--"<qt>"
--"<h2>%1</h2>"
--"<p>%2"
--"<br/>%3</p></qt>"
-+"<qt><h2>%1</h2><p>%2<br/>%3</p></qt>"
- msgstr "<qt><h2>%1</h2><p>%2<br/>%3</p></qt>"
- 
- #: distributionlistentryview.cpp:112
-@@ -1279,8 +1276,8 @@
- 
- #: distributionlistpicker.cpp:115
- msgid ""
--"A distribution list with the the name %1 already exists. Please choose another "
--"name"
-+"A distribution list with the the name %1 already exists. Please choose "
-+"another name"
- msgstr "有相同名稱 %1 的分派清單存在，請使用其他名稱。"
- 
- #: distributionlistpicker.cpp:115
-@@ -1293,7 +1290,7 @@
- 
- #: emaileditwidget.cpp:107
- msgid "Edit Email Addresses..."
--msgstr "編輯電子郵件位址..."
-+msgstr "編輯電子郵件位址…"
- 
- #: emaileditwidget.cpp:176
- msgid "Edit Email Addresses"
-@@ -1301,11 +1298,11 @@
- 
- #: emaileditwidget.cpp:194 keywidget.cpp:53
- msgid "Add..."
--msgstr "新增..."
-+msgstr "新增…"
- 
- #: emaileditwidget.cpp:198 features/distributionlistngwidget.cpp:177
- msgid "Edit..."
--msgstr "編輯..."
-+msgstr "編輯…"
- 
- #: emaileditwidget.cpp:206
- msgid "Set Standard"
-@@ -1354,11 +1351,11 @@
- 
- #: filtereditdialog.cpp:269
- msgid "&Add..."
--msgstr "新增(&A)..."
-+msgstr "新增(&A)…"
- 
- #: filtereditdialog.cpp:270
- msgid "&Edit..."
--msgstr "編輯(&E)..."
-+msgstr "編輯(&E)…"
- 
- #: filterselectionwidget.cpp:37
- msgid "Filter:"
-@@ -1382,7 +1379,7 @@
- 
- #: geowidget.cpp:83
- msgid "Edit Geo Data..."
--msgstr "編輯 GEO 資料..."
-+msgstr "編輯 GEO 資料…"
- 
- #: geowidget.cpp:161
- msgid "Geo Data Input"
-@@ -1430,7 +1427,7 @@
- 
- #: imeditwidget.cpp:63
- msgid "Edit IM Addresses..."
--msgstr "編輯 IM 位址..."
-+msgstr "編輯 IM 位址…"
- 
- #: incsearchwidget.cpp:53
- msgid "Search:"
-@@ -1438,11 +1435,12 @@
- 
- #: incsearchwidget.cpp:59
- msgid ""
--"The incremental search"
--"<p>Enter some text here will start the search for the contact, which matches "
--"the search pattern best. The part of the contact, which will be used for "
--"matching, depends on the field selection."
--msgstr "漸進式搜尋（incremental search） <p>在這裡輸入一些文字，並開始根據選擇的欄位比對找尋最符合的聯絡人。"
-+"The incremental search<p>Enter some text here will start the search for the "
-+"contact, which matches the search pattern best. The part of the contact, "
-+"which will be used for matching, depends on the field selection."
-+msgstr ""
-+"漸進式搜尋（incremental search） <p>在這裡輸入一些文字，並開始根據選擇的欄位"
-+"比對找尋最符合的聯絡人。"
- 
- #: incsearchwidget.cpp:63
- msgid ""
-@@ -1596,8 +1594,8 @@
- 
- #: kabcore.cpp:970
- msgid ""
--"Your KDE installation is missing LDAP support, please ask your administrator or "
--"distributor for more information."
-+"Your KDE installation is missing LDAP support, please ask your administrator "
-+"or distributor for more information."
- msgstr "您的 KDE 沒有支援 LDAP，請與您的系統管理員聯絡。"
- 
- #: kabcore.cpp:972
-@@ -1618,7 +1616,7 @@
- 
- #: kabcore.cpp:1258
- msgid "&Send Email to Contact..."
--msgstr "送出電子郵件給聯絡人(&S)..."
-+msgstr "送出電子郵件給聯絡人(&S)…"
- 
- #: kabcore.cpp:1261
- msgid "Send a mail to all selected contacts."
-@@ -1634,29 +1632,27 @@
- 
- #: kabcore.cpp:1268
- msgid "&New Contact..."
--msgstr "新增聯絡人(&N)..."
-+msgstr "新增聯絡人(&N)…"
- 
- #: kabcore.cpp:1270
- msgid ""
--"Create a new contact"
--"<p>You will be presented with a dialog where you can add all data about a "
--"person, including addresses and phone numbers."
-+"Create a new contact<p>You will be presented with a dialog where you can add "
-+"all data about a person, including addresses and phone numbers."
- msgstr "新增聯絡人<p>您可以新增聯絡人的資料，包括電子郵件地址與電話號碼等等。"
- 
- #: kabcore.cpp:1272
- msgid "&New Distribution List..."
--msgstr "新增分派清單(&N)..."
-+msgstr "新增分派清單(&N)…"
- 
- #: kabcore.cpp:1274
- msgid ""
--"Create a new distribution list"
--"<p>You will be presented with a dialog where you can create a new distribution "
--"list."
-+"Create a new distribution list<p>You will be presented with a dialog where "
-+"you can create a new distribution list."
- msgstr "建立新分派清單 <p>會有一個對話框讓您新增分派清單。"
- 
- #: kabcore.cpp:1276
- msgid "Send &Contact..."
--msgstr "送出聯絡人(&C)..."
-+msgstr "送出聯絡人(&C)…"
- 
- #: kabcore.cpp:1279
- msgid "Send a mail with the selected contact as attachment."
-@@ -1664,7 +1660,7 @@
- 
- #: kabcore.cpp:1281
- msgid "Chat &With..."
--msgstr "聊天(&W)..."
-+msgstr "聊天(&W)…"
- 
- #: kabcore.cpp:1284
- msgid "Start a chat with the selected contact."
-@@ -1672,13 +1668,12 @@
- 
- #: kabcore.cpp:1286
- msgid "&Edit Contact..."
--msgstr "編輯聯絡人(&E)..."
-+msgstr "編輯聯絡人(&E)…"
- 
- #: kabcore.cpp:1289
- msgid ""
--"Edit a contact"
--"<p>You will be presented with a dialog where you can change all data about a "
--"person, including addresses and phone numbers."
-+"Edit a contact<p>You will be presented with a dialog where you can change "
-+"all data about a person, including addresses and phone numbers."
- msgstr "編輯聯絡人<p>您可以修改聯絡人的資料。"
- 
- #: kabcore.cpp:1291
-@@ -1713,18 +1708,18 @@
- 
- #: kabcore.cpp:1313
- msgid "&Copy Contact To..."
--msgstr "複製聯絡人到(&C)..."
-+msgstr "複製聯絡人到(&C)…"
- 
- #: kabcore.cpp:1316
- msgid ""
--"Store a contact in a different Addressbook"
--"<p>You will be presented with a dialog where you can select a new storage place "
--"for this contact."
--msgstr "儲存聯絡人於不同的通訊錄中<p>您可以選擇新的通訊錄來儲存此聯絡人的資料。"
-+"Store a contact in a different Addressbook<p>You will be presented with a "
-+"dialog where you can select a new storage place for this contact."
-+msgstr ""
-+"儲存聯絡人於不同的通訊錄中<p>您可以選擇新的通訊錄來儲存此聯絡人的資料。"
- 
- #: kabcore.cpp:1319
- msgid "M&ove Contact To..."
--msgstr "移動聯絡人到(&O)..."
-+msgstr "移動聯絡人到(&O)…"
- 
- #: kabcore.cpp:1325
- msgid "Show Jump Bar"
-@@ -1752,7 +1747,7 @@
- 
- #: kabcore.cpp:1338
- msgid "&Configure Address Book..."
--msgstr "設定通訊錄(&C)..."
-+msgstr "設定通訊錄(&C)…"
- 
- #: kabcore.cpp:1344
- msgid ""
-@@ -1762,14 +1757,15 @@
- 
- #: kabcore.cpp:1347
- msgid "&Lookup Addresses in LDAP Directory..."
--msgstr "查詢 LDAP 目錄中的地址(&L)..."
-+msgstr "查詢 LDAP 目錄中的地址(&L)…"
- 
- #: kabcore.cpp:1349
- msgid ""
--"Search for contacts on a LDAP server"
--"<p>You will be presented with a dialog, where you can search for contacts and "
--"select the ones you want to add to your local address book."
--msgstr "查詢 LDAP 伺服器中的聯絡人<p>您可以尋找並選擇要將哪些聯絡人加入通訊錄中。"
-+"Search for contacts on a LDAP server<p>You will be presented with a dialog, "
-+"where you can search for contacts and select the ones you want to add to "
-+"your local address book."
-+msgstr ""
-+"查詢 LDAP 伺服器中的聯絡人<p>您可以尋找並選擇要將哪些聯絡人加入通訊錄中。"
- 
- #: kabcore.cpp:1351
- msgid "Set as Personal Contact Data"
-@@ -1777,10 +1773,12 @@
- 
- #: kabcore.cpp:1354
- msgid ""
--"Set the personal contact"
--"<p>The data of this contact will be used in many other KDE applications, so you "
--"do not have to input your personal data several times."
--msgstr "設定成個人資料<p>這個聯絡人的資料會設定成您的個人資料，這樣在其他 KDE 的應用程式中就不必再重新輸入。"
-+"Set the personal contact<p>The data of this contact will be used in many "
-+"other KDE applications, so you do not have to input your personal data "
-+"several times."
-+msgstr ""
-+"設定成個人資料<p>這個聯絡人的資料會設定成您的個人資料，這樣在其他 KDE 的應用"
-+"程式中就不必再重新輸入。"
- 
- #: kabcore.cpp:1359
- msgid "Set the categories for all selected contacts."
-@@ -1834,7 +1832,7 @@
- 
- #: keywidget.cpp:60
- msgid "Export..."
--msgstr "匯出..."
-+msgstr "匯出…"
- 
- #: keywidget.cpp:108
- msgid "Key Type"
-@@ -1973,7 +1971,7 @@
- 
- #: ldapsearchdialog.cpp:219
- msgid "Add to Distribution List..."
--msgstr "新增到分派清單..."
-+msgstr "新增到分派清單…"
- 
- #: ldapsearchdialog.cpp:262
- msgid ""
-@@ -2112,7 +2110,7 @@
- 
- #: phoneeditwidget.cpp:92
- msgid "Other..."
--msgstr "其他..."
-+msgstr "其他…"
- 
- #: phoneeditwidget.cpp:295
- msgid "Edit Phone Number"
-@@ -2209,8 +2207,8 @@
- #, no-c-format
- msgid ""
- "_: Instant messaging\n"
--"The IM Address that is set as the standard is the address that is shown in main "
--"editor window."
-+"The IM Address that is set as the standard is the address that is shown in "
-+"main editor window."
- msgstr "設定成標準的 IM 位址會顯示在主編輯視窗中。"
- 
- #. i18n: file editors/imeditorbase.ui line 58
-@@ -2218,12 +2216,12 @@
- #, no-c-format
- msgid ""
- "_: Instant messaging\n"
--"<qt>Only one IM Address can be set as the standard IM Address."
--"<br>The standard IM Address is shown in the main editor window, and other "
--"programs may use this as hint for deciding which IM Address to show.</qt>"
-+"<qt>Only one IM Address can be set as the standard IM Address.<br>The "
-+"standard IM Address is shown in the main editor window, and other programs "
-+"may use this as hint for deciding which IM Address to show.</qt>"
- msgstr ""
--"<qt>只有一個 IM 位址可以設定成標準。"
--"<br>標準的 IM 位址會被顯示在主編輯視窗中，其他的程式也可能用它來決定要顯示哪一個 IM 位址。</qt>"
-+"<qt>只有一個 IM 位址可以設定成標準。<br>標準的 IM 位址會被顯示在主編輯視窗"
-+"中，其他的程式也可能用它來決定要顯示哪一個 IM 位址。</qt>"
- 
- #. i18n: file editors/imeditorbase.ui line 66
- #: rc.cpp:87
-@@ -2239,7 +2237,7 @@
- msgid ""
- "_: Instant messaging\n"
- "&Edit..."
--msgstr "編輯(&E)..."
-+msgstr "編輯(&E)…"
- 
- #. i18n: file editors/imeditorbase.ui line 82
- #: rc.cpp:93
-@@ -2247,7 +2245,7 @@
- msgid ""
- "_: Instant messaging\n"
- "&Add..."
--msgstr "新增(&A)..."
-+msgstr "新增(&A)…"
- 
- #. i18n: file editors/imeditorbase.ui line 88
- #: rc.cpp:96
-@@ -2400,7 +2398,9 @@
- msgid ""
- "If true, the contact list will be placed above the extensions on the left "
- "(distribution list editor etc.) instead of in the middle of the main window"
--msgstr "若為真，聯絡人清單會被放在左方延伸元件（如分派清單編輯器等）的上方，而非放在主視窗的中央。"
-+msgstr ""
-+"若為真，聯絡人清單會被放在左方延伸元件（如分派清單編輯器等）的上方，而非放在"
-+"主視窗的中央。"
- 
- #: soundwidget.cpp:54
- msgid "Play"
-@@ -2459,11 +2459,12 @@
- #: viewconfigurefilterpage.cpp:46
- msgid ""
- "The default filter will be activated whenever this view is displayed. This "
--"feature allows you to configure views that only interact with certain types of "
--"information based on the filter. Once the view is activated, the filter can be "
--"changed at anytime."
-+"feature allows you to configure views that only interact with certain types "
-+"of information based on the filter. Once the view is activated, the filter "
-+"can be changed at anytime."
- msgstr ""
--"預設的過濾器會在每次這個檢視顯示時開始作用。這個功能讓您能以過濾器來設定只跟某些資訊類型有關的檢視。當檢視開始作用後，過濾器可以在任何時間變更。"
-+"預設的過濾器會在每次這個檢視顯示時開始作用。這個功能讓您能以過濾器來設定只跟"
-+"某些資訊類型有關的檢視。當檢視開始作用後，過濾器可以在任何時間變更。"
- 
- #: viewconfigurefilterpage.cpp:57
- msgid "No default filter"
-@@ -2527,18 +2528,18 @@
- 
- #: viewmanager.cpp:571
- msgid "Modify View..."
--msgstr "修改檢視..."
-+msgstr "修改檢視…"
- 
- #: viewmanager.cpp:574
- msgid ""
- "By pressing this button a dialog opens that allows you to modify the view of "
--"the addressbook. There you can add or remove fields that you want to be shown "
--"or hidden in the addressbook like the name for example."
-+"the addressbook. There you can add or remove fields that you want to be "
-+"shown or hidden in the addressbook like the name for example."
- msgstr "按下此按鍵可以讓您修改通訊錄的檢視模式。您可以新增或刪除要顯示的欄位。"
- 
- #: viewmanager.cpp:576
- msgid "Add View..."
--msgstr "新增檢視..."
-+msgstr "新增檢視…"
- 
- #: viewmanager.cpp:579
- msgid ""
-@@ -2567,13 +2568,12 @@
- 
- #: viewmanager.cpp:591
- msgid "Edit &Filters..."
--msgstr "編輯過濾器(&F)..."
-+msgstr "編輯過濾器(&F)…"
- 
- #: viewmanager.cpp:594
- msgid ""
--"Edit the contact filters"
--"<p>You will be presented with a dialog, where you can add, remove and edit "
--"filters."
-+"Edit the contact filters<p>You will be presented with a dialog, where you "
-+"can add, remove and edit filters."
- msgstr "編輯聯絡人過濾器<p>您可以新增、刪除或編輯過濾器。"
- 
- #: xxportmanager.cpp:80
-@@ -2649,8 +2649,8 @@
- 
- #: xxportselectdialog.cpp:211
- msgid ""
--"Only export contacts who are members of a category that is checked on the list "
--"to the left.\n"
-+"Only export contacts who are members of a category that is checked on the "
-+"list to the left.\n"
- "This option is disabled if you have no categories."
- msgstr ""
- "只匯出屬於左邊選出的類別成員的聯絡人。\n"
-@@ -2777,7 +2777,7 @@
- 
- #: features/distributionlistngwidget.cpp:174
- msgid "New Distribution List..."
--msgstr "新增分派清單..."
-+msgstr "新增分派清單…"
- 
- #: features/distributionlistngwidget.cpp:236
- msgid "All Contacts"
-@@ -2785,11 +2785,11 @@
- 
- #: features/distributionlistwidget.cpp:163
- msgid "New List..."
--msgstr "新增清單..."
-+msgstr "新增清單…"
- 
- #: features/distributionlistwidget.cpp:167
- msgid "Rename List..."
--msgstr "重新命名清單..."
-+msgstr "重新命名清單…"
- 
- #: features/distributionlistwidget.cpp:171
- msgid "Remove List"
-@@ -2805,7 +2805,7 @@
- 
- #: features/distributionlistwidget.cpp:196
- msgid "Change Email..."
--msgstr "改變電子郵件..."
-+msgstr "改變電子郵件…"
- 
- #: features/distributionlistwidget.cpp:200
- msgid "Remove Contact"
-@@ -3028,12 +3028,13 @@
- msgid ""
- "Only print contacts matching the selected filter.\n"
- "This option is disabled if you have not defined any filters."
--msgstr "只選擇符合選擇的過濾器的聯絡人。 如果您沒有定義任何過濾器，這個選項會被關閉。"
-+msgstr ""
-+"只選擇符合選擇的過濾器的聯絡人。 如果您沒有定義任何過濾器，這個選項會被關閉。"
- 
- #: printing/selectionpage.cpp:77
- msgid ""
--"Only print contacts who are members of a category that is checked on the list "
--"to the left.\n"
-+"Only print contacts who are members of a category that is checked on the "
-+"list to the left.\n"
- "This option is disabled if you have no categories."
- msgstr ""
- "只匯出屬於左邊選出的類別成員的聯絡人。\n"
-@@ -3123,16 +3124,19 @@
- 
- #: views/configurecardviewdialog.cpp:230
- msgid ""
--"The item margin is the distance (in pixels) between the item edge and the item "
--"data. Most noticeably, incrementing the item margin will add space between the "
--"focus rectangle and the item data."
--msgstr "留白(Margin)是紙張邊緣與要列印資料之間的距離，以像素(pixel)為單位。這個值越大，邊緣留下的空白就越大。"
-+"The item margin is the distance (in pixels) between the item edge and the "
-+"item data. Most noticeably, incrementing the item margin will add space "
-+"between the focus rectangle and the item data."
-+msgstr ""
-+"留白(Margin)是紙張邊緣與要列印資料之間的距離，以像素(pixel)為單位。這個值越"
-+"大，邊緣留下的空白就越大。"
- 
- #: views/configurecardviewdialog.cpp:235
- msgid ""
- "The item spacing decides the distance (in pixels) between the items and "
- "anything else: the view borders, other items or column separators."
--msgstr "填空是指列印項目與邊界、行分隔子或其他列印項目之間的距離，以像素為單位。"
-+msgstr ""
-+"填空是指列印項目與邊界、行分隔子或其他列印項目之間的距離，以像素為單位。"
- 
- #: views/configurecardviewdialog.cpp:239
- msgid "Sets the width of column separators"
-@@ -3172,7 +3176,7 @@
- 
- #: views/configurecardviewdialog.cpp:278 views/configurecardviewdialog.cpp:285
- msgid "Choose..."
--msgstr "選擇..."
-+msgstr "選擇…"
- 
- #: views/configurecardviewdialog.cpp:282
- msgid "&Header font:"
-@@ -3183,7 +3187,9 @@
- "If custom fonts are enabled, you may choose which fonts to use for this view "
- "below. Otherwise the default KDE font will be used, in bold style for the "
- "header and normal style for the data."
--msgstr "如果開啟自定字型，您可以選擇自己想用的字型。否則會套用目前 KDE 設定的字型，標頭會使用粗體字，資料內容則用一般字型。"
-+msgstr ""
-+"如果開啟自定字型，您可以選擇自己想用的字型。否則會套用目前 KDE 設定的字型，標"
-+"頭會使用粗體字，資料內容則用一般字型。"
- 
- #: views/configurecardviewdialog.cpp:304
- msgid "Show &empty fields"
-@@ -3231,8 +3237,7 @@
- msgid ""
- "_: label: value\n"
- "%1: \n"
--msgstr ""
--"%1：\n"
-+msgstr "%1：\n"
- 
- #: views/kaddressbookcardview.cpp:51
- msgid "Card"
-@@ -3256,8 +3261,8 @@
- 
- #: views/kaddressbooktableview.cpp:71
- msgid ""
--"A listing of contacts in a table. Each cell of the table holds a field of the "
--"contact."
-+"A listing of contacts in a table. Each cell of the table holds a field of "
-+"the contact."
- msgstr "在表格中列出聯絡人。表格中的每個儲存格都存有聯絡人的一個欄位。"
- 
- #: views/kaddressbooktableview.cpp:138
-@@ -3266,7 +3271,7 @@
- 
- #: xxport/bookmark_xxport.cpp:39
- msgid "Export Bookmarks Menu..."
--msgstr "匯出書籤目錄..."
-+msgstr "匯出書籤目錄…"
- 
- #: xxport/bookmark_xxport.cpp:51
- msgid "AddressBook"
-@@ -3278,11 +3283,11 @@
- 
- #: xxport/csv_xxport.cpp:42
- msgid "Import CSV List..."
--msgstr "匯入 CSV 清單..."
-+msgstr "匯入 CSV 清單…"
- 
- #: xxport/csv_xxport.cpp:43
- msgid "Export CSV List..."
--msgstr "匯出 CSV 清單..."
-+msgstr "匯出 CSV 清單…"
- 
- #: xxport/csv_xxport.cpp:55 xxport/ldif_xxport.cpp:102
- msgid "<qt>Unable to open file <b>%1</b>.%2.</qt>"
-@@ -3342,20 +3347,12 @@
- 
- #: xxport/csvimportdialog.cpp:424
- msgid ""
--"<ul>"
--"<li>y: year with 2 digits</li>"
--"<li>Y: year with 4 digits</li>"
--"<li>m: month with 1 or 2 digits</li>"
--"<li>M: month with 2 digits</li>"
--"<li>d: day with 1 or 2 digits</li>"
--"<li>D: day with 2 digits</li></ul>"
--msgstr ""
--"<ul> "
--"<li>y：年份，以兩位數顯示</li> "
--"<li>Y：年份，以四位數顯示</li> "
--"<li>m：月份，前面不補零</li> "
--"<li>M：月份，前面補零</li> "
--"<li>d：日期，前面不補零</li> "
-+"<ul><li>y: year with 2 digits</li><li>Y: year with 4 digits</li><li>m: month "
-+"with 1 or 2 digits</li><li>M: month with 2 digits</li><li>d: day with 1 or 2 "
-+"digits</li><li>D: day with 2 digits</li></ul>"
-+msgstr ""
-+"<ul> <li>y：年份，以兩位數顯示</li> <li>Y：年份，以四位數顯示</li> <li>m：月"
-+"份，前面不補零</li> <li>M：月份，前面補零</li> <li>d：日期，前面不補零</li> "
- "<li>D：日期，前面補零</li>"
- 
- #: xxport/csvimportdialog.cpp:432
-@@ -3376,11 +3373,11 @@
- 
- #: xxport/csvimportdialog.cpp:453
- msgid "Apply Template..."
--msgstr "套用樣板..."
-+msgstr "套用樣板…"
- 
- #: xxport/csvimportdialog.cpp:454
- msgid "Save Template..."
--msgstr "儲存樣板..."
-+msgstr "儲存樣板…"
- 
- #: xxport/csvimportdialog.cpp:506
- msgid "Using codec '%1'"
-@@ -3412,7 +3409,7 @@
- 
- #: xxport/csvimportdialog.cpp:785
- msgid "You have to assign at least one column."
--msgstr "您至少要指定一行"
-+msgstr "您至少要指定一列"
- 
- #: xxport/csvimportdialog.cpp:813
- msgid "Template Selection"
-@@ -3436,7 +3433,7 @@
- 
- #: xxport/eudora_xxport.cpp:44
- msgid "Import Eudora Addressbook..."
--msgstr "匯入 Eudora 通訊錄..."
-+msgstr "匯入 Eudora 通訊錄…"
- 
- #: xxport/eudora_xxport.cpp:50
- msgid "Eudora Light Addressbook (*.txt)"
-@@ -3444,11 +3441,11 @@
- 
- #: xxport/gnokii_xxport.cpp:85
- msgid "Import From Mobile Phone..."
--msgstr "從手機匯入..."
-+msgstr "從手機匯入…"
- 
- #: xxport/gnokii_xxport.cpp:86
- msgid "Export to Mobile Phone..."
--msgstr "匯出到手機..."
-+msgstr "匯出到手機…"
- 
- #: xxport/gnokii_xxport.cpp:134 xxport/gnokii_xxport.cpp:824
- msgid "Failed to initialize the gnokii library."
-@@ -3456,23 +3453,14 @@
- 
- #: xxport/gnokii_xxport.cpp:140 xxport/gnokii_xxport.cpp:853
- msgid ""
--"<qt>"
--"<center>Mobile Phone interface initialization failed."
--"<br>"
--"<br>The returned error message was:"
--"<br><b>%1</b>"
--"<br>"
--"<br>You might try to run \"gnokii --identify\" on the command line to check any "
--"cable/transport issues and to verify if your gnokii configuration is "
--"correct.</center></qt>"
--msgstr ""
--"<qt> "
--"<center>手機介面初始化失敗。 "
--"<br> "
--"<br>回報的錯誤為： "
--"<br><b>%1</b> "
--"<br> "
--"<br>您可能要試試執行 `gnokii --identify` 並確定傳輸線是否有問題，然後檢查您的 gnokii 設定是否正確。</center></qt>"
-+"<qt><center>Mobile Phone interface initialization failed.<br><br>The "
-+"returned error message was:<br><b>%1</b><br><br>You might try to run "
-+"\"gnokii --identify\" on the command line to check any cable/transport "
-+"issues and to verify if your gnokii configuration is correct.</center></qt>"
-+msgstr ""
-+"<qt> <center>手機介面初始化失敗。 <br> <br>回報的錯誤為： <br><b>%1</b> <br> "
-+"<br>您可能要試試執行 `gnokii --identify` 並確定傳輸線是否有問題，然後檢查您"
-+"的 gnokii 設定是否正確。</center></qt>"
- 
- #: xxport/gnokii_xxport.cpp:179 xxport/gnokii_xxport.cpp:953
- msgid "Mobile Phone information:"
-@@ -3504,23 +3492,21 @@
- 
- #: xxport/gnokii_xxport.cpp:211 xxport/gnokii_xxport.cpp:995
- msgid ""
--"<qt>Importing <b>%1</b> contacts from <b>%2</b> of the Mobile Phone."
--"<br>"
--"<br>%3</qt>"
-+"<qt>Importing <b>%1</b> contacts from <b>%2</b> of the Mobile Phone.<br><br>%"
-+"3</qt>"
- msgstr "<qt>從手機 <b>%2</b> 匯入 <b>%1</b> 聯絡人。 <br> <br>%3</qt>"
- 
- #: xxport/gnokii_xxport.cpp:532 xxport/gnokii_xxport.cpp:1327
- msgid ""
--"<qt>Please connect your Mobile Phone to your computer and press <b>Continue</b> "
--"to start importing the personal contacts."
--"<br>"
--"<br>Please note that if your Mobile Phone is not properly connected the "
--"following detection phase might take up to two minutes, during which "
--"KAddressbook will behave unresponsively.</qt>"
--msgstr ""
--"<qt>請將您的手機連結上您的電腦，然後按下<b>繼續</b> 開始匯入聯絡人。 "
--"<br> "
--"<br>請注意，如果您的手機沒有連結好，可能要偵測兩分鐘以上，這段時間 KAddressbook 將沒有任何回應。</qt>"
-+"<qt>Please connect your Mobile Phone to your computer and press <b>Continue</"
-+"b> to start importing the personal contacts.<br><br>Please note that if your "
-+"Mobile Phone is not properly connected the following detection phase might "
-+"take up to two minutes, during which KAddressbook will behave unresponsively."
-+"</qt>"
-+msgstr ""
-+"<qt>請將您的手機連結上您的電腦，然後按下<b>繼續</b> 開始匯入聯絡人。 <br> "
-+"<br>請注意，如果您的手機沒有連結好，可能要偵測兩分鐘以上，這段時間 "
-+"KAddressbook 將沒有任何回應。</qt>"
- 
- #: xxport/gnokii_xxport.cpp:540 xxport/gnokii_xxport.cpp:1335
- msgid "Mobile Phone Import"
-@@ -3529,11 +3515,9 @@
- #: xxport/gnokii_xxport.cpp:541 xxport/gnokii_xxport.cpp:590
- #: xxport/gnokii_xxport.cpp:1336 xxport/gnokii_xxport.cpp:1385
- msgid ""
--"<qt>"
--"<center>Establishing connection to the Mobile Phone."
--"<br>"
--"<br>Please wait...</center></qt>"
--msgstr "<qt> <center>建立與手機的連結中。 <br> <br>請稍候...</center></qt>"
-+"<qt><center>Establishing connection to the Mobile Phone.<br><br>Please "
-+"wait...</center></qt>"
-+msgstr "<qt> <center>建立與手機的連結中。 <br> <br>請稍候…</center></qt>"
- 
- #: xxport/gnokii_xxport.cpp:564 xxport/gnokii_xxport.cpp:1359
- msgid "&Stop Import"
-@@ -3541,16 +3525,15 @@
- 
- #: xxport/gnokii_xxport.cpp:581 xxport/gnokii_xxport.cpp:1376
- msgid ""
--"<qt>Please connect your Mobile Phone to your computer and press <b>Continue</b> "
--"to start exporting the selected personal contacts."
--"<br>"
--"<br>Please note that if your Mobile Phone is not properly connected the "
--"following detection phase might take up to two minutes, during which "
--"KAddressbook will behave unresponsively.</qt>"
--msgstr ""
--"<qt>請將您的手機連結上您的電腦，然後按下<b>繼續</b> 開始匯入聯絡人。 "
--"<br> "
--"<br>請注意，如果您的手機沒有連結好，可能要偵測兩分鐘以上，這段時間 KAddressbook 將沒有任何回應。</qt>"
-+"<qt>Please connect your Mobile Phone to your computer and press <b>Continue</"
-+"b> to start exporting the selected personal contacts.<br><br>Please note "
-+"that if your Mobile Phone is not properly connected the following detection "
-+"phase might take up to two minutes, during which KAddressbook will behave "
-+"unresponsively.</qt>"
-+msgstr ""
-+"<qt>請將您的手機連結上您的電腦，然後按下<b>繼續</b> 開始匯入聯絡人。 <br> "
-+"<br>請注意，如果您的手機沒有連結好，可能要偵測兩分鐘以上，這段時間 "
-+"KAddressbook 將沒有任何回應。</qt>"
- 
- #: xxport/gnokii_xxport.cpp:589 xxport/gnokii_xxport.cpp:773
- #: xxport/gnokii_xxport.cpp:1384 xxport/gnokii_xxport.cpp:1568
-@@ -3559,17 +3542,15 @@
- 
- #: xxport/gnokii_xxport.cpp:645 xxport/gnokii_xxport.cpp:1440
- msgid ""
--"<qt>Do you want the selected contacts to be <b>appended</b> "
--"to the current mobile phonebook or should they <b>replace</b> "
--"all currently existing phonebook entries ?"
--"<br>"
--"<br>Please note, that in case you choose to replace the phonebook entries, "
--"every contact in your phone will be deleted and only the newly exported "
--"contacts will be available from inside your phone.</qt>"
--msgstr ""
--"<qt>您要將選擇的聯絡人<b>加入</b>到手機通訊錄，還是要<b>置換</b>目前手機中存在的資料？ "
--"<br> "
--"<br>請注意，如果您選擇要置換，您手機上所有的聯絡人資料都將被刪除，只有您選擇的聯絡人會被匯出到手機上。</qt>"
-+"<qt>Do you want the selected contacts to be <b>appended</b> to the current "
-+"mobile phonebook or should they <b>replace</b> all currently existing "
-+"phonebook entries ?<br><br>Please note, that in case you choose to replace "
-+"the phonebook entries, every contact in your phone will be deleted and only "
-+"the newly exported contacts will be available from inside your phone.</qt>"
-+msgstr ""
-+"<qt>您要將選擇的聯絡人<b>加入</b>到手機通訊錄，還是要<b>置換</b>目前手機中存"
-+"在的資料？ <br> <br>請注意，如果您選擇要置換，您手機上所有的聯絡人資料都將被"
-+"刪除，只有您選擇的聯絡人會被匯出到手機上。</qt>"
- 
- #: xxport/gnokii_xxport.cpp:651 xxport/gnokii_xxport.cpp:1446
- msgid "Export to Mobile Phone"
-@@ -3590,22 +3571,17 @@
- #: xxport/gnokii_xxport.cpp:661 xxport/gnokii_xxport.cpp:1456
- msgid ""
- "<qt>Exporting <b>%1</b> contacts to the <b>%2</b> of the Mobile Phone."
--"<br>"
--"<br>%3</qt>"
-+"<br><br>%3</qt>"
- msgstr "<qt>正在匯出 <b>%1</b> 個聯絡人到手機 <b>%2</b> <br> <br>%3</qt>"
- 
- #: xxport/gnokii_xxport.cpp:728 xxport/gnokii_xxport.cpp:1523
- msgid ""
--"<qt>"
--"<center>All selected contacts have been sucessfully copied to the Mobile Phone."
--"<br>"
--"<br>Please wait until all remaining orphaned contacts from the Mobile Phone "
--"have been deleted.</center></qt>"
--msgstr ""
--"<qt> "
--"<center>所有選擇的聯絡人都成功複製到手機上了。 "
--"<br> "
--"<br>請稍候，手機正在清除不要的聯絡人資訊。</center></qt>"
-+"<qt><center>All selected contacts have been sucessfully copied to the Mobile "
-+"Phone.<br><br>Please wait until all remaining orphaned contacts from the "
-+"Mobile Phone have been deleted.</center></qt>"
-+msgstr ""
-+"<qt> <center>所有選擇的聯絡人都成功複製到手機上了。 <br> <br>請稍候，手機正在"
-+"清除不要的聯絡人資訊。</center></qt>"
- 
- #: xxport/gnokii_xxport.cpp:733 xxport/gnokii_xxport.cpp:1528
- msgid "&Stop Delete"
-@@ -3617,24 +3593,18 @@
- 
- #: xxport/gnokii_xxport.cpp:764 xxport/gnokii_xxport.cpp:1559
- msgid ""
--"<qt>The following contacts could not be exported to the Mobile Phone. Possible "
--"Reasons for this problem could be:"
--"<br>"
--"<ul>"
--"<li>The contacts contain more information per entry than the phone can "
--"store.</li>"
--"<li>Your phone does not allow to store multiple addresses, emails, homepages, "
--"...</li>"
--"<li>other storage size related problems.</li></ul>To avoid those kind of "
--"problems in the future please reduce the amount of different fields in the "
--"above contacts.</qt>"
--msgstr ""
--"<qt>以下的聯絡人無法匯出到手機。可能的原因為： "
--"<br> "
--"<ul> "
--"<li>聯絡人包含了太多資料，手機無法儲存。</li> "
--"<li>您的手機不允許在一筆資料中儲存多個地址、電子郵件地址與網頁等。</li> "
--"<li>儲存空間的問題</li> </ul> 要避免這些問題，請減少聯絡人資料。</qt>"
-+"<qt>The following contacts could not be exported to the Mobile Phone. "
-+"Possible Reasons for this problem could be:<br><ul><li>The contacts contain "
-+"more information per entry than the phone can store.</li><li>Your phone does "
-+"not allow to store multiple addresses, emails, homepages, ...</li><li>other "
-+"storage size related problems.</li></ul>To avoid those kind of problems in "
-+"the future please reduce the amount of different fields in the above "
-+"contacts.</qt>"
-+msgstr ""
-+"<qt>以下的聯絡人無法匯出到手機。可能的原因為： <br> <ul> <li>聯絡人包含了太多"
-+"資料，手機無法儲存。</li> <li>您的手機不允許在一筆資料中儲存多個地址、電子郵"
-+"件地址與網頁等。</li> <li>儲存空間的問題</li> </ul> 要避免這些問題，請減少聯"
-+"絡人資料。</qt>"
- 
- #: xxport/gnokii_xxport.cpp:827
- msgid "Gnokii is not yet configured."
-@@ -3647,7 +3617,8 @@
- "permissions in the /var/lock directory and try again."
- msgstr ""
- "Gnokii 回報一個「鎖定檔錯誤」(Lock file error)。\n"
--"請離開所有正在執行中的 gnokii 應用程式，並確定您是否有 /var/lock 的寫入權限，然後再試一次。"
-+"請離開所有正在執行中的 gnokii 應用程式，並確定您是否有 /var/lock 的寫入權限，"
-+"然後再試一次。"
- 
- #: xxport/gnokii_xxport.cpp:868
- msgid "Unknown"
-@@ -3675,7 +3646,7 @@
- 
- #: xxport/kde2_xxport.cpp:45
- msgid "Import KDE 2 Addressbook..."
--msgstr "匯入 KDE 2 通訊錄..."
-+msgstr "匯入 KDE 2 通訊錄…"
- 
- #: xxport/kde2_xxport.cpp:52
- msgid "<qt>Could not find a KDE 2 address book <b>%1</b>.</qt>"
-@@ -3691,11 +3662,11 @@
- 
- #: xxport/ldif_xxport.cpp:56
- msgid "Import LDIF Addressbook..."
--msgstr "匯入 LDIF 通訊錄..."
-+msgstr "匯入 LDIF 通訊錄…"
- 
- #: xxport/ldif_xxport.cpp:57
- msgid "Export LDIF Addressbook..."
--msgstr "匯出 LDIF 通訊錄..."
-+msgstr "匯出 LDIF 通訊錄…"
- 
- #: xxport/ldif_xxport.cpp:73 xxport/opera_xxport.cpp:57
- msgid "<qt>Unable to open <b>%1</b> for reading.</qt>"
-@@ -3703,7 +3674,7 @@
- 
- #: xxport/opera_xxport.cpp:44
- msgid "Import Opera Addressbook..."
--msgstr "匯入 Opera 通訊錄..."
-+msgstr "匯入 Opera 通訊錄…"
- 
- #: xxport/pab_pablib.cpp:28 xxport/pab_xxport.cpp:46
- msgid "Import MS Exchange Personal Address Book (.PAB)"
-@@ -3727,19 +3698,20 @@
- 
- #: xxport/vcard_xxport.cpp:99
- msgid "Import vCard..."
--msgstr "匯入 vCard..."
-+msgstr "匯入 vCard…"
- 
- #: xxport/vcard_xxport.cpp:100
- msgid "Export vCard 2.1..."
--msgstr "匯出 vCard 2.1..."
-+msgstr "匯出 vCard 2.1…"
- 
- #: xxport/vcard_xxport.cpp:101
- msgid "Export vCard 3.0..."
--msgstr "匯出 vCard 3.0..."
-+msgstr "匯出 vCard 3.0…"
- 
- #: xxport/vcard_xxport.cpp:125
- msgid ""
--"You have selected a list of contacts, shall they be exported to several files?"
-+"You have selected a list of contacts, shall they be exported to several "
-+"files?"
- msgstr "您已經選擇聯絡人清單。要將他們匯出到不同的檔案嗎？"
- 
- #: xxport/vcard_xxport.cpp:128
-@@ -3786,7 +3758,7 @@
- 
- #: xxport/vcard_xxport.cpp:420
- msgid "Import All..."
--msgstr "全部匯入..."
-+msgstr "全部匯入…"
- 
- #: xxport/vcard_xxport.cpp:475
- msgid "Select vCard Fields"
-@@ -3811,3 +3783,7 @@
- #: xxport/vcard_xxport.cpp:494
- msgid "Encryption keys"
- msgstr "加密金鑰"
-+
-+#, fuzzy
-+#~ msgid "Show Extension"
-+#~ msgstr "Erweiterung anzeigen"
-diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdepim/kalarm.po kde-i18n-zh_TW-3.5.10/messages/kdepim/kalarm.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdepim/kalarm.po	2008-08-19 20:43:18.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdepim/kalarm.po	2011-11-11 15:45:17.000000000 +0100
-@@ -12,7 +12,7 @@
- "Project-Id-Version: kalarm\n"
- "POT-Creation-Date: 2008-08-19 01:19+0200\n"
- "PO-Revision-Date: 2008-02-19 08:26+0800\n"
--"Last-Translator: Franklin Weng <franklin at goodhorse dot idv dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Chinese Traditional <zh-l10n@linux.org.tw>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
-@@ -202,8 +202,8 @@
- 
- #: alarmlistview.cpp:339
- msgid ""
--"Alarm message text, URL of text file to display, command to execute, or email "
--"subject line"
-+"Alarm message text, URL of text file to display, command to execute, or "
-+"email subject line"
- msgstr "鬧鐘訊息文字，或要顯示的網址，或要執行的指令，或要送出電子郵件的標題。"
- 
- #: alarmlistview.cpp:340
-@@ -241,7 +241,7 @@
- 
- #: alarmtimewidget.cpp:47
- msgid "Time from no&w:"
--msgstr "現在的時間 (&W)："
-+msgstr "現在的時間(&W)："
- 
- #: alarmtimewidget.cpp:50
- msgid ""
-@@ -260,11 +260,11 @@
- 
- #: alarmtimewidget.cpp:95
- msgid "&Defer to date/time:"
--msgstr "延遲日期/時間 (&D)："
-+msgstr "延遲日期/時間(&D)："
- 
- #: alarmtimewidget.cpp:95
- msgid "At &date/time:"
--msgstr "指定日期/時間 (&D)："
-+msgstr "指定日期/時間(&D)："
- 
- #: alarmtimewidget.cpp:98
- msgid "Reschedule the alarm to the specified date and time."
-@@ -284,7 +284,7 @@
- 
- #: alarmtimewidget.cpp:130 editdlg.cpp:327
- msgid "An&y time"
--msgstr "任何時間 (&Y)"
-+msgstr "任何時間(&Y)"
- 
- #: alarmtimewidget.cpp:133
- msgid "Schedule the alarm for any time during the day"
-@@ -292,7 +292,7 @@
- 
- #: alarmtimewidget.cpp:137
- msgid "Defer for time &interval:"
--msgstr "延遲的時間間隔 (&I)："
-+msgstr "延遲的時間間隔(&I)："
- 
- #: alarmtimewidget.cpp:141
- msgid "Reschedule the alarm for the specified time interval after now."
-@@ -336,8 +336,8 @@
- 
- #: birthdaydlg.cpp:96
- msgid ""
--"Enter text to appear before the person's name in the alarm message, including "
--"any necessary trailing spaces."
-+"Enter text to appear before the person's name in the alarm message, "
-+"including any necessary trailing spaces."
- msgstr "輸入在鬧鐘訊息中，要顯示人名之前的字串，包含需要的空格。"
- 
- #: birthdaydlg.cpp:99
-@@ -390,13 +390,13 @@
- 
- #: birthdaydlg.cpp:142
- msgid ""
--"Enter the number of days before each birthday to display a reminder. This is in "
--"addition to the alarm which is displayed on the birthday."
-+"Enter the number of days before each birthday to display a reminder. This is "
-+"in addition to the alarm which is displayed on the birthday."
- msgstr "輸入您希望在生日前多久顯示提醒訊息。"
- 
- #: birthdaydlg.cpp:160 editdlg.cpp:142
- msgid "Special Actions..."
--msgstr "特殊動作..."
-+msgstr "特殊動作…"
- 
- #: birthdaydlg.cpp:171 recurrenceedit.cpp:172
- msgid "Sub-Repetition"
-@@ -417,7 +417,8 @@
- #: daemon.cpp:223
- msgid ""
- "Cannot enable alarms.\n"
--"Installation or configuration error: Alarm Daemon (%1) version is incompatible."
-+"Installation or configuration error: Alarm Daemon (%1) version is "
-+"incompatible."
- msgstr ""
- "無法啟動鬧鐘。\n"
- "安裝或設定錯誤：鬧鐘守護程式（%1）的版本不相容。"
-@@ -492,7 +493,7 @@
- 
- #: editdlg.cpp:135
- msgid "&Recurrence - [%1]"
--msgstr "循環 (&R)─【%1】"
-+msgstr "循環(&R)─【%1】"
- 
- #: editdlg.cpp:140
- msgid "Confirm acknowledgment"
-@@ -578,7 +579,7 @@
- 
- #: editdlg.cpp:190
- msgid "Load Template..."
--msgstr "載入樣本..."
-+msgstr "載入樣本…"
- 
- #: editdlg.cpp:198
- msgid "Template name:"
-@@ -590,7 +591,7 @@
- 
- #: editdlg.cpp:211
- msgid "&Alarm"
--msgstr "鬧鐘 (&A)"
-+msgstr "鬧鐘(&A)"
- 
- #: editdlg.cpp:230
- msgid "Action"
-@@ -598,7 +599,7 @@
- 
- #: editdlg.cpp:238
- msgid "Te&xt"
--msgstr "文字 (&X)"
-+msgstr "文字(&X)"
- 
- #: editdlg.cpp:241
- msgid "If checked, the alarm will display a text message."
-@@ -611,7 +612,7 @@
- 
- #: editdlg.cpp:254 find.cpp:130
- msgid "Co&mmand"
--msgstr "指令 (&M)"
-+msgstr "指令(&M)"
- 
- #: editdlg.cpp:257
- msgid "If checked, the alarm will execute a shell command."
-@@ -619,7 +620,7 @@
- 
- #: editdlg.cpp:262 find.cpp:135
- msgid "&Email"
--msgstr "電子郵件 (&E)"
-+msgstr "電子郵件(&E)"
- 
- #: editdlg.cpp:265
- msgid "If checked, the alarm will send an email."
-@@ -635,7 +636,7 @@
- 
- #: editdlg.cpp:282
- msgid "C&hange..."
--msgstr "改變 (&C)..."
-+msgstr "改變(&C)…"
- 
- #: editdlg.cpp:285
- msgid "Change the alarm's deferred time, or cancel the deferral"
-@@ -688,7 +689,8 @@
- 
- #: editdlg.cpp:365
- msgid ""
--"Check to additionally display a reminder in advance of the main alarm time(s)."
-+"Check to additionally display a reminder in advance of the main alarm time"
-+"(s)."
- msgstr "勾選此選項以便在主要鬧鐘響鈴時間之前先顯示提醒。"
- 
- #: editdlg.cpp:388
-@@ -753,9 +755,11 @@
- 
- #: editdlg.cpp:538
- msgid ""
--"Check to log the command output to a local file. The output will be appended to "
--"any existing contents of the file."
--msgstr "勾選此選項以便將指令輸出紀錄到檔案中。如果檔案已存在則輸出會被附加到檔案的最尾端。"
-+"Check to log the command output to a local file. The output will be appended "
-+"to any existing contents of the file."
-+msgstr ""
-+"勾選此選項以便將指令輸出紀錄到檔案中。如果檔案已存在則輸出會被附加到檔案的最"
-+"尾端。"
- 
- #: editdlg.cpp:546
- msgid "Check to discard command output."
-@@ -765,7 +769,7 @@
- msgid ""
- "Your email identity, used to identify you as the sender when sending email "
- "alarms."
--msgstr "電子郵件的寄件者身份，用於送出的電子郵件中。"
-+msgstr "電子郵件的寄件者身分，用於送出的電子郵件中。"
- 
- #: editdlg.cpp:591
- msgid ""
-@@ -799,7 +803,7 @@
- 
- #: editdlg.cpp:637
- msgid "Add..."
--msgstr "增加..."
-+msgstr "增加…"
- 
- #: editdlg.cpp:639
- msgid "Add an attachment to the email."
-@@ -807,7 +811,7 @@
- 
- #: editdlg.cpp:642
- msgid "Remo&ve"
--msgstr "移除 (&V)"
-+msgstr "移除(&V)"
- 
- #: editdlg.cpp:644
- msgid "Remove the highlighted attachment from the email."
-@@ -847,8 +851,8 @@
- 
- #: editdlg.cpp:1448
- msgid ""
--"For a repetition within the recurrence, its period must be in units of days or "
--"weeks for a date-only alarm"
-+"For a repetition within the recurrence, its period must be in units of days "
-+"or weeks for a date-only alarm"
- msgstr "在循環裡重覆的鬧鐘，其簡單重覆時間必須以天或周為單位。"
- 
- #: editdlg.cpp:1470
-@@ -861,7 +865,7 @@
- 
- #: editdlg.cpp:1471
- msgid "&Send"
--msgstr "寄出 (&S)"
-+msgstr "寄出(&S)"
- 
- #: editdlg.cpp:1482
- #, c-format
-@@ -992,8 +996,8 @@
- 
- #: find.cpp:112
- msgid ""
--"Check to include expired alarms in the search. This option is only available if "
--"expired alarms are currently being displayed."
-+"Check to include expired alarms in the search. This option is only available "
-+"if expired alarms are currently being displayed."
- msgstr "勾選此項以搜尋已逾時的鬧鐘。只有在顯示中有已逾期的鬧鐘時才能選擇。"
- 
- #: find.cpp:120
-@@ -1050,7 +1054,7 @@
- 
- #: fontcolour.cpp:91
- msgid "Add Co&lor..."
--msgstr "新增顏色 (&L)..."
-+msgstr "新增顏色(&L)…"
- 
- #: fontcolour.cpp:94
- msgid "Choose a new color to add to the color selection list."
-@@ -1058,7 +1062,7 @@
- 
- #: fontcolour.cpp:97
- msgid "&Remove Color"
--msgstr "移除顏色 (&R)"
-+msgstr "移除顏色(&R)"
- 
- #: fontcolour.cpp:101
- msgid ""
-@@ -1077,7 +1081,7 @@
- 
- #: fontcolourbutton.cpp:48
- msgid "Font && Co&lor..."
--msgstr "字型與顏色 (&L)..."
-+msgstr "字型與顏色(&L)…"
- 
- #: fontcolourbutton.cpp:52
- msgid ""
-@@ -1090,8 +1094,8 @@
- 
- #: fontcolourbutton.cpp:63
- msgid ""
--"This sample text illustrates the current font and color settings. You may edit "
--"it to test special characters."
-+"This sample text illustrates the current font and color settings. You may "
-+"edit it to test special characters."
- msgstr "這個範例文字用於顯示目前的字型與顏色設定。您可以用其它特殊字元來測試。"
- 
- #: fontcolourbutton.cpp:100
-@@ -1287,7 +1291,7 @@
- msgid ""
- "Invalid 'From' email address.\n"
- "KMail identity '%1' not found."
--msgstr "找不到 KMail 中設定的身份 %1。"
-+msgstr "找不到 KMail 中設定的身分 %1。"
- 
- #: kamail.cpp:125
- msgid ""
-@@ -1295,14 +1299,14 @@
- "Email identity '%1' has no email address"
- msgstr ""
- "不合法的「寄件人」電子郵件地址。\n"
--"身份 %1 沒有電子郵件地址。"
-+"身分 %1 沒有電子郵件地址。"
- 
- #: kamail.cpp:134
- msgid ""
- "No 'From' email address is configured (no default KMail identity found)\n"
- "Please set it in KMail or in the KAlarm Preferences dialog."
- msgstr ""
--"寄件者尚未設定（找不到 KMail 中預設寄件身份）。\n"
-+"寄件者尚未設定（找不到 KMail 中預設寄件身分）。\n"
- "請在 KMail 中，或是在 KAlarm 「喜好設定」中設定。"
- 
- #: kamail.cpp:137
-@@ -1384,14 +1388,16 @@
- #: latecancel.cpp:48
- msgid ""
- "If checked, the alarm will be canceled if it cannot be triggered within the "
--"specified period after its scheduled time. Possible reasons for not triggering "
--"include your being logged off, X not running, or the alarm daemon not running.\n"
-+"specified period after its scheduled time. Possible reasons for not "
-+"triggering include your being logged off, X not running, or the alarm daemon "
-+"not running.\n"
- "\n"
- "If unchecked, the alarm will be triggered at the first opportunity after its "
- "scheduled time, regardless of how late it is."
- msgstr ""
--"如果開啟此選項，若鬧鐘在排程時間之後的一段指定時間之內尚未被觸發，則此次排程會被取消。有可能是觸發時間使用者並未登入，或是 X "
--"未執行，或是鬧鐘守護程式未執行。\n"
-+"如果開啟此選項，若鬧鐘在排程時間之後的一段指定時間之內尚未被觸發，則此次排程"
-+"會被取消。有可能是觸發時間使用者並未登入，或是 X 未執行，或是鬧鐘守護程式未執"
-+"行。\n"
- "\n"
- "如果關閉此選項，則不管鬧鐘逾時多久，都會在第一個可以響鈴的機會響鈴。"
- 
-@@ -1407,8 +1413,8 @@
- 
- #: latecancel.cpp:83
- msgid ""
--"Automatically close the alarm window after the expiry of the late-cancelation "
--"period"
-+"Automatically close the alarm window after the expiry of the late-"
-+"cancelation period"
- msgstr "在過了延遲取消時間後，自動將鬧鐘的視窗關閉。"
- 
- #: main.cpp:37
-@@ -1473,7 +1479,7 @@
- 
- #: main.cpp:63
- msgid "KMail identity to use as sender of email"
--msgstr "作為寄件者的 KMail 身份"
-+msgstr "作為寄件者的 KMail 身分"
- 
- #: main.cpp:64
- msgid "Trigger or cancel alarm with the specified event ID"
-@@ -1613,11 +1619,11 @@
- 
- #: mainwindow.cpp:329
- msgid "&Templates..."
--msgstr "樣本(&T)..."
-+msgstr "樣本(&T)…"
- 
- #: mainwindow.cpp:330 templatedlg.cpp:61
- msgid "&New..."
--msgstr "新增(&N)..."
-+msgstr "新增(&N)…"
- 
- #: mainwindow.cpp:331
- msgid "New &From Template"
-@@ -1625,15 +1631,15 @@
- 
- #: mainwindow.cpp:332
- msgid "Create Tem&plate..."
--msgstr "產生樣本(&P)..."
-+msgstr "產生樣本(&P)…"
- 
- #: mainwindow.cpp:333
- msgid "&Copy..."
--msgstr "複製(&C)..."
-+msgstr "複製(&C)…"
- 
- #: mainwindow.cpp:334 messagewin.cpp:520 templatedlg.cpp:66
- msgid "&Edit..."
--msgstr "編輯(&E)..."
-+msgstr "編輯(&E)…"
- 
- #: mainwindow.cpp:336
- msgid "Reac&tivate"
-@@ -1657,11 +1663,11 @@
- 
- #: mainwindow.cpp:347
- msgid "Import &Alarms..."
--msgstr "匯入鬧鐘(&A)..."
-+msgstr "匯入鬧鐘(&A)…"
- 
- #: mainwindow.cpp:348
- msgid "Import &Birthdays..."
--msgstr "匯入生日(&B)..."
-+msgstr "匯入生日(&B)…"
- 
- #: mainwindow.cpp:349
- msgid "&Refresh Alarms"
-@@ -1772,7 +1778,7 @@
- 
- #: messagewin.cpp:531
- msgid "&Defer..."
--msgstr "延期(&D)..."
-+msgstr "延期(&D)…"
- 
- #: messagewin.cpp:537
- msgid ""
-@@ -1886,7 +1892,7 @@
- 
- #: messagewin.cpp:1404
- msgid "&Acknowledge"
--msgstr "確認 (&A)"
-+msgstr "確認(&A)"
- 
- #: messagewin.cpp:1449
- msgid "Unable to locate this email in KMail"
-@@ -1930,53 +1936,58 @@
- 
- #: prefdlg.cpp:264
- msgid "&Run only on demand"
--msgstr "只在守護程式模式下執行 (&R)"
-+msgstr "只在守護程式模式下執行(&R)"
- 
- #: prefdlg.cpp:268
- msgid ""
- "Check to run KAlarm only when required.\n"
- "\n"
- "Notes:\n"
--"1. Alarms are displayed even when KAlarm is not running, since alarm monitoring "
--"is done by the alarm daemon.\n"
--"2. With this option selected, the system tray icon can be displayed or hidden "
--"independently of KAlarm."
-+"1. Alarms are displayed even when KAlarm is not running, since alarm "
-+"monitoring is done by the alarm daemon.\n"
-+"2. With this option selected, the system tray icon can be displayed or "
-+"hidden independently of KAlarm."
- msgstr ""
- "勾選此選項的話，只在有需要時執行 KAlarm。\n"
- "\n"
- "注意：\n"
--"1. 即使 KAlarm 沒有在執行中，鬧鐘還是不會被關掉，因為鬧鐘監測是由鬧鐘守護程式來執行。\n"
-+"1. 即使 KAlarm 沒有在執行中，鬧鐘還是不會被關掉，因為鬧鐘監測是由鬧鐘守護程式"
-+"來執行。\n"
- "2. 選取此選項的話，系統匣圖示可以選擇要顯示或隱藏，與 KAlarm 無關。"
- 
- #: prefdlg.cpp:275
- msgid "Run continuously in system &tray"
--msgstr "在系統匣中持續執行 (&T)"
-+msgstr "在系統匣中持續執行(&T)"
- 
- #: prefdlg.cpp:279
- msgid ""
- "Check to run KAlarm continuously in the KDE system tray.\n"
- "\n"
- "Notes:\n"
--"1. With this option selected, closing the system tray icon will quit KAlarm.\n"
--"2. You do not need to select this option in order for alarms to be displayed, "
--"since alarm monitoring is done by the alarm daemon. Running in the system tray "
--"simply provides easy access and a status indication."
-+"1. With this option selected, closing the system tray icon will quit "
-+"KAlarm.\n"
-+"2. You do not need to select this option in order for alarms to be "
-+"displayed, since alarm monitoring is done by the alarm daemon. Running in "
-+"the system tray simply provides easy access and a status indication."
- msgstr ""
- "在 KDE 的系統匣中持續執行。\n"
- "\n"
- "注意：\n"
- "1. 如果選擇此選項，關閉中的系統匣圖示後將會離開 KAlarm。\n"
--"2. 這個選項只是提供簡便的方式來讓使用者瞭解目前鬧鐘的狀態。而實際監測鬧鐘是由鬧鐘守護程式進行。因此不選取這個選項也不會造成鬧鐘被關閉。"
-+"2. 這個選項只是提供簡便的方式來讓使用者瞭解目前鬧鐘的狀態。而實際監測鬧鐘是由"
-+"鬧鐘守護程式進行。因此不選取這個選項也不會造成鬧鐘被關閉。"
- 
- #: prefdlg.cpp:287
- msgid "Disa&ble alarms while not running"
--msgstr "當沒有在執行時關閉鬧鐘 (&B)"
-+msgstr "當沒有在執行時關閉鬧鐘(&B)"
- 
- #: prefdlg.cpp:291
- msgid ""
--"Check to disable alarms whenever KAlarm is not running. Alarms will only appear "
--"while the system tray icon is visible."
--msgstr "勾選此選項的話，當 KAlarm 不再執行時會關閉鬧鐘。當系統匣圖示出現時鬧鐘才會被開啟。"
-+"Check to disable alarms whenever KAlarm is not running. Alarms will only "
-+"appear while the system tray icon is visible."
-+msgstr ""
-+"勾選此選項的話，當 KAlarm 不再執行時會關閉鬧鐘。當系統匣圖示出現時鬧鐘才會被"
-+"開啟。"
- 
- #: prefdlg.cpp:294
- msgid "Warn before &quitting"
-@@ -1988,7 +1999,7 @@
- 
- #: prefdlg.cpp:300 prefdlg.cpp:537
- msgid "Autostart at &login"
--msgstr "在登入時自動啟動 (&L)"
-+msgstr "在登入時自動啟動(&L)"
- 
- #: prefdlg.cpp:307
- msgid "Start alarm monitoring at lo&gin"
-@@ -2008,17 +2019,19 @@
- 
- #: prefdlg.cpp:322
- msgid "&Start of day for date-only alarms:"
--msgstr "一天的開始 (&S)："
-+msgstr "一天的開始(&S)："
- 
- #: prefdlg.cpp:326
- msgid ""
--"The earliest time of day at which a date-only alarm (i.e. an alarm with \"any "
--"time\" specified) will be triggered."
--msgstr "一天最早的時間。對只設定日期的鬧鐘（也就是勾選「任何時間」鬧鐘）而言，將會在這個時間被觸發。"
-+"The earliest time of day at which a date-only alarm (i.e. an alarm with "
-+"\"any time\" specified) will be triggered."
-+msgstr ""
-+"一天最早的時間。對只設定日期的鬧鐘（也就是勾選「任何時間」鬧鐘）而言，將會在"
-+"這個時間被觸發。"
- 
- #: prefdlg.cpp:334
- msgid "Con&firm alarm deletions"
--msgstr "確認鬧鐘刪除 (&F)"
-+msgstr "確認鬧鐘刪除(&F)"
- 
- #: prefdlg.cpp:337
- msgid "Check to be prompted for confirmation each time you delete an alarm."
-@@ -2036,7 +2049,9 @@
- msgid ""
- "Check to store alarms after expiry or deletion (except deleted alarms which "
- "were never triggered)."
--msgstr "勾選此選項的話，鬧鐘在逾時或刪除後仍實際保留著，除非刪除的鬧鐘已確定不會再響鈴。"
-+msgstr ""
-+"勾選此選項的話，鬧鐘在逾時或刪除後仍實際保留著，除非刪除的鬧鐘已確定不會再響"
-+"鈴。"
- 
- #: prefdlg.cpp:356
- msgid "Discard ex&pired alarms after:"
-@@ -2048,9 +2063,11 @@
- 
- #: prefdlg.cpp:367
- msgid ""
--"Uncheck to store expired alarms indefinitely. Check to enter how long expired "
--"alarms should be stored."
--msgstr "如果不勾選此選項，則逾時鬧鐘將被永久保存。勾選此選項的話則可以選擇要保留多久。"
-+"Uncheck to store expired alarms indefinitely. Check to enter how long "
-+"expired alarms should be stored."
-+msgstr ""
-+"如果不勾選此選項，則逾時鬧鐘將被永久保存。勾選此選項的話則可以選擇要保留多"
-+"久。"
- 
- #: prefdlg.cpp:370
- msgid "Clear Expired Alar&ms"
-@@ -2066,8 +2083,8 @@
- 
- #: prefdlg.cpp:381
- msgid ""
--"Choose which application to use when a command alarm is executed in a terminal "
--"window"
-+"Choose which application to use when a command alarm is executed in a "
-+"terminal window"
- msgstr "選擇指令型鬧鐘要執行在哪一個終端機視窗中"
- 
- #: prefdlg.cpp:388
-@@ -2082,11 +2099,13 @@
- 
- #: prefdlg.cpp:422
- msgid ""
--"Enter the full command line needed to execute a command in your chosen terminal "
--"window. By default the alarm's command string will be appended to what you "
--"enter here. See the KAlarm Handbook for details of special codes to tailor the "
--"command line."
--msgstr "輸入要執行的終端機程式完整命令列。預設鬧鐘的命令字串會附加在您輸入的命令列之後。關於詳情請參考 KAlarm 手冊。"
-+"Enter the full command line needed to execute a command in your chosen "
-+"terminal window. By default the alarm's command string will be appended to "
-+"what you enter here. See the KAlarm Handbook for details of special codes to "
-+"tailor the command line."
-+msgstr ""
-+"輸入要執行的終端機程式完整命令列。預設鬧鐘的命令字串會附加在您輸入的命令列之"
-+"後。關於詳情請參考 KAlarm 手冊。"
- 
- #: prefdlg.cpp:473
- #, c-format
-@@ -2105,7 +2124,7 @@
- 
- #: prefdlg.cpp:537
- msgid "Autostart system tray &icon at login"
--msgstr "在登入時自動啟動系統匣圖示 (&I)"
-+msgstr "在登入時自動啟動系統匣圖示(&I)"
- 
- #: prefdlg.cpp:538
- msgid "Check to run KAlarm whenever you start KDE."
-@@ -2121,24 +2140,26 @@
- 
- #: prefdlg.cpp:606
- msgid "&KMail"
--msgstr "KMail (&K)"
-+msgstr "KMail(&K)"
- 
- #: prefdlg.cpp:609
- msgid "&Sendmail"
--msgstr "Sendmail (&S)"
-+msgstr "Sendmail(&S)"
- 
- #: prefdlg.cpp:615
- msgid ""
- "Choose how to send email when an email alarm is triggered.\n"
- "KMail: The email is sent automatically via KMail. KMail is started first if "
- "necessary.\n"
--"Sendmail: The email is sent automatically. This option will only work if your "
--"system is configured to use sendmail or a sendmail compatible mail transport "
--"agent."
-+"Sendmail: The email is sent automatically. This option will only work if "
-+"your system is configured to use sendmail or a sendmail compatible mail "
-+"transport agent."
- msgstr ""
- "選擇鬧鐘被觸發時要如何寄出信件。\n"
--"KMail：如果 KMail 在執行中，則信件直接放進 KMail 的寄件匣中。如果沒有，則會跳出 KMail 的發信視窗，讓您可以送出信件。\n"
--"Sendmail: 這會自動地寄出信件。該選項將只會在您的系統是設定使用 sendmail 或相容的郵件傳遞程式時才有作用。"
-+"KMail：如果 KMail 在執行中，則信件直接放進 KMail 的寄件匣中。如果沒有，則會跳"
-+"出 KMail 的發信視窗，讓您可以送出信件。\n"
-+"Sendmail: 這會自動地寄出信件。該選項將只會在您的系統是設定使用 sendmail 或相"
-+"容的郵件傳遞程式時才有作用。"
- 
- #: prefdlg.cpp:621
- msgid "Co&py sent emails into KMail's %1 folder"
-@@ -2164,23 +2185,24 @@
- 
- #: prefdlg.cpp:661
- msgid ""
--"Check to use the email address set in the KDE Control Center, to identify you "
--"as the sender when sending email alarms."
-+"Check to use the email address set in the KDE Control Center, to identify "
-+"you as the sender when sending email alarms."
- msgstr "勾選此選項的話，寄件者欄位將使用 KDE 控制中心裡設定的電子郵件地址。"
- 
- #: prefdlg.cpp:665
- msgid "Use KMail &identities"
--msgstr "使用 KMail 的寄件者身份(&I)"
-+msgstr "使用 KMail 的寄件者身分(&I)"
- 
- #: prefdlg.cpp:669
- msgid ""
- "Check to use KMail's email identities to identify you as the sender when "
--"sending email alarms. For existing email alarms, KMail's default identity will "
--"be used. For new email alarms, you will be able to pick which of KMail's "
--"identities to use."
--msgstr ""
--"勾選此選項的話，寄件者將使用 KMail 中所設定的寄件者身份。若為已存在的電子郵件，則會先使用 KMail "
--"預設的身份。對後來新發出的電子郵件，會讓您選擇要使用哪一個寄件身份。"
-+"sending email alarms. For existing email alarms, KMail's default identity "
-+"will be used. For new email alarms, you will be able to pick which of "
-+"KMail's identities to use."
-+msgstr ""
-+"勾選此選項的話，寄件者將使用 KMail 中所設定的寄件者身分。若為已存在的電子郵"
-+"件，則會先使用 KMail 預設的身分。對後來新發出的電子郵件，會讓您選擇要使用哪一"
-+"個寄件身分。"
- 
- #: prefdlg.cpp:676
- msgid ""
-@@ -2191,9 +2213,11 @@
- #: prefdlg.cpp:690
- msgid ""
- "Your email address, used for blind copying email alarms to yourself. If you "
--"want blind copies to be sent to your account on the computer which KAlarm runs "
--"on, you can simply enter your user login name."
--msgstr "您的電子郵件地址，用於接收密件副本。如果您要發送到本機上的帳號，只要填入帳號名稱即可。"
-+"want blind copies to be sent to your account on the computer which KAlarm "
-+"runs on, you can simply enter your user login name."
-+msgstr ""
-+"您的電子郵件地址，用於接收密件副本。如果您要發送到本機上的帳號，只要填入帳號"
-+"名稱即可。"
- 
- #: prefdlg.cpp:698
- msgid "Us&e address from Control Center"
-@@ -2201,8 +2225,8 @@
- 
- #: prefdlg.cpp:702
- msgid ""
--"Check to use the email address set in the KDE Control Center, for blind copying "
--"email alarms to yourself."
-+"Check to use the email address set in the KDE Control Center, for blind "
-+"copying email alarms to yourself."
- msgstr "將密件副本發送到 KDE 控制中心所設定的電子郵件地址。"
- 
- #: prefdlg.cpp:708
-@@ -2211,11 +2235,13 @@
- 
- #: prefdlg.cpp:711
- msgid ""
--"Display a notification message whenever an email alarm has queued an email for "
--"sending to a remote system. This could be useful if, for example, you have a "
--"dial-up connection, so that you can then ensure that the email is actually "
--"transmitted."
--msgstr "如果要發送到遠端的電子郵件被放進佇列中沒有馬上送出，則顯示一個通知訊息。這在使用像撥接式網路時很有用，您可以確認電子郵件是否已被送出。"
-+"Display a notification message whenever an email alarm has queued an email "
-+"for sending to a remote system. This could be useful if, for example, you "
-+"have a dial-up connection, so that you can then ensure that the email is "
-+"actually transmitted."
-+msgstr ""
-+"如果要發送到遠端的電子郵件被放進佇列中沒有馬上送出，則顯示一個通知訊息。這在"
-+"使用像撥接式網路時很有用，您可以確認電子郵件是否已被送出。"
- 
- #: prefdlg.cpp:789
- msgid "No valid 'Bcc' email address is specified."
-@@ -2239,7 +2265,7 @@
- #: prefdlg.cpp:807
- #, c-format
- msgid "No KMail identities currently exist. %1"
--msgstr "KMail 中沒有設定任何寄件身份。%1"
-+msgstr "KMail 中沒有設定任何寄件身分。%1"
- 
- #: prefdlg.cpp:825
- msgid "Message Font && Color"
-@@ -2267,7 +2293,8 @@
- 
- #: prefdlg.cpp:896
- msgid ""
--"Check to select %1 as the default setting for \"%2\" in the alarm edit dialog."
-+"Check to select %1 as the default setting for \"%2\" in the alarm edit "
-+"dialog."
- msgstr "勾選此選項以在鬧鐘編輯視窗中選擇 %1 做為 %2 的預設設定。"
- 
- #: prefdlg.cpp:899
-@@ -2314,7 +2341,7 @@
- 
- #: prefdlg.cpp:1018
- msgid "&Recurrence:"
--msgstr "循環 (&R)："
-+msgstr "循環(&R)："
- 
- #: prefdlg.cpp:1031
- msgid "The default setting for the recurrence rule in the alarm edit dialog."
-@@ -2338,12 +2365,13 @@
- 
- #: prefdlg.cpp:1056
- msgid ""
--"For yearly recurrences, choose what date, if any, alarms due on February 29th "
--"should occur in non-leap years.\n"
--"Note that the next scheduled occurrence of existing alarms is not re-evaluated "
--"when you change this setting."
-+"For yearly recurrences, choose what date, if any, alarms due on February "
-+"29th should occur in non-leap years.\n"
-+"Note that the next scheduled occurrence of existing alarms is not re-"
-+"evaluated when you change this setting."
- msgstr ""
--"對年度循環的鬧鐘，如果日期落在二月廿九日，但是當年度非閏年時，選擇要改在哪一天響鈴。\n"
-+"對年度循環的鬧鐘，如果日期落在二月廿九日，但是當年度非閏年時，選擇要改在哪一"
-+"天響鈴。\n"
- "注意這不會改變此鬧鐘的排程設定。"
- 
- #: prefdlg.cpp:1182
-@@ -2361,8 +2389,8 @@
- 
- #: prefdlg.cpp:1206
- msgid ""
--"Specify whether to include in the system tray tooltip, a summary of alarms due "
--"in the next 24 hours"
-+"Specify whether to include in the system tray tooltip, a summary of alarms "
-+"due in the next 24 hours"
- msgstr "決定是否要在系統匣的工具提示中顯示在未來廿四小時會響鈴的鬧鐘。"
- 
- #: prefdlg.cpp:1211
-@@ -2371,9 +2399,11 @@
- 
- #: prefdlg.cpp:1218
- msgid ""
--"Uncheck to display all of the next 24 hours' alarms in the system tray tooltip. "
--"Check to enter an upper limit on the number to be displayed."
--msgstr "取消此選項就會在系統匣工具列中顯示所有在廿四小時內會響鈴的鬧鐘。勾選此選項可以選擇最多要顯示幾個。"
-+"Uncheck to display all of the next 24 hours' alarms in the system tray "
-+"tooltip. Check to enter an upper limit on the number to be displayed."
-+msgstr ""
-+"取消此選項就會在系統匣工具列中顯示所有在廿四小時內會響鈴的鬧鐘。勾選此選項可"
-+"以選擇最多要顯示幾個。"
- 
- #: prefdlg.cpp:1226
- msgid ""
-@@ -2383,8 +2413,8 @@
- 
- #: prefdlg.cpp:1233
- msgid ""
--"Specify whether to show in the system tray tooltip, how long until each alarm "
--"is due"
-+"Specify whether to show in the system tray tooltip, how long until each "
-+"alarm is due"
- msgstr "決定是否要在系統匣的工具提示中顯示每個鬧鐘還要多久響鈴。"
- 
- #: prefdlg.cpp:1238
-@@ -2410,11 +2440,12 @@
- "displayed, but it has no title bar and cannot be moved or resized."
- msgstr ""
- "指定鬧鐘訊息視窗的特性：\n"
--"- 如果勾選此選項，則顯示的視窗為一正常視窗，含有標題列，並且會取得鍵盤輸入的焦點。 - 如果不勾選，則顯示時無法與您互動，沒有標題列也無法移動或改變大小。"
-+"- 如果勾選此選項，則顯示的視窗為一正常視窗，含有標題列，並且會取得鍵盤輸入的"
-+"焦點。 - 如果不勾選，則顯示時無法與您互動，沒有標題列也無法移動或改變大小。"
- 
- #: prefdlg.cpp:1259
- msgid "System tray icon &update interval:"
--msgstr "系統列圖示更新間隔 (&U)："
-+msgstr "系統列圖示更新間隔(&U)："
- 
- #: prefdlg.cpp:1264 sounddlg.cpp:161
- msgid "seconds"
-@@ -2422,8 +2453,8 @@
- 
- #: prefdlg.cpp:1266
- msgid ""
--"How often to update the system tray icon to indicate whether or not the Alarm "
--"Daemon is monitoring alarms."
-+"How often to update the system tray icon to indicate whether or not the "
-+"Alarm Daemon is monitoring alarms."
- msgstr "要多久更新系統工作匣圖示一次以顯示鬧鐘守護程式是否還在監測鬧鐘。"
- 
- #. i18n: file kalarmui.rc line 32
-@@ -2454,7 +2485,7 @@
- 
- #: recurrenceedit.cpp:74
- msgid "Ho&urly/Minutely"
--msgstr "小時/分鐘 (&U)"
-+msgstr "小時/分鐘(&U)"
- 
- #: recurrenceedit.cpp:75
- msgid "Daily"
-@@ -2462,7 +2493,7 @@
- 
- #: recurrenceedit.cpp:76
- msgid "&Daily"
--msgstr "天 (&D)"
-+msgstr "天(&D)"
- 
- #: recurrenceedit.cpp:77
- msgid "Weekly"
-@@ -2470,7 +2501,7 @@
- 
- #: recurrenceedit.cpp:78
- msgid "&Weekly"
--msgstr "週 (&W)"
-+msgstr "週(&W)"
- 
- #: recurrenceedit.cpp:79
- msgid "Monthly"
-@@ -2478,7 +2509,7 @@
- 
- #: recurrenceedit.cpp:80
- msgid "&Monthly"
--msgstr "月 (&M)"
-+msgstr "月(&M)"
- 
- #: recurrenceedit.cpp:81
- msgid "Yearly"
-@@ -2486,7 +2517,7 @@
- 
- #: recurrenceedit.cpp:82
- msgid "&Yearly"
--msgstr "年 (&Y)"
-+msgstr "年(&Y)"
- 
- #: recurrenceedit.cpp:106
- msgid "Recurrence Rule"
-@@ -2526,8 +2557,8 @@
- 
- #: recurrenceedit.cpp:177
- msgid ""
--"Set up a repetition within the recurrence, to trigger the alarm multiple times "
--"each time the recurrence is due."
-+"Set up a repetition within the recurrence, to trigger the alarm multiple "
-+"times each time the recurrence is due."
- msgstr "設定在循環內的重覆，當循環到的時候可以觸發鬧鐘多次。"
- 
- #: recurrenceedit.cpp:219
-@@ -2536,7 +2567,7 @@
- 
- #: recurrenceedit.cpp:225
- msgid "No &end"
--msgstr "不結束 (&E)"
-+msgstr "不結束(&E)"
- 
- #: recurrenceedit.cpp:228
- msgid "Repeat the alarm indefinitely"
-@@ -2566,8 +2597,8 @@
- msgid ""
- "Repeat the alarm until the date/time specified.\n"
- "\n"
--"Note: This applies to the main recurrence only. It does not limit any "
--"sub-repetition which will occur regardless after the last main recurrence."
-+"Note: This applies to the main recurrence only. It does not limit any sub-"
-+"repetition which will occur regardless after the last main recurrence."
- msgstr ""
- "重覆鬧鐘，直到指定的日期與時間。\n"
- "\n"
-@@ -2583,8 +2614,8 @@
- 
- #: recurrenceedit.cpp:277
- msgid ""
--"Stop repeating the alarm after your first login on or after the specified end "
--"date"
-+"Stop repeating the alarm after your first login on or after the specified "
-+"end date"
- msgstr "在第一次登入之後，或在指定的結束日期之後停止重覆響鈴。"
- 
- #: recurrenceedit.cpp:293
-@@ -2597,8 +2628,8 @@
- 
- #: recurrenceedit.cpp:321
- msgid ""
--"Enter a date to insert in the exceptions list. Use in conjunction with the Add "
--"or Change button below."
-+"Enter a date to insert in the exceptions list. Use in conjunction with the "
-+"Add or Change button below."
- msgstr "輸入一個日期放進例外清單中。可以使用底下的「新增」、「變更」鍵。"
- 
- #: recurrenceedit.cpp:330
-@@ -2631,7 +2662,7 @@
- 
- #: recurrenceedit.cpp:1031
- msgid "Recur e&very"
--msgstr "循環週期 (&V)："
-+msgstr "循環週期(&V)："
- 
- #: recurrenceedit.cpp:1099
- msgid "hours:minutes"
-@@ -2812,8 +2843,8 @@
- 
- #: recurrenceedit.cpp:1501
- msgid ""
--"Select which date, if any, the February 29th alarm should trigger in non-leap "
--"years"
-+"Select which date, if any, the February 29th alarm should trigger in non-"
-+"leap years"
- msgstr "如果在非閏年中遇到要在二月廿九日響鈴的鬧鐘，選擇要改到哪一天響鈴。"
- 
- #: recurrenceedit.cpp:1585
-@@ -2850,7 +2881,9 @@
- msgid ""
- "Instead of the alarm triggering just once at each recurrence, checking this "
- "option makes the alarm trigger multiple times at each recurrence."
--msgstr "勾選此選項打開賴床功能。與循環週期不同的是，這個選項可以在一個循環週期內重覆響鈴多次，也就是可以讓您賴個床。"
-+msgstr ""
-+"勾選此選項打開賴床功能。與循環週期不同的是，這個選項可以在一個循環週期內重覆"
-+"響鈴多次，也就是可以讓您賴個床。"
- 
- #: repetition.cpp:166
- msgid "Enter the time between repetitions of the alarm"
-@@ -2913,8 +2946,8 @@
- 
- #: sounddlg.cpp:110
- msgid ""
--"If checked, the sound file will be played repeatedly for as long as the message "
--"is displayed."
-+"If checked, the sound file will be played repeatedly for as long as the "
-+"message is displayed."
- msgstr "勾選此選項的話，只要訊息顯示著，音效檔就會一直被重覆播放。"
- 
- #: sounddlg.cpp:114
-@@ -3043,8 +3076,11 @@
- "Enter a shell command to execute before the alarm is displayed.\n"
- "Note that it is executed only when the alarm proper is displayed, not when a "
- "reminder or deferred alarm is displayed.\n"
--"N.B. KAlarm will wait for the command to complete before displaying the alarm."
--msgstr "輸入要在響鈴前執行的指令。注意，此指令是在響鈴前執行，而非在提醒前執行。KAlarm 會檔到指令執行完畢時才響鈴。"
-+"N.B. KAlarm will wait for the command to complete before displaying the "
-+"alarm."
-+msgstr ""
-+"輸入要在響鈴前執行的指令。注意，此指令是在響鈴前執行，而非在提醒前執行。"
-+"KAlarm 會檔到指令執行完畢時才響鈴。"
- 
- #: specialactions.cpp:158
- msgid "Post-alar&m action:"
-@@ -3053,10 +3089,12 @@
- #: specialactions.cpp:165
- msgid ""
- "Enter a shell command to execute after the alarm window is closed.\n"
--"Note that it is not executed after closing a reminder window. If you defer the "
--"alarm, it is not executed until the alarm is finally acknowledged or closed."
-+"Note that it is not executed after closing a reminder window. If you defer "
-+"the alarm, it is not executed until the alarm is finally acknowledged or "
-+"closed."
- msgstr ""
--"輸入要在響鈴後，視窗關閉時執行的指令。注意，此指令是在響鈴後執行，而非在提醒後執行。如果您延遲了此鬧鈴，則指令也會跟著延遲，直到響鈴完視窗關閉時才執行。"
-+"輸入要在響鈴後，視窗關閉時執行的指令。注意，此指令是在響鈴後執行，而非在提醒"
-+"後執行。如果您延遲了此鬧鈴，則指令也會跟著延遲，直到響鈴完視窗關閉時才執行。"
- 
- #: templatedlg.cpp:47
- msgid "Alarm Templates"
-@@ -3131,7 +3169,7 @@
- 
- #: traywindow.cpp:91
- msgid "&New Alarm..."
--msgstr "新的鬧鐘(&N)..."
-+msgstr "新的鬧鐘(&N)…"
- 
- #: traywindow.cpp:92
- msgid "New Alarm From &Template"
-@@ -3245,7 +3283,7 @@
- 
- #: lib/colourcombo.cpp:185
- msgid "Custom..."
--msgstr "自訂..."
-+msgstr "自訂…"
- 
- #: lib/dateedit.cpp:63
- #, c-format
-@@ -3330,3 +3368,101 @@
- #: kalarmd/admain.cpp:48
- msgid "Original Author"
- msgstr "原始作者"
-+
-+#, fuzzy
-+#~ msgid ""
-+#~ "_: first week of January\n"
-+#~ "of:"
-+#~ msgstr "im"
-+
-+#, fuzzy
-+#~ msgid ""
-+#~ "_: This refers to simple repetitions set up using the Simple Repetition "
-+#~ "dialog\n"
-+#~ "Cannot defer past the alarm's next repetition (currently %1)"
-+#~ msgstr ""
-+#~ "Die Erinnerung lässt sich nicht auf einen Zeitpunkt nach der nächsten "
-+#~ "Wiederholung verschieben (momentan %1)"
-+
-+#, fuzzy
-+#~ msgid ""
-+#~ "_: This refers to recurrences set up using the Recurrence tab\n"
-+#~ "Cannot defer past the alarm's next recurrence (currently %1)"
-+#~ msgstr ""
-+#~ "Die Erinnerung lässt sich nicht auf einen Zeitpunkt nach der nächsten "
-+#~ "Wiederholung verschieben (momentan %1)"
-+
-+#, fuzzy
-+#~ msgid "Recurrence:"
-+#~ msgstr "Wiederholung:"
-+
-+#, fuzzy
-+#~ msgid ""
-+#~ "How often the alarm recurs.\n"
-+#~ "The times shown are those configured in the Recurrence tab and in the "
-+#~ "Simple Repetition dialog."
-+#~ msgstr ""
-+#~ "Legt fest, wie oft die Erinnerung wiederholt werden soll.\n"
-+#~ "Die Wiederholungen werden im Feld \"Wiederholung\" und im Dialog "
-+#~ "\"Einfache Wiederholung\" eingestellt."
-+
-+#, fuzzy
-+#~ msgid "Set up a simple, or additional, alarm repetition"
-+#~ msgstr ""
-+#~ "Eine einfache oder auch zusätzliche Wiederholung der Erinnerung einstellen"
-+
-+#, fuzzy
-+#~ msgid "Repeat the alarm until the date/time specified"
-+#~ msgstr "Wiederholt die Erinnerung bis zum angegebenen Zeitpunkt"
-+
-+#, fuzzy
-+#~ msgid ""
-+#~ "Use this dialog either:\n"
-+#~ "- instead of the Recurrence tab, or\n"
-+#~ "- after using the Recurrence tab, to set up a repetition within a "
-+#~ "repetition."
-+#~ msgstr ""
-+#~ "Benutzen Sie diesen Dialog entweder:\n"
-+#~ "- statt der Registerkarte \"Wiederholungen\" oder \n"
-+#~ "- nach der Registerkarte \"Wiederholungen\", um eine Wiederholung "
-+#~ "innerhalb der Wiederholung aufzusetzen."
-+
-+#, fuzzy
-+#~ msgid "Message color"
-+#~ msgstr "Farbe für Nachrichten"
-+
-+#, fuzzy
-+#~ msgid "Choose the background color for the alarm message."
-+#~ msgstr "Legen Sie die Hintergrundfarbe für die Erinnerungsnachricht fest."
-+
-+#, fuzzy
-+#~ msgid "Show alarm &time"
-+#~ msgstr "Zeitpunkt der Fälligkeit an&zeigen"
-+
-+#, fuzzy
-+#~ msgid "Show time u&ntil alarm"
-+#~ msgstr "Verbl&eibende Zeit bis zur Fälligkeit anzeigen"
-+
-+#, fuzzy
-+#~ msgid "Alarm List"
-+#~ msgstr "Erinnerungsliste"
-+
-+#, fuzzy
-+#~ msgid ""
-+#~ "Specify whether to show in the alarm list, the time at which each alarm "
-+#~ "is due"
-+#~ msgstr ""
-+#~ "Gibt an, ob in der Erinnerungsliste auch die Uhrzeit, zu der eine "
-+#~ "Erinnerungsmeldung ausgelöst wird, angezeigt werden soll"
-+
-+#, fuzzy
-+#~ msgid ""
-+#~ "Specify whether to show in the alarm list, how long until each alarm is "
-+#~ "due"
-+#~ msgstr "Gibt an, ob die Restzeit bis zur Erinnerung angezeigt werden soll"
-+
-+#, fuzzy
-+#~ msgid "Specify whether to show expired alarms in the alarm list"
-+#~ msgstr ""
-+#~ "Gibt an, ob abgelaufene Erinnerungen in der Erinnerungsliste angezeigt "
-+#~ "werden sollen"
-diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdepim/kandy.po kde-i18n-zh_TW-3.5.10/messages/kdepim/kandy.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdepim/kandy.po	2006-10-01 18:34:21.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdepim/kandy.po	2011-11-11 15:45:17.000000000 +0100
-@@ -7,8 +7,7 @@
- "Project-Id-Version: kandy\n"
- "POT-Creation-Date: 2006-07-25 03:59+0200\n"
- "PO-Revision-Date: 2006-03-02 08:49+0800\n"
--"Last-Translator: Frank Weng (a.k.a. Franklin) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Traditional Chinese <zh_l10n@linux.org.tw>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
-@@ -117,11 +116,11 @@
- 
- #: kandyview.cpp:86
- msgid "Add..."
--msgstr "新增..."
-+msgstr "新增…"
- 
- #: kandyview.cpp:90
- msgid "Edit..."
--msgstr "編輯..."
-+msgstr "編輯…"
- 
- #: kandyview.cpp:98
- msgid "Execute"
-@@ -177,11 +176,11 @@
- 
- #: mobilegui.cpp:295 mobilegui.cpp:454
- msgid "Reading mobile phonebook..."
--msgstr "讀取行動電話的電話簿..."
-+msgstr "讀取行動電話的電話簿…"
- 
- #: mobilegui.cpp:424
- msgid "Writing mobile phonebook..."
--msgstr "寫入行動電話的電話簿..."
-+msgstr "寫入行動電話的電話簿…"
- 
- #: mobilegui.cpp:433
- msgid "Wrote mobile phonebook."
-@@ -189,7 +188,7 @@
- 
- #: mobilegui.cpp:493
- msgid "Reading KDE address book..."
--msgstr "讀取 KDE 通訊錄..."
-+msgstr "讀取 KDE 通訊錄…"
- 
- #: mobilegui.cpp:643
- msgid "Read KDE address book."
-@@ -268,7 +267,8 @@
- 
- #: modem.cpp:197
- msgid ""
--"Unable to open device '%1'. Please check that you have sufficient permissions."
-+"Unable to open device '%1'. Please check that you have sufficient "
-+"permissions."
- msgstr "無法開啟裝置 %1。請確定您的權限沒有問題。"
- 
- #: modem.cpp:206
-@@ -313,7 +313,7 @@
- #: rc.cpp:3 rc.cpp:6
- #, no-c-format
- msgid "&Show"
--msgstr "顯示 (&S)"
-+msgstr "顯示(&S)"
- 
- #. i18n: file cmdpropertiesdialog_base.ui line 16
- #: rc.cpp:9
-@@ -427,7 +427,7 @@
- #: rc.cpp:93
- #, no-c-format
- msgid "Save to File..."
--msgstr "儲存到檔案..."
-+msgstr "儲存到檔案…"
- 
- #. i18n: file mobilegui_base.ui line 332
- #: rc.cpp:105
-diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdepim/karm.po kde-i18n-zh_TW-3.5.10/messages/kdepim/karm.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdepim/karm.po	2008-08-19 20:43:18.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdepim/karm.po	2011-11-11 15:45:17.000000000 +0100
-@@ -6,7 +6,7 @@
- "Project-Id-Version: karm\n"
- "POT-Creation-Date: 2008-04-21 01:46+0200\n"
- "PO-Revision-Date: 2008-04-28 07:57+0800\n"
--"Last-Translator: Franklin Weng <franklin at goodhorse dot idv dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Chinese Traditional <zh-l10n@linux.org.tw>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
-@@ -70,15 +70,16 @@
- msgstr ""
- "選取此選項將在此工作上花的時間設定為絕對值。\n"
- "\n"
--"例如，如果您在目前的工作階段中，在這份工作上花了剛好四個小時，您可以設定工作階段時間為四小時。"
-+"例如，如果您在目前的工作階段中，在這份工作上花了剛好四個小時，您可以設定工作"
-+"階段時間為四小時。"
- 
- #: edittaskdialog.cpp:236
- msgid ""
--"Use this option to change the time spent on this task relative to its current "
--"value.\n"
-+"Use this option to change the time spent on this task relative to its "
-+"current value.\n"
- "\n"
--"For example, if you worked on this task for one hour without the timer running, "
--"you would add 1 hr."
-+"For example, if you worked on this task for one hour without the timer "
-+"running, you would add 1 hr."
- msgstr ""
- "選取此選項將在此工作上花的時間設定為相對於目前的值。\n"
- "\n"
-@@ -99,8 +100,8 @@
- 
- #: edittaskdialog.cpp:250
- msgid ""
--"Use this option to automatically start the timer on this task when you switch "
--"to the specified desktop(s)."
-+"Use this option to automatically start the timer on this task when you "
-+"switch to the specified desktop(s)."
- msgstr "選取此選項，則在您切換到指定桌面上時，會自動啟動對此工作的計時器。"
- 
- #: edittaskdialog.cpp:253
-@@ -138,7 +139,7 @@
- 
- #: karm_part.cpp:141 mainwindow.cpp:279
- msgid "S&top"
--msgstr "停止 (&T)"
-+msgstr "停止(&T)"
- 
- #: karm_part.cpp:146 mainwindow.cpp:284
- msgid "Stop &All Timers"
-@@ -146,7 +147,7 @@
- 
- #: karm_part.cpp:153 mainwindow.cpp:291
- msgid "&New..."
--msgstr "新增(&N)..."
-+msgstr "新增(&N)…"
- 
- #: karm_part.cpp:158 mainwindow.cpp:296
- msgid "New &Subtask..."
-@@ -154,7 +155,7 @@
- 
- #: karm_part.cpp:168 mainwindow.cpp:306
- msgid "&Edit..."
--msgstr "編輯(&E)..."
-+msgstr "編輯(&E)…"
- 
- #: karm_part.cpp:180 mainwindow.cpp:318
- msgid "&Mark as Complete"
-@@ -174,23 +175,23 @@
- 
- #: karm_part.cpp:209 mainwindow.cpp:355
- msgid "Import &Legacy Flat File..."
--msgstr "匯入 Legacy Flat 檔案(&L)..."
-+msgstr "匯入 Legacy Flat 檔案(&L)…"
- 
- #: karm_part.cpp:212 mainwindow.cpp:358
- msgid "&Export to CSV File..."
--msgstr "匯出到 CSV 檔案(&E)..."
-+msgstr "匯出到 CSV 檔案(&E)…"
- 
- #: karm_part.cpp:215 mainwindow.cpp:361
- msgid "Export &History to CSV File..."
--msgstr "匯出歷史到 CSV 檔案(&H)..."
-+msgstr "匯出歷史到 CSV 檔案(&H)…"
- 
- #: karm_part.cpp:218 mainwindow.cpp:364
- msgid "Import Tasks From &Planner..."
--msgstr "從 Planner 匯入事件(&P)..."
-+msgstr "從 Planner 匯入事件(&P)…"
- 
- #: karm_part.cpp:221
- msgid "Configure KArm..."
--msgstr "設定 KArm..."
-+msgstr "設定 KArm…"
- 
- #: karm_part.cpp:233 mainwindow.cpp:379
- msgid "Configure key bindings"
-@@ -216,8 +217,8 @@
- 
- #: karm_part.cpp:243 mainwindow.cpp:389
- msgid ""
--"This will reset the session and total time to 0 for all tasks, to restart from "
--"scratch."
-+"This will reset the session and total time to 0 for all tasks, to restart "
-+"from scratch."
- msgstr "這會將所有工作的工作階段與總計時間歸零，並從頭開始。"
- 
- #: karm_part.cpp:247 mainwindow.cpp:393
-@@ -229,13 +230,14 @@
- "This will start timing for the selected task.\n"
- "It is even possible to time several tasks simultaneously.\n"
- "\n"
--"You may also start timing of a tasks by double clicking the left mouse button "
--"on a given task. This will, however, stop timing of other tasks."
-+"You may also start timing of a tasks by double clicking the left mouse "
-+"button on a given task. This will, however, stop timing of other tasks."
- msgstr ""
- "這會啟動對所選擇工作的計時器。\n"
- "這也可能同時啟動數個工作計時器。\n"
- "\n"
--"您也可以經由在工作上雙擊滑鼠左鍵以啟動或停止對工作的計時。然而，這將停止其他工作的計時。"
-+"您也可以經由在工作上雙擊滑鼠左鍵以啟動或停止對工作的計時。然而，這將停止其他"
-+"工作的計時。"
- 
- #: karm_part.cpp:257 karm_part.cpp:258 mainwindow.cpp:403 mainwindow.cpp:404
- msgid "Stop timing of the selected task"
-@@ -309,10 +311,8 @@
- msgstr "匯出進度"
- 
- #: karmstorage.cpp:918
--msgid ""
--"Task History\n"
--msgstr ""
--"工作歷史\n"
-+msgid "Task History\n"
-+msgstr "工作歷史\n"
- 
- #: karmstorage.cpp:919 timekard.cpp:315
- msgid "From %1 to %2"
-@@ -659,12 +659,13 @@
- msgid ""
- "<p>You can choose to output time values in fractions of an hour or in "
- "minutes.</p>\n"
--"<p>For example, if the value is 5 hours and 45 minutes, then the Decimal option "
--"would output <tt>5.75</tt>, and the Hours:Minutes option would output <tt>"
--"5:45</tt></p>"
-+"<p>For example, if the value is 5 hours and 45 minutes, then the Decimal "
-+"option would output <tt>5.75</tt>, and the Hours:Minutes option would output "
-+"<tt>5:45</tt></p>"
- msgstr ""
- "<p>您可以選擇輸出時間的單位是否要使用分鐘。</p>\n"
--"<p>例如，如果時間為五小時四十五分鐘，則選擇「十進制」就會輸出 <tt>5.75</tt>，選擇「小時：分鐘」則輸出 <tt>5:45</tt>。</p>"
-+"<p>例如，如果時間為五小時四十五分鐘，則選擇「十進制」就會輸出 <tt>5.75</tt>，"
-+"選擇「小時：分鐘」則輸出 <tt>5:45</tt>。</p>"
- 
- #. i18n: file csvexportdialog_base.ui line 232
- #: rc.cpp:67
-@@ -743,14 +744,15 @@
- #: taskview.cpp:405
- msgid ""
- "Saving is impossible, so timing is useless. \n"
--"Saving problems may result from a full harddisk, a directory name instead of a "
--"file name, or stale locks. Check that your harddisk has enough space, that your "
--"calendar file exists and is a file and remove stale locks, typically from "
--"~/.kde/share/apps/kabc/lock."
-+"Saving problems may result from a full harddisk, a directory name instead of "
-+"a file name, or stale locks. Check that your harddisk has enough space, that "
-+"your calendar file exists and is a file and remove stale locks, typically "
-+"from ~/.kde/share/apps/kabc/lock."
- msgstr ""
- "無法儲存，所以時間沒有用。\n"
--"無法儲存可能是因為硬碟空間已滿，或是指定到目錄而非檔案名稱，或是被鎖定。請檢查您的硬碟空間，您的行事曆檔案存在，並且到鎖定目錄（通常是 "
--"~/.kde/share/apps/kabc/lock）中確認檔案未被鎖定。"
-+"無法儲存可能是因為硬碟空間已滿，或是指定到目錄而非檔案名稱，或是被鎖定。請檢"
-+"查您的硬碟空間，您的行事曆檔案存在，並且到鎖定目錄（通常是 ~/.kde/share/apps/"
-+"kabc/lock）中確認檔案未被鎖定。"
- 
- #: taskview.cpp:495
- msgid "New Task"
-@@ -763,11 +765,12 @@
- #: taskview.cpp:521
- msgid ""
- "Error storing new task. Your changes were not saved. Make sure you can edit "
--"your iCalendar file. Also quit all applications using this file and remove any "
--"lock file related to its name from ~/.kde/share/apps/kabc/lock/ "
-+"your iCalendar file. Also quit all applications using this file and remove "
-+"any lock file related to its name from ~/.kde/share/apps/kabc/lock/ "
- msgstr ""
--"儲存新工作時發生錯誤。您的變更尚未儲存。請確定您可以編輯 iCalendar 檔案。另外也請將所有使用這個檔案的應用程式關閉，並從 "
--"~/.kde/share/apps/kabc/lock 目錄中將跟這個名字有關的鎖定檔移除。"
-+"儲存新工作時發生錯誤。您的變更尚未儲存。請確定您可以編輯 iCalendar 檔案。另外"
-+"也請將所有使用這個檔案的應用程式關閉，並從 ~/.kde/share/apps/kabc/lock 目錄中"
-+"將跟這個名字有關的鎖定檔移除。"
- 
- #: taskview.cpp:560
- msgid "New Sub Task"
-@@ -796,11 +799,14 @@
- "Are you sure you want to delete the task named\n"
- "\"%1\" and its entire history?\n"
- "NOTE: all its subtasks and their history will also be deleted."
--msgstr "確定要刪除名稱為 %1 的工作及它所有的歷史紀錄嗎？注意：所有相關子工作及歷史紀錄都會被刪除。"
-+msgstr ""
-+"確定要刪除名稱為 %1 的工作及它所有的歷史紀錄嗎？注意：所有相關子工作及歷史紀"
-+"錄都會被刪除。"
- 
- #: taskview.cpp:818
- msgid ""
--"Copy totals for just this task and its subtasks, or copy totals for all tasks?"
-+"Copy totals for just this task and its subtasks, or copy totals for all "
-+"tasks?"
- msgstr "要複製這個工作及它的子工作的總計時間，還是要複製所有工作的總計時間？"
- 
- #: taskview.cpp:819
-@@ -817,8 +823,8 @@
- 
- #: taskview.cpp:842
- msgid ""
--"Copy session time for just this task and its subtasks, or copy session time for "
--"all tasks?"
-+"Copy session time for just this task and its subtasks, or copy session time "
-+"for all tasks?"
- msgstr "要複製這個工作及它的子工作的階段時間，還是要複製所有工作的階段時間？"
- 
- #: taskview.cpp:843
-@@ -838,7 +844,8 @@
- "Total Time: Overall time for this task and all its subtasks."
- msgstr ""
- "工作階段時間：您選擇「開始新的工作階段」後，對這份工作所花的時間。\n"
--"工作階段時間總計：您選擇「開始新的工作階段」後，對這份工作及其子工作所花的時間總計。\n"
-+"工作階段時間總計：您選擇「開始新的工作階段」後，對這份工作及其子工作所花的時"
-+"間總計。\n"
- "時間：這份工作的整體時間。\n"
- "總計時間：這份工作及其子工作的整體時間。"
- 
-@@ -873,7 +880,7 @@
- 
- #: tray.cpp:139
- msgid ", ..."
--msgstr ", ..."
-+msgstr ",…"
- 
- #: tray.cpp:154
- msgid ", "
-diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdepim/kcmkabconfig.po kde-i18n-zh_TW-3.5.10/messages/kdepim/kcmkabconfig.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdepim/kcmkabconfig.po	2006-07-22 10:04:30.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdepim/kcmkabconfig.po	2011-11-11 15:45:17.000000000 +0100
-@@ -6,8 +6,7 @@
- "Project-Id-Version: kcmkabconfig\n"
- "POT-Creation-Date: 2005-08-13 01:40+0200\n"
- "PO-Revision-Date: 2006-03-02 08:54+0800\n"
--"Last-Translator: Frank Weng (a.k.a. Franklin) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Traditional Chinese <zh_l10n@linux.org.tw>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
-@@ -32,11 +31,11 @@
- 
- #: addresseewidget.cpp:59
- msgid "Add..."
--msgstr "新增..."
-+msgstr "新增…"
- 
- #: addresseewidget.cpp:60
- msgid "Edit..."
--msgstr "編輯..."
-+msgstr "編輯…"
- 
- #: addresseewidget.cpp:93
- msgid "New"
-@@ -152,9 +151,8 @@
- 
- #: kabconfigwidget.cpp:121
- msgid ""
--"<ul>"
--"<li>%N: Phone Number</li>"
--"<li>%F: File containing the text message(s)</li></ul>"
-+"<ul><li>%N: Phone Number</li><li>%F: File containing the text message(s)</"
-+"li></ul>"
- msgstr "<ul><li>%N：電話號碼</li><li>%F：包含文字訊息的檔案</li></ul>"
- 
- #: kabconfigwidget.cpp:129
-@@ -163,19 +161,11 @@
- 
- #: kabconfigwidget.cpp:135
- msgid ""
--"<ul> "
--"<li>%s: Street</li>"
--"<li>%r: Region</li>"
--"<li>%l: Location</li>"
--"<li>%z: Zip Code</li>"
--"<li>%c: Country ISO Code</li> </ul>"
-+"<ul> <li>%s: Street</li><li>%r: Region</li><li>%l: Location</li><li>%z: Zip "
-+"Code</li><li>%c: Country ISO Code</li> </ul>"
- msgstr ""
--"<ul>"
--"<li>%s：街名</li>"
--"<li>%r：區域</li>"
--"<li>%l：位置</li>"
--"<li>%z：郵遞區號</li>"
--"<li>%c：國家 ISO 代碼</li></ul>"
-+"<ul><li>%s：街名</li><li>%r：區域</li><li>%l：位置</li><li>%z：郵遞區號</"
-+"li><li>%c：國家 ISO 代碼</li></ul>"
- 
- #: kabconfigwidget.cpp:158
- msgid "Contact"
-@@ -215,11 +205,11 @@
- 
- #: ldapoptionswidget.cpp:291
- msgid "&Add Host..."
--msgstr "新增主機(&A)..."
-+msgstr "新增主機(&A)…"
- 
- #: ldapoptionswidget.cpp:292
- msgid "&Edit Host..."
--msgstr "編輯主機(&E)..."
-+msgstr "編輯主機(&E)…"
- 
- #: ldapoptionswidget.cpp:294
- msgid "&Remove Host"
-diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdepim/kcmkontactnt.po kde-i18n-zh_TW-3.5.10/messages/kdepim/kcmkontactnt.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdepim/kcmkontactnt.po	2006-07-22 10:04:31.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdepim/kcmkontactnt.po	2011-11-11 15:45:17.000000000 +0100
-@@ -6,8 +6,7 @@
- "Project-Id-Version: kcmkontactnt\n"
- "POT-Creation-Date: 2006-03-20 03:58+0100\n"
- "PO-Revision-Date: 2006-03-02 09:06+0800\n"
--"Last-Translator: Frank Weng (a.k.a. Franklin) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Traditional Chinese <zh_l10n@linux.org.tw>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
-@@ -88,7 +87,7 @@
- 
- #: kcmkontactknt.cpp:380
- msgid "New Feed..."
--msgstr "新的 feed..."
-+msgstr "新的 feed…"
- 
- #: kcmkontactknt.cpp:383
- msgid "Delete Feed"
-diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdepim/kdepimresources.po kde-i18n-zh_TW-3.5.10/messages/kdepim/kdepimresources.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdepim/kdepimresources.po	2006-07-22 10:04:30.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdepim/kdepimresources.po	2011-11-11 15:45:17.000000000 +0100
-@@ -6,8 +6,7 @@
- "Project-Id-Version: kdepimresources\n"
- "POT-Creation-Date: 2005-03-13 01:24+0100\n"
- "PO-Revision-Date: 2006-03-02 13:36+0800\n"
--"Last-Translator: Frank Weng (a.k.a. Franklin) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Traditional Chinese <zh_l10n@linux.org.tw>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
-@@ -142,7 +141,7 @@
- 
- #: kcal_resourcegroupwarebaseconfig.cpp:76
- msgid "Configure Cache Settings..."
--msgstr "設定快取..."
-+msgstr "設定快取…"
- 
- #. i18n: file kresources_groupwareprefs.kcfg line 9
- #: rc.cpp:3
-diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdepim/kdepimwizards.po kde-i18n-zh_TW-3.5.10/messages/kdepim/kdepimwizards.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdepim/kdepimwizards.po	2008-02-13 10:55:33.000000000 +0100
-+++ kde-i18n-zh_TW-3.5.10/messages/kdepim/kdepimwizards.po	2011-11-11 15:45:17.000000000 +0100
-@@ -7,7 +7,7 @@
- "Project-Id-Version: kdepimwizards\n"
- "POT-Creation-Date: 2008-01-26 01:19+0100\n"
- "PO-Revision-Date: 2008-02-04 08:41+0800\n"
--"Last-Translator: Franklin Weng <franklin at goodhorse dot idv dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Chinese Traditional <zh-l10n@linux.org.tw>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
-@@ -69,12 +69,12 @@
- 
- #: egroupwarewizard.cpp:340
- msgid ""
--"Some servers may not have the xmlrpc.php file in the 'egroupware' folder of the "
--"server. With this option it is possible to eventually change the path to that "
--"file. For most servers, the default value is OK."
-+"Some servers may not have the xmlrpc.php file in the 'egroupware' folder of "
-+"the server. With this option it is possible to eventually change the path to "
-+"that file. For most servers, the default value is OK."
- msgstr ""
--"有些伺服器上的 egroupware 資料夾內可能沒有 xmlrpc.php "
--"這個檔。如果開啟這個選項的話，您可以改變這個檔的路徑。對大部份的伺服器來說，使用預設值即可。"
-+"有些伺服器上的 egroupware 資料夾內可能沒有 xmlrpc.php 這個檔。如果開啟這個選"
-+"項的話，您可以改變這個檔的路徑。對大部份的伺服器來說，使用預設值即可。"
- 
- #: egroupwarewizard.cpp:342
- msgid "Use SS&L connection"
-@@ -485,7 +485,8 @@
- 
- #: scalixwizard.cpp:383
- msgid ""
--"Your email address on the Scalix Server. Example: <i>name@crossplatform.com</i>"
-+"Your email address on the Scalix Server. Example: <i>name@crossplatform.com</"
-+"i>"
- msgstr "您在 Scalix 伺服器上的電子郵件地址。格式為：<i>name@example.net</i>"
- 
- #: scalixwizard.cpp:386
-diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdepim/kdgantt.po kde-i18n-zh_TW-3.5.10/messages/kdepim/kdgantt.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdepim/kdgantt.po	2008-02-13 10:55:33.000000000 +0100
-+++ kde-i18n-zh_TW-3.5.10/messages/kdepim/kdgantt.po	2011-11-11 15:45:17.000000000 +0100
-@@ -6,8 +6,7 @@
- "Project-Id-Version: kdgantt\n"
- "POT-Creation-Date: 2008-01-26 01:18+0100\n"
- "PO-Revision-Date: 2006-05-25 10:17+0800\n"
--"Last-Translator: Frank Weng (a.k.a. Franklin) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Traditional Chinese <zh_l10n@linux.org.tw>\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/kdepim/kfile_ics.po kde-i18n-zh_TW-3.5.10/messages/kdepim/kfile_ics.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdepim/kfile_ics.po	2006-07-22 10:04:31.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdepim/kfile_ics.po	2011-11-11 15:45:17.000000000 +0100
-@@ -6,8 +6,7 @@
- "Project-Id-Version: kfile_ics\n"
- "POT-Creation-Date: 2004-10-12 01:17+0200\n"
- "PO-Revision-Date: 2006-03-02 15:33+0800\n"
--"Last-Translator: Frank Weng (a.k.a. Franklin) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Traditional Chinese <zh_l10n@linux.org.tw>\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/kdepim/kfile_palm.po kde-i18n-zh_TW-3.5.10/messages/kdepim/kfile_palm.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdepim/kfile_palm.po	2006-07-22 10:04:31.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdepim/kfile_palm.po	2011-11-11 15:45:17.000000000 +0100
-@@ -6,8 +6,7 @@
- "Project-Id-Version: kfile_palm\n"
- "POT-Creation-Date: 2004-10-12 01:17+0200\n"
- "PO-Revision-Date: 2006-03-02 15:47+0800\n"
--"Last-Translator: Frank Weng (a.k.a. Franklin) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Traditional Chinese <zh_l10n@linux.org.tw>\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/kdepim/kfile_rfc822.po kde-i18n-zh_TW-3.5.10/messages/kdepim/kfile_rfc822.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdepim/kfile_rfc822.po	2006-07-22 10:04:30.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdepim/kfile_rfc822.po	2011-11-11 15:45:17.000000000 +0100
-@@ -6,8 +6,7 @@
- "Project-Id-Version: kfile_rfc822\n"
- "POT-Creation-Date: 2004-10-12 01:17+0200\n"
- "PO-Revision-Date: 2006-03-02 15:14+0800\n"
--"Last-Translator: Frank Weng (a.k.a. Franklin) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Traditional Chinese <zh_l10n@linux.org.tw>\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/kdepim/kfile_vcf.po kde-i18n-zh_TW-3.5.10/messages/kdepim/kfile_vcf.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdepim/kfile_vcf.po	2008-02-13 10:55:32.000000000 +0100
-+++ kde-i18n-zh_TW-3.5.10/messages/kdepim/kfile_vcf.po	2011-11-11 15:45:17.000000000 +0100
-@@ -7,7 +7,7 @@
- "Project-Id-Version: kfile_vcf\n"
- "POT-Creation-Date: 2008-01-07 01:17+0100\n"
- "PO-Revision-Date: 2002-08-28 12:14+0800\n"
--"Last-Translator: Keanu <keanu@ms50.url.com.tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\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/kdepim/kgantt.po kde-i18n-zh_TW-3.5.10/messages/kdepim/kgantt.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdepim/kgantt.po	2006-07-22 10:04:31.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdepim/kgantt.po	2011-11-11 15:45:17.000000000 +0100
-@@ -7,7 +7,7 @@
- "Project-Id-Version: kgantt\n"
- "POT-Creation-Date: 2004-10-12 01:17+0200\n"
- "PO-Revision-Date: 2002-10-07 20:24+0800\n"
--"Last-Translator: Keanu <keanu@ms50.url.com.tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
-@@ -179,7 +179,7 @@
- 
- #: xQGanttBarViewPort.cpp:242
- msgid "Configure Gantt..."
--msgstr "設定 Gantt..."
-+msgstr "設定 Gantt…"
- 
- #: xQGanttListView.cpp:54
- msgid "Items"
-diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdepim/kio_groupwise.po kde-i18n-zh_TW-3.5.10/messages/kdepim/kio_groupwise.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdepim/kio_groupwise.po	2007-01-15 10:56:36.000000000 +0100
-+++ kde-i18n-zh_TW-3.5.10/messages/kdepim/kio_groupwise.po	2011-11-11 15:45:17.000000000 +0100
-@@ -6,8 +6,7 @@
- "Project-Id-Version: kio_groupwise\n"
- "POT-Creation-Date: 2006-12-12 02:40+0100\n"
- "PO-Revision-Date: 2006-03-02 15:43+0800\n"
--"Last-Translator: Frank Weng (a.k.a. Franklin) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Traditional Chinese <zh_l10n@linux.org.tw>\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/kdepim/kio_imap4.po kde-i18n-zh_TW-3.5.10/messages/kdepim/kio_imap4.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdepim/kio_imap4.po	2008-02-13 10:55:32.000000000 +0100
-+++ kde-i18n-zh_TW-3.5.10/messages/kdepim/kio_imap4.po	2011-11-11 15:45:17.000000000 +0100
-@@ -9,7 +9,7 @@
- "Project-Id-Version: kio_imap4\n"
- "POT-Creation-Date: 2008-01-26 01:19+0100\n"
- "PO-Revision-Date: 2008-02-04 08:41+0800\n"
--"Last-Translator: Franklin Weng <franklin at goodhorse dot idv dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Chinese Traditional <zh-l10n@linux.org.tw>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
-@@ -36,11 +36,11 @@
- 
- #: imap4.cc:939
- msgid "&Messages"
--msgstr "訊息 (&M)"
-+msgstr "訊息(&M)"
- 
- #: imap4.cc:939
- msgid "&Subfolders"
--msgstr "子目錄 (&S)"
-+msgstr "子目錄(&S)"
- 
- #: imap4.cc:1273
- msgid "Unsubscribe of folder %1 failed. The server returned: %2"
-@@ -68,7 +68,8 @@
- 
- #: imap4.cc:1488 imap4.cc:1515
- msgid ""
--"Retrieving the Access Control List on folder %1 failed. The server returned: %2"
-+"Retrieving the Access Control List on folder %1 failed. The server returned: "
-+"%2"
- msgstr "從資料夾中 %1 取得權限控制清單失敗。伺服器回應：%2"
- 
- #: imap4.cc:1549
-@@ -90,8 +91,8 @@
- 
- #: imap4.cc:1727
- msgid ""
--"Retrieving the quota root information on folder %1 failed. The server returned: "
--"%2"
-+"Retrieving the quota root information on folder %1 failed. The server "
-+"returned: %2"
- msgstr "無法取得目錄 %1 的大小限制資訊。伺服器回應：%2"
- 
- #: imap4.cc:1783
-diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdepim/kio_mobile.po kde-i18n-zh_TW-3.5.10/messages/kdepim/kio_mobile.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdepim/kio_mobile.po	2006-07-22 10:04:31.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdepim/kio_mobile.po	2011-11-11 15:45:17.000000000 +0100
-@@ -6,8 +6,7 @@
- "Project-Id-Version: kio_mobile\n"
- "POT-Creation-Date: 2004-12-11 01:22+0100\n"
- "PO-Revision-Date: 2006-03-02 15:47+0800\n"
--"Last-Translator: Frank Weng (a.k.a. Franklin) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Traditional Chinese <zh_l10n@linux.org.tw>\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/kdepim/kio_scalix.po kde-i18n-zh_TW-3.5.10/messages/kdepim/kio_scalix.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdepim/kio_scalix.po	2008-02-13 10:55:32.000000000 +0100
-+++ kde-i18n-zh_TW-3.5.10/messages/kdepim/kio_scalix.po	2011-11-11 15:45:17.000000000 +0100
-@@ -6,7 +6,7 @@
- "Project-Id-Version: kio_scalix\n"
- "POT-Creation-Date: 2008-01-26 01:19+0100\n"
- "PO-Revision-Date: 2008-02-04 08:42+0800\n"
--"Last-Translator: Franklin Weng <franklin at goodhorse dot idv dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Chinese Traditional <zh-l10n@linux.org.tw>\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/kdepim/kio_sieve.po kde-i18n-zh_TW-3.5.10/messages/kdepim/kio_sieve.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdepim/kio_sieve.po	2008-08-19 20:43:18.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdepim/kio_sieve.po	2011-11-11 15:45:17.000000000 +0100
-@@ -6,8 +6,7 @@
- "Project-Id-Version: kio_sieve\n"
- "POT-Creation-Date: 2008-03-07 02:10+0100\n"
- "PO-Revision-Date: 2006-03-02 15:53+0800\n"
--"Last-Translator: Frank Weng (a.k.a. Franklin) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Traditional Chinese <zh_l10n@linux.org.tw>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
-@@ -16,7 +15,7 @@
- 
- #: sieve.cpp:332
- msgid "Connecting to %1..."
--msgstr "連接到 %1 中..."
-+msgstr "連接到 %1 中…"
- 
- #: sieve.cpp:335
- msgid "The connection to the server was lost."
-@@ -28,7 +27,7 @@
- 
- #: sieve.cpp:374
- msgid "Authenticating user..."
--msgstr "認證使用者..."
-+msgstr "認證使用者…"
- 
- #: sieve.cpp:377
- msgid "Authentication failed."
-@@ -40,7 +39,7 @@
- 
- #: sieve.cpp:453
- msgid "Activating script..."
--msgstr "啟動文稿..."
-+msgstr "啟動文稿…"
- 
- #: sieve.cpp:469
- msgid "There was an error activating the script."
-@@ -52,7 +51,7 @@
- 
- #: sieve.cpp:515
- msgid "Sending data..."
--msgstr "送出資料中..."
-+msgstr "送出資料中…"
- 
- #: sieve.cpp:532
- msgid "KIO data supply error."
-@@ -68,7 +67,7 @@
- 
- #: sieve.cpp:603
- msgid "Verifying upload completion..."
--msgstr "檢查上傳完成度..."
-+msgstr "檢查上傳完成度…"
- 
- #: sieve.cpp:629 sieve.cpp:637
- #, c-format
-@@ -93,11 +92,11 @@
- 
- #: sieve.cpp:681
- msgid "Retrieving data..."
--msgstr "取得資料中..."
-+msgstr "取得資料中…"
- 
- #: sieve.cpp:730
- msgid "Finishing up..."
--msgstr "完成中..."
-+msgstr "完成中…"
- 
- #: sieve.cpp:738
- msgid "A protocol error occurred while trying to negotiate script downloading."
-@@ -109,7 +108,7 @@
- 
- #: sieve.cpp:758
- msgid "Deleting file..."
--msgstr "刪除檔案中..."
-+msgstr "刪除檔案中…"
- 
- #: sieve.cpp:773
- msgid "The server would not delete the file."
-diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdepim/kitchensync.po kde-i18n-zh_TW-3.5.10/messages/kdepim/kitchensync.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdepim/kitchensync.po	2007-10-08 12:00:14.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdepim/kitchensync.po	2011-11-11 15:45:17.000000000 +0100
-@@ -7,7 +7,7 @@
- "Project-Id-Version: kitchensync\n"
- "POT-Creation-Date: 2007-07-21 01:15+0200\n"
- "PO-Revision-Date: 2007-09-18 14:39+0800\n"
--"Last-Translator: Franklin Weng <franklin at goodhorse dot idv dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Chinese Traditional <zh-l10n@linux.org.tw>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
-@@ -40,41 +40,31 @@
- 
- #: aboutpage.cpp:104
- msgid ""
--"<h2 style='text-align:center; margin-top: 0px;'>Welcome to KitchenSync %1</h2>"
--"<p>%1</p><table align=\"center\">"
--"<tr>"
--"<td><a href=\"%1\"><img width=\"%1\" height=\"%1\" src=\"%1\" /></a></td>"
--"<td><a href=\"%1\">%1</a>"
--"<br><span id=\"subtext\"><nobr>%1</td></tr>"
--"<tr>"
--"<td><a href=\"%1\"><img width=\"%1\" height=\"%1\" src=\"%1\" /></a></td>"
--"<td><a href=\"%1\">%1</a>"
--"<br><span id=\"subtext\"><nobr>%1</td></tr>"
--"<tr>"
--"<td><a href=\"%1\"><img width=\"%1\" height=\"%1\" src=\"%1\" /></a></td>"
--"<td><a href=\"%1\">%1</a>"
--"<br><span id=\"subtext\"><nobr>%1</td></tr></table>"
-+"<h2 style='text-align:center; margin-top: 0px;'>Welcome to KitchenSync %1</"
-+"h2><p>%1</p><table align=\"center\"><tr><td><a href=\"%1\"><img width=\"%1\" "
-+"height=\"%1\" src=\"%1\" /></a></td><td><a href=\"%1\">%1</a><br><span id="
-+"\"subtext\"><nobr>%1</td></tr><tr><td><a href=\"%1\"><img width=\"%1\" "
-+"height=\"%1\" src=\"%1\" /></a></td><td><a href=\"%1\">%1</a><br><span id="
-+"\"subtext\"><nobr>%1</td></tr><tr><td><a href=\"%1\"><img width=\"%1\" "
-+"height=\"%1\" src=\"%1\" /></a></td><td><a href=\"%1\">%1</a><br><span id="
-+"\"subtext\"><nobr>%1</td></tr></table>"
- msgstr ""
--"<h2 style='text-align:center; margin-top: 0px;'>歡迎來到 KitchenSync %1</h2>"
--"<p>%1</p><table align=\"center\">"
--"<tr>"
--"<td><a href=\"%1\"><img width=\"%1\" height=\"%1\" src=\"%1\" /></a></td>"
--"<td><a href=\"%1\">%1</a>"
--"<br><span id=\"subtext\"><nobr>%1</td></tr>"
--"<tr>"
--"<td><a href=\"%1\"><img width=\"%1\" height=\"%1\" src=\"%1\" /></a></td>"
--"<td><a href=\"%1\">%1</a>"
--"<br><span id=\"subtext\"><nobr>%1</td></tr>"
--"<tr>"
--"<td><a href=\"%1\"><img width=\"%1\" height=\"%1\" src=\"%1\" /></a></td>"
--"<td><a href=\"%1\">%1</a>"
--"<br><span id=\"subtext\"><nobr>%1</td></tr></table>"
-+"<h2 style='text-align:center; margin-top: 0px;'>歡迎來到 KitchenSync %1</"
-+"h2><p>%1</p><table align=\"center\"><tr><td><a href=\"%1\"><img width=\"%1\" "
-+"height=\"%1\" src=\"%1\" /></a></td><td><a href=\"%1\">%1</a><br><span id="
-+"\"subtext\"><nobr>%1</td></tr><tr><td><a href=\"%1\"><img width=\"%1\" "
-+"height=\"%1\" src=\"%1\" /></a></td><td><a href=\"%1\">%1</a><br><span id="
-+"\"subtext\"><nobr>%1</td></tr><tr><td><a href=\"%1\"><img width=\"%1\" "
-+"height=\"%1\" src=\"%1\" /></a></td><td><a href=\"%1\">%1</a><br><span id="
-+"\"subtext\"><nobr>%1</td></tr></table>"
- 
- #: aboutpage.cpp:115
- msgid ""
- "KitchenSync synchronizes your e-mail, addressbook, calendar, to-do list and "
- "more."
--msgstr "KitchenSync e 能將您的電子郵件、通訊錄、行事曆、待辦事項列表及其他許多東西同步。"
-+msgstr ""
-+"KitchenSync e 能將您的電子郵件、通訊錄、行事曆、待辦事項列表及其他許多東西同"
-+"步。"
- 
- #: aboutpage.cpp:121
- msgid "Read Manual"
-@@ -261,8 +251,8 @@
- 
- #: configguigcalendar.cpp:53
- msgid ""
--"Please notice that currently the password is stored as plain text in the plugin "
--"configuration file"
-+"Please notice that currently the password is stored as plain text in the "
-+"plugin configuration file"
- msgstr "請注意，目前的密碼以純文字形式存放在外掛程式設定檔中。"
- 
- #: configguigcalendar.cpp:56
-@@ -624,7 +614,7 @@
- 
- #: groupconfig.cpp:89
- msgid "Add Member..."
--msgstr "新增成員..."
-+msgstr "新增成員…"
- 
- #: groupconfig.cpp:96
- msgid "Group"
-@@ -770,15 +760,15 @@
- 
- #: mainwidget.cpp:107
- msgid "Add Group..."
--msgstr "新增群組..."
-+msgstr "新增群組…"
- 
- #: mainwidget.cpp:109
- msgid "Delete Group..."
--msgstr "刪除群組..."
-+msgstr "刪除群組…"
- 
- #: mainwidget.cpp:111
- msgid "Edit Group..."
--msgstr "編輯群組..."
-+msgstr "編輯群組…"
- 
- #: mainwidget.cpp:127
- msgid "Create Synchronization Group"
-diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdepim/kleopatra.po kde-i18n-zh_TW-3.5.10/messages/kdepim/kleopatra.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdepim/kleopatra.po	2008-08-19 20:43:18.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdepim/kleopatra.po	2011-11-11 15:45:17.000000000 +0100
-@@ -7,7 +7,7 @@
- "Project-Id-Version: kleopatra\n"
- "POT-Creation-Date: 2008-08-19 01:19+0200\n"
- "PO-Revision-Date: 2008-02-04 08:43+0800\n"
--"Last-Translator: Franklin Weng <franklin at goodhorse dot idv dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Chinese Traditional <zh-l10n@linux.org.tw>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
-@@ -156,10 +156,8 @@
- 
- #: certificateinfowidgetimpl.cpp:187
- msgid ""
--"<qt>"
--"<p>An error occurred while fetching the certificate <b>%1</b> "
--"from the backend:</p>"
--"<p><b>%2</b></p></qt>"
-+"<qt><p>An error occurred while fetching the certificate <b>%1</b> from the "
-+"backend:</p><p><b>%2</b></p></qt>"
- msgstr "<qt><p>從後端介面 <b>%2</b> 抓取憑證 <b>%1</b> 時發生錯誤。</p></qt>"
- 
- #: certificateinfowidgetimpl.cpp:192 certmanager.cpp:537
-@@ -197,8 +195,8 @@
- 
- #: certificatewizardimpl.cpp:91
- msgid ""
--"_: Format string for the labels in the \"Your Personal Data\" page - required "
--"field\n"
-+"_: Format string for the labels in the \"Your Personal Data\" page - "
-+"required field\n"
- "*%1 (%2):"
- msgstr "*%1 (%2):"
- 
-@@ -271,7 +269,7 @@
- 
- #: certmanager.cpp:270
- msgid "New Key Pair..."
--msgstr "新的金鑰配對..."
-+msgstr "新的金鑰配對…"
- 
- #: certmanager.cpp:274
- msgid "Hierarchical Key List"
-@@ -303,23 +301,23 @@
- 
- #: certmanager.cpp:311
- msgid "Import Certificates..."
--msgstr "匯入憑證..."
-+msgstr "匯入憑證…"
- 
- #: certmanager.cpp:316
- msgid "Import CRLs..."
--msgstr "匯入廢棄憑證清單..."
-+msgstr "匯入廢棄憑證清單…"
- 
- #: certmanager.cpp:321
- msgid "Export Certificates..."
--msgstr "匯出憑證..."
-+msgstr "匯出憑證…"
- 
- #: certmanager.cpp:325
- msgid "Export Secret Key..."
--msgstr "匯出秘密金鑰..."
-+msgstr "匯出祕密金鑰…"
- 
- #: certmanager.cpp:330
- msgid "Certificate Details..."
--msgstr "憑證詳情..."
-+msgstr "憑證詳情…"
- 
- #: certmanager.cpp:333
- msgid "Download"
-@@ -327,15 +325,15 @@
- 
- #: certmanager.cpp:340
- msgid "Dump CRL Cache..."
--msgstr "印出廢棄憑證清單快取內容..."
-+msgstr "印出廢棄憑證清單快取內容…"
- 
- #: certmanager.cpp:345
- msgid "Clear CRL Cache..."
--msgstr "清除廢棄憑證清單快取..."
-+msgstr "清除廢棄憑證清單快取…"
- 
- #: certmanager.cpp:350
- msgid "GnuPG Log Viewer..."
--msgstr "GnuPG 紀錄顯示器..."
-+msgstr "GnuPG 紀錄顯示器…"
- 
- #: certmanager.cpp:355
- msgid "Search:"
-@@ -378,7 +376,7 @@
- 
- #: certmanager.cpp:515
- msgid "Refreshing keys..."
--msgstr "刷新金鑰中..."
-+msgstr "刷新金鑰中…"
- 
- #: certmanager.cpp:525
- #, c-format
-@@ -395,23 +393,22 @@
- 
- #: certmanager.cpp:532
- msgid ""
--"<qt>"
--"<p>An error occurred while fetching the certificates from the backend:</p>"
--"<p><b>%1</b></p></qt>"
-+"<qt><p>An error occurred while fetching the certificates from the backend:</"
-+"p><p><b>%1</b></p></qt>"
- msgstr "<qt><p>從後端介面 <b>%1</b> 抓取憑證時失敗。</p></qt>"
- 
- #: certmanager.cpp:579
- msgid "Fetching keys..."
--msgstr "抓取金鑰中..."
-+msgstr "抓取金鑰中…"
- 
- #: certmanager.cpp:604
- msgid ""
- "The query result has been truncated.\n"
--"Either the local or a remote limit on the maximum number of returned hits has "
--"been exceeded.\n"
--"You can try to increase the local limit in the configuration dialog, but if one "
--"of the configured servers is the limiting factor, you have to refine your "
--"search."
-+"Either the local or a remote limit on the maximum number of returned hits "
-+"has been exceeded.\n"
-+"You can try to increase the local limit in the configuration dialog, but if "
-+"one of the configured servers is the limiting factor, you have to refine "
-+"your search."
- msgstr ""
- "查詢結果被截斷了。\n"
- "可能是已經超過本地或遠端的最多傳回筆數限制。\n"
-@@ -423,9 +420,8 @@
- 
- #: certmanager.cpp:705
- msgid ""
--"<qt>"
--"<p>An error occurred while trying to download the certificate %1:</p>"
--"<p><b>%2</b></p></qt>"
-+"<qt><p>An error occurred while trying to download the certificate %1:</"
-+"p><p><b>%2</b></p></qt>"
- msgstr "<qt><p>下載憑證 %1 時發生錯誤：</p> <p><b>%2</b></p></qt>"
- 
- #: certmanager.cpp:711
-@@ -434,13 +430,12 @@
- 
- #: certmanager.cpp:735
- msgid "Fetching certificate from server..."
--msgstr "從伺服器上抓取憑證..."
-+msgstr "從伺服器上抓取憑證…"
- 
- #: certmanager.cpp:773
- msgid ""
--"<qt>"
--"<p>An error occurred while trying to import the certificate %1:</p>"
--"<p><b>%2</b></p></qt>"
-+"<qt><p>An error occurred while trying to import the certificate %1:</p><p><b>"
-+"%2</b></p></qt>"
- msgstr "<qt><p>匯入憑證 %1 時發生錯誤：</p> <p><b>%2</b></p></qt>"
- 
- #: certmanager.cpp:778
-@@ -449,7 +444,7 @@
- 
- #: certmanager.cpp:788
- msgid "Importing certificates..."
--msgstr "匯入憑證中..."
-+msgstr "匯入憑證中…"
- 
- #: certmanager.cpp:809
- msgid "<tr><td align=\"right\">%1</td><td>%2</td></tr>"
-@@ -497,19 +492,19 @@
- 
- #: certmanager.cpp:839
- msgid "Secret keys processed:"
--msgstr "已處理的秘密金鑰："
-+msgstr "已處理的祕密金鑰："
- 
- #: certmanager.cpp:842
- msgid "Secret keys imported:"
--msgstr "已匯入的秘密金鑰："
-+msgstr "已匯入的祕密金鑰："
- 
- #: certmanager.cpp:845
- msgid "Secret keys <em>not</em> imported:"
--msgstr "尚未匯入的秘密金鑰："
-+msgstr "尚未匯入的祕密金鑰："
- 
- #: certmanager.cpp:850
- msgid "Secret keys unchanged:"
--msgstr "未變更的秘密金鑰："
-+msgstr "未變更的祕密金鑰："
- 
- #: certmanager.cpp:854
- msgid "<qt><p>Detailed results of importing %1:</p><table>%2</table></qt>"
-@@ -521,8 +516,8 @@
- 
- #: certmanager.cpp:876
- msgid ""
--"The GpgSM process that tried to import the CRL file ended prematurely because "
--"of an unexpected error."
-+"The GpgSM process that tried to import the CRL file ended prematurely "
-+"because of an unexpected error."
- msgstr "試著匯入廢棄憑證清單檔案的 GpgSM 行程遇到不可預期的錯誤而結束。"
- 
- #: certmanager.cpp:878
-@@ -557,15 +552,15 @@
- 
- #: certmanager.cpp:992
- msgid ""
--"The DirMngr process that tried to clear the CRL cache ended prematurely because "
--"of an unexpected error."
-+"The DirMngr process that tried to clear the CRL cache ended prematurely "
-+"because of an unexpected error."
- msgstr "試著清除廢棄憑證清單快取的 DirMngr 行程遇到不可預期的錯誤而結束。"
- 
- #: certmanager.cpp:994
- #, c-format
- msgid ""
--"An error occurred when trying to clear the CRL cache. The output from DirMngr "
--"was:\n"
-+"An error occurred when trying to clear the CRL cache. The output from "
-+"DirMngr was:\n"
- "%1"
- msgstr ""
- "試著清除廢棄憑證清單快取時發生錯誤。DirMngr 的輸出為：\n"
-@@ -577,9 +572,8 @@
- 
- #: certmanager.cpp:1002
- msgid ""
--"<qt>"
--"<p>An error occurred while trying to delete the certificates:</p>"
--"<p><b>%1</b></p></qt>"
-+"<qt><p>An error occurred while trying to delete the certificates:</p><p><b>%"
-+"1</b></p></qt>"
- msgstr "<qt><p>試著刪除憑證時發生錯誤：</p><p><b>%1</b></p></qt>"
- 
- #: certmanager.cpp:1006 certmanager.cpp:1101
-@@ -588,7 +582,7 @@
- 
- #: certmanager.cpp:1040
- msgid "Checking key dependencies..."
--msgstr "檢查金鑰相依性..."
-+msgstr "檢查金鑰相依性…"
- 
- #: certmanager.cpp:1066
- msgid ""
-@@ -596,7 +590,8 @@
- "other, non-selected certificates.\n"
- "Deleting a CA certificate will also delete all certificates issued by it."
- msgstr ""
--"所選擇的憑證中有一些（或全部）是其他憑證的產生者（CA certificates，CA 憑證）。\n"
-+"所選擇的憑證中有一些（或全部）是其他憑證的產生者（CA certificates，CA 憑"
-+"證）。\n"
- "刪除 CA 憑證也會刪除它們所產生的所有憑證。"
- 
- #: certmanager.cpp:1071
-@@ -607,8 +602,8 @@
- msgid ""
- "_n: Do you really want to delete this certificate and the %1 certificates it "
- "certified?\n"
--"Do you really want to delete these %n certificates and the %1 certificates they "
--"certified?"
-+"Do you really want to delete these %n certificates and the %1 certificates "
-+"they certified?"
- msgstr "您確定要刪除這 %n 個憑證及它們所認證的 %1 個憑證嗎？"
- 
- #: certmanager.cpp:1080
-@@ -624,18 +619,14 @@
- 
- #: certmanager.cpp:1093
- msgid ""
--"<qt>"
--"<p>An error occurred while trying to delete the certificate:</p>"
--"<p><b>%1</b>"
--"<p></qt>"
-+"<qt><p>An error occurred while trying to delete the certificate:</p><p><b>%"
-+"1</b><p></qt>"
- msgstr "<qt><p>刪除憑證時發生錯誤：</p><p><b>%1</b></p></qt>"
- 
- #: certmanager.cpp:1096
- msgid ""
--"<qt>"
--"<p>An error occurred while trying to delete the certificates:</p>"
--"<p><b>%1</b>"
--"<p></qt>"
-+"<qt><p>An error occurred while trying to delete the certificates:</p><p><b>%"
-+"1</b><p></qt>"
- msgstr "<qt><p>刪除憑證時發生錯誤：</p><p><b>%1</b></p></qt>"
- 
- #: certmanager.cpp:1100
-@@ -644,13 +635,12 @@
- 
- #: certmanager.cpp:1115
- msgid "Deleting keys..."
--msgstr "刪除金鑰中..."
-+msgstr "刪除金鑰中…"
- 
- #: certmanager.cpp:1205
- msgid ""
--"<qt>"
--"<p>An error occurred while trying to export the certificate:</p>"
--"<p><b>%1</b></p></qt>"
-+"<qt><p>An error occurred while trying to export the certificate:</p><p><b>%"
-+"1</b></p></qt>"
- msgstr "<qt><p>匯出憑證時發生錯誤：</p><p><b>%1</b></p></qt>"
- 
- #: certmanager.cpp:1209
-@@ -659,7 +649,7 @@
- 
- #: certmanager.cpp:1224
- msgid "Exporting certificate..."
--msgstr "匯出憑證中..."
-+msgstr "匯出憑證中…"
- 
- #: certmanager.cpp:1259
- msgid "ASCII Armored Certificate Bundles (*.pem)"
-@@ -671,28 +661,27 @@
- 
- #: certmanager.cpp:1279
- msgid "Secret Key Export"
--msgstr "匯出秘密金鑰"
-+msgstr "匯出祕密金鑰"
- 
- #: certmanager.cpp:1280
- msgid ""
- "Select the secret key to export (<b>Warning: The PKCS#12 format is insecure; "
- "exporting secret keys is discouraged</b>):"
--msgstr "選擇要匯出的秘密金鑰（警告：PKCS#12 格式不安全，不建議匯出秘密金鑰）："
-+msgstr "選擇要匯出的祕密金鑰（警告：PKCS#12 格式不安全，不建議匯出祕密金鑰）："
- 
- #: certmanager.cpp:1298
- msgid ""
--"<qt>"
--"<p>An error occurred while trying to export the secret key:</p>"
--"<p><b>%1</b></p></qt>"
--msgstr "<qt><p>匯出秘密金鑰時發生錯誤：</p><p><b>%1</b></p></qt>"
-+"<qt><p>An error occurred while trying to export the secret key:</p><p><b>%1</"
-+"b></p></qt>"
-+msgstr "<qt><p>匯出祕密金鑰時發生錯誤：</p><p><b>%1</b></p></qt>"
- 
- #: certmanager.cpp:1302
- msgid "Secret-Key Export Failed"
--msgstr "匯出秘密金鑰失敗"
-+msgstr "匯出祕密金鑰失敗"
- 
- #: certmanager.cpp:1344 certmanager.cpp:1359
- msgid "Exporting secret key..."
--msgstr "匯出秘密金鑰中..."
-+msgstr "匯出祕密金鑰中…"
- 
- #: certmanager.cpp:1345
- msgid ""
-@@ -705,7 +694,8 @@
- 
- #: certmanager.cpp:1427
- msgid ""
--"Could not start GnuPG LogViewer (kwatchgnupg). Please check your installation!"
-+"Could not start GnuPG LogViewer (kwatchgnupg). Please check your "
-+"installation!"
- msgstr "無法啟動 GnuPG 紀錄顯示器（Kwatchgnupg）。請檢查您的安裝是否完整。"
- 
- #: certmanager.cpp:1429
-@@ -738,8 +728,8 @@
- 
- #: main.cpp:71
- msgid ""
--"<qt>The crypto plugin could not be initialized."
--"<br>Certificate Manager will terminate now.</qt>"
-+"<qt>The crypto plugin could not be initialized.<br>Certificate Manager will "
-+"terminate now.</qt>"
- msgstr "<qt>加密外掛程式無法初始化。<br> 憑證管理員將結束。</qt>"
- 
- #. i18n: file kleopatraui.rc line 26
-@@ -820,16 +810,17 @@
- "sign messages, to encrypt messages and to decrypt messages that other people "
- "send to you in encrypted form.\n"
- "<p>\n"
--"The key pair will be generated in a decentralized manner. Please contact your "
--"local help desk if you are unsure how to obtain a certificate for your new key "
--"in your organization."
-+"The key pair will be generated in a decentralized manner. Please contact "
-+"your local help desk if you are unsure how to obtain a certificate for your "
-+"new key in your organization."
- msgstr ""
- "<b>歡迎來到金鑰產生精靈。</b>\n"
--"<br>"
--"<br>\n"
--"這個精靈會協助您透過幾個簡單的步驟，產生一組新的金鑰配對，及它的憑證。您可以用這個憑證來簽署信件，加密或解密信件。\n"
-+"<br><br>\n"
-+"這個精靈會協助您透過幾個簡單的步驟，產生一組新的金鑰配對，及它的憑證。您可以"
-+"用這個憑證來簽署信件，加密或解密信件。\n"
- "<p>\n"
--"金鑰配對會以非集中的方式來產生。如果您不確定在您的組織中要怎麼對您的金鑰產生憑證，請聯絡您的管理員尋求協助。"
-+"金鑰配對會以非集中的方式來產生。如果您不確定在您的組織中要怎麼對您的金鑰產生"
-+"憑證，請聯絡您的管理員尋求協助。"
- 
- #. i18n: file certificatewizard.ui line 72
- #: rc.cpp:62
-@@ -841,8 +832,8 @@
- #: rc.cpp:65
- #, no-c-format
- msgid ""
--"On this page, you will configure the cryptographic key length and the type of "
--"certificate to create."
-+"On this page, you will configure the cryptographic key length and the type "
-+"of certificate to create."
- msgstr "這一頁中，您可以設定加密金鑰長度及產生憑證的型態。"
- 
- #. i18n: file certificatewizard.ui line 111
-@@ -894,7 +885,9 @@
- "On this page, you will enter some personal data that will be stored in your "
- "certificate and that will help other people to determine that it is actually "
- "you who is sending a message."
--msgstr "這一頁中，您可以輸入一些個人資料，它們會被儲存在您的憑證中，協助其他人決定發送此信件的人是不是您。"
-+msgstr ""
-+"這一頁中，您可以輸入一些個人資料，它們會被儲存在您的憑證中，協助其他人決定發"
-+"送此信件的人是不是您。"
- 
- #. i18n: file certificatewizard.ui line 255
- #: rc.cpp:92
-@@ -906,8 +899,8 @@
- #: rc.cpp:95
- #, no-c-format
- msgid ""
--"This will insert your address if you have set the \"Who am I\" information in "
--"the address book"
-+"This will insert your address if you have set the \"Who am I\" information "
-+"in the address book"
- msgstr "如果您在通訊錄中有設定「我是誰」的資訊，這會將您的地址插入憑證中。"
- 
- #. i18n: file certificatewizard.ui line 304
-@@ -920,26 +913,26 @@
- #: rc.cpp:101
- #, no-c-format
- msgid ""
--"<qt>"
--"<p>On this page, you will create a key pair in a decentralized way.\n"
--"</p>"
--"<p>You can either store the certificate request in a file for later "
-+"<qt><p>On this page, you will create a key pair in a decentralized way.\n"
-+"</p><p>You can either store the certificate request in a file for later "
- "transmission or \n"
- "send it to the Certificate Authority (CA) directly. Please check with \n"
--"your local help desk if you are unsure what to select here.</p>"
--"<p>\n"
-+"your local help desk if you are unsure what to select here.</p><p>\n"
- "Once you are done with your settings, click \n"
- "<em>Generate Key Pair and Certificate Request</em> in order to generate your "
- "key pair and a corresponding certificate request.</p>\n"
- "<p><b>Note:</b> if you choose to send via email directly, \n"
--"a kmail composer will be opened; you can add detailed information for the CA\n"
-+"a kmail composer will be opened; you can add detailed information for the "
-+"CA\n"
- "there.</p><qt>"
- msgstr ""
--"<qt>"
--"<p>這一頁中，您會以非集中的方式產生一組金鑰配對。</p>\n"
--"<p>您可以將憑證請求存在一個檔案中，稍後直接送到憑證認證中心（CA）。如果您不確定要選擇什麼，請與您的管理員聯絡尋求協助。</p>\n"
--"<p>您完成設定之後，按下「產生金鑰配對與憑證請求」來產生金鑰配對與憑證請求。</p>\n"
--"<p><b>注意：</b>如果您選擇透過電子郵件直接傳送，會開啟一個 KMail 編輯視窗。您可以加入給 CA 的詳細資訊。</p></qt>"
-+"<qt><p>這一頁中，您會以非集中的方式產生一組金鑰配對。</p>\n"
-+"<p>您可以將憑證請求存在一個檔案中，稍後直接送到憑證認證中心（CA）。如果您不確"
-+"定要選擇什麼，請與您的管理員聯絡尋求協助。</p>\n"
-+"<p>您完成設定之後，按下「產生金鑰配對與憑證請求」來產生金鑰配對與憑證請求。</"
-+"p>\n"
-+"<p><b>注意：</b>如果您選擇透過電子郵件直接傳送，會開啟一個 KMail 編輯視窗。您"
-+"可以加入給 CA 的詳細資訊。</p></qt>"
- 
- #. i18n: file certificatewizard.ui line 359
- #: rc.cpp:112
-@@ -983,17 +976,18 @@
- msgid ""
- "<qt>\n"
- "Your key pair has now been created and stored locally. The corresponding "
--"certificate request is now ready to be sent to the CA (certification authority) "
--"which will generate a certificate for you and send it back via email (unless "
--"you have selected storage in a file). Please review the certificate details "
--"shown below.\n"
-+"certificate request is now ready to be sent to the CA (certification "
-+"authority) which will generate a certificate for you and send it back via "
-+"email (unless you have selected storage in a file). Please review the "
-+"certificate details shown below.\n"
- "<p>\n"
- "If you want to change anything, press Back and make your changes; otherwise, "
- "press Finish to send the certificate request to the CA.\n"
- "</qt>"
- msgstr ""
--"<qt>您的金鑰配對已經產生並儲存到本地檔案中。相關的憑證請求也已準備好發送到憑證認證中心（CA），產生憑證後會透過電子郵件寄回來給您（除非您選擇要儲存到檔案）"
--"。請再檢視一次憑證的詳情。\n"
-+"<qt>您的金鑰配對已經產生並儲存到本地檔案中。相關的憑證請求也已準備好發送到憑"
-+"證認證中心（CA），產生憑證後會透過電子郵件寄回來給您（除非您選擇要儲存到檔"
-+"案）。請再檢視一次憑證的詳情。\n"
- "<p>\n"
- "如果您要更改任何東西，請按「回上一步」，否則請按下「完成」並送出憑證。</qt>"
- 
-@@ -1019,13 +1013,13 @@
- #: rc.cpp:146
- #, no-c-format
- msgid "Set &Background Color..."
--msgstr "設定背景顏色(&B)..."
-+msgstr "設定背景顏色(&B)…"
- 
- #. i18n: file conf/appearanceconfigwidgetbase.ui line 76
- #: rc.cpp:149
- #, no-c-format
- msgid "Set F&ont..."
--msgstr "設定字型(&O)..."
-+msgstr "設定字型(&O)…"
- 
- #. i18n: file conf/appearanceconfigwidgetbase.ui line 98
- #: rc.cpp:155
-diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdepim/kmailcvt.po kde-i18n-zh_TW-3.5.10/messages/kdepim/kmailcvt.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdepim/kmailcvt.po	2008-02-13 10:55:32.000000000 +0100
-+++ kde-i18n-zh_TW-3.5.10/messages/kdepim/kmailcvt.po	2011-11-11 15:45:17.000000000 +0100
-@@ -11,8 +11,7 @@
- "Project-Id-Version: kmailcvt1\n"
- "POT-Creation-Date: 2007-12-11 01:17+0100\n"
- "PO-Revision-Date: 2006-01-13 08:36+0800\n"
--"Last-Translator: Frank Weng (a.k.a. Franklin) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Traditional Chinese <zh_l10n@linux.org.tw>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
-@@ -25,11 +24,11 @@
- 
- #: filter_mailapp.cxx:34
- msgid ""
--"<p><b>OS X Mail Import Filter</b></p>"
--"<p>This filter imports e-mails from the Mail client in Apple Mac OS X.</p>"
-+"<p><b>OS X Mail Import Filter</b></p><p>This filter imports e-mails from the "
-+"Mail client in Apple Mac OS X.</p>"
- msgstr ""
--"<p><b>OS X 信件匯入過濾器</b></p>"
--"<p>這個過濾器會幫忙您將 Apple Mac OS X 的收發信軟體中的郵件匯入 Kmail 中。</p>"
-+"<p><b>OS X 信件匯入過濾器</b></p><p>這個過濾器會幫忙您將 Apple Mac OS X 的收"
-+"發信軟體中的郵件匯入 Kmail 中。</p>"
- 
- #: filter_evolution.cxx:58 filter_evolution_v2.cxx:66
- #: filter_kmail_maildir.cxx:57 filter_mailapp.cxx:53 filter_oe.cxx:61
-@@ -57,7 +56,7 @@
- #: filter_evolution.cxx:146 filter_mailapp.cxx:71 filter_mbox.cxx:61
- #: filter_opera.cxx:89 filter_outlook.cxx:58
- msgid "Importing emails from %1..."
--msgstr "正在匯入信件夾 %1..."
-+msgstr "正在匯入信件夾 %1…"
- 
- #: filter_evolution.cxx:77 filter_evolution_v2.cxx:90
- #: filter_kmail_maildir.cxx:83 filter_mailapp.cxx:127 filter_mbox.cxx:133
-@@ -86,25 +85,23 @@
- 
- #: filter_thunderbird.cxx:30
- msgid ""
--"<p><b>Thunderbird/Mozilla import filter</b></p>"
--"<p>Select your base Thunderbird/Mozilla mailfolder (usually "
--"~/.thunderbird/*.default/Mail/Local Folders/).</p>"
--"<p><b>Note:</b> Never choose a Folder which <u>does not</u> "
--"contain mbox-files (for example, a maildir): if you do, you will get many new "
--"folders.</p>"
--"<p>Since it is possible to recreate the folder structure, the folders will be "
--"stored under: \"Thunderbird-Import\".</p>"
--msgstr ""
--"<p><b>Thunderbird/Mozilla 信件匯入過濾器</b></p>"
--"<p>請選擇您在 Thunder/Mozilla 信件的根目錄（通常是在 "
--"~/.thunderbird/*.default/Mail/Local/Folders/）。</p>"
--"<p><b>注意：</b>不要選擇<u>不含</u> mbox 格式郵件的目錄（例如使用 maildir 的目錄），不然會產生很多新的信件夾。</p>"
--"<p>這個過濾器會產生一個叫 Thunderbird-Import 的信件夾，並幫您保存原先的目錄結構。</p>"
-+"<p><b>Thunderbird/Mozilla import filter</b></p><p>Select your base "
-+"Thunderbird/Mozilla mailfolder (usually ~/.thunderbird/*.default/Mail/Local "
-+"Folders/).</p><p><b>Note:</b> Never choose a Folder which <u>does not</u> "
-+"contain mbox-files (for example, a maildir): if you do, you will get many "
-+"new folders.</p><p>Since it is possible to recreate the folder structure, "
-+"the folders will be stored under: \"Thunderbird-Import\".</p>"
-+msgstr ""
-+"<p><b>Thunderbird/Mozilla 信件匯入過濾器</b></p><p>請選擇您在 Thunder/"
-+"Mozilla 信件的根目錄（通常是在 ~/.thunderbird/*.default/Mail/Local/"
-+"Folders/）。</p><p><b>注意：</b>不要選擇<u>不含</u> mbox 格式郵件的目錄（例如"
-+"使用 maildir 的目錄），不然會產生很多新的信件夾。</p><p>這個過濾器會產生一個"
-+"叫 Thunderbird-Import 的信件夾，並幫您保存原先的目錄結構。</p>"
- 
- #: filter_evolution_v2.cxx:124 filter_thunderbird.cxx:94
- #: filter_thunderbird.cxx:129
- msgid "Start import file %1..."
--msgstr "開始匯入檔案 %1..."
-+msgstr "開始匯入檔案 %1…"
- 
- #: filter_evolution.cxx:196 filter_evolution_v2.cxx:92
- #: filter_kmail_maildir.cxx:85 filter_opera.cxx:143 filter_outlook.cxx:59
-@@ -118,9 +115,10 @@
- 
- #: filters.cxx:145 filters.cxx:180
- msgid ""
--"<b>Fatal:</b> Unable to start KMail for DCOP communication. Make sure <i>"
--"kmail</i> is installed."
--msgstr "<b>嚴重錯誤:</b>無法啟動 KMail DCOP 通訊。請確定您有安裝 <i>KMail</i>。"
-+"<b>Fatal:</b> Unable to start KMail for DCOP communication. Make sure "
-+"<i>kmail</i> is installed."
-+msgstr ""
-+"<b>嚴重錯誤:</b>無法啟動 KMail DCOP 通訊。請確定您有安裝 <i>KMail</i>。"
- 
- #: filters.cxx:153 filters.cxx:188
- msgid "Cannot make folder %1 in KMail"
-@@ -152,21 +150,20 @@
- 
- #: filter_sylpheed.cxx:29
- msgid ""
--"<p><b>Sylpheed import filter</b></p>"
--"<p>Select the base directory of the Sylpheed mailfolder you want to import "
--"(usually: ~/Mail ).</p>"
--"<p>Since it is possible to recreate the folder structure, the folders will be "
--"stored under: \"Sylpheed-Import\" in your local folder.</p>"
--"<p>This filter also recreates the status of message, e.g. new or forwarded."
--msgstr ""
--"<p><b>Sylpheed 信件匯入過濾器</b></p>"
--"<p>請選擇您要匯入的 Sylpheed 郵件的根目錄（通常是 ~/Mail）。</p>"
--"<p>這個過濾器會產生一個叫 Sylpheed-Import 的信件夾，並幫您保存原先的目錄結構。</p>"
--"<p>它並且會重新產生每一封信件的狀態，例如是未讀的或是已轉寄之類。</p>"
-+"<p><b>Sylpheed import filter</b></p><p>Select the base directory of the "
-+"Sylpheed mailfolder you want to import (usually: ~/Mail ).</p><p>Since it is "
-+"possible to recreate the folder structure, the folders will be stored under: "
-+"\"Sylpheed-Import\" in your local folder.</p><p>This filter also recreates "
-+"the status of message, e.g. new or forwarded."
-+msgstr ""
-+"<p><b>Sylpheed 信件匯入過濾器</b></p><p>請選擇您要匯入的 Sylpheed 郵件的根目"
-+"錄（通常是 ~/Mail）。</p><p>這個過濾器會產生一個叫 Sylpheed-Import 的信件夾，"
-+"並幫您保存原先的目錄結構。</p><p>它並且會重新產生每一封信件的狀態，例如是未讀"
-+"的或是已轉寄之類。</p>"
- 
- #: filter_kmail_maildir.cxx:196 filter_sylpheed.cxx:140 filter_thebat.cxx:199
- msgid "Import folder %1..."
--msgstr "正在匯入信件夾 %1..."
-+msgstr "正在匯入信件夾 %1…"
- 
- #: filter_kmail_maildir.cxx:206 filter_kmail_maildir.cxx:211
- #: filter_plain.cxx:68 filter_plain.cxx:72 filter_sylpheed.cxx:153
-@@ -205,15 +202,14 @@
- 
- #: filter_evolution.cxx:33
- msgid ""
--"<p><b>Evolution 1.x import filter</b></p>"
--"<p>Select the base directory of Evolution's mails (usually "
--"~/evolution/local).</p>"
--"<p>Since it is possible to recreate the folder structure, the folders will be "
--"stored under: \"Evolution-Import\".</p>"
--msgstr ""
--"<p><b>Evolution 1.x 信件匯入過濾器</b></p>"
--"<p>請選擇 Evolution 的信件目錄（通常是 ~/evolution/local）。</p>"
--"<p>這個過濾器會產生一個叫 Evolution-Import 的信件夾，並幫您保存原先的目錄結構。</p>"
-+"<p><b>Evolution 1.x import filter</b></p><p>Select the base directory of "
-+"Evolution's mails (usually ~/evolution/local).</p><p>Since it is possible to "
-+"recreate the folder structure, the folders will be stored under: \"Evolution-"
-+"Import\".</p>"
-+msgstr ""
-+"<p><b>Evolution 1.x 信件匯入過濾器</b></p><p>請選擇 Evolution 的信件目錄（通"
-+"常是 ~/evolution/local）。</p><p>這個過濾器會產生一個叫 Evolution-Import 的信"
-+"件夾，並幫您保存原先的目錄結構。</p>"
- 
- #: filter_opera.cxx:28
- msgid "Import Opera Emails"
-@@ -221,26 +217,25 @@
- 
- #: filter_opera.cxx:30
- msgid ""
--"<p><b>Opera email import filter</b></p>"
--"<p>This filter will import mails from Opera mail folder. Use this filter if you "
--"want to import all mails within a account in the Opera maildir.</p>"
--"<p>Select the directory of the account (usually "
--"~/.opera/mail/store/account*).</p>"
--"<p><b>Note:</b> Emails will be imported into a folder named after the account "
--"they came from, prefixed with OPERA-</p>"
--msgstr ""
--"<p><b>Opera 信件匯入過濾器</b></p>"
--"<p>請選擇要匯入帳號的目錄（通常是 ~/.opera/mail/store/account*）。</p>"
--"<p>這個過濾器將 Opera 中某個帳號的所有郵件匯入，並存在信件夾內，信件夾的名稱會用 OPERA-您的帳號名稱。</p>"
-+"<p><b>Opera email import filter</b></p><p>This filter will import mails from "
-+"Opera mail folder. Use this filter if you want to import all mails within a "
-+"account in the Opera maildir.</p><p>Select the directory of the account "
-+"(usually ~/.opera/mail/store/account*).</p><p><b>Note:</b> Emails will be "
-+"imported into a folder named after the account they came from, prefixed with "
-+"OPERA-</p>"
-+msgstr ""
-+"<p><b>Opera 信件匯入過濾器</b></p><p>請選擇要匯入帳號的目錄（通常是 ~/.opera/"
-+"mail/store/account*）。</p><p>這個過濾器將 Opera 中某個帳號的所有郵件匯入，並"
-+"存在信件夾內，信件夾的名稱會用 OPERA-您的帳號名稱。</p>"
- 
- #: filter_opera.cxx:75 filter_outlook.cxx:46 filter_plain.cxx:52
- #: filter_pmail.cxx:61
- msgid "Counting files..."
--msgstr "計算檔案中..."
-+msgstr "計算檔案中…"
- 
- #: filter_opera.cxx:82 filter_outlook.cxx:50 filter_plain.cxx:56
- msgid "Importing new mail files..."
--msgstr "正在匯入新的信件檔..."
-+msgstr "正在匯入新的信件檔…"
- 
- #: kmailcvt.cpp:26
- msgid "KMailCVT Import Tool"
-@@ -256,7 +251,7 @@
- 
- #: kmailcvt.cpp:53
- msgid "Import in progress"
--msgstr "匯入中..."
-+msgstr "匯入中…"
- 
- #: kmailcvt.cpp:56
- msgid "Import finished"
-@@ -269,31 +264,33 @@
- #: filter_pmail.cxx:33
- msgid ""
- "<p>Select the Pegasus-Mail directory on your system (containing *.CNM, *.PMM "
--"and *.MBX files). On many systems this is stored in C:\\pmail\\mail or "
--"C:\\pmail\\mail\\admin</p>"
--"<p><b>Note:</b> Since it is possible to recreate the folder structure, the "
--"folders will be stored under: \"PegasusMail-Import\".</p>"
--msgstr ""
--"<p>請選擇您系統上的 Pegasus-Mail 的郵件目錄（那些 *.CNM、*.PMM、*.MBX檔）。大部份系統都是放在 C:\\pmail\\mail "
--"或 C:\\pmail\\mail\\admin 中</p>"
--"<p><b>注意：</b>這個過濾器會產生一個叫 PegasusMail-Import 的信件夾，並幫您保存原先的目錄結構。</p>"
-+"and *.MBX files). On many systems this is stored in C:\\pmail\\mail or C:"
-+"\\pmail\\mail\\admin</p><p><b>Note:</b> Since it is possible to recreate the "
-+"folder structure, the folders will be stored under: \"PegasusMail-Import\".</"
-+"p>"
-+msgstr ""
-+"<p>請選擇您系統上的 Pegasus-Mail 的郵件目錄（那些 *.CNM、*.PMM、*.MBX檔）。大"
-+"部份系統都是放在 C:\\pmail\\mail 或 C:\\pmail\\mail\\admin 中</p><p><b>注意："
-+"</b>這個過濾器會產生一個叫 PegasusMail-Import 的信件夾，並幫您保存原先的目錄"
-+"結構。</p>"
- 
- #: filter_pmail.cxx:69
- msgid ""
--"Cannot parse the folder structure; continuing import without subfolder support."
-+"Cannot parse the folder structure; continuing import without subfolder "
-+"support."
- msgstr "無法剖析目錄結構：改成不匯入子目錄。"
- 
- #: filter_pmail.cxx:72
- msgid "Importing new mail files ('.cnm')..."
--msgstr "正在匯入新的信件檔('.cnm')..."
-+msgstr "正在匯入新的信件檔('.cnm')…"
- 
- #: filter_pmail.cxx:74
- msgid "Importing mail folders ('.pmm')..."
--msgstr "正在匯入信件夾('.pmm')..."
-+msgstr "正在匯入信件夾('.pmm')…"
- 
- #: filter_pmail.cxx:76
- msgid "Importing 'UNIX' mail folders ('.mbx')..."
--msgstr "正在匯入'UNIX'信件夾('.mbx')..."
-+msgstr "正在匯入'UNIX'信件夾('.mbx')…"
- 
- #: filter_pmail.cxx:175 filter_pmail.cxx:255
- #, c-format
-@@ -307,7 +304,7 @@
- 
- #: filter_pmail.cxx:290
- msgid "Parsing the folder structure..."
--msgstr "剖析目錄結構中..."
-+msgstr "剖析目錄結構中…"
- 
- #. i18n: file kimportpagedlg.ui line 91
- #: rc.cpp:3
-@@ -331,13 +328,13 @@
- #: rc.cpp:12
- #, no-c-format
- msgid "Importing in progress..."
--msgstr "匯入中..."
-+msgstr "匯入中…"
- 
- #. i18n: file kimportpagedlg.ui line 134
- #: rc.cpp:15 rc.cpp:18 rc.cpp:24
- #, no-c-format
- msgid "..."
--msgstr "..."
-+msgstr "…"
- 
- #. i18n: file kimportpagedlg.ui line 158
- #: rc.cpp:21
-@@ -356,31 +353,22 @@
- #, no-c-format
- msgid ""
- "<b>Welcome to KMailCVT - The KMail Import Tool</b>\n"
--"<br>"
--"<br>\n"
--"This program will help you import your email from your previous email program "
--"into KMail."
--"<br>"
--"<br>"
--"<br>"
--"<br>\n"
-+"<br><br>\n"
-+"This program will help you import your email from your previous email "
-+"program into KMail.<br><br><br><br>\n"
- " Please select the program you would like to import from, then click 'Next'."
- msgstr ""
- "<b>歡迎使用 KMailCVT - KMail 的郵件匯入工具</b>\n"
--"<br>"
--"<br>\n"
-+"<br><br>\n"
- "這個工具會幫忙您將您之前使用的收發信軟體中的信件搬到 KMail 中。"
--"<br>"
--"<br>"
--"<br>"
--"<br>\n"
-+"<br><br><br><br>\n"
- "請選擇您要使用的匯入過濾器，並按「下一頁」。"
- 
- #. i18n: file kselfilterpagedlg.ui line 133
- #: rc.cpp:36
- #, no-c-format
- msgid "Remove &duplicate messages during import"
--msgstr "匯入過程中移除重複的信件 (&d)"
-+msgstr "匯入過程中移除重複的信件(&D)"
- 
- #: filter_mbox.cxx:28
- msgid "Import mbox Files (UNIX, Evolution)"
-@@ -388,17 +376,16 @@
- 
- #: filter_mbox.cxx:30
- msgid ""
--"<p><b>mbox import filter</b></p>"
--"<p>This filter will import mbox files into KMail. Use this filter if you want "
--"to import mails from Ximian Evolution or other mailers that use this "
--"traditional UNIX format.</p>"
--"<p><b>Note:</b> Emails will be imported into folders named after the file they "
--"came from, prefixed with MBOX-</p>"
--msgstr ""
--"<p><b>mbox 信件匯入過濾器</b></p>"
--"<p>這個過濾器可以將 mbox 檔案中的信件匯入 KMail 中。如果您原先是使用 Ximian Evolution 或其他使用傳統 UNIX "
--"信件檔格式的軟體，您可以用這個過濾器來將信件匯入。</p>"
--"<p><b>注意：</b>信件會匯入到新的信件夾，信件夾名稱為原來的檔名前面加上 MBOX-。</p>"
-+"<p><b>mbox import filter</b></p><p>This filter will import mbox files into "
-+"KMail. Use this filter if you want to import mails from Ximian Evolution or "
-+"other mailers that use this traditional UNIX format.</p><p><b>Note:</b> "
-+"Emails will be imported into folders named after the file they came from, "
-+"prefixed with MBOX-</p>"
-+msgstr ""
-+"<p><b>mbox 信件匯入過濾器</b></p><p>這個過濾器可以將 mbox 檔案中的信件匯入 "
-+"KMail 中。如果您原先是使用 Ximian Evolution 或其他使用傳統 UNIX 信件檔格式的"
-+"軟體，您可以用這個過濾器來將信件匯入。</p><p><b>注意：</b>信件會匯入到新的信"
-+"件夾，信件夾名稱為原來的檔名前面加上 MBOX-。</p>"
- 
- #: filter_mbox.cxx:49
- msgid "mbox Files (*)"
-@@ -410,20 +397,18 @@
- 
- #: filter_kmail_maildir.cxx:28
- msgid ""
--"<p><b>KMail import filter</b></p>"
--"<p>Select the base directory of the KMail mailfolder you want to import.</p>"
--"<p><b>Note:</b> Never select your current local KMail maildir (usually ~/Mail "
--"or ~/.kde/share/apps/kmail/mail ): in this case, KMailCVT may become stuck in a "
--"continuous loop. </p>"
--"<p>This filter does not import KMail mailfolders with mbox files.</p>"
--"<p>Since it is possible to recreate the folder structure, the folders will be "
--"stored under: \"KMail-Import\" in your local folder.</p>"
--msgstr ""
--"<p><b>KMail 信件匯入過濾器</b></p>"
--"<p>請選擇您要匯入的 KMail 的信件根目錄。</p>"
--"<p><b>注意：</b>請不要選擇您現在所使用的 KMail 目錄 (通常是 ~/Mail 或 "
--"~/.kde/share/apps/kmail/mail），否則 KMailCVT 有可能會陷入無窮迴圈中。</p>"
--"<p>這個過濾器會產生一個叫 KMail-Import 的資料夾，並幫您保存原先的目錄結構。</p>"
-+"<p><b>KMail import filter</b></p><p>Select the base directory of the KMail "
-+"mailfolder you want to import.</p><p><b>Note:</b> Never select your current "
-+"local KMail maildir (usually ~/Mail or ~/.kde/share/apps/kmail/mail ): in "
-+"this case, KMailCVT may become stuck in a continuous loop. </p><p>This "
-+"filter does not import KMail mailfolders with mbox files.</p><p>Since it is "
-+"possible to recreate the folder structure, the folders will be stored under: "
-+"\"KMail-Import\" in your local folder.</p>"
-+msgstr ""
-+"<p><b>KMail 信件匯入過濾器</b></p><p>請選擇您要匯入的 KMail 的信件根目錄。</"
-+"p><p><b>注意：</b>請不要選擇您現在所使用的 KMail 目錄 (通常是 ~/Mail 或 ~/."
-+"kde/share/apps/kmail/mail），否則 KMailCVT 有可能會陷入無窮迴圈中。</p><p>這"
-+"個過濾器會產生一個叫 KMail-Import 的資料夾，並幫您保存原先的目錄結構。</p>"
- 
- #: filter_evolution_v2.cxx:29
- msgid "Import Evolution 2.x Local Mails and Folder Structure"
-@@ -431,19 +416,18 @@
- 
- #: filter_evolution_v2.cxx:31
- msgid ""
--"<p><b>Evolution 2.x import filter</b></p>"
--"<p>Select the base directory of your local Evolution mailfolder (usually "
--"~/.evolution/mail/local/).</p>"
--"<p><b>Note:</b> Never choose a Folder which <u>does not</u> "
--"contain mbox-files (for example a maildir): if you do, you will get many new "
--"folders.</p>"
--"<p>Since it is possible to recreate the folder structure, the folders will be "
--"stored under: \"Evolution-Import\".</p>"
--msgstr ""
--"<p><b>Evolution 2.x 信件匯入過濾器</b></p>"
--"<p>請選擇您要匯入的 Evolution 信件根目錄（通常是在 ~/.evolution/mail/local/ 中）。</p>"
--"<p><b>注意：</b>請不要選擇<u>不含</u> mbox 格式郵件的目錄（例如使用 maildir 的目錄），不然會產生很多新的信件夾。</p>"
--"<p>這個過濾器會產生一個叫 Evolution-Import 的信件夾，並幫您保存原先的目錄結構。</p>"
-+"<p><b>Evolution 2.x import filter</b></p><p>Select the base directory of "
-+"your local Evolution mailfolder (usually ~/.evolution/mail/local/).</"
-+"p><p><b>Note:</b> Never choose a Folder which <u>does not</u> contain mbox-"
-+"files (for example a maildir): if you do, you will get many new folders.</"
-+"p><p>Since it is possible to recreate the folder structure, the folders will "
-+"be stored under: \"Evolution-Import\".</p>"
-+msgstr ""
-+"<p><b>Evolution 2.x 信件匯入過濾器</b></p><p>請選擇您要匯入的 Evolution 信件"
-+"根目錄（通常是在 ~/.evolution/mail/local/ 中）。</p><p><b>注意：</b>請不要選"
-+"擇<u>不含</u> mbox 格式郵件的目錄（例如使用 maildir 的目錄），不然會產生很多"
-+"新的信件夾。</p><p>這個過濾器會產生一個叫 Evolution-Import 的信件夾，並幫您保"
-+"存原先的目錄結構。</p>"
- 
- #: filter_oe.cxx:40
- msgid "Import Outlook Express Emails"
-@@ -451,21 +435,18 @@
- 
- #: filter_oe.cxx:42
- msgid ""
--"<p><b>Outlook Express 4/5/6 import filter</b></p>"
--"<p>You will need to locate the folder where the mailbox has been stored by "
--"searching for .dbx or .mbx files under "
--"<ul>"
--"<li><i>C:\\Windows\\Application Data</i> in Windows 9x"
--"<li><i>Documents and Settings</i> in Windows 2000 or later</ul></p>"
--"<p><b>Note:</b> Since it is possible to recreate the folder structure, the "
-+"<p><b>Outlook Express 4/5/6 import filter</b></p><p>You will need to locate "
-+"the folder where the mailbox has been stored by searching for .dbx or .mbx "
-+"files under <ul><li><i>C:\\Windows\\Application Data</i> in Windows "
-+"9x<li><i>Documents and Settings</i> in Windows 2000 or later</ul></"
-+"p><p><b>Note:</b> Since it is possible to recreate the folder structure, the "
- "folders from Outlook Express 5 and 6 will be stored under: \"OE-Import\" in "
- "your local folder.</p>"
- msgstr ""
--"<p><b>Outlook Express 4/5/6 信件匯入過濾器</b></p>"
--"<p>若您使用的是 Windows 2000 或之後的版本，您可能必需在 "
--"<ul>"
--"<li><i>C:\\Windows\\Application Data</i> 找尋有 .dbx 或 .mbx 檔案的信件目錄。</p>"
--"<p><b>注意：</b>這個過濾器會產生一個叫 OE-Import 的信件夾，並幫您保存原先的目錄結構。</p>"
-+"<p><b>Outlook Express 4/5/6 信件匯入過濾器</b></p><p>若您使用的是 Windows "
-+"2000 或之後的版本，您可能必需在 <ul><li><i>C:\\Windows\\Application Data</i> "
-+"找尋有 .dbx 或 .mbx 檔案的信件目錄。</p><p><b>注意：</b>這個過濾器會產生一個"
-+"叫 OE-Import 的信件夾，並幫您保存原先的目錄結構。</p>"
- 
- #: filter_oe.cxx:68
- #, c-format
-@@ -474,7 +455,7 @@
- 
- #: filter_oe.cxx:83
- msgid "Import folder structure..."
--msgstr "正在匯入郵件目錄結構..."
-+msgstr "正在匯入郵件目錄結構…"
- 
- #: filter_oe.cxx:102
- msgid "Finished importing Outlook Express emails"
-@@ -488,17 +469,17 @@
- #: filter_oe.cxx:131
- #, c-format
- msgid "Importing OE4 Mailbox %1"
--msgstr "匯入 OE4 信件夾 %1 中..."
-+msgstr "匯入 OE4 信件夾 %1 中…"
- 
- #: filter_oe.cxx:145
- #, c-format
- msgid "Importing OE5+ Mailbox %1"
--msgstr "匯入 OE5+ 信件夾 %1 中..."
-+msgstr "匯入 OE5+ 信件夾 %1 中…"
- 
- #: filter_oe.cxx:151
- #, c-format
- msgid "Importing OE5+ Folder file %1"
--msgstr "正在匯入 OE5+ 信件檔 %1 中..."
-+msgstr "正在匯入 OE5+ 信件檔 %1 中…"
- 
- #: filter_lnotes.cxx:30
- msgid "Import Lotus Notes Emails"
-@@ -506,18 +487,17 @@
- 
- #: filter_lnotes.cxx:32
- msgid ""
--"<p><b>Lotus Notes Structured Text mail import filter</b></p>"
--"<p>This filter will import Structured Text files from an exported Lotus Notes "
--"email client into KMail. Use this filter if you want to import mails from Lotus "
--"or other mailers that use the Lotus Notes Structured Text format.</p>"
--"<p><b>Note:</b> Since it is possible to recreate the folder structure, the "
--"imported messages will be stored in subfolders under: \"LNotes-Import\", in "
--"your local folder, named using the names of the files the messages came "
--"from.</p>"
--msgstr ""
--"<p><b>Lotus Notes 信件匯入過濾器</b></p>"
--"<p>這個過濾器會讀取您先前匯出的 Lotus Notes 信件格式檔，並將其中信件匯入 KMail 中。</p>"
--"<p><b>注意：</b>這個過濾器會產生一個叫 LNotes-Import 的信件夾，並幫您保存原先的目錄格式。</p>"
-+"<p><b>Lotus Notes Structured Text mail import filter</b></p><p>This filter "
-+"will import Structured Text files from an exported Lotus Notes email client "
-+"into KMail. Use this filter if you want to import mails from Lotus or other "
-+"mailers that use the Lotus Notes Structured Text format.</p><p><b>Note:</b> "
-+"Since it is possible to recreate the folder structure, the imported messages "
-+"will be stored in subfolders under: \"LNotes-Import\", in your local folder, "
-+"named using the names of the files the messages came from.</p>"
-+msgstr ""
-+"<p><b>Lotus Notes 信件匯入過濾器</b></p><p>這個過濾器會讀取您先前匯出的 "
-+"Lotus Notes 信件格式檔，並將其中信件匯入 KMail 中。</p><p><b>注意：</b>這個過"
-+"濾器會產生一個叫 LNotes-Import 的信件夾，並幫您保存原先的目錄格式。</p>"
- 
- #: filter_lnotes.cxx:56
- msgid "All Files (*)"
-@@ -526,7 +506,7 @@
- #: filter_lnotes.cxx:65
- #, c-format
- msgid "Importing emails from %1"
--msgstr "正在匯入從 %1 中匯入信件..."
-+msgstr "正在匯入從 %1 中匯入信件…"
- 
- #: filter_thebat.cxx:33
- msgid "Import The Bat! Mails and Folder Structure"
-@@ -534,19 +514,17 @@
- 
- #: filter_thebat.cxx:35
- msgid ""
--"<p><b>The Bat! import filter</b></p>"
--"<p>Select the base directory of the 'The Bat!' local mailfolder you want to "
--"import.</p>"
--"<p><b>Note:</b> This filter imports the *.tbb-files from 'The Bat!' local "
--"folder, e.g. from POP accounts, and not from IMAP/DIMAP accounts.</p>"
--"<p>Since it is possible to recreate the folder structure, the folders will be "
--"stored under: \"TheBat-Import\" in your local account.</p>"
--msgstr ""
--"<p><b>The Bat! 信件匯入過濾器</b></p>"
--"<p>請選擇您要匯入的 `The Bat!' 的信件根目錄。</p>"
--"<p><b>注意：</b>這個過濾器會讀取 The Bat! 資料夾中的 .tbb 檔並匯入，也就是只匯入 POP 帳號的信件，而不會匯入 "
--"IMAP/DIMAP 帳號中的信件。</p>"
--"<p>這個過濾器會產生一個叫 TheBat-Import 的信件夾，並幫您保存原來的目錄結構。</p>"
-+"<p><b>The Bat! import filter</b></p><p>Select the base directory of the 'The "
-+"Bat!' local mailfolder you want to import.</p><p><b>Note:</b> This filter "
-+"imports the *.tbb-files from 'The Bat!' local folder, e.g. from POP "
-+"accounts, and not from IMAP/DIMAP accounts.</p><p>Since it is possible to "
-+"recreate the folder structure, the folders will be stored under: \"TheBat-"
-+"Import\" in your local account.</p>"
-+msgstr ""
-+"<p><b>The Bat! 信件匯入過濾器</b></p><p>請選擇您要匯入的 `The Bat!' 的信件根"
-+"目錄。</p><p><b>注意：</b>這個過濾器會讀取 The Bat! 資料夾中的 .tbb 檔並匯"
-+"入，也就是只匯入 POP 帳號的信件，而不會匯入 IMAP/DIMAP 帳號中的信件。</p><p>"
-+"這個過濾器會產生一個叫 TheBat-Import 的信件夾，並幫您保存原來的目錄結構。</p>"
- 
- #: kselfilterpage.cpp:76
- msgid "<p><i>Written by %1.</i></p>"
-@@ -558,29 +536,29 @@
- 
- #: filter_outlook.cxx:30
- msgid ""
--"<p><b>Outlook email import filter</b></p>"
--"<p>This filter will import mails from a Outlook pst-file. You will need to "
--"locate the folder where the pst-file has been stored by searching for .pst "
--"files under: <i>C:\\Documents and Settings</i> in Windows 2000 or later</p>"
--"<p><b>Note:</b> Emails will be imported into a folder named after the account "
--"they came from, prefixed with OUTLOOK-</p>"
--msgstr ""
--"<p><b>Outlook 信件匯入過濾器</b></p>"
--"<p>這個過濾器會讀取 Outlook 的 pst 檔並匯入信件。若您使用的是 Windows 2000 或之後的系統，您必須在 <i>"
--"C:\\Documents and Settings</i> 中找尋 .pst 檔。</p>"
--"<p><b>注意：</b>這個過濾器會產生一個新的信件夾，名稱為 pst 檔的檔名前面加上 OUTLOOK-。</p>"
-+"<p><b>Outlook email import filter</b></p><p>This filter will import mails "
-+"from a Outlook pst-file. You will need to locate the folder where the pst-"
-+"file has been stored by searching for .pst files under: <i>C:\\Documents and "
-+"Settings</i> in Windows 2000 or later</p><p><b>Note:</b> Emails will be "
-+"imported into a folder named after the account they came from, prefixed with "
-+"OUTLOOK-</p>"
-+msgstr ""
-+"<p><b>Outlook 信件匯入過濾器</b></p><p>這個過濾器會讀取 Outlook 的 pst 檔並匯"
-+"入信件。若您使用的是 Windows 2000 或之後的系統，您必須在 <i>C:\\Documents "
-+"and Settings</i> 中找尋 .pst 檔。</p><p><b>注意：</b>這個過濾器會產生一個新的"
-+"信件夾，名稱為 pst 檔的檔名前面加上 OUTLOOK-。</p>"
- 
- #: filter_outlook.cxx:47
- msgid "Counting mail..."
--msgstr "計算信件中..."
-+msgstr "計算信件中…"
- 
- #: filter_outlook.cxx:48
- msgid "Counting directories..."
--msgstr "計算目錄中..."
-+msgstr "計算目錄中…"
- 
- #: filter_outlook.cxx:49
- msgid "Counting folders..."
--msgstr "計算資料夾中..."
-+msgstr "計算資料夾中…"
- 
- #: filter_plain.cxx:27
- msgid "Import Plain Text Emails"
-@@ -589,9 +567,10 @@
- #: filter_plain.cxx:29
- msgid ""
- "<p>Select the directory containing the emails on your system. The emails are "
--"placed in a folder with the same name as the directory they were in, prefixed "
--"by PLAIN-</p>"
--"<p>This filter will import all .msg, .eml and .txt emails.</p>"
--msgstr ""
--"<p>這個過濾器會匯入所有的 .msg、.eml 與 .txt 檔。</p>"
--"<p>請選擇包含以上郵件檔的目錄。這些信件將會匯入到新的信件夾中，名稱為原來目錄的名稱，前面加上 PLAIN-。</p>"
-+"placed in a folder with the same name as the directory they were in, "
-+"prefixed by PLAIN-</p><p>This filter will import all .msg, .eml and .txt "
-+"emails.</p>"
-+msgstr ""
-+"<p>這個過濾器會匯入所有的 .msg、.eml 與 .txt 檔。</p><p>請選擇包含以上郵件檔"
-+"的目錄。這些信件將會匯入到新的信件夾中，名稱為原來目錄的名稱，前面加上 "
-+"PLAIN-。</p>"
-diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdepim/kmail.po kde-i18n-zh_TW-3.5.10/messages/kdepim/kmail.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdepim/kmail.po	2008-08-19 20:43:18.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdepim/kmail.po	2011-11-11 15:45:17.000000000 +0100
-@@ -16,8 +16,7 @@
- "Project-Id-Version: kmail\n"
- "POT-Creation-Date: 2008-08-19 01:18+0200\n"
- "PO-Revision-Date: 2008-08-01 15:33+0800\n"
--"Last-Translator: Frank Weng (a.k.a. Franklin) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: zh_TW <zh-l10n@linux.org.tw>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
-@@ -145,7 +144,7 @@
- 
- #: accountdialog.cpp:354 accountdialog.cpp:493
- msgid "Choo&se..."
--msgstr "選擇(&S)..."
-+msgstr "選擇(&S)…"
- 
- #: accountdialog.cpp:359
- msgid "Locking Method"
-@@ -221,7 +220,7 @@
- #: accountdialog.cpp:454 accountdialog.cpp:554 accountdialog.cpp:758
- #: accountdialog.cpp:1073
- msgid "Identity:"
--msgstr "身份："
-+msgstr "身分："
- 
- #: accountdialog.cpp:473
- msgid "Account Type: Maildir Account"
-@@ -229,11 +228,11 @@
- 
- #: accountdialog.cpp:490
- msgid "Folder &location:"
--msgstr "資料夾位置 (&L)："
-+msgstr "資料夾位置(&L)："
- 
- #: accountdialog.cpp:525
- msgid "Include in &manual mail check"
--msgstr "手動檢查信件時檢查這個帳號(&m)"
-+msgstr "手動檢查信件時檢查這個帳號(&M)"
- 
- #: accountdialog.cpp:570
- msgid "Account Type: POP Account"
-@@ -250,12 +249,12 @@
- 
- #: accountdialog.cpp:596 accountdialog.cpp:866
- msgid ""
--"Your Internet Service Provider gave you a <em>user name</em> "
--"which is used to authenticate you with their servers. It usually is the first "
--"part of your email address (the part before <em>@</em>)."
-+"Your Internet Service Provider gave you a <em>user name</em> which is used "
-+"to authenticate you with their servers. It usually is the first part of your "
-+"email address (the part before <em>@</em>)."
- msgstr ""
--"帳號名稱是您的網路服務提供者（ISP）所提供您用來認證的<em>使用者名稱</em>，通常是您的電子郵件地址中前面的那一部份（也就是在 <em>@</em> "
--"前面的那一部份）。"
-+"帳號名稱是您的網路服務提供者（ISP）所提供您用來認證的<em>使用者名稱</em>，通"
-+"常是您的電子郵件地址中前面的那一部份（也就是在 <em>@</em> 前面的那一部份）。"
- 
- #: accountdialog.cpp:602 accountdialog.cpp:873 kmtransport.cpp:446
- msgid "P&assword:"
-@@ -276,16 +275,17 @@
- #: accountdialog.cpp:628 accountdialog.cpp:962 kmtransport.cpp:459
- msgid ""
- "Check this option to have KMail store the password.\n"
--"If KWallet is available the password will be stored there which is considered "
--"safe.\n"
-+"If KWallet is available the password will be stored there which is "
-+"considered safe.\n"
- "However, if KWallet is not available, the password will be stored in KMail's "
--"configuration file. The password is stored in an obfuscated format, but should "
--"not be considered secure from decryption efforts if access to the configuration "
--"file is obtained."
-+"configuration file. The password is stored in an obfuscated format, but "
-+"should not be considered secure from decryption efforts if access to the "
-+"configuration file is obtained."
- msgstr ""
- "勾選這個選項，KMail 會將您的密碼儲存下來。\n"
- "如果您的系統中有使用 KWallet，密碼將會儲存在 KWallet 以提供較安全的保護。\n"
--"如果沒有 KWallet 的話，密碼將會儲存在 KMail 的設定檔中，並做簡單的加密。但是這仍然不保證密碼可以安全地不被破解。"
-+"如果沒有 KWallet 的話，密碼將會儲存在 KMail 的設定檔中，並做簡單的加密。但是"
-+"這仍然不保證密碼可以安全地不被破解。"
- 
- #: accountdialog.cpp:640
- msgid "Lea&ve fetched messages on the server"
-@@ -305,7 +305,7 @@
- 
- #: accountdialog.cpp:707
- msgid "Include in man&ual mail check"
--msgstr "手動檢查時檢查此帳號 (&U)"
-+msgstr "手動檢查時檢查此帳號(&U)"
- 
- #: accountdialog.cpp:713
- msgid "&Filter messages if they are greater than"
-@@ -313,9 +313,12 @@
- 
- #: accountdialog.cpp:726
- msgid ""
--"If you select this option, POP Filters will be used to decide what to do with "
--"messages. You can then select to download, delete or keep them on the server."
--msgstr "選擇這個選項表示使用 POP 過濾器來過濾信件。您可以選擇要下載、刪除還是保留在伺服器上。"
-+"If you select this option, POP Filters will be used to decide what to do "
-+"with messages. You can then select to download, delete or keep them on the "
-+"server."
-+msgstr ""
-+"選擇這個選項表示使用 POP 過濾器來過濾信件。您可以選擇要下載、刪除還是保留在伺"
-+"服器上。"
- 
- #: accountdialog.cpp:737
- msgid "Chec&k interval:"
-@@ -364,13 +367,15 @@
- 
- #: accountdialog.cpp:800 accountdialog.cpp:1114 kmtransport.cpp:516
- msgid ""
--"_: Please translate this authentication method only if you have a good reason\n"
-+"_: Please translate this authentication method only if you have a good "
-+"reason\n"
- "&LOGIN"
- msgstr "LOGIN(&L)"
- 
- #: accountdialog.cpp:803 accountdialog.cpp:1117 kmtransport.cpp:519
- msgid ""
--"_: Please translate this authentication method only if you have a good reason\n"
-+"_: Please translate this authentication method only if you have a good "
-+"reason\n"
- "&PLAIN"
- msgstr "PLAIN(&PLAIN)"
- 
-@@ -413,12 +418,13 @@
- #: accountdialog.cpp:902
- msgid ""
- "Here you see the different namespaces that your IMAP server supports.Each "
--"namespace represents a prefix that separates groups of folders.Namespaces allow "
--"KMail for example to display your personal folders and shared folders in one "
--"account."
--msgstr ""
--"您在這裡可以看到您的 IMAP "
--"伺服器上的不同的命名空間(namespace)。每一個都代表不同的群組與資料夾。命名空間可以讓您在一個帳號中同時顯示個人資料夾與共用的資料夾。"
-+"namespace represents a prefix that separates groups of folders.Namespaces "
-+"allow KMail for example to display your personal folders and shared folders "
-+"in one account."
-+msgstr ""
-+"您在這裡可以看到您的 IMAP 伺服器上的不同的命名空間(namespace)。每一個都代表不"
-+"同的群組與資料夾。命名空間可以讓您在一個帳號中同時顯示個人資料夾與共用的資料"
-+"夾。"
- 
- #: accountdialog.cpp:914
- msgid "Reload the namespaces from the server. This overwrites any changes."
-@@ -470,14 +476,16 @@
- 
- #: accountdialog.cpp:999
- msgid "Load attach&ments on demand"
--msgstr "有需要才載入附加檔 (&M)"
-+msgstr "有需要才載入附加檔(&M)"
- 
- #: accountdialog.cpp:1001
- msgid ""
--"Activate this to load attachments not automatically when you select the email "
--"but only when you click on the attachment. This way also big emails are shown "
--"instantly."
--msgstr "如果您開啟這個選項，附加檔只有在您點選它的時候才會下載下來。這樣一些很大的信件也可以很快地顯示。"
-+"Activate this to load attachments not automatically when you select the "
-+"email but only when you click on the attachment. This way also big emails "
-+"are shown instantly."
-+msgstr ""
-+"如果您開啟這個選項，附加檔只有在您點選它的時候才會下載下來。這樣一些很大的信"
-+"件也可以很快地顯示。"
- 
- #: accountdialog.cpp:1009
- msgid "List only open folders"
-@@ -487,7 +495,9 @@
- msgid ""
- "Only folders that are open (expanded) in the folder tree are checked for "
- "subfolders. Use this if there are many folders on the server."
--msgstr "只列出已展開的資料夾中的子目錄。如果您系統上有很多很多資料夾的話，就可以使用這個選項。"
-+msgstr ""
-+"只列出已展開的資料夾中的子目錄。如果您系統上有很多很多資料夾的話，就可以使用"
-+"這個選項。"
- 
- #: accountdialog.cpp:1044
- msgid "Include in manual mail chec&k"
-@@ -523,36 +533,41 @@
- msgid ""
- "The server does not seem to support unique message numbers, but this is a "
- "requirement for leaving messages on the server.\n"
--"Since some servers do not correctly announce their capabilities you still have "
--"the possibility to turn leaving fetched messages on the server on."
-+"Since some servers do not correctly announce their capabilities you still "
-+"have the possibility to turn leaving fetched messages on the server on."
- msgstr ""
--"這個伺服器似乎不支援單一的信件編號，但是如果您要將信件留在伺服器上的話，這個功能是必要的。\n"
--"不過有些伺服器可能也搞不清楚它們到底有沒有支援這個功能，您還是可以試試將這個功能打開。"
-+"這個伺服器似乎不支援單一的信件編號，但是如果您要將信件留在伺服器上的話，這個"
-+"功能是必要的。\n"
-+"不過有些伺服器可能也搞不清楚它們到底有沒有支援這個功能，您還是可以試試將這個"
-+"功能打開。"
- 
- #: accountdialog.cpp:1470
- msgid ""
- "The server does not seem to support fetching message headers, but this is a "
- "requirement for filtering messages on the server.\n"
--"Since some servers do not correctly announce their capabilities you still have "
--"the possibility to turn filtering messages on the server on."
-+"Since some servers do not correctly announce their capabilities you still "
-+"have the possibility to turn filtering messages on the server on."
- msgstr ""
- "這個伺服器不提供信件的標頭，但是如果您要過濾信件的話，這個功能是必要的。\n"
--"不過有些伺服器可能也搞不清楚它們到底有沒有支援這個功能，您還是可以試試將這個功能打開。"
-+"不過有些伺服器可能也搞不清楚它們到底有沒有支援這個功能，您還是可以試試將這個"
-+"功能打開。"
- 
- #: accountdialog.cpp:1485
- msgid ""
--"Please note that this feature can cause some POP3 servers that do not support "
--"pipelining to send corrupted mail;\n"
-+"Please note that this feature can cause some POP3 servers that do not "
-+"support pipelining to send corrupted mail;\n"
- "this is configurable, though, because some servers support pipelining but do "
- "not announce their capabilities. To check whether your POP3 server announces "
- "pipelining support use the \"Check What the Server Supports\" button at the "
- "bottom of the dialog;\n"
--"if your server does not announce it, but you want more speed, then you should "
--"do some testing first by sending yourself a batch of mail and downloading it."
-+"if your server does not announce it, but you want more speed, then you "
-+"should do some testing first by sending yourself a batch of mail and "
-+"downloading it."
- msgstr ""
- "請注意，這個功能可能會導致一些不支援此功能的 POP3 伺服器送信時發生問題。\n"
- "您可以用「檢查伺服器提供的協定」來看看這個伺服器有沒有提供此功能。\n"
--"不過有些伺服器可能也搞不清楚它們到底有沒有支援這個功能，您還是可以試試將這個功能打開。只是建議您先送一些測試信件來確保不會發生問題。"
-+"不過有些伺服器可能也搞不清楚它們到底有沒有支援這個功能，您還是可以試試將這個"
-+"功能打開。只是建議您先送一些測試信件來確保不會發生問題。"
- 
- #: accountdialog.cpp:1538 accountdialog.cpp:1557
- msgid "Please specify a server and port on the General tab first."
-@@ -560,39 +575,43 @@
- 
- #: accountdialog.cpp:1640
- msgid ""
--"The server does not seem to support pipelining; therefore, this option has been "
--"disabled.\n"
--"Since some servers do not correctly announce their capabilities you still have "
--"the possibility to turn pipelining on. But please note that this feature can "
--"cause some POP servers that do not support pipelining to send corrupt messages. "
--"So before using this feature with important mail you should first test it by "
--"sending yourself a larger number of test messages which you all download in one "
--"go from the POP server."
-+"The server does not seem to support pipelining; therefore, this option has "
-+"been disabled.\n"
-+"Since some servers do not correctly announce their capabilities you still "
-+"have the possibility to turn pipelining on. But please note that this "
-+"feature can cause some POP servers that do not support pipelining to send "
-+"corrupt messages. So before using this feature with important mail you "
-+"should first test it by sending yourself a larger number of test messages "
-+"which you all download in one go from the POP server."
- msgstr ""
- "這個伺服器似乎不支援管線下載功能，所以此功能已被關閉。\n"
--"不過有些伺服器可能也搞不清楚它們到底有沒有支援這個功能，您還是可以試試將這個功能打開。只是建議您先送一些測試信件來確保不會發生問題。"
-+"不過有些伺服器可能也搞不清楚它們到底有沒有支援這個功能，您還是可以試試將這個"
-+"功能打開。只是建議您先送一些測試信件來確保不會發生問題。"
- 
- #: accountdialog.cpp:1659
- msgid ""
- "The server does not seem to support unique message numbers, but this is a "
--"requirement for leaving messages on the server; therefore, this option has been "
--"disabled.\n"
--"Since some servers do not correctly announce their capabilities you still have "
--"the possibility to turn leaving fetched messages on the server on."
-+"requirement for leaving messages on the server; therefore, this option has "
-+"been disabled.\n"
-+"Since some servers do not correctly announce their capabilities you still "
-+"have the possibility to turn leaving fetched messages on the server on."
- msgstr ""
--"這個伺服器似乎不支援單一的信件編號，但是如果您要將信件留在伺服器上的話，這個功能是必要的。\n"
--"不過有些伺服器可能也搞不清楚它們到底有沒有支援這個功能，您還是可以試試將這個功能打開。"
-+"這個伺服器似乎不支援單一的信件編號，但是如果您要將信件留在伺服器上的話，這個"
-+"功能是必要的。\n"
-+"不過有些伺服器可能也搞不清楚它們到底有沒有支援這個功能，您還是可以試試將這個"
-+"功能打開。"
- 
- #: accountdialog.cpp:1672
- msgid ""
- "The server does not seem to support fetching message headers, but this is a "
- "requirement for filtering messages on the server; therefore, this option has "
- "been disabled.\n"
--"Since some servers do not correctly announce their capabilities you still have "
--"the possibility to turn filtering messages on the server on."
-+"Since some servers do not correctly announce their capabilities you still "
-+"have the possibility to turn filtering messages on the server on."
- msgstr ""
- "這個伺服器不提供信件的標頭，但是如果您要過濾信件的話，這個功能是必要的。\n"
--"不過有些伺服器可能也搞不清楚它們到底有沒有支援這個功能，您還是可以試試將這個功能打開。"
-+"不過有些伺服器可能也搞不清楚它們到底有沒有支援這個功能，您還是可以試試將這個"
-+"功能打開。"
- 
- #: accountdialog.cpp:1734 vacationdialog.cpp:163
- msgid ""
-@@ -622,7 +641,7 @@
- 
- #: accountdialog.cpp:2119
- msgid "Fetching Namespaces..."
--msgstr "讀取命名空間..."
-+msgstr "讀取命名空間…"
- 
- #: accountdialog.cpp:2180
- msgid "Empty"
-@@ -666,8 +685,8 @@
- 
- #: accountmanager.cpp:308
- msgid ""
--"You need to add an account in the network section of the settings in order to "
--"receive mail."
-+"You need to add an account in the network section of the settings in order "
-+"to receive mail."
- msgstr "您必須在設定的網路區段中加入一個帳號才可接收信件。"
- 
- #: accountwizard.cpp:87
-@@ -704,10 +723,12 @@
- 
- #: accountwizard.cpp:195
- msgid ""
--"<qt>It seems you have started KMail for the first time. You can use this wizard "
--"to setup your mail accounts. Just enter the connection data that you received "
--"from your email provider into the following pages.</qt>"
--msgstr "<qt>您似乎是第一次使用 KMail。您可以利用這個精靈來設定您的信件帳號。您只要輸入連線的資料即可。</qt>"
-+"<qt>It seems you have started KMail for the first time. You can use this "
-+"wizard to setup your mail accounts. Just enter the connection data that you "
-+"received from your email provider into the following pages.</qt>"
-+msgstr ""
-+"<qt>您似乎是第一次使用 KMail。您可以利用這個精靈來設定您的信件帳號。您只要輸"
-+"入連線的資料即可。</qt>"
- 
- #: accountwizard.cpp:200
- msgid "Welcome"
-@@ -755,7 +776,7 @@
- 
- #: accountwizard.cpp:283
- msgid "Choose..."
--msgstr "選擇..."
-+msgstr "選擇…"
- 
- #: accountwizard.cpp:292
- msgid "Outgoing server:"
-@@ -781,7 +802,7 @@
- 
- #: accountwizard.cpp:519 accountwizard.cpp:530 accountwizard.cpp:543
- msgid "Check for supported security capabilities of %1..."
--msgstr "檢查 %1 是否支援加密功能..."
-+msgstr "檢查 %1 是否支援加密功能…"
- 
- #: actionscheduler.cpp:598 kmfiltermgr.cpp:152 kmfiltermgr.cpp:255
- #: kmfiltermgr.cpp:293
-@@ -848,7 +869,7 @@
- 
- #: antispamwizard.cpp:493
- msgid "Scanning for %1..."
--msgstr "掃描 %1 中..."
-+msgstr "掃描 %1 中…"
- 
- #: antispamwizard.cpp:524
- msgid "Scanning for anti-spam tools finished."
-@@ -906,21 +927,22 @@
- 
- #: antispamwizard.cpp:864
- msgid ""
--"<p>Here you can get some assistance in setting up KMail's filter rules to use "
--"some commonly-known anti-virus tools.</p>"
--"<p>The wizard can detect those tools on your computer as well as create filter "
--"rules to classify messages using these tools and to separate messages "
--"containing viruses. The wizard will not take any existing filter rules into "
--"consideration: it will always append the new rules.</p>"
--"<p><b>Warning:</b> As KMail appears to be frozen during the scan of the "
--"messages for viruses, you may encounter problems with the responsiveness of "
--"KMail because anti-virus tool operations are usually time consuming; please "
--"consider deleting the filter rules created by the wizard to get back to the "
--"former behavior."
--msgstr ""
--"<p>在這裡您可以設定 KMail 的一些過濾規則，以使用常見的防毒工具。</p>"
--"<p>這個精靈可以偵測這些工具，並產生過濾規則，來協助隔離病毒信件。這個精靈將不會影響已經存在的過濾規則，它會把新的規則放到最後面。</p>"
--"<p><b>警告：</b>KMail 在掃毒的過程中可能會停止一段時間沒有回應，因為掃毒通常都很耗時。如果經常發生這種狀況，您可能要考慮將這些規則拿掉。</p>"
-+"<p>Here you can get some assistance in setting up KMail's filter rules to "
-+"use some commonly-known anti-virus tools.</p><p>The wizard can detect those "
-+"tools on your computer as well as create filter rules to classify messages "
-+"using these tools and to separate messages containing viruses. The wizard "
-+"will not take any existing filter rules into consideration: it will always "
-+"append the new rules.</p><p><b>Warning:</b> As KMail appears to be frozen "
-+"during the scan of the messages for viruses, you may encounter problems with "
-+"the responsiveness of KMail because anti-virus tool operations are usually "
-+"time consuming; please consider deleting the filter rules created by the "
-+"wizard to get back to the former behavior."
-+msgstr ""
-+"<p>在這裡您可以設定 KMail 的一些過濾規則，以使用常見的防毒工具。</p><p>這個精"
-+"靈可以偵測這些工具，並產生過濾規則，來協助隔離病毒信件。這個精靈將不會影響已"
-+"經存在的過濾規則，它會把新的規則放到最後面。</p><p><b>警告：</b>KMail 在掃毒"
-+"的過程中可能會停止一段時間沒有回應，因為掃毒通常都很耗時。如果經常發生這種狀"
-+"況，您可能要考慮將這些規則拿掉。</p>"
- 
- #: antispamwizard.cpp:915
- msgid ""
-@@ -952,13 +974,12 @@
- 
- #: antispamwizard.cpp:964
- msgid ""
--"The default folder is the inbox folder, but you may change that in the folder "
--"view below."
--"<p>Not all tools support a classification as unsure. If you haven't selected a "
--"capable tool, you can't select a folder as well."
-+"The default folder is the inbox folder, but you may change that in the "
-+"folder view below.<p>Not all tools support a classification as unsure. If "
-+"you haven't selected a capable tool, you can't select a folder as well."
- msgstr ""
--"不確定信的預設去處為收件匣，不過您可以改變它。"
--"<p>不是所有的偵測軟體都有「標記為不確定(unsure)」的功能，如果您選擇的工具沒有這個功能，您就無法選擇資料夾。"
-+"不確定信的預設去處為收件匣，不過您可以改變它。<p>不是所有的偵測軟體都有「標記"
-+"為不確定(unsure)」的功能，如果您選擇的工具沒有這個功能，您就無法選擇資料夾。"
- 
- #: antispamwizard.cpp:1064
- msgid "Check messages using the anti-virus tools"
-@@ -968,9 +989,11 @@
- msgid ""
- "Let the anti-virus tools check your messages. The wizard will create "
- "appropriate filters. The messages are usually marked by the tools so that "
--"following filters can react on this and, for example, move virus messages to a "
--"special folder."
--msgstr "讓防毒軟體檢查您的信件。這個精靈會產生適當的過濾規則來執行防毒。信件會經由防毒工具標記，並透過過濾規則來隔離到特定的資料夾。"
-+"following filters can react on this and, for example, move virus messages to "
-+"a special folder."
-+msgstr ""
-+"讓防毒軟體檢查您的信件。這個精靈會產生適當的過濾規則來執行防毒。信件會經由防"
-+"毒工具標記，並透過過濾規則來隔離到特定的資料夾。"
- 
- #: antispamwizard.cpp:1072
- msgid "Move detected viral messages to the selected folder"
-@@ -979,9 +1002,11 @@
- #: antispamwizard.cpp:1074
- msgid ""
- "A filter to detect messages classified as virus-infected and to move those "
--"messages into a predefined folder is created. The default folder is the trash "
--"folder, but you may change that in the folder view."
--msgstr "已產生一個新的過濾規則，將標記為病毒的信件搬到特定的資料夾中。預設的去處為資源回收桶，但您可以改變它。"
-+"messages into a predefined folder is created. The default folder is the "
-+"trash folder, but you may change that in the folder view."
-+msgstr ""
-+"已產生一個新的過濾規則，將標記為病毒的信件搬到特定的資料夾中。預設的去處為資"
-+"源回收桶，但您可以改變它。"
- 
- #: antispamwizard.cpp:1080
- msgid "Additionally, mark detected viral messages as read"
-@@ -989,8 +1014,8 @@
- 
- #: antispamwizard.cpp:1083
- msgid ""
--"Mark messages which have been classified as virus-infected as read, as well as "
--"moving them to the selected folder."
-+"Mark messages which have been classified as virus-infected as read, as well "
-+"as moving them to the selected folder."
- msgstr "將標記為病毒的信件搬移到資料夾的同時標記成已讀。"
- 
- #: cachedimapjob.cpp:220 cachedimapjob.cpp:271 cachedimapjob.cpp:825
-@@ -1014,7 +1039,9 @@
- "This could be because you do not have permission to do this, or because the "
- "folder is already present on the server; the error message from the server "
- "communication is here:"
--msgstr "這有可能是您在伺服器上的權限不足，或試圖建立已存在的資料夾。從伺服器上傳來的錯誤訊息為："
-+msgstr ""
-+"這有可能是您在伺服器上的權限不足，或試圖建立已存在的資料夾。從伺服器上傳來的"
-+"錯誤訊息為："
- 
- #: cachedimapjob.cpp:626
- msgid "Error while deleting folder %1 on the server: "
-@@ -1031,15 +1058,19 @@
- 
- #: callback.cpp:170
- msgid ""
--"<qt>None of your identities match the receiver of this message,"
--"<br>please choose which of the following addresses is yours, if any:"
--msgstr "<qt>收件人中沒有一個符合您所設定的身份。<br>請從以下的地址中選擇您的電子郵件地址："
-+"<qt>None of your identities match the receiver of this message,<br>please "
-+"choose which of the following addresses is yours, if any:"
-+msgstr ""
-+"<qt>收件人中沒有一個符合您所設定的身分。<br>請從以下的地址中選擇您的電子郵件"
-+"地址："
- 
- #: callback.cpp:176
- msgid ""
--"<qt>Several of your identities match the receiver of this message,"
--"<br>please choose which of the following addresses is yours:"
--msgstr "<qt>有一個以上的收件人符合您所設定的身份。<br>請從以下的地址中選擇您的電子郵件地址："
-+"<qt>Several of your identities match the receiver of this message,<br>please "
-+"choose which of the following addresses is yours:"
-+msgstr ""
-+"<qt>有一個以上的收件人符合您所設定的身分。<br>請從以下的地址中選擇您的電子郵"
-+"件地址："
- 
- #: callback.cpp:183
- msgid "Select Address"
-@@ -1068,23 +1099,24 @@
- 
- #: configuredialog.cpp:155
- msgid ""
--"<qt>"
--"<p>This setting has been fixed by your administrator.</p>"
--"<p>If you think this is an error, please contact him.</p></qt>"
--msgstr "<qt><p>這個設定已經被您的管理者修改過。</p><p>如果您覺得有問題，請與他聯絡。</p></qt>"
-+"<qt><p>This setting has been fixed by your administrator.</p><p>If you think "
-+"this is an error, please contact him.</p></qt>"
-+msgstr ""
-+"<qt><p>這個設定已經被您的管理者修改過。</p><p>如果您覺得有問題，請與他聯絡。"
-+"</p></qt>"
- 
- #: configuredialog.cpp:217
- msgid "&Load Profile..."
--msgstr "載入設定檔(&L)..."
-+msgstr "載入設定檔(&L)…"
- 
- #: configuredialog.cpp:305 simplestringlisteditor.cpp:85
- msgid "&Add..."
--msgstr "新增(&A)..."
-+msgstr "新增(&A)…"
- 
- #: configuredialog.cpp:306 configuredialog.cpp:625 configuredialog.cpp:1096
- #: configuredialog.cpp:3165 simplestringlisteditor.cpp:108
- msgid "&Modify..."
--msgstr "修改(&M)..."
-+msgstr "修改(&M)…"
- 
- #: configuredialog.cpp:307
- msgid "&Rename"
-@@ -1100,19 +1132,19 @@
- 
- #: configuredialog.cpp:450
- msgid "<qt>Do you really want to remove the identity named <b>%1</b>?</qt>"
--msgstr "<qt>您確定要移除名為 <b>%1</b> 的身份？</qt>"
-+msgstr "<qt>您確定要移除名為 <b>%1</b> 的身分？</qt>"
- 
- #: configuredialog.cpp:452
- msgid "Remove Identity"
--msgstr "移除身份(&R)"
-+msgstr "移除身分(&R)"
- 
- #: configuredialog.cpp:493 configuredialog.cpp:3114
- msgid "Add..."
--msgstr "新增..."
-+msgstr "新增…"
- 
- #: configuredialog.cpp:495 configuredialog.cpp:3116
- msgid "Modify..."
--msgstr "修改..."
-+msgstr "修改…"
- 
- #: configuredialog.cpp:499
- msgid "Set as Default"
-@@ -1148,11 +1180,11 @@
- #: configuredialog.cpp:618 configuredialog.cpp:1089 configuredialog.cpp:2836
- #: configuredialog.cpp:3087 configuredialog.cpp:3164 configuredialog.cpp:3498
- msgid "A&dd..."
--msgstr "新增(&D)..."
-+msgstr "新增(&D)…"
- 
- #: configuredialog.cpp:633 configuredialog.cpp:1104
- msgid "R&emove"
--msgstr "移除(&E)..."
-+msgstr "移除(&E)…"
- 
- #: configuredialog.cpp:640
- msgid "Set Default"
-@@ -1214,14 +1246,14 @@
- 
- #: configuredialog.cpp:717
- msgid ""
--"<qt>"
--"<p>The default domain is used to complete email addresses that only consist of "
--"the user's name.</p></qt>"
-+"<qt><p>The default domain is used to complete email addresses that only "
-+"consist of the user's name.</p></qt>"
- msgstr "<qt><p>預設域名是用來補齊所輸入的電子郵件地址。</p></qt>"
- 
- #: configuredialog.cpp:741
- msgid ""
--"_: %1: name; %2: number appended to it to make it unique among a list of names\n"
-+"_: %1: name; %2: number appended to it to make it unique among a list of "
-+"names\n"
- "%1 %2"
- msgstr "%2 %1"
- 
-@@ -1239,9 +1271,9 @@
- 
- #: configuredialog.cpp:830
- msgid ""
--"_: %1: type of transport. Result used in Configure->Accounts->"
--"Sending listview, \"type\" column, first row, to indicate that this is the "
--"default transport\n"
-+"_: %1: type of transport. Result used in Configure->Accounts->Sending "
-+"listview, \"type\" column, first row, to indicate that this is the default "
-+"transport\n"
- "%1 (Default)"
- msgstr "%1 (預設)"
- 
-@@ -1254,14 +1286,14 @@
- msgid ""
- "_n: This identity has been changed to use the modified transport:\n"
- "These %n identities have been changed to use the modified transport:"
--msgstr "以下 %n 個身份使用的送信帳號已被變更："
-+msgstr "以下 %n 個身分使用的送信帳號已被變更："
- 
- #: configuredialog.cpp:921
- #, c-format
- msgid ""
- "_n: This identity has been changed to use the default transport:\n"
- "These %n identities have been changed to use the default transport:"
--msgstr "以下 %n 個身份已經被設定為使用預設的送信帳號："
-+msgstr "以下 %n 個身分已經被設定為使用預設的送信帳號："
- 
- #: configuredialog.cpp:1066
- msgid "Incoming accounts (add at least one):"
-@@ -1509,11 +1541,11 @@
- 
- #: configuredialog.cpp:1855
- msgid "Lon&g folder list"
--msgstr "資料夾長列表 (&G)"
-+msgstr "資料夾長列表(&G)"
- 
- #: configuredialog.cpp:1856
- msgid "Shor&t folder list"
--msgstr "資料夾短列表 (&T)"
-+msgstr "資料夾短列表(&T)"
- 
- #: configuredialog.cpp:1865
- msgid "Abo&ve the message pane"
-@@ -1525,7 +1557,7 @@
- 
- #: configuredialog.cpp:1869
- msgid "Message Structure Viewer Placement"
--msgstr "信件結構列表放在..."
-+msgstr "信件結構列表放在…"
- 
- #: configuredialog.cpp:1874
- msgid "Show &never"
-@@ -1625,8 +1657,8 @@
- 
- #: configuredialog.cpp:2046
- msgid ""
--"Open threads that contain ne&w, unread or important messages and open watched "
--"threads."
-+"Open threads that contain ne&w, unread or important messages and open "
-+"watched threads."
- msgstr "展開內含有新的、未讀的、或是有重要信件的討論串(&W)"
- 
- #: configuredialog.cpp:2056
-@@ -1635,72 +1667,51 @@
- 
- #: configuredialog.cpp:2073
- msgid ""
--"<qt>"
--"<p><strong>These expressions may be used for the date:</strong></p>"
--"<ul>"
--"<li>d - the day as a number without a leading zero (1-31)</li>"
--"<li>dd - the day as a number with a leading zero (01-31)</li>"
--"<li>ddd - the abbreviated day name (Mon - Sun)</li>"
--"<li>dddd - the long day name (Monday - Sunday)</li>"
--"<li>M - the month as a number without a leading zero (1-12)</li>"
--"<li>MM - the month as a number with a leading zero (01-12)</li>"
--"<li>MMM - the abbreviated month name (Jan - Dec)</li>"
--"<li>MMMM - the long month name (January - December)</li>"
--"<li>yy - the year as a two digit number (00-99)</li>"
--"<li>yyyy - the year as a four digit number (0000-9999)</li></ul>"
--"<p><strong>These expressions may be used for the time:</string></p> "
--"<ul>"
--"<li>h - the hour without a leading zero (0-23 or 1-12 if AM/PM display)</li>"
--"<li>hh - the hour with a leading zero (00-23 or 01-12 if AM/PM display)</li>"
--"<li>m - the minutes without a leading zero (0-59)</li>"
--"<li>mm - the minutes with a leading zero (00-59)</li>"
--"<li>s - the seconds without a leading zero (0-59)</li>"
--"<li>ss - the seconds with a leading zero (00-59)</li>"
--"<li>z - the milliseconds without leading zeroes (0-999)</li>"
--"<li>zzz - the milliseconds with leading zeroes (000-999)</li>"
--"<li>AP - switch to AM/PM display. AP will be replaced by either \"AM\" or "
--"\"PM\".</li>"
--"<li>ap - switch to AM/PM display. ap will be replaced by either \"am\" or "
--"\"pm\".</li>"
--"<li>Z - time zone in numeric form (-0500)</li></ul>"
--"<p><strong>All other input characters will be ignored.</strong></p></qt>"
--msgstr ""
--"<qt>"
--"<p><strong>以下表示法用於表示日期：</strong></p> "
--"<ul>"
--"<li>d - 日 (不含開頭的 0) (1-31)</li>"
--"<li>dd - 日 (含開頭的 0)(01-31)</li>"
--"<li>ddd - 縮寫星期幾</li>"
--"<li>dddd - 完整表示星期幾</li>"
--"<li>M - 月 (不含開頭的 0) (1-12)</li>"
--"<li>MM - 月 (含開頭的 0) (01-12)</li>"
--"<li>MMM - 縮寫月份</li>"
--"<li>MMMM - 完整表示月份</li>"
--"<li>yy - 年份後兩碼</li>"
--"<li>yyyy - 完整表示年份</li></li>"
--"<p><strong>以下表示法用於表示時間：</strong></p>"
--"<ul>"
--"<li>h - 時 (不含開頭的 0) (0-23 或 1-12)</li>"
--"<li>hh - 時 (含開頭的 0) (00-23 或 01-12) </li>"
--"<li>m - 分 (不含開頭的 0) (0-59)</li>"
--"<li>mm - 分 (含開頭的 0) (00-59)</li>"
--"<li>s - 秒 (不含開頭的 0) (0-59)</li>"
--"<li>ss - 秒 (含開頭的 0) (00-59)</li>"
--"<li>z - 毫秒 (不含開頭的 0) (0-999)</li>"
--"<li>zzz - 毫秒 (含開頭的 0) (000-999)</li>"
--"<li>AP - 顯示上午或下午。AP會被取代為 AM 或 PM</li>"
--"<li>ap - 同 AP 但為小寫</li>"
--"<li>Z - 時區 (以數字顯示，如 +0800)</li></ul>"
--"<p><strong>其他的輸入字元都會被忽略</strong></p></qt>"
-+"<qt><p><strong>These expressions may be used for the date:</strong></"
-+"p><ul><li>d - the day as a number without a leading zero (1-31)</li><li>dd - "
-+"the day as a number with a leading zero (01-31)</li><li>ddd - the "
-+"abbreviated day name (Mon - Sun)</li><li>dddd - the long day name (Monday - "
-+"Sunday)</li><li>M - the month as a number without a leading zero (1-12)</"
-+"li><li>MM - the month as a number with a leading zero (01-12)</li><li>MMM - "
-+"the abbreviated month name (Jan - Dec)</li><li>MMMM - the long month name "
-+"(January - December)</li><li>yy - the year as a two digit number (00-99)</"
-+"li><li>yyyy - the year as a four digit number (0000-9999)</li></"
-+"ul><p><strong>These expressions may be used for the time:</string></p> "
-+"<ul><li>h - the hour without a leading zero (0-23 or 1-12 if AM/PM display)</"
-+"li><li>hh - the hour with a leading zero (00-23 or 01-12 if AM/PM display)</"
-+"li><li>m - the minutes without a leading zero (0-59)</li><li>mm - the "
-+"minutes with a leading zero (00-59)</li><li>s - the seconds without a "
-+"leading zero (0-59)</li><li>ss - the seconds with a leading zero (00-59)</"
-+"li><li>z - the milliseconds without leading zeroes (0-999)</li><li>zzz - the "
-+"milliseconds with leading zeroes (000-999)</li><li>AP - switch to AM/PM "
-+"display. AP will be replaced by either \"AM\" or \"PM\".</li><li>ap - switch "
-+"to AM/PM display. ap will be replaced by either \"am\" or \"pm\".</li><li>Z "
-+"- time zone in numeric form (-0500)</li></ul><p><strong>All other input "
-+"characters will be ignored.</strong></p></qt>"
-+msgstr ""
-+"<qt><p><strong>以下表示法用於表示日期：</strong></p> <ul><li>d - 日 (不含開頭"
-+"的 0) (1-31)</li><li>dd - 日 (含開頭的 0)(01-31)</li><li>ddd - 縮寫星期幾</"
-+"li><li>dddd - 完整表示星期幾</li><li>M - 月 (不含開頭的 0) (1-12)</li><li>MM "
-+"- 月 (含開頭的 0) (01-12)</li><li>MMM - 縮寫月份</li><li>MMMM - 完整表示月份"
-+"</li><li>yy - 年份後兩碼</li><li>yyyy - 完整表示年份</li></li><p><strong>以下"
-+"表示法用於表示時間：</strong></p><ul><li>h - 時 (不含開頭的 0) (0-23 或 1-12)"
-+"</li><li>hh - 時 (含開頭的 0) (00-23 或 01-12) </li><li>m - 分 (不含開頭的 "
-+"0) (0-59)</li><li>mm - 分 (含開頭的 0) (00-59)</li><li>s - 秒 (不含開頭的 0) "
-+"(0-59)</li><li>ss - 秒 (含開頭的 0) (00-59)</li><li>z - 毫秒 (不含開頭的 0) "
-+"(0-999)</li><li>zzz - 毫秒 (含開頭的 0) (000-999)</li><li>AP - 顯示上午或下"
-+"午。AP會被取代為 AM 或 PM</li><li>ap - 同 AP 但為小寫</li><li>Z - 時區 (以數"
-+"字顯示，如 +0800)</li></ul><p><strong>其他的輸入字元都會被忽略</strong></p></"
-+"qt>"
- 
- #: configuredialog.cpp:2187
- msgid ""
--"Changing the global threading setting will override all folder specific values."
-+"Changing the global threading setting will override all folder specific "
-+"values."
- msgstr "改變全域的同主題討論串設定，將會覆蓋過個別資料夾之前的同主題設定。"
- 
- #: configuredialog.cpp:2224
- msgid "Show HTML stat&us bar"
--msgstr "顯示 HTML 狀態列 (&U)"
-+msgstr "顯示 HTML 狀態列(&U)"
- 
- #: configuredialog.cpp:2228
- msgid "Show s&pam status in fancy headers"
-@@ -1788,7 +1799,7 @@
- 
- #: configuredialog.cpp:2669 kmlineeditspell.cpp:136
- msgid "Edit Recent Addresses..."
--msgstr "編輯最近常用的位址..."
-+msgstr "編輯最近常用的位址…"
- 
- #: configuredialog.cpp:2676 kmedit.cpp:540
- msgid "External Editor"
-@@ -1801,20 +1812,18 @@
- 
- #: configuredialog.cpp:2817
- msgid ""
--"<qt>The following placeholders are supported in the reply phrases:"
--"<br><b>%D</b>: date, <b>%S</b>: subject,"
--"<br><b>%e</b>: sender's address, <b>%F</b>: sender's name, <b>%f</b>"
--": sender's initials,"
--"<br><b>%T</b>: recipient's name, <b>%t</b>: recipient's name and address,"
--"<br><b>%C</b>: carbon copy names, <b>%c</b>: carbon copy names and addresses,"
--"<br><b>%%</b>: percent sign, <b>%_</b>: space, <b>%L</b>: linebreak</qt>"
--msgstr ""
--"<qt>回覆片語中支援下列保留符號："
--"<br> <b>%D</b>=日期，<b>%S</b>=主題，"
--"<br> <b>%e</b>=寄件者位址，<b>%F</b>=寄件者姓名，%f</b>=寄件者姓氏，"
--"<br> <b>%T</b>=收件者姓名，<b>%t</b>=收件者姓名及位址，"
--"<br> <b>%C</b>=複本收件者姓名，<b>%c</b>=複本收件者姓名及位址，"
--"<br> <b>%%</b>=百分比符號，<b>%_</b>=空格，<b>%L</b>=換行</qt>"
-+"<qt>The following placeholders are supported in the reply phrases:<br><b>%D</"
-+"b>: date, <b>%S</b>: subject,<br><b>%e</b>: sender's address, <b>%F</b>: "
-+"sender's name, <b>%f</b>: sender's initials,<br><b>%T</b>: recipient's name, "
-+"<b>%t</b>: recipient's name and address,<br><b>%C</b>: carbon copy names, <b>"
-+"%c</b>: carbon copy names and addresses,<br><b>%%</b>: percent sign, <b>%_</"
-+"b>: space, <b>%L</b>: linebreak</qt>"
-+msgstr ""
-+"<qt>回覆片語中支援下列保留符號：<br> <b>%D</b>=日期，<b>%S</b>=主題，<br> <b>"
-+"%e</b>=寄件者位址，<b>%F</b>=寄件者姓名，%f</b>=寄件者姓氏，<br> <b>%T</b>=收"
-+"件者姓名，<b>%t</b>=收件者姓名及位址，<br> <b>%C</b>=複本收件者姓名，<b>%c</"
-+"b>=複本收件者姓名及位址，<br> <b>%%</b>=百分比符號，<b>%_</b>=空格，<b>%L</"
-+"b>=換列</qt>"
- 
- #: configuredialog.cpp:2830
- msgid "Lang&uage:"
-@@ -1873,7 +1882,7 @@
- 
- #: configuredialog.cpp:3088 configuredialog.cpp:3499
- msgid "Mod&ify..."
--msgstr "修改(&I)..."
-+msgstr "修改(&I)…"
- 
- #: configuredialog.cpp:3089
- msgid "Enter new reply prefix:"
-@@ -1889,8 +1898,8 @@
- 
- #: configuredialog.cpp:3156
- msgid ""
--"This list is checked for every outgoing message from the top to the bottom for "
--"a charset that contains all required characters."
-+"This list is checked for every outgoing message from the top to the bottom "
-+"for a charset that contains all required characters."
- msgstr "這個列表將會由上而下的檢查每封寄出信件的字元集內含所有要求的字元"
- 
- #: configuredialog.cpp:3165
-@@ -1945,8 +1954,8 @@
- 
- #: configuredialog.cpp:3471
- msgid ""
--"Turn this option on to make Outlook(tm) understand attachment names containing "
--"non-English characters"
-+"Turn this option on to make Outlook(tm) understand attachment names "
-+"containing non-English characters"
- msgstr "這個選項是確保 Outlook 在非英語字元集的信件中認得附檔。"
- 
- #: configuredialog.cpp:3482
-@@ -1973,15 +1982,16 @@
- 
- #: configuredialog.cpp:3542
- msgid ""
--"You have chosen to encode attachment names containing non-English characters in "
--"a way that is understood by Outlook(tm) and other mail clients that do not "
--"support standard-compliant encoded attachment names.\n"
--"Note that KMail may create non-standard compliant messages, and consequently it "
--"is possible that your messages will not be understood by standard-compliant "
--"mail clients; so, unless you have no other choice, you should not enable this "
--"option."
-+"You have chosen to encode attachment names containing non-English characters "
-+"in a way that is understood by Outlook(tm) and other mail clients that do "
-+"not support standard-compliant encoded attachment names.\n"
-+"Note that KMail may create non-standard compliant messages, and consequently "
-+"it is possible that your messages will not be understood by standard-"
-+"compliant mail clients; so, unless you have no other choice, you should not "
-+"enable this option."
- msgstr ""
--"您已經選擇使用 Outlook(tm) 可認得的附加檔名稱，要注意其他的收發信軟體可能會不認得附加檔。\n"
-+"您已經選擇使用 Outlook(tm) 可認得的附加檔名稱，要注意其他的收發信軟體可能會不"
-+"認得附加檔。\n"
- "所以，除非是不得已，否則不建議您開啟這個選項。"
- 
- #: configuredialog.cpp:3569
-@@ -2006,88 +2016,79 @@
- 
- #: configuredialog.cpp:3624
- msgid ""
--"<qt>"
--"<p>Messages sometimes come in both formats. This option controls whether you "
--"want the HTML part or the plain text part to be displayed.</p>"
--"<p>Displaying the HTML part makes the message look better, but at the same time "
--"increases the risk of security holes being exploited.</p>"
--"<p>Displaying the plain text part loses much of the message's formatting, but "
--"makes it almost <em>impossible</em> to exploit security holes in the HTML "
--"renderer (Konqueror).</p>"
--"<p>The option below guards against one common misuse of HTML messages, but it "
--"cannot guard against security issues that were not known at the time this "
--"version of KMail was written.</p>"
--"<p>It is therefore advisable to <em>not</em> prefer HTML to plain text.</p>"
--"<p><b>Note:</b> You can set this option on a per-folder basis from the <i>"
--"Folder</i> menu of KMail's main window.</p></qt>"
--msgstr ""
--"<qt>"
--"<p>有時信件中會同時含有 HTML 與純文字格式。這個選項讓您選擇您要顯示哪一部份。</p> "
--"<p>顯示 HTML 部份會比較好看，不過會有安全上的風險。</p> "
--"<p>顯示純文字部份有可能會把格式打亂，但是安全性相對提高許多。</p> "
--"<p>雖然目前已經設法解決一些安全上的問題，但是還是有可能有其他目前尚未被發現的安全漏洞存在。</p> "
--"<p>因此，建議<em>不要</em>開啟 HTML 預覽。</p> "
--"<p><b>注意：</b>您可以針對每個資料夾，在 KMail 的<i>資料夾</i>設定目錄中做不同的設定。</p></qt>"
-+"<qt><p>Messages sometimes come in both formats. This option controls whether "
-+"you want the HTML part or the plain text part to be displayed.</"
-+"p><p>Displaying the HTML part makes the message look better, but at the same "
-+"time increases the risk of security holes being exploited.</p><p>Displaying "
-+"the plain text part loses much of the message's formatting, but makes it "
-+"almost <em>impossible</em> to exploit security holes in the HTML renderer "
-+"(Konqueror).</p><p>The option below guards against one common misuse of HTML "
-+"messages, but it cannot guard against security issues that were not known at "
-+"the time this version of KMail was written.</p><p>It is therefore advisable "
-+"to <em>not</em> prefer HTML to plain text.</p><p><b>Note:</b> You can set "
-+"this option on a per-folder basis from the <i>Folder</i> menu of KMail's "
-+"main window.</p></qt>"
-+msgstr ""
-+"<qt><p>有時信件中會同時含有 HTML 與純文字格式。這個選項讓您選擇您要顯示哪一部"
-+"份。</p> <p>顯示 HTML 部份會比較好看，不過會有安全上的風險。</p> <p>顯示純文"
-+"字部份有可能會把格式打亂，但是安全性相對提高許多。</p> <p>雖然目前已經設法解"
-+"決一些安全上的問題，但是還是有可能有其他目前尚未被發現的安全漏洞存在。</p> "
-+"<p>因此，建議<em>不要</em>開啟 HTML 預覽。</p> <p><b>注意：</b>您可以針對每個"
-+"資料夾，在 KMail 的<i>資料夾</i>設定目錄中做不同的設定。</p></qt>"
- 
- #: configuredialog.cpp:3641
- msgid ""
--"<qt>"
--"<p>Some mail advertisements are in HTML and contain references to, for example, "
--"images that the advertisers employ to find out that you have read their message "
--"(&quot;web bugs&quot;).</p>"
--"<p>There is no valid reason to load images off the Internet like this, since "
--"the sender can always attach the required images directly to the message.</p>"
--"<p>To guard from such a misuse of the HTML displaying feature of KMail, this "
--"option is <em>disabled</em> by default.</p>"
--"<p>However, if you wish to, for example, view images in HTML messages that were "
--"not attached to it, you can enable this option, but you should be aware of the "
--"possible problem.</p></qt>"
--msgstr ""
--"<qt>"
--"<p>有些垃圾信件是用 HTML 格式，並且內含一些從遠端載入的圖片，如此發信者可以確定收件人有開啟該封信件。(這又稱之為&quot;web "
--"bugs&quot;)。</p> "
--"<p>不過實際上他們可以把圖檔直接夾在信件中，我們實在沒有理由讓發信者這樣浪費網路頻寬。</p> "
--"<p>因此，在 KMail 顯示設定中，預設是將遠端載入圖片的功能關閉的。</p>"
--"<p>您還是可以選擇將這個功能打開。</p></qt>"
-+"<qt><p>Some mail advertisements are in HTML and contain references to, for "
-+"example, images that the advertisers employ to find out that you have read "
-+"their message (&quot;web bugs&quot;).</p><p>There is no valid reason to load "
-+"images off the Internet like this, since the sender can always attach the "
-+"required images directly to the message.</p><p>To guard from such a misuse "
-+"of the HTML displaying feature of KMail, this option is <em>disabled</em> by "
-+"default.</p><p>However, if you wish to, for example, view images in HTML "
-+"messages that were not attached to it, you can enable this option, but you "
-+"should be aware of the possible problem.</p></qt>"
-+msgstr ""
-+"<qt><p>有些垃圾信件是用 HTML 格式，並且內含一些從遠端載入的圖片，如此發信者可"
-+"以確定收件人有開啟該封信件。(這又稱之為&quot;web bugs&quot;)。</p> <p>不過實"
-+"際上他們可以把圖檔直接夾在信件中，我們實在沒有理由讓發信者這樣浪費網路頻寬。"
-+"</p> <p>因此，在 KMail 顯示設定中，預設是將遠端載入圖片的功能關閉的。</p><p>"
-+"您還是可以選擇將這個功能打開。</p></qt>"
- 
- #: configuredialog.cpp:3654
- msgid ""
--"<qt>"
--"<h3>Message Disposition Notification Policy</h3>"
--"<p>MDNs are a generalization of what is commonly called <b>read receipt</b>"
--". The message author requests a disposition notification to be sent and the "
--"receiver's mail program generates a reply from which the author can learn what "
--"happened to his message. Common disposition types include <b>displayed</b> "
--"(i.e. read), <b>deleted</b> and <b>dispatched</b> (e.g. forwarded).</p>"
--"<p>The following options are available to control KMail's sending of MDNs:</p>"
--"<ul>"
--"<li><em>Ignore</em>: Ignores any request for disposition notifications. No MDN "
--"will ever be sent automatically (recommended).</li>"
--"<li><em>Ask</em>: Answers requests only after asking the user for permission. "
--"This way, you can send MDNs for selected messages while denying or ignoring "
--"them for others.</li>"
--"<li><em>Deny</em>: Always sends a <b>denied</b> notification. This is only <em>"
--"slightly</em> better than always sending MDNs. The author will still know that "
--"the messages has been acted upon, he just cannot tell whether it was deleted or "
--"read etc.</li>"
--"<li><em>Always send</em>: Always sends the requested disposition notification. "
--"That means that the author of the message gets to know when the message was "
--"acted upon and, in addition, what happened to it (displayed, deleted, etc.). "
--"This option is strongly discouraged, but since it makes much sense e.g. for "
--"customer relationship management, it has been made available.</li></ul></qt>"
--msgstr ""
--"<qt>"
--"<h3>信件處理通知(MDN)</h3>"
--"<p>MDN 有點像張收據。發信人在信件中加入 MDN，而收信人的收信軟體會發出一個通知給發信人，告訴發信人這封信是被收件人如何處理。通常處理的方式包括：<b>"
--"被顯示</b>（也就是被開啟）、<b>被刪除</b>以及<b>被發送</b>（也就是被轉寄）。</p> "
--"<p>KMail 可以依如下選項選擇要如何回應 MDN：</p> "
--"<ul>"
--"<li><em>忽略</em>：忽略任何 MDN 的要求。KMail 不會回覆任何 MDN 要求。（建議選項）</li> "
--"<li><em>詢問使用者</em>：詢問使用者是否要回覆 MDN。</li> "
--"<li><em>回覆拒絕</em>：對所有 MDN 都回覆<b>拒絕</b>(denied)。這其實只比「自動回覆」要好<em>一點點</em>"
--"而已，KMail 還是會對每個 MDN 都做回覆，只是發信人分不出這封信是被開啟還是直接被刪除。</li> "
--"<li><em>自動回覆</em>：系統會自動回覆 "
--"MDN。我們完全不建議使用這個選項，但是因為這對處理顧客回應之類的事情是有作用的，所以還是讓您選擇。</li></ul></qt>"
-+"<qt><h3>Message Disposition Notification Policy</h3><p>MDNs are a "
-+"generalization of what is commonly called <b>read receipt</b>. The message "
-+"author requests a disposition notification to be sent and the receiver's "
-+"mail program generates a reply from which the author can learn what happened "
-+"to his message. Common disposition types include <b>displayed</b> (i.e. "
-+"read), <b>deleted</b> and <b>dispatched</b> (e.g. forwarded).</p><p>The "
-+"following options are available to control KMail's sending of MDNs:</"
-+"p><ul><li><em>Ignore</em>: Ignores any request for disposition "
-+"notifications. No MDN will ever be sent automatically (recommended).</"
-+"li><li><em>Ask</em>: Answers requests only after asking the user for "
-+"permission. This way, you can send MDNs for selected messages while denying "
-+"or ignoring them for others.</li><li><em>Deny</em>: Always sends a "
-+"<b>denied</b> notification. This is only <em>slightly</em> better than "
-+"always sending MDNs. The author will still know that the messages has been "
-+"acted upon, he just cannot tell whether it was deleted or read etc.</"
-+"li><li><em>Always send</em>: Always sends the requested disposition "
-+"notification. That means that the author of the message gets to know when "
-+"the message was acted upon and, in addition, what happened to it (displayed, "
-+"deleted, etc.). This option is strongly discouraged, but since it makes much "
-+"sense e.g. for customer relationship management, it has been made available."
-+"</li></ul></qt>"
-+msgstr ""
-+"<qt><h3>信件處理通知(MDN)</h3><p>MDN 有點像張收據。發信人在信件中加入 MDN，而"
-+"收信人的收信軟體會發出一個通知給發信人，告訴發信人這封信是被收件人如何處理。"
-+"通常處理的方式包括：<b>被顯示</b>（也就是被開啟）、<b>被刪除</b>以及<b>被發送"
-+"</b>（也就是被轉寄）。</p> <p>KMail 可以依如下選項選擇要如何回應 MDN：</p> "
-+"<ul><li><em>忽略</em>：忽略任何 MDN 的要求。KMail 不會回覆任何 MDN 要求。（建"
-+"議選項）</li> <li><em>詢問使用者</em>：詢問使用者是否要回覆 MDN。</li> "
-+"<li><em>回覆拒絕</em>：對所有 MDN 都回覆<b>拒絕</b>(denied)。這其實只比「自動"
-+"回覆」要好<em>一點點</em>而已，KMail 還是會對每個 MDN 都做回覆，只是發信人分"
-+"不出這封信是被開啟還是直接被刪除。</li> <li><em>自動回覆</em>：系統會自動回"
-+"覆 MDN。我們完全不建議使用這個選項，但是因為這對處理顧客回應之類的事情是有作"
-+"用的，所以還是讓您選擇。</li></ul></qt>"
- 
- #: configuredialog.cpp:3687
- msgid "HTML Messages"
-@@ -2103,14 +2104,15 @@
- 
- #: configuredialog.cpp:3699
- msgid ""
--"<b>WARNING:</b> Allowing HTML in email may increase the risk that your system "
--"will be compromised by present and anticipated security exploits. <a "
--"href=\"whatsthis:%1\">More about HTML mails...</a> <a href=\"whatsthis:%2\">"
--"More about external references...</a>"
--msgstr ""
--"<b>警告：</b> 在信件中使用 HTML 將會使你更容易受到的攻擊， 並且有可能會增加你的系統被其他已存在和將來的安全漏洞危害的機會。 請參閱<a "
--"href=\"whatsthis:%1\">關於 HTML 信件...</a>，<a href=\"whatsthis:%2\">關於遠端連結...</a>"
--"，取得選項進一步的資訊。"
-+"<b>WARNING:</b> Allowing HTML in email may increase the risk that your "
-+"system will be compromised by present and anticipated security exploits. <a "
-+"href=\"whatsthis:%1\">More about HTML mails...</a> <a href=\"whatsthis:%2"
-+"\">More about external references...</a>"
-+msgstr ""
-+"<b>警告：</b> 在信件中使用 HTML 將會使你更容易受到的攻擊， 並且有可能會增加你"
-+"的系統被其他已存在和將來的安全漏洞危害的機會。 請參閱<a href=\"whatsthis:%1"
-+"\">關於 HTML 信件...</a>，<a href=\"whatsthis:%2\">關於遠端連結...</a>，取得"
-+"選項進一步的資訊。"
- 
- #: configuredialog.cpp:3711
- msgid "Encrypted Messages"
-@@ -2130,7 +2132,7 @@
- 
- #: configuredialog.cpp:3732 kmmessage.cpp:1361 kmmessage.cpp:1368
- msgid "&Ignore"
--msgstr "忽略 (&I)"
-+msgstr "忽略(&I)"
- 
- #: configuredialog.cpp:3735
- msgid "As&k"
-@@ -2169,7 +2171,8 @@
- "<b>WARNING:</b> Unconditionally returning confirmations undermines your "
- "privacy. <a href=\"whatsthis:%1\">More...</a>"
- msgstr ""
--"<b>警告：</b> 無條件的傳回確認，將會逐漸的破壞你的隱私。請參閱<a href=\"whatsthis:%1\">相關文件</a>取得更進一步的資訊。"
-+"<b>警告：</b> 無條件的傳回確認，將會逐漸的破壞你的隱私。請參閱<a href="
-+"\"whatsthis:%1\">相關文件</a>取得更進一步的資訊。"
- 
- #: configuredialog.cpp:3786
- msgid "Certificate && Key Bundle Attachments"
-@@ -2218,8 +2221,8 @@
- 
- #: configuredialog.cpp:4467
- msgid ""
--"_: to be continued with \"do not loop\", \"loop in current folder\", and \"loop "
--"in all folders\".\n"
-+"_: to be continued with \"do not loop\", \"loop in current folder\", and "
-+"\"loop in all folders\".\n"
- "When trying to find unread messages:"
- msgstr "尋找未讀信件時："
- 
-@@ -2243,8 +2246,8 @@
- 
- #: configuredialog.cpp:4487
- msgid ""
--"_: to be continued with \"jump to first new message\", \"jump to first unread "
--"or new message\",and \"jump to last selected message\".\n"
-+"_: to be continued with \"jump to first new message\", \"jump to first "
-+"unread or new message\",and \"jump to last selected message\".\n"
- "When entering a folder:"
- msgstr "進入資料夾時："
- 
-@@ -2299,22 +2302,19 @@
- #: configuredialog.cpp:4537
- msgid ""
- "_: what's this help\n"
--"<qt>"
--"<p>This selects which mailbox format will be the default for local folders:</p>"
--"<p><b>mbox:</b> KMail's mail folders are represented by a single file each. "
--"Individual messages are separated from each other by a line starting with "
--"\"From \". This saves space on disk, but may be less robust, e.g. when moving "
--"messages between folders.</p>"
--"<p><b>maildir:</b> KMail's mail folders are represented by real folders on "
--"disk. Individual messages are separate files. This may waste a bit of space on "
--"disk, but should be more robust, e.g. when moving messages between folders.</p>"
--"</qt>"
--msgstr ""
--"<qt>"
--"<p>這個選項決定預設的資料夾格式：</p> "
--"<p><b>mbox:</b>每個資料夾用一個檔案來表示。檔案中用 From: "
--"標頭來區隔每封信。這樣比較節省空間，但是在不同資料夾間搬移信件時比較麻煩。</p> "
--"<p><b>maildir:</b>每個資料夾在硬碟中都有一個目錄。每一封信都用一個檔案。這樣比較佔硬碟空間，但是比較簡單省事。</p></qt>"
-+"<qt><p>This selects which mailbox format will be the default for local "
-+"folders:</p><p><b>mbox:</b> KMail's mail folders are represented by a single "
-+"file each. Individual messages are separated from each other by a line "
-+"starting with \"From \". This saves space on disk, but may be less robust, e."
-+"g. when moving messages between folders.</p><p><b>maildir:</b> KMail's mail "
-+"folders are represented by real folders on disk. Individual messages are "
-+"separate files. This may waste a bit of space on disk, but should be more "
-+"robust, e.g. when moving messages between folders.</p></qt>"
-+msgstr ""
-+"<qt><p>這個選項決定預設的資料夾格式：</p> <p><b>mbox:</b>每個資料夾用一個檔案"
-+"來表示。檔案中用 From: 標頭來區隔每封信。這樣比較節省空間，但是在不同資料夾間"
-+"搬移信件時比較麻煩。</p> <p><b>maildir:</b>每個資料夾在硬碟中都有一個目錄。每"
-+"一封信都用一個檔案。這樣比較佔硬碟空間，但是比較簡單省事。</p></qt>"
- 
- #: configuredialog.cpp:4562
- msgid "Open this folder on startup:"
-@@ -2347,44 +2347,38 @@
- #: configuredialog.cpp:4601
- msgid ""
- "_: what's this help\n"
--"<qt>"
--"<p>When jumping to the next unread message, it may occur that no more unread "
--"messages are below the current message.</p>"
--"<p><b>Do not loop:</b> The search will stop at the last message in the current "
--"folder.</p>"
--"<p><b>Loop in current folder:</b> The search will continue at the top of the "
--"message list, but not go to another folder.</p>"
--"<p><b>Loop in all folders:</b> The search will continue at the top of the "
--"message list. If no unread messages are found it will then continue to the next "
--"folder.</p>"
--"<p>Similarly, when searching for the previous unread message, the search will "
--"start from the bottom of the message list and continue to the previous folder "
--"depending on which option is selected.</p></qt>"
--msgstr ""
--"<qt>"
--"<p>當要跳到下一封未讀信件時，如果找不到未讀信件：</p> "
--"<p><b>不做循環檢查：</b>在找完目前資料夾後，就停止尋找。</p> "
--"<p><b>循環檢查目前的資料夾：</b>從目前資料夾的第一封繼續尋找，但不會跳到其他的資料夾去。</p> "
--"<p><b>循環檢查所有的資料夾：</b>跳到其他的資料夾的第一封開始尋找。</p> "
--"<p>同樣的，如果往前找到第一封信之後，它會看選項決定是要在同一個資料夾的最後一封信繼續往前找，還是跳下一個資料夾的最後一封信，還是就停止找尋。</p>"
--"</qt>"
-+"<qt><p>When jumping to the next unread message, it may occur that no more "
-+"unread messages are below the current message.</p><p><b>Do not loop:</b> The "
-+"search will stop at the last message in the current folder.</p><p><b>Loop in "
-+"current folder:</b> The search will continue at the top of the message list, "
-+"but not go to another folder.</p><p><b>Loop in all folders:</b> The search "
-+"will continue at the top of the message list. If no unread messages are "
-+"found it will then continue to the next folder.</p><p>Similarly, when "
-+"searching for the previous unread message, the search will start from the "
-+"bottom of the message list and continue to the previous folder depending on "
-+"which option is selected.</p></qt>"
-+msgstr ""
-+"<qt><p>當要跳到下一封未讀信件時，如果找不到未讀信件：</p> <p><b>不做循環檢"
-+"查：</b>在找完目前資料夾後，就停止尋找。</p> <p><b>循環檢查目前的資料夾：</b>"
-+"從目前資料夾的第一封繼續尋找，但不會跳到其他的資料夾去。</p> <p><b>循環檢查所"
-+"有的資料夾：</b>跳到其他的資料夾的第一封開始尋找。</p> <p>同樣的，如果往前找"
-+"到第一封信之後，它會看選項決定是要在同一個資料夾的最後一封信繼續往前找，還是"
-+"跳下一個資料夾的最後一封信，還是就停止找尋。</p></qt>"
- 
- #: configuredialog.cpp:4618
- msgid ""
- "_: what's this help\n"
--"<qt>"
--"<p>Full text indexing allows very fast searches on the content of your "
--"messages. When enabled, the search dialog will work very fast. Also, the search "
--"tool bar will select messages based on content.</p>"
--"<p>It takes up a certain amount of disk space (about half the disk space for "
--"the messages).</p>"
--"<p>After enabling, the index will need to be built, but you can continue to use "
--"KMail while this operation is running.</p></qt>"
--msgstr ""
--"<qt>"
--"<p>全文檢索可以在搜尋信件內容時變得快很多，搜尋工具列也可以依據信件內容來選擇信件。</p> "
--"<p>不過要建立索引會佔用不少硬碟空間(大約要信件大小的一半)。</p>"
--"<p>開啟這個選項後，要建立索引，不過建索引的同時您可以繼續使用 KMail。</p></qt>"
-+"<qt><p>Full text indexing allows very fast searches on the content of your "
-+"messages. When enabled, the search dialog will work very fast. Also, the "
-+"search tool bar will select messages based on content.</p><p>It takes up a "
-+"certain amount of disk space (about half the disk space for the messages).</"
-+"p><p>After enabling, the index will need to be built, but you can continue "
-+"to use KMail while this operation is running.</p></qt>"
-+msgstr ""
-+"<qt><p>全文檢索可以在搜尋信件內容時變得快很多，搜尋工具列也可以依據信件內容來"
-+"選擇信件。</p> <p>不過要建立索引會佔用不少硬碟空間(大約要信件大小的一半)。</"
-+"p><p>開啟這個選項後，要建立索引，不過建索引的同時您可以繼續使用 KMail。</p></"
-+"qt>"
- 
- #: configuredialog.cpp:4694
- msgid "&IMAP Resource Folder Options"
-@@ -2417,7 +2411,7 @@
- 
- #: configuredialog.cpp:4731
- msgid "&Language of the groupware folders:"
--msgstr "群組資料夾的語言 (&L)"
-+msgstr "群組資料夾的語言(&L)"
- 
- #: configuredialog.cpp:4734
- msgid "Set the language of the folder names"
-@@ -2425,19 +2419,19 @@
- 
- #: configuredialog.cpp:4743
- msgid "English"
--msgstr "英文"
-+msgstr "英語"
- 
- #: configuredialog.cpp:4743
- msgid "German"
--msgstr "德文"
-+msgstr "德語"
- 
- #: configuredialog.cpp:4743
- msgid "French"
--msgstr "法文"
-+msgstr "法語"
- 
- #: configuredialog.cpp:4743
- msgid "Dutch"
--msgstr "荷蘭文"
-+msgstr "荷蘭語"
- 
- #: configuredialog.cpp:4752
- msgid "Set the parent of the resource folders"
-@@ -2449,8 +2443,8 @@
- 
- #: configuredialog.cpp:4785
- msgid ""
--"When this is checked, you will not see the IMAP resource folders in the folder "
--"tree."
-+"When this is checked, you will not see the IMAP resource folders in the "
-+"folder tree."
- msgstr "勾選這個選項，您就看不到 IMAP 的資源資料夾。"
- 
- #: configuredialog.cpp:4792
-@@ -2459,8 +2453,8 @@
- 
- #: configuredialog.cpp:4796
- msgid ""
--"When this is checked, you will not see normal  mail folders in the folder tree "
--"for the account configured for groupware."
-+"When this is checked, you will not see normal  mail folders in the folder "
-+"tree for the account configured for groupware."
- msgstr "勾選這個選項，您就看不到設定為群組的此帳號的一般郵件資料夾。"
- 
- #: configuredialog.cpp:4804
-@@ -2509,13 +2503,14 @@
- #: configuredialog.cpp:4847 rc.cpp:685
- #, no-c-format
- msgid ""
--"Microsoft Outlook, when used in combination with a Microsoft Exchange server, "
--"has a problem understanding standards-compliant groupware e-mail. Turn this "
--"option on to send groupware invitations in a way that Microsoft Exchange "
--"understands."
--msgstr ""
--"Microsoft Outlook 在與 Microsoft Exchange 伺服器一起使用時，會有個關於解讀群組電子郵件的問題。開啟此選項則會以 "
--"Microsoft Exchange 瞭解的方式來送出群組邀請函。"
-+"Microsoft Outlook, when used in combination with a Microsoft Exchange "
-+"server, has a problem understanding standards-compliant groupware e-mail. "
-+"Turn this option on to send groupware invitations in a way that Microsoft "
-+"Exchange understands."
-+msgstr ""
-+"Microsoft Outlook 在與 Microsoft Exchange 伺服器一起使用時，會有個關於解讀群"
-+"組電子郵件的問題。開啟此選項則會以 Microsoft Exchange 瞭解的方式來送出群組邀"
-+"請函。"
- 
- #. i18n: file kmail.kcfg line 188
- #: configuredialog.cpp:4853 rc.cpp:688
-@@ -2531,18 +2526,19 @@
- 
- #: configuredialog.cpp:4867
- msgid ""
--"<qt>Invitations are normally sent as attachments to a mail. This switch changes "
--"the invitation mails to be sent in the text of the mail instead; this is "
--"necessary to send invitations and replies to Microsoft Outlook."
-+"<qt>Invitations are normally sent as attachments to a mail. This switch "
-+"changes the invitation mails to be sent in the text of the mail instead; "
-+"this is necessary to send invitations and replies to Microsoft Outlook."
- "<br>But, when you do this, you no longer get descriptive text that mail "
--"programs can read; so, to people who have email programs that do not understand "
--"the invitations, the resulting messages look very odd."
--"<br>People that have email programs that do understand invitations will still "
--"be able to work with this.</qt>"
--msgstr ""
--"<qt>邀請函(invitiations) 通常是用附檔的方式傳送的。這個選項可以讓您把邀請函改成直接用信件內文來傳送。如果對方是用 Microsoft "
--"Outlook，那麼傳送邀請函與回覆就必需用這種方式。"
--"<br> 不過，使用這種方式，其他軟體收信的人就有可能看到一團糟的東西。</qt>"
-+"programs can read; so, to people who have email programs that do not "
-+"understand the invitations, the resulting messages look very odd.<br>People "
-+"that have email programs that do understand invitations will still be able "
-+"to work with this.</qt>"
-+msgstr ""
-+"<qt>邀請函(invitiations) 通常是用附檔的方式傳送的。這個選項可以讓您把邀請函改"
-+"成直接用信件內文來傳送。如果對方是用 Microsoft Outlook，那麼傳送邀請函與回覆"
-+"就必需用這種方式。<br> 不過，使用這種方式，其他軟體收信的人就有可能看到一團糟"
-+"的東西。</qt>"
- 
- #: configuredialog.cpp:4922
- msgid "<Choose a Folder>"
-@@ -2558,11 +2554,11 @@
- 
- #: configuredialog_p.cpp:43
- msgid "New Identity"
--msgstr "新身份"
-+msgstr "新身分"
- 
- #: configuredialog_p.cpp:54
- msgid "&New identity:"
--msgstr "新身份(&N)："
-+msgstr "新身分(&N)："
- 
- #: configuredialog_p.cpp:63
- msgid "&With empty fields"
-@@ -2574,11 +2570,11 @@
- 
- #: configuredialog_p.cpp:74
- msgid "&Duplicate existing identity"
--msgstr "複製現有身份(&D)"
-+msgstr "複製現有身分(&D)"
- 
- #: configuredialog_p.cpp:83
- msgid "&Existing identities:"
--msgstr "現有身份(&E)："
-+msgstr "現有身分(&E)："
- 
- #: configuredialog_p.cpp:196
- msgid "New Language"
-@@ -2646,23 +2642,22 @@
- 
- #: customtemplates.cpp:93
- msgid ""
--"<qt>"
--"<p>Here you can add, edit, and delete custom message templates to use when you "
--"compose a reply or forwarding message. Create the custom template by selecting "
--"it using the right mouse  button menu or toolbar menu. Also, you can bind a "
--"keyboard combination to the template for faster operations.</p>"
--"<p>Message templates support substitution commands by simple typing them or "
--"selecting them from menu <i>Insert command</i>.</p>"
--"<p>There are four types of custom templates: used to <i>Reply</i>, <i>"
--"Reply to All</i>, <i>Forward</i>, and <i>Universal</i> "
--"which can be used for all kind of operations. You cannot bind keyboard shortcut "
--"to <i>Universal</i> templates.</p></qt>"
--msgstr ""
--"<qt>"
--"<p>您可以在此新增、編輯與刪除自訂信件樣本，以用於編寫回覆或轉寄信件。用滑鼠右鍵選擇按鍵選單或工具列選單以建立自訂樣本。此外，您也可以指定樣本的組合鍵以提高效"
--"率。</p> "
--"<p>信件樣本支援替代指令，只要輸入或從選單中選取<i>插入指令</i>即可。</p> "
--"<p>有四種型態的自訂樣本：<i>回覆</i>、<i>全部回覆</i>、<i>轉寄</i>與<i>通用</i>。您無法指定<i>通用</i>的樣本。"
-+"<qt><p>Here you can add, edit, and delete custom message templates to use "
-+"when you compose a reply or forwarding message. Create the custom template "
-+"by selecting it using the right mouse  button menu or toolbar menu. Also, "
-+"you can bind a keyboard combination to the template for faster operations.</"
-+"p><p>Message templates support substitution commands by simple typing them "
-+"or selecting them from menu <i>Insert command</i>.</p><p>There are four "
-+"types of custom templates: used to <i>Reply</i>, <i>Reply to All</i>, "
-+"<i>Forward</i>, and <i>Universal</i> which can be used for all kind of "
-+"operations. You cannot bind keyboard shortcut to <i>Universal</i> templates."
-+"</p></qt>"
-+msgstr ""
-+"<qt><p>您可以在此新增、編輯與刪除自訂信件樣本，以用於編寫回覆或轉寄信件。用滑"
-+"鼠右鍵選擇按鍵選單或工具列選單以建立自訂樣本。此外，您也可以指定樣本的組合鍵"
-+"以提高效率。</p> <p>信件樣本支援替代指令，只要輸入或從選單中選取<i>插入指令</"
-+"i>即可。</p> <p>有四種型態的自訂樣本：<i>回覆</i>、<i>全部回覆</i>、<i>轉寄</"
-+"i>與<i>通用</i>。您無法指定<i>通用</i>的樣本。"
- 
- #: customtemplates.cpp:107 templatesconfiguration.cpp:105
- msgid "<a href=\"whatsthis:%1\">How does this work?</a>"
-@@ -2734,7 +2729,9 @@
- msgid ""
- "KMail is unable to detect when the choosen editor is closed. To avoid data "
- "loss, editing the attachment will be aborted."
--msgstr "KMail 無法偵測到選取的編輯器會在何時關閉。為了避免資料遺失，將會中止編輯附件。"
-+msgstr ""
-+"KMail 無法偵測到選取的編輯器會在何時關閉。為了避免資料遺失，將會中止編輯附"
-+"件。"
- 
- #: editorwatcher.cpp:170
- msgid "Unable to edit attachment"
-@@ -2804,13 +2801,13 @@
- msgid ""
- "_: @item Text character set\n"
- "Chinese Traditional"
--msgstr "繁體中文"
-+msgstr "傳統字漢語"
- 
- #: encodingdetector.cpp:1343
- msgid ""
- "_: @item Text character set\n"
- "Chinese Simplified"
--msgstr "簡體中文"
-+msgstr "簡化字漢語"
- 
- #: encodingdetector.cpp:1346
- msgid ""
-@@ -2828,7 +2825,7 @@
- msgid ""
- "_n: Removing 1 old message from folder %1...\n"
- "Removing %n old messages from folder %1..."
--msgstr "移除資料夾 %1 中 %n 封舊信件..."
-+msgstr "移除資料夾 %1 中 %n 封舊信件…"
- 
- #: expirejob.cpp:171
- msgid "Cannot expire messages from folder %1: destination folder %2 not found"
-@@ -2838,7 +2835,7 @@
- msgid ""
- "_n: Moving 1 old message from folder %1 to folder %2...\n"
- "Moving %n old messages from folder %1 to folder %2..."
--msgstr "移動資料夾 %1 中 %n 封舊信件到資料夾 %2..."
-+msgstr "移動資料夾 %1 中 %n 封舊信件到資料夾 %2…"
- 
- #: expirejob.cpp:214
- msgid ""
-@@ -2923,7 +2920,7 @@
- 
- #: favoritefolderview.cpp:337 kmfoldertree.cpp:1153 kmmainwidget.cpp:2767
- msgid "&Assign Shortcut..."
--msgstr "設定捷徑(&A)..."
-+msgstr "設定捷徑(&A)…"
- 
- #: favoritefolderview.cpp:338 kmfoldertree.cpp:1158
- msgid "Expire..."
-@@ -2931,7 +2928,7 @@
- 
- #: favoritefolderview.cpp:341
- msgid "Add Favorite Folder..."
--msgstr "新增我的最愛資料夾..."
-+msgstr "新增我的最愛資料夾…"
- 
- #: favoritefolderview.cpp:395
- msgid "Local Inbox"
-@@ -2986,8 +2983,8 @@
- 
- #: filterlogdlg.cpp:79
- msgid ""
--"You can turn logging of filter activities on and off here. Of course, log data "
--"is collected and shown only when logging is turned on. "
-+"You can turn logging of filter activities on and off here. Of course, log "
-+"data is collected and shown only when logging is turned on. "
- msgstr "您可以打開過濾紀錄功能。打開後過濾信件都將會有紀錄。"
- 
- #: filterlogdlg.cpp:83
-@@ -3004,11 +3001,14 @@
- 
- #: filterlogdlg.cpp:105
- msgid ""
--"You can control the feedback in the log concerning the evaluation of the filter "
--"rules of applied filters: having this option checked will give detailed "
--"feedback for each single filter rule; alternatively, only feedback about the "
--"result of the evaluation of all rules of a single filter will be given."
--msgstr "您可以控制要怎麼紀錄過濾的動作：這個選項打開後會紀錄跟每一個規則比對的結果，否則就只紀錄符合的規則。"
-+"You can control the feedback in the log concerning the evaluation of the "
-+"filter rules of applied filters: having this option checked will give "
-+"detailed feedback for each single filter rule; alternatively, only feedback "
-+"about the result of the evaluation of all rules of a single filter will be "
-+"given."
-+msgstr ""
-+"您可以控制要怎麼紀錄過濾的動作：這個選項打開後會紀錄跟每一個規則比對的結果，"
-+"否則就只紀錄符合的規則。"
- 
- #: filterlogdlg.cpp:112
- msgid "Log filter pattern evaluation"
-@@ -3028,11 +3028,13 @@
- 
- #: filterlogdlg.cpp:144
- msgid ""
--"Collecting log data uses memory to temporarily store the log data; here you can "
--"limit the maximum amount of memory to be used: if the size of the collected log "
--"data exceeds this limit then the oldest data will be discarded until the limit "
--"is no longer exceeded. "
--msgstr "要紀錄過濾資料需要使用記憶體，這裡您可以限制使用記憶體的大小。如果超過的話，會將最舊的紀錄丟棄。"
-+"Collecting log data uses memory to temporarily store the log data; here you "
-+"can limit the maximum amount of memory to be used: if the size of the "
-+"collected log data exceeds this limit then the oldest data will be discarded "
-+"until the limit is no longer exceeded. "
-+msgstr ""
-+"要紀錄過濾資料需要使用記憶體，這裡您可以限制使用記憶體的大小。如果超過的話，"
-+"會將最舊的紀錄丟棄。"
- 
- #: filterlogdlg.cpp:258
- msgid ""
-@@ -3079,14 +3081,16 @@
- 
- #: folderdiaacltab.cpp:95
- msgid "&User identifier:"
--msgstr "使用者身份(&U)："
-+msgstr "使用者身分(&U)："
- 
- #: folderdiaacltab.cpp:101
- msgid ""
--"The User Identifier is the login of the user on the IMAP server. This can be a "
--"simple user name or the full email address of the user; the login for your own "
--"account on the server will tell you which one it is."
--msgstr "使用者身份是要登入 IMAP 伺服器的身份。可以是簡單的使用者名稱，或是整個電子信件地址。您登入的 IMAP 伺服器會告訴你要用哪一個。"
-+"The User Identifier is the login of the user on the IMAP server. This can be "
-+"a simple user name or the full email address of the user; the login for your "
-+"own account on the server will tell you which one it is."
-+msgstr ""
-+"使用者身分是要登入 IMAP 伺服器的身分。可以是簡單的使用者名稱，或是整個電子信"
-+"件地址。您登入的 IMAP 伺服器會告訴你要用哪一個。"
- 
- #: folderdiaacltab.cpp:106 folderdiaacltab.cpp:341
- msgid "Permissions"
-@@ -3106,15 +3110,15 @@
- 
- #: folderdiaacltab.cpp:352
- msgid "Add Entry..."
--msgstr "新增..."
-+msgstr "新增…"
- 
- #: folderdiaacltab.cpp:353
- msgid "Modify Entry..."
--msgstr "修改..."
-+msgstr "修改…"
- 
- #: folderdiaacltab.cpp:354
- msgid "Remove Entry"
--msgstr "移除..."
-+msgstr "移除…"
- 
- #: folderdiaacltab.cpp:426
- msgid "Error retrieving user permissions."
-@@ -3130,7 +3134,7 @@
- 
- #: folderdiaacltab.cpp:452 folderdiaquotatab.cpp:120
- msgid "Connecting to server %1, please wait..."
--msgstr "連接到伺服器 %1。請稍候..."
-+msgstr "連接到伺服器 %1。請稍候…"
- 
- #: folderdiaacltab.cpp:470 folderdiaquotatab.cpp:139
- #: kmfoldercachedimap.cpp:843
-@@ -3159,8 +3163,8 @@
- 
- #: folderdiaacltab.cpp:631
- msgid ""
--"Do you really want to remove your own permissions for this folder? You will not "
--"be able to access it afterwards."
-+"Do you really want to remove your own permissions for this folder? You will "
-+"not be able to access it afterwards."
- msgstr "您確定要移除您對這個資料夾的權限嗎？此後您就無法再存取這個資料夾了。"
- 
- #: folderdiaquotatab.cpp:163 folderdiaquotatab.cpp:177
-@@ -3214,9 +3218,9 @@
- 
- #: foldershortcutdialog.cpp:65
- msgid ""
--"<qt>To choose a key or a combination of keys which select the current folder, "
--"click the button below and then press the key(s) you wish to associate with "
--"this folder.</qt>"
-+"<qt>To choose a key or a combination of keys which select the current "
-+"folder, click the button below and then press the key(s) you wish to "
-+"associate with this folder.</qt>"
- msgstr "<qt>按底下的按鈕，並按下您要設定的熱鍵。</qt>"
- 
- #: foldershortcutdialog.cpp:91 kmfilterdlg.cpp:526 snippetdlg.cpp:93
-@@ -3334,44 +3338,18 @@
- 
- #: htmlstatusbar.cpp:91
- msgid ""
--"<qt><b>"
--"<br>H"
--"<br>T"
--"<br>M"
--"<br>L"
--"<br> "
--"<br>M"
--"<br>e"
--"<br>s"
--"<br>s"
--"<br>a"
--"<br>g"
--"<br>e</b></qt>"
-+"<qt><b><br>H<br>T<br>M<br>L<br> <br>M<br>e<br>s<br>s<br>a<br>g<br>e</b></qt>"
- msgstr "<qt><b><br>H<br>T<br>M<br>L<br> <br>信<br>件</b></qt>"
- 
- #: htmlstatusbar.cpp:94
- msgid ""
--"<qt>"
--"<br>N"
--"<br>o"
--"<br> "
--"<br>H"
--"<br>T"
--"<br>M"
--"<br>L"
--"<br> "
--"<br>M"
--"<br>e"
--"<br>s"
--"<br>s"
--"<br>a"
--"<br>g"
--"<br>e</qt>"
-+"<qt><br>N<br>o<br> <br>H<br>T<br>M<br>L<br> "
-+"<br>M<br>e<br>s<br>s<br>a<br>g<br>e</qt>"
- msgstr "<qt><br>非<br> <br>H<br>T<br>M<br>L<br> <br>信<br>件</b></qt>"
- 
- #: identitydialog.cpp:90
- msgid "Edit Identity"
--msgstr "編輯身份"
-+msgstr "編輯身分"
- 
- #: identitydialog.cpp:118
- msgid "&Your name:"
-@@ -3379,17 +3357,12 @@
- 
- #: identitydialog.cpp:120
- msgid ""
--"<qt>"
--"<h3>Your name</h3>"
--"<p>This field should contain your name as you would like it to appear in the "
--"email header that is sent out;</p>"
--"<p>if you leave this blank your real name will not appear, only the email "
--"address.</p></qt>"
--msgstr ""
--"<qt>"
--"<h3>您的姓名</h3>"
--"<p>這個欄位是您想要顯示在信件標頭中的名稱。</p> "
--"<p>如果空白，則標頭中只會顯示您的電子郵件地址。</p></qt>"
-+"<qt><h3>Your name</h3><p>This field should contain your name as you would "
-+"like it to appear in the email header that is sent out;</p><p>if you leave "
-+"this blank your real name will not appear, only the email address.</p></qt>"
-+msgstr ""
-+"<qt><h3>您的姓名</h3><p>這個欄位是您想要顯示在信件標頭中的名稱。</p> <p>如果"
-+"空白，則標頭中只會顯示您的電子郵件地址。</p></qt>"
- 
- #: identitydialog.cpp:132
- msgid "Organi&zation:"
-@@ -3397,16 +3370,12 @@
- 
- #: identitydialog.cpp:134
- msgid ""
--"<qt>"
--"<h3>Organization</h3>"
--"<p>This field should have the name of your organization if you'd like it to be "
--"shown in the email header that is sent out.</p>"
--"<p>It is safe (and normal) to leave this blank.</p></qt>"
--msgstr ""
--"<qt>"
--"<h3>組織</h3>"
--"<p>如果您要在信件標頭中顯示您所工作的單位名稱，請填寫在這個欄位。</p>"
--"<p>這個欄位留空白並沒有影響。</p></qt>"
-+"<qt><h3>Organization</h3><p>This field should have the name of your "
-+"organization if you'd like it to be shown in the email header that is sent "
-+"out.</p><p>It is safe (and normal) to leave this blank.</p></qt>"
-+msgstr ""
-+"<qt><h3>組織</h3><p>如果您要在信件標頭中顯示您所工作的單位名稱，請填寫在這個"
-+"欄位。</p><p>這個欄位留空白並沒有影響。</p></qt>"
- 
- #: identitydialog.cpp:147
- msgid "&Email address:"
-@@ -3414,16 +3383,12 @@
- 
- #: identitydialog.cpp:149
- msgid ""
--"<qt>"
--"<h3>Email address</h3>"
--"<p>This field should have your full email address.</p>"
--"<p>If you leave this blank, or get it wrong, people will have trouble replying "
--"to you.</p></qt>"
--msgstr ""
--"<qt>"
--"<h3>電子郵件地址</h3>"
--"<p>這個欄位應填入您完整的電子郵件地址。</p>"
--"<p>如果填寫錯誤或留空白，收信人就無法回信給您了。</p></qt>"
-+"<qt><h3>Email address</h3><p>This field should have your full email address."
-+"</p><p>If you leave this blank, or get it wrong, people will have trouble "
-+"replying to you.</p></qt>"
-+msgstr ""
-+"<qt><h3>電子郵件地址</h3><p>這個欄位應填入您完整的電子郵件地址。</p><p>如果填"
-+"寫錯誤或留空白，收信人就無法回信給您了。</p></qt>"
- 
- #: identitydialog.cpp:161
- msgid "Cryptograph&y"
-@@ -3432,7 +3397,7 @@
- #: identitydialog.cpp:168 identitydialog.cpp:192 identitydialog.cpp:217
- #: identitydialog.cpp:243
- msgid "Chang&e..."
--msgstr "修改(&E)..."
-+msgstr "修改(&E)…"
- 
- #: identitydialog.cpp:169
- msgid "Your OpenPGP Signature Key"
-@@ -3445,17 +3410,15 @@
- 
- #: identitydialog.cpp:174
- msgid ""
--"<qt>"
--"<p>The OpenPGP key you choose here will be used to digitally sign messages. You "
--"can also use GnuPG keys.</p>"
--"<p>You can leave this blank, but KMail will not be able to digitally sign "
--"emails using OpenPGP; normal mail functions will not be affected.</p>"
--"<p>You can find out more about keys at <a>http://www.gnupg.org</a></p></qt>"
--msgstr ""
--"<qt>"
--"<p>OpenPGP 金鑰會用來做數位簽章。您也可以使用 GnuPG 金鑰。</p> "
--"<p>這個欄位您可以留白，但 KMail 就無法簽署數位簽章。</p> "
--"<p>更多詳細資料請參閱<a>http://www.gnupg.org</a></p></qt>"
-+"<qt><p>The OpenPGP key you choose here will be used to digitally sign "
-+"messages. You can also use GnuPG keys.</p><p>You can leave this blank, but "
-+"KMail will not be able to digitally sign emails using OpenPGP; normal mail "
-+"functions will not be affected.</p><p>You can find out more about keys at "
-+"<a>http://www.gnupg.org</a></p></qt>"
-+msgstr ""
-+"<qt><p>OpenPGP 金鑰會用來做數位簽章。您也可以使用 GnuPG 金鑰。</p> <p>這個欄"
-+"位您可以留白，但 KMail 就無法簽署數位簽章。</p> <p>更多詳細資料請參閱"
-+"<a>http://www.gnupg.org</a></p></qt>"
- 
- #: identitydialog.cpp:181
- msgid "OpenPGP signing key:"
-@@ -3467,25 +3430,22 @@
- 
- #: identitydialog.cpp:194
- msgid ""
--"Select the OpenPGP key which should be used when encrypting to yourself and for "
--"the \"Attach My Public Key\" feature in the composer."
-+"Select the OpenPGP key which should be used when encrypting to yourself and "
-+"for the \"Attach My Public Key\" feature in the composer."
- msgstr "選取將附加在信件後並用來加密的金鑰"
- 
- #: identitydialog.cpp:199
- msgid ""
--"<qt>"
--"<p>The OpenPGP key you choose here will be used to encrypt messages to yourself "
--"and for the \"Attach My Public Key\" feature in the composer. You can also use "
--"GnuPG keys.</p>"
--"<p>You can leave this blank, but KMail will not be able to encrypt copies of "
--"outgoing messages to you using OpenPGP; normal mail functions will not be "
--"affected.</p>"
--"<p>You can find out more about keys at <a>http://www.gnupg.org</a></qt>"
--msgstr ""
--"<qt>"
--"<p>您所選擇的 OpenPGP 金鑰會用來加密您的信件，並附在信件之後。您也可以使用 GnuPG 金鑰。</p> "
--"<p>您可以將這個欄位留白，不過 KMail 就無法用 OpenPGP 加密。</p> "
--"<p>更多詳細資料請參閱<a>http://www.gnupg.org</a></p></qt>"
-+"<qt><p>The OpenPGP key you choose here will be used to encrypt messages to "
-+"yourself and for the \"Attach My Public Key\" feature in the composer. You "
-+"can also use GnuPG keys.</p><p>You can leave this blank, but KMail will not "
-+"be able to encrypt copies of outgoing messages to you using OpenPGP; normal "
-+"mail functions will not be affected.</p><p>You can find out more about keys "
-+"at <a>http://www.gnupg.org</a></qt>"
-+msgstr ""
-+"<qt><p>您所選擇的 OpenPGP 金鑰會用來加密您的信件，並附在信件之後。您也可以使"
-+"用 GnuPG 金鑰。</p> <p>您可以將這個欄位留白，不過 KMail 就無法用 OpenPGP 加"
-+"密。</p> <p>更多詳細資料請參閱<a>http://www.gnupg.org</a></p></qt>"
- 
- #: identitydialog.cpp:206
- msgid "OpenPGP encryption key:"
-@@ -3503,15 +3463,13 @@
- 
- #: identitydialog.cpp:223
- msgid ""
--"<qt>"
--"<p>The S/MIME (X.509) certificate you choose here will be used to digitally "
--"sign messages.</p>"
--"<p>You can leave this blank, but KMail will not be able to digitally sign "
--"emails using S/MIME; normal mail functions will not be affected.</p></qt>"
--msgstr ""
--"<qt>"
--"<p>您選擇的 S/MIME (X.509) 憑證是用來簽署數位簽章的。</p> "
--"<p>您可以將這個欄位留白，但 KMail 就無法使用 S/MIME 來簽署您的信件。</p></qt>"
-+"<qt><p>The S/MIME (X.509) certificate you choose here will be used to "
-+"digitally sign messages.</p><p>You can leave this blank, but KMail will not "
-+"be able to digitally sign emails using S/MIME; normal mail functions will "
-+"not be affected.</p></qt>"
-+msgstr ""
-+"<qt><p>您選擇的 S/MIME (X.509) 憑證是用來簽署數位簽章的。</p> <p>您可以將這個"
-+"欄位留白，但 KMail 就無法使用 S/MIME 來簽署您的信件。</p></qt>"
- 
- #: identitydialog.cpp:228
- msgid "S/MIME signing certificate:"
-@@ -3523,23 +3481,21 @@
- 
- #: identitydialog.cpp:245
- msgid ""
--"Select the S/MIME certificate which should be used when encrypting to yourself "
--"and for the \"Attach My Certificate\" feature in the composer."
-+"Select the S/MIME certificate which should be used when encrypting to "
-+"yourself and for the \"Attach My Certificate\" feature in the composer."
- msgstr "選取將附加在信件後並用來加密的 S/MIME 憑證"
- 
- #: identitydialog.cpp:250
- msgid ""
--"<qt>"
--"<p>The S/MIME certificate you choose here will be used to encrypt messages to "
--"yourself and for the \"Attach My Certificate\" feature in the composer.</p>"
--"<p>You can leave this blank, but KMail will not be able to encrypt copies of "
--"outgoing messages to you using S/MIME; normal mail functions will not be "
--"affected.</p></qt>"
--msgstr ""
--"<qt>"
--"<p>您所選擇的 OpenPGP 金鑰會用來加密您的信件，並附在信件之後。您也可以使用 GnuPG 金鑰。</p> "
--"<p>您可以將這個欄位留白，不過 KMail 就無法用 S/MIME 加密。</p> "
--"<p>更多詳細資料請參閱<a>http://www.gnupg.org</a></p></qt>"
-+"<qt><p>The S/MIME certificate you choose here will be used to encrypt "
-+"messages to yourself and for the \"Attach My Certificate\" feature in the "
-+"composer.</p><p>You can leave this blank, but KMail will not be able to "
-+"encrypt copies of outgoing messages to you using S/MIME; normal mail "
-+"functions will not be affected.</p></qt>"
-+msgstr ""
-+"<qt><p>您所選擇的 OpenPGP 金鑰會用來加密您的信件，並附在信件之後。您也可以使"
-+"用 GnuPG 金鑰。</p> <p>您可以將這個欄位留白，不過 KMail 就無法用 S/MIME 加"
-+"密。</p> <p>更多詳細資料請參閱<a>http://www.gnupg.org</a></p></qt>"
- 
- #: identitydialog.cpp:256
- msgid "S/MIME encryption certificate:"
-@@ -3559,20 +3515,16 @@
- 
- #: identitydialog.cpp:302
- msgid ""
--"<qt>"
--"<h3>Reply-To addresses</h3>"
--"<p>This sets the <tt>Reply-to:</tt> header to contain a different email address "
--"to the normal <tt>From:</tt> address.</p>"
--"<p>This can be useful when you have a group of people working together in "
--"similar roles. For example, you might want any emails sent to have your email "
--"in the <tt>From:</tt> field, but any responses to go to a group address.</p>"
--"<p>If in doubt, leave this field blank.</p></qt>"
--msgstr ""
--"<qt>"
--"<h3>回信地址</h3>"
--"<p>這用來設定信件中的 <tt>Reply-to:</tt> 標頭。</p> "
--"<p>如果您要讓回信送到跟發信不同的位置，您可以設定這個欄位。</p> "
--"<p>如果不懂得怎麼使用，請留白即可。</p></qt>"
-+"<qt><h3>Reply-To addresses</h3><p>This sets the <tt>Reply-to:</tt> header to "
-+"contain a different email address to the normal <tt>From:</tt> address.</"
-+"p><p>This can be useful when you have a group of people working together in "
-+"similar roles. For example, you might want any emails sent to have your "
-+"email in the <tt>From:</tt> field, but any responses to go to a group "
-+"address.</p><p>If in doubt, leave this field blank.</p></qt>"
-+msgstr ""
-+"<qt><h3>回信地址</h3><p>這用來設定信件中的 <tt>Reply-to:</tt> 標頭。</p> <p>"
-+"如果您要讓回信送到跟發信不同的位置，您可以設定這個欄位。</p> <p>如果不懂得怎"
-+"麼使用，請留白即可。</p></qt>"
- 
- #: identitydialog.cpp:319
- msgid "&BCC addresses:"
-@@ -3580,22 +3532,17 @@
- 
- #: identitydialog.cpp:321
- msgid ""
--"<qt>"
--"<h3>BCC (Blind Carbon Copy) addresses</h3>"
--"<p>The addresses that you enter here will be added to each outgoing mail that "
--"is sent with this identity. They will not be visible to other recipients.</p>"
--"<p>This is commonly used to send a copy of each sent message to another account "
--"of yours.</p>"
--"<p>To specify more than one address, use commas to separate the list of BCC "
--"recipients.</p>"
--"<p>If in doubt, leave this field blank.</p></qt>"
--msgstr ""
--"<qt>"
--"<h3>密件副本 (BCC)</h3>"
--"<p>您輸入在這個欄位中的電子郵件地址都將不會被顯示出來，因此其他收件人都不會看到。</p> "
--"<p>通常是用來發送信件備份給自己。</p> "
--"<p>若要發送給一個以上的地址，請用逗號隔開。</p> "
--"<p>如果不懂得怎麼使用，請留白即可。</p></qt>"
-+"<qt><h3>BCC (Blind Carbon Copy) addresses</h3><p>The addresses that you "
-+"enter here will be added to each outgoing mail that is sent with this "
-+"identity. They will not be visible to other recipients.</p><p>This is "
-+"commonly used to send a copy of each sent message to another account of "
-+"yours.</p><p>To specify more than one address, use commas to separate the "
-+"list of BCC recipients.</p><p>If in doubt, leave this field blank.</p></qt>"
-+msgstr ""
-+"<qt><h3>密件副本 (BCC)</h3><p>您輸入在這個欄位中的電子郵件地址都將不會被顯示"
-+"出來，因此其他收件人都不會看到。</p> <p>通常是用來發送信件備份給自己。</p> "
-+"<p>若要發送給一個以上的地址，請用逗號隔開。</p> <p>如果不懂得怎麼使用，請留白"
-+"即可。</p></qt>"
- 
- #: identitydialog.cpp:337
- msgid "D&ictionary:"
-@@ -3644,14 +3591,17 @@
- "This might result in warning messages on the receiving side when trying to "
- "verify signatures made with this configuration."
- msgstr ""
--"其中一個 OpenPGP 簽署金鑰未含有任何屬於這個身份的使用者代號與電子郵件地址(%1)。\n"
-+"其中一個 OpenPGP 簽署金鑰未含有任何屬於這個身分的使用者代號與電子郵件地址(%"
-+"1)。\n"
- "這樣可能導致收件人確認數位簽章時會接獲警告。"
- 
- #: identitydialog.cpp:527
- msgid ""
--"One of the configured OpenPGP encryption keys does not contain any user ID with "
--"the configured email address for this identity (%1)."
--msgstr "其中一個 OpenPGP 加密金鑰未含有任何屬於這個身份的使用者代號與電子郵件地址(%1)。"
-+"One of the configured OpenPGP encryption keys does not contain any user ID "
-+"with the configured email address for this identity (%1)."
-+msgstr ""
-+"其中一個 OpenPGP 加密金鑰未含有任何屬於這個身分的使用者代號與電子郵件地址(%"
-+"1)。"
- 
- #: identitydialog.cpp:534
- msgid ""
-@@ -3660,14 +3610,17 @@
- "This might result in warning messages on the receiving side when trying to "
- "verify signatures made with this configuration."
- msgstr ""
--"其中一個 S/MIME 簽署憑證未含有任何屬於這個身份的使用者代號與電子郵件地址(%1)。\n"
-+"其中一個 S/MIME 簽署憑證未含有任何屬於這個身分的使用者代號與電子郵件地址(%"
-+"1)。\n"
- "這樣可能導致收件人確認數位簽章時會接獲警告。"
- 
- #: identitydialog.cpp:543
- msgid ""
- "One of the configured S/MIME encryption certificates does not contain the "
- "configured email address for this identity (%1)."
--msgstr "其中一個 S/MIME 加密金鑰未含有任何屬於這個身份的使用者代號與電子郵件地址(%1)。"
-+msgstr ""
-+"其中一個 S/MIME 加密金鑰未含有任何屬於這個身分的使用者代號與電子郵件地址(%"
-+"1)。"
- 
- #: identitydialog.cpp:551
- msgid "Email Address Not Found in Key/Certificates"
-@@ -3679,7 +3632,7 @@
- 
- #: identitydialog.cpp:582
- msgid "Edit Identity \"%1\""
--msgstr "編輯身份 %1"
-+msgstr "編輯身分 %1"
- 
- #: identitydialog.cpp:606
- msgid ""
-@@ -3697,12 +3650,12 @@
- msgid ""
- "The custom templates folder for identity \"%1\" does not exist (anymore); "
- "therefore, the default templates folder will be used."
--msgstr "身份 %1 的自訂樣本資料夾不存在。將使用預設的樣本資料夾。"
-+msgstr "身分 %1 的自訂樣本資料夾不存在。將使用預設的樣本資料夾。"
- 
- #: identitylistview.cpp:85
- msgid ""
--"_: %1: identity name. Used in the config dialog, section Identity, to indicate "
--"the default identity\n"
-+"_: %1: identity name. Used in the config dialog, section Identity, to "
-+"indicate the default identity\n"
- "%1 (Default)"
- msgstr "%1 (預設)"
- 
-@@ -3747,14 +3700,14 @@
- 
- #: imapaccountbase.cpp:742 imapaccountbase.cpp:756
- msgid ""
--"The configuration was automatically migrated but you should check your account "
--"configuration."
-+"The configuration was automatically migrated but you should check your "
-+"account configuration."
- msgstr "這些設定已經自動被變更，不過請您還是確認一下。"
- 
- #: imapaccountbase.cpp:760
- msgid ""
--"It was not possible to migrate your configuration automatically so please check "
--"your account configuration."
-+"It was not possible to migrate your configuration automatically so please "
-+"check your account configuration."
- msgstr "無法自動變更您舊的設定，請您確定您的設定。"
- 
- #: imapaccountbase.cpp:874 imapaccountbase.cpp:875
-@@ -3790,16 +3743,16 @@
- #: imapaccountbase.cpp:905
- msgid ""
- "\n"
--"Since you do not have write privileges on this folder, please ask the owner of "
--"the folder to free up some space in it."
-+"Since you do not have write privileges on this folder, please ask the owner "
-+"of the folder to free up some space in it."
- msgstr ""
- "\n"
- "既然您沒有此資料夾的權限，請先詢問此資料夾的使用者是否願意放出一些空間。"
- 
- #: imapaccountbase.cpp:951
- msgid ""
--"The connection to the server %1 was unexpectedly closed or timed out. It will "
--"be re-established automatically if possible."
-+"The connection to the server %1 was unexpectedly closed or timed out. It "
-+"will be re-established automatically if possible."
- msgstr "連到伺服器 %1 時發生逾時或被關閉連線。將會嘗試自動重新連線。"
- 
- #: imapaccountbase.cpp:957
-@@ -3860,8 +3813,8 @@
- 
- #: keyresolver.cpp:234
- msgid ""
--"One or more of your configured OpenPGP encryption keys or S/MIME certificates "
--"is not fully trusted for encryption."
-+"One or more of your configured OpenPGP encryption keys or S/MIME "
-+"certificates is not fully trusted for encryption."
- msgstr "您設定的 OpenPGP 加密金鑰或 S/MIME 憑證並未完全被信任做加密。"
- 
- #: keyresolver.cpp:240
-@@ -3886,168 +3839,137 @@
- 
- #: keyresolver.cpp:553
- msgid ""
--"_n: "
--"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
--"<p>expires in less than a day.</p>\n"
--"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
--"<p>expires in less than %n days.</p>"
-+"_n: <p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
-+"p><p>expires in less than a day.</p>\n"
-+"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
-+"p><p>expires in less than %n days.</p>"
- msgstr ""
--"<p>您的 OpenPGP 簽署金鑰</p> <p align=center><b>%1</b>(KeyID 0x%2)</p> "
--"<p>將在 %n 天內到期。</p>"
-+"<p>您的 OpenPGP 簽署金鑰</p> <p align=center><b>%1</b>(KeyID 0x%2)</p> <p>將"
-+"在 %n 天內到期。</p>"
- 
- #: keyresolver.cpp:558
- msgid ""
--"_n: "
--"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
--"<p>expires in less than a day.</p>\n"
--"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
--"<p>expires in less than %n days.</p>"
-+"_n: <p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)"
-+"</p><p>expires in less than a day.</p>\n"
-+"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
-+"p><p>expires in less than %n days.</p>"
- msgstr ""
--"<p>您的 OpenPGP 加密金鑰</p> <p align=center><b>%1</b>(KeyID 0x%2)</p> "
--"<p>將在 %n 天內到期。</p>"
-+"<p>您的 OpenPGP 加密金鑰</p> <p align=center><b>%1</b>(KeyID 0x%2)</p> <p>將"
-+"在 %n 天內到期。</p>"
- 
- #: keyresolver.cpp:563
- msgid ""
--"_n: "
--"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
--"<p>expires in less than a day.</p>\n"
--"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
--"<p>expires in less than %n days.</p>"
-+"_n: <p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</"
-+"p><p>expires in less than a day.</p>\n"
-+"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</"
-+"p><p>expires in less than %n days.</p>"
- msgstr ""
--"<p>您的 OpenPGP 加密金鑰</p> <p align=center><b>%1</b>(KeyID 0x%2)</p> "
--"<p>將在 %n 天內到期。</p>"
-+"<p>您的 OpenPGP 加密金鑰</p> <p align=center><b>%1</b>(KeyID 0x%2)</p> <p>將"
-+"在 %n 天內到期。</p>"
- 
- #: keyresolver.cpp:573
- msgid ""
--"_n: "
--"<p>The root certificate</p><p align=center><b>%3</b></p>"
--"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
--"(serial number %2)</p>"
--"<p>expires in less than a day.</p>\n"
--"<p>The root certificate</p><p align=center><b>%3</b></p>"
--"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
--"(serial number %2)</p>"
--"<p>expires in less than %n days.</p>"
--msgstr ""
--"<p>您的 S/MIME 簽署憑證 <b>%1</b> (序號 %2) 所使用的根憑證 (root certificate)</p> "
--"<p align=center><b>%3</b></p> "
--"<p>將在 %n 天內到期</p>"
-+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/"
-+"MIME signing certificate</p><p align=center><b>%1</b> (serial number %2)</"
-+"p><p>expires in less than a day.</p>\n"
-+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/MIME "
-+"signing certificate</p><p align=center><b>%1</b> (serial number %2)</"
-+"p><p>expires in less than %n days.</p>"
-+msgstr ""
-+"<p>您的 S/MIME 簽署憑證 <b>%1</b> (序號 %2) 所使用的根憑證 (root certificate)"
-+"</p> <p align=center><b>%3</b></p> <p>將在 %n 天內到期</p>"
- 
- #: keyresolver.cpp:580
- msgid ""
--"_n: "
--"<p>The root certificate</p><p align=center><b>%3</b></p>"
--"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
--"(serial number %2)</p>"
--"<p>expires in less than a day.</p>\n"
--"<p>The root certificate</p><p align=center><b>%3</b></p>"
--"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
--"(serial number %2)</p>"
--"<p>expires in less than %n days.</p>"
--msgstr ""
--"<p>您的 S/MIME 加密憑證 <b>%1</b> (序號 %2) 所使用的根憑證 (root certificate)</p> "
--"<p align=center><b>%3</b></p> "
--"<p>將在 %n 天內到期</p>"
-+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/"
-+"MIME encryption certificate</p><p align=center><b>%1</b> (serial number %2)</"
-+"p><p>expires in less than a day.</p>\n"
-+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/MIME "
-+"encryption certificate</p><p align=center><b>%1</b> (serial number %2)</"
-+"p><p>expires in less than %n days.</p>"
-+msgstr ""
-+"<p>您的 S/MIME 加密憑證 <b>%1</b> (序號 %2) 所使用的根憑證 (root certificate)"
-+"</p> <p align=center><b>%3</b></p> <p>將在 %n 天內到期</p>"
- 
- #: keyresolver.cpp:587
- msgid ""
--"_n: "
--"<p>The root certificate</p><p align=center><b>%3</b></p>"
--"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
--"<p>expires in less than a day.</p>\n"
--"<p>The root certificate</p><p align=center><b>%3</b></p>"
--"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
--"<p>expires in less than %n days.</p>"
--msgstr ""
--"<p>您的 S/MIME 憑證 <b>%1</b> (序號 %2) 所使用的根憑證 (root certificate)</p> "
--"<p align=center><b>%3</b></p> "
--"<p>將在 %n 天內到期</p>"
-+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for S/MIME "
-+"certificate</p><p align=center><b>%1</b> (serial number %2)</p><p>expires in "
-+"less than a day.</p>\n"
-+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for S/MIME "
-+"certificate</p><p align=center><b>%1</b> (serial number %2)</p><p>expires in "
-+"less than %n days.</p>"
-+msgstr ""
-+"<p>您的 S/MIME 憑證 <b>%1</b> (序號 %2) 所使用的根憑證 (root certificate)</"
-+"p> <p align=center><b>%3</b></p> <p>將在 %n 天內到期</p>"
- 
- #: keyresolver.cpp:595
- msgid ""
--"_n: "
--"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
--"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
--"(serial number %2)</p>"
--"<p>expires in less than a day.</p>\n"
--"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
--"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
--"(serial number %2)</p>"
--"<p>expires in less than %n days.</p>"
--msgstr ""
--"<p>您的 S/MIME 簽署憑證 <b>%1</b> (序號 %2) 所使用的中介 CA 憑證 (intermediate CA "
--"certificate)</p> <p align=center><b>%3</b></p> "
--"<p>將在 %n 天內到期</p>"
-+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
-+"p><p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-+"(serial number %2)</p><p>expires in less than a day.</p>\n"
-+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for "
-+"your S/MIME signing certificate</p><p align=center><b>%1</b> (serial number %"
-+"2)</p><p>expires in less than %n days.</p>"
-+msgstr ""
-+"<p>您的 S/MIME 簽署憑證 <b>%1</b> (序號 %2) 所使用的中介 CA 憑證 "
-+"(intermediate CA certificate)</p> <p align=center><b>%3</b></p> <p>將在 %n 天"
-+"內到期</p>"
- 
- #: keyresolver.cpp:602
- msgid ""
--"_n: "
--"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
--"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
--"(serial number %2)</p>"
--"<p>expires in less than a day.</p>\n"
--"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
--"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
--"(serial number %2)</p>"
--"<p>expires in less than %n days.</p>"
--msgstr ""
--"<p>您的 S/MIME 加密憑證 <b>%1</b> (序號 %2) 所使用的中介 CA 憑證 (intermediate CA "
--"certificate)</p> <p align=center><b>%3</b></p> "
--"<p>將在 %n 天內到期</p>"
-+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
-+"p><p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-+"(serial number %2)</p><p>expires in less than a day.</p>\n"
-+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for "
-+"your S/MIME encryption certificate</p><p align=center><b>%1</b> (serial "
-+"number %2)</p><p>expires in less than %n days.</p>"
-+msgstr ""
-+"<p>您的 S/MIME 加密憑證 <b>%1</b> (序號 %2) 所使用的中介 CA 憑證 "
-+"(intermediate CA certificate)</p> <p align=center><b>%3</b></p> <p>將在 %n 天"
-+"內到期</p>"
- 
- #: keyresolver.cpp:609
- msgid ""
--"_n: "
--"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
--"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
--"<p>expires in less than a day.</p>\n"
--"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
--"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
--"<p>expires in less than %n days.</p>"
--msgstr ""
--"<p>您的 S/MIME 憑證 <b>%1</b> (序號 %2) 所使用的中介 CA 憑證 (intermediate CA certificate)</p> "
--"<p align=center><b>%3</b></p> "
--"<p>將在 %n 天內到期</p>"
-+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
-+"p><p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</"
-+"p><p>expires in less than a day.</p>\n"
-+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for S/"
-+"MIME certificate</p><p align=center><b>%1</b> (serial number %2)</"
-+"p><p>expires in less than %n days.</p>"
-+msgstr ""
-+"<p>您的 S/MIME 憑證 <b>%1</b> (序號 %2) 所使用的中介 CA 憑證 (intermediate "
-+"CA certificate)</p> <p align=center><b>%3</b></p> <p>將在 %n 天內到期</p>"
- 
- #: keyresolver.cpp:618
- msgid ""
--"_n: "
--"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> "
--"(serial number %2)</p>"
--"<p>expires in less than a day.</p>\n"
--"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> "
--"(serial number %2)</p>"
--"<p>expires in less than %n days.</p>"
-+"_n: <p>Your S/MIME signing certificate</p><p align=center><b>%1</b> (serial "
-+"number %2)</p><p>expires in less than a day.</p>\n"
-+"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> (serial "
-+"number %2)</p><p>expires in less than %n days.</p>"
- msgstr ""
--"<p>您的 S/MIME 簽署憑證 </p><p align=center><b>%1</b> (序號 %2) </p> "
--"<p>將在 %n 天內到期</p>"
-+"<p>您的 S/MIME 簽署憑證 </p><p align=center><b>%1</b> (序號 %2) </p> <p>將在 "
-+"%n 天內到期</p>"
- 
- #: keyresolver.cpp:623
- msgid ""
--"_n: "
--"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
--"(serial number %2)</p>"
--"<p>expires in less than a day.</p>\n"
--"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
--"(serial number %2)</p>"
--"<p>expires in less than %n days.</p>"
-+"_n: <p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-+"(serial number %2)</p><p>expires in less than a day.</p>\n"
-+"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> (serial "
-+"number %2)</p><p>expires in less than %n days.</p>"
- msgstr ""
--"<p>您的 S/MIME 加密憑證</p><p align=center><b>%1</b> (序號 %2) </p>"
--"<p>將在 %n 天內到期</p>"
-+"<p>您的 S/MIME 加密憑證</p><p align=center><b>%1</b> (序號 %2) </p><p>將在 %"
-+"n 天內到期</p>"
- 
- #: keyresolver.cpp:628
- msgid ""
--"_n: "
--"<p>The S/MIME certificate for</p><p align=center><b>%1</b> "
--"(serial number %2)</p>"
--"<p>expires in less than a day.</p>\n"
--"<p>The S/MIME certificate for</p><p align=center><b>%1</b> "
--"(serial number %2)</p>"
--"<p>expires in less than %n days.</p>"
--msgstr ""
--"<p><p align=center><b>%1</b></p>"
--"<p>的 S/MIME 憑證（序號 %2） </p>"
--"<p>將在 %n 天內到期</p>"
-+"_n: <p>The S/MIME certificate for</p><p align=center><b>%1</b> (serial "
-+"number %2)</p><p>expires in less than a day.</p>\n"
-+"<p>The S/MIME certificate for</p><p align=center><b>%1</b> (serial number %2)"
-+"</p><p>expires in less than %n days.</p>"
-+msgstr ""
-+"<p><p align=center><b>%1</b></p><p>的 S/MIME 憑證（序號 %2） </p><p>將在 %n "
-+"天內到期</p>"
- 
- #: keyresolver.cpp:634
- msgid "OpenPGP Key Expires Soon"
-@@ -4059,13 +3981,15 @@
- 
- #: keyresolver.cpp:668
- msgid ""
--"One or more of your configured OpenPGP encryption keys or S/MIME certificates "
--"is not usable for encryption. Please reconfigure your encryption keys and "
--"certificates for this identity in the identity configuration dialog.\n"
-+"One or more of your configured OpenPGP encryption keys or S/MIME "
-+"certificates is not usable for encryption. Please reconfigure your "
-+"encryption keys and certificates for this identity in the identity "
-+"configuration dialog.\n"
- "If you choose to continue, and the keys are needed later on, you will be "
- "prompted to specify the keys to use."
- msgstr ""
--"您設定的 OpenPGP 加密金鑰或 S/MIME 加密憑證無法用於加密。請到您的身份設定重新設定您的加密金鑰或憑證。\n"
-+"您設定的 OpenPGP 加密金鑰或 S/MIME 加密憑證無法用於加密。請到您的身分設定重新"
-+"設定您的加密金鑰或憑證。\n"
- "如果您要繼續，而稍後會需要加密時，系統會詢問您要使用哪個金鑰。"
- 
- #: keyresolver.cpp:676 keyresolver.cpp:989 keyresolver.cpp:1016
-@@ -4080,7 +4004,8 @@
- "If you choose to continue, and the keys are needed later on, you will be "
- "prompted to specify the keys to use."
- msgstr ""
--"您設定的 OpenPGP 簽署金鑰或 S/MIME 簽署憑證無法用於簽署數位簽章。請到您的身份設定重新設定您的簽署金鑰或憑證。\n"
-+"您設定的 OpenPGP 簽署金鑰或 S/MIME 簽署憑證無法用於簽署數位簽章。請到您的身分"
-+"設定重新設定您的簽署金鑰或憑證。\n"
- "如果您要繼續，而稍後會需要簽署時，系統會詢問您要使用哪個金鑰。"
- 
- #: keyresolver.cpp:720 keyresolver.cpp:1043 keyresolver.cpp:1059
-@@ -4091,37 +4016,37 @@
- msgid ""
- "Examination of recipient's encryption preferences yielded that the message "
- "should be encrypted using OpenPGP, at least for some recipients;\n"
--"however, you have not configured valid trusted OpenPGP encryption keys for this "
--"identity.\n"
--"You may continue without encrypting to yourself, but be aware that you will not "
--"be able to read your own messages if you do so."
-+"however, you have not configured valid trusted OpenPGP encryption keys for "
-+"this identity.\n"
-+"You may continue without encrypting to yourself, but be aware that you will "
-+"not be able to read your own messages if you do so."
- msgstr ""
- "根據您的設定，信件應該至少對部份的收件人使用 OpenPGP 加密。\n"
--"但是，您並未對這個身份設定可信任的 OpenPGP 加密金鑰。\n"
-+"但是，您並未對這個身分設定可信任的 OpenPGP 加密金鑰。\n"
- "您可以選擇不要對自己加密，但是您就有可能無法讀取自己寫的信件。"
- 
- #: keyresolver.cpp:1007
- msgid ""
- "Examination of recipient's encryption preferences yielded that the message "
- "should be encrypted using S/MIME, at least for some recipients;\n"
--"however, you have not configured valid S/MIME encryption certificates for this "
--"identity.\n"
--"You may continue without encrypting to yourself, but be aware that you will not "
--"be able to read your own messages if you do so."
-+"however, you have not configured valid S/MIME encryption certificates for "
-+"this identity.\n"
-+"You may continue without encrypting to yourself, but be aware that you will "
-+"not be able to read your own messages if you do so."
- msgstr ""
- "根據您的設定，信件應該至少對部份的收件人使用 S/MIME 加密。\n"
--"但是，您並未對這個身份設定可信任的 OpenPGP 加密金鑰。\n"
-+"但是，您並未對這個身分設定可信任的 OpenPGP 加密金鑰。\n"
- "您可以選擇不要對自己加密，但是您就有可能無法讀取自己寫的信件。"
- 
- #: keyresolver.cpp:1037
- msgid ""
--"Examination of recipient's signing preferences yielded that the message should "
--"be signed using OpenPGP, at least for some recipients;\n"
-+"Examination of recipient's signing preferences yielded that the message "
-+"should be signed using OpenPGP, at least for some recipients;\n"
- "however, you have not configured valid OpenPGP signing certificates for this "
- "identity."
- msgstr ""
- "根據您的設定，信件應該至少對部份的收件人使用 OpenPGP 簽署數位簽章。\n"
--"但是，您並未對這個身份設定可信任的 OpenPGP 簽署金鑰。"
-+"但是，您並未對這個身分設定可信任的 OpenPGP 簽署金鑰。"
- 
- #: keyresolver.cpp:1044
- msgid "Do Not OpenPGP-Sign"
-@@ -4129,13 +4054,13 @@
- 
- #: keyresolver.cpp:1053
- msgid ""
--"Examination of recipient's signing preferences yielded that the message should "
--"be signed using S/MIME, at least for some recipients;\n"
-+"Examination of recipient's signing preferences yielded that the message "
-+"should be signed using S/MIME, at least for some recipients;\n"
- "however, you have not configured valid S/MIME signing certificates for this "
- "identity."
- msgstr ""
- "根據您的設定，信件應該至少對部份的收件人使用 S/MIME 簽署數位簽章。\n"
--"但是，您並未對這個身份設定可信任的 S/MIME 簽署金鑰。"
-+"但是，您並未對這個身分設定可信任的 S/MIME 簽署金鑰。"
- 
- #: keyresolver.cpp:1060
- msgid "Do Not S/MIME-Sign"
-@@ -4156,8 +4081,8 @@
- 
- #: keyresolver.cpp:1275
- msgid ""
--"You did not select an encryption key for yourself (encrypt to self). You will "
--"not be able to decrypt your own message if you encrypt it."
-+"You did not select an encryption key for yourself (encrypt to self). You "
-+"will not be able to decrypt your own message if you encrypt it."
- msgstr "您沒有選擇對自己加密的金鑰。您將無法解開您自己所寫的信件。"
- 
- #: keyresolver.cpp:1279 keyresolver.cpp:1303 keyresolver.cpp:1317
-@@ -4177,8 +4102,8 @@
- 
- #: keyresolver.cpp:1299
- msgid ""
--"You did not select an encryption key for any of the recipients of this message; "
--"therefore, the message will not be encrypted."
-+"You did not select an encryption key for any of the recipients of this "
-+"message; therefore, the message will not be encrypted."
- msgstr "您沒有選擇對任一收件人使用之加密金鑰。信件將不會加密。"
- 
- #: keyresolver.cpp:1304 messagecomposer.cpp:933
-@@ -4258,10 +4183,8 @@
- msgstr "嚴重錯誤: 無法收取信件"
- 
- #: kmaccount.cpp:277
--msgid ""
--"Failed to add message:\n"
--msgstr ""
--"無法新增訊息：\n"
-+msgid "Failed to add message:\n"
-+msgstr "無法新增訊息：\n"
- 
- #: kmacctimap.cpp:300
- #, c-format
-@@ -4284,7 +4207,7 @@
- #: kmacctlocal.cpp:128 kmacctlocal.cpp:136 kmacctmaildir.cpp:110
- #: kmacctmaildir.cpp:117 popaccount.cpp:404
- msgid "Preparing transmission from \"%1\"..."
--msgstr "準備從 %1 傳輸..."
-+msgstr "準備從 %1 傳輸…"
- 
- #: kmacctlocal.cpp:145
- msgid "Running precommand failed."
-@@ -4345,7 +4268,7 @@
- 
- #: kmacctseldlg.cpp:56
- msgid "&Maildir mailbox"
--msgstr "Maildir 信箱 (&M)"
-+msgstr "Maildir 信箱(&M)"
- 
- #: kmailicalifaceimpl.cpp:90 kmfolderdia.cpp:448 newfolderdialog.cpp:125
- msgid "Mail"
-@@ -4388,7 +4311,9 @@
- msgid ""
- "KMail will now create the required groupware folders as subfolders of %1; if "
- "you do not want this, cancel and the IMAP resource will be disabled"
--msgstr "KMail 將會在 %1 下產生群組資料夾。如果您不要，請按下取消，IMAP 資源將會被關閉。"
-+msgstr ""
-+"KMail 將會在 %1 下產生群組資料夾。如果您不要，請按下取消，IMAP 資源將會被關"
-+"閉。"
- 
- #: kmailicalifaceimpl.cpp:1736
- msgid "%1: no folder found. It will be created."
-@@ -4400,10 +4325,12 @@
- 
- #: kmailicalifaceimpl.cpp:1744
- msgid ""
--"<qt>KMail found the following groupware folders in %1 and needs to perform the "
--"following operations: %2"
--"<br>If you do not want this, cancel and the IMAP resource will be disabled"
--msgstr "<qt>Kmail 發現在 %1 中的下列群組資料夾，即將進行下列動作：%2<br> 如果您不要，請按下取消，IMAP 資源將會被關閉。"
-+"<qt>KMail found the following groupware folders in %1 and needs to perform "
-+"the following operations: %2<br>If you do not want this, cancel and the IMAP "
-+"resource will be disabled"
-+msgstr ""
-+"<qt>Kmail 發現在 %1 中的下列群組資料夾，即將進行下列動作：%2<br> 如果您不要，"
-+"請按下取消，IMAP 資源將會被關閉。"
- 
- #: kmailicalifaceimpl.cpp:1751
- msgid "Standard Groupware Folders"
-@@ -4426,7 +4353,7 @@
- msgid ""
- "_n: Please wait while the message is transferred\n"
- "Please wait while the %n messages are transferred"
--msgstr "%n 封信件傳送中，請稍候..."
-+msgstr "%n 封信件傳送中，請稍候…"
- 
- #: kmcommands.cpp:594
- msgid "Address copied to clipboard."
-@@ -4479,8 +4406,8 @@
- #: kmcommands.cpp:1363
- msgid ""
- "\n"
--"This is a MIME digest forward. The content of the message is contained in the "
--"attachment(s).\n"
-+"This is a MIME digest forward. The content of the message is contained in "
-+"the attachment(s).\n"
- "\n"
- "\n"
- msgstr ""
-@@ -4523,7 +4450,7 @@
- 
- #: kmcommands.cpp:2406
- msgid "Opening URL..."
--msgstr "正在開啟 URL..."
-+msgstr "正在開啟 URL…"
- 
- #: kmcommands.cpp:2413
- msgid "<qt>Do you really want to execute <b>%1</b>?</qt>"
-@@ -4611,9 +4538,9 @@
- 
- #: kmcommands.cpp:2952
- msgid ""
--"There is no Address Book entry for this email address. Add them to the Address "
--"Book and then add instant messaging addresses using your preferred messaging "
--"client."
-+"There is no Address Book entry for this email address. Add them to the "
-+"Address Book and then add instant messaging addresses using your preferred "
-+"messaging client."
- msgstr "在通訊錄中找不到這個電子郵件地址。請將它加入通訊錄及您使用的聊天軟體。"
- 
- #: kmcommands.cpp:2955
-@@ -4628,8 +4555,8 @@
- 
- #: kmcommands.cpp:3179 kmcomposewin.cpp:5128 objecttreeparser.cpp:1632
- msgid ""
--"Chiasmus backend does not offer the \"x-obtain-keys\" function. Please report "
--"this bug."
-+"Chiasmus backend does not offer the \"x-obtain-keys\" function. Please "
-+"report this bug."
- msgstr "Chiasmus 後端無法提供 x-obtain-keys 功能。請回報錯誤。"
- 
- #: kmcommands.cpp:3181 kmcommands.cpp:3186 kmcommands.cpp:3195
-@@ -4642,14 +4569,15 @@
- 
- #: kmcommands.cpp:3192 kmcomposewin.cpp:5141 objecttreeparser.cpp:1644
- msgid ""
--"Unexpected return value from Chiasmus backend: The \"x-obtain-keys\" function "
--"did not return a string list. Please report this bug."
--msgstr "Chiasmus 後端傳回錯誤：x-obtain-keys 功能並未傳回字串列表。請回報錯誤。"
-+"Unexpected return value from Chiasmus backend: The \"x-obtain-keys\" "
-+"function did not return a string list. Please report this bug."
-+msgstr ""
-+"Chiasmus 後端傳回錯誤：x-obtain-keys 功能並未傳回字串列表。請回報錯誤。"
- 
- #: kmcommands.cpp:3201 kmcomposewin.cpp:5150 objecttreeparser.cpp:1652
- msgid ""
--"No keys have been found. Please check that a valid key path has been set in the "
--"Chiasmus configuration."
-+"No keys have been found. Please check that a valid key path has been set in "
-+"the Chiasmus configuration."
- msgstr "找不到金鑰。請確定 Chiasmus 有設定好金鑰的路徑。"
- 
- #: kmcommands.cpp:3208 objecttreeparser.cpp:1659
-@@ -4658,8 +4586,8 @@
- 
- #: kmcommands.cpp:3220 objecttreeparser.cpp:1671
- msgid ""
--"Chiasmus backend does not offer the \"x-decrypt\" function. Please report this "
--"bug."
-+"Chiasmus backend does not offer the \"x-decrypt\" function. Please report "
-+"this bug."
- msgstr "Chiasmus 後端未提供 x-decrypt 功能。請回報錯誤。"
- 
- #: kmcommands.cpp:3231 objecttreeparser.cpp:1679
-@@ -4674,8 +4602,8 @@
- 
- #: kmcommands.cpp:3270 objecttreeparser.cpp:1691
- msgid ""
--"Unexpected return value from Chiasmus backend: The \"x-decrypt\" function did "
--"not return a byte array. Please report this bug."
-+"Unexpected return value from Chiasmus backend: The \"x-decrypt\" function "
-+"did not return a byte array. Please report this bug."
- msgstr "Chiasmus 後端傳回錯誤：x-decrypt 功能沒有傳回位元陣列。請回報錯誤。"
- 
- #: kmcommands.cpp:3425
-@@ -4749,7 +4677,7 @@
- 
- #: kmcomposewin.cpp:970
- msgid "&Identity:"
--msgstr "身份(&I)："
-+msgstr "身分(&I)："
- 
- #: kmcomposewin.cpp:974
- msgid "&Dictionary:"
-@@ -4785,7 +4713,8 @@
- 
- #: kmcomposewin.cpp:1003
- msgid ""
--"<qt>The email addresses you put in this field receive a copy of the email.</qt>"
-+"<qt>The email addresses you put in this field receive a copy of the email.</"
-+"qt>"
- msgstr "<qt>這個欄位中的電子郵件地址都將收到這封信件的一份複本。</qt>"
- 
- #: kmcomposewin.cpp:1010
-@@ -4799,12 +4728,13 @@
- #: kmcomposewin.cpp:1013
- msgid ""
- "<qt>The email addresses you put in this field receive a copy of the email. "
--"Technically it is the same thing as putting all the addresses in the <b>To:</b> "
--"field but differs in that it usually symbolises the receiver of the Carbon Copy "
--"(CC) is a listener, not the main recipient.</qt>"
--msgstr ""
--"<qt>這個欄位中的電子郵件地址都將收到這封信件的一份複本。基本上這跟把所有地址都放在「<b>收件人</b>"
--"」是一樣的，但是放在這裡表示這些收件者收到的是複本，而不是主要的收件人。</qt>"
-+"Technically it is the same thing as putting all the addresses in the <b>To:</"
-+"b> field but differs in that it usually symbolises the receiver of the "
-+"Carbon Copy (CC) is a listener, not the main recipient.</qt>"
-+msgstr ""
-+"<qt>這個欄位中的電子郵件地址都將收到這封信件的一份複本。基本上這跟把所有地址"
-+"都放在「<b>收件人</b>」是一樣的，但是放在這裡表示這些收件者收到的是複本，而不"
-+"是主要的收件人。</qt>"
- 
- #: kmcomposewin.cpp:1025
- msgid "&Blind copy to (BCC):"
-@@ -4816,10 +4746,11 @@
- 
- #: kmcomposewin.cpp:1028
- msgid ""
--"<qt>Essentially the same thing as the <b>Copy To:</b> "
--"field but differs in that all other recipients do not see who receives a blind "
--"copy.</qt>"
--msgstr "<qt>跟放在複本欄位中一樣，但是在信件中看不到密件副本收件人的電子郵件地址與資料。</qt>"
-+"<qt>Essentially the same thing as the <b>Copy To:</b> field but differs in "
-+"that all other recipients do not see who receives a blind copy.</qt>"
-+msgstr ""
-+"<qt>跟放在複本欄位中一樣，但是在信件中看不到密件副本收件人的電子郵件地址與資"
-+"料。</qt>"
- 
- #: kmcomposewin.cpp:1060
- msgid "S&ubject:"
-@@ -4852,7 +4783,7 @@
- 
- #: kmcomposewin.cpp:1261
- msgid "&Insert File..."
--msgstr "插入檔案(&I)..."
-+msgstr "插入檔案(&I)…"
- 
- #: kmcomposewin.cpp:1264
- msgid "&Insert File Recent"
-@@ -4864,19 +4795,19 @@
- 
- #: kmcomposewin.cpp:1274
- msgid "&New Composer"
--msgstr "寫信(&N)..."
-+msgstr "寫信(&N)…"
- 
- #: kmcomposewin.cpp:1278
- msgid "New Main &Window"
--msgstr "新主視窗(&W)..."
-+msgstr "新主視窗(&W)…"
- 
- #: kmcomposewin.cpp:1283
- msgid "Select &Recipients..."
--msgstr "選擇收件者(&R)..."
-+msgstr "選擇收件者(&R)…"
- 
- #: kmcomposewin.cpp:1285
- msgid "Save &Distribution List..."
--msgstr "儲存聯絡人群組(&D)..."
-+msgstr "儲存聯絡人群組(&D)…"
- 
- #: kmcomposewin.cpp:1307
- msgid "Pa&ste as Quotation"
-@@ -4918,7 +4849,7 @@
- 
- #: kmcomposewin.cpp:1339
- msgid "&Wordwrap"
--msgstr "自動換行(&W)"
-+msgstr "自動換列(&W)"
- 
- #: kmcomposewin.cpp:1344
- msgid "&Snippets"
-@@ -4942,7 +4873,7 @@
- 
- #: kmcomposewin.cpp:1372
- msgid "&Identity"
--msgstr "身份(&I)"
-+msgstr "身分(&I)"
- 
- #: kmcomposewin.cpp:1375
- msgid "&Dictionary"
-@@ -4974,7 +4905,7 @@
- 
- #: kmcomposewin.cpp:1397
- msgid "&BCC"
--msgstr "秘件副本(&B)"
-+msgstr "祕件副本(&B)"
- 
- #: kmcomposewin.cpp:1401
- msgid "S&ubject"
-@@ -4994,7 +4925,7 @@
- 
- #: kmcomposewin.cpp:1417
- msgid "Attach &Public Key..."
--msgstr "附上公開金鑰(&P)..."
-+msgstr "附上公開金鑰(&P)…"
- 
- #: kmcomposewin.cpp:1420
- msgid "Attach &My Public Key"
-@@ -5002,7 +4933,7 @@
- 
- #: kmcomposewin.cpp:1423 kmcomposewin.cpp:2272
- msgid "&Attach File..."
--msgstr "附加檔案(&A)..."
-+msgstr "附加檔案(&A)…"
- 
- #: kmcomposewin.cpp:1426
- msgid "&Remove Attachment"
-@@ -5018,11 +4949,11 @@
- 
- #: kmcomposewin.cpp:1442
- msgid "&Spellchecker..."
--msgstr "拼字檢查程式(&S)..."
-+msgstr "拼字檢查程式(&S)…"
- 
- #: kmcomposewin.cpp:1446 kmcomposewin.cpp:1449
- msgid "Encrypt Message with Chiasmus..."
--msgstr "用 Chiasmus 將信件加密..."
-+msgstr "用 Chiasmus 將信件加密…"
- 
- #: kmcomposewin.cpp:1457
- msgid "&Encrypt Message"
-@@ -5098,11 +5029,11 @@
- 
- #: kmcomposewin.cpp:1559
- msgid "Text Color..."
--msgstr "字體顏色..."
-+msgstr "字體顏色…"
- 
- #: kmcomposewin.cpp:1573
- msgid "Configure KMail..."
--msgstr "設定 KMail..."
-+msgstr "設定 KMail…"
- 
- #: kmcomposewin.cpp:1582
- msgid " Spellcheck: %1 "
-@@ -5114,7 +5045,7 @@
- 
- #: kmcomposewin.cpp:1584 kmcomposewin.cpp:1595
- msgid " Line: %1 "
--msgstr " 行：%1"
-+msgstr " 列：%1"
- 
- #: kmcomposewin.cpp:2188
- msgid "Re&save as Template"
-@@ -5146,8 +5077,8 @@
- 
- #: kmcomposewin.cpp:2268
- msgid ""
--"The message you have composed seems to refer to an attached file but you have "
--"not attached anything.\n"
-+"The message you have composed seems to refer to an attached file but you "
-+"have not attached anything.\n"
- "Do you want to attach a file to your message?"
- msgstr ""
- "您似乎打算在信中附加檔案，但是忘了這麼做。\n"
-@@ -5163,15 +5094,15 @@
- 
- #: kmcomposewin.cpp:2350
- msgid ""
--"<qt>"
--"<p>KMail could not recognize the location of the attachment (%1);</p>"
--"<p>you have to specify the full path if you wish to attach a file.</p></qt>"
--msgstr "<qt> <p>KMail 無法辨識附加檔位置：(%1)</p> <p>您必須指定完整的路徑。</p></qt>"
-+"<qt><p>KMail could not recognize the location of the attachment (%1);</"
-+"p><p>you have to specify the full path if you wish to attach a file.</p></qt>"
-+msgstr ""
-+"<qt> <p>KMail 無法辨識附加檔位置：(%1)</p> <p>您必須指定完整的路徑。</p></qt>"
- 
- #: kmcomposewin.cpp:2359
- msgid ""
--"<qt>"
--"<p>Your administrator has disallowed attaching files bigger than %1 MB.</p>"
-+"<qt><p>Your administrator has disallowed attaching files bigger than %1 MB.</"
-+"p>"
- msgstr "<qt><p>您的管理者不同意附加超過 %1 MB 的檔案。</p>"
- 
- #: kmcomposewin.cpp:2697
-@@ -5190,9 +5121,8 @@
- 
- #: kmcomposewin.cpp:3048
- msgid ""
--"<qt>"
--"<p>An error occurred while trying to export the key from the backend:</p>"
--"<p><b>%1</b></p></qt>"
-+"<qt><p>An error occurred while trying to export the key from the backend:</"
-+"p><p><b>%1</b></p></qt>"
- msgstr "<qt><p>從後端匯出金鑰時發生錯誤：</p> <p><b>%1</b></p></qt>"
- 
- #: kmcomposewin.cpp:3052
-@@ -5201,7 +5131,7 @@
- 
- #: kmcomposewin.cpp:3079
- msgid "Exporting key..."
--msgstr "匯出金鑰中..."
-+msgstr "匯出金鑰中…"
- 
- #: kmcomposewin.cpp:3090
- #, c-format
-@@ -5224,7 +5154,7 @@
- 
- #: kmcomposewin.cpp:3130 kmmimeparttree.cpp:138 kmreaderwin.cpp:1968
- msgid "Open With..."
--msgstr "開啟用..."
-+msgstr "開啟用…"
- 
- #: kmcomposewin.cpp:3132
- msgid ""
-@@ -5234,11 +5164,11 @@
- 
- #: kmcomposewin.cpp:3135
- msgid "Edit With..."
--msgstr "編輯方式..."
-+msgstr "編輯方式…"
- 
- #: kmcomposewin.cpp:3143
- msgid "Add Attachment..."
--msgstr "新增附件..."
-+msgstr "新增附件…"
- 
- #: kmcomposewin.cpp:3232 kmcomposewin.cpp:3240
- msgid "KMail could not compress the file."
-@@ -5272,8 +5202,8 @@
- 
- #: kmcomposewin.cpp:3771
- msgid ""
--"Please select whether you want to insert the content as text into the editor, "
--"or append the referenced file as an attachment."
-+"Please select whether you want to insert the content as text into the "
-+"editor, or append the referenced file as an attachment."
- msgstr "請選則您是否要將此內容當成文字插入編輯器內，或是將它當成附檔。"
- 
- #: kmcomposewin.cpp:3773
-@@ -5287,15 +5217,13 @@
- 
- #: kmcomposewin.cpp:3873
- msgid ""
--"<qt>"
--"<p>You have requested that messages be encrypted to yourself, but the currently "
--"selected identity does not define an (OpenPGP or S/MIME) encryption key to use "
--"for this.</p>"
--"<p>Please select the key(s) to use in the identity configuration.</p></qt>"
--msgstr ""
--"<qt> "
--"<p>您要求對自己加密，但目前的身份並未定義 OpenPGP 或 S/MIME 的加密金鑰或憑證。</p> "
--"<p>請在身份設定處選擇您要使用的金鑰。</p></qt>"
-+"<qt><p>You have requested that messages be encrypted to yourself, but the "
-+"currently selected identity does not define an (OpenPGP or S/MIME) "
-+"encryption key to use for this.</p><p>Please select the key(s) to use in the "
-+"identity configuration.</p></qt>"
-+msgstr ""
-+"<qt> <p>您要求對自己加密，但目前的身分並未定義 OpenPGP 或 S/MIME 的加密金鑰或"
-+"憑證。</p> <p>請在身分設定處選擇您要使用的金鑰。</p></qt>"
- 
- #: kmcomposewin.cpp:3880
- msgid "Undefined Encryption Key"
-@@ -5303,14 +5231,12 @@
- 
- #: kmcomposewin.cpp:3924
- msgid ""
--"<qt>"
--"<p>In order to be able to sign this message you first have to define the "
--"(OpenPGP or S/MIME) signing key to use.</p>"
--"<p>Please select the key to use in the identity configuration.</p></qt>"
--msgstr ""
--"<qt>"
--"<p>為了要簽署信件，您必須指定加密用的 OpenPGP 金鑰或 S/MIME 憑證。</p> "
--"<p>請在身份設定處選擇要使用的金鑰或憑證。</p></qt>"
-+"<qt><p>In order to be able to sign this message you first have to define the "
-+"(OpenPGP or S/MIME) signing key to use.</p><p>Please select the key to use "
-+"in the identity configuration.</p></qt>"
-+msgstr ""
-+"<qt><p>為了要簽署信件，您必須指定加密用的 OpenPGP 金鑰或 S/MIME 憑證。</p> "
-+"<p>請在身分設定處選擇要使用的金鑰或憑證。</p></qt>"
- 
- #: kmcomposewin.cpp:3931
- msgid "Undefined Signing Key"
-@@ -5328,15 +5254,17 @@
- 
- #: kmcomposewin.cpp:4033
- msgid ""
--"You must enter your email address in the From: field. You should also set your "
--"email address for all identities, so that you do not have to enter it for each "
--"message."
--msgstr "您必須在「寄件者」欄位中填入自己的電子郵件地址。您應該在身份設定中設定電子信件地址，這樣就不必每次送信都重新填寫。"
-+"You must enter your email address in the From: field. You should also set "
-+"your email address for all identities, so that you do not have to enter it "
-+"for each message."
-+msgstr ""
-+"您必須在「寄件者」欄位中填入自己的電子郵件地址。您應該在身分設定中設定電子信"
-+"件地址，這樣就不必每次送信都重新填寫。"
- 
- #: kmcomposewin.cpp:4044
- msgid ""
--"You must specify at least one receiver,either in the To: field or as CC or as "
--"BCC."
-+"You must specify at least one receiver,either in the To: field or as CC or "
-+"as BCC."
- msgstr "您必須在收件者、複本或密件複本欄位中指定最少一位收件者。"
- 
- #: kmcomposewin.cpp:4052
-@@ -5389,10 +5317,11 @@
- 
- #: kmcomposewin.cpp:4129
- msgid ""
--"<qt>"
--"<p>Inline signing/encrypting of HTML messages is not possible;</p>"
--"<p>do you want to delete your markup?</p></qt>"
--msgstr "<qt><p>無法對 HTML 信件做內含式簽署(Inline signing)或加密。</p> <p>您要刪除標記嗎？</p> </qt>"
-+"<qt><p>Inline signing/encrypting of HTML messages is not possible;</p><p>do "
-+"you want to delete your markup?</p></qt>"
-+msgstr ""
-+"<qt><p>無法對 HTML 信件做內含式簽署(Inline signing)或加密。</p> <p>您要刪除標"
-+"記嗎？</p> </qt>"
- 
- #: kmcomposewin.cpp:4131
- msgid "Sign/Encrypt Message?"
-@@ -5402,11 +5331,11 @@
- msgid ""
- "The custom drafts or templates folder for identify \"%1\" does not exist "
- "(anymore); therefore, the default drafts or templates folder will be used."
--msgstr "身份 %1 自訂的草稿或樣本資料夾已不存在。將使用預設的資料夾。"
-+msgstr "身分 %1 自訂的草稿或樣本資料夾已不存在。將使用預設的資料夾。"
- 
- #: kmcomposewin.cpp:4326
- msgid "About to send email..."
--msgstr "即將傳送信件..."
-+msgstr "即將傳送信件…"
- 
- #: kmcomposewin.cpp:4327
- msgid "Send Confirmation"
-@@ -5443,8 +5372,8 @@
- #: kmcomposewin.cpp:5115
- msgid ""
- "Please configure a Crypto Backend to use for Chiasmus encryption first.\n"
--"You can do this in the Crypto Backends tab of the configure dialog's Security "
--"page."
-+"You can do this in the Crypto Backends tab of the configure dialog's "
-+"Security page."
- msgstr ""
- "請先將 Chiasmus 設定為加密後端。\n"
- "您可以在「安全」頁中的「加密後端」設定。"
-@@ -5454,7 +5383,8 @@
- "It looks as though libkleopatra was compiled without Chiasmus support. You "
- "might want to recompile libkleopatra with --enable-chiasmus."
- msgstr ""
--"libkleopatra 函式庫沒有支援 Chiasmus。您可能必須重新編譯 libkleopatra，並打使用 --enable-chiasmus 選項。"
-+"libkleopatra 函式庫沒有支援 Chiasmus。您可能必須重新編譯 libkleopatra，並打使"
-+"用 --enable-chiasmus 選項。"
- 
- #: kmcomposewin.cpp:5122
- msgid "No Chiasmus Backend Configured"
-@@ -5518,9 +5448,10 @@
- 
- #: kmedit.cpp:734
- msgid ""
--"ISpell/Aspell could not be started. Please make sure you have ISpell or Aspell "
--"properly configured and in your PATH."
--msgstr "ISpell/Aspell 無法啟動。請確定您已在 PATH 中正確設定 ISpell 或 Aspell。"
-+"ISpell/Aspell could not be started. Please make sure you have ISpell or "
-+"Aspell properly configured and in your PATH."
-+msgstr ""
-+"ISpell/Aspell 無法啟動。請確定您已在 PATH 中正確設定 ISpell 或 Aspell。"
- 
- #: kmedit.cpp:743
- msgid "ISpell/Aspell seems to have crashed."
-@@ -5548,10 +5479,10 @@
- 
- #: kmfilter.cpp:289
- msgid ""
--"<qt>Unknown filter action <b>%1</b>"
--"<br>in filter rule <b>%2</b>."
--"<br>Ignoring it.</qt>"
--msgstr "<qt>在過濾規則 %2 中<br> 有未知的過濾動作 <b>%1</b>。<br> 將會忽略它。</qt>"
-+"<qt>Unknown filter action <b>%1</b><br>in filter rule <b>%2</b>.<br>Ignoring "
-+"it.</qt>"
-+msgstr ""
-+"<qt>在過濾規則 %2 中<br> 有未知的過濾動作 <b>%1</b>。<br> 將會忽略它。</qt>"
- 
- #: kmfilteraction.cpp:598
- msgid "Confirm Delivery"
-@@ -5567,7 +5498,7 @@
- 
- #: kmfilteraction.cpp:701
- msgid "Set Identity To"
--msgstr "設定身份"
-+msgstr "設定身分"
- 
- #: kmfilteraction.cpp:784
- msgid "Mark As"
-@@ -5739,125 +5670,107 @@
- 
- #: kmfilterdlg.cpp:51
- msgid ""
--"<qt>"
--"<p>This is the list of defined filters. They are processed top-to-bottom.</p>"
--"<p>Click on any filter to edit it using the controls in the right-hand half of "
--"the dialog.</p></qt>"
--msgstr "<qt> <p>這裡是已定義的過濾器，由上而下。</p> <p>點選過濾器，並在右手邊修改。</p> </qt>"
-+"<qt><p>This is the list of defined filters. They are processed top-to-bottom."
-+"</p><p>Click on any filter to edit it using the controls in the right-hand "
-+"half of the dialog.</p></qt>"
-+msgstr ""
-+"<qt> <p>這裡是已定義的過濾器，由上而下。</p> <p>點選過濾器，並在右手邊修改。"
-+"</p> </qt>"
- 
- #: kmfilterdlg.cpp:57
- msgid ""
--"<qt>"
--"<p>Click this button to create a new filter.</p>"
--"<p>The filter will be inserted just before the currently-selected one, but you "
--"can always change that later on.</p>"
--"<p>If you have clicked this button accidentally, you can undo this by clicking "
--"on the <em>Delete</em> button.</p></qt>"
--msgstr ""
--"<qt> "
--"<p>按此鍵建立新的過濾規則。</p> "
--"<p>新的規則會插在目前規則的上面，不過您稍候可以調整它的順序。</p> "
--"<p>如果您不小心按到此鍵，您隨時可以刪除它。</p></qt>"
-+"<qt><p>Click this button to create a new filter.</p><p>The filter will be "
-+"inserted just before the currently-selected one, but you can always change "
-+"that later on.</p><p>If you have clicked this button accidentally, you can "
-+"undo this by clicking on the <em>Delete</em> button.</p></qt>"
-+msgstr ""
-+"<qt> <p>按此鍵建立新的過濾規則。</p> <p>新的規則會插在目前規則的上面，不過您"
-+"稍候可以調整它的順序。</p> <p>如果您不小心按到此鍵，您隨時可以刪除它。</p></"
-+"qt>"
- 
- #: kmfilterdlg.cpp:64
- msgid ""
--"<qt>"
--"<p>Click this button to copy a filter.</p>"
--"<p>If you have clicked this button accidentally, you can undo this by clicking "
--"on the <em>Delete</em> button.</p></qt>"
--msgstr "<qt> <p>按此鍵複製目前的過濾規則。</p> <p>如果您不小心按到此鍵，您隨時可以刪除它。</p></qt>"
-+"<qt><p>Click this button to copy a filter.</p><p>If you have clicked this "
-+"button accidentally, you can undo this by clicking on the <em>Delete</em> "
-+"button.</p></qt>"
-+msgstr ""
-+"<qt> <p>按此鍵複製目前的過濾規則。</p> <p>如果您不小心按到此鍵，您隨時可以刪"
-+"除它。</p></qt>"
- 
- #: kmfilterdlg.cpp:68
- msgid ""
--"<qt>"
--"<p>Click this button to <em>delete</em> the currently-selected filter from the "
--"list above.</p>"
--"<p>There is no way to get the filter back once it is deleted, but you can "
--"always leave the dialog by clicking <em>Cancel</em> to discard the changes "
--"made.</p></qt>"
--msgstr ""
--"<qt> "
--"<p>按此鍵<em>刪除</em>目前選擇的過濾規則。</p> "
--"<p>規則一經刪除就無法救回來，但是您可以選擇<em>取消</em>來取消剛剛所有的變更。</p></qt>"
-+"<qt><p>Click this button to <em>delete</em> the currently-selected filter "
-+"from the list above.</p><p>There is no way to get the filter back once it is "
-+"deleted, but you can always leave the dialog by clicking <em>Cancel</em> to "
-+"discard the changes made.</p></qt>"
-+msgstr ""
-+"<qt> <p>按此鍵<em>刪除</em>目前選擇的過濾規則。</p> <p>規則一經刪除就無法救回"
-+"來，但是您可以選擇<em>取消</em>來取消剛剛所有的變更。</p></qt>"
- 
- #: kmfilterdlg.cpp:75
- msgid ""
--"<qt>"
--"<p>Click this button to move the currently-selected filter to the <em>top</em> "
--"of the list above.</p>"
--"<p>This is useful since the order of the filters in the list determines the "
--"order in which they are tried on messages: The topmost filter gets tried "
--"first.</p></qt>"
--msgstr ""
--"<qt> "
--"<p>按此鍵將目前的規則移到清單的<em>最頂端</em>。</p> "
--"<p>在執行過濾時會依據此清單的過濾器順序依序執行。最頂端的過濾器會優先執行。</p></qt>"
-+"<qt><p>Click this button to move the currently-selected filter to the "
-+"<em>top</em> of the list above.</p><p>This is useful since the order of the "
-+"filters in the list determines the order in which they are tried on "
-+"messages: The topmost filter gets tried first.</p></qt>"
-+msgstr ""
-+"<qt> <p>按此鍵將目前的規則移到清單的<em>最頂端</em>。</p> <p>在執行過濾時會依"
-+"據此清單的過濾器順序依序執行。最頂端的過濾器會優先執行。</p></qt>"
- 
- #: kmfilterdlg.cpp:81
- msgid ""
--"<qt>"
--"<p>Click this button to move the currently-selected filter <em>up</em> "
--"one in the list above.</p>"
--"<p>This is useful since the order of the filters in the list determines the "
--"order in which they are tried on messages: The topmost filter gets tried "
--"first.</p>"
--"<p>If you have clicked this button accidentally, you can undo this by clicking "
--"on the <em>Down</em> button.</p></qt>"
-+"<qt><p>Click this button to move the currently-selected filter <em>up</em> "
-+"one in the list above.</p><p>This is useful since the order of the filters "
-+"in the list determines the order in which they are tried on messages: The "
-+"topmost filter gets tried first.</p><p>If you have clicked this button "
-+"accidentally, you can undo this by clicking on the <em>Down</em> button.</"
-+"p></qt>"
- msgstr "<qt> <p>按此鍵將目前的規則往<em>上</em>移動。</p> </qt>"
- 
- #: kmfilterdlg.cpp:89
- msgid ""
--"<qt>"
--"<p>Click this button to move the currently-selected filter <em>down</em> "
--"one in the list above.</p>"
--"<p>This is useful since the order of the filters in the list determines the "
--"order in which they are tried on messages: The topmost filter gets tried "
--"first.</p>"
--"<p>If you have clicked this button accidentally, you can undo this by clicking "
--"on the <em>Up</em> button.</p></qt>"
-+"<qt><p>Click this button to move the currently-selected filter <em>down</em> "
-+"one in the list above.</p><p>This is useful since the order of the filters "
-+"in the list determines the order in which they are tried on messages: The "
-+"topmost filter gets tried first.</p><p>If you have clicked this button "
-+"accidentally, you can undo this by clicking on the <em>Up</em> button.</p></"
-+"qt>"
- msgstr "<qt> <p>按此鍵將目前的規則往<em>下</em>移動。</p> </qt>"
- 
- #: kmfilterdlg.cpp:97
- msgid ""
--"<qt>"
--"<p>Click this button to move the currently-selected filter to the <em>"
--"bottom</em> of the list above.</p>"
--"<p>This is useful since the order of the filters in the list determines the "
--"order in which they are tried on messages: The topmost filter gets tried "
--"first.</p></qt>"
--msgstr ""
--"<qt> "
--"<p>按此鍵將目前的規則移到清單的<em>最底端</em>。</p> "
--"<p>在執行過濾時會依據此清單的過濾器順序依序執行。最頂端的過濾器會優先執行。</p></qt>"
-+"<qt><p>Click this button to move the currently-selected filter to the "
-+"<em>bottom</em> of the list above.</p><p>This is useful since the order of "
-+"the filters in the list determines the order in which they are tried on "
-+"messages: The topmost filter gets tried first.</p></qt>"
-+msgstr ""
-+"<qt> <p>按此鍵將目前的規則移到清單的<em>最底端</em>。</p> <p>在執行過濾時會依"
-+"據此清單的過濾器順序依序執行。最頂端的過濾器會優先執行。</p></qt>"
- 
- #: kmfilterdlg.cpp:103
- msgid ""
--"<qt>"
--"<p>Click this button to rename the currently-selected filter.</p>"
--"<p>Filters are named automatically, as long as they start with \"&lt;\".</p>"
--"<p>If you have renamed a filter accidentally and want automatic naming back, "
--"click this button and select <em>Clear</em> followed by <em>OK</em> "
--"in the appearing dialog.</p></qt>"
--msgstr ""
--"<qt> "
--"<p>按此鍵可以重新命名規則。</p> "
--"<p>新的規則會自動命名，您可以更改它的名稱。</p> "
--"<p>如果想要將名稱回覆到原先系統自動給的名稱，您可以選擇重新命名，然後按下<em>清除</em>後再按<em>確定</em>即可。</p></qt>"
-+"<qt><p>Click this button to rename the currently-selected filter.</"
-+"p><p>Filters are named automatically, as long as they start with \"&lt;\".</"
-+"p><p>If you have renamed a filter accidentally and want automatic naming "
-+"back, click this button and select <em>Clear</em> followed by <em>OK</em> in "
-+"the appearing dialog.</p></qt>"
-+msgstr ""
-+"<qt> <p>按此鍵可以重新命名規則。</p> <p>新的規則會自動命名，您可以更改它的名"
-+"稱。</p> <p>如果想要將名稱回覆到原先系統自動給的名稱，您可以選擇重新命名，然"
-+"後按下<em>清除</em>後再按<em>確定</em>即可。</p></qt>"
- 
- #: kmfilterdlg.cpp:110
- msgid ""
--"<qt>"
--"<p>Check this button to force the confirmation dialog to be displayed.</p>"
--"<p>This is useful if you have defined a ruleset that tags messages to be "
-+"<qt><p>Check this button to force the confirmation dialog to be displayed.</"
-+"p><p>This is useful if you have defined a ruleset that tags messages to be "
- "downloaded later. Without the possibility to force the dialog popup, these "
--"messages could never be downloaded if no other large messages were waiting on "
--"the server, or if you wanted to change the ruleset to tag the messages "
-+"messages could never be downloaded if no other large messages were waiting "
-+"on the server, or if you wanted to change the ruleset to tag the messages "
- "differently.</p></qt>"
- msgstr ""
--"<qt> "
--"<p>勾選這個選項，則強制顯示確認對話框。</p> "
--"<p>如果您定義了一個規則，選擇等等要下載的信件，就應該開啟確認對話框。否則如果沒有其他大的信件在伺服器端等待，或是您要修改規則時，這些信件就有可能永遠不會被下"
--"載。</p></qt>"
-+"<qt> <p>勾選這個選項，則強制顯示確認對話框。</p> <p>如果您定義了一個規則，選"
-+"擇等等要下載的信件，就應該開啟確認對話框。否則如果沒有其他大的信件在伺服器端"
-+"等待，或是您要修改規則時，這些信件就有可能永遠不會被下載。</p></qt>"
- 
- #: kmfilterdlg.cpp:129
- msgid "POP3 Filter Rules"
-@@ -5968,8 +5881,8 @@
- #: kmfilterdlg.cpp:744
- msgid ""
- "At least one filter targets a folder on an online IMAP account. Such filters "
--"will only be applied when manually filtering and when filtering incoming online "
--"IMAP mail."
-+"will only be applied when manually filtering and when filtering incoming "
-+"online IMAP mail."
- msgstr "至少有一個過濾器被套用在 IMAP 帳號上。這樣只能對新進信件用手動過濾。"
- 
- #: kmfilterdlg.cpp:774
-@@ -6020,25 +5933,23 @@
- 
- #: kmfoldercachedimap.cpp:122
- msgid ""
--"_: "
--"<p><b>Troubleshooting the IMAP cache.</b></p>"
--"<p>If you have problems with synchronizing an IMAP folder, you should first try "
--"rebuilding the index file. This will take some time to rebuild, but will not "
--"cause any problems.</p>"
--"<p>If that is not enough, you can try refreshing the IMAP cache. If you do "
-+"_: <p><b>Troubleshooting the IMAP cache.</b></p><p>If you have problems with "
-+"synchronizing an IMAP folder, you should first try rebuilding the index "
-+"file. This will take some time to rebuild, but will not cause any problems.</"
-+"p><p>If that is not enough, you can try refreshing the IMAP cache. If you do "
- "this, you will loose all your local changes for this folder and all its "
- "subfolders.</p>\n"
--"<p><b>Troubleshooting the IMAP cache.</b></p>"
--"<p>If you have problems with synchronizing an IMAP folder, you should first try "
--"rebuilding the index file. This will take some time to rebuild, but will not "
--"cause any problems.</p>"
--"<p>If that is not enough, you can try refreshing the IMAP cache. If you do "
-+"<p><b>Troubleshooting the IMAP cache.</b></p><p>If you have problems with "
-+"synchronizing an IMAP folder, you should first try rebuilding the index "
-+"file. This will take some time to rebuild, but will not cause any problems.</"
-+"p><p>If that is not enough, you can try refreshing the IMAP cache. If you do "
- "this, you will lose all your local changes for this folder and all its "
- "subfolders.</p>"
- msgstr ""
--"<p><b>如何解決 IMAP 快取的問題</b></p> "
--"<p>如果您在與 IMAP 資料夾同步時發生問題，您可以先試著重建索引檔。這會花一點時間，但不會有什麼問題。</p> "
--"<p>如果重建後仍然不行，試著更新 IMAP 快取內容。這樣會失去先前對本地端這個資料夾及其子資料夾所做的改變，回復到原先的設定。</p>"
-+"<p><b>如何解決 IMAP 快取的問題</b></p> <p>如果您在與 IMAP 資料夾同步時發生問"
-+"題，您可以先試著重建索引檔。這會花一點時間，但不會有什麼問題。</p> <p>如果重"
-+"建後仍然不行，試著更新 IMAP 快取內容。這樣會失去先前對本地端這個資料夾及其子"
-+"資料夾所做的改變，回復到原先的設定。</p>"
- 
- #: kmfoldercachedimap.cpp:135
- msgid "Rebuild &Index"
-@@ -6068,12 +5979,14 @@
- msgid ""
- "The UID cache file for folder %1 could not be read. There could be a problem "
- "with file system permission, or it is corrupted."
--msgstr "無法讀取資料夾 %1 的使用者代碼快取檔。有可能是因為檔案系統權限的問題，或該檔已損毀。"
-+msgstr ""
-+"無法讀取資料夾 %1 的使用者代碼快取檔。有可能是因為檔案系統權限的問題，或該檔"
-+"已損毀。"
- 
- #: kmfoldercachedimap.cpp:452
- msgid ""
--"The UID cache file for folder %1 could not be written. There could be a problem "
--"with file system permission."
-+"The UID cache file for folder %1 could not be written. There could be a "
-+"problem with file system permission."
- msgstr "無法寫入資料夾 %1 的使用者代碼快取檔。有可能是因為檔案系統權限的問題。"
- 
- #: kmfoldercachedimap.cpp:562
-@@ -6111,10 +6024,11 @@
- 
- #: kmfoldercachedimap.cpp:721
- msgid ""
--"Folder %1 is not in initial sync state (state was %2). Do you want to reset it "
--"to initial sync state and sync anyway?"
-+"Folder %1 is not in initial sync state (state was %2). Do you want to reset "
-+"it to initial sync state and sync anyway?"
- msgstr ""
--"資料夾 %1 目前並不是在初始同步狀態(initial sync state)下。（目前狀態為 %2）。您確定要重置成初始同步狀態，並進行同步動作嗎？"
-+"資料夾 %1 目前並不是在初始同步狀態(initial sync state)下。（目前狀態為 %2）。"
-+"您確定要重置成初始同步狀態，並進行同步動作嗎？"
- 
- #: kmfoldercachedimap.cpp:721
- msgid "Reset && Sync"
-@@ -6238,14 +6152,11 @@
- 
- #: kmfoldercachedimap.cpp:1546
- msgid ""
--"<qt>"
--"<p>Mails on the server in folder <b>%1</b> were deleted. Do you want to delete "
--"them locally?"
--"<br>UIDs: %2</p></qt>"
--msgstr ""
--"<qt>"
--"<p>伺服器中資料夾 <b>%1</b> 裡的郵件已經被刪除了。您要一起刪除本地端的資料嗎？"
--"<br> 使用者代碼：%2</p></qt>"
-+"<qt><p>Mails on the server in folder <b>%1</b> were deleted. Do you want to "
-+"delete them locally?<br>UIDs: %2</p></qt>"
-+msgstr ""
-+"<qt><p>伺服器中資料夾 <b>%1</b> 裡的郵件已經被刪除了。您要一起刪除本地端的資"
-+"料嗎？<br> 使用者代碼：%2</p></qt>"
- 
- #: kmfoldercachedimap.cpp:1558
- msgid "Deleting removed messages from server"
-@@ -6266,10 +6177,11 @@
- 
- #: kmfoldercachedimap.cpp:2130
- msgid ""
--"<qt>"
--"<p>It seems that the folder <b>%1</b> was deleted. Do you want to delete it "
--"from the server?</p></qt>"
--msgstr "<qt> <p>資料夾 <b>%1</b> 似乎已經被刪除了。您要一起刪除伺服器上的資料夾嗎？</p></qt>"
-+"<qt><p>It seems that the folder <b>%1</b> was deleted. Do you want to delete "
-+"it from the server?</p></qt>"
-+msgstr ""
-+"<qt> <p>資料夾 <b>%1</b> 似乎已經被刪除了。您要一起刪除伺服器上的資料夾嗎？</"
-+"p></qt>"
- 
- #: kmfoldercachedimap.cpp:2411
- msgid "Aborted"
-@@ -6277,15 +6189,17 @@
- 
- #: kmfoldercachedimap.cpp:2592
- msgid ""
--"The IMAP server %1 does not have support for IMAP annotations. The XML storage "
--"cannot be used on this server; please re-configure KMail differently."
--msgstr "IMAP 伺服器 %1 不支援 annotations。無法使用 XML storage，請重新設定 KMail。"
-+"The IMAP server %1 does not have support for IMAP annotations. The XML "
-+"storage cannot be used on this server; please re-configure KMail differently."
-+msgstr ""
-+"IMAP 伺服器 %1 不支援 annotations。無法使用 XML storage，請重新設定 KMail。"
- 
- #: kmfoldercachedimap.cpp:2620
- msgid ""
--"The IMAP server %1 doesn't have support for imap annotations. The XML storage "
--"cannot be used on this server, please re-configure KMail differently"
--msgstr "IMAP 伺服器 %1 不支援 annotations。無法使用 XML storage，請重新設定 KMail。"
-+"The IMAP server %1 doesn't have support for imap annotations. The XML "
-+"storage cannot be used on this server, please re-configure KMail differently"
-+msgstr ""
-+"IMAP 伺服器 %1 不支援 annotations。無法使用 XML storage，請重新設定 KMail。"
- 
- #: kmfoldercachedimap.cpp:2729
- msgid "Error while setting annotation: "
-@@ -6297,14 +6211,15 @@
- 
- #: kmfoldercachedimap.cpp:2895
- msgid ""
--"<p>There are new messages in folder <b>%1</b>, which have not been uploaded to "
--"the server yet, but the folder has been deleted on the server or you do not "
--"have sufficient access rights on the folder to upload them.</p>"
--"<p>All affected messages will therefore be moved to <b>%2</b> "
--"to avoid data loss.</p>"
--msgstr ""
--"<p>在資料夾 <b>%1</b> 中有新信件，尚未上傳到伺服器。不過此資料夾不是已經在伺服器上被刪除，就是您沒有權限可以上傳。</p> "
--"<p>所有受影響的信件都會被移到 <b>%2</b> 以避免遺失。</p>"
-+"<p>There are new messages in folder <b>%1</b>, which have not been uploaded "
-+"to the server yet, but the folder has been deleted on the server or you do "
-+"not have sufficient access rights on the folder to upload them.</p><p>All "
-+"affected messages will therefore be moved to <b>%2</b> to avoid data loss.</"
-+"p>"
-+msgstr ""
-+"<p>在資料夾 <b>%1</b> 中有新信件，尚未上傳到伺服器。不過此資料夾不是已經在伺"
-+"服器上被刪除，就是您沒有權限可以上傳。</p> <p>所有受影響的信件都會被移到 <b>%"
-+"2</b> 以避免遺失。</p>"
- 
- #: kmfoldercachedimap.cpp:2901
- msgid "Insufficient access rights"
-@@ -6312,17 +6227,17 @@
- 
- #: kmfoldercachedimap.cpp:2907
- msgid ""
--"<p>There are new messages in this folder (%1), which have not been uploaded to "
--"the server yet, but the folder has been deleted on the server or you do not "
--"have sufficient access rights on the folder now to upload them. Please contact "
--"your administrator to allow upload of new messages to you, or move them out of "
--"this folder.</p> "
--"<p>Do you want to move these messages to another folder now?</p>"
--msgstr ""
--"<p>在資料夾 <b>%1</b> "
--"中有新信件，尚未上傳到伺服器。不過此資料夾不是已經在伺服器上被刪除，就是您沒有權限可以上傳。請與您的管理員聯絡，以便讓您上傳，或是您可以將這些信件移到別的資料夾"
--"。</p> "
--"<p>您要現在將這些信件移到別的資料夾嗎？</p>"
-+"<p>There are new messages in this folder (%1), which have not been uploaded "
-+"to the server yet, but the folder has been deleted on the server or you do "
-+"not have sufficient access rights on the folder now to upload them. Please "
-+"contact your administrator to allow upload of new messages to you, or move "
-+"them out of this folder.</p> <p>Do you want to move these messages to "
-+"another folder now?</p>"
-+msgstr ""
-+"<p>在資料夾 <b>%1</b> 中有新信件，尚未上傳到伺服器。不過此資料夾不是已經在伺"
-+"服器上被刪除，就是您沒有權限可以上傳。請與您的管理員聯絡，以便讓您上傳，或是"
-+"您可以將這些信件移到別的資料夾。</p> <p>您要現在將這些信件移到別的資料夾嗎？"
-+"</p>"
- 
- #: kmfoldercachedimap.cpp:2914 kmkernel.cpp:1801
- msgid "Do Not Move"
-@@ -6374,18 +6289,18 @@
- 
- #: kmfolderdia.cpp:358
- msgid ""
--"<qt>"
--"<p>If this option is enabled then you will be notified about new/unread mail in "
--"this folder. Moreover, going to the next/previous folder with unread messages "
--"will stop at this folder.</p>"
--"<p>Uncheck this option if you do not want to be notified about new/unread mail "
--"in this folder and if you want this folder to be skipped when going to the "
--"next/previous folder with unread messages. This is useful for ignoring any "
--"new/unread mail in your trash and spam folder.</p></qt>"
--msgstr ""
--"<qt> "
--"<p>這個選項被勾選的話，系統會通知您這個資料夾內有新的或未讀的信件，在找尋下一封未讀信件時也會在這個資料夾內搜尋。</p> "
--"<p>不勾選的話，系統就不會通知您，找未讀信件時也不會找這個資料夾。通常用於資源回收桶或存放垃圾信的資料夾。</p></qt>"
-+"<qt><p>If this option is enabled then you will be notified about new/unread "
-+"mail in this folder. Moreover, going to the next/previous folder with unread "
-+"messages will stop at this folder.</p><p>Uncheck this option if you do not "
-+"want to be notified about new/unread mail in this folder and if you want "
-+"this folder to be skipped when going to the next/previous folder with unread "
-+"messages. This is useful for ignoring any new/unread mail in your trash and "
-+"spam folder.</p></qt>"
-+msgstr ""
-+"<qt> <p>這個選項被勾選的話，系統會通知您這個資料夾內有新的或未讀的信件，在找"
-+"尋下一封未讀信件時也會在這個資料夾內搜尋。</p> <p>不勾選的話，系統就不會通知"
-+"您，找未讀信件時也不會找這個資料夾。通常用於資源回收桶或存放垃圾信的資料夾。"
-+"</p></qt>"
- 
- #: kmfolderdia.cpp:374
- msgid "Include this folder in mail checks"
-@@ -6397,10 +6312,11 @@
- 
- #: kmfolderdia.cpp:387
- msgid ""
--"Check this option if you want replies you write to mails in this folder to be "
--"put in this same folder after sending, instead of in the configured sent-mail "
--"folder."
--msgstr "這個選項勾選的話，您回覆的信件也會放在這個資料夾，而不是放到寄件備份中。"
-+"Check this option if you want replies you write to mails in this folder to "
-+"be put in this same folder after sending, instead of in the configured sent-"
-+"mail folder."
-+msgstr ""
-+"這個選項勾選的話，您回覆的信件也會放在這個資料夾，而不是放到寄件備份中。"
- 
- #: kmfolderdia.cpp:402
- msgid "Show Sender/Receiver Column in List of Messages"
-@@ -6427,16 +6343,18 @@
- 
- #: kmfolderdia.cpp:423
- msgid "&Sender identity:"
--msgstr "寄件人身份(&S)："
-+msgstr "寄件人身分(&S)："
- 
- #: kmfolderdia.cpp:429
- msgid ""
--"Select the sender identity to be used when writing new mail or replying to mail "
--"in this folder. This means that if you are in one of your work folders, you can "
--"make KMail use the corresponding sender email address, signature and signing or "
--"encryption keys automatically. Identities can be set up in the main "
--"configuration dialog. (Settings -> Configure KMail)"
--msgstr "您可以選擇要用哪一個身份做為寄件者，包括簽名檔、電子簽章與加密等等的設定都會套用您所選擇的身份的設定。"
-+"Select the sender identity to be used when writing new mail or replying to "
-+"mail in this folder. This means that if you are in one of your work folders, "
-+"you can make KMail use the corresponding sender email address, signature and "
-+"signing or encryption keys automatically. Identities can be set up in the "
-+"main configuration dialog. (Settings -> Configure KMail)"
-+msgstr ""
-+"您可以選擇要用哪一個身分做為寄件者，包括簽名檔、電子簽章與加密等等的設定都會"
-+"套用您所選擇的身分的設定。"
- 
- #: kmfolderdia.cpp:442
- msgid "&Folder contents:"
-@@ -6454,19 +6372,23 @@
- "(for tasks, this setting is only used for alarms).\n"
- "\n"
- "Example use cases: if the boss shares a folder with his secretary, only the "
--"boss should be marked as busy for his meetings, so he should select \"Admins\", "
--"since the secretary has no admin rights on the folder.\n"
--"On the other hand if a working group shares a Calendar for group meetings, all "
--"readers of the folders should be marked as busy for meetings.\n"
--"A company-wide folder with optional events in it would use \"Nobody\" since it "
--"is not known who will go to those events."
--msgstr ""
--"這個設定是針對日曆或行事曆資料夾（設定在行事曆上時，只用於提醒通知），設定哪些使用者在讀取這個資料夾的內容時，可以在清單中標記「忙碌」或「空閒」，並收到提醒通知"
--"。\n"
--"\n"
--"例如：如果老闆開了一個資料夾跟秘書共享，應該只有老闆可以設定是否忙碌，因此應該他應該將此設定設為「管理者」。\n"
--"再舉個例，如果一群共同進行一個專案的同事共享一份日曆設定，那設定會議時，所有人都應該同時被標上忙碌，並收到通知。\n"
--"如果是全公司都可以看到的資料夾紀錄某些事件，那就應該設定成「無」，因為不確定有哪些人會參與這些事件。"
-+"boss should be marked as busy for his meetings, so he should select \"Admins"
-+"\", since the secretary has no admin rights on the folder.\n"
-+"On the other hand if a working group shares a Calendar for group meetings, "
-+"all readers of the folders should be marked as busy for meetings.\n"
-+"A company-wide folder with optional events in it would use \"Nobody\" since "
-+"it is not known who will go to those events."
-+msgstr ""
-+"這個設定是針對日曆或行事曆資料夾（設定在行事曆上時，只用於提醒通知），設定哪"
-+"些使用者在讀取這個資料夾的內容時，可以在清單中標記「忙碌」或「空閒」，並收到"
-+"提醒通知。\n"
-+"\n"
-+"例如：如果老闆開了一個資料夾跟祕書共享，應該只有老闆可以設定是否忙碌，因此應"
-+"該他應該將此設定設為「管理者」。\n"
-+"再舉個例，如果一群共同進行一個專案的同事共享一份日曆設定，那設定會議時，所有"
-+"人都應該同時被標上忙碌，並收到通知。\n"
-+"如果是全公司都可以看到的資料夾紀錄某些事件，那就應該設定成「無」，因為不確定"
-+"有哪些人會參與這些事件。"
- 
- #: kmfolderdia.cpp:497
- msgid "Nobody"
-@@ -6492,11 +6414,13 @@
- #: kmfolderdia.cpp:585
- msgid ""
- "You have configured this folder to contain groupware information and the "
--"general configuration option to hide groupware folders is set. That means that "
--"this folder will disappear once the configuration dialog is closed. If you want "
--"to remove the folder again, you will need to temporarily disable hiding of "
--"groupware folders to be able to see it."
--msgstr "您已經設定這個資料夾包含群組資訊，並設定為隱藏。如果您要移除這個資料夾的話，您必須取消隱藏狀態。"
-+"general configuration option to hide groupware folders is set. That means "
-+"that this folder will disappear once the configuration dialog is closed. If "
-+"you want to remove the folder again, you will need to temporarily disable "
-+"hiding of groupware folders to be able to see it."
-+msgstr ""
-+"您已經設定這個資料夾包含群組資訊，並設定為隱藏。如果您要移除這個資料夾的話，"
-+"您必須取消隱藏狀態。"
- 
- #: kmfolderdir.cpp:184
- msgid "<qt>Cannot enter folder <b>%1</b>.</qt>"
-@@ -6565,7 +6489,8 @@
- msgid ""
- "The mail index for '%1' is from an unknown version of KMail (%2).\n"
- "This index can be regenerated from your mail folder, but some information, "
--"including status flags, may be lost. Do you wish to downgrade your index file?"
-+"including status flags, may be lost. Do you wish to downgrade your index "
-+"file?"
- msgstr ""
- "%1 的信件索引是由不知哪個版本的 KMail (%2) 產生的。\n"
- "索引可以重建，但是有些像是狀態之類的資訊可能會不見。您要重建索引嗎？"
-@@ -6582,7 +6507,8 @@
- msgid ""
- "The mail index for '%1' is corrupted and will be regenerated now, but some "
- "information, including status flags, will be lost."
--msgstr "%1 的信件索引已損毀，將會重新建立索引。但是有些像是狀態之類的資訊可能會不見。"
-+msgstr ""
-+"%1 的信件索引已損毀，將會重新建立索引。但是有些像是狀態之類的資訊可能會不見。"
- 
- #: kmfoldermaildir.cpp:89
- msgid "Error opening %1; this folder is missing."
-@@ -6590,8 +6516,8 @@
- 
- #: kmfoldermaildir.cpp:92
- msgid ""
--"Error opening %1; either this is not a valid maildir folder, or you do not have "
--"sufficient access permissions."
-+"Error opening %1; either this is not a valid maildir folder, or you do not "
-+"have sufficient access permissions."
- msgstr "無法開啟 %1，它可能不是一個 maildir 的資料夾，或者是權限問題。"
- 
- #: kmfoldermaildir.cpp:124
-@@ -6632,17 +6558,15 @@
- 
- #: kmfoldermbox.cpp:128
- msgid ""
--"<qt>"
--"<p>The index of folder '%2' seems to be out of date. To prevent message "
-+"<qt><p>The index of folder '%2' seems to be out of date. To prevent message "
- "corruption the index will be regenerated. As a result deleted messages might "
--"reappear and status flags might be lost.</p>"
--"<p>Please read the corresponding entry in the <a href=\"%1\">"
--"FAQ section of the manual of KMail</a> for information about how to prevent "
--"this problem from happening again.</p></qt>"
--msgstr ""
--"<qt>"
--"<p>資料夾 %2 的索引已經過期。為了避免信件被損毀，索引會被重建，不過之前刪除的訊息可能會重新跑出來，而信件狀態則可能會不見。</p> "
--"<p>請到 <a href=\"%1\">KMail FAQ</a>中閱讀相關資料，來看看如何避免這種狀況再發生。</p></qt>"
-+"reappear and status flags might be lost.</p><p>Please read the corresponding "
-+"entry in the <a href=\"%1\">FAQ section of the manual of KMail</a> for "
-+"information about how to prevent this problem from happening again.</p></qt>"
-+msgstr ""
-+"<qt><p>資料夾 %2 的索引已經過期。為了避免信件被損毀，索引會被重建，不過之前刪"
-+"除的訊息可能會重新跑出來，而信件狀態則可能會不見。</p> <p>請到 <a href=\"%1"
-+"\">KMail FAQ</a>中閱讀相關資料，來看看如何避免這種狀況再發生。</p></qt>"
- 
- #: kmfoldermbox.cpp:152 kmfoldermbox.cpp:158
- msgid "Index Out of Date"
-@@ -6717,9 +6641,11 @@
- 
- #: kmfoldermgr.cpp:200
- msgid ""
--"A folder with the same name has been deleted since the last mail check.You need "
--"to check mails first before creating another folder with the same name."
--msgstr "在上次檢查郵件之後，有一個同名的資料夾已經被刪除。您在建立同名資料夾前，必須先再檢查一次郵件。"
-+"A folder with the same name has been deleted since the last mail check.You "
-+"need to check mails first before creating another folder with the same name."
-+msgstr ""
-+"在上次檢查郵件之後，有一個同名的資料夾已經被刪除。您在建立同名資料夾前，必須"
-+"先再檢查一次郵件。"
- 
- #: kmfoldermgr.cpp:202
- msgid "Could Not Create Folder"
-@@ -6741,7 +6667,7 @@
- #: kmfolderseldlg.cpp:283 kmfolderseldlg.cpp:445 kmfolderseldlg.cpp:465
- #: kmfoldertree.cpp:1056 kmfoldertree.cpp:1077
- msgid "&New Subfolder..."
--msgstr "新資料夾(&N)..."
-+msgstr "新資料夾(&N)…"
- 
- #: kmfolderseldlg.cpp:446 kmfolderseldlg.cpp:466
- msgid "Create a new subfolder under the currently selected folder"
-@@ -6785,7 +6711,7 @@
- 
- #: kmfoldertree.cpp:1057 kmmainwidget.cpp:2757
- msgid "&New Folder..."
--msgstr "建立新資料夾(&N)..."
-+msgstr "建立新資料夾(&N)…"
- 
- #: kmfoldertree.cpp:1068 kmmainwidget.cpp:2645
- msgid "Check &Mail"
-@@ -6793,11 +6719,11 @@
- 
- #: kmfoldertree.cpp:1084
- msgid "&Copy Folder To"
--msgstr "複製此資料夾到...(&C)"
-+msgstr "複製此資料夾到…(&C)"
- 
- #: kmfoldertree.cpp:1090
- msgid "&Move Folder To"
--msgstr "移動此資料夾到...(&M)"
-+msgstr "移動此資料夾到…(&M)"
- 
- #: kmfoldertree.cpp:1104
- msgid "Add to Favorite Folders"
-@@ -6809,7 +6735,7 @@
- 
- #: kmfoldertree.cpp:1126
- msgid "Local Subscription..."
--msgstr "本地端訂閱..."
-+msgstr "本地端訂閱…"
- 
- #: kmfoldertree.cpp:1133
- msgid "Refresh Folder List"
-@@ -6821,10 +6747,12 @@
- 
- #: kmfoldertree.cpp:1242
- msgid ""
--"<qt>Cannot create folder <b>%1</b> because of insufficient permissions on the "
--"server. If you think you should be able to create subfolders here, ask your "
--"administrator to grant you rights to do so.</qt> "
--msgstr "<qt>無法產生資料夾<b>%1</b>，因為伺服器上的權限不足。請向您的管理員反應。</qt>"
-+"<qt>Cannot create folder <b>%1</b> because of insufficient permissions on "
-+"the server. If you think you should be able to create subfolders here, ask "
-+"your administrator to grant you rights to do so.</qt> "
-+msgstr ""
-+"<qt>無法產生資料夾<b>%1</b>，因為伺服器上的權限不足。請向您的管理員反應。</"
-+"qt>"
- 
- #: kmfoldertree.cpp:1657 kmmainwidget.cpp:420 kmmainwidget.cpp:427
- #: kmmainwidget.cpp:434 kmsearchpattern.h:220
-@@ -6946,10 +6874,10 @@
- #: kmheaders.cpp:1560
- #, c-format
- msgid ""
--"_n: <qt>Do you really want to delete the selected message?"
--"<br>Once deleted, it cannot be restored.</qt>\n"
--"<qt>Do you really want to delete the %n selected messages?"
--"<br>Once deleted, they cannot be restored.</qt>"
-+"_n: <qt>Do you really want to delete the selected message?<br>Once deleted, "
-+"it cannot be restored.</qt>\n"
-+"<qt>Do you really want to delete the %n selected messages?<br>Once deleted, "
-+"they cannot be restored.</qt>"
- msgstr "<qt>您確定要刪除這 %n 封信件嗎？<br> 刪除後就無法回復了。</qt>"
- 
- #: kmheaders.cpp:1562
-@@ -7082,26 +7010,25 @@
- #: kmkernel.cpp:1777
- msgid ""
- "_: %1-%3 is the application name, %4-%7 are folder path\n"
--"<qt>The <i>%4</i> folder exists. %1 now uses the <i>%5</i> "
--"folder for its messages."
--"<p>%2 can move the contents of <i>%6<i> into this folder for you, though this "
--"may replace any existing files with the same name in <i>%7</i>."
-+"<qt>The <i>%4</i> folder exists. %1 now uses the <i>%5</i> folder for its "
-+"messages.<p>%2 can move the contents of <i>%6<i> into this folder for you, "
-+"though this may replace any existing files with the same name in <i>%7</i>."
- "<p><strong>Would you like %3 to move the mail files now?</strong></qt>"
- msgstr ""
--"<qt>資料夾 <i>%4</i> 已存在。%1 目前使用資料夾 <i>%5</i> 來存放信件。 "
--"<p>%2 可以將 <i>%6</i> 的內容搬到這個資料夾，不過可能會將資料夾 <i>%7</i> 中相同名稱的檔案給蓋掉。 "
--"<p><strong>您確定要 %3 搬移信件檔案嗎？</strong></qt>"
-+"<qt>資料夾 <i>%4</i> 已存在。%1 目前使用資料夾 <i>%5</i> 來存放信件。 <p>%2 "
-+"可以將 <i>%6</i> 的內容搬到這個資料夾，不過可能會將資料夾 <i>%7</i> 中相同名"
-+"稱的檔案給蓋掉。 <p><strong>您確定要 %3 搬移信件檔案嗎？</strong></qt>"
- 
- #: kmkernel.cpp:1789
- msgid ""
- "_: %1-%3 is the application name, %4-%6 are folder path\n"
--"<qt>The <i>%4</i> folder exists. %1 now uses the <i>%5</i> "
--"folder for its messages. %2 can move the contents of <i>%6</i> "
--"into this folder for you."
-+"<qt>The <i>%4</i> folder exists. %1 now uses the <i>%5</i> folder for its "
-+"messages. %2 can move the contents of <i>%6</i> into this folder for you."
- "<p><strong>Would you like %3 to move the mail files now?</strong></qt>"
- msgstr ""
--"<qt>資料夾 <i>%4</i> 已存在。%1 目前使用資料夾 <i>%5</i> 來存放信件。%2 可以將 <i>%6</i> 的內容搬到這個資料夾。"
--"<p><strong>您確定要 %3 搬移信件檔案嗎？</strong></qt>"
-+"<qt>資料夾 <i>%4</i> 已存在。%1 目前使用資料夾 <i>%5</i> 來存放信件。%2 可以"
-+"將 <i>%6</i> 的內容搬到這個資料夾。<p><strong>您確定要 %3 搬移信件檔案嗎？</"
-+"strong></qt>"
- 
- #: kmkernel.cpp:1798
- msgid "Migrate Mail Files?"
-@@ -7199,8 +7126,7 @@
- #: kmmainwidget.cpp:993
- msgid ""
- "_: %1 is a list of the number of new messages per folder\n"
--"<b>New mail arrived</b>"
--"<br>%1"
-+"<b>New mail arrived</b><br>%1"
- msgstr "<b>有新信件來了！</b> <br>%1"
- 
- #: kmmainwidget.cpp:997
-@@ -7238,8 +7164,8 @@
- 
- #: kmmainwidget.cpp:1179
- msgid ""
--"<qt>Are you sure you want to move all messages from folder <b>%1</b> "
--"to the trash?</qt>"
-+"<qt>Are you sure you want to move all messages from folder <b>%1</b> to the "
-+"trash?</qt>"
- msgstr "<qt>您確定要將 <b>%1</b> 中的信件都搬到資源回收桶嗎？</qt>"
- 
- #: kmmainwidget.cpp:1198
-@@ -7252,9 +7178,11 @@
- 
- #: kmmainwidget.cpp:1221
- msgid ""
--"<qt>Are you sure you want to delete the search <b>%1</b>?"
--"<br>Any messages it shows will still be available in their original folder.</qt>"
--msgstr "<qt>您確定要刪除搜尋 <b>%1</b> 的結果？<br> 您還是可以在原來的資料夾內找到相關內容。</qt>"
-+"<qt>Are you sure you want to delete the search <b>%1</b>?<br>Any messages it "
-+"shows will still be available in their original folder.</qt>"
-+msgstr ""
-+"<qt>您確定要刪除搜尋 <b>%1</b> 的結果？<br> 您還是可以在原來的資料夾內找到相"
-+"關內容。</qt>"
- 
- #: kmmainwidget.cpp:1225
- msgid "Delete Folder"
-@@ -7266,47 +7194,50 @@
- 
- #: kmmainwidget.cpp:1233
- msgid ""
--"<qt>Are you sure you want to delete the empty folder <b>%1</b> "
--"and all its subfolders? Those subfolders might not be empty and their contents "
--"will be discarded as well. "
--"<p><b>Beware</b> that discarded messages are not saved into your Trash folder "
--"and are permanently deleted.</qt>"
--msgstr ""
--"<qt>您確定要移除空資料夾 <b>%1</b> 以及所有子資料夾嗎？子資料夾可能不是空的，若您刪除則所有內容都會被刪除。 "
--"<p><b>請小心</b>，刪除的信件將不會被移到資源回收桶，而是會被永久刪除。</qt>"
-+"<qt>Are you sure you want to delete the empty folder <b>%1</b> and all its "
-+"subfolders? Those subfolders might not be empty and their contents will be "
-+"discarded as well. <p><b>Beware</b> that discarded messages are not saved "
-+"into your Trash folder and are permanently deleted.</qt>"
-+msgstr ""
-+"<qt>您確定要移除空資料夾 <b>%1</b> 以及所有子資料夾嗎？子資料夾可能不是空的，"
-+"若您刪除則所有內容都會被刪除。 <p><b>請小心</b>，刪除的信件將不會被移到資源回"
-+"收桶，而是會被永久刪除。</qt>"
- 
- #: kmmainwidget.cpp:1242
- msgid ""
--"<qt>Are you sure you want to delete the folder <b>%1</b>"
--", discarding its contents? "
--"<p><b>Beware</b> that discarded messages are not saved into your Trash folder "
--"and are permanently deleted.</qt>"
-+"<qt>Are you sure you want to delete the folder <b>%1</b>, discarding its "
-+"contents? <p><b>Beware</b> that discarded messages are not saved into your "
-+"Trash folder and are permanently deleted.</qt>"
- msgstr ""
--"<qt>您確定要移除資料夾 <b>%1</b> ，並捨棄其內容？ "
--"<p><b>請小心</b>，刪除的信件將不會被移到資源回收桶，而是會被永久刪除。</qt>"
-+"<qt>您確定要移除資料夾 <b>%1</b> ，並捨棄其內容？ <p><b>請小心</b>，刪除的信"
-+"件將不會被移到資源回收桶，而是會被永久刪除。</qt>"
- 
- #: kmmainwidget.cpp:1249
- msgid ""
--"<qt>Are you sure you want to delete the folder <b>%1</b> "
--"and all its subfolders, discarding their contents? "
--"<p><b>Beware</b> that discarded messages are not saved into your Trash folder "
--"and are permanently deleted.</qt>"
-+"<qt>Are you sure you want to delete the folder <b>%1</b> and all its "
-+"subfolders, discarding their contents? <p><b>Beware</b> that discarded "
-+"messages are not saved into your Trash folder and are permanently deleted.</"
-+"qt>"
- msgstr ""
--"<qt>您確定要移除資料夾 <b>%1</b> 以及所有子資料夾，並捨棄其內容？ "
--"<p><b>請小心</b>，刪除的信件將不會被移到資源回收桶，而是會被永久刪除。</qt></qt>"
-+"<qt>您確定要移除資料夾 <b>%1</b> 以及所有子資料夾，並捨棄其內容？ <p><b>請小"
-+"心</b>，刪除的信件將不會被移到資源回收桶，而是會被永久刪除。</qt></qt>"
- 
- #: kmmainwidget.cpp:1268
- msgid ""
--"<qt>The folder you deleted was associated with the account <b>%1</b> "
--"which delivered mail into it. The folder the account delivers new mail into was "
-+"<qt>The folder you deleted was associated with the account <b>%1</b> which "
-+"delivered mail into it. The folder the account delivers new mail into was "
- "reset to the main Inbox folder.</qt>"
--msgstr "<qt>您刪除的資料夾是帳號 <b>%1</b> 所設定的收件匣。刪除後這個帳號將會改用預設的收件匣。</qt>"
-+msgstr ""
-+"<qt>您刪除的資料夾是帳號 <b>%1</b> 所設定的收件匣。刪除後這個帳號將會改用預設"
-+"的收件匣。</qt>"
- 
- #: kmmainwidget.cpp:1349
- msgid ""
- "Are you sure you want to refresh the IMAP cache?\n"
- "This will remove all changes that you have done locally to your IMAP folders."
--msgstr "您確定要更新 IMAP 快取的內容嗎？ 這會將您對本地端 IMAP 資料夾做的改變通通丟棄。"
-+msgstr ""
-+"您確定要更新 IMAP 快取的內容嗎？ 這會將您對本地端 IMAP 資料夾做的改變通通丟"
-+"棄。"
- 
- #: kmmainwidget.cpp:1365
- msgid "Are you sure you want to expire all old messages?"
-@@ -7314,10 +7245,12 @@
- 
- #: kmmainwidget.cpp:1389
- msgid ""
--"Use of HTML in mail will make you more vulnerable to \"spam\" and may increase "
--"the likelihood that your system will be compromised by other present and "
--"anticipated security exploits."
--msgstr "在信件中使用 HTML 將會使您更容易受到垃圾信的攻擊，並且有可能會增加您的系統被其他已存在和將來的安全漏洞危害的機會。"
-+"Use of HTML in mail will make you more vulnerable to \"spam\" and may "
-+"increase the likelihood that your system will be compromised by other "
-+"present and anticipated security exploits."
-+msgstr ""
-+"在信件中使用 HTML 將會使您更容易受到垃圾信的攻擊，並且有可能會增加您的系統被"
-+"其他已存在和將來的安全漏洞危害的機會。"
- 
- #: kmmainwidget.cpp:1392 kmmainwidget.cpp:1416 kmsender.cpp:503
- msgid "Security Warning"
-@@ -7330,9 +7263,11 @@
- #: kmmainwidget.cpp:1413
- msgid ""
- "Loading external references in html mail will make you more vulnerable to "
--"\"spam\" and may increase the likelihood that your system will be compromised "
--"by other present and anticipated security exploits."
--msgstr "在 HTML 信件中下載遠端的連結會使您更容易受到垃圾信的攻擊，並且有可能會增加您的系統被其他已存在和將來的安全漏洞危害的機會。"
-+"\"spam\" and may increase the likelihood that your system will be "
-+"compromised by other present and anticipated security exploits."
-+msgstr ""
-+"在 HTML 信件中下載遠端的連結會使您更容易受到垃圾信的攻擊，並且有可能會增加您"
-+"的系統被其他已存在和將來的安全漏洞危害的機會。"
- 
- #: kmmainwidget.cpp:1417
- msgid "Load External References"
-@@ -7340,19 +7275,20 @@
- 
- #: kmmainwidget.cpp:1658
- msgid "Filter on Mailing-List..."
--msgstr "過濾 Mailing-List..."
-+msgstr "過濾 Mailing-List…"
- 
- #: kmmainwidget.cpp:1663
- msgid "Filter on Mailing-List %1..."
--msgstr "過濾 Mailing-List %1..."
-+msgstr "過濾 Mailing-List %1…"
- 
- #: kmmainwidget.cpp:1761
- msgid ""
--"KMail's Out of Office Reply functionality relies on server-side filtering. You "
--"have not yet configured an IMAP server for this.\n"
-+"KMail's Out of Office Reply functionality relies on server-side filtering. "
-+"You have not yet configured an IMAP server for this.\n"
- "You can do this on the \"Filtering\" tab of the IMAP account configuration."
- msgstr ""
--"KMail 的自動回覆功能跟伺服器端的過濾設定有關。您目前還沒設定 IMAP 伺服器的相關功能。\n"
-+"KMail 的自動回覆功能跟伺服器端的過濾設定有關。您目前還沒設定 IMAP 伺服器的相"
-+"關功能。\n"
- "您可以在 IMAP 帳號設定中的「過濾」頁設定。"
- 
- #: kmmainwidget.cpp:1766
-@@ -7365,7 +7301,8 @@
- 
- #: kmmainwidget.cpp:1810
- msgid ""
--"Could not start GnuPG LogViewer (kwatchgnupg); please check your installation."
-+"Could not start GnuPG LogViewer (kwatchgnupg); please check your "
-+"installation."
- msgstr "無法啟動 GnuPG 紀錄檢視器 (kwatchgnupg)，請檢查安裝是否完全！"
- 
- #: kmmainwidget.cpp:2485
-@@ -7386,7 +7323,7 @@
- 
- #: kmmainwidget.cpp:2622 kmmimeparttree.cpp:141
- msgid "Save &As..."
--msgstr "另存新檔(&A)..."
-+msgstr "另存新檔(&A)…"
- 
- #: kmmainwidget.cpp:2629
- msgid "&Compact All Folders"
-@@ -7426,39 +7363,39 @@
- 
- #: kmmainwidget.cpp:2684
- msgid "&Address Book..."
--msgstr "通訊錄(&A)..."
-+msgstr "通訊錄(&A)…"
- 
- #: kmmainwidget.cpp:2689
- msgid "Certificate Manager..."
--msgstr "憑證管理員..."
-+msgstr "憑證管理員…"
- 
- #: kmmainwidget.cpp:2694
- msgid "GnuPG Log Viewer..."
--msgstr "GnuPG 紀錄檢視器..."
-+msgstr "GnuPG 紀錄檢視器…"
- 
- #: kmmainwidget.cpp:2699
- msgid "&Import Messages..."
--msgstr "匯入信件(&I)..."
-+msgstr "匯入信件(&I)…"
- 
- #: kmmainwidget.cpp:2704
- msgid "&Debug Sieve..."
--msgstr "除錯過濾器(&D)..."
-+msgstr "除錯過濾器(&D)…"
- 
- #: kmmainwidget.cpp:2710
- msgid "Edit \"Out of Office\" Replies..."
--msgstr "編輯自動回覆..."
-+msgstr "編輯自動回覆…"
- 
- #: kmmainwidget.cpp:2716
- msgid "Filter &Log Viewer..."
--msgstr "過濾紀錄檢視器(&L)..."
-+msgstr "過濾紀錄檢視器(&L)…"
- 
- #: kmmainwidget.cpp:2719
- msgid "&Anti-Spam Wizard..."
--msgstr "反垃圾信精靈(&A)..."
-+msgstr "反垃圾信精靈(&A)…"
- 
- #: kmmainwidget.cpp:2721
- msgid "&Anti-Virus Wizard..."
--msgstr "防毒精靈(&A)..."
-+msgstr "防毒精靈(&A)…"
- 
- #: kmmainwidget.cpp:2725 kmreadermainwin.cpp:316
- msgid "&Move to Trash"
-@@ -7482,11 +7419,11 @@
- 
- #: kmmainwidget.cpp:2747
- msgid "&Find Messages..."
--msgstr "尋找信件(&F)..."
-+msgstr "尋找信件(&F)…"
- 
- #: kmmainwidget.cpp:2750
- msgid "&Find in Message..."
--msgstr "在信件中尋找(&F)..."
-+msgstr "在信件中尋找(&F)…"
- 
- #: kmmainwidget.cpp:2753
- msgid "Select &All Messages"
-@@ -7558,7 +7495,7 @@
- 
- #: kmmainwidget.cpp:2820
- msgid "&New Message..."
--msgstr "新信件(&N)..."
-+msgstr "新信件(&N)…"
- 
- #: kmmainwidget.cpp:2823 kmmainwidget.cpp:2915
- msgid "New Message From &Template"
-@@ -7566,7 +7503,7 @@
- 
- #: kmmainwidget.cpp:2831
- msgid "New Message t&o Mailing-List..."
--msgstr "張貼到信件論壇(&O)..."
-+msgstr "張貼到信件論壇(&O)…"
- 
- #: kmmainwidget.cpp:2836 kmreadermainwin.cpp:327 searchwindow.cpp:320
- msgid ""
-@@ -7594,11 +7531,11 @@
- msgid ""
- "_: Message->Forward->\n"
- "&Redirect..."
--msgstr "轉向(&R)..."
-+msgstr "轉向(&R)…"
- 
- #: kmmainwidget.cpp:2885
- msgid "Send A&gain..."
--msgstr "重送(&G)..."
-+msgstr "重送(&G)…"
- 
- #: kmmainwidget.cpp:2890
- msgid "&Create Filter"
-@@ -7606,19 +7543,19 @@
- 
- #: kmmainwidget.cpp:2893
- msgid "Filter on &Subject..."
--msgstr "過濾信件主題(&S)..."
-+msgstr "過濾信件主題(&S)…"
- 
- #: kmmainwidget.cpp:2898
- msgid "Filter on &From..."
--msgstr "過濾信件來源(&F)..."
-+msgstr "過濾信件來源(&F)…"
- 
- #: kmmainwidget.cpp:2903
- msgid "Filter on &To..."
--msgstr "過濾信件收件者(&T)..."
-+msgstr "過濾信件收件者(&T)…"
- 
- #: kmmainwidget.cpp:2908
- msgid "Filter on Mailing-&List..."
--msgstr "過濾信件論壇(&L)..."
-+msgstr "過濾信件論壇(&L)…"
- 
- #: kmmainwidget.cpp:2921
- msgid "Mark &Thread"
-@@ -7674,7 +7611,7 @@
- 
- #: kmmainwidget.cpp:2970
- msgid "Save A&ttachments..."
--msgstr "儲存附件(&T)..."
-+msgstr "儲存附件(&T)…"
- 
- #: kmmainwidget.cpp:2980
- msgid "Appl&y All Filters"
-@@ -7844,15 +7781,15 @@
- 
- #: kmmainwidget.cpp:3117
- msgid "Configure &Filters..."
--msgstr "設定過濾器(&F)..."
-+msgstr "設定過濾器(&F)…"
- 
- #: kmmainwidget.cpp:3119
- msgid "Configure &POP Filters..."
--msgstr "設定 POP 信件過濾器(&P)..."
-+msgstr "設定 POP 信件過濾器(&P)…"
- 
- #: kmmainwidget.cpp:3121
- msgid "Manage &Sieve Scripts..."
--msgstr "管理可用的過濾器..."
-+msgstr "管理可用的過濾器…"
- 
- #: kmmainwidget.cpp:3124
- msgid "KMail &Introduction"
-@@ -7864,11 +7801,11 @@
- 
- #: kmmainwidget.cpp:3131
- msgid "Configure &Notifications..."
--msgstr "設定通知(&N)..."
-+msgstr "設定通知(&N)…"
- 
- #: kmmainwidget.cpp:3136
- msgid "&Configure KMail..."
--msgstr "設定 KMail (&C)..."
-+msgstr "設定 KMail(&C)…"
- 
- #: kmmainwidget.cpp:3431
- msgid "E&mpty Trash"
-@@ -7920,12 +7857,12 @@
- 
- #: kmmainwin.cpp:178
- msgid " Initializing..."
--msgstr " 正在初始化..."
-+msgstr " 正在初始化…"
- 
- #: kmmessage.cpp:1316
- msgid ""
--"This message contains a request to return a notification about your reception "
--"of the message.\n"
-+"This message contains a request to return a notification about your "
-+"reception of the message.\n"
- "You can either ignore the request or let KMail send a \"denied\" or normal "
- "response."
- msgstr ""
-@@ -7934,10 +7871,10 @@
- 
- #: kmmessage.cpp:1321
- msgid ""
--"This message contains a request to send a notification about your reception of "
--"the message.\n"
--"It contains a processing instruction that is marked as \"required\", but which "
--"is unknown to KMail.\n"
-+"This message contains a request to send a notification about your reception "
-+"of the message.\n"
-+"It contains a processing instruction that is marked as \"required\", but "
-+"which is unknown to KMail.\n"
- "You can either ignore the request or let KMail send a \"failed\" response."
- msgstr ""
- "這封信要求回覆信件處理通知給寄件者。\n"
-@@ -7946,8 +7883,8 @@
- 
- #: kmmessage.cpp:1328
- msgid ""
--"This message contains a request to send a notification about your reception of "
--"the message,\n"
-+"This message contains a request to send a notification about your reception "
-+"of the message,\n"
- "but it is requested to send the notification to more than one address.\n"
- "You can either ignore the request or let KMail send a \"denied\" or normal "
- "response."
-@@ -7958,8 +7895,8 @@
- 
- #: kmmessage.cpp:1335
- msgid ""
--"This message contains a request to send a notification about your reception of "
--"the message,\n"
-+"This message contains a request to send a notification about your reception "
-+"of the message,\n"
- "but there is no return-path set.\n"
- "You can either ignore the request or let KMail send a \"denied\" or normal "
- "response."
-@@ -7970,8 +7907,8 @@
- 
- #: kmmessage.cpp:1341
- msgid ""
--"This message contains a request to send a notification about your reception of "
--"the message,\n"
-+"This message contains a request to send a notification about your reception "
-+"of the message,\n"
- "but the return-path address differs from the address the notification was "
- "requested to be sent to.\n"
- "You can either ignore the request or let KMail send a \"denied\" or normal "
-@@ -7997,7 +7934,9 @@
- msgid ""
- "Header \"Disposition-Notification-Options\" contained required, but unknown "
- "parameter"
--msgstr "在 Disposition-Notification-Options 標頭中含有「要求回覆(required)」，但 KMail 無法處理。"
-+msgstr ""
-+"在 Disposition-Notification-Options 標頭中含有「要求回覆(required)」，但 "
-+"KMail 無法處理。"
- 
- #: kmmessage.cpp:1628
- msgid "Receipt: "
-@@ -8016,7 +7955,7 @@
- 
- #: kmmimeparttree.cpp:147
- msgid "Save All Attachments..."
--msgstr "儲存所有附件..."
-+msgstr "儲存所有附件…"
- 
- #: kmmimeparttree.cpp:154 kmreaderwin.cpp:1975 kmreaderwin.cpp:2626
- msgid "Delete Attachment"
-@@ -8052,39 +7991,33 @@
- 
- #: kmmsgpartdlg.cpp:88
- msgid ""
--"<qt>"
--"<p>The <em>MIME type</em> of the file:</p>"
--"<p>normally, you do not need to touch this setting, since the type of the file "
--"is automatically checked; but, sometimes, %1 may not detect the type correctly "
--"-- here is where you can fix that.</p></qt>"
--msgstr ""
--"<qt> "
--"<p>檔案的 <em>MIME 型態</em>：</p> "
--"<p>通常您不需要去改變這個設定，系統會自動偵測檔案型態。但是有時候 %1 無法正確偵測，您可以在這裡修正。</p></qt>"
-+"<qt><p>The <em>MIME type</em> of the file:</p><p>normally, you do not need "
-+"to touch this setting, since the type of the file is automatically checked; "
-+"but, sometimes, %1 may not detect the type correctly -- here is where you "
-+"can fix that.</p></qt>"
-+msgstr ""
-+"<qt> <p>檔案的 <em>MIME 型態</em>：</p> <p>通常您不需要去改變這個設定，系統會"
-+"自動偵測檔案型態。但是有時候 %1 無法正確偵測，您可以在這裡修正。</p></qt>"
- 
- #: kmmsgpartdlg.cpp:100
- msgid ""
--"<qt>"
--"<p>The size of the part:</p>"
--"<p>sometimes, %1 will only give an estimated size here, because calculating the "
--"exact size would take too much time; when this is the case, it will be made "
--"visible by adding \"(est.)\" to the size displayed.</p></qt>"
--msgstr ""
--"<qt> "
--"<p>此部份的大小</p> "
--"<p>有時，%1 只會給大約的大小，因為要計算實際的大小可能要花很多的時間。此時在顯示大小時會附上「（大約）」的標記。</p></qt>"
-+"<qt><p>The size of the part:</p><p>sometimes, %1 will only give an estimated "
-+"size here, because calculating the exact size would take too much time; when "
-+"this is the case, it will be made visible by adding \"(est.)\" to the size "
-+"displayed.</p></qt>"
-+msgstr ""
-+"<qt> <p>此部份的大小</p> <p>有時，%1 只會給大約的大小，因為要計算實際的大小可"
-+"能要花很多的時間。此時在顯示大小時會附上「（大約）」的標記。</p></qt>"
- 
- #: kmmsgpartdlg.cpp:114
- msgid ""
--"<qt>"
--"<p>The file name of the part:</p>"
--"<p>although this defaults to the name of the attached file, it does not specify "
--"the file to be attached; rather, it suggests a file name to be used by the "
--"recipient's mail agent when saving the part to disk.</p></qt>"
--msgstr ""
--"<qt> "
--"<p>此部份的檔案名稱</p> "
--"<p>雖然通常是指附檔本身的檔名，但是並不盡然。更正確地說，它只是用於建議收件者在儲存的時候使用什麼名稱。</p></qt>"
-+"<qt><p>The file name of the part:</p><p>although this defaults to the name "
-+"of the attached file, it does not specify the file to be attached; rather, "
-+"it suggests a file name to be used by the recipient's mail agent when saving "
-+"the part to disk.</p></qt>"
-+msgstr ""
-+"<qt> <p>此部份的檔案名稱</p> <p>雖然通常是指附檔本身的檔名，但是並不盡然。更"
-+"正確地說，它只是用於建議收件者在儲存的時候使用什麼名稱。</p></qt>"
- 
- #: kmmsgpartdlg.cpp:124
- msgid "&Description:"
-@@ -8092,12 +8025,13 @@
- 
- #: kmmsgpartdlg.cpp:128
- msgid ""
--"<qt>"
--"<p>A description of the part:</p>"
--"<p>this is just an informational description of the part, much like the Subject "
--"is for the whole message; most mail agents will show this information in their "
--"message previews alongside the attachment's icon.</p></qt>"
--msgstr "<qt> <p>此部份的說明：</p> <p>這是一些關於此部份的資訊，通常會顯示在附件圖示的說明。</p></qt>"
-+"<qt><p>A description of the part:</p><p>this is just an informational "
-+"description of the part, much like the Subject is for the whole message; "
-+"most mail agents will show this information in their message previews "
-+"alongside the attachment's icon.</p></qt>"
-+msgstr ""
-+"<qt> <p>此部份的說明：</p> <p>這是一些關於此部份的資訊，通常會顯示在附件圖示"
-+"的說明。</p></qt>"
- 
- #: kmmsgpartdlg.cpp:139
- msgid "&Encoding:"
-@@ -8105,19 +8039,18 @@
- 
- #: kmmsgpartdlg.cpp:143
- msgid ""
--"<qt>"
--"<p>The transport encoding of this part:</p>"
--"<p>normally, you do not need to change this, since %1 will use a decent default "
--"encoding, depending on the MIME type; yet, sometimes, you can significantly "
--"reduce the size of the resulting message, e.g. if a PostScript file does not "
--"contain binary data, but consists of pure text -- in this case, choosing "
--"\"quoted-printable\" over the default \"base64\" will save up to 25% in "
--"resulting message size.</p></qt>"
--msgstr ""
--"<qt> "
--"<p>此部份的傳送編碼方式</p> "
--"<p>通常您不需要去修改它，%1 會根據 MIME 型態來判斷使用哪一種編碼方式。但是您還是可以自行指定。有時自行指定可以節省一些空間，例如 "
--"PostScript 檔內以文字為主，使用 quoted-printable 而不是預設的 base64 可以省下約 25% 的大小。</p></qt>"
-+"<qt><p>The transport encoding of this part:</p><p>normally, you do not need "
-+"to change this, since %1 will use a decent default encoding, depending on "
-+"the MIME type; yet, sometimes, you can significantly reduce the size of the "
-+"resulting message, e.g. if a PostScript file does not contain binary data, "
-+"but consists of pure text -- in this case, choosing \"quoted-printable\" "
-+"over the default \"base64\" will save up to 25% in resulting message size.</"
-+"p></qt>"
-+msgstr ""
-+"<qt> <p>此部份的傳送編碼方式</p> <p>通常您不需要去修改它，%1 會根據 MIME 型態"
-+"來判斷使用哪一種編碼方式。但是您還是可以自行指定。有時自行指定可以節省一些空"
-+"間，例如 PostScript 檔內以文字為主，使用 quoted-printable 而不是預設的 "
-+"base64 可以省下約 25% 的大小。</p></qt>"
- 
- #: kmmsgpartdlg.cpp:156
- msgid "Suggest &automatic display"
-@@ -8125,18 +8058,15 @@
- 
- #: kmmsgpartdlg.cpp:159
- msgid ""
--"<qt>"
--"<p>Check this option if you want to suggest to the recipient the automatic "
--"(inline) display of this part in the message preview, instead of the default "
--"icon view;</p>"
--"<p>technically, this is carried out by setting this part's <em>"
--"Content-Disposition</em> header field to \"inline\" instead of the default "
--"\"attachment\".</p></qt>"
--msgstr ""
--"<qt> "
--"<p>如果您要讓收件者那一端自動顯示出這部份的預覽，而不是只顯示圖示，就勾選這個選項。</p> "
--"<p>技術上，這只消在 <em>Content-Disposition</em> 標頭上使用 inline 而不是用 attachment 即可。</p>"
--"</qt>"
-+"<qt><p>Check this option if you want to suggest to the recipient the "
-+"automatic (inline) display of this part in the message preview, instead of "
-+"the default icon view;</p><p>technically, this is carried out by setting "
-+"this part's <em>Content-Disposition</em> header field to \"inline\" instead "
-+"of the default \"attachment\".</p></qt>"
-+msgstr ""
-+"<qt> <p>如果您要讓收件者那一端自動顯示出這部份的預覽，而不是只顯示圖示，就勾"
-+"選這個選項。</p> <p>技術上，這只消在 <em>Content-Disposition</em> 標頭上使用 "
-+"inline 而不是用 attachment 即可。</p></qt>"
- 
- #: kmmsgpartdlg.cpp:168
- msgid "&Sign this part"
-@@ -8144,11 +8074,12 @@
- 
- #: kmmsgpartdlg.cpp:171
- msgid ""
--"<qt>"
--"<p>Check this option if you want this message part to be signed;</p>"
--"<p>the signature will be made with the key that you associated with the "
-+"<qt><p>Check this option if you want this message part to be signed;</"
-+"p><p>the signature will be made with the key that you associated with the "
- "currently-selected identity.</p></qt>"
--msgstr "<qt> <p>如果您要簽署這部份，就勾選這個選項。</p> <p>系統會使用您發信的身份指定的簽章來簽署。</p></qt>"
-+msgstr ""
-+"<qt> <p>如果您要簽署這部份，就勾選這個選項。</p> <p>系統會使用您發信的身分指"
-+"定的簽章來簽署。</p></qt>"
- 
- #: kmmsgpartdlg.cpp:178
- msgid "Encr&ypt this part"
-@@ -8156,10 +8087,11 @@
- 
- #: kmmsgpartdlg.cpp:181
- msgid ""
--"<qt>"
--"<p>Check this option if you want this message part to be encrypted;</p>"
--"<p>the part will be encrypted for the recipients of this message</p></qt>"
--msgstr "<qt> <p>如果您要將這部份加密，就勾選此選項。</p> <p>這部份將會被加密。</p></qt>"
-+"<qt><p>Check this option if you want this message part to be encrypted;</"
-+"p><p>the part will be encrypted for the recipients of this message</p></qt>"
-+msgstr ""
-+"<qt> <p>如果您要將這部份加密，就勾選此選項。</p> <p>這部份將會被加密。</p></"
-+"qt>"
- 
- #: kmmsgpartdlg.cpp:224
- msgid ""
-@@ -8173,12 +8105,12 @@
- 
- #: kmpopfiltercnfrmdlg.cpp:293
- msgid ""
--"Messages to filter found on POP Account: <b>%1</b>"
--"<p>The messages shown exceed the maximum size limit you defined for this "
--"account."
--"<br>You can select what you want to do with them by checking the appropriate "
--"button."
--msgstr "在 POP 帳號 <b>%1</b> 中過濾信件： <p>這封信件超過了您所設定的大小。<br> 您可以選擇要如何處理。"
-+"Messages to filter found on POP Account: <b>%1</b><p>The messages shown "
-+"exceed the maximum size limit you defined for this account.<br>You can "
-+"select what you want to do with them by checking the appropriate button."
-+msgstr ""
-+"在 POP 帳號 <b>%1</b> 中過濾信件： <p>這封信件超過了您所設定的大小。<br> 您可"
-+"以選擇要如何處理。"
- 
- #: kmpopfiltercnfrmdlg.cpp:298
- msgid "Messages Exceeding Size"
-@@ -8211,7 +8143,7 @@
- 
- #: kmreadermainwin.cpp:477 searchwindow.cpp:352
- msgid "Save Attachments..."
--msgstr "儲存附件..."
-+msgstr "儲存附件…"
- 
- #: kmreaderwin.cpp:562
- msgid ""
-@@ -8339,15 +8271,15 @@
- 
- #: kmreaderwin.cpp:654
- msgid "New Message To..."
--msgstr "新信件(&N)..."
-+msgstr "新信件(&N)…"
- 
- #: kmreaderwin.cpp:657
- msgid "Reply To..."
--msgstr "傳送回信給..."
-+msgstr "傳送回信給…"
- 
- #: kmreaderwin.cpp:660
- msgid "Forward To..."
--msgstr "轉寄至..."
-+msgstr "轉寄至…"
- 
- #: kmreaderwin.cpp:663
- msgid "Add to Address Book"
-@@ -8355,7 +8287,7 @@
- 
- #: kmreaderwin.cpp:666
- msgid "Open in Address Book"
--msgstr "在通訊錄內開啟..."
-+msgstr "在通訊錄內開啟…"
- 
- #: kmreaderwin.cpp:670
- msgid "Select All Text"
-@@ -8375,7 +8307,7 @@
- 
- #: kmreaderwin.cpp:680
- msgid "Save Link As..."
--msgstr "另存連結成..."
-+msgstr "另存連結成…"
- 
- #: kmreaderwin.cpp:687
- msgid "Chat &With..."
-@@ -8415,18 +8347,18 @@
- 
- #: kmreaderwin.cpp:1346
- msgid ""
--"<h2 style='margin-top: 0px;'>Retrieving Folder Contents</h2>"
--"<p>Please wait . . .</p>&nbsp;"
--msgstr "<h2 style='margin-top: 0px;'>讀取資料夾內容中</h2><p>請稍候......</p>&nbsp;"
-+"<h2 style='margin-top: 0px;'>Retrieving Folder Contents</h2><p>Please "
-+"wait . . .</p>&nbsp;"
-+msgstr ""
-+"<h2 style='margin-top: 0px;'>讀取資料夾內容中</h2><p>請稍候......</p>&nbsp;"
- 
- #: kmreaderwin.cpp:1354
- msgid ""
--"<h2 style='margin-top: 0px;'>Offline</h2>"
--"<p>KMail is currently in offline mode. Click <a href=\"kmail:goOnline\">here</a> "
--"to go online . . .</p>&nbsp;"
-+"<h2 style='margin-top: 0px;'>Offline</h2><p>KMail is currently in offline "
-+"mode. Click <a href=\"kmail:goOnline\">here</a> to go online . . .</p>&nbsp;"
- msgstr ""
--"<h2 style='margin-top: 0px;'>離線模式</h2>"
--"<p>KMail 目前在離線模式中。點選<a href=\"kmail:goOnline\">這裡</a>恢復上線模式。</p>&nbsp;"
-+"<h2 style='margin-top: 0px;'>離線模式</h2><p>KMail 目前在離線模式中。點選<a "
-+"href=\"kmail:goOnline\">這裡</a>恢復上線模式。</p>&nbsp;"
- 
- #: kmreaderwin.cpp:1371
- msgid ""
-@@ -8434,18 +8366,16 @@
- "version; %5: prior KDE version; %6: generated list of new features; %7: "
- "First-time user text (only shown on first start); %8: generated list of "
- "important changes; --- end of comment ---\n"
--"<h2 style='margin-top: 0px;'>Welcome to KMail %1</h2>"
--"<p>KMail is the email client for the K Desktop Environment. It is designed to "
--"be fully compatible with Internet mailing standards including MIME, SMTP, POP3 "
--"and IMAP.</p>\n"
--"<ul>"
--"<li>KMail has many powerful features which are described in the <a href=\"%2\">"
--"documentation</a></li>\n"
--"<li>The <a href=\"%3\">KMail homepage</A> offers information about new versions "
--"of KMail</li></ul>\n"
-+"<h2 style='margin-top: 0px;'>Welcome to KMail %1</h2><p>KMail is the email "
-+"client for the K Desktop Environment. It is designed to be fully compatible "
-+"with Internet mailing standards including MIME, SMTP, POP3 and IMAP.</p>\n"
-+"<ul><li>KMail has many powerful features which are described in the <a href="
-+"\"%2\">documentation</a></li>\n"
-+"<li>The <a href=\"%3\">KMail homepage</A> offers information about new "
-+"versions of KMail</li></ul>\n"
- "%8\n"
--"<p>Some of the new features in this release of KMail include (compared to KMail "
--"%4, which is part of KDE %5):</p>\n"
-+"<p>Some of the new features in this release of KMail include (compared to "
-+"KMail %4, which is part of KDE %5):</p>\n"
- "<ul>\n"
- "%6</ul>\n"
- "%7\n"
-@@ -8453,13 +8383,13 @@
- "<p>Thank you,</p>\n"
- "<p style='margin-bottom: 0px'>&nbsp; &nbsp; The KMail Team</p>"
- msgstr ""
--"<h2 style='margin-top: 0px;'>歡迎來到 KMail %1</h2>"
--"<p>KMail 是 KDE 的郵件收發軟體。它支援完整的郵件標準，包括 MIME、SMTP、POP3 與 IMAP 等。</p>\n"
--"<ul>"
--"<li>KMail 擁有強大的功能，及完整的<a href=\"%2\">說明文件</a></li>\n"
-+"<h2 style='margin-top: 0px;'>歡迎來到 KMail %1</h2><p>KMail 是 KDE 的郵件收發"
-+"軟體。它支援完整的郵件標準，包括 MIME、SMTP、POP3 與 IMAP 等。</p>\n"
-+"<ul><li>KMail 擁有強大的功能，及完整的<a href=\"%2\">說明文件</a></li>\n"
- "<li><a href=\"%3\">KMail 網站</A> 也提供了 Kmail 新版本的資訊。</li></ul>\n"
- "%8\n"
--"<p>與 KDE %5 中包含的 KMail %4 相較，在這一版的 KMail 中包含了一些新功能：</p>\n"
-+"<p>與 KDE %5 中包含的 KMail %4 相較，在這一版的 KMail 中包含了一些新功能：</"
-+"p>\n"
- "<ul>\n"
- "%6</ul>\n"
- "%7\n"
-@@ -8468,28 +8398,26 @@
- "<p style='margin-bottom: 0px'>&nbsp; &nbsp; KMail 開發小組敬上</p>"
- 
- #: kmreaderwin.cpp:1394 kmreaderwin.cpp:1416
--msgid ""
--"<li>%1</li>\n"
--msgstr ""
--"<li>%1</li>\n"
-+msgid "<li>%1</li>\n"
-+msgstr "<li>%1</li>\n"
- 
- #: kmreaderwin.cpp:1399
- msgid ""
--"<p>Please take a moment to fill in the KMail configuration panel at "
--"Settings-&gt;Configure KMail.\n"
-+"<p>Please take a moment to fill in the KMail configuration panel at Settings-"
-+"&gt;Configure KMail.\n"
- "You need to create at least a default identity and an incoming as well as "
- "outgoing mail account.</p>\n"
- msgstr ""
- "<p>請花一點時間先設定 KMail。\n"
--"您至少需要先產生一個新身份，以及收信與發信的帳號。</p>\n"
-+"您至少需要先產生一個新身分，以及收信與發信的帳號。</p>\n"
- 
- #: kmreaderwin.cpp:1411
- msgid ""
- "<p><span style='font-size:125%; font-weight:bold;'>Important changes</span> "
- "(compared to KMail %1):</p>\n"
- msgstr ""
--"<p><span style='font-size:125%; font-weight:bold;'>與 KMail %1 相比之重大改變</span>"
--"：</p>\n"
-+"<p><span style='font-size:125%; font-weight:bold;'>與 KMail %1 相比之重大改變"
-+"</span>：</p>\n"
- 
- #: kmreaderwin.cpp:1555
- msgid "( body part )"
-@@ -8511,7 +8439,8 @@
- #: kmreaderwin.cpp:2181
- #, c-format
- msgid ""
--"_n: [KMail: Attachment contains binary data. Trying to show first character.]\n"
-+"_n: [KMail: Attachment contains binary data. Trying to show first "
-+"character.]\n"
- "[KMail: Attachment contains binary data. Trying to show first %n characters.]"
- msgstr "[KMail：附件包含二進位資料。先嘗試顯示開頭 %n 個字元。]"
- 
-@@ -8521,7 +8450,7 @@
- 
- #: kmreaderwin.cpp:2279
- msgid "&Open With..."
--msgstr "開啟用(&O)..."
-+msgstr "開啟用(&O)…"
- 
- #: kmreaderwin.cpp:2281
- msgid ""
-@@ -8537,12 +8466,14 @@
- 
- #: kmreaderwin.cpp:2625
- msgid ""
--"Deleting an attachment might invalidate any digital signature on this message."
-+"Deleting an attachment might invalidate any digital signature on this "
-+"message."
- msgstr "刪除附件可能會造成此信件的簽章不正確。"
- 
- #: kmreaderwin.cpp:2637
- msgid ""
--"Modifying an attachment might invalidate any digital signature on this message."
-+"Modifying an attachment might invalidate any digital signature on this "
-+"message."
- msgstr "變更附件可能會造成此信件的簽章不正確。"
- 
- #: kmreaderwin.cpp:2685
-@@ -8619,10 +8550,10 @@
- 
- #: kmsender.cpp:385
- msgid ""
--"Moving the sent message \"%1\" from the \"outbox\" to the \"sent-mail\" folder "
--"failed.\n"
--"Possible reasons are lack of disk space or write permission. Please try to fix "
--"the problem and move the message manually."
-+"Moving the sent message \"%1\" from the \"outbox\" to the \"sent-mail\" "
-+"folder failed.\n"
-+"Possible reasons are lack of disk space or write permission. Please try to "
-+"fix the problem and move the message manually."
- msgstr ""
- "將已寄出的信件 %1 從寄件匣移到寄件備份時失敗。\n"
- "可能的原因是磁碟空間不夠，或權限問題。請試著修正問題後自行將它移動。"
-@@ -8630,9 +8561,11 @@
- #: kmsender.cpp:431
- msgid ""
- "It's not possible to send messages without specifying a sender address.\n"
--"Please set the email address of identity '%1' in the Identities section of the "
--"configuration dialog and then try again."
--msgstr "沒有指定寄件者就無法送出信件。請至少在身份 %1 設定中設定一個電子郵件地址，然後再試一次。"
-+"Please set the email address of identity '%1' in the Identities section of "
-+"the configuration dialog and then try again."
-+msgstr ""
-+"沒有指定寄件者就無法送出信件。請至少在身分 %1 設定中設定一個電子郵件地址，然"
-+"後再試一次。"
- 
- #: kmsender.cpp:453
- #, c-format
-@@ -8651,12 +8584,12 @@
- 
- #: kmsender.cpp:472
- msgid "Initiating sender process..."
--msgstr "正在起始寄件者處理..."
-+msgstr "正在起始寄件者處理…"
- 
- #: kmsender.cpp:502
- msgid ""
--"You have chosen to send all queued email using an unencrypted transport, do you "
--"want to continue? "
-+"You have chosen to send all queued email using an unencrypted transport, do "
-+"you want to continue? "
- msgstr "您選擇用不加密的方式送出所有佇列中的信件。確定要繼續嗎？"
- 
- #: kmsender.cpp:504
-@@ -8681,14 +8614,16 @@
- msgid ""
- "Sending aborted:\n"
- "%1\n"
--"The message will stay in the 'outbox' folder until you either fix the problem "
--"(e.g. a broken address) or remove the message from the 'outbox' folder.\n"
-+"The message will stay in the 'outbox' folder until you either fix the "
-+"problem (e.g. a broken address) or remove the message from the 'outbox' "
-+"folder.\n"
- "The following transport protocol was used:\n"
- "  %2"
- msgstr ""
- "取消傳送：\n"
- "%1\n"
--"信件將保留在寄件匣中直到你解決問題（例如修正錯誤的位址），不然請您從寄件匣中移除這個信件。\n"
-+"信件將保留在寄件匣中直到你解決問題（例如修正錯誤的位址），不然請您從寄件匣中"
-+"移除這個信件。\n"
- "使用下列傳送協定：\n"
- "  %2"
- 
-@@ -8698,18 +8633,14 @@
- 
- #: kmsender.cpp:719
- msgid ""
--"<p>Sending failed:</p>"
--"<p>%1</p>"
--"<p>The message will stay in the 'outbox' folder until you either fix the "
--"problem (e.g. a broken address) or remove the message from the 'outbox' "
--"folder.</p>"
--"<p>The following transport protocol was used:  %2</p>"
--"<p>Do you want me to continue sending the remaining messages?</p>"
--msgstr ""
--"<p>傳送失敗：</p> "
--"<p>%1</p>"
--"<p>信件將保留在寄件匣中直到你解決問題（例如修正錯誤的位址），不然請您從寄件匣中移除這個信件。</p>"
--"<p>使用下列傳送協定：%2</p> "
-+"<p>Sending failed:</p><p>%1</p><p>The message will stay in the 'outbox' "
-+"folder until you either fix the problem (e.g. a broken address) or remove "
-+"the message from the 'outbox' folder.</p><p>The following transport protocol "
-+"was used:  %2</p><p>Do you want me to continue sending the remaining "
-+"messages?</p>"
-+msgstr ""
-+"<p>傳送失敗：</p> <p>%1</p><p>信件將保留在寄件匣中直到你解決問題（例如修正錯"
-+"誤的位址），不然請您從寄件匣中移除這個信件。</p><p>使用下列傳送協定：%2</p> "
- "<p>您要我傳送剩下的信件嗎？</p>"
- 
- #: kmsender.cpp:729
-@@ -8728,14 +8659,16 @@
- msgid ""
- "Sending failed:\n"
- "%1\n"
--"The message will stay in the 'outbox' folder until you either fix the problem "
--"(e.g. a broken address) or remove the message from the 'outbox' folder.\n"
-+"The message will stay in the 'outbox' folder until you either fix the "
-+"problem (e.g. a broken address) or remove the message from the 'outbox' "
-+"folder.\n"
- "The following transport protocol was used:\n"
- " %2"
- msgstr ""
- "傳送失敗：\n"
- "%1\n"
--"信件將保留在寄件匣中直到你解決問題（例如修正錯誤的位址），不然請您從寄件匣中移除這個信件。\n"
-+"信件將保留在寄件匣中直到你解決問題（例如修正錯誤的位址），不然請您從寄件匣中"
-+"移除這個信件。\n"
- "使用下列傳送協定：\n"
- " %2"
- 
-@@ -8754,7 +8687,8 @@
- msgstr ""
- "傳送失敗：\n"
- "%1\n"
--"信件將保留在寄件匣中直到你解決問題（例如修正錯誤的位址），不然請您從寄件匣中移除這個信件。\n"
-+"信件將保留在寄件匣中直到你解決問題（例如修正錯誤的位址），不然請您從寄件匣中"
-+"移除這個信件。\n"
- "使用下列傳送協定：\n"
- " %2"
- 
-@@ -8773,31 +8707,39 @@
- 
- #: kmstartup.cpp:197
- msgid ""
--"%1 already seems to be running on another display on this machine. Running %2 "
--"more than once can cause the loss of mail. You should not start %1 unless you "
--"are sure that it is not already running."
--msgstr "%1 已經在其他地方執行中。重複執行 %2 可能會導致信件遺失。請您確定 %1 沒有被重複執行。"
-+"%1 already seems to be running on another display on this machine. Running %"
-+"2 more than once can cause the loss of mail. You should not start %1 unless "
-+"you are sure that it is not already running."
-+msgstr ""
-+"%1 已經在其他地方執行中。重複執行 %2 可能會導致信件遺失。請您確定 %1 沒有被重"
-+"複執行。"
- 
- #: kmstartup.cpp:207
- msgid ""
--"%1 seems to be running on another display on this machine. Running %1 and %2 at "
--"the same time can cause the loss of mail. You should not start %2 unless you "
--"are sure that %1 is not running."
--msgstr "%1 已經在其他地方執行中。同時執行 %1 與 %2 可能會導致信件遺失。請您啟動 %2 前先確定 %1 沒有被執行。"
-+"%1 seems to be running on another display on this machine. Running %1 and %2 "
-+"at the same time can cause the loss of mail. You should not start %2 unless "
-+"you are sure that %1 is not running."
-+msgstr ""
-+"%1 已經在其他地方執行中。同時執行 %1 與 %2 可能會導致信件遺失。請您啟動 %2 前"
-+"先確定 %1 沒有被執行。"
- 
- #: kmstartup.cpp:215
- msgid ""
--"%1 already seems to be running on %2. Running %1 more than once can cause the "
--"loss of mail. You should not start %1 on this computer unless you are sure that "
--"it is not already running on %2."
--msgstr "%1 已經在 %2 執行中。重複執行 %1 可能會導致信件遺失。請您啟動 %1 前先確定沒有在 %2 上被執行。"
-+"%1 already seems to be running on %2. Running %1 more than once can cause "
-+"the loss of mail. You should not start %1 on this computer unless you are "
-+"sure that it is not already running on %2."
-+msgstr ""
-+"%1 已經在 %2 執行中。重複執行 %1 可能會導致信件遺失。請您啟動 %1 前先確定沒有"
-+"在 %2 上被執行。"
- 
- #: kmstartup.cpp:221
- msgid ""
--"%1 seems to be running on %3. Running %1 and %2 at the same time can cause the "
--"loss of mail. You should not start %2 on this computer unless you are sure that "
--"%1 is not running on %3."
--msgstr "%1 已經在 %3 執行中。同時執行 %1 與 %2 可能會導致信件遺失。請您啟動 %2 前先確定 %1 沒有在 %3 上被執行。"
-+"%1 seems to be running on %3. Running %1 and %2 at the same time can cause "
-+"the loss of mail. You should not start %2 on this computer unless you are "
-+"sure that %1 is not running on %3."
-+msgstr ""
-+"%1 已經在 %3 執行中。同時執行 %1 與 %2 可能會導致信件遺失。請您啟動 %2 前先確"
-+"定 %1 沒有在 %3 上被執行。"
- 
- #: kmstartup.cpp:231
- #, c-format
-@@ -8832,12 +8774,14 @@
- "KWallet is not available. It is strongly recommended to use KWallet for "
- "managing your passwords.\n"
- "However, KMail can store the password in its configuration file instead. The "
--"password is stored in an obfuscated format, but should not be considered secure "
--"from decryption efforts if access to the configuration file is obtained.\n"
-+"password is stored in an obfuscated format, but should not be considered "
-+"secure from decryption efforts if access to the configuration file is "
-+"obtained.\n"
- "Do you want to store the password for account '%1' in the configuration file?"
- msgstr ""
- "無法使用 KWallet。強烈建議您使用 KWallet 來管理您的密碼。\n"
--"如果沒有 KWallet 的話，密碼將會保存在 KMail 的設定檔中，並做簡單的加密。但是這仍然不保證密碼可以安全地不被破解。\n"
-+"如果沒有 KWallet 的話，密碼將會保存在 KMail 的設定檔中，並做簡單的加密。但是"
-+"這仍然不保證密碼可以安全地不被破解。\n"
- "您確定要將帳號 %1 的密碼存在設定檔中嗎？"
- 
- #: kmtransport.cpp:149 networkaccount.cpp:228
-@@ -8874,7 +8818,7 @@
- 
- #: kmtransport.cpp:341
- msgid "Choos&e..."
--msgstr "選擇(&E)..."
-+msgstr "選擇(&E)…"
- 
- #: kmtransport.cpp:364
- msgid "Transport: SMTP"
-@@ -8905,7 +8849,8 @@
- msgid ""
- "A command to run locally, prior to sending email. This can be used to set up "
- "ssh tunnels, for example. Leave it empty if no command should be run."
--msgstr "在送信前執行的命令。例如可以設定 ssh 通道。如果沒有要執行的命令就請留白。"
-+msgstr ""
-+"在送信前執行的命令。例如可以設定 ssh 通道。如果沒有要執行的命令就請留白。"
- 
- #: kmtransport.cpp:427
- msgid "Server &requires authentication"
-@@ -8913,9 +8858,11 @@
- 
- #: kmtransport.cpp:429
- msgid ""
--"Check this option if your SMTP server requires authentication before accepting "
--"mail. This is known as 'Authenticated SMTP' or simply ASMTP."
--msgstr "如果您的 SMTP 伺服器需要身份認證，請勾選這個選項。這就是所謂的 Authenticated SMTP 或 ASMTP。"
-+"Check this option if your SMTP server requires authentication before "
-+"accepting mail. This is known as 'Authenticated SMTP' or simply ASMTP."
-+msgstr ""
-+"如果您的 SMTP 伺服器需要身分認證，請勾選這個選項。這就是所謂的 Authenticated "
-+"SMTP 或 ASMTP。"
- 
- #: kmtransport.cpp:442
- msgid "The user name to send to the server for authorization"
-@@ -8935,13 +8882,12 @@
- 
- #: kmtransport.cpp:478
- msgid ""
--"Check this option to have KMail use a custom hostname when identifying itself "
--"to the mail server."
--"<p>This is useful when your system's hostname may not be set correctly or to "
--"mask your system's true hostname."
-+"Check this option to have KMail use a custom hostname when identifying "
-+"itself to the mail server.<p>This is useful when your system's hostname may "
-+"not be set correctly or to mask your system's true hostname."
- msgstr ""
--"這個選項讓 KMail 在與伺服器溝通時，使用不同的主機名稱。 "
--"<p>如果您的系統主機設定不正確，或是您不想讓其他人知道您的主機名稱時，可以使用這個選項。"
-+"這個選項讓 KMail 在與伺服器溝通時，使用不同的主機名稱。 <p>如果您的系統主機設"
-+"定不正確，或是您不想讓其他人知道您的主機名稱時，可以使用這個選項。"
- 
- #: kmtransport.cpp:485
- msgid "Hos&tname:"
-@@ -8970,8 +8916,8 @@
- 
- #: kmtransport.cpp:786
- msgid ""
--"The Host field cannot be empty. Please  enter the name or the IP address of the "
--"SMTP server."
-+"The Host field cannot be empty. Please  enter the name or the IP address of "
-+"the SMTP server."
- msgstr "主機欄位不能空白。請輸入 SMTP 伺服器的域名或 IP 位址。"
- 
- #: kmtransport.cpp:788
-@@ -8984,13 +8930,14 @@
- 
- #: localsubscriptiondialog.cpp:120
- msgid ""
--"Locally unsubscribing from folders will remove all information that is present "
--"locally about those folders. The folders will not be changed on the server. "
--"Press cancel now if you want to make sure all local changes have been written "
--"to the server by checking mail first."
--msgstr ""
--"從資料夾取消本地端訂閱會移除所有這些資料夾的本地資訊。在伺服器端的此資料夾將不會被改變。如果您要確認本地端的資料已經寫入伺服器，您可以按下取消鍵，並再度檢查郵件"
--"。"
-+"Locally unsubscribing from folders will remove all information that is "
-+"present locally about those folders. The folders will not be changed on the "
-+"server. Press cancel now if you want to make sure all local changes have "
-+"been written to the server by checking mail first."
-+msgstr ""
-+"從資料夾取消本地端訂閱會移除所有這些資料夾的本地資訊。在伺服器端的此資料夾將"
-+"不會被改變。如果您要確認本地端的資料已經寫入伺服器，您可以按下取消鍵，並再度"
-+"檢查郵件。"
- 
- #: localsubscriptiondialog.cpp:124
- msgid "Local changes will be lost when unsubscribing"
-@@ -9088,11 +9035,11 @@
- 
- #: managesievescriptsdialog.cpp:161
- msgid "Edit Script..."
--msgstr "編輯過濾器..."
-+msgstr "編輯過濾器…"
- 
- #: managesievescriptsdialog.cpp:164
- msgid "New Script..."
--msgstr "新的過濾器..."
-+msgstr "新的過濾器…"
- 
- #: managesievescriptsdialog.cpp:233
- msgid "Really delete script \"%1\" from the server?"
-@@ -9130,27 +9077,27 @@
- 
- #: messageactions.cpp:48 searchwindow.cpp:311
- msgid "&Reply..."
--msgstr "回覆(&R)..."
-+msgstr "回覆(&R)…"
- 
- #: messageactions.cpp:52
- msgid "Reply to A&uthor..."
--msgstr "回覆給原作者(&U)..."
-+msgstr "回覆給原作者(&U)…"
- 
- #: messageactions.cpp:58 searchwindow.cpp:313
- msgid "Reply to &All..."
--msgstr "全部回覆(&A)..."
-+msgstr "全部回覆(&A)…"
- 
- #: messageactions.cpp:63 searchwindow.cpp:316
- msgid "Reply to Mailing-&List..."
--msgstr "回信到信件論壇 (&L)..."
-+msgstr "回信到信件論壇(&L)…"
- 
- #: messageactions.cpp:69
- msgid "Reply Without &Quote..."
--msgstr "不引文回覆(&Q)..."
-+msgstr "不引文回覆(&Q)…"
- 
- #: messageactions.cpp:73
- msgid "Create Task/Reminder..."
--msgstr "建立工作/提醒..."
-+msgstr "建立工作/提醒…"
- 
- #: messageactions.cpp:78
- msgid "Mar&k Message"
-@@ -9202,31 +9149,24 @@
- 
- #: messagecomposer.cpp:222
- msgid ""
--"<qt>"
--"<p>Structuring information returned by the Crypto plug-in could not be "
--"processed correctly; the plug-in might be damaged.</p>"
--"<p>Please contact your system administrator.</p></qt>"
--msgstr ""
--"<qt> "
--"<p>加密外掛程式 (Crypto Plug-In) 傳回的資訊結構錯誤，外掛程式可能已損毀。</p> "
--"<p>請與您的系統管理員聯絡。</p></qt>"
-+"<qt><p>Structuring information returned by the Crypto plug-in could not be "
-+"processed correctly; the plug-in might be damaged.</p><p>Please contact your "
-+"system administrator.</p></qt>"
-+msgstr ""
-+"<qt> <p>加密外掛程式 (Crypto Plug-In) 傳回的資訊結構錯誤，外掛程式可能已損"
-+"毀。</p> <p>請與您的系統管理員聯絡。</p></qt>"
- 
- #: messagecomposer.cpp:226
- msgid ""
--"<p>No active Crypto Plug-In was found and the built-in OpenPGP code did not run "
--"successfully.</p>"
--"<p>You can do two things to change this:</p>"
--"<ul>"
--"<li><em>either</em> activate a Plug-In using the Settings->Configure KMail->"
--"Plug-In dialog.</li>"
--"<li><em>or</em> specify traditional OpenPGP settings on the same dialog's "
--"Identity->Advanced tab.</li></ul>"
--msgstr ""
--"<p>沒有可用的加密外掛程式，內建的 OpenPGP 沒有成功執行。</p> "
--"<p>您可以做以下動作：</p> "
--"<ul>"
--"<li>在 KMail 設定=>外掛程式設定中打開外掛程式。<em>或者是</em>，</li> "
--"<li>在身份=>進階中指定傳統的 OpenPGP 設定。</li></ul>"
-+"<p>No active Crypto Plug-In was found and the built-in OpenPGP code did not "
-+"run successfully.</p><p>You can do two things to change this:</"
-+"p><ul><li><em>either</em> activate a Plug-In using the Settings->Configure "
-+"KMail->Plug-In dialog.</li><li><em>or</em> specify traditional OpenPGP "
-+"settings on the same dialog's Identity->Advanced tab.</li></ul>"
-+msgstr ""
-+"<p>沒有可用的加密外掛程式，內建的 OpenPGP 沒有成功執行。</p> <p>您可以做以下"
-+"動作：</p> <ul><li>在 KMail 設定=>外掛程式設定中打開外掛程式。<em>或者是</"
-+"em>，</li> <li>在身分=>進階中指定傳統的 OpenPGP 設定。</li></ul>"
- 
- #: messagecomposer.cpp:444
- msgid ""
-@@ -9238,8 +9178,8 @@
- 
- #: messagecomposer.cpp:556
- msgid ""
--"Chiasmus backend does not offer the \"x-encrypt\" function. Please report this "
--"bug."
-+"Chiasmus backend does not offer the \"x-encrypt\" function. Please report "
-+"this bug."
- msgstr "Chiasmus 後端沒有指定 x-encrypt 功能。請回報錯誤。"
- 
- #: messagecomposer.cpp:564
-@@ -9254,14 +9194,14 @@
- 
- #: messagecomposer.cpp:577
- msgid ""
--"Unexpected return value from Chiasmus backend: The \"x-encrypt\" function did "
--"not return a byte array. Please report this bug."
-+"Unexpected return value from Chiasmus backend: The \"x-encrypt\" function "
-+"did not return a byte array. Please report this bug."
- msgstr "Chiasmus 後端傳回錯誤：x-encrypt 功能沒有傳回位元陣列。請回報錯誤。"
- 
- #: messagecomposer.cpp:638
- msgid ""
--"The inline OpenPGP crypto message format does not support encryption or signing "
--"of attachments.\n"
-+"The inline OpenPGP crypto message format does not support encryption or "
-+"signing of attachments.\n"
- "Really use deprecated inline OpenPGP?"
- msgstr ""
- "內含式(inline) OpenPGP 加密格式不支援對附件加密或簽署。\n"
-@@ -9314,7 +9254,7 @@
- msgid ""
- "You have requested to sign this message, but no valid signing keys have been "
- "configured for this identity."
--msgstr "您要求簽署信件，但這個身份沒有指定正確的簽署金鑰。"
-+msgstr "您要求簽署信件，但這個身分沒有指定正確的簽署金鑰。"
- 
- #: messagecomposer.cpp:810
- msgid "Send Unsigned?"
-@@ -9331,7 +9271,7 @@
- "Sign all parts instead?"
- msgstr ""
- "這封信件某些部份不會被簽署。\n"
--"部份簽署的信件可能有違站台的安全原則。\n"
-+"部份簽署的信件可能有違站臺的安全原則。\n"
- "要簽署全部的信件嗎？"
- 
- #: messagecomposer.cpp:829
-@@ -9341,7 +9281,7 @@
- "Sign message instead?"
- msgstr ""
- "這封信沒有被簽署。\n"
--"未簽署的信件可能有違站台的安全原則。\n"
-+"未簽署的信件可能有違站臺的安全原則。\n"
- "要簽署信件嗎？"
- 
- #: messagecomposer.cpp:833
-@@ -9370,8 +9310,8 @@
- 
- #: messagecomposer.cpp:877
- msgid ""
--"Examination of the recipient's encryption preferences yielded that you be asked "
--"whether or not to encrypt this message.\n"
-+"Examination of the recipient's encryption preferences yielded that you be "
-+"asked whether or not to encrypt this message.\n"
- "Encrypt this message?"
- msgstr ""
- "設定要求詢問您是否要加密這封信件。\n"
-@@ -9383,7 +9323,7 @@
- 
- #: messagecomposer.cpp:884
- msgid "Sign && &Encrypt"
--msgstr "簽署並加密 (&E)"
-+msgstr "簽署並加密(&E)"
- 
- #: messagecomposer.cpp:887 messagecomposer.cpp:962
- msgid "&Sign Only"
-@@ -9407,9 +9347,12 @@
- 
- #: messagecomposer.cpp:927
- msgid ""
--"You have requested to encrypt this message, and to encrypt a copy to yourself, "
--"but no valid trusted encryption keys have been configured for this identity."
--msgstr "您已要求加密此信件，並送一份複本給自己，但是這個身份沒有合法可信任的加密金鑰。"
-+"You have requested to encrypt this message, and to encrypt a copy to "
-+"yourself, but no valid trusted encryption keys have been configured for this "
-+"identity."
-+msgstr ""
-+"您已要求加密此信件，並送一份複本給自己，但是這個身分沒有合法可信任的加密金"
-+"鑰。"
- 
- #: messagecomposer.cpp:932
- msgid "Send Unencrypted?"
-@@ -9418,12 +9361,12 @@
- #: messagecomposer.cpp:948
- msgid ""
- "Some parts of this message will not be encrypted.\n"
--"Sending only partially encrypted messages might violate site policy and/or leak "
--"sensitive information.\n"
-+"Sending only partially encrypted messages might violate site policy and/or "
-+"leak sensitive information.\n"
- "Encrypt all parts instead?"
- msgstr ""
- "這封信的某些部份不會被加密。\n"
--"送出未完全加密的信件可能有違站台的安全原則。\n"
-+"送出未完全加密的信件可能有違站臺的安全原則。\n"
- "是否要改成加密整封信？"
- 
- #: messagecomposer.cpp:952
-@@ -9434,7 +9377,7 @@
- "Encrypt messages instead?"
- msgstr ""
- "這封信不會被加密。\n"
--"送出未完全加密的信件可能有違站台的安全原則。\n"
-+"送出未完全加密的信件可能有違站臺的安全原則。\n"
- "是否要改成加密整封信？"
- 
- #: messagecomposer.cpp:957
-@@ -9447,18 +9390,17 @@
- 
- #: messagecomposer.cpp:2040
- msgid ""
--"<qt>"
--"<p>Error: The backend did not return any encoded data.</p>"
--"<p>Please report this bug:"
--"<br>%2</p></qt>"
--msgstr "<qt> <p>錯誤：後端沒有傳回編碼過的資料。</p> <p>請回報錯誤：<br>%2</p></qt>"
-+"<qt><p>Error: The backend did not return any encoded data.</p><p>Please "
-+"report this bug:<br>%2</p></qt>"
-+msgstr ""
-+"<qt> <p>錯誤：後端沒有傳回編碼過的資料。</p> <p>請回報錯誤：<br>%2</p></qt>"
- 
- #: messagecomposer.cpp:2113
- msgid ""
--"<qt>Not all characters fit into the chosen encoding."
--"<br>"
--"<br>Send the message anyway?</qt>"
--msgstr "<qt>不是所有的字元都符合所選擇的編碼方式。<br><br>確定要送出信件嗎？</qt>"
-+"<qt>Not all characters fit into the chosen encoding.<br><br>Send the message "
-+"anyway?</qt>"
-+msgstr ""
-+"<qt>不是所有的字元都符合所選擇的編碼方式。<br><br>確定要送出信件嗎？</qt>"
- 
- #: messagecomposer.cpp:2115
- msgid "Some Characters Will Be Lost"
-@@ -9490,8 +9432,9 @@
- 
- #: messagecomposer.cpp:2213
- msgid ""
--"This message could not be encrypted, since the chosen backend does not seem to "
--"support encryption; this should actually never happen, please report this bug."
-+"This message could not be encrypted, since the chosen backend does not seem "
-+"to support encryption; this should actually never happen, please report this "
-+"bug."
- msgstr "因為後端似乎不支援加密功能，所以這封信件沒有辦法加密。請回報錯誤。"
- 
- #: messagecomposer.cpp:2233 messagecomposer.cpp:2278
-@@ -9500,10 +9443,12 @@
- 
- #: messagecomposer.cpp:2255
- msgid ""
--"This message could not be signed and encrypted, since the chosen backend does "
--"not seem to support combined signing and encryption; this should actually never "
--"happen, please report this bug."
--msgstr "因為後端似乎不支援簽署同時加密功能，所以這封信件沒有辦法簽署與加密。請回報錯誤。"
-+"This message could not be signed and encrypted, since the chosen backend "
-+"does not seem to support combined signing and encryption; this should "
-+"actually never happen, please report this bug."
-+msgstr ""
-+"因為後端似乎不支援簽署同時加密功能，所以這封信件沒有辦法簽署與加密。請回報錯"
-+"誤。"
- 
- #: newfolderdialog.cpp:58
- msgid "New Folder"
-@@ -9524,13 +9469,14 @@
- 
- #: newfolderdialog.cpp:97
- msgid ""
--"Select whether you want to store the messages in this folder as one file per  "
--"message (maildir) or as one big file (mbox). KMail uses maildir by default and "
--"this only needs to be changed in rare circumstances. If you are unsure, leave "
--"this option as-is."
--msgstr ""
--"請選擇在這個資料夾中要用什麼格式儲存信件。您可以選擇每封信一個檔案（maildir 格式）或是把所有信件存成一個大檔（mbox 格式）。KMail 預設會使用 "
--"maildir，如果您不是很瞭解這是在幹嘛，就請不要修改此選項。"
-+"Select whether you want to store the messages in this folder as one file "
-+"per  message (maildir) or as one big file (mbox). KMail uses maildir by "
-+"default and this only needs to be changed in rare circumstances. If you are "
-+"unsure, leave this option as-is."
-+msgstr ""
-+"請選擇在這個資料夾中要用什麼格式儲存信件。您可以選擇每封信一個檔案（maildir "
-+"格式）或是把所有信件存成一個大檔（mbox 格式）。KMail 預設會使用 maildir，如果"
-+"您不是很瞭解這是在幹嘛，就請不要修改此選項。"
- 
- #: newfolderdialog.cpp:119
- msgid "Folder &contains:"
-@@ -9539,9 +9485,11 @@
- #: newfolderdialog.cpp:124
- msgid ""
- "Select whether you want the new folder to be used for mail storage of for "
--"storage of groupware items such as tasks or notes. The default is mail. If you "
--"are unsure, leave this option as-is."
--msgstr "請選擇您要讓這個資料夾儲存信件還是行事曆與便條等。預設是儲存信件。如果您不是很瞭解這是在幹嘛，就請不要修改此選項。"
-+"storage of groupware items such as tasks or notes. The default is mail. If "
-+"you are unsure, leave this option as-is."
-+msgstr ""
-+"請選擇您要讓這個資料夾儲存信件還是行事曆與便條等。預設是儲存信件。如果您不是"
-+"很瞭解這是在幹嘛，就請不要修改此選項。"
- 
- #: newfolderdialog.cpp:160
- msgid "Namespace for &folder:"
-@@ -9627,8 +9575,8 @@
- #: objecttreeparser.cpp:610
- #, c-format
- msgid ""
--"The message is signed, but the validity of the signature cannot be verified.<br "
--"/>Reason: %1"
-+"The message is signed, but the validity of the signature cannot be verified."
-+"<br />Reason: %1"
- msgstr "信件已簽署，但無法確認簽章的合法信。<br> 原因：%1"
- 
- #: objecttreeparser.cpp:667
-@@ -9658,23 +9606,25 @@
- 
- #: objecttreeparser.cpp:844
- msgid ""
--"<b>Note:</b> This HTML message may contain external references to images etc. "
--"For security/privacy reasons external references are not loaded. If you trust "
--"the sender of this message then you can load the external references for this "
--"message <a href=\"kmail:loadExternal\">by clicking here</a>."
--msgstr ""
--"<b>注意：</b>這封信件包含了要從遠端下載的連結圖片等。為了安全性與私密性的考量，這些遠端連結都沒有下載。如果您確信您可以下載這些連結不會發生問題，您可以<"
--"a href=\"kmail:loadExternal\">按這裡</a>來下載。"
-+"<b>Note:</b> This HTML message may contain external references to images "
-+"etc. For security/privacy reasons external references are not loaded. If you "
-+"trust the sender of this message then you can load the external references "
-+"for this message <a href=\"kmail:loadExternal\">by clicking here</a>."
-+msgstr ""
-+"<b>注意：</b>這封信件包含了要從遠端下載的連結圖片等。為了安全性與私密性的考"
-+"量，這些遠端連結都沒有下載。如果您確信您可以下載這些連結不會發生問題，您可以"
-+"<a href=\"kmail:loadExternal\">按這裡</a>來下載。"
- 
- #: objecttreeparser.cpp:854
- msgid ""
--"<b>Note:</b> This is an HTML message. For security reasons, only the raw HTML "
--"code is shown. If you trust the sender of this message then you can activate "
--"formatted HTML display for this message <a href=\"kmail:showHTML\">"
--"by clicking here</a>."
--msgstr ""
--"<b>注意：</b>這是一封 HTML 信件。因為安全考量，目前只顯示 HTML 原始碼。如果您確信來源沒有問題，您可以<a "
--"href=\"kmail:showHTML\">按這裡</a>來顯示 HTML 格式的郵件。"
-+"<b>Note:</b> This is an HTML message. For security reasons, only the raw "
-+"HTML code is shown. If you trust the sender of this message then you can "
-+"activate formatted HTML display for this message <a href=\"kmail:showHTML"
-+"\">by clicking here</a>."
-+msgstr ""
-+"<b>注意：</b>這是一封 HTML 信件。因為安全考量，目前只顯示 HTML 原始碼。如果您"
-+"確信來源沒有問題，您可以<a href=\"kmail:showHTML\">按這裡</a>來顯示 HTML 格式"
-+"的郵件。"
- 
- #: objecttreeparser.cpp:1451
- #, c-format
-@@ -9708,14 +9658,14 @@
- msgid ""
- "_n: 1 new secret key was imported.\n"
- "%n new secret keys were imported."
--msgstr "已匯入 %n 個新的秘密金鑰。"
-+msgstr "已匯入 %n 個新的祕密金鑰。"
- 
- #: objecttreeparser.cpp:1476
- #, c-format
- msgid ""
- "_n: 1 secret key was unchanged.\n"
- "%n secret keys were unchanged."
--msgstr "%n 個秘密金鑰維持不變。"
-+msgstr "%n 個祕密金鑰維持不變。"
- 
- #: objecttreeparser.cpp:1485
- msgid "Sorry, no details on certificate import available."
-@@ -9731,7 +9681,7 @@
- 
- #: objecttreeparser.cpp:1496
- msgid "New or changed: %1 (secret key available)"
--msgstr "新的或已改變的：%1 （個秘密金鑰可使用）"
-+msgstr "新的或已改變的：%1 （個祕密金鑰可使用）"
- 
- #: objecttreeparser.cpp:1498
- #, c-format
-@@ -9887,9 +9837,11 @@
- 
- #: objecttreeparser.cpp:2269
- msgid ""
--"No mail address is stored in the %1 used for signing, so we cannot compare it "
--"to the sender's address %2."
--msgstr "寄件者用於簽署的電子郵件地址沒有保存在 %1，因此我們無法與寄件者的地址 %2 做比較。"
-+"No mail address is stored in the %1 used for signing, so we cannot compare "
-+"it to the sender's address %2."
-+msgstr ""
-+"寄件者用於簽署的電子郵件地址沒有保存在 %1，因此我們無法與寄件者的地址 %2 做比"
-+"較。"
- 
- #: objecttreeparser.cpp:2292
- #, c-format
-@@ -10004,34 +9956,39 @@
- 
- #: popaccount.cpp:495
- msgid ""
--"Your POP3 server (Account: %1) does not support the UIDL command: this command "
--"is required to determine, in a reliable way, which of the mails on the server "
--"KMail has already seen before;\n"
--"the feature to leave the mails on the server will therefore not work properly."
-+"Your POP3 server (Account: %1) does not support the UIDL command: this "
-+"command is required to determine, in a reliable way, which of the mails on "
-+"the server KMail has already seen before;\n"
-+"the feature to leave the mails on the server will therefore not work "
-+"properly."
- msgstr ""
--"您的 POP3 伺服器（帳號：%1）不支援 UIDL 命令：這個命令用於決定 KMail 已經檢查過伺服器上哪些信件。\n"
-+"您的 POP3 伺服器（帳號：%1）不支援 UIDL 命令：這個命令用於決定 KMail 已經檢查"
-+"過伺服器上哪些信件。\n"
- "因此「將信件保留在伺服器上」的功能有可能無法正常運作。"
- 
- #: popaccount.cpp:752
- msgid ""
- "_n: Fetched 1 message from %1. Deleting messages from server...\n"
- "Fetched %n messages from %1. Deleting messages from server..."
--msgstr "從 %1 讀取 %n 封信件。從伺服器上刪除..."
-+msgstr "從 %1 讀取 %n 封信件。從伺服器上刪除…"
- 
- #: popaccount.cpp:762 popaccount.cpp:782
- msgid ""
- "_n: Fetched 1 message from %1. Terminating transmission...\n"
- "Fetched %n messages from %1. Terminating transmission..."
--msgstr "從 %1 讀取 %n 封信件。結束傳輸..."
-+msgstr "從 %1 讀取 %n 封信件。結束傳輸…"
- 
- #: popaccount.cpp:905
- msgid ""
--"Fetching message %1 of %2 (%3 of %4 KB) for %5@%6 (%7 KB remain on the server)."
--msgstr "傳送 %5@%6 的信件中... 已傳送 %1 封（%3 KB），共 %2 封（%4 KB，伺服器上共有 %7 KB）。"
-+"Fetching message %1 of %2 (%3 of %4 KB) for %5@%6 (%7 KB remain on the "
-+"server)."
-+msgstr ""
-+"傳送 %5@%6 的信件中... 已傳送 %1 封（%3 KB），共 %2 封（%4 KB，伺服器上共有 %"
-+"7 KB）。"
- 
- #: popaccount.cpp:912
- msgid "Fetching message %1 of %2 (%3 of %4 KB) for %5@%6."
--msgstr "傳送 %5@%6 的信件中... 已傳送 %1 封（%3 KB），共 %2 封（%4 KB）。"
-+msgstr "傳送 %5@%6 的信件中… 已傳送 %1 封（%3 KB），共 %2 封（%4 KB）。"
- 
- #: popaccount.cpp:949
- msgid "Unable to complete LIST operation."
-@@ -10043,9 +10000,11 @@
- 
- #: popaccount.cpp:1026
- msgid ""
--"Your server does not support the TOP command. Therefore it is not possible to "
--"fetch the headers of large emails first, before downloading them."
--msgstr "您的信件主機不支援 TOP 指令。因此，在下載大信件前，將無法預先取得大信件的標頭。"
-+"Your server does not support the TOP command. Therefore it is not possible "
-+"to fetch the headers of large emails first, before downloading them."
-+msgstr ""
-+"您的信件主機不支援 TOP 指令。因此，在下載大信件前，將無法預先取得大信件的標"
-+"頭。"
- 
- #. i18n: file kmail_part.rc line 80
- #: rc.cpp:15 rc.cpp:81
-@@ -10099,10 +10058,12 @@
- #: rc.cpp:141
- #, no-c-format
- msgid ""
--"When this option is enabled, all messages you send will be signed by default; "
--"of course, it is still possible to disable signing for each message "
-+"When this option is enabled, all messages you send will be signed by "
-+"default; of course, it is still possible to disable signing for each message "
- "individually."
--msgstr "這個選項被勾選之後，所有您送出的信件都會自動簽署。當然，您也可以針對個別信件將這個功能關閉。"
-+msgstr ""
-+"這個選項被勾選之後，所有您送出的信件都會自動簽署。當然，您也可以針對個別信件"
-+"將這個功能關閉。"
- 
- #. i18n: file composercryptoconfiguration.ui line 48
- #: rc.cpp:144
-@@ -10116,16 +10077,18 @@
- msgid ""
- "When encrypting emails, always also encr&ypt to the certificate of my own "
- "identity"
--msgstr "加密電子郵件時，總是使用我自己身份的憑證來加密(&Y)"
-+msgstr "加密電子郵件時，總是使用我自己身分的憑證來加密(&Y)"
- 
- #. i18n: file composercryptoconfiguration.ui line 62
- #: rc.cpp:150
- #, no-c-format
- msgid ""
--"When this option is enabled, the message/file will not only be encrypted with "
--"the receiver's public key, but also with your key. This will enable you to "
--"decrypt the message/file at a later time. This is generally a good idea."
--msgstr "這個選項勾選之後，信件不只會用收件者的公開金鑰加密，也會用您自己的公開金鑰加密。您自己稍後可以自行解密。我們通常都建議這樣做。"
-+"When this option is enabled, the message/file will not only be encrypted "
-+"with the receiver's public key, but also with your key. This will enable you "
-+"to decrypt the message/file at a later time. This is generally a good idea."
-+msgstr ""
-+"這個選項勾選之後，信件不只會用收件者的公開金鑰加密，也會用您自己的公開金鑰加"
-+"密。您自己稍後可以自行解密。我們通常都建議這樣做。"
- 
- #. i18n: file composercryptoconfiguration.ui line 70
- #: rc.cpp:153
-@@ -10138,10 +10101,11 @@
- #, no-c-format
- msgid ""
- "When this option is enabled, the signed/encrypted text will be shown in a "
--"separate window, enabling you to know how it will look before it is sent. This "
--"is a good idea when you are verifying that your encryption system works."
-+"separate window, enabling you to know how it will look before it is sent. "
-+"This is a good idea when you are verifying that your encryption system works."
- msgstr ""
--"這個選項被勾選之後，系統會在信件送出前，先在另一個視窗讓您檢視簽署過或加密過後的內容。如果您要檢視您加密的系統是否運作良好，您可以選擇使用此選項。"
-+"這個選項被勾選之後，系統會在信件送出前，先在另一個視窗讓您檢視簽署過或加密過"
-+"後的內容。如果您要檢視您加密的系統是否運作良好，您可以選擇使用此選項。"
- 
- #. i18n: file composercryptoconfiguration.ui line 81
- #: rc.cpp:159
-@@ -10162,16 +10126,17 @@
- "<qt>\n"
- "<h1>Store Messages Encrypted</h1>\n"
- "When this box is checked, sent messages are stored encrypted like they were "
--"sent. This is not recommended, as you will not be able to read the messages any "
--"longer if a necessary certificate expires.\n"
-+"sent. This is not recommended, as you will not be able to read the messages "
-+"any longer if a necessary certificate expires.\n"
- "<p>\n"
--"However, there may be local rules that require you to turn this option on. When "
--"in doubt, check with your local administrator.\n"
-+"However, there may be local rules that require you to turn this option on. "
-+"When in doubt, check with your local administrator.\n"
- "</qt>"
- msgstr ""
- "<qt>\n"
- "<h1>儲存加密過後的信件</h1>\n"
--"這個選項被勾選之後，寄件備份中的信件會保持加密。我們不建議這樣做，因為如果憑證過期之後，您將再也無法檢視您送出過的內容。\n"
-+"這個選項被勾選之後，寄件備份中的信件會保持加密。我們不建議這樣做，因為如果憑"
-+"證過期之後，您將再也無法檢視您送出過的內容。\n"
- "<p>\n"
- "但是，有可能您的管理員會要求您這樣做。如果不確定，請與您的系統管理員聯絡。\n"
- "</qt>"
-@@ -10187,11 +10152,13 @@
- #, no-c-format
- msgid ""
- "When this option is enabled, the application will always show you a list of "
--"public keys from which you can choose the one it will use for encryption. If it "
--"is off, the application will only show the dialog if it cannot find the right "
--"key or if there are several which could be used."
--msgstr ""
--"這個選項被勾選之後，系統在每次您要加密時，都會顯示清單讓您選擇要使用的公開金鑰。反之，則系統只會在它找不到正確的金鑰，或者是有多重選擇的時候才會要求您選擇。"
-+"public keys from which you can choose the one it will use for encryption. If "
-+"it is off, the application will only show the dialog if it cannot find the "
-+"right key or if there are several which could be used."
-+msgstr ""
-+"這個選項被勾選之後，系統在每次您要加密時，都會顯示清單讓您選擇要使用的公開金"
-+"鑰。反之，則系統只會在它找不到正確的金鑰，或者是有多重選擇的時候才會要求您選"
-+"擇。"
- 
- #. i18n: file composercryptoconfiguration.ui line 114
- #: rc.cpp:179
-@@ -10203,10 +10170,12 @@
- #: rc.cpp:182
- #, no-c-format
- msgid ""
--"When this option is enabled, every message you send will be encrypted whenever "
--"encryption is possible and desired; of course, it is still possible to disable "
--"the automatic encryption for each message individually."
--msgstr "這個選項被勾選的話，每次要送出信件時，只要能加密系統都會幫您加密。當然，您也可以針對個別信件將這個功能關閉。"
-+"When this option is enabled, every message you send will be encrypted "
-+"whenever encryption is possible and desired; of course, it is still possible "
-+"to disable the automatic encryption for each message individually."
-+msgstr ""
-+"這個選項被勾選的話，每次要送出信件時，只要能加密系統都會幫您加密。當然，您也"
-+"可以針對個別信件將這個功能關閉。"
- 
- #. i18n: file composercryptoconfiguration.ui line 125
- #: rc.cpp:185
-@@ -10344,7 +10313,7 @@
- #: rc.cpp:278
- #, no-c-format
- msgid "Sender identit&y:"
--msgstr "寄件者身份(&Y)："
-+msgstr "寄件者身分(&Y)："
- 
- #. i18n: file folderpropertiesdialog.ui line 483
- #: rc.cpp:281
-@@ -10368,8 +10337,8 @@
- #: rc.cpp:296
- #, no-c-format
- msgid ""
--"If this option is selected, S/MIME certificates are validated using Certificate "
--"Revocation Lists (CRLs)."
-+"If this option is selected, S/MIME certificates are validated using "
-+"Certificate Revocation Lists (CRLs)."
- msgstr "選擇此選項的話，S/MIME 憑證會使用 CRL 來確認。"
- 
- #. i18n: file smimeconfiguration.ui line 38
-@@ -10382,10 +10351,12 @@
- #: rc.cpp:302
- #, no-c-format
- msgid ""
--"If this option is selected, S/MIME certificates are validated online using the "
--"Online Certificates Status Protocol (OCSP). Fill in the URL of the OCSP "
-+"If this option is selected, S/MIME certificates are validated online using "
-+"the Online Certificates Status Protocol (OCSP). Fill in the URL of the OCSP "
- "responder below."
--msgstr "選擇此選項的話，S/MIME 憑證會使用 OSCP 來做線上確認。請在底下輸入 OSCP 的 URL。"
-+msgstr ""
-+"選擇此選項的話，S/MIME 憑證會使用 OSCP 來做線上確認。請在底下輸入 OSCP 的 "
-+"URL。"
- 
- #. i18n: file smimeconfiguration.ui line 49
- #: rc.cpp:305
-@@ -10429,9 +10400,12 @@
- #: rc.cpp:323
- #, no-c-format
- msgid ""
--"By default GnuPG uses the file ~/.gnupg/policies.txt to check if a certificate "
--"policy is allowed. If this option is selected, policies are not checked."
--msgstr "預設 GnuPG 使用 ~/.gnupg/policies.txt 來檢查憑證原則。選擇這個選項的話就不做檢查。"
-+"By default GnuPG uses the file ~/.gnupg/policies.txt to check if a "
-+"certificate policy is allowed. If this option is selected, policies are not "
-+"checked."
-+msgstr ""
-+"預設 GnuPG 使用 ~/.gnupg/policies.txt 來檢查憑證原則。選擇這個選項的話就不做"
-+"檢查。"
- 
- #. i18n: file smimeconfiguration.ui line 147
- #: rc.cpp:326
-@@ -10459,7 +10433,8 @@
- msgid ""
- "If this option is checked, missing issuer certificates are fetched when "
- "necessary (this applies to both validation methods, CRLs and OCSP)"
--msgstr "勾選此選項的話，消失的發行者憑證只要能找到就會抓取（包括 CRL 與 OSCP）。"
-+msgstr ""
-+"勾選此選項的話，消失的發行者憑證只要能找到就會抓取（包括 CRL 與 OSCP）。"
- 
- #. i18n: file smimeconfiguration.ui line 169
- #: rc.cpp:338
-@@ -10505,9 +10480,11 @@
- #, no-c-format
- msgid ""
- "Enter here the location of your HTTP Proxy, which will be used for all HTTP "
--"requests relating to S/MIME. The syntax is host:port, for instance "
--"myproxy.nowhere.com:3128."
--msgstr "請在這裡輸入 HTTP proxy 的位址。語法為主機：埠號，例如 myproxy.nowhere.com:3128"
-+"requests relating to S/MIME. The syntax is host:port, for instance myproxy."
-+"nowhere.com:3128."
-+msgstr ""
-+"請在這裡輸入 HTTP proxy 的位址。語法為主機：埠號，例如 myproxy.nowhere."
-+"com:3128"
- 
- #. i18n: file smimeconfiguration.ui line 253
- #: rc.cpp:362
-@@ -10520,13 +10497,13 @@
- #, no-c-format
- msgid ""
- "When looking for the location of a CRL, the to-be-tested certificate usually "
--"contains what are known as \"CRL Distribution Point\" (DP) entries, which are "
--"URLs describing the way to access the URL. The first found DP entry is used.  "
--"With this option all entries using the HTTP scheme are ignored when looking for "
--"a suitable DP."
-+"contains what are known as \"CRL Distribution Point\" (DP) entries, which "
-+"are URLs describing the way to access the URL. The first found DP entry is "
-+"used.  With this option all entries using the HTTP scheme are ignored when "
-+"looking for a suitable DP."
- msgstr ""
--"在尋找 CRL 位址時，憑證裡通常會有所謂的 CRL 發布點 (CRL Distribution Point)。如果選擇此選項的話，使用 HTTP "
--"會忽略此設定，不會依據此設定去找 CRL DP。"
-+"在尋找 CRL 位址時，憑證裡通常會有所謂的 CRL 發布點 (CRL Distribution Point)。"
-+"如果選擇此選項的話，使用 HTTP 會忽略此設定，不會依據此設定去找 CRL DP。"
- 
- #. i18n: file smimeconfiguration.ui line 268
- #: rc.cpp:368
-@@ -10557,13 +10534,13 @@
- #, no-c-format
- msgid ""
- "When looking for the location of a CRL, the to-be-tested certificate usually "
--"contains what are known as \"CRL Distribution Point\" (DP) entries, which are "
--"URLs describing the way to access the URL. The first found DP entry is used.  "
--"With this option all entries using the LDAP scheme are ignored when looking for "
--"a suitable DP."
-+"contains what are known as \"CRL Distribution Point\" (DP) entries, which "
-+"are URLs describing the way to access the URL. The first found DP entry is "
-+"used.  With this option all entries using the LDAP scheme are ignored when "
-+"looking for a suitable DP."
- msgstr ""
--"在尋找 CRL 位址時，憑證裡通常會有所謂的 CRL 發布點 (CRL Distribution Point)。如果選擇此選項的話，使用 LDAP "
--"會忽略此設定，不會依據此設定去找 CRL DP。"
-+"在尋找 CRL 位址時，憑證裡通常會有所謂的 CRL 發布點 (CRL Distribution Point)。"
-+"如果選擇此選項的話，使用 LDAP 會忽略此設定，不會依據此設定去找 CRL DP。"
- 
- #. i18n: file smimeconfiguration.ui line 326
- #: rc.cpp:383
-@@ -10576,16 +10553,17 @@
- #, no-c-format
- msgid ""
- "Entering a LDAP server here will make all LDAP requests go to that server "
--"first. More precisely, this setting overrides any specified host and port part "
--"in a LDAP URL and will also be used if host and port have been omitted from the "
--"URL. Other LDAP servers will be used only if the connection to the \"proxy\" "
--"failed.\n"
--"The syntax is \"HOST\" or \"HOST:PORT\". If PORT is omitted, port 389 (standard "
--"LDAP port) is used."
--msgstr ""
--"請在這裡輸入 LDAP 伺服器，所有的 LDAP 要求都會先送到該伺服器。這個設定也會忽略所有 LDAP URL 中指定的主機與埠號，若 LDAP URL "
--"中沒有指定主機與埠號的話也會送到此伺服器。除非無法連到這個伺服器，才會考慮其他的 LDAP 伺服器。 "
--"語法是「主機」或「主機：埠號」。如果沒有寫埠號的話，預設使用 389（預設的 LDAP 埠號）。"
-+"first. More precisely, this setting overrides any specified host and port "
-+"part in a LDAP URL and will also be used if host and port have been omitted "
-+"from the URL. Other LDAP servers will be used only if the connection to the "
-+"\"proxy\" failed.\n"
-+"The syntax is \"HOST\" or \"HOST:PORT\". If PORT is omitted, port 389 "
-+"(standard LDAP port) is used."
-+msgstr ""
-+"請在這裡輸入 LDAP 伺服器，所有的 LDAP 要求都會先送到該伺服器。這個設定也會忽"
-+"略所有 LDAP URL 中指定的主機與埠號，若 LDAP URL 中沒有指定主機與埠號的話也會"
-+"送到此伺服器。除非無法連到這個伺服器，才會考慮其他的 LDAP 伺服器。 語法是「主"
-+"機」或「主機：埠號」。如果沒有寫埠號的話，預設使用 389（預設的 LDAP 埠號）。"
- 
- #. i18n: file snippetdlgbase.ui line 16
- #: rc.cpp:390
-@@ -10722,8 +10700,8 @@
- msgid ""
- "<qt>\n"
- "<h1>Warn When Trying To Send Unsigned Messages</h1>\n"
--"If this box is checked, you will be warned when you try to send parts of or the "
--"whole message unsigned.\n"
-+"If this box is checked, you will be warned when you try to send parts of or "
-+"the whole message unsigned.\n"
- "<p>\n"
- "It is recommended to leave this option turned on for maximum integrity.\n"
- "</qt>"
-@@ -10753,8 +10731,8 @@
- msgid ""
- "<qt>\n"
- "<h1>Warn When Trying To Send Unencrypted Messages</h1>\n"
--"If this box is checked, you will be warned when you try to send parts of or the "
--"whole message unencrypted.\n"
-+"If this box is checked, you will be warned when you try to send parts of or "
-+"the whole message unencrypted.\n"
- "<p>\n"
- "It is recommended to leave this option turned on for maximum integrity.\n"
- "</qt>"
-@@ -10792,8 +10770,7 @@
- msgstr ""
- "<qt>\n"
- "<h1>如果憑證內沒有收件者的電子郵件地址則提出警告</h1>\n"
--"這個選項被勾選的話，在加密憑證中找不到收件者的電子郵件地址時會提出警告。"
--"<p>\n"
-+"這個選項被勾選的話，在加密憑證中找不到收件者的電子郵件地址時會提出警告。<p>\n"
- "建議您使用此選項。\n"
- "</qt>"
- 
-@@ -10872,8 +10849,8 @@
- msgid ""
- "<qt>\n"
- "<h1>Warn If A Certificate In The Chain Expires</h1>\n"
--"Select the minimum number of days all certificates in the chain should be valid "
--"without issuing a warning.\n"
-+"Select the minimum number of days all certificates in the chain should be "
-+"valid without issuing a warning.\n"
- "<p>\n"
- "The recommended SPHINX setting is 14 days.\n"
- "</qt>"
-@@ -10910,8 +10887,8 @@
- msgid ""
- "<qt>\n"
- "<h1>Warn If Root Certificate Expires</h1>\n"
--"Select the minimum number of days the root certificate should be valid without "
--"issuing a warning.\n"
-+"Select the minimum number of days the root certificate should be valid "
-+"without issuing a warning.\n"
- "<p>\n"
- "The recommended SPHINX setting is 14 days.\n"
- "</qt>"
-@@ -10975,11 +10952,12 @@
- #: rc.cpp:621
- #, no-c-format
- msgid ""
--"<qt>"
--"<p>Select whether you want KMail to send all messages in the outbox on manual "
--"or all mail checks, or whether you do not want messages to be sent "
-+"<qt><p>Select whether you want KMail to send all messages in the outbox on "
-+"manual or all mail checks, or whether you do not want messages to be sent "
- "automatically at all. </p></qt>"
--msgstr "<qt> <p>如果您不要信件自動送出，或是要 KMail 在檢查信件時順便把寄件匣中的信件順便送出，就選擇此選項。</p></qt>"
-+msgstr ""
-+"<qt> <p>如果您不要信件自動送出，或是要 KMail 在檢查信件時順便把寄件匣中的信件"
-+"順便送出，就選擇此選項。</p></qt>"
- 
- #. i18n: file kmail.kcfg line 70
- #: rc.cpp:624
-@@ -10994,10 +10972,12 @@
- #, no-c-format
- msgid ""
- "If there are new messages in a folder, which have not been uploaded to the "
--"server yet, but you do not have sufficient access rights on the folder now to "
--"upload them, these messages will automatically be moved into a lost and found "
--"folder."
--msgstr "若是在某資料夾中還有新的信件尚未上傳到伺服器，而您的權限似乎沒辦法上傳，則這些信件將會自動移到 lost+found 資料夾中。"
-+"server yet, but you do not have sufficient access rights on the folder now "
-+"to upload them, these messages will automatically be moved into a lost and "
-+"found folder."
-+msgstr ""
-+"若是在某資料夾中還有新的信件尚未上傳到伺服器，而您的權限似乎沒辦法上傳，則這"
-+"些信件將會自動移到 lost+found 資料夾中。"
- 
- #. i18n: file kmail.kcfg line 76
- #: rc.cpp:630
-@@ -11011,8 +10991,8 @@
- msgid ""
- "This setting allows administrators to set a minimum delay between two mail "
- "checks.\"\n"
--"           \"The user will not be able to choose a value smaller than the value "
--"set here."
-+"           \"The user will not be able to choose a value smaller than the "
-+"value set here."
- msgstr ""
- "這個設定值是讓管理者設定兩次郵件檢查之間的最小時間間隔。\n"
- "使用者不能選擇一個比此值還小的時間間隔。"
-@@ -11041,8 +11021,8 @@
- #: rc.cpp:649
- #, no-c-format
- msgid ""
--"Close the application when the mainwindow is closed, even if there is a system "
--"tray icon active."
-+"Close the application when the mainwindow is closed, even if there is a "
-+"system tray icon active."
- msgstr "當主視窗關閉時順便關閉此應用程式，即使系統匣圖示仍存在。"
- 
- #. i18n: file kmail.kcfg line 119
-@@ -11056,9 +11036,11 @@
- #, no-c-format
- msgid ""
- "If this option is enabled then for each folder the number of newly arrived "
--"messages is shown in the new mail notification; otherwise, you will only get a "
--"simple 'New mail arrived' message."
--msgstr "這個選項打開的話，在新信寄達通知中會顯示有幾封新信件。不然您就只會看到「有新信件來了」的通知。"
-+"messages is shown in the new mail notification; otherwise, you will only get "
-+"a simple 'New mail arrived' message."
-+msgstr ""
-+"這個選項打開的話，在新信寄達通知中會顯示有幾封新信件。不然您就只會看到「有新"
-+"信件來了」的通知。"
- 
- #. i18n: file kmail.kcfg line 124
- #: rc.cpp:658
-@@ -11097,11 +11079,12 @@
- #, no-c-format
- msgid ""
- "Microsoft Outlook has a number of shortcomings in its implementation of the "
--"iCalendar standard; this option works around one of them. If you have problems "
--"with Outlook users not being able to get your replies, try setting this option."
-+"iCalendar standard; this option works around one of them. If you have "
-+"problems with Outlook users not being able to get your replies, try setting "
-+"this option."
- msgstr ""
--"在 Microsoft Outlook 中，關於 iCalendar 標準的實作中有許多缺點。如果有任何使用 Outlook "
--"的使用者收不到您的回覆，請試著打開這個選項。"
-+"在 Microsoft Outlook 中，關於 iCalendar 標準的實作中有許多缺點。如果有任何使"
-+"用 Outlook 的使用者收不到您的回覆，請試著打開這個選項。"
- 
- #. i18n: file kmail.kcfg line 176
- #: rc.cpp:676
-@@ -11114,12 +11097,12 @@
- #, no-c-format
- msgid ""
- "Microsoft Outlook has a number of shortcomings  in its implementation of the "
--"iCalendar standard; this option works around one of them. If you have problems "
--"with Outlook users not being able to get your invitations, try setting this "
--"option."
-+"iCalendar standard; this option works around one of them. If you have "
-+"problems with Outlook users not being able to get your invitations, try "
-+"setting this option."
- msgstr ""
--"在 Microsoft Outlook 中，關於 iCalendar 標準的實作中有許多缺點。如果有任何使用 Outlook "
--"的使用者收不到您的邀請函，請試著打開這個選項。"
-+"在 Microsoft Outlook 中，關於 iCalendar 標準的實作中有許多缺點。如果有任何使"
-+"用 Outlook 的使用者收不到您的邀請函，請試著打開這個選項。"
- 
- #. i18n: file kmail.kcfg line 182
- #: rc.cpp:682
-@@ -11131,14 +11114,15 @@
- #: rc.cpp:691
- #, no-c-format
- msgid ""
--"When this is checked, you will not see the mail composer window. Instead, all "
--"invitation mails are sent automatically. If you want to see the mail before "
--"sending it, you can uncheck this option. However, be aware that the text in the "
--"composer window is in iCalendar syntax, and you should not try modifying it by "
--"hand."
--msgstr ""
--"勾選這個選項的話，會自動送出邀請函，使用者不會看到信件編輯視窗。如果您要在送出之前先看到信件內容，您可以取消這個選項。不過信件內容會使用 iCalendar "
--"語法，請不要去修改它。"
-+"When this is checked, you will not see the mail composer window. Instead, "
-+"all invitation mails are sent automatically. If you want to see the mail "
-+"before sending it, you can uncheck this option. However, be aware that the "
-+"text in the composer window is in iCalendar syntax, and you should not try "
-+"modifying it by hand."
-+msgstr ""
-+"勾選這個選項的話，會自動送出邀請函，使用者不會看到信件編輯視窗。如果您要在送"
-+"出之前先看到信件內容，您可以取消這個選項。不過信件內容會使用 iCalendar 語法，"
-+"請不要去修改它。"
- 
- #. i18n: file kmail.kcfg line 205
- #: rc.cpp:694
-@@ -11150,8 +11134,8 @@
- #: rc.cpp:697
- #, no-c-format
- msgid ""
--"When this is checked, received invitation emails that have been replied to will "
--"be moved to the Trash folder, once the reply has been successfully sent."
-+"When this is checked, received invitation emails that have been replied to "
-+"will be moved to the Trash folder, once the reply has been successfully sent."
- msgstr "勾選此項目的話，已接收的邀請信函會在回覆成功送出後移到資源回收桶。"
- 
- #. i18n: file kmail.kcfg line 215
-@@ -11159,20 +11143,23 @@
- #, no-c-format
- msgid ""
- "<p>Enabling this makes it possible to store the entries from the Kontact "
--"applications (KOrganizer, KAddressBook, and KNotes.)</p>"
--"<p>If you want to set this option you must also set the applications to use the "
--"IMAP resource; this is done in the KDE Control Center.</p>"
--msgstr ""
--"<p>打開這個選項，您可以儲存 Kontact 應用程式（如 KOrganizer，KAddressBook 與 KNotes）中的內容。</p> "
--"<p>如果您要設定這個選項，您也必須設定這些應用程式使用 IMAP 資源。您可以在 KDE 控制中心裡設定。</p>"
-+"applications (KOrganizer, KAddressBook, and KNotes.)</p><p>If you want to "
-+"set this option you must also set the applications to use the IMAP resource; "
-+"this is done in the KDE Control Center.</p>"
-+msgstr ""
-+"<p>打開這個選項，您可以儲存 Kontact 應用程式（如 KOrganizer，KAddressBook 與 "
-+"KNotes）中的內容。</p> <p>如果您要設定這個選項，您也必須設定這些應用程式使用 "
-+"IMAP 資源。您可以在 KDE 控制中心裡設定。</p>"
- 
- #. i18n: file kmail.kcfg line 220
- #: rc.cpp:703
- #, no-c-format
- msgid ""
--"<p>Usually you will not have any reason to see the folders that hold the IMAP "
--"resources. But if you need to see them, you can set that here.</p>"
--msgstr "<p>通常您不會需要看到 IMAP 資源的資料夾。不過如果您堅持要看的話，可以在這裡設定。</p>"
-+"<p>Usually you will not have any reason to see the folders that hold the "
-+"IMAP resources. But if you need to see them, you can set that here.</p>"
-+msgstr ""
-+"<p>通常您不會需要看到 IMAP 資源的資料夾。不過如果您堅持要看的話，可以在這裡設"
-+"定。</p>"
- 
- #. i18n: file kmail.kcfg line 229
- #: rc.cpp:706
-@@ -11185,34 +11172,34 @@
- "regular \"\n"
- "          \"mail via an additional online IMAP account.</p>"
- msgstr ""
--"<p>如果儲存群組資訊的帳號不會用來管理一般郵件，則設定此選項讓 KMail 只顯示群組資料夾。若是您透過上線式 IMAP "
--"帳號管理一般郵件的話，這個選項會很有用。</p>"
-+"<p>如果儲存群組資訊的帳號不會用來管理一般郵件，則設定此選項讓 KMail 只顯示群"
-+"組資料夾。若是您透過上線式 IMAP 帳號管理一般郵件的話，這個選項會很有用。</p>"
- 
- #. i18n: file kmail.kcfg line 233
- #: rc.cpp:712
- #, no-c-format
- msgid ""
--"<p>Choose the storage format of the groupware folders. "
--"<ul>"
--"<li>The default format is to use the ical (for calendar folders) and vcard (for "
--"addressbook folders) standards. This format makes all Kontact features "
--"available.</li>"
--"<li>The Kolab XML format uses a custom model that matches more closely the one "
--"used in Outlook. This format gives better Outlook compatibility, when using a "
--"Kolab server or a compatible solution.</li></ul></p>"
--msgstr ""
--"<p>請選擇群組資料夾的儲存格式。 "
--"<ul> "
--"<li>預設格式是用 ical（日曆資料夾）及 vcard（通訊錄資料夾）。這讓您可以使用 Kontact 的功能。</li> "
--"<li>另外 Kolab XML 格式使用另外一種模式，比較接近 Outlook。這個格式與 Outlook 較為相容。</li></ul></p>"
-+"<p>Choose the storage format of the groupware folders. <ul><li>The default "
-+"format is to use the ical (for calendar folders) and vcard (for addressbook "
-+"folders) standards. This format makes all Kontact features available.</"
-+"li><li>The Kolab XML format uses a custom model that matches more closely "
-+"the one used in Outlook. This format gives better Outlook compatibility, "
-+"when using a Kolab server or a compatible solution.</li></ul></p>"
-+msgstr ""
-+"<p>請選擇群組資料夾的儲存格式。 <ul> <li>預設格式是用 ical（日曆資料夾）及 "
-+"vcard（通訊錄資料夾）。這讓您可以使用 Kontact 的功能。</li> <li>另外 Kolab "
-+"XML 格式使用另外一種模式，比較接近 Outlook。這個格式與 Outlook 較為相容。</"
-+"li></ul></p>"
- 
- #. i18n: file kmail.kcfg line 242
- #: rc.cpp:715
- #, no-c-format
- msgid ""
--"<p>This chooses the parent of the IMAP resource folders.</p>"
--"<p>By default, the Kolab server sets the IMAP inbox to be the parent.</p>"
--msgstr "<p>這裡選擇 IMAP 資源資料夾的母資料夾。</p> <p>Kolab 伺服器預設使用 IMAP 的收件匣為母資料夾。</p>"
-+"<p>This chooses the parent of the IMAP resource folders.</p><p>By default, "
-+"the Kolab server sets the IMAP inbox to be the parent.</p>"
-+msgstr ""
-+"<p>這裡選擇 IMAP 資源資料夾的母資料夾。</p> <p>Kolab 伺服器預設使用 IMAP 的收"
-+"件匣為母資料夾。</p>"
- 
- #. i18n: file kmail.kcfg line 247
- #: rc.cpp:718
-@@ -11225,14 +11212,13 @@
- #, no-c-format
- msgid ""
- "<p>If you want to set the folder names of the IMAP storage to your local "
--"language, you can choose between these available languages.</p>"
--"<p> Please note, that the only reason to do so is for compatibility with "
--"Microsoft Outlook. It is considered a bad idea to set this, since it makes "
--"changing languages impossible. </p>"
--"<p>So do not set this unless you have to.</p>"
-+"language, you can choose between these available languages.</p><p> Please "
-+"note, that the only reason to do so is for compatibility with Microsoft "
-+"Outlook. It is considered a bad idea to set this, since it makes changing "
-+"languages impossible. </p><p>So do not set this unless you have to.</p>"
- msgstr ""
--"<p>您可以將 IMAP 儲存資料夾的語言設定為您自己使用的語言。</p> "
--"<p>請注意，通常這樣做的目的只是為了跟 Microsoft Outlook 相容，但是您就不能再更換語言。</p> "
-+"<p>您可以將 IMAP 儲存資料夾的語言設定為您自己使用的語言。</p> <p>請注意，通常"
-+"這樣做的目的只是為了跟 Microsoft Outlook 相容，但是您就不能再更換語言。</p> "
- "<p>除非必要，請不要設定。</p>"
- 
- #. i18n: file kmail.kcfg line 258
-@@ -11272,9 +11258,10 @@
- #: rc.cpp:739
- #, no-c-format
- msgid ""
--"This can be used to restrict the number of connections per host while checking "
--"for new mail. By default the number of connections is unlimited (0)."
--msgstr "這可以用於設定檢查新郵件時每個主機最多可以幾個連結。預設是 0，也就是不限制。"
-+"This can be used to restrict the number of connections per host while "
-+"checking for new mail. By default the number of connections is unlimited (0)."
-+msgstr ""
-+"這可以用於設定檢查新郵件時每個主機最多可以幾個連結。預設是 0，也就是不限制。"
- 
- #. i18n: file kmail.kcfg line 292
- #: rc.cpp:742
-@@ -11287,7 +11274,8 @@
- #, no-c-format
- msgid ""
- "This option enables or disables the search line edit above the message list "
--"which can be used to quickly search the information shown in the message list."
-+"which can be used to quickly search the information shown in the message "
-+"list."
- msgstr "這個選項決定要不要在信件上方顯示搜尋工具列。"
- 
- #. i18n: file kmail.kcfg line 297
-@@ -11332,19 +11320,19 @@
- #: rc.cpp:766
- #, no-c-format
- msgid ""
--"Remember this identity, so that it will be used in future composer windows as "
--"well.\n"
-+"Remember this identity, so that it will be used in future composer windows "
-+"as well.\n"
- "        "
- msgstr ""
--"記住這個身份，可以用於以後發信時。\n"
-+"記住這個身分，可以用於以後發信時。\n"
- "        "
- 
- #. i18n: file kmail.kcfg line 329
- #: rc.cpp:770
- #, no-c-format
- msgid ""
--"Remember this folder for sent items, so that it will be used in future composer "
--"windows as well."
-+"Remember this folder for sent items, so that it will be used in future "
-+"composer windows as well."
- msgstr "記住這個資料夾，以後發信時可以使用。"
- 
- #. i18n: file kmail.kcfg line 333
-@@ -11359,7 +11347,7 @@
- #: rc.cpp:776
- #, no-c-format
- msgid "Word &wrap at column:"
--msgstr "自動換行在欄位(&W)："
-+msgstr "自動換列在欄位(&W)："
- 
- #. i18n: file kmail.kcfg line 360
- #: rc.cpp:785
-@@ -11379,16 +11367,14 @@
- #: rc.cpp:794
- #, no-c-format
- msgid ""
--"<qt>"
--"<p>Enable this option if you want KMail to request Message Disposition "
--"Notifications (MDNs) for each of your outgoing messages.</p>"
--"<p>This option only affects the default; you can still enable or disable MDN "
--"requesting on a per-message basis in the composer, menu item <em>Options</em>->"
--"<em>Request Disposition Notification</em>.</p></qt>"
--msgstr ""
--"<qt>"
--"<p>開啟這個選項，KMail 會將您送出的信件都附上回覆信件處理通知的要求。</p>"
--"<p>您可以針對個別信件關掉此選項。</p></qt>"
-+"<qt><p>Enable this option if you want KMail to request Message Disposition "
-+"Notifications (MDNs) for each of your outgoing messages.</p><p>This option "
-+"only affects the default; you can still enable or disable MDN requesting on "
-+"a per-message basis in the composer, menu item <em>Options</em>-><em>Request "
-+"Disposition Notification</em>.</p></qt>"
-+msgstr ""
-+"<qt><p>開啟這個選項，KMail 會將您送出的信件都附上回覆信件處理通知的要求。</"
-+"p><p>您可以針對個別信件關掉此選項。</p></qt>"
- 
- #. i18n: file kmail.kcfg line 391
- #: rc.cpp:797
-@@ -11400,8 +11386,8 @@
- #: rc.cpp:800
- #, no-c-format
- msgid ""
--"Disable this option if you do not want recently used addresses to appear in the "
--"autocompletion list in the composer's address fields."
-+"Disable this option if you do not want recently used addresses to appear in "
-+"the autocompletion list in the composer's address fields."
- msgstr "如果您不要讓系統自動補上最近使用的位址，就關掉這個選項。"
- 
- #. i18n: file kmail.kcfg line 413
-@@ -11414,10 +11400,12 @@
- #: rc.cpp:806
- #, no-c-format
- msgid ""
--"A backup copy of the text in the composer window can be created regularly. The "
--"interval used to create the backups is set here. You can disable autosaving by "
--"setting it to the value 0."
--msgstr "在編寫新信時，系統會自動儲存備份。您可以設定要多久儲存一次。要關掉這個功能，請設定為 0。"
-+"A backup copy of the text in the composer window can be created regularly. "
-+"The interval used to create the backups is set here. You can disable "
-+"autosaving by setting it to the value 0."
-+msgstr ""
-+"在編寫新信時，系統會自動儲存備份。您可以設定要多久儲存一次。要關掉這個功能，"
-+"請設定為 0。"
- 
- #. i18n: file kmail.kcfg line 418
- #: rc.cpp:809
-@@ -11475,13 +11463,14 @@
- #: rc.cpp:835
- #, no-c-format
- msgid "Maximum number of recipient editor lines."
--msgstr "收件者編輯器最大行數"
-+msgstr "收件者編輯器最大列數"
- 
- #. i18n: file kmail.kcfg line 474
- #: rc.cpp:838
- #, no-c-format
- msgid ""
--"List of message part types to strip off mails that are being forwarded inline."
-+"List of message part types to strip off mails that are being forwarded "
-+"inline."
- msgstr "用於除去被內含轉寄信件的部件型態清單。"
- 
- #. i18n: file kmail.kcfg line 478
-@@ -11510,12 +11499,13 @@
- msgid ""
- "Some emails, especially those generated automatically, do not specify the "
- "character encoding which needs to be used to properly display them. In such "
--"cases a fallback character encoding will be used, which you can configure here. "
--"Set it to the character encoding most commonly used in your part of the world. "
--"As a default the encoding configured for the whole system is used."
--msgstr ""
--"有些信件，特別是那些自動產生的信件，不會指定使用的字元集。這種狀況下，系統會使用您所設定的「最後的字元集」。您可以將它設定為在您那裡人們最常使用的字元集。預設的"
--"是您的系統所使用的字元集。"
-+"cases a fallback character encoding will be used, which you can configure "
-+"here. Set it to the character encoding most commonly used in your part of "
-+"the world. As a default the encoding configured for the whole system is used."
-+msgstr ""
-+"有些信件，特別是那些自動產生的信件，不會指定使用的字元集。這種狀況下，系統會"
-+"使用您所設定的「最後的字元集」。您可以將它設定為在您那裡人們最常使用的字元"
-+"集。預設的是您的系統所使用的字元集。"
- 
- #. i18n: file kmail.kcfg line 536
- #: rc.cpp:853
-@@ -11523,7 +11513,9 @@
- msgid ""
- "Changing this from its default 'Auto' will force the use of the specified "
- "encoding for all emails, regardless of what they specify themselves."
--msgstr "改變這個選項不使用「自動」的話，系統會不管信件中的指示，使用您所設定的字元集。"
-+msgstr ""
-+"改變這個選項不使用「自動」的話，系統會不管信件中的指示，使用您所設定的字元"
-+"集。"
- 
- #. i18n: file kmail.kcfg line 542
- #: rc.cpp:859
-@@ -11537,8 +11529,8 @@
- #: rc.cpp:865
- #, no-c-format
- msgid ""
--"Enable this option to show different levels of quoted text. Disable to hide the "
--"levels of quoted text."
-+"Enable this option to show different levels of quoted text. Disable to hide "
-+"the levels of quoted text."
- msgstr "如果您要顯示出不同的引言層次，請打開這個選項。"
- 
- #. i18n: file kmail.kcfg line 550
-@@ -11571,7 +11563,8 @@
- msgid ""
- "Enable this option to get the User-Agent and X-Mailer header lines displayed "
- "when using fancy headers."
--msgstr "開啟此選項可以用花俏格式顯示使用者代理程式（User-Agent）與 X-Mailer 欄位。"
-+msgstr ""
-+"開啟此選項可以用花俏格式顯示使用者代理程式（User-Agent）與 X-Mailer 欄位。"
- 
- #. i18n: file kmail.kcfg line 576
- #: rc.cpp:883
-@@ -11602,9 +11595,11 @@
- #, no-c-format
- msgid ""
- "Send Message Disposition Notifications with an empty sender string. Some "
--"servers might be configure to reject such messages, so if you are experiencing "
--"problems sending MDNs, uncheck this option."
--msgstr "送出信件處理通知時，將寄件者欄位清空。有些伺服器會拒絕這樣的信件處理通知，所以如果您在送出通知時遇到問題，試著將這個選項關閉。"
-+"servers might be configure to reject such messages, so if you are "
-+"experiencing problems sending MDNs, uncheck this option."
-+msgstr ""
-+"送出信件處理通知時，將寄件者欄位清空。有些伺服器會拒絕這樣的信件處理通知，所"
-+"以如果您在送出通知時遇到問題，試著將這個選項關閉。"
- 
- #. i18n: file kmail.kcfg line 606
- #: rc.cpp:898
-@@ -11660,7 +11655,9 @@
- msgid ""
- "Allow users to upload out-of-office sieve scripts, but disallow them changin "
- "any settings, such as the domain to react to and the spam reaction switch."
--msgstr "允許使用者上傳「不在辦公室」的文稿，但不允許變更任何設定，如要回應的網域或是垃圾信件的處理等等。"
-+msgstr ""
-+"允許使用者上傳「不在辦公室」的文稿，但不允許變更任何設定，如要回應的網域或是"
-+"垃圾信件的處理等等。"
- 
- #. i18n: file kmail.kcfg line 648
- #: rc.cpp:925
-@@ -11678,8 +11675,8 @@
- #: rc.cpp:931
- #, no-c-format
- msgid ""
--"Check if there is still an active out-of-office reply configured when starting "
--"KMail."
-+"Check if there is still an active out-of-office reply configured when "
-+"starting KMail."
- msgstr "啟動 KMail 時檢查是否有設定「不在辦公室」的自動回覆。"
- 
- #: recipientseditor.cpp:100
-@@ -11720,7 +11717,7 @@
- 
- #: recipientseditor.cpp:766
- msgid "Save List..."
--msgstr "儲存清單..."
-+msgstr "儲存清單…"
- 
- #: recipientseditor.cpp:772
- msgid "Save recipients as distribution list"
-@@ -11728,7 +11725,7 @@
- 
- #: recipientseditor.cpp:774
- msgid "Se&lect..."
--msgstr "選擇(&L)..."
-+msgstr "選擇(&L)…"
- 
- #: recipientseditor.cpp:777
- msgid "Select recipients from address book"
-@@ -11808,10 +11805,10 @@
- 
- #: recipientspicker.cpp:784
- msgid ""
--"_n: You selected 1 recipient. The maximum supported number of recipients is %1. "
--"Please adapt the selection.\n"
--"You selected %n recipients. The maximum supported number of recipients is %1. "
--"Please adapt the selection."
-+"_n: You selected 1 recipient. The maximum supported number of recipients is %"
-+"1. Please adapt the selection.\n"
-+"You selected %n recipients. The maximum supported number of recipients is %"
-+"1. Please adapt the selection."
- msgstr "您選擇的 %n 個收件者，但最大只能容納 %1 個收件者。請修改。"
- 
- #: redirectdialog.cpp:57
-@@ -11828,8 +11825,8 @@
- 
- #: redirectdialog.cpp:73
- msgid ""
--"This button opens a separate dialog where you can select recipients out of all "
--"available addresses."
-+"This button opens a separate dialog where you can select recipients out of "
-+"all available addresses."
- msgstr "這個按鍵會另外開啟一個對話框，讓您選擇收件者的地址。"
- 
- #: redirectdialog.cpp:107
-@@ -11842,7 +11839,7 @@
- 
- #: regexplineedit.cpp:83
- msgid "Edit..."
--msgstr "編輯..."
-+msgstr "編輯…"
- 
- #: renamejob.cpp:169
- msgid "Error while renaming a folder."
-@@ -11934,9 +11931,12 @@
- 
- #: searchjob.cpp:253
- msgid ""
--"To execute your search all messages of the folder %1 have to be downloaded from "
--"the server. This may take some time. Do you want to continue your search?"
--msgstr "要執行搜尋，所有資料夾 %1 內的信件都必須從伺服器上下載下來。這可能會花一些時間，您確定要繼續嗎？"
-+"To execute your search all messages of the folder %1 have to be downloaded "
-+"from the server. This may take some time. Do you want to continue your "
-+"search?"
-+msgstr ""
-+"要執行搜尋，所有資料夾 %1 內的信件都必須從伺服器上下載下來。這可能會花一些時"
-+"間，您確定要繼續嗎？"
- 
- #: searchjob.cpp:257
- msgid "Continue Search"
-@@ -11988,7 +11988,7 @@
- 
- #: searchwindow.cpp:274
- msgid "AMiddleLengthText..."
--msgstr "一個中等長度文字..."
-+msgstr "一個中等長度文字…"
- 
- #: searchwindow.cpp:275
- msgid "Ready."
-@@ -12072,16 +12072,12 @@
- "\n"
- 
- #: sievedebugdialog.cpp:230
--msgid ""
--"Collecting data for account '%1'...\n"
--msgstr ""
--"收集帳號 %1 的資料中...\n"
-+msgid "Collecting data for account '%1'...\n"
-+msgstr "收集帳號 %1 的資料中…\n"
- 
- #: sievedebugdialog.cpp:231
--msgid ""
--"------------------------------------------------------------\n"
--msgstr ""
--"------------------------------------------------------------\n"
-+msgid "------------------------------------------------------------\n"
-+msgstr "------------------------------------------------------------\n"
- 
- #: sievedebugdialog.cpp:239
- msgid ""
-@@ -12100,10 +12096,8 @@
- "\n"
- 
- #: sievedebugdialog.cpp:286
--msgid ""
--"Contents of script '%1':\n"
--msgstr ""
--"過濾器 %1 的內容：\n"
-+msgid "Contents of script '%1':\n"
-+msgstr "過濾器 %1 的內容：\n"
- 
- #: sievedebugdialog.cpp:321
- msgid ""
-@@ -12126,20 +12120,16 @@
- "\n"
- 
- #: sievedebugdialog.cpp:342
--msgid ""
--"Sieve capabilities:\n"
--msgstr ""
--"過濾器容量：\n"
-+msgid "Sieve capabilities:\n"
-+msgstr "過濾器容量：\n"
- 
- #: sievedebugdialog.cpp:346
- msgid "(No special capabilities available)"
- msgstr "（沒有特定的容量）"
- 
- #: sievedebugdialog.cpp:355
--msgid ""
--"Available Sieve scripts:\n"
--msgstr ""
--"可用的過濾器：\n"
-+msgid "Available Sieve scripts:\n"
-+msgstr "可用的過濾器：\n"
- 
- #: sievedebugdialog.cpp:359
- msgid ""
-@@ -12181,7 +12171,7 @@
- msgid ""
- "Check this box if you want KMail to append a signature to mails written with "
- "this identity."
--msgstr "如果您要在信件尾端附上這個身份的簽名檔，請打開此選項。"
-+msgstr "如果您要在信件尾端附上這個身分的簽名檔，請打開此選項。"
- 
- #: signatureconfigurator.cpp:68 xfaceconfigurator.cpp:112
- msgid "Click on the widgets below to obtain help on the input methods."
-@@ -12215,9 +12205,10 @@
- 
- #: signatureconfigurator.cpp:122
- msgid ""
--"Use this requester to specify a text file that contains your signature. It will "
--"be read every time you create a new mail or append a new signature."
--msgstr "這裡可以指定您要使用的簽名檔。每次開啟新信件或附加簽名時就會去讀取這個檔案。"
-+"Use this requester to specify a text file that contains your signature. It "
-+"will be read every time you create a new mail or append a new signature."
-+msgstr ""
-+"這裡可以指定您要使用的簽名檔。每次開啟新信件或附加簽名時就會去讀取這個檔案。"
- 
- #: signatureconfigurator.cpp:126
- msgid "S&pecify file:"
-@@ -12233,13 +12224,14 @@
- 
- #: signatureconfigurator.cpp:149
- msgid ""
--"You can add an arbitrary command here, either with or without path depending on "
--"whether or not the command is in your Path. For every new mail, KMail will "
--"execute the command and use what it outputs (to standard output) as a "
--"signature. Usual commands for use with this mechanism are \"fortune\" or \"ksig "
--"-random\"."
-+"You can add an arbitrary command here, either with or without path depending "
-+"on whether or not the command is in your Path. For every new mail, KMail "
-+"will execute the command and use what it outputs (to standard output) as a "
-+"signature. Usual commands for use with this mechanism are \"fortune\" or "
-+"\"ksig -random\"."
- msgstr ""
--"您可以在這裡指定命令，並請注意命令是否在您所設定的執行路徑上。每次編寫新信件時，系統都會執行此命令，並將其送至標準輸出的內容做為簽名檔。通常這可以搭配 "
-+"您可以在這裡指定命令，並請注意命令是否在您所設定的執行路徑上。每次編寫新信件"
-+"時，系統都會執行此命令，並將其送至標準輸出的內容做為簽名檔。通常這可以搭配 "
- "fortune 或 ksig-random 等小程式使用。"
- 
- #: signatureconfigurator.cpp:155
-@@ -12285,11 +12277,11 @@
- 
- #: snippetwidget.cpp:545
- msgid "Edit &group..."
--msgstr "編輯群組(&G)..."
-+msgstr "編輯群組(&G)…"
- 
- #: snippetwidget.cpp:548
- msgid "&Edit..."
--msgstr "編輯(&E)..."
-+msgstr "編輯(&E)…"
- 
- #: snippetwidget.cpp:553
- msgid "Text Snippets"
-@@ -12297,11 +12289,11 @@
- 
- #: snippetwidget.cpp:555
- msgid "&Add Snippet..."
--msgstr "新增片段(&A)..."
-+msgstr "新增片段(&A)…"
- 
- #: snippetwidget.cpp:556
- msgid "Add G&roup..."
--msgstr "新增群組(&R)..."
-+msgstr "新增群組(&R)…"
- 
- #: snippetwidget.cpp:589
- msgid "Please enter the value for <b>%1</b>:"
-@@ -12323,10 +12315,12 @@
- 
- #: snippetwidget.cpp:702 snippetwidget.cpp:819
- msgid ""
--"If you enable this option, the value entered to the right will be saved. If you "
--"use the same variable later, even in another snippet, the value entered to the "
--"right will be the default value for that variable."
--msgstr "如果開啟此選項，則輸入的會儲存為預設值。稍後使用同一個變數時，預設使用此值，即使是在不同的片段中。"
-+"If you enable this option, the value entered to the right will be saved. If "
-+"you use the same variable later, even in another snippet, the value entered "
-+"to the right will be the default value for that variable."
-+msgstr ""
-+"如果開啟此選項，則輸入的會儲存為預設值。稍後使用同一個變數時，預設使用此值，"
-+"即使是在不同的片段中。"
- 
- #: snippetwidget.cpp:802
- msgid "Enter the replacement values for %1:"
-@@ -12384,49 +12378,45 @@
- 
- #: templatesconfiguration.cpp:70
- msgid ""
--"<qt>"
--"<p>Here you can create message templates to use when you compose new messages "
--"or replies, or when you forward messages.</p>"
--"<p>The message templates support substitution commands by simple typing them or "
--"selecting them from menu <i>Insert command</i>.</p>"
--"<p>Templates specified here are folder-specific. They override both global "
--"templates and per-identity templates if they are specified.</p></qt>"
--msgstr ""
--"<qt>"
--"<p>您可以在此建立用於編寫、回覆與轉寄信件時的信件樣本。</p> "
--"<p>信件樣本支援替代指令，只要輸入或從選單中選取<i>插入指令</i>即可。</p> "
--"<p>在此指定的樣本以儲存資料夾為主。若額外指定也可以覆寫全域樣本及每個身份個別指定的樣本。</p></qt>"
-+"<qt><p>Here you can create message templates to use when you compose new "
-+"messages or replies, or when you forward messages.</p><p>The message "
-+"templates support substitution commands by simple typing them or selecting "
-+"them from menu <i>Insert command</i>.</p><p>Templates specified here are "
-+"folder-specific. They override both global templates and per-identity "
-+"templates if they are specified.</p></qt>"
-+msgstr ""
-+"<qt><p>您可以在此建立用於編寫、回覆與轉寄信件時的信件樣本。</p> <p>信件樣本支"
-+"援替代指令，只要輸入或從選單中選取<i>插入指令</i>即可。</p> <p>在此指定的樣本"
-+"以儲存資料夾為主。若額外指定也可以覆寫全域樣本及每個身分個別指定的樣本。</"
-+"p></qt>"
- 
- #: templatesconfiguration.cpp:82
- msgid ""
--"<qt>"
--"<p>Here you can create message templates to use when you compose new messages "
--"or replies, or when you forward messages.</p>"
--"<p>The message templates support substitution commands by simple typing them or "
--"selecting them from menu <i>Insert command</i>.</p>"
--"<p>Templates specified here are mail identity-wide. They override global "
--"templates and are being overridden by per-folder templates if they are "
--"specified.</p></qt>"
--msgstr ""
--"<qt>"
--"<p>您可以在此建立用於編寫、回覆與轉寄信件時的信件樣本。</p> "
--"<p>信件樣本支援替代指令，只要輸入或從選單中選取<i>插入指令</i>即可。</p> "
--"<p>在此指定的樣本以個別身份為主。這些樣本會覆寫全域樣本，若額外指定也可以覆寫資料夾中的樣本。</p></qt>"
-+"<qt><p>Here you can create message templates to use when you compose new "
-+"messages or replies, or when you forward messages.</p><p>The message "
-+"templates support substitution commands by simple typing them or selecting "
-+"them from menu <i>Insert command</i>.</p><p>Templates specified here are "
-+"mail identity-wide. They override global templates and are being overridden "
-+"by per-folder templates if they are specified.</p></qt>"
-+msgstr ""
-+"<qt><p>您可以在此建立用於編寫、回覆與轉寄信件時的信件樣本。</p> <p>信件樣本支"
-+"援替代指令，只要輸入或從選單中選取<i>插入指令</i>即可。</p> <p>在此指定的樣本"
-+"以個別身分為主。這些樣本會覆寫全域樣本，若額外指定也可以覆寫資料夾中的樣本。"
-+"</p></qt>"
- 
- #: templatesconfiguration.cpp:94
- msgid ""
--"<qt>"
--"<p>Here you can create message templates to use when you compose new messages "
--"or replies, or when you forward messages.</p>"
--"<p>The message templates support substitution commands by simple typing them or "
--"selecting them from menu <i>Insert command</i>.</p>"
--"<p>This is a global (default) template. They can be overridden by per-identity "
--"templates and by per-folder templates if they are specified.</p></qt>"
--msgstr ""
--"<qt>"
--"<p>您可以在此建立用於編寫、回覆與轉寄信件時的信件樣本。</p> "
--"<p>信件樣本支援替代指令，只要輸入或從選單中選取<i>插入指令</i>即可。</p> "
--"<p>在此指定的樣本以全域（預設）樣本為主。若額外指定，則會被每個身份個別指定的樣本及資料夾中的樣本覆寫。</p></qt>"
-+"<qt><p>Here you can create message templates to use when you compose new "
-+"messages or replies, or when you forward messages.</p><p>The message "
-+"templates support substitution commands by simple typing them or selecting "
-+"them from menu <i>Insert command</i>.</p><p>This is a global (default) "
-+"template. They can be overridden by per-identity templates and by per-folder "
-+"templates if they are specified.</p></qt>"
-+msgstr ""
-+"<qt><p>您可以在此建立用於編寫、回覆與轉寄信件時的信件樣本。</p> <p>信件樣本支"
-+"援替代指令，只要輸入或從選單中選取<i>插入指令</i>即可。</p> <p>在此指定的樣本"
-+"以全域（預設）樣本為主。若額外指定，則會被每個身分個別指定的樣本及資料夾中的"
-+"樣本覆寫。</p></qt>"
- 
- #: templatesconfiguration.cpp:343
- msgid ""
-@@ -12526,11 +12516,11 @@
- 
- #: templatesinsertcommand.cpp:37
- msgid "&Insert Command..."
--msgstr "插入命令(&I)..."
-+msgstr "插入命令(&I)…"
- 
- #: templatesinsertcommand.cpp:48
- msgid "Insert Command..."
--msgstr "插入命令..."
-+msgstr "插入命令…"
- 
- #: templatesinsertcommand.cpp:51
- msgid "Original Message"
-@@ -12700,15 +12690,13 @@
- msgid ""
- "<p>...that you can go to the next and previous message by using the\n"
- "right and left arrow keys respectively?</p>\n"
--msgstr ""
--"<p>您可以用右鍵跟左鍵來到下一封或前一封信嗎？</p>\n"
-+msgstr "<p>您可以用右鍵跟左鍵來到下一封或前一封信嗎？</p>\n"
- 
- #: tips.cpp:9
- msgid ""
- "<p>...that you can rapidly create filters on sender, recipient,\n"
- "subject and mailing lists with <em>Tools-&gt;Create&nbsp;Filter</em>?</p>\n"
--msgstr ""
--"<p>您可以用<em>工具->建立過濾器</em>來建立過濾規則嗎？</p>\n"
-+msgstr "<p>您可以用<em>工具->建立過濾器</em>來建立過濾規則嗎？</p>\n"
- 
- #: tips.cpp:15
- msgid ""
-@@ -12722,9 +12710,8 @@
- msgstr ""
- "<p>您可以利用<em>重寫標頭</em>過濾功能，\n"
- "來將郵件論壇的名稱從信件主題上丟掉嗎？\n"
--"只要"
--"<pre>重寫標頭 Subject，將 &quot;\\s*\\[mailing list name\\]\\s*&quot; 換成 "
--"&quot;&quot;</pre>即可。\n"
-+"只要<pre>重寫標頭 Subject，將 &quot;\\s*\\[mailing list name\\]\\s*&quot; 換"
-+"成 &quot;&quot;</pre>即可。\n"
- "</p>\n"
- 
- #: tips.cpp:26
-@@ -12733,7 +12720,8 @@
- "<em>Folder-&gt;Mailing List Management</em> dialog? You can then use\n"
- "<em>Message-&gt;New&nbsp;Message&nbsp;to&nbsp;Mailing&nbsp;List...</em>\n"
- "to open the composer with the mailing list address preset.\n"
--"Alternatively, you can click with the middle mouse button on the folder.</p>\n"
-+"Alternatively, you can click with the middle mouse button on the folder.</"
-+"p>\n"
- msgstr ""
- "<p>您可以用<em>郵件論壇管理員</em>來將資料夾與郵件論壇建立關聯嗎？\n"
- "您可以用「信件->張貼到信件論壇」功能來編寫新信，郵件地址會自動填入。\n"
-@@ -12754,15 +12742,16 @@
- "<p>This thwarts attempts to fake successful signature verification by\n"
- "sending HTML mails mimicking KMail's signature status frames.</p>\n"
- msgstr ""
--"<p>Kmail 可以對不同型態的信件（如純文字、HTML、OpenPGP 等）用不同顏色的光棒嗎？</p>\n"
--"<p>有些 HTML 信件中會含有假的 KMail 簽名確認狀態，使用這個功能可以清楚知道信件是不是經過確認。</p>\n"
-+"<p>Kmail 可以對不同型態的信件（如純文字、HTML、OpenPGP 等）用不同顏色的光棒"
-+"嗎？</p>\n"
-+"<p>有些 HTML 信件中會含有假的 KMail 簽名確認狀態，使用這個功能可以清楚知道信"
-+"件是不是經過確認。</p>\n"
- 
- #: tips.cpp:49
- msgid ""
- "<p>...that you can filter on any header by simply entering its name\n"
- "in the first edit field of a search rule?</p>\n"
--msgstr ""
--"<p>您可以在過濾規則中只輸入標頭名稱就可以進行過濾嗎？</p>\n"
-+msgstr "<p>您可以在過濾規則中只輸入標頭名稱就可以進行過濾嗎？</p>\n"
- 
- #: tips.cpp:55
- msgid ""
-@@ -12776,7 +12765,8 @@
- 
- #: tips.cpp:62
- msgid ""
--"<p>...that when replying, only the selected part of the message is quoted?</p>\n"
-+"<p>...that when replying, only the selected part of the message is quoted?</"
-+"p>\n"
- "<p>If nothing is selected, the full message is quoted.</p>\n"
- "<p>This even works with text of attachments when\n"
- "<em>View-&gt;Attachments-&gt;Inline</em> is selected.</p>\n"
-@@ -12786,8 +12776,7 @@
- msgstr ""
- "<p>回信的時候，只有被選擇的部份才會被引入信件嗎？</p>\n"
- "<p>若是都沒有選擇的話，整封信都會被引入。</p>\n"
--" "
--"<p>甚至使用直列式附件也可以這樣做。</p>\n"
-+" <p>甚至使用直列式附件也可以這樣做。</p>\n"
- "<p>除非您選擇<em>不要引言回覆</em>。</p>\n"
- "<p align=\"right\"><em>由 David F. Newman 提供</em></p>\n"
- 
-@@ -12919,7 +12908,7 @@
- 
- #: vacationdialog.cpp:76
- msgid "&Resend notification only after:"
--msgstr "在...之後重送通知(&R)："
-+msgstr "在…之後重送通知(&R)："
- 
- #: vacationdialog.cpp:82
- msgid "&Send responses for these addresses:"
-@@ -12959,12 +12948,12 @@
- 
- #: xfaceconfigurator.cpp:93
- msgid ""
--"Check this box if you want KMail to add a so-called X-Face header to messages "
--"written with this identity. An X-Face is a small (48x48 pixels) black and white "
--"image that some mail clients are able to display."
-+"Check this box if you want KMail to add a so-called X-Face header to "
-+"messages written with this identity. An X-Face is a small (48x48 pixels) "
-+"black and white image that some mail clients are able to display."
- msgstr ""
--"如果您要讓 KMail 在使用這個身份發信時加入一個 X-Face 標頭，您就勾選這個選項。X-Face 是一個 48x48 "
--"像素，黑白的圖片，可以讓收信軟體顯示。"
-+"如果您要讓 KMail 在使用這個身分發信時加入一個 X-Face 標頭，您就勾選這個選項。"
-+"X-Face 是一個 48x48 像素，黑白的圖片，可以讓收信軟體顯示。"
- 
- #: xfaceconfigurator.cpp:100
- msgid "This is a preview of the picture selected/entered below."
-@@ -12988,14 +12977,16 @@
- 
- #: xfaceconfigurator.cpp:147
- msgid "Select File..."
--msgstr "選擇檔案..."
-+msgstr "選擇檔案…"
- 
- #: xfaceconfigurator.cpp:149
- msgid ""
--"Use this to select an image file to create the picture from. The image should "
--"be of high contrast and nearly quadratic shape. A light background helps "
--"improve the result."
--msgstr "選擇您要產生圖片的圖像檔。這個檔案最好是高反差，並且是接近方形的。如果背景較亮更好。"
-+"Use this to select an image file to create the picture from. The image "
-+"should be of high contrast and nearly quadratic shape. A light background "
-+"helps improve the result."
-+msgstr ""
-+"選擇您要產生圖片的圖像檔。這個檔案最好是高反差，並且是接近方形的。如果背景較"
-+"亮更好。"
- 
- #: xfaceconfigurator.cpp:156
- msgid "Set From Address Book"
-@@ -13003,17 +12994,18 @@
- 
- #: xfaceconfigurator.cpp:158
- msgid ""
--"You can use a scaled-down version of the picture you have set in your address "
--"book entry."
-+"You can use a scaled-down version of the picture you have set in your "
-+"address book entry."
- msgstr "您可以用您設定在通訊錄中的圖片的縮小版。"
- 
- #: xfaceconfigurator.cpp:164
- msgid ""
--"<qt>KMail can send a small (48x48 pixels), low-quality, monochrome picture with "
--"every message. For example, this could be a picture of you or a glyph. It is "
--"shown in the recipient's mail client (if supported)."
-+"<qt>KMail can send a small (48x48 pixels), low-quality, monochrome picture "
-+"with every message. For example, this could be a picture of you or a glyph. "
-+"It is shown in the recipient's mail client (if supported)."
- msgstr ""
--"<qt>KMail 可以在每封信中附上一個 48x48 像素，低畫質，黑白的圖片。例如這可以是您的標誌。如果收件者使用的收信軟體有支援的話，就會顯示在上面。"
-+"<qt>KMail 可以在每封信中附上一個 48x48 像素，低畫質，黑白的圖片。例如這可以是"
-+"您的標誌。如果收件者使用的收信軟體有支援的話，就會顯示在上面。"
- 
- #: xfaceconfigurator.cpp:180
- msgid "Use this field to enter an arbitrary X-Face string."
-@@ -13021,12 +13013,11 @@
- 
- #: xfaceconfigurator.cpp:184
- msgid ""
--"Examples are available at <a href=\"http://www.xs4all.nl/~ace/X-Faces/\">"
--"http://www.xs4all.nl/~ace/X-Faces/</a>."
-+"Examples are available at <a href=\"http://www.xs4all.nl/~ace/X-Faces/"
-+"\">http://www.xs4all.nl/~ace/X-Faces/</a>."
- msgstr ""
--"範例在<a "
--"href=\"http://www.xs4all.nl/~ace/X-Faces/\">http://www.xs4all.nl/~ace/X-Faces/</"
--"a>。"
-+"範例在<a href=\"http://www.xs4all.nl/~ace/X-Faces/\">http://www.xs4all.nl/"
-+"~ace/X-Faces/</a>。"
- 
- #: xfaceconfigurator.cpp:248 xfaceconfigurator.cpp:257
- msgid "No picture set for your address book entry."
-@@ -13161,3 +13152,11 @@
- 
- #~ msgid "Op&en"
- #~ msgstr "開啟(&E)"
-+
-+#, fuzzy
-+#~ msgid "Always encr&ypt to self"
-+#~ msgstr "Nachrichten i&mmer auch mit eigenem Schlüssel verschlüsseln"
-+
-+#, fuzzy
-+#~ msgid "Show Audit Log"
-+#~ msgstr "Prüfprotokoll anzeigen"
-diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdepim/kmail_text_calendar_plugin.po kde-i18n-zh_TW-3.5.10/messages/kdepim/kmail_text_calendar_plugin.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdepim/kmail_text_calendar_plugin.po	2008-08-19 20:43:18.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdepim/kmail_text_calendar_plugin.po	2011-11-11 15:45:17.000000000 +0100
-@@ -7,7 +7,7 @@
- "Project-Id-Version: kmail_text_calendar_plugin\n"
- "POT-Creation-Date: 2008-08-19 01:19+0200\n"
- "PO-Revision-Date: 2008-02-04 08:45+0800\n"
--"Last-Translator: Franklin Weng <franklin at goodhorse dot idv dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Chinese Traditional <zh-l10n@linux.org.tw>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
-@@ -60,7 +60,7 @@
- 
- #: text_calendar.cpp:655
- msgid "Create a counter proposal..."
--msgstr "建立反提案..."
-+msgstr "建立反提案…"
- 
- #: text_calendar.cpp:657
- msgid "Throw mail away"
-@@ -72,7 +72,7 @@
- 
- #: text_calendar.cpp:664
- msgid "Check my calendar..."
--msgstr "檢查我的日曆..."
-+msgstr "檢查我的日曆…"
- 
- #: text_calendar.cpp:666
- msgid "Enter incidence into my calendar"
-diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdepim/kmail_text_vcard_plugin.po kde-i18n-zh_TW-3.5.10/messages/kdepim/kmail_text_vcard_plugin.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdepim/kmail_text_vcard_plugin.po	2006-07-22 10:04:31.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdepim/kmail_text_vcard_plugin.po	2011-11-11 15:45:17.000000000 +0100
-@@ -6,8 +6,7 @@
- "Project-Id-Version: kmail_text_vcard_plugin\n"
- "POT-Creation-Date: 2004-12-11 01:22+0100\n"
- "PO-Revision-Date: 2006-02-10 12:24+0800\n"
--"Last-Translator: Frank Weng (a.k.a. Franklin) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Traditional Chinese <zh_l10n@linux.org.tw>\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/kdepim/kmobile.po kde-i18n-zh_TW-3.5.10/messages/kdepim/kmobile.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdepim/kmobile.po	2006-07-22 10:04:31.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdepim/kmobile.po	2011-11-11 15:45:17.000000000 +0100
-@@ -6,8 +6,7 @@
- "Project-Id-Version: kmobile\n"
- "POT-Creation-Date: 2005-07-25 01:39+0200\n"
- "PO-Revision-Date: 2006-03-02 17:01+0800\n"
--"Last-Translator: Frank Weng (a.k.a. Franklin) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Traditional Chinese <zh_l10n@linux.org.tw>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
-@@ -28,11 +27,11 @@
- 
- #: kmobile.cpp:107
- msgid "&Add Device..."
--msgstr "新增裝置(&A)..."
-+msgstr "新增裝置(&A)…"
- 
- #: kmobile.cpp:109
- msgid "&Remove Device"
--msgstr "移除裝置(&R)..."
-+msgstr "移除裝置(&R)…"
- 
- #: kmobile.cpp:109
- msgid "Remove this device"
-@@ -40,11 +39,11 @@
- 
- #: kmobile.cpp:111
- msgid "Re&name Device..."
--msgstr "重命名裝置(&N)..."
-+msgstr "重命名裝置(&N)…"
- 
- #: kmobile.cpp:113
- msgid "&Configure Device..."
--msgstr "設定裝置(&C)..."
-+msgstr "設定裝置(&C)…"
- 
- #: kmobile.cpp:259
- msgid "Add New Mobile or Portable Device"
-@@ -56,7 +55,7 @@
- 
- #: kmobile.cpp:262
- msgid "&Scan for New Devices..."
--msgstr "掃描新裝置(&S)..."
-+msgstr "掃描新裝置(&S)…"
- 
- #: kmobile.cpp:266
- msgid "&Add"
-@@ -64,8 +63,8 @@
- 
- #: kmobile.cpp:330
- msgid ""
--"<qt>You have no mobile devices configured yet."
--"<p>Do you want to add a device now ?</qt>"
-+"<qt>You have no mobile devices configured yet.<p>Do you want to add a device "
-+"now ?</qt>"
- msgstr "<qt>您沒有設定任何的行動通訊裝置。 <p>您要新增一個裝置嗎？</qt>"
- 
- #: kmobile.cpp:332
-@@ -135,8 +134,8 @@
- #: kmobiledevice.cpp:395
- #, c-format
- msgid ""
--"Unable to read lockfile %s. Please check for reason and remove the lockfile by "
--"hand."
-+"Unable to read lockfile %s. Please check for reason and remove the lockfile "
-+"by hand."
- msgstr "無法讀取鎖定檔 %s。請檢查原因並手動移除鎖定檔。"
- 
- #: kmobiledevice.cpp:414
-diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdepim/knode.po kde-i18n-zh_TW-3.5.10/messages/kdepim/knode.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdepim/knode.po	2008-08-19 20:43:18.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdepim/knode.po	2011-11-11 15:45:17.000000000 +0100
-@@ -5,8 +5,7 @@
- "Project-Id-Version: knode\n"
- "POT-Creation-Date: 2008-07-22 01:18+0200\n"
- "PO-Revision-Date: 2006-06-19 10:34+0800\n"
--"Last-Translator: Frank Weng (a.k.a. Franklin) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Chinese Traditional <zh-l10n@linux.org.tw>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
-@@ -47,7 +46,7 @@
- 
- #: articlewidget.cpp:143
- msgid "F&ind in Article..."
--msgstr "在文章中尋找...(&I)"
-+msgstr "在文章中尋找…(&I)"
- 
- #: articlewidget.cpp:144
- msgid "&View Source"
-@@ -55,15 +54,15 @@
- 
- #: articlewidget.cpp:146
- msgid "&Followup to Newsgroup..."
--msgstr "回覆到新聞群組...(&F)"
-+msgstr "回覆到新聞群組…(&F)"
- 
- #: articlewidget.cpp:148
- msgid "Reply by E&mail..."
--msgstr "以電子郵件回覆...(&M)"
-+msgstr "以電子郵件回覆…(&M)"
- 
- #: articlewidget.cpp:150
- msgid "Forw&ard by Email..."
--msgstr "以電子郵件轉寄...(&A)"
-+msgstr "以電子郵件轉寄…(&A)"
- 
- #: articlewidget.cpp:152
- msgid ""
-@@ -157,7 +156,7 @@
- 
- #: articlewidget.cpp:215
- msgid "&Save Attachment As..."
--msgstr "附件另存新檔...(&S)"
-+msgstr "附件另存新檔…(&S)"
- 
- #: articlewidget.cpp:341
- msgid "Unable to load the article."
-@@ -173,23 +172,23 @@
- 
- #: articlewidget.cpp:460
- msgid ""
--"<br/><b>This article has the MIME type &quot;message/partial&quot;, which KNode "
--"cannot handle yet."
--"<br>Meanwhile you can save the article as a text file and reassemble it by "
--"hand.</b>"
-+"<br/><b>This article has the MIME type &quot;message/partial&quot;, which "
-+"KNode cannot handle yet.<br>Meanwhile you can save the article as a text "
-+"file and reassemble it by hand.</b>"
- msgstr ""
- "<br /><b>這篇文章有 KNode 無法處理的 MIME 型態 &quot;message/partial&quot;"
- "<br>您可以將此文章存成文字檔，並自行重新整理。</b>"
- 
- #: articlewidget.cpp:477
- msgid ""
--"<b>Note:</b> This is an HTML message. For security reasons, only the raw HTML "
--"code is shown. If you trust the sender of this message then you can activate "
--"formatted HTML display for this message <a href=\"knode:showHTML\">"
--"by clicking here</a>."
--msgstr ""
--"<b>注意：</b>這是一封 HTML 信件。因為安全考量，目前只顯示 HTML 原始碼。如果您確信來源沒有問題，您可以<a "
--"href=\"knode:showHTML\">按這裡</a>來顯示 HTML 格式的郵件。"
-+"<b>Note:</b> This is an HTML message. For security reasons, only the raw "
-+"HTML code is shown. If you trust the sender of this message then you can "
-+"activate formatted HTML display for this message <a href=\"knode:showHTML"
-+"\">by clicking here</a>."
-+msgstr ""
-+"<b>注意：</b>這是一封 HTML 信件。因為安全考量，目前只顯示 HTML 原始碼。如果您"
-+"確信來源沒有問題，您可以<a href=\"knode:showHTML\">按這裡</a>來顯示 HTML 格式"
-+"的郵件。"
- 
- #: articlewidget.cpp:523
- msgid "An error occurred."
-@@ -250,10 +249,8 @@
- msgstr "未命名的"
- 
- #: articlewidget.cpp:1024
--msgid ""
--"An error occurred while downloading the article source:\n"
--msgstr ""
--"下載文章來源時發生錯誤：\n"
-+msgid "An error occurred while downloading the article source:\n"
-+msgstr "下載文章來源時發生錯誤：\n"
- 
- #: articlewidget.cpp:1380 kncomposer.cpp:1218
- msgid "Select Charset"
-@@ -414,9 +411,8 @@
- 
- #: knarticlefactory.cpp:602 knarticlefactory.cpp:896
- msgid ""
--"<qt>The signature generator program produced the following output:"
--"<br>"
--"<br>%1</qt>"
-+"<qt>The signature generator program produced the following output:<br><br>%"
-+"1</qt>"
- msgstr "<qt>簽章產生程式產生了以下的輸出：<br> <br>%1</qt>"
- 
- #: knarticlefactory.cpp:628
-@@ -433,8 +429,8 @@
- 
- #: knarticlefactory.cpp:733
- msgid ""
--"You have aborted the posting of articles. The unsent articles are stored in the "
--"\"Outbox\" folder."
-+"You have aborted the posting of articles. The unsent articles are stored in "
-+"the \"Outbox\" folder."
- msgstr "您已經取消發表文章。未發表的文章將存放於寄件匣中。"
- 
- #: knarticlefactory.cpp:782
-@@ -447,13 +443,13 @@
- msgid ""
- "Please enter a valid email address at the identity tab of the account "
- "configuration dialog."
--msgstr "請在帳號設定對話框中的身份頁中輸入合法的電子郵件地址。"
-+msgstr "請在帳號設定對話框中的身分頁中輸入合法的電子郵件地址。"
- 
- #: knarticlefactory.cpp:828
- msgid ""
--"Please enter a valid email address at the identity section of the configuration "
--"dialog."
--msgstr "請在設定對話框中的身份設定輸入合法的電子郵件地址。"
-+"Please enter a valid email address at the identity section of the "
-+"configuration dialog."
-+msgstr "請在設定對話框中的身分設定輸入合法的電子郵件地址。"
- 
- #: knarticlefactory.cpp:916
- msgid "Emails cannot be canceled or superseded."
-@@ -567,7 +563,7 @@
- 
- #: knarticlemanager.cpp:189
- msgid " Creating list..."
--msgstr "產生列表中..."
-+msgstr "產生列表中…"
- 
- #: knarticlemanager.cpp:577 kngroup.cpp:428
- msgid "no subject"
-@@ -617,7 +613,7 @@
- 
- #: kncleanup.cpp:266
- msgid "Cleaning up. Please wait..."
--msgstr "正在清除，請稍待..."
-+msgstr "正在清除，請稍待…"
- 
- #: kncollectionview.cpp:43 knconfigwidgets.cpp:1515 kngroupbrowser.cpp:88
- msgid "Name"
-@@ -641,7 +637,7 @@
- 
- #: kncomposer.cpp:80
- msgid "Edit Recent Addresses..."
--msgstr "編輯最近的地址..."
-+msgstr "編輯最近的地址…"
- 
- #: kncomposer.cpp:208
- msgid "&Send Now"
-@@ -669,15 +665,15 @@
- 
- #: kncomposer.cpp:247
- msgid "&Insert File..."
--msgstr "插入檔案...(&I)"
-+msgstr "插入檔案…(&I)"
- 
- #: kncomposer.cpp:250
- msgid "Insert File (in a &box)..."
--msgstr "插入檔案到信箱...(&b)"
-+msgstr "插入檔案到信箱…(&B)"
- 
- #: kncomposer.cpp:253
- msgid "Attach &File..."
--msgstr "附加檔案...(&F)"
-+msgstr "附加檔案…(&F)"
- 
- #: kncomposer.cpp:256
- msgid "Sign Article with &PGP"
-@@ -705,7 +701,7 @@
- 
- #: kncomposer.cpp:284
- msgid "&Word Wrap"
--msgstr "自動換行(&W)"
-+msgstr "自動換列(&W)"
- 
- #: kncomposer.cpp:289
- msgid "Add &Quote Characters"
-@@ -725,7 +721,7 @@
- 
- #: kncomposer.cpp:301
- msgid "Get &Original Text (not re-wrapped)"
--msgstr "取得原始文字（未重新折行）(&O)"
-+msgstr "取得原始文字（未重新折列）(&O)"
- 
- #: kncomposer.cpp:305
- msgid "S&cramble (Rot 13)"
-@@ -857,7 +853,7 @@
- "Do you want to re-edit the article or send it anyway?"
- msgstr ""
- "您的簽名超過八行。\n"
--"您應該讓您的簽名短一點，最好控制在四行左右。\n"
-+"您應該讓您的簽名短一點，最好控制在四列左右。\n"
- "您要重新編輯文章，還是要送出？"
- 
- #: kncomposer.cpp:697
-@@ -865,7 +861,7 @@
- "Your signature exceeds the widely-accepted limit of 4 lines:\n"
- "please consider shortening your signature;\n"
- "otherwise, you will probably annoy your readers."
--msgstr "您的簽名超過了四行。請考慮縮短您的簽名檔，以免造成讀者困擾。"
-+msgstr "您的簽名超過了四列。請考慮縮短您的簽名檔，以免造成讀者困擾。"
- 
- #: kncomposer.cpp:717
- msgid ""
-@@ -873,7 +869,7 @@
- "please specify it in the global identity configuration,\n"
- "in the account properties or in the group properties.\n"
- "The article will be sent unsigned."
--msgstr "您尚未設定簽署用的金鑰。請在身份設定中指定。文章將不會被簽署。"
-+msgstr "您尚未設定簽署用的金鑰。請在身分設定中指定。文章將不會被簽署。"
- 
- #: kncomposer.cpp:724
- msgid "Send Unsigned"
-@@ -893,10 +889,12 @@
- 
- #: kncomposer.cpp:1167
- msgid ""
--"The poster does not want a mail copy of your reply (Mail-Copies-To: nobody);\n"
-+"The poster does not want a mail copy of your reply (Mail-Copies-To: "
-+"nobody);\n"
- "please respect their request."
- msgstr ""
--"此文章的發表者不希望收到您的回覆的電子郵件副本。（「發送郵件副本」標頭設定為 nobody）。\n"
-+"此文章的發表者不希望收到您的回覆的電子郵件副本。（「發送郵件副本」標頭設定為 "
-+"nobody）。\n"
- "請尊重他們的要求。"
- 
- #: kncomposer.cpp:1168
-@@ -989,7 +987,7 @@
- 
- #: kncomposer.cpp:1743
- msgid "&Browse..."
--msgstr "瀏覽...(&B)"
-+msgstr "瀏覽…(&B)"
- 
- #: kncomposer.cpp:1753
- msgid "&Groups:"
-@@ -1020,7 +1018,7 @@
- 
- #: kncomposer.cpp:1924
- msgid "A&dd..."
--msgstr "新增...(&D)"
-+msgstr "新增…(&D)"
- 
- #: kncomposer.cpp:2058
- msgid "Suggestions"
-@@ -1226,13 +1224,11 @@
- 
- #: knconfigwidgets.cpp:65
- msgid ""
--"<qt>"
--"<p>Your name as it will appear to others reading your articles.</p>"
--"<p>Ex: <b>John Stuart Masterson III</b>.</p></qt>"
--msgstr ""
--"<qt> "
--"<p>文章中顯示的您的名稱。</p> "
--"<p>例如：<b>John Stuart Masterson III</b>。</p></qt>"
-+"<qt><p>Your name as it will appear to others reading your articles.</"
-+"p><p>Ex: <b>John Stuart Masterson III</b>.</p></qt>"
-+msgstr ""
-+"<qt> <p>文章中顯示的您的名稱。</p> <p>例如：<b>John Stuart Masterson III</"
-+"b>。</p></qt>"
- 
- #: knconfigwidgets.cpp:72
- msgid "Organi&zation:"
-@@ -1240,9 +1236,8 @@
- 
- #: knconfigwidgets.cpp:75
- msgid ""
--"<qt>"
--"<p>The name of the organization you work for.</p>"
--"<p>Ex: <b>KNode, Inc</b>.</p></qt>"
-+"<qt><p>The name of the organization you work for.</p><p>Ex: <b>KNode, Inc</"
-+"b>.</p></qt>"
- msgstr "<qt> <p>您工作的單位名稱。</p> <p>例如：<b>KNode, Inc.</b>。</p></qt>"
- 
- #: knconfigwidgets.cpp:82
-@@ -1251,10 +1246,11 @@
- 
- #: knconfigwidgets.cpp:85
- msgid ""
--"<qt>"
--"<p>Your email address as it will appear to others reading your articles</p>"
--"<p>Ex: <b>nospam@please.com</b>.</qt>"
--msgstr "<qt> <p>文章中顯示的您的電子郵件地址。</p> <p>例如：<b>nospam@please.com</b>。</qt>"
-+"<qt><p>Your email address as it will appear to others reading your articles</"
-+"p><p>Ex: <b>nospam@please.com</b>.</qt>"
-+msgstr ""
-+"<qt> <p>文章中顯示的您的電子郵件地址。</p> <p>例如：<b>nospam@please.com</"
-+"b>。</qt>"
- 
- #: knconfigwidgets.cpp:92
- msgid "&Reply-to address:"
-@@ -1262,15 +1258,13 @@
- 
- #: knconfigwidgets.cpp:95
- msgid ""
--"<qt>"
--"<p>When someone reply to your article by email, this is the address the message "
--"will be sent. If you fill in this field, please do it with a real email "
--"address.</p>"
--"<p>Ex: <b>john@example.com</b>.</p></qt>"
--msgstr ""
--"<qt> "
--"<p>當有人要使用電子郵件回覆您的文章時，會回到這裡所設定的地址。所以如果您要填寫此欄位，請填實際可用的地址。</p> "
--"<p>例如：<b>john@example.com</b>。</p></qt>"
-+"<qt><p>When someone reply to your article by email, this is the address the "
-+"message will be sent. If you fill in this field, please do it with a real "
-+"email address.</p><p>Ex: <b>john@example.com</b>.</p></qt>"
-+msgstr ""
-+"<qt> <p>當有人要使用電子郵件回覆您的文章時，會回到這裡所設定的地址。所以如果"
-+"您要填寫此欄位，請填實際可用的地址。</p> <p>例如：<b>john@example.com</b>。</"
-+"p></qt>"
- 
- #: knconfigwidgets.cpp:103
- msgid "&Mail-copies-to:"
-@@ -1294,8 +1288,8 @@
- 
- #: knconfigwidgets.cpp:116
- msgid ""
--"<qt>"
--"<p>The OpenPGP key you choose here will be used to sign your articles.</p></qt>"
-+"<qt><p>The OpenPGP key you choose here will be used to sign your articles.</"
-+"p></qt>"
- msgstr "<qt> <p>您所選擇的 OpenPGP 金鑰將用於簽署您的文章。</p></qt>"
- 
- #: knconfigwidgets.cpp:128
-@@ -1312,14 +1306,14 @@
- 
- #: knconfigwidgets.cpp:140
- msgid ""
--"<qt>"
--"<p>The file from which the signature will be read.</p>"
--"<p>Ex: <b>/home/robt/.sig</b>.</p></qt>"
--msgstr "<qt> <p>就是簽名檔啊。</p> <p>例如：<b>/home/robt/.signature</b>。</p></qt>"
-+"<qt><p>The file from which the signature will be read.</p><p>Ex: <b>/home/"
-+"robt/.sig</b>.</p></qt>"
-+msgstr ""
-+"<qt> <p>就是簽名檔啊。</p> <p>例如：<b>/home/robt/.signature</b>。</p></qt>"
- 
- #: knconfigwidgets.cpp:145 knconfigwidgets.cpp:2235
- msgid "Choo&se..."
--msgstr "選擇...(&S)"
-+msgstr "選擇…(&S)"
- 
- #: knconfigwidgets.cpp:149
- msgid "&Edit File"
-@@ -1331,13 +1325,11 @@
- 
- #: knconfigwidgets.cpp:156
- msgid ""
--"<qt>"
--"<p>Mark this option if the signature will be generated by a program</p>"
--"<p>Ex: <b>/home/robt/gensig.sh</b>.</p></qt>"
--msgstr ""
--"<qt> "
--"<p>如果您選取的檔案為一支產生簽名輸出的程式，則請選取此項。</p> "
--"<p>例如：<b>/home/robot/gensig.sh</b>。</p></qt>"
-+"<qt><p>Mark this option if the signature will be generated by a program</"
-+"p><p>Ex: <b>/home/robt/gensig.sh</b>.</p></qt>"
-+msgstr ""
-+"<qt> <p>如果您選取的檔案為一支產生簽名輸出的程式，則請選取此項。</p> <p>例"
-+"如：<b>/home/robot/gensig.sh</b>。</p></qt>"
- 
- #: knconfigwidgets.cpp:161
- msgid "Specify signature &below"
-@@ -1358,18 +1350,18 @@
- #: knconfigwidgets.cpp:304 knconfigwidgets.cpp:1319 knconfigwidgets.cpp:1665
- #: knconfigwidgets.cpp:1987
- msgid "&Add..."
--msgstr "新增...(&A)"
-+msgstr "新增…(&A)"
- 
- #: knconfigwidgets.cpp:308 knconfigwidgets.cpp:1327 knconfigwidgets.cpp:1669
- #: knconfigwidgets.cpp:1995
- msgid ""
- "_: modify something\n"
- "&Edit..."
--msgstr "編輯...(&E)"
-+msgstr "編輯…(&E)"
- 
- #: knconfigwidgets.cpp:316
- msgid "&Subscribe..."
--msgstr "訂閱...(&S)"
-+msgstr "訂閱…(&S)"
- 
- #: knconfigwidgets.cpp:398
- #, c-format
-@@ -1462,7 +1454,7 @@
- 
- #: knconfigwidgets.cpp:552 kngrouppropdlg.cpp:145
- msgid "&Identity"
--msgstr "身份(&I)"
-+msgstr "身分(&I)"
- 
- #: knconfigwidgets.cpp:555 kngrouppropdlg.cpp:148
- msgid "&Cleanup"
-@@ -1480,7 +1472,7 @@
- 
- #: knconfigwidgets.cpp:831
- msgid "Cha&nge..."
--msgstr "改變...(&N)"
-+msgstr "改變…(&N)"
- 
- #: knconfigwidgets.cpp:841
- msgid "Use custom &fonts"
-@@ -1488,7 +1480,7 @@
- 
- #: knconfigwidgets.cpp:845
- msgid "Chang&e..."
--msgstr "改變...(&E)"
-+msgstr "改變…(&E)"
- 
- #: knconfigwidgets.cpp:998
- msgid "Article Handling"
-@@ -1532,7 +1524,7 @@
- 
- #: knconfigwidgets.cpp:1016
- msgid "Show &line count"
--msgstr "顯示文章行數(&L)"
-+msgstr "顯示文章列數(&L)"
- 
- #: knconfigwidgets.cpp:1017
- msgid "Show unread count in &thread"
-@@ -1588,7 +1580,7 @@
- 
- #: knconfigwidgets.cpp:1217
- msgid "Re&wrap text when necessary"
--msgstr "必要時做文字折行"
-+msgstr "必要時做文字折列"
- 
- #: knconfigwidgets.cpp:1218
- msgid "Re&move trailing empty lines"
-@@ -1692,7 +1684,7 @@
- 
- #: knconfigwidgets.cpp:1673
- msgid "Co&py..."
--msgstr "複製...(&P)"
-+msgstr "複製…(&P)"
- 
- #: knconfigwidgets.cpp:1684
- msgid "&Menu:"
-@@ -1752,9 +1744,11 @@
- 
- #: knconfigwidgets.cpp:1999
- msgid ""
--"<qt>Placeholders for replies: <b>%NAME</b>=sender's name, <b>%EMAIL</b>"
--"=sender's address</qt>"
--msgstr "<qt>回文之符號解釋：<b>%NAME</b>為發文者名稱，<b>%EMAIL</b>為發文者電子郵件地址。</qt>"
-+"<qt>Placeholders for replies: <b>%NAME</b>=sender's name, <b>%EMAIL</"
-+"b>=sender's address</qt>"
-+msgstr ""
-+"<qt>回文之符號解釋：<b>%NAME</b>為發文者名稱，<b>%EMAIL</b>為發文者電子郵件地"
-+"址。</qt>"
- 
- #: knconfigwidgets.cpp:2002
- msgid "Do not add the \"&User-Agent\" identification header"
-@@ -1762,7 +1756,7 @@
- 
- #: knconfigwidgets.cpp:2182
- msgid "Word &wrap at column:"
--msgstr "自動換行在欄位(&W)："
-+msgstr "自動換列在欄位(&W)："
- 
- #: knconfigwidgets.cpp:2190
- msgid "Appe&nd signature automatically"
-@@ -1783,11 +1777,12 @@
- "%L</b>=line break</qt>"
- msgstr ""
- "<qt>符號解釋：<b>%NAME</b>為發文者名稱，<b>%EMAIL</b>為發文者電子郵件地址，"
--"<br> <b>%DATE</b>為日期，<b>%MSID</b>為訊息代碼，<b>%GROUP</b>為群組名稱，<b>%L</b>為換行。</qt>"
-+"<br> <b>%DATE</b>為日期，<b>%MSID</b>為訊息代碼，<b>%GROUP</b>為群組名稱，<b>"
-+"%L</b>為換列。</qt>"
- 
- #: knconfigwidgets.cpp:2210
- msgid "Rewrap quoted te&xt automatically"
--msgstr "自動將引言文字折行(&X)"
-+msgstr "自動將引言文字折列(&X)"
- 
- #: knconfigwidgets.cpp:2214
- msgid "Include the a&uthor's signature"
-@@ -1875,19 +1870,19 @@
- 
- #: knconvert.cpp:57
- msgid "Start Conversion..."
--msgstr "開始談話..."
-+msgstr "開始談話…"
- 
- #: knconvert.cpp:72
- msgid ""
--"<b>Congratulations, you have upgraded to KNode version %1.</b>"
--"<br>Unfortunately this version uses a different format for some data-files, so "
--"in order to keep your existing data it is necessary to convert it first. This "
--"is now done automatically by KNode. If you want to, a backup of your existing "
--"data will be created before the conversion starts."
--msgstr ""
--"<b>恭喜您，您已經將 KNode 升級到版本 %1。</b>"
--"<br> 不過這個版本中某些資料檔使用了不同的格式。為了保留您之前的資料，我們必須先做轉換。這個轉換動作 KNode "
--"會自動進行。如果您有需要，可以選擇在轉換之前先進行資料備份。"
-+"<b>Congratulations, you have upgraded to KNode version %1.</"
-+"b><br>Unfortunately this version uses a different format for some data-"
-+"files, so in order to keep your existing data it is necessary to convert it "
-+"first. This is now done automatically by KNode. If you want to, a backup of "
-+"your existing data will be created before the conversion starts."
-+msgstr ""
-+"<b>恭喜您，您已經將 KNode 升級到版本 %1。</b><br> 不過這個版本中某些資料檔使"
-+"用了不同的格式。為了保留您之前的資料，我們必須先做轉換。這個轉換動作 KNode 會"
-+"自動進行。如果您有需要，可以選擇在轉換之前先進行資料備份。"
- 
- #: knconvert.cpp:79
- msgid "Create backup of old data"
-@@ -1899,7 +1894,7 @@
- 
- #: knconvert.cpp:98
- msgid "<b>Converting, please wait...</b>"
--msgstr "<br>轉換中，請稍待...</b>"
-+msgstr "<br>轉換中，請稍待…</b>"
- 
- #: knconvert.cpp:108
- msgid "Processed tasks:"
-@@ -1907,14 +1902,14 @@
- 
- #: knconvert.cpp:135
- msgid ""
--"<b>Some errors occurred during the conversion.</b>"
--"<br>You should now examine the log to find out what went wrong."
-+"<b>Some errors occurred during the conversion.</b><br>You should now examine "
-+"the log to find out what went wrong."
- msgstr "<b>轉換時發生一些錯誤。</b><br> 請您檢視一下紀錄檔以查明有哪些問題。"
- 
- #: knconvert.cpp:139
- msgid ""
--"<b>The conversion was successful.</b>"
--"<br>Have a lot of fun with this new version of KNode. ;-)"
-+"<b>The conversion was successful.</b><br>Have a lot of fun with this new "
-+"version of KNode. ;-)"
- msgstr "<b>轉換成功。</b> <br> 請繼續享用新版本的 KNode。:-)"
- 
- #: knconvert.cpp:142
-@@ -2032,7 +2027,7 @@
- msgid ""
- "_: collection of article headers\n"
- "Lines"
--msgstr "行數（Lines）"
-+msgstr "列數（Lines）"
- 
- #: kndisplayedheader.cpp:41
- msgid ""
-@@ -2238,7 +2233,7 @@
- 
- #: knfolder.cpp:196
- msgid " Loading folder..."
--msgstr "載入資料夾中..."
-+msgstr "載入資料夾中…"
- 
- #: knfoldermanager.cpp:44
- msgid "Local Folders"
-@@ -2270,11 +2265,11 @@
- 
- #: knfoldermanager.cpp:297
- msgid " Importing articles..."
--msgstr "正在匯入文章..."
-+msgstr "正在匯入文章…"
- 
- #: knfoldermanager.cpp:363
- msgid " Storing articles..."
--msgstr "正在儲存文章...."
-+msgstr "正在儲存文章…."
- 
- #: knfoldermanager.cpp:390
- msgid "Export Folder"
-@@ -2282,15 +2277,15 @@
- 
- #: knfoldermanager.cpp:394
- msgid " Exporting articles..."
--msgstr "正在匯出文章..."
-+msgstr "正在匯出文章…"
- 
- #: kngroup.cpp:907
- msgid " Scoring..."
--msgstr "正在註記分數..."
-+msgstr "正在註記分數…"
- 
- #: kngroup.cpp:954
- msgid " Reorganizing headers..."
--msgstr "重新組織標頭..."
-+msgstr "重新組織標頭…"
- 
- #: kngroup.cpp:1055
- #, c-format
-@@ -2315,7 +2310,7 @@
- 
- #: kngroupbrowser.cpp:67
- msgid "Loading groups..."
--msgstr "載入群組..."
-+msgstr "載入群組…"
- 
- #: kngroupbrowser.cpp:361
- msgid "Groups on %1: (%2 displayed)"
-@@ -2335,7 +2330,7 @@
- 
- #: kngroupdialog.cpp:38
- msgid "New &Groups..."
--msgstr "新增群組...(&G)"
-+msgstr "新增群組…(&G)"
- 
- #: kngroupdialog.cpp:40
- msgid "Current changes:"
-@@ -2360,7 +2355,7 @@
- 
- #: kngroupdialog.cpp:274
- msgid "Downloading groups..."
--msgstr "下載群組..."
-+msgstr "下載群組…"
- 
- #: kngroupdialog.cpp:285
- msgid "New Groups"
-@@ -2380,7 +2375,7 @@
- 
- #: kngroupdialog.cpp:318
- msgid "Checking for new groups..."
--msgstr "檢查新群組中..."
-+msgstr "檢查新群組中…"
- 
- #: kngroupmanager.cpp:411
- msgid ""
-@@ -2503,7 +2498,7 @@
- 
- #: knjobdata.cpp:131 knnetaccess.cpp:480
- msgid "Waiting..."
--msgstr "等待中..."
-+msgstr "等待中…"
- 
- #: knmainwidget.cpp:96
- msgid "Article Viewer"
-@@ -2523,8 +2518,8 @@
- 
- #: knmainwidget.cpp:166
- msgid ""
--"<b>Reset Quick Search</b>"
--"<br>Resets the quick search so that all messages are shown again."
-+"<b>Reset Quick Search</b><br>Resets the quick search so that all messages "
-+"are shown again."
- msgstr "<b>重置快速搜尋</b><br> 將快速搜尋重置，所有文章都會重新顯示。"
- 
- #: knmainwidget.cpp:170
-@@ -2609,7 +2604,7 @@
- 
- #: knmainwidget.cpp:602
- msgid "&Subscribe to Newsgroups..."
--msgstr "訂閱新聞群組...(&S)"
-+msgstr "訂閱新聞群組…(&S)"
- 
- #: knmainwidget.cpp:604
- msgid "&Expire All Groups"
-@@ -2629,7 +2624,7 @@
- 
- #: knmainwidget.cpp:612
- msgid "&Post to Newsgroup..."
--msgstr "發表到新聞群組...(&P)"
-+msgstr "發表到新聞群組…(&P)"
- 
- #: knmainwidget.cpp:616
- msgid "Group &Properties"
-@@ -2665,11 +2660,11 @@
- 
- #: knmainwidget.cpp:632
- msgid "Mark Last as Unr&ead..."
--msgstr "將最後一篇標為未讀...(&E)"
-+msgstr "將最後一篇標為未讀…(&E)"
- 
- #: knmainwidget.cpp:637
- msgid "&Configure KNode..."
--msgstr "設定 KNode(&C)..."
-+msgstr "設定 KNode(&C)…"
- 
- #: knmainwidget.cpp:643
- msgid "&New Folder"
-@@ -2701,11 +2696,11 @@
- 
- #: knmainwidget.cpp:657
- msgid "&Import MBox Folder..."
--msgstr "匯入 MBOX 資料夾...(&I)"
-+msgstr "匯入 MBOX 資料夾…(&I)"
- 
- #: knmainwidget.cpp:659
- msgid "E&xport as MBox Folder..."
--msgstr "匯出成 MBox 資料夾...(&X)"
-+msgstr "匯出成 MBox 資料夾…(&X)"
- 
- #: knmainwidget.cpp:663
- msgid "S&ort"
-@@ -2725,7 +2720,7 @@
- 
- #: knmainwidget.cpp:668
- msgid "By &Lines"
--msgstr "以行數(&L)"
-+msgstr "以列數(&L)"
- 
- #: knmainwidget.cpp:669
- msgid "By &Date"
-@@ -2745,7 +2740,7 @@
- 
- #: knmainwidget.cpp:681
- msgid "&Search Articles..."
--msgstr "搜尋文章...(&S)"
-+msgstr "搜尋文章…(&S)"
- 
- #: knmainwidget.cpp:683
- msgid "&Refresh List"
-@@ -2793,7 +2788,7 @@
- 
- #: knmainwidget.cpp:710
- msgid "&Edit Scoring Rules..."
--msgstr "編輯評分規則...(&E)"
-+msgstr "編輯評分規則…(&E)"
- 
- #: knmainwidget.cpp:712
- msgid "Recalculate &Scores"
-@@ -2801,11 +2796,11 @@
- 
- #: knmainwidget.cpp:714
- msgid "&Lower Score for Author..."
--msgstr "降低此作者分數...(&L)"
-+msgstr "降低此作者分數…(&L)"
- 
- #: knmainwidget.cpp:716
- msgid "&Raise Score for Author..."
--msgstr "提高此作者分數...(&R)"
-+msgstr "提高此作者分數…(&R)"
- 
- #: knmainwidget.cpp:718
- msgid "&Ignore Thread"
-@@ -2831,7 +2826,7 @@
- msgid ""
- "_: edit article\n"
- "&Edit Article..."
--msgstr "編輯文章...(&E)"
-+msgstr "編輯文章…(&E)"
- 
- #: knmainwidget.cpp:734
- msgid "Stop &Network"
-@@ -2839,7 +2834,7 @@
- 
- #: knmainwidget.cpp:738
- msgid "&Fetch Article with ID..."
--msgstr "以代碼抓取文章...(&F)"
-+msgstr "以代碼抓取文章…(&F)"
- 
- #: knmainwidget.cpp:742
- msgid "Show &Group View"
-@@ -2964,7 +2959,7 @@
- 
- #: knnetaccess.cpp:105
- msgid "Waiting for KWallet..."
--msgstr "等待 KWallet..."
-+msgstr "等待 KWallet…"
- 
- #: knnetaccess.cpp:314
- msgid ""
-@@ -2982,43 +2977,43 @@
- 
- #: knnetaccess.cpp:400
- msgid " Connecting to server..."
--msgstr "正在連接伺服器..."
-+msgstr "正在連接伺服器…"
- 
- #: knnetaccess.cpp:405
- msgid " Loading group list from disk..."
--msgstr "從磁碟中載入群組清單..."
-+msgstr "從磁碟中載入群組清單…"
- 
- #: knnetaccess.cpp:410
- msgid " Writing group list to disk..."
--msgstr "寫入群組清單到磁碟中..."
-+msgstr "寫入群組清單到磁碟中…"
- 
- #: knnetaccess.cpp:415
- msgid " Downloading group list..."
--msgstr "下載群組清單..."
-+msgstr "下載群組清單…"
- 
- #: knnetaccess.cpp:420
- msgid " Looking for new groups..."
--msgstr "尋找新群組..."
-+msgstr "尋找新群組…"
- 
- #: knnetaccess.cpp:425
- msgid " Downloading group descriptions..."
--msgstr "下載群組說明..."
-+msgstr "下載群組說明…"
- 
- #: knnetaccess.cpp:430
- msgid " Downloading new headers..."
--msgstr "下載新標頭..."
-+msgstr "下載新標頭…"
- 
- #: knnetaccess.cpp:435
- msgid " Sorting..."
--msgstr "排序中..."
-+msgstr "排序中…"
- 
- #: knnetaccess.cpp:440
- msgid " Downloading article..."
--msgstr "下載文章..."
-+msgstr "下載文章…"
- 
- #: knnetaccess.cpp:445
- msgid " Sending article..."
--msgstr "正在傳送文章..."
-+msgstr "正在傳送文章…"
- 
- #: knnntpclient.cpp:77 knnntpclient.cpp:316
- msgid "Unable to read the group list file"
-@@ -3079,15 +3074,12 @@
- 
- #: knnntpclient.cpp:483
- msgid ""
--"<br>"
--"<br>The article you requested is not available on your news server."
--"<br>You could try to get it from <a "
--"href=\"http://groups.google.com/groups?selm=%1\">groups.google.com</a>."
--msgstr ""
--"<br>"
--"<br>您要求的文章目前不存在於伺服器上。"
--"<br> 您可以試著從 <a href=\"http://groups.google.com/groups?selm=%1\">"
--"groups.google.com</a> 中抓取文章。"
-+"<br><br>The article you requested is not available on your news server."
-+"<br>You could try to get it from <a href=\"http://groups.google.com/groups?"
-+"selm=%1\">groups.google.com</a>."
-+msgstr ""
-+"<br><br>您要求的文章目前不存在於伺服器上。<br> 您可以試著從 <a href=\"http://"
-+"groups.google.com/groups?selm=%1\">groups.google.com</a> 中抓取文章。"
- 
- #: knnntpclient.cpp:575
- msgid ""
-@@ -3153,10 +3145,8 @@
- msgstr "連線已斷。"
- 
- #: knprotocolclient.cpp:472 knprotocolclient.cpp:534 knprotocolclient.cpp:594
--msgid ""
--"Communication error:\n"
--msgstr ""
--"連線錯誤：\n"
-+msgid "Communication error:\n"
-+msgstr "連線錯誤：\n"
- 
- #: knprotocolclient.cpp:504 knprotocolclient.cpp:566
- msgid "Communication error"
-@@ -3183,13 +3173,15 @@
- "KWallet is not available. It is strongly recommended to use KWallet for "
- "managing your passwords.\n"
- "However, KNode can store the password in its configuration file instead. The "
--"password is stored in an obfuscated format, but should not be considered secure "
--"from decryption efforts if access to the configuration file is obtained.\n"
-+"password is stored in an obfuscated format, but should not be considered "
-+"secure from decryption efforts if access to the configuration file is "
-+"obtained.\n"
- "Do you want to store the password for server '%1' in the configuration file?"
- msgstr ""
- "無法使用 KWallet。強烈建議您使用 KWallet 來管理您的密碼。\n"
--"如果沒有 KWallet 的話，密碼將會保存在 KNode 的設定檔中，並做簡單的加密。但是這仍然不保證密碼可以安全地不被破解。您確定要將伺服器 %1 "
--"的密碼存在設定檔中嗎？"
-+"如果沒有 KWallet 的話，密碼將會保存在 KNode 的設定檔中，並做簡單的加密。但是"
-+"這仍然不保證密碼可以安全地不被破解。您確定要將伺服器 %1 的密碼存在設定檔中"
-+"嗎？"
- 
- #: knserverinfo.cpp:115
- msgid "KWallet Not Available"
-@@ -3329,8 +3321,7 @@
- 
- #: utilities.cpp:170
- msgid ""
--"<qt>A file named <b>%1</b> already exists."
--"<br>Do you want to replace it?</qt>"
-+"<qt>A file named <b>%1</b> already exists.<br>Do you want to replace it?</qt>"
- msgstr "<qt>檔案 <b>%1</b> 已存在。<br> 您要取代它嗎？</qt>"
- 
- #: utilities.cpp:171
-diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdepim/knotes.po kde-i18n-zh_TW-3.5.10/messages/kdepim/knotes.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdepim/knotes.po	2008-02-13 10:55:32.000000000 +0100
-+++ kde-i18n-zh_TW-3.5.10/messages/kdepim/knotes.po	2011-11-11 15:45:17.000000000 +0100
-@@ -12,7 +12,7 @@
- "Project-Id-Version: knotes\n"
- "POT-Creation-Date: 2008-01-26 01:19+0100\n"
- "PO-Revision-Date: 2008-02-04 08:45+0800\n"
--"Last-Translator: Franklin Weng <franklin at goodhorse dot idv dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Chinese Traditional <zh-l10n@linux.org.tw>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
-@@ -37,7 +37,7 @@
- 
- #: knote.cpp:109
- msgid "Rename..."
--msgstr "重新命名..."
-+msgstr "重新命名…"
- 
- #: knote.cpp:111
- msgid "Lock"
-@@ -57,19 +57,19 @@
- 
- #: knote.cpp:121
- msgid "Set Alarm..."
--msgstr "設定鬧鈴..."
-+msgstr "設定鬧鈴…"
- 
- #: knote.cpp:124
- msgid "Send..."
--msgstr "傳送..."
-+msgstr "傳送…"
- 
- #: knote.cpp:126
- msgid "Mail..."
--msgstr "寄送..."
-+msgstr "寄送…"
- 
- #: knote.cpp:131
- msgid "Preferences..."
--msgstr "設定偏好..."
-+msgstr "設定偏好…"
- 
- #: knote.cpp:134
- msgid "Keep Above Others"
-@@ -117,8 +117,8 @@
- 
- #: knote.cpp:844
- msgid ""
--"<qt>A file named <b>%1</b> already exists."
--"<br>Are you sure you want to overwrite it?</qt>"
-+"<qt>A file named <b>%1</b> already exists.<br>Are you sure you want to "
-+"overwrite it?</qt>"
- msgstr "<qt>已經有一個叫做<b>%1</b>的檔案。<br>您確定要覆蓋掉這個檔案嗎?</qt>"
- 
- #: knote.cpp:933
-@@ -311,7 +311,7 @@
- 
- #: knoteedit.cpp:130
- msgid "Text Color..."
--msgstr "文字顏色..."
-+msgstr "文字顏色…"
- 
- #: knoteedit.cpp:133
- msgid "Text Font"
-@@ -438,10 +438,11 @@
- 
- #: resourcelocal.cpp:89
- msgid ""
--"<qt>Unable to save the notes to <b>%1</b>. Check that there is sufficient disk "
--"space."
--"<br>There should be a backup in the same directory though.</qt>"
--msgstr "<qt>無法將便條紙儲存至<b>%1</b>，請檢查是否有足夠的磁碟空間。<br>儘管如此，在同一個目錄下應該有一份備份</qt>"
-+"<qt>Unable to save the notes to <b>%1</b>. Check that there is sufficient "
-+"disk space.<br>There should be a backup in the same directory though.</qt>"
-+msgstr ""
-+"<qt>無法將便條紙儲存至<b>%1</b>，請檢查是否有足夠的磁碟空間。<br>儘管如此，在"
-+"同一個目錄下應該有一份備份</qt>"
- 
- #: resourcelocalconfig.cpp:37
- msgid "Location:"
-diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdepim/konsolekalendar.po kde-i18n-zh_TW-3.5.10/messages/kdepim/konsolekalendar.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdepim/konsolekalendar.po	2006-07-22 10:04:31.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdepim/konsolekalendar.po	2011-11-11 15:45:17.000000000 +0100
-@@ -6,8 +6,7 @@
- "Project-Id-Version: konsolekalendar\n"
- "POT-Creation-Date: 2006-06-07 04:03+0200\n"
- "PO-Revision-Date: 2006-06-19 10:35+0800\n"
--"Last-Translator: Frank Weng (a.k.a. Franklin) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Chinese Traditional <zh-l10n@linux.org.tw>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
-@@ -330,22 +329,23 @@
- msgid ""
- "Examples:\n"
- "  konsolekalendar --view\n"
--"  konsolekalendar --add --date 2003-06-04 --time 10:00 --end-time 12:00 \\\n    "
--"              --summary \"Doctor Visit\" --description \"Get My Head "
-+"  konsolekalendar --add --date 2003-06-04 --time 10:00 --end-time 12:00 \\\n"
-+"                  --summary \"Doctor Visit\" --description \"Get My Head "
- "Examined\"\n"
- "  konsolekalendar --delete --uid KOrganizer-1740326.803"
- msgstr ""
- "例如：\n"
- "  konsolekalendar --view\n"
--"  konsolekalendar --add --date 2003-06-04 --time 10:00 --end-time 12:00 \\\n    "
--"                   --summary \"看醫生\" --description \"健康檢查\"\n"
-+"  konsolekalendar --add --date 2003-06-04 --time 10:00 --end-time 12:00 \\\n"
-+"                       --summary \"看醫生\" --description \"健康檢查\"\n"
- "  konsolekalendar --delete --uid KOrganizer-1740326.803"
- 
- #: main.cpp:162
- msgid ""
- "For more information visit the program home page at:\n"
- "  http://pim.kde.org/components/konsolekalendar.php"
--msgstr "請參考 http://pim.kde.org/components/konsolekalendar.php 以取得更多資訊。"
-+msgstr ""
-+"請參考 http://pim.kde.org/components/konsolekalendar.php 以取得更多資訊。"
- 
- #: main.cpp:184
- msgid "Primary Author"
-@@ -455,8 +455,8 @@
- 
- #: main.cpp:870
- msgid ""
--"Only 1 operation mode (view, add, change, delete, create) permitted at any one "
--"time"
-+"Only 1 operation mode (view, add, change, delete, create) permitted at any "
-+"one time"
- msgstr "您一次只能指定以下運作型態中的一種：view, add, change, delete, create"
- 
- #: main.cpp:880
-diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdepim/kontact.po kde-i18n-zh_TW-3.5.10/messages/kdepim/kontact.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdepim/kontact.po	2008-08-19 20:43:18.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdepim/kontact.po	2011-11-11 15:45:17.000000000 +0100
-@@ -9,8 +9,7 @@
- "Project-Id-Version: kontact\n"
- "POT-Creation-Date: 2008-07-24 01:19+0200\n"
- "PO-Revision-Date: 2008-08-01 15:33+0800\n"
--"Last-Translator: Frank Weng (a.k.a. Franklin) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: zh_TW <zh-l10n@linux.org.tw>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
-@@ -30,7 +29,9 @@
- msgid ""
- "Usually Kontact will come up with the component used before shutdown. Check "
- "this box if you would like a specific component to come up on start instead."
--msgstr "Kontact 通常會以上次結束程式前使用的功能啟動。如果您要在每次啟動程式時開啟指定的功能元件請勾選此項目。"
-+msgstr ""
-+"Kontact 通常會以上次結束程式前使用的功能啟動。如果您要在每次啟動程式時開啟指"
-+"定的功能元件請勾選此項目。"
- 
- #: src/aboutdialog.cpp:44
- msgid "About Kontact"
-@@ -118,7 +119,7 @@
- 
- #: src/mainwindow.cpp:100
- msgid "Select Components ..."
--msgstr "選擇元件..."
-+msgstr "選擇元件…"
- 
- #: src/mainwindow.cpp:260
- msgid ""
-@@ -128,11 +129,11 @@
- 
- #: src/mainwindow.cpp:261
- msgid "Loading Kontact..."
--msgstr "載入 Kontact..."
-+msgstr "載入 Kontact…"
- 
- #: src/mainwindow.cpp:271
- msgid " Initializing..."
--msgstr " 初始化..."
-+msgstr " 初始化…"
- 
- #: src/mainwindow.cpp:293
- msgid "Get Organized!"
-@@ -152,11 +153,11 @@
- 
- #: src/mainwindow.cpp:341
- msgid "Configure Kontact..."
--msgstr "設定 Kontact..."
-+msgstr "設定 Kontact…"
- 
- #: src/mainwindow.cpp:344
- msgid "Configure &Profiles..."
--msgstr "編輯設定檔(&P)..."
-+msgstr "編輯設定檔(&P)…"
- 
- #: src/mainwindow.cpp:347
- msgid "&Kontact Introduction"
-@@ -164,15 +165,15 @@
- 
- #: src/mainwindow.cpp:349
- msgid "&Tip of the Day"
--msgstr "每日小秘訣(&T)"
-+msgstr "每日小祕訣(&T)"
- 
- #: src/mainwindow.cpp:351
- msgid "&Request Feature..."
--msgstr "要求新功能(&R)..."
-+msgstr "要求新功能(&R)…"
- 
- #: src/mainwindow.cpp:683
- msgid "Application is running standalone. Foregrounding..."
--msgstr "已獨立執行應用程式。移至前景..."
-+msgstr "已獨立執行應用程式。移至前景…"
- 
- #: src/mainwindow.cpp:695
- #, c-format
-@@ -187,37 +188,25 @@
- 
- #: src/mainwindow.cpp:1062
- msgid ""
--"<h2 style='text-align:center; margin-top: 0px;'>Welcome to Kontact %1</h2>"
--"<p>%1</p><table align=\"center\">"
--"<tr>"
--"<td><a href=\"%1\"><img width=\"%1\" height=\"%1\" src=\"%1\" /></a></td>"
--"<td><a href=\"%1\">%1</a>"
--"<br><span id=\"subtext\"><nobr>%1</td></tr>"
--"<tr>"
--"<td><a href=\"%1\"><img width=\"%1\" height=\"%1\" src=\"%1\" /></a></td>"
--"<td><a href=\"%1\">%1</a>"
--"<br><span id=\"subtext\"><nobr>%1</td></tr>"
--"<tr>"
--"<td><a href=\"%1\"><img width=\"%1\" height=\"%1\" src=\"%1\" /></a></td>"
--"<td><a href=\"%1\">%1</a>"
--"<br><span id=\"subtext\"><nobr>%1</td></tr></table><p style=\"margin-bottom: "
--"0px\"> <a href=\"%1\">Skip this introduction</a></p>"
-+"<h2 style='text-align:center; margin-top: 0px;'>Welcome to Kontact %1</h2><p>"
-+"%1</p><table align=\"center\"><tr><td><a href=\"%1\"><img width=\"%1\" "
-+"height=\"%1\" src=\"%1\" /></a></td><td><a href=\"%1\">%1</a><br><span id="
-+"\"subtext\"><nobr>%1</td></tr><tr><td><a href=\"%1\"><img width=\"%1\" "
-+"height=\"%1\" src=\"%1\" /></a></td><td><a href=\"%1\">%1</a><br><span id="
-+"\"subtext\"><nobr>%1</td></tr><tr><td><a href=\"%1\"><img width=\"%1\" "
-+"height=\"%1\" src=\"%1\" /></a></td><td><a href=\"%1\">%1</a><br><span id="
-+"\"subtext\"><nobr>%1</td></tr></table><p style=\"margin-bottom: 0px\"> <a "
-+"href=\"%1\">Skip this introduction</a></p>"
- msgstr ""
--"<h2 style='text-align:center; margin-top: 0px;'>歡迎使用 Kontact %1</h2>"
--"<p>%1</p><table align=\"center\">"
--"<tr>"
--"<td><a href=\"%1\"><img width=\"%1\" height=\"%1\" src=\"%1\" /></a></td>"
--"<td><a href=\"%1\">%1</a>"
--"<br><span id=\"subtext\"><nobr>%1</td></tr>"
--"<tr>"
--"<td><a href=\"%1\"><img width=\"%1\" height=\"%1\" src=\"%1\" /></a></td>"
--"<td><a href=\"%1\">%1</a>"
--"<br><span id=\"subtext\"><nobr>%1</td></tr>"
--"<tr>"
--"<td><a href=\"%1\"><img width=\"%1\" height=\"%1\" src=\"%1\" /></a></td>"
--"<td><a href=\"%1\">%1</a>"
--"<br><span id=\"subtext\"><nobr>%1</td></tr></table><p style=\"margin-bottom: "
--"0px\"> <a href=\"%1\">跳過這段介紹</a></p>"
-+"<h2 style='text-align:center; margin-top: 0px;'>歡迎使用 Kontact %1</h2><p>%"
-+"1</p><table align=\"center\"><tr><td><a href=\"%1\"><img width=\"%1\" height="
-+"\"%1\" src=\"%1\" /></a></td><td><a href=\"%1\">%1</a><br><span id=\"subtext"
-+"\"><nobr>%1</td></tr><tr><td><a href=\"%1\"><img width=\"%1\" height=\"%1\" "
-+"src=\"%1\" /></a></td><td><a href=\"%1\">%1</a><br><span id=\"subtext"
-+"\"><nobr>%1</td></tr><tr><td><a href=\"%1\"><img width=\"%1\" height=\"%1\" "
-+"src=\"%1\" /></a></td><td><a href=\"%1\">%1</a><br><span id=\"subtext"
-+"\"><nobr>%1</td></tr></table><p style=\"margin-bottom: 0px\"> <a href=\"%1\">"
-+"跳過這段介紹</a></p>"
- 
- #: src/mainwindow.cpp:1074
- msgid ""
-@@ -296,7 +285,8 @@
- 
- #: src/profiledialog.cpp:151
- msgid ""
--"The profile \"%1\" will be overwritten with the current settings. Are you sure?"
-+"The profile \"%1\" will be overwritten with the current settings. Are you "
-+"sure?"
- msgstr "設定檔 %1 會被目前的設定覆蓋。您確定嗎？"
- 
- #: src/profiledialog.cpp:151
-@@ -305,8 +295,8 @@
- 
- #: src/profiledialog.cpp:161
- msgid ""
--"Do you really want to delete the profile \"%1\"? All profile settings will be "
--"lost!"
-+"Do you really want to delete the profile \"%1\"? All profile settings will "
-+"be lost!"
- msgstr "您真的要刪除設定檔 %1 嗎？所有的設定都會遺失。"
- 
- #: src/profiledialog.cpp:172 src/profiledialog.cpp:188
-@@ -363,15 +353,15 @@
- #: plugins/akregator/akregator_plugin.cpp:57
- #: plugins/newsticker/kcmkontactknt.cpp:380
- msgid "New Feed..."
--msgstr "新增 Feed..."
-+msgstr "新增 Feed…"
- 
- #: plugins/kaddressbook/kaddressbook_plugin.cpp:60
- msgid "New Contact..."
--msgstr "新增聯絡人..."
-+msgstr "新增聯絡人…"
- 
- #: plugins/kaddressbook/kaddressbook_plugin.cpp:64
- msgid "&New Distribution List..."
--msgstr "新增分派清單(&N)..."
-+msgstr "新增分派清單(&N)…"
- 
- #: plugins/kaddressbook/kaddressbook_plugin.cpp:67
- msgid "Synchronize Contacts"
-@@ -422,7 +412,7 @@
- 
- #: plugins/kmail/kmail_plugin.cpp:64
- msgid "New Message..."
--msgstr "新增訊息..."
-+msgstr "新增訊息…"
- 
- #: plugins/kmail/kmail_plugin.cpp:68
- msgid "Synchronize Mail"
-@@ -448,7 +438,7 @@
- 
- #: plugins/knode/knode_plugin.cpp:52
- msgid "New Article..."
--msgstr "新增文章..."
-+msgstr "新增文章…"
- 
- #: plugins/knotes/knotes_part.cpp:53
- msgid "&New"
-@@ -456,11 +446,11 @@
- 
- #: plugins/knotes/knotes_part.cpp:55
- msgid "Rename..."
--msgstr "重新命名..."
-+msgstr "重新命名…"
- 
- #: plugins/knotes/knotes_part.cpp:59
- msgid "Print Selected Notes..."
--msgstr "列印選取的備忘..."
-+msgstr "列印選取的備忘…"
- 
- #: plugins/knotes/knotes_part.cpp:123
- msgid "To print notes, first select the notes to print from the list."
-@@ -487,7 +477,7 @@
- 
- #: plugins/knotes/knotes_plugin.cpp:47
- msgid "New Note..."
--msgstr "新增記事..."
-+msgstr "新增記事…"
- 
- #: plugins/knotes/knotes_plugin.cpp:49
- msgid "Synchronize Notes"
-@@ -511,7 +501,7 @@
- 
- #: plugins/korganizer/journalplugin.cpp:52
- msgid "New Journal..."
--msgstr "新增日記..."
-+msgstr "新增日記…"
- 
- #: plugins/korganizer/journalplugin.cpp:55
- msgid "Synchronize Journal"
-@@ -579,7 +569,7 @@
- 
- #: plugins/korganizer/korganizerplugin.cpp:63
- msgid "New Event..."
--msgstr "新增事件..."
-+msgstr "新增事件…"
- 
- #: plugins/korganizer/korganizerplugin.cpp:67
- msgid "Synchronize Calendar"
-@@ -636,7 +626,7 @@
- 
- #: plugins/korganizer/summarywidget.cpp:281
- msgid "&Edit Appointment..."
--msgstr "編輯約會(&E)..."
-+msgstr "編輯約會(&E)…"
- 
- #: plugins/korganizer/summarywidget.cpp:283
- msgid "&Delete Appointment"
-@@ -648,7 +638,7 @@
- 
- #: plugins/korganizer/todoplugin.cpp:64
- msgid "New To-do..."
--msgstr "新增待辦事項..."
-+msgstr "新增待辦事項…"
- 
- #: plugins/korganizer/todoplugin.cpp:68
- msgid "Synchronize To-do List"
-@@ -685,7 +675,7 @@
- 
- #: plugins/korganizer/todosummarywidget.cpp:230
- msgid "&Edit To-do..."
--msgstr "編輯待辦事項(&E)..."
-+msgstr "編輯待辦事項(&E)…"
- 
- #: plugins/korganizer/todosummarywidget.cpp:232
- msgid "&Delete To-do"
-@@ -1015,7 +1005,8 @@
- 
- #: plugins/summary/kcmkontactsummary.cpp:98
- msgid ""
--"Here you can select which summary plugins to have visible in your summary view."
-+"Here you can select which summary plugins to have visible in your summary "
-+"view."
- msgstr "您可以在這裡選擇您的摘要畫面要顯示哪些摘要外掛。"
- 
- #: plugins/summary/kcmkontactsummary.cpp:110
-@@ -1032,7 +1023,7 @@
- 
- #: plugins/summary/summaryview_part.cpp:91
- msgid "&Configure Summary View..."
--msgstr "設定摘要畫面(&C)..."
-+msgstr "設定摘要畫面(&C)…"
- 
- #: plugins/summary/summaryview_part.cpp:139
- #, c-format
-@@ -1110,3 +1101,11 @@
- "_: EMAIL OF TRANSLATORS\n"
- "Your emails"
- msgstr "yochenhsieh@xuite.net,franklin at goodhorse dot idv dot tw"
-+
-+#, fuzzy
-+#~ msgid "New Messages"
-+#~ msgstr "Neue Nachrichten"
-+
-+#, fuzzy
-+#~ msgid "&Refresh Summary View..."
-+#~ msgstr "&Übersicht aktualisieren…"
-diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdepim/korganizer.po kde-i18n-zh_TW-3.5.10/messages/kdepim/korganizer.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdepim/korganizer.po	2008-08-19 20:43:18.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdepim/korganizer.po	2011-11-11 15:45:17.000000000 +0100
-@@ -13,8 +13,7 @@
- "Project-Id-Version: korganizer\n"
- "POT-Creation-Date: 2008-08-19 01:19+0200\n"
- "PO-Revision-Date: 2008-08-01 15:33+0800\n"
--"Last-Translator: Frank Weng (a.k.a. Franklin) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: zh_TW <zh-l10n@linux.org.tw>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
-@@ -30,7 +29,7 @@
- #: actionmanager.cpp:470 actionmanager.cpp:1448 actionmanager.cpp:1476
- #: koeventpopupmenu.cpp:54 kotodoview.cpp:455 resourceview.cpp:599
- msgid "&Edit..."
--msgstr "編輯(&E)..."
-+msgstr "編輯(&E)…"
- 
- #: koeventpopupmenu.cpp:76
- msgid "&Toggle Reminder"
-@@ -46,16 +45,17 @@
- 
- #: koeventpopupmenu.cpp:88
- msgid "Send as iCalendar..."
--msgstr "以 iCalendar 送出..."
-+msgstr "以 iCalendar 送出…"
- 
- #: koeditordetails.cpp:194
- msgid ""
--"Displays information about current attendees. To edit an attendee, select it in "
--"this list and modify the values in the area below. Clicking on a column title "
--"will sort the list according to that column. The RSVP column indicates whether "
--"or not a response is requested from the attendee."
-+"Displays information about current attendees. To edit an attendee, select it "
-+"in this list and modify the values in the area below. Clicking on a column "
-+"title will sort the list according to that column. The RSVP column indicates "
-+"whether or not a response is requested from the attendee."
- msgstr ""
--"顯示目前參加者的資訊。要編輯參加者，請在此清單中選擇，並在底下修改數值。點選欄位標題可以根據該欄位排序。「敬請回覆」欄位是指是否要求參加者回覆。"
-+"顯示目前參加者的資訊。要編輯參加者，請在此清單中選擇，並在底下修改數值。點選"
-+"欄位標題可以根據該欄位排序。「敬請回覆」欄位是指是否要求參加者回覆。"
- 
- #. i18n: file publishdialog_base.ui line 28
- #: koeditordetails.cpp:201 koprefsdialog.cpp:1063 rc.cpp:417 rc.cpp:1859
-@@ -141,11 +141,13 @@
- 
- #: koeditorfreebusy.cpp:229
- msgid ""
--"Sets the zoom level on the Gantt chart. 'Hour' shows a range of several hours, "
--"'Day' shows a range of a few days, 'Week' shows a range of a few months, and "
--"'Month' shows a range of a few years, while 'Automatic' selects the range most "
--"appropriate for the current event or to-do."
--msgstr "設定此甘特圖的放大等級。選擇「時」以數小時為範圍，「日」以數日為範圍...依此類推。「自動」則會自動選取目前事件或待辦事項最適合的時間範圍。"
-+"Sets the zoom level on the Gantt chart. 'Hour' shows a range of several "
-+"hours, 'Day' shows a range of a few days, 'Week' shows a range of a few "
-+"months, and 'Month' shows a range of a few years, while 'Automatic' selects "
-+"the range most appropriate for the current event or to-do."
-+msgstr ""
-+"設定此甘特圖的放大等級。選擇「時」以數小時為範圍，「日」以數日為範圍...依此類"
-+"推。「自動」則會自動選取目前事件或待辦事項最適合的時間範圍。"
- 
- #: koeditorfreebusy.cpp:236
- msgid "Scale: "
-@@ -223,8 +225,8 @@
- 
- #: koeditorfreebusy.cpp:675
- msgid ""
--"Of the %1 participants, %2 have accepted, %3 have tentatively accepted, and %4 "
--"have declined."
-+"Of the %1 participants, %2 have accepted, %3 have tentatively accepted, and %"
-+"4 have declined."
- msgstr "在 %1 個參加者中，%2 個已接受，%3 個暫時接受，%4 個已拒絕。"
- 
- #: koeditorfreebusy.cpp:898
-@@ -235,8 +237,8 @@
- 
- #: koeditorrecurrence.cpp:91
- msgid ""
--"The number of the week from the beginning of the month on which this event or "
--"to-do should recur."
-+"The number of the week from the beginning of the month on which this event "
-+"or to-do should recur."
- msgstr "此事件或待辦事項要於一個月的第幾週循環。"
- 
- #: koeditorrecurrence.cpp:95 koeditorrecurrence.cpp:259
-@@ -482,8 +484,8 @@
- 
- #: koeditorrecurrence.cpp:454
- msgid ""
--"Sets a specific day in a specific week of a specific month on which this event "
--"or to-do should recur."
-+"Sets a specific day in a specific week of a specific month on which this "
-+"event or to-do should recur."
- msgstr "此事件或待辦事項要於哪個月的第幾週的第幾天循環。"
- 
- #: koeditorrecurrence.cpp:465
-@@ -502,7 +504,8 @@
- 
- #: koeditorrecurrence.cpp:484
- msgid ""
--"Sets a specific day within the year on which this event or to-do should recur."
-+"Sets a specific day within the year on which this event or to-do should "
-+"recur."
- msgstr "此事件或待辦事項要於一年中的哪一天循環。"
- 
- #: koeditorrecurrence.cpp:495
-@@ -523,8 +526,8 @@
- 
- #: koeditorrecurrence.cpp:591
- msgid ""
--"A date that should be considered an exception to the recurrence rules for this "
--"event or to-do."
-+"A date that should be considered an exception to the recurrence rules for "
-+"this event or to-do."
- msgstr "此事件或待辦事項循環的例外日期。"
- 
- #. i18n: file koeditoralarms_base.ui line 546
-@@ -535,7 +538,8 @@
- 
- #: koeditorrecurrence.cpp:598
- msgid ""
--"Add this date as an exception to the recurrence rules for this event or to-do."
-+"Add this date as an exception to the recurrence rules for this event or to-"
-+"do."
- msgstr "將此日期加到此事件或待辦事項循環規則的例外清單中。"
- 
- #: koeditorrecurrence.cpp:601
-@@ -554,8 +558,8 @@
- 
- #: koeditorrecurrence.cpp:614
- msgid ""
--"Displays current dates that are being considered exceptions to the recurrence "
--"rules for this event or to-do."
-+"Displays current dates that are being considered exceptions to the "
-+"recurrence rules for this event or to-do."
- msgstr "顯示此事件或待辦事項例外清單中的日期。"
- 
- #: koeditorrecurrence.cpp:678
-@@ -568,8 +572,8 @@
- 
- #: koeditorrecurrence.cpp:705
- msgid ""
--"Sets a range for which these recurrence rules will apply to this event or "
--"to-do."
-+"Sets a range for which these recurrence rules will apply to this event or to-"
-+"do."
- msgstr "設定此事件或待辦事項的循環規則所涵蓋的時間範圍。"
- 
- #: koeditorrecurrence.cpp:713
-@@ -658,7 +662,7 @@
- 
- #: koeditorrecurrence.cpp:901
- msgid "&Weekly"
--msgstr "每週 (&W)"
-+msgstr "每週(&W)"
- 
- #: koeditorrecurrence.cpp:903
- msgid ""
-@@ -711,7 +715,7 @@
- 
- #: koeditorrecurrence.cpp:1043
- msgid "Recurrence Range..."
--msgstr "循環範圍..."
-+msgstr "循環範圍…"
- 
- #: koeditorrecurrence.cpp:1046 koeditorrecurrence.cpp:1063
- msgid ""
-@@ -721,7 +725,7 @@
- 
- #: koeditorrecurrence.cpp:1055
- msgid "Exceptions..."
--msgstr "例外..."
-+msgstr "例外…"
- 
- #: koeditorrecurrence.cpp:1395
- msgid ""
-@@ -741,7 +745,7 @@
- 
- #: koincidenceeditor.cpp:73
- msgid "&Templates..."
--msgstr "樣本...(&T)"
-+msgstr "樣本…(&T)"
- 
- #: koincidenceeditor.cpp:86
- msgid "Atte&ndees"
-@@ -749,8 +753,8 @@
- 
- #: koincidenceeditor.cpp:88
- msgid ""
--"The Attendees tab allows you to Add or Remove Attendees to/from this event or "
--"to-do."
-+"The Attendees tab allows you to Add or Remove Attendees to/from this event "
-+"or to-do."
- msgstr "「參加者」讓您新增或移除此事件或待辦事項的參加者。"
- 
- #: koincidenceeditor.cpp:172
-@@ -853,8 +857,8 @@
- 
- #: incidencechanger.cpp:61
- msgid ""
--"Some attendees were removed from the incidence. Shall cancel messages be sent "
--"to these attendees?"
-+"Some attendees were removed from the incidence. Shall cancel messages be "
-+"sent to these attendees?"
- msgstr "已自此事件中移除某些參加者。要對他們發出取消訊息嗎？"
- 
- #: incidencechanger.cpp:63
-@@ -906,10 +910,12 @@
- #: koprefsdialog.cpp:162 rc.cpp:567 rc.cpp:1154
- #, no-c-format
- msgid ""
--"Select your timezone from the list of locations on this drop down box. If your "
--"city is not listed, select one which shares the same timezone. KOrganizer will "
--"automatically adjust for daylight savings."
--msgstr "請於此地區清單中選取您的時區。如果您所在的城市不在清單內，請選擇一個有相同時區的地區。KOrganizer 將會自動調整日光節約時間。"
-+"Select your timezone from the list of locations on this drop down box. If "
-+"your city is not listed, select one which shares the same timezone. "
-+"KOrganizer will automatically adjust for daylight savings."
-+msgstr ""
-+"請於此地區清單中選取您的時區。如果您所在的城市不在清單內，請選擇一個有相同時"
-+"區的地區。KOrganizer 將會自動調整日光節約時間。"
- 
- #: koprefsdialog.cpp:206
- msgid "[No selection]"
-@@ -927,7 +933,9 @@
- msgid ""
- "Select from which region you want to use the holidays here. Defined holidays "
- "are shown as non-working days in the date navigator, the agenda view, etc."
--msgstr "請選擇您使用的假日區域。「假日」在瀏覽日期或檢視行程時將會被列為不必工作的日子。"
-+msgstr ""
-+"請選擇您使用的假日區域。「假日」在瀏覽日期或檢視行程時將會被列為不必工作的日"
-+"子。"
- 
- #: koprefsdialog.cpp:292
- msgid "(None)"
-@@ -968,9 +976,11 @@
- #: koprefsdialog.cpp:352
- msgid ""
- "Check this box to make KOrganizer mark the working hours for this day of the "
--"week. If this is a work day for you, check this box, or the working hours will "
--"not be marked with color."
--msgstr "開啟此選項，KOrganizer 將會標記本週這一天的工作時間。如果這一天您要工作，您可以開啟此選項，不然將不會以顏色標記。"
-+"week. If this is a work day for you, check this box, or the working hours "
-+"will not be marked with color."
-+msgstr ""
-+"開啟此選項，KOrganizer 將會標記本週這一天的工作時間。如果這一天您要工作，您可"
-+"以開啟此選項，不然將不會以顏色標記。"
- 
- #: koprefsdialog.cpp:473
- msgid "Date Navigator"
-@@ -1013,13 +1023,14 @@
- 
- #: koprefsdialog.cpp:673
- msgid ""
--"Select here the event category you want to modify. You can change the selected "
--"category color using the button below."
-+"Select here the event category you want to modify. You can change the "
-+"selected category color using the button below."
- msgstr "選擇您要變更的事件類別。您可以用底下的按鈕改變所選的類別顏色。"
- 
- #: koprefsdialog.cpp:680
- msgid ""
--"Choose here the color of the event category selected using the combo box above."
-+"Choose here the color of the event category selected using the combo box "
-+"above."
- msgstr "在此選擇此事件類別的顏色。"
- 
- #: koprefsdialog.cpp:686
-@@ -1028,8 +1039,8 @@
- 
- #: koprefsdialog.cpp:692
- msgid ""
--"Select here resource you want to modify. You can change the selected resource "
--"color using the button below."
-+"Select here resource you want to modify. You can change the selected "
-+"resource color using the button below."
- msgstr "在此選擇您要變更的資源。您可以用底下的按鈕改變所選的資源顏色。"
- 
- #: koprefsdialog.cpp:699
-@@ -1053,11 +1064,12 @@
- msgid ""
- "Add, edit or remove additional e-mails addresses here. These email addresses "
- "are the ones you have in addition to the one set in personal preferences. If "
--"you are an attendee of one event, but use another email address there, you need "
--"to list this address here so KOrganizer can recognize it as yours."
-+"you are an attendee of one event, but use another email address there, you "
-+"need to list this address here so KOrganizer can recognize it as yours."
- msgstr ""
--"您可以在此新增、編輯或移除額外的電子郵件地址。這些是在您個人設定的電子郵件地址之外的地址。例如您對其他單位公布的不是您預設的電子郵件地址，那麼將其他地址加入此清"
--"單，KOrganizer 在收到邀請函時才能知道是給您的。"
-+"您可以在此新增、編輯或移除額外的電子郵件地址。這些是在您個人設定的電子郵件地"
-+"址之外的地址。例如您對其他單位公布的不是您預設的電子郵件地址，那麼將其他地址"
-+"加入此清單，KOrganizer 在收到邀請函時才能知道是給您的。"
- 
- #: koprefsdialog.cpp:868
- msgid "Additional email address:"
-@@ -1065,9 +1077,9 @@
- 
- #: koprefsdialog.cpp:869
- msgid ""
--"Edit additional e-mails addresses here. To edit an address select it from the "
--"list above or press the \"New\" button below. These email addresses are the "
--"ones you have in addition to the one set in personal preferences."
-+"Edit additional e-mails addresses here. To edit an address select it from "
-+"the list above or press the \"New\" button below. These email addresses are "
-+"the ones you have in addition to the one set in personal preferences."
- msgstr "在此編輯額外的電子郵件地址。"
- 
- #: koprefsdialog.cpp:881
-@@ -1076,8 +1088,8 @@
- 
- #: koprefsdialog.cpp:882
- msgid ""
--"Press this button to add a new entry to the additional e-mail addresses list. "
--"Use the edit box above to edit the new entry."
-+"Press this button to add a new entry to the additional e-mail addresses "
-+"list. Use the edit box above to edit the new entry."
- msgstr "按此按鍵可以在清單中新增一個額外的電子郵件地址。"
- 
- #: koprefsdialog.cpp:929 publishdialog.cpp:102
-@@ -1086,7 +1098,7 @@
- 
- #: koprefsdialog.cpp:1080
- msgid "Configure &Plugin..."
--msgstr "設定外掛程式...(&P)"
-+msgstr "設定外掛程式…(&P)"
- 
- #: koprefsdialog.cpp:1081
- msgid ""
-@@ -1116,12 +1128,12 @@
- #: freebusymanager.cpp:228
- msgid ""
- "<qt>No URL configured for uploading your free/busy list. Please set it in "
--"KOrganizer's configuration dialog, on the \"Free/Busy\" page. "
--"<br>Contact your system administrator for the exact URL and the account "
--"details.</qt>"
-+"KOrganizer's configuration dialog, on the \"Free/Busy\" page. <br>Contact "
-+"your system administrator for the exact URL and the account details.</qt>"
- msgstr ""
--"<qt>沒有設定您上傳行程資訊清單使用的網址。請在 KOrganizer 的設定對話框裡的「行程資訊」頁中設定。"
--"<br> 關於網址與帳號詳情等資訊，請與您的系統管理員聯絡。</qt>"
-+"<qt>沒有設定您上傳行程資訊清單使用的網址。請在 KOrganizer 的設定對話框裡的"
-+"「行程資訊」頁中設定。<br> 關於網址與帳號詳情等資訊，請與您的系統管理員聯絡。"
-+"</qt>"
- 
- #: freebusymanager.cpp:232
- msgid "No Free/Busy Upload URL"
-@@ -1138,12 +1150,13 @@
- #: freebusymanager.cpp:330
- msgid ""
- "<qt>The software could not upload your free/busy list to the URL '%1'. There "
--"might be a problem with the access rights, or you specified an incorrect URL. "
--"The system said: <em>%2</em>."
--"<br>Please check the URL or contact your system administrator.</qt>"
--msgstr ""
--"<qt>系統無法將您的行程資訊清單上傳至網址 %1。也許是存取權限有問題，或是您指定的網址有誤。系統回應為：<em>%2</em>"
--"<br> 請檢查您的網址，或是與您的系統管理員聯絡。</qt>"
-+"might be a problem with the access rights, or you specified an incorrect "
-+"URL. The system said: <em>%2</em>.<br>Please check the URL or contact your "
-+"system administrator.</qt>"
-+msgstr ""
-+"<qt>系統無法將您的行程資訊清單上傳至網址 %1。也許是存取權限有問題，或是您指定"
-+"的網址有誤。系統回應為：<em>%2</em><br> 請檢查您的網址，或是與您的系統管理員"
-+"聯絡。</qt>"
- 
- #: _translatorinfo.cpp:1
- msgid ""
-@@ -1191,7 +1204,7 @@
- 
- #: koeditorgeneral.cpp:154
- msgid "&Select..."
--msgstr "選擇(&S)..."
-+msgstr "選擇(&S)…"
- 
- #: koeditorgeneral.cpp:164
- msgid "Acc&ess:"
-@@ -1199,18 +1212,20 @@
- 
- #: koeditorgeneral.cpp:165
- msgid ""
--"Sets whether the access to this event or to-do is restricted. Please note that "
--"KOrganizer currently does not use this setting, so the implementation of the "
--"restrictions will depend on the groupware server. This means that events or "
--"to-dos marked as private or confidential may be visible to others."
--msgstr ""
--"設定是否要限制此事件或待辦事項的存取權限。請注意，KOrganizer "
--"目前不使用此設定，而是依靠群組伺服器的設定。這表示您在此設定為機密的事件或待辦事項還是有可能被其他人看到。"
-+"Sets whether the access to this event or to-do is restricted. Please note "
-+"that KOrganizer currently does not use this setting, so the implementation "
-+"of the restrictions will depend on the groupware server. This means that "
-+"events or to-dos marked as private or confidential may be visible to others."
-+msgstr ""
-+"設定是否要限制此事件或待辦事項的存取權限。請注意，KOrganizer 目前不使用此設"
-+"定，而是依靠群組伺服器的設定。這表示您在此設定為機密的事件或待辦事項還是有可"
-+"能被其他人看到。"
- 
- #: koeditorgeneral.cpp:186
- msgid ""
- "Sets the description for this event or to-do. This will be displayed in a "
--"reminder if one is set, as well as in a tooltip when you hover over the event."
-+"reminder if one is set, as well as in a tooltip when you hover over the "
-+"event."
- msgstr "設定此事件或待辦事項的說明。這會顯示在提醒中，還有事件發生期間。"
- 
- #: koeditorgeneral.cpp:210
-@@ -1310,8 +1325,8 @@
- 
- #: koeditorgeneraltodo.cpp:154
- msgid ""
--"Sets whether or not this to-do's start and due dates have times associated with "
--"them."
-+"Sets whether or not this to-do's start and due dates have times associated "
-+"with them."
- msgstr "設定此待辦事項的啟始與到期日期與時間是否有關聯。"
- 
- #: koeditorgeneraltodo.cpp:172
-@@ -1327,15 +1342,17 @@
- 
- #: koeditorgeneraltodo.cpp:184 koeditorgeneraltodo.cpp:544
- msgid "co&mpleted"
--msgstr "已完成 (&M)"
-+msgstr "已完成(&M)"
- 
- #: koeditorgeneraltodo.cpp:197
- msgid ""
--"Sets the priority of this to-do on a scale from one to nine, with one being the "
--"highest priority, five being a medium priority, and nine being the lowest. In "
--"programs that have a different scale, the numbers will be adjusted to match the "
--"appropriate scale."
--msgstr "設定此待辦事項的優先等級，從一到九。一為高優先，五為中度優先，九為最低優先。不過對於有其他量度法的程式，此數值將會調整為適當的區間。"
-+"Sets the priority of this to-do on a scale from one to nine, with one being "
-+"the highest priority, five being a medium priority, and nine being the "
-+"lowest. In programs that have a different scale, the numbers will be "
-+"adjusted to match the appropriate scale."
-+msgstr ""
-+"設定此待辦事項的優先等級，從一到九。一為高優先，五為中度優先，九為最低優先。"
-+"不過對於有其他量度法的程式，此數值將會調整為適當的區間。"
- 
- #: koeditorgeneraltodo.cpp:203
- msgid "&Priority:"
-@@ -1459,21 +1476,26 @@
- 
- #: kogroupware.cpp:295
- msgid ""
--"Your status as an attendee of this event changed. Do you want to send a status "
--"update to the organizer of this event?"
-+"Your status as an attendee of this event changed. Do you want to send a "
-+"status update to the organizer of this event?"
- msgstr "您在此事件的參加者狀態已變更。您要送出狀態變更資訊給此事件的組織者嗎？"
- 
- #: kogroupware.cpp:302
- msgid ""
--"You are not the organizer of this event. Deleting it will bring your calendar "
--"out of sync with the organizers calendar. Do you really want to delete it?"
--msgstr "您不是此事件的組織者。刪除此事件會讓您的行事曆與組織者的行事曆不同步。您確定要刪除嗎？"
-+"You are not the organizer of this event. Deleting it will bring your "
-+"calendar out of sync with the organizers calendar. Do you really want to "
-+"delete it?"
-+msgstr ""
-+"您不是此事件的組織者。刪除此事件會讓您的行事曆與組織者的行事曆不同步。您確定"
-+"要刪除嗎？"
- 
- #: kogroupware.cpp:307
- msgid ""
- "You are not the organizer of this event. Editing it will bring your calendar "
- "out of sync with the organizers calendar. Do you really want to edit it?"
--msgstr "您不是此事件的組織者。編輯此事件會讓您的行事曆與組織者的行事曆不同步。您確定要編輯嗎？"
-+msgstr ""
-+"您不是此事件的組織者。編輯此事件會讓您的行事曆與組織者的行事曆不同步。您確定"
-+"要編輯嗎？"
- 
- #: kogroupware.cpp:323
- msgid "<No summary given>"
-@@ -1609,11 +1631,11 @@
- 
- #: actionmanager.cpp:452 kotodoview.cpp:463
- msgid "New &To-do..."
--msgstr "新增待辦事項...(&T)"
-+msgstr "新增待辦事項…(&T)"
- 
- #: actionmanager.cpp:456 kotodoview.cpp:465
- msgid "New Su&b-to-do..."
--msgstr "新增子待辦事項...(&B)"
-+msgstr "新增子待辦事項…(&B)"
- 
- #: kotodoview.cpp:467
- msgid "&Make this To-do Independent"
-@@ -1639,7 +1661,7 @@
- 
- #: kotodoview.cpp:484
- msgid "&New To-do..."
--msgstr "新增待辦事項...(&N)"
-+msgstr "新增待辦事項…(&N)"
- 
- #: kotodoview.cpp:486
- msgid ""
-@@ -1763,14 +1785,16 @@
- 
- #: calendarview.cpp:262
- msgid ""
--"<p><em>No Item Selected</em></p>"
--"<p>Select an event, to-do or journal entry to view its details here.</p>"
--msgstr "<p><em> 沒有選取任何項目</em></p> <p>請選擇一個事件、待辦事項或日誌項目，並在此檢視其詳情。</p>"
-+"<p><em>No Item Selected</em></p><p>Select an event, to-do or journal entry "
-+"to view its details here.</p>"
-+msgstr ""
-+"<p><em> 沒有選取任何項目</em></p> <p>請選擇一個事件、待辦事項或日誌項目，並在"
-+"此檢視其詳情。</p>"
- 
- #: calendarview.cpp:268
- msgid ""
--"View the details of events, journal entries or to-dos selected in KOrganizer's "
--"main view here."
-+"View the details of events, journal entries or to-dos selected in "
-+"KOrganizer's main view here."
- msgstr "檢視您在 KOrganizer 中所選擇的事件、待辦事項或日誌項目的詳情。"
- 
- #: calendarview.cpp:421
-@@ -1779,10 +1803,12 @@
- 
- #: calendarview.cpp:644
- msgid ""
--"The timezone setting was changed. Do you want to keep the absolute time of the "
--"items in your calendar, which will show them to be at a different time than "
--"before, or move them to be at the old time also in the new timezone?"
--msgstr "時區設定已變更。您要在行事曆中使用事件的絕對時間，（也就是在行事曆中顯示的時間會被改變），還是要保留過去設定的時間？"
-+"The timezone setting was changed. Do you want to keep the absolute time of "
-+"the items in your calendar, which will show them to be at a different time "
-+"than before, or move them to be at the old time also in the new timezone?"
-+msgstr ""
-+"時區設定已變更。您要在行事曆中使用事件的絕對時間，（也就是在行事曆中顯示的時"
-+"間會被改變），還是要保留過去設定的時間？"
- 
- #: calendarview.cpp:648
- msgid "Keep Absolute Times?"
-@@ -1807,8 +1833,8 @@
- 
- #: calendarview.cpp:782
- msgid ""
--"The item \"%1\" is filtered by your current filter rules, so it will be hidden "
--"and not appear in the view."
-+"The item \"%1\" is filtered by your current filter rules, so it will be "
-+"hidden and not appear in the view."
- msgstr "項目 %1 已被您目前的過濾規則過濾掉了，所以不會在此檢視中顯示。"
- 
- #: calendarview.cpp:785
-@@ -1904,8 +1930,8 @@
- 
- #: calendarview.cpp:1468
- msgid ""
--"_: Groupware message sending failed. %2 is "
--"request/reply/add/cancel/counter/etc.\n"
-+"_: Groupware message sending failed. %2 is request/reply/add/cancel/counter/"
-+"etc.\n"
- "Unable to send the item '%1'.\n"
- "Method: %2"
- msgstr ""
-@@ -1954,9 +1980,12 @@
- 
- #: calendarview.cpp:1974
- msgid ""
--"The item \"%1\" has sub-to-dos. Do you want to delete just this item and make "
--"all its sub-to-dos independent, or delete the to-do with all its sub-to-dos?"
--msgstr "項目 %1 有子待辦事項。您要只刪除此項目，並讓所有的子待辦事項獨立出來，還是連同子待辦事項一起刪除？"
-+"The item \"%1\" has sub-to-dos. Do you want to delete just this item and "
-+"make all its sub-to-dos independent, or delete the to-do with all its sub-to-"
-+"dos?"
-+msgstr ""
-+"項目 %1 有子待辦事項。您要只刪除此項目，並讓所有的子待辦事項獨立出來，還是連"
-+"同子待辦事項一起刪除？"
- 
- #: calendarview.cpp:1980
- msgid "Delete Only This"
-@@ -1968,9 +1997,10 @@
- 
- #: calendarview.cpp:2007
- msgid ""
--"The item \"%1\" is marked read-only and cannot be deleted; it probably belongs "
--"to a read-only calendar resource."
--msgstr "項目 %1 標記為唯讀，因此無法刪除。有可能此項目屬於一個唯讀的行事曆資源。"
-+"The item \"%1\" is marked read-only and cannot be deleted; it probably "
-+"belongs to a read-only calendar resource."
-+msgstr ""
-+"項目 %1 標記為唯讀，因此無法刪除。有可能此項目屬於一個唯讀的行事曆資源。"
- 
- #: calendarview.cpp:2011
- msgid "Removing not possible"
-@@ -1978,15 +2008,19 @@
- 
- #: calendarview.cpp:2038
- msgid ""
--"The calendar item \"%1\" recurs over multiple dates; are you sure you want to "
--"delete it and all its recurrences?"
--msgstr "行事曆項目 %1 會在許多時候循環發生。您確定要刪除此項目及其所有的循環規則嗎？"
-+"The calendar item \"%1\" recurs over multiple dates; are you sure you want "
-+"to delete it and all its recurrences?"
-+msgstr ""
-+"行事曆項目 %1 會在許多時候循環發生。您確定要刪除此項目及其所有的循環規則嗎？"
- 
- #: calendarview.cpp:2044
- msgid ""
--"The calendar item \"%1\" recurs over multiple dates. Do you want to delete only "
--"the current one on %2, only all future recurrences, or all its recurrences?"
--msgstr "行事曆項目 %1 會在許多時候循環發生。您要只刪除 %2 上目前的循環，刪除所有未來的循環，還是刪除所有的循環規則？"
-+"The calendar item \"%1\" recurs over multiple dates. Do you want to delete "
-+"only the current one on %2, only all future recurrences, or all its "
-+"recurrences?"
-+msgstr ""
-+"行事曆項目 %1 會在許多時候循環發生。您要只刪除 %2 上目前的循環，刪除所有未來"
-+"的循環，還是刪除所有的循環規則？"
- 
- #: calendarview.cpp:2049
- msgid "Delete C&urrent"
-@@ -2085,17 +2119,15 @@
- 
- #: datenavigatorcontainer.cpp:51
- msgid ""
--"<qt>"
--"<p>Select the dates you want to display in KOrganizer's main view here. Hold "
--"down the mouse button to select more than one day.</p>"
--"<p>Press the top buttons to browse to the next / previous months or years.</p>"
--"<p>Each line shows a week. The number in the left column is the number of the "
--"week in the year. Press it to select the whole week.</p></qt>"
--msgstr ""
--"<qt>"
--"<p>選擇您要顯示在 KOrganizer 主畫面的日期。如果要選一天以上，請按住滑鼠按鍵。</p> "
--"<p>按上方的按鈕來瀏覽不同的月份或年度。</p> "
--"<p>每一行顯示一週。左方的欄位是這個年度的第幾週，按下可以選取整週。</p></qt>"
-+"<qt><p>Select the dates you want to display in KOrganizer's main view here. "
-+"Hold down the mouse button to select more than one day.</p><p>Press the top "
-+"buttons to browse to the next / previous months or years.</p><p>Each line "
-+"shows a week. The number in the left column is the number of the week in the "
-+"year. Press it to select the whole week.</p></qt>"
-+msgstr ""
-+"<qt><p>選擇您要顯示在 KOrganizer 主畫面的日期。如果要選一天以上，請按住滑鼠按"
-+"鍵。</p> <p>按上方的按鈕來瀏覽不同的月份或年度。</p> <p>每一列顯示一週。左方"
-+"的欄位是這個年度的第幾週，按下可以選取整週。</p></qt>"
- 
- #: journalentry.cpp:92
- msgid "[Add Journal Entry]"
-@@ -2177,7 +2209,9 @@
- msgid ""
- "Do you want to start the KOrganizer reminder daemon at login (note that you "
- "will not get reminders whilst the daemon is not running)?"
--msgstr "您要在登入時啟動 KOrganizer 提醒守護程式嗎？注意，若守護程式未啟動，您就無法收到事前提醒通知。"
-+msgstr ""
-+"您要在登入時啟動 KOrganizer 提醒守護程式嗎？注意，若守護程式未啟動，您就無法"
-+"收到事前提醒通知。"
- 
- #: korgac/alarmdockwindow.cpp:182
- msgid "Close KOrganizer Reminder Daemon"
-@@ -2201,7 +2235,7 @@
- 
- #: koeditorgeneralevent.cpp:158 korgac/alarmdialog.cpp:82
- msgid "Edit..."
--msgstr "編輯..."
-+msgstr "編輯…"
- 
- #: korgac/alarmdialog.cpp:82
- msgid "Suspend"
-@@ -2260,15 +2294,18 @@
- "section of the KDE Control Center. In addition, identities are gathered from "
- "your KMail settings and from your address book. If you choose to set it "
- "globally for KDE in the Control Center, be sure to check 'Use email settings "
--"from Control Center' in the 'Personal' section of the KOrganizer configuration."
-+"from Control Center' in the 'Personal' section of the KOrganizer "
-+"configuration."
- msgstr ""
--"將身份設定為此待辦事件或事件的組織者。身份可以在 KOrganizer 設定中的「個人」區設定，或是在 KDE "
--"控制中心裡，「安全性」中的「帳號與密碼」中設定。此外，也可以由您的 KMail 設定及您的通訊錄中收集身份。如果您決定要在控制中心設定一個 KDE "
--"通用的身份，請在 KOrganizer 設定中的「個人」區選擇「使用控制中心的電子郵件設定」。"
-+"將身分設定為此待辦事件或事件的組織者。身分可以在 KOrganizer 設定中的「個人」"
-+"區設定，或是在 KDE 控制中心裡，「安全性」中的「帳號與密碼」中設定。此外，也可"
-+"以由您的 KMail 設定及您的通訊錄中收集身分。如果您決定要在控制中心設定一個 "
-+"KDE 通用的身分，請在 KOrganizer 設定中的「個人」區選擇「使用控制中心的電子郵"
-+"件設定」。"
- 
- #: koattendeeeditor.cpp:75 koattendeeeditor.cpp:283
- msgid "Identity as organizer:"
--msgstr "組織者的身份："
-+msgstr "組織者的身分："
- 
- #: koattendeeeditor.cpp:89
- msgid ""
-@@ -2294,7 +2331,8 @@
- 
- #: koattendeeeditor.cpp:124
- msgid ""
--"Edits the current attendance status of the attendee selected in the list above."
-+"Edits the current attendance status of the attendee selected in the list "
-+"above."
- msgstr "編輯上方清單中所選取的參加狀態。"
- 
- #: koattendeeeditor.cpp:128
-@@ -2320,12 +2358,14 @@
- 
- #: koattendeeeditor.cpp:163
- msgid ""
--"Adds a new attendee to the list. Once the attendee is added, you will be able "
--"to edit the attendee's name, role, attendance status, and whether or not the "
--"attendee is required to respond to the invitation. To select an attendee from "
--"your addressbook, click the 'Select Addressee' button instead."
--msgstr ""
--"在清單中增加一個新的參加者。增加之後，您可以編輯該名參加者的名稱、角色、參與狀態以及是否要求對方回覆此邀請。要從您的通訊錄中選取參加者，請點選「選擇收件者」。"
-+"Adds a new attendee to the list. Once the attendee is added, you will be "
-+"able to edit the attendee's name, role, attendance status, and whether or "
-+"not the attendee is required to respond to the invitation. To select an "
-+"attendee from your addressbook, click the 'Select Addressee' button instead."
-+msgstr ""
-+"在清單中增加一個新的參加者。增加之後，您可以編輯該名參加者的名稱、角色、參與"
-+"狀態以及是否要求對方回覆此邀請。要從您的通訊錄中選取參加者，請點選「選擇收件"
-+"者」。"
- 
- #: koattendeeeditor.cpp:175
- msgid "Removes the attendee selected in the list above."
-@@ -2333,7 +2373,7 @@
- 
- #: koattendeeeditor.cpp:179
- msgid "Select Addressee..."
--msgstr "選擇收件者..."
-+msgstr "選擇收件者…"
- 
- #: koattendeeeditor.cpp:182
- msgid "Opens your address book, allowing you to select new attendees from it."
-@@ -2389,7 +2429,7 @@
- 
- #: actionmanager.cpp:253
- msgid "Import &Calendar..."
--msgstr "匯入行事曆...(&C)"
-+msgstr "匯入行事曆…(&C)"
- 
- #: actionmanager.cpp:255
- msgid "&Import From UNIX Ical tool"
-@@ -2397,27 +2437,27 @@
- 
- #: actionmanager.cpp:257
- msgid "Get &Hot New Stuff..."
--msgstr "取得熱門新事件...(&H)"
-+msgstr "取得熱門新事件…(&H)"
- 
- #: actionmanager.cpp:261
- msgid "Export &Web Page..."
--msgstr "匯出網頁...(&W)"
-+msgstr "匯出網頁…(&W)"
- 
- #: actionmanager.cpp:264
- msgid "&iCalendar..."
--msgstr "&iCalendar..."
-+msgstr "&iCalendar…"
- 
- #: actionmanager.cpp:267
- msgid "&vCalendar..."
--msgstr "&vCalendar..."
-+msgstr "&vCalendar…"
- 
- #: actionmanager.cpp:270
- msgid "Upload &Hot New Stuff..."
--msgstr "上傳熱門新事件...(&H)"
-+msgstr "上傳熱門新事件…(&H)"
- 
- #: actionmanager.cpp:276
- msgid "Archive O&ld Entries..."
--msgstr "將舊項目打包...(&L)"
-+msgstr "將舊項目打包…(&L)"
- 
- #: actionmanager.cpp:278
- msgid ""
-@@ -2506,11 +2546,11 @@
- 
- #: actionmanager.cpp:448
- msgid "New E&vent..."
--msgstr "新事件...(&V)"
-+msgstr "新事件…(&V)"
- 
- #: actionmanager.cpp:462
- msgid "New &Journal..."
--msgstr "新日誌...(&J)"
-+msgstr "新日誌…(&J)"
- 
- #: actionmanager.cpp:477
- msgid "&Make Sub-to-do Independent"
-@@ -2518,7 +2558,7 @@
- 
- #: actionmanager.cpp:496
- msgid "&Publish Item Information..."
--msgstr "發布項目資訊...(&P)"
-+msgstr "發布項目資訊…(&P)"
- 
- #: actionmanager.cpp:501
- msgid "Send &Invitation to Attendees"
-@@ -2544,11 +2584,11 @@
- 
- #: actionmanager.cpp:536
- msgid "&Send as iCalendar..."
--msgstr "以 iCalendar 送出(&S)..."
-+msgstr "以 iCalendar 送出(&S)…"
- 
- #: actionmanager.cpp:541
- msgid "&Mail Free Busy Information..."
--msgstr "寄發行程資訊郵件...(&M)"
-+msgstr "寄發行程資訊郵件…(&M)"
- 
- #: actionmanager.cpp:546
- msgid "&Upload Free Busy Information"
-@@ -2580,19 +2620,19 @@
- 
- #: actionmanager.cpp:606
- msgid "Configure &Date && Time..."
--msgstr "設定日期和時間...(&D)"
-+msgstr "設定日期和時間…(&D)"
- 
- #: actionmanager.cpp:613
- msgid "Manage View &Filters..."
--msgstr "管理檢視過濾器...(&F)"
-+msgstr "管理檢視過濾器…(&F)"
- 
- #: actionmanager.cpp:616
- msgid "Manage C&ategories..."
--msgstr "管理分類...(&A)"
-+msgstr "管理分類…(&A)"
- 
- #: actionmanager.cpp:620
- msgid "&Configure Calendar..."
--msgstr "設定行事曆...(&C)"
-+msgstr "設定行事曆…(&C)"
- 
- #: actionmanager.cpp:645 actionmanager.cpp:647
- msgid "Filter: "
-@@ -2606,21 +2646,23 @@
- msgid ""
- "You have no ical file in your home directory.\n"
- "Import cannot proceed.\n"
--msgstr ""
--"在您的家目錄中沒有 ical 檔案，無法匯入。\n"
-+msgstr "在您的家目錄中沒有 ical 檔案，無法匯入。\n"
- 
- #: actionmanager.cpp:771
- msgid ""
--"KOrganizer successfully imported and merged your .calendar file from ical into "
--"the currently opened calendar."
--msgstr "KOrganizer 已經成功匯入您的 ical .calendar 檔並合併到您開啟中的行事曆中。"
-+"KOrganizer successfully imported and merged your .calendar file from ical "
-+"into the currently opened calendar."
-+msgstr ""
-+"KOrganizer 已經成功匯入您的 ical .calendar 檔並合併到您開啟中的行事曆中。"
- 
- #: actionmanager.cpp:777
- msgid ""
- "KOrganizer encountered some unknown fields while parsing your .calendar ical "
--"file, and had to discard them; please check to see that all your relevant data "
--"was correctly imported."
--msgstr "KOrganizer 在剖析您的 ical .calendar 檔案時遇到一些未知欄位，必須將其拋棄。請檢查您的資料是否已正確匯入。"
-+"file, and had to discard them; please check to see that all your relevant "
-+"data was correctly imported."
-+msgstr ""
-+"KOrganizer 在剖析您的 ical .calendar 檔案時遇到一些未知欄位，必須將其拋棄。請"
-+"檢查您的資料是否已正確匯入。"
- 
- #: actionmanager.cpp:781
- msgid "ICal Import Successful with Warning"
-@@ -2628,8 +2670,8 @@
- 
- #: actionmanager.cpp:784
- msgid ""
--"KOrganizer encountered an error parsing your .calendar file from ical; import "
--"has failed."
-+"KOrganizer encountered an error parsing your .calendar file from ical; "
-+"import has failed."
- msgstr "KOrganizer 剖析您的 ical .calendar 檔案時發生錯誤。匯入失敗。"
- 
- #: actionmanager.cpp:788
-@@ -2664,9 +2706,11 @@
- 
- #: actionmanager.cpp:990
- msgid ""
--"Your calendar will be saved in iCalendar format. Use 'Export vCalendar' to save "
--"in vCalendar format."
--msgstr "將用 iCalendar 檔案格式儲存您的行事曆。要存成 vCalendar 格式，請使用「匯出 vCalendar」。"
-+"Your calendar will be saved in iCalendar format. Use 'Export vCalendar' to "
-+"save in vCalendar format."
-+msgstr ""
-+"將用 iCalendar 檔案格式儲存您的行事曆。要存成 vCalendar 格式，請使用「匯出 "
-+"vCalendar」。"
- 
- #: actionmanager.cpp:992
- msgid "Format Conversion"
-@@ -2714,11 +2758,11 @@
- 
- #: actionmanager.cpp:1434
- msgid "&Edit Event..."
--msgstr "編輯事件...(&E)"
-+msgstr "編輯事件…(&E)"
- 
- #: actionmanager.cpp:1435
- msgid "&Delete Event"
--msgstr "刪除事件...(&D)"
-+msgstr "刪除事件…(&D)"
- 
- #: actionmanager.cpp:1439
- msgid "&Show To-do"
-@@ -2726,7 +2770,7 @@
- 
- #: actionmanager.cpp:1440
- msgid "&Edit To-do..."
--msgstr "編輯待辦事項...(&E)"
-+msgstr "編輯待辦事項…(&E)"
- 
- #: actionmanager.cpp:1441
- msgid "&Delete To-do"
-@@ -2766,7 +2810,8 @@
- 
- #: actionmanager.cpp:1788
- msgid ""
--"The calendar contains unsaved changes. Do you want to save them before exiting?"
-+"The calendar contains unsaved changes. Do you want to save them before "
-+"exiting?"
- msgstr "行事曆有未儲存的變更。您要在離開前先存檔嗎？"
- 
- #: actionmanager.cpp:1793
-@@ -2878,7 +2923,9 @@
- "Select this option if you do not want to show recurring events and to-dos in "
- "your views. Daily and weekly recurring items may take a lot of space, so it "
- "might be handy to hide them."
--msgstr "如果您不想在您的檢視中顯示循環事件與待辦事項，請選取此項。通常每日或每週循環的項目會佔掉很多空間，所以您可以考慮隱藏它們。"
-+msgstr ""
-+"如果您不想在您的檢視中顯示循環事件與待辦事項，請選取此項。通常每日或每週循環"
-+"的項目會佔掉很多空間，所以您可以考慮隱藏它們。"
- 
- #. i18n: file filteredit_base.ui line 90
- #: rc.cpp:117 rc.cpp:2093
-@@ -2893,7 +2940,9 @@
- "If this box is checked, the filter will hide all to-do items from the list, "
- "that have been completed. Optionally, only items that have been completed a "
- "given number of days are hidden."
--msgstr "勾選此選項的話，過濾器會將所有已完成的待辦事項隱藏起來。另外也可以選擇要隱藏已完成多久的待辦事項。"
-+msgstr ""
-+"勾選此選項的話，過濾器會將所有已完成的待辦事項隱藏起來。另外也可以選擇要隱藏"
-+"已完成多久的待辦事項。"
- 
- #. i18n: file filteredit_base.ui line 129
- #: rc.cpp:123 rc.cpp:2099
-@@ -2905,10 +2954,13 @@
- #: rc.cpp:126 rc.cpp:2102
- #, no-c-format
- msgid ""
--"This option will allow you to select which completed to-dos should be hidden. "
--"When you choose <i>Immediately</i>, it will hide the to-do as soon as you check "
--"it. You can increase or decrease the number of days in the spinbox."
--msgstr "這個選項讓您可以選擇要隱藏已完成多久的待辦事項。如果您選擇<i>立刻</i>，則所有已完成的待辦事項都會立即被隱藏。"
-+"This option will allow you to select which completed to-dos should be "
-+"hidden. When you choose <i>Immediately</i>, it will hide the to-do as soon "
-+"as you check it. You can increase or decrease the number of days in the "
-+"spinbox."
-+msgstr ""
-+"這個選項讓您可以選擇要隱藏已完成多久的待辦事項。如果您選擇<i>立刻</i>，則所有"
-+"已完成的待辦事項都會立即被隱藏。"
- 
- #. i18n: file filteredit_base.ui line 152
- #: rc.cpp:129 rc.cpp:2105
-@@ -2921,11 +2973,13 @@
- #, no-c-format
- msgid ""
- "Here you can give the number of days a to-do item has to be completed to be "
--"hidden from the to-do list. If you select \"Immediately\", all completed to-dos "
--"will be hidden. If you, for example, choose a value of 1, all to-do items will "
--"be hidden, that have been marked finished longer than 24 hours ago."
-+"hidden from the to-do list. If you select \"Immediately\", all completed to-"
-+"dos will be hidden. If you, for example, choose a value of 1, all to-do "
-+"items will be hidden, that have been marked finished longer than 24 hours "
-+"ago."
- msgstr ""
--"您可以決定要隱藏已完成幾天的待辦事項。如果您選擇「立刻」，則所有已完成的待辦事項都會被隱藏。如果選擇一天，則會將已完成超過廿四小時的待辦事項隱藏起來。"
-+"您可以決定要隱藏已完成幾天的待辦事項。如果您選擇「立刻」，則所有已完成的待辦"
-+"事項都會被隱藏。如果選擇一天，則會將已完成超過廿四小時的待辦事項隱藏起來。"
- 
- #. i18n: file filteredit_base.ui line 182
- #: rc.cpp:135 rc.cpp:2111
-@@ -2937,8 +2991,9 @@
- #: rc.cpp:138 rc.cpp:2114
- #, no-c-format
- msgid ""
--"This option hides all to-dos from your list, where the start date has not been "
--"reached. (Note that the start date is not the due date of the to-do item.)"
-+"This option hides all to-dos from your list, where the start date has not "
-+"been reached. (Note that the start date is not the due date of the to-do "
-+"item.)"
- msgstr "這個選項會將未啟動的（也就是啟動日期還沒到的）待辦事項隱藏起來。"
- 
- #. i18n: file filteredit_base.ui line 235
-@@ -2951,8 +3006,8 @@
- #: rc.cpp:147 rc.cpp:2123
- #, no-c-format
- msgid ""
--"When this option is enabled, this filter will show all items which do <i>not</i> "
--"contain the selected categories."
-+"When this option is enabled, this filter will show all items which do "
-+"<i>not</i> contain the selected categories."
- msgstr "選取此選項，過濾器會顯示所有不屬於選取的類別的項目。"
- 
- #. i18n: file filteredit_base.ui line 252
-@@ -2973,7 +3028,7 @@
- #: rc.cpp:156 rc.cpp:2132
- #, no-c-format
- msgid "Change..."
--msgstr "變更..."
-+msgstr "變更…"
- 
- #. i18n: file filteredit_base.ui line 282
- #: rc.cpp:159 rc.cpp:2135
-@@ -2985,11 +3040,13 @@
- #: rc.cpp:162 rc.cpp:2138
- #, no-c-format
- msgid ""
--"This option hides all to-dos from your list which are assigned to someone else."
--"<br>\n"
--"Only to-dos which have least one attendee will be checked.  If you are not in "
--"the list of attendees the to-do will be hidden."
--msgstr "這個選項會將所有不屬於自己的待辦事項隱藏起來。<br> 它只會檢查超過一個以上參加者的待辦事項。如果您不在此參加者中，則此待辦事項會被隱藏。"
-+"This option hides all to-dos from your list which are assigned to someone "
-+"else.<br>\n"
-+"Only to-dos which have least one attendee will be checked.  If you are not "
-+"in the list of attendees the to-do will be hidden."
-+msgstr ""
-+"這個選項會將所有不屬於自己的待辦事項隱藏起來。<br> 它只會檢查超過一個以上參加"
-+"者的待辦事項。如果您不在此參加者中，則此待辦事項會被隱藏。"
- 
- #. i18n: file koeditoralarms_base.ui line 16
- #: rc.cpp:166 rc.cpp:1880
-@@ -3133,7 +3190,7 @@
- #: rc.cpp:250 rc.cpp:1964
- #, no-c-format
- msgid "&Remove..."
--msgstr "移除...(&R)"
-+msgstr "移除…(&R)"
- 
- #. i18n: file koeditoralarms_base.ui line 554
- #: rc.cpp:256 rc.cpp:1970
-@@ -3158,10 +3215,11 @@
- #, no-c-format
- msgid ""
- "By publishing Free/Busy information, you allow others to take your calendar "
--"into account when inviting you for a meeting. Only the times you have already "
--"busy are published, not why they are busy."
-+"into account when inviting you for a meeting. Only the times you have "
-+"already busy are published, not why they are busy."
- msgstr ""
--"發布行程資訊（Free/Busy）後，其他人可以讀取您的行程表，並考慮是否邀請您參加會議。這只會發布您何時沒有空閒，而不會列出您那時要做什麼。"
-+"發布行程資訊（Free/Busy）後，其他人可以讀取您的行程表，並考慮是否邀請您參加會"
-+"議。這只會發布您何時沒有空閒，而不會列出您那時要做什麼。"
- 
- #. i18n: file kogroupwareprefspage.ui line 53
- #: rc.cpp:274 rc.cpp:897
-@@ -3176,13 +3234,15 @@
- "Check this box to upload your Free/Busy information automatically.\n"
- "It is possible to skip this option and mail or upload your Free/Busy "
- "information using the Schedule menu of KOrganizer.\n"
--"Note: If KOrganizer is acting as a KDE Kolab client, this is not required, as "
--"the Kolab2 server taking care of publishing your Free/Busy information and "
--"manages the access to it from other users."
-+"Note: If KOrganizer is acting as a KDE Kolab client, this is not required, "
-+"as the Kolab2 server taking care of publishing your Free/Busy information "
-+"and manages the access to it from other users."
- msgstr ""
- "勾選此選項，您的行程資訊會自動上傳。\n"
--"您也可以取消此選項，並在 KOrganizer 的「時間表」上設定郵寄或上傳您的行程資訊。\n"
--"注意：如果 KOrganizer 做為 KDE Kolab 的客戶端程式，則不需要如此。Kolab2 伺服器會負責發布並管理您的行程資訊。"
-+"您也可以取消此選項，並在 KOrganizer 的「時間表」上設定郵寄或上傳您的行程資"
-+"訊。\n"
-+"注意：如果 KOrganizer 做為 KDE Kolab 的客戶端程式，則不需要如此。Kolab2 伺服"
-+"器會負責發布並管理您的行程資訊。"
- 
- #. i18n: file kogroupwareprefspage.ui line 74
- #: rc.cpp:282 rc.cpp:905
-@@ -3209,8 +3269,8 @@
- #: rc.cpp:294 rc.cpp:297 rc.cpp:303 rc.cpp:917 rc.cpp:920 rc.cpp:926
- #, no-c-format
- msgid ""
--"Configure the number of calendar days you wish to be published and available to "
--"others here."
-+"Configure the number of calendar days you wish to be published and available "
-+"to others here."
- msgstr "設定您希望發布多少天的行程給其他人知道。"
- 
- #. i18n: file kogroupwareprefspage.ui line 140
-@@ -3232,12 +3292,13 @@
- "Enter the URL for the server on which your Free/Busy information shall be "
- "published here.\n"
- "Ask the server administrator for this information.\n"
--"Here is a Kolab2 server URL example: "
--"\"webdavs://kolab2.com/freebusy/joe@kolab2.com.ifb\""
-+"Here is a Kolab2 server URL example: \"webdavs://kolab2.com/freebusy/"
-+"joe@kolab2.com.ifb\""
- msgstr ""
- "輸入您要發布行程資訊的網址。\n"
- "相關資訊請詢問系統管理員。\n"
--"以 Kolab2 伺服器為例，其網址像這樣：\"webdavs://kolab2.com/freebusy/joe@kolab2.com.ifb\""
-+"以 Kolab2 伺服器為例，其網址像這樣：\"webdavs://kolab2.com/freebusy/"
-+"joe@kolab2.com.ifb\""
- 
- #. i18n: file kogroupwareprefspage.ui line 194
- #: rc.cpp:314 rc.cpp:937
-@@ -3255,7 +3316,8 @@
- "For security reasons, it is not recommended to store your password in the "
- "configuration file."
- msgstr ""
--"勾選此選項能讓 KOrganizer 記注您的密碼，不會每次上傳行程資訊時就詢問一次。不過密碼會儲存在設定檔中。為了安全起見，我們不建議您儲存。"
-+"勾選此選項能讓 KOrganizer 記注您的密碼，不會每次上傳行程資訊時就詢問一次。不"
-+"過密碼會儲存在設定檔中。為了安全起見，我們不建議您儲存。"
- 
- #. i18n: file kogroupwareprefspage.ui line 206
- #: plugins/exchange/exchangeconfig.cpp:59 rc.cpp:321 rc.cpp:944
-@@ -3283,7 +3345,8 @@
- msgstr ""
- "輸入伺服器上您的登入帳號資訊。\n"
- "\n"
--"Kolab2 伺服器要特別注意：請先註冊您的代碼（UID）。預設您的代碼會是您在 Kolab2 上的電子郵件地址，但也有可能不同。如果不是，請輸入您的代碼。"
-+"Kolab2 伺服器要特別注意：請先註冊您的代碼（UID）。預設您的代碼會是您在 "
-+"Kolab2 上的電子郵件地址，但也有可能不同。如果不是，請輸入您的代碼。"
- 
- #. i18n: file kogroupwareprefspage.ui line 247
- #: rc.cpp:335 rc.cpp:958
-@@ -3321,9 +3384,9 @@
- #: rc.cpp:360 rc.cpp:983
- #, no-c-format
- msgid ""
--"Check this box to retrieve other peoples' Free/Busy information automatically. "
--"Note that you have to fill the correct server information to make this "
--"possible."
-+"Check this box to retrieve other peoples' Free/Busy information "
-+"automatically. Note that you have to fill the correct server information to "
-+"make this possible."
- msgstr "勾選此選項以自動取得其他人的行程資訊。注意，您要填入正確的伺服器資訊。"
- 
- #. i18n: file kogroupwareprefspage.ui line 347
-@@ -3343,13 +3406,14 @@
- #: rc.cpp:369 rc.cpp:992
- #, no-c-format
- msgid ""
--"Check this box to download a free/busy file in the format \"user@domain.ifb\" "
--"(for example joe@company.com.ifb). Otherwise, it will download a free/busy file "
--"in the format user.ifb (for example joe.ifb). Ask the server Administrator if "
--"you are not sure about how to configure this option."
--msgstr ""
--"勾選此選項的話，在下載他人行程資訊時，會使用完整的電子郵件地址（例如：joe@company.com.ifb），否則只會使用簡短格式（如：user.ifb）。如"
--"果您不確定要怎麼設定，請詢問您的系統管理員。"
-+"Check this box to download a free/busy file in the format \"user@domain.ifb"
-+"\" (for example joe@company.com.ifb). Otherwise, it will download a free/"
-+"busy file in the format user.ifb (for example joe.ifb). Ask the server "
-+"Administrator if you are not sure about how to configure this option."
-+msgstr ""
-+"勾選此選項的話，在下載他人行程資訊時，會使用完整的電子郵件地址（例如："
-+"joe@company.com.ifb），否則只會使用簡短格式（如：user.ifb）。如果您不確定要怎"
-+"麼設定，請詢問您的系統管理員。"
- 
- #. i18n: file kogroupwareprefspage.ui line 388
- #: rc.cpp:378 rc.cpp:383 rc.cpp:1001 rc.cpp:1006
-@@ -3392,7 +3456,7 @@
- #: rc.cpp:432 rc.cpp:1874
- #, no-c-format
- msgid "Select &Addressee..."
--msgstr "選擇收件人...(&A)"
-+msgstr "選擇收件人…(&A)"
- 
- #. i18n: file template_management_dialog_base.ui line 16
- #: rc.cpp:438 rc.cpp:1478
-@@ -3405,9 +3469,11 @@
- #, no-c-format
- msgid ""
- "Select a template and click <b>Apply Template</b> to apply it to the current "
--"event or task. Click <b>New</b> to create a new template based on the current "
--"event or task."
--msgstr "選擇一個樣本，並按下<b>套用樣本</b>來將它套用到目前的事件或工作。按下<b>新增</b>會依目前的事件或工作來產生新的樣本。"
-+"event or task. Click <b>New</b> to create a new template based on the "
-+"current event or task."
-+msgstr ""
-+"選擇一個樣本，並按下<b>套用樣本</b>來將它套用到目前的事件或工作。按下<b>新增"
-+"</b>會依目前的事件或工作來產生新的樣本。"
- 
- #. i18n: file template_management_dialog_base.ui line 65
- #: rc.cpp:450 rc.cpp:1490 templatemanagementdialog.cpp:50
-@@ -3426,11 +3492,12 @@
- #, no-c-format
- msgid ""
- "Check this box to save your calendar file automatically when you exit "
--"KOrganizer without asking and periodically, as you work. This setting does not "
--"affect the automatic saving of the standard calendar, which is automatically "
--"saved after each change."
-+"KOrganizer without asking and periodically, as you work. This setting does "
-+"not affect the automatic saving of the standard calendar, which is "
-+"automatically saved after each change."
- msgstr ""
--"勾選此選項的話，在您離開 KOrganizer 時會自動儲存您的行事曆檔案，而不會詢問。這個設定不影響標準的自動儲存功能，後者是在每次變更時就儲存。"
-+"勾選此選項的話，在您離開 KOrganizer 時會自動儲存您的行事曆檔案，而不會詢問。"
-+"這個設定不影響標準的自動儲存功能，後者是在每次變更時就儲存。"
- 
- #. i18n: file korganizer.kcfg line 16
- #: rc.cpp:459 rc.cpp:1046
-@@ -3442,10 +3509,12 @@
- #: rc.cpp:462 rc.cpp:1049
- #, no-c-format
- msgid ""
--"Set the interval between automatic saving of calendar events in minutes here. "
--"This setting only applies to files that are opened manually. The standard "
--"KDE-wide calendar is automatically saved after each change."
--msgstr "設定自動儲存行事曆事件的時間間隔。這只會套用到您手動開啟的行事曆檔案，而不影響標準的行事曆自動儲存功能。"
-+"Set the interval between automatic saving of calendar events in minutes "
-+"here. This setting only applies to files that are opened manually. The "
-+"standard KDE-wide calendar is automatically saved after each change."
-+msgstr ""
-+"設定自動儲存行事曆事件的時間間隔。這只會套用到您手動開啟的行事曆檔案，而不影"
-+"響標準的行事曆自動儲存功能。"
- 
- #. i18n: file korganizer.kcfg line 22
- #: rc.cpp:465 rc.cpp:1052
-@@ -3499,8 +3568,8 @@
- #: rc.cpp:489 rc.cpp:1076
- #, no-c-format
- msgid ""
--"If auto-archiving is enabled, events older than this amount will be archived. "
--"The unit of this value is specified in another field."
-+"If auto-archiving is enabled, events older than this amount will be "
-+"archived. The unit of this value is specified in another field."
- msgstr "如果自動歸檔功能開啟，則舊事件會自動歸檔。"
- 
- #. i18n: file korganizer.kcfg line 57
-@@ -3543,10 +3612,12 @@
- #: rc.cpp:510 rc.cpp:1097
- #, no-c-format
- msgid ""
--"Check this box to export the calendar to an HTML-file every time you save it. "
--"By default, this file will be called calendar.html and placed in the user home "
--"folder."
--msgstr "勾選此選項，每次儲存行事曆時會將行事曆匯出成 HTML 檔。預設檔名為 calendar.html，並置於使用者的家目錄中。"
-+"Check this box to export the calendar to an HTML-file every time you save "
-+"it. By default, this file will be called calendar.html and placed in the "
-+"user home folder."
-+msgstr ""
-+"勾選此選項，每次儲存行事曆時會將行事曆匯出成 HTML 檔。預設檔名為 calendar."
-+"html，並置於使用者的家目錄中。"
- 
- #. i18n: file korganizer.kcfg line 81
- #: rc.cpp:513 rc.cpp:1100
-@@ -3579,12 +3650,14 @@
- #, no-c-format
- msgid ""
- "Select this option to choose the resource to be used to record the item each "
--"time you create a new event, to-do or journal entry. This choice is recommended "
--"if you intend to use the shared folders functionality of the Kolab server or "
--"have to manage multiple accounts using Kontact as a KDE Kolab client. "
--msgstr ""
--"選取此選項，會詢問您要將新增項目放到哪個資源中。如果您要使用 Kolab 伺服器上的共享資料夾功能，或是使用 Kontact 為 Kolab "
--"客戶端來管理不同的帳號，建議選取此選項。"
-+"time you create a new event, to-do or journal entry. This choice is "
-+"recommended if you intend to use the shared folders functionality of the "
-+"Kolab server or have to manage multiple accounts using Kontact as a KDE "
-+"Kolab client. "
-+msgstr ""
-+"選取此選項，會詢問您要將新增項目放到哪個資源中。如果您要使用 Kolab 伺服器上的"
-+"共享資料夾功能，或是使用 Kontact 為 Kolab 客戶端來管理不同的帳號，建議選取此"
-+"選項。"
- 
- #. i18n: file korganizer.kcfg line 98
- #: rc.cpp:528 rc.cpp:1115
-@@ -3598,7 +3671,9 @@
- msgid ""
- "Check this box to get a copy of all e-mail messages that KOrganizer sends at "
- "your request to event attendees."
--msgstr "勾選此選項的話，KOrganizer 送出電子郵件給事件參加者時，也會送一份複本給擁有者。"
-+msgstr ""
-+"勾選此選項的話，KOrganizer 送出電子郵件給事件參加者時，也會送一份複本給擁有"
-+"者。"
- 
- #. i18n: file korganizer.kcfg line 103
- #: rc.cpp:534 rc.cpp:1121
-@@ -3610,10 +3685,12 @@
- #: rc.cpp:537 rc.cpp:1124
- #, no-c-format
- msgid ""
--"Check this box to use the KDE-wide e-mail settings, which are defined using the "
--"KDE Control Center &quot;Password & User Account&quot; Module. Uncheck this box "
--"to be able to specify your full name and e-mail."
--msgstr "勾選此選項的話，則使用 KDE 控制中心裡設定的電子郵件設定，否則您也可以指定您的全名與電子郵件地址。"
-+"Check this box to use the KDE-wide e-mail settings, which are defined using "
-+"the KDE Control Center &quot;Password & User Account&quot; Module. Uncheck "
-+"this box to be able to specify your full name and e-mail."
-+msgstr ""
-+"勾選此選項的話，則使用 KDE 控制中心裡設定的電子郵件設定，否則您也可以指定您的"
-+"全名與電子郵件地址。"
- 
- #. i18n: file korganizer.kcfg line 108
- #: rc.cpp:540 rc.cpp:1127
-@@ -3641,7 +3718,9 @@
- msgid ""
- "Enter here your e-mail address. This e-mail address will be used to identify "
- "the owner of the calendar, and displayed in events and to-dos you create."
--msgstr "輸入您的電子郵件地址。此電子郵件地址會用於辨識行事曆的擁有者，並顯示在您建立的事件或待辦事項中。"
-+msgstr ""
-+"輸入您的電子郵件地址。此電子郵件地址會用於辨識行事曆的擁有者，並顯示在您建立"
-+"的事件或待辦事項中。"
- 
- #. i18n: file korganizer.kcfg line 118
- #: rc.cpp:552 rc.cpp:1139
-@@ -3673,10 +3752,12 @@
- #: rc.cpp:564 rc.cpp:1151
- #, no-c-format
- msgid ""
--"Select this option to use sendmail as the mail transport. The mail transport is "
--"used for groupware functionality. Please check if you have sendmail installed "
--"before selecting this option."
--msgstr "選取此項使用 sendmail 做為郵件傳送軟體。要使用此項，請先檢查 sendmail 是否已經正確安裝。"
-+"Select this option to use sendmail as the mail transport. The mail transport "
-+"is used for groupware functionality. Please check if you have sendmail "
-+"installed before selecting this option."
-+msgstr ""
-+"選取此項使用 sendmail 做為郵件傳送軟體。要使用此項，請先檢查 sendmail 是否已"
-+"經正確安裝。"
- 
- #. i18n: file korganizer.kcfg line 142
- #: rc.cpp:576 rc.cpp:1163
-@@ -3742,9 +3823,11 @@
- #, no-c-format
- msgid ""
- "Check this box to show the days containing daily recurring events in bold "
--"typeface in the Date Navigator, or uncheck it to give more prominence to other "
--"(non daily recurring) events."
--msgstr "勾選此選項，在瀏覽日期時會顯示每天循環的事件。您也可以不要使用此選項，以便突顯其他非每日循環的事件。"
-+"typeface in the Date Navigator, or uncheck it to give more prominence to "
-+"other (non daily recurring) events."
-+msgstr ""
-+"勾選此選項，在瀏覽日期時會顯示每天循環的事件。您也可以不要使用此選項，以便突"
-+"顯其他非每日循環的事件。"
- 
- #. i18n: file korganizer.kcfg line 172
- #: rc.cpp:606 rc.cpp:1193
-@@ -3757,9 +3840,11 @@
- #, no-c-format
- msgid ""
- "Check this box to show the days containing weekly recurring events in bold "
--"typeface in the Date Navigator, or uncheck it to give more prominence to other "
--"(non weekly recurring) events."
--msgstr "勾選此選項，在瀏覽日期時會顯示每週循環的事件。您也可以不要使用此選項，以便突顯其他非每週循環的事件。"
-+"typeface in the Date Navigator, or uncheck it to give more prominence to "
-+"other (non weekly recurring) events."
-+msgstr ""
-+"勾選此選項，在瀏覽日期時會顯示每週循環的事件。您也可以不要使用此選項，以便突"
-+"顯其他非每週循環的事件。"
- 
- #. i18n: file korganizer.kcfg line 177
- #: rc.cpp:612 rc.cpp:1199
-@@ -3771,8 +3856,8 @@
- #: rc.cpp:615 rc.cpp:1202
- #, no-c-format
- msgid ""
--"Check this box to display an event summary tooltip when hovering the mouse over "
--"an event."
-+"Check this box to display an event summary tooltip when hovering the mouse "
-+"over an event."
- msgstr "勾選此選項，在滑鼠移到顯示的事件上方時，會顯示事件的摘要。"
- 
- #. i18n: file korganizer.kcfg line 182
-@@ -3787,7 +3872,9 @@
- msgid ""
- "Check this box to display to-dos in the day, week, and month view. This is "
- "helpful when you have a lot of (recurring) to-dos."
--msgstr "勾選此選項的話，會以日、週與月檢視顯示待辦事項。通常如果您有一大堆的待辦事項的話，這會很好用。"
-+msgstr ""
-+"勾選此選項的話，會以日、週與月檢視顯示待辦事項。通常如果您有一大堆的待辦事項"
-+"的話，這會很好用。"
- 
- #. i18n: file korganizer.kcfg line 187
- #: rc.cpp:624 rc.cpp:1211
-@@ -3799,9 +3886,10 @@
- #: rc.cpp:627 rc.cpp:1214
- #, no-c-format
- msgid ""
--"Check this box to display scrollbars when clicking on a cell in the month view; "
--"they will only appear when needed though."
--msgstr "勾選此選項，在月覽表中每天的格子中加上捲軸。不過只有需要的時候才會出現。"
-+"Check this box to display scrollbars when clicking on a cell in the month "
-+"view; they will only appear when needed though."
-+msgstr ""
-+"勾選此選項，在月覽表中每天的格子中加上捲軸。不過只有需要的時候才會出現。"
- 
- #. i18n: file korganizer.kcfg line 192
- #: rc.cpp:630 rc.cpp:1217
-@@ -3813,10 +3901,12 @@
- #: rc.cpp:633 rc.cpp:1220
- #, no-c-format
- msgid ""
--"Check this box to start the event editor automatically when you select a time "
--"range in the daily and weekly view. To select a time range, drag the mouse from "
--"the start time to the end time of the event you are about to plan."
--msgstr "勾選此選項的話，您在日覽表或週覽表中選擇時間範圍時，會自動啟動事件編輯器。要選擇時間範圍，您可以用滑鼠從啟始時間拖曳到結束時間。"
-+"Check this box to start the event editor automatically when you select a "
-+"time range in the daily and weekly view. To select a time range, drag the "
-+"mouse from the start time to the end time of the event you are about to plan."
-+msgstr ""
-+"勾選此選項的話，您在日覽表或週覽表中選擇時間範圍時，會自動啟動事件編輯器。要"
-+"選擇時間範圍，您可以用滑鼠從啟始時間拖曳到結束時間。"
- 
- #. i18n: file korganizer.kcfg line 198
- #: rc.cpp:636 rc.cpp:1223
-@@ -3830,7 +3920,9 @@
- msgid ""
- "Check this box to display a red line in the day or week view indicating the "
- "current-time line (Marcus Bains line)."
--msgstr "勾選此選項以在日覽表或週覽表中以紅線指出目前的時間（又稱為 Marcus Bains Line，MBL）"
-+msgstr ""
-+"勾選此選項以在日覽表或週覽表中以紅線指出目前的時間（又稱為 Marcus Bains "
-+"Line，MBL）"
- 
- #. i18n: file korganizer.kcfg line 203
- #: rc.cpp:642 rc.cpp:1229
-@@ -3916,7 +4008,8 @@
- msgid ""
- "Enter the start time for events here. This time should be the earliest time "
- "that you use for events, as it will be displayed at the top."
--msgstr "輸入事件的開始時間。這個時間是指您每天要處理事件最早的時間，會顯示在最上面。"
-+msgstr ""
-+"輸入事件的開始時間。這個時間是指您每天要處理事件最早的時間，會顯示在最上面。"
- 
- #. i18n: file korganizer.kcfg line 253
- #: rc.cpp:684 rc.cpp:1271
-@@ -4000,7 +4093,9 @@
- "view. If this box is checked, you will gain some space for the monthly view, "
- "but other widgets, such as the date navigator, the item details and the "
- "resources list, will not be displayed."
--msgstr "勾選此選項，KOrganizer 顯示月覽表時會使用整個視窗，其他的元件如日期瀏覽、項目詳情、資源列表等就不會顯示。"
-+msgstr ""
-+"勾選此選項，KOrganizer 顯示月覽表時會使用整個視窗，其他的元件如日期瀏覽、項目"
-+"詳情、資源列表等就不會顯示。"
- 
- #. i18n: file korganizer.kcfg line 289
- #: rc.cpp:720 rc.cpp:1307
-@@ -4012,11 +4107,13 @@
- #: rc.cpp:723 rc.cpp:1310
- #, no-c-format
- msgid ""
--"Check this box to use the full KOrganizer window when displaying the to-do list "
--"view. If this box is checked, you will gain some space for the to-do list view, "
--"but other widgets, such as the date navigator, the to-do details and the "
--"resources list, will not be displayed."
--msgstr "勾選此選項，KOrganizer 顯示待辦事項時會使用整個視窗，其他的元件如日期瀏覽、待辦事項詳情、資源列表等就不會顯示。"
-+"Check this box to use the full KOrganizer window when displaying the to-do "
-+"list view. If this box is checked, you will gain some space for the to-do "
-+"list view, but other widgets, such as the date navigator, the to-do details "
-+"and the resources list, will not be displayed."
-+msgstr ""
-+"勾選此選項，KOrganizer 顯示待辦事項時會使用整個視窗，其他的元件如日期瀏覽、待"
-+"辦事項詳情、資源列表等就不會顯示。"
- 
- #. i18n: file korganizer.kcfg line 295
- #: rc.cpp:726 rc.cpp:1313
-@@ -4042,10 +4139,11 @@
- #: rc.cpp:735 rc.cpp:1322
- #, no-c-format
- msgid ""
--"Select on this spin box the number of &quot;x&quot; days to be displayed in the "
--"next days view. To access the  the next &quot;x&quot; days view, choose the "
--"&quot;Next X Days&quot; menu item from the &quot;View&quot; menu."
--msgstr "在此選擇要檢視未來幾天。要使用此功能，請在「檢視」選單中選取「未來幾天」。"
-+"Select on this spin box the number of &quot;x&quot; days to be displayed in "
-+"the next days view. To access the  the next &quot;x&quot; days view, choose "
-+"the &quot;Next X Days&quot; menu item from the &quot;View&quot; menu."
-+msgstr ""
-+"在此選擇要檢視未來幾天。要使用此功能，請在「檢視」選單中選取「未來幾天」。"
- 
- #. i18n: file korganizer.kcfg line 348
- #: rc.cpp:738 rc.cpp:1325
-@@ -4057,19 +4155,20 @@
- #: rc.cpp:741 rc.cpp:1328
- #, no-c-format
- msgid ""
--"Check this box to enable automatic generation of mails when creating, updating "
--"or deleting events (or to-dos) involving other attendees. You should check this "
--"box if you want to use the groupware functionality (e.g. Configuring Kontact as "
--"a KDE Kolab client)."
--msgstr ""
--"勾選此選項，在您建立、更新或刪除跟其他參加者有關的事件、待辦事項時，會自動產生電子郵件。如果您要使用群組功能（如設定 Kontact 為 KDE Kolab "
--"的客戶端），建議使用此選項。"
-+"Check this box to enable automatic generation of mails when creating, "
-+"updating or deleting events (or to-dos) involving other attendees. You "
-+"should check this box if you want to use the groupware functionality (e.g. "
-+"Configuring Kontact as a KDE Kolab client)."
-+msgstr ""
-+"勾選此選項，在您建立、更新或刪除跟其他參加者有關的事件、待辦事項時，會自動產"
-+"生電子郵件。如果您要使用群組功能（如設定 Kontact 為 KDE Kolab 的客戶端），建"
-+"議使用此選項。"
- 
- #. i18n: file korganizer.kcfg line 357
- #: rc.cpp:744 rc.cpp:1331
- #, no-c-format
- msgid "Send Outlook-like pseudo counter proposals"
--msgstr ""
-+msgstr "送出類似 Outlook 的假性反提案"
- 
- #. i18n: file korganizer.kcfg line 365
- #: rc.cpp:747 rc.cpp:1334
-@@ -4081,9 +4180,10 @@
- #: rc.cpp:750 rc.cpp:1337
- #, no-c-format
- msgid ""
--"Select the holiday color here. The holiday color will be used for the holiday "
--"name in the month view and the holiday number in the date navigator."
--msgstr "在此選擇假日顏色。假日顏色會用在月覽表中的假日名稱，及日期瀏覽時的假日編號。"
-+"Select the holiday color here. The holiday color will be used for the "
-+"holiday name in the month view and the holiday number in the date navigator."
-+msgstr ""
-+"在此選擇假日顏色。假日顏色會用在月覽表中的假日名稱，及日期瀏覽時的假日編號。"
- 
- #. i18n: file korganizer.kcfg line 370
- #: rc.cpp:753 rc.cpp:1340
-@@ -4095,8 +4195,8 @@
- #: rc.cpp:756 rc.cpp:1343
- #, no-c-format
- msgid ""
--"Select the highlight color here. The highlight color will be used for marking "
--"the currently selected area in your agenda and in the date navigator."
-+"Select the highlight color here. The highlight color will be used for "
-+"marking the currently selected area in your agenda and in the date navigator."
- msgstr "選擇重點顏色。重點顏色會用於行程表或日期瀏覽中，標示目前所選擇的區域。"
- 
- #. i18n: file korganizer.kcfg line 375
-@@ -4157,10 +4257,12 @@
- #: rc.cpp:786 rc.cpp:1373
- #, no-c-format
- msgid ""
--"Select the default event color here. The default event color will be used for "
--"events categories in your agenda. Note that you can specify a separate color "
--"for each event category below."
--msgstr "在此選擇預設事件顏色。預設事件顏色會用於行程表中的事件類別。注意您可以個別選擇某一個事件類別的顏色。"
-+"Select the default event color here. The default event color will be used "
-+"for events categories in your agenda. Note that you can specify a separate "
-+"color for each event category below."
-+msgstr ""
-+"在此選擇預設事件顏色。預設事件顏色會用於行程表中的事件類別。注意您可以個別選"
-+"擇某一個事件類別的顏色。"
- 
- #. i18n: file korganizer.kcfg line 414
- #: rc.cpp:789 rc.cpp:1376
-@@ -4173,9 +4275,12 @@
- #, no-c-format
- msgid ""
- "Press this button to configure the time bar font. The time bar is the widget "
--"that shows the hours in the agenda view. This button will open the &quot;Select "
--"Font&quot; dialog, allowing you to choose the hour font for the time bar."
--msgstr "按下此按鍵以設定時間列的字型。時間列是在行程檢視中顯示時間用的。這個按鍵會開啟「選擇字型」的對話框，讓您選擇時間列的字型。"
-+"that shows the hours in the agenda view. This button will open the &quot;"
-+"Select Font&quot; dialog, allowing you to choose the hour font for the time "
-+"bar."
-+msgstr ""
-+"按下此按鍵以設定時間列的字型。時間列是在行程檢視中顯示時間用的。這個按鍵會開"
-+"啟「選擇字型」的對話框，讓您選擇時間列的字型。"
- 
- #. i18n: file korganizer.kcfg line 418
- #: rc.cpp:795 rc.cpp:1382
-@@ -4187,10 +4292,12 @@
- #: rc.cpp:798 rc.cpp:1385
- #, no-c-format
- msgid ""
--"Press this button to configure the agenda view font. This button will open the "
--"&quot;Select Font&quot; dialog, allowing you to choose the font for the events "
--"in the agenda view."
--msgstr "按下此按鍵以設定行程檢視的字型。這個按鍵會開啟「選擇字型」的對話框，讓您選擇行程檢視的字型。"
-+"Press this button to configure the agenda view font. This button will open "
-+"the &quot;Select Font&quot; dialog, allowing you to choose the font for the "
-+"events in the agenda view."
-+msgstr ""
-+"按下此按鍵以設定行程檢視的字型。這個按鍵會開啟「選擇字型」的對話框，讓您選擇"
-+"行程檢視的字型。"
- 
- #. i18n: file korganizer.kcfg line 422
- #: rc.cpp:801 rc.cpp:1388
-@@ -4205,7 +4312,9 @@
- "Press this button to configure the current-time line font. This button will "
- "open the &quot;Select Font&quot; dialog, allowing you to choose the font for "
- "the current-time line in the agenda view."
--msgstr "按下此按鍵以設定目前時間線(MBL)的字型。這個按鍵會開啟「選擇字型」的對話框，讓您選擇目前時間線的字型。"
-+msgstr ""
-+"按下此按鍵以設定目前時間線(MBL)的字型。這個按鍵會開啟「選擇字型」的對話框，讓"
-+"您選擇目前時間線的字型。"
- 
- #. i18n: file korganizer.kcfg line 426
- #: rc.cpp:807 rc.cpp:1394
-@@ -4217,10 +4326,12 @@
- #: rc.cpp:810 rc.cpp:1397
- #, no-c-format
- msgid ""
--"Press this button to configure the month view font. This button will open the "
--"&quot;Select Font&quot; dialog, allowing you to choose the font for the items "
--"in the month view."
--msgstr "按下此按鍵以設定月檢視的字型。這個按鍵會開啟「選擇字型」的對話框，讓您選擇月檢視的字型。"
-+"Press this button to configure the month view font. This button will open "
-+"the &quot;Select Font&quot; dialog, allowing you to choose the font for the "
-+"items in the month view."
-+msgstr ""
-+"按下此按鍵以設定月檢視的字型。這個按鍵會開啟「選擇字型」的對話框，讓您選擇月"
-+"檢視的字型。"
- 
- #. i18n: file korganizer.kcfg line 445
- #: rc.cpp:813 rc.cpp:1400
-@@ -4279,8 +4390,9 @@
- "example if this option is 'true' then looking for the free/busy data of "
- "joe@mydomain.com on the server www.yourdomain.com won't work."
- msgstr ""
--"此設定讓您決定行程表網址的網域部份是否必須符合您搜尋的使用者的網域部份。例如，若此選項為「真」則在伺服器 www.yourdomain.com 中尋找 "
--"joe@mydomain.com 會無法搜尋。"
-+"此設定讓您決定行程表網址的網域部份是否必須符合您搜尋的使用者的網域部份。例"
-+"如，若此選項為「真」則在伺服器 www.yourdomain.com 中尋找 joe@mydomain.com 會"
-+"無法搜尋。"
- 
- #. i18n: file korganizer.kcfg line 472
- #: rc.cpp:840 rc.cpp:1427
-@@ -4294,11 +4406,12 @@
- msgid ""
- "With this setting, you can change the filename that will be fetched from the "
- "server. With this checked, it will download a free/busy file called "
--"user@domain.ifb, for example nn@kde.org.ifb. Without this set, it will download "
--"user.ifb, for example nn.ifb."
-+"user@domain.ifb, for example nn@kde.org.ifb. Without this set, it will "
-+"download user.ifb, for example nn.ifb."
- msgstr ""
--"使用此選項，您可以改變伺服器下載之檔名。勾選此選項，在下載他人行程資訊時，會使用 user@domain.ifb 這樣的檔名，例如 "
--"nn@kde.org.ifb，否則只會使用簡短格式，如：user.ifb。"
-+"使用此選項，您可以改變伺服器下載之檔名。勾選此選項，在下載他人行程資訊時，會"
-+"使用 user@domain.ifb 這樣的檔名，例如 nn@kde.org.ifb，否則只會使用簡短格式，"
-+"如：user.ifb。"
- 
- #. i18n: file korganizer.kcfg line 478
- #: rc.cpp:846 rc.cpp:1433
-@@ -4382,8 +4495,8 @@
- #: rc.cpp:1592
- #, no-c-format
- msgid ""
--"You should check this option if you want to print to-dos which are due on one "
--"of the dates which are in the supplied date range."
-+"You should check this option if you want to print to-dos which are due on "
-+"one of the dates which are in the supplied date range."
- msgstr "如果您要印出某幾天會到期的待辦事項，請勾選此選項。"
- 
- #. i18n: file ./printing/calprintdayconfig_base.ui line 43
-@@ -4403,9 +4516,11 @@
- #, no-c-format
- msgid ""
- "If you want to print more days at once, you can define a range of dates with "
--"this option and the <i>End date</i> option. This option is used to define the "
--"start date."
--msgstr "如果您要一次印出多天，您可以使用此選項決定開始日期，並指定結束日期，以定義一個日期範圍。"
-+"this option and the <i>End date</i> option. This option is used to define "
-+"the start date."
-+msgstr ""
-+"如果您要一次印出多天，您可以使用此選項決定開始日期，並指定結束日期，以定義一"
-+"個日期範圍。"
- 
- #. i18n: file ./printing/calprintdayconfig_base.ui line 102
- #: rc.cpp:1604 rc.cpp:1748
-@@ -4417,12 +4532,14 @@
- #: rc.cpp:1607
- #, no-c-format
- msgid ""
--"It is possible to print only those events which are inside a given timerange. "
--"With this time selection box you can define the end of this time range. The "
--"start time should be defined with the <i>Start time</i> "
--"option. Note you can automatically modify these settings if you check <i>"
--"Extend time range to include all events</i>."
--msgstr "您可以只印出指定時間範圍內的事件。您可以在此指定結束的時間。您也可以選擇「延長時間範圍以引入所有事件」來自動修改此設定。"
-+"It is possible to print only those events which are inside a given "
-+"timerange. With this time selection box you can define the end of this time "
-+"range. The start time should be defined with the <i>Start time</i> option. "
-+"Note you can automatically modify these settings if you check <i>Extend time "
-+"range to include all events</i>."
-+msgstr ""
-+"您可以只印出指定時間範圍內的事件。您可以在此指定結束的時間。您也可以選擇「延"
-+"長時間範圍以引入所有事件」來自動修改此設定。"
- 
- #. i18n: file ./printing/calprintdayconfig_base.ui line 126
- #: rc.cpp:1610
-@@ -4430,10 +4547,12 @@
- msgid ""
- "It's possible to print only those events which are inside a given timerange. "
- "With this time selection box you can define the end of this time range. The "
--"start time should be defined with the <i>Start time</i> "
--"option. Note you can automatically modify these settings if you check <i>"
--"Extend time range to include all events</i>."
--msgstr "您可以只印出指定時間範圍內的事件。您可以在此指定結束的時間。您也可以選擇「延長時間範圍以引入所有事件」來自動修改此設定。"
-+"start time should be defined with the <i>Start time</i> option. Note you can "
-+"automatically modify these settings if you check <i>Extend time range to "
-+"include all events</i>."
-+msgstr ""
-+"您可以只印出指定時間範圍內的事件。您可以在此指定結束的時間。您也可以選擇「延"
-+"長時間範圍以引入所有事件」來自動修改此設定。"
- 
- #. i18n: file ./printing/calprintdayconfig_base.ui line 134
- #: rc.cpp:1613
-@@ -4454,11 +4573,13 @@
- #, no-c-format
- msgid ""
- "It's possible to print only those events which are inside a given timerange. "
--"With this time selection box you can define the start of this time range. The "
--"end time should be defined with the <i>End time</i> option. Note you can "
--"automatically modify these settings if you check <i>"
--"Extend time range to include all events</i>."
--msgstr "您可以只印出指定時間範圍內的事件。您可以在此指定開始的時間。您也可以選擇「延長時間範圍以引入所有事件」來自動修改此設定。"
-+"With this time selection box you can define the start of this time range. "
-+"The end time should be defined with the <i>End time</i> option. Note you can "
-+"automatically modify these settings if you check <i>Extend time range to "
-+"include all events</i>."
-+msgstr ""
-+"您可以只印出指定時間範圍內的事件。您可以在此指定開始的時間。您也可以選擇「延"
-+"長時間範圍以引入所有事件」來自動修改此設定。"
- 
- #. i18n: file ./printing/calprintdayconfig_base.ui line 174
- #: rc.cpp:1625 rc.cpp:1757
-@@ -4470,21 +4591,25 @@
- #: rc.cpp:1628
- #, no-c-format
- msgid ""
--"It is possible to print only those events which are inside a given timerange. "
--"With this time selection box you can define the start of this time range. The "
--"end time should be defined with the <i>End time</i> option. Note you can "
--"automatically modify these settings if you check <i>"
--"Extend time range to include all events</i>."
--msgstr "您可以只印出指定時間範圍內的事件。您可以在此指定開始的時間。您也可以選擇「延長時間範圍以引入所有事件」來自動修改此設定。"
-+"It is possible to print only those events which are inside a given "
-+"timerange. With this time selection box you can define the start of this "
-+"time range. The end time should be defined with the <i>End time</i> option. "
-+"Note you can automatically modify these settings if you check <i>Extend time "
-+"range to include all events</i>."
-+msgstr ""
-+"您可以只印出指定時間範圍內的事件。您可以在此指定開始的時間。您也可以選擇「延"
-+"長時間範圍以引入所有事件」來自動修改此設定。"
- 
- #. i18n: file ./printing/calprintdayconfig_base.ui line 191
- #: rc.cpp:1631 rc.cpp:1637 rc.cpp:1673
- #, no-c-format
- msgid ""
- "If you want to print more days at once, you can define a range of dates with "
--"this option and the <i>Start date</i> option. This option is used to define the "
--"end date."
--msgstr "如果您要一次印出多天，您可以使用此選項決定結束日期，並指定開始日期，以定義一個日期範圍。"
-+"this option and the <i>Start date</i> option. This option is used to define "
-+"the end date."
-+msgstr ""
-+"如果您要一次印出多天，您可以使用此選項決定結束日期，並指定開始日期，以定義一"
-+"個日期範圍。"
- 
- #. i18n: file ./printing/calprintdayconfig_base.ui line 199
- #: rc.cpp:1634 rc.cpp:1670 rc.cpp:1769 rc.cpp:1994 rc.cpp:2057 rc.cpp:2069
-@@ -4502,8 +4627,8 @@
- #: rc.cpp:1643 rc.cpp:1730
- #, no-c-format
- msgid ""
--"If you want to use colors to distinguish certain categories on the print, check "
--"this option."
-+"If you want to use colors to distinguish certain categories on the print, "
-+"check this option."
- msgstr "勾選此選項，可以使用顏色，以便在印出時區分不同類別。"
- 
- #. i18n: file ./printing/calprinttodoconfig_base.ui line 29
-@@ -4649,9 +4774,11 @@
- #, no-c-format
- msgid ""
- "Here you can choose which events should be printed based on their date. This "
--"check enables you to enter the start date of the date range. Use the <i>"
--"End date</i> to enter the end date of the daterange."
--msgstr "在此您可以依日期決定要列印哪些事件。您可以使用此選項決定開始日期，並指定結束日期，以定義一個日期範圍。"
-+"check enables you to enter the start date of the date range. Use the <i>End "
-+"date</i> to enter the end date of the daterange."
-+msgstr ""
-+"在此您可以依日期決定要列印哪些事件。您可以使用此選項決定開始日期，並指定結束"
-+"日期，以定義一個日期範圍。"
- 
- #. i18n: file ./printing/calprintweekconfig_base.ui line 108
- #: rc.cpp:1751 rc.cpp:1754
-@@ -4670,9 +4797,11 @@
- #, no-c-format
- msgid ""
- "Here you can choose which events should be printed based on their date. This "
--"check enables you to enter the end date of the date range. Use the <i>"
--"Start date</i> to enter the start date of the daterange."
--msgstr "在此您可以依日期決定要列印哪些事件。您可以使用此選項決定結束日期，並指定開始日期，以定義一個日期範圍。"
-+"check enables you to enter the end date of the date range. Use the <i>Start "
-+"date</i> to enter the start date of the daterange."
-+msgstr ""
-+"在此您可以依日期決定要列印哪些事件。您可以使用此選項決定結束日期，並指定開始"
-+"日期，以定義一個日期範圍。"
- 
- #. i18n: file ./printing/calprintweekconfig_base.ui line 213
- #: rc.cpp:1778
-@@ -4680,7 +4809,8 @@
- msgid ""
- "The timetable view supports colors. If you want to make use of colors you "
- "should check this option. The category colors will be used."
--msgstr "時間表檢視支援顏色。如果您要使用顏色，請勾選此選項。將會使用類別的顏色。"
-+msgstr ""
-+"時間表檢視支援顏色。如果您要使用顏色，請勾選此選項。將會使用類別的顏色。"
- 
- #. i18n: file ./printing/calprintweekconfig_base.ui line 221
- #: rc.cpp:1781
-@@ -4692,7 +4822,7 @@
- #: rc.cpp:1784
- #, no-c-format
- msgid "Print as &Filofax page"
--msgstr "列印為 Filofax (&F)"
-+msgstr "列印為 Filofax(&F)"
- 
- #. i18n: file ./printing/calprintweekconfig_base.ui line 238
- #: rc.cpp:1787
-@@ -4712,8 +4842,8 @@
- #, no-c-format
- msgid ""
- "This view is similar to the weekview in KOrganizer. The week is printed in "
--"landscape layout. You can even use the same colors for the items if you check "
--"<i>Use Colors</i>."
-+"landscape layout. You can even use the same colors for the items if you "
-+"check <i>Use Colors</i>."
- msgstr "這有點像是 KOrganizer 的週覽表。每一週會橫向列印。您也可以使用顏色。"
- 
- #. i18n: file ./printing/calprintweekconfig_base.ui line 257
-@@ -4726,17 +4856,19 @@
- #: rc.cpp:1799
- #, no-c-format
- msgid ""
--"This view is similar to the week view in KOrganizer. The only difference with "
--"the timetable view is the page layout. Timetables are printed in landscape, the "
--"split week view in portrait."
--msgstr "這有點像是 KOrganizer 的週覽表。唯一的不同是時間表會橫向列印，而每週檢視分離列印會縱向列印。"
-+"This view is similar to the week view in KOrganizer. The only difference "
-+"with the timetable view is the page layout. Timetables are printed in "
-+"landscape, the split week view in portrait."
-+msgstr ""
-+"這有點像是 KOrganizer 的週覽表。唯一的不同是時間表會橫向列印，而每週檢視分離"
-+"列印會縱向列印。"
- 
- #. i18n: file ./printing/calprintweekconfig_base.ui line 276
- #: rc.cpp:1805 rc.cpp:1838
- #, no-c-format
- msgid ""
--"Check this option if you want to have to-dos on the print, placed by their due "
--"date."
-+"Check this option if you want to have to-dos on the print, placed by their "
-+"due date."
- msgstr "勾選此選項以列印待辦事項。"
- 
- #. i18n: file ./printing/calprintmonthconfig_base.ui line 57
-@@ -4749,19 +4881,23 @@
- #: rc.cpp:1814
- #, no-c-format
- msgid ""
--"When you want to print more months at once, you can define a month range. This "
--"option defines the first month to be printed. Use the option <i>End month</i> "
--"to define the last month in this range."
--msgstr "如果您要一次印出多個月，您可以使用此選項決定開始月份，並指定結束月份，以定義一個日期範圍。"
-+"When you want to print more months at once, you can define a month range. "
-+"This option defines the first month to be printed. Use the option <i>End "
-+"month</i> to define the last month in this range."
-+msgstr ""
-+"如果您要一次印出多個月，您可以使用此選項決定開始月份，並指定結束月份，以定義"
-+"一個日期範圍。"
- 
- #. i18n: file ./printing/calprintmonthconfig_base.ui line 71
- #: rc.cpp:1817 rc.cpp:1820
- #, no-c-format
- msgid ""
--"When you want to print more months at once, you can define a month range. This "
--"option defines the first month to be printed. Use the on <i>End month</i> "
--"to define the last month in this range."
--msgstr "如果您要一次印出多個月，您可以使用此選項決定開始月份，並用「結束月份」來指定結束月份，以定義一個日期範圍。"
-+"When you want to print more months at once, you can define a month range. "
-+"This option defines the first month to be printed. Use the on <i>End month</"
-+"i> to define the last month in this range."
-+msgstr ""
-+"如果您要一次印出多個月，您可以使用此選項決定開始月份，並用「結束月份」來指定"
-+"結束月份，以定義一個日期範圍。"
- 
- #. i18n: file ./printing/calprintmonthconfig_base.ui line 93
- #: rc.cpp:1823
-@@ -4773,10 +4909,12 @@
- #: rc.cpp:1826 rc.cpp:1829 rc.cpp:1832
- #, no-c-format
- msgid ""
--"When you want to print more months at once, you can define a month range. This "
--"option defines the last month to be printed. Use the option <i>Start month</i> "
--"to define the first month in this range."
--msgstr "如果您要一次印出多個月，您可以使用此選項決定結束月份，並指定開始月份，以定義一個日期範圍。"
-+"When you want to print more months at once, you can define a month range. "
-+"This option defines the last month to be printed. Use the option <i>Start "
-+"month</i> to define the first month in this range."
-+msgstr ""
-+"如果您要一次印出多個月，您可以使用此選項決定結束月份，並指定開始月份，以定義"
-+"一個日期範圍。"
- 
- #. i18n: file ./printing/calprintmonthconfig_base.ui line 162
- #: rc.cpp:1841
-@@ -4803,7 +4941,9 @@
- "With this option it is possible to leave out the daily recurring to-dos and "
- "events in the print. They take a lot of space and make the month view "
- "needlessly complicated."
--msgstr "您可以選擇要不要列印每天循環的待辦事項與事件。這些會佔用很多空間，並讓月檢視變得複雜。"
-+msgstr ""
-+"您可以選擇要不要列印每天循環的待辦事項與事件。這些會佔用很多空間，並讓月檢視"
-+"變得複雜。"
- 
- #. i18n: file ./printing/calprintmonthconfig_base.ui line 184
- #: rc.cpp:1853
-@@ -4817,7 +4957,9 @@
- msgid ""
- "Similar to \"Print daily recurring to-dos and events\". Weekly to-dos and "
- "events will be omitted when making a print of the selected month."
--msgstr "類似「列印每天循環的待辦事項與事件」。每週循環的待辦事項與事件在列印所選擇的月份時會被省略。"
-+msgstr ""
-+"類似「列印每天循環的待辦事項與事件」。每週循環的待辦事項與事件在列印所選擇的"
-+"月份時會被省略。"
- 
- #. i18n: file ./plugins/printing/list/calprintlistconfig_base.ui line 18
- #: rc.cpp:1985
-@@ -4951,23 +5093,24 @@
- 
- #: koeditorattachments.cpp:199
- msgid ""
--"Displays a list of current items (files, mail, etc.) that have been associated "
--"with this event or to-do. "
-+"Displays a list of current items (files, mail, etc.) that have been "
-+"associated with this event or to-do. "
- msgstr "顯示與目前事件或待辦事項相關的項目（檔案、郵件等等）清單。"
- 
- #: koeditorattachments.cpp:225
- msgid "&Attach File..."
--msgstr "附加檔案(&A)..."
-+msgstr "附加檔案(&A)…"
- 
- #: koeditorattachments.cpp:226
- msgid ""
- "Shows a dialog used to select an attachment to add to this event or to-do as "
- "link as inline data."
--msgstr "顯示對話框以選擇加入到此事件或待辦事項的附件。附件會以內含連結方式附加。"
-+msgstr ""
-+"顯示對話框以選擇加入到此事件或待辦事項的附件。附件會以內含連結方式附加。"
- 
- #: koeditorattachments.cpp:229
- msgid "Attach &Link..."
--msgstr "附加連結(&L)..."
-+msgstr "附加連結(&L)…"
- 
- #: koeditorattachments.cpp:230
- msgid ""
-@@ -4998,8 +5141,8 @@
- 
- #: koeditorattachments.cpp:315 koeditorattachments.cpp:340
- msgid ""
--"URL (e.g. a web page) or file to be attached (only the link will be attached, "
--"not the file itself):"
-+"URL (e.g. a web page) or file to be attached (only the link will be "
-+"attached, not the file itself):"
- msgstr "要附加的網址或檔案（只會附加連結，而非檔案本身）："
- 
- #: koeditorattachments.cpp:317 koeditorattachments.cpp:325
-@@ -5083,7 +5226,8 @@
- msgid ""
- "Invalid search expression, cannot perform the search. Please enter a search "
- "expression using the wildcard characters '*' and '?' where needed."
--msgstr "不正確的搜尋條件，無法搜尋。有必要時，請在搜尋條件中使用萬用字元“*”和“?”。"
-+msgstr ""
-+"不正確的搜尋條件，無法搜尋。有必要時，請在搜尋條件中使用萬用字元“*”和“?”。"
- 
- #: searchdialog.cpp:162
- msgid "No events were found matching your search expression."
-@@ -5149,19 +5293,17 @@
- 
- #: resourceview.cpp:236
- msgid ""
--"<qt>"
--"<p>Press this button to add a resource to KOrganizer.</p>"
--"<p>Events, journal entries and to-dos are retrieved and stored on resources. "
--"Available resources include groupware servers, local files, journal entries as "
--"blogs on a server, etc... </p>"
--"<p>If you have more than one active resource, when creating incidents you will "
--"either automatically use the default resource or be prompted to select the "
--"resource to use.</p></qt>"
--msgstr ""
--"<qt>"
--"<p>按下此按鍵以新增資源到 KOrganizer。</p>"
--"<p>事件、日誌項目與待辦事項會讀取並儲存在資源中。可用的資源包括群組伺服器、本地端檔案、日誌項目如部落格等等。</p>"
--"<p>如果您啟動一個以上的資源，您在建立項目時可以選擇要自動套用預設的資源，或是讓您選擇要使用哪個資源。</p></qt>"
-+"<qt><p>Press this button to add a resource to KOrganizer.</p><p>Events, "
-+"journal entries and to-dos are retrieved and stored on resources. Available "
-+"resources include groupware servers, local files, journal entries as blogs "
-+"on a server, etc... </p><p>If you have more than one active resource, when "
-+"creating incidents you will either automatically use the default resource or "
-+"be prompted to select the resource to use.</p></qt>"
-+msgstr ""
-+"<qt><p>按下此按鍵以新增資源到 KOrganizer。</p><p>事件、日誌項目與待辦事項會讀"
-+"取並儲存在資源中。可用的資源包括群組伺服器、本地端檔案、日誌項目如部落格等"
-+"等。</p><p>如果您啟動一個以上的資源，您在建立項目時可以選擇要自動套用預設的資"
-+"源，或是讓您選擇要使用哪個資源。</p></qt>"
- 
- #: resourceview.cpp:249
- msgid "Edit calendar settings"
-@@ -5179,27 +5321,26 @@
- 
- #: resourceview.cpp:258
- msgid ""
--"Press this button to delete the resource currently selected on the KOrganizer "
--"resources list above."
-+"Press this button to delete the resource currently selected on the "
-+"KOrganizer resources list above."
- msgstr "按下此按鍵以刪除上方 KOrganizer 資源清單中所選取的資源。"
- 
- #: resourceview.cpp:266
- msgid ""
--"<qt>"
--"<p>Select on this list the active KOrganizer resources. Check the resource box "
--"to make it active. Press the \"Add...\" button below to add new resources to "
--"the list.</p>"
--"<p>Events, journal entries and to-dos are retrieved and stored on resources. "
--"Available resources include groupware servers, local files, journal entries as "
--"blogs on a server, etc...</p>"
--"<p>If you have more than one active resource, when creating incidents you will "
-+"<qt><p>Select on this list the active KOrganizer resources. Check the "
-+"resource box to make it active. Press the \"Add...\" button below to add new "
-+"resources to the list.</p><p>Events, journal entries and to-dos are "
-+"retrieved and stored on resources. Available resources include groupware "
-+"servers, local files, journal entries as blogs on a server, etc...</p><p>If "
-+"you have more than one active resource, when creating incidents you will "
- "either automatically use the default resource or be prompted to select the "
- "resource to use.</p></qt>"
- msgstr ""
--"<qt>"
--"<p>在此清單中選擇啟動的 KOrganizer 資源。請勾選要啟動的資源。按下方的「新增」按鍵可以新增資源到清單中。</p>"
--"<p>事件、日誌項目與待辦事項會讀取並儲存在資源中。可用的資源包括群組伺服器、本地端檔案、日誌項目如部落格等等。</p>"
--"<p>如果您啟動一個以上的資源，您在建立項目時可以選擇要自動套用預設的資源，或是讓您選擇要使用哪個資源。</p></qt>"
-+"<qt><p>在此清單中選擇啟動的 KOrganizer 資源。請勾選要啟動的資源。按下方的「新"
-+"增」按鍵可以新增資源到清單中。</p><p>事件、日誌項目與待辦事項會讀取並儲存在資"
-+"源中。可用的資源包括群組伺服器、本地端檔案、日誌項目如部落格等等。</p><p>如果"
-+"您啟動一個以上的資源，您在建立項目時可以選擇要自動套用預設的資源，或是讓您選"
-+"擇要使用哪個資源。</p></qt>"
- 
- #: resourceview.cpp:326
- msgid "Add Subresource"
-@@ -5235,10 +5376,11 @@
- 
- #: resourceview.cpp:484
- msgid ""
--"<qt>Do you really want to remove the subresource <b>%1</b>"
--"? Note that its contents will be completely deleted. This operation cannot be "
--"undone. </qt>"
--msgstr "<qt>您確定要移除子資源 <b>%1</b> 嗎？注ˋ，它的內容將會被完全刪除，無法回復。</qt>"
-+"<qt>Do you really want to remove the subresource <b>%1</b>? Note that its "
-+"contents will be completely deleted. This operation cannot be undone. </qt>"
-+msgstr ""
-+"<qt>您確定要移除子資源 <b>%1</b> 嗎？注ˋ，它的內容將會被完全刪除，無法回復。"
-+"</qt>"
- 
- #: resourceview.cpp:487
- msgid "<qt>Do you really want to remove the resource <b>%1</b>?</qt>"
-@@ -5250,10 +5392,12 @@
- 
- #: resourceview.cpp:504
- msgid ""
--"<qt>Failed to remove the subresource <b>%1</b>. The reason could be that it is "
--"a built-in one which cannot be removed, or that the removal of the underlying "
--"storage folder failed.</qt>"
--msgstr "<<qt移除子資源 ><b%1></b>時失敗。理由可能是因為它是內建的資源，無法刪除；或是從資料夾中刪除時失敗。</qt>"
-+"<qt>Failed to remove the subresource <b>%1</b>. The reason could be that it "
-+"is a built-in one which cannot be removed, or that the removal of the "
-+"underlying storage folder failed.</qt>"
-+msgstr ""
-+"<<qt移除子資源 ><b%1></b>時失敗。理由可能是因為它是內建的資源，無法刪除；或是"
-+"從資料夾中刪除時失敗。</qt>"
- 
- #: resourceview.cpp:581
- msgid "Re&load"
-@@ -5281,7 +5425,7 @@
- 
- #: resourceview.cpp:609
- msgid "&Add..."
--msgstr "新增...(&A)"
-+msgstr "新增…(&A)"
- 
- #: printing/calprinter.cpp:133
- msgid "Unable to print, no valid print style was returned."
-@@ -5416,8 +5560,8 @@
- 
- #: printing/calprintdefaultplugins.cpp:435
- msgid ""
--"_: Formatting of an attendee: 'Name (Role): Status', e.g. 'Reinhold Kainhofer "
--"<reinhold@kainhofer.com> (Participant): Awaiting Response'\n"
-+"_: Formatting of an attendee: 'Name (Role): Status', e.g. 'Reinhold "
-+"Kainhofer <reinhold@kainhofer.com> (Participant): Awaiting Response'\n"
- "%1 (%2): %3"
- msgstr "%1（%2）：%3"
- 
-@@ -5634,12 +5778,11 @@
- msgid ""
- "You didn't change the event, thus no counter proposal has been sent to the "
- "organizer."
--msgstr ""
-+msgstr "您並未變更事件，因此沒有反提案被送到組織者。"
- 
- #: koeventeditor.cpp:285
--#, fuzzy
- msgid "No changes"
--msgstr "Exchange"
-+msgstr "沒有變更"
- 
- #: koeventeditor.cpp:295
- #, c-format
-@@ -5705,9 +5848,11 @@
- 
- #: korganizer_options.h:40
- msgid ""
--"Calendar files or urls. Unless -i, -o or -m is explicitly specified, the user "
--"will be asked whether to import, merge or open in a separate window."
--msgstr "行事曆檔案或網址。除非指定 -i、-o 或 -m，否則會詢問使用者是要匯入、合併或在新視窗開啟。"
-+"Calendar files or urls. Unless -i, -o or -m is explicitly specified, the "
-+"user will be asked whether to import, merge or open in a separate window."
-+msgstr ""
-+"行事曆檔案或網址。除非指定 -i、-o 或 -m，否則會詢問使用者是要匯入、合併或在新"
-+"視窗開啟。"
- 
- #: koeditorgeneralevent.cpp:104
- msgid "Sets options related to the date and time of the event or to-do."
-@@ -5762,8 +5907,8 @@
- 
- #: koeditorgeneralevent.cpp:447
- msgid ""
--"Shows the duration of the event or to-do with the current start and end dates "
--"and times."
-+"Shows the duration of the event or to-do with the current start and end "
-+"dates and times."
- msgstr "依目前的開始及結束時間來顯示此事件或待辦事項的時間範圍。"
- 
- #: koeditorgeneralevent.cpp:464
-@@ -5808,14 +5953,15 @@
- msgid ""
- "Archiving saves old items into the given file and then deletes them in the "
- "current calendar. If the archive file already exists they will be added. (<a "
--"href=\"whatsthis:In order to add an archive to your calendar, use the "
--"&quot;Merge Calendar&quot; function. You can view an archive by opening it in "
--"KOrganizer like any other calendar. It is not saved in a special format, but as "
--"vCalendar.\">How to restore</a>)"
--msgstr ""
--"歸檔會將舊的項目儲存到指定的檔案中，並從目前的行事曆中刪除。如果檔案以存在，則會附加在後面。<a "
--"href=\"whatsthis:要將歸檔加入您的行事曆，請使用&quot;合併行事曆&quot;功能。您可以用 KOrganizer "
--"檢視歸檔，就像一般行事曆一樣。歸檔儲存並沒有使用特別的格式，而是使用 vCalendar。\">如何儲存</a>"
-+"href=\"whatsthis:In order to add an archive to your calendar, use the &quot;"
-+"Merge Calendar&quot; function. You can view an archive by opening it in "
-+"KOrganizer like any other calendar. It is not saved in a special format, but "
-+"as vCalendar.\">How to restore</a>)"
-+msgstr ""
-+"歸檔會將舊的項目儲存到指定的檔案中，並從目前的行事曆中刪除。如果檔案以存在，"
-+"則會附加在後面。<a href=\"whatsthis:要將歸檔加入您的行事曆，請使用&quot;合併"
-+"行事曆&quot;功能。您可以用 KOrganizer 檢視歸檔，就像一般行事曆一樣。歸檔儲存"
-+"並沒有使用特別的格式，而是使用 vCalendar。\">如何儲存</a>"
- 
- #: archivedialog.cpp:82
- msgid "Archive now items older than:"
-@@ -5824,9 +5970,11 @@
- #: archivedialog.cpp:87
- msgid ""
- "The date before which items should be archived. All older events and to-dos "
--"will be saved and deleted, the newer (and events exactly on that date) will be "
--"kept."
--msgstr "要將多久以前的項目歸檔。所有的舊事件或待辦事項會被歸檔，並從行事曆中刪除。新的項目則會保留。"
-+"will be saved and deleted, the newer (and events exactly on that date) will "
-+"be kept."
-+msgstr ""
-+"要將多久以前的項目歸檔。所有的舊事件或待辦事項會被歸檔，並從行事曆中刪除。新"
-+"的項目則會保留。"
- 
- #: archivedialog.cpp:96
- msgid "Automaticall&y archive items older than:"
-@@ -5834,16 +5982,17 @@
- 
- #: archivedialog.cpp:99
- msgid ""
--"If this feature is enabled, KOrganizer will regularly check if events and "
--"to-dos have to be archived; this means you will not need to use this dialog box "
-+"If this feature is enabled, KOrganizer will regularly check if events and to-"
-+"dos have to be archived; this means you will not need to use this dialog box "
- "again, except to change the settings."
- msgstr "開啟此選項的話，KOrganizer 會定時檢查是否事件與待辦事項要歸檔。"
- 
- #: archivedialog.cpp:107
- msgid ""
--"The age of the events and to-dos to archive. All older items will be saved and "
--"deleted, the newer will be kept."
--msgstr "要歸檔多久以前的事件與待辦事項。所有舊的項目都會被歸檔並從行事曆中刪除。"
-+"The age of the events and to-dos to archive. All older items will be saved "
-+"and deleted, the newer will be kept."
-+msgstr ""
-+"要歸檔多久以前的事件與待辦事項。所有舊的項目都會被歸檔並從行事曆中刪除。"
- 
- #: archivedialog.cpp:112
- msgid "Day(s)"
-@@ -5872,8 +6021,9 @@
- "deleted. You can later load or merge the file like any other calendar. It is "
- "not saved in a special format, it uses the iCalendar format. "
- msgstr ""
--"要歸檔的檔名與路徑。事件與待辦事項會被加到歸檔檔案中，所有已經歸檔的事件都不會被變更或刪除。您可以稍後再載入或合併此檔，就像其他的行事曆一樣。歸檔儲存並沒有使用"
--"特別的格式，而是使用 iCalendar。"
-+"要歸檔的檔名與路徑。事件與待辦事項會被加到歸檔檔案中，所有已經歸檔的事件都不"
-+"會被變更或刪除。您可以稍後再載入或合併此檔，就像其他的行事曆一樣。歸檔儲存並"
-+"沒有使用特別的格式，而是使用 iCalendar。"
- 
- #: archivedialog.cpp:134
- msgid "Type of Items to Archive"
-@@ -5881,10 +6031,12 @@
- 
- #: archivedialog.cpp:139
- msgid ""
--"Here you can select which items should be archived. Events are archived if they "
--"ended before the date given above; to-dos are archived if they were finished "
--"before the date."
--msgstr "您可以選擇要歸檔的項目型態。事件會在上面指定時間結束前歸檔，待辦事項則是在指定時間之前完成的話便歸檔。"
-+"Here you can select which items should be archived. Events are archived if "
-+"they ended before the date given above; to-dos are archived if they were "
-+"finished before the date."
-+msgstr ""
-+"您可以選擇要歸檔的項目型態。事件會在上面指定時間結束前歸檔，待辦事項則是在指"
-+"定時間之前完成的話便歸檔。"
- 
- #: archivedialog.cpp:144
- msgid "&Delete only, do not save"
-@@ -5892,15 +6044,14 @@
- 
- #: archivedialog.cpp:147
- msgid ""
--"Select this option to delete old events and to-dos without saving them. It is "
--"not possible to recover the events later."
--msgstr "選取此項的話，則舊的事件與待辦事項只會刪除，而不會歸檔。如此以後將無法回復。"
-+"Select this option to delete old events and to-dos without saving them. It "
-+"is not possible to recover the events later."
-+msgstr ""
-+"選取此項的話，則舊的事件與待辦事項只會刪除，而不會歸檔。如此以後將無法回復。"
- 
- #: archivedialog.cpp:211
--msgid ""
--"The archive file name is not valid.\n"
--msgstr ""
--"歸建檔名不正確。\n"
-+msgid "The archive file name is not valid.\n"
-+msgstr "歸建檔名不正確。\n"
- 
- #: komonthview.cpp:349
- msgid ""
-@@ -5958,45 +6109,48 @@
- 
- #: tips.cpp:3
- msgid ""
--"<p>...that you can synchronize your calendar data with the data on a Palm Pilot "
--"by using <a href=\"http://www.slac.com/pilone/kpilot_home\">KPilot</a>?\n"
-+"<p>...that you can synchronize your calendar data with the data on a Palm "
-+"Pilot by using <a href=\"http://www.slac.com/pilone/kpilot_home\">KPilot</"
-+"a>?\n"
- "</p>\n"
- msgstr ""
--"<p>...您可以將您的行事曆資料與 Palm Pilot 的資料同步，您只要使用 <a "
--"href=\"http://www.slac.com/pilone/kpilot_home\">KPilot</a>\n"
-+"<p>...您可以將您的行事曆資料與 Palm Pilot 的資料同步，您只要使用 <a href="
-+"\"http://www.slac.com/pilone/kpilot_home\">KPilot</a>\n"
- "</p>\n"
- 
- #: tips.cpp:9
- msgid ""
--"<p>...that it is possible to show the current time in the calendar? Enable the "
--"current time line in the dialog which appears after selecting <b>Settings</b>"
--", <b>Configure KOrganizer...</b> from the menu bar.\n"
-+"<p>...that it is possible to show the current time in the calendar? Enable "
-+"the current time line in the dialog which appears after selecting "
-+"<b>Settings</b>, <b>Configure KOrganizer...</b> from the menu bar.\n"
- "</p>\n"
- msgstr ""
--"<p>...您可以在行事曆中顯示目前的時間。只要在「設定 KOrganizer...」中的「設定」頁，打開「顯示目前的時間」設定即可。</p>\n"
-+"<p>...您可以在行事曆中顯示目前的時間。只要在「設定 KOrganizer...」中的「設"
-+"定」頁，打開「顯示目前的時間」設定即可。</p>\n"
- 
- #: tips.cpp:15
- msgid ""
--"<p>...that KOrganizer supports Microsoft Exchange? Add the <b>"
--"Microsoft&reg; Exchange 2000 resource</b> using the <b>Resource View</b> "
--"from the KOrganizer sidebar.\n"
-+"<p>...that KOrganizer supports Microsoft Exchange? Add the <b>Microsoft&reg; "
-+"Exchange 2000 resource</b> using the <b>Resource View</b> from the "
-+"KOrganizer sidebar.\n"
- "</p>\n"
- msgstr ""
--"<p> KOrganizer 支援 Microsoft Exchange。您只要在 Korganizer 的邊列中的「資源檢視」頁中，加入 <b>"
--"Microsoft&reg; Exchange 2000 資源</b>即可。</p>\n"
-+"<p> KOrganizer 支援 Microsoft Exchange。您只要在 Korganizer 的邊列中的「資源"
-+"檢視」頁中，加入 <b>Microsoft&reg; Exchange 2000 資源</b>即可。</p>\n"
- 
- #: tips.cpp:21
- msgid ""
--"<p>...that you can select whether the week starts on Monday or on Sunday in the "
--"KDE Control Center? KOrganizer uses this setting. Look at Regional & "
--"Accessibility->Country/Region & Languages in the KDE Control Center, or select "
--"<b>Settings</b>,\n"
-+"<p>...that you can select whether the week starts on Monday or on Sunday in "
-+"the KDE Control Center? KOrganizer uses this setting. Look at Regional & "
-+"Accessibility->Country/Region & Languages in the KDE Control Center, or "
-+"select <b>Settings</b>,\n"
- "<b>Configure Date & Time...</b> from the menu bar. Select the Time & Dates "
- "tab.\n"
- "</p>\n"
- msgstr ""
--"<p>...您可以在 KDE 控制中心裡選擇一週的開始要在星期一或星期天。KOrganizer 會使用此設定。請在 KDE "
--"控制中心裡，「輔助」裡的「國家、地區及語言」中設定，或是在選單中，「設定」裡的「設定日期與時間」也可以設定。</p>\n"
-+"<p>...您可以在 KDE 控制中心裡選擇一週的開始要在星期一或星期天。KOrganizer 會"
-+"使用此設定。請在 KDE 控制中心裡，「輔助」裡的「國家、地區及語言」中設定，或是"
-+"在選單中，「設定」裡的「設定日期與時間」也可以設定。</p>\n"
- 
- #: tips.cpp:28
- msgid ""
-@@ -6004,91 +6158,102 @@
- "wish to change; like the priority, the category or the date?\n"
- "</p>\n"
- msgstr ""
--"<p>...您可以在某日的類別、優先等級等等的項目上，直接點選滑鼠右鍵，就可以快速編輯待辦事項。\n"
-+"<p>...您可以在某日的類別、優先等級等等的項目上，直接點選滑鼠右鍵，就可以快速"
-+"編輯待辦事項。\n"
- "</p>\n"
- 
- #: tips.cpp:34
- msgid ""
- "<p>...that you can view and edit a calendar from the shell with "
--"konsolekalendar? Run <b>konsolekalendar --help</b> for the available options.\n"
-+"konsolekalendar? Run <b>konsolekalendar --help</b> for the available "
-+"options.\n"
- "</p>\n"
- msgstr ""
--"<p>...您可以使用 konsolekalendar 直接用命令列編輯行事曆。請參考 <b>konsolekalendar --help</b> 的說明。\n"
-+"<p>...您可以使用 konsolekalendar 直接用命令列編輯行事曆。請參考 "
-+"<b>konsolekalendar --help</b> 的說明。\n"
- "</p>\n"
- 
- #: tips.cpp:40
- msgid ""
--"<p>...that you can import birthdays from your address book? There is a resource "
--"available which connects the birthdays to your calendar; it is even possible to "
--"set a reminder for each event.\n"
-+"<p>...that you can import birthdays from your address book? There is a "
-+"resource available which connects the birthdays to your calendar; it is even "
-+"possible to set a reminder for each event.\n"
- "</p>\n"
- msgstr ""
--"<p>...您可以從您的通訊錄中匯入生日設定。有一個資源可以用於此，甚至可以在事前提醒您。\n"
-+"<p>...您可以從您的通訊錄中匯入生日設定。有一個資源可以用於此，甚至可以在事前"
-+"提醒您。\n"
- "</p>\n"
- 
- #: tips.cpp:46
- msgid ""
--"<p>...that you can store your calendar on an FTP server? Use the standard file "
--"dialog to save the calendar to a URL like "
--"<b>ftp://username@ftpserver/filename</b>. You can make your calendar active and "
--"load and save it as if it were local, or add it permanently to your resources "
--"list, using the remote file resource. Just make sure that no two KOrganizer "
--"applications are working on the same file, at the same time.\n"
-+"<p>...that you can store your calendar on an FTP server? Use the standard "
-+"file dialog to save the calendar to a URL like <b>ftp://username@ftpserver/"
-+"filename</b>. You can make your calendar active and load and save it as if "
-+"it were local, or add it permanently to your resources list, using the "
-+"remote file resource. Just make sure that no two KOrganizer applications are "
-+"working on the same file, at the same time.\n"
- "</p>\n"
- msgstr ""
--"<p>...您可以將您的行事曆儲存到一個 FTP 伺服器。使用標準的檔案對話框，將行事曆儲存到一個網址，像是"
--"<br>ftp://username@ftpserver/filename</b>。您可以啟動、載入或儲存您的行事曆，就像處理本地端檔案一樣，或是將它永久加入您"
--"的資源清單，以使用遠端的檔案資源。您只要確定兩個 KOrganizer 應用程式不會同時對同一個檔案運作。\n"
-+"<p>...您可以將您的行事曆儲存到一個 FTP 伺服器。使用標準的檔案對話框，將行事曆"
-+"儲存到一個網址，像是<br>ftp://username@ftpserver/filename</b>。您可以啟動、載"
-+"入或儲存您的行事曆，就像處理本地端檔案一樣，或是將它永久加入您的資源清單，以"
-+"使用遠端的檔案資源。您只要確定兩個 KOrganizer 應用程式不會同時對同一個檔案運"
-+"作。\n"
- "</p>\n"
- 
- #: tips.cpp:52
- msgid ""
--"<p>...that you can create hierarchical to-dos by clicking with the right mouse "
--"button on an existing to-do and selecting <b>New Sub-to-do</b> "
--"from the context menu?\n"
-+"<p>...that you can create hierarchical to-dos by clicking with the right "
-+"mouse button on an existing to-do and selecting <b>New Sub-to-do</b> from "
-+"the context menu?\n"
- "</p>\n"
- msgstr ""
--"<p>...您可以使用滑鼠右鍵在已存在的待辦事項上點選，並選擇「新增子待辦事項」，以建立樹狀的待辦事項。\n"
-+"<p>...您可以使用滑鼠右鍵在已存在的待辦事項上點選，並選擇「新增子待辦事項」，"
-+"以建立樹狀的待辦事項。\n"
- "</p>\n"
- 
- #: tips.cpp:58
- msgid ""
- "<p>...that a color can be assigned to each category? Events with a certain "
--"category will be shown in that color. You can assign these in the section <b>"
--"Colors</b> within the dialog which appears after selecting <b>Settings</b>, <b>"
--"Configure KOrganizer...</b> from the menu bar.\n"
-+"category will be shown in that color. You can assign these in the section "
-+"<b>Colors</b> within the dialog which appears after selecting <b>Settings</"
-+"b>, <b>Configure KOrganizer...</b> from the menu bar.\n"
- "</p>\n"
- msgstr ""
--"<p>...您可以對每個類別指定不同的顏色。每個類別中的事件就會使用該顏色顯示。您可以在選單中「設定」「顏色」中設定。\n"
-+"<p>...您可以對每個類別指定不同的顏色。每個類別中的事件就會使用該顏色顯示。您"
-+"可以在選單中「設定」「顏色」中設定。\n"
- "</p>\n"
- 
- #: tips.cpp:64
- msgid ""
--"<p>...that you can view and edit a calendar with Konqueror? Just click on the "
--"calendar file to make Konqueror open it.\n"
-+"<p>...that you can view and edit a calendar with Konqueror? Just click on "
-+"the calendar file to make Konqueror open it.\n"
- "</p>\n"
- msgstr ""
--"<p>...您可以使用 Konqueror 來檢視與編輯行事曆。只要點選行事曆檔案，讓 Konquere 開啟它。\n"
-+"<p>...您可以使用 Konqueror 來檢視與編輯行事曆。只要點選行事曆檔案，讓 "
-+"Konquere 開啟它。\n"
- "</p>\n"
- 
- #: tips.cpp:70
- msgid ""
--"<p>...that it is possible to add an attachment to an event or to-do? To do so, "
--"add a link to the <b>Attachments</b> tab within the <b>Edit Event</b> or <b>"
--"Edit To-do</b> dialog.\n"
-+"<p>...that it is possible to add an attachment to an event or to-do? To do "
-+"so, add a link to the <b>Attachments</b> tab within the <b>Edit Event</b> or "
-+"<b>Edit To-do</b> dialog.\n"
- "</p>\n"
- msgstr ""
--"<p>...您可以在事件或待辦事項中附加檔案。您只要在「編輯事件」或「編輯待辦事項」對話框中的「附加檔案」加入一個連結。\n"
-+"<p>...您可以在事件或待辦事項中附加檔案。您只要在「編輯事件」或「編輯待辦事"
-+"項」對話框中的「附加檔案」加入一個連結。\n"
- "</p>\n"
- 
- #: tips.cpp:76
- msgid ""
--"<p>...that you can export your calendar to HTML? Select <b>File</b>, <b>"
--"Export</b>, <b>Export Web Page...</b> from the menu bar to open the <b>"
--"Export calendar as web page</b> dialog.\n"
-+"<p>...that you can export your calendar to HTML? Select <b>File</b>, "
-+"<b>Export</b>, <b>Export Web Page...</b> from the menu bar to open the "
-+"<b>Export calendar as web page</b> dialog.\n"
- "</p>\n"
- msgstr ""
--"<p>...您可以將您的行事曆匯出成 HTML 檔。您只要在「檔案」/「匯出」中選擇「匯出網頁」即可。\n"
-+"<p>...您可以將您的行事曆匯出成 HTML 檔。您只要在「檔案」/「匯出」中選擇「匯出"
-+"網頁」即可。\n"
- "</p>\n"
- 
- #: tips.cpp:82
-@@ -6096,12 +6261,13 @@
- "<p>...that you can purge completed to-dos in one step? Go to the <b>File</b> "
- "menu and choose <b>Purge Completed</b>.\n"
- msgstr ""
--"<p>...您可以用一個步驟就能清除已完成的待辦事項。只要在「檔案」選單中選擇「清除已完成的待辦事項」。</p>\n"
-+"<p>...您可以用一個步驟就能清除已完成的待辦事項。只要在「檔案」選單中選擇「清"
-+"除已完成的待辦事項」。</p>\n"
- 
- #: tips.cpp:87
- msgid ""
--"<p>...that you can create a new sub-to-do by pasting a to-do while another one "
--"is selected?\n"
-+"<p>...that you can create a new sub-to-do by pasting a to-do while another "
-+"one is selected?\n"
- "</p>\n"
- msgstr ""
- "<p>...您可以直接選擇其他的待辦事項，並貼上成為新的子待辦事項。\n"
-@@ -6389,9 +6555,9 @@
- 
- #: plugins/hebrew/holiday.cpp:63
- msgid ""
--"_: These are Jewish holidays and mostly do not have translations. They may have "
--"different spellings in your language; otherwise, just translate the sound to "
--"your characters\n"
-+"_: These are Jewish holidays and mostly do not have translations. They may "
-+"have different spellings in your language; otherwise, just translate the "
-+"sound to your characters\n"
- "Sh. HaHodesh"
- msgstr "Sh. HaHodesh"
- 
-@@ -6690,11 +6856,11 @@
- 
- #: plugins/exchange/exchange.cpp:72
- msgid "&Download..."
--msgstr "下載(&D)..."
-+msgstr "下載(&D)…"
- 
- #: plugins/exchange/exchange.cpp:75
- msgid "&Upload Event..."
--msgstr "上傳事件...(&U)"
-+msgstr "上傳事件…(&U)"
- 
- #: plugins/exchange/exchange.cpp:83
- msgid "De&lete Event"
-@@ -6702,7 +6868,7 @@
- 
- #: plugins/exchange/exchange.cpp:89
- msgid "&Configure..."
--msgstr "設定...(&C)"
-+msgstr "設定…(&C)"
- 
- #: plugins/exchange/exchange.cpp:104
- msgid ""
-@@ -6773,7 +6939,9 @@
- "The item you try to change is a recurring item. Shall the changes be applied "
- "only to this single occurrence, only to the future items, or to all items in "
- "the recurrence?"
--msgstr "您試圖變更的是一個循環項目。您要將此變更只套用在目前的事件，或只套用在未來的項目，還是循環中所有的項目？"
-+msgstr ""
-+"您試圖變更的是一個循環項目。您要將此變更只套用在目前的事件，或只套用在未來的"
-+"項目，還是循環中所有的項目？"
- 
- #: koagenda.cpp:1057
- msgid "Changing Recurring Item"
-@@ -6811,3 +6979,75 @@
- #: koagenda.cpp:1114
- msgid "Unable to add the future items to the calendar. No change will be done."
- msgstr "無法將未來的項目加入行事曆。將不做任何變更。"
-+
-+#, fuzzy
-+#~ msgid "Zoom to Fit"
-+#~ msgstr "passend verkleinern"
-+
-+#, fuzzy
-+#~ msgid ""
-+#~ "Zooms the Gantt chart so that you can see the entire duration of the "
-+#~ "event on it."
-+#~ msgstr ""
-+#~ "Verändert die Skalierung der Gantt-Tafel, so dass die gesamte Dauer des "
-+#~ "Ereignisses sichtbar ist."
-+
-+#, fuzzy
-+#~ msgid ""
-+#~ "The Attachments tab allows you to add or remove files, emails, contacts, "
-+#~ "and other items associated with this event or to-do."
-+#~ msgstr ""
-+#~ "Die Karteikarte \"Anhänge\" ermöglicht es Ihnen, Dateien, Kontakte und "
-+#~ "andere zu diesem Ereignis oder dieser Aufgabe gehörende Objekte "
-+#~ "hinzuzufügen bzw. zu entfernen."
-+
-+#, fuzzy
-+#~ msgid "Select Cate&gories..."
-+#~ msgstr "&Kategorien…"
-+
-+#, fuzzy
-+#~ msgid "Agenda view uses resource colors"
-+#~ msgstr "Ressourcenfarbe in der Tagesansicht benutzen"
-+
-+#, fuzzy
-+#~ msgid ""
-+#~ "Check this box to make the agenda view use the resource colors of an item."
-+#~ msgstr ""
-+#~ "Wenn Sie diese Option auswählen, werden bei Ereignissen in der "
-+#~ "Tagesansicht die Ressourcenfarben verwendet."
-+
-+#, fuzzy
-+#~ msgid "URI"
-+#~ msgstr "URI"
-+
-+#, fuzzy
-+#~ msgid "MIME Type"
-+#~ msgstr "MIME-Typ"
-+
-+#, fuzzy
-+#~ msgid ""
-+#~ "Shows a dialog used to edit the attachment currently selected in the list "
-+#~ "above."
-+#~ msgstr ""
-+#~ "Zeigt einen Dialog an, mit dem der oben ausgewählte Anhang bearbeitet "
-+#~ "werden kann."
-+
-+#, fuzzy
-+#~ msgid ""
-+#~ "Opens the attachment selected in the list above in the viewer that is "
-+#~ "associated with it in your KDE preferences."
-+#~ msgstr ""
-+#~ "Öffnet den oben ausgewählten Anhang mit der Anwendung, mit der der "
-+#~ "Dateityp in KDE verknüpft ist."
-+
-+#, fuzzy
-+#~ msgid "Add..."
-+#~ msgstr "Hinzufügen…"
-+
-+#, fuzzy
-+#~ msgid "&Free/Busy"
-+#~ msgstr "&Frei/Belegt-Objekt"
-+
-+#, fuzzy
-+#~ msgid "T&ime associated"
-+#~ msgstr "&Zeit festgelegt"
-diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdepim/korn.po kde-i18n-zh_TW-3.5.10/messages/kdepim/korn.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdepim/korn.po	2008-08-19 20:43:18.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdepim/korn.po	2011-11-11 15:45:17.000000000 +0100
-@@ -5,8 +5,7 @@
- "Project-Id-Version: korn\n"
- "POT-Creation-Date: 2008-07-08 01:22+0200\n"
- "PO-Revision-Date: 2006-06-15 08:13+0800\n"
--"Last-Translator: Frank Weng (a.k.a. Franklin) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Traditional Chinese <zh_l10n@linux.org.tw>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
-@@ -172,7 +171,7 @@
- 
- #: kio_count.cpp:204 kio_count.cpp:254
- msgid "Got unknown job; something must be wrong..."
--msgstr "抓到未知的工作，可能有某處發生錯誤..."
-+msgstr "抓到未知的工作，可能有某處發生錯誤…"
- 
- #: kio_count.cpp:210 kio_count.cpp:211
- #, c-format
-@@ -181,7 +180,7 @@
- 
- #: kio_delete.cpp:110
- msgid "Could not get a connected slave; I cannot delete this way..."
--msgstr "無法取得已連接的 slave，無法刪除..."
-+msgstr "無法取得已連接的 slave，無法刪除…"
- 
- #: kio_delete.cpp:185
- #, c-format
-@@ -190,7 +189,7 @@
- 
- #: kio_read.cpp:77 kio_read.cpp:91
- msgid "Unknown job returned; I will try if this one will do... "
--msgstr "傳回未知的工作，試試另一個方法..."
-+msgstr "傳回未知的工作，試試另一個方法…"
- 
- #: kio_read.cpp:80
- #, c-format
-@@ -262,7 +261,7 @@
- 
- #: maildlg.cpp:41
- msgid "Loading full mail. Please wait..."
--msgstr "載入完整的信件中。請稍候..."
-+msgstr "載入完整的信件中。請稍候…"
- 
- #: mailsubject.cpp:55
- msgid "Subject:"
-@@ -514,7 +513,8 @@
- msgid ""
- "The names of DCOP-objects by this box. DCOP-objects let other programs add "
- "'virtual' emails to the box."
--msgstr "這個信箱的 DCOP 物件名稱。DCOP 物件讓其它程式新增「虛擬」的電子郵件到此信箱。"
-+msgstr ""
-+"這個信箱的 DCOP 物件名稱。DCOP 物件讓其它程式新增「虛擬」的電子郵件到此信箱。"
- 
- #. i18n: file korncfg.ui line 31
- #: rc.cpp:138
-@@ -575,15 +575,15 @@
- 
- #: subjectsdlg.cpp:251
- msgid "Rechecking box..."
--msgstr "重新檢查信箱..."
-+msgstr "重新檢查信箱…"
- 
- #: subjectsdlg.cpp:267
- msgid "Fetching messages..."
--msgstr "抓取信件中..."
-+msgstr "抓取信件中…"
- 
- #: subjectsdlg.cpp:325
- msgid "Downloading subjects..."
--msgstr "下載主旨中..."
-+msgstr "下載主旨中…"
- 
- #: subjectsdlg.cpp:419
- #, c-format
-@@ -598,4 +598,4 @@
- 
- #: subjectsdlg.cpp:427
- msgid "Deleting mail; please wait...."
--msgstr "刪除郵件中，請稍候..."
-+msgstr "刪除郵件中，請稍候…"
-diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdepim/kpilot.po kde-i18n-zh_TW-3.5.10/messages/kdepim/kpilot.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdepim/kpilot.po	2008-08-19 20:43:18.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdepim/kpilot.po	2011-11-11 15:45:17.000000000 +0100
-@@ -6,8 +6,7 @@
- "Project-Id-Version: kpilot\n"
- "POT-Creation-Date: 2008-07-08 01:23+0200\n"
- "PO-Revision-Date: 2007-04-18 12:36+0800\n"
--"Last-Translator: Frank Weng (a.k.a. Franklin) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Chinese Traditional <zh-l10n@linux.org.tw>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
-@@ -37,22 +36,16 @@
- msgstr "<b><em>注意：</em></b><br>"
- 
- #: lib/pilotDateEntry.cc:277 lib/pilotTodoEntry.cc:158
--msgid ""
--"Note:\n"
--msgstr ""
--"注意：\n"
-+msgid "Note:\n"
-+msgstr "注意：\n"
- 
- #: lib/pilotMemo.cc:81
- msgid ""
--"<i>Title:</i> %1"
--"<br>\n"
--"<i>MemoText:</i>"
--"<br>%2"
--msgstr ""
--"<i>標題：</i>%1"
--"<br>\n"
--"<i>備忘文字：</i>"
--"<br>%2"
-+"<i>Title:</i> %1<br>\n"
-+"<i>MemoText:</i><br>%2"
-+msgstr ""
-+"<i>標題：</i>%1<br>\n"
-+"<i>備忘文字：</i><br>%2"
- 
- #: lib/pilotMemo.cc:86
- msgid ""
-@@ -74,10 +67,8 @@
- msgstr "已遺失與掌上型裝置的連線。無法繼續同步。"
- 
- #: lib/actions.cc:54
--msgid ""
--"KPilot %1 HotSync starting...\n"
--msgstr ""
--"KPilot %1 熱同步開始...\n"
-+msgid "KPilot %1 HotSync starting...\n"
-+msgstr "KPilot %1 熱同步開始…\n"
- 
- #: lib/actions.cc:56
- msgid "Using encoding %1 on the handheld."
-@@ -88,14 +79,12 @@
- msgstr "KPilot 忙碌中，無法即時處理熱同步。"
- 
- #: lib/actions.cc:114
--msgid ""
--"Testing.\n"
--msgstr ""
--"測試中。\n"
-+msgid "Testing.\n"
-+msgstr "測試中。\n"
- 
- #: lib/actions.cc:130
- msgid "Syncing database %1..."
--msgstr "同步資料庫 %1..."
-+msgstr "同步資料庫 %1…"
- 
- #: kpilot/logFile.cc:97 lib/actions.cc:134
- msgid "HotSync finished."
-@@ -170,7 +159,7 @@
- 
- #: lib/kpilotdevicelink.cc:187
- msgid "Trying to open device %1..."
--msgstr "試著開啟裝置 %1..."
-+msgstr "試著開啟裝置 %1…"
- 
- #: lib/kpilotdevicelink.cc:241
- msgid "Already listening on that device"
-@@ -202,12 +191,12 @@
- 
- #: lib/kpilotdevicelink.cc:478
- msgid "Checking last PC..."
--msgstr "檢查上一個 PC..."
-+msgstr "檢查上一個 PC…"
- 
- #: lib/kpilotdevicelink.cc:487
- msgid ""
--"Could not read user information from the Pilot. Perhaps you have a password set "
--"on the device?"
-+"Could not read user information from the Pilot. Perhaps you have a password "
-+"set on the device?"
- msgstr "無法從 Pilot 讀取使用者資訊。也許您在該裝置上設了密碼？"
- 
- #: lib/kpilotdevicelink.cc:670
-@@ -229,10 +218,8 @@
- msgstr "<qt>無法安裝檔案 %1。</qt>"
- 
- #: lib/kpilotdevicelink.cc:846
--msgid ""
--"End of HotSync\n"
--msgstr ""
--"熱同步結束\n"
-+msgid "End of HotSync\n"
-+msgstr "熱同步結束\n"
- 
- #: lib/pilotDateEntry.cc:179
- #, c-format
-@@ -313,8 +300,8 @@
- 
- #: lib/plugin.cc:93
- msgid ""
--"<qt>The <i>%1</i> conduit's settings have been changed. Do you want to save the "
--"changes before continuing?</qt>"
-+"<qt>The <i>%1</i> conduit's settings have been changed. Do you want to save "
-+"the changes before continuing?</qt>"
- msgstr "<qt>導管 %1 的設定已變更。您要儲存此變更嗎？</qt>"
- 
- #: lib/plugin.cc:105
-@@ -335,9 +322,11 @@
- 
- #: lib/plugin.cc:202
- msgid ""
--"For trademark information, see the <a href=\"help:/kpilot/trademarks.html\">"
--"KPilot User's Guide</a>."
--msgstr "關於商標資訊，請參考 <a href=\"help:/kpilot/trademarks.html\">KPilot 使用者指南</a>。"
-+"For trademark information, see the <a href=\"help:/kpilot/trademarks.html"
-+"\">KPilot User's Guide</a>."
-+msgstr ""
-+"關於商標資訊，請參考 <a href=\"help:/kpilot/trademarks.html\">KPilot 使用者指"
-+"南</a>。"
- 
- #: lib/plugin.cc:213
- msgid "<b>Authors:</b> "
-@@ -362,8 +351,8 @@
- 
- #: lib/plugin.cc:482
- msgid ""
--"The %1 conduit has made a large number of changes to your %2.  Do you want to "
--"allow this change?\n"
-+"The %1 conduit has made a large number of changes to your %2.  Do you want "
-+"to allow this change?\n"
- "Details:\n"
- "\t%3"
- msgstr ""
-@@ -482,15 +471,15 @@
- 
- #: conduits/memofileconduit/memofile-conduit.cc:126
- msgid " Copying Pilot to PC..."
--msgstr "從 Pilot 複製到 PC..."
-+msgstr "從 Pilot 複製到 PC…"
- 
- #: conduits/memofileconduit/memofile-conduit.cc:131
- msgid " Copying PC to Pilot..."
--msgstr "從 PC 複製到 Pilot..."
-+msgstr "從 PC 複製到 Pilot…"
- 
- #: conduits/memofileconduit/memofile-conduit.cc:135
- msgid " Doing regular sync..."
--msgstr "執行正規同步作業中..."
-+msgstr "執行正規同步作業中…"
- 
- #: conduits/memofileconduit/memofile-factory.cc:63
- msgid "Memofile Conduit for KPilot"
-@@ -546,8 +535,8 @@
- 
- #: conduits/sysinfoconduit/sysinfo-setup.cc:97
- msgid ""
--"Retrieves System, Hardware, and User Info from the Handheld and stores them to "
--"a file."
-+"Retrieves System, Hardware, and User Info from the Handheld and stores them "
-+"to a file."
- msgstr "從掌上型裝置收取系統、硬體與使用者資訊，並儲存到檔案。"
- 
- #: conduits/sysinfoconduit/sysinfo-conduit.cc:163
-@@ -734,9 +723,9 @@
- 
- #: conduits/timeconduit/time-conduit.cc:108
- msgid ""
--"PalmOS 3.25 and 3.3 do not support setting the system time. Skipping the time "
--"conduit..."
--msgstr "PalmOS 3.25 與 3.3 版不支援設定系統時間。將忽略時間導管..."
-+"PalmOS 3.25 and 3.3 do not support setting the system time. Skipping the "
-+"time conduit..."
-+msgstr "PalmOS 3.25 與 3.3 版不支援設定系統時間。將忽略時間導管…"
- 
- #: conduits/timeconduit/time-setup.cc:48
- msgid "Time Synchronization Conduit for KPilot"
-@@ -774,7 +763,9 @@
- "You chose to sync with the file \"%1\", which cannot be opened. Please make "
- "sure to supply a valid file name in the conduit's configuration dialog. "
- "Aborting the conduit."
--msgstr "您選擇與檔案 %1 同步，但是檔案無法開啟。請確定您在導管設定中所給的是正確的檔名。將中止此導管。"
-+msgstr ""
-+"您選擇與檔案 %1 同步，但是檔案無法開啟。請確定您在導管設定中所給的是正確的檔"
-+"名。將中止此導管。"
- 
- #: conduits/abbrowserconduit/abbrowser-conduit.cc:327
- #: conduits/abbrowserconduit/abbrowser-conduit.cc:328
-@@ -788,8 +779,8 @@
- 
- #: conduits/abbrowserconduit/abbrowser-conduit.cc:396
- msgid ""
--"An error occurred while uploading \"%1\". You can try to upload the temporary "
--"local file \"%2\" manually"
-+"An error occurred while uploading \"%1\". You can try to upload the "
-+"temporary local file \"%2\" manually"
- msgstr "上傳 %1 時發生錯誤。您可以試著手動上傳本地的暫存檔 %2。"
- 
- #: conduits/abbrowserconduit/abbrowser-conduit.cc:518
-@@ -913,7 +904,9 @@
- "The following address entry was changed on the handheld as well as on the PC "
- "side. The changes could not be merged automatically, so please resolve the "
- "conflict yourself:"
--msgstr "底下的通訊錄項目已同時在 PC 與掌上型裝置中變更，但是兩者的變更無法自動合併。請先解決這個問題："
-+msgstr ""
-+"底下的通訊錄項目已同時在 PC 與掌上型裝置中變更，但是兩者的變更無法自動合併。"
-+"請先解決這個問題："
- 
- #: conduits/abbrowserconduit/abbrowser-conduit.cc:1762
- msgid "Address conflict"
-@@ -1026,7 +1019,9 @@
- msgid ""
- "<qt>You selected to sync folders, but gave a filename instead (<em>%1</em>)."
- "<br>Use folder <em>%2</em> instead?</qt>"
--msgstr "<qt>您選擇要同步資料夾，但是給了一個檔案（<em>%1</em>）。<br> 要改用資料夾 <em>%2</em> 嗎？</qt>"
-+msgstr ""
-+"<qt>您選擇要同步資料夾，但是給了一個檔案（<em>%1</em>）。<br> 要改用資料夾 "
-+"<em>%2</em> 嗎？</qt>"
- 
- #: conduits/docconduit/kpalmdoc_dlg.cc:179
- #: conduits/docconduit/kpalmdoc_dlg.cc:215
-@@ -1039,7 +1034,8 @@
- msgid ""
- "<qt>The folder <em>%1</em> for the handheld database files is not a valid "
- "folder.</qt>"
--msgstr "<qt>掌上型裝置資料庫檔所使用的資料夾 <em>%1</em> 不是合法的資料夾。</qt>"
-+msgstr ""
-+"<qt>掌上型裝置資料庫檔所使用的資料夾 <em>%1</em> 不是合法的資料夾。</qt>"
- 
- #: conduits/docconduit/kpalmdoc_dlg.cc:201
- msgid ""
-@@ -1157,12 +1153,12 @@
- "Here is a list of all text files and DOC databases the conduit found. The "
- "conduit tried to determine the correct sync direction, but for databases in "
- "bold red letters a conflict occurred (i.e. the text was changed both on the "
--"desktop and on the handheld). For these databases please specify which version "
--"is the current one."
-+"desktop and on the handheld). For these databases please specify which "
-+"version is the current one."
- msgstr ""
--"這裡是導管所找到的所有文字檔與 DOC "
--"資料庫的清單。導管曾經試著決定正確的同步方向，但是以粗紅字母標出的資料庫中出現衝突（也就是文字內容在兩邊都做了變更）。請指定這些發生衝突的資料庫，要以哪個版本為"
--"主。"
-+"這裡是導管所找到的所有文字檔與 DOC 資料庫的清單。導管曾經試著決定正確的同步方"
-+"向，但是以粗紅字母標出的資料庫中出現衝突（也就是文字內容在兩邊都做了變更）。"
-+"請指定這些發生衝突的資料庫，要以哪個版本為主。"
- 
- #: conduits/docconduit/doc-conflictdialog.cc:57
- msgid ""
-@@ -1191,7 +1187,7 @@
- 
- #: conduits/docconduit/doc-conflictdialog.cc:113
- msgid "More Info..."
--msgstr "更多資訊..."
-+msgstr "更多資訊…"
- 
- #: conduits/docconduit/doc-conflictdialog.cc:155
- msgid "unchanged"
-@@ -1226,16 +1222,12 @@
- "\n"
- 
- #: conduits/docconduit/doc-conflictdialog.cc:172
--msgid ""
--"Handheld: %1\n"
--msgstr ""
--"掌上型裝置：%1\n"
-+msgid "Handheld: %1\n"
-+msgstr "掌上型裝置：%1\n"
- 
- #: conduits/docconduit/doc-conflictdialog.cc:173
--msgid ""
--"Desktop: %1\n"
--msgstr ""
--"桌面：%1\n"
-+msgid "Desktop: %1\n"
-+msgstr "桌面：%1\n"
- 
- #: conduits/docconduit/doc-conflictdialog.cc:175
- msgid "Database information"
-@@ -1270,7 +1262,9 @@
- 
- #: conduits/notepadconduit/notepad-factory.cc:78
- msgid "Notepad conduit is based on Angus' read-notepad, part of pilot-link"
--msgstr "記事本導管是以 Angus 的 read-notepad 為基礎開發出來的。它是 pilot-link 的一部份"
-+msgstr ""
-+"記事本導管是以 Angus 的 read-notepad 為基礎開發出來的。它是 pilot-link 的一部"
-+"份"
- 
- #: conduits/recordconduit/factory.cc:64
- msgid "Record Conduit"
-@@ -1361,8 +1355,8 @@
- 
- #: conduits/vcalconduit/vcal-conduit.cc:222
- msgid ""
--"Event \"%1\" has a yearly recurrence other than by month, will change this to "
--"recurrence by month on handheld."
-+"Event \"%1\" has a yearly recurrence other than by month, will change this "
-+"to recurrence by month on handheld."
- msgstr "事件 %1 設定為年度循環，而不是月份循環。在掌上型裝置將改為月份循環。"
- 
- #: conduits/vcalconduit/vcal-setup.cc:44
-@@ -1388,12 +1382,12 @@
- 
- #: conduits/vcalconduit/cleanupstate.cc:62
- msgid "Cleaning up ..."
--msgstr "清除中..."
-+msgstr "清除中…"
- 
- #: conduits/vcalconduit/cleanupstate.cc:91
- msgid ""
--"An error occurred while uploading \"%1\". You can try to upload the temporary "
--"local file \"%2\" manually."
-+"An error occurred while uploading \"%1\". You can try to upload the "
-+"temporary local file \"%2\" manually."
- msgstr "上傳 %1 時發生錯誤。您可以試著手動上傳本地的暫存檔 %2。"
- 
- #: conduits/vcalconduit/todo-conduit.cc:183
-@@ -1403,11 +1397,11 @@
- 
- #: conduits/vcalconduit/pctohhstate.cc:71
- msgid "Copying records to Pilot ..."
--msgstr "複製紀錄到 Pilot..."
-+msgstr "複製紀錄到 Pilot…"
- 
- #: conduits/vcalconduit/initstate.cc:59
- msgid "Initializing conduit ..."
--msgstr "初始化導管中..."
-+msgstr "初始化導管中…"
- 
- #: conduits/vcalconduit/todo-setup.cc:47
- msgid "To-do Conduit for KPilot"
-@@ -1429,7 +1423,9 @@
- msgid ""
- "You selected to sync with an iCalendar file, but did not give a filename. "
- "Please select a valid file name in the conduit's configuration dialog"
--msgstr "您選擇要與 iCalendar 檔案同步，但是未指定檔案名稱。請在導管設定對話框中選擇一個合法檔案。"
-+msgstr ""
-+"您選擇要與 iCalendar 檔案同步，但是未指定檔案名稱。請在導管設定對話框中選擇一"
-+"個合法檔案。"
- 
- #: conduits/vcalconduit/vcal-conduitbase.cc:291
- #: conduits/vcalconduit/vcal-conduitbase.cc:356
-@@ -1448,7 +1444,9 @@
- "You chose to sync with the file \"%1\", which cannot be opened or created. "
- "Please make sure to supply a valid file name in the conduit's configuration "
- "dialog. Aborting the conduit."
--msgstr "您選擇與檔案 %1 同步，但是檔案無法開啟或建立。請確定您在導管設定中所給的是正確的檔名。將中止此導管。"
-+msgstr ""
-+"您選擇與檔案 %1 同步，但是檔案無法開啟或建立。請確定您在導管設定中所給的是正"
-+"確的檔名。將中止此導管。"
- 
- #: conduits/vcalconduit/vcal-conduitbase.cc:330
- msgid "Syncing with file \"%1\""
-@@ -1507,35 +1505,35 @@
- 
- #: kpilot/conduitConfigDialog.cc:264
- msgid "Configure..."
--msgstr "設定..."
-+msgstr "設定…"
- 
- #: kpilot/conduitConfigDialog.cc:274
- msgid ""
--"<qt><i>Conduits</i> are external (possibly third-party) programs that perform "
--"synchronization actions. They may have individual configurations. Select a "
--"conduit to configure it, and enable it by clicking on its checkbox. </qt>"
-+"<qt><i>Conduits</i> are external (possibly third-party) programs that "
-+"perform synchronization actions. They may have individual configurations. "
-+"Select a conduit to configure it, and enable it by clicking on its checkbox. "
-+"</qt>"
- msgstr ""
--"<qt>所謂的導管（<i>Conduits</i>）是外部程式（有可能是第三者提供的），用以執行同步動作。每個導管都可能有自己的設定。請選擇一個導管，設定好後勾"
--"選就可以開始使用。</qt>"
-+"<qt>所謂的導管（<i>Conduits</i>）是外部程式（有可能是第三者提供的），用以執行"
-+"同步動作。每個導管都可能有自己的設定。請選擇一個導管，設定好後勾選就可以開始"
-+"使用。</qt>"
- 
- #: kpilot/conduitConfigDialog.cc:282
- msgid ""
--"<qt>"
--"<p>The <i>general</i> portion of KPilot's setup contains settings for your "
--"hardware and the way KPilot should display your data. For the basic setup, "
--"which should fulfill the need of most users, just use the setup wizard "
--"below.</p>If you need some special settings, this dialog provides all the "
--"options for fine-tuning KPilot. But be warned: The HotSync settings are various "
--"esoteric things.</p>"
--"<p>You can enable an action or conduit by clicking on its checkbox. Checked "
--"conduits will be run during a HotSync. Select a conduit to configure it.</p>"
--"</qt>"
--msgstr ""
--"<qt>"
--"<p>KPilot 設定中的「一般」設定包括了您的硬體，以及 KPilot 顯示您的資料的方法設定。要做基本設定，您可以用底下的組態精靈。</p> "
--"<p>如果您需要做一些特殊設定，此對話框提供了微調 KPilot "
--"所需的所有選項。不過請小心：熱同步（HotSync）設定裡多半是一些有經驗的人才懂的設定。</p> "
--"<p>您可以勾選以開啟一個動作或導管。所選取的導管會在熱同步時執行。選擇一個導管以設定。</p></qt>"
-+"<qt><p>The <i>general</i> portion of KPilot's setup contains settings for "
-+"your hardware and the way KPilot should display your data. For the basic "
-+"setup, which should fulfill the need of most users, just use the setup "
-+"wizard below.</p>If you need some special settings, this dialog provides all "
-+"the options for fine-tuning KPilot. But be warned: The HotSync settings are "
-+"various esoteric things.</p><p>You can enable an action or conduit by "
-+"clicking on its checkbox. Checked conduits will be run during a HotSync. "
-+"Select a conduit to configure it.</p></qt>"
-+msgstr ""
-+"<qt><p>KPilot 設定中的「一般」設定包括了您的硬體，以及 KPilot 顯示您的資料的"
-+"方法設定。要做基本設定，您可以用底下的組態精靈。</p> <p>如果您需要做一些特殊"
-+"設定，此對話框提供了微調 KPilot 所需的所有選項。不過請小心：熱同步（HotSync）"
-+"設定裡多半是一些有經驗的人才懂的設定。</p> <p>您可以勾選以開啟一個動作或導"
-+"管。所選取的導管會在熱同步時執行。選擇一個導管以設定。</p></qt>"
- 
- #: kpilot/conduitConfigDialog.cc:295
- msgid "Configuration Wizard"
-@@ -1598,8 +1596,8 @@
- 
- #: kpilot/conduitConfigDialog.cc:542
- msgid ""
--"<qt>This is an internal action which has no configuration options. The action's "
--"description is: <i>%1</i> </qt>"
-+"<qt>This is an internal action which has no configuration options. The "
-+"action's description is: <i>%1</i> </qt>"
- msgstr "<qt>這是沒有設定選項的內部動作。動作的描述為：<i>%1</i>。</qt>"
- 
- #: kpilot/conduitConfigDialog.cc:722
-@@ -1608,8 +1606,8 @@
- 
- #: kpilot/conduitConfigDialog.cc:735
- msgid ""
--"<qt>No library could be found for the conduit %1. This means that the conduit "
--"was not installed properly.</qt>"
-+"<qt>No library could be found for the conduit %1. This means that the "
-+"conduit was not installed properly.</qt>"
- msgstr "<qt>找不到導管 %1 所需的函式庫。這表示導管沒有正確安裝。</qt>"
- 
- #: kpilot/conduitConfigDialog.cc:745 kpilot/conduitConfigDialog.cc:762
-@@ -1618,14 +1616,14 @@
- 
- #: kpilot/conduitConfigDialog.cc:752
- msgid ""
--"<qt>There was a problem loading the library for the conduit %1. This means that "
--"the conduit was not installed properly.</qt>"
-+"<qt>There was a problem loading the library for the conduit %1. This means "
-+"that the conduit was not installed properly.</qt>"
- msgstr "<qt>載入導管 %1 的函式庫時發生問題。這表示導管沒有正確安裝。</qt>"
- 
- #: kpilot/dbSelectionDialog.cc:108
- msgid ""
--"This is a database that exists on the device. It was not added manually, so it "
--"can not removed from the list."
-+"This is a database that exists on the device. It was not added manually, so "
-+"it can not removed from the list."
- msgstr "這是裝置上的資料庫。它不是手動新增的，所以也無法從清單中移除。"
- 
- #: kpilot/dbSelectionDialog.cc:108
-@@ -1665,8 +1663,8 @@
- "When syncing the calendar or to-do list using KPilot please quit Evolution "
- "before the sync, otherwise you will lose data."
- msgstr ""
--"KPilot 目前還無法與 Evolution 的通訊錄同步，因此通訊錄導管已被關閉。若要使用 KPilot 來同步行事曆或待辦事項，請先離開 "
--"Evolution，以避免資料流失。"
-+"KPilot 目前還無法與 Evolution 的通訊錄同步，因此通訊錄導管已被關閉。若要使用 "
-+"KPilot 來同步行事曆或待辦事項，請先離開 Evolution，以避免資料流失。"
- 
- #: kpilot/kpilotConfigWizard.cc:157
- msgid "Restrictions with Evolution"
-@@ -1691,8 +1689,8 @@
- 
- #: kpilot/kpilotConfigWizard.cc:205
- msgid ""
--"The remaining options in the config dialog are advanced options and can be used "
--"to fine-tune KPilot."
-+"The remaining options in the config dialog are advanced options and can be "
-+"used to fine-tune KPilot."
- msgstr "設定對話框中的其它選項是進階選項，可用於微調 KPilot。"
- 
- #: kpilot/kpilotConfigWizard.cc:210
-@@ -1704,15 +1702,16 @@
- "Please put the handheld in the cradle, press the hotsync button and click on "
- "\"Continue\".\n"
- "\n"
--"Some kernel versions (Linux 2.6.x) have problems with the visor kernel module "
--"(for Sony Clie devices). Running an autodetection in that case might block the "
--"computer from doing hotsyncs until it is rebooted. In that case it might be "
--"advisable not to continue."
-+"Some kernel versions (Linux 2.6.x) have problems with the visor kernel "
-+"module (for Sony Clie devices). Running an autodetection in that case might "
-+"block the computer from doing hotsyncs until it is rebooted. In that case it "
-+"might be advisable not to continue."
- msgstr ""
- "請將掌上型裝置放於架上，按下熱同步鍵，並點選「繼續」。\n"
- "\n"
--"有些核心版本（Linux 2.6.x）的 visor 模組（Sony Clie "
--"裝置用的）有些問題。若使用該模組執行自動偵測可能會鎖住電腦無法執行熱同步，直到重開機為止。若是這種狀況，最好不要繼續。"
-+"有些核心版本（Linux 2.6.x）的 visor 模組（Sony Clie 裝置用的）有些問題。若使"
-+"用該模組執行自動偵測可能會鎖住電腦無法執行熱同步，直到重開機為止。若是這種狀"
-+"況，最好不要繼續。"
- 
- #: kpilot/kpilotConfigWizard.cc:223
- msgid "Handheld Detection"
-@@ -1737,7 +1736,8 @@
- 
- #: kpilot/kpilotConfig.cc:178
- msgid ""
--"Renamed conduits, Kroupware and file installer have been made conduits as well."
-+"Renamed conduits, Kroupware and file installer have been made conduits as "
-+"well."
- msgstr "導管重命名、Kroupware、以及檔案安裝器也做成導管了。"
- 
- #: kpilot/kpilotConfig.cc:181
-@@ -1750,8 +1750,8 @@
- 
- #: kpilot/kpilotConfig.cc:199
- msgid ""
--"The configuration file for KPilot is out-of date. Please run KPilot to update "
--"it."
-+"The configuration file for KPilot is out-of date. Please run KPilot to "
-+"update it."
- msgstr "KPilot 的設定檔已過期。請執行 KPilot 以更新。"
- 
- #: kpilot/kpilotConfig.cc:202 kpilot/kpilotConfig.cc:327
-@@ -1770,9 +1770,11 @@
- 
- #: kpilot/kpilotConfig.cc:248
- msgid ""
--"<qt>The following old conduits were found on your system. It is a good idea to "
--"remove them and the associated <tt>.la</tt> and <tt>.so.0</tt> files.</qt>"
--msgstr "<qt>在您的系統上發現了以下的舊導管。建議您將相關的 <tt>.la</tt> 與 <tt>.so.0</tt> 檔案移除。</qt>"
-+"<qt>The following old conduits were found on your system. It is a good idea "
-+"to remove them and the associated <tt>.la</tt> and <tt>.so.0</tt> files.</qt>"
-+msgstr ""
-+"<qt>在您的系統上發現了以下的舊導管。建議您將相關的 <tt>.la</tt> 與 <tt>."
-+"so.0</tt> 檔案移除。</qt>"
- 
- #: kpilot/kpilotConfig.cc:253
- msgid "Old Conduits Found"
-@@ -1783,7 +1785,9 @@
- "<qt>The no backup databases listed in your configuration file have been "
- "adjusted to the new format. Database creator IDs have been changed to use "
- "square brackets []."
--msgstr "<qt>列在您的設定檔中的無備份資料庫已經調整為新的格式。資料庫建立者代碼已經改為用方括號 [] 括起來。"
-+msgstr ""
-+"<qt>列在您的設定檔中的無備份資料庫已經調整為新的格式。資料庫建立者代碼已經改"
-+"為用方括號 [] 括起來。"
- 
- #: kpilot/kpilotConfig.cc:289
- msgid "No Backup Databases Updated"
-@@ -1791,9 +1795,10 @@
- 
- #: kpilot/kpilotConfig.cc:310
- msgid ""
--"KPilot is not configured for use. You may use the configuration wizard or the "
--"normal configure dialog to configure KPilot."
--msgstr "KPilot 設未設定完成。您可以用組態精靈，或是一般的設定對話框來設定 KPilot。"
-+"KPilot is not configured for use. You may use the configuration wizard or "
-+"the normal configure dialog to configure KPilot."
-+msgstr ""
-+"KPilot 設未設定完成。您可以用組態精靈，或是一般的設定對話框來設定 KPilot。"
- 
- #: kpilot/kpilotConfig.cc:313
- msgid "Not Configured"
-@@ -1809,9 +1814,10 @@
- 
- #: kpilot/kpilotConfig.cc:323
- msgid ""
--"The configuration file for KPilot is out-of date. KPilot can update some parts "
--"of the configuration automatically. Do you wish to continue?"
--msgstr "KPilot 的設定檔已過期。KPilot 可以自動更新設定檔中的某些部份。您要繼續嗎？"
-+"The configuration file for KPilot is out-of date. KPilot can update some "
-+"parts of the configuration automatically. Do you wish to continue?"
-+msgstr ""
-+"KPilot 的設定檔已過期。KPilot 可以自動更新設定檔中的某些部份。您要繼續嗎？"
- 
- #: kpilot/dbRecordEditor.cc:53
- msgid "Edit Record"
-@@ -1819,13 +1825,14 @@
- 
- #: kpilot/dbRecordEditor.cc:75
- msgid ""
--"Changing the record data and flags might corrupt the whole record, or even make "
--"the database unusable. Do not change the values unless you are absolutely sure "
--"you know what you are doing.\n"
-+"Changing the record data and flags might corrupt the whole record, or even "
-+"make the database unusable. Do not change the values unless you are "
-+"absolutely sure you know what you are doing.\n"
- "\n"
- "Really assign these new flags?"
- msgstr ""
--"變更紀錄資料與旗標可能會造成整個紀錄損毀，或甚至造成整個資料庫無法使用。除非您十分確定您在做什麼，否則不要任意變更這些值。\n"
-+"變更紀錄資料與旗標可能會造成整個紀錄損毀，或甚至造成整個資料庫無法使用。除非"
-+"您十分確定您在做什麼，否則不要任意變更這些值。\n"
- "\n"
- "您確定要指定這些新的旗標嗎？"
- 
-@@ -1880,7 +1887,7 @@
- #: kpilot/dbRecordEditor.cc:114 rc.cpp:1412
- #, no-c-format
- msgid "&Secret"
--msgstr "秘密(&S)"
-+msgstr "祕密(&S)"
- 
- #. i18n: file ./kpilot/dbRecordEditor_base.ui line 113
- #: kpilot/dbRecordEditor.cc:115 rc.cpp:1415
-@@ -1890,21 +1897,22 @@
- 
- #: kpilot/dbRecordEditor.cc:193
- msgid ""
--"To view and edit the record data, please install a hex editor (e.g. kbytesedit "
--"from kdeutils)."
--msgstr "要檢視與編輯紀錄資料，請安裝十六進位碼編輯器（如 kdeutils 中的 khexedit）。"
-+"To view and edit the record data, please install a hex editor (e.g. "
-+"kbytesedit from kdeutils)."
-+msgstr ""
-+"要檢視與編輯紀錄資料，請安裝十六進位碼編輯器（如 kdeutils 中的 khexedit）。"
- 
- #: kpilot/datebookWidget.cc:58 kpilot/dbviewerWidget.cc:109
- msgid "&Add..."
--msgstr "新增(&A)..."
-+msgstr "新增(&A)…"
- 
- #: kpilot/datebookWidget.cc:61 kpilot/dbviewerWidget.cc:111
- msgid "&Edit..."
--msgstr "編輯(&E)..."
-+msgstr "編輯(&E)…"
- 
- #: kpilot/datebookWidget.cc:64
- msgid "&Delete..."
--msgstr "刪除(&D)..."
-+msgstr "刪除(&D)…"
- 
- #: kpilot/datebookWidget.cc:69
- msgid "Al"
-@@ -1924,13 +1932,14 @@
- 
- #: kpilot/dbFlagsEditor.cc:60
- msgid ""
--"Changing the database flags might corrupt the whole database, or make the data "
--"unusable. Do not change the values unless you are absolutely sure you know what "
--"you are doing.\n"
-+"Changing the database flags might corrupt the whole database, or make the "
-+"data unusable. Do not change the values unless you are absolutely sure you "
-+"know what you are doing.\n"
- "\n"
- "Really assign these new flags?"
- msgstr ""
--"變更資料庫旗標可能會造成整個資料庫損毀，或是讓資料無法使用。除非您十分確定您在做什麼，否則不要任意變更這些值。\n"
-+"變更資料庫旗標可能會造成整個資料庫損毀，或是讓資料無法使用。除非您十分確定您"
-+"在做什麼，否則不要任意變更這些值。\n"
- "\n"
- "您確定要指定這些新的旗標嗎？"
- 
-@@ -1963,13 +1972,15 @@
- 
- #: kpilot/logWidget.cc:148
- msgid "Save Log..."
--msgstr "儲存紀錄..."
-+msgstr "儲存紀錄…"
- 
- #: kpilot/logWidget.cc:149
- msgid ""
- "<qt>You can save the list of messages received during this HotSync to a file "
- "(for example for use in a bug report) by clicking here.</qt>"
--msgstr "<qt>您可以點選這裡，以將目前熱同步期間所接收到的訊息清單儲存到檔案中（可以用於回報錯誤）。</qt>"
-+msgstr ""
-+"<qt>您可以點選這裡，以將目前熱同步期間所接收到的訊息清單儲存到檔案中（可以用"
-+"於回報錯誤）。</qt>"
- 
- #: kpilot/logWidget.cc:158
- msgid "Sync progress:"
-@@ -2021,7 +2032,7 @@
- 
- #: kpilot/pilotDaemon.cc:159
- msgid "&Configure KPilot..."
--msgstr "設定 KPilot(&C)..."
-+msgstr "設定 KPilot(&C)…"
- 
- #: kpilot/pilotDaemon.cc:164
- msgid ""
-@@ -2058,13 +2069,13 @@
- 
- #: kpilot/pilotDaemon.cc:907
- msgid ""
--"HotSync is disabled because KPilot could not determine the state of the screen "
--"saver. You can disable this security feature by unchecking the 'do not sync "
--"when screensaver is active' box in the HotSync page of the configuration "
--"dialog."
-+"HotSync is disabled because KPilot could not determine the state of the "
-+"screen saver. You can disable this security feature by unchecking the 'do "
-+"not sync when screensaver is active' box in the HotSync page of the "
-+"configuration dialog."
- msgstr ""
--"熱同步會被關閉，因為 KPilot "
--"無法決定螢幕保護程式的狀態。若您堅持要這樣做，您可以在設定對話框中的「熱同步」頁中，取消勾選「螢幕保護程式啟動時不要同步」。"
-+"熱同步會被關閉，因為 KPilot 無法決定螢幕保護程式的狀態。若您堅持要這樣做，您"
-+"可以在設定對話框中的「熱同步」頁中，取消勾選「螢幕保護程式啟動時不要同步」。"
- 
- #: kpilot/pilotDaemon.cc:1165 kpilot/pilotDaemon.cc:1166
- msgid "HotSync Completed.<br>"
-@@ -2113,11 +2124,11 @@
- 
- #: kpilot/kroupware.cc:188
- msgid "Rewriting to-dos to KMail..."
--msgstr "重新將待辦事項寫入 KMail..."
-+msgstr "重新將待辦事項寫入 KMail…"
- 
- #: kpilot/kroupware.cc:195
- msgid "Rewriting Calendar to KMail"
--msgstr "重新將行事曆寫入 KMail..."
-+msgstr "重新將行事曆寫入 KMail…"
- 
- #: kpilot/kroupware.cc:230
- msgid "Syncing KMail with Addresses "
-@@ -2135,7 +2146,9 @@
- msgid ""
- "To view the Application info block data, please install a hex editor (e.g. "
- "khexedit from kdeutils)."
--msgstr "要檢視應用程式資訊區塊的資料，請安裝十六進位碼編輯器（如 kdeutils 中的 khexedit）"
-+msgstr ""
-+"要檢視應用程式資訊區塊的資料，請安裝十六進位碼編輯器（如 kdeutils 中的 "
-+"khexedit）"
- 
- #: kpilot/dbAppInfoEditor.cc:86
- msgid "Changing the AppInfo block isn't yet supported by KPilot!"
-@@ -2175,7 +2188,7 @@
- 
- #: kpilot/memoWidget.cc:264
- msgid "Import Memo..."
--msgstr "匯入備忘錄..."
-+msgstr "匯入備忘錄…"
- 
- #: kpilot/memoWidget.cc:268
- msgid "Read a text file and add it to the Pilot's memo database."
-@@ -2187,7 +2200,7 @@
- 
- #: kpilot/memoWidget.cc:272
- msgid "Export Memo..."
--msgstr "匯出備忘錄..."
-+msgstr "匯出備忘錄…"
- 
- #: kpilot/memoWidget.cc:277
- msgid "Write the selected memo to a file."
-@@ -2302,10 +2315,12 @@
- 
- #: kpilot/kpilotConfigDialog.cc:145
- msgid ""
--"<qt>The device name you entered (<i>%1</i>) is longer than 13 characters. This "
--"is probably unsupported and can cause problems. Are you sure you want to use "
--"this device name?</qt>"
--msgstr "<qt>您輸入的裝置名稱（<i>%1</i>）超過了 13 個字元，可能無法支援並會產生問題。您確定要使用此裝置名稱嗎？</qt>"
-+"<qt>The device name you entered (<i>%1</i>) is longer than 13 characters. "
-+"This is probably unsupported and can cause problems. Are you sure you want "
-+"to use this device name?</qt>"
-+msgstr ""
-+"<qt>您輸入的裝置名稱（<i>%1</i>）超過了 13 個字元，可能無法支援並會產生問題。"
-+"您確定要使用此裝置名稱嗎？</qt>"
- 
- #: kpilot/kpilotConfigDialog.cc:150
- msgid "Device Name too Long"
-@@ -2396,9 +2411,9 @@
- #: kpilot/dbviewerWidget.cc:366
- msgid ""
- "<qt>Do you really want to delete the selected record? This cannot be undone."
--"<br>"
--"<br>Delete record?<qt>"
--msgstr "<qt>您確定要刪除所選取的紀錄嗎？此動作無法復原。<br><br>要刪除紀錄嗎？<qt>"
-+"<br><br>Delete record?<qt>"
-+msgstr ""
-+"<qt>您確定要刪除所選取的紀錄嗎？此動作無法復原。<br><br>要刪除紀錄嗎？<qt>"
- 
- #: kpilot/dbviewerWidget.cc:366
- msgid "Deleting Record"
-@@ -2425,9 +2440,10 @@
- 
- #: kpilot/todoWidget.cc:243
- msgid ""
--"<qt>This list displays all the to-dos in the selected category. Click on one to "
--"display it to the right.</qt>"
--msgstr "<qt>這個清單顯示所選取類別的所有待辦事項。點選其中一個，可以在右邊顯示。</qt>"
-+"<qt>This list displays all the to-dos in the selected category. Click on one "
-+"to display it to the right.</qt>"
-+msgstr ""
-+"<qt>這個清單顯示所選取類別的所有待辦事項。點選其中一個，可以在右邊顯示。</qt>"
- 
- #: kpilot/todoWidget.cc:247
- msgid "To-do info:"
-@@ -2435,7 +2451,7 @@
- 
- #: kpilot/addressWidget.cc:251 kpilot/todoWidget.cc:257
- msgid "Edit Record..."
--msgstr "編輯紀錄..."
-+msgstr "編輯紀錄…"
- 
- #: kpilot/todoWidget.cc:262
- msgid "<qt>You can edit a to-do when it is selected.</qt>"
-@@ -2447,7 +2463,7 @@
- 
- #: kpilot/addressWidget.cc:259 kpilot/todoWidget.cc:266
- msgid "New Record..."
--msgstr "新紀錄..."
-+msgstr "新紀錄…"
- 
- #: kpilot/todoWidget.cc:270
- msgid "<qt>Add a new to-do to the to-do list.</qt>"
-@@ -2455,7 +2471,8 @@
- 
- #: kpilot/todoWidget.cc:271
- msgid ""
--"<qt><i>Adding new to-dos is disabled by the 'internal editors' setting.</i></qt>"
-+"<qt><i>Adding new to-dos is disabled by the 'internal editors' setting.</i></"
-+"qt>"
- msgstr "<qt><i>「內部編輯器」設定關閉新增待辦事項功能。</i></qt>"
- 
- #: kpilot/addressWidget.cc:269 kpilot/todoWidget.cc:275
-@@ -2477,9 +2494,11 @@
- 
- #: kpilot/todoWidget.cc:408
- msgid ""
--"You cannot add to-dos to the to-do list until you have done a HotSync at least "
--"once to retrieve the database layout from your Pilot."
--msgstr "您必須至少執行一次熱同步，從您的 Pilot 上取得資料庫佈局之後，您才能夠開始新增待辦事項。"
-+"You cannot add to-dos to the to-do list until you have done a HotSync at "
-+"least once to retrieve the database layout from your Pilot."
-+msgstr ""
-+"您必須至少執行一次熱同步，從您的 Pilot 上取得資料庫布局之後，您才能夠開始新增"
-+"待辦事項。"
- 
- #: kpilot/todoWidget.cc:411
- msgid "Cannot Add New To-do"
-@@ -2532,11 +2551,12 @@
- 
- #: kpilot/internalEditorAction.cc:204
- msgid ""
--"The %1 with ID %2 of the database \"%3\" was changed on the handheld and in the "
--"internal editor. Shall the changes in KPilot be copied to the handheld, and so "
--"override the changes there?"
-+"The %1 with ID %2 of the database \"%3\" was changed on the handheld and in "
-+"the internal editor. Shall the changes in KPilot be copied to the handheld, "
-+"and so override the changes there?"
- msgstr ""
--"資料庫 %3 的 %1（ID %2）已經在掌上型裝置與內部編輯器上都做了變更。要將 KPilot 上的變更複製到掌上型裝置，並覆寫那邊的變更嗎？"
-+"資料庫 %3 的 %1（ID %2）已經在掌上型裝置與內部編輯器上都做了變更。要將 "
-+"KPilot 上的變更複製到掌上型裝置，並覆寫那邊的變更嗎？"
- 
- #: kpilot/internalEditorAction.cc:209
- #, c-format
-@@ -2571,7 +2591,8 @@
- msgid ""
- "To view and edit the record data, please install a hex editor (e.g. khexedit "
- "from kdeutils)."
--msgstr "要檢視並編輯紀錄資料，請安裝十六進位碼編輯器（如 kdeutils 中的 khexedit）"
-+msgstr ""
-+"要檢視並編輯紀錄資料，請安裝十六進位碼編輯器（如 kdeutils 中的 khexedit）"
- 
- #: kpilot/internalEditorAction.cc:315
- #, c-format
-@@ -2599,7 +2620,8 @@
- msgid ""
- "KPilot is now trying to automatically detect the device of your handheld. "
- "Please press the hotsync button if you have not done so already."
--msgstr "KPilot 現在正試著自動偵測您的掌上型裝置。如果您尚未執行，請按下熱同步鍵。"
-+msgstr ""
-+"KPilot 現在正試著自動偵測您的掌上型裝置。如果您尚未執行，請按下熱同步鍵。"
- 
- #: kpilot/kpilotProbeDialog.cc:100
- msgid "Status"
-@@ -2607,7 +2629,7 @@
- 
- #: kpilot/kpilotProbeDialog.cc:104
- msgid "Autodetection not yet started..."
--msgstr "自動偵測尚未開始..."
-+msgstr "自動偵測尚未開始…"
- 
- #: kpilot/kpilotProbeDialog.cc:113
- msgid "Detected Values"
-@@ -2627,11 +2649,11 @@
- 
- #: kpilot/kpilotProbeDialog.cc:195
- msgid "Starting detection..."
--msgstr "開始偵測..."
-+msgstr "開始偵測…"
- 
- #: kpilot/kpilotProbeDialog.cc:233
- msgid "Waiting for handheld to connect..."
--msgstr "等待掌上型裝置連線..."
-+msgstr "等待掌上型裝置連線…"
- 
- #: kpilot/kpilotProbeDialog.cc:266
- msgid "Timeout reached, could not detect a handheld."
-@@ -2639,19 +2661,16 @@
- 
- #: kpilot/kpilotProbeDialog.cc:267
- msgid ""
--"<qt>A handheld could not be detected. Possible check the following things:</p>"
--"<ul>"
--"<li> Have you pressed the hotsync button on the handheld?\n"
-+"<qt>A handheld could not be detected. Possible check the following things:</"
-+"p><ul><li> Have you pressed the hotsync button on the handheld?\n"
- "<li> Make sure the device sits in the cradle correctly.\n"
- "<li> Make sure the cradle is correctly plugged in to the computer.\n"
- "<li> Have you checked that your device is actually supported by kpilot (see "
- "http://www.kpilot.org).\n"
- "</ul>"
- msgstr ""
--"<qt>"
--"<p>無法偵測到掌上型裝置。請檢查下列事項：</p> "
--"<ul> "
--"<li>您是否已按下了掌上型裝置上的熱同步鍵？\n"
-+"<qt><p>無法偵測到掌上型裝置。請檢查下列事項：</p> <ul> <li>您是否已按下了掌上"
-+"型裝置上的熱同步鍵？\n"
- "<li>請確認此裝置已正確地放置在架上。\n"
- "<li>請確定裝置架已正確地連線到電腦上。\n"
- "<li>您是否確定 KPilot 支援您的裝置？（請參考 http://www.kpilot.org）\n"
-@@ -2676,7 +2695,7 @@
- 
- #: kpilot/fileInstallWidget.cc:77
- msgid "Add File..."
--msgstr "新增檔案..."
-+msgstr "新增檔案…"
- 
- #: kpilot/fileInstallWidget.cc:81
- msgid "<qt>Choose a file to add to the list of files to install.</qt>"
-@@ -2695,7 +2714,9 @@
- msgid ""
- "<qt>This lists files that will be installed on the Pilot during the next "
- "HotSync. Drag files here or use the Add button.</qt>"
--msgstr "<qt>這裡列出在下次熱同步時要安裝在 Pilot 上的檔案。您可以將檔案拖放到這裡，或是用「新增」按鍵來新增。</qt>"
-+msgstr ""
-+"<qt>這裡列出在下次熱同步時要安裝在 Pilot 上的檔案。您可以將檔案拖放到這裡，或"
-+"是用「新增」按鍵來新增。</qt>"
- 
- #: kpilot/fileInstallWidget.cc:217
- msgid "*.pdb *.prc|PalmOS Databases (*.pdb *.prc)"
-@@ -2747,16 +2768,12 @@
- msgstr "略過 %1"
- 
- #: kpilot/hotSync.cc:482
--msgid ""
--"Backup of %1 failed.\n"
--msgstr ""
--"%1 備份失敗。\n"
-+msgid "Backup of %1 failed.\n"
-+msgstr "%1 備份失敗。\n"
- 
- #: kpilot/hotSync.cc:540
--msgid ""
--"... OK.\n"
--msgstr ""
--" .. 完成\n"
-+msgid "... OK.\n"
-+msgstr " .. 完成\n"
- 
- #: kpilot/hotSync.cc:548
- msgid "Backup failed."
-@@ -2801,9 +2818,11 @@
- #: kpilot/hotSync.cc:748
- msgid ""
- "The database in &quot;%1&quot; has a resource name that is longer than 31 "
--"characters. This suggests a bug in the tool used to create the database. KPilot "
--"cannot install this database."
--msgstr "%1 的資料庫中含有超過 31 個字元的資源名稱。這表示用於建立資料庫的工具可能有問題。KPilot 無法安裝此資料庫。"
-+"characters. This suggests a bug in the tool used to create the database. "
-+"KPilot cannot install this database."
-+msgstr ""
-+"%1 的資料庫中含有超過 31 個字元的資源名稱。這表示用於建立資料庫的工具可能有問"
-+"題。KPilot 無法安裝此資料庫。"
- 
- #: kpilot/hotSync.cc:806
- msgid ""
-@@ -2816,7 +2835,8 @@
- "<qt>Neither KPilot nor the handheld have a username set. They <i>should</i> "
- "be set. Should KPilot set them to a default value (<i>%1</i>)?</qt>"
- msgstr ""
--"<qt>KPilot 與掌上型裝置都沒有設定使用者名稱。使用者名稱必須要設定。要讓 KPilot 設為預設值（<i>%1</i>）嗎？</qt>"
-+"<qt>KPilot 與掌上型裝置都沒有設定使用者名稱。使用者名稱必須要設定。要讓 "
-+"KPilot 設為預設值（<i>%1</i>）嗎？</qt>"
- 
- #: kpilot/hotSync.cc:814 kpilot/hotSync.cc:831 kpilot/hotSync.cc:855
- msgid "User Unknown"
-@@ -2826,29 +2846,36 @@
- msgid ""
- "<qt>The handheld has a username set (<i>%1</i>) but KPilot does not. Should "
- "KPilot use this username in future?</qt>"
--msgstr "<qt>掌上型裝置中有設定使用者名稱（<i>%1</i>），但是 KPilot 沒有。要讓 KPilot 將來都用這個使用者名稱嗎？"
-+msgstr ""
-+"<qt>掌上型裝置中有設定使用者名稱（<i>%1</i>），但是 KPilot 沒有。要讓 KPilot "
-+"將來都用這個使用者名稱嗎？"
- 
- #: kpilot/hotSync.cc:844
- msgid ""
- "KPilot has a username set (<i>%1</i>) but the handheld does not. Should "
- "KPilot's username be set in the handheld as well?"
--msgstr "<qt>KPilot 中有設定使用者名稱（<i>%1</i>），但是掌上型裝置沒有。要讓掌上型裝置設定此使用者名稱嗎？"
-+msgstr ""
-+"<qt>KPilot 中有設定使用者名稱（<i>%1</i>），但是掌上型裝置沒有。要讓掌上型裝"
-+"置設定此使用者名稱嗎？"
- 
- #: kpilot/hotSync.cc:848
- msgid ""
- "<br/>(<i>Note:</i> If your handheld has been reset to factory defaults, you "
--"should use <i>Restore</i> instead of a regular HotSync. Click on Cancel to stop "
--"this sync.)"
--msgstr "<br/>（注意：若是您的掌上型裝置已被重置回出廠預設值，您應該用「回復」而不是用熱同步。點選「取消」來取消這次同步。）"
-+"should use <i>Restore</i> instead of a regular HotSync. Click on Cancel to "
-+"stop this sync.)"
-+msgstr ""
-+"<br/>（注意：若是您的掌上型裝置已被重置回出廠預設值，您應該用「回復」而不是用"
-+"熱同步。點選「取消」來取消這次同步。）"
- 
- #: kpilot/hotSync.cc:877
- msgid ""
--"<qt>The handheld thinks that the username is %1; however, KPilot says you are "
--"%2.Which of these is the correct name?\n"
-+"<qt>The handheld thinks that the username is %1; however, KPilot says you "
-+"are %2.Which of these is the correct name?\n"
- "If you click on Cancel, the sync will proceed, but the usernames will not be "
- "changed.</qt>"
- msgstr ""
--"<qt>掌上型裝置認為使用者名稱為 %1，但是 KPilot 認為您是 %2。哪個才是正確的？如果您選擇「取消」，會繼續同步，但是使用者名稱不會變更。</qt>"
-+"<qt>掌上型裝置認為使用者名稱為 %1，但是 KPilot 認為您是 %2。哪個才是正確的？"
-+"如果您選擇「取消」，會繼續同步，但是使用者名稱不會變更。</qt>"
- 
- #: kpilot/hotSync.cc:887
- msgid "User Mismatch"
-@@ -2875,7 +2902,9 @@
- "<qt>Are you sure you want to completely restore your Pilot from the backup "
- "directory (<i>%1</i>)? This will erase any information you currently have on "
- "your Pilot.</qt>"
--msgstr "<qt>您確定您要從備份目錄（<i>%1</i>）中完整回復您的 Pilot 嗎？這會將您的 Pilot 上現有的資訊消除掉。</qt>"
-+msgstr ""
-+"<qt>您確定您要從備份目錄（<i>%1</i>）中完整回復您的 Pilot 嗎？這會將您的 "
-+"Pilot 上現有的資訊消除掉。</qt>"
- 
- #: kpilot/hotSync.cc:1008
- msgid "Restore Pilot"
-@@ -2891,7 +2920,7 @@
- 
- #: kpilot/hotSync.cc:1024 kpilot/hotSync.cc:1094
- msgid "Restoring %1..."
--msgstr "回復 %1 中..."
-+msgstr "回復 %1 中…"
- 
- #: kpilot/hotSync.cc:1044
- msgid "File '%1' cannot be read."
-@@ -2911,11 +2940,12 @@
- 
- #: kpilot/kpilot.cc:162
- msgid "Starting the KPilot daemon ..."
--msgstr "啟動 KPilot 守護程式..."
-+msgstr "啟動 KPilot 守護程式…"
- 
- #: kpilot/kpilot.cc:179
- msgid ""
--"Could not start the KPilot daemon. The system error message was: &quot;%1&quot;"
-+"Could not start the KPilot daemon. The system error message was: &quot;%"
-+"1&quot;"
- msgstr "無法啟動 KPilot 守護程式。系統錯誤訊息為：%1"
- 
- #: kpilot/kpilot.cc:196
-@@ -3001,7 +3031,9 @@
- msgid ""
- "Select the kind of HotSync to perform next. This applies only to the next "
- "HotSync; to change the default, use the configuration dialog."
--msgstr "選擇下次要執行的熱同步種類。這只在下次熱同步時套用。如果要改變預設值，請到設定對話框中設定。"
-+msgstr ""
-+"選擇下次要執行的熱同步種類。這只在下次熱同步時套用。如果要改變預設值，請到設"
-+"定對話框中設定。"
- 
- #: kpilot/kpilot.cc:525
- msgid "&HotSync"
-@@ -3025,8 +3057,8 @@
- 
- #: kpilot/kpilot.cc:537
- msgid ""
--"Tell the daemon that the next HotSync should be a FullSync (check data on both "
--"sides)."
-+"Tell the daemon that the next HotSync should be a FullSync (check data on "
-+"both sides)."
- msgstr "告訴守護程式，下次熱同步時應該執行完整同步（檢查兩邊的資料）。"
- 
- #: kpilot/kpilot.cc:541
-@@ -3052,15 +3084,17 @@
- 
- #: kpilot/kpilot.cc:553
- msgid ""
--"Tell the daemon that the next HotSync should restore the Handheld from data on "
--"the PC."
-+"Tell the daemon that the next HotSync should restore the Handheld from data "
-+"on the PC."
- msgstr "告訴守護程式，下次熱同步時應該將 PC 上的備份資料回復到掌上型裝置上。"
- 
- #: kpilot/kpilot.cc:561
- msgid ""
--"Tell the daemon that the next HotSync should copy all data from the Handheld to "
--"the PC, overwriting entries on the PC."
--msgstr "告訴守護程式，下次熱同步時應該將掌上型裝置的所有資料複製到 PC 上，並覆寫在 PC 上現有的項目。"
-+"Tell the daemon that the next HotSync should copy all data from the Handheld "
-+"to the PC, overwriting entries on the PC."
-+msgstr ""
-+"告訴守護程式，下次熱同步時應該將掌上型裝置的所有資料複製到 PC 上，並覆寫在 "
-+"PC 上現有的項目。"
- 
- #: kpilot/kpilot.cc:569
- msgid "Next HotSync will copy PC to Handheld."
-@@ -3068,9 +3102,11 @@
- 
- #: kpilot/kpilot.cc:570
- msgid ""
--"Tell the daemon that the next HotSync should copy all data from the PC to the "
--"Handheld, overwriting entries on the Handheld."
--msgstr "告訴守護程式，下次熱同步時應該將 PC 上的所有資料複製到掌上型裝置上，並覆寫在掌上型裝置上現有的項目。"
-+"Tell the daemon that the next HotSync should copy all data from the PC to "
-+"the Handheld, overwriting entries on the Handheld."
-+msgstr ""
-+"告訴守護程式，下次熱同步時應該將 PC 上的所有資料複製到掌上型裝置上，並覆寫在"
-+"掌上型裝置上現有的項目。"
- 
- #: kpilot/kpilot.cc:577
- msgid "&List Only"
-@@ -3104,7 +3140,7 @@
- 
- #: kpilot/kpilot.cc:613
- msgid "Configuration &Wizard..."
--msgstr "組態精靈(&W)..."
-+msgstr "組態精靈(&W)…"
- 
- #: kpilot/kpilot.cc:616
- msgid "Configure KPilot using the configuration wizard."
-@@ -3112,9 +3148,9 @@
- 
- #: kpilot/kpilot.cc:851
- msgid ""
--"The library containing the configuration wizard for KPilot could not be loaded, "
--"and the wizard is not available. Please try to use the regular configuration "
--"dialog."
-+"The library containing the configuration wizard for KPilot could not be "
-+"loaded, and the wizard is not available. Please try to use the regular "
-+"configuration dialog."
- msgstr "無法載入 KPilot 組態精靈的函式庫，因此無法啟動精靈。請使用設定對話框。"
- 
- #: kpilot/kpilot.cc:854
-@@ -3186,8 +3222,8 @@
- 
- #: kpilot/fileInstaller.cc:110
- msgid ""
--"Only PalmOS database files (like *.pdb and *.prc) can be installed by the file "
--"installer."
-+"Only PalmOS database files (like *.pdb and *.prc) can be installed by the "
-+"file installer."
- msgstr "檔案安裝器只能安裝 PalmOS 資料庫檔案（如 *.pdb 與 *.prc）。"
- 
- #: kpilot/main-test.cc:66
-@@ -3279,9 +3315,10 @@
- 
- #: kpilot/addressWidget.cc:237
- msgid ""
--"<qt>This list displays all the addresses in the selected category. Click on one "
--"to display it to the right.</qt>"
--msgstr "<qt>這個清單顯示所選取的類別中的所有地址。點選其中一個，可以在右邊顯示。</qt>"
-+"<qt>This list displays all the addresses in the selected category. Click on "
-+"one to display it to the right.</qt>"
-+msgstr ""
-+"<qt>這個清單顯示所選取的類別中的所有地址。點選其中一個，可以在右邊顯示。</qt>"
- 
- #: kpilot/addressWidget.cc:241
- msgid "Address info:"
-@@ -3307,7 +3344,7 @@
- msgid ""
- "_: Export addresses to file\n"
- "Export..."
--msgstr "匯出..."
-+msgstr "匯出…"
- 
- #: kpilot/addressWidget.cc:281
- msgid "<qt>Export all addresses in the selected category to CSV format.</qt>"
-@@ -3315,9 +3352,11 @@
- 
- #: kpilot/addressWidget.cc:480
- msgid ""
--"You cannot add addresses to the address book until you have done a HotSync at "
--"least once to retrieve the database layout from your Pilot."
--msgstr "您必須至少執行一次熱同步，從您的 Pilot 上取得資料庫佈局之後，您才能夠開始新增地址。"
-+"You cannot add addresses to the address book until you have done a HotSync "
-+"at least once to retrieve the database layout from your Pilot."
-+msgstr ""
-+"您必須至少執行一次熱同步，從您的 Pilot 上取得資料庫布局之後，您才能夠開始新增"
-+"地址。"
- 
- #: kpilot/addressWidget.cc:483
- msgid "Cannot Add New Address"
-@@ -3396,10 +3435,12 @@
- #: rc.cpp:36 rc.cpp:42
- #, no-c-format
- msgid ""
--"<qt>Enter here, or select by clicking the file picker button, the location and "
--"file name of the output file used to store the handheld's system "
-+"<qt>Enter here, or select by clicking the file picker button, the location "
-+"and file name of the output file used to store the handheld's system "
- "information.</qt>"
--msgstr "<qt>請在此輸入要儲存掌上型裝置系統資訊的輸出檔名與位置，或直接點選檔案挑選器按鈕來挑選。</qt>"
-+msgstr ""
-+"<qt>請在此輸入要儲存掌上型裝置系統資訊的輸出檔名與位置，或直接點選檔案挑選器"
-+"按鈕來挑選。</qt>"
- 
- #. i18n: file ./conduits/sysinfoconduit/sysinfo-setup_dialog.ui line 71
- #: rc.cpp:39
-@@ -3445,9 +3486,12 @@
- #: rc.cpp:60
- #, no-c-format
- msgid ""
--"<qt>Enter here, or select by clicking on the file picker button, the location "
--"of the template to be used if you select the Custom template option.</qt>"
--msgstr "<qt>若您選擇使用自訂樣本，請在此輸入您要使用的樣本位置，或直接點選檔案挑選器按鈕來挑選。</qt>"
-+"<qt>Enter here, or select by clicking on the file picker button, the "
-+"location of the template to be used if you select the Custom template option."
-+"</qt>"
-+msgstr ""
-+"<qt>若您選擇使用自訂樣本，請在此輸入您要使用的樣本位置，或直接點選檔案挑選器"
-+"按鈕來挑選。</qt>"
- 
- #. i18n: file ./conduits/sysinfoconduit/sysinfo-setup_dialog.ui line 132
- #: rc.cpp:63
-@@ -3460,9 +3504,11 @@
- #, no-c-format
- msgid ""
- "<qt>Select this option to output the system information data as defined by a "
--"custom template. Enter the location of the template in the edit box, or select "
--"it clicking on the file picker button.</qt>"
--msgstr "<qt>選擇此選項，以使用自訂樣本來輸出系統資訊。您可以在此輸入您要使用的樣本位置，或直接點選檔案挑選器按鈕來挑選。</qt>"
-+"custom template. Enter the location of the template in the edit box, or "
-+"select it clicking on the file picker button.</qt>"
-+msgstr ""
-+"<qt>選擇此選項，以使用自訂樣本來輸出系統資訊。您可以在此輸入您要使用的樣本位"
-+"置，或直接點選檔案挑選器按鈕來挑選。</qt>"
- 
- #. i18n: file ./conduits/sysinfoconduit/sysinfo-setup_dialog.ui line 147
- #: rc.cpp:69
-@@ -3480,8 +3526,8 @@
- #: rc.cpp:75
- #, no-c-format
- msgid ""
--"<qt>Check on this list the types of information about your system and handheld "
--"you want to display in the output file.</qt>"
-+"<qt>Check on this list the types of information about your system and "
-+"handheld you want to display in the output file.</qt>"
- msgstr "<qt>在此清單上選擇您打算輸出到檔案中的掌上型裝置的系統資訊類型。</qt>"
- 
- #. i18n: file ./conduits/malconduit/mal-setup_dialog.ui line 49
-@@ -3506,10 +3552,12 @@
- #: rc.cpp:90
- #, no-c-format
- msgid ""
--"<qt>Select this option to synchronize with the MAL server on every HotSync. To "
--"perform a successful synchronization, you need to have access to the MAL server "
--"during the HotSync.</qt>"
--msgstr "<qt>選擇此選項，則在每次進行熱同步時會與 MAL 伺服器同步。要成功同步，您必須在熱同步期間能夠存取 MAL 伺服器。</qt>"
-+"<qt>Select this option to synchronize with the MAL server on every HotSync. "
-+"To perform a successful synchronization, you need to have access to the MAL "
-+"server during the HotSync.</qt>"
-+msgstr ""
-+"<qt>選擇此選項，則在每次進行熱同步時會與 MAL 伺服器同步。要成功同步，您必須在"
-+"熱同步期間能夠存取 MAL 伺服器。</qt>"
- 
- #. i18n: file ./conduits/malconduit/mal-setup_dialog.ui line 86
- #: rc.cpp:93
-@@ -3521,13 +3569,13 @@
- #: rc.cpp:96
- #, no-c-format
- msgid ""
--"<qt>Select this option to synchronize with the MAL server on every HotSync that "
--"is at least one hour after the previous MAL sync. To perform a successful "
--"synchronization, you need to have access to the MAL server during the "
--"HotSync.</qt>"
-+"<qt>Select this option to synchronize with the MAL server on every HotSync "
-+"that is at least one hour after the previous MAL sync. To perform a "
-+"successful synchronization, you need to have access to the MAL server during "
-+"the HotSync.</qt>"
- msgstr ""
--"<qt>選擇此選項，則在上一次與 MAL 伺服器同步之後至少隔一小時的熱同步動作時，會再與 MAL 伺服器同步。要成功同步，您必須在熱同步期間能夠存取 MAL "
--"伺服器。</qt>"
-+"<qt>選擇此選項，則在上一次與 MAL 伺服器同步之後至少隔一小時的熱同步動作時，會"
-+"再與 MAL 伺服器同步。要成功同步，您必須在熱同步期間能夠存取 MAL 伺服器。</qt>"
- 
- #. i18n: file ./conduits/malconduit/mal-setup_dialog.ui line 100
- #: rc.cpp:99
-@@ -3539,13 +3587,13 @@
- #: rc.cpp:102
- #, no-c-format
- msgid ""
--"<qt>Select this option to synchronize with the MAL server on every HotSync that "
--"is at least one day after the previous MAL sync. To perform a successful "
--"synchronization, you need to have access to the MAL server during the "
--"HotSync.</qt>"
-+"<qt>Select this option to synchronize with the MAL server on every HotSync "
-+"that is at least one day after the previous MAL sync. To perform a "
-+"successful synchronization, you need to have access to the MAL server during "
-+"the HotSync.</qt>"
- msgstr ""
--"<qt>選擇此選項，則在上一次與 MAL 伺服器同步之後至少隔一天的熱同步動作時，會再與 MAL 伺服器同步。要成功同步，您必須在熱同步期間能夠存取 MAL "
--"伺服器。</qt>"
-+"<qt>選擇此選項，則在上一次與 MAL 伺服器同步之後至少隔一天的熱同步動作時，會再"
-+"與 MAL 伺服器同步。要成功同步，您必須在熱同步期間能夠存取 MAL 伺服器。</qt>"
- 
- #. i18n: file ./conduits/malconduit/mal-setup_dialog.ui line 111
- #: rc.cpp:105
-@@ -3557,13 +3605,13 @@
- #: rc.cpp:108
- #, no-c-format
- msgid ""
--"<qt>Select this option to synchronize with the MAL server on every HotSync that "
--"is at least one week after the previous MAL sync. To perform a successful "
--"synchronization, you need to have access to the MAL server during the "
--"HotSync.</qt>"
-+"<qt>Select this option to synchronize with the MAL server on every HotSync "
-+"that is at least one week after the previous MAL sync. To perform a "
-+"successful synchronization, you need to have access to the MAL server during "
-+"the HotSync.</qt>"
- msgstr ""
--"<qt>選擇此選項，則在上一次與 MAL 伺服器同步之後至少隔一週的熱同步動作時，會再與 MAL 伺服器同步。要成功同步，您必須在熱同步期間能夠存取 MAL "
--"伺服器。</qt>"
-+"<qt>選擇此選項，則在上一次與 MAL 伺服器同步之後至少隔一週的熱同步動作時，會再"
-+"與 MAL 伺服器同步。要成功同步，您必須在熱同步期間能夠存取 MAL 伺服器。</qt>"
- 
- #. i18n: file ./conduits/malconduit/mal-setup_dialog.ui line 122
- #: rc.cpp:111
-@@ -3575,13 +3623,13 @@
- #: rc.cpp:114
- #, no-c-format
- msgid ""
--"<qt>Select this option to synchronize with the MAL server on every HotSync that "
--"is at least one month after the previous MAL sync. To perform a successful "
--"synchronization, you need to have access to the MAL server during the "
--"HotSync.</qt>"
-+"<qt>Select this option to synchronize with the MAL server on every HotSync "
-+"that is at least one month after the previous MAL sync. To perform a "
-+"successful synchronization, you need to have access to the MAL server during "
-+"the HotSync.</qt>"
- msgstr ""
--"<qt>選擇此選項，則在上一次與 MAL 伺服器同步之後至少隔一個月的熱同步動作時，會再與 MAL 伺服器同步。要成功同步，您必須在熱同步期間能夠存取 MAL "
--"伺服器。</qt>"
-+"<qt>選擇此選項，則在上一次與 MAL 伺服器同步之後至少隔一個月的熱同步動作時，會"
-+"再與 MAL 伺服器同步。要成功同步，您必須在熱同步期間能夠存取 MAL 伺服器。</qt>"
- 
- #. i18n: file ./conduits/malconduit/mal-setup_dialog.ui line 154
- #: rc.cpp:117
-@@ -3661,19 +3709,20 @@
- #: rc.cpp:153 rc.cpp:156
- #, no-c-format
- msgid ""
--"<qt>If you selected HTTP or SOCKS proxy, type the address of the proxy server "
--"to use here, in the form <i>foo.bar.com</i> (not <i>http://foo.bar.com</i> "
--"or <i>http://foo.bar.com:8080</i>).</qt>"
--msgstr ""
--"<qt>如果您選取 HTTP 或 SOCKS 伺服器，請在此輸入伺服器的位址，格式為 <i>foo.bar.com</i>（而不是 <i>"
--"http://foo.bar.com</i> 或 <i>http://foo.bar.com:8080</i>）。</qt>"
-+"<qt>If you selected HTTP or SOCKS proxy, type the address of the proxy "
-+"server to use here, in the form <i>foo.bar.com</i> (not <i>http://foo.bar."
-+"com</i> or <i>http://foo.bar.com:8080</i>).</qt>"
-+msgstr ""
-+"<qt>如果您選取 HTTP 或 SOCKS 伺服器，請在此輸入伺服器的位址，格式為 <i>foo."
-+"bar.com</i>（而不是 <i>http://foo.bar.com</i> 或 <i>http://foo.bar.com:8080</"
-+"i>）。</qt>"
- 
- #. i18n: file ./conduits/malconduit/mal-setup_dialog.ui line 305
- #: rc.cpp:159
- #, no-c-format
- msgid ""
--"<qt>Enter the port you want KPilot to use when connecting to your proxy server "
--"here.</qt>"
-+"<qt>Enter the port you want KPilot to use when connecting to your proxy "
-+"server here.</qt>"
- msgstr "<qt>輸入 KPilot 連線到代理伺服器時使用的連接埠。</qt>"
- 
- #. i18n: file ./conduits/malconduit/mal-setup_dialog.ui line 316
-@@ -3707,8 +3756,7 @@
- #, no-c-format
- msgid ""
- "<qt>Enter a list of MAL servers that do not need the use of a proxy here, "
--"separated with commas, e.g: "
--"<br><i>localhost,127.0.0.1,.lan</i><qt>"
-+"separated with commas, e.g: <br><i>localhost,127.0.0.1,.lan</i><qt>"
- msgstr ""
- "<qt>在此輸入不需要使用代理伺服器的 MAL 伺服器，以逗號分隔。例如："
- "<br><i>localhost,127.0.0.1,.lan</i>。<qt>"
-@@ -3741,11 +3789,12 @@
- #: rc.cpp:204
- #, no-c-format
- msgid ""
--"<qt>There is currently <b>no way to set server parameters on the desktop</b>"
--"; you need to use the <i>MobileLink</i> or <i>AGConnect</i> "
--"application on the handheld device. </qt>"
-+"<qt>There is currently <b>no way to set server parameters on the desktop</"
-+"b>; you need to use the <i>MobileLink</i> or <i>AGConnect</i> application on "
-+"the handheld device. </qt>"
- msgstr ""
--"<qt>目前沒有任何方法可在桌面上設定伺服器資訊。您必須使用掌上型裝置裡的 <i>MobileLink</i> 或 <i>AGConnect</i>。</qt>"
-+"<qt>目前沒有任何方法可在桌面上設定伺服器資訊。您必須使用掌上型裝置裡的 "
-+"<i>MobileLink</i> 或 <i>AGConnect</i>。</qt>"
- 
- #. i18n: file ./conduits/knotes/setup_base.ui line 45
- #: rc.cpp:210
-@@ -3757,13 +3806,14 @@
- #: rc.cpp:213
- #, no-c-format
- msgid ""
--"<qt>Check this box if you wish to delete notes from KNotes automatically when "
--"the corresponding Pilot memo is deleted. Use this option with care, as the "
--"notes you want to keep in the handheld and in the desktop are not necessarily "
--"the same.</qt>"
--msgstr ""
--"<qt>勾選此選項的話，您刪除 Pilot 備忘的時候，會自動刪除 KNotes "
--"上相關聯的備忘。請小心使用此選項，因為您要保存在掌上型裝置的備忘跟您想保存在桌面上的備忘不見得一樣。</qt>"
-+"<qt>Check this box if you wish to delete notes from KNotes automatically "
-+"when the corresponding Pilot memo is deleted. Use this option with care, as "
-+"the notes you want to keep in the handheld and in the desktop are not "
-+"necessarily the same.</qt>"
-+msgstr ""
-+"<qt>勾選此選項的話，您刪除 Pilot 備忘的時候，會自動刪除 KNotes 上相關聯的備"
-+"忘。請小心使用此選項，因為您要保存在掌上型裝置的備忘跟您想保存在桌面上的備忘"
-+"不見得一樣。</qt>"
- 
- #. i18n: file ./conduits/knotes/setup_base.ui line 59
- #: rc.cpp:216
-@@ -3779,8 +3829,9 @@
- "confirmation, when the corresponding Pilot memo is deleted. Use this option "
- "only if you want to keep the same notes in the handheld and in the PC.</qt>"
- msgstr ""
--"<qt>勾選此選項的話，在刪除 Pilot 備忘的同時要刪除相關 KNotes 備忘的話，將不會與您確認。除非您確定您要在掌上型裝置與您的 PC "
--"中保存同樣的備忘，否則請不要使用此選項。</qt>"
-+"<qt>勾選此選項的話，在刪除 Pilot 備忘的同時要刪除相關 KNotes 備忘的話，將不會"
-+"與您確認。除非您確定您要在掌上型裝置與您的 PC 中保存同樣的備忘，否則請不要使"
-+"用此選項。</qt>"
- 
- #. i18n: file ./conduits/timeconduit/time-setup_dialog.ui line 63
- #: rc.cpp:225
-@@ -3820,10 +3871,12 @@
- #: rc.cpp:240
- #, no-c-format
- msgid ""
--"<qt>PalmOS Version 3.25 and 3.3 do not support setting the system time, so this "
--"conduit will be skipped for handhelds that run either of these operating "
--"systems.</qt>"
--msgstr "<qt>PalmOS 3.25 與 3.3 版不支援設定系統時間，因此此導管在這兩個版本的作業系統上將被忽略。</qt>"
-+"<qt>PalmOS Version 3.25 and 3.3 do not support setting the system time, so "
-+"this conduit will be skipped for handhelds that run either of these "
-+"operating systems.</qt>"
-+msgstr ""
-+"<qt>PalmOS 3.25 與 3.3 版不支援設定系統時間，因此此導管在這兩個版本的作業系統"
-+"上將被忽略。</qt>"
- 
- #. i18n: file ./conduits/abbrowserconduit/KPilotCustomFieldEditor.ui line 18
- #: rc.cpp:243 rc.cpp:246
-@@ -3841,9 +3894,10 @@
- "last case, you can change the values here. Note, however, that for all other "
- "settings the values entered here will have no effect."
- msgstr ""
--"在您的掌上型裝置上，每個位址會提供四個自訂欄位給您個人使用。KPilot "
--"可以將這些欄位與生日、網址、即時通訊地址同步，或是單純儲存成自訂的值。在單純儲存成自訂值的狀況下，您可以在此修改它的值。不過要注意的是，對其它設定來講，此地輸入"
--"的值將沒有任何作用。"
-+"在您的掌上型裝置上，每個位址會提供四個自訂欄位給您個人使用。KPilot 可以將這些"
-+"欄位與生日、網址、即時通訊地址同步，或是單純儲存成自訂的值。在單純儲存成自訂"
-+"值的狀況下，您可以在此修改它的值。不過要注意的是，對其它設定來講，此地輸入的"
-+"值將沒有任何作用。"
- 
- #. i18n: file ./conduits/abbrowserconduit/KPilotCustomFieldEditor.ui line 46
- #: rc.cpp:252
-@@ -3855,10 +3909,12 @@
- #: rc.cpp:255 rc.cpp:264
- #, no-c-format
- msgid ""
--"<qt>Edit or enter the value of the third custom field here. Using KPilot, you "
--"can synchronize these values with the handheld's Address application custom "
--"fields.</qt>"
--msgstr "<qt>在此編輯或輸入第三個自訂欄位的值。若您使用 KPilot，您可以將這些值與掌上型裝置的通訊錄應用程式中的自訂欄位同步。</qt>"
-+"<qt>Edit or enter the value of the third custom field here. Using KPilot, "
-+"you can synchronize these values with the handheld's Address application "
-+"custom fields.</qt>"
-+msgstr ""
-+"<qt>在此編輯或輸入第三個自訂欄位的值。若您使用 KPilot，您可以將這些值與掌上型"
-+"裝置的通訊錄應用程式中的自訂欄位同步。</qt>"
- 
- #. i18n: file ./conduits/abbrowserconduit/KPilotCustomFieldEditor.ui line 60
- #: rc.cpp:258
-@@ -3870,19 +3926,23 @@
- #: rc.cpp:261 rc.cpp:270
- #, no-c-format
- msgid ""
--"<qt>Edit or enter the value of the fourth custom field here. Using KPilot, you "
--"can synchronize these values with the handheld's Address application custom "
--"fields.</qt>"
--msgstr "<qt>在此編輯或輸入第四個自訂欄位的值。若您使用 KPilot，您可以將這些值與掌上型裝置的通訊錄應用程式中的自訂欄位同步。</qt>"
-+"<qt>Edit or enter the value of the fourth custom field here. Using KPilot, "
-+"you can synchronize these values with the handheld's Address application "
-+"custom fields.</qt>"
-+msgstr ""
-+"<qt>在此編輯或輸入第四個自訂欄位的值。若您使用 KPilot，您可以將這些值與掌上型"
-+"裝置的通訊錄應用程式中的自訂欄位同步。</qt>"
- 
- #. i18n: file ./conduits/abbrowserconduit/KPilotCustomFieldEditor.ui line 82
- #: rc.cpp:267 rc.cpp:276
- #, no-c-format
- msgid ""
--"<qt>Edit or enter the value of the second custom field here. Using KPilot, you "
--"can synchronize these values with the handheld's Address application custom "
--"fields.</qt>"
--msgstr "<qt>在此編輯或輸入第二個自訂欄位的值。若您使用 KPilot，您可以將這些值與掌上型裝置的通訊錄應用程式中的自訂欄位同步。</qt>"
-+"<qt>Edit or enter the value of the second custom field here. Using KPilot, "
-+"you can synchronize these values with the handheld's Address application "
-+"custom fields.</qt>"
-+msgstr ""
-+"<qt>在此編輯或輸入第二個自訂欄位的值。若您使用 KPilot，您可以將這些值與掌上型"
-+"裝置的通訊錄應用程式中的自訂欄位同步。</qt>"
- 
- #. i18n: file ./conduits/abbrowserconduit/KPilotCustomFieldEditor.ui line 98
- #: rc.cpp:273
-@@ -3900,21 +3960,23 @@
- #: rc.cpp:282 rc.cpp:285
- #, no-c-format
- msgid ""
--"<qt>Edit or enter the value of the first custom field here. Using KPilot, you "
--"can synchronize these values with the handheld's Address application custom "
--"fields.</qt>"
--msgstr "<qt>在此編輯或輸入第一個自訂欄位的值。若您使用 KPilot，您可以將這些值與掌上型裝置的通訊錄應用程式中的自訂欄位同步。</qt>"
-+"<qt>Edit or enter the value of the first custom field here. Using KPilot, "
-+"you can synchronize these values with the handheld's Address application "
-+"custom fields.</qt>"
-+msgstr ""
-+"<qt>在此編輯或輸入第一個自訂欄位的值。若您使用 KPilot，您可以將這些值與掌上型"
-+"裝置的通訊錄應用程式中的自訂欄位同步。</qt>"
- 
- #. i18n: file ./conduits/abbrowserconduit/KPilotCustomFieldEditor.ui line 142
- #: rc.cpp:288
- #, no-c-format
- msgid ""
--"If you let KPilot sync the handheld's custom fields as custom fields on the PC, "
--"you can change the values here. Note, however, that for all other settings the "
--"values entered here will have no effect."
-+"If you let KPilot sync the handheld's custom fields as custom fields on the "
-+"PC, you can change the values here. Note, however, that for all other "
-+"settings the values entered here will have no effect."
- msgstr ""
--"如果您打算使用 KPilot 將掌上型裝置裡的自訂欄位同步為 PC "
--"上的自訂欄位，您可以在此變更這些值。不過要注意的是，對其它設定來講，此地輸入的值將沒有任何作用。"
-+"如果您打算使用 KPilot 將掌上型裝置裡的自訂欄位同步為 PC 上的自訂欄位，您可以"
-+"在此變更這些值。不過要注意的是，對其它設定來講，此地輸入的值將沒有任何作用。"
- 
- #. i18n: file ./conduits/abbrowserconduit/KPilotCustomFieldEditor.ui line 158
- #: rc.cpp:291
-@@ -3938,11 +4000,13 @@
- #: rc.cpp:300
- #, no-c-format
- msgid ""
--"These values indicate the state of the record for KPilot, and connect an entry "
--"on the handheld with an entry on the PC.\n"
--"Do NOT change these values: doing so will almost certainly result in data loss "
--"when you next do a sync."
--msgstr "這些值表示 KPilot 的紀錄狀態，並將 PC 上的項目與掌上型裝置的項目連接起來。請不要變更這些值，如此會導致在下一次同步時資料遺失。"
-+"These values indicate the state of the record for KPilot, and connect an "
-+"entry on the handheld with an entry on the PC.\n"
-+"Do NOT change these values: doing so will almost certainly result in data "
-+"loss when you next do a sync."
-+msgstr ""
-+"這些值表示 KPilot 的紀錄狀態，並將 PC 上的項目與掌上型裝置的項目連接起來。請"
-+"不要變更這些值，如此會導致在下一次同步時資料遺失。"
- 
- #. i18n: file ./conduits/abbrowserconduit/kaddressbookConduit.ui line 66
- #: rc.cpp:307 rc.cpp:913
-@@ -3960,9 +4024,12 @@
- #: rc.cpp:313
- #, no-c-format
- msgid ""
--"<qt>Select this option to synchronize with KDE's standard addressbook (i.e. the "
--"addressbook that you edit in KAddressBook, and which you use in KMail)</qt>"
--msgstr "<qt>選擇此選項的話，會與 KDE 的標準通訊錄（也就是 KAddressBook 與 KMail 中使用的通訊錄）同步。</qt>"
-+"<qt>Select this option to synchronize with KDE's standard addressbook (i.e. "
-+"the addressbook that you edit in KAddressBook, and which you use in KMail)</"
-+"qt>"
-+msgstr ""
-+"<qt>選擇此選項的話，會與 KDE 的標準通訊錄（也就是 KAddressBook 與 KMail 中使"
-+"用的通訊錄）同步。</qt>"
- 
- #. i18n: file ./conduits/abbrowserconduit/kaddressbookConduit.ui line 91
- #: rc.cpp:316
-@@ -3975,12 +4042,13 @@
- #, no-c-format
- msgid ""
- "<qt>Select this option to use a specific address book file, instead of the "
--"standard KDE address book. This file must be in the vCard format (.vcf). Type "
--"the location of this file in the edit box or select it clicking the file picker "
--"button.</qt>"
--msgstr ""
--"<qt>選擇此選項的話，會使用特別的通訊錄檔案，而不使用標準 KDE 通訊錄來同步。這個檔必須是 vCard "
--"格式（.vcf）。您可以在此輸入此檔案的位置，或直接點選檔案挑選器按鈕來挑選。</qt>"
-+"standard KDE address book. This file must be in the vCard format (.vcf). "
-+"Type the location of this file in the edit box or select it clicking the "
-+"file picker button.</qt>"
-+msgstr ""
-+"<qt>選擇此選項的話，會使用特別的通訊錄檔案，而不使用標準 KDE 通訊錄來同步。這"
-+"個檔必須是 vCard 格式（.vcf）。您可以在此輸入此檔案的位置，或直接點選檔案挑選"
-+"器按鈕來挑選。</qt>"
- 
- #. i18n: file ./conduits/abbrowserconduit/kaddressbookConduit.ui line 113
- #: rc.cpp:322
-@@ -3988,7 +4056,9 @@
- msgid ""
- "<qt>Enter the vCard file name here or select it by clicking the file picker "
- "button. vCard is a standard format for exchanging contact information. </qt>"
--msgstr "<qt>您可以在此輸入 vCard 檔案的名稱，或直接點選檔案挑選器按鈕來挑選。vCard 是交換聯絡人資訊時的標準格式。</qt>"
-+msgstr ""
-+"<qt>您可以在此輸入 vCard 檔案的名稱，或直接點選檔案挑選器按鈕來挑選。vCard 是"
-+"交換聯絡人資訊時的標準格式。</qt>"
- 
- #. i18n: file ./conduits/abbrowserconduit/kaddressbookConduit.ui line 123
- #: rc.cpp:325
-@@ -4000,12 +4070,14 @@
- #: rc.cpp:328
- #, no-c-format
- msgid ""
--"<qt>If you delete an address on your handheld, you can determine if it should "
--"be archived on the PC. If you check that and this checkbox, the address will be "
--"added to your addressbook, but no longer synchronized with the handheld.</qt>"
--msgstr ""
--"<qt>如果您從您的掌上型裝置中刪除一個位址，您可以決定是否要將它歸檔到 PC "
--"上。如果您勾選此選項，則此位址會被加到您的通訊錄中，但不會再同步到您的掌上型裝置中。</qt>"
-+"<qt>If you delete an address on your handheld, you can determine if it "
-+"should be archived on the PC. If you check that and this checkbox, the "
-+"address will be added to your addressbook, but no longer synchronized with "
-+"the handheld.</qt>"
-+msgstr ""
-+"<qt>如果您從您的掌上型裝置中刪除一個位址，您可以決定是否要將它歸檔到 PC 上。"
-+"如果您勾選此選項，則此位址會被加到您的通訊錄中，但不會再同步到您的掌上型裝置"
-+"中。</qt>"
- 
- #. i18n: file ./conduits/abbrowserconduit/kaddressbookConduit.ui line 136
- #: rc.cpp:331 rc.cpp:703 rc.cpp:938
-@@ -4023,17 +4095,19 @@
- #: rc.cpp:340 rc.cpp:364
- #, no-c-format
- msgid ""
--"<qt>Select in this list how conflicting entries (entries which were edited both "
--"on your handheld and on the PC) are resolved. Possibly values are \"Use "
-+"<qt>Select in this list how conflicting entries (entries which were edited "
-+"both on your handheld and on the PC) are resolved. Possibly values are \"Use "
- "KPilot's Global Setting\" to use the settings defined in KPilot HotSync "
--"configuration, \"Ask User\" to let you decide case by case, \"Do Nothing\" to "
--"allow the entries to be different, \"PC overrides\", \"Handheld overrides\", "
--"\"Use values from last sync\" and \"Use both entries\" to create a new entry on "
--"both the PC and handheld.</qt>"
--msgstr ""
--"<qt>在此清單中選擇要如何處理衝突的項目（您在掌上型裝置跟 PC 中都有修改的項目）。可用的選項包括：「使用 KPilot 全域設定」會直接使用在 "
--"KPilot 熱同步設定中的設定；「詢問使用者」則會每次都詢問使用者的意見；「不做任何事」就是維持原狀；還有「PC "
--"覆寫」、「掌上型裝置覆寫」、「最後一次同步的值」等等，最後「兩個項目都使用」則會在 PC 與掌上型裝置兩邊各產生一個新的項目。</qt>"
-+"configuration, \"Ask User\" to let you decide case by case, \"Do Nothing\" "
-+"to allow the entries to be different, \"PC overrides\", \"Handheld overrides"
-+"\", \"Use values from last sync\" and \"Use both entries\" to create a new "
-+"entry on both the PC and handheld.</qt>"
-+msgstr ""
-+"<qt>在此清單中選擇要如何處理衝突的項目（您在掌上型裝置跟 PC 中都有修改的項"
-+"目）。可用的選項包括：「使用 KPilot 全域設定」會直接使用在 KPilot 熱同步設定"
-+"中的設定；「詢問使用者」則會每次都詢問使用者的意見；「不做任何事」就是維持原"
-+"狀；還有「PC 覆寫」、「掌上型裝置覆寫」、「最後一次同步的值」等等，最後「兩個"
-+"項目都使用」則會在 PC 與掌上型裝置兩邊各產生一個新的項目。</qt>"
- 
- #. i18n: file ./conduits/abbrowserconduit/kaddressbookConduit.ui line 178
- #: rc.cpp:343 rc.cpp:944
-@@ -4081,7 +4155,8 @@
- #: rc.cpp:367
- #, no-c-format
- msgid ""
--"<p>Select the default action if an event was modified on both sides here. </p>"
-+"<p>Select the default action if an event was modified on both sides here. </"
-+"p>"
- msgstr "<p>在此選擇事件在兩邊變更後的預設動作。</p>"
- 
- #. i18n: file ./conduits/abbrowserconduit/kaddressbookConduit.ui line 258
-@@ -4102,7 +4177,8 @@
- msgid ""
- "<qt>Select which KAddressBook field should be used to store the Pilot's "
- "&quot;Other&quot; phone here.</qt>"
--msgstr "<qt>選擇 Pilot 裡的「其他」電話要儲存在 KAddressBook 裡的哪個欄位。</qt>"
-+msgstr ""
-+"<qt>選擇 Pilot 裡的「其他」電話要儲存在 KAddressBook 裡的哪個欄位。</qt>"
- 
- #. i18n: file ./conduits/abbrowserconduit/kaddressbookConduit.ui line 284
- #: rc.cpp:379
-@@ -4162,8 +4238,8 @@
- #: rc.cpp:409 rc.cpp:418
- #, no-c-format
- msgid ""
--"<qt>Select which KAddressBook field should be used to store the Pilot's Street "
--"Address here.</qt>"
-+"<qt>Select which KAddressBook field should be used to store the Pilot's "
-+"Street Address here.</qt>"
- msgstr "<qt>選擇 Pilot 中的街道地址要儲存在 KAddressBook 中的哪個欄位。</qt>"
- 
- #. i18n: file ./conduits/abbrowserconduit/kaddressbookConduit.ui line 351
-@@ -4188,8 +4264,8 @@
- #: rc.cpp:424 rc.cpp:433
- #, no-c-format
- msgid ""
--"<qt>Select which KAddressBook field should be used to store the Fax number from "
--"the Pilot here.</qt>"
-+"<qt>Select which KAddressBook field should be used to store the Fax number "
-+"from the Pilot here.</qt>"
- msgstr "<qt>選擇 Pilot 中的傳真號碼要儲存在 KAddressBook 中的哪個欄位。</qt>"
- 
- #. i18n: file ./conduits/abbrowserconduit/kaddressbookConduit.ui line 419
-@@ -4208,9 +4284,11 @@
- #: rc.cpp:442 rc.cpp:475
- #, no-c-format
- msgid ""
--"<qt>Select the field from this list that represents best the meaning given by "
--"your use of the first custom field on your handheld.</qt>"
--msgstr "<qt>從這份清單中，選擇您的掌上型裝置中的第一個自訂欄位應該搭配清單中的哪個欄位。</qt>"
-+"<qt>Select the field from this list that represents best the meaning given "
-+"by your use of the first custom field on your handheld.</qt>"
-+msgstr ""
-+"<qt>從這份清單中，選擇您的掌上型裝置中的第一個自訂欄位應該搭配清單中的哪個欄"
-+"位。</qt>"
- 
- #. i18n: file ./conduits/abbrowserconduit/kaddressbookConduit.ui line 449
- #: rc.cpp:445
-@@ -4222,9 +4300,11 @@
- #: rc.cpp:448 rc.cpp:490
- #, no-c-format
- msgid ""
--"<qt>Select the field from this list that represents best the meaning given by "
--"your use of the second custom field on your handheld.</qt>"
--msgstr "<qt>從這份清單中，選擇您的掌上型裝置中的第二個自訂欄位應該搭配清單中的哪個欄位。</qt>"
-+"<qt>Select the field from this list that represents best the meaning given "
-+"by your use of the second custom field on your handheld.</qt>"
-+msgstr ""
-+"<qt>從這份清單中，選擇您的掌上型裝置中的第二個自訂欄位應該搭配清單中的哪個欄"
-+"位。</qt>"
- 
- #. i18n: file ./conduits/abbrowserconduit/kaddressbookConduit.ui line 460
- #: rc.cpp:451
-@@ -4236,9 +4316,11 @@
- #: rc.cpp:454 rc.cpp:505
- #, no-c-format
- msgid ""
--"<qt>Select the field from this list that represents best the meaning given by "
--"your use of the third custom field on your handheld.</qt>"
--msgstr "<qt>從這份清單中，選擇您的掌上型裝置中的第三個自訂欄位應該搭配清單中的哪個欄位。</qt>"
-+"<qt>Select the field from this list that represents best the meaning given "
-+"by your use of the third custom field on your handheld.</qt>"
-+msgstr ""
-+"<qt>從這份清單中，選擇您的掌上型裝置中的第三個自訂欄位應該搭配清單中的哪個欄"
-+"位。</qt>"
- 
- #. i18n: file ./conduits/abbrowserconduit/kaddressbookConduit.ui line 471
- #: rc.cpp:457
-@@ -4250,9 +4332,11 @@
- #: rc.cpp:460 rc.cpp:520
- #, no-c-format
- msgid ""
--"<qt>Select the field from this list that represents best the meaning given by "
--"your use of the fourth custom field on your handheld.</qt>"
--msgstr "<qt>從這份清單中，選擇您的掌上型裝置中的第四個自訂欄位應該搭配清單中的哪個欄位。</qt>"
-+"<qt>Select the field from this list that represents best the meaning given "
-+"by your use of the fourth custom field on your handheld.</qt>"
-+msgstr ""
-+"<qt>從這份清單中，選擇您的掌上型裝置中的第四個自訂欄位應該搭配清單中的哪個欄"
-+"位。</qt>"
- 
- #. i18n: file ./conduits/abbrowserconduit/kaddressbookConduit.ui line 480
- #: rc.cpp:463 rc.cpp:478 rc.cpp:493 rc.cpp:508
-@@ -4276,13 +4360,13 @@
- #: rc.cpp:472
- #, no-c-format
- msgid "IM Address (ICQ, MS, ...)"
--msgstr "即時通訊地址（ICQ，MS，...）"
-+msgstr "即時通訊地址（ICQ，MS，…）"
- 
- #. i18n: file ./conduits/abbrowserconduit/kaddressbookConduit.ui line 531
- #: rc.cpp:487 rc.cpp:502 rc.cpp:517
- #, no-c-format
- msgid "IM Address (ICQ, MSN, ...)"
--msgstr "即時通訊地址（ICQ，MSN，...）"
-+msgstr "即時通訊地址（ICQ，MSN，…）"
- 
- #. i18n: file ./conduits/abbrowserconduit/kaddressbookConduit.ui line 640
- #: rc.cpp:523
-@@ -4294,15 +4378,16 @@
- #: rc.cpp:526 rc.cpp:550
- #, no-c-format
- msgid ""
--"<qt>Select the birthdate format here, if you selected \"birthdate\" for any of "
--"the custom fields above. Possible placeholders are:"
--"<br> %d for the day, %m for the month, %y for the two-digit year, %Y for the "
--"four-digit year. For  example, %d.%m.%Y would generate a date like 27.3.1952, "
--"while %m/%d/%y would write the same date as 03/27/52. </qt>"
--msgstr ""
--"<qt>如果您在上方的任一個自訂欄位定義中選擇了「生日」，則您可以在此選擇生日的格式。符號所代表的意義為："
--"<br> %d：日；%m：月；%y：西元年，二位數；%Y：西元年，四位數。例如，%d.%m.%Y 會將日期顯示為 27.3.1952，而 %m/%d/%y "
--"會將日期顯示為 03/27/52。</qt>"
-+"<qt>Select the birthdate format here, if you selected \"birthdate\" for any "
-+"of the custom fields above. Possible placeholders are:<br> %d for the day, %"
-+"m for the month, %y for the two-digit year, %Y for the four-digit year. For  "
-+"example, %d.%m.%Y would generate a date like 27.3.1952, while %m/%d/%y would "
-+"write the same date as 03/27/52. </qt>"
-+msgstr ""
-+"<qt>如果您在上方的任一個自訂欄位定義中選擇了「生日」，則您可以在此選擇生日的"
-+"格式。符號所代表的意義為：<br> %d：日；%m：月；%y：公元年，二位數；%Y：公元"
-+"年，四位數。例如，%d.%m.%Y 會將日期顯示為 27.3.1952，而 %m/%d/%y 會將日期顯示"
-+"為 03/27/52。</qt>"
- 
- #. i18n: file ./conduits/abbrowserconduit/kaddressbookConduit.ui line 652
- #: rc.cpp:529
-@@ -4358,7 +4443,9 @@
- msgid ""
- "The following record was edited both on the handheld and on the PC. Please "
- "choose which values shall be synced:"
--msgstr "以下的紀錄同時在掌上型裝置與 PC 上都有編輯修改過。請選擇要以那個值為主來同步："
-+msgstr ""
-+"以下的紀錄同時在掌上型裝置與 PC 上都有編輯修改過。請選擇要以那個值為主來同"
-+"步："
- 
- #. i18n: file ./conduits/abbrowserconduit/resolutionDialog_base.ui line 36
- #: rc.cpp:559
-@@ -4372,12 +4459,12 @@
- msgid ""
- "<qt>Use this list to resolve, field by field, the conflicts created when a "
- "record was edited both on the handheld and on the PC. For each record, the "
--"different values from the last sync, the handheld and PC are displayed for each "
--"field, allowing you to choose the desired value.</qt>"
-+"different values from the last sync, the handheld and PC are displayed for "
-+"each field, allowing you to choose the desired value.</qt>"
- msgstr ""
--"<qt>當某一筆紀錄同時在 PC "
--"與掌上型裝置中修改過的時候，依每個欄位，使用此清單來解決衝突的問題。在每一筆資料的每一個欄位中，都會顯示與上一次同步後不同的值，在掌上型裝置上的值與在 PC "
--"上的值，好讓您選擇想要同步的值。</qt>"
-+"<qt>當某一筆紀錄同時在 PC 與掌上型裝置中修改過的時候，依每個欄位，使用此清單"
-+"來解決衝突的問題。在每一筆資料的每一個欄位中，都會顯示與上一次同步後不同的"
-+"值，在掌上型裝置上的值與在 PC 上的值，好讓您選擇想要同步的值。</qt>"
- 
- #. i18n: file ./conduits/abbrowserconduit/resolutionDialog_base.ui line 63
- #: rc.cpp:565
-@@ -4397,8 +4484,8 @@
- #: rc.cpp:571
- #, no-c-format
- msgid ""
--"<qt>Click this button to use both values, resulting in the duplication of the "
--"record.</qt>"
-+"<qt>Click this button to use both values, resulting in the duplication of "
-+"the record.</qt>"
- msgstr "<qt>點擊此按鍵就兩邊都保留，如此會複製一份紀錄。</qt>"
- 
- #. i18n: file ./conduits/abbrowserconduit/resolutionDialog_base.ui line 96
-@@ -4427,7 +4514,8 @@
- msgid ""
- "<qt>Click this button to use the last sync values (old values) for "
- "synchronizing all conflicting fields in this record.</qt>"
--msgstr "<qt>點擊此按鍵就會使用最後一次同步後的值（也就是未變更前的舊值）來同步。</qt>"
-+msgstr ""
-+"<qt>點擊此按鍵就會使用最後一次同步後的值（也就是未變更前的舊值）來同步。</qt>"
- 
- #. i18n: file ./conduits/abbrowserconduit/resolutionDialog_base.ui line 118
- #: rc.cpp:586
-@@ -4454,11 +4542,12 @@
- #, no-c-format
- msgid ""
- "<qt>Enter here, or select clicking the file picker button, the name and "
--"location of the folder used to find and synchronize text files. All files with "
--"extension .txt located in this folder will be synced to Palm DOC databases in "
--"your handheld.</qt>"
-+"location of the folder used to find and synchronize text files. All files "
-+"with extension .txt located in this folder will be synced to Palm DOC "
-+"databases in your handheld.</qt>"
- msgstr ""
--"<qt>您可以在此輸入要用於尋找與同步文字檔的資料夾位置，或直接點選檔案挑選器按鈕來挑選。所有在此資料夾中以 .txt 為副檔名的檔案，都會被您掌上型裝置中的 "
-+"<qt>您可以在此輸入要用於尋找與同步文字檔的資料夾位置，或直接點選檔案挑選器按"
-+"鈕來挑選。所有在此資料夾中以 .txt 為副檔名的檔案，都會被您掌上型裝置中的 "
- "Palm DOC 資料庫裡的資料同步。</qt>"
- 
- #. i18n: file ./conduits/docconduit/doc-setupdialog.ui line 68
-@@ -4471,9 +4560,11 @@
- #: rc.cpp:604
- #, no-c-format
- msgid ""
--"<qt>Check this box if you want to save a copy of the Palm DOC databases (.pdb "
--"files) on your PC.</qt>"
--msgstr "<qt>勾選此選項的話，會儲存一份 Palm DOC 資料庫檔案（*.pdb）到您的 PC 上。</qt>"
-+"<qt>Check this box if you want to save a copy of the Palm DOC databases (."
-+"pdb files) on your PC.</qt>"
-+msgstr ""
-+"<qt>勾選此選項的話，會儲存一份 Palm DOC 資料庫檔案（*.pdb）到您的 PC 上。</"
-+"qt>"
- 
- #. i18n: file ./conduits/docconduit/doc-setupdialog.ui line 90
- #: rc.cpp:610
-@@ -4493,11 +4584,12 @@
- msgid ""
- "<qt>Select this option to synchronize texts changed in your PC to Palm DOC "
- "databases in your handheld. Palm DOC databases modified in the handheld will "
--"not be converted to text files, but texts changed in the PC will be converted "
--"to the Palm DOC databases.</qt>"
-+"not be converted to text files, but texts changed in the PC will be "
-+"converted to the Palm DOC databases.</qt>"
- msgstr ""
--"<qt>選取此選項的話，會將您的 PC 中的文字檔變更同步到您的掌上型裝置的 Palm DOC 資料庫中。Palm DOC "
--"資料庫的變更不會轉換為文字檔，但是在 PC 中的變更的文字會被轉換到 Palm DOC 資料庫中。</qt>"
-+"<qt>選取此選項的話，會將您的 PC 中的文字檔變更同步到您的掌上型裝置的 Palm "
-+"DOC 資料庫中。Palm DOC 資料庫的變更不會轉換為文字檔，但是在 PC 中的變更的文字"
-+"會被轉換到 Palm DOC 資料庫中。</qt>"
- 
- #. i18n: file ./conduits/docconduit/doc-setupdialog.ui line 121
- #: rc.cpp:619
-@@ -4509,13 +4601,14 @@
- #: rc.cpp:622
- #, no-c-format
- msgid ""
--"<qt>Select this option to synchronize the changes made to Palm DOC databases in "
--"your handheld to the PC text files. Palm DOC databases modified in the handheld "
--"will be converted to text files, but texts changed in the PC will not be "
--"converted to the Palm DOC databases.</qt>"
--msgstr ""
--"<qt>選取此選項的話，會將您的掌上型裝置的 Palm DOC 資料庫的變更同步到您的 PC 的文字檔中。Palm DOC 資料庫的變更會轉換為文字檔，但是在 "
--"PC 中的變更的文字不會被轉換到 Palm DOC 資料庫中。</qt>"
-+"<qt>Select this option to synchronize the changes made to Palm DOC databases "
-+"in your handheld to the PC text files. Palm DOC databases modified in the "
-+"handheld will be converted to text files, but texts changed in the PC will "
-+"not be converted to the Palm DOC databases.</qt>"
-+msgstr ""
-+"<qt>選取此選項的話，會將您的掌上型裝置的 Palm DOC 資料庫的變更同步到您的 PC "
-+"的文字檔中。Palm DOC 資料庫的變更會轉換為文字檔，但是在 PC 中的變更的文字不會"
-+"被轉換到 Palm DOC 資料庫中。</qt>"
- 
- #. i18n: file ./conduits/docconduit/doc-setupdialog.ui line 132
- #: rc.cpp:625
-@@ -4528,12 +4621,13 @@
- #, no-c-format
- msgid ""
- "<qt>Select this option to synchronize the file texts in your PC to Palm DOC "
--"databases in your handheld. Palm DOC databases modified in the handheld will be "
--"converted to text files, and texts changed in the PC will be converted to the "
--"Palm DOC databases, keeping both versions in sync.</qt>"
-+"databases in your handheld. Palm DOC databases modified in the handheld will "
-+"be converted to text files, and texts changed in the PC will be converted to "
-+"the Palm DOC databases, keeping both versions in sync.</qt>"
- msgstr ""
--"<qt>選取此選項的話，會將您的掌上型裝置的 Palm DOC 資料庫與您的 PC 的文字檔做雙向同步。Palm DOC 資料庫的變更會轉換為文字檔，在 PC "
--"中的變更的文字也會被轉換到 Palm DOC 資料庫中，讓兩邊的版本保持一致。</qt>"
-+"<qt>選取此選項的話，會將您的掌上型裝置的 Palm DOC 資料庫與您的 PC 的文字檔做"
-+"雙向同步。Palm DOC 資料庫的變更會轉換為文字檔，在 PC 中的變更的文字也會被轉換"
-+"到 Palm DOC 資料庫中，讓兩邊的版本保持一致。</qt>"
- 
- #. i18n: file ./conduits/docconduit/doc-setupdialog.ui line 168
- #: rc.cpp:631
-@@ -4543,8 +4637,8 @@
- "location of the folder where copies of the handheld databases are kept (.pdb "
- "files). Local copies are only made if the box is checked as well.</qt>"
- msgstr ""
--"<qt>您可以在此輸入要保存掌上型裝置資料庫檔案（*.pdb）複本的資料夾位置，或直接點選檔案挑選器按鈕來挑選。若同時勾選此選項的話，會順便做複製的動作。</q"
--"t>"
-+"<qt>您可以在此輸入要保存掌上型裝置資料庫檔案（*.pdb）複本的資料夾位置，或直接"
-+"點選檔案挑選器按鈕來挑選。若同時勾選此選項的話，會順便做複製的動作。</qt>"
- 
- #. i18n: file ./conduits/docconduit/doc-setupdialog.ui line 178
- #: rc.cpp:634 rc.cpp:778
-@@ -4564,7 +4658,9 @@
- msgid ""
- "Check this box, if the text should be compressed on the handheld to save "
- "memory. Most doc reader on the handheld support compressed texts."
--msgstr "勾選此選項的話，會將掌上型裝置中的文字做壓縮以節省記憶體。大部份在掌上型裝置的文件閱讀器都支援壓縮的功能。"
-+msgstr ""
-+"勾選此選項的話，會將掌上型裝置中的文字做壓縮以節省記憶體。大部份在掌上型裝置"
-+"的文件閱讀器都支援壓縮的功能。"
- 
- #. i18n: file ./conduits/docconduit/doc-setupdialog.ui line 198
- #: rc.cpp:643
-@@ -4575,8 +4671,9 @@
- "consume about 50% less memory than in uncompressed state. Almost all DOC "
- "readers on the Palm support compressed texts.</qt>"
- msgstr ""
--"<qt>Palm DOC 格式支援壓縮文字以節省記憶體的功能。勾選此選項以開啟此功能，讓 Palm DOC 資料庫可以節省約 50% "
--"左右的記憶體。大部份在掌上型裝置的文件閱讀器都支援壓縮的功能。</qt>"
-+"<qt>Palm DOC 格式支援壓縮文字以節省記憶體的功能。勾選此選項以開啟此功能，讓 "
-+"Palm DOC 資料庫可以節省約 50% 左右的記憶體。大部份在掌上型裝置的文件閱讀器都"
-+"支援壓縮的功能。</qt>"
- 
- #. i18n: file ./conduits/docconduit/doc-setupdialog.ui line 206
- #: rc.cpp:646 rc.cpp:802
-@@ -4591,11 +4688,12 @@
- "<qt>Check this box to enable bookmark creation when converting text files to "
- "Palm DOC databases. Most doc readers support bookmarks. In order to create a "
- "bookmark, it is necessary to to provide the location in the text where the "
--"bookmark should be set and the bookmark title, in at least one of the formats "
--"listed below.</qt>"
-+"bookmark should be set and the bookmark title, in at least one of the "
-+"formats listed below.</qt>"
- msgstr ""
--"<qt>勾選此選項的話，在轉換文字檔到 Palm DOC "
--"資料庫時會開啟建立書籤的功能。大部份的文件閱讀器都支援書籤。要建立書籤，至少需要以下面列出的一種格式提供書籤設定的位置，以及書籤的標題。</qt>"
-+"<qt>勾選此選項的話，在轉換文字檔到 Palm DOC 資料庫時會開啟建立書籤的功能。大"
-+"部份的文件閱讀器都支援書籤。要建立書籤，至少需要以下面列出的一種格式提供書籤"
-+"設定的位置，以及書籤的標題。</qt>"
- 
- #. i18n: file ./conduits/docconduit/doc-setupdialog.ui line 237
- #: rc.cpp:652 rc.cpp:781
-@@ -4607,14 +4705,15 @@
- #: rc.cpp:655
- #, no-c-format
- msgid ""
--"Check this box to create bookmarks from inline tags in the text. The inline tag "
--"consist of tags in the form <* bookmarktext *>. The bookmark location is set "
--"using the location of the inline tag in the text, and  the name is the text "
--"between the <* and the *>. The inline tag (<*...*>) will be removed from the "
--"text."
--msgstr ""
--"勾選此選項的話，會從文字中的內含標籤來建立書籤。內含標籤包含了此格式 <* bookmarktext *> "
--"的標籤。書籤的位置會用文字中的內含標籤的位置，標題名稱則用 <* 與 *> 間的文字。最後此標籤（<* ... *>）會從文字中移除。"
-+"Check this box to create bookmarks from inline tags in the text. The inline "
-+"tag consist of tags in the form <* bookmarktext *>. The bookmark location is "
-+"set using the location of the inline tag in the text, and  the name is the "
-+"text between the <* and the *>. The inline tag (<*...*>) will be removed "
-+"from the text."
-+msgstr ""
-+"勾選此選項的話，會從文字中的內含標籤來建立書籤。內含標籤包含了此格式 <* "
-+"bookmarktext *> 的標籤。書籤的位置會用文字中的內含標籤的位置，標題名稱則用 "
-+"<* 與 *> 間的文字。最後此標籤（<* ... *>）會從文字中移除。"
- 
- #. i18n: file ./conduits/docconduit/doc-setupdialog.ui line 251
- #: rc.cpp:658 rc.cpp:775
-@@ -4632,13 +4731,14 @@
- #: rc.cpp:664
- #, no-c-format
- msgid ""
--"Check this box to convert tags of the form <bookmarkname> "
--"at the end of the text to bookmarks. The text inside the tag (\"bookmarkname\") "
--"will be searched in the text, and whenever found, a bookmark will be set there. "
--"The endtags <...> will then be removed from the end of the text."
--msgstr ""
--"勾選此選項的話，會將文字結尾的 <bookmarkname> "
--"標籤轉換為書籤。它會搜尋在標籤中的文字（\"bookmarkname\"），找到之後會將書籤設定在那裡。最後會將結束標籤 <...> 從文字尾端移除。"
-+"Check this box to convert tags of the form <bookmarkname> at the end of the "
-+"text to bookmarks. The text inside the tag (\"bookmarkname\") will be "
-+"searched in the text, and whenever found, a bookmark will be set there. The "
-+"endtags <...> will then be removed from the end of the text."
-+msgstr ""
-+"勾選此選項的話，會將文字結尾的 <bookmarkname> 標籤轉換為書籤。它會搜尋在標籤"
-+"中的文字（\"bookmarkname\"），找到之後會將書籤設定在那裡。最後會將結束標籤 "
-+"<...> 從文字尾端移除。"
- 
- #. i18n: file ./conduits/docconduit/doc-setupdialog.ui line 273
- #: rc.cpp:667 rc.cpp:808
-@@ -4650,14 +4750,15 @@
- #: rc.cpp:670
- #, no-c-format
- msgid ""
--"<qt>Check this box to use regular expressions in a file to search the text for "
--"bookmarks. The file should have the same name as the text file, but should end "
--"in .bmk instead of .txt (for instance, the regular expression file for "
--"textname.txt should be textname.bmk). See the documentation for a description "
--"of the format of the bmk file.</qt>"
--msgstr ""
--"<qt>勾選此選項的話，會使用檔案中的正規表示式來搜尋文字以建立書籤。此檔的檔名要與文字檔一樣，但是將副檔名換為 .bmk（例如，textname.txt "
--"檔的書籤正規表示式檔應該要叫做 textname.bmk）。bmk 檔的格式請參考文件說明。</qt>"
-+"<qt>Check this box to use regular expressions in a file to search the text "
-+"for bookmarks. The file should have the same name as the text file, but "
-+"should end in .bmk instead of .txt (for instance, the regular expression "
-+"file for textname.txt should be textname.bmk). See the documentation for a "
-+"description of the format of the bmk file.</qt>"
-+msgstr ""
-+"<qt>勾選此選項的話，會使用檔案中的正規表示式來搜尋文字以建立書籤。此檔的檔名"
-+"要與文字檔一樣，但是將副檔名換為 .bmk（例如，textname.txt 檔的書籤正規表示式"
-+"檔應該要叫做 textname.bmk）。bmk 檔的格式請參考文件說明。</qt>"
- 
- #. i18n: file ./conduits/docconduit/doc-setupdialog.ui line 291
- #: rc.cpp:673 rc.cpp:814
-@@ -4675,9 +4776,11 @@
- #: rc.cpp:679
- #, no-c-format
- msgid ""
--"<qt>Check this box to avoid syncing the text on the handheld to the PC if you "
--"only changed the bookmarks on the handheld (but not the text).</qt>"
--msgstr "<qt>勾選此選項的話，若您只變更掌上型裝置文件的書籤（但沒有變更文字內容），則不會同步到 PC 上。</qt>"
-+"<qt>Check this box to avoid syncing the text on the handheld to the PC if "
-+"you only changed the bookmarks on the handheld (but not the text).</qt>"
-+msgstr ""
-+"<qt>勾選此選項的話，若您只變更掌上型裝置文件的書籤（但沒有變更文字內容），則"
-+"不會同步到 PC 上。</qt>"
- 
- #. i18n: file ./conduits/docconduit/doc-setupdialog.ui line 330
- #: rc.cpp:682 rc.cpp:817
-@@ -4695,8 +4798,8 @@
- #: rc.cpp:688
- #, no-c-format
- msgid ""
--"<qt>Check this box to avoid converting Palm DOC bookmarks to inline tags or to "
--"a bookmark file.</qt>"
-+"<qt>Check this box to avoid converting Palm DOC bookmarks to inline tags or "
-+"to a bookmark file.</qt>"
- msgstr "<qt>勾選此選項以避免將 Palm DOC 書籤轉換為內含標籤或書籤檔。</qt>"
- 
- #. i18n: file ./conduits/docconduit/doc-setupdialog.ui line 355
-@@ -4710,13 +4813,14 @@
- #, no-c-format
- msgid ""
- "<qt>Check this box to convert the Palm DOC database bookmarks to a separate "
--"file, in the bmk format (see more about this format in the documentation). The "
--"resulting bookmark file shares the same filename as the resulting .txt file, "
--"but ends in .bmk instead. This approach creates a clean text file and a "
--"bookmark file.</qt>"
-+"file, in the bmk format (see more about this format in the documentation). "
-+"The resulting bookmark file shares the same filename as the resulting .txt "
-+"file, but ends in .bmk instead. This approach creates a clean text file and "
-+"a bookmark file.</qt>"
- msgstr ""
--"<qt>勾選此選項的話，則會將 Palm DOC 資料庫書籤以 bmk 格式轉換到不同的檔案中（關於 bmk "
--"格式請參考文件說明）。結果的書籤檔會與文字檔的檔名相同，只有副檔名換成 .bmk。這會建立一個乾淨的文字檔與書籤檔。</qt>"
-+"<qt>勾選此選項的話，則會將 Palm DOC 資料庫書籤以 bmk 格式轉換到不同的檔案中"
-+"（關於 bmk 格式請參考文件說明）。結果的書籤檔會與文字檔的檔名相同，只有副檔名"
-+"換成 .bmk。這會建立一個乾淨的文字檔與書籤檔。</qt>"
- 
- #. i18n: file ./conduits/docconduit/doc-setupdialog.ui line 372
- #: rc.cpp:697 rc.cpp:820
-@@ -4728,13 +4832,15 @@
- #: rc.cpp:700
- #, no-c-format
- msgid ""
--"<qt>Check this box to convert the Palm DOC database bookmarks to inline tags, "
--"in the form &lt;* BookmarkName *&gt;. These tags are inserted in the text in "
--"the position marked by the bookmark, and the text inside the tag corresponds to "
--"the bookmark name. Inline tags are easy to create, delete, move and edit.</qt>"
--msgstr ""
--"<qt>勾選此選項會將 Palm DOC 資料庫的書籤轉換為 &lt;* BookmarkName *&gt; "
--"的內含標籤。這些標籤會安插在書籤所標示的位置上，標籤內的文字會使用書籤的名稱。內含標籤比較容易建立、刪除、移動與編輯。</qt>"
-+"<qt>Check this box to convert the Palm DOC database bookmarks to inline "
-+"tags, in the form &lt;* BookmarkName *&gt;. These tags are inserted in the "
-+"text in the position marked by the bookmark, and the text inside the tag "
-+"corresponds to the bookmark name. Inline tags are easy to create, delete, "
-+"move and edit.</qt>"
-+msgstr ""
-+"<qt>勾選此選項會將 Palm DOC 資料庫的書籤轉換為 &lt;* BookmarkName *&gt; 的內"
-+"含標籤。這些標籤會安插在書籤所標示的位置上，標籤內的文字會使用書籤的名稱。內"
-+"含標籤比較容易建立、刪除、移動與編輯。</qt>"
- 
- #. i18n: file ./conduits/docconduit/doc-setupdialog.ui line 404
- #: rc.cpp:709
-@@ -4742,18 +4848,20 @@
- msgid ""
- "If the same text was changed on the PC and the handheld, which of the two "
- "versions should be used as the new version?"
--msgstr "如果同樣的文字，在 PC 與掌上型裝置中都做了變更，則要以哪個版本為主來同步？"
-+msgstr ""
-+"如果同樣的文字，在 PC 與掌上型裝置中都做了變更，則要以哪個版本為主來同步？"
- 
- #. i18n: file ./conduits/docconduit/doc-setupdialog.ui line 407
- #: rc.cpp:712
- #, no-c-format
- msgid ""
--"<qt>The Palm DOC conduit does not feature merging the modifications when a text "
--"is changed both in the handheld and in the computer. Therefore, the choice is "
--"between working with the files out of sync, or discarding the changes in one of "
--"them.</qt>"
-+"<qt>The Palm DOC conduit does not feature merging the modifications when a "
-+"text is changed both in the handheld and in the computer. Therefore, the "
-+"choice is between working with the files out of sync, or discarding the "
-+"changes in one of them.</qt>"
- msgstr ""
--"<qt>Palm DOC 導管並沒有將 PC 與掌上型裝置同時做的變更合併起來的功能。因此，您必須選擇要使用哪一邊的版本，或是兩個都不要。</qt>"
-+"<qt>Palm DOC 導管並沒有將 PC 與掌上型裝置同時做的變更合併起來的功能。因此，您"
-+"必須選擇要使用哪一邊的版本，或是兩個都不要。</qt>"
- 
- #. i18n: file ./conduits/docconduit/doc-setupdialog.ui line 418
- #: rc.cpp:715
-@@ -4765,14 +4873,15 @@
- #: rc.cpp:718
- #, no-c-format
- msgid ""
--"<qt>The Palm DOC conduit does not feature merging the modifications when a text "
--"is changed both in the handheld and in the computer. Therefore, when conflicts "
--"appear, the choice is between working with the files out of sync, or discarding "
--"the changes in one of them. Select this option to prevent KPilot from "
--"overwriting your modifications.</qt>"
--msgstr ""
--"<qt>Palm DOC 導管並沒有將 PC 與掌上型裝置同時做的變更合併起來的功能。因此，您必須選擇要使用哪一邊的版本，或是兩個都不要。選取此選項，則 "
--"KPilot 不會去處理與覆寫您的變更。</qt>"
-+"<qt>The Palm DOC conduit does not feature merging the modifications when a "
-+"text is changed both in the handheld and in the computer. Therefore, when "
-+"conflicts appear, the choice is between working with the files out of sync, "
-+"or discarding the changes in one of them. Select this option to prevent "
-+"KPilot from overwriting your modifications.</qt>"
-+msgstr ""
-+"<qt>Palm DOC 導管並沒有將 PC 與掌上型裝置同時做的變更合併起來的功能。因此，您"
-+"必須選擇要使用哪一邊的版本，或是兩個都不要。選取此選項，則 KPilot 不會去處理"
-+"與覆寫您的變更。</qt>"
- 
- #. i18n: file ./conduits/docconduit/doc-setupdialog.ui line 432
- #: rc.cpp:721
-@@ -4784,14 +4893,15 @@
- #: rc.cpp:724
- #, no-c-format
- msgid ""
--"<qt>The Palm DOC conduit does not feature merging the modifications when a text "
--"is changed both in the handheld and in the computer. Therefore, when conflicts "
--"appear, the choice is between working with the files out of sync, or discarding "
--"the changes in one of them. Select this option to make the PDA version "
--"overwrite the PC version in case of conflict.</qt>"
--msgstr ""
--"<qt>Palm DOC 導管並沒有將 PC 與掌上型裝置同時做的變更合併起來的功能。因此，您必須選擇要使用哪一邊的版本，或是兩個都不要。選取此選項，則以 "
--"PDA 的版本為主，PC 端的內容將被同步，原本的變更將被丟棄。</qt>"
-+"<qt>The Palm DOC conduit does not feature merging the modifications when a "
-+"text is changed both in the handheld and in the computer. Therefore, when "
-+"conflicts appear, the choice is between working with the files out of sync, "
-+"or discarding the changes in one of them. Select this option to make the PDA "
-+"version overwrite the PC version in case of conflict.</qt>"
-+msgstr ""
-+"<qt>Palm DOC 導管並沒有將 PC 與掌上型裝置同時做的變更合併起來的功能。因此，您"
-+"必須選擇要使用哪一邊的版本，或是兩個都不要。選取此選項，則以 PDA 的版本為主，"
-+"PC 端的內容將被同步，原本的變更將被丟棄。</qt>"
- 
- #. i18n: file ./conduits/docconduit/doc-setupdialog.ui line 446
- #: rc.cpp:727
-@@ -4803,14 +4913,15 @@
- #: rc.cpp:730
- #, no-c-format
- msgid ""
--"<qt>The Palm DOC conduit does not feature merging the modifications when a text "
--"is changed both in the handheld and in the computer. Therefore, when conflicts "
--"appear, the choice is between working with the files out of sync, or discarding "
--"the changes in one of them. Select this option to make the PC version overwrite "
--"the PDA version in case of conflict.</qt>"
--msgstr ""
--"<qt>Palm DOC 導管並沒有將 PC 與掌上型裝置同時做的變更合併起來的功能。因此，您必須選擇要使用哪一邊的版本，或是兩個都不要。選取此選項，則以 "
--"PC 的版本為主，PDA 端的內容將被同步，原本的變更將被丟棄。</qt>"
-+"<qt>The Palm DOC conduit does not feature merging the modifications when a "
-+"text is changed both in the handheld and in the computer. Therefore, when "
-+"conflicts appear, the choice is between working with the files out of sync, "
-+"or discarding the changes in one of them. Select this option to make the PC "
-+"version overwrite the PDA version in case of conflict.</qt>"
-+msgstr ""
-+"<qt>Palm DOC 導管並沒有將 PC 與掌上型裝置同時做的變更合併起來的功能。因此，您"
-+"必須選擇要使用哪一邊的版本，或是兩個都不要。選取此選項，則以 PC 的版本為主，"
-+"PDA 端的內容將被同步，原本的變更將被丟棄。</qt>"
- 
- #. i18n: file ./conduits/docconduit/doc-setupdialog.ui line 460
- #: rc.cpp:733
-@@ -4822,14 +4933,15 @@
- #: rc.cpp:736
- #, no-c-format
- msgid ""
--"<qt>The Palm DOC conduit does not feature merging the modifications when a text "
--"is changed both in the handheld and in the computer. Therefore, when conflicts "
--"appear, the choice is between working with the files out of sync, or discarding "
--"the changes in one of them. Select this option to show the resolution dialog to "
--"let the user decide on a case by case basis.</qt>"
--msgstr ""
--"<qt>Palm DOC 導管並沒有將 PC "
--"與掌上型裝置同時做的變更合併起來的功能。因此，您必須選擇要使用哪一邊的版本，或是兩個都不要。選取此選項，則會顯示出解決對話框，讓使用者決定要怎麼做。</qt>"
-+"<qt>The Palm DOC conduit does not feature merging the modifications when a "
-+"text is changed both in the handheld and in the computer. Therefore, when "
-+"conflicts appear, the choice is between working with the files out of sync, "
-+"or discarding the changes in one of them. Select this option to show the "
-+"resolution dialog to let the user decide on a case by case basis.</qt>"
-+msgstr ""
-+"<qt>Palm DOC 導管並沒有將 PC 與掌上型裝置同時做的變更合併起來的功能。因此，您"
-+"必須選擇要使用哪一邊的版本，或是兩個都不要。選取此選項，則會顯示出解決對話"
-+"框，讓使用者決定要怎麼做。</qt>"
- 
- #. i18n: file ./conduits/docconduit/doc-setupdialog.ui line 479
- #: rc.cpp:739
-@@ -4841,8 +4953,8 @@
- #: rc.cpp:742
- #, no-c-format
- msgid ""
--"<qt>Check this box to force the resolution dialog to appear even when there are "
--"no conflicts.</qt>"
-+"<qt>Check this box to force the resolution dialog to appear even when there "
-+"are no conflicts.</qt>"
- msgstr "<qt>勾選此選項以強制解決對話框出現，即使沒有衝突也一樣。</qt>"
- 
- #. i18n: file ./conduits/docconduit/kpalmdoc_dlgbase.ui line 47
-@@ -4861,10 +4973,12 @@
- #: rc.cpp:757
- #, no-c-format
- msgid ""
--"Folder where copies of the handheld databases are kept. You can install them to "
--"any PalmOS handheld, and distribute these copies to other people (but beware of "
--"copyright infringement)."
--msgstr "掌上型裝置中的資料庫要複製到哪個資料夾。您可以安裝這些複本到任何 PalmOS 掌上型裝置，並散布這些複本給其它人（不過請小心版權問題）。"
-+"Folder where copies of the handheld databases are kept. You can install them "
-+"to any PalmOS handheld, and distribute these copies to other people (but "
-+"beware of copyright infringement)."
-+msgstr ""
-+"掌上型裝置中的資料庫要複製到哪個資料夾。您可以安裝這些複本到任何 PalmOS 掌上"
-+"型裝置，並散布這些複本給其它人（不過請小心版權問題）。"
- 
- #. i18n: file ./conduits/docconduit/kpalmdoc_dlgbase.ui line 93
- #: rc.cpp:760
-@@ -4894,61 +5008,69 @@
- #: rc.cpp:772
- #, no-c-format
- msgid ""
--"Enter the name of the folder where the text files reside on the PC. All files "
--"with extension .txt will be synced to the handheld."
--msgstr "輸入文字檔要放在 PC 上的資料夾名稱。所有副檔名為 .txt 的檔案都會與掌上型裝置同步。"
-+"Enter the name of the folder where the text files reside on the PC. All "
-+"files with extension .txt will be synced to the handheld."
-+msgstr ""
-+"輸入文字檔要放在 PC 上的資料夾名稱。所有副檔名為 .txt 的檔案都會與掌上型裝置"
-+"同步。"
- 
- #. i18n: file ./conduits/docconduit/kpalmdoc_dlgbase.ui line 236
- #: rc.cpp:784
- #, no-c-format
- msgid ""
--"When a <* bookmarktext *> appears somewhere in the text, a bookmark will be set "
--"at this position, and the text between the <* and the *> "
--"will be used as bookmark name. The <*...*> will be removed from the text."
-+"When a <* bookmarktext *> appears somewhere in the text, a bookmark will be "
-+"set at this position, and the text between the <* and the *> will be used as "
-+"bookmark name. The <*...*> will be removed from the text."
- msgstr ""
--"當 <* bookmarktext *> 出現在文字的某處時，會在該處設定一個書籤，而 <* 與 *> 間的文字會做為書籤的名稱。最後 <* ... *> "
--"會從文字中移除。"
-+"當 <* bookmarktext *> 出現在文字的某處時，會在該處設定一個書籤，而 <* 與 *> "
-+"間的文字會做為書籤的名稱。最後 <* ... *> 會從文字中移除。"
- 
- #. i18n: file ./conduits/docconduit/kpalmdoc_dlgbase.ui line 247
- #: rc.cpp:790
- #, no-c-format
- msgid ""
--"Tags of the form <bookmarkname> at the end of the text will be used to search "
--"the text for the pattern between the < and >. Whenever \"bookmarkname\" appears "
--"in the text, a bookmark will be set there. The endtags <...> "
--"will then be removed from the end of the text."
--msgstr ""
--"放在文字尾端的格式為 <bookmarkname> 的標籤會被用於搜尋在 < 與 > 間的文字。當 \"bookmarkname\" "
--"出現在文字中時，會在該處設置一個書籤。最後 <...> 的標籤會被移除。"
-+"Tags of the form <bookmarkname> at the end of the text will be used to "
-+"search the text for the pattern between the < and >. Whenever \"bookmarkname"
-+"\" appears in the text, a bookmark will be set there. The endtags <...> will "
-+"then be removed from the end of the text."
-+msgstr ""
-+"放在文字尾端的格式為 <bookmarkname> 的標籤會被用於搜尋在 < 與 > 間的文字。當 "
-+"\"bookmarkname\" 出現在文字中時，會在該處設置一個書籤。最後 <...> 的標籤會被"
-+"移除。"
- 
- #. i18n: file ./conduits/docconduit/kpalmdoc_dlgbase.ui line 264
- #: rc.cpp:799
- #, no-c-format
- msgid ""
--"The Palm doc format supports compressing the text to save memory. If you check "
--"this box, the text will consume about 50% less memory than in uncompressed "
--"state. Almost all DOC readers on the Palm support compressed texts."
-+"The Palm doc format supports compressing the text to save memory. If you "
-+"check this box, the text will consume about 50% less memory than in "
-+"uncompressed state. Almost all DOC readers on the Palm support compressed "
-+"texts."
- msgstr ""
--"Palm DOC 格式支援壓縮文字，以節省記憶體。如果您勾選此選項，會節省約 50% 的記憶體。大部份 Palm 上面的文件閱讀器都支援文字壓縮。"
-+"Palm DOC 格式支援壓縮文字，以節省記憶體。如果您勾選此選項，會節省約 50% 的記"
-+"憶體。大部份 Palm 上面的文件閱讀器都支援文字壓縮。"
- 
- #. i18n: file ./conduits/docconduit/kpalmdoc_dlgbase.ui line 278
- #: rc.cpp:805
- #, no-c-format
- msgid ""
--"Do you want to convert bookmarks? Most doc readers support bookmarks. You have "
--"to provide some information about where the bookmarks should be set and their "
--"titles. Check at least one of the bookmark types below."
--msgstr "您要轉換書籤嗎？大部份的文件閱讀器都支援書籤。您至少需要以下面列出的一種格式提供書籤設定的位置，以及書籤的標題。"
-+"Do you want to convert bookmarks? Most doc readers support bookmarks. You "
-+"have to provide some information about where the bookmarks should be set and "
-+"their titles. Check at least one of the bookmark types below."
-+msgstr ""
-+"您要轉換書籤嗎？大部份的文件閱讀器都支援書籤。您至少需要以下面列出的一種格式"
-+"提供書籤設定的位置，以及書籤的標題。"
- 
- #. i18n: file ./conduits/docconduit/kpalmdoc_dlgbase.ui line 289
- #: rc.cpp:811
- #, no-c-format
- msgid ""
--"Use regular expressions in a file textname.bmk (textname.txt is the filename of "
--"the text) to search the text for bookmarks.See the documentation for a "
-+"Use regular expressions in a file textname.bmk (textname.txt is the filename "
-+"of the text) to search the text for bookmarks.See the documentation for a "
- "description of the format of the bmk file."
- msgstr ""
--"使用 textname.bmk 檔（文字檔名為 textname.txt）中的正規表示式來搜尋要做書籤的文字。bmk 檔的格式請參考文件說明。"
-+"使用 textname.bmk 檔（文字檔名為 textname.txt）中的正規表示式來搜尋要做書籤的"
-+"文字。bmk 檔的格式請參考文件說明。"
- 
- #. i18n: file ./conduits/docconduit/kpalmdoc_dlgbase.ui line 386
- #: rc.cpp:826
-@@ -4986,7 +5108,9 @@
- msgid ""
- "<qt>The Null-conduit can be attached to several databases, effectively "
- "preventing them from Syncing. Enter the database names here.</qt>"
--msgstr "<qt>虛擬導管（Null Conduit）可以附加到一些資料庫中，避免它們被同步。請在此輸入資料庫名稱。</qt>"
-+msgstr ""
-+"<qt>虛擬導管（Null Conduit）可以附加到一些資料庫中，避免它們被同步。請在此輸"
-+"入資料庫名稱。</qt>"
- 
- #. i18n: file ./conduits/recordconduit/setup_base.ui line 143
- #: rc.cpp:862
-@@ -5021,7 +5145,8 @@
- "the dialog may be enabled or disabled. Currently, the only <i>working</i> "
- "method is through KMail.</qt>"
- msgstr ""
--"<qt>請選擇 KPilot 用於傳送您的掌上型裝置發出的郵件的方式。依據您選取的方式不同，其它欄位可能會開啟或關閉。目前僅支援透過 KMail。</qt>"
-+"<qt>請選擇 KPilot 用於傳送您的掌上型裝置發出的郵件的方式。依據您選取的方式不"
-+"同，其它欄位可能會開啟或關閉。目前僅支援透過 KMail。</qt>"
- 
- #. i18n: file ./conduits/popmail/setup-dialog.ui line 73
- #: rc.cpp:877
-@@ -5051,13 +5176,15 @@
- #: rc.cpp:892 rc.cpp:895
- #, no-c-format
- msgid ""
--"<qt>If you want to add a signature file, enter the location of your signature "
--"file (usually, <i>.signature</i>, located in your home folder) here, or select "
--"it clicking the file picker button. The signature file contains the text that "
--"is added to the end of your outgoing mail messages.</qt>"
-+"<qt>If you want to add a signature file, enter the location of your "
-+"signature file (usually, <i>.signature</i>, located in your home folder) "
-+"here, or select it clicking the file picker button. The signature file "
-+"contains the text that is added to the end of your outgoing mail messages.</"
-+"qt>"
- msgstr ""
--"<qt>如果您要加入簽名檔，請輸入您簽名檔的位置（通常是您家目錄中的 <i>.signature</i>"
--"），或是透過檔案挑選器挑選。簽名檔內的文字會被附在信件的最後面。</qt>"
-+"<qt>如果您要加入簽名檔，請輸入您簽名檔的位置（通常是您家目錄中的 <i>."
-+"signature</i>），或是透過檔案挑選器挑選。簽名檔內的文字會被附在信件的最後面。"
-+"</qt>"
- 
- #. i18n: file ./conduits/popmail/setup-dialog.ui line 112
- #: rc.cpp:898
-@@ -5101,13 +5228,13 @@
- #: rc.cpp:925
- #, no-c-format
- msgid ""
--"<qt>Select this option to use a specific calendar file, instead of the standard "
--"KDE calendar. This file must be in the in the vCalendar or iCalendar format. "
--"Enter the location of this file in the edit box or select it clicking the file "
--"picker button.</qt>"
-+"<qt>Select this option to use a specific calendar file, instead of the "
-+"standard KDE calendar. This file must be in the in the vCalendar or "
-+"iCalendar format. Enter the location of this file in the edit box or select "
-+"it clicking the file picker button.</qt>"
- msgstr ""
--"<qt>選取此選項以使用指定的行事曆檔案，而不使用標準的 KDE 行事曆。此檔必須是 vCalendar 或 iCalendar "
--"格式。請輸入檔案的位置，或使用檔案挑選器挑選。</qt>"
-+"<qt>選取此選項以使用指定的行事曆檔案，而不使用標準的 KDE 行事曆。此檔必須是 "
-+"vCalendar 或 iCalendar 格式。請輸入檔案的位置，或使用檔案挑選器挑選。</qt>"
- 
- #. i18n: file ./conduits/vcalconduit/korganizerConduit.ui line 141
- #: rc.cpp:928
-@@ -5117,7 +5244,8 @@
- "clicking the file picker button. This file must be in the iCalendar or "
- "vCalendar format.</qt>"
- msgstr ""
--"<qt>您可以在此輸入要使用的行事曆檔案的位置，或直接點選檔案挑選器按鈕來挑選。檔案必須是 iCalendar 或 vCalendar 格式。</qt>"
-+"<qt>您可以在此輸入要使用的行事曆檔案的位置，或直接點選檔案挑選器按鈕來挑選。"
-+"檔案必須是 iCalendar 或 vCalendar 格式。</qt>"
- 
- #. i18n: file ./conduits/vcalconduit/korganizerConduit.ui line 151
- #: rc.cpp:931
-@@ -5137,19 +5265,21 @@
- #: rc.cpp:965
- #, no-c-format
- msgid ""
--"<qt>Select in this list how conflicting entries (entries which were edited both "
--"on your handheld and on the PC) are resolved. Possibly values are \"Use "
-+"<qt>Select in this list how conflicting entries (entries which were edited "
-+"both on your handheld and on the PC) are resolved. Possibly values are \"Use "
- "KPilot's Global Setting\" to use the settings defined in KPilot HotSync "
--"configuration, \"Ask User\" to let you decide case by case, \"Do Nothing\" to "
--"allow the entries to be different, \"PC overrides\", \"Handheld overrides\", "
--"\"Use values from last sync\" and \"Use both entries\" to create a new entry on "
--"both the PC and handheld. Note that this does <i>not</i> "
--"handle double-scheduling conflicts.</qt>"
--msgstr ""
--"<qt>在此清單中選擇要如何處理衝突的項目（您在掌上型裝置跟 PC 中都有修改的項目）。可用的選項包括：「使用 KPilot 全域設定」會直接使用在 "
--"KPilot 熱同步設定中的設定；「詢問使用者」則會每次都詢問使用者的意見；「不做任何事」就是維持原狀；還有「PC "
--"覆寫」、「掌上型裝置覆寫」、「最後一次同步的值」等等，最後「兩個項目都使用」則會在 PC 與掌上型裝置兩邊各產生一個新的項目。要注意的是，這個選項並<i>"
--"不會</i>處理雙重行程（double-scheduling）的衝突。</qt>"
-+"configuration, \"Ask User\" to let you decide case by case, \"Do Nothing\" "
-+"to allow the entries to be different, \"PC overrides\", \"Handheld overrides"
-+"\", \"Use values from last sync\" and \"Use both entries\" to create a new "
-+"entry on both the PC and handheld. Note that this does <i>not</i> handle "
-+"double-scheduling conflicts.</qt>"
-+msgstr ""
-+"<qt>在此清單中選擇要如何處理衝突的項目（您在掌上型裝置跟 PC 中都有修改的項"
-+"目）。可用的選項包括：「使用 KPilot 全域設定」會直接使用在 KPilot 熱同步設定"
-+"中的設定；「詢問使用者」則會每次都詢問使用者的意見；「不做任何事」就是維持原"
-+"狀；還有「PC 覆寫」、「掌上型裝置覆寫」、「最後一次同步的值」等等，最後「兩個"
-+"項目都使用」則會在 PC 與掌上型裝置兩邊各產生一個新的項目。要注意的是，這個選"
-+"項並<i>不會</i>處理雙重行程（double-scheduling）的衝突。</qt>"
- 
- #. i18n: file ./kpilot/todoEditor_base.ui line 32
- #: rc.cpp:968
-@@ -5229,7 +5359,9 @@
- msgid ""
- "<qt>Check this box to perform a full sync when your last sync was performed "
- "with another PC or system, to guarantee the completeness of your data.</qt>"
--msgstr "<qt>勾選此選項的話，若您最後一次同步是在另一台 PC 或系統上執行的，則會做一次完整的同步，以保證您資料的完整性。</qt>"
-+msgstr ""
-+"<qt>勾選此選項的話，若您最後一次同步是在另一臺 PC 或系統上執行的，則會做一次"
-+"完整的同步，以保證您資料的完整性。</qt>"
- 
- #. i18n: file ./kpilot/kpilotConfigDialog_sync.ui line 44
- #: rc.cpp:1010
-@@ -5248,24 +5380,23 @@
- #, no-c-format
- msgid ""
- "<qt>Select in this list the synchronization type that KPilot will use as "
--"default. Possible values are:"
--"<br>\"HotSync\", to run all selected conduits, and sync the databases with a "
--"modified flag set, updating the modified records only;"
--"<br>\"FullSync\" to run all selected conduits, and sync all databases, reading "
--"all records, and performing a full backup;"
--"<br>\"Copy PC to handheld\" to run all conduits and sync all databases, but "
--"instead of merging the information from both sources, copy the PC data to the "
--"handheld;"
-+"default. Possible values are:<br>\"HotSync\", to run all selected conduits, "
-+"and sync the databases with a modified flag set, updating the modified "
-+"records only;<br>\"FullSync\" to run all selected conduits, and sync all "
-+"databases, reading all records, and performing a full backup;<br>\"Copy PC "
-+"to handheld\" to run all conduits and sync all databases, but instead of "
-+"merging the information from both sources, copy the PC data to the handheld;"
- "<br>\"Copy handheld to PC\" to run all conduits and sync all databases, but "
--"instead of merging the information from both sources, copy the handheld data to "
--"the PC.</qt>"
-+"instead of merging the information from both sources, copy the handheld data "
-+"to the PC.</qt>"
- msgstr ""
--"<qt>在此清單中選取 KPilot 預設使用的同步方式。可用的選項包括："
--"<br> 「熱同步」（HotSync）會執行所有選取的導管，並同步更新有變更過的資料庫紀錄。"
--"<br> 「完整同步」（FullSync）會執行所有選取的導管，以及同步所有的資料庫，讀取所有的紀錄，並做完整的備份。"
--"<br> 「從 PC 複製到掌上型裝置」會執行所有的導管，並同步所有的資料庫，但是方向只從 PC 同步到掌上型裝置，而不做兩邊的合併。"
--"<br> 「從掌上型裝置複製到 PC」會執行所有的導管，並同步所有的資料庫，但是方向只從掌上型裝置同步到 PC，而不做兩邊的合併。"
--"<br></qt>"
-+"<qt>在此清單中選取 KPilot 預設使用的同步方式。可用的選項包括：<br> 「熱同步」"
-+"（HotSync）會執行所有選取的導管，並同步更新有變更過的資料庫紀錄。<br> 「完整"
-+"同步」（FullSync）會執行所有選取的導管，以及同步所有的資料庫，讀取所有的紀"
-+"錄，並做完整的備份。<br> 「從 PC 複製到掌上型裝置」會執行所有的導管，並同步所"
-+"有的資料庫，但是方向只從 PC 同步到掌上型裝置，而不做兩邊的合併。<br> 「從掌上"
-+"型裝置複製到 PC」會執行所有的導管，並同步所有的資料庫，但是方向只從掌上型裝置"
-+"同步到 PC，而不做兩邊的合併。<br></qt>"
- 
- #. i18n: file ./kpilot/kpilotConfigDialog_sync.ui line 74
- #: rc.cpp:1025
-@@ -5277,19 +5408,20 @@
- #: rc.cpp:1046
- #, no-c-format
- msgid ""
--"<qt>Select in this list how conflicting entries (entries which were edited both "
--"on your handheld and on the PC) are resolved. Possibly values are  \"Ask User\" "
--"to let you decide case by case, \"Do Nothing\" to allow the entries to be "
--"different, \"PC overrides\", \"Handheld overrides\", \"Use values from last "
--"sync\" and \"Use both entries\" to create a new entry on both the PC and "
--"handheld. Note that the conflict resolution option selected here can be "
--"overridden by conduits that have their own conflict resolution "
-+"<qt>Select in this list how conflicting entries (entries which were edited "
-+"both on your handheld and on the PC) are resolved. Possibly values are  "
-+"\"Ask User\" to let you decide case by case, \"Do Nothing\" to allow the "
-+"entries to be different, \"PC overrides\", \"Handheld overrides\", \"Use "
-+"values from last sync\" and \"Use both entries\" to create a new entry on "
-+"both the PC and handheld. Note that the conflict resolution option selected "
-+"here can be overridden by conduits that have their own conflict resolution "
- "configuration.</qt>"
- msgstr ""
--"<qt>在此清單中選擇要如何處理衝突的項目（您在掌上型裝置跟 PC "
--"中都有修改的項目）。可用的選項包括：「詢問使用者」會每次都詢問使用者的意見；「不做任何事」就是維持原狀；還有「PC "
--"覆寫」、「掌上型裝置覆寫」、「最後一次同步的值」等等，最後「兩個項目都使用」則會在 PC "
--"與掌上型裝置兩邊各產生一個新的項目。要注意的是，若是使用的導管本身就有設定解決衝突的方式，則這裡選取的選項會被忽略。</qt>"
-+"<qt>在此清單中選擇要如何處理衝突的項目（您在掌上型裝置跟 PC 中都有修改的項"
-+"目）。可用的選項包括：「詢問使用者」會每次都詢問使用者的意見；「不做任何事」"
-+"就是維持原狀；還有「PC 覆寫」、「掌上型裝置覆寫」、「最後一次同步的值」等等，"
-+"最後「兩個項目都使用」則會在 PC 與掌上型裝置兩邊各產生一個新的項目。要注意的"
-+"是，若是使用的導管本身就有設定解決衝突的方式，則這裡選取的選項會被忽略。</qt>"
- 
- #. i18n: file ./kpilot/kpilotConfigDialog_sync.ui line 159
- #: rc.cpp:1052
-@@ -5307,9 +5439,10 @@
- "when you use a different desktop, since KPilot is not aware of screensavers "
- "other than KDE's.</qt>"
- msgstr ""
--"<qt>勾選此選項的話，會避免讓 KPilot "
--"在螢幕保護程式啟動的期間去同步您的掌上型裝置：這是為了安全性考量，避免其它人用他們自己的掌上型裝置來「竊取」您的資料。不過若是您使用的是不同的桌面系統，則必須關"
--"閉此選項，因為 KPilot 只認得 KDE 的螢幕保護程式。</qt>"
-+"<qt>勾選此選項的話，會避免讓 KPilot 在螢幕保護程式啟動的期間去同步您的掌上型"
-+"裝置：這是為了安全性考量，避免其它人用他們自己的掌上型裝置來「竊取」您的資"
-+"料。不過若是您使用的是不同的桌面系統，則必須關閉此選項，因為 KPilot 只認得 "
-+"KDE 的螢幕保護程式。</qt>"
- 
- #. i18n: file ./kpilot/kpilotConfigDialog_startup.ui line 33
- #: rc.cpp:1061
-@@ -5330,7 +5463,8 @@
- "<qt>Check this box to stop the KPilot daemon when you quit KPilot (only if "
- "KPilot started the daemon itself).</qt>"
- msgstr ""
--"<qt>勾選此選項的話，當您離開 KPilot 時，會同時中止 KPilot 守護程式（只在 KPilot 自己啟動守護程式時有效）。</qt>"
-+"<qt>勾選此選項的話，當您離開 KPilot 時，會同時中止 KPilot 守護程式（只在 "
-+"KPilot 自己啟動守護程式時有效）。</qt>"
- 
- #. i18n: file ./kpilot/kpilotConfigDialog_startup.ui line 55
- #: rc.cpp:1070
-@@ -5342,12 +5476,12 @@
- #: rc.cpp:1073
- #, no-c-format
- msgid ""
--"<qt>Check this box to stop both KPilot and the KPilot daemon after the HotSync "
--"finishes. This may be useful for systems where KPilot is started by the USB "
--"daemon.</qt>"
-+"<qt>Check this box to stop both KPilot and the KPilot daemon after the "
-+"HotSync finishes. This may be useful for systems where KPilot is started by "
-+"the USB daemon.</qt>"
- msgstr ""
--"<qt>勾選此選項的話，會在熱同步完成後同時停止 KPilot 與 KPilot 守護程式。如果 KPilot 是由 USB "
--"守護程式叫出來的，您就可以使用這個選項。</qt>"
-+"<qt>勾選此選項的話，會在熱同步完成後同時停止 KPilot 與 KPilot 守護程式。如果 "
-+"KPilot 是由 USB 守護程式叫出來的，您就可以使用這個選項。</qt>"
- 
- #. i18n: file ./kpilot/kpilotConfigDialog_startup.ui line 68
- #: rc.cpp:1076
-@@ -5367,7 +5501,8 @@
- msgid ""
- "<qt>Check this box to start up the KPilot daemon every time you log in to "
- "KDE.</qt>"
--msgstr "<qt>勾選此選項的話，每次您登入 KDE 時就會自動啟動 KPilot 守護程式。</qt>"
-+msgstr ""
-+"<qt>勾選此選項的話，每次您登入 KDE 時就會自動啟動 KPilot 守護程式。</qt>"
- 
- #. i18n: file ./kpilot/kpilotConfigDialog_startup.ui line 90
- #: rc.cpp:1085
-@@ -5379,25 +5514,27 @@
- #: rc.cpp:1088
- #, no-c-format
- msgid ""
--"<qt>Check this box to place a Kpilot icon in the system tray, which shows the "
--"daemon's status, and allows you to select the next sync type and to configure "
--"KPilot.</qt>"
-+"<qt>Check this box to place a Kpilot icon in the system tray, which shows "
-+"the daemon's status, and allows you to select the next sync type and to "
-+"configure KPilot.</qt>"
- msgstr ""
--"<qt>勾選此選項的話，會在系統匣內顯示 KPilot 圖示，告訴您目前守護程式的狀態，並允許您選擇下一次同步的模式，以及設定 KPilot。</qt>"
-+"<qt>勾選此選項的話，會在系統匣內顯示 KPilot 圖示，告訴您目前守護程式的狀態，"
-+"並允許您選擇下一次同步的模式，以及設定 KPilot。</qt>"
- 
- #. i18n: file ./kpilot/kpilotConfigWizard_app.ui line 26
- #: rc.cpp:1091
- #, no-c-format
- msgid ""
--"Finally, you can configure KPilot specifically for some PIM applications, like "
--"Kontact (KDE's integrated PIM application) or Evolution (GNOME's integrated PIM "
--"application).\n"
-+"Finally, you can configure KPilot specifically for some PIM applications, "
-+"like Kontact (KDE's integrated PIM application) or Evolution (GNOME's "
-+"integrated PIM application).\n"
- "\n"
- "Press \"Finish\" to setup KPilot according to the settings in this "
- "configuration Wizard."
- msgstr ""
--"最後，您可以設定 KPilot 指定一些個人資訊管理的應用程式，如 Kontack（KDE 的個人資訊管理整合應用程式），或是 Evolution（GNOME "
--"的個人資訊管理整合應用程式）。\n"
-+"最後，您可以設定 KPilot 指定一些個人資訊管理的應用程式，如 Kontack（KDE 的個"
-+"人資訊管理整合應用程式），或是 Evolution（GNOME 的個人資訊管理整合應用程"
-+"式）。\n"
- "\n"
- "設定好後按下「完成」。"
- 
-@@ -5465,20 +5602,19 @@
- #: rc.cpp:1129 rc.cpp:1138
- #, no-c-format
- msgid ""
--"<qt>"
--"<p>Enter the databases types you wish to exclude from the backup operation "
--"here. Use this setting if backing up some databases crashes the handheld, or if "
--"you do not want a backup of some databases (like AvantGo pages).</p>"
--"<p>Entries with square brackets [] are <i>creator codes</i> like <tt>[lnch]</tt> "
--"and can exclude a whole range of databases. Entries without the brackets list "
--"database names, and may include shell-style wildcards, like <tt>*_a68k</tt>.</p>"
--"</qt>"
--msgstr ""
--"<qt>"
--"<p>請在此輸入您在備份時要排除的資料庫型態。如果在備份某些資料庫時會造成掌上型裝置當機的話，或是您不想備份某些資料庫（如 AvantGo "
--"頁面），您可以使用此選項。</p>"
--"<p>使用方括號 [] 括起來的項目為建立者代碼（<i>Creator codes</i>），像是 <tt>[Inch]</tt>"
--"，可以排除整個範圍的資料庫。沒有用方括號括起來的文字則是資料庫名稱，可以包含萬用字元，如 <tt>*_a68k</tt>。</p></qt>"
-+"<qt><p>Enter the databases types you wish to exclude from the backup "
-+"operation here. Use this setting if backing up some databases crashes the "
-+"handheld, or if you do not want a backup of some databases (like AvantGo "
-+"pages).</p><p>Entries with square brackets [] are <i>creator codes</i> like "
-+"<tt>[lnch]</tt> and can exclude a whole range of databases. Entries without "
-+"the brackets list database names, and may include shell-style wildcards, "
-+"like <tt>*_a68k</tt>.</p></qt>"
-+msgstr ""
-+"<qt><p>請在此輸入您在備份時要排除的資料庫型態。如果在備份某些資料庫時會造成掌"
-+"上型裝置當機的話，或是您不想備份某些資料庫（如 AvantGo 頁面），您可以使用此選"
-+"項。</p><p>使用方括號 [] 括起來的項目為建立者代碼（<i>Creator codes</i>），像"
-+"是 <tt>[Inch]</tt>，可以排除整個範圍的資料庫。沒有用方括號括起來的文字則是資"
-+"料庫名稱，可以包含萬用字元，如 <tt>*_a68k</tt>。</p></qt>"
- 
- #. i18n: file ./kpilot/kpilotConfigDialog_backup.ui line 127
- #: rc.cpp:1132
-@@ -5490,45 +5626,48 @@
- #: rc.cpp:1135 rc.cpp:1141
- #, no-c-format
- msgid ""
--"<qt>"
--"<p>Enter the databases types you wish to exclude from the restore operation "
--"here (like AvantGo databases). They will be skipped even if they exist in the "
--"set of backup databases on the handheld. If you still want to install an "
--"ignored database to the handheld, you can always manually install it to the "
--"handheld.</p>"
--"<p>Entries with square brackets [] are <i>creator codes</i> like <tt>[lnch]</tt> "
--"and can exclude a whole range of databases. Entries without the brackets list "
--"database names, and may include shell-style wildcards, like <tt>*_a68k</tt>.</p>"
--"</qt>"
--msgstr ""
--"<qt>"
--"<p>請在此輸入您在回復資料庫時要排除的資料庫型態（如 AvantGo "
--"資料庫）。它們會在回復動作時被略過，即使在掌上型裝置有設定要備份。如果您要將一個被排除的資料庫安裝到掌上型裝置，您可以手動安裝。</p>"
--"<p>使用方括號 [] 括起來的項目為建立者代碼（<i>Creator codes</i>），像是 <tt>[Inch]</tt>"
--"，可以排除整個範圍的資料庫。沒有用方括號括起來的文字則是資料庫名稱，可以包含萬用字元，如 <tt>*_a68k</tt>。</qt>"
-+"<qt><p>Enter the databases types you wish to exclude from the restore "
-+"operation here (like AvantGo databases). They will be skipped even if they "
-+"exist in the set of backup databases on the handheld. If you still want to "
-+"install an ignored database to the handheld, you can always manually install "
-+"it to the handheld.</p><p>Entries with square brackets [] are <i>creator "
-+"codes</i> like <tt>[lnch]</tt> and can exclude a whole range of databases. "
-+"Entries without the brackets list database names, and may include shell-"
-+"style wildcards, like <tt>*_a68k</tt>.</p></qt>"
-+msgstr ""
-+"<qt><p>請在此輸入您在回復資料庫時要排除的資料庫型態（如 AvantGo 資料庫）。它"
-+"們會在回復動作時被略過，即使在掌上型裝置有設定要備份。如果您要將一個被排除的"
-+"資料庫安裝到掌上型裝置，您可以手動安裝。</p><p>使用方括號 [] 括起來的項目為建"
-+"立者代碼（<i>Creator codes</i>），像是 <tt>[Inch]</tt>，可以排除整個範圍的資"
-+"料庫。沒有用方括號括起來的文字則是資料庫名稱，可以包含萬用字元，如 "
-+"<tt>*_a68k</tt>。</qt>"
- 
- #. i18n: file ./kpilot/kpilotConfigDialog_backup.ui line 157
- #: rc.cpp:1144 rc.cpp:1150
- #, no-c-format
- msgid "..."
--msgstr "..."
-+msgstr "…"
- 
- #. i18n: file ./kpilot/kpilotConfigDialog_backup.ui line 160
- #: rc.cpp:1147
- #, no-c-format
- msgid ""
--"<qt>Click here to open the database selection dialog. This dialog allows you to "
--"check the databases you want to exclude from the backup from a list.</qt>"
--msgstr "<qt>點擊此處以開啟資料庫選取對話框。這個對話框讓您勾選您打算在備份時排除的資料庫。</qt>"
-+"<qt>Click here to open the database selection dialog. This dialog allows you "
-+"to check the databases you want to exclude from the backup from a list.</qt>"
-+msgstr ""
-+"<qt>點擊此處以開啟資料庫選取對話框。這個對話框讓您勾選您打算在備份時排除的資"
-+"料庫。</qt>"
- 
- #. i18n: file ./kpilot/kpilotConfigDialog_backup.ui line 171
- #: rc.cpp:1153
- #, no-c-format
- msgid ""
--"<qt>Click here to open the database selection dialog. This dialog allows you to "
--"select the databases you want to exclude from the restore operation from a "
--"list.</qt>"
--msgstr "<qt>點擊此處以開啟資料庫選取對話框。這個對話框讓您勾選您打算在回復時排除的資料庫。</qt>"
-+"<qt>Click here to open the database selection dialog. This dialog allows you "
-+"to select the databases you want to exclude from the restore operation from "
-+"a list.</qt>"
-+msgstr ""
-+"<qt>點擊此處以開啟資料庫選取對話框。這個對話框讓您勾選您打算在回復時排除的資"
-+"料庫。</qt>"
- 
- #. i18n: file ./kpilot/kpilotConfigDialog_backup.ui line 181
- #: rc.cpp:1156
-@@ -5540,9 +5679,11 @@
- #: rc.cpp:1159
- #, no-c-format
- msgid ""
--"<qt>Check this box to run the selected conduits before every backup. This makes "
--"sure the backup is up to date with the last changes from your PC.</qt>"
--msgstr "<qt>勾選此選項的話，在每次備份前會先執行所選取的導管。這能確保您的備份是 PC 上修改過的最新的資料。</qt>"
-+"<qt>Check this box to run the selected conduits before every backup. This "
-+"makes sure the backup is up to date with the last changes from your PC.</qt>"
-+msgstr ""
-+"<qt>勾選此選項的話，在每次備份前會先執行所選取的導管。這能確保您的備份是 PC "
-+"上修改過的最新的資料。</qt>"
- 
- #. i18n: file ./kpilot/kpilotConfigWizard_user.ui line 24
- #: rc.cpp:1162
-@@ -5569,55 +5710,60 @@
- #, no-c-format
- msgid ""
- "<p>You can either let KPilot detect these values automatically (for this you "
--"need your handheld ready and connected to the PC)  or enter them manually.</p>\n"
-+"need your handheld ready and connected to the PC)  or enter them manually.</"
-+"p>\n"
- "<p>Please enter the username exactly as set on the handheld. </p>\n"
- "<p>If setting the device type manually (i.e., if automatic detection did not "
--"work for you), please look below for tips on choosing the right device name.  "
--"{0...n} means a number from 0 up to a very large number, though usually just "
--"255.\n"
-+"work for you), please look below for tips on choosing the right device "
-+"name.  {0...n} means a number from 0 up to a very large number, though "
-+"usually just 255.\n"
- "<p>\n"
--"Serial Port: an old method of connection, used primarily by the original line "
--"of Palm Pilots, and various Palm-based cellphones.  Device name will look like "
--"/dev/ttyS{0...n} (Linux) or /dev/cuaa{0...n} (FreeBSD).</p>\n"
-+"Serial Port: an old method of connection, used primarily by the original "
-+"line of Palm Pilots, and various Palm-based cellphones.  Device name will "
-+"look like /dev/ttyS{0...n} (Linux) or /dev/cuaa{0...n} (FreeBSD).</p>\n"
- "<p>\n"
--"USB Port: A newer style of connection, used by most newer Palms, Handsprings, "
--"and Sony Clies.  Device name will look like /dev/ttyUSB{0...n} or "
--"/dev/usb/tts/{0...n} (Linux) or /dev/ucom{0...n} (FreeBSD).  On Linux, "
--"definitely check both 0 and 1: newer devices tend to use 1; older devices tend "
--"to use 0.</p>\n"
-+"USB Port: A newer style of connection, used by most newer Palms, "
-+"Handsprings, and Sony Clies.  Device name will look like /dev/ttyUSB{0...n} "
-+"or /dev/usb/tts/{0...n} (Linux) or /dev/ucom{0...n} (FreeBSD).  On Linux, "
-+"definitely check both 0 and 1: newer devices tend to use 1; older devices "
-+"tend to use 0.</p>\n"
- "<p>\n"
- "Infrared: (pronounced infra-red) is a relatively slow connection type used "
--"solely as a last resort.  Device name will be /dev/ircomm0 or /dev/ttyS{0...n} "
--"(Linux), or /dev/sio{0...n} (FreeBSD).</p>\n"
-+"solely as a last resort.  Device name will be /dev/ircomm0 or /dev/ttyS{0..."
-+"n} (Linux), or /dev/sio{0...n} (FreeBSD).</p>\n"
- "<p>\n"
- "Bluetooth: A new connection method, this is used almost exclusively on new, "
--"high-end devices, like the Tungsten T3 or the Zire 72.  Device name will be "
--"/dev/usb/ttub/{0...n} or /dev/ttyUB{0...n} (Linux), or /dev/ttyp{0...n} "
-+"high-end devices, like the Tungsten T3 or the Zire 72.  Device name will be /"
-+"dev/usb/ttub/{0...n} or /dev/ttyUB{0...n} (Linux), or /dev/ttyp{0...n} "
- "(FreeBSD).</p>\n"
- "<p>\n"
- "Network: This has not been tested by any of the KPilot developers themselves "
- "(hardware donations always accepted!), but it has been reported that setting "
--"the device to \"net:any\" will work for network-enabled devices.  However, this "
--"has also been known to lock KPilot up when doing anything other than just "
--"syncing. Use it with caution.\n"
-+"the device to \"net:any\" will work for network-enabled devices.  However, "
-+"this has also been known to lock KPilot up when doing anything other than "
-+"just syncing. Use it with caution.\n"
- "</p>"
- msgstr ""
--"<p>您可以讓 KPilot 自動偵測這些值（您當然要先將您的掌上型裝置連到您的電腦上），或是自己手動輸入這些值。</p>\n"
-+"<p>您可以讓 KPilot 自動偵測這些值（您當然要先將您的掌上型裝置連到您的電腦"
-+"上），或是自己手動輸入這些值。</p>\n"
- "<p>請輸入掌上型裝置上設定的使用者名稱。</p>\n"
--"<p>如果無法自動偵測，您必須手動輸入裝置型態時，請先參考底下的提示，以選擇正確的裝置名稱。{0...n} 表示從 0 到 n，通常 n 不超過 "
--"255。</p>\n"
--"<p>序列埠：舊式的連接方式，主要用於早期的 Palm Pilots，以及一些 Palm 的行動電話。它們的裝置名稱會是 /dev/ttyS{0...n}（在 "
--"Linux 上）或是 /dev/cuaa{0...n}（在 FreeBSD 上）。</p>\n"
--"<p>USB 埠：新式的連線方式，主要用於新的 Palms，Handsprings 與 Sony Clies 系列。裝置名稱會是 "
--"/dev/ttyUSB{0...n}（在 Linux 上）或是 /dev/ucom{0...n}（在 FreeBSD 上）。在 Linux 上，您要同時試試 "
--"0 跟 1，因為新式的裝置會用 1，而較舊的裝置會用 0。</p>\n"
--"<p>紅外線：速度比較慢，通常只用於最後的救急。裝置名稱會是 /dev/ircomm0 或 /dev/ttyS{0...b}（在 Linux 上），或是 "
--"/dev/sio{0...n}（在 FreeBSD 上）。</p>\n"
--"<p>藍芽：新式的連線方式，通常只用於新的，高檔的裝置，如 Tungsten T3 或 Zire 72。裝置名稱會是 "
--"/dev/usb/ttub/{0...n} 或 /dev/ttyUB{0...n}（在 Linux 上），或是 /dev/ttyp{0...n}（在 "
--"FreeBSD 上）。</p>\n"
--"<p>網路：目前尚未經過任何 KPilot 開發者的測試（有人要捐獻硬體嗎？），不過已經有回報，將裝置設為 \"net:any\" "
--"可以在開啟網路的裝置上運作。不過，也有人回報說使用這個選項只能做同步，其他的動作都會鎖死 KPilot。所以請小心使用。</p></p>"
-+"<p>如果無法自動偵測，您必須手動輸入裝置型態時，請先參考底下的提示，以選擇正確"
-+"的裝置名稱。{0...n} 表示從 0 到 n，通常 n 不超過 255。</p>\n"
-+"<p>序列埠：舊式的連接方式，主要用於早期的 Palm Pilots，以及一些 Palm 的行動電"
-+"話。它們的裝置名稱會是 /dev/ttyS{0...n}（在 Linux 上）或是 /dev/cuaa{0...n}"
-+"（在 FreeBSD 上）。</p>\n"
-+"<p>USB 埠：新式的連線方式，主要用於新的 Palms，Handsprings 與 Sony Clies 系"
-+"列。裝置名稱會是 /dev/ttyUSB{0...n}（在 Linux 上）或是 /dev/ucom{0...n}（在 "
-+"FreeBSD 上）。在 Linux 上，您要同時試試 0 跟 1，因為新式的裝置會用 1，而較舊"
-+"的裝置會用 0。</p>\n"
-+"<p>紅外線：速度比較慢，通常只用於最後的救急。裝置名稱會是 /dev/ircomm0 或 /"
-+"dev/ttyS{0...b}（在 Linux 上），或是 /dev/sio{0...n}（在 FreeBSD 上）。</p>\n"
-+"<p>藍芽：新式的連線方式，通常只用於新的，高檔的裝置，如 Tungsten T3 或 Zire "
-+"72。裝置名稱會是 /dev/usb/ttub/{0...n} 或 /dev/ttyUB{0...n}（在 Linux 上），"
-+"或是 /dev/ttyp{0...n}（在 FreeBSD 上）。</p>\n"
-+"<p>網路：目前尚未經過任何 KPilot 開發者的測試（有人要捐獻硬體嗎？），不過已經"
-+"有回報，將裝置設為 \"net:any\" 可以在開啟網路的裝置上運作。不過，也有人回報說"
-+"使用這個選項只能做同步，其他的動作都會鎖死 KPilot。所以請小心使用。</p></p>"
- 
- #. i18n: file ./kpilot/kpilotConfigWizard_user.ui line 73
- #: rc.cpp:1187
-@@ -5630,12 +5776,12 @@
- #, no-c-format
- msgid ""
- "<qt>Enter the device the Pilot is attached to (for instance a serial or USB "
--"port) here. You can also use <i>/dev/pilot</i>, and make that a symlink to the "
--"correct device. Use the button below to automatically detect the device. You "
--"need write permission to successfully synchronize with the handheld.</qt>"
-+"port) here. You can also use <i>/dev/pilot</i>, and make that a symlink to "
-+"the correct device. Use the button below to automatically detect the device. "
-+"You need write permission to successfully synchronize with the handheld.</qt>"
- msgstr ""
--"<qt>請輸入 Pilot 的裝置名稱。您可以使用 <i>/dev/pilot</i> "
--"並將它連到正確的裝置檔。按下底下的按鈕可以自動偵測裝置。您需要寫入的權限才能與裝置同步。</qt>"
-+"<qt>請輸入 Pilot 的裝置名稱。您可以使用 <i>/dev/pilot</i> 並將它連到正確的裝"
-+"置檔。按下底下的按鈕可以自動偵測裝置。您需要寫入的權限才能與裝置同步。</qt>"
- 
- #. i18n: file ./kpilot/kpilotConfigWizard_user.ui line 87
- #: rc.cpp:1193
-@@ -5652,7 +5798,8 @@
- "handheld. If the wizard cannot retrieve this information, check if you have "
- "write permission for the device.</qt>"
- msgstr ""
--"<qt>點擊此按鍵開啟偵測對話框。這個精靈會試著自動找出您的掌上型裝置，並顯示使用者名稱。如果精靈無法取得這些資訊，請檢查您是否對該裝置有寫入的權限。</qt>"
-+"<qt>點擊此按鍵開啟偵測對話框。這個精靈會試著自動找出您的掌上型裝置，並顯示使"
-+"用者名稱。如果精靈無法取得這些資訊，請檢查您是否對該裝置有寫入的權限。</qt>"
- 
- #. i18n: file ./kpilot/kpilotConfigWizard_user.ui line 98
- #: rc.cpp:1199
-@@ -5667,7 +5814,8 @@
- "<qt>Enter your username here, as it appears in the Pilot's &quot;Owner&quot; "
- "setting, or use the button below to automatically detect it.</qt>"
- msgstr ""
--"<qt>請在此輸入您的使用者名稱，必須與 Pilot 上的 &quot;Owner&quot; 設定一樣，或是用底下的按鍵來自動偵測。</qt>"
-+"<qt>請在此輸入您的使用者名稱，必須與 Pilot 上的 &quot;Owner&quot; 設定一樣，"
-+"或是用底下的按鍵來自動偵測。</qt>"
- 
- #. i18n: file ./kpilot/kpilotConfigWizard_user.ui line 117
- #: rc.cpp:1208
-@@ -5679,13 +5827,13 @@
- #: rc.cpp:1217
- #, no-c-format
- msgid ""
--"<qt>Check this box to make the kpilot daemon load when you first log in until "
--"you log out.  That means (in theory), that you should not have to do anything "
--"other than connect your handheld and push \"sync\", and kpilot will appear and "
--"magically do your bidding. </qt>"
-+"<qt>Check this box to make the kpilot daemon load when you first log in "
-+"until you log out.  That means (in theory), that you should not have to do "
-+"anything other than connect your handheld and push \"sync\", and kpilot will "
-+"appear and magically do your bidding. </qt>"
- msgstr ""
--"<qt>勾選此選項的話，當您當入時 KPilot "
--"守護程式會自動載入，直到您登出。這表示（理論上）您不需要做什麼，只需要連上您的掌上型裝置，然後按下「同步」，KPilot "
-+"<qt>勾選此選項的話，當您當入時 KPilot 守護程式會自動載入，直到您登出。這表示"
-+"（理論上）您不需要做什麼，只需要連上您的掌上型裝置，然後按下「同步」，KPilot "
- "就會自動出現並神奇地照您的吩咐工作。</qt>"
- 
- #. i18n: file ./kpilot/kpilotConfigDialog_viewers.ui line 47
-@@ -5698,13 +5846,14 @@
- #: rc.cpp:1229
- #, no-c-format
- msgid ""
--"<qt>The internal viewers can be read only or editable. The editable mode allows "
--"you to add new records, delete or edit the existing records and sync your "
--"modifications back to the handheld. Check this box to set the internal viewers "
--"to editable mode, uncheck to set them to read only mode.</qt>"
--msgstr ""
--"<qt>內部檢視器可以選擇要唯讀或是可編輯。可編輯模式讓您可以新增、刪除或編輯現有的紀錄，並同步到您的掌上型裝置。勾選此選項表示開啟可編輯模式，取消勾選則設為唯"
--"讀模式。</qt>"
-+"<qt>The internal viewers can be read only or editable. The editable mode "
-+"allows you to add new records, delete or edit the existing records and sync "
-+"your modifications back to the handheld. Check this box to set the internal "
-+"viewers to editable mode, uncheck to set them to read only mode.</qt>"
-+msgstr ""
-+"<qt>內部檢視器可以選擇要唯讀或是可編輯。可編輯模式讓您可以新增、刪除或編輯現"
-+"有的紀錄，並同步到您的掌上型裝置。勾選此選項表示開啟可編輯模式，取消勾選則設"
-+"為唯讀模式。</qt>"
- 
- #. i18n: file ./kpilot/kpilotConfigDialog_viewers.ui line 61
- #: rc.cpp:1232
-@@ -5716,9 +5865,11 @@
- #: rc.cpp:1235
- #, no-c-format
- msgid ""
--"<qt>Check this box to display in the internal viewers records that are marked "
--"&quot;Private&quot; in the Pilot.</qt>"
--msgstr "<qt>勾選此選項的話，會在內部檢視器顯示在 Pilot 上被標記為私人（&quot;Private&quot;）的紀錄。</qt>"
-+"<qt>Check this box to display in the internal viewers records that are "
-+"marked &quot;Private&quot; in the Pilot.</qt>"
-+msgstr ""
-+"<qt>勾選此選項的話，會在內部檢視器顯示在 Pilot 上被標記為私人（&quot;"
-+"Private&quot;）的紀錄。</qt>"
- 
- #. i18n: file ./kpilot/kpilotConfigDialog_viewers.ui line 85
- #: rc.cpp:1241
-@@ -5732,7 +5883,8 @@
- msgid ""
- "<qt>Select this option to display addresses in the internal address viewer "
- "sorted by last name, first name.</qt>"
--msgstr "<qt>選取此選項的話，在內部地址檢視器上顯示地址時，會依「姓，名」來排序。</qt>"
-+msgstr ""
-+"<qt>選取此選項的話，在內部地址檢視器上顯示地址時，會依「姓，名」來排序。</qt>"
- 
- #. i18n: file ./kpilot/kpilotConfigDialog_viewers.ui line 96
- #: rc.cpp:1247
-@@ -5746,7 +5898,9 @@
- msgid ""
- "<qt>Select this option to display addresses in the internal address viewer "
- "sorted by company name, last name.</qt>"
--msgstr "<qt>選取此選項的話，在內部地址檢視器上顯示地址時，會依「公司名稱，姓」來排序。</qt>"
-+msgstr ""
-+"<qt>選取此選項的話，在內部地址檢視器上顯示地址時，會依「公司名稱，姓」來排"
-+"序。</qt>"
- 
- #. i18n: file ./kpilot/kpilotConfigDialog_viewers.ui line 121
- #: rc.cpp:1253
-@@ -5760,7 +5914,9 @@
- msgid ""
- "<qt>Check this box to combine all entries with the same last name in the "
- "internal address viewer.</qt>"
--msgstr "<qt>選取此選項的話，在內部地址檢視器上顯示地址時，會將相同姓氏的紀錄組合在一起。</qt>"
-+msgstr ""
-+"<qt>選取此選項的話，在內部地址檢視器上顯示地址時，會將相同姓氏的紀錄組合在一"
-+"起。</qt>"
- 
- #. i18n: file ./kpilot/dbFlagsEditor_base.ui line 32
- #: rc.cpp:1268
-@@ -5863,12 +6019,12 @@
- #, no-c-format
- msgid ""
- "<qt>Enter the device the Pilot is attached to (for instance a serial or USB "
--"port) here. You can also use <i>/dev/pilot</i>, and make that a symlink to the "
--"correct device. You need write permission to successfully synchronize with the "
--"handheld.</qt>"
-+"port) here. You can also use <i>/dev/pilot</i>, and make that a symlink to "
-+"the correct device. You need write permission to successfully synchronize "
-+"with the handheld.</qt>"
- msgstr ""
--"<qt>請輸入 Pilot 的裝置名稱。您可以使用 <i>/dev/pilot</i> "
--"並將它連到正確的裝置檔。按下底下的按鈕可以自動偵測裝置。您需要寫入的權限才能與裝置同步。</qt>"
-+"<qt>請輸入 Pilot 的裝置名稱。您可以使用 <i>/dev/pilot</i> 並將它連到正確的裝"
-+"置檔。按下底下的按鈕可以自動偵測裝置。您需要寫入的權限才能與裝置同步。</qt>"
- 
- #. i18n: file ./kpilot/kpilotConfigDialog_device.ui line 51
- #: rc.cpp:1325
-@@ -5880,14 +6036,15 @@
- #: rc.cpp:1328 rc.cpp:1349
- #, no-c-format
- msgid ""
--"<qt>Select the speed of the serial connection to your handheld here. This has "
--"no meaning for USB devices. For an older model, choose 9600. Newer models may "
--"be able to handle speeds up to the maximum listed, 115200. You can experiment "
--"with the connection speed: the manual suggests starting at a speed of 19200 and "
--"trying faster speeds to see if they work.</qt>"
--msgstr ""
--"<qt>請在此選擇序列埠連接的速度。這個選項與 USB 連線無關。對一些舊式的裝置，請選擇 9600。新一點的裝置可以上到 "
--"115200。您可以實驗一下看看哪個速度才正確：手冊的建議是從 19200 開始試，如果看起來可以，就加快速度試試。</qt>"
-+"<qt>Select the speed of the serial connection to your handheld here. This "
-+"has no meaning for USB devices. For an older model, choose 9600. Newer "
-+"models may be able to handle speeds up to the maximum listed, 115200. You "
-+"can experiment with the connection speed: the manual suggests starting at a "
-+"speed of 19200 and trying faster speeds to see if they work.</qt>"
-+msgstr ""
-+"<qt>請在此選擇序列埠連接的速度。這個選項與 USB 連線無關。對一些舊式的裝置，請"
-+"選擇 9600。新一點的裝置可以上到 115200。您可以實驗一下看看哪個速度才正確：手"
-+"冊的建議是從 19200 開始試，如果看起來可以，就加快速度試試。</qt>"
- 
- #. i18n: file ./kpilot/kpilotConfigDialog_device.ui line 65
- #: rc.cpp:1331 rc.cpp:1361
-@@ -5895,7 +6052,8 @@
- msgid ""
- "<qt>Enter your name here, as it appears in the Pilot's &quot;Owner&quot; "
- "setting.</qt>"
--msgstr "<qt>請在此輸入您的姓名，必須與 Pilot 上的 &quot;Owner&quot; 設定一樣。</qt>"
-+msgstr ""
-+"<qt>請在此輸入您的姓名，必須與 Pilot 上的 &quot;Owner&quot; 設定一樣。</qt>"
- 
- #. i18n: file ./kpilot/kpilotConfigDialog_device.ui line 88
- #: rc.cpp:1334
-@@ -5941,8 +6099,8 @@
- "uses a different encoding than ISO-latin1 (ISO8859-1), select the correct "
- "encoding here, in order to display special characters correctly.</qt>"
- msgstr ""
--"<qt>PalmOS 裝置提供了多國語言。如果您的裝置使用與 "
--"ISO-latin1（ISO8859-1）不同的語言，請在此選擇正確的編碼，以顯示正確的字元。</qt>"
-+"<qt>PalmOS 裝置提供了多國語言。如果您的裝置使用與 ISO-latin1（ISO8859-1）不同"
-+"的語言，請在此選擇正確的編碼，以顯示正確的字元。</qt>"
- 
- #. i18n: file ./kpilot/kpilotConfigDialog_device.ui line 137
- #: rc.cpp:1358
-@@ -5972,13 +6130,14 @@
- #: rc.cpp:1376
- #, no-c-format
- msgid ""
--"<qt>Workarounds enable special handling for specific devices. Most devices do "
--"not need special handling. However, the Zire&tm; 31, Zire 72 and Tungsten T5 <i>"
--"do</i> have special needs, so if you are connecting such a device, please "
--"select the workaround for them.</qt>"
--msgstr ""
--"<qt>開發中選項（Workarounds）會針對一些特殊的裝置開啟特殊的處理。大部份的裝置都不需要特殊處理。不過像 Zire&tm; 31，Zire 72 "
--"與 Tungsten T5 就有特殊需求，因此若您是使用這類的裝置，請選擇此選項。</qt>"
-+"<qt>Workarounds enable special handling for specific devices. Most devices "
-+"do not need special handling. However, the Zire&tm; 31, Zire 72 and Tungsten "
-+"T5 <i>do</i> have special needs, so if you are connecting such a device, "
-+"please select the workaround for them.</qt>"
-+msgstr ""
-+"<qt>開發中選項（Workarounds）會針對一些特殊的裝置開啟特殊的處理。大部份的裝置"
-+"都不需要特殊處理。不過像 Zire&tm; 31，Zire 72 與 Tungsten T5 就有特殊需求，因"
-+"此若您是使用這類的裝置，請選擇此選項。</qt>"
- 
- #. i18n: file ./kpilot/dbSelection_base.ui line 23
- #: rc.cpp:1379
-diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdepim/kres_birthday.po kde-i18n-zh_TW-3.5.10/messages/kdepim/kres_birthday.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdepim/kres_birthday.po	2006-07-22 10:04:31.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdepim/kres_birthday.po	2011-11-11 15:45:17.000000000 +0100
-@@ -6,8 +6,7 @@
- "Project-Id-Version: kres_birthday\n"
- "POT-Creation-Date: 2005-12-15 03:11+0100\n"
- "PO-Revision-Date: 2006-03-02 16:05+0800\n"
--"Last-Translator: Frank Weng (a.k.a. Franklin) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Traditional Chinese <zh_l10n@linux.org.tw>\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/kdepim/kres_blogging.po kde-i18n-zh_TW-3.5.10/messages/kdepim/kres_blogging.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdepim/kres_blogging.po	2006-07-22 10:04:31.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdepim/kres_blogging.po	2011-11-11 15:45:17.000000000 +0100
-@@ -6,8 +6,7 @@
- "Project-Id-Version: kres_blogging\n"
- "POT-Creation-Date: 2005-02-02 01:26+0100\n"
- "PO-Revision-Date: 2006-03-02 16:07+0800\n"
--"Last-Translator: Frank Weng (a.k.a. Franklin) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Traditional Chinese <zh_l10n@linux.org.tw>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
-@@ -16,9 +15,10 @@
- 
- #: kcal_resourcebloggingconfig.cpp:35
- msgid ""
--"Currently, the blogging resource is only read-only. You will not be able to add "
--"journals to this resource or upload any changes to the server."
--msgstr "目前部落格資源只能唯讀。您無法新增日誌到這個資源，或是上傳任何改變到伺服器。"
-+"Currently, the blogging resource is only read-only. You will not be able to "
-+"add journals to this resource or upload any changes to the server."
-+msgstr ""
-+"目前部落格資源只能唯讀。您無法新增日誌到這個資源，或是上傳任何改變到伺服器。"
- 
- #: kcal_resourcebloggingconfig.cpp:35
- msgid "Read-Only"
-diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdepim/kres_exchange.po kde-i18n-zh_TW-3.5.10/messages/kdepim/kres_exchange.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdepim/kres_exchange.po	2006-07-22 10:04:31.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdepim/kres_exchange.po	2011-11-11 15:45:17.000000000 +0100
-@@ -6,8 +6,7 @@
- "Project-Id-Version: kres_exchange\n"
- "POT-Creation-Date: 2006-03-25 04:00+0100\n"
- "PO-Revision-Date: 2006-06-19 10:36+0800\n"
--"Last-Translator: Frank Weng (a.k.a. Franklin) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Chinese Traditional <zh-l10n@linux.org.tw>\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/kdepim/kres_featureplan.po kde-i18n-zh_TW-3.5.10/messages/kdepim/kres_featureplan.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdepim/kres_featureplan.po	2006-07-22 10:04:31.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdepim/kres_featureplan.po	2011-11-11 15:45:17.000000000 +0100
-@@ -6,8 +6,7 @@
- "Project-Id-Version: kres_featureplan\n"
- "POT-Creation-Date: 2005-01-16 01:25+0100\n"
- "PO-Revision-Date: 2006-03-02 16:10+0800\n"
--"Last-Translator: Frank Weng (a.k.a. Franklin) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Traditional Chinese <zh_l10n@linux.org.tw>\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/kdepim/kres_groupware.po kde-i18n-zh_TW-3.5.10/messages/kdepim/kres_groupware.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdepim/kres_groupware.po	2006-07-22 10:04:30.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdepim/kres_groupware.po	2011-11-11 15:45:17.000000000 +0100
-@@ -6,8 +6,7 @@
- "Project-Id-Version: kres_groupware\n"
- "POT-Creation-Date: 2005-08-18 04:31+0200\n"
- "PO-Revision-Date: 2006-03-02 16:12+0800\n"
--"Last-Translator: Frank Weng (a.k.a. Franklin) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Traditional Chinese <zh_l10n@linux.org.tw>\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/kdepim/kres_groupwise.po kde-i18n-zh_TW-3.5.10/messages/kdepim/kres_groupwise.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdepim/kres_groupwise.po	2007-10-08 12:00:14.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdepim/kres_groupwise.po	2011-11-11 15:45:17.000000000 +0100
-@@ -6,8 +6,7 @@
- "Project-Id-Version: kres_groupwise\n"
- "POT-Creation-Date: 2007-08-02 01:15+0200\n"
- "PO-Revision-Date: 2006-12-18 13:11+0800\n"
--"Last-Translator: Frank Weng (a.k.a. Franklin) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Chinese Traditional <zh-l10n@linux.org.tw>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
-@@ -259,8 +258,8 @@
- 
- #: soap/ksslsocket.cpp:324
- msgid ""
--"The IP address of the host %1 does not match the one the certificate was issued "
--"to."
-+"The IP address of the host %1 does not match the one the certificate was "
-+"issued to."
- msgstr "主機 %1 的 IP 與憑證中的不符。"
- 
- #: soap/ksslsocket.cpp:329 soap/ksslsocket.cpp:339 soap/ksslsocket.cpp:355
-diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdepim/kres_kolab.po kde-i18n-zh_TW-3.5.10/messages/kdepim/kres_kolab.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdepim/kres_kolab.po	2008-08-19 20:43:18.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdepim/kres_kolab.po	2011-11-11 15:45:17.000000000 +0100
-@@ -7,7 +7,7 @@
- "Project-Id-Version: kres_kolab\n"
- "POT-Creation-Date: 2008-02-29 01:41+0100\n"
- "PO-Revision-Date: 2008-02-04 12:38+0800\n"
--"Last-Translator: Franklin Weng <franklin at goodhorse dot idv dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Chinese Traditional <zh-l10n@linux.org.tw>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
-@@ -16,19 +16,19 @@
- 
- #: kabc/resourcekolab.cpp:205
- msgid "Loading contacts..."
--msgstr "載入聯絡人..."
-+msgstr "載入聯絡人…"
- 
- #: kcal/resourcekolab.cpp:171
- msgid "Loading tasks..."
--msgstr "載入工作..."
-+msgstr "載入工作…"
- 
- #: kcal/resourcekolab.cpp:172
- msgid "Loading journals..."
--msgstr "載入日誌..."
-+msgstr "載入日誌…"
- 
- #: kcal/resourcekolab.cpp:173
- msgid "Loading events..."
--msgstr "載入事件..."
-+msgstr "載入事件…"
- 
- #: kcal/resourcekolab.cpp:376
- #, c-format
-@@ -95,8 +95,8 @@
- #, c-format
- msgid ""
- "This is a Kolab Groupware object.\n"
--"To view this object you will need an email client that can understand the Kolab "
--"Groupware format.\n"
-+"To view this object you will need an email client that can understand the "
-+"Kolab Groupware format.\n"
- "For a list of such email clients please visit\n"
- "%1"
- msgstr ""
-@@ -111,14 +111,14 @@
- 
- #: shared/resourcekolabbase.cpp:230
- msgid ""
--"No writable resource was found, saving will not be possible. Reconfigure KMail "
--"first."
-+"No writable resource was found, saving will not be possible. Reconfigure "
-+"KMail first."
- msgstr "找不到可寫入的資源，無法儲存。請先重新設定 KMail。"
- 
- #: shared/resourcekolabbase.cpp:239
- msgid ""
--"You have more than one writable resource folder. Please select the one you want "
--"to write to."
-+"You have more than one writable resource folder. Please select the one you "
-+"want to write to."
- msgstr "您有一個以上可寫入的資源資料夾。請選擇您要寫到哪裡。"
- 
- #: shared/resourcekolabbase.cpp:243
-diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdepim/kres_remote.po kde-i18n-zh_TW-3.5.10/messages/kdepim/kres_remote.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdepim/kres_remote.po	2007-05-14 12:23:02.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdepim/kres_remote.po	2011-11-11 15:45:17.000000000 +0100
-@@ -6,8 +6,7 @@
- "Project-Id-Version: kres_remote\n"
- "POT-Creation-Date: 2007-01-26 02:44+0100\n"
- "PO-Revision-Date: 2006-03-02 16:15+0800\n"
--"Last-Translator: Frank Weng (a.k.a. Franklin) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Traditional Chinese <zh_l10n@linux.org.tw>\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/kdepim/kres_scalix.po kde-i18n-zh_TW-3.5.10/messages/kdepim/kres_scalix.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdepim/kres_scalix.po	2008-08-19 20:43:18.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdepim/kres_scalix.po	2011-11-11 15:45:17.000000000 +0100
-@@ -6,7 +6,7 @@
- "Project-Id-Version: kres_scalix\n"
- "POT-Creation-Date: 2008-02-29 01:41+0100\n"
- "PO-Revision-Date: 2008-02-04 12:40+0800\n"
--"Last-Translator: Franklin Weng <franklin@mail.everfocus.com.tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team:  <zh@li.org>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
-@@ -19,8 +19,8 @@
- 
- #: shared/resourcescalixbase.cpp:157
- msgid ""
--"No writable resource was found, saving will not be possible. Reconfigure KMail "
--"first."
-+"No writable resource was found, saving will not be possible. Reconfigure "
-+"KMail first."
- msgstr "找不到可寫入的資源，無法儲存。請先重新設定 KMail。"
- 
- #: shared/resourcescalixbase.cpp:165
-@@ -29,25 +29,25 @@
- 
- #: shared/resourcescalixbase.cpp:166
- msgid ""
--"You have more than one writable resource folder. Please select the one you want "
--"to write to."
-+"You have more than one writable resource folder. Please select the one you "
-+"want to write to."
- msgstr "您有一個以上可寫入的資源。請選擇您要寫入哪一個。"
- 
- #: kabc/resourcescalix.cpp:202
- msgid "Loading contacts..."
--msgstr "載入聯絡人中..."
-+msgstr "載入聯絡人中…"
- 
- #: kcal/resourcescalix.cpp:159
- msgid "Loading tasks..."
--msgstr "載入工作中..."
-+msgstr "載入工作中…"
- 
- #: kcal/resourcescalix.cpp:160
- msgid "Loading journals..."
--msgstr "載入日誌中..."
-+msgstr "載入日誌中…"
- 
- #: kcal/resourcescalix.cpp:161
- msgid "Loading events..."
--msgstr "載入事件中..."
-+msgstr "載入事件中…"
- 
- #: kcal/resourcescalix.cpp:328
- #, c-format
-diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdepim/kres_tvanytime.po kde-i18n-zh_TW-3.5.10/messages/kdepim/kres_tvanytime.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdepim/kres_tvanytime.po	2006-07-22 10:04:31.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdepim/kres_tvanytime.po	2011-11-11 15:45:17.000000000 +0100
-@@ -6,8 +6,7 @@
- "Project-Id-Version: kres_tvanytime\n"
- "POT-Creation-Date: 2005-12-30 03:18+0100\n"
- "PO-Revision-Date: 2006-03-02 16:17+0800\n"
--"Last-Translator: Frank Weng (a.k.a. Franklin) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Traditional Chinese <zh_l10n@linux.org.tw>\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/kdepim/kres_xmlrpc.po kde-i18n-zh_TW-3.5.10/messages/kdepim/kres_xmlrpc.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdepim/kres_xmlrpc.po	2006-07-22 10:04:31.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdepim/kres_xmlrpc.po	2011-11-11 15:45:17.000000000 +0100
-@@ -6,8 +6,7 @@
- "Project-Id-Version: kres_xmlrpc\n"
- "POT-Creation-Date: 2006-06-16 04:05+0200\n"
- "PO-Revision-Date: 2006-06-19 10:36+0800\n"
--"Last-Translator: Frank Weng (a.k.a. Franklin) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Chinese Traditional <zh-l10n@linux.org.tw>\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/kdepim/ktnef.po kde-i18n-zh_TW-3.5.10/messages/kdepim/ktnef.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdepim/ktnef.po	2007-05-14 12:23:02.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdepim/ktnef.po	2011-11-11 15:45:17.000000000 +0100
-@@ -6,8 +6,7 @@
- "Project-Id-Version: ktnef\n"
- "POT-Creation-Date: 2007-02-16 02:44+0100\n"
- "PO-Revision-Date: 2006-06-15 08:13+0800\n"
--"Last-Translator: Frank Weng (a.k.a. Franklin) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Traditional Chinese <zh_l10n@linux.org.tw>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
-@@ -80,7 +79,7 @@
- 
- #: gui/ktnefmain.cpp:93 gui/ktnefmain.cpp:325
- msgid "View With..."
--msgstr "以...觀看"
-+msgstr "以…觀看"
- 
- #: gui/ktnefmain.cpp:94 gui/ktnefmain.cpp:328
- msgid "Extract"
-@@ -88,11 +87,11 @@
- 
- #: gui/ktnefmain.cpp:95 gui/ktnefmain.cpp:329
- msgid "Extract To..."
--msgstr "展開到..."
-+msgstr "展開到…"
- 
- #: gui/ktnefmain.cpp:96
- msgid "Extract All To..."
--msgstr "將所有展開到..."
-+msgstr "將所有展開到…"
- 
- #: gui/ktnefmain.cpp:97 gui/messagepropertydialog.cpp:26
- msgid "Message Properties"
-@@ -104,11 +103,11 @@
- 
- #: gui/ktnefmain.cpp:100
- msgid "Save Message Text As..."
--msgstr "另存信件文字..."
-+msgstr "另存信件文字…"
- 
- #: gui/ktnefmain.cpp:109
- msgid "Default Folder..."
--msgstr "預設資料夾..."
-+msgstr "預設資料夾…"
- 
- #: gui/ktnefmain.cpp:127
- msgid "100 attachments found"
-diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdepim/kwatchgnupg.po kde-i18n-zh_TW-3.5.10/messages/kdepim/kwatchgnupg.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdepim/kwatchgnupg.po	2006-07-22 10:04:30.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdepim/kwatchgnupg.po	2011-11-11 15:45:17.000000000 +0100
-@@ -6,8 +6,7 @@
- "Project-Id-Version: kwatchgnupg\n"
- "POT-Creation-Date: 2005-07-25 01:39+0200\n"
- "PO-Revision-Date: 2006-03-03 09:27+0800\n"
--"Last-Translator: Frank Weng (a.k.a. Franklin) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Traditional Chinese <zh_l10n@linux.org.tw>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
-@@ -102,7 +101,7 @@
- 
- #: kwatchgnupgconfig.cpp:141
- msgid "Enable &word wrapping"
--msgstr "開啟折行功能(&W)"
-+msgstr "開啟折列功能(&W)"
- 
- #: kwatchgnupgmainwin.cpp:98
- msgid "C&lear History"
-@@ -110,7 +109,7 @@
- 
- #: kwatchgnupgmainwin.cpp:109
- msgid "Configure KWatchGnuPG..."
--msgstr "設定 KWatchGnuPG..."
-+msgstr "設定 KWatchGnuPG…"
- 
- #: kwatchgnupgmainwin.cpp:148
- msgid ""
-diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdepim/libkcal.po kde-i18n-zh_TW-3.5.10/messages/kdepim/libkcal.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdepim/libkcal.po	2008-08-19 20:43:18.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdepim/libkcal.po	2011-11-11 15:45:17.000000000 +0100
-@@ -7,7 +7,7 @@
- "Project-Id-Version: libkcal\n"
- "POT-Creation-Date: 2008-08-19 01:18+0200\n"
- "PO-Revision-Date: 2008-02-04 12:46+0800\n"
--"Last-Translator: Franklin Weng <franklin at goodhorse dot idv dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Chinese Traditional <zh-l10n@linux.org.tw>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
-@@ -84,9 +84,12 @@
- #: calendarlocal.cpp:581
- msgid ""
- "The timezone setting was changed. In order to display the calendar you are "
--"looking at in the new timezone, it needs to be saved. Do you want to save the "
--"pending changes or rather wait and apply the new timezone on the next reload?"
--msgstr "時區設定已被改變。要顯示新時區的行事曆，您需要先儲存。您要現在將所做的改變先儲存起來，還是等到下一次重新載入時再將新時區套用進來？"
-+"looking at in the new timezone, it needs to be saved. Do you want to save "
-+"the pending changes or rather wait and apply the new timezone on the next "
-+"reload?"
-+msgstr ""
-+"時區設定已被改變。要顯示新時區的行事曆，您需要先儲存。您要現在將所做的改變先"
-+"儲存起來，還是等到下一次重新載入時再將新時區套用進來？"
- 
- #: calendarlocal.cpp:587
- msgid "Save before applying timezones?"
-@@ -939,22 +942,16 @@
- msgstr "這是一個空閒/忙碌物件"
- 
- #: incidenceformatter.cpp:2050
--msgid ""
--"Summary: %1\n"
--msgstr ""
--"總結：%1\n"
-+msgid "Summary: %1\n"
-+msgstr "總結：%1\n"
- 
- #: incidenceformatter.cpp:2053
--msgid ""
--"Organizer: %1\n"
--msgstr ""
--"組織者：%1\n"
-+msgid "Organizer: %1\n"
-+msgstr "組織者：%1\n"
- 
- #: incidenceformatter.cpp:2056
--msgid ""
--"Location: %1\n"
--msgstr ""
--"位置：%1\n"
-+msgid "Location: %1\n"
-+msgstr "位置：%1\n"
- 
- #: incidenceformatter.cpp:2063
- msgid ""
-@@ -991,40 +988,28 @@
- msgstr "每幾年"
- 
- #: incidenceformatter.cpp:2069 incidenceformatter.cpp:2117
--msgid ""
--"Start Date: %1\n"
--msgstr ""
--"開始日期：%1\n"
-+msgid "Start Date: %1\n"
-+msgstr "開始日期：%1\n"
- 
- #: incidenceformatter.cpp:2071 incidenceformatter.cpp:2119
--msgid ""
--"Start Time: %1\n"
--msgstr ""
--"開始時間：%1\n"
-+msgid "Start Time: %1\n"
-+msgstr "開始時間：%1\n"
- 
- #: incidenceformatter.cpp:2074
--msgid ""
--"End Date: %1\n"
--msgstr ""
--"結束日期：%1\n"
-+msgid "End Date: %1\n"
-+msgstr "結束日期：%1\n"
- 
- #: incidenceformatter.cpp:2077
--msgid ""
--"End Time: %1\n"
--msgstr ""
--"結束時間：%1\n"
-+msgid "End Time: %1\n"
-+msgstr "結束時間：%1\n"
- 
- #: incidenceformatter.cpp:2082
--msgid ""
--"Recurs: %1\n"
--msgstr ""
--"重覆：%1\n"
-+msgid "Recurs: %1\n"
-+msgstr "重覆：%1\n"
- 
- #: incidenceformatter.cpp:2084
--msgid ""
--"Frequency: %1\n"
--msgstr ""
--"頻率：%1\n"
-+msgid "Frequency: %1\n"
-+msgstr "頻率：%1\n"
- 
- #: incidenceformatter.cpp:2088
- #, c-format
-@@ -1034,16 +1019,12 @@
- msgstr "重覆 %n 次"
- 
- #: incidenceformatter.cpp:2099
--msgid ""
--"Repeat until: %1\n"
--msgstr ""
--"重覆直到：%1\n"
-+msgid "Repeat until: %1\n"
-+msgstr "重覆直到：%1\n"
- 
- #: incidenceformatter.cpp:2101
--msgid ""
--"Repeats forever\n"
--msgstr ""
--"永遠重覆\n"
-+msgid "Repeats forever\n"
-+msgstr "永遠重覆\n"
- 
- #: incidenceformatter.cpp:2107 incidenceformatter.cpp:2130
- msgid ""
-@@ -1054,28 +1035,20 @@
- "%1\n"
- 
- #: incidenceformatter.cpp:2123
--msgid ""
--"Due Date: %1\n"
--msgstr ""
--"預定日期：%1\n"
-+msgid "Due Date: %1\n"
-+msgstr "預定日期：%1\n"
- 
- #: incidenceformatter.cpp:2125
--msgid ""
--"Due Time: %1\n"
--msgstr ""
--"預定時間：%1\n"
-+msgid "Due Time: %1\n"
-+msgstr "預定時間：%1\n"
- 
- #: incidenceformatter.cpp:2138
--msgid ""
--"Date: %1\n"
--msgstr ""
--"日期：%1\n"
-+msgid "Date: %1\n"
-+msgstr "日期：%1\n"
- 
- #: incidenceformatter.cpp:2140
--msgid ""
--"Time: %1\n"
--msgstr ""
--"時間：%1\n"
-+msgid "Time: %1\n"
-+msgstr "時間：%1\n"
- 
- #: incidenceformatter.cpp:2143
- msgid ""
-@@ -1269,7 +1242,8 @@
- msgid ""
- "CSS style sheet to be used by the final HTML page. This string contains the "
- "actual contents of the CSS, not a path to the style sheet."
--msgstr "用於 HTML 輸出頁的 CSS 樣式表。字串包含實際 CSS 內容，而不是樣式表的路徑。"
-+msgstr ""
-+"用於 HTML 輸出頁的 CSS 樣式表。字串包含實際 CSS 內容，而不是樣式表的路徑。"
- 
- #. i18n: file htmlexportsettings.kcfg line 53
- #: rc.cpp:54
-@@ -1431,16 +1405,12 @@
- msgstr "型態：%1"
- 
- #: resourcecalendar.cpp:149
--msgid ""
--"Error while loading %1.\n"
--msgstr ""
--"載入 %1 時發生錯誤。\n"
-+msgid "Error while loading %1.\n"
-+msgstr "載入 %1 時發生錯誤。\n"
- 
- #: resourcecalendar.cpp:186
--msgid ""
--"Error while saving %1.\n"
--msgstr ""
--"儲存 %1 時發生錯誤。\n"
-+msgid "Error while saving %1.\n"
-+msgstr "儲存 %1 時發生錯誤。\n"
- 
- #: resourcelocalconfig.cpp:49 resourcelocaldirconfig.cpp:47
- msgid "Location:"
-@@ -1463,7 +1433,9 @@
- "You did not specify a URL for this resource. Therefore, the resource will be "
- "saved in %1. It is still possible to change this location by editing the "
- "resource properties."
--msgstr "您沒有指定此資源的網址。因此，此資源會被儲存在 %1。您還是可以透過編輯此資源的內容改變這個位置。"
-+msgstr ""
-+"您沒有指定此資源的網址。因此，此資源會被儲存在 %1。您還是可以透過編輯此資源的"
-+"內容改變這個位置。"
- 
- #: scheduler.cpp:50
- msgid "Updated Publish"
-diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdepim/libkdepim.po kde-i18n-zh_TW-3.5.10/messages/kdepim/libkdepim.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdepim/libkdepim.po	2008-08-19 20:43:18.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdepim/libkdepim.po	2011-11-11 15:45:17.000000000 +0100
-@@ -9,7 +9,7 @@
- "Project-Id-Version: libkdepim\n"
- "POT-Creation-Date: 2008-07-14 01:18+0200\n"
- "PO-Revision-Date: 2008-07-14 13:39+0800\n"
--"Last-Translator: Franklin Weng <franklin at goodhorse dot idv dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Chinese Traditional <zh-l10n@linux.org.tw>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
-@@ -30,15 +30,19 @@
- 
- #: ../libemailfunctions/email.cpp:457
- msgid ""
--"The email address you entered is not valid because it contains more than one @. "
--"You will not create valid messages if you do not change your address."
--msgstr "您輸入的電子郵件地址不合法，因為包含了兩個以上的 @ 符號。如果您不改變您輸入的位址，將無法產生可用的信件。"
-+"The email address you entered is not valid because it contains more than one "
-+"@. You will not create valid messages if you do not change your address."
-+msgstr ""
-+"您輸入的電子郵件地址不合法，因為包含了兩個以上的 @ 符號。如果您不改變您輸入的"
-+"位址，將無法產生可用的信件。"
- 
- #: ../libemailfunctions/email.cpp:462
- msgid ""
--"The email address you entered is not valid because it does not contain a @.You "
--"will not create valid messages if you do not change your address."
--msgstr "您輸入的電子郵件地址不合法，因為沒有包含 @ 符號。如果您不改變您輸入的位址，將無法產生可用的信件。"
-+"The email address you entered is not valid because it does not contain a @."
-+"You will not create valid messages if you do not change your address."
-+msgstr ""
-+"您輸入的電子郵件地址不合法，因為沒有包含 @ 符號。如果您不改變您輸入的位址，將"
-+"無法產生可用的信件。"
- 
- #: ../libemailfunctions/email.cpp:467
- msgid "You have to enter something in the email address field."
-@@ -46,14 +50,14 @@
- 
- #: ../libemailfunctions/email.cpp:469
- msgid ""
--"The email address you entered is not valid because it does not contain a local "
--"part."
-+"The email address you entered is not valid because it does not contain a "
-+"local part."
- msgstr "您輸入的電子郵件地址不合法，因為沒有包含帳號。"
- 
- #: ../libemailfunctions/email.cpp:472
- msgid ""
--"The email address you entered is not valid because it does not contain a domain "
--"part."
-+"The email address you entered is not valid because it does not contain a "
-+"domain part."
- msgstr "您輸入的電子郵件地址不合法，因為沒有包含網域。"
- 
- #: ../libemailfunctions/email.cpp:475
-@@ -86,10 +90,12 @@
- 
- #: ../libemailfunctions/email.cpp:489
- msgid ""
--"The email address you entered is not valid because it ended unexpectedly, this "
--"probably means you have used an escaping type character like an \\  as the last "
--"character in your email address."
--msgstr "您輸入的電子郵件地址不合法，因為在非預期的狀況下結束。這可能是因為您在輸入欄位的最後面不小心加了一個跳脫字元（如 \\）。"
-+"The email address you entered is not valid because it ended unexpectedly, "
-+"this probably means you have used an escaping type character like an \\  as "
-+"the last character in your email address."
-+msgstr ""
-+"您輸入的電子郵件地址不合法，因為在非預期的狀況下結束。這可能是因為您在輸入欄"
-+"位的最後面不小心加了一個跳脫字元（如 \\）。"
- 
- #: ../libemailfunctions/email.cpp:494
- msgid ""
-@@ -99,8 +105,8 @@
- 
- #: ../libemailfunctions/email.cpp:497 ../libemailfunctions/email.cpp:558
- msgid ""
--"The email address you entered is not valid because it does not seem to contain "
--"an actual email address, i.e. something of the form joe@kde.org."
-+"The email address you entered is not valid because it does not seem to "
-+"contain an actual email address, i.e. something of the form joe@kde.org."
- msgstr "您輸入的電子郵件地址不合法，因為似乎不是一個真實的電子郵件地址。"
- 
- #: ../libemailfunctions/email.cpp:501
-@@ -111,8 +117,8 @@
- 
- #: ../libemailfunctions/email.cpp:504
- msgid ""
--"The email address you have entered is not valid because it contains an invalid "
--"displayname."
-+"The email address you have entered is not valid because it contains an "
-+"invalid displayname."
- msgstr "您輸入的電子郵件地址不合法，因為包含了不合法的顯示名稱。"
- 
- #: ../libemailfunctions/email.cpp:507
-@@ -156,7 +162,7 @@
- 
- #: addresseelineedit.cpp:873
- msgid "Configure Completion Order..."
--msgstr "設定完成順序..."
-+msgstr "設定完成順序…"
- 
- #: addresseeselector.cpp:67
- msgid "All"
-@@ -289,8 +295,8 @@
- 
- #: addresseeview.cpp:590 addresseeview.cpp:605 addresseeview.cpp:639
- msgid ""
--"There is no application set which could be executed. Please go to the settings "
--"dialog and configure one."
-+"There is no application set which could be executed. Please go to the "
-+"settings dialog and configure one."
- msgstr "沒有設定可執行的應用程式。請到設定視窗去設定。"
- 
- #: addresseeview.cpp:693
-@@ -350,8 +356,8 @@
- 
- #: addressesdialog.cpp:883
- msgid ""
--"There are no addresses in your list. First add some addresses from your address "
--"book, then try again."
-+"There are no addresses in your list. First add some addresses from your "
-+"address book, then try again."
- msgstr "在您的清單中沒有任何地址。請先從通訊錄新增地址，然後再試一次。"
- 
- #: addressesdialog.cpp:890
-@@ -403,8 +409,8 @@
- msgid ""
- "_n: Transmission for account %3 complete. %n new message in %1 KB (%2 KB "
- "remaining on the server).\n"
--"Transmission for account %3 complete. %n new messages in %1 KB (%2 KB remaining "
--"on the server)."
-+"Transmission for account %3 complete. %n new messages in %1 KB (%2 KB "
-+"remaining on the server)."
- msgstr "帳號 %3 傳輸完成。%n 封新信件，%1 KB（還有 %2 KB 在伺服器上）。"
- 
- #: broadcaststatus.cpp:127
-@@ -585,9 +591,11 @@
- 
- #: kaddrbook.cpp:151
- msgid ""
--"<qt>The email address <b>%1</b> was added to your addressbook; you can add more "
--"information to this entry by opening the addressbook.</qt>"
--msgstr "<qt>電子郵件地址 <b>%1</b> 已經加入您的通訊錄中。您可以開啟通訊錄並新增其資訊。</qt>"
-+"<qt>The email address <b>%1</b> was added to your addressbook; you can add "
-+"more information to this entry by opening the addressbook.</qt>"
-+msgstr ""
-+"<qt>電子郵件地址 <b>%1</b> 已經加入您的通訊錄中。您可以開啟通訊錄並新增其資"
-+"訊。</qt>"
- 
- #: kaddrbook.cpp:157
- msgid "<qt>The email address <b>%1</b> is already in your addressbook.</qt>"
-@@ -595,15 +603,18 @@
- 
- #: kaddrbook.cpp:188
- msgid ""
--"The VCard was added to your addressbook; you can add more information to this "
--"entry by opening the addressbook."
-+"The VCard was added to your addressbook; you can add more information to "
-+"this entry by opening the addressbook."
- msgstr "VCard 已經加入您的通訊錄中。您可以開啟通訊錄並新增其資訊。"
- 
- #: kaddrbook.cpp:195
- msgid ""
--"The VCard's primary email address is already in your addressbook; however, you "
--"may save the VCard into a file and import it into the addressbook manually."
--msgstr "VCard 的主要電子郵件已經在您的通訊錄中了。然而，您還是可以將 VCard 存到檔案中，並手動匯入通訊錄中。"
-+"The VCard's primary email address is already in your addressbook; however, "
-+"you may save the VCard into a file and import it into the addressbook "
-+"manually."
-+msgstr ""
-+"VCard 的主要電子郵件已經在您的通訊錄中了。然而，您還是可以將 VCard 存到檔案"
-+"中，並手動匯入通訊錄中。"
- 
- #: kcmdesignerfields.cpp:77 kcmdesignerfields.cpp:78 kcmdesignerfields.cpp:83
- msgid "Text"
-@@ -657,7 +668,9 @@
- msgid ""
- "<qt><b>Warning:</b> Qt Designer could not be found. It is probably not "
- "installed. You will only be able to import existing designer files.</qt>"
--msgstr "<qt><b>警告：</b>找不到 Qt Designer。有可能尚未安裝。您目前只能匯入已存在的 designer 檔案。</qt>"
-+msgstr ""
-+"<qt><b>警告：</b>找不到 Qt Designer。有可能尚未安裝。您目前只能匯入已存在的 "
-+"designer 檔案。</qt>"
- 
- #: kcmdesignerfields.cpp:280
- msgid "Available Pages"
-@@ -669,38 +682,30 @@
- 
- #: kcmdesignerfields.cpp:299
- msgid ""
--"<qt>"
--"<p>This section allows you to add your own GUI  Elements ('<i>Widgets</i>"
--"') to store your own values into %1. Proceed as described below:</p>"
--"<ol>"
--"<li>Click on '<i>Edit with Qt Designer</i>'"
--"<li>In the dialog, select '<i>Widget</i>', then click <i>OK</i>"
--"<li>Add your widgets to the form"
--"<li>Save the file in the directory proposed by Qt Designer"
--"<li>Close Qt Designer</ol>"
--"<p>In case you already have a designer file (*.ui) located somewhere on your "
--"hard disk, simply choose '<i>Import Page</i>'</p>"
--"<p><b>Important:</b> The name of each input widget you place within the form "
--"must start with '<i>X_</i>'; so if you want the widget to correspond to your "
--"custom entry '<i>X-Foo</i>', set the widget's <i>name</i> property to '<i>"
--"X_Foo</i>'.</p>"
--"<p><b>Important:</b> The widget will edit custom fields with an application "
--"name of %2.  To change the application name to be edited, set the widget name "
--"in Qt Designer.</p></qt>"
--msgstr ""
--"<qt> "
--"<p>這裡讓您加入您自己的 GUI 元素（<i>Widgets</i>），儲存您自己的值到 %1。以如下的方式進行：</p> "
--"<ol> "
--"<li>按下「以 Qt Designer 編輯」</li> "
--"<li>在對話框中，選擇「元件」(Widget)，並按下「確定」。</li> "
--"<li>在設計板(form)中新增您自己的元件。</li> "
--"<li>將檔案儲存到 Qt Designer 建議的目錄中。</li> "
--"<li>關閉 Qt Designer。</li></ol> "
--"<p>如果您已經有了 designer 檔案 (*.ui)，您可以選擇「匯入設計頁」。</p> "
--"<p><b>重要：</b>每一個您放進設計板中的元件的名稱，都必須以 <i>X_</i> 開頭。所以如果您要讓這個元件與您自定的項目 <i>X-Foo</i> "
--"相關聯，您應該將此元件的「名稱」(name) 屬性設為 <i>X_Foo</i>。</p> "
--"<p><b>重要：</b>元件會依應用程式名稱 %2 編輯自定欄位。如果要變更編輯的應用程式名稱，請在 Qt Designer 中設定元件的名稱。</p>"
--"</qt>"
-+"<qt><p>This section allows you to add your own GUI  Elements ('<i>Widgets</"
-+"i>') to store your own values into %1. Proceed as described below:</"
-+"p><ol><li>Click on '<i>Edit with Qt Designer</i>'<li>In the dialog, select "
-+"'<i>Widget</i>', then click <i>OK</i><li>Add your widgets to the "
-+"form<li>Save the file in the directory proposed by Qt Designer<li>Close Qt "
-+"Designer</ol><p>In case you already have a designer file (*.ui) located "
-+"somewhere on your hard disk, simply choose '<i>Import Page</i>'</"
-+"p><p><b>Important:</b> The name of each input widget you place within the "
-+"form must start with '<i>X_</i>'; so if you want the widget to correspond to "
-+"your custom entry '<i>X-Foo</i>', set the widget's <i>name</i> property to "
-+"'<i>X_Foo</i>'.</p><p><b>Important:</b> The widget will edit custom fields "
-+"with an application name of %2.  To change the application name to be "
-+"edited, set the widget name in Qt Designer.</p></qt>"
-+msgstr ""
-+"<qt> <p>這裡讓您加入您自己的 GUI 元素（<i>Widgets</i>），儲存您自己的值到 %"
-+"1。以如下的方式進行：</p> <ol> <li>按下「以 Qt Designer 編輯」</li> <li>在對"
-+"話框中，選擇「元件」(Widget)，並按下「確定」。</li> <li>在設計板(form)中新增"
-+"您自己的元件。</li> <li>將檔案儲存到 Qt Designer 建議的目錄中。</li> <li>關"
-+"閉 Qt Designer。</li></ol> <p>如果您已經有了 designer 檔案 (*.ui)，您可以選擇"
-+"「匯入設計頁」。</p> <p><b>重要：</b>每一個您放進設計板中的元件的名稱，都必須"
-+"以 <i>X_</i> 開頭。所以如果您要讓這個元件與您自定的項目 <i>X-Foo</i> 相關聯，"
-+"您應該將此元件的「名稱」(name) 屬性設為 <i>X_Foo</i>。</p> <p><b>重要：</b>元"
-+"件會依應用程式名稱 %2 編輯自定欄位。如果要變更編輯的應用程式名稱，請在 Qt "
-+"Designer 中設定元件的名稱。</p></qt>"
- 
- #: kcmdesignerfields.cpp:321
- msgid "<a href=\"whatsthis:%1\">How does this work?</a>"
-@@ -712,11 +717,11 @@
- 
- #: kcmdesignerfields.cpp:332
- msgid "Import Page..."
--msgstr "匯入設計頁..."
-+msgstr "匯入設計頁…"
- 
- #: kcmdesignerfields.cpp:334
- msgid "Edit with Qt Designer..."
--msgstr "以 Qt Designer 編輯..."
-+msgstr "以 Qt Designer 編輯…"
- 
- #: kcmdesignerfields.cpp:362
- msgid "Key:"
-@@ -777,9 +782,10 @@
- #: kconfigwizard.cpp:166
- msgid ""
- "Please make sure that the programs which are configured by the wizard do not "
--"run in parallel to the wizard; otherwise, changes done by the wizard could be "
--"lost."
--msgstr "請確定此精靈所設定的應用程式沒有同時在執行。否則，所做的變更可能會遺失。"
-+"run in parallel to the wizard; otherwise, changes done by the wizard could "
-+"be lost."
-+msgstr ""
-+"請確定此精靈所設定的應用程式沒有同時在執行。否則，所做的變更可能會遺失。"
- 
- #: kconfigwizard.cpp:169
- msgid "Run Wizard Now"
-@@ -1018,7 +1024,7 @@
- 
- #: kimportdialog.cpp:227
- msgid "Assign with Template..."
--msgstr "以樣本分配..."
-+msgstr "以樣本分配…"
- 
- #: kimportdialog.cpp:231
- msgid "Save Current Template"
-@@ -1062,13 +1068,13 @@
- 
- #: kincidencechooser.cpp:56
- msgid ""
--"<qt>A conflict was detected. This probably means someone edited the same entry "
--"on the server while you changed it locally."
--"<br/>NOTE: You have to check mail again to apply your changes to the "
--"server.</qt>"
-+"<qt>A conflict was detected. This probably means someone edited the same "
-+"entry on the server while you changed it locally.<br/>NOTE: You have to "
-+"check mail again to apply your changes to the server.</qt>"
- msgstr ""
--"<qt>偵測到衝突。這有可能是當您在本地端改變此項目時，某人在伺服器上編輯了同樣的項目。<br /> "
--"注意：您必須再檢查郵件一次，以便將您的改變套用到伺服器上。</qt>"
-+"<qt>偵測到衝突。這有可能是當您在本地端改變此項目時，某人在伺服器上編輯了同樣"
-+"的項目。<br /> 注意：您必須再檢查郵件一次，以便將您的改變套用到伺服器上。</"
-+"qt>"
- 
- #: kincidencechooser.cpp:63
- msgid "Take Local"
-@@ -1162,7 +1168,7 @@
- 
- #: kincidencechooser.cpp:254 kincidencechooser.cpp:256
- msgid "Show details..."
--msgstr "顯示詳情..."
-+msgstr "顯示詳情…"
- 
- #: kincidencechooser.cpp:268
- msgid "Differences of %1 and %2"
-@@ -1203,7 +1209,7 @@
- 
- #: kprefsdialog.cpp:234
- msgid "Choose..."
--msgstr "選擇..."
-+msgstr "選擇…"
- 
- #: kprefsdialog.cpp:738
- msgid "Preferences"
-@@ -1226,16 +1232,10 @@
- #: kscoring.cpp:106
- msgid ""
- "Article\n"
--"<b>%1</b>"
--"<br><b>%2</b>"
--"<br>caused the following note to appear:"
--"<br>%3"
-+"<b>%1</b><br><b>%2</b><br>caused the following note to appear:<br>%3"
- msgstr ""
- "文章\n"
--"<b>%1</b>"
--"<br> <b>%2</b>"
--"<br> 讓以下的註解出現："
--"<br> %3"
-+"<b>%1</b><br> <b>%2</b><br> 讓以下的註解出現：<br> %3"
- 
- #: kscoring.cpp:172
- msgid "Adjust Score"
-@@ -1320,7 +1320,7 @@
- 
- #: kscoringeditor.cpp:89
- msgid "Edit..."
--msgstr "編輯..."
-+msgstr "編輯…"
- 
- #: kscoringeditor.cpp:224
- msgid "Select an action."
-@@ -1434,7 +1434,7 @@
- 
- #: ksubscription.cpp:246
- msgid "Loading..."
--msgstr "載入中..."
-+msgstr "載入中…"
- 
- #: ksubscription.cpp:247
- msgid "Current changes:"
-@@ -1460,7 +1460,7 @@
- msgid ""
- "_n: Loading... (1 matching)\n"
- "Loading... (%n matching)"
--msgstr "載入中...（%n 符合）"
-+msgstr "載入中…（%n 符合）"
- 
- #: ksubscription.cpp:777
- msgid ""
-@@ -1598,7 +1598,7 @@
- 
- #: maillistdrag.cpp:236
- msgid "Retrieving and storing messages..."
--msgstr "取得並儲存信件..."
-+msgstr "取得並儲存信件…"
- 
- #: pluginloaderbase.cpp:96
- msgid "Unnamed plugin"
-@@ -1614,7 +1614,7 @@
- 
- #: progressmanager.cpp:96
- msgid "Aborting..."
--msgstr "取消中..."
-+msgstr "取消中…"
- 
- #. i18n: file addresspicker.ui line 36
- #: rc.cpp:9 rc.cpp:36
-@@ -1668,7 +1668,7 @@
- #: rc.cpp:39
- #, no-c-format
- msgid "Save as &Distribution List..."
--msgstr "儲存成分派清單(&D)..."
-+msgstr "儲存成分派清單(&D)…"
- 
- #. i18n: file addresspicker.ui line 303
- #: rc.cpp:42
-@@ -1692,7 +1692,7 @@
- #: rc.cpp:54
- #, no-c-format
- msgid "A&dd"
--msgstr "增加 (&D)"
-+msgstr "增加(&D)"
- 
- #. i18n: file categoryselectdialog_base.ui line 63
- #: rc.cpp:66
-@@ -1704,7 +1704,7 @@
- #: rc.cpp:69
- #, no-c-format
- msgid "&Edit Categories..."
--msgstr "編輯分類 (&E)..."
-+msgstr "編輯分類(&E)…"
- 
- #. i18n: file pimemoticons.kcfg line 8
- #: rc.cpp:72
-diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdepim/libkholidays.po kde-i18n-zh_TW-3.5.10/messages/kdepim/libkholidays.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdepim/libkholidays.po	2006-07-22 10:04:31.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdepim/libkholidays.po	2011-11-11 15:45:17.000000000 +0100
-@@ -6,8 +6,7 @@
- "Project-Id-Version: libkholidays\n"
- "POT-Creation-Date: 2005-02-19 01:28+0100\n"
- "PO-Revision-Date: 2006-03-02 17:08+0800\n"
--"Last-Translator: Frank Weng (a.k.a. Franklin) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Traditional Chinese <zh_l10n@linux.org.tw>\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/kdepim/libkleopatra.po kde-i18n-zh_TW-3.5.10/messages/kdepim/libkleopatra.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdepim/libkleopatra.po	2008-08-19 20:43:18.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdepim/libkleopatra.po	2011-11-11 15:45:17.000000000 +0100
-@@ -9,7 +9,7 @@
- "Project-Id-Version: libkleopatra\n"
- "POT-Creation-Date: 2008-08-19 01:19+0200\n"
- "PO-Revision-Date: 2008-07-14 13:40+0800\n"
--"Last-Translator: Franklin Weng <franklin at goodhorse dot idv dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Chinese Traditional <zh-l10n@linux.org.tw>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
-@@ -132,17 +132,19 @@
- msgid ""
- "<qt>\n"
- "<h1>X.500 Directory Services</h1>\n"
--"You can use X.500 directory services to retrieve certificates and certificate "
--"revocation lists that are not saved locally. Ask your local administrator if "
--"you want to make use of this feature and are unsure which directory service you "
--"can use.\n"
-+"You can use X.500 directory services to retrieve certificates and "
-+"certificate revocation lists that are not saved locally. Ask your local "
-+"administrator if you want to make use of this feature and are unsure which "
-+"directory service you can use.\n"
- "<p>\n"
--"If you do not use a directory service, you can still use local certificates.\n"
-+"If you do not use a directory service, you can still use local "
-+"certificates.\n"
- "</qt>"
- msgstr ""
- "<qt>\n"
- "<h1>X.500 目錄服務</h1>\n"
--"您可以使用 X.500 目錄服務，來取得本地端沒有儲存的憑證及作廢憑證清單。如果您要使用此功能，但不確定有哪些目錄服務可以使用，請詢問您的管理員。\n"
-+"您可以使用 X.500 目錄服務，來取得本地端沒有儲存的憑證及作廢憑證清單。如果您要"
-+"使用此功能，但不確定有哪些目錄服務可以使用，請詢問您的管理員。\n"
- "<p>\n"
- "如果您沒有使用目錄服務，您還是可以使用本地端的憑證。</qt>"
- 
-@@ -150,7 +152,7 @@
- #: rc.cpp:62
- #, no-c-format
- msgid "&Add Service..."
--msgstr "新增服務(&A)..."
-+msgstr "新增服務(&A)…"
- 
- #. i18n: file ui/directoryserviceswidgetbase.ui line 205
- #: rc.cpp:65
-@@ -164,14 +166,15 @@
- msgid ""
- "<qt>\n"
- "<h1>Add a Directory Service</h1>\n"
--"By clicking this button, you can select a new directory service to be used for "
--"retrieving certificates and CRLs. You will be asked for the server name and an "
--"optional description.\n"
-+"By clicking this button, you can select a new directory service to be used "
-+"for retrieving certificates and CRLs. You will be asked for the server name "
-+"and an optional description.\n"
- "</qt>"
- msgstr ""
- "<qt>\n"
- "<h1>新增目錄服務</h1>\n"
--"按下此按鍵，您可以選擇新的目錄服務，以取得憑證與作廢憑證清單（CRL）。您必須輸入伺服器名稱。</qt>"
-+"按下此按鍵，您可以選擇新的目錄服務，以取得憑證與作廢憑證清單（CRL）。您必須輸"
-+"入伺服器名稱。</qt>"
- 
- #. i18n: file ui/directoryserviceswidgetbase.ui line 239
- #: rc.cpp:74
-@@ -358,8 +361,8 @@
- 
- #: ui/backendconfigwidget.cpp:153
- msgid ""
--"_: Items in Kleo::BackendConfigWidget listview (1: protocol; 2: implementation "
--"name)\n"
-+"_: Items in Kleo::BackendConfigWidget listview (1: protocol; 2: "
-+"implementation name)\n"
- "%1 (%2)"
- msgstr "%1 (%2)"
- 
-@@ -369,7 +372,7 @@
- 
- #: ui/backendconfigwidget.cpp:223
- msgid "Confi&gure..."
--msgstr "設定(&G)..."
-+msgstr "設定(&G)…"
- 
- #: ui/backendconfigwidget.cpp:230
- msgid "Rescan"
-@@ -389,7 +392,7 @@
- 
- #: ui/cryptoconfigmodule.cpp:577
- msgid "Edit..."
--msgstr "編輯..."
-+msgstr "編輯…"
- 
- #: ui/cryptoconfigmodule.cpp:609
- msgid "Configure LDAP Servers"
-@@ -496,7 +499,7 @@
- 
- #: ui/keyrequester.cpp:126
- msgid "Change..."
--msgstr "變更..."
-+msgstr "變更…"
- 
- #: ui/keyrequester.cpp:218 ui/keyselectiondialog.cpp:216
- msgid "<unknown>"
-@@ -505,9 +508,8 @@
- #: backends/qgpgme/qgpgmekeylistjob.cpp:180 ui/keyrequester.cpp:231
- #: ui/keyselectiondialog.cpp:520
- msgid ""
--"<qt>"
--"<p>An error occurred while fetching the keys from the backend:</p>"
--"<p><b>%1</b></p></qt>"
-+"<qt><p>An error occurred while fetching the keys from the backend:</p><p><b>%"
-+"1</b></p></qt>"
- msgstr "<qt><p>從後端介面 <b>%1</b> 抓取金鑰時發生錯誤。</p></qt>"
- 
- #: ui/keyrequester.cpp:236 ui/keyrequester.cpp:265 ui/keyrequester.cpp:289
-@@ -603,10 +605,10 @@
- 
- #: ui/keyselectiondialog.cpp:378
- msgid ""
--"<qt>"
--"<p>If you check this box your choice will be stored and you will not be asked "
--"again.</p></qt>"
--msgstr "<qt><p>如果勾選此選項，您的選擇會被儲存起來，並且不會再詢問您。</p></qt>"
-+"<qt><p>If you check this box your choice will be stored and you will not be "
-+"asked again.</p></qt>"
-+msgstr ""
-+"<qt><p>如果勾選此選項，您的選擇會被儲存起來，並且不會再詢問您。</p></qt>"
- 
- #: ui/keyselectiondialog.cpp:394
- msgid "&Reread Keys"
-@@ -630,20 +632,21 @@
- 
- #: ui/keyselectiondialog.cpp:558
- msgid "Checking selected keys..."
--msgstr "檢查所選擇的金鑰中..."
-+msgstr "檢查所選擇的金鑰中…"
- 
- #: ui/keyselectiondialog.cpp:558
- msgid "Fetching keys..."
--msgstr "抓取金鑰中..."
-+msgstr "抓取金鑰中…"
- 
- #: ui/keyselectiondialog.cpp:584
- #, c-format
- msgid ""
--"_n: <qt>One backend returned truncated output."
--"<br>Not all available keys are shown</qt>\n"
--"<qt>%n backends returned truncated output."
--"<br>Not all available keys are shown</qt>"
--msgstr "<qt>%n 個後端介面傳回的輸出被截斷了。<br> 所列出的金鑰並非所有的金鑰。</qt>"
-+"_n: <qt>One backend returned truncated output.<br>Not all available keys are "
-+"shown</qt>\n"
-+"<qt>%n backends returned truncated output.<br>Not all available keys are "
-+"shown</qt>"
-+msgstr ""
-+"<qt>%n 個後端介面傳回的輸出被截斷了。<br> 所列出的金鑰並非所有的金鑰。</qt>"
- 
- #: ui/keyselectiondialog.cpp:587
- msgid "Key List Result"
-@@ -655,7 +658,7 @@
- 
- #: ui/messagebox.cpp:60
- msgid "&Save to Disk..."
--msgstr "儲存到磁碟(&S)..."
-+msgstr "儲存到磁碟(&S)…"
- 
- #: ui/messagebox.cpp:64
- msgid "&Copy to Clipboard"
-@@ -800,7 +803,7 @@
- 
- #: backends/chiasmus/obtainkeysjob.cpp:99
- msgid "Scanning directory %1..."
--msgstr "掃描目錄 %1 中..."
-+msgstr "掃描目錄 %1 中…"
- 
- #: backends/kpgp/kpgpbackendbase.cpp:66
- msgid "Kpgp/gpg"
-@@ -871,20 +874,21 @@
- 
- #: backends/qgpgme/qgpgmejob.cpp:277
- msgid ""
--"You need a passphrase to unlock the secret key for user:"
--"<br/> %1 (retry)"
--msgstr "您需要密碼片語以解除使用者的秘密金鑰：<br /> %1（重試）"
-+"You need a passphrase to unlock the secret key for user:<br/> %1 (retry)"
-+msgstr "您需要密碼片語以解除使用者的祕密金鑰：<br /> %1（重試）"
- 
- #: backends/qgpgme/qgpgmejob.cpp:278
- #, c-format
- msgid "You need a passphrase to unlock the secret key for user:<br/> %1"
--msgstr "您需要密碼片語以解除使用者的秘密金鑰：<br /> %1"
-+msgstr "您需要密碼片語以解除使用者的祕密金鑰：<br /> %1"
- 
- #: backends/qgpgme/qgpgmejob.cpp:281
- msgid ""
- "This dialog will reappear every time the passphrase is needed. For a more "
- "secure solution that also allows caching the passphrase, use gpg-agent."
--msgstr "這個對話框將在每次需要密碼片語時出現。如果您希望將密碼片語暫時儲存起來，請使用 gpg-agent。"
-+msgstr ""
-+"這個對話框將在每次需要密碼片語時出現。如果您希望將密碼片語暫時儲存起來，請使"
-+"用 gpg-agent。"
- 
- #: backends/qgpgme/qgpgmejob.cpp:284
- msgid "gpg-agent was found in %1, but does not appear to be running."
-@@ -909,27 +913,29 @@
- 
- #: backends/qgpgme/qgpgmeprogresstokenmapper.cpp:54
- msgid "Generating DSA key..."
--msgstr "產生 DSA 金鑰中..."
-+msgstr "產生 DSA 金鑰中…"
- 
- #: backends/qgpgme/qgpgmeprogresstokenmapper.cpp:58
- msgid "Generating ElGamal key..."
--msgstr "產生 ElGamal 金鑰中..."
-+msgstr "產生 ElGamal 金鑰中…"
- 
- #: backends/qgpgme/qgpgmeprogresstokenmapper.cpp:63
- msgid "Searching for a large prime number..."
--msgstr "搜尋大的質數中..."
-+msgstr "搜尋大的質數中…"
- 
- #: backends/qgpgme/qgpgmeprogresstokenmapper.cpp:67
- msgid ""
- "Waiting for new entropy from random number generator (you might want to "
- "exercise the harddisks or move the mouse)..."
--msgstr "正等待從亂數產生器中產生新的熵數中（您可以讓硬碟讀寫一下或動一動滑鼠）..."
-+msgstr ""
-+"正等待從亂數產生器中產生新的熵數中（您可以讓硬碟讀寫一下或動一動滑鼠）..."
- 
- #: backends/qgpgme/qgpgmeprogresstokenmapper.cpp:71
- msgid "Please wait..."
--msgstr "請稍候..."
-+msgstr "請稍候…"
- 
- #: backends/qgpgme/qgpgmeprogresstokenmapper.cpp:75
- msgid ""
--"Starting gpg-agent (you should consider starting a global instance instead)..."
--msgstr "gpg-agent 啟動中（您應該考慮啟動全域的實體）..."
-+"Starting gpg-agent (you should consider starting a global instance "
-+"instead)..."
-+msgstr "gpg-agent 啟動中（您應該考慮啟動全域的實體）…"
-diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdepim/libkmime.po kde-i18n-zh_TW-3.5.10/messages/kdepim/libkmime.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdepim/libkmime.po	2008-08-19 20:43:18.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdepim/libkmime.po	2011-11-11 15:45:17.000000000 +0100
-@@ -6,8 +6,7 @@
- "Project-Id-Version: libkmime\n"
- "POT-Creation-Date: 2008-04-25 05:30+0200\n"
- "PO-Revision-Date: 2006-03-02 17:12+0800\n"
--"Last-Translator: Frank Weng (a.k.a. Franklin) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Traditional Chinese <zh_l10n@linux.org.tw>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
-@@ -18,20 +17,26 @@
- msgid ""
- "The message sent on ${date} to ${to} with subject \"${subject}\" has been "
- "displayed. This is no guarantee that the message has been read or understood."
--msgstr "在 ${date} 送至 ${to} 主旨為 ${subject} 的信件已經被顯示了。但是不保證這封信已經被讀取。"
-+msgstr ""
-+"在 ${date} 送至 ${to} 主旨為 ${subject} 的信件已經被顯示了。但是不保證這封信"
-+"已經被讀取。"
- 
- #: kmime_mdn.cpp:58
- msgid ""
- "The message sent on ${date} to ${to} with subject \"${subject}\" has been "
--"deleted unseen. This is no guarantee that the message will not be \"undeleted\" "
--"and nonetheless read later on."
--msgstr "在 ${date} 送至 ${to} 主旨為 ${subject} 的信件在未被開啟的情況下被刪除了。不保證這封信會被救回來再閱讀。"
-+"deleted unseen. This is no guarantee that the message will not be \"undeleted"
-+"\" and nonetheless read later on."
-+msgstr ""
-+"在 ${date} 送至 ${to} 主旨為 ${subject} 的信件在未被開啟的情況下被刪除了。不"
-+"保證這封信會被救回來再閱讀。"
- 
- #: kmime_mdn.cpp:63
- msgid ""
- "The message sent on ${date} to ${to} with subject \"${subject}\" has been "
- "dispatched. This is no guarantee that the message will not be read later on."
--msgstr "在 ${date} 送至 ${to} 主旨為 ${subject} 的信件已經被轉送了。但是不保證這封信已經被讀取。"
-+msgstr ""
-+"在 ${date} 送至 ${to} 主旨為 ${subject} 的信件已經被轉送了。但是不保證這封信"
-+"已經被讀取。"
- 
- #: kmime_mdn.cpp:67
- msgid ""
-@@ -41,16 +46,21 @@
- 
- #: kmime_mdn.cpp:70
- msgid ""
--"The message sent on ${date} to ${to} with subject \"${subject}\" has been acted "
--"upon. The sender does not wish to disclose more details to you than that."
--msgstr "在 ${date} 送至 ${to} 主旨為 ${subject} 的信件已經被處理了。寄件者不希望透露更多細節給您。"
-+"The message sent on ${date} to ${to} with subject \"${subject}\" has been "
-+"acted upon. The sender does not wish to disclose more details to you than "
-+"that."
-+msgstr ""
-+"在 ${date} 送至 ${to} 主旨為 ${subject} 的信件已經被處理了。寄件者不希望透露"
-+"更多細節給您。"
- 
- #: kmime_mdn.cpp:74
- msgid ""
- "Generation of a Message Disposition Notification for the message sent on "
- "${date} to ${to} with subject \"${subject}\" failed. Reason is given in the "
- "Failure: header field below."
--msgstr "產生在 ${date} 送至 ${to} 主旨為 ${subject} 的信件通知失敗。失敗的理由在底下的「Failure」欄位中。"
-+msgstr ""
-+"產生在 ${date} 送至 ${to} 主旨為 ${subject} 的信件通知失敗。失敗的理由在底下"
-+"的「Failure」欄位中。"
- 
- #: kmime_util.cpp:665
- msgid "unknown"
-diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdepim/libkpgp.po kde-i18n-zh_TW-3.5.10/messages/kdepim/libkpgp.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdepim/libkpgp.po	2006-07-22 10:04:31.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdepim/libkpgp.po	2011-11-11 15:45:17.000000000 +0100
-@@ -6,8 +6,7 @@
- "Project-Id-Version: libkpgp\n"
- "POT-Creation-Date: 2006-05-29 04:02+0200\n"
- "PO-Revision-Date: 2006-06-15 08:15+0800\n"
--"Last-Translator: Frank Weng (a.k.a. Franklin) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Traditional Chinese <zh_l10n@linux.org.tw>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
-@@ -77,8 +76,8 @@
- msgid ""
- "_: %1 = 'bad keys' error message\n"
- "%1\n"
--"Do you want to encrypt anyway, leave the message as-is, or cancel sending the "
--"message?"
-+"Do you want to encrypt anyway, leave the message as-is, or cancel sending "
-+"the message?"
- msgstr ""
- "%1\n"
- "您要繼續做加密的動作，還是不加密，還是取消不發送此信件了？"
-@@ -129,21 +128,25 @@
- 
- #: kpgp.cpp:584
- msgid ""
--"You did not select an encryption key for any of the recipients of this message; "
--"therefore, the message will not be encrypted."
-+"You did not select an encryption key for any of the recipients of this "
-+"message; therefore, the message will not be encrypted."
- msgstr "您沒有對此信件的任一收件者選擇加密金鑰，因此此信件將不會被加密。"
- 
- #: kpgp.cpp:600
- msgid ""
- "You did not select an encryption key for one of the recipients; this person "
- "will not be able to decrypt the message if you encrypt it."
--msgstr "您沒有對此信件的其中一位收件者選擇加密金鑰，因此如果您加密此信件的話，這位收件者可能無法解密。"
-+msgstr ""
-+"您沒有對此信件的其中一位收件者選擇加密金鑰，因此如果您加密此信件的話，這位收"
-+"件者可能無法解密。"
- 
- #: kpgp.cpp:603
- msgid ""
- "You did not select encryption keys for some of the recipients; these persons "
- "will not be able to decrypt the message if you encrypt it."
--msgstr "您沒有對此信件的其中幾位收件者選擇加密金鑰，因此如果您加密此信件的話，這幾位收件者可能無法解密。"
-+msgstr ""
-+"您沒有對此信件的其中幾位收件者選擇加密金鑰，因此如果您加密此信件的話，這幾位"
-+"收件者可能無法解密。"
- 
- #: kpgp.cpp:877
- msgid ""
-@@ -240,9 +243,9 @@
- 
- #: kpgpbase2.cpp:205
- msgid ""
--"Signing failed: please check your PGP User Identity, the PGP setup, and the key "
--"rings."
--msgstr "簽署失敗。請檢查您的 PGP 使用者身份，PGP 設定，及金鑰環。"
-+"Signing failed: please check your PGP User Identity, the PGP setup, and the "
-+"key rings."
-+msgstr "簽署失敗。請檢查您的 PGP 使用者身分，PGP 設定，及金鑰環。"
- 
- #: kpgpbase2.cpp:213
- msgid "Encryption failed: please check your PGP setup and the key rings."
-@@ -258,7 +261,7 @@
- 
- #: kpgpbase2.cpp:310 kpgpbase5.cpp:238 kpgpbaseG.cpp:278
- msgid "You do not have the secret key needed to decrypt this message."
--msgstr "您沒有解密此信件使用的秘密金鑰。"
-+msgstr "您沒有解密此信件使用的祕密金鑰。"
- 
- #: kpgpbase2.cpp:450
- msgid ""
-@@ -282,8 +285,8 @@
- 
- #: kpgpbase5.cpp:154
- msgid ""
--"The key(s) you want to encrypt your message to are not trusted. No encryption "
--"done."
-+"The key(s) you want to encrypt your message to are not trusted. No "
-+"encryption done."
- msgstr "您要用來加密信件的金鑰未被信任。將不做加密。"
- 
- #: kpgpbase5.cpp:157
-@@ -311,7 +314,7 @@
- 
- #: kpgpbase6.cpp:95
- msgid "You do not have the secret key for this message."
--msgstr "您沒有此信件使用的秘密金鑰。"
-+msgstr "您沒有此信件使用的祕密金鑰。"
- 
- #: kpgpbase6.cpp:172
- msgid "??? (file ~/.pgp/pubring.pkr not found)"
-@@ -327,7 +330,7 @@
- 
- #: kpgpbaseG.cpp:190
- msgid "Signing failed because your secret key is unusable."
--msgstr "簽署失敗，因為您的秘密金鑰無法使用。"
-+msgstr "簽署失敗，因為您的祕密金鑰無法使用。"
- 
- #: kpgpbaseG.cpp:221
- msgid "Error running gpg"
-@@ -351,7 +354,9 @@
- msgid ""
- "Please check if encryption really works before you start using it seriously. "
- "Also note that attachments are not encrypted by the PGP/GPG module."
--msgstr "在開始使用前，請認真檢查加密是否能運作。另外也請注意，附加檔並不會被 PGP/GPG 模組加密。"
-+msgstr ""
-+"在開始使用前，請認真檢查加密是否能運作。另外也請注意，附加檔並不會被 PGP/GPG "
-+"模組加密。"
- 
- #: kpgpui.cpp:134
- msgid "Encryption Tool"
-@@ -391,22 +396,23 @@
- 
- #: kpgpui.cpp:161
- msgid ""
--"<qt>"
--"<p>When this option is enabled, the passphrase of your private key will be "
--"remembered by the application as long as the application is running. Thus you "
--"will only have to enter the passphrase once.</p>"
--"<p>Be aware that this could be a security risk. If you leave your computer, "
--"others can use it to send signed messages and/or read your encrypted messages. "
--"If a core dump occurs, the contents of your RAM will be saved onto disk, "
--"including your passphrase.</p>"
--"<p>Note that when using KMail, this setting only applies if you are not using "
--"gpg-agent. It is also ignored if you are using crypto plugins.</p></qt>"
--msgstr ""
--"<qt>"
--"<p>開啟此選項的話，您私密金鑰使用的密碼片語被記憶起來，直到應用程式不再執行。這樣您只需要輸入一次密碼片語即可。</p> "
--"<p>但是要注意，這樣做有安全性上的風險。如果您離開您的電腦，其他人可能可以用您的電腦與您的金鑰來簽署與發送信件，或是用您的金鑰來解密並偷看別人的信件。如果程式"
--"出現錯誤而造成 core dumped，則記憶體內容會被記到檔案中，包括您的密碼片語在內。</p> "
--"<p>如果您是使用 KMail，這個設定只在您不使用 GPG 代理人時才有用。如果您使用加密外掛程式，這個設定也會被忽略。</p></qt>"
-+"<qt><p>When this option is enabled, the passphrase of your private key will "
-+"be remembered by the application as long as the application is running. Thus "
-+"you will only have to enter the passphrase once.</p><p>Be aware that this "
-+"could be a security risk. If you leave your computer, others can use it to "
-+"send signed messages and/or read your encrypted messages. If a core dump "
-+"occurs, the contents of your RAM will be saved onto disk, including your "
-+"passphrase.</p><p>Note that when using KMail, this setting only applies if "
-+"you are not using gpg-agent. It is also ignored if you are using crypto "
-+"plugins.</p></qt>"
-+msgstr ""
-+"<qt><p>開啟此選項的話，您私密金鑰使用的密碼片語被記憶起來，直到應用程式不再執"
-+"行。這樣您只需要輸入一次密碼片語即可。</p> <p>但是要注意，這樣做有安全性上的"
-+"風險。如果您離開您的電腦，其他人可能可以用您的電腦與您的金鑰來簽署與發送信"
-+"件，或是用您的金鑰來解密並偷看別人的信件。如果程式出現錯誤而造成 core "
-+"dumped，則記憶體內容會被記到檔案中，包括您的密碼片語在內。</p> <p>如果您是使"
-+"用 KMail，這個設定只在您不使用 GPG 代理人時才有用。如果您使用加密外掛程式，這"
-+"個設定也會被忽略。</p></qt>"
- 
- #: kpgpui.cpp:174
- msgid "Always encr&ypt to self"
-@@ -414,15 +420,13 @@
- 
- #: kpgpui.cpp:179
- msgid ""
--"<qt>"
--"<p>When this option is enabled, the message/file will not only be encrypted "
--"with the receiver's public key, but also with your key. This will enable you to "
--"decrypt the message/file at a later time. This is generally a good idea.</p>"
--"</qt>"
--msgstr ""
--"<qt>"
--"<p>開啟此選項的話，信件或檔案不只使用收件人的公開金鑰加密，另外也會用您自己的金鑰加密。您自己稍後可以去解密此信件或檔案。通常這會是個好主意。</p>"
--"</qt>"
-+"<qt><p>When this option is enabled, the message/file will not only be "
-+"encrypted with the receiver's public key, but also with your key. This will "
-+"enable you to decrypt the message/file at a later time. This is generally a "
-+"good idea.</p></qt>"
-+msgstr ""
-+"<qt><p>開啟此選項的話，信件或檔案不只使用收件人的公開金鑰加密，另外也會用您自"
-+"己的金鑰加密。您自己稍後可以去解密此信件或檔案。通常這會是個好主意。</p></qt>"
- 
- #: kpgpui.cpp:188
- msgid "&Show signed/encrypted text after composing"
-@@ -430,15 +434,14 @@
- 
- #: kpgpui.cpp:194
- msgid ""
--"<qt>"
--"<p>When this option is enabled, the signed/encrypted text will be shown in a "
--"separate window, enabling you to know how it will look before it is sent. This "
--"is a good idea when you are verifying that your encryption system works.</p>"
--"</qt>"
--msgstr ""
--"<qt>"
--"<p>開啟此選項的話，您在寫信時會另外有一個視窗，顯示加密過或簽署過後的內容，讓您在發送前知道加密過或簽署過後是長什麼樣子。通常如果您要確認您的加密系統可以運作"
--"，就可以選擇此選項。</p></qt>"
-+"<qt><p>When this option is enabled, the signed/encrypted text will be shown "
-+"in a separate window, enabling you to know how it will look before it is "
-+"sent. This is a good idea when you are verifying that your encryption system "
-+"works.</p></qt>"
-+msgstr ""
-+"<qt><p>開啟此選項的話，您在寫信時會另外有一個視窗，顯示加密過或簽署過後的內"
-+"容，讓您在發送前知道加密過或簽署過後是長什麼樣子。通常如果您要確認您的加密系"
-+"統可以運作，就可以選擇此選項。</p></qt>"
- 
- #: kpgpui.cpp:200
- msgid "Always show the encryption keys &for approval"
-@@ -446,15 +449,15 @@
- 
- #: kpgpui.cpp:205
- msgid ""
--"<qt>"
--"<p>When this option is enabled, the application will always show you a list of "
--"public keys from which you can choose the one it will use for encryption. If it "
--"is off, the application will only show the dialog if it cannot find the right "
--"key or if there are several which could be used. </p></qt>"
--msgstr ""
--"<qt>"
--"<p>開啟此選項的話，應用程式會顯示一個公開金鑰的清單，您可以從中選擇一個金鑰用於加密。如果不開啟此選項，則應用程式只會在找不到正確的金鑰，或是有多個金鑰需要選"
--"擇時才會顯示視窗。</p></qt>"
-+"<qt><p>When this option is enabled, the application will always show you a "
-+"list of public keys from which you can choose the one it will use for "
-+"encryption. If it is off, the application will only show the dialog if it "
-+"cannot find the right key or if there are several which could be used. </p></"
-+"qt>"
-+msgstr ""
-+"<qt><p>開啟此選項的話，應用程式會顯示一個公開金鑰的清單，您可以從中選擇一個金"
-+"鑰用於加密。如果不開啟此選項，則應用程式只會在找不到正確的金鑰，或是有多個金"
-+"鑰需要選擇時才會顯示視窗。</p></qt>"
- 
- #: kpgpui.cpp:327
- msgid "&Search for:"
-@@ -474,9 +477,8 @@
- 
- #: kpgpui.cpp:354
- msgid ""
--"<qt>"
--"<p>If you check this box your choice will be stored and you will not be asked "
--"again.</p></qt>"
-+"<qt><p>If you check this box your choice will be stored and you will not be "
-+"asked again.</p></qt>"
- msgstr "<qt><p>如果您開啟此選項，您的選擇會被記起來，不會再被詢問。</P></qt>"
- 
- #: kpgpui.cpp:391
-@@ -530,7 +532,7 @@
- 
- #: kpgpui.cpp:531
- msgid "Secret key available"
--msgstr "可用的秘密金鑰"
-+msgstr "可用的祕密金鑰"
- 
- #: kpgpui.cpp:534
- msgid "Sign only key"
-@@ -558,11 +560,11 @@
- 
- #: kpgpui.cpp:1005
- msgid "Checking key 0xMMMMMMMM..."
--msgstr "檢查金鑰 0xMMMMMMMM..."
-+msgstr "檢查金鑰 0xMMMMMMMM…"
- 
- #: kpgpui.cpp:1016
- msgid "Checking key 0x%1..."
--msgstr "檢查金鑰 0x%1..."
-+msgstr "檢查金鑰 0x%1…"
- 
- #: kpgpui.cpp:1040
- msgid "Recheck Key"
-@@ -578,7 +580,7 @@
- 
- #: kpgpui.cpp:1185 kpgpui.cpp:1378 kpgpui.cpp:1435
- msgid "Change..."
--msgstr "變更..."
-+msgstr "變更…"
- 
- #: kpgpui.cpp:1315
- msgid "Encryption Key Approval"
-diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdepim/libkpimexchange.po kde-i18n-zh_TW-3.5.10/messages/kdepim/libkpimexchange.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdepim/libkpimexchange.po	2006-07-22 10:04:31.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdepim/libkpimexchange.po	2011-11-11 15:45:17.000000000 +0100
-@@ -6,8 +6,7 @@
- "Project-Id-Version: libkpimexchange\n"
- "POT-Creation-Date: 2004-10-12 01:18+0200\n"
- "PO-Revision-Date: 2006-03-02 17:14+0800\n"
--"Last-Translator: Frank Weng (a.k.a. Franklin) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Traditional Chinese <zh_l10n@linux.org.tw>\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/kdepim/libksieve.po kde-i18n-zh_TW-3.5.10/messages/kdepim/libksieve.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdepim/libksieve.po	2006-07-22 10:04:30.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdepim/libksieve.po	2011-11-11 15:45:17.000000000 +0100
-@@ -6,8 +6,7 @@
- "Project-Id-Version: libksieve\n"
- "POT-Creation-Date: 2004-10-12 01:17+0200\n"
- "PO-Revision-Date: 2006-03-03 09:47+0800\n"
--"Last-Translator: Frank Weng (a.k.a. Franklin) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Traditional Chinese <zh_l10n@linux.org.tw>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
-@@ -39,7 +38,7 @@
- msgid ""
- "Parse error: Only whitespace and #comments may follow \"text:\" on the same "
- "line"
--msgstr "剖析錯誤：只有空白與 # 註解之後能有 \"text:\"，且必須在同一行中。"
-+msgstr "剖析錯誤：只有空白與 # 註解之後能有 \"text:\"，且必須在同一列中。"
- 
- #: shared/error.cpp:132
- msgid "Parse error: Number out of Range (must be smaller than %1)"
-@@ -140,11 +139,11 @@
- 
- #: shared/error.cpp:209
- msgid "Site Policy Limit Violation: Test nesting too deep (max. %1)"
--msgstr "違反站台限制政策：巢狀測試層數過深（最多 %1 層）"
-+msgstr "違反站臺限制政策：巢狀測試層數過深（最多 %1 層）"
- 
- #: shared/error.cpp:212
- msgid "Site Policy Limit Violation: Block nesting too deep (max. %1)"
--msgstr "違反站台限制政策：巢狀區塊層數過深（最多 %1 層）"
-+msgstr "違反站臺限制政策：巢狀區塊層數過深（最多 %1 層）"
- 
- #: shared/error.cpp:215
- msgid "Invalid Argument \"%1\" to \"%2\""
-@@ -172,7 +171,7 @@
- 
- #: shared/error.cpp:235
- msgid "Site Policy Limit Violation: Too many Actions requested (max. %1)"
--msgstr "違反站台限制政策：請求太多動作（最多 %1 個）"
-+msgstr "違反站臺限制政策：請求太多動作（最多 %1 個）"
- 
- #: shared/error.cpp:238
- msgid "Unknown error"
-diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdepim/scalixadmin.po kde-i18n-zh_TW-3.5.10/messages/kdepim/scalixadmin.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdepim/scalixadmin.po	2008-02-13 10:55:33.000000000 +0100
-+++ kde-i18n-zh_TW-3.5.10/messages/kdepim/scalixadmin.po	2011-11-11 15:45:17.000000000 +0100
-@@ -6,7 +6,7 @@
- "Project-Id-Version: scalixadmin\n"
- "POT-Creation-Date: 2008-01-26 01:19+0100\n"
- "PO-Revision-Date: 2008-02-04 12:49+0800\n"
--"Last-Translator: Franklin Weng <franklin@mail.everfocus.com.tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team:  <zh@li.org>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
-@@ -31,15 +31,15 @@
- 
- #: delegatedialog.cpp:48
- msgid "..."
--msgstr "..."
-+msgstr "…"
- 
- #: delegatepage.cpp:45
- msgid "Add Delegate..."
--msgstr "新增代理人..."
-+msgstr "新增代理人…"
- 
- #: delegatepage.cpp:48
- msgid "Edit Delegate..."
--msgstr "編輯代理人..."
-+msgstr "編輯代理人…"
- 
- #: delegatepage.cpp:52
- msgid "Remove Delegate"
-@@ -111,7 +111,7 @@
- 
- #: mainwindow.cpp:49
- msgid "Out of Office..."
--msgstr "不在辦公室..."
-+msgstr "不在辦公室…"
- 
- #: mainwindow.cpp:49
- msgid "Setup Out of Office Message"
-@@ -127,7 +127,7 @@
- 
- #: otheruserpage.cpp:48
- msgid "Add Account..."
--msgstr "新增帳號..."
-+msgstr "新增帳號…"
- 
- #: otheruserpage.cpp:51
- msgid "Remove Account"
-@@ -135,7 +135,7 @@
- 
- #: otheruserpage.cpp:143
- msgid "Updating account..."
--msgstr "更新帳號中..."
-+msgstr "更新帳號中…"
- 
- #: otheruserpage.cpp:155
- msgid "Unable to start KMail to trigger account update with Scalix server"
-diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdesdk/cervisia.po kde-i18n-zh_TW-3.5.10/messages/kdesdk/cervisia.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdesdk/cervisia.po	2008-02-13 10:55:29.000000000 +0100
-+++ kde-i18n-zh_TW-3.5.10/messages/kdesdk/cervisia.po	2011-11-11 15:45:17.000000000 +0100
-@@ -8,7 +8,7 @@
- "Project-Id-Version: cervisia\n"
- "POT-Creation-Date: 2007-09-24 01:15+0200\n"
- "PO-Revision-Date: 2007-10-03 10:46+0800\n"
--"Last-Translator: Chih-Wei Huang <cwhuang@linux.org.tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Chinese Traditional <zh-l10n@linux.org.tw>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
-@@ -123,7 +123,7 @@
- 
- #: cervisiapart.cpp:235
- msgid "O&pen Sandbox..."
--msgstr "開啟沙箱(&P)..."
-+msgstr "開啟沙箱(&P)…"
- 
- #: cervisiapart.cpp:238
- msgid "Opens a CVS working folder in the main window"
-@@ -135,7 +135,7 @@
- 
- #: cervisiapart.cpp:246
- msgid "&Insert ChangeLog Entry..."
--msgstr "插入 ChangeLog 項目(&I)..."
-+msgstr "插入 ChangeLog 項目(&I)…"
- 
- #: cervisiapart.cpp:249
- msgid "Inserts a new intro into the file ChangeLog in the toplevel folder"
-@@ -159,7 +159,7 @@
- 
- #: cervisiapart.cpp:274
- msgid "Reso&lve..."
--msgstr "解決衝突(&L)..."
-+msgstr "解決衝突(&L)…"
- 
- #: cervisiapart.cpp:277
- msgid "Opens the resolve dialog with the selected file"
-@@ -167,7 +167,7 @@
- 
- #: cervisiapart.cpp:281
- msgid "&Commit..."
--msgstr "提交(&C)..."
-+msgstr "提交(&C)…"
- 
- #: cervisiapart.cpp:284
- msgid "Commits the selected files"
-@@ -175,7 +175,7 @@
- 
- #: cervisiapart.cpp:288
- msgid "&Add to Repository..."
--msgstr "新增到主目錄(&A)..."
-+msgstr "新增到主目錄(&A)…"
- 
- #: cervisiapart.cpp:291
- msgid "Adds (cvs add) the selected files to the repository"
-@@ -183,7 +183,7 @@
- 
- #: cervisiapart.cpp:295
- msgid "Add &Binary..."
--msgstr "新增二進位檔(&B)..."
-+msgstr "新增二進位檔(&B)…"
- 
- #: cervisiapart.cpp:298
- msgid "Adds (cvs -kb add) the selected files as binaries to the repository"
-@@ -191,7 +191,7 @@
- 
- #: cervisiapart.cpp:302
- msgid "&Remove From Repository..."
--msgstr "從主目錄中移除(&R)..."
-+msgstr "從主目錄中移除(&R)…"
- 
- #: cervisiapart.cpp:305
- msgid "Removes (cvs remove) the selected files from the repository"
-@@ -215,7 +215,7 @@
- 
- #: cervisiapart.cpp:333
- msgid "Browse &Log..."
--msgstr "瀏覽紀錄檔(&L)..."
-+msgstr "瀏覽紀錄檔(&L)…"
- 
- #: cervisiapart.cpp:336
- msgid "Shows the revision tree of the selected file"
-@@ -223,19 +223,19 @@
- 
- #: cervisiapart.cpp:341
- msgid "Browse Multi-File Log..."
--msgstr "瀏覽多重檔案紀錄..."
-+msgstr "瀏覽多重檔案紀錄…"
- 
- #: cervisiapart.cpp:345
- msgid "&Annotate..."
--msgstr "最後狀態註記(&A)..."
-+msgstr "最後狀態註記(&A)…"
- 
- #: cervisiapart.cpp:348
- msgid "Shows a blame-annotated view of the selected file"
--msgstr "顯示所選取檔案，每一行最後狀態的註記"
-+msgstr "顯示所選取檔案，每一列最後狀態的註記"
- 
- #: cervisiapart.cpp:352
- msgid "&Difference to Repository (BASE)..."
--msgstr "與主目錄比較（BASE）(&D)..."
-+msgstr "與主目錄比較（BASE）(&D)…"
- 
- #: cervisiapart.cpp:355
- msgid ""
-@@ -245,7 +245,7 @@
- 
- #: cervisiapart.cpp:359
- msgid "Difference to Repository (HEAD)..."
--msgstr "與主目錄比較（HEAD）(&D)..."
-+msgstr "與主目錄比較（HEAD）(&D)…"
- 
- #: cervisiapart.cpp:362
- msgid ""
-@@ -255,7 +255,7 @@
- 
- #: cervisiapart.cpp:366
- msgid "Last &Change..."
--msgstr "最後變更(&C)..."
-+msgstr "最後變更(&C)…"
- 
- #: cervisiapart.cpp:369
- msgid ""
-@@ -264,7 +264,7 @@
- 
- #: cervisiapart.cpp:373
- msgid "&History..."
--msgstr "歷史紀錄(&H)..."
-+msgstr "歷史紀錄(&H)…"
- 
- #: cervisiapart.cpp:376
- msgid "Shows the CVS history as reported by the server"
-@@ -288,7 +288,7 @@
- 
- #: cervisiapart.cpp:398
- msgid "&Tag/Branch..."
--msgstr "標籤/分支(&T)..."
-+msgstr "標籤/分支(&T)…"
- 
- #: cervisiapart.cpp:401
- msgid "Creates a tag or branch for the selected files"
-@@ -296,7 +296,7 @@
- 
- #: cervisiapart.cpp:405
- msgid "&Delete Tag..."
--msgstr "刪除標籤(&D)..."
-+msgstr "刪除標籤(&D)…"
- 
- #: cervisiapart.cpp:408
- msgid "Deletes a tag from the selected files"
-@@ -304,7 +304,7 @@
- 
- #: cervisiapart.cpp:412
- msgid "&Update to Tag/Date..."
--msgstr "更新到標籤/日期(&U)..."
-+msgstr "更新到標籤/日期(&U)…"
- 
- #: cervisiapart.cpp:415
- msgid "Updates the selected files to a given tag, branch or date"
-@@ -320,7 +320,7 @@
- 
- #: cervisiapart.cpp:426
- msgid "&Merge..."
--msgstr "合併(&M)..."
-+msgstr "合併(&M)…"
- 
- #: cervisiapart.cpp:429
- msgid "Merges a branch or a set of modifications into the selected files"
-@@ -328,7 +328,7 @@
- 
- #: cervisiapart.cpp:433
- msgid "&Add Watch..."
--msgstr "新增監控(&A)..."
-+msgstr "新增監控(&A)…"
- 
- #: cervisiapart.cpp:436
- msgid "Adds a watch for the selected files"
-@@ -336,7 +336,7 @@
- 
- #: cervisiapart.cpp:440
- msgid "&Remove Watch..."
--msgstr "移除監控(&R)..."
-+msgstr "移除監控(&R)…"
- 
- #: cervisiapart.cpp:443
- msgid "Removes a watch from the selected files"
-@@ -392,7 +392,7 @@
- 
- #: cervisiapart.cpp:489
- msgid "Create &Patch Against Repository..."
--msgstr "建立修補檔(&P)..."
-+msgstr "建立修補檔(&P)…"
- 
- #: cervisiapart.cpp:492
- msgid "Creates a patch from the modifications in your sandbox"
-@@ -400,11 +400,11 @@
- 
- #: cervisiapart.cpp:499
- msgid "&Create..."
--msgstr "建立(&C)..."
-+msgstr "建立(&C)…"
- 
- #: cervisiapart.cpp:503
- msgid "&Checkout..."
--msgstr "取出(&C)..."
-+msgstr "取出(&C)…"
- 
- #: cervisiapart.cpp:506
- msgid "Allows you to checkout a module from a repository"
-@@ -412,7 +412,7 @@
- 
- #: cervisiapart.cpp:510
- msgid "&Import..."
--msgstr "匯入(&I)..."
-+msgstr "匯入(&I)…"
- 
- #: cervisiapart.cpp:513
- msgid "Allows you to import a module into a repository"
-@@ -420,7 +420,7 @@
- 
- #: cervisiapart.cpp:517
- msgid "&Repositories..."
--msgstr "主目錄(&R)..."
-+msgstr "主目錄(&R)…"
- 
- #: cervisiapart.cpp:520
- msgid "Configures a list of repositories you regularly use"
-@@ -528,7 +528,7 @@
- 
- #: cervisiapart.cpp:603
- msgid "Configure Cervisia..."
--msgstr "設定 Cervisia..."
-+msgstr "設定 Cervisia…"
- 
- #: cervisiapart.cpp:606
- msgid "Allows you to configure the Cervisia KPart"
-@@ -1105,7 +1105,7 @@
- 
- #: logdlg.cpp:199
- msgid "Create Patch..."
--msgstr "建立修補檔..."
-+msgstr "建立修補檔…"
- 
- #: logdlg.cpp:236
- #, c-format
-@@ -1264,7 +1264,7 @@
- 
- #: patchoptiondlg.cpp:49
- msgid "&Number of context lines:"
--msgstr "內容行數(&N)："
-+msgstr "內容列數(&N)："
- 
- #: patchoptiondlg.cpp:59
- msgid "Ignore Options"
-@@ -1287,22 +1287,16 @@
- msgstr "忽略大小寫的改變"
- 
- #: protocolview.cpp:127
--msgid ""
--"[Exited with status %1]\n"
--msgstr ""
--"【離開狀態 %1】\n"
-+msgid "[Exited with status %1]\n"
-+msgstr "【離開狀態 %1】\n"
- 
- #: protocolview.cpp:129
--msgid ""
--"[Finished]\n"
--msgstr ""
--"【已完成】\n"
-+msgid "[Finished]\n"
-+msgstr "【已完成】\n"
- 
- #: protocolview.cpp:132
--msgid ""
--"[Aborted]\n"
--msgstr ""
--"【已中止】\n"
-+msgid "[Aborted]\n"
-+msgstr "【已中止】\n"
- 
- #. i18n: file cervisiaui.rc line 42
- #: rc.cpp:21 rc.cpp:69
-@@ -1338,7 +1332,8 @@
- #: rc.cpp:45
- #, no-c-format
- msgid ""
--"The foreground color used to highlight files with a conflict in the file view."
-+"The foreground color used to highlight files with a conflict in the file "
-+"view."
- msgstr "在檔案檢視時，顯示有衝突檔案的前景顏色。"
- 
- #. i18n: file cervisiapart.kcfg line 33
-@@ -1381,15 +1376,15 @@
- 
- #: repositorydlg.cpp:182
- msgid "&Add..."
--msgstr "新增(&A)..."
-+msgstr "新增(&A)…"
- 
- #: repositorydlg.cpp:183
- msgid "&Modify..."
--msgstr "修改(&M)..."
-+msgstr "修改(&M)…"
- 
- #: repositorydlg.cpp:186
- msgid "Login..."
--msgstr "登入..."
-+msgstr "登入…"
- 
- #: repositorydlg.cpp:187
- msgid "Logout"
-@@ -1450,7 +1445,7 @@
- 
- #: settingsdlg.cpp:268
- msgid "&Number of context lines in diff dialog:"
--msgstr "比較對話框中內容行數(&N)："
-+msgstr "比較對話框中內容列數(&N)："
- 
- #: settingsdlg.cpp:273
- msgid "Additional &options for cvs diff:"
-@@ -1482,19 +1477,19 @@
- 
- #: settingsdlg.cpp:335
- msgid "Font for &Protocol Window..."
--msgstr "協定視窗的字型(&P)..."
-+msgstr "協定視窗的字型(&P)…"
- 
- #: settingsdlg.cpp:337
- msgid "Font for A&nnotate View..."
--msgstr "最後狀態註記檢視的字型(&N)..."
-+msgstr "最後狀態註記檢視的字型(&N)…"
- 
- #: settingsdlg.cpp:339
- msgid "Font for D&iff View..."
--msgstr "比較檢視的字型(&I)..."
-+msgstr "比較檢視的字型(&I)…"
- 
- #: settingsdlg.cpp:341
- msgid "Font for ChangeLog View..."
--msgstr "ChangeLog 檢視的字型..."
-+msgstr "ChangeLog 檢視的字型…"
- 
- #: settingsdlg.cpp:345
- msgid "Colors"
-@@ -1558,8 +1553,8 @@
- 
- #: tagdlg.cpp:125
- msgid ""
--"Tag must start with a letter and may contain letters, digits and the characters "
--"'-' and '_'."
-+"Tag must start with a letter and may contain letters, digits and the "
-+"characters '-' and '_'."
- msgstr "標籤必須以字母開頭，並且只能包含字母、數字、字元 '-' 及字元 '_'。"
- 
- #: updatedlg.cpp:38
-diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdesdk/cvsservice.po kde-i18n-zh_TW-3.5.10/messages/kdesdk/cvsservice.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdesdk/cvsservice.po	2006-07-22 10:04:18.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdesdk/cvsservice.po	2011-11-11 15:45:17.000000000 +0100
-@@ -6,8 +6,7 @@
- "Project-Id-Version: cvsservice\n"
- "POT-Creation-Date: 2005-05-18 21:25+0200\n"
- "PO-Revision-Date: 2006-01-24 14:40+0800\n"
--"Last-Translator: Frank Weng (a.k.a. Franklin) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Traditional Chinese <zh_l10n@linux.org.tw>\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/kdesdk/kbabel.po kde-i18n-zh_TW-3.5.10/messages/kdesdk/kbabel.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdesdk/kbabel.po	2008-08-19 20:43:14.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdesdk/kbabel.po	2011-11-11 15:45:17.000000000 +0100
-@@ -7,7 +7,7 @@
- "Project-Id-Version: kbabel\n"
- "POT-Creation-Date: 2008-07-08 01:21+0200\n"
- "PO-Revision-Date: 2007-11-09 14:52+0800\n"
--"Last-Translator: Chih-Wei Huang <cwhuang@linux.org.tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Chinese Traditional <zh-l10n@linux.org.tw>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
-@@ -59,25 +59,21 @@
- 
- #: catalogmanager/catalogmanagerview.cpp:183
- msgid ""
--"<qt>"
--"<p><b>Log window</b></p>\n"
-+"<qt><p><b>Log window</b></p>\n"
- "<p>In this window the output of the executed commands are shown.</p></qt>"
- msgstr "<qt><p><b>記錄視窗</b></p><p>本視窗顯示執行命令的輸出結果。</p></qt>"
- 
- #: catalogmanager/catalogmanagerview.cpp:194
- msgid ""
--"<qt>"
--"<p><b>Catalog Manager</b></p>\n"
-+"<qt><p><b>Catalog Manager</b></p>\n"
- "<p>The Catalog Manager merges two folders into one tree and displays all\n"
- "PO and POT files in these folders. This way you can easily see if a\n"
- "template has been added or removed. Also some information about the files\n"
--"is displayed.</p>"
--"<p>For more information see section <b>The Catalog Manager</b> "
--"in the online help.</p></qt>"
--msgstr ""
--"<qt> "
--"<p><b>目錄管理員</b></p>"
--"<p>目錄管理員會將 PO 與 POT 檔的目錄合併在一個樹狀顯示圖裡。這樣您可以很方便地看到樣本檔案 (templates) 有沒有被翻譯並加入 PO "
-+"is displayed.</p><p>For more information see section <b>The Catalog Manager</"
-+"b> in the online help.</p></qt>"
-+msgstr ""
-+"<qt> <p><b>目錄管理員</b></p><p>目錄管理員會將 PO 與 POT 檔的目錄合併在一個樹"
-+"狀顯示圖裡。這樣您可以很方便地看到樣本檔案 (templates) 有沒有被翻譯並加入 PO "
- "檔的目錄中，並且也會顯示這些檔案的一些狀態。</p>"
- 
- #: catalogmanager/catalogmanagerview.cpp:448
-@@ -131,71 +127,52 @@
- msgid ""
- "The Catalog Manager is still updating information about the files.\n"
- "If you continue, it will try to update all necessary files, however this can "
--"take a long time and may lead to wrong results. Please wait until all files are "
--"updated."
-+"take a long time and may lead to wrong results. Please wait until all files "
-+"are updated."
- msgstr ""
- "目錄管理員仍然在更新檔案的資訊中。\n"
--"如果您繼續，它會試著更新所有需要的檔案，但是可能會花很長的時間，而且可能結果會有問題。請先稍候等到所有的檔案都更新完成。"
-+"如果您繼續，它會試著更新所有需要的檔案，但是可能會花很長的時間，而且可能結果"
-+"會有問題。請先稍候等到所有的檔案都更新完成。"
- 
- #: catalogmanager/catalogmanagerview.cpp:769
--msgid ""
--"Statistics for all:\n"
--msgstr ""
--"全部統計：\n"
-+msgid "Statistics for all:\n"
-+msgstr "全部統計：\n"
- 
- #: catalogmanager/catalogmanagerview.cpp:771
--msgid ""
--"Statistics for %1:\n"
--msgstr ""
--"統計 %1：\n"
-+msgid "Statistics for %1:\n"
-+msgstr "統計 %1：\n"
- 
- #: catalogmanager/catalogmanagerview.cpp:773
--msgid ""
--"Number of packages: %1\n"
--msgstr ""
--"套件數：%1\n"
-+msgid "Number of packages: %1\n"
-+msgstr "套件數：%1\n"
- 
- #: catalogmanager/catalogmanagerview.cpp:776
--msgid ""
--"Complete translated: %1 % (%2)\n"
--msgstr ""
--"翻譯完成：%1 % (%2)\n"
-+msgid "Complete translated: %1 % (%2)\n"
-+msgstr "翻譯完成：%1 % (%2)\n"
- 
- #: catalogmanager/catalogmanagerview.cpp:779
--msgid ""
--"Only template available: %1 % (%2)\n"
--msgstr ""
--"只有樣本的：%1 % (%2)\n"
-+msgid "Only template available: %1 % (%2)\n"
-+msgstr "只有樣本的：%1 % (%2)\n"
- 
- #: catalogmanager/catalogmanagerview.cpp:781
--msgid ""
--"Only PO file available: %1 % (%2)\n"
--msgstr ""
--"只有 PO 檔的：%1 % (%2)\n"
-+msgid "Only PO file available: %1 % (%2)\n"
-+msgstr "只有 PO 檔的：%1 % (%2)\n"
- 
- #: catalogmanager/catalogmanagerview.cpp:783
--msgid ""
--"Number of messages: %1\n"
--msgstr ""
--"訊息數：%1\n"
-+msgid "Number of messages: %1\n"
-+msgstr "訊息數：%1\n"
- 
- #: catalogmanager/catalogmanagerview.cpp:787
--msgid ""
--"Translated: %1 % (%2)\n"
--msgstr ""
--"已翻譯：%1 % (%2)\n"
-+msgid "Translated: %1 % (%2)\n"
-+msgstr "已翻譯：%1 % (%2)\n"
- 
- #: catalogmanager/catalogmanagerview.cpp:790
--msgid ""
--"Fuzzy: %1 % (%2)\n"
--msgstr ""
--"模糊翻譯：%1 % (%2)\n"
-+msgid "Fuzzy: %1 % (%2)\n"
-+msgstr "模糊翻譯：%1 % (%2)\n"
- 
- #: catalogmanager/catalogmanagerview.cpp:793
--msgid ""
--"Untranslated: %1 % (%2)\n"
--msgstr ""
--"未翻譯：%1 % (%2)\n"
-+msgid "Untranslated: %1 % (%2)\n"
-+msgstr "未翻譯：%1 % (%2)\n"
- 
- #. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 790
- #: catalogmanager/catalogmanagerview.cpp:795 rc.cpp:1001 rc.cpp:1206
-@@ -428,7 +405,8 @@
- 
- #: catalogmanager/main.cpp:195 kbabel/main.cpp:566
- msgid ""
--"Wrote documentation and sent many bug reports and suggestions for improvements."
-+"Wrote documentation and sent many bug reports and suggestions for "
-+"improvements."
- msgstr "撰寫說明文件，並協助除錯及改進建議。"
- 
- #: catalogmanager/main.cpp:198 kbabel/main.cpp:569
-@@ -460,11 +438,11 @@
- 
- #: catalogmanager/main.cpp:214 kbabel/main.cpp:581
- msgid "KBabel contains code from Qt"
--msgstr "KBabel 包含部份 Qt 的源碼。"
-+msgstr "KBabel 包含部份 Qt 的原始碼。"
- 
- #: catalogmanager/main.cpp:216
- msgid "KBabel contains code from GNU gettext"
--msgstr "KBabel 包含部份 GNU gettext 的源碼。"
-+msgstr "KBabel 包含部份 GNU gettext 的原始碼。"
- 
- #: catalogmanager/multiroughtransdlg.cpp:56
- msgid "Files:"
-@@ -747,21 +725,15 @@
- 
- #: catalogmanager/findinfilesdialog.cpp:59
- msgid ""
--"<qt>"
--"<p><b>File Options</b></p>"
--"<p>Here you can finetune where to find:"
--"<ul>"
--"<li><b>In all files</b>: search in all files, otherwise searched is the "
--"selected file or files in the selected folder</li>"
--"<li><b>Ask before next file</b>: show a dialog asking to proceed to the next "
--"file</li></ul></qt>"
--msgstr ""
--"<qt> "
--"<p><b>檔案選項</b></p> "
--"<p>您可以選擇要尋找： "
--"<ul> "
--"<li><b>在所有檔案內</b>：在所有檔案內尋找，否則就尋找所選擇的檔案，或是所選擇資料夾內的所有檔案。</li> "
--"<li><b>進入下一個檔案前先詢問</b>：在進入下一個檔案內尋找前先詢問。</li></ul></qt>"
-+"<qt><p><b>File Options</b></p><p>Here you can finetune where to find:"
-+"<ul><li><b>In all files</b>: search in all files, otherwise searched is the "
-+"selected file or files in the selected folder</li><li><b>Ask before next "
-+"file</b>: show a dialog asking to proceed to the next file</li></ul></qt>"
-+msgstr ""
-+"<qt> <p><b>檔案選項</b></p> <p>您可以選擇要尋找： <ul> <li><b>在所有檔案內</"
-+"b>：在所有檔案內尋找，否則就尋找所選擇的檔案，或是所選擇資料夾內的所有檔案。"
-+"</li> <li><b>進入下一個檔案前先詢問</b>：在進入下一個檔案內尋找前先詢問。</"
-+"li></ul></qt>"
- 
- #. i18n: file ./catalogmanager/catalogmanagerui.rc line 78
- #: catalogmanager/future.cpp:4 rc.cpp:21 rc.cpp:39 rc.cpp:45
-@@ -779,11 +751,11 @@
- 
- #: catalogmanager/future.cpp:10
- msgid "Revert"
--msgstr "回復源碼"
-+msgstr "回復原始碼"
- 
- #: catalogmanager/future.cpp:11
- msgid "Revert for Marked"
--msgstr "回復已標記檔案的源碼"
-+msgstr "回復已標記檔案的原始碼"
- 
- #: catalogmanager/future.cpp:12
- msgid "Cleanup"
-@@ -830,11 +802,11 @@
- 
- #: catalogmanager/catalogmanager.cpp:237
- msgid "Fi&nd in Files..."
--msgstr "在檔案內尋找(&N)..."
-+msgstr "在檔案內尋找(&N)…"
- 
- #: catalogmanager/catalogmanager.cpp:240
- msgid "Re&place in Files..."
--msgstr "置換檔案內容(&P)..."
-+msgstr "置換檔案內容(&P)…"
- 
- #: catalogmanager/catalogmanager.cpp:243 kbabel/kbabel.cpp:674
- msgid "&Stop Searching"
-@@ -862,19 +834,19 @@
- 
- #: catalogmanager/catalogmanager.cpp:267
- msgid "&Load Markings..."
--msgstr "載入檔案標示列表(&L)..."
-+msgstr "載入檔案標示列表(&L)…"
- 
- #: catalogmanager/catalogmanager.cpp:270
- msgid "&Save Markings..."
--msgstr "儲存檔案標示列表(&S)..."
-+msgstr "儲存檔案標示列表(&S)…"
- 
- #: catalogmanager/catalogmanager.cpp:273
- msgid "&Mark Files..."
--msgstr "標示檔案(&M)..."
-+msgstr "標示檔案(&M)…"
- 
- #: catalogmanager/catalogmanager.cpp:275
- msgid "&Unmark Files..."
--msgstr "解除檔案標示(&U)..."
-+msgstr "解除檔案標示(&U)…"
- 
- #: catalogmanager/catalogmanager.cpp:284 kbabel/kbabel.cpp:543
- msgid "Nex&t Untranslated"
-@@ -934,7 +906,7 @@
- 
- #: catalogmanager/catalogmanager.cpp:331 kbabel/kbabel.cpp:594
- msgid "&New..."
--msgstr "新增(&N)..."
-+msgstr "新增(&N)…"
- 
- #: catalogmanager/catalogmanager.cpp:339 kbabel/kbabel.cpp:602
- msgid "C&lose"
-@@ -942,7 +914,7 @@
- 
- #: catalogmanager/catalogmanager.cpp:345 kbabel/kbabel.cpp:607
- msgid "&Configure..."
--msgstr "設定(&C)..."
-+msgstr "設定(&C)…"
- 
- #: catalogmanager/catalogmanager.cpp:350
- msgid "&Statistics"
-@@ -1070,18 +1042,16 @@
- 
- #: catalogmanager/catalogmanager.cpp:558
- msgid ""
--"<qt>"
--"<p><b>Statusbar</b></p>\n"
-+"<qt><p><b>Statusbar</b></p>\n"
- "<p>The statusbar displays information about progress of the current find or "
--"replace operation. The first number in <b>Found:</b> "
--"displays the number of files with an occurrence of the searched text not yet "
--"shown in the KBabel window. The second shows the total number of files "
--"containing the searched text found so far.</p></qt>"
--msgstr ""
--"<qt> "
--"<p><b>狀態列</b></p>"
--"<p>狀態列顯示目前尋找或置換的進度資訊。在<b>已找到：</b>中的第一個數字表示找到搜尋字串而尚未顯示在 KBabel "
--"視窗的檔案數量。第二個數字表示到目前為止找到搜尋字串的檔案總數。</p></qt>"
-+"replace operation. The first number in <b>Found:</b> displays the number of "
-+"files with an occurrence of the searched text not yet shown in the KBabel "
-+"window. The second shows the total number of files containing the searched "
-+"text found so far.</p></qt>"
-+msgstr ""
-+"<qt> <p><b>狀態列</b></p><p>狀態列顯示目前尋找或置換的進度資訊。在<b>已找到："
-+"</b>中的第一個數字表示找到搜尋字串而尚未顯示在 KBabel 視窗的檔案數量。第二個"
-+"數字表示到目前為止找到搜尋字串的檔案總數。</p></qt>"
- 
- #: catalogmanager/catalogmanager.cpp:663 catalogmanager/catalogmanager.cpp:696
- #: catalogmanager/catalogmanager.cpp:727 catalogmanager/catalogmanager.cpp:757
-@@ -1355,15 +1325,12 @@
- 
- #: commonui/roughtransdlg.cpp:108
- msgid ""
--"<qt>"
--"<p><b>What entries to translate</b></p>"
--"<p>Choose here, for which entries of the file KBabel tries to find a "
--"translation. Changed entries are always marked as fuzzy, no matter which option "
--"you choose.</p></qt>"
--msgstr ""
--"<qt> "
--"<p><b>要翻譯哪些項目？</b></p> "
--"<p>選擇您要 KBabel 約略翻譯這個檔案中的哪些項目。不過翻譯的訊息一定會被標示成模糊翻譯，不管您怎麼選。</p></qt>"
-+"<qt><p><b>What entries to translate</b></p><p>Choose here, for which entries "
-+"of the file KBabel tries to find a translation. Changed entries are always "
-+"marked as fuzzy, no matter which option you choose.</p></qt>"
-+msgstr ""
-+"<qt> <p><b>要翻譯哪些項目？</b></p> <p>選擇您要 KBabel 約略翻譯這個檔案中的哪"
-+"些項目。不過翻譯的訊息一定會被標示成模糊翻譯，不管您怎麼選。</p></qt>"
- 
- #: commonui/roughtransdlg.cpp:113
- msgid "How to Translate"
-@@ -1383,16 +1350,14 @@
- 
- #: commonui/roughtransdlg.cpp:126
- msgid ""
--"<qt>"
--"<p><b>How messages get translated</b></p>"
--"<p>Here you can define if a message can only get translated completely, if "
--"similar messages are acceptable or if KBabel is supposed to try translating the "
--"single words of a message if no translation of the complete message or similar "
--"message was found.</p></qt>"
--msgstr ""
--"<qt> "
--"<p><b>要怎麼翻譯？</b></p> "
--"<p>您可以定義一個訊息要做完全翻譯，還是尋找類似的翻譯，抑或是在找不到資訊時，讓 KBabel 針對每一個單字做翻譯。</p></qt>"
-+"<qt><p><b>How messages get translated</b></p><p>Here you can define if a "
-+"message can only get translated completely, if similar messages are "
-+"acceptable or if KBabel is supposed to try translating the single words of a "
-+"message if no translation of the complete message or similar message was "
-+"found.</p></qt>"
-+msgstr ""
-+"<qt> <p><b>要怎麼翻譯？</b></p> <p>您可以定義一個訊息要做完全翻譯，還是尋找類"
-+"似的翻譯，抑或是在找不到資訊時，讓 KBabel 針對每一個單字做翻譯。</p></qt>"
- 
- #: commonui/roughtransdlg.cpp:136
- msgid "&Mark changed entries as fuzzy"
-@@ -1400,17 +1365,16 @@
- 
- #: commonui/roughtransdlg.cpp:139
- msgid ""
--"<qt>"
--"<p><b>Mark changed entries as fuzzy</b></p>"
--"<p>When a translation for a message is found, the entry will be marked <b>"
--"fuzzy</b> by default. This is because the translation is just guessed by KBabel "
--"and you should always check the results carefully. Deactivate this option only "
--"if you know what you are doing.</p></qt>"
--msgstr ""
--"<qt> "
--"<p><b>將翻譯的訊息標示成模糊訊息</b></p> "
--"<p>當找到一個訊息的已翻譯訊息時，它預設會被標示成<b>模糊(fuzzy)</b>訊息。這是因為這些翻譯訊息只是 KBabel "
--"猜測的，而您應該要對這些訊息做進一步的檢查與確認。除非您知道自己在做什麼，否則請不要關掉此選項。</p></qt>"
-+"<qt><p><b>Mark changed entries as fuzzy</b></p><p>When a translation for a "
-+"message is found, the entry will be marked <b>fuzzy</b> by default. This is "
-+"because the translation is just guessed by KBabel and you should always "
-+"check the results carefully. Deactivate this option only if you know what "
-+"you are doing.</p></qt>"
-+msgstr ""
-+"<qt> <p><b>將翻譯的訊息標示成模糊訊息</b></p> <p>當找到一個訊息的已翻譯訊息"
-+"時，它預設會被標示成<b>模糊(fuzzy)</b>訊息。這是因為這些翻譯訊息只是 KBabel "
-+"猜測的，而您應該要對這些訊息做進一步的檢查與確認。除非您知道自己在做什麼，否"
-+"則請不要關掉此選項。</p></qt>"
- 
- #: commonui/roughtransdlg.cpp:150
- msgid "Initialize &KDE-specific entries"
-@@ -1418,16 +1382,14 @@
- 
- #: commonui/roughtransdlg.cpp:153
- msgid ""
--"<qt>"
--"<p><b>Initialize KDE-specific entries</b></p>"
--"<p>Initialize \"Comment=\" and \"Name=\" entries if a translation is not found. "
--"Also, \"NAME OF TRANSLATORS\" and \"EMAIL OF TRANSLATORS\" is filled with "
--"identity settings.</p></qt>"
--msgstr ""
--"<qt> "
--"<p><b>初始化 KDE 相關的項目</b></p> "
--"<p>如果找不到翻譯訊息的話，初始化 Comment= 與 Name= 的項目。並且在 NAME OF TRANSLATORS 與 EMAIL OF "
--"TRANSLATORS 填上適當的個人設定。</p></qt>"
-+"<qt><p><b>Initialize KDE-specific entries</b></p><p>Initialize \"Comment=\" "
-+"and \"Name=\" entries if a translation is not found. Also, \"NAME OF "
-+"TRANSLATORS\" and \"EMAIL OF TRANSLATORS\" is filled with identity settings."
-+"</p></qt>"
-+msgstr ""
-+"<qt> <p><b>初始化 KDE 相關的項目</b></p> <p>如果找不到翻譯訊息的話，初始化 "
-+"Comment= 與 Name= 的項目。並且在 NAME OF TRANSLATORS 與 EMAIL OF TRANSLATORS "
-+"填上適當的個人設定。</p></qt>"
- 
- #: commonui/roughtransdlg.cpp:158
- msgid "Dictionaries"
-@@ -1435,19 +1397,16 @@
- 
- #: commonui/roughtransdlg.cpp:177
- msgid ""
--"<qt>"
--"<p><b>Dictionaries</b></p>"
--"<p>Choose here, which dictionaries have to be used for finding a translation. "
--"If you select more than one dictionary, they are used in the same order as they "
--"are displayed in the list.</p>"
--"<p>The <b>Configure</b> button allows you to temporarily configure selected "
--"dictionary. The original settings will be restored after closing the dialog.</p>"
--"</qt>"
-+"<qt><p><b>Dictionaries</b></p><p>Choose here, which dictionaries have to be "
-+"used for finding a translation. If you select more than one dictionary, they "
-+"are used in the same order as they are displayed in the list.</p><p>The "
-+"<b>Configure</b> button allows you to temporarily configure selected "
-+"dictionary. The original settings will be restored after closing the dialog."
-+"</p></qt>"
- msgstr ""
--"<qt> "
--"<p><b>字典</b></p> "
--"<p>選擇翻譯時要使用哪個字典。如果您選擇一個以上的話，則會依清單的順序來尋找字典。</p> "
--"<p><b>設定</b>鈕可以讓您暫時設定已選擇的字典。原始的設定會在關掉對話框後回復。</p></qt>"
-+"<qt> <p><b>字典</b></p> <p>選擇翻譯時要使用哪個字典。如果您選擇一個以上的話，"
-+"則會依清單的順序來尋找字典。</p> <p><b>設定</b>鈕可以讓您暫時設定已選擇的字"
-+"典。原始的設定會在關掉對話框後回復。</p></qt>"
- 
- #: commonui/roughtransdlg.cpp:186
- msgid "Messages:"
-@@ -1455,15 +1414,14 @@
- 
- #: commonui/roughtransdlg.cpp:744
- msgid ""
--"<qt>"
--"<p>When a translation for a message is found, the entry will be marked <b>"
--"fuzzy</b> by default. This is because the translation is just guessed by KBabel "
--"and you should always check the results carefully. Deactivate this option only "
--"if you know what you are doing.</p></qt>"
--msgstr ""
--"<qt> "
--"<p>當找到一個訊息的翻譯字串時，預設會標示為<b>模糊(fuzzy)</b>訊息。這是因為這些翻譯訊息只是 KBabel "
--"猜測的，而您應該要對這些訊息做進一步的檢查與確認。除非您知道自己在做什麼，否則請不要關掉此選項。</p></qt>"
-+"<qt><p>When a translation for a message is found, the entry will be marked "
-+"<b>fuzzy</b> by default. This is because the translation is just guessed by "
-+"KBabel and you should always check the results carefully. Deactivate this "
-+"option only if you know what you are doing.</p></qt>"
-+msgstr ""
-+"<qt> <p>當找到一個訊息的翻譯字串時，預設會標示為<b>模糊(fuzzy)</b>訊息。這是"
-+"因為這些翻譯訊息只是 KBabel 猜測的，而您應該要對這些訊息做進一步的檢查與確"
-+"認。除非您知道自己在做什麼，否則請不要關掉此選項。</p></qt>"
- 
- #: commonui/projectpref.cpp:70
- msgid ""
-@@ -1563,7 +1521,7 @@
- 
- #: commonui/projectpref.cpp:127
- msgid "Searching for Differences"
--msgstr "搜尋差異中..."
-+msgstr "搜尋差異中…"
- 
- #: commonui/cmdedit.cpp:51
- msgid "Command &Label:"
-@@ -1611,14 +1569,12 @@
- 
- #: commonui/finddialog.cpp:71
- msgid ""
--"<qt>"
--"<p><b>Find text</b></p>"
--"<p>Here you can enter the text you want to search for. If you want to search "
--"for a regular expression, enable <b>Use regular expression</b> below.</p></qt>"
--msgstr ""
--"<qt> "
--"<p><b>尋找文字</b></p> "
--"<p>您可以輸入您要尋找的文字。如果您要用正規表示式來表示，請打開<b>使用正規表示式</b>的選項。</p></qt>"
-+"<qt><p><b>Find text</b></p><p>Here you can enter the text you want to search "
-+"for. If you want to search for a regular expression, enable <b>Use regular "
-+"expression</b> below.</p></qt>"
-+msgstr ""
-+"<qt> <p><b>尋找文字</b></p> <p>您可以輸入您要尋找的文字。如果您要用正規表示式"
-+"來表示，請打開<b>使用正規表示式</b>的選項。</p></qt>"
- 
- #: commonui/finddialog.cpp:82 commonui/finddialog.cpp:536
- msgid "&Replace"
-@@ -1630,15 +1586,14 @@
- 
- #: commonui/finddialog.cpp:92
- msgid ""
--"<qt>"
--"<p><b>Replace text</b></p>"
--"<p>Here you can enter the text you want the found text to get replaced with. "
--"The text is used as is. It is not possible to make a back reference, if you "
--"have searched for a regular expression.</p></qt>"
--msgstr ""
--"<qt> "
--"<p><b>取代文字</b></p> "
--"<p>您可以輸入您要找的文字，以及您希望將它取代為何。注意，如果您用正規表示式來搜尋，就無法做回溯參考(back reference)。</p></qt>"
-+"<qt><p><b>Replace text</b></p><p>Here you can enter the text you want the "
-+"found text to get replaced with. The text is used as is. It is not possible "
-+"to make a back reference, if you have searched for a regular expression.</"
-+"p></qt>"
-+msgstr ""
-+"<qt> <p><b>取代文字</b></p> <p>您可以輸入您要找的文字，以及您希望將它取代為"
-+"何。注意，如果您用正規表示式來搜尋，就無法做回溯參考(back reference)。</p></"
-+"qt>"
- 
- #: commonui/finddialog.cpp:101
- msgid "Find"
-@@ -1666,16 +1621,15 @@
- 
- #: commonui/finddialog.cpp:116
- msgid ""
--"<qt>"
--"<p><b>Where to search</b></p>"
--"<p>Select here in which parts of a catalog entry you want to search.</p></qt>"
-+"<qt><p><b>Where to search</b></p><p>Select here in which parts of a catalog "
-+"entry you want to search.</p></qt>"
- msgstr "<qt><p><b>要搜尋哪裡？</b></p><p>設定您要搜尋檔案的哪一部份。</p></qt>"
- 
- #. i18n: file ./catalogmanager/markpatternwidget.ui line 54
- #: commonui/finddialog.cpp:124 rc.cpp:69
- #, no-c-format
- msgid "C&ase sensitive"
--msgstr "區分大小(&a)"
-+msgstr "區分大小(&A)"
- 
- #: commonui/finddialog.cpp:125
- msgid "O&nly whole words"
-@@ -1705,7 +1659,7 @@
- 
- #: commonui/finddialog.cpp:138 commonui/projectprefwidgets.cpp:708
- msgid "&Edit..."
--msgstr "編輯(&E)..."
-+msgstr "編輯(&E)…"
- 
- #: commonui/finddialog.cpp:146
- msgid "As&k before replacing"
-@@ -1713,58 +1667,44 @@
- 
- #: commonui/finddialog.cpp:149
- msgid ""
--"<qt>"
--"<p><b>Options</b></p>"
--"<p>Here you can finetune replacing:"
--"<ul>"
--"<li><b>Case sensitive</b>: does case of entered text have to be respected?</li>"
--"<li><b>Only whole words</b>: text found must not be part of a longer word</li>"
--"<li><b>From cursor position</b>: start replacing at the part of the document "
--"where the cursor is. Otherwise replacing is started at the beginning or the "
--"end.</li>"
--"<li><b>Find backwards</b>: Should be self-explanatory.</li>"
--"<li><b>Use regular expression</b>: use text entered in field <b>Find</b> "
--"as a regular expression. This option has no effect with the replace text, "
--"especially no back references are possible.</li>"
--"<li><b>Ask before replacing</b>: Enable, if you want to have control about what "
--"is replaced. Otherwise all found text is replaced without asking.</li></ul></p>"
--"</qt>"
--msgstr ""
--"<qt> "
--"<p><b>選項</b></p> "
--"<p>您可以調整取代的選項： "
--"<ul> "
--"<li><b>區分大小寫</b>：要照您所輸入的文字大小寫來搜尋嗎？</li> "
--"<li><b>只找整個字</b>：找到的文字必須完全符合，不能是另一個更長的字中的某一部份。</li>"
--"<li><b>從游標處開始</b>：從游標所在的地方開始尋找。否則會從檔案開頭或結尾開始尋找。</li> "
--"<li><b>往前尋找</b>：這不需解釋吧。</li> "
--"<li><b>使用正規表示式</b>：在搜尋欄位中使用正規表示式來表示您要找的字串樣式。但在取代字串時無法使用。</li> "
--"<li><b>取代前先詢問</b>如果您要在字串被取代前先行確認，那麼請打開此選項。</li></ul></p></qt>"
-+"<qt><p><b>Options</b></p><p>Here you can finetune replacing:<ul><li><b>Case "
-+"sensitive</b>: does case of entered text have to be respected?</"
-+"li><li><b>Only whole words</b>: text found must not be part of a longer "
-+"word</li><li><b>From cursor position</b>: start replacing at the part of the "
-+"document where the cursor is. Otherwise replacing is started at the "
-+"beginning or the end.</li><li><b>Find backwards</b>: Should be self-"
-+"explanatory.</li><li><b>Use regular expression</b>: use text entered in "
-+"field <b>Find</b> as a regular expression. This option has no effect with "
-+"the replace text, especially no back references are possible.</li><li><b>Ask "
-+"before replacing</b>: Enable, if you want to have control about what is "
-+"replaced. Otherwise all found text is replaced without asking.</li></ul></"
-+"p></qt>"
-+msgstr ""
-+"<qt> <p><b>選項</b></p> <p>您可以調整取代的選項： <ul> <li><b>區分大小寫</"
-+"b>：要照您所輸入的文字大小寫來搜尋嗎？</li> <li><b>只找整個字</b>：找到的文字"
-+"必須完全符合，不能是另一個更長的字中的某一部份。</li><li><b>從游標處開始</"
-+"b>：從游標所在的地方開始尋找。否則會從檔案開頭或結尾開始尋找。</li> <li><b>往"
-+"前尋找</b>：這不需解釋吧。</li> <li><b>使用正規表示式</b>：在搜尋欄位中使用正"
-+"規表示式來表示您要找的字串樣式。但在取代字串時無法使用。</li> <li><b>取代前先"
-+"詢問</b>如果您要在字串被取代前先行確認，那麼請打開此選項。</li></ul></p></qt>"
- 
- #: commonui/finddialog.cpp:166
- msgid ""
--"<qt>"
--"<p><b>Options</b></p>"
--"<p>Here you can finetune the search:"
--"<ul>"
--"<li><b>Case sensitive</b>: does case of entered text have to be respected?</li>"
--"<li><b>Only whole words</b>: text found must not be part of a longer word</li>"
--"<li><b>From cursor position</b>: start search at the part of the document, "
--"where the cursor is. Otherwise search is started at the beginning or the "
--"end.</li>"
--"<li><b>Find backwards</b>: Should be self-explanatory.</li>"
--"<li><b>Use regular expression</b>: use entered text as a regular "
-+"<qt><p><b>Options</b></p><p>Here you can finetune the search:<ul><li><b>Case "
-+"sensitive</b>: does case of entered text have to be respected?</"
-+"li><li><b>Only whole words</b>: text found must not be part of a longer "
-+"word</li><li><b>From cursor position</b>: start search at the part of the "
-+"document, where the cursor is. Otherwise search is started at the beginning "
-+"or the end.</li><li><b>Find backwards</b>: Should be self-explanatory.</"
-+"li><li><b>Use regular expression</b>: use entered text as a regular "
- "expression.</li></ul></p></qt>"
- msgstr ""
--"<qt> "
--"<p><b>選項</b></p> "
--"<p>您可以調整搜尋的選項： "
--"<ul> "
--"<li><b>區分大小寫</b>：要照您所輸入的文字大小寫來搜尋嗎？</li> "
--"<li><b>只找整個字</b>：找到的文字必須完全符合，不能是另一個更長的字中的某一部份。</li>"
--"<li><b>從游標處開始</b>：從游標所在的地方開始尋找。否則會從檔案開頭或結尾開始尋找。</li> "
--"<li><b>往前尋找</b>：這不需解釋吧。</li> "
--"<li><b>使用正規表示式</b>：在搜尋欄位中使用正規表示式來表示您要找的字串樣式。但在取代字串時無法使用。</li></ul></p></qt>"
-+"<qt> <p><b>選項</b></p> <p>您可以調整搜尋的選項： <ul> <li><b>區分大小寫</"
-+"b>：要照您所輸入的文字大小寫來搜尋嗎？</li> <li><b>只找整個字</b>：找到的文字"
-+"必須完全符合，不能是另一個更長的字中的某一部份。</li><li><b>從游標處開始</"
-+"b>：從游標所在的地方開始尋找。否則會從檔案開頭或結尾開始尋找。</li> <li><b>往"
-+"前尋找</b>：這不需解釋吧。</li> <li><b>使用正規表示式</b>：在搜尋欄位中使用正"
-+"規表示式來表示您要找的字串樣式。但在取代字串時無法使用。</li></ul></p></qt>"
- 
- #: commonui/finddialog.cpp:536
- msgid "&Goto Next"
-@@ -1796,7 +1736,7 @@
- 
- #: commonui/projectprefwidgets.cpp:143
- msgid "De&scription"
--msgstr "描述 (&S)"
-+msgstr "描述(&S)"
- 
- #: commonui/projectprefwidgets.cpp:149
- msgid "Encoding"
-@@ -1892,7 +1832,7 @@
- 
- #: commonui/projectprefwidgets.cpp:249
- msgid "Update &translator copyright"
--msgstr "更新翻譯者授權聲明 (&T)"
-+msgstr "更新翻譯者授權聲明(&T)"
- 
- #: commonui/projectprefwidgets.cpp:253
- msgid "Free Software Foundation Copyright"
-@@ -1908,20 +1848,19 @@
- 
- #: commonui/projectprefwidgets.cpp:259
- msgid "Do &not change"
--msgstr "不改變 (&N)"
-+msgstr "不改變(&N)"
- 
- #: commonui/projectprefwidgets.cpp:263
- msgid "Cop&yright"
--msgstr "版權所有 (&Y)"
-+msgstr "版權所有(&Y)"
- 
- #: commonui/projectprefwidgets.cpp:266
- msgid ""
--"<qt>"
--"<p><b>Update Header</b></p>\n"
--"<p>Check this button to update the header information of the file every time it "
--"is saved.</p>\n"
--"<p>The header normally keeps information about the date and time the file was "
--"last\n"
-+"<qt><p><b>Update Header</b></p>\n"
-+"<p>Check this button to update the header information of the file every time "
-+"it is saved.</p>\n"
-+"<p>The header normally keeps information about the date and time the file "
-+"was last\n"
- "updated, the last translator etc.</p>\n"
- "<p>You can choose which information you want to update from the checkboxes "
- "below.\n"
-@@ -1930,112 +1869,98 @@
- "manually by choosing\n"
- "<b>Edit->Edit Header</b> in the editor window.</p></qt>"
- msgstr ""
--"<qt>更新標頭</b></p>"
--"<p>開啟這個選項的話，每次儲存時都會去更新標頭。</p>"
--"<p>您可以選擇您要更新哪些資訊。如果該標頭不存在的話，會將它附加上去。如果您要在標頭中加上額外的欄位，您可以在編輯視窗中用<b>編輯 - 編輯標頭</b>"
--"來手動編輯標頭。</p></qt>"
-+"<qt>更新標頭</b></p><p>開啟這個選項的話，每次儲存時都會去更新標頭。</p><p>您"
-+"可以選擇您要更新哪些資訊。如果該標頭不存在的話，會將它附加上去。如果您要在標"
-+"頭中加上額外的欄位，您可以在編輯視窗中用<b>編輯 - 編輯標頭</b>來手動編輯標"
-+"頭。</p></qt>"
- 
- #: commonui/projectprefwidgets.cpp:278
- msgid ""
--"<qt>"
--"<p><b>Fields to update</b></p>\n"
-+"<qt><p><b>Fields to update</b></p>\n"
- "<p>Choose which fields in the header you want to have updated when saving.\n"
- "If a field does not exist, it is appended to the header.</p>\n"
- "<p>If you want to add other information to the header, you have to edit the "
- "header manually\n"
- "by choosing <b>Edit->Edit Header</b> in the editor window.</p>\n"
--"<p>Deactivate <b>Update Header</b> above if you do not want to have the header\n"
-+"<p>Deactivate <b>Update Header</b> above if you do not want to have the "
-+"header\n"
- "updated when saving.</p></qt>"
- msgstr ""
--"<qt> "
--"<p><b>要更新的欄位</b></p>"
--"<p>請選擇您在儲存時要更新的標頭欄位。如果該欄位不存在，它會附在標頭的後面。</p>"
--"<p>如果您要在標頭中加上額外的欄位，您可以在編輯視窗中用<b>編輯 - 編輯標頭</b>來手動編輯標頭。</p>"
--"<p>關閉<b>更新標頭</b>選項的話，在儲存時就不會去更新標頭。</p></qt>"
-+"<qt> <p><b>要更新的欄位</b></p><p>請選擇您在儲存時要更新的標頭欄位。如果該欄"
-+"位不存在，它會附在標頭的後面。</p><p>如果您要在標頭中加上額外的欄位，您可以在"
-+"編輯視窗中用<b>編輯 - 編輯標頭</b>來手動編輯標頭。</p><p>關閉<b>更新標頭</b>"
-+"選項的話，在儲存時就不會去更新標頭。</p></qt>"
- 
- #: commonui/projectprefwidgets.cpp:286
- msgid ""
--"<qt>"
--"<p><b>Encoding</b></p>"
--"<p>Choose how to encode characters when saving to a file. If you are unsure "
--"what encoding to use, please ask your translation coordinator.</p>"
--"<ul>"
--"<li><b>%1</b>: this is the encoding that fits the character set of your system "
--"language.</li>"
--"<li><b>%2</b>: uses Unicode (UTF-8) encoding.</li></ul></qt>"
--msgstr ""
--"<qt> "
--"<p><b>編碼</b></p> "
--"<p>請選擇要儲存到檔案中時使用的編碼。如果您不確定要用哪一種編碼，請詢問您的翻譯團隊的成員。</p>"
--"<ul> "
--"<li><b>%1</b>：這是您系統使用的編碼。</li> "
--"<li><b>%2</b>：使用萬國碼 (Unicode) UTF-8。</li> </ul></qt>"
-+"<qt><p><b>Encoding</b></p><p>Choose how to encode characters when saving to "
-+"a file. If you are unsure what encoding to use, please ask your translation "
-+"coordinator.</p><ul><li><b>%1</b>: this is the encoding that fits the "
-+"character set of your system language.</li><li><b>%2</b>: uses Unicode (UTF-"
-+"8) encoding.</li></ul></qt>"
-+msgstr ""
-+"<qt> <p><b>編碼</b></p> <p>請選擇要儲存到檔案中時使用的編碼。如果您不確定要用"
-+"哪一種編碼，請詢問您的翻譯團隊的成員。</p><ul> <li><b>%1</b>：這是您系統使用"
-+"的編碼。</li> <li><b>%2</b>：使用萬國碼 (Unicode) UTF-8。</li> </ul></qt>"
- 
- #: commonui/projectprefwidgets.cpp:296
- msgid ""
--"<qt>"
--"<p><b>Keep the encoding of the file</b></p>"
--"<p>If this option is activated, files are always saved in the same encoding as "
--"they were read in. Files without charset information in the header (e.g. POT "
--"files) are saved in the encoding set above.</p></qt>"
--msgstr ""
--"<qt> "
--"<p><b>保留檔案的編碼</b></p> "
--"<p>如果開啟此選項，檔案在儲存時會保留原來的編碼。如果沒有編碼的設定（例如樣本的 pot 檔）則會使用上面的編碼設定來儲存。</p></qt>"
-+"<qt><p><b>Keep the encoding of the file</b></p><p>If this option is "
-+"activated, files are always saved in the same encoding as they were read in. "
-+"Files without charset information in the header (e.g. POT files) are saved "
-+"in the encoding set above.</p></qt>"
-+msgstr ""
-+"<qt> <p><b>保留檔案的編碼</b></p> <p>如果開啟此選項，檔案在儲存時會保留原來的"
-+"編碼。如果沒有編碼的設定（例如樣本的 pot 檔）則會使用上面的編碼設定來儲存。</"
-+"p></qt>"
- 
- #: commonui/projectprefwidgets.cpp:302
- msgid ""
--"<qt>"
--"<p><b>Check syntax of file when saving</b></p>\n"
--"<p>Check this to automatically check syntax of file with \"msgfmt "
--"--statistics\"\n"
--"when saving a file. You will only get a message, if an error occurred.</p></qt>"
--msgstr ""
--"<qt> "
--"<p><b>儲存時檢查檔案語法</b></p>"
--"<p>開啟這個選項的話，儲存檔案時會自動使用 msgfmt --statistics 來檢查語法是否正確。但是如果發生錯誤的話，您只會得到一個錯誤訊息。</p>"
--"</qt>"
-+"<qt><p><b>Check syntax of file when saving</b></p>\n"
-+"<p>Check this to automatically check syntax of file with \"msgfmt --"
-+"statistics\"\n"
-+"when saving a file. You will only get a message, if an error occurred.</p></"
-+"qt>"
-+msgstr ""
-+"<qt> <p><b>儲存時檢查檔案語法</b></p><p>開啟這個選項的話，儲存檔案時會自動使"
-+"用 msgfmt --statistics 來檢查語法是否正確。但是如果發生錯誤的話，您只會得到一"
-+"個錯誤訊息。</p></qt>"
- 
- #: commonui/projectprefwidgets.cpp:306
- msgid ""
--"<qt>"
--"<p><b>Save obsolete entries</b></p>\n"
--"<p>If this option is activated, obsolete entries found when the file was open\n"
-+"<qt><p><b>Save obsolete entries</b></p>\n"
-+"<p>If this option is activated, obsolete entries found when the file was "
-+"open\n"
- "will be saved back to the file. Obsolete entries are marked by #~ and are\n"
- "created when the msgmerge does not need the translation anymore.\n"
--"If the text will appear again, the obsolete entries will be activated again.\n"
-+"If the text will appear again, the obsolete entries will be activated "
-+"again.\n"
- "The main drawback is the size of the saved file.</p></qt>"
- msgstr ""
--"<qt> "
--"<p><b>儲存已廢棄的訊息</b></p>"
--"<p>如果開啟此選項，原本檔案內已廢棄的訊息也會寫回檔案去。已廢棄的訊息是指 msgmerge 執行訊息合併時若發現已經用不著的訊息，會以 #~ "
--"標記。如果它發現這些訊息又被使用了，則會將它放回去。主要的缺點是檔案可能變得很大。</p></qt>"
-+"<qt> <p><b>儲存已廢棄的訊息</b></p><p>如果開啟此選項，原本檔案內已廢棄的訊息"
-+"也會寫回檔案去。已廢棄的訊息是指 msgmerge 執行訊息合併時若發現已經用不著的訊"
-+"息，會以 #~ 標記。如果它發現這些訊息又被使用了，則會將它放回去。主要的缺點是"
-+"檔案可能變得很大。</p></qt>"
- 
- #: commonui/projectprefwidgets.cpp:314
- msgid ""
--"<qt>"
--"<p><b>Format of Revision-Date</b></p>"
--"<p>Choose in which format the date and time of the header field\n"
--"<i>PO-Revision-Date</i> is saved: "
--"<ul>\n"
-+"<qt><p><b>Format of Revision-Date</b></p><p>Choose in which format the date "
-+"and time of the header field\n"
-+"<i>PO-Revision-Date</i> is saved: <ul>\n"
- "<li><b>Default</b> is the format normally used in PO files.</li>\n"
- "<li><b>Local</b> is the format specific to your country.\n"
- "It can be configured in KDE's Control Center.</li>\n"
--"<li><b>Custom</b> lets you define your own format.</li></ul></p> "
--"<p>It is recommended that you use the default format to avoid creating "
--"non-standard PO files.</p>"
--"<p>For more information, see section <b>The Preferences Dialog</b> "
--"in the online help.</p></qt>"
--msgstr ""
--"<qt> "
--"<p><b>最新更新日期的格式</b></p> "
--"<p>選擇儲存在 <i>PO-Revision-Date</i> 欄位的日期與時間格式： "
--"<ul>"
--"<li><b>預設日期格式</b>是指通常用於 PO 檔的格式。</li>"
--"<li><b>本地日期格式</b>是指您的國家所使用的日期格式。這可以在 KDE 的控制中心中設定。</li>"
--"<li><b>自定日期格式</b>讓您自行定義格式。</li></ul></p> "
--"<p>通常建議使用預設的格式，避免產生不標準的 PO 檔。</p> "
--"<p>要取得更多資訊，請參考線上說明的<b>設定對話框</b>。</p></qt>"
-+"<li><b>Custom</b> lets you define your own format.</li></ul></p> <p>It is "
-+"recommended that you use the default format to avoid creating non-standard "
-+"PO files.</p><p>For more information, see section <b>The Preferences Dialog</"
-+"b> in the online help.</p></qt>"
-+msgstr ""
-+"<qt> <p><b>最新更新日期的格式</b></p> <p>選擇儲存在 <i>PO-Revision-Date</i> "
-+"欄位的日期與時間格式： <ul><li><b>預設日期格式</b>是指通常用於 PO 檔的格式。"
-+"</li><li><b>本地日期格式</b>是指您的國家所使用的日期格式。這可以在 KDE 的控制"
-+"中心中設定。</li><li><b>自定日期格式</b>讓您自行定義格式。</li></ul></p> <p>"
-+"通常建議使用預設的格式，避免產生不標準的 PO 檔。</p> <p>要取得更多資訊，請參"
-+"考線上說明的<b>設定對話框</b>。</p></qt>"
- 
- #: commonui/projectprefwidgets.cpp:412
- msgid "<font size=\"+1\">Project: %1</font>"
-@@ -2071,17 +1996,16 @@
- 
- #: commonui/projectprefwidgets.cpp:455
- msgid ""
--"<qt>"
--"<p><b>Identity</b></p>\n"
-+"<qt><p><b>Identity</b></p>\n"
- "<p>Fill in information about you and your translation team.\n"
- "This information is used when updating the header of a file.</p>\n"
--"<p>You can find the options if and what fields in the header should be updated\n"
-+"<p>You can find the options if and what fields in the header should be "
-+"updated\n"
- "on page <b>Save</b> in this dialog.</p></qt>"
- msgstr ""
--"<qt> "
--"<p><b>個人資訊</b></p>"
--"<p>請填入您與您的翻譯團隊的資訊。這些資訊會用於更新檔案的標頭。</p>"
--"<p>您可以在<b>儲存</b>頁中找到關於您要更新的標頭欄位的選項。</p></qt>"
-+"<qt> <p><b>個人資訊</b></p><p>請填入您與您的翻譯團隊的資訊。這些資訊會用於更"
-+"新檔案的標頭。</p><p>您可以在<b>儲存</b>頁中找到關於您要更新的標頭欄位的選"
-+"項。</p></qt>"
- 
- #: commonui/projectprefwidgets.cpp:471
- msgid "&Number of singular/plural forms:"
-@@ -2099,24 +2023,21 @@
- 
- #: commonui/projectprefwidgets.cpp:486
- msgid ""
--"<qt>"
--"<p><b>Number of singular/plural forms</b></p>"
--"<p><b>Note</b>: This option is KDE specific. If you are not translating a KDE "
--"application, you can safely ignore this option.</p>"
--"<p>Choose here how many singular and plural forms are used in your language. "
--"This number must correspond to the settings of your language team.</p>"
--"<p>Alternatively, you can set this option to <i>Automatic</i> "
--"and KBabel will try to get this information automatically from KDE. Use the <i>"
--"Test</i> button to test if it can find it out.</p></qt>"
--msgstr ""
--"<qt>單/複數格式的數目</b></p> "
--"<p><b>注意</b>：這是 KDE 相關的選項。如果您不是在翻譯 KDE 應用程式，您可以忽略這個選項。</p> "
--"<p>請選擇在您的語言中有多少單數與複數型。這個數字與您的翻譯團隊的設定有關。</p>"
--"<p>此外，您也可以設定成<i>自動</i>，KBabel 會試著自動從 KDE 取得相關資訊。使用<i>測試</i>"
--"來測試 KBabel 是否能找到這些資訊。</p>"
--"<p>譯者註：此選項對中文是不需要的，設定成 1 即可。您可以參考 "
--"http://docs.kde.org/development/en/kdesdk/kbabel/kbabel-pluralforms.html "
--"對單複數型的說明。</p></qt>"
-+"<qt><p><b>Number of singular/plural forms</b></p><p><b>Note</b>: This option "
-+"is KDE specific. If you are not translating a KDE application, you can "
-+"safely ignore this option.</p><p>Choose here how many singular and plural "
-+"forms are used in your language. This number must correspond to the settings "
-+"of your language team.</p><p>Alternatively, you can set this option to "
-+"<i>Automatic</i> and KBabel will try to get this information automatically "
-+"from KDE. Use the <i>Test</i> button to test if it can find it out.</p></qt>"
-+msgstr ""
-+"<qt>單/複數格式的數目</b></p> <p><b>注意</b>：這是 KDE 相關的選項。如果您不是"
-+"在翻譯 KDE 應用程式，您可以忽略這個選項。</p> <p>請選擇在您的語言中有多少單數"
-+"與複數型。這個數字與您的翻譯團隊的設定有關。</p><p>此外，您也可以設定成<i>自"
-+"動</i>，KBabel 會試著自動從 KDE 取得相關資訊。使用<i>測試</i>來測試 KBabel 是"
-+"否能找到這些資訊。</p><p>譯者註：此選項對中文是不需要的，設定成 1 即可。您可"
-+"以參考 http://docs.kde.org/development/en/kdesdk/kbabel/kbabel-pluralforms."
-+"html 對單複數型的說明。</p></qt>"
- 
- #: commonui/projectprefwidgets.cpp:504
- msgid "&GNU plural form header:"
-@@ -2133,31 +2054,29 @@
- #: commonui/projectprefwidgets.cpp:521
- #, c-format
- msgid ""
--"<qt>"
--"<p><b>Require plural form arguments in translation</b></p>\n"
-+"<qt><p><b>Require plural form arguments in translation</b></p>\n"
- "<p><b>Note</b>: This option is KDE specific at the moment. If you are not "
- "translating a KDE application, you can safely ignore this option.</p>\n"
--"<p>If is this option enabled, the validation check will require the %n argument "
--"to be present in the message.</p></qt>"
-+"<p>If is this option enabled, the validation check will require the %n "
-+"argument to be present in the message.</p></qt>"
- msgstr ""
--"<qt> "
--"<p><b>翻譯時需要加入標記複數型參數</b></p>"
--"<p><b>注意</b>：這是 KDE 相關的選項。如果您不是在翻譯 KDE 應用程式，您可以忽略這個選項。</p> "
--"<p>如果開啟此選項，在檔案檢查時會需要 %n 參數在訊息裡。</p></qt>"
-+"<qt> <p><b>翻譯時需要加入標記複數型參數</b></p><p><b>注意</b>：這是 KDE 相關"
-+"的選項。如果您不是在翻譯 KDE 應用程式，您可以忽略這個選項。</p> <p>如果開啟此"
-+"選項，在檔案檢查時會需要 %n 參數在訊息裡。</p></qt>"
- 
- #: commonui/projectprefwidgets.cpp:529
- msgid ""
--"<qt>"
--"<p><b>GNU plural form header</b></p>\n"
--"<p>Here you can fill a header entry for GNU plural form handling; if you leave "
--"the entry empty, the entry in the PO file will not be changed or added.</p>\n"
--"<p>KBabel can automatically try to determine value suggested by the GNU gettext "
--"tools for currently set language; just press the <b>Lookup</b> button.</p></qt>"
--msgstr ""
--"<qt> "
--"<p><b>GNU 複數型標頭</b></p>"
--"<p>您可以填入一個標頭來表示 GNU 的複數型處理。如果留白的話，PO 檔內就不會改變或加入該標頭。</p>"
--"<p>按下「尋找」鍵，KBabel 可以自動用 GNU gettext 工具來試著決定目前語言所使用的建議值。</p></qt>"
-+"<qt><p><b>GNU plural form header</b></p>\n"
-+"<p>Here you can fill a header entry for GNU plural form handling; if you "
-+"leave the entry empty, the entry in the PO file will not be changed or added."
-+"</p>\n"
-+"<p>KBabel can automatically try to determine value suggested by the GNU "
-+"gettext tools for currently set language; just press the <b>Lookup</b> "
-+"button.</p></qt>"
-+msgstr ""
-+"<qt> <p><b>GNU 複數型標頭</b></p><p>您可以填入一個標頭來表示 GNU 的複數型處"
-+"理。如果留白的話，PO 檔內就不會改變或加入該標頭。</p><p>按下「尋找」鍵，"
-+"KBabel 可以自動用 GNU gettext 工具來試著決定目前語言所使用的建議值。</p></qt>"
- 
- #: commonui/projectprefwidgets.cpp:608 commonui/projectprefwidgets.cpp:642
- msgid "Please insert a language code first."
-@@ -2184,7 +2103,9 @@
- "It was not possible to determine GNU header for plural forms. Maybe your GNU "
- "gettext tools are too old or they do not contain a suggested value for your "
- "language."
--msgstr "找不到 GNU 的複數型標頭。也許您的 GNU gettext 工具太舊了，或是您的語言中沒有任何建議值。"
-+msgstr ""
-+"找不到 GNU 的複數型標頭。也許您的 GNU gettext 工具太舊了，或是您的語言中沒有"
-+"任何建議值。"
- 
- #: commonui/projectprefwidgets.cpp:677
- msgid "&Marker for keyboard accelerator:"
-@@ -2192,14 +2113,12 @@
- 
- #: commonui/projectprefwidgets.cpp:682
- msgid ""
--"<qt>"
--"<p><b>Marker for keyboard accelerator</b></p>"
--"<p>Define here, what character marks the following character as keyboard "
--"accelerator. For example in Qt it is '&amp;' and in Gtk it is '_'.</p></qt>"
--msgstr ""
--"<qt> "
--"<p><b>快速鍵標示符號</b></p> "
--"<p>決定在哪一個字元之後的字元為快速鍵。例如，在 Qt 中是 &amp 而 GTK 中則是 _。</p></qt>"
-+"<qt><p><b>Marker for keyboard accelerator</b></p><p>Define here, what "
-+"character marks the following character as keyboard accelerator. For example "
-+"in Qt it is '&amp;' and in Gtk it is '_'.</p></qt>"
-+msgstr ""
-+"<qt> <p><b>快速鍵標示符號</b></p> <p>決定在哪一個字元之後的字元為快速鍵。例"
-+"如，在 Qt 中是 &amp 而 GTK 中則是 _。</p></qt>"
- 
- #: commonui/projectprefwidgets.cpp:693
- msgid "&Regular expression for context information:"
-@@ -2207,11 +2126,12 @@
- 
- #: commonui/projectprefwidgets.cpp:699
- msgid ""
--"<qt>"
--"<p><b>Regular expression for context information</b></p>"
--"<p>Enter a regular expression here which defines what is context information in "
--"the message and must not get translated.</p></qt>"
--msgstr "<qt> <p><b>內容資訊的正規表示式</b></p> <p>輸入正規表示式來表示訊息中哪些屬於不需要翻譯的內容資訊。</p></qt>"
-+"<qt><p><b>Regular expression for context information</b></p><p>Enter a "
-+"regular expression here which defines what is context information in the "
-+"message and must not get translated.</p></qt>"
-+msgstr ""
-+"<qt> <p><b>內容資訊的正規表示式</b></p> <p>輸入正規表示式來表示訊息中哪些屬於"
-+"不需要翻譯的內容資訊。</p></qt>"
- 
- #: commonui/projectprefwidgets.cpp:715
- msgid "Compression Method for Mail Attachments"
-@@ -2219,11 +2139,11 @@
- 
- #: commonui/projectprefwidgets.cpp:720
- msgid "tar/&bzip2"
--msgstr "tar/bzip2 (&B)"
-+msgstr "tar/bzip2(&B)"
- 
- #: commonui/projectprefwidgets.cpp:721
- msgid "tar/&gzip"
--msgstr "tar/gzip (&G)"
-+msgstr "tar/gzip(&G)"
- 
- #: commonui/projectprefwidgets.cpp:723
- msgid "&Use compression when sending a single file"
-@@ -2235,14 +2155,12 @@
- 
- #: commonui/projectprefwidgets.cpp:805
- msgid ""
--"<qt>"
--"<p><b>On the fly spellchecking</b></p>"
--"<p>Activate this to let KBabel spell check the text as you type. Mispelled "
--"words will be colored by the error color.</p></qt>"
--msgstr ""
--"<qt> "
--"<p><b>直接檢查拼字</b></p> "
--"<p>開啟此選項，讓 KBabel 直接在您輸入文字時就做拼字檢查。拼錯的字會以標示錯誤的顏色顯示。</p></qt>"
-+"<qt><p><b>On the fly spellchecking</b></p><p>Activate this to let KBabel "
-+"spell check the text as you type. Mispelled words will be colored by the "
-+"error color.</p></qt>"
-+msgstr ""
-+"<qt> <p><b>直接檢查拼字</b></p> <p>開啟此選項，讓 KBabel 直接在您輸入文字時就"
-+"做拼字檢查。拼錯的字會以標示錯誤的顏色顯示。</p></qt>"
- 
- #: commonui/projectprefwidgets.cpp:811
- msgid "&Remember ignored words"
-@@ -2254,14 +2172,12 @@
- 
- #: commonui/projectprefwidgets.cpp:827
- msgid ""
--"<qt>"
--"<p><b>Remember ignored words</b></p>"
--"<p>Activate this, to let KBabel ignore the words, where you have chosen <i>"
--"Ignore All</i> in the spell check dialog, in every spell check.</p></qt>"
--msgstr ""
--"<qt> "
--"<p><b>記住忽略的字詞</b></p> "
--"<p>開啟此選項的話，KBabel 會在每次做拼字檢查時，忽略您在拼字檢查對話框中<i>全部忽略</i>的字詞。</p></qt>"
-+"<qt><p><b>Remember ignored words</b></p><p>Activate this, to let KBabel "
-+"ignore the words, where you have chosen <i>Ignore All</i> in the spell check "
-+"dialog, in every spell check.</p></qt>"
-+msgstr ""
-+"<qt> <p><b>記住忽略的字詞</b></p> <p>開啟此選項的話，KBabel 會在每次做拼字檢"
-+"查時，忽略您在拼字檢查對話框中<i>全部忽略</i>的字詞。</p></qt>"
- 
- #. i18n: file ./commonui/projectwizardwidget2.ui line 68
- #: commonui/projectprefwidgets.cpp:890 rc.cpp:313
-@@ -2277,15 +2193,14 @@
- 
- #: commonui/projectprefwidgets.cpp:914
- msgid ""
--"<qt>"
--"<p><b>Base folders</b></p>\n"
-+"<qt><p><b>Base folders</b></p>\n"
- "<p>Type in the folders which contain all your PO and POT files.\n"
- "The files and the folders in these folders will then be merged into one\n"
- "tree.</p></qt>"
- msgstr ""
--"<qt> "
--"<p><b>基本資料夾</b></p>\n"
--"<p>輸入含有您的 PO 檔與 POT 檔的資料夾。KBabel 會將它們合併在一個樹狀圖之中。</p></qt>"
-+"<qt> <p><b>基本資料夾</b></p>\n"
-+"<p>輸入含有您的 PO 檔與 POT 檔的資料夾。KBabel 會將它們合併在一個樹狀圖之中。"
-+"</p></qt>"
- 
- #: commonui/projectprefwidgets.cpp:924
- msgid "O&pen files in new window"
-@@ -2293,15 +2208,13 @@
- 
- #: commonui/projectprefwidgets.cpp:927
- msgid ""
--"<qt>"
--"<p><b>Open files in new window</b></p>\n"
--"<p>If this is activated all files that are opened from the Catalog Manager are "
--"opened\n"
-+"<qt><p><b>Open files in new window</b></p>\n"
-+"<p>If this is activated all files that are opened from the Catalog Manager "
-+"are opened\n"
- "in a new window.</p></qt>"
- msgstr ""
--"<qt> "
--"<p><b>開啟檔案於新視窗</b></p> "
--"<p>如果開啟此選項，所有從目錄管理員開啟的檔案都會用新視窗來開啟。</p></qt>"
-+"<qt> <p><b>開啟檔案於新視窗</b></p> <p>如果開啟此選項，所有從目錄管理員開啟的"
-+"檔案都會用新視窗來開啟。</p></qt>"
- 
- #: commonui/projectprefwidgets.cpp:931
- msgid "&Kill processes on exit"
-@@ -2309,17 +2222,15 @@
- 
- #: commonui/projectprefwidgets.cpp:933
- msgid ""
--"<qt>"
--"<p><b>Kill processes on exit</b></p>\n"
--"<p>If you check this, KBabel tries to kill the processes, that have not exited "
--"already when KBabel exits,\n"
-+"<qt><p><b>Kill processes on exit</b></p>\n"
-+"<p>If you check this, KBabel tries to kill the processes, that have not "
-+"exited already when KBabel exits,\n"
- "by sending a kill signal to them.</p>\n"
- "<p>NOTE: It is not guaranteed that the processes will be killed.</p></qt>"
- msgstr ""
--"<qt> "
--"<p><b>離開時結束行程</b></p> "
--"<p>如果開啟此選項，KBabel 會在離開時試著對還沒離開的行程送出 SIGKILL 來刪除它們。</p> "
--"<p>注意：這不保證這些行程就會被刪除。</p></qt>"
-+"<qt> <p><b>離開時結束行程</b></p> <p>如果開啟此選項，KBabel 會在離開時試著對"
-+"還沒離開的行程送出 SIGKILL 來刪除它們。</p> <p>注意：這不保證這些行程就會被刪"
-+"除。</p></qt>"
- 
- #: commonui/projectprefwidgets.cpp:939
- msgid "Create inde&x for file contents"
-@@ -2327,17 +2238,15 @@
- 
- #: commonui/projectprefwidgets.cpp:941
- msgid ""
--"<qt>"
--"<p><b>Create index for file contents</b></p>\n"
--"<p>If you check this, KBabel will create an index for each PO file to speed up "
--"the find/replace functions.</p>\n"
--"<p>NOTE: This will slow down updating the file information considerably.</p>"
--"</qt>"
--msgstr ""
--"<qt> "
--"<p><b>對檔案內容建立索引</b></p> "
--"<p>如果開啟此選項，KBabel 會對每個 PO 檔建索引，以加速搜尋/取代功能。</p> "
--"<p>注意：這會造成更新檔案資訊時速度變慢。</p> </qt>"
-+"<qt><p><b>Create index for file contents</b></p>\n"
-+"<p>If you check this, KBabel will create an index for each PO file to speed "
-+"up the find/replace functions.</p>\n"
-+"<p>NOTE: This will slow down updating the file information considerably.</"
-+"p></qt>"
-+msgstr ""
-+"<qt> <p><b>對檔案內容建立索引</b></p> <p>如果開啟此選項，KBabel 會對每個 PO "
-+"檔建索引，以加速搜尋/取代功能。</p> <p>注意：這會造成更新檔案資訊時速度變慢。"
-+"</p> </qt>"
- 
- #: commonui/projectprefwidgets.cpp:945
- msgid "Run &msgfmt before processing a file"
-@@ -2345,24 +2254,21 @@
- 
- #: commonui/projectprefwidgets.cpp:947
- msgid ""
--"<qt>"
--"<p><b>Run msgfmt before processing a file</b></p>"
--"<p>If you enable this, KBabel will run Gettext's msgfmt tool before processing "
--"a file.</p>"
--"<p>Enabling this setting is recommended, even if it causes processing to be "
--"slower. This setting is enabled by default.</p>"
--"<p>Disabling is useful for slow computers and when you want to translate PO "
--"files that are not supported by the current version of the Gettext tools that "
--"are on your system. The drawback of disabling is that hardly any syntax "
--"checking is done by the processing code, so invalid PO files could be shown as "
--"good ones, even if Gettext tools would reject such files.</p></qt>"
--msgstr ""
--"<qt> "
--"<p><b>在處理檔案前先執行 msgfmt </b></p> "
--"<p>如果開啟此選項，KBabel 在處理一個檔案前會先執行 Gettext 的 msgfmt 工具。</p> "
--"<p>通常建議開啟，即使會讓處理變慢。這個選項預設是開啟的。</p> "
--"<p>如果您的電腦速度很慢，或是您要翻譯不被目前版本的 Gettext 工具所支援的 PO 檔，可以關掉這個選項。缺點是無法做語法檢查，所以不合法的 PO "
--"檔可能被當成合法的來顯示。</p></qt>"
-+"<qt><p><b>Run msgfmt before processing a file</b></p><p>If you enable this, "
-+"KBabel will run Gettext's msgfmt tool before processing a file.</"
-+"p><p>Enabling this setting is recommended, even if it causes processing to "
-+"be slower. This setting is enabled by default.</p><p>Disabling is useful for "
-+"slow computers and when you want to translate PO files that are not "
-+"supported by the current version of the Gettext tools that are on your "
-+"system. The drawback of disabling is that hardly any syntax checking is done "
-+"by the processing code, so invalid PO files could be shown as good ones, "
-+"even if Gettext tools would reject such files.</p></qt>"
-+msgstr ""
-+"<qt> <p><b>在處理檔案前先執行 msgfmt </b></p> <p>如果開啟此選項，KBabel 在處"
-+"理一個檔案前會先執行 Gettext 的 msgfmt 工具。</p> <p>通常建議開啟，即使會讓處"
-+"理變慢。這個選項預設是開啟的。</p> <p>如果您的電腦速度很慢，或是您要翻譯不被"
-+"目前版本的 Gettext 工具所支援的 PO 檔，可以關掉這個選項。缺點是無法做語法檢"
-+"查，所以不合法的 PO 檔可能被當成合法的來顯示。</p></qt>"
- 
- #: commonui/projectprefwidgets.cpp:988
- msgid "Commands for Folders"
-@@ -2380,30 +2286,22 @@
- 
- #: commonui/projectprefwidgets.cpp:998
- msgid ""
--"<qt>"
--"<p><b>Commands for folders</b></p>"
--"<p>Insert here the commands you want to execute in folders from the Catalog "
--"Manager. The commands are then shown in the submenu <b>Commands</b> "
--"in the Catalog Manager's context menu.</p>"
--"<p>The following strings will be replaced in a command:"
--"<ul>"
--"<li>@PACKAGE@: The name of the folder without path</li>"
--"<li>@PODIR@: The name of the PO-folder with path</li>"
--"<li>@POTDIR@: The name of the template folder with path</li>"
--"<li>@POFILES@: The names of the PO files with path</li>"
--"<li>@MARKEDPOFILES@: The names of the marked PO files with path</li></ul></p>"
--"</qt>"
--msgstr ""
--"<qt> "
--"<p><b>資料夾命令</b></p> "
--"<p>請在此插入您在目錄管理員中要對資料夾所執行的命令。這些命令會在目錄管理員的選單中的<b>命令</b>子目錄中出現。</p> "
--"<p>以下的字串會在命令中被代換： "
--"<ul> "
--"<li>@PACKAGE@：資料夾名稱，不含路徑。</li> "
--"<li>@PODIR@：PO 資料夾名稱，包含路徑。</li> "
--"<li>@POTDIR@：樣本資料夾名稱，包含路徑。</li> "
--"<li>@POFILES@：PO 檔名稱，包含路徑。</li> "
--"<li>@MARKEDPOFILES@：已標示的 PO 檔名稱，包含路徑。</li></ul></p> </qt>"
-+"<qt><p><b>Commands for folders</b></p><p>Insert here the commands you want "
-+"to execute in folders from the Catalog Manager. The commands are then shown "
-+"in the submenu <b>Commands</b> in the Catalog Manager's context menu.</"
-+"p><p>The following strings will be replaced in a command:<ul><li>@PACKAGE@: "
-+"The name of the folder without path</li><li>@PODIR@: The name of the PO-"
-+"folder with path</li><li>@POTDIR@: The name of the template folder with "
-+"path</li><li>@POFILES@: The names of the PO files with path</"
-+"li><li>@MARKEDPOFILES@: The names of the marked PO files with path</li></"
-+"ul></p></qt>"
-+msgstr ""
-+"<qt> <p><b>資料夾命令</b></p> <p>請在此插入您在目錄管理員中要對資料夾所執行的"
-+"命令。這些命令會在目錄管理員的選單中的<b>命令</b>子目錄中出現。</p> <p>以下的"
-+"字串會在命令中被代換： <ul> <li>@PACKAGE@：資料夾名稱，不含路徑。</li> "
-+"<li>@PODIR@：PO 資料夾名稱，包含路徑。</li> <li>@POTDIR@：樣本資料夾名稱，包"
-+"含路徑。</li> <li>@POFILES@：PO 檔名稱，包含路徑。</li> <li>@MARKEDPOFILES@："
-+"已標示的 PO 檔名稱，包含路徑。</li></ul></p> </qt>"
- 
- #: commonui/projectprefwidgets.cpp:1051
- msgid "Commands for Files"
-@@ -2421,33 +2319,24 @@
- 
- #: commonui/projectprefwidgets.cpp:1061
- msgid ""
--"<qt>"
--"<p><b>Commands for files</b></p>"
--"<p>Insert here the commands you want to execute on files from the Catalog "
--"Manager. The commands are then shown in the submenu <b>Commands</b> "
--"in the Catalog Manager's context menu.</p>"
--"<p>The following strings will be replaced in a command:"
--"<ul>"
--"<li>@PACKAGE@: The name of the file without path and extension</li>"
--"<li>@POFILE@: The name of the PO-file with path and extension</li>"
--"<li>@POTFILE@: The name of the corresponding template file with path and "
--"extension</li>"
--"<li>@POEMAIL@: The name and email address of the last translator</li>"
--"<li>@PODIR@: The name of the folder the PO-file is in, with path</li>"
--"<li>@POTDIR@: The name of the folder the template file is in, with path</li>"
--"</ul></p></qt>"
--msgstr ""
--"<qt> "
--"<p><b>檔案命令</b></p> "
--"<p>請在此插入您在目錄管理員中要對檔案所執行的命令。這些命令會在目錄管理員的選單中的<b>命令</b>子目錄中出現。</p> "
--"<p>以下的字串會在命令中被代換： "
--"<ul> "
--"<li>@PACKAGE@：資料夾名稱，不含路徑與副檔名。</li> "
--"<li>@POFILE@：PO 檔名稱，包含路徑與副檔名。</li> "
--"<li>@POTFILE@：樣本檔名稱，包含路徑與副檔名。</li> "
--"<li>@POEMAIL@：最後翻譯者的姓名與電子郵件地址。</li> "
--"<li>@PODIR@：PO 資料夾名稱，包含路徑。</li> "
--"<li>@POTDIR@：樣本資料夾名稱，包含路徑。</li> </ul></p></qt>"
-+"<qt><p><b>Commands for files</b></p><p>Insert here the commands you want to "
-+"execute on files from the Catalog Manager. The commands are then shown in "
-+"the submenu <b>Commands</b> in the Catalog Manager's context menu.</p><p>The "
-+"following strings will be replaced in a command:<ul><li>@PACKAGE@: The name "
-+"of the file without path and extension</li><li>@POFILE@: The name of the PO-"
-+"file with path and extension</li><li>@POTFILE@: The name of the "
-+"corresponding template file with path and extension</li><li>@POEMAIL@: The "
-+"name and email address of the last translator</li><li>@PODIR@: The name of "
-+"the folder the PO-file is in, with path</li><li>@POTDIR@: The name of the "
-+"folder the template file is in, with path</li></ul></p></qt>"
-+msgstr ""
-+"<qt> <p><b>檔案命令</b></p> <p>請在此插入您在目錄管理員中要對檔案所執行的命"
-+"令。這些命令會在目錄管理員的選單中的<b>命令</b>子目錄中出現。</p> <p>以下的字"
-+"串會在命令中被代換： <ul> <li>@PACKAGE@：資料夾名稱，不含路徑與副檔名。</li> "
-+"<li>@POFILE@：PO 檔名稱，包含路徑與副檔名。</li> <li>@POTFILE@：樣本檔名稱，"
-+"包含路徑與副檔名。</li> <li>@POEMAIL@：最後翻譯者的姓名與電子郵件地址。</li> "
-+"<li>@PODIR@：PO 資料夾名稱，包含路徑。</li> <li>@POTDIR@：樣本資料夾名稱，包"
-+"含路徑。</li> </ul></p></qt>"
- 
- #: commonui/projectprefwidgets.cpp:1114
- msgid "Shown Columns"
-@@ -2483,14 +2372,13 @@
- 
- #: commonui/projectprefwidgets.cpp:1126
- msgid ""
--"<qt>"
--"<p><b>Shown columns</b></p>\n"
-+"<qt><p><b>Shown columns</b></p>\n"
- "<p></p></qt>"
- msgstr "<qt> <p><b>顯示欄位</b></p> <p>尚無說明</p></qt>"
- 
- #: commonui/projectprefwidgets.cpp:1157
- msgid "&Base folder for source code:"
--msgstr "源碼檔案的基本目錄(&B)："
-+msgstr "原始碼檔案的基本目錄(&B)："
- 
- #: commonui/projectprefwidgets.cpp:1168
- msgid "Path Patterns"
-@@ -2498,7 +2386,7 @@
- 
- #: commonui/context.cpp:97
- msgid "Corresponding source file not found"
--msgstr "找不到對應源碼"
-+msgstr "找不到對應原始碼"
- 
- #: commonui/context.cpp:265 commonui/context.cpp:275 commonui/context.cpp:285
- msgid ""
-@@ -2516,36 +2404,30 @@
- 
- #: kbabel/commentview.cpp:88
- msgid ""
--"<qt>"
--"<p><b>Comment Editor</b></p>\n"
-+"<qt><p><b>Comment Editor</b></p>\n"
- "This edit window shows you the comments of the currently displayed message."
- "<p>\n"
--"<p>The comments normally contain information about where the message is found "
--"in the source\n"
-+"<p>The comments normally contain information about where the message is "
-+"found in the source\n"
- "code and status information about this message (fuzzy, c-format).\n"
- "Hints from other translators are also sometimes contained in comments.</p>\n"
- "<p>You can hide the comment editor by deactivating\n"
- "<b>Options->Show Comments</b>.</p></qt>"
- msgstr ""
--"<qt> "
--"<p><b>註解編輯器</b></p>\n"
--"這個編輯視窗顯示您對目前訊息的註解。</p> "
--"<p>註解通常包含這個訊息是放在哪些源碼檔裡面，還有它們的狀態（如 fuzzy, c-format 等）。"
-+"<qt> <p><b>註解編輯器</b></p>\n"
-+"這個編輯視窗顯示您對目前訊息的註解。</p> <p>註解通常包含這個訊息是放在哪些源"
-+"碼檔裡面，還有它們的狀態（如 fuzzy, c-format 等）。"
- 
- #: kbabel/contextview.cpp:63
- msgid ""
--"<qt>"
--"<p><b>PO Context</b></p>"
--"<p>This window shows the context of the current message in the PO file. "
--"Normally it shows four messages in front of the current message and four after "
--"it.</p>"
--"<p>You can hide the tools window by deactivating <b>Options->Show Tools</b>.</p>"
--"</qt></qt>"
--msgstr ""
--"<qt> "
--"<p><b>PO 內容</b></p> "
--"<p>這個視窗顯示目前 PO 檔中的內容。通常除了目前的訊息外，還會顯示前後各四個訊息。</p> "
--"<p>您可以在<b>選項 - 顯示工具</b> 目錄中選擇隱藏這個視窗。</p> </qt>"
-+"<qt><p><b>PO Context</b></p><p>This window shows the context of the current "
-+"message in the PO file. Normally it shows four messages in front of the "
-+"current message and four after it.</p><p>You can hide the tools window by "
-+"deactivating <b>Options->Show Tools</b>.</p></qt></qt>"
-+msgstr ""
-+"<qt> <p><b>PO 內容</b></p> <p>這個視窗顯示目前 PO 檔中的內容。通常除了目前的"
-+"訊息外，還會顯示前後各四個訊息。</p> <p>您可以在<b>選項 - 顯示工具</b> 目錄中"
-+"選擇隱藏這個視窗。</p> </qt>"
- 
- #: kbabel/contextview.cpp:99
- msgid "current entry"
-@@ -2556,21 +2438,17 @@
- msgstr "未翻譯"
- 
- #: kbabel/contextview.cpp:140
--msgid ""
--"Plural %1: %2\n"
--msgstr ""
--"複數型 %1：%2\n"
-+msgid "Plural %1: %2\n"
-+msgstr "複數型 %1：%2\n"
- 
- #: kbabel/errorlistview.cpp:62
- msgid ""
--"<qt>"
--"<p><b>Error List</b></p>"
--"<p>This window shows the list of errors found by validator tools so you can "
--"know why the current message has been marked with an error.</p></qt>"
--msgstr ""
--"<qt> "
--"<p><b>錯誤列表</b></p> "
--"<p>這個視窗顯示檢查工具所找到的錯誤的清單，您可以瞭解為何目前的訊息被標示成錯誤。</p></qt>"
-+"<qt><p><b>Error List</b></p><p>This window shows the list of errors found by "
-+"validator tools so you can know why the current message has been marked with "
-+"an error.</p></qt>"
-+msgstr ""
-+"<qt> <p><b>錯誤列表</b></p> <p>這個視窗顯示檢查工具所找到的錯誤的清單，您可以"
-+"瞭解為何目前的訊息被標示成錯誤。</p></qt>"
- 
- #: kbabel/kbabelpref.cpp:57
- msgid ""
-@@ -2656,7 +2534,7 @@
- #: kbabel/main.cpp:555
- msgid ""
- "Wrote the dictionary plugin for searching in a database and some other code."
--msgstr "撰寫字典外掛程式，可搜尋資料庫及其他源碼。"
-+msgstr "撰寫字典外掛程式，可搜尋資料庫及其他原始碼。"
- 
- #: kbabel/main.cpp:560
- msgid "Bug fixes, KFilePlugin for PO files, CVS support, mailing files"
-@@ -2688,10 +2566,11 @@
- 
- #: kbabel/headereditor.cpp:61
- msgid ""
--"<qt>"
--"<p>This button updates the header using the current settings. The resulting "
--"header is the one that would be written into the PO file on saving.</p></qt>"
--msgstr "<qt> <p>這個按鈕會依據目前的設定來更新標頭，並在儲存時寫入 PO 檔。</p></qt>"
-+"<qt><p>This button updates the header using the current settings. The "
-+"resulting header is the one that would be written into the PO file on saving."
-+"</p></qt>"
-+msgstr ""
-+"<qt> <p>這個按鈕會依據目前的設定來更新標頭，並在儲存時寫入 PO 檔。</p></qt>"
- 
- #: kbabel/headereditor.cpp:65
- msgid "&Reset"
-@@ -2708,40 +2587,34 @@
- 
- #: kbabel/headereditor.cpp:136
- msgid ""
--"<qt>"
--"<p>This is not a valid header.</p>\n"
-+"<qt><p>This is not a valid header.</p>\n"
- "<p>Please edit the header before updating!</p></qt>"
- msgstr "<qt> <p>這不是合法的標頭。</p><p>請在更新前修改該標頭資訊。</p></qt>"
- 
- #: kbabel/headereditor.cpp:172
- msgid ""
--"<qt>"
--"<p>This is not a valid header.</p>\n"
-+"<qt><p>This is not a valid header.</p>\n"
- "<p>Please edit the header before updating.</p></qt>"
- msgstr "<qt> <p>這不是合法的標頭。</p><p>請在更新前修改該標頭資訊。</p></qt>"
- 
- #: kbabel/kbabelview.cpp:185
- msgid ""
--"<qt>"
--"<p><b>Search results</b></p>"
--"<p>This part of the window shows the results of searching in dictionaries."
--"<p>"
--"<p>In the top is displayed the number of entries found and where the currently "
--"displayed entry is found. Use the buttons at the bottom to navigate through the "
--"search results.</p>"
--"<p>Search is either started automatically when switching to another entry in "
--"the editor window or by choosing the desired dictionary in <b>Dictionaries->"
--"Find...</b>.</p>"
--"<p>The common options can be configured in the preferences dialog in section <b>"
--"Search</b> and the options for the different dictionaries can be changed with "
--"<b>Settings->Configure Dictionary</b>.</p></qt>"
--msgstr ""
--"<qt> "
--"<p><b>搜尋結果</b></p> "
--"<p>這個視窗顯示在字典中搜尋的結果。</p> "
--"<p>在最上面顯示的是搜尋到的數量，以及目前找到的是哪一個訊息。用下面的按鈕來瀏覽其他的結果。</p> "
--"<p>當您在編輯視窗選擇其他的訊息，或是在<b>字典 - 尋找</b>中選擇其他的字典時，會自動開始搜尋。</p> "
--"<p>共同的選項放在「設定 KBabel」中的<b>搜尋</b>頁中，此外您也可以在<b>設定 - 設定字典</b>中變更各字典的選項。</p></qt>"
-+"<qt><p><b>Search results</b></p><p>This part of the window shows the results "
-+"of searching in dictionaries.<p><p>In the top is displayed the number of "
-+"entries found and where the currently displayed entry is found. Use the "
-+"buttons at the bottom to navigate through the search results.</p><p>Search "
-+"is either started automatically when switching to another entry in the "
-+"editor window or by choosing the desired dictionary in <b>Dictionaries-"
-+">Find...</b>.</p><p>The common options can be configured in the preferences "
-+"dialog in section <b>Search</b> and the options for the different "
-+"dictionaries can be changed with <b>Settings->Configure Dictionary</b>.</p></"
-+"qt>"
-+msgstr ""
-+"<qt> <p><b>搜尋結果</b></p> <p>這個視窗顯示在字典中搜尋的結果。</p> <p>在最上"
-+"面顯示的是搜尋到的數量，以及目前找到的是哪一個訊息。用下面的按鈕來瀏覽其他的"
-+"結果。</p> <p>當您在編輯視窗選擇其他的訊息，或是在<b>字典 - 尋找</b>中選擇其"
-+"他的字典時，會自動開始搜尋。</p> <p>共同的選項放在「設定 KBabel」中的<b>搜尋"
-+"</b>頁中，此外您也可以在<b>設定 - 設定字典</b>中變更各字典的選項。</p></qt>"
- 
- #: kbabel/kbabelview.cpp:258
- msgid ""
-@@ -2797,11 +2670,12 @@
- 
- #: kbabel/kbabelview.cpp:343
- msgid ""
--"<qt>"
--"<p><b>Original String</b></p>\n"
-+"<qt><p><b>Original String</b></p>\n"
- "<p>This part of the window shows the original message\n"
- "of the currently displayed entry.</p></qt>"
--msgstr "<qt><p><b>原始訊息</b></p><p>本視窗顯示目前這個訊息的原始(翻譯前)訊息。</p></qt>"
-+msgstr ""
-+"<qt><p><b>原始訊息</b></p><p>本視窗顯示目前這個訊息的原始(翻譯前)訊息。</p></"
-+"qt>"
- 
- #. i18n: translators: Dock window caption
- #: kbabel/kbabelview.cpp:350
-@@ -2829,24 +2703,22 @@
- 
- #: kbabel/kbabelview.cpp:437
- msgid ""
--"<qt>"
--"<p><b>Status LEDs</b></p>\n"
-+"<qt><p><b>Status LEDs</b></p>\n"
- "<p>These LEDs display the status of the currently displayed message.\n"
- "You can change their color in the preferences dialog section\n"
- "<b>Editor</b> on page <b>Appearance</b></p></qt>"
- msgstr ""
--"<qt> "
--"<p><b>狀態燈號</b></p> "
--"<p>這些燈號顯示目前訊息的狀態。您可以在<b>外觀</b>頁中的<b>編輯器</b>內設定不同狀態的顏色。</p></qt>"
-+"<qt> <p><b>狀態燈號</b></p> <p>這些燈號顯示目前訊息的狀態。您可以在<b>外觀</"
-+"b>頁中的<b>編輯器</b>內設定不同狀態的顏色。</p></qt>"
- 
- #: kbabel/kbabelview.cpp:450
- msgid ""
--"<qt>"
--"<p><b>Translation Editor</b></p>\n"
-+"<qt><p><b>Translation Editor</b></p>\n"
- "<p>This editor displays and lets you edit the translation of the currently "
--"displayed message."
-+"displayed message.<p></qt>"
-+msgstr ""
-+"<qt><p><b>翻譯訊息視窗</b></p><p>本視窗讓您觀看並編輯目前顯示的翻譯訊息。"
- "<p></qt>"
--msgstr "<qt><p><b>翻譯訊息視窗</b></p><p>本視窗讓您觀看並編輯目前顯示的翻譯訊息。<p></qt>"
- 
- #. i18n: translators: Dock window caption
- #: kbabel/kbabelview.cpp:466
-@@ -2895,12 +2767,12 @@
- #. i18n: translators: Dock window caption
- #: kbabel/kbabelview.cpp:520
- msgid "Source Context"
--msgstr "源碼內容"
-+msgstr "原始碼內容"
- 
- #. i18n: translators: Dock tab caption
- #: kbabel/kbabelview.cpp:522
- msgid "Source"
--msgstr "源碼"
-+msgstr "原始碼"
- 
- #: kbabel/kbabelview.cpp:532
- msgid "Translation List"
-@@ -2936,7 +2808,8 @@
- 
- #: kbabel/kbabelview.cpp:1196
- msgid ""
--"The file contained syntax errors and an attempt has been made to recover it.\n"
-+"The file contained syntax errors and an attempt has been made to recover "
-+"it.\n"
- "Please check the questionable entries by using Go->Next error"
- msgstr ""
- "這個檔案裡有一些語法錯誤，不過已經嘗試修正。\n"
-@@ -3093,16 +2966,12 @@
- "msgfmt --statistics 的輸出為：\n"
- 
- #: kbabel/kbabelview.cpp:1658
--msgid ""
--"msgfmt detected a syntax error.\n"
--msgstr ""
--"msgfmt 偵測到語法錯誤。\n"
-+msgid "msgfmt detected a syntax error.\n"
-+msgstr "msgfmt 偵測到語法錯誤。\n"
- 
- #: kbabel/kbabelview.cpp:1659
--msgid ""
--"msgfmt detected a header syntax error.\n"
--msgstr ""
--"msgfmt 偵測到標頭語法錯誤。\n"
-+msgid "msgfmt detected a header syntax error.\n"
-+msgstr "msgfmt 偵測到標頭語法錯誤。\n"
- 
- #: kbabel/kbabelview.cpp:1663 kbabel/kbabelview.cpp:1703
- msgid ""
-@@ -3114,10 +2983,8 @@
- 
- #: kbabel/kbabelview.cpp:1665 kbabel/kbabelview.cpp:1682
- #: kbabel/kbabelview.cpp:1685
--msgid ""
--"Output of \"msgfmt --statistics\":\n"
--msgstr ""
--"msgfmt --statistics 的輸出為：\n"
-+msgid "Output of \"msgfmt --statistics\":\n"
-+msgstr "msgfmt --statistics 的輸出為：\n"
- 
- #: kbabel/kbabelview.cpp:1680 kbabel/kbabelview.cpp:1688
- #: kbabel/kbabelview.cpp:1718 kbabel/kbabelview.cpp:1723
-@@ -3162,12 +3029,10 @@
- #: kbabel/kbabelview.cpp:2036
- #, c-format
- msgid ""
--"_n: <qt>%n replacement made."
--"<br>End of document reached."
--"<br>Continue from the beginning?</qt>\n"
--"<qt>%n replacements made."
--"<br>End of document reached."
--"<br>Continue from the beginning?</qt>"
-+"_n: <qt>%n replacement made.<br>End of document reached.<br>Continue from "
-+"the beginning?</qt>\n"
-+"<qt>%n replacements made.<br>End of document reached.<br>Continue from the "
-+"beginning?</qt>"
- msgstr "<qt>%n 個地方被取代。<br> 已遇到檔案結尾。<br> 要再從頭開始嗎？</qt>"
- 
- #: kbabel/kbabelview.cpp:2044
-@@ -3207,12 +3072,10 @@
- #: kbabel/kbabelview.cpp:2221
- #, c-format
- msgid ""
--"_n: <qt>%n replacement made."
--"<br>Beginning of document reached."
--"<br>Continue from the end?</qt>\n"
--"<qt>%n replacements made."
--"<br>Beginning of document reached."
--"<br>Continue from the end?</qt>"
-+"_n: <qt>%n replacement made.<br>Beginning of document reached.<br>Continue "
-+"from the end?</qt>\n"
-+"<qt>%n replacements made.<br>Beginning of document reached.<br>Continue from "
-+"the end?</qt>"
- msgstr "<qt>%n 個地方被取代。<br> 已遇到檔案開頭。<br> 要再從結尾開始嗎？</qt>"
- 
- #: kbabel/kbabelview.cpp:2230
-@@ -3269,15 +3132,16 @@
- msgid ""
- "There seems to be an error with the synchronization of the spell checking "
- "process and KBabel.\n"
--"Please check that you have set the correct settings for your language for spell "
--"checking.\n"
-+"Please check that you have set the correct settings for your language for "
-+"spell checking.\n"
- "If you have, and this problem is reproducible, please send a detailed bug "
--"report (your spell checking options, what file you have checked and what to do "
--"to reproduce the problem) by using Help->Report Bug..."
-+"report (your spell checking options, what file you have checked and what to "
-+"do to reproduce the problem) by using Help->Report Bug..."
- msgstr ""
- "拼字檢查的行程與 KBabel 同步時發生錯誤。\n"
- "請檢查您用於拼字檢查的語言設定是否正確。\n"
--"如果正確，而且這個問題持續存在，請用目錄中的「說明 - 報告問題」送出詳細的錯誤報告（包括您的拼字檢查的設定選項、您檢查的檔案，以及如何重現此錯誤）。"
-+"如果正確，而且這個問題持續存在，請用目錄中的「說明 - 報告問題」送出詳細的錯誤"
-+"報告（包括您的拼字檢查的設定選項、您檢查的檔案，以及如何重現此錯誤）。"
- 
- #: kbabel/kbabelview.cpp:4300 kbabel/kbabelview.cpp:4326
- #, c-format
-@@ -3301,8 +3165,8 @@
- #: kbabel/kbabelview.cpp:4391
- msgid ""
- "The spell checker program could not be started.\n"
--"Please make sure you have the spell checker program properly configured and in "
--"your PATH."
-+"Please make sure you have the spell checker program properly configured and "
-+"in your PATH."
- msgstr ""
- "拼字檢查程式無法啟動。\n"
- "請確定您的拼字檢查程式設定正確，並且在您的執行路徑之中。"
-@@ -3335,20 +3199,23 @@
- "You have not run KBabel before. To allow KBabel to work correctly you must "
- "enter some information in the preferences dialog first.\n"
- "The minimum requirement is to fill out the Identity page.\n"
--"Also check the encoding on the Save page, which is currently set to %1. You may "
--"want to change this setting according to the settings of your language team."
--msgstr ""
--"您之前並沒有執行過 KBabel。 為了讓 KBabel 正常工作，您必須先在個人設定畫面中輸入一些資訊。\n"
--"您至少應該輸入個人身份資訊。\n"
--"另外也請檢查在儲存設定頁中的編碼資訊。目前編碼的設定是 %1。您或許要根據您所屬的翻譯團隊來設定."
-+"Also check the encoding on the Save page, which is currently set to %1. You "
-+"may want to change this setting according to the settings of your language "
-+"team."
-+msgstr ""
-+"您之前並沒有執行過 KBabel。 為了讓 KBabel 正常工作，您必須先在個人設定畫面中"
-+"輸入一些資訊。\n"
-+"您至少應該輸入個人身分資訊。\n"
-+"另外也請檢查在儲存設定頁中的編碼資訊。目前編碼的設定是 %1。您或許要根據您所屬"
-+"的翻譯團隊來設定."
- 
- #: kbabel/kbabel.cpp:415
- msgid "Save Sp&ecial..."
--msgstr "儲存設定選項(&E)..."
-+msgstr "儲存設定選項(&E)…"
- 
- #: kbabel/kbabel.cpp:417
- msgid "Set &Package..."
--msgstr "設定套件名稱 (&P)..."
-+msgstr "設定套件名稱(&P)…"
- 
- #: kbabel/kbabel.cpp:425
- msgid "New &Window"
-@@ -3376,7 +3243,7 @@
- 
- #: kbabel/kbabel.cpp:459
- msgid "&Edit Header..."
--msgstr "編輯標頭(&E)..."
-+msgstr "編輯標頭(&E)…"
- 
- #: kbabel/kbabel.cpp:462
- msgid "&Insert Next Tag"
-@@ -3456,27 +3323,27 @@
- 
- #: kbabel/kbabel.cpp:614
- msgid "&Spell Check..."
--msgstr "拼字檢查(&S)..."
-+msgstr "拼字檢查(&S)…"
- 
- #: kbabel/kbabel.cpp:617
- msgid "&Check All..."
--msgstr "全部檢查(&C)..."
-+msgstr "全部檢查(&C)…"
- 
- #: kbabel/kbabel.cpp:620
- msgid "C&heck From Cursor Position..."
--msgstr "從游標位置開始檢查(&H)..."
-+msgstr "從游標位置開始檢查(&H)…"
- 
- #: kbabel/kbabel.cpp:623
- msgid "Ch&eck Current..."
--msgstr "檢查目前的(&E)..."
-+msgstr "檢查目前的(&E)…"
- 
- #: kbabel/kbabel.cpp:626
- msgid "Check Fro&m Current to End of File..."
--msgstr "從目前位置檢查到檔案結束(&M)..."
-+msgstr "從目前位置檢查到檔案結束(&M)…"
- 
- #: kbabel/kbabel.cpp:629
- msgid "Chec&k Selected Text..."
--msgstr "檢查選擇的文字(&K)..."
-+msgstr "檢查選擇的文字(&K)…"
- 
- #: kbabel/kbabel.cpp:635
- msgid "&Diffmode"
-@@ -3484,7 +3351,7 @@
- 
- #: kbabel/kbabel.cpp:645
- msgid "S&how Original Text"
--msgstr "顯示原始文字 (&H)"
-+msgstr "顯示原始文字(&H)"
- 
- #: kbabel/kbabel.cpp:649
- msgid "&Open File for Diff"
-@@ -3492,11 +3359,11 @@
- 
- #: kbabel/kbabel.cpp:653
- msgid "&Rough Translation..."
--msgstr "約略翻譯(&R)..."
-+msgstr "約略翻譯(&R)…"
- 
- #: kbabel/kbabel.cpp:657
- msgid "&Catalog Manager..."
--msgstr "目錄管理員(&C)..."
-+msgstr "目錄管理員(&C)…"
- 
- #: kbabel/kbabel.cpp:660
- msgid "Toggle Edit Mode"
-@@ -3550,24 +3417,22 @@
- 
- #: kbabel/kbabel.cpp:735 kbabel/kbabel.cpp:1605
- msgid "Line: %1 Col: %2"
--msgstr "行號： %1 列號 ： %2"
-+msgstr "列號： %1 列號 ： %2"
- 
- #: kbabel/kbabel.cpp:749
- msgid ""
--"<qt>"
--"<p><b>Statusbar</b></p>\n"
-+"<qt><p><b>Statusbar</b></p>\n"
- "<p>The statusbar displays some information about the opened file,\n"
- "like the total number of entries and the number of fuzzy and untranslated\n"
- "messages. Also the index and the status of the currently displayed entry is "
- "shown.</p></qt>"
- msgstr ""
--"<qt> "
--"<p><b>狀態列</b></p> "
--"<p>狀態列顯示關於目前檔案的資訊，像是訊息總數、模糊與未翻譯訊息數量等。另外還有目前訊息的狀態。</p></qt>"
-+"<qt> <p><b>狀態列</b></p> <p>狀態列顯示關於目前檔案的資訊，像是訊息總數、模糊"
-+"與未翻譯訊息數量等。另外還有目前訊息的狀態。</p></qt>"
- 
- #: kbabel/kbabel.cpp:767
- msgid "Perform &All Checks"
--msgstr "執行所有的檢查 (&A)"
-+msgstr "執行所有的檢查(&A)"
- 
- #: kbabel/kbabel.cpp:774
- msgid "C&heck Syntax"
-@@ -3638,8 +3503,8 @@
- #: kbabel/kbabelview2.cpp:538
- #, c-format
- msgid ""
--"An error occurred while trying to get the list of messages for this file from "
--"the database:\n"
-+"An error occurred while trying to get the list of messages for this file "
-+"from the database:\n"
- "%1"
- msgstr ""
- "從資料庫取得此檔案的訊息清單時發生錯誤：\n"
-@@ -3672,7 +3537,8 @@
- #: kbabel/kbabelview2.cpp:801
- msgid ""
- "The search string has not been found yet.\n"
--"However, the string might be found in the files being searched at the moment.\n"
-+"However, the string might be found in the files being searched at the "
-+"moment.\n"
- "Please try later."
- msgstr ""
- "還沒找到要搜尋的字串。\n"
-@@ -3711,10 +3577,11 @@
- 
- #: kbabel/charselectview.cpp:84
- msgid ""
--"<qt>"
--"<p><b>Character Selector</b></p>"
--"<p>This tool allows to insert special characters using double click.</p></qt>"
--msgstr "<qt> <p><b>字元選擇器</b></p> <p>這個工具可以讓您用雙擊滑鼠來插入特殊符號。</p></qt>"
-+"<qt><p><b>Character Selector</b></p><p>This tool allows to insert special "
-+"characters using double click.</p></qt>"
-+msgstr ""
-+"<qt> <p><b>字元選擇器</b></p> <p>這個工具可以讓您用雙擊滑鼠來插入特殊符號。</"
-+"p></qt>"
- 
- #: kbabel/gotodialog.cpp:41 kbabel/gotodialog.cpp:43
- msgid "Go to Entry"
-@@ -3814,17 +3681,14 @@
- #: rc.cpp:87
- #, no-c-format
- msgid ""
--"<qt>"
--"<p><b>Mark invalid as fuzzy</b>"
--"<p>\n"
-+"<qt><p><b>Mark invalid as fuzzy</b><p>\n"
- "<p>If you select this option, all items,\n"
- "which identifies the tool as invalid, will be\n"
- "marked as fuzzy and the resulting file\n"
- "will be saved.</p></qt>"
- msgstr ""
--"<qt> "
--"<p><b>將不合法的訊息標示為模糊訊息</b></p> "
--"<p>如果勾選此選項，被檢查工具認為不合法的會被標示為模糊訊息，並將結果儲存至檔案。</p></qt>"
-+"<qt> <p><b>將不合法的訊息標示為模糊訊息</b></p> <p>如果勾選此選項，被檢查工具"
-+"認為不合法的會被標示為模糊訊息，並將結果儲存至檔案。</p></qt>"
- 
- #. i18n: file ./catalogmanager/validationoptions.ui line 47
- #: rc.cpp:94
-@@ -3836,12 +3700,12 @@
- #: rc.cpp:97
- #, no-c-format
- msgid ""
--"<qt>"
--"<p><b>Do not validate fuzzy</b>"
--"<p>\n"
-+"<qt><p><b>Do not validate fuzzy</b><p>\n"
- "<p>If you select this option, all items\n"
- "marked as fuzzy will not be validated at all.</p></qt>"
--msgstr "<qt> <p><b>不要檢查標示為模糊的訊息</b></p> <p>勾選此選項的話，模糊訊息將不會被檢查是否合語法。</p></qt>"
-+msgstr ""
-+"<qt> <p><b>不要檢查標示為模糊的訊息</b></p> <p>勾選此選項的話，模糊訊息將不會"
-+"被檢查是否合語法。</p></qt>"
- 
- #. i18n: file ./commonui/diffpreferences.ui line 25
- #: rc.cpp:102
-@@ -3853,8 +3717,7 @@
- #: rc.cpp:105
- #, no-c-format
- msgid ""
--"<qt>"
--"<p><b>Source for difference lookup</b></p>\n"
-+"<qt><p><b>Source for difference lookup</b></p>\n"
- "<p>Here you can select a source, which should be used\n"
- "for finding a difference.</p>\n"
- "<p>You can select file, translation database or\n"
-@@ -3869,13 +3732,11 @@
- "by choosing <i>Tools->Diff->Open file for diff</i>\n"
- "in KBabel's main window.</p></qt>"
- msgstr ""
--"<qt> "
--"<p><b>差異比較的來源</b></p> "
--"<p>您可以選擇用於差異比較 (diff) 的來源。</p> "
--"<p>您可以選擇檔案，翻譯資料庫，或是相關的翻譯訊息。</p> "
--"<p>如果您選的是翻譯資料庫，那麼會從資料庫中取出訊息來比較差異。您必須在設定中打開<i>自動將訊息加入到資料庫</i>。</p> "
--"<p>您可以在 KBabel 主視窗中的 <i>工具 - 比較差異(Diff) - 開啟檔案並執行 Diff</i>來暫時執行訊息與檔案的比較。</p>"
--"</qt>"
-+"<qt> <p><b>差異比較的來源</b></p> <p>您可以選擇用於差異比較 (diff) 的來源。</"
-+"p> <p>您可以選擇檔案，翻譯資料庫，或是相關的翻譯訊息。</p> <p>如果您選的是翻"
-+"譯資料庫，那麼會從資料庫中取出訊息來比較差異。您必須在設定中打開<i>自動將訊息"
-+"加入到資料庫</i>。</p> <p>您可以在 KBabel 主視窗中的 <i>工具 - 比較差異"
-+"(Diff) - 開啟檔案並執行 Diff</i>來暫時執行訊息與檔案的比較。</p></qt>"
- 
- #. i18n: file ./commonui/diffpreferences.ui line 52
- #: rc.cpp:121
-@@ -3914,10 +3775,10 @@
- "<p>Note that this option has no effect if messages from\n"
- "the database are used for diffing.</p></qt>"
- msgstr ""
--"<qt> "
--"<p><b>比較差異來源檔案的基本資料夾</b></p> "
--"<p>您可以定義您要用於比較的檔案所存放的資料夾。如果要比較的檔案分別放在個別基本資料夾中相對應的位置，KBabel 可以自動開啟正確的檔案來做比較。</p> "
--"<p>注意，如果您選擇的是從資料庫來做比較，那這個選項就不會有任何作用。</p></qt>"
-+"<qt> <p><b>比較差異來源檔案的基本資料夾</b></p> <p>您可以定義您要用於比較的檔"
-+"案所存放的資料夾。如果要比較的檔案分別放在個別基本資料夾中相對應的位置，"
-+"KBabel 可以自動開啟正確的檔案來做比較。</p> <p>注意，如果您選擇的是從資料庫來"
-+"做比較，那這個選項就不會有任何作用。</p></qt>"
- 
- #. i18n: file ./commonui/klisteditor.ui line 151
- #: rc.cpp:152
-@@ -3950,19 +3811,16 @@
- "and also a type of the translation project.\n"
- "</p>"
- msgstr ""
--"<font size=\"+1\">歡迎來的專案精靈！</font> "
--"<br/> "
--"<p>這個精靈會協助您設定新的 KBabel 翻譯專案。</p> "
--"<p>首先，您要選擇專案名稱與儲存設定的檔案。</p> "
--"<p>然後設定要翻譯的語言，以及翻譯專案的型態</p>"
-+"<font size=\"+1\">歡迎來的專案精靈！</font> <br/> <p>這個精靈會協助您設定新"
-+"的 KBabel 翻譯專案。</p> <p>首先，您要選擇專案名稱與儲存設定的檔案。</p> <p>"
-+"然後設定要翻譯的語言，以及翻譯專案的型態</p>"
- 
- #. i18n: file ./commonui/projectwizardwidget.ui line 66
- #: rc.cpp:174 rc.cpp:251
- #, no-c-format
- msgid ""
- "<qt>\n"
--"<p><b>Configuration File Name</b>"
--"<br/>\n"
-+"<p><b>Configuration File Name</b><br/>\n"
- "The name of a file to store the configuration of the\n"
- "project.</p>\n"
- "</qt>"
-@@ -3980,13 +3838,14 @@
- msgid ""
- "<qt>\n"
- "<p>\n"
--"<b>Language</b>"
--"<br/>\n"
-+"<b>Language</b><br/>\n"
- "The destination language of the project, i.e., the language\n"
- "to translate into. It should follow the ISO 631 language naming\n"
- "standard.</p>\n"
- "</qt>"
--msgstr "<qt><p><b>語言</b> <br/> 這個專案是要翻譯成哪種語言。您應該遵循 ISO 631 語言命名標準。</p></qt>"
-+msgstr ""
-+"<qt><p><b>語言</b> <br/> 這個專案是要翻譯成哪種語言。您應該遵循 ISO 631 語言"
-+"命名標準。</p></qt>"
- 
- #. i18n: file ./commonui/projectwizardwidget.ui line 97
- #: rc.cpp:193
-@@ -3998,9 +3857,7 @@
- #: rc.cpp:196 rc.cpp:238
- #, no-c-format
- msgid ""
--"<qt>"
--"<p><b>Project name</b>"
--"<br/>\n"
-+"<qt><p><b>Project name</b><br/>\n"
- "The project name is an identification of a project for\n"
- "you. It is shown in the project configuration dialog\n"
- "as well as in the title of windows opened for the project.\n"
-@@ -4009,11 +3866,9 @@
- "<b>Note:</b> The project name cannot be later changed.<\n"
- "</p></qt>"
- msgstr ""
--"<qt> "
--"<p><b>專案名稱</b> "
--"<br/> 專案名稱會顯示在至專案設定對話框中，以及開啟這個專案時的視窗標頭中。"
--"<br/>"
--"<br/> <b>注意：</b>專案名稱決定了就沒辦法再改變了。</p></qt>"
-+"<qt> <p><b>專案名稱</b> <br/> 專案名稱會顯示在至專案設定對話框中，以及開啟這"
-+"個專案時的視窗標頭中。<br/><br/> <b>注意：</b>專案名稱決定了就沒辦法再改變"
-+"了。</p></qt>"
- 
- #. i18n: file ./commonui/projectwizardwidget.ui line 135
- #: rc.cpp:215
-@@ -4044,14 +3899,11 @@
- "</p>\n"
- "</qt>"
- msgstr ""
--"<qt> "
--"<p><b>專案型態</b> 專案型態允許您針對一些已知的翻譯計畫的特殊型態設定做調整。例如，它可以設定檢查工具，加速鍵的符號，還有標頭格式等。</p> "
--"<p>目前已知的型態有： "
--"<ul> "
--"<li><b>KDE</b>：KDE 的國際化專案</li> "
--"<li><b>GNOME</b>：GNOME 的翻譯專案</li> "
--"<li><b>翻譯機器人(Translation Robot)</b> "
--"<li><b>其它</b>：其他專案，此型態不會預設任何調整。</li> </ul></p></qt>"
-+"<qt> <p><b>專案型態</b> 專案型態允許您針對一些已知的翻譯計畫的特殊型態設定做"
-+"調整。例如，它可以設定檢查工具，加速鍵的符號，還有標頭格式等。</p> <p>目前已"
-+"知的型態有： <ul> <li><b>KDE</b>：KDE 的國際化專案</li> <li><b>GNOME</b>："
-+"GNOME 的翻譯專案</li> <li><b>翻譯機器人(Translation Robot)</b> <li><b>其它</"
-+"b>：其他專案，此型態不會預設任何調整。</li> </ul></p></qt>"
- 
- #. i18n: file ./commonui/projectwizardwidget.ui line 184
- #: rc.cpp:248
-@@ -4087,23 +3939,20 @@
- #: rc.cpp:290
- #, no-c-format
- msgid ""
--"<qt>"
--"<p><b>Translation Files</b></p>\n"
-+"<qt><p><b>Translation Files</b></p>\n"
- "<p>Type in the folders which contain all your PO and POT files.\n"
--"The files and the folders in these folders will then be merged into one "
--"tree.</p></qt>"
-+"The files and the folders in these folders will then be merged into one tree."
-+"</p></qt>"
- msgstr ""
--"<qt> "
--"<p><B>翻譯檔案</b></p> "
--"<p>請輸入您的 PO 與 POT 檔存放的資料夾名稱。它們會被合併到一個樹狀圖下。</p></qt>"
-+"<qt> <p><B>翻譯檔案</b></p> <p>請輸入您的 PO 與 POT 檔存放的資料夾名稱。它們"
-+"會被合併到一個樹狀圖下。</p></qt>"
- 
- #. i18n: file ./commonui/projectwizardwidget2.ui line 44
- #: rc.cpp:295
- #, no-c-format
- msgid ""
- "<font size=\"+1\">The Translation Files</font>\n"
--"<br/>"
--"<br/>\n"
-+"<br/><br/>\n"
- "If the project contains more than one file to translate, it\n"
- "better to organize the files. \n"
- "\n"
-@@ -4119,13 +3968,11 @@
- "leave the entries empty, the Catalog Manager\n"
- "will not work."
- msgstr ""
--"<font size=\"+1\">翻譯檔案</font> "
--"<br/>"
--"<br/> 如果專案中包含一個以上的檔案需要翻譯，最好能將它們組織起來。\n"
-+"<font size=\"+1\">翻譯檔案</font> <br/><br/> 如果專案中包含一個以上的檔案需要"
-+"翻譯，最好能將它們組織起來。\n"
- "KBabel 會區分兩種翻譯檔案：\n"
--"<ul> "
--"<li><b>樣本檔(templates)</b>：需要翻譯的檔案。</li> "
--"<li><b>已翻譯檔</b>：至少已經有部份翻譯的檔案。</li></ul>"
-+"<ul> <li><b>樣本檔(templates)</b>：需要翻譯的檔案。</li> <li><b>已翻譯檔</"
-+"b>：至少已經有部份翻譯的檔案。</li></ul>"
- 
- #. i18n: file ./kbabel/fontpreferences.ui line 25
- #: rc.cpp:319
-@@ -4185,8 +4032,8 @@
- #: rc.cpp:376
- #, no-c-format
- msgid ""
--"<qt>Here you can setup a color to display identified <b>mispelled</b> "
--"words and\n"
-+"<qt>Here you can setup a color to display identified <b>mispelled</b> words "
-+"and\n"
- "phrases.</qt>"
- msgstr "<qt>您可以設定<b>拼字錯誤</b>的顏色。</qt>"
- 
-@@ -4218,21 +4065,19 @@
- #: rc.cpp:392
- #, no-c-format
- msgid ""
--"<qt>"
--"<p><b>Automatically start search</b></p>\n"
-+"<qt><p><b>Automatically start search</b></p>\n"
- "<p>If this is activated, the search is automatically started \n"
- "whenever you switch to another entry in the editor. You can \n"
- "choose where to search with the combo box <b>Default Dictionary</b>.\n"
--"</p>"
--"<p>You can also start searching manually by choosing an entry in \n"
-+"</p><p>You can also start searching manually by choosing an entry in \n"
- "the popup menu that appears either when clicking \n"
- "<b>Dictionaries->Find...</b> or keeping the dictionary button \n"
- "in the toolbar pressed for a while.</p></qt>"
- msgstr ""
--"<qt> "
--"<p><b>自動開始搜尋</b></p> "
--"<p>如果開啟此選項，當您在編輯器內切換到其他項目時會自動開始搜尋。您可以在<b>預設字典</b>欄中選擇要搜尋哪裡。</p> "
--"<p>您也可以使用目錄中的<b>字典 - 尋找文字</b>，或是按住工具列中的字典按鈕一陣子來手動開始搜尋。</p></qt>"
-+"<qt> <p><b>自動開始搜尋</b></p> <p>如果開啟此選項，當您在編輯器內切換到其他項"
-+"目時會自動開始搜尋。您可以在<b>預設字典</b>欄中選擇要搜尋哪裡。</p> <p>您也可"
-+"以使用目錄中的<b>字典 - 尋找文字</b>，或是按住工具列中的字典按鈕一陣子來手動"
-+"開始搜尋。</p></qt>"
- 
- #. i18n: file ./kbabel/searchpreferences.ui line 65
- #: rc.cpp:402
-@@ -4244,8 +4089,7 @@
- #: rc.cpp:405
- #, no-c-format
- msgid ""
--"<qt>"
--"<p><b>Default Dictionary</b></p>\n"
-+"<qt><p><b>Default Dictionary</b></p>\n"
- "<p>Choose here where to search as default. \n"
- "This setting is used when searching is started automatically \n"
- "or when pressing the dictionary button in the toolbar.</p>\n"
-@@ -4253,10 +4097,9 @@
- "the desired dictionary from <b>Settings->Configure Dictionary</b>.\n"
- "</p></qt>"
- msgstr ""
--"<qt> "
--"<p><b>預設字典</b></p> "
--"<p>請選擇當自動開始搜尋或是手動開始搜尋時，預設要搜尋哪個字典。</p> "
--"<p>您可以在<b>設定 - 設定字典</b>中選擇要用的字典。</p></qt>"
-+"<qt> <p><b>預設字典</b></p> <p>請選擇當自動開始搜尋或是手動開始搜尋時，預設要"
-+"搜尋哪個字典。</p> <p>您可以在<b>設定 - 設定字典</b>中選擇要用的字典。</p></"
-+"qt>"
- 
- #. i18n: file ./kbabel/headerwidget.ui line 43
- #: rc.cpp:417
-@@ -4274,16 +4117,15 @@
- #: rc.cpp:426
- #, no-c-format
- msgid ""
--"<qt>"
--"<p><b>Automatically unset fuzzy status</b></p>\n"
--"<p>If this is activated and you are editing a fuzzy entry, the fuzzy status is "
--"automatically\n"
-+"<qt><p><b>Automatically unset fuzzy status</b></p>\n"
-+"<p>If this is activated and you are editing a fuzzy entry, the fuzzy status "
-+"is automatically\n"
- "unset (this means the string <i>, fuzzy</i>\n"
- "is removed from the entry's comment).</p></qt>"
- msgstr ""
--"<qt> "
--"<p><b>自動取消模糊翻譯狀態</b></p> "
--"<p>如果開啟此選項，當您編輯一個訊息之後，模糊的狀態就會自動被關閉。（換言之，在此訊息的標頭中的 ,fuzzy 字串就會被拿掉。）</p></qt>"
-+"<qt> <p><b>自動取消模糊翻譯狀態</b></p> <p>如果開啟此選項，當您編輯一個訊息之"
-+"後，模糊的狀態就會自動被關閉。（換言之，在此訊息的標頭中的 ,fuzzy 字串就會被"
-+"拿掉。）</p></qt>"
- 
- #. i18n: file ./kbabel/editorpreferences.ui line 68
- #: rc.cpp:432
-@@ -4295,8 +4137,7 @@
- #: rc.cpp:435
- #, no-c-format
- msgid ""
--"<qt>"
--"<p><b>Use clever editing</b></p>\n"
-+"<qt><p><b>Use clever editing</b></p>\n"
- "<p>Check this to make typing text more comfortable and let \n"
- "KBabel take care of some special characters that have to \n"
- "be quoted. For example typing '\\\"' will result in \n"
-@@ -4306,11 +4147,11 @@
- "<p>Note that this is just a hint: it is still possible to \n"
- "generate syntactically incorrect text.</p></qt>"
- msgstr ""
--"<qt> "
--"<p><b>使用聰明編輯</b></p> "
--"<p>這個選項可以讓輸入文字時更為便利，KBabel 會幫您處理一些特殊字元。例如輸入 '\\\"' 會自動幫您擴充成 '\\\\\\\"'，還有按下 "
--"Enter 鍵後會自動加入空白在一行的最後面，按 Shift-Enter 會在一行的最後面加入 '\\\\n'。</p> "
--"<p>注意，這只是個提示：您還是得注意語法上有沒有錯誤。</p></qt>"
-+"<qt> <p><b>使用聰明編輯</b></p> <p>這個選項可以讓輸入文字時更為便利，KBabel "
-+"會幫您處理一些特殊字元。例如輸入 '\\\"' 會自動幫您擴充成 '\\\\\\\"'，還有按"
-+"下 Enter 鍵後會自動加入空白在一列的最後面，按 Shift-Enter 會在一列的最後面加"
-+"入 '\\\\n'。</p> <p>注意，這只是個提示：您還是得注意語法上有沒有錯誤。</p></"
-+"qt>"
- 
- #. i18n: file ./kbabel/editorpreferences.ui line 89
- #: rc.cpp:446
-@@ -4322,17 +4163,15 @@
- #: rc.cpp:449
- #, no-c-format
- msgid ""
--"<qt>"
--"<p><b>Error recognition</b></p>\n"
-+"<qt><p><b>Error recognition</b></p>\n"
- "<p>Here you can set how to show that an error occurred. \n"
- "<b>Beep on error</b> beeps and <b>Change text color on error\n"
- "</b> changes the color of the translated text. If none is \n"
- "activated, you will still see a message in the statusbar.\n"
- "</p></qt>"
- msgstr ""
--"<qt> "
--"<p><b>辨識錯誤</b></p> "
--"<p>您可以設定錯誤要<b>發出嗶聲</b>或是要<b>改變文字顏色</b>。如果都不選的話，您會在狀態列看到訊息。</p></qt>"
-+"<qt> <p><b>辨識錯誤</b></p> <p>您可以設定錯誤要<b>發出嗶聲</b>或是要<b>改變文"
-+"字顏色</b>。如果都不選的話，您會在狀態列看到訊息。</p></qt>"
- 
- #. i18n: file ./kbabel/editorpreferences.ui line 113
- #: rc.cpp:457
-@@ -4386,11 +4225,12 @@
- #: rc.cpp:481
- #, no-c-format
- msgid ""
--"<qt>"
--"<p><b>Status LEDs</b></p>\n"
--"<p>Choose here where the status LEDs are displayed and what color they have.</p>"
--"</qt>"
--msgstr "<qt> <p><b>狀態燈號</b></p> <p>請選擇要顯示哪些狀態燈號，還有它們的顏色。</p></qt>"
-+"<qt><p><b>Status LEDs</b></p>\n"
-+"<p>Choose here where the status LEDs are displayed and what color they have."
-+"</p></qt>"
-+msgstr ""
-+"<qt> <p><b>狀態燈號</b></p> <p>請選擇要顯示哪些狀態燈號，還有它們的顏色。</"
-+"p></qt>"
- 
- #. i18n: file ./kbabel/editorpreferences.ui line 224
- #: rc.cpp:485
-@@ -4898,7 +4738,7 @@
- #: rc.cpp:830
- #, no-c-format
- msgid "Setup Filter..."
--msgstr "設定過濾器..."
-+msgstr "設定過濾器…"
- 
- #. i18n: file ./kbabeldict/modules/dbsearchengine2/sourcedialog.ui line 223
- #: rc.cpp:833
-@@ -4944,7 +4784,8 @@
- "according to the rules defined in tabs <strong> Generic </strong>\n"
- "and <strong>Match</strong>"
- msgstr ""
--"<qml>掃描整個資料庫，並傳回符合 <strong>一般</strong>頁與 <strong>符合</strong> 頁中所定義的規則的項目。"
-+"<qml>掃描整個資料庫，並傳回符合 <strong>一般</strong>頁與 <strong>符合</"
-+"strong> 頁中所定義的規則的項目。"
- 
- #. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 88
- #: rc.cpp:856 rc.cpp:1061
-@@ -4958,13 +4799,14 @@
- msgid ""
- "<qml>Search in a list of <em>good keys</em> (see <strong>Good keys</strong> "
- "tab) with rules defined in <strong>Search</strong> tab.\n"
--"This is the best way to search because the <em>good keys</em> "
--"list probably contains all the keys that match with your query. However, it is "
--"smaller than the whole database."
--msgstr ""
--"<qml>根據 <strong>搜尋</strong> 頁中定義的規則，以<em>好的鍵值(Good keys)</em>清單來搜尋（請參考<strong>"
--"好的鍵值</strong>頁）。\n"
--"這是最好的搜尋方式，因為<em>好的鍵值</em>清單中包含了所有符合您查詢的關鍵字，不過它比整個資料庫要小。"
-+"This is the best way to search because the <em>good keys</em> list probably "
-+"contains all the keys that match with your query. However, it is smaller "
-+"than the whole database."
-+msgstr ""
-+"<qml>根據 <strong>搜尋</strong> 頁中定義的規則，以<em>好的鍵值(Good keys)</"
-+"em>清單來搜尋（請參考<strong>好的鍵值</strong>頁）。\n"
-+"這是最好的搜尋方式，因為<em>好的鍵值</em>清單中包含了所有符合您查詢的關鍵字，"
-+"不過它比整個資料庫要小。"
- 
- #. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 103
- #: rc.cpp:863 rc.cpp:1068
-@@ -4976,9 +4818,11 @@
- #: rc.cpp:866 rc.cpp:1071
- #, no-c-format
- msgid ""
--"<qml>Returns the whole <em>good keys</em> list. Rules defined in <strong>"
--"Search</strong> tab are ignored."
--msgstr "<qml>傳回整個<em>好的鍵值</em>清單。定義在 <strong>搜尋</strong>頁中的規則會被忽略。"
-+"<qml>Returns the whole <em>good keys</em> list. Rules defined in "
-+"<strong>Search</strong> tab are ignored."
-+msgstr ""
-+"<qml>傳回整個<em>好的鍵值</em>清單。定義在 <strong>搜尋</strong>頁中的規則會"
-+"被忽略。"
- 
- #. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 116
- #: rc.cpp:869 rc.cpp:1074
-@@ -4990,9 +4834,11 @@
- #: rc.cpp:872 rc.cpp:1077
- #, no-c-format
- msgid ""
--"<qml>If it is checked the search will be case sensitive. It is ignored if you "
--"use <em>Return the list of \"good keys\"</em> search mode."
--msgstr "<qml>如果勾選此選項，搜尋時會區分大小寫。如果您使用<em>傳回好的鍵值清單</em>模式時則會被忽略。"
-+"<qml>If it is checked the search will be case sensitive. It is ignored if "
-+"you use <em>Return the list of \"good keys\"</em> search mode."
-+msgstr ""
-+"<qml>如果勾選此選項，搜尋時會區分大小寫。如果您使用<em>傳回好的鍵值清單</em>"
-+"模式時則會被忽略。"
- 
- #. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 127
- #: rc.cpp:875 rc.cpp:1080
-@@ -5005,8 +4851,8 @@
- #, no-c-format
- msgid ""
- "Remove white spaces at the beginning and at the end of the phrase.\n"
--"It also substitutes groups of more than one space character with only one space "
--"character."
-+"It also substitutes groups of more than one space character with only one "
-+"space character."
- msgstr ""
- "移除片語開頭與結尾的空格。\n"
- "另外也會去除多餘的空格。"
-@@ -5111,22 +4957,20 @@
- #: rc.cpp:930 rc.cpp:1135
- #, no-c-format
- msgid ""
--"<qml>If you use one or two <em>word substitution</em> "
--"each time you search a phrase with less than the specified number of words, the "
--"search engine will also search for all phrases that differ from the original "
--"one in one or two words."
--"<p>\n"
--"<strong>Example:</strong>"
--"<br>\n"
--"If you search for <em>My name is Andrea</em> and you have activated <em>"
--"one word substitution</em> you may also find phrases like <em>"
--"My name is Joe</em> or <em>Your name is Andrea</em>."
--msgstr ""
--"<qml>如果您使用<em>單字替換</em>，在您查詢不太長的片語或句子時，搜尋引擎也會幫您找出只有一個字或兩個字不同的片語或句子。\n"
--"<p><strong>例如：</strong> "
--"<br>\n"
--"如果您搜尋<em>My name is Andrea</em>，並打開<em>替換一個單字</em>功能，您也會查到像<em>"
--"My name is Joe</em>或是<em>Your name is Andrea</em>。"
-+"<qml>If you use one or two <em>word substitution</em> each time you search a "
-+"phrase with less than the specified number of words, the search engine will "
-+"also search for all phrases that differ from the original one in one or two "
-+"words.<p>\n"
-+"<strong>Example:</strong><br>\n"
-+"If you search for <em>My name is Andrea</em> and you have activated <em>one "
-+"word substitution</em> you may also find phrases like <em>My name is Joe</"
-+"em> or <em>Your name is Andrea</em>."
-+msgstr ""
-+"<qml>如果您使用<em>單字替換</em>，在您查詢不太長的片語或句子時，搜尋引擎也會"
-+"幫您找出只有一個字或兩個字不同的片語或句子。\n"
-+"<p><strong>例如：</strong> <br>\n"
-+"如果您搜尋<em>My name is Andrea</em>，並打開<em>替換一個單字</em>功能，您也會"
-+"查到像<em>My name is Joe</em>或是<em>Your name is Andrea</em>。"
- 
- #. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 402
- #: rc.cpp:935 rc.cpp:1140
-@@ -5180,8 +5024,8 @@
- #: rc.cpp:965 rc.cpp:1170
- #, no-c-format
- msgid ""
--"Automatically add an entry to the database if a new translation is notified by "
--"someone (may be kbabel)"
-+"Automatically add an entry to the database if a new translation is notified "
-+"by someone (may be kbabel)"
- msgstr "如果 KBabel 找到新的翻譯則自動將訊息加入到資料庫。"
- 
- #. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 617
-@@ -5194,11 +5038,12 @@
- #: rc.cpp:971 rc.cpp:1176
- #, no-c-format
- msgid ""
--"<qml>Put here the name and email address that you want to use as <em>"
--"last translator</em> filed when you auto-add entry to the database (e.g. when "
--"you modify a translation with kbabel)."
--"<p>"
--msgstr "<qml>請在此輸入您在自動加入資料庫時要放在<em>最新翻譯者</em>欄位中的姓名與電子郵件地址。<p>"
-+"<qml>Put here the name and email address that you want to use as <em>last "
-+"translator</em> filed when you auto-add entry to the database (e.g. when you "
-+"modify a translation with kbabel).<p>"
-+msgstr ""
-+"<qml>請在此輸入您在自動加入資料庫時要放在<em>最新翻譯者</em>欄位中的姓名與電"
-+"子郵件地址。<p>"
- 
- #. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 635
- #: rc.cpp:974
-@@ -5216,7 +5061,7 @@
- #: rc.cpp:980
- #, no-c-format
- msgid "Scan Folder && Subfolders"
--msgstr "掃瞄目錄及子目錄"
-+msgstr "掃描目錄及子目錄"
- 
- #. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 673
- #: rc.cpp:983 rc.cpp:1188
-@@ -5252,7 +5097,7 @@
- #: rc.cpp:998 rc.cpp:1203
- #, no-c-format
- msgid "Export..."
--msgstr "匯出..."
-+msgstr "匯出…"
- 
- #. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 798
- #: rc.cpp:1004 rc.cpp:1209
-@@ -5270,27 +5115,22 @@
- #: rc.cpp:1013 rc.cpp:1218
- #, no-c-format
- msgid ""
--"<qml>Here you can define how to fill the <em>good keys list</em>."
--"<p>\n"
--"You can set the minimum number of words of the query that a key must have to be "
--"inserted in the <em>good keys list</em>."
--"<p>\n"
-+"<qml>Here you can define how to fill the <em>good keys list</em>.<p>\n"
-+"You can set the minimum number of words of the query that a key must have to "
-+"be inserted in the <em>good keys list</em>.<p>\n"
- "You can also set the minimum number of words of the key that the query must "
--"have to insert the key in the list."
--"<p>\n"
-+"have to insert the key in the list.<p>\n"
- "These two numbers are the percentage of the total number of words. If the "
- "result of this percentage is less than one, the engine will set it to one."
- "<p>\n"
- "Finally you can set the maximum number of entries in the list."
- msgstr ""
--"<qml>您可以在此定義要如何填入<em>好的鍵值清單</em>。"
--"<p>\n"
-+"<qml>您可以在此定義要如何填入<em>好的鍵值清單</em>。<p>\n"
- "您可以設定在查詢字串中至少必須含有多少比例的<em>好的鍵值清單</em>中的單字。 "
- "<p>\n"
- "您也可以設定查詢字串中至少必須含有多少比例的清單中的字，才能被放進清單中。"
- "<p>\n"
--"這兩個數字是佔單字總數的百分比。如果這個數字小於一，則會被重設為一。 "
--"<p>\n"
-+"這兩個數字是佔單字總數的百分比。如果這個數字小於一，則會被重設為一。 <p>\n"
- "最後您要設定上列數值的最大值。"
- 
- #. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 849
-@@ -5351,13 +5191,13 @@
- #: rc.cpp:1182
- #, no-c-format
- msgid "Scan Folder..."
--msgstr "掃瞄目錄"
-+msgstr "掃描目錄"
- 
- #. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 648
- #: rc.cpp:1185
- #, no-c-format
- msgid "Scan Folder && Subfolders..."
--msgstr "掃瞄目錄及子目錄"
-+msgstr "掃描目錄及子目錄"
- 
- #. i18n: file ./kbabeldict/modules/poauxiliary/pwidget.ui line 39
- #: rc.cpp:1252
-@@ -5375,23 +5215,22 @@
- #: rc.cpp:1258
- #, no-c-format
- msgid ""
--"<qt>"
--"<p>\n"
-+"<qt><p>\n"
- "The following variables will be replaced in the path if available:\n"
- "<ul>\n"
- "<li><b>@PACKAGE@</b>: the name of the currently translated application or "
- "package</li>\n"
- "<li><b>@LANG@</b>: the language code</li>\n"
--"<li><b>@DIR<em>n</em>@</b>: where n is a positive integer. This expands to the "
--"nth folder counted from the filename</li>\n"
-+"<li><b>@DIR<em>n</em>@</b>: where n is a positive integer. This expands to "
-+"the nth folder counted from the filename</li>\n"
- "</ul></p></qt>"
- msgstr ""
--"<qt>"
--"<p>以下的符號會在路徑中被取代：\n"
-+"<qt><p>以下的符號會在路徑中被取代：\n"
- "<ul>\n"
- "<li><b>@PACKAGE@</b>：目前翻譯的應用程式或套件名稱</li>\n"
- "<li><b>@LANG@</b>：語言代碼</li>\n"
--"<li><b>@DIR<em>n</em>@</b>：n是個正整數。這是指從檔名算起第 n 個資料夾名稱。</li>\n"
-+"<li><b>@DIR<em>n</em>@</b>：n是個正整數。這是指從檔名算起第 n 個資料夾名稱。"
-+"</li>\n"
- "</ul></p></qt>"
- 
- #: kbabeldict/kbabeldictbox.cpp:201
-@@ -5513,40 +5352,36 @@
- 
- #: kbabeldict/modules/tmx/preferenceswidget.cpp:88
- msgid ""
--"<qt>"
--"<p><b>Parameters</b></p>"
--"<p>Here you can fine-tune searching within the PO file. For example, if you "
--"want to perform a case sensitive search.</p></qt>"
--msgstr "<qt> <p><b>參數</b></p> <p>您可以微調 PO 檔的搜尋參數。例如區分大小寫。</p></qt>"
-+"<qt><p><b>Parameters</b></p><p>Here you can fine-tune searching within the "
-+"PO file. For example, if you want to perform a case sensitive search.</p></"
-+"qt>"
-+msgstr ""
-+"<qt> <p><b>參數</b></p> <p>您可以微調 PO 檔的搜尋參數。例如區分大小寫。</p></"
-+"qt>"
- 
- #: kbabeldict/modules/pocompendium/preferenceswidget.cpp:96
- #: kbabeldict/modules/tmx/preferenceswidget.cpp:94
- msgid ""
--"<qt>"
--"<p><b>Comparison Options</b></p>"
--"<p>Choose here which messages you want to have treated as a matching "
--"message.</p></qt>"
-+"<qt><p><b>Comparison Options</b></p><p>Choose here which messages you want "
-+"to have treated as a matching message.</p></qt>"
- msgstr "<qt><p><b>比較參數</b></p><p>從這裡設定用來搜尋的檔案。</p></qt>"
- 
- #: kbabeldict/modules/pocompendium/preferenceswidget.cpp:104
- #: kbabeldict/modules/tmx/preferenceswidget.cpp:102
- msgid ""
--"<qt>"
--"<p><b>3-Gram-matching</b></p>"
--"<p>A message matches another if most of its 3-letter groups are contained in "
--"the other message. e.g. 'abc123' matches 'abcx123c12'.</p></qt>"
--msgstr ""
--"<qt>"
--"<p><b>3-Gram-matching</b></p>"
--"<p>在此方法中，將訊息以三個字母為一組。如果其中一個訊息包含了另一個訊息大部份的三個字母的群組，則判定為符合。例如： abc123 與 abcx123c12 "
--"相符。</q></qt>"
-+"<qt><p><b>3-Gram-matching</b></p><p>A message matches another if most of its "
-+"3-letter groups are contained in the other message. e.g. 'abc123' matches "
-+"'abcx123c12'.</p></qt>"
-+msgstr ""
-+"<qt><p><b>3-Gram-matching</b></p><p>在此方法中，將訊息以三個字母為一組。如果"
-+"其中一個訊息包含了另一個訊息大部份的三個字母的群組，則判定為符合。例如： "
-+"abc123 與 abcx123c12 相符。</q></qt>"
- 
- #: kbabeldict/modules/pocompendium/preferenceswidget.cpp:109
- #: kbabeldict/modules/tmx/preferenceswidget.cpp:107
- msgid ""
--"<qt>"
--"<p><b>Location</b></p>"
--"<p>Configure here which file is to be used for searching.</p></qt>"
-+"<qt><p><b>Location</b></p><p>Configure here which file is to be used for "
-+"searching.</p></qt>"
- msgstr "<qt><p><b>位置</b></p><p>從這裡設定用來搜尋的檔案。</p></qt>"
- 
- #: kbabeldict/modules/pocompendium/compendiumdata.cpp:79
-@@ -5602,15 +5437,12 @@
- 
- #: kbabeldict/modules/pocompendium/preferenceswidget.cpp:88
- msgid ""
--"<qt>"
--"<p><b>Parameters</b></p>"
--"<p>Here you can fine-tune searching within the PO file. For example if you want "
--"to perform a case sensitive search, or if you want fuzzy messages to be "
--"ignored.</p></qt>"
--msgstr ""
--"<qt> "
--"<p><b>參數</b></p> "
--"<p>您可以微調 PO 檔的搜尋參數。例如如果您想要區分大小寫，或是要忽略模糊訊息等等。</p></qt>"
-+"<qt><p><b>Parameters</b></p><p>Here you can fine-tune searching within the "
-+"PO file. For example if you want to perform a case sensitive search, or if "
-+"you want fuzzy messages to be ignored.</p></qt>"
-+msgstr ""
-+"<qt> <p><b>參數</b></p> <p>您可以微調 PO 檔的搜尋參數。例如如果您想要區分大小"
-+"寫，或是要忽略模糊訊息等等。</p></qt>"
- 
- #: kbabeldict/modules/pocompendium/compendiumdata.cpp:93
- #, c-format
-@@ -5644,12 +5476,10 @@
- msgid ""
- "<h3>Chunk by chunk</h3>CHANGE THIS TEXT!!!!This translation isobtained "
- "translating the  sentences and using afuzzy sentence translation database."
--"<br> <b>Do not rely on it</b>. Translations may be fuzzy."
--"<br>"
-+"<br> <b>Do not rely on it</b>. Translations may be fuzzy.<br>"
- msgstr ""
--"<h3>以句子資料庫(chunk by chunk)</h3>注意！這種方式是用個模糊的句子翻譯資料庫來進行翻譯。"
--"<br> <b>請不要依賴這個字典</b>。翻譯可能是模糊翻譯。"
--"<br>"
-+"<h3>以句子資料庫(chunk by chunk)</h3>注意！這種方式是用個模糊的句子翻譯資料庫"
-+"來進行翻譯。<br> <b>請不要依賴這個字典</b>。翻譯可能是模糊翻譯。<br>"
- 
- #: kbabeldict/modules/dbsearchengine2/algorithms.cpp:374
- #: kbabeldict/modules/dbsearchengine2/algorithms.cpp:386
-@@ -5660,13 +5490,11 @@
- #: kbabeldict/modules/dbsearchengine2/algorithms.cpp:387
- msgid ""
- "<h3>Dynamic Dictionary</h3>This is a dynamic dictionary created looking for "
--"correlation of original and translated words."
--"<br> <b>Do not rely on it</b>. Translations may be fuzzy."
--"<br>"
--msgstr ""
--"<h3>動態字典(dynamic dictionary)</h3>這是建立來搜尋原始與翻譯文字關聯性的動態字典。"
--"<br> <b>請不要依賴這個字典</b>。翻譯可能是模糊翻譯。"
--"<br>"
-+"correlation of original and translated words.<br> <b>Do not rely on it</b>. "
-+"Translations may be fuzzy.<br>"
-+msgstr ""
-+"<h3>動態字典(dynamic dictionary)</h3>這是建立來搜尋原始與翻譯文字關聯性的動態"
-+"字典。<br> <b>請不要依賴這個字典</b>。翻譯可能是模糊翻譯。<br>"
- 
- #: kbabeldict/modules/dbsearchengine2/database.cpp:142
- msgid "Create Database"
-@@ -5736,22 +5564,22 @@
- 
- #: kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp:176
- msgid ""
--"<p>There are backup database files from previous versions of KBabel. However, "
--"another version of KBabel (probably from KDE 3.1.1 or 3.1.2) created a new "
--"database. As a result, your KBabel installation contains two versions of "
--"database files. Unfortunatelly, the old and new version can not be merged. You "
--"need to choose one of them."
--"<br/>"
--"<br/>If you choose the old version, the new one will be removed. If you choose "
--"the new version, the old database files will be left alone and you need to "
--"remove them manually. Otherwise this message will be displayed again (the old "
--"files are at $KDEHOME/share/apps/kbabeldict/dbsearchengine/*,old).</p>"
--msgstr ""
--"<p>KBabel 以前的版本有使用備份的資料庫。但是其他版本的 KBabel（可能是 KDE 3.1.1 或 KDE 3.1.2 "
--"中的）建了新的資料庫。因此，您的 KBabel 目前有兩個版本的資料庫檔案，但是兩者沒辦法合併。您必須選擇使用哪一個。"
--"<br/> "
--"<br/>如果您選擇舊的資料庫，新的會被移除，反之若您選擇新的資料庫，舊的會被保留，等您自行將它移除。若您未移除，則這個訊息會再被顯示出來。（舊的資料庫檔案在 "
--"$KDEHOME/share/apps/kbabeldict/dbsearchengine/*,old）。</p>"
-+"<p>There are backup database files from previous versions of KBabel. "
-+"However, another version of KBabel (probably from KDE 3.1.1 or 3.1.2) "
-+"created a new database. As a result, your KBabel installation contains two "
-+"versions of database files. Unfortunatelly, the old and new version can not "
-+"be merged. You need to choose one of them.<br/><br/>If you choose the old "
-+"version, the new one will be removed. If you choose the new version, the old "
-+"database files will be left alone and you need to remove them manually. "
-+"Otherwise this message will be displayed again (the old files are at "
-+"$KDEHOME/share/apps/kbabeldict/dbsearchengine/*,old).</p>"
-+msgstr ""
-+"<p>KBabel 以前的版本有使用備份的資料庫。但是其他版本的 KBabel（可能是 KDE "
-+"3.1.1 或 KDE 3.1.2 中的）建了新的資料庫。因此，您的 KBabel 目前有兩個版本的資"
-+"料庫檔案，但是兩者沒辦法合併。您必須選擇使用哪一個。<br/> <br/>如果您選擇舊的"
-+"資料庫，新的會被移除，反之若您選擇新的資料庫，舊的會被保留，等您自行將它移"
-+"除。若您未移除，則這個訊息會再被顯示出來。（舊的資料庫檔案在 $KDEHOME/share/"
-+"apps/kbabeldict/dbsearchengine/*,old）。</p>"
- 
- #: kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp:185
- msgid "Old Database Found"
-@@ -5785,7 +5613,7 @@
- #: kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp:438
- #: kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp:647
- msgid "Unable to search now: a PO file scan is in progress"
--msgstr "目前無法搜尋： 正在進行 po 檔掃瞄"
-+msgstr "目前無法搜尋： 正在進行 po 檔掃描"
- 
- #: kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp:445
- msgid "Unable to open the database"
-@@ -5845,7 +5673,7 @@
- 
- #: kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp:1608
- msgid "Searching words"
--msgstr "搜尋文字中..."
-+msgstr "搜尋文字中…"
- 
- #: kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp:1850
- msgid "Process output"
-@@ -5887,7 +5715,7 @@
- 
- #: kbabeldict/kbabeldictview.cpp:108
- msgid "Sea&rch in translations"
--msgstr "在翻譯中找尋(&R)..."
-+msgstr "在翻譯中找尋(&R)…"
- 
- #: kbabeldict/kbabeldictview.cpp:125
- msgid "Settings:"
-@@ -5895,7 +5723,7 @@
- 
- #: kbabeldict/aboutmoduledlg.cpp:42
- msgid "Report Bug..."
--msgstr "錯誤回報..."
-+msgstr "錯誤回報…"
- 
- #: kbabeldict/kbabeldict.cpp:45
- msgid "KBabelDict"
-@@ -5903,7 +5731,7 @@
- 
- #: kbabeldict/kbabeldict.cpp:47
- msgid "About Module"
--msgstr "關於模組..."
-+msgstr "關於模組…"
- 
- #: kbabeldict/kbabeldict.cpp:48 kbabeldict/kbabeldict.cpp:104
- msgid "Hide Sett&ings"
-@@ -5927,12 +5755,12 @@
- 
- #: kbabeldict/dictchooser.cpp:84
- msgid "Move &Up"
--msgstr "上移 (&U)"
-+msgstr "上移(&U)"
- 
- #: kbabeldict/dictchooser.cpp:87
- msgid "Move &Down"
--msgstr "下移 (&D)"
-+msgstr "下移(&D)"
- 
- #: kbabeldict/dictchooser.cpp:90
- msgid "Con&figure..."
--msgstr "設定(&F)..."
-+msgstr "設定(&F)…"
-diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdesdk/kbugbuster.po kde-i18n-zh_TW-3.5.10/messages/kdesdk/kbugbuster.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdesdk/kbugbuster.po	2008-08-19 20:43:14.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdesdk/kbugbuster.po	2011-11-11 15:45:17.000000000 +0100
-@@ -6,8 +6,7 @@
- "Project-Id-Version: kbugbuster\n"
- "POT-Creation-Date: 2008-07-08 01:21+0200\n"
- "PO-Revision-Date: 2006-06-20 11:08+0800\n"
--"Last-Translator: Frank Weng (a.k.a. Franklin) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Chinese Traditional <zh-l10n@linux.org.tw>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
-@@ -134,7 +133,7 @@
- #: gui/kbbmainwindow.cpp:184 rc.cpp:54
- #, no-c-format
- msgid "C&lose..."
--msgstr "關閉(&L)..."
-+msgstr "關閉(&L)…"
- 
- #. i18n: file gui/cwbugdetailscontainer_base.ui line 136
- #: rc.cpp:57
-@@ -152,31 +151,31 @@
- #: rc.cpp:63
- #, no-c-format
- msgid "Re&assign..."
--msgstr "重新指定(&A)..."
-+msgstr "重新指定(&A)…"
- 
- #. i18n: file gui/cwbugdetailscontainer_base.ui line 169
- #: rc.cpp:66
- #, no-c-format
- msgid "Change &Title..."
--msgstr "變更標題(&T)..."
-+msgstr "變更標題(&T)…"
- 
- #. i18n: file gui/cwbugdetailscontainer_base.ui line 180
- #: rc.cpp:69
- #, no-c-format
- msgid "Chan&ge Severity..."
--msgstr "變更嚴重度(&G)..."
-+msgstr "變更嚴重度(&G)…"
- 
- #. i18n: file gui/cwbugdetailscontainer_base.ui line 202
- #: gui/kbbmainwindow.cpp:196 rc.cpp:72
- #, no-c-format
- msgid "&Reply..."
--msgstr "回覆(&R)..."
-+msgstr "回覆(&R)…"
- 
- #. i18n: file gui/cwbugdetailscontainer_base.ui line 213
- #: gui/kbbmainwindow.cpp:198 rc.cpp:75
- #, no-c-format
- msgid "Reply &Privately..."
--msgstr "私下回覆(&P)..."
-+msgstr "私下回覆(&P)…"
- 
- #. i18n: file gui/cwsearchwidget_base.ui line 38
- #: rc.cpp:81
-@@ -299,7 +298,7 @@
- 
- #: backend/bugjob.cpp:56
- msgid "Parsing..."
--msgstr "剖析中..."
-+msgstr "剖析中…"
- 
- #: backend/bugjob.cpp:67
- msgid "Ready."
-@@ -334,7 +333,7 @@
- 
- #: backend/bugsystem.cpp:151
- msgid "Retrieving My Bugs list..."
--msgstr "取得我的臭蟲清單中..."
-+msgstr "取得我的臭蟲清單中…"
- 
- #: backend/kbbprefs.cpp:137
- msgid "Bug Fixed in CVS"
-@@ -370,7 +369,7 @@
- 
- #: backend/mailsender.cpp:97
- msgid "Sending through sendmail..."
--msgstr "用 sendmail 送出..."
-+msgstr "用 sendmail 送出…"
- 
- #: backend/mailsender.cpp:105
- msgid "No running instance of KMail found."
-@@ -378,7 +377,7 @@
- 
- #: backend/mailsender.cpp:110
- msgid "Passing mail to KDE email program..."
--msgstr "將信件傳遞到 KDE 電子郵件程式..."
-+msgstr "將信件傳遞到 KDE 電子郵件程式…"
- 
- #: backend/mailsender.cpp:174
- msgid ""
-@@ -589,11 +588,11 @@
- 
- #: gui/cwbuglistcontainer.cpp:211
- msgid "Retrieving List of Outstanding Bugs for Product '%1'..."
--msgstr "取得產品 %1 的未解決的臭蟲清單..."
-+msgstr "取得產品 %1 的未解決的臭蟲清單…"
- 
- #: gui/cwbuglistcontainer.cpp:213
- msgid "Retrieving List of Outstanding Bugs for Product '%1' (Component %2)..."
--msgstr "取得產品 %1 （元件 %2）的未解決的臭蟲清單..."
-+msgstr "取得產品 %1 （元件 %2）的未解決的臭蟲清單…"
- 
- #: gui/cwbuglistcontainer.cpp:224
- msgid "Package '%1'"
-@@ -608,7 +607,9 @@
- "Welcome to KBugBuster, a tool to manage the KDE Bug Report System. With "
- "KBugBuster you can manage outstanding bug reports for KDE from a convenient "
- "front end."
--msgstr "歡迎來到 KBugBuster，管理 KDE 錯誤回報系統的工具。您可以用它來管理尚未解決的錯誤報告。"
-+msgstr ""
-+"歡迎來到 KBugBuster，管理 KDE 錯誤回報系統的工具。您可以用它來管理尚未解決的"
-+"錯誤報告。"
- 
- #: gui/kbbmainwindow.cpp:100
- msgid "Welcome to <b>KBugBuster</b>."
-@@ -656,15 +657,15 @@
- 
- #: gui/kbbmainwindow.cpp:171
- msgid "&Search by Product..."
--msgstr "搜尋產品(&S)..."
-+msgstr "搜尋產品(&S)…"
- 
- #: gui/kbbmainwindow.cpp:173
- msgid "Search by Bug &Number..."
--msgstr "搜尋臭蟲號碼(&N)..."
-+msgstr "搜尋臭蟲號碼(&N)…"
- 
- #: gui/kbbmainwindow.cpp:177
- msgid "Search by &Description..."
--msgstr "搜尋描述(&D)..."
-+msgstr "搜尋描述(&D)…"
- 
- #: gui/kbbmainwindow.cpp:207
- msgid "&Disconnected Mode"
-@@ -692,11 +693,11 @@
- 
- #: gui/kbbmainwindow.cpp:243
- msgid "Show Last Server Response..."
--msgstr "顯示最後一個伺服器回應..."
-+msgstr "顯示最後一個伺服器回應…"
- 
- #: gui/kbbmainwindow.cpp:246
- msgid "Show Bug HTML Source..."
--msgstr "顯示 臭蟲 HTML 源碼..."
-+msgstr "顯示 臭蟲 HTML 原始碼…"
- 
- #: gui/kbbmainwindow.cpp:344
- msgid "List of pending commands:"
-@@ -740,7 +741,7 @@
- 
- #: gui/kbbmainwindow.cpp:487
- msgid "Bug HTML Source"
--msgstr "臭蟲 HTML 源碼"
-+msgstr "臭蟲 HTML 原始碼"
- 
- #: gui/loadallbugsdlg.cpp:29
- #, c-format
-@@ -761,7 +762,7 @@
- 
- #: gui/messageeditor.cpp:34
- msgid "Add Button..."
--msgstr "新增按鍵..."
-+msgstr "新增按鍵…"
- 
- #: gui/messageeditor.cpp:38
- msgid "Remove Button"
-@@ -781,7 +782,7 @@
- 
- #: gui/msginputdialog.cpp:25
- msgid "&Edit Presets..."
--msgstr "編輯預先設定(&E)..."
-+msgstr "編輯預先設定(&E)…"
- 
- #: gui/msginputdialog.cpp:32
- #, c-format
-@@ -850,11 +851,11 @@
- 
- #: gui/preferencesdialog.cpp:92
- msgid "Add Server..."
--msgstr "新增伺服器..."
-+msgstr "新增伺服器…"
- 
- #: gui/preferencesdialog.cpp:95
- msgid "Edit Server..."
--msgstr "編輯伺服器..."
-+msgstr "編輯伺服器…"
- 
- #: gui/preferencesdialog.cpp:98
- msgid "Delete Server"
-@@ -862,7 +863,7 @@
- 
- #: gui/preferencesdialog.cpp:101
- msgid "Select Server From List..."
--msgstr "從清單中選擇伺服器..."
-+msgstr "從清單中選擇伺服器…"
- 
- #: gui/preferencesdialog.cpp:110
- msgid "Advanced"
-@@ -874,7 +875,7 @@
- 
- #: gui/preferencesdialog.cpp:120
- msgid "&KMail"
--msgstr "KMail (&K)"
-+msgstr "KMail(&K)"
- 
- #: gui/preferencesdialog.cpp:121
- msgid "D&irect"
-@@ -882,7 +883,7 @@
- 
- #: gui/preferencesdialog.cpp:122
- msgid "&Sendmail"
--msgstr "Sendmail (&S)"
-+msgstr "Sendmail(&S)"
- 
- #: gui/preferencesdialog.cpp:124
- msgid "Show closed bugs"
-diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdesdk/kcachegrind.po kde-i18n-zh_TW-3.5.10/messages/kdesdk/kcachegrind.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdesdk/kcachegrind.po	2008-08-19 20:43:14.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdesdk/kcachegrind.po	2011-11-11 15:45:17.000000000 +0100
-@@ -8,7 +8,7 @@
- "Project-Id-Version: kcachegrind\n"
- "POT-Creation-Date: 2008-07-08 01:21+0200\n"
- "PO-Revision-Date: 2007-10-03 10:39+0800\n"
--"Last-Translator: Chih-Wei Huang <cwhuang@linux.org.tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Chinese Traditional <zh-l10n@linux.org.tw>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
-@@ -47,11 +47,11 @@
- 
- #: tracedata.cpp:159
- msgid "Part Source Line"
--msgstr "源碼行部件"
-+msgstr "原始碼行部件"
- 
- #: tracedata.cpp:160
- msgid "Source Line"
--msgstr "源碼行"
-+msgstr "原始碼行"
- 
- #: tracedata.cpp:161
- msgid "Part Line Call"
-@@ -107,7 +107,7 @@
- 
- #: tracedata.cpp:174
- msgid "Function Source File"
--msgstr "函式源碼檔案"
-+msgstr "函式原始碼檔案"
- 
- #. i18n: file dumpselectionbase.ui line 300
- #: rc.cpp:144 rc.cpp:273 rc.cpp:318 rc.cpp:342 tracedata.cpp:175
-@@ -129,11 +129,11 @@
- 
- #: tracedata.cpp:179
- msgid "Part Source File"
--msgstr "程式源碼檔案部件"
-+msgstr "程式原始碼檔案部件"
- 
- #: tracedata.cpp:180
- msgid "Source File"
--msgstr "程式源碼檔案"
-+msgstr "程式原始碼檔案"
- 
- #: tracedata.cpp:181
- msgid "Part ELF Object"
-@@ -179,7 +179,7 @@
- 
- #: tracedata.cpp:5021
- msgid "Recalculating Function Cycles..."
--msgstr "重新計算函式循環..."
-+msgstr "重新計算函式循環…"
- 
- #. i18n: file dumpselectionbase.ui line 550
- #: callmapview.cpp:59 partselection.cpp:58 rc.cpp:192
-@@ -310,15 +310,14 @@
- 
- #: costtypeview.cpp:81
- msgid ""
--"<b>Cost Types List</b>"
--"<p>This list shows all cost types available and what the self/inclusive cost of "
--"the current selected function is for that cost type.</p>"
--"<p>By choosing a cost type from the list, you change the cost type of costs "
--"shown all over KCachegrind to be the selected one.</p>"
--msgstr ""
--"<b>花費類型清單</b>"
--"<p>這份清單顯示所有可用的花費類型（cost type）以及目前所選取的函式在該類型的自身與引入的花費。</p> "
--"<p>選取其中一種類型，您可以改變所有 KCachegrind 的花費成為該類型。</p>"
-+"<b>Cost Types List</b><p>This list shows all cost types available and what "
-+"the self/inclusive cost of the current selected function is for that cost "
-+"type.</p><p>By choosing a cost type from the list, you change the cost type "
-+"of costs shown all over KCachegrind to be the selected one.</p>"
-+msgstr ""
-+"<b>花費類型清單</b><p>這份清單顯示所有可用的花費類型（cost type）以及目前所選"
-+"取的函式在該類型的自身與引入的花費。</p> <p>選取其中一種類型，您可以改變所有 "
-+"KCachegrind 的花費成為該類型。</p>"
- 
- #: costtypeview.cpp:98
- msgid "Set Secondary Event Type"
-@@ -342,7 +341,7 @@
- 
- #: costtypeview.cpp:115
- msgid "New Cost Type ..."
--msgstr "新增花費類型..."
-+msgstr "新增花費類型…"
- 
- #: costtypeview.cpp:149 costtypeview.cpp:154
- #, c-format
-@@ -381,32 +380,29 @@
- 
- #: toplevel.cpp:288
- msgid ""
--"<b>The Parts Overview</b>"
--"<p>A trace consists of multiple trace parts when there are several profile data "
--"files from one profile run. The Trace Part Overview dockable shows these, "
--"horizontally ordered in execution time; the rectangle sizes are proportional to "
--"the total cost spent in the parts. You can select one or several parts to "
--"constrain all costs shown to these parts only.</p>"
--"<p>The parts are further subdivided: there is a partitioning and an callee "
--"split mode: "
--"<ul>"
--"<li>Partitioning: You see the partitioning into groups for a trace part, "
--"according to the group type selected. E.g. if ELF object groups are selected, "
--"you see colored rectangles for each used ELF object (shared library or "
--"executable), sized according to the cost spent therein.</li>"
--"<li>Callee: A rectangle showing the inclusive cost of the current selected "
--"function in the trace part is shown. This is split up into smaller rectangles "
--"to show the costs of its callees.</li></ul></p>"
--msgstr ""
--"<b>部件概觀</b>"
--"<p>當某個分析檔中還有多個分析資料檔時，這份概觀可以看到所有的追蹤部件。追蹤部件概觀水平軸為執行時間，矩形大小與部件的總花費成比例。您可以選擇多個部件來顯示這"
--"些部件的總花費。</p> "
--"<p>這些部件可以再更進一步細分：有分割模式與被呼叫者模式： "
--"<ul> "
--"<li>分割模式（Partitioning）：您可以看到追蹤部件被分割為多個群組，根據所選取的群組類型，例如選取了 ELF 物件群組，您可以看到每個被使用的 "
--"ELF 物件（分享函式庫或執行檔）都分別用彩色的矩形表示，矩形大小與花費成比例。</li> "
--"<li>被呼叫者（Callee）模式：顯示一個矩形，代表此追蹤部件裡目前所選取的函式的總花費。這裡面又分成小矩形，代表每個被呼叫者的花費。</li></ul>"
--"</p>"
-+"<b>The Parts Overview</b><p>A trace consists of multiple trace parts when "
-+"there are several profile data files from one profile run. The Trace Part "
-+"Overview dockable shows these, horizontally ordered in execution time; the "
-+"rectangle sizes are proportional to the total cost spent in the parts. You "
-+"can select one or several parts to constrain all costs shown to these parts "
-+"only.</p><p>The parts are further subdivided: there is a partitioning and an "
-+"callee split mode: <ul><li>Partitioning: You see the partitioning into "
-+"groups for a trace part, according to the group type selected. E.g. if ELF "
-+"object groups are selected, you see colored rectangles for each used ELF "
-+"object (shared library or executable), sized according to the cost spent "
-+"therein.</li><li>Callee: A rectangle showing the inclusive cost of the "
-+"current selected function in the trace part is shown. This is split up into "
-+"smaller rectangles to show the costs of its callees.</li></ul></p>"
-+msgstr ""
-+"<b>部件概觀</b><p>當某個分析檔中還有多個分析資料檔時，這份概觀可以看到所有的"
-+"追蹤部件。追蹤部件概觀水平軸為執行時間，矩形大小與部件的總花費成比例。您可以"
-+"選擇多個部件來顯示這些部件的總花費。</p> <p>這些部件可以再更進一步細分：有分"
-+"割模式與被呼叫者模式： <ul> <li>分割模式（Partitioning）：您可以看到追蹤部件"
-+"被分割為多個群組，根據所選取的群組類型，例如選取了 ELF 物件群組，您可以看到每"
-+"個被使用的 ELF 物件（分享函式庫或執行檔）都分別用彩色的矩形表示，矩形大小與花"
-+"費成比例。</li> <li>被呼叫者（Callee）模式：顯示一個矩形，代表此追蹤部件裡目"
-+"前所選取的函式的總花費。這裡面又分成小矩形，代表每個被呼叫者的花費。</li></"
-+"ul></p>"
- 
- #: toplevel.cpp:318
- msgid "Top Cost Call Stack"
-@@ -414,16 +410,15 @@
- 
- #: toplevel.cpp:320
- msgid ""
--"<b>The Top Cost Call Stack</b>"
--"<p>This is a purely fictional 'most probable' call stack. It is built up by "
--"starting with the current selected function and adds the callers/callees with "
--"highest cost at the top and to bottom.</p>"
--"<p>The <b>Cost</b> and <b>Calls</b> columns show the cost used for all calls "
--"from the function in the line above.</p>"
--msgstr ""
--"<b>最高花費呼叫堆疊</b>"
--"<p>這只是純虛構的「最有可能的」呼叫堆疊。它是從目前選取的函式開始，針對每個呼叫者與被呼叫者的最高花費放到堆疊中。</p> "
--"<p><b>花費</b>與<b>呼叫</b>欄位顯示呼叫所使用的花費。</p>"
-+"<b>The Top Cost Call Stack</b><p>This is a purely fictional 'most probable' "
-+"call stack. It is built up by starting with the current selected function "
-+"and adds the callers/callees with highest cost at the top and to bottom.</"
-+"p><p>The <b>Cost</b> and <b>Calls</b> columns show the cost used for all "
-+"calls from the function in the line above.</p>"
-+msgstr ""
-+"<b>最高花費呼叫堆疊</b><p>這只是純虛構的「最有可能的」呼叫堆疊。它是從目前選"
-+"取的函式開始，針對每個呼叫者與被呼叫者的最高花費放到堆疊中。</p> <p><b>花費</"
-+"b>與<b>呼叫</b>欄位顯示呼叫所使用的花費。</p>"
- 
- #: toplevel.cpp:333
- msgid "Flat Profile"
-@@ -431,19 +426,18 @@
- 
- #: toplevel.cpp:343
- msgid ""
--"<b>The Flat Profile</b>"
--"<p>The flat profile contains a group and a function selection list. The group "
--"list contains all groups where costs are spent in, depending on the chosen "
--"group type. The group list is hidden when group type 'Function' is selected."
--"<p>"
--"<p>The function list contains the functions of the selected group (or all for "
--"'Function' group type), ordered by the costs spent therein. Functions with "
--"costs less than 1% are hidden on default.</p>"
--msgstr ""
--"<b>簡單分析檔</b>"
--"<p>簡單分析檔（Flat "
--"Profile）包含一個群組與函式選取清單。根據所選取的群組型態，群組清單包含了所有花費到的群組。若是群組型態選擇為「函式」則群組清單會被隱藏起來。</p> "
--"<p>函式清單則包含了所選取的群組的函式，（如果群組型態為「函式」則包含所有的函式），依花費排序。花費少於 1% 的則預設為隱藏。</p>"
-+"<b>The Flat Profile</b><p>The flat profile contains a group and a function "
-+"selection list. The group list contains all groups where costs are spent in, "
-+"depending on the chosen group type. The group list is hidden when group type "
-+"'Function' is selected.<p><p>The function list contains the functions of the "
-+"selected group (or all for 'Function' group type), ordered by the costs "
-+"spent therein. Functions with costs less than 1% are hidden on default.</p>"
-+msgstr ""
-+"<b>簡單分析檔</b><p>簡單分析檔（Flat Profile）包含一個群組與函式選取清單。根"
-+"據所選取的群組型態，群組清單包含了所有花費到的群組。若是群組型態選擇為「函"
-+"式」則群組清單會被隱藏起來。</p> <p>函式清單則包含了所選取的群組的函式，（如"
-+"果群組型態為「函式」則包含所有的函式），依花費排序。花費少於 1% 的則預設為隱"
-+"藏。</p>"
- 
- #. i18n: file dumpselectionbase.ui line 16
- #: rc.cpp:84 toplevel.cpp:357 toplevel.cpp:609
-@@ -453,43 +447,34 @@
- 
- #: toplevel.cpp:367
- msgid ""
--"<b>Profile Dumps</b>"
--"<p>This dockable shows in the top part the list of loadable profile dumps in "
--"all subdirectories of: "
--"<ul>"
--"<li>current working directory of KCachegrind, i.e. where it was started from, "
--"and "
--"<li>the default profile dump directory given in the configuration.</ul> "
--"The list is sorted according the the target command profiled in the "
--"corresponding dump.</p>"
--"<p>On selecting a profile dump, information for it is shown in the bottom area "
--"of the dockable: "
--"<ul>"
--"<li><b>Options</b> allows you to view the profiled command and profile options "
--"of this dump. By changing any item, a new (yet unexisting) profile template is "
--"created. Press <b>Run Profile</b> to start aprofile run with these options in "
--"the background. "
--"<li><b>Info</b> gives detailed info on the selected dump like event cost "
--"summary and properties of the simulated cache. "
--"<li><b>State</b> is only available for current happening profiles runs. Press "
--"<b>Update</b> to see different counters of the run, and a stack trace of the "
--"current position in the program profiled. Check the <b>Every</b> "
--"option to let KCachegrind regularly poll these data. Check the <b>Sync</b> "
--"option to let the dockable activate the top function in the current loaded "
--"dump.</ul></p>"
--msgstr ""
--"<b>分析檔傾印（Profile dump）</b>"
--"<p>這個嵌入元件的上半部顯示以下目錄及其子目錄中，可載入的分析檔傾印： "
--"<ul>"
--"<li>目前 KCachegrind 的工作目錄；</li>"
--"<li>設定中所預設的分析檔傾印目錄。</li></ul> 這個清單依據分析檔分析的指令排序。</p> "
--"<p>選取某個分析檔傾印，其資訊會顯示在此元件的下半部： "
--"<ul>"
--"<li><b>選項</b>讓您可以檢視此分析檔分析的指令，以及此傾印的分析檔選項。改變任何項目，新的分析檔樣本就會建立（但未儲存）。按下「執行分析檔」就會在背景"
--"開始用新的選項來執行分析檔。</li> "
--"<li><b>資訊</b>為所選取的傾印的詳細資訊，包括事件花費概要，模擬的快取的屬性等。</li> "
--"<li><b>狀態</b>只對目前執行中的分析檔有用。按下「更新」可以看執行中的計數器，程式堆疊目前的位置。檢查每一個選項，讓 KCachegrind "
--"可以常規性地輪詢這些資料。檢查同步選項讓此元件同步。</li></ul></p>"
-+"<b>Profile Dumps</b><p>This dockable shows in the top part the list of "
-+"loadable profile dumps in all subdirectories of: <ul><li>current working "
-+"directory of KCachegrind, i.e. where it was started from, and <li>the "
-+"default profile dump directory given in the configuration.</ul> The list is "
-+"sorted according the the target command profiled in the corresponding dump.</"
-+"p><p>On selecting a profile dump, information for it is shown in the bottom "
-+"area of the dockable: <ul><li><b>Options</b> allows you to view the profiled "
-+"command and profile options of this dump. By changing any item, a new (yet "
-+"unexisting) profile template is created. Press <b>Run Profile</b> to start "
-+"aprofile run with these options in the background. <li><b>Info</b> gives "
-+"detailed info on the selected dump like event cost summary and properties of "
-+"the simulated cache. <li><b>State</b> is only available for current "
-+"happening profiles runs. Press <b>Update</b> to see different counters of "
-+"the run, and a stack trace of the current position in the program profiled. "
-+"Check the <b>Every</b> option to let KCachegrind regularly poll these data. "
-+"Check the <b>Sync</b> option to let the dockable activate the top function "
-+"in the current loaded dump.</ul></p>"
-+msgstr ""
-+"<b>分析檔傾印（Profile dump）</b><p>這個嵌入元件的上半部顯示以下目錄及其子目"
-+"錄中，可載入的分析檔傾印： <ul><li>目前 KCachegrind 的工作目錄；</li><li>設定"
-+"中所預設的分析檔傾印目錄。</li></ul> 這個清單依據分析檔分析的指令排序。</p> "
-+"<p>選取某個分析檔傾印，其資訊會顯示在此元件的下半部： <ul><li><b>選項</b>讓您"
-+"可以檢視此分析檔分析的指令，以及此傾印的分析檔選項。改變任何項目，新的分析檔"
-+"樣本就會建立（但未儲存）。按下「執行分析檔」就會在背景開始用新的選項來執行分"
-+"析檔。</li> <li><b>資訊</b>為所選取的傾印的詳細資訊，包括事件花費概要，模擬的"
-+"快取的屬性等。</li> <li><b>狀態</b>只對目前執行中的分析檔有用。按下「更新」可"
-+"以看執行中的計數器，程式堆疊目前的位置。檢查每一個選項，讓 KCachegrind 可以常"
-+"規性地輪詢這些資料。檢查同步選項讓此元件同步。</li></ul></p>"
- 
- #: toplevel.cpp:455
- msgid "&Duplicate"
-@@ -497,15 +482,14 @@
- 
- #: toplevel.cpp:459
- msgid ""
--"<b>Duplicate Current Layout</b>"
--"<p>Make a copy of the current layout.</p>"
--msgstr "<b>複製目前的佈局</b><p>複製目前的佈局。</p>"
-+"<b>Duplicate Current Layout</b><p>Make a copy of the current layout.</p>"
-+msgstr "<b>複製目前的布局</b><p>複製目前的布局。</p>"
- 
- #: toplevel.cpp:466
- msgid ""
--"<b>Remove Current Layout</b>"
--"<p>Delete current layout and make the previous active.</p>"
--msgstr "<b>移除目前的佈局</b><p>刪除目前的佈局，並回到上一個。</p>"
-+"<b>Remove Current Layout</b><p>Delete current layout and make the previous "
-+"active.</p>"
-+msgstr "<b>移除目前的布局</b><p>刪除目前的布局，並回到上一個。</p>"
- 
- #: toplevel.cpp:470
- msgid "&Go to Next"
-@@ -513,7 +497,7 @@
- 
- #: toplevel.cpp:474
- msgid "Go to Next Layout"
--msgstr "跳到下一個佈局"
-+msgstr "跳到下一個布局"
- 
- #: toplevel.cpp:477
- msgid "&Go to Previous"
-@@ -521,7 +505,7 @@
- 
- #: toplevel.cpp:481
- msgid "Go to Previous Layout"
--msgstr "跳到上一個佈局"
-+msgstr "跳到上一個布局"
- 
- #: toplevel.cpp:484
- msgid "&Restore to Default"
-@@ -529,7 +513,7 @@
- 
- #: toplevel.cpp:487
- msgid "Restore Layouts to Default"
--msgstr "還原佈局預設值"
-+msgstr "還原布局預設值"
- 
- #: toplevel.cpp:490
- msgid "&Save as Default"
-@@ -537,7 +521,7 @@
- 
- #: toplevel.cpp:493
- msgid "Save Layouts as Default"
--msgstr "儲存佈局為預設值"
-+msgstr "儲存布局為預設值"
- 
- #: toplevel.cpp:504
- msgid "<b>New</b><p>Open new empty KCachegrind window.</p>"
-@@ -545,12 +529,12 @@
- 
- #: toplevel.cpp:507
- msgid "&Add..."
--msgstr "新增(&A)..."
-+msgstr "新增(&A)…"
- 
- #: toplevel.cpp:510
- msgid ""
--"<b>Add Profile Data</b>"
--"<p>This opens an additional profile data file in the current window.</p>"
-+"<b>Add Profile Data</b><p>This opens an additional profile data file in the "
-+"current window.</p>"
- msgstr "<b>新增分析檔資料</b> <p>在目前視窗中開啟新的分析資料檔。</p>"
- 
- #: toplevel.cpp:522
-@@ -563,10 +547,10 @@
- 
- #: toplevel.cpp:530
- msgid ""
--"<b>Export Call Graph</b>"
--"<p>Generates a file with extension .dot for the tools of the GraphViz "
--"package.</p>"
--msgstr "<b>匯出呼叫圖</b> <p>產生副檔名為 .dot 的 GraphViz 套件工具的檔案。</p>"
-+"<b>Export Call Graph</b><p>Generates a file with extension .dot for the "
-+"tools of the GraphViz package.</p>"
-+msgstr ""
-+"<b>匯出呼叫圖</b> <p>產生副檔名為 .dot 的 GraphViz 套件工具的檔案。</p>"
- 
- #: toplevel.cpp:536
- msgid "&Force Dump"
-@@ -574,35 +558,36 @@
- 
- #: toplevel.cpp:545
- msgid ""
--"<b>Force Dump</b>"
--"<p>This forces a dump for a Callgrind profile run in the current directory. "
--"This action is checked while KCachegrind looks for the dump. If the dump is "
--"finished, it automatically reloads the current trace. If this is the one from "
--"the running Callgrind, the new created trace part will be loaded, too.</p>"
--"<p>Force dump creates a file 'callgrind.cmd', and checks every second for its "
--"existence. A running Callgrind will detect this file, dump a trace part, and "
--"delete 'callgrind.cmd'. The deletion is detected by KCachegrind, and it does a "
--"Reload. If there's <em>no</em> Callgrind running, press 'Force Dump' again to "
--"cancel the dump request. This deletes 'callgrind.cmd' itself and stops polling "
--"for a new dump.</p>"
--"<p>Note: A Callgrind run <em>only</em> detects existence of 'callgrind.cmd' "
--"when actively running a few milliseconds, i.e. <em>not</em> "
--"sleeping. Tip: For a profiled GUI program, you can awake Callgrind e.g. by "
--"resizing a window of the program.</p>"
--msgstr ""
--"<b>強制傾印</b> "
--"<p>強制 Callgrind 執行分析檔傾印在目前的目錄中。當 KCachegrind "
--"要尋找傾印時可以勾選此選項。傾印完成後，會自動重新載入目前的追蹤。如果是 Callgrind 傾印，則也會載入新建立的追蹤部件。</p> "
--"<p>強制傾印會建立一個叫做 callgrind.cmd 的檔案，並每秒鐘檢查其存在與否。執行中的 Callgrind 會偵測此檔，傾印追蹤部件，並刪除 "
--"callgrind.cmd 檔。KCachegrind 會偵測到刪除的動作，並做重新載入。如果沒有執行 "
--"Callgrind，再按一次「強制傾印」會取消傾印的要求。這會刪除 callgrind.cmd 檔並停止輪詢新的傾印。</p> "
--"<p>注意：Callgrind 執行時只會在實際執行的時間（只有幾毫秒）才會偵測 callgrind.cmd "
--"檔的存在與否，休眠（Sleep）時並不會偵測。提示：若是使用者介面的程式分析檔，您可以用調整視窗大小來叫醒 Callgrind。</p>"
-+"<b>Force Dump</b><p>This forces a dump for a Callgrind profile run in the "
-+"current directory. This action is checked while KCachegrind looks for the "
-+"dump. If the dump is finished, it automatically reloads the current trace. "
-+"If this is the one from the running Callgrind, the new created trace part "
-+"will be loaded, too.</p><p>Force dump creates a file 'callgrind.cmd', and "
-+"checks every second for its existence. A running Callgrind will detect this "
-+"file, dump a trace part, and delete 'callgrind.cmd'. The deletion is "
-+"detected by KCachegrind, and it does a Reload. If there's <em>no</em> "
-+"Callgrind running, press 'Force Dump' again to cancel the dump request. This "
-+"deletes 'callgrind.cmd' itself and stops polling for a new dump.</p><p>Note: "
-+"A Callgrind run <em>only</em> detects existence of 'callgrind.cmd' when "
-+"actively running a few milliseconds, i.e. <em>not</em> sleeping. Tip: For a "
-+"profiled GUI program, you can awake Callgrind e.g. by resizing a window of "
-+"the program.</p>"
-+msgstr ""
-+"<b>強制傾印</b> <p>強制 Callgrind 執行分析檔傾印在目前的目錄中。當 "
-+"KCachegrind 要尋找傾印時可以勾選此選項。傾印完成後，會自動重新載入目前的追"
-+"蹤。如果是 Callgrind 傾印，則也會載入新建立的追蹤部件。</p> <p>強制傾印會建立"
-+"一個叫做 callgrind.cmd 的檔案，並每秒鐘檢查其存在與否。執行中的 Callgrind 會"
-+"偵測此檔，傾印追蹤部件，並刪除 callgrind.cmd 檔。KCachegrind 會偵測到刪除的動"
-+"作，並做重新載入。如果沒有執行 Callgrind，再按一次「強制傾印」會取消傾印的要"
-+"求。這會刪除 callgrind.cmd 檔並停止輪詢新的傾印。</p> <p>注意：Callgrind 執行"
-+"時只會在實際執行的時間（只有幾毫秒）才會偵測 callgrind.cmd 檔的存在與否，休眠"
-+"（Sleep）時並不會偵測。提示：若是使用者介面的程式分析檔，您可以用調整視窗大小"
-+"來叫醒 Callgrind。</p>"
- 
- #: toplevel.cpp:570
- msgid ""
--"<b>Open Profile Data</b>"
--"<p>This opens a profile data file, with possible multiple parts</p>"
-+"<b>Open Profile Data</b><p>This opens a profile data file, with possible "
-+"multiple parts</p>"
- msgstr "<b>開啟分析檔資料</b><p>開啟分析檔資料。</p>"
- 
- #: toplevel.cpp:586
-@@ -653,50 +638,24 @@
- 
- #: toplevel.cpp:643
- msgid ""
--"<b>Show percentage costs relative to parent</b>"
--"<p>If this is switched off, percentage costs are always shown relative to the "
--"total cost of the profile part(s) that are currently browsed. By turning on "
--"this option, percentage cost of shown cost items will be relative to the parent "
--"cost item."
--"<ul>"
--"<table>"
--"<tr>"
--"<td><b>Cost Type</td>"
--"<td><b>Parent Cost</td></tr>"
--"<tr>"
--"<td>Function Cumulative</td>"
--"<td>Total</td></tr>"
--"<tr>"
--"<td>Function Self</td>"
--"<td>Function Group (*) / Total</td></tr>"
--"<tr>"
--"<td>Call</td>"
--"<td>Function Cumulative</td></tr>"
--"<tr>"
--"<td>Source Line</td>"
--"<td>Function Cumulative</td></tr></table>"
--"<p>(*) Only if function grouping is switched on (e.g. ELF object grouping)."
--msgstr ""
--"<b>顯示相對於父項目的相關花費百分比</b> "
--"<p>關閉此選項的話，則花費百分比是以相對於目前瀏覽的分析檔部件的總花費。開啟此選項，則此百分比是相對於父項目的相關花費。 "
--"<ul>"
--"<table>"
--"<tr>"
--"<td>花費型態</td>"
--"<td>父項目花費</td></tr> "
--"<tr>"
--"<td>函式累積</td>"
--"<td>總計</td></tr> "
--"<tr>"
--"<td>函式本身</td>"
--"<td>函式群組(*) / 總計</td></tr> "
--"<tr>"
--"<td>呼叫</td>"
--"<td>函式累積</td></tr> "
--"<tr>"
--"<td>源碼行號</td>"
--"<td>函式累積</td></tr></table></p> "
--"<p>(*)：只有在打開函式群組時（例如 ELF 物件群組）</p>"
-+"<b>Show percentage costs relative to parent</b><p>If this is switched off, "
-+"percentage costs are always shown relative to the total cost of the profile "
-+"part(s) that are currently browsed. By turning on this option, percentage "
-+"cost of shown cost items will be relative to the parent cost item."
-+"<ul><table><tr><td><b>Cost Type</td><td><b>Parent Cost</td></"
-+"tr><tr><td>Function Cumulative</td><td>Total</td></tr><tr><td>Function Self</"
-+"td><td>Function Group (*) / Total</td></tr><tr><td>Call</td><td>Function "
-+"Cumulative</td></tr><tr><td>Source Line</td><td>Function Cumulative</td></"
-+"tr></table><p>(*) Only if function grouping is switched on (e.g. ELF object "
-+"grouping)."
-+msgstr ""
-+"<b>顯示相對於父項目的相關花費百分比</b> <p>關閉此選項的話，則花費百分比是以相"
-+"對於目前瀏覽的分析檔部件的總花費。開啟此選項，則此百分比是相對於父項目的相關"
-+"花費。 <ul><table><tr><td>花費型態</td><td>父項目花費</td></tr> <tr><td>函式"
-+"累積</td><td>總計</td></tr> <tr><td>函式本身</td><td>函式群組(*) / 總計</"
-+"td></tr> <tr><td>呼叫</td><td>函式累積</td></tr> <tr><td>原始碼列號</td><td>函"
-+"式累積</td></tr></table></p> <p>(*)：只有在打開函式群組時（例如 ELF 物件群"
-+"組）</p>"
- 
- #: toplevel.cpp:658
- msgid "Do Cycle Detection"
-@@ -708,23 +667,23 @@
- 
- #: toplevel.cpp:667
- msgid ""
--"<b>Detect recursive cycles</b>"
--"<p>If this is switched off, the treemap drawing will show black areas when a "
--"recursive call is made instead of drawing the recursion ad infinitum. Note that "
--"the size of black areas often will be wrong, as inside recursive cycles the "
--"cost of calls cannot be determined; the error is small, however, for false "
--"cycles (see documentation)."
--"<p>The correct handling for cycles is to detect them and collapse all functions "
--"of a cycle into a virtual function, which is done when this option is selected. "
--"Unfortunately, with GUI applications, this often will lead to huge false "
--"cycles, making the analysis impossible; therefore, there is the option to "
--"switch this off."
--msgstr ""
--"<b>偵測遞迴循環</b> "
--"<p>關閉此選項的話，樹狀圖會以黑色區域表示遞迴呼叫，而非無限制地畫遞迴。注意，黑色區域的大小通常會是錯的，因為遞迴循環時呼叫的花費無法立即決定。不過對假循環而"
--"言，這個問題並不大（請參考文件說明）。</p> "
--"<p>勾選此選項的話，會去偵測並展開所有的函式成為一虛擬函式，以便正確處理。不過，對使用者介面的應用程式來說，這會產生巨大的假循環，變得無法分析。因此，就必須關"
--"掉這個選項。</p>"
-+"<b>Detect recursive cycles</b><p>If this is switched off, the treemap "
-+"drawing will show black areas when a recursive call is made instead of "
-+"drawing the recursion ad infinitum. Note that the size of black areas often "
-+"will be wrong, as inside recursive cycles the cost of calls cannot be "
-+"determined; the error is small, however, for false cycles (see "
-+"documentation).<p>The correct handling for cycles is to detect them and "
-+"collapse all functions of a cycle into a virtual function, which is done "
-+"when this option is selected. Unfortunately, with GUI applications, this "
-+"often will lead to huge false cycles, making the analysis impossible; "
-+"therefore, there is the option to switch this off."
-+msgstr ""
-+"<b>偵測遞迴循環</b> <p>關閉此選項的話，樹狀圖會以黑色區域表示遞迴呼叫，而非無"
-+"限制地畫遞迴。注意，黑色區域的大小通常會是錯的，因為遞迴循環時呼叫的花費無法"
-+"立即決定。不過對假循環而言，這個問題並不大（請參考文件說明）。</p> <p>勾選此"
-+"選項的話，會去偵測並展開所有的函式成為一虛擬函式，以便正確處理。不過，對使用"
-+"者介面的應用程式來說，這會產生巨大的假循環，變得無法分析。因此，就必須關掉這"
-+"個選項。</p>"
- 
- #: toplevel.cpp:689 toplevel.cpp:729
- msgid "Go back in function selection history"
-@@ -736,10 +695,10 @@
- 
- #: toplevel.cpp:701 toplevel.cpp:715
- msgid ""
--"<b>Go Up</b>"
--"<p>Go to last selected caller of current function. If no caller was visited, "
--"use that with highest cost.</p>"
--msgstr "<b>往上</b><p>到此函式最後一個選取的呼叫者。如果沒有，則使用最高花費。</p>"
-+"<b>Go Up</b><p>Go to last selected caller of current function. If no caller "
-+"was visited, use that with highest cost.</p>"
-+msgstr ""
-+"<b>往上</b><p>到此函式最後一個選取的呼叫者。如果沒有，則使用最高花費。</p>"
- 
- #: toplevel.cpp:707
- msgid "&Up"
-@@ -791,7 +750,7 @@
- 
- #: toplevel.cpp:808
- msgid "Tip of the &Day..."
--msgstr "每日提示(&D)..."
-+msgstr "每日提示(&D)…"
- 
- #: toplevel.cpp:809
- msgid "Show \"Tip of the Day\""
-@@ -840,7 +799,7 @@
- #: toplevel.cpp:1926
- #, c-format
- msgid "Layout Count: %1"
--msgstr "佈局計數：%1"
-+msgstr "布局計數：%1"
- 
- #: toplevel.cpp:1933
- msgid "No profile data file loaded."
-@@ -890,26 +849,24 @@
- 
- #: instrview.cpp:132
- msgid "Source Position"
--msgstr "源碼位置"
-+msgstr "原始碼位置"
- 
- #: instrview.cpp:163
- msgid ""
--"<b>Annotated Assembler</b>"
--"<p>The annotated assembler list shows the machine code instructions of the "
--"current selected function together with (self) cost spent while executing an "
--"instruction. If this is a call instruction, lines with details on the call "
--"happening are inserted into the source: the cost spent inside of the call, the "
--"number of calls happening, and the call destination.</p>"
--"<p>The disassembler output shown is generated with the 'objdump' utility from "
--"the 'binutils' package.</p>"
--"<p>Select a line with call information to make the destination function of this "
--"call current.</p>"
--msgstr ""
--"<b>註記組譯器（Annotated Assembler）</b> "
--"<p>註記組譯器顯示目前選取的函式的機器碼指令，以及執行該指令時的花費。如果是呼叫指令，則呼叫時發生的詳情會插入到源碼中，包括呼叫的花費，呼叫的次數，以及呼叫的"
--"目的地。</p> "
--"<p>反組譯輸出可以用 objdump 產生，通常會包在 binutils 套件中。</p> "
--"<p>選取呼叫資訊中的某一行可以眺到被呼叫的函式。</p>"
-+"<b>Annotated Assembler</b><p>The annotated assembler list shows the machine "
-+"code instructions of the current selected function together with (self) cost "
-+"spent while executing an instruction. If this is a call instruction, lines "
-+"with details on the call happening are inserted into the source: the cost "
-+"spent inside of the call, the number of calls happening, and the call "
-+"destination.</p><p>The disassembler output shown is generated with the "
-+"'objdump' utility from the 'binutils' package.</p><p>Select a line with call "
-+"information to make the destination function of this call current.</p>"
-+msgstr ""
-+"<b>註記組譯器（Annotated Assembler）</b> <p>註記組譯器顯示目前選取的函式的機"
-+"器碼指令，以及執行該指令時的花費。如果是呼叫指令，則呼叫時發生的詳情會插入到"
-+"原始碼中，包括呼叫的花費，呼叫的次數，以及呼叫的目的地。</p> <p>反組譯輸出可以"
-+"用 objdump 產生，通常會包在 binutils 套件中。</p> <p>選取呼叫資訊中的某一列可"
-+"以眺到被呼叫的函式。</p>"
- 
- #: callgraphview.cpp:2397 callgraphview.cpp:2401 callgraphview.cpp:2419
- #: callview.cpp:123 callview.cpp:128 coverageview.cpp:166 instrview.cpp:191
-@@ -1009,45 +966,39 @@
- 
- #: callgraphview.cpp:1425
- msgid ""
--"<b>Call Graph around active Function</b>"
--"<p>Depending on configuration, this view shows the call graph environment of "
--"the active function. Note: the shown cost is <b>only</b> "
--"the cost which is spent while the active function was actually running; i.e. "
--"the cost shown for main() - if it's visible - should be the same as the cost of "
--"the active function, as that's the part of inclusive cost of main() spent while "
--"the active function was running.</p>"
--"<p>For cycles, blue call arrows indicate that this is an artificial call added "
--"for correct drawing which actually never happened.</p>"
--"<p>If the graph is larger than the widget area, an overview panner is shown in "
--"one edge. There are similar visualization options to the Call Treemap; the "
--"selected function is highlighted."
--"<p>"
--msgstr ""
--"<b>活躍函式的呼叫圖環境</b> "
--"<p>根據設定，此檢視顯示活躍函式的呼叫圖環境。注意：顯示的花費只表示此函式執行中的花費，也就是說，main() 函式顯示的花費會跟此函式的花費一樣，因為那是 "
--"main() 的引入花費。</p> "
--"<p>對循環而言，藍色的呼叫箭頭表示是人工加上去修正的，實際上不會發生。</p> "
--"<p>如果此圖大於元件的大小，則會在一邊顯示略圖。類似呼叫樹狀圖的視覺選項，選取的函式會被突顯。</p>"
-+"<b>Call Graph around active Function</b><p>Depending on configuration, this "
-+"view shows the call graph environment of the active function. Note: the "
-+"shown cost is <b>only</b> the cost which is spent while the active function "
-+"was actually running; i.e. the cost shown for main() - if it's visible - "
-+"should be the same as the cost of the active function, as that's the part of "
-+"inclusive cost of main() spent while the active function was running.</"
-+"p><p>For cycles, blue call arrows indicate that this is an artificial call "
-+"added for correct drawing which actually never happened.</p><p>If the graph "
-+"is larger than the widget area, an overview panner is shown in one edge. "
-+"There are similar visualization options to the Call Treemap; the selected "
-+"function is highlighted.<p>"
-+msgstr ""
-+"<b>活躍函式的呼叫圖環境</b> <p>根據設定，此檢視顯示活躍函式的呼叫圖環境。注"
-+"意：顯示的花費只表示此函式執行中的花費，也就是說，main() 函式顯示的花費會跟此"
-+"函式的花費一樣，因為那是 main() 的引入花費。</p> <p>對循環而言，藍色的呼叫箭"
-+"頭表示是人工加上去修正的，實際上不會發生。</p> <p>如果此圖大於元件的大小，則"
-+"會在一邊顯示略圖。類似呼叫樹狀圖的視覺選項，選取的函式會被突顯。</p>"
- 
- #: callgraphview.cpp:1789
- msgid ""
- "Warning: a long lasting graph layouting is in progress.\n"
- "Reduce node/edge limits for speedup.\n"
- msgstr ""
--"警告：正在進行長而持續的佈局作業。\n"
-+"警告：正在進行長而持續的布局作業。\n"
- "要加速，請降低節點與邊線的限制。\n"
- 
- #: callgraphview.cpp:1792
--msgid ""
--"Layouting stopped.\n"
--msgstr ""
--"佈局停止。\n"
-+msgid "Layouting stopped.\n"
-+msgstr "布局停止。\n"
- 
- #: callgraphview.cpp:1794
--msgid ""
--"The call graph has %1 nodes and %2 edges.\n"
--msgstr ""
--"呼叫圖中含有 %1 個節點與 %2 個邊線。\n"
-+msgid "The call graph has %1 nodes and %2 edges.\n"
-+msgstr "呼叫圖中含有 %1 個節點與 %2 個邊線。\n"
- 
- #: callgraphview.cpp:1827
- msgid "No item activated for which to draw the call graph."
-@@ -1071,10 +1022,8 @@
- msgstr "請檢查 dot 已安裝（在 GraphViz 套件中）"
- 
- #: callgraphview.cpp:2199
--msgid ""
--"Error running the graph layouting tool.\n"
--msgstr ""
--"執行圖形佈局工具時發生錯誤。\n"
-+msgid "Error running the graph layouting tool.\n"
-+msgstr "執行圖形布局工具時發生錯誤。\n"
- 
- #: callgraphview.cpp:2207
- msgid ""
-@@ -1085,7 +1034,7 @@
- 
- #: callgraphview.cpp:2428
- msgid "Stop Layouting"
--msgstr "停止佈局"
-+msgstr "停止布局"
- 
- #: callgraphview.cpp:2436
- msgid "As PostScript"
-@@ -1093,7 +1042,7 @@
- 
- #: callgraphview.cpp:2437
- msgid "As Image ..."
--msgstr "為影像檔..."
-+msgstr "為影像檔…"
- 
- #: callgraphview.cpp:2439
- msgid "Export Graph"
-@@ -1398,37 +1347,32 @@
- 
- #: tabview.cpp:553
- msgid ""
--"<b>Information Tabs</b>"
--"<p>This widget shows information for the current selected function in different "
--"tabs: "
--"<ul>"
--"<li>The Costs tab shows a list of available event types and the inclusive and "
--"self costs regarding to these types.</li>"
--"<li>The Parts tab shows a list of trace parts if the trace consists of more "
--"than one part (otherwise, this tab is hided). The cost of the selected function "
--"spent in the different parts together with the calls happening is shown.</li>"
--"<li>The Call Lists tab shows direct callers and callees of the function in more "
--"detail.</li>"
--"<li>The Coverage tab shows the same is the Call Lists tab, but not only direct "
--"callers and callees but also indirect ones.</li>"
--"<li>The Call Graph tab shows a graphical visualization of the calls done by "
--"this function.</li>"
--"<li>The Source tab presents annotated source code if debugging information and "
--"the source file is available.</li>"
--"<li>The Assembler tab presents annotated assembler code if trace information on "
--"instruction level is available.</li></ul>For more information, see the <em>"
--"What's This?</em> help of the corresponding tab widget</p>"
--msgstr ""
--"<b>資訊分頁</b>"
--"<p>本畫面以不同分頁顯示目前所選擇函數的資訊： "
--"<ul>"
--"<li>「花費」分頁顯示可用的事件型態清單，以及它們的引入與自身花費。</li>"
--"<li>「部件」分頁在有一個以上的追蹤時顯示追蹤部件清單。（若只有一個則會隱藏此分頁。）也會顯示選取的函式在不同的部件，以及呼叫的花費。</li>"
--"<li>「呼叫清單」分頁顯示此函式內直接呼叫的函式，與直接呼叫此函式的函式詳情。</li>"
--"<li>「總體呼叫」分頁顯示的跟「呼叫清單」差不多，不過還包括間接呼叫。</li>"
--"<li>「呼叫圖」分頁顯示此函式與呼叫者之間的圖形關係。</li>"
--"<li>「源碼」分頁在除錯資訊與程式源碼檔可用時顯示源碼。</li>"
--"<li>「組合」分頁顯示追蹤資訊的機械碼。</li></ul>更多詳情可以參考「這是什麼？」的說明元件。</p>"
-+"<b>Information Tabs</b><p>This widget shows information for the current "
-+"selected function in different tabs: <ul><li>The Costs tab shows a list of "
-+"available event types and the inclusive and self costs regarding to these "
-+"types.</li><li>The Parts tab shows a list of trace parts if the trace "
-+"consists of more than one part (otherwise, this tab is hided). The cost of "
-+"the selected function spent in the different parts together with the calls "
-+"happening is shown.</li><li>The Call Lists tab shows direct callers and "
-+"callees of the function in more detail.</li><li>The Coverage tab shows the "
-+"same is the Call Lists tab, but not only direct callers and callees but also "
-+"indirect ones.</li><li>The Call Graph tab shows a graphical visualization of "
-+"the calls done by this function.</li><li>The Source tab presents annotated "
-+"source code if debugging information and the source file is available.</"
-+"li><li>The Assembler tab presents annotated assembler code if trace "
-+"information on instruction level is available.</li></ul>For more "
-+"information, see the <em>What's This?</em> help of the corresponding tab "
-+"widget</p>"
-+msgstr ""
-+"<b>資訊分頁</b><p>本畫面以不同分頁顯示目前所選擇函數的資訊： <ul><li>「花費」"
-+"分頁顯示可用的事件型態清單，以及它們的引入與自身花費。</li><li>「部件」分頁在"
-+"有一個以上的追蹤時顯示追蹤部件清單。（若只有一個則會隱藏此分頁。）也會顯示選"
-+"取的函式在不同的部件，以及呼叫的花費。</li><li>「呼叫清單」分頁顯示此函式內直"
-+"接呼叫的函式，與直接呼叫此函式的函式詳情。</li><li>「總體呼叫」分頁顯示的跟"
-+"「呼叫清單」差不多，不過還包括間接呼叫。</li><li>「呼叫圖」分頁顯示此函式與呼"
-+"叫者之間的圖形關係。</li><li>「原始碼」分頁在除錯資訊與程式原始碼檔可用時顯示源"
-+"碼。</li><li>「組合」分頁顯示追蹤資訊的機械碼。</li></ul>更多詳情可以參考「這"
-+"是什麼？」的說明元件。</p>"
- 
- #: tabview.cpp:630
- msgid "(No Data loaded)"
-@@ -1440,32 +1384,30 @@
- 
- #: sourceview.cpp:54 sourceview.cpp:554
- msgid "Source (unknown)"
--msgstr "程式源碼（未知）"
-+msgstr "程式原始碼（未知）"
- 
- #: sourceview.cpp:89
- msgid ""
--"<b>Annotated Source</b>"
--"<p>The annotated source list shows the source lines of the current selected "
--"function together with (self) cost spent while executing the code of this "
--"source line. If there was a call in a source line, lines with details on the "
--"call happening are inserted into the source: the cost spent inside of the call, "
--"the number of calls happening, and the call destination.</p>"
--"<p>Select a inserted call information line to make the destination function "
--"current.</p>"
--msgstr ""
--"<b>註記源碼</b> "
--"<p>註記源碼清單顯示目前所選取的函式源碼，以及其執行時的花費。如果在源碼中有呼叫，則呼叫發生時的詳情會被插入源碼中，包括呼叫時的花費，呼叫的數量以及呼叫的目的"
--"地。</p> "
--"<p>選取被插入的呼叫資訊可以眺到該函式。</p>"
-+"<b>Annotated Source</b><p>The annotated source list shows the source lines "
-+"of the current selected function together with (self) cost spent while "
-+"executing the code of this source line. If there was a call in a source "
-+"line, lines with details on the call happening are inserted into the source: "
-+"the cost spent inside of the call, the number of calls happening, and the "
-+"call destination.</p><p>Select a inserted call information line to make the "
-+"destination function current.</p>"
-+msgstr ""
-+"<b>註記原始碼</b> <p>註記原始碼清單顯示目前所選取的函式原始碼，以及其執行時的花費。"
-+"如果在原始碼中有呼叫，則呼叫發生時的詳情會被插入原始碼中，包括呼叫時的花費，呼叫"
-+"的數量以及呼叫的目的地。</p> <p>選取被插入的呼叫資訊可以眺到該函式。</p>"
- 
- #: sourceview.cpp:120
- #, c-format
- msgid "Go to Line %1"
--msgstr "跳到第 %1 行"
-+msgstr "跳到第 %1 列"
- 
- #: sourceview.cpp:293
- msgid "(No Source)"
--msgstr "（無程式源碼）"
-+msgstr "（無程式原始碼）"
- 
- #: sourceview.cpp:512
- msgid "There is no cost of current selected type associated"
-@@ -1481,7 +1423,7 @@
- 
- #: sourceview.cpp:553
- msgid "Source ('%1')"
--msgstr "程式源碼（%1）"
-+msgstr "程式原始碼（%1）"
- 
- #: sourceview.cpp:559
- msgid "--- Inlined from '%1' ---"
-@@ -1493,7 +1435,7 @@
- 
- #: sourceview.cpp:565
- msgid "There is no source available for the following function:"
--msgstr "以下的函式沒有源碼可參考："
-+msgstr "以下的函式沒有原始碼可參考："
- 
- #: sourceview.cpp:570
- msgid "This is because no debug information is present."
-@@ -1509,11 +1451,11 @@
- 
- #: sourceview.cpp:583
- msgid "This is because its source file cannot be found:"
--msgstr "這是因為它的程式源碼檔找不到："
-+msgstr "這是因為它的程式原始碼檔找不到："
- 
- #: sourceview.cpp:587
- msgid "Add the folder of this file to the source folder list."
--msgstr "新增此檔案所在的資料夾到程式源碼資料夾清單中。"
-+msgstr "新增此檔案所在的資料夾到程式原始碼資料夾清單中。"
- 
- #: sourceview.cpp:589
- msgid "The list can be found in the configuration dialog."
-@@ -1568,61 +1510,57 @@
- 
- #: coverageview.cpp:90
- msgid ""
--"<b>List of all Callers</b>"
--"<p>This list shows all functions calling the current selected one, either "
--"directly or with several functions in-between on the stack; the number of "
--"functions in-between plus one is called the <em>Distance</em> "
--"(e.g. for function A,B,C there exists a call from A to C when A calls B and B "
--"calls C, i.e. A => B => C. The distance here is 2).</p>"
--"<p>Absolute cost shown is the cost spent in the selected function while a "
--"listed function is active; relative cost is the percentage of all cost spent in "
--"the selected function while the listed one is active. The cost graphic shows "
--"logarithmic percentage with a different color for each distance.</p>"
--"<p>As there can be many calls from the same function, the distance column "
-+"<b>List of all Callers</b><p>This list shows all functions calling the "
-+"current selected one, either directly or with several functions in-between "
-+"on the stack; the number of functions in-between plus one is called the "
-+"<em>Distance</em> (e.g. for function A,B,C there exists a call from A to C "
-+"when A calls B and B calls C, i.e. A => B => C. The distance here is 2).</"
-+"p><p>Absolute cost shown is the cost spent in the selected function while a "
-+"listed function is active; relative cost is the percentage of all cost spent "
-+"in the selected function while the listed one is active. The cost graphic "
-+"shows logarithmic percentage with a different color for each distance.</"
-+"p><p>As there can be many calls from the same function, the distance column "
- "sometimes shows the range of distances for all calls happening; then, in "
--"parentheses, there is the medium distance, i.e. the distance where most of the "
--"call costs happened.</p>"
--"<p>Selecting a function makes it the current selected one of this information "
--"panel. If there are two panels (Split mode), the function of the other panel is "
--"changed instead.</p>"
--msgstr ""
--"<b>所有呼叫者清單</b> "
--"<p>此清單顯示目前選取函式的所有呼叫者函式，包括直接呼叫與間接呼叫。間接呼叫的數字加一稱為「距離」（例如，函式 A 呼叫函式 B，函式 B 又呼叫函式 "
--"C，則函式 A 到 C 的距離為 2）</p> "
--"<p>顯示的「絕對花費」是當一個已列出的所選函式使用時的花費；「相對花費」是此函式相對於所有已選函式的花費。花費圖形以對每個距離以不同顏色顯示對數百分比。</p"
--"> "
--"<p>因為有可能同一個函式中會有許多呼叫，距離欄位有時會顯示所有發生呼叫的函式的距離範圍，這種狀況下，括弧中顯示的是平均距離，也就是發生呼叫最多花費的地方。</"
--"p> "
--"<p>選擇某函式可以看每個函式的資訊。如果在分割模式下的兩個面板，會在另一個面板改變。</p>"
-+"parentheses, there is the medium distance, i.e. the distance where most of "
-+"the call costs happened.</p><p>Selecting a function makes it the current "
-+"selected one of this information panel. If there are two panels (Split "
-+"mode), the function of the other panel is changed instead.</p>"
-+msgstr ""
-+"<b>所有呼叫者清單</b> <p>此清單顯示目前選取函式的所有呼叫者函式，包括直接呼叫"
-+"與間接呼叫。間接呼叫的數字加一稱為「距離」（例如，函式 A 呼叫函式 B，函式 B "
-+"又呼叫函式 C，則函式 A 到 C 的距離為 2）</p> <p>顯示的「絕對花費」是當一個已"
-+"列出的所選函式使用時的花費；「相對花費」是此函式相對於所有已選函式的花費。花"
-+"費圖形以對每個距離以不同顏色顯示對數百分比。</p> <p>因為有可能同一個函式中會"
-+"有許多呼叫，距離欄位有時會顯示所有發生呼叫的函式的距離範圍，這種狀況下，括弧"
-+"中顯示的是平均距離，也就是發生呼叫最多花費的地方。</p> <p>選擇某函式可以看每"
-+"個函式的資訊。如果在分割模式下的兩個面板，會在另一個面板改變。</p>"
- 
- #: coverageview.cpp:120
- msgid ""
--"<b>List of all Callees</b>"
--"<p>This list shows all functions called by the current selected one, either "
--"directly or with several function in-between on the stack; the number of "
--"function in-between plus one is called the <em>Distance</em> "
--"(e.g. for function A,B,C there exists a call from A to C when A calls B and B "
--"calls C, i.e. A => B => C. The distance here is 2).</p>"
--"<p>Absolute cost shown is the cost spent in the listed function while the "
-+"<b>List of all Callees</b><p>This list shows all functions called by the "
-+"current selected one, either directly or with several function in-between on "
-+"the stack; the number of function in-between plus one is called the "
-+"<em>Distance</em> (e.g. for function A,B,C there exists a call from A to C "
-+"when A calls B and B calls C, i.e. A => B => C. The distance here is 2).</"
-+"p><p>Absolute cost shown is the cost spent in the listed function while the "
- "selected is active; relative cost is the percentage of all cost spent in the "
--"listed function while the selected one is active. The cost graphic always shows "
--"logarithmic percentage with a different color for each distance.</p>"
--"<p>As there can be many calls to the same function, the distance column "
-+"listed function while the selected one is active. The cost graphic always "
-+"shows logarithmic percentage with a different color for each distance.</"
-+"p><p>As there can be many calls to the same function, the distance column "
- "sometimes shows the range of distances for all calls happening; then, in "
--"parentheses, there is the medium distance, i.e. the distance where most of the "
--"call costs happened.</p>"
--"<p>Selecting a function makes it the current selected one of this information "
--"panel. If there are two panels (Split mode), the function of the other panel is "
--"changed instead.</p>"
--msgstr ""
--"<b>被呼叫者清單</b>"
--"<p>這份清單顯示所有被目前選取的函式呼叫的函式，包括直接與間接呼叫。間接呼叫的數字加一稱為「距離」（例如，函式 A 呼叫函式 B，函式 B 又呼叫函式 "
--"C，則函式 A 到 C 的距離為 2）</p> "
--"<p>顯示的「絕對花費」是當一個已列出的所選函式使用時的花費；「相對花費」是此函式相對於所有已選函式的花費。花費圖形以對每個距離以不同顏色顯示對數百分比。</p"
--"> "
--"<p>因為有可能同一個函式中會有許多呼叫，距離欄位有時會顯示所有發生呼叫的函式的距離範圍，這種狀況下，括弧中顯示的是平均距離，也就是發生呼叫最多花費的地方。</"
--"p> "
--"<p>選擇某函式可以看每個函式的資訊。如果在分割模式下的兩個面板，會在另一個面板改變。</p>"
-+"parentheses, there is the medium distance, i.e. the distance where most of "
-+"the call costs happened.</p><p>Selecting a function makes it the current "
-+"selected one of this information panel. If there are two panels (Split "
-+"mode), the function of the other panel is changed instead.</p>"
-+msgstr ""
-+"<b>被呼叫者清單</b><p>這份清單顯示所有被目前選取的函式呼叫的函式，包括直接與"
-+"間接呼叫。間接呼叫的數字加一稱為「距離」（例如，函式 A 呼叫函式 B，函式 B 又"
-+"呼叫函式 C，則函式 A 到 C 的距離為 2）</p> <p>顯示的「絕對花費」是當一個已列"
-+"出的所選函式使用時的花費；「相對花費」是此函式相對於所有已選函式的花費。花費"
-+"圖形以對每個距離以不同顏色顯示對數百分比。</p> <p>因為有可能同一個函式中會有"
-+"許多呼叫，距離欄位有時會顯示所有發生呼叫的函式的距離範圍，這種狀況下，括弧中"
-+"顯示的是平均距離，也就是發生呼叫最多花費的地方。</p> <p>選擇某函式可以看每個"
-+"函式的資訊。如果在分割模式下的兩個面板，會在另一個面板改變。</p>"
- 
- #: configuration.cpp:63
- msgid "Instruction Fetch"
-@@ -1688,7 +1626,7 @@
- #: rc.cpp:9
- #, no-c-format
- msgid "&Layout"
--msgstr "佈局(&L)"
-+msgstr "布局(&L)"
- 
- #. i18n: file kcachegrindui.rc line 32
- #: rc.cpp:12
-@@ -1772,7 +1710,7 @@
- #: rc.cpp:66
- #, no-c-format
- msgid "Source Folders"
--msgstr "程式源碼資料夾"
-+msgstr "程式原始碼資料夾"
- 
- #. i18n: file configdlgbase.ui line 454
- #: rc.cpp:69
-@@ -1784,7 +1722,7 @@
- #: rc.cpp:72
- #, no-c-format
- msgid "Add..."
--msgstr "新增..."
-+msgstr "新增…"
- 
- #. i18n: file dumpselectionbase.ui line 32
- #: rc.cpp:87
-@@ -2292,45 +2230,46 @@
- 
- #: callmapview.cpp:98
- msgid ""
--"<b>Caller Map</b>"
--"<p>This graph shows the nested hierarchy of all callers of the current "
--"activated function. Each colored rectangle represents a function; its size "
--"tries to be proportional to the cost spent therein while the active function is "
--"running (however, there are drawing constrains).</p>"
--msgstr ""
--"<b>呼叫者地圖</b> "
--"<p>這個圖形顯示目前活躍的函式所有呼叫者的巢狀架構。每個彩色的矩形表示一個函式，大小會與該函式執行時的花費成比例。（不過畫圖形時會有所限制，所以是盡量成比例）"
--"。</p>"
-+"<b>Caller Map</b><p>This graph shows the nested hierarchy of all callers of "
-+"the current activated function. Each colored rectangle represents a "
-+"function; its size tries to be proportional to the cost spent therein while "
-+"the active function is running (however, there are drawing constrains).</p>"
-+msgstr ""
-+"<b>呼叫者地圖</b> <p>這個圖形顯示目前活躍的函式所有呼叫者的巢狀架構。每個彩色"
-+"的矩形表示一個函式，大小會與該函式執行時的花費成比例。（不過畫圖形時會有所限"
-+"制，所以是盡量成比例）。</p>"
- 
- #: callmapview.cpp:105
- msgid ""
--"<b>Call Map</b>"
--"<p>This graph shows the nested hierarchy of all callees of the current "
--"activated function. Each colored rectangle represents a function; its size "
--"tries to be proportional to the cost spent therein while the active function is "
--"running (however, there are drawing constrains).</p>"
--msgstr ""
--"<b>呼叫地圖</b> "
--"<p>這個圖形顯示目前活躍的函式所有呼叫的巢狀架構。每個彩色的矩形表示一個函式，大小會與該函式執行時的花費成比例。（不過畫圖形時會有所限制，所以是盡量成比例）。"
--"</p>"
-+"<b>Call Map</b><p>This graph shows the nested hierarchy of all callees of "
-+"the current activated function. Each colored rectangle represents a "
-+"function; its size tries to be proportional to the cost spent therein while "
-+"the active function is running (however, there are drawing constrains).</p>"
-+msgstr ""
-+"<b>呼叫地圖</b> <p>這個圖形顯示目前活躍的函式所有呼叫的巢狀架構。每個彩色的矩"
-+"形表示一個函式，大小會與該函式執行時的花費成比例。（不過畫圖形時會有所限制，"
-+"所以是盡量成比例）。</p>"
- 
- #: callmapview.cpp:113
- msgid ""
- "<p>Appearance options can be found in the in the context menu. To get exact "
--"size proportions, choose 'Hide incorrect borders'. As this mode can be <em>"
--"very</em> time consuming, you may want to limit the maximum drawn nesting level "
--"before. 'Best' determinates the split direction for children from the aspect "
--"ratio of the parent. 'Always Best' decides on remaining space for each sibling. "
--"'Ignore Proportions' takes space for function name drawing <em>before</em> "
--"drawing children. Note that size proportions can get <em>heavily</em> wrong.</p>"
--"<p>This is a <em>TreeMap</em> widget. Keyboard navigation is available with the "
--"left/right arrow keys for traversing siblings, and up/down arrow keys to go a "
--"nesting level up/down. <em>Return</em> activates the current item.</p>"
--msgstr ""
--"<p>外觀選項可以在選單中找到。要取得精準的大小比例，選擇「隱藏不正確的框線」。這個模式可能會<em>非常</em>"
--"花時間，您可能要先限制一下最多的巢狀等級。「最佳」會依父函式的比例來分離子函式的方向。「總是最佳」會依剩餘空間來決定。「忽略比例」會在畫子函式前先保留函式名稱空"
--"間。注意大小的比例有可能會錯得很離譜。</p> "
--"<p>有一種「樹狀地圖」元件。可以用鍵盤左右鍵來導覽所有的子節點，上下鍵則可以進出巢狀等級。Enter 鍵會啟動目前的項目。</p>"
-+"size proportions, choose 'Hide incorrect borders'. As this mode can be "
-+"<em>very</em> time consuming, you may want to limit the maximum drawn "
-+"nesting level before. 'Best' determinates the split direction for children "
-+"from the aspect ratio of the parent. 'Always Best' decides on remaining "
-+"space for each sibling. 'Ignore Proportions' takes space for function name "
-+"drawing <em>before</em> drawing children. Note that size proportions can get "
-+"<em>heavily</em> wrong.</p><p>This is a <em>TreeMap</em> widget. Keyboard "
-+"navigation is available with the left/right arrow keys for traversing "
-+"siblings, and up/down arrow keys to go a nesting level up/down. <em>Return</"
-+"em> activates the current item.</p>"
-+msgstr ""
-+"<p>外觀選項可以在選單中找到。要取得精準的大小比例，選擇「隱藏不正確的框線」。"
-+"這個模式可能會<em>非常</em>花時間，您可能要先限制一下最多的巢狀等級。「最佳」"
-+"會依父函式的比例來分離子函式的方向。「總是最佳」會依剩餘空間來決定。「忽略比"
-+"例」會在畫子函式前先保留函式名稱空間。注意大小的比例有可能會錯得很離譜。</p> "
-+"<p>有一種「樹狀地圖」元件。可以用鍵盤左右鍵來導覽所有的子節點，上下鍵則可以進"
-+"出巢狀等級。Enter 鍵會啟動目前的項目。</p>"
- 
- #: callmapview.cpp:167
- msgid "Go To"
-@@ -2467,34 +2406,32 @@
- 
- #: callview.cpp:85
- msgid ""
--"<b>List of direct Callers</b>"
--"<p>This list shows all functions calling the current selected one directly, "
--"together with a call count and the cost spent in the current selected function "
--"while being called from the function from the list.</p>"
--"<p>An icon instead of an inclusive cost specifies that this is a call inside of "
--"a recursive cycle. An inclusive cost makes no sense here.</p>"
--"<p>Selecting a function makes it the current selected one of this information "
--"panel. If there are two panels (Split mode), the function of the other panel is "
--"changed instead.</p>"
--msgstr ""
--"<b>直接呼叫者清單</b> "
--"<p>這個清單顯示直接呼叫目前選取函式的所有函式，以及呼叫次數與呼叫花費。</p> "
--"<p>如果顯示一圖示而非引入花費，則表示這個呼叫是在遞迴循環之中。引入花費在此沒有意義。</p> "
--"<p>選擇某個函式會在目前資訊面板的顯示中跳到該函式。如果有兩個面板（分割模式），則會變換另一個面板的函式。</p>"
-+"<b>List of direct Callers</b><p>This list shows all functions calling the "
-+"current selected one directly, together with a call count and the cost spent "
-+"in the current selected function while being called from the function from "
-+"the list.</p><p>An icon instead of an inclusive cost specifies that this is "
-+"a call inside of a recursive cycle. An inclusive cost makes no sense here.</"
-+"p><p>Selecting a function makes it the current selected one of this "
-+"information panel. If there are two panels (Split mode), the function of the "
-+"other panel is changed instead.</p>"
-+msgstr ""
-+"<b>直接呼叫者清單</b> <p>這個清單顯示直接呼叫目前選取函式的所有函式，以及呼叫"
-+"次數與呼叫花費。</p> <p>如果顯示一圖示而非引入花費，則表示這個呼叫是在遞迴循"
-+"環之中。引入花費在此沒有意義。</p> <p>選擇某個函式會在目前資訊面板的顯示中跳"
-+"到該函式。如果有兩個面板（分割模式），則會變換另一個面板的函式。</p>"
- 
- #: callview.cpp:98
- msgid ""
--"<b>List of direct Callees</b>"
--"<p>This list shows all functions called by the current selected one directly, "
--"together with a call count and the cost spent in this function while being "
--"called from the selected function.</p>"
--"<p>Selecting a function makes it the current selected one of this information "
--"panel. If there are two panels (Split mode), the function of the other panel is "
--"changed instead.</p>"
--msgstr ""
--"<b>直接被呼叫者清單</b> "
--"<p>這個清單顯示目前選取函式直接呼叫的所有函式，以及呼叫次數與呼叫花費。</p> "
--"<p>選擇某個函式會在目前資訊面板的顯示中跳到該函式。如果有兩個面板（分割模式），則會變換另一個面板的函式。</p>"
-+"<b>List of direct Callees</b><p>This list shows all functions called by the "
-+"current selected one directly, together with a call count and the cost spent "
-+"in this function while being called from the selected function.</"
-+"p><p>Selecting a function makes it the current selected one of this "
-+"information panel. If there are two panels (Split mode), the function of the "
-+"other panel is changed instead.</p>"
-+msgstr ""
-+"<b>直接被呼叫者清單</b> <p>這個清單顯示目前選取函式直接呼叫的所有函式，以及呼"
-+"叫次數與呼叫花費。</p> <p>選擇某個函式會在目前資訊面板的顯示中跳到該函式。如"
-+"果有兩個面板（分割模式），則會變換另一個面板的函式。</p>"
- 
- #: costtypeitem.cpp:56
- msgid "Unknown Type"
-@@ -2508,7 +2445,8 @@
- "use. Request <em>What's This?</em> help by pressing\n"
- "Shift+F1 and clicking on the widget.</p>\n"
- msgstr ""
--"<p>每個使用者介面元件中的「這是什麼？」說明內含了此元件的詳細用法資訊。建議第一次使用時先閱讀它。您以可以按 Shift+F1 叫出。</p>\n"
-+"<p>每個使用者介面元件中的「這是什麼？」說明內含了此元件的詳細用法資訊。建議第"
-+"一次使用時先閱讀它。您以可以按 Shift+F1 叫出。</p>\n"
- 
- #: tips.cpp:12
- msgid ""
-@@ -2517,15 +2455,15 @@
- "Use the Assembler View for the instruction annotations.\n"
- "</p>\n"
- msgstr ""
--"<p>若您提供這個選項：<em>--dump-instr=yes</em>，您可以在呼叫樹模式取得指令層級的分析檔資訊。\n"
-+"<p>若您提供這個選項：<em>--dump-instr=yes</em>，您可以在呼叫樹模式取得指令層"
-+"級的分析檔資訊。\n"
- "用「組譯器檢視」取得指令的註記。</p>\n"
- 
- #: tips.cpp:20
- msgid ""
- "<p>...that you can use Alt-Left/Right keys of your keyboard to go\n"
- "back/forward in the active object history ?</p>\n"
--msgstr ""
--"<p>您可以用 Alt 加上左右鍵來在目前的物件歷史中往返。</p>\n"
-+msgstr "<p>您可以用 Alt 加上左右鍵來在目前的物件歷史中往返。</p>\n"
- 
- #: tips.cpp:26
- msgid ""
-@@ -2535,19 +2473,22 @@
- "the current item, press Space, and to activate it, press Return.\n"
- "</p>\n"
- msgstr ""
--"<p>您可以用方向鍵在呼叫者/被呼叫者地圖中導覽。用左右鍵來跳到相鄰的節點，上下鍵則在不同的巢狀等級間來回。要選取目前的項目，您可以按空白鍵，按下 Enter "
--"鍵則是啟用。</p>\n"
-+"<p>您可以用方向鍵在呼叫者/被呼叫者地圖中導覽。用左右鍵來跳到相鄰的節點，上下"
-+"鍵則在不同的巢狀等級間來回。要選取目前的項目，您可以按空白鍵，按下 Enter 鍵則"
-+"是啟用。</p>\n"
- 
- #: tips.cpp:35
- msgid ""
- "<p>...that you can navigate in the Call Graph View using\n"
- "arrow keys? Use Up/Down to go one calling level up/down, alternating\n"
--"between calls and functions. Use Left/Right to change to siblings of a current\n"
-+"between calls and functions. Use Left/Right to change to siblings of a "
-+"current\n"
- "selected call. To activate the current item, press Return.\n"
- "</p>\n"
- msgstr ""
--"<p>您可以用方向鍵在呼叫圖檢視中導覽。用左右鍵來跳到與目前選取的呼叫相鄰的節點，上下鍵則在不同的呼叫等級間來回，切換呼叫函式。按下 Enter "
--"鍵則是啟用目前的項目。</p>\n"
-+"<p>您可以用方向鍵在呼叫圖檢視中導覽。用左右鍵來跳到與目前選取的呼叫相鄰的節"
-+"點，上下鍵則在不同的呼叫等級間來回，切換呼叫函式。按下 Enter 鍵則是啟用目前的"
-+"項目。</p>\n"
- 
- #: tips.cpp:44
- msgid ""
-@@ -2555,7 +2496,8 @@
- "name (case-insensitive) into the edit line of the toolbar\n"
- "and hit return?</p>\n"
- msgstr ""
--"<p>您可以在工具列的編輯欄中輸入某函式的部份名稱（不分大小寫），再按下 Enter 鍵就可以快速找到該函式的位置。</p>\n"
-+"<p>您可以在工具列的編輯欄中輸入某函式的部份名稱（不分大小寫），再按下 Enter "
-+"鍵就可以快速找到該函式的位置。</p>\n"
- 
- #: tips.cpp:51
- msgid ""
-@@ -2563,7 +2505,8 @@
- "ELF objects/C++ Classes/Source Files for graph coloring\n"
- "in <em>Settings->Configure KCachegrind...</em>?</p>\n"
- msgstr ""
--"<p>您可以指定自訂的顏色給圖形中的 ELF 物件、C++ 類別或源碼檔。您只要在「設定」─「設定 KCachegrind...」中設定即可。</p>\n"
-+"<p>您可以指定自訂的顏色給圖形中的 ELF 物件、C++ 類別或原始碼檔。您只要在「設"
-+"定」─「設定 KCachegrind...」中設定即可。</p>\n"
- 
- #: tips.cpp:58
- msgid ""
-@@ -2575,16 +2518,18 @@
- "have added the directory of the source file to the\n"
- "<em>Source Directories</em> list in the configuration.\n"
- msgstr ""
--"<p>如果有提供除錯資訊的話，您可以在資訊分頁中的「位置」標籤處，或是源碼分頁處的源碼標頭處看到所選取函式的除錯資訊。</p>\n"
--"<p>必須要有源碼檔的檔名（包括副檔名）。如果 KCachegrind 還是沒有顯示源碼，請確定您已將源碼檔所在的路徑加到設定中的「源碼目錄」清單中。</p>"
--"\n"
-+"<p>如果有提供除錯資訊的話，您可以在資訊分頁中的「位置」標籤處，或是原始碼分頁處"
-+"的原始碼標頭處看到所選取函式的除錯資訊。</p>\n"
-+"<p>必須要有原始碼檔的檔名（包括副檔名）。如果 KCachegrind 還是沒有顯示原始碼，請"
-+"確定您已將原始碼檔所在的路徑加到設定中的「原始碼目錄」清單中。</p>\n"
- 
- #: tips.cpp:69
- msgid ""
- "<p>...that you can configure whether KCachgrind should\n"
- "show absolute event counts or relative ones (percentage display)?</p>\n"
- msgstr ""
--"<p>您可以設定是否要讓 KCachegrind 顯示絕對事件計數或相對事件計數（以百分比顯示）。</p>\n"
-+"<p>您可以設定是否要讓 KCachegrind 顯示絕對事件計數或相對事件計數（以百分比顯"
-+"示）。</p>\n"
- 
- #: tips.cpp:75
- msgid ""
-@@ -2597,9 +2542,11 @@
- "it in the flat profile. Selecting functions with small cost will\n"
- "temporarily add them to the flat profile list.</p>\n"
- msgstr ""
--"<p>您可以在 KCachegrind "
--"中設定所有函式清單中的最大顯示數目。這樣的話，清單中的最後一個項目會顯示出還有多少函式未顯示出來，以及這些未顯示函式的花費。</p>\n"
--"<p>要啟動較少花費的函式，您可以搜尋並在簡單分析檔中選取。這樣會暫時新增到簡單分析檔清單中。</p>\n"
-+"<p>您可以在 KCachegrind 中設定所有函式清單中的最大顯示數目。這樣的話，清單中"
-+"的最後一個項目會顯示出還有多少函式未顯示出來，以及這些未顯示函式的花費。</"
-+"p>\n"
-+"<p>要啟動較少花費的函式，您可以搜尋並在簡單分析檔中選取。這樣會暫時新增到簡單"
-+"分析檔清單中。</p>\n"
- 
- #: tips.cpp:87
- msgid ""
-@@ -2615,10 +2562,13 @@
- "with function bar() selected means that 50% of all the cost of function\n"
- "bar() happened while calling foo2() from bar().</p>\n"
- msgstr ""
--"<p>「總體呼叫頁」顯示的是呼叫選取的函式的所有函式（上半部），以及被選取的函式呼叫的函式（下半部），包括直接與間接呼叫。</p>\n"
-+"<p>「總體呼叫頁」顯示的是呼叫選取的函式的所有函式（上半部），以及被選取的函式"
-+"呼叫的函式（下半部），包括直接與間接呼叫。</p>\n"
- "<p>例如：</p>\n"
--"<p>選取函式 bar()，上半部清單中的函式 foo1() 數值 50% 表示從 foo1() 呼叫 bar() 時的花費佔全部花費的 50%。</p>\n"
--"<p>下半部清單中的函式 foo2() 數值 50% 表示 bar() 呼叫 foo2() 時的花費佔全部花費的 50%。</p>\n"
-+"<p>選取函式 bar()，上半部清單中的函式 foo1() 數值 50% 表示從 foo1() 呼叫 bar"
-+"() 時的花費佔全部花費的 50%。</p>\n"
-+"<p>下半部清單中的函式 foo2() 數值 50% 表示 bar() 呼叫 foo2() 時的花費佔全部花"
-+"費的 50%。</p>\n"
- 
- #: tips.cpp:102
- msgid ""
-@@ -2628,7 +2578,8 @@
- "<p>Items from this list can be selected by pressing the right\n"
- "mouse button.</p>\n"
- msgstr ""
--"<p>滑鼠指標指在樹狀地圖中上頭時稍等一下，會跑出逼個工具提示，裡面會顯示巢狀矩形的名稱清單。</p>\n"
-+"<p>滑鼠指標指在樹狀地圖中上頭時稍等一下，會跑出逼個工具提示，裡面會顯示巢狀矩"
-+"形的名稱清單。</p>\n"
- "<p>清單中的項目可以用滑鼠右鍵選取。</p>\n"
- 
- #: tips.cpp:111
-@@ -2642,13 +2593,15 @@
- "of not-branching assembler statements inside of your program\n"
- "code).</p>\n"
- msgstr ""
--"<p>您可以限制只顯示一小部份部件的花費計數，只要在「追蹤選擇」元件中選取這些部件即可。</p>\n"
--"<p>要在 cachegrind 的分析執行中產生多個部件，可以用像這樣的選項：--cachedumps=xxx 表示 xxx "
--"個基本區塊。（基本區塊是在您的程式碼中不分支的組譯敘述）。</p>\n"
-+"<p>您可以限制只顯示一小部份部件的花費計數，只要在「追蹤選擇」元件中選取這些部"
-+"件即可。</p>\n"
-+"<p>要在 cachegrind 的分析執行中產生多個部件，可以用像這樣的選項：--"
-+"cachedumps=xxx 表示 xxx 個基本區塊。（基本區塊是在您的程式碼中不分支的組譯敘"
-+"述）。</p>\n"
- 
- #: configdlg.cpp:60
- msgid "Source Files"
--msgstr "程式源碼檔案"
-+msgstr "程式原始碼檔案"
- 
- #: configdlg.cpp:61
- msgid "C++ Classes"
-@@ -2695,28 +2648,27 @@
- 
- #: partview.cpp:73
- msgid ""
--"<b>Trace Part List</b>"
--"<p>This list shows all trace parts of the loaded trace. For each part, the "
--"self/inclusive cost of the current selected function, spent in the part, is "
--"shown; percentage costs are always relative to the total cost <em>"
--"of the part</em> (not to the whole trace as in the Trace Part Overview). Also "
--"shown are the calls happening to/from the current function inside of the trace "
--"part.</p>"
--"<p>By choosing one or more trace parts from the list, the costs shown all over "
--"KCachegrind will only be the ones spent in the selected part(s). If no list "
--"selection is shown, in fact all trace parts are selected implicitly.</p>"
--"<p>This is a multi-selection list. You can select ranges by dragging the mouse "
--"or use SHIFT/CTRL modifiers. Selection/Deselection of trace parts can also be "
--"done by using the Trace Part Overview Dockable. This one also supports multiple "
--"selection.</p>"
--"<p>Note that the list is hidden if only one trace part is loaded.</p>"
--msgstr ""
--"<b>追蹤部件清單</b> "
--"<p>這份清單顯示載入的追蹤的所有追蹤部件。每個部件中包含目前選取的函式在該部件中的自身與引入的花費，百分比是相對於該部件的總花費（不是追蹤部件概觀中的總花費）"
--"。另外也會呼叫目前函式的呼叫者與被呼叫者。</p> "
--"<p>若從清單中選擇追蹤部件，就只會顯示選取的部件的花費。如果沒有選擇任何部件，則預設是選取所有的部件。</p> "
--"<p>這是可以多重選擇的清單，您可以拖曳滑鼠來選取一個範圍，或是用 Shift 或 Ctrl 鍵來在「追蹤部件概觀」元件中選擇部件。</p> "
--"<p>注意若是只載入一個追蹤部件，則此元件是隱藏的。</p>"
-+"<b>Trace Part List</b><p>This list shows all trace parts of the loaded "
-+"trace. For each part, the self/inclusive cost of the current selected "
-+"function, spent in the part, is shown; percentage costs are always relative "
-+"to the total cost <em>of the part</em> (not to the whole trace as in the "
-+"Trace Part Overview). Also shown are the calls happening to/from the current "
-+"function inside of the trace part.</p><p>By choosing one or more trace parts "
-+"from the list, the costs shown all over KCachegrind will only be the ones "
-+"spent in the selected part(s). If no list selection is shown, in fact all "
-+"trace parts are selected implicitly.</p><p>This is a multi-selection list. "
-+"You can select ranges by dragging the mouse or use SHIFT/CTRL modifiers. "
-+"Selection/Deselection of trace parts can also be done by using the Trace "
-+"Part Overview Dockable. This one also supports multiple selection.</"
-+"p><p>Note that the list is hidden if only one trace part is loaded.</p>"
-+msgstr ""
-+"<b>追蹤部件清單</b> <p>這份清單顯示載入的追蹤的所有追蹤部件。每個部件中包含目"
-+"前選取的函式在該部件中的自身與引入的花費，百分比是相對於該部件的總花費（不是"
-+"追蹤部件概觀中的總花費）。另外也會呼叫目前函式的呼叫者與被呼叫者。</p> <p>若"
-+"從清單中選擇追蹤部件，就只會顯示選取的部件的花費。如果沒有選擇任何部件，則預"
-+"設是選取所有的部件。</p> <p>這是可以多重選擇的清單，您可以拖曳滑鼠來選取一個"
-+"範圍，或是用 Shift 或 Ctrl 鍵來在「追蹤部件概觀」元件中選擇部件。</p> <p>注意"
-+"若是只載入一個追蹤部件，則此元件是隱藏的。</p>"
- 
- #: partview.cpp:106
- msgid "Select '%1'"
-diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdesdk/kfile_cpp.po kde-i18n-zh_TW-3.5.10/messages/kdesdk/kfile_cpp.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdesdk/kfile_cpp.po	2006-07-22 10:04:18.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdesdk/kfile_cpp.po	2011-11-11 15:45:17.000000000 +0100
-@@ -7,7 +7,7 @@
- "Project-Id-Version: kfile_cpp\n"
- "POT-Creation-Date: 2005-05-18 21:25+0200\n"
- "PO-Revision-Date: 2002-06-04 12:33+0800\n"
--"Last-Translator: Keanu <keanu@ms50.url.com.tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
-@@ -19,7 +19,7 @@
- 
- #: kfile_cpp.cpp:51
- msgid "Lines"
--msgstr "行數"
-+msgstr "列數"
- 
- #: kfile_cpp.cpp:53
- msgid "Code"
-diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdesdk/kfile_diff.po kde-i18n-zh_TW-3.5.10/messages/kdesdk/kfile_diff.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdesdk/kfile_diff.po	2006-07-22 10:04:18.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdesdk/kfile_diff.po	2011-11-11 15:45:17.000000000 +0100
-@@ -7,7 +7,7 @@
- "Project-Id-Version: kfile_diff\n"
- "POT-Creation-Date: 2005-05-18 21:25+0200\n"
- "PO-Revision-Date: 2002-10-07 20:09+0800\n"
--"Last-Translator: Keanu <keanu@ms50.url.com.tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\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/kdesdk/kfile_po.po kde-i18n-zh_TW-3.5.10/messages/kdesdk/kfile_po.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdesdk/kfile_po.po	2005-09-10 13:15:18.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdesdk/kfile_po.po	2011-11-11 15:45:17.000000000 +0100
-@@ -7,7 +7,7 @@
- "Project-Id-Version: kfile_po\n"
- "POT-Creation-Date: 2005-05-18 21:25+0200\n"
- "PO-Revision-Date: 2002-10-24 09:34+0800\n"
--"Last-Translator: Keanu <keanu@ms50.url.com.tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\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/kdesdk/kfile_ts.po kde-i18n-zh_TW-3.5.10/messages/kdesdk/kfile_ts.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdesdk/kfile_ts.po	2006-07-22 10:04:18.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdesdk/kfile_ts.po	2011-11-11 15:45:17.000000000 +0100
-@@ -6,8 +6,7 @@
- "Project-Id-Version: kfile_ts\n"
- "POT-Creation-Date: 2005-05-18 21:25+0200\n"
- "PO-Revision-Date: 2006-01-24 14:41+0800\n"
--"Last-Translator: Frank Weng (a.k.a. Franklin) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Traditional Chinese <zh_l10n@linux.org.tw>\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/kdesdk/kio_svn.po kde-i18n-zh_TW-3.5.10/messages/kdesdk/kio_svn.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdesdk/kio_svn.po	2006-07-22 10:04:18.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdesdk/kio_svn.po	2011-11-11 15:45:17.000000000 +0100
-@@ -6,8 +6,7 @@
- "Project-Id-Version: kio_svn\n"
- "POT-Creation-Date: 2006-02-18 03:52+0100\n"
- "PO-Revision-Date: 2006-06-19 13:36+0800\n"
--"Last-Translator: Frank Weng (a.k.a. Franklin) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Chinese Traditional <zh-l10n@linux.org.tw>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
-@@ -16,7 +15,7 @@
- 
- #: svn.cpp:235
- msgid "Looking for %1..."
--msgstr "尋找 %1..."
-+msgstr "尋找 %1…"
- 
- #: svn.cpp:1088
- msgid "Nothing to commit."
-diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdesdk/kompare.po kde-i18n-zh_TW-3.5.10/messages/kdesdk/kompare.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdesdk/kompare.po	2008-02-13 10:55:29.000000000 +0100
-+++ kde-i18n-zh_TW-3.5.10/messages/kdesdk/kompare.po	2011-11-11 15:45:17.000000000 +0100
-@@ -6,8 +6,7 @@
- "Project-Id-Version: kompare\n"
- "POT-Creation-Date: 2007-12-20 01:16+0100\n"
- "PO-Revision-Date: 2006-06-20 15:31+0800\n"
--"Last-Translator: Frank Weng (a.k.a. Franklin) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Chinese Traditional <zh-l10n@linux.org.tw>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
-@@ -36,7 +35,7 @@
- 
- #: komparepart/kompare_part.cpp:168
- msgid "Save .&diff..."
--msgstr "儲存 .diff(&D)..."
-+msgstr "儲存 .diff(&D)…"
- 
- #: komparepart/kompare_part.cpp:171
- msgid "Swap Source with Destination"
-@@ -88,11 +87,11 @@
- 
- #: komparepart/kompare_part.cpp:493
- msgid "Running diff..."
--msgstr "執行 diff..."
-+msgstr "執行 diff…"
- 
- #: komparepart/kompare_part.cpp:496
- msgid "Parsing diff output..."
--msgstr "分析 diff 輸出..."
-+msgstr "分析 diff 輸出…"
- 
- #: komparepart/kompare_part.cpp:545
- msgid "Comparing file %1 with file %2"
-@@ -164,7 +163,8 @@
- 
- #: komparepart/kompare_part.cpp:667
- msgid ""
--"No diff file, or no 2 files have been diffed. Therefore no stats are available."
-+"No diff file, or no 2 files have been diffed. Therefore no stats are "
-+"available."
- msgstr "沒有 diff 檔，或沒有兩個檔案可比較。因此無法統計。"
- 
- #: komparepart/kompare_part.cpp:669 komparepart/kompare_part.cpp:683
-@@ -242,7 +242,7 @@
- 
- #: libdialogpages/viewpage.cpp:80
- msgid "Number of lines:"
--msgstr "行數："
-+msgstr "列數："
- 
- #: libdialogpages/viewpage.cpp:86
- msgid "Tabs to Spaces"
-@@ -278,7 +278,8 @@
- "program does not support all the options that the GNU version does. This way "
- "you can select that version."
- msgstr ""
--"您可以選擇不同的 diff 程式。在 Solaris 上標準的 diff 程式，支援選項沒有像 GNU 版本那麼多。您可以在此選擇其他的版本。"
-+"您可以選擇不同的 diff 程式。在 Solaris 上標準的 diff 程式，支援選項沒有像 "
-+"GNU 版本那麼多。您可以在此選擇其他的版本。"
- 
- #: libdialogpages/diffpage.cpp:221
- msgid "&Diff"
-@@ -290,28 +291,31 @@
- 
- #: libdialogpages/diffpage.cpp:233
- msgid ""
--"Select the format of the output generated by diff. Unified is the one that is "
--"used most frequently because it is very readable. The KDE developers like this "
--"format the best so use it for sending patches."
-+"Select the format of the output generated by diff. Unified is the one that "
-+"is used most frequently because it is very readable. The KDE developers like "
-+"this format the best so use it for sending patches."
- msgstr ""
--"選擇 diff 輸出的格式。「統一」（Unified）是最常用的，因為可讀性很高。KDE 開發團隊最喜歡用這個格式，所以要傳送修補檔用這個格式最好。"
-+"選擇 diff 輸出的格式。「統一」（Unified）是最常用的，因為可讀性很高。KDE 開發"
-+"團隊最喜歡用這個格式，所以要傳送修補檔用這個格式最好。"
- 
- #: libdialogpages/diffpage.cpp:247
- msgid "Lines of Context"
--msgstr "內容行數"
-+msgstr "內容列數"
- 
- #. i18n: file komparepart/komparesaveoptionsbase.ui line 312
- #: libdialogpages/diffpage.cpp:251 rc.cpp:81
- #, no-c-format
- msgid "Number of context lines:"
--msgstr "內容的行數："
-+msgstr "內容的列數："
- 
- #: libdialogpages/diffpage.cpp:253
- msgid ""
- "The number of context lines is normally 2 or 3. This makes the diff readable "
- "and applicable in most cases. More than 3 lines will only bloat the diff "
- "unnecessarily."
--msgstr "內容行數通常是 2 或 3。這會提高 diff 輸出的可讀性，並且在大部份狀況都可使用。三行以上只會讓 diff 輸出產生不必要的膨脹。"
-+msgstr ""
-+"內容列數通常是 2 或 3。這會提高 diff 輸出的可讀性，並且在大部份狀況都可使用。"
-+"三列以上只會讓 diff 輸出產生不必要的膨脹。"
- 
- #: libdialogpages/diffpage.cpp:259
- msgid "&Format"
-@@ -361,7 +365,7 @@
- 
- #: libdialogpages/diffpage.cpp:294
- msgid "&Edit..."
--msgstr "編輯(&E)..."
-+msgstr "編輯(&E)…"
- 
- #: libdialogpages/diffpage.cpp:295
- msgid ""
-@@ -423,14 +427,15 @@
- 
- #: libdialogpages/diffpage.cpp:330
- msgid ""
--"If this is checked you can enter a shell pattern in the text box on the right "
--"or select entries from the list."
--msgstr "勾選此選項的話，您可以在右方文字欄內輸入一個文稿樣式，或是從清單中選擇。"
-+"If this is checked you can enter a shell pattern in the text box on the "
-+"right or select entries from the list."
-+msgstr ""
-+"勾選此選項的話，您可以在右方文字欄內輸入一個文稿樣式，或是從清單中選擇。"
- 
- #: libdialogpages/diffpage.cpp:332
- msgid ""
--"Here you can enter or remove a shell pattern or select one or more entries from "
--"the list."
-+"Here you can enter or remove a shell pattern or select one or more entries "
-+"from the list."
- msgstr "您可以在此輸入或移除文稿樣式，或是從清單中選擇樣式。"
- 
- #: libdialogpages/diffpage.cpp:338
-@@ -444,14 +449,14 @@
- 
- #: libdialogpages/diffpage.cpp:342
- msgid ""
--"Here you can enter the URL of a file with shell patterns to ignore during the "
--"comparison of the folders."
-+"Here you can enter the URL of a file with shell patterns to ignore during "
-+"the comparison of the folders."
- msgstr "您可以在此輸入檔案路徑，檔案中含有在比較資料夾時要忽略的文稿樣式。"
- 
- #: libdialogpages/diffpage.cpp:344
- msgid ""
--"Any file you select in the dialog that pops up when you click it will be put in "
--"the dialog to the left of this button."
-+"Any file you select in the dialog that pops up when you click it will be put "
-+"in the dialog to the left of this button."
- msgstr "您在此對話框中所選擇的任何檔案將會被放到左方的對話框中。"
- 
- #: libdialogpages/diffpage.cpp:352
-@@ -480,7 +485,8 @@
- 
- #: main.cpp:33
- msgid ""
--"A program to view the differences between files and optionally generate a diff"
-+"A program to view the differences between files and optionally generate a "
-+"diff"
- msgstr "檢視檔案間的不同，還有產生修補檔的程式。"
- 
- #: main.cpp:39
-@@ -489,31 +495,35 @@
- 
- #: main.cpp:40
- msgid ""
--"This will open URL1 and expect it to be diff output. URL1 can also be a '-' and "
--"then it will read from standard input. Can be used for instance for cvs diff | "
--"kompare -o -. Kompare will do a check to see if it can find the original "
--"file(s) and then blend the original file(s) into the diffoutput and show that "
--"in the viewer. -n disables the check."
-+"This will open URL1 and expect it to be diff output. URL1 can also be a '-' "
-+"and then it will read from standard input. Can be used for instance for cvs "
-+"diff | kompare -o -. Kompare will do a check to see if it can find the "
-+"original file(s) and then blend the original file(s) into the diffoutput and "
-+"show that in the viewer. -n disables the check."
- msgstr ""
--"這會開啟 URL1，它應該是 diff 的輸出。URL1 也可以是 '-'，這種狀況下它會從標準輸入讀取。它可以這樣用：cvs diff | compare "
--"-o -。Kompare 會檢查是否可以找到原始檔，並套用 diff 輸出，再顯示在檢視器內。 -n 關閉此檢查。"
-+"這會開啟 URL1，它應該是 diff 的輸出。URL1 也可以是 '-'，這種狀況下它會從標準"
-+"輸入讀取。它可以這樣用：cvs diff | compare -o -。Kompare 會檢查是否可以找到原"
-+"始檔，並套用 diff 輸出，再顯示在檢視器內。 -n 關閉此檢查。"
- 
- #: main.cpp:41
- msgid ""
--"This will blend URL2 into URL1, URL2 is expected to be diff output and URL1 the "
--"file or folder that the diffoutput needs to be blended into. "
--msgstr "這會將 URL2 套用到 URL1。URL2 應該是 diff 的輸出，URL1 則是要套用的檔案或資料夾。"
-+"This will blend URL2 into URL1, URL2 is expected to be diff output and URL1 "
-+"the file or folder that the diffoutput needs to be blended into. "
-+msgstr ""
-+"這會將 URL2 套用到 URL1。URL2 應該是 diff 的輸出，URL1 則是要套用的檔案或資料"
-+"夾。"
- 
- #: main.cpp:42
- msgid ""
- "Disables the check for automatically finding the original file(s) when using "
- "'-' as URL with the -o option."
--msgstr "在使用 '-' 為讀取的 URL，並與 -o 一起使用時，關閉自動尋找原始檔案的檢查。"
-+msgstr ""
-+"在使用 '-' 為讀取的 URL，並與 -o 一起使用時，關閉自動尋找原始檔案的檢查。"
- 
- #: main.cpp:43
- msgid ""
--"Use this to specify the encoding when calling it from the command line. It will "
--"default to the local encoding if not specified."
-+"Use this to specify the encoding when calling it from the command line. It "
-+"will default to the local encoding if not specified."
- msgstr "用這個指定從命令列呼叫時的編碼。預設為本地端的編碼系統。"
- 
- #: main.cpp:52
-@@ -562,10 +572,12 @@
- 
- #: kompare_shell.cpp:401 main.cpp:189
- msgid ""
--"If you have entered 2 filenames or 2 folders in the fields in this dialog then "
--"this button will be enabled and pressing it will start a comparison of the "
--"entered files or folders. "
--msgstr "如果您在此對話框的欄位中輸入了兩個檔名或兩個資料夾，按下這個按鈕就會開始比較。"
-+"If you have entered 2 filenames or 2 folders in the fields in this dialog "
-+"then this button will be enabled and pressing it will start a comparison of "
-+"the entered files or folders. "
-+msgstr ""
-+"如果您在此對話框的欄位中輸入了兩個檔名或兩個資料夾，按下這個按鈕就會開始比"
-+"較。"
- 
- #: kompareurldialog.cpp:41
- msgid "Here you can enter the files you want to compare."
-@@ -612,35 +624,35 @@
- msgid ""
- "_n: Applied: Changes made to %n line undone\n"
- "Applied: Changes made to  %n lines undone"
--msgstr "套用：對 %n 行改變的動作未完成"
-+msgstr "套用：對 %n 列改變的動作未完成"
- 
- #: komparenavtreepart/komparenavtreepart.cpp:429
- #, c-format
- msgid ""
- "_n: Changed %n line\n"
- "Changed %n lines"
--msgstr "改變 %n 行"
-+msgstr "改變 %n 列"
- 
- #: komparenavtreepart/komparenavtreepart.cpp:434
- #, c-format
- msgid ""
- "_n: Applied: Insertion of %n line undone\n"
- "Applied: Insertion of %n lines undone"
--msgstr "套用：插入 %n 行的動作未完成"
-+msgstr "套用：插入 %n 列的動作未完成"
- 
- #: komparenavtreepart/komparenavtreepart.cpp:437
- #, c-format
- msgid ""
- "_n: Inserted %n line\n"
- "Inserted %n lines"
--msgstr "插入 %n 行"
-+msgstr "插入 %n 列"
- 
- #: komparenavtreepart/komparenavtreepart.cpp:442
- #, c-format
- msgid ""
- "_n: Applied: Deletion of %n line undone\n"
- "Applied: Deletion of %n lines undone"
--msgstr "套用：刪除 %n 行的動作未完成。"
-+msgstr "套用：刪除 %n 列的動作未完成。"
- 
- #: komparenavtreepart/komparenavtreepart.cpp:445
- #, c-format
-@@ -761,15 +773,15 @@
- 
- #: kompare_shell.cpp:232
- msgid "&Open Diff..."
--msgstr "開啟 Diff(&O)..."
-+msgstr "開啟 Diff(&O)…"
- 
- #: kompare_shell.cpp:233
- msgid "&Compare Files..."
--msgstr "比較檔案(&C)..."
-+msgstr "比較檔案(&C)…"
- 
- #: kompare_shell.cpp:236
- msgid "&Blend URL with Diff..."
--msgstr "將差異處套用到 URL(&B)..."
-+msgstr "將差異處套用到 URL(&B)…"
- 
- #: kompare_shell.cpp:245
- msgid "Show T&ext View"
-@@ -835,14 +847,15 @@
- 
- #: kompare_shell.cpp:372
- msgid ""
--"If you have entered a file or folder name and a file that contains diff output "
--"in the fields in this dialog then this button will be enabled and pressing it "
--"will open kompare's main view where the output of the entered file or files "
--"from the folder are mixed with the diff output so you can then apply the "
--"difference(s) to a file or to the files. "
-+"If you have entered a file or folder name and a file that contains diff "
-+"output in the fields in this dialog then this button will be enabled and "
-+"pressing it will open kompare's main view where the output of the entered "
-+"file or files from the folder are mixed with the diff output so you can then "
-+"apply the difference(s) to a file or to the files. "
- msgstr ""
--"如果您在此對話框中輸入一個檔案或資料夾名稱，以及包含 diff 輸出的檔案，按下此鍵會開啟 Kompare 的主檢視視窗，讓您檢視此 diff "
--"輸出套用到指定的檔案或資料夾後的結果。"
-+"如果您在此對話框中輸入一個檔案或資料夾名稱，以及包含 diff 輸出的檔案，按下此"
-+"鍵會開啟 Kompare 的主檢視視窗，讓您檢視此 diff 輸出套用到指定的檔案或資料夾後"
-+"的結果。"
- 
- #: kompare_shell.cpp:401
- msgid "Compare these files or folders"
-@@ -886,19 +899,20 @@
- 
- #: libdiff2/komparemodellist.cpp:238 libdiff2/komparemodellist.cpp:262
- msgid ""
--"<qt>No models or no differences, this file: <b>%1</b>"
--", is not a valid diff file.</qt>"
-+"<qt>No models or no differences, this file: <b>%1</b>, is not a valid diff "
-+"file.</qt>"
- msgstr "<qt>檔案 <b>%1</b> 不是合法的 diff 檔，沒有任何模式或差異處。</qt>"
- 
- #: libdiff2/komparemodellist.cpp:246
- msgid ""
--"<qt>There were problems applying the diff <b>%1</b> to the file <b>%2</b>.</qt>"
-+"<qt>There were problems applying the diff <b>%1</b> to the file <b>%2</b>.</"
-+"qt>"
- msgstr "<qt>套用 <b>%1</b>到檔案 <b>%2</b> 時發生問題。</qt>"
- 
- #: libdiff2/komparemodellist.cpp:271
- msgid ""
--"<qt>There were problems applying the diff <b>%1</b> to the folder <b>%2</b>"
--".</qt>"
-+"<qt>There were problems applying the diff <b>%1</b> to the folder <b>%2</b>."
-+"</qt>"
- msgstr "<qt>套用 <b>%1</b>到資料夾 <b>%2</b> 時發生問題。</qt>"
- 
- #: libdiff2/komparemodellist.cpp:299 libdiff2/komparemodellist.cpp:582
-@@ -917,10 +931,12 @@
- 
- #: libdiff2/komparemodellist.cpp:383
- msgid ""
--"<qt>Could not upload the temporary file to the destination location <b>%1</b>"
--". The temporary file is still available under: <b>%2</b>"
--". You can manually copy it to the right place.</qt>"
--msgstr "<qt>無法將暫存檔上傳到目標位置 <b>%1</b>。暫存檔仍然在 <b>%2</b>。您可以手動複製到正確的地方。</qt>"
-+"<qt>Could not upload the temporary file to the destination location <b>%1</"
-+"b>. The temporary file is still available under: <b>%2</b>. You can manually "
-+"copy it to the right place.</qt>"
-+msgstr ""
-+"<qt>無法將暫存檔上傳到目標位置 <b>%1</b>。暫存檔仍然在 <b>%2</b>。您可以手動"
-+"複製到正確的地方。</qt>"
- 
- #: libdiff2/komparemodellist.cpp:435 libdiff2/komparemodellist.cpp:548
- msgid "Could not parse diff output."
-diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdesdk/kres_bugzilla.po kde-i18n-zh_TW-3.5.10/messages/kdesdk/kres_bugzilla.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdesdk/kres_bugzilla.po	2006-07-22 10:04:18.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdesdk/kres_bugzilla.po	2011-11-11 15:45:17.000000000 +0100
-@@ -6,8 +6,7 @@
- "Project-Id-Version: kres_bugzilla\n"
- "POT-Creation-Date: 2005-05-18 21:25+0200\n"
- "PO-Revision-Date: 2006-01-24 14:48+0800\n"
--"Last-Translator: Frank Weng (a.k.a. Franklin) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Traditional Chinese <zh_l10n@linux.org.tw>\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/kdesdk/kstartperf.po kde-i18n-zh_TW-3.5.10/messages/kdesdk/kstartperf.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdesdk/kstartperf.po	2006-07-22 10:04:18.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdesdk/kstartperf.po	2011-11-11 15:45:17.000000000 +0100
-@@ -7,7 +7,7 @@
- "Project-Id-Version: kstartperf 1.7\n"
- "POT-Creation-Date: 2005-05-18 21:25+0200\n"
- "PO-Revision-Date: 2001-08-30 11:44+CST\n"
--"Last-Translator: Chih-Wei Huang <cwhuang@linux.org.tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Traditional Chinese <zh-l10n@linux.org.tw>\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/kdesdk/kuiviewer.po kde-i18n-zh_TW-3.5.10/messages/kdesdk/kuiviewer.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdesdk/kuiviewer.po	2006-07-22 10:04:18.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdesdk/kuiviewer.po	2011-11-11 15:45:17.000000000 +0100
-@@ -6,8 +6,7 @@
- "Project-Id-Version: kuiviewer\n"
- "POT-Creation-Date: 2005-05-18 21:25+0200\n"
- "PO-Revision-Date: 2006-01-24 14:46+0800\n"
--"Last-Translator: Frank Weng (a.k.a. Franklin) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Traditional Chinese <zh_l10n@linux.org.tw>\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/kdesdk/spy.po kde-i18n-zh_TW-3.5.10/messages/kdesdk/spy.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdesdk/spy.po	2006-07-22 10:04:18.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdesdk/spy.po	2011-11-11 15:45:17.000000000 +0100
-@@ -7,8 +7,7 @@
- "Project-Id-Version: spy\n"
- "POT-Creation-Date: 2005-05-18 21:25+0200\n"
- "PO-Revision-Date: 2006-01-24 14:48+0800\n"
--"Last-Translator: Frank Weng (a.k.a. Franklin) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Traditional Chinese <zh_l10n@linux.org.tw>\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/kdesdk/umbrello.po kde-i18n-zh_TW-3.5.10/messages/kdesdk/umbrello.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdesdk/umbrello.po	2008-08-19 20:43:14.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdesdk/umbrello.po	2011-11-11 15:45:17.000000000 +0100
-@@ -6,8 +6,7 @@
- "Project-Id-Version: umbrello\n"
- "POT-Creation-Date: 2008-07-08 01:21+0200\n"
- "PO-Revision-Date: 2006-09-11 13:32+0800\n"
--"Last-Translator: Frank Weng (a.k.a. Franklin) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Chinese Traditional <zh-l10n@linux.org.tw>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
-@@ -205,15 +204,19 @@
- 
- #: umlwidgetcontroller.cpp:128
- msgid ""
--"Hold shift or ctrl to move in X axis. Hold shift and control to move in Y axis. "
--"Right button click to cancel move."
--msgstr "按住 shift 或 ctrl 來移動 X 軸。按住 shift 與 control 來移動 Y 軸。點選右鍵取消移動。"
-+"Hold shift or ctrl to move in X axis. Hold shift and control to move in Y "
-+"axis. Right button click to cancel move."
-+msgstr ""
-+"按住 shift 或 ctrl 來移動 X 軸。按住 shift 與 control 來移動 Y 軸。點選右鍵取"
-+"消移動。"
- 
- #: umlwidgetcontroller.cpp:379
- msgid ""
--"Hold shift or ctrl to move in X axis. Hold shift and control to move in Y axis. "
--"Right button click to cancel resize."
--msgstr "按住 shift 或 ctrl 來移動 X 軸。按住 shift 與 control 來移動 Y 軸。點選右鍵取消調整大小。"
-+"Hold shift or ctrl to move in X axis. Hold shift and control to move in Y "
-+"axis. Right button click to cancel resize."
-+msgstr ""
-+"按住 shift 或 ctrl 來移動 X 軸。按住 shift 與 control 來移動 Y 軸。點選右鍵取"
-+"消調整大小。"
- 
- #: dialogs/activitydialog.cpp:70
- msgid "Initial activity"
-@@ -315,7 +318,7 @@
- 
- #: dialogs/activitypage.cpp:72
- msgid "New Activity..."
--msgstr "新增活動..."
-+msgstr "新增活動…"
- 
- #: dialogs/activitypage.cpp:75 floatingtextwidget.cpp:178
- msgid "Rename"
-@@ -388,8 +391,8 @@
- #: dialogs/codegenerationwizard.cpp:168
- msgid ""
- "The folder could not be created.\n"
--"Please make sure you have write access to its parent folder or select another, "
--"valid, folder."
-+"Please make sure you have write access to its parent folder or select "
-+"another, valid, folder."
- msgstr ""
- "無法建立資料夾。\n"
- "請確定您對其父資料夾有寫入的權限，否則請另選一個可使用的資料夾。"
-@@ -492,7 +495,7 @@
- 
- #: dialogs/classifierlistpage.cpp:39
- msgid "N&ew Attribute..."
--msgstr "新增屬性(&E)..."
-+msgstr "新增屬性(&E)…"
- 
- #: dialogs/classifierlistpage.cpp:41 dialogs/classpropdlg.cpp:187
- #: listpopupmenu.cpp:674 refactoring/refactoringassistant.cpp:499
-@@ -501,7 +504,7 @@
- 
- #: dialogs/classifierlistpage.cpp:42
- msgid "N&ew Operation..."
--msgstr "新增操作(&E)..."
-+msgstr "新增操作(&E)…"
- 
- #: dialogs/classifierlistpage.cpp:44 dialogs/classpropdlg.cpp:195
- msgid "Templates"
-@@ -509,7 +512,7 @@
- 
- #: dialogs/classifierlistpage.cpp:45
- msgid "N&ew Template..."
--msgstr "新增樣本(&E)..."
-+msgstr "新增樣本(&E)…"
- 
- #: dialogs/classifierlistpage.cpp:47 dialogs/classpropdlg.cpp:202
- msgid "Enum Literals"
-@@ -517,7 +520,7 @@
- 
- #: dialogs/classifierlistpage.cpp:48
- msgid "N&ew Enum Literal..."
--msgstr "新增 Enum 常數(&E)..."
-+msgstr "新增 Enum 常數(&E)…"
- 
- #: dialogs/classifierlistpage.cpp:50 dialogs/classpropdlg.cpp:209
- msgid "Entity Attributes"
-@@ -525,7 +528,7 @@
- 
- #: dialogs/classifierlistpage.cpp:51
- msgid "N&ew Entity Attribute..."
--msgstr "新增實體屬性(&E)..."
-+msgstr "新增實體屬性(&E)…"
- 
- #: dialogs/classifierlistpage.cpp:101 dialogs/umloperationdialog.cpp:143
- #: uml.cpp:273
-@@ -637,7 +640,7 @@
- 
- #: dialogs/umloperationdialog.cpp:141
- msgid "Ne&w Parameter..."
--msgstr "新增參數(&W)..."
-+msgstr "新增參數(&W)…"
- 
- #: dialogs/umloperationdialog.cpp:323 dialogs/umloperationdialog.cpp:376
- msgid "You have entered an invalid parameter name."
-@@ -672,10 +675,8 @@
- msgstr "操作名稱無效"
- 
- #: dialogs/umloperationdialog.cpp:466 refactoring/refactoringassistant.cpp:653
--msgid ""
--"An operation with that signature already exists in %1.\n"
--msgstr ""
--"具有同樣簽名的操作已經存在於 %1。\n"
-+msgid "An operation with that signature already exists in %1.\n"
-+msgstr "具有同樣簽名的操作已經存在於 %1。\n"
- 
- #: dialogs/umloperationdialog.cpp:468 refactoring/refactoringassistant.cpp:655
- msgid "Choose a different name or parameter list."
-@@ -711,8 +712,8 @@
- 
- #: dialogs/parmpropdlg.cpp:84
- msgid ""
--"\"in\" is a readonly parameter, \"out\" is a writeonly parameter and \"inout\" "
--"is a parameter for reading and writing."
-+"\"in\" is a readonly parameter, \"out\" is a writeonly parameter and \"inout"
-+"\" is a parameter for reading and writing."
- msgstr "\"in\" 為唯讀參數，\"out\" 為唯寫參數，\"inout\" 為可讀寫參數。"
- 
- #: dialogs/umlattributedialog.cpp:42
-@@ -1219,19 +1220,17 @@
- 
- #: dialogs/settingsdlg.cpp:148
- msgid ""
--"<qt>"
--"<p>The autosave file will be saved to ~/autosave.xmi if the autosaving occurs "
--"before you have manually saved the file.</p>"
--"<p>If you've already saved it, the autosave file will be saved in the same "
--"folder as the file and will be named like the file's name, followed by the "
--"suffix specified.</p>"
--"<p>If the suffix is equal to the suffix of the file you've saved, the autosave "
--"will overwrite your file automatically.</p></qt>"
--msgstr ""
--"<qt> "
--"<p>在您手動儲存之前，自動儲存的檔案會儲存到 ~/autosave.xml。</p>"
--"<p>如果您已經儲存，則自動儲存的檔案會存在跟原檔案相同的目錄下，用原檔案的檔名，但加上指定的後置字串。</p> "
--"<p>如果指定的後置字串跟您儲存的檔案的後置字串一樣，則自動儲存會自動覆寫您的檔案。</p></qt>"
-+"<qt><p>The autosave file will be saved to ~/autosave.xmi if the autosaving "
-+"occurs before you have manually saved the file.</p><p>If you've already "
-+"saved it, the autosave file will be saved in the same folder as the file and "
-+"will be named like the file's name, followed by the suffix specified.</"
-+"p><p>If the suffix is equal to the suffix of the file you've saved, the "
-+"autosave will overwrite your file automatically.</p></qt>"
-+msgstr ""
-+"<qt> <p>在您手動儲存之前，自動儲存的檔案會儲存到 ~/autosave.xml。</p><p>如果"
-+"您已經儲存，則自動儲存的檔案會存在跟原檔案相同的目錄下，用原檔案的檔名，但加"
-+"上指定的後置字串。</p> <p>如果指定的後置字串跟您儲存的檔案的後置字串一樣，則"
-+"自動儲存會自動覆寫您的檔案。</p></qt>"
- 
- #: dialogs/settingsdlg.cpp:158
- msgid "Startup"
-@@ -1469,7 +1468,7 @@
- 
- #: umllistview.cpp:2339
- msgid "Loading listview..."
--msgstr "正在載入列表檢視..."
-+msgstr "正在載入列表檢視…"
- 
- #: umllistview.cpp:2671
- msgid "The folder must be emptied before it can be deleted."
-@@ -1523,10 +1522,8 @@
- msgstr "無法開啟檔案"
- 
- #: codegenerator.cpp:531 codegenerators/simplecodegenerator.cpp:128
--msgid ""
--"Cannot create the folder:\n"
--msgstr ""
--"無法建立資料夾：\n"
-+msgid "Cannot create the folder:\n"
-+msgstr "無法建立資料夾：\n"
- 
- #: codegenerator.cpp:532 codegenerators/simplecodegenerator.cpp:129
- msgid ""
-@@ -1542,13 +1539,11 @@
- 
- #: umlviewimageexporter.cpp:46
- msgid "Exporting view..."
--msgstr "正在匯出檢視..."
-+msgstr "正在匯出檢視…"
- 
- #: umlviewimageexporter.cpp:50
--msgid ""
--"An error happened when exporting the image:\n"
--msgstr ""
--"匯出影像時發生錯誤。\n"
-+msgid "An error happened when exporting the image:\n"
-+msgstr "匯出影像時發生錯誤。\n"
- 
- #: codeimport/classimport.cpp:39 uml.cpp:376 uml.cpp:483 uml.cpp:660
- #: uml.cpp:688 uml.cpp:712 uml.cpp:722 uml.cpp:753 uml.cpp:758 uml.cpp:783
-@@ -1604,8 +1599,8 @@
- 
- #: aligntoolbar.cpp:383
- msgid ""
--"For alignment you have to select at least 2 objects like classes or actors. You "
--"can not align associations."
-+"For alignment you have to select at least 2 objects like classes or actors. "
-+"You can not align associations."
- msgstr "要進行對齊，您必須至少選擇兩個像類別或主角這樣的物件。您不能對齊關聯。"
- 
- #: enumliteral.cpp:65 object_factory.cpp:153 stereotype.cpp:76 umldoc.cpp:976
-@@ -1863,7 +1858,9 @@
- msgid ""
- "_: NAME OF TRANSLATORS\n"
- "Your names"
--msgstr "原始中文翻譯：KDE 簡體中文翻譯組， 繁體轉換與整理：Frank Weng (a.k.a. Franklin)"
-+msgstr ""
-+"原始中文翻譯：KDE 簡化字漢語翻譯組， 繁體轉換與整理：Frank Weng (a.k.a. "
-+"Franklin)"
- 
- #: _translatorinfo.cpp:3
- msgid ""
-@@ -1894,8 +1891,8 @@
- 
- #: main.cpp:43
- msgid ""
--"keep the tree structure used to store the views in the document in the target "
--"directory"
-+"keep the tree structure used to store the views in the document in the "
-+"target directory"
- msgstr "在目標目錄中的文件裡保留用於儲存檢視的樹狀結構"
- 
- #: main.cpp:95
-@@ -1923,11 +1920,12 @@
- "(c) 2006 Gael de Chalendar (aka Kleag), (c) 2002-2006 Umbrello UML Modeller "
- "Authors"
- msgstr ""
--"(c) 2006 Gael de Chalendar (aka Kleag), (c) 2002-2006 Umbrello UML 建模工具作者"
-+"(c) 2006 Gael de Chalendar (aka Kleag), (c) 2002-2006 Umbrello UML 建模工具作"
-+"者"
- 
- #: docgenerators/docbookgenerator.cpp:70 umlviewimageexporterall.cpp:58
- msgid "Exporting all views..."
--msgstr "匯出所有的檢視..."
-+msgstr "匯出所有的檢視…"
- 
- #: docgenerators/docbookgenerator.cpp:77 docgenerators/docbookgenerator.cpp:83
- #: umlviewimageexporterall.cpp:64 umlviewimageexporterall.cpp:70
-@@ -2089,19 +2087,19 @@
- 
- #: umldoc.cpp:1573
- msgid "Setting up the document..."
--msgstr "正在設立文件..."
-+msgstr "正在設立文件…"
- 
- #: umldoc.cpp:1600
- msgid "Resolving object references..."
--msgstr "正在反解物件參考..."
-+msgstr "正在反解物件參考…"
- 
- #: umldoc.cpp:1638
- msgid "Loading UML elements..."
--msgstr "正在載入 UML 元素...."
-+msgstr "正在載入 UML 元素…."
- 
- #: umldoc.cpp:1811
- msgid "Loading diagrams..."
--msgstr "正在載入圖表..."
-+msgstr "正在載入圖表…"
- 
- #: umldoc.cpp:2104
- #, c-format
-@@ -2190,7 +2188,7 @@
- 
- #: uml.cpp:186
- msgid "&New Class Wizard..."
--msgstr "新增類別精靈(&N)..."
-+msgstr "新增類別精靈(&N)…"
- 
- #: uml.cpp:188
- msgid "&Add Default Datatypes for Active Language"
-@@ -2198,7 +2196,7 @@
- 
- #: uml.cpp:193
- msgid "&Code Generation Wizard..."
--msgstr "代碼產生精靈(&C)..."
-+msgstr "代碼產生精靈(&C)…"
- 
- #: uml.cpp:195
- msgid "&Generate All Code"
-@@ -2206,7 +2204,7 @@
- 
- #: uml.cpp:198
- msgid "&Import Classes..."
--msgstr "匯入類別(&I)..."
-+msgstr "匯入類別(&I)…"
- 
- #: uml.cpp:201
- msgid "Creates a new document"
-@@ -2226,7 +2224,7 @@
- 
- #: uml.cpp:205
- msgid "Saves the document as..."
--msgstr "文件另存為..."
-+msgstr "文件另存為…"
- 
- #: uml.cpp:206
- msgid "Closes the document"
-@@ -2270,43 +2268,43 @@
- 
- #: uml.cpp:224
- msgid "&Class Diagram..."
--msgstr "類別圖(&C)..."
-+msgstr "類別圖(&C)…"
- 
- #: uml.cpp:228
- msgid "&Autolayout..."
--msgstr "自動佈局(&A)..."
-+msgstr "自動布局(&A)…"
- 
- #: uml.cpp:231
- msgid "&Sequence Diagram..."
--msgstr "序列圖(&S)..."
-+msgstr "序列圖(&S)…"
- 
- #: uml.cpp:234
- msgid "C&ollaboration Diagram..."
--msgstr "協作圖(&O)..."
-+msgstr "協作圖(&O)…"
- 
- #: uml.cpp:237
- msgid "&Use Case Diagram..."
--msgstr "用例圖(&U)..."
-+msgstr "用例圖(&U)…"
- 
- #: uml.cpp:240
- msgid "S&tate Diagram..."
--msgstr "狀態圖(&T)..."
-+msgstr "狀態圖(&T)…"
- 
- #: uml.cpp:243
- msgid "&Activity Diagram..."
--msgstr "活動圖(&A)..."
-+msgstr "活動圖(&A)…"
- 
- #: uml.cpp:246
- msgid "Co&mponent Diagram..."
--msgstr "元件圖(&M)..."
-+msgstr "元件圖(&M)…"
- 
- #: uml.cpp:250
- msgid "&Deployment Diagram..."
--msgstr "部署圖(&D)..."
-+msgstr "部署圖(&D)…"
- 
- #: uml.cpp:254
- msgid "&Entity Relationship Diagram..."
--msgstr "實體關係圖(&E)..."
-+msgstr "實體關係圖(&E)…"
- 
- #: uml.cpp:258
- msgid "&Clear Diagram"
-@@ -2326,11 +2324,11 @@
- 
- #: uml.cpp:269
- msgid "&Export as Picture..."
--msgstr "匯出為圖片(&E)..."
-+msgstr "匯出為圖片(&E)…"
- 
- #: uml.cpp:271
- msgid "Export &All Diagrams as Pictures..."
--msgstr "將全部圖表匯出為圖片(&A)..."
-+msgstr "將全部圖表匯出為圖片(&A)…"
- 
- #: uml.cpp:286
- msgid "&Zoom Slider"
-@@ -2406,39 +2404,39 @@
- 
- #: listpopupmenu.cpp:615 uml.cpp:420
- msgid "Class Diagram..."
--msgstr "類別圖..."
-+msgstr "類別圖…"
- 
- #: listpopupmenu.cpp:618 uml.cpp:421
- msgid "Sequence Diagram..."
--msgstr "序列圖..."
-+msgstr "序列圖…"
- 
- #: listpopupmenu.cpp:619 uml.cpp:422
- msgid "Collaboration Diagram..."
--msgstr "協作圖..."
-+msgstr "協作圖…"
- 
- #: listpopupmenu.cpp:551 uml.cpp:423
- msgid "Use Case Diagram..."
--msgstr "用例圖..."
-+msgstr "用例圖…"
- 
- #: listpopupmenu.cpp:616 uml.cpp:424
- msgid "State Diagram..."
--msgstr "狀態圖..."
-+msgstr "狀態圖…"
- 
- #: listpopupmenu.cpp:617 uml.cpp:425
- msgid "Activity Diagram..."
--msgstr "活動圖..."
-+msgstr "活動圖…"
- 
- #: listpopupmenu.cpp:521 uml.cpp:426
- msgid "Component Diagram..."
--msgstr "元件圖..."
-+msgstr "元件圖…"
- 
- #: listpopupmenu.cpp:528 uml.cpp:427
- msgid "Deployment Diagram..."
--msgstr "部署圖..."
-+msgstr "部署圖…"
- 
- #: listpopupmenu.cpp:541 uml.cpp:428
- msgid "Entity Relationship Diagram..."
--msgstr "實體關係圖..."
-+msgstr "實體關係圖…"
- 
- #: uml.cpp:458
- msgid "&Tree View"
-@@ -2450,23 +2448,23 @@
- 
- #: uml.cpp:479 uml.cpp:664 uml.cpp:692
- msgid "Opening file..."
--msgstr "正在開啟檔案..."
-+msgstr "正在開啟檔案…"
- 
- #: uml.cpp:650
- msgid "Creating new document..."
--msgstr "正在建立新文件..."
-+msgstr "正在建立新文件…"
- 
- #: uml.cpp:673
- msgid ""
--"*.xmi *.xmi.tgz *.xmi.tar.bz2 *.mdl|All Supported Files (*.xmi, *.xmi.tgz, "
--"*.xmi.tar.bz2, *.mdl)\n"
-+"*.xmi *.xmi.tgz *.xmi.tar.bz2 *.mdl|All Supported Files (*.xmi, *.xmi.tgz, *."
-+"xmi.tar.bz2, *.mdl)\n"
- "*.xmi|Uncompressed XMI Files (*.xmi)\n"
- "*.xmi.tgz|Gzip Compressed XMI Files (*.xmi.tgz)\n"
- "*.xmi.tar.bz2|Bzip2 Compressed XMI Files (*.xmi.tar.bz2)\n"
- "*.mdl|Rose model files"
- msgstr ""
--"*.xmi *.xmi.tgz *.xmi.tar.bz2 *.mdl|所有支援的檔案（*.xmi, *.xmi.tgz, *.xmi.tar.bz2, "
--"*.mdl）\n"
-+"*.xmi *.xmi.tgz *.xmi.tar.bz2 *.mdl|所有支援的檔案（*.xmi, *.xmi.tgz, *.xmi."
-+"tar.bz2, *.mdl）\n"
- "*.xmi|未壓縮的 XMI 檔案（*.xmi）\n"
- "*.xmi.tgz|Gzip 壓縮的 XMI 檔案（*.xmi.tgz）\n"
- "*.xmi.tar.bz2|Bzip2 壓縮的 XMI 檔案（*.xmi.tar.bz2）\n"
-@@ -2478,11 +2476,11 @@
- 
- #: uml.cpp:716
- msgid "Saving file..."
--msgstr "正在儲存檔案..."
-+msgstr "正在儲存檔案…"
- 
- #: uml.cpp:727
- msgid "Saving file with a new filename..."
--msgstr "正在用新檔名儲存檔案..."
-+msgstr "正在用新檔名儲存檔案…"
- 
- #: uml.cpp:732
- msgid ""
-@@ -2510,11 +2508,11 @@
- 
- #: uml.cpp:764
- msgid "Closing file..."
--msgstr "正在關閉檔案..."
-+msgstr "正在關閉檔案…"
- 
- #: uml.cpp:772
- msgid "Printing..."
--msgstr "正在列印..."
-+msgstr "正在列印…"
- 
- #: uml.cpp:779
- #, c-format
-@@ -2523,24 +2521,24 @@
- 
- #: uml.cpp:787
- msgid "Exiting..."
--msgstr "正在離開..."
-+msgstr "正在離開…"
- 
- #: uml.cpp:823
- msgid "Cutting selection..."
--msgstr "正在剪下所選取的項目..."
-+msgstr "正在剪下所選取的項目…"
- 
- #: uml.cpp:836
- msgid "Copying selection to clipboard..."
--msgstr "正在複製所選取的項目到剪貼簿..."
-+msgstr "正在複製所選取的項目到剪貼簿…"
- 
- #: uml.cpp:844
- msgid "Inserting clipboard contents..."
--msgstr "正在插入剪貼簿內容..."
-+msgstr "正在插入剪貼簿內容…"
- 
- #: uml.cpp:849
- msgid ""
--"Umbrello could not paste the clipboard contents.  The objects in the clipboard "
--"may be of the wrong type to be pasted here."
-+"Umbrello could not paste the clipboard contents.  The objects in the "
-+"clipboard may be of the wrong type to be pasted here."
- msgstr "Umbrello 無法貼上剪貼簿內容。剪貼簿中的物件的型態可能不正確。"
- 
- #: clipboard/umlclipboard.cpp:691 uml.cpp:851
-@@ -2549,11 +2547,11 @@
- 
- #: uml.cpp:863
- msgid "Toggling toolbar..."
--msgstr "正在切換工具列..."
-+msgstr "正在切換工具列…"
- 
- #: uml.cpp:878
- msgid "Toggle the statusbar..."
--msgstr "切換狀態列..."
-+msgstr "切換狀態列…"
- 
- #: uml.cpp:1186
- msgid "Cannot view code until you generate some first."
-@@ -2693,7 +2691,7 @@
- #: rc.cpp:63 rc.cpp:96
- #, no-c-format
- msgid "..."
--msgstr "..."
-+msgstr "…"
- 
- #. i18n: file codegenerators/cppcodegenerationformbase.ui line 273
- #: rc.cpp:66
-@@ -2855,13 +2853,13 @@
- #: rc.cpp:237
- #, no-c-format
- msgid "Bro&wse..."
--msgstr "瀏覽(&W)..."
-+msgstr "瀏覽(&W)…"
- 
- #. i18n: file dialogs/codegenerationoptionsbase.ui line 126
- #: rc.cpp:240
- #, no-c-format
- msgid "B&rowse..."
--msgstr "瀏覽(&R)..."
-+msgstr "瀏覽(&R)…"
- 
- #. i18n: file dialogs/codegenerationoptionsbase.ui line 134
- #: rc.cpp:243
-@@ -2930,8 +2928,8 @@
- #: rc.cpp:274
- #, no-c-format
- msgid ""
--"If a file already exists in the destination folder, select a different name to "
--"use by adding a suffix to the file name"
-+"If a file already exists in the destination folder, select a different name "
-+"to use by adding a suffix to the file name"
- msgstr "如果檔案存在於目標資料夾內，則以檔案名加後置字串作為新名稱"
- 
- #. i18n: file dialogs/codegenerationoptionsbase.ui line 265
-@@ -2967,18 +2965,14 @@
- #. i18n: file dialogs/codegenerationoptionsbase.ui line 368
- #: rc.cpp:292
- #, no-c-format
--msgid ""
--"*NIX (\"\\n\")"
--msgstr ""
--"*NIX（\"\\n\"）"
-+msgid "*NIX (\"\\n\")"
-+msgstr "*NIX（\"\\n\"）"
- 
- #. i18n: file dialogs/codegenerationoptionsbase.ui line 373
- #: rc.cpp:295
- #, no-c-format
--msgid ""
--"Windows (\"\\r\\n\")"
--msgstr ""
--"Windows（\"\\r\\n\"）"
-+msgid "Windows (\"\\r\\n\")"
-+msgstr "Windows（\"\\r\\n\"）"
- 
- #. i18n: file dialogs/codegenerationoptionsbase.ui line 378
- #: rc.cpp:298
-@@ -3022,8 +3016,8 @@
- #: rc.cpp:317
- #, no-c-format
- msgid ""
--"Writes comments to indicate the different sections (public, private etc) in a "
--"class, even if the sections are empty"
-+"Writes comments to indicate the different sections (public, private etc) in "
-+"a class, even if the sections are empty"
- msgstr "寫入註解以指示類別中的不同部分（公開、私有等），即使該部分為空的"
- 
- #. i18n: file dialogs/codegenerationoptionsbase.ui line 452
-@@ -3213,8 +3207,8 @@
- #, no-c-format
- msgid ""
- "Snap the size of the components to be a multiple of the grid spacing.\n"
--"If 'Snap to Grid' is enabled a component will always be aligned with the grid "
--"on all 4 sides."
-+"If 'Snap to Grid' is enabled a component will always be aligned with the "
-+"grid on all 4 sides."
- msgstr ""
- "貼齊元件的大小為格線間距的整數倍。\n"
- "如果開啟「貼齊格線」，那麼元件的四條邊將永遠與格線對齊。"
-@@ -3285,14 +3279,16 @@
- #: rc.cpp:473
- #, no-c-format
- msgid ""
--"The views are stored in folders in the document. The same tree structure used "
--"in the document to store the views can be created in the selected base "
-+"The views are stored in folders in the document. The same tree structure "
-+"used in the document to store the views can be created in the selected base "
- "directory with this option.\n"
- "Only the folders made by the user are created in the base directory (Logical "
- "view, use case view and so on aren't created)."
- msgstr ""
--"檢視是保留在文件中的資料夾。您可以將文件中用於儲存檢視的樹狀結構也套用在此選項所選取的基礎資料夾中。\n"
--"只有使用者建立的資料夾會在基礎資料夾中建立（邏輯檢視、用例檢視等不會被建立）。"
-+"檢視是保留在文件中的資料夾。您可以將文件中用於儲存檢視的樹狀結構也套用在此選"
-+"項所選取的基礎資料夾中。\n"
-+"只有使用者建立的資料夾會在基礎資料夾中建立（邏輯檢視、用例檢視等不會被建"
-+"立）。"
- 
- #. i18n: file dialogs/umlrolepropertiesbase.ui line 106
- #: rc.cpp:495
-@@ -3316,8 +3312,8 @@
- 
- #: classifier.cpp:201
- msgid ""
--"An operation with the same name and signature already exists. You can not add "
--"it again."
-+"An operation with the same name and signature already exists. You can not "
-+"add it again."
- msgstr "有同樣名稱和簽名的操作已經存在，不能再新增。"
- 
- #: activitywidget.cpp:163 toolbarstateother.cpp:143 umlview.cpp:2545
-@@ -3386,8 +3382,8 @@
- 
- #: clipboard/umlclipboard.cpp:687
- msgid ""
--"At least one of the items in the clipboard could not be pasted because an item "
--"of the same name already exists.  Any other items have been pasted."
-+"At least one of the items in the clipboard could not be pasted because an "
-+"item of the same name already exists.  Any other items have been pasted."
- msgstr "因為有同名項目存在，剪貼簿至少有一個項目無法貼上，其它則貼上成功。"
- 
- #: refactoring/refactoringassistant.cpp:289
-@@ -3435,40 +3431,42 @@
- "using UML.</p>\n"
- msgstr ""
- "<p>歡迎使用 Umbrello。</p>\n"
--"<p>UML 圖表可幫助您設計物件導向軟體，並為您組織文件。<a href=\"help:/umbrello\">Umbrello 手冊</a> "
--"中對 UML 的使用有很好的介紹。</p>\n"
-+"<p>UML 圖表可幫助您設計物件導向軟體，並為您組織文件。<a href=\"help:/umbrello"
-+"\">Umbrello 手冊</a> 中對 UML 的使用有很好的介紹。</p>\n"
- 
- #: tips.cpp:9
- msgid ""
--"<p>Welcome to Umbrello 1.5.  New in this version are association classes, Ruby "
--"code generation, externalizable folders, ability to change interfaces into "
--"classes, and more.</p>\n"
-+"<p>Welcome to Umbrello 1.5.  New in this version are association classes, "
-+"Ruby code generation, externalizable folders, ability to change interfaces "
-+"into classes, and more.</p>\n"
- msgstr ""
--"<p>歡迎使用 Umbrello 1.5。此版本中的新增內容包括關聯類別、Ruby 代碼產生、外部化資料夾、將介面轉變為類別等等。</p>\n"
-+"<p>歡迎使用 Umbrello 1.5。此版本中的新增內容包括關聯類別、Ruby 代碼產生、外部"
-+"化資料夾、將介面轉變為類別等等。</p>\n"
- 
- #: tips.cpp:14
- msgid ""
--"<p>Tabbed Diagrams and Externalized Folders are mutually exclusive. If you need "
--"External Folders then deselect &quot;Use tabbed diagrams&quot; in the General "
--"Settings.</p>\n"
-+"<p>Tabbed Diagrams and Externalized Folders are mutually exclusive. If you "
-+"need External Folders then deselect &quot;Use tabbed diagrams&quot; in the "
-+"General Settings.</p>\n"
- msgstr ""
--"<p>標籤式圖表和外部化資料夾無法同時使用。如果您需要外部資料夾，必須在一般設定中取消「使用標籤式圖表」。</p>\n"
-+"<p>標籤式圖表和外部化資料夾無法同時使用。如果您需要外部資料夾，必須在一般設定"
-+"中取消「使用標籤式圖表」。</p>\n"
- 
- #: tips.cpp:19
- msgid ""
--"<p>Most diagram items can not be resized, they will resize themselves to fit to "
--"their contents.\n"
--"Boxes, notes and sequence diagram messages can be resized, just click and drag "
--"on the red square.</p>\n"
-+"<p>Most diagram items can not be resized, they will resize themselves to fit "
-+"to their contents.\n"
-+"Boxes, notes and sequence diagram messages can be resized, just click and "
-+"drag on the red square.</p>\n"
- msgstr ""
--"<p>大多數的圖表項目都不能手動改變大小，它們會自己改變以便適用於它們的內容。方框、註釋和序列圖信息可以改變大小，只需在紅色正方形上點擊和拖曳。</p>\n"
-+"<p>大多數的圖表項目都不能手動改變大小，它們會自己改變以便適用於它們的內容。方"
-+"框、註釋和序列圖信息可以改變大小，只需在紅色正方形上點擊和拖曳。</p>\n"
- 
- #: tips.cpp:25
- msgid ""
- "<p>If you want to add an already existing class to a diagram just drag its "
- "entry from the tree view.</p>\n"
--msgstr ""
--"<p>如果想新增一個已經存在的類別到圖表，從樹狀檢視中拖曳即可。</p>\n"
-+msgstr "<p>如果想新增一個已經存在的類別到圖表，從樹狀檢視中拖曳即可。</p>\n"
- 
- #: tips.cpp:30
- msgid ""
-@@ -3477,39 +3475,44 @@
- "classes.\n"
- "Right click a class to open the refactoring agent.</p>\n"
- msgstr ""
--"<p>Umbrello 的重構代理讓您可以在類別和它的衍生或基礎類別間移動操作。在類別上點擊右鍵可以開啟重構代理。</p>\n"
-+"<p>Umbrello 的重構代理讓您可以在類別和它的衍生或基礎類別間移動操作。在類別上"
-+"點擊右鍵可以開啟重構代理。</p>\n"
- 
- #: tips.cpp:37
- msgid ""
--"<p>Sequence diagram objects can have a destructor box and be drawn as actors.  "
--"Double click one for\n"
-+"<p>Sequence diagram objects can have a destructor box and be drawn as "
-+"actors.  Double click one for\n"
- "the Properties dialogue.</p>\n"
- msgstr ""
--"<p>序列圖物件可以有一個解構子方框，並繪製成主角。雙擊可以開啟屬性對話框。</p>\n"
-+"<p>序列圖物件可以有一個解構子方框，並繪製成主角。雙擊可以開啟屬性對話框。</"
-+"p>\n"
- 
- #: tips.cpp:43
- msgid ""
--"<p>Sequence diagram messages can act as constructors.  Click on the object box "
--"(rather than the vertical line) to make it a constructor.</p>\n"
-+"<p>Sequence diagram messages can act as constructors.  Click on the object "
-+"box (rather than the vertical line) to make it a constructor.</p>\n"
- msgstr ""
--"<p>序列圖訊息可以做為建構子。點擊物件方框（而不是垂直線）就可以讓它做為建構子。</p>\n"
-+"<p>序列圖訊息可以做為建構子。點擊物件方框（而不是垂直線）就可以讓它做為建構"
-+"子。</p>\n"
- 
- #: tips.cpp:48
- msgid ""
--"<p>Sequence diagrams support messages to self.  Click on the same vertical line "
--"again to create an automessage.</p>\n"
-+"<p>Sequence diagrams support messages to self.  Click on the same vertical "
-+"line again to create an automessage.</p>\n"
- msgstr ""
--"<p>序列圖支援給自己的訊息。再次點選同樣的垂直線條就可以建立一個自動訊息。</p>\n"
-+"<p>序列圖支援給自己的訊息。再次點選同樣的垂直線條就可以建立一個自動訊息。</"
-+"p>\n"
- 
- #: tips.cpp:53
- msgid ""
- "<p>If on loading a foreign file nothing is displayed in the list view, try "
- "saving the model under a different name,\n"
--"closing, and reloading the saved file.  Usually the list view is then properly "
--"populated.\n"
-+"closing, and reloading the saved file.  Usually the list view is then "
-+"properly populated.\n"
- "</p>\n"
- msgstr ""
--"<p>如果載入外部檔案時在列表檢視中沒有顯示任何東西，請試著用不同名稱儲存模型，關閉再重新載入剛儲存的檔案。通常列表檢視就會正常了。</p>\n"
-+"<p>如果載入外部檔案時在列表檢視中沒有顯示任何東西，請試著用不同名稱儲存模型，"
-+"關閉再重新載入剛儲存的檔案。通常列表檢視就會正常了。</p>\n"
- 
- #: tips.cpp:60
- msgid ""
-@@ -3517,20 +3520,18 @@
- "pasted into KWord\n"
- "and other applications.</p>\n"
- msgstr ""
--"<p>剪下和複製會將影像以 PNG 格式儲存在剪貼簿中，在 KWord 或其它應用程式中可以直接貼上。</p>\n"
-+"<p>剪下和複製會將影像以 PNG 格式儲存在剪貼簿中，在 KWord 或其它應用程式中可以"
-+"直接貼上。</p>\n"
- 
- #: tips.cpp:66
- msgid ""
- "<p>Associations do not have to be in straight lines, double clicking on one "
- "will create a movable point.</p>\n"
--msgstr ""
--"<p>關聯不必一定是直線。雙擊其中一條，可以建立一個可移動的點。</p>\n"
-+msgstr "<p>關聯不必一定是直線。雙擊其中一條，可以建立一個可移動的點。</p>\n"
- 
- #: tips.cpp:71
--msgid ""
--"<p>You can turn on autosaving in the Configure Umbrello dialog.</p>\n"
--msgstr ""
--"<p>在 Umbrello 設定對話框中可以開啟自動儲存功能。</p>\n"
-+msgid "<p>You can turn on autosaving in the Configure Umbrello dialog.</p>\n"
-+msgstr "<p>在 Umbrello 設定對話框中可以開啟自動儲存功能。</p>\n"
- 
- #: tips.cpp:76
- msgid ""
-@@ -3538,23 +3539,22 @@
- "Either add it to the bugs database with Report Bug from the Help menu\n"
- "or send it to the uml-devel mailing list.</p>\n"
- "<ul>\n"
--"<li><a href=\"http://uml.sf.net/contact.php\">http://uml.sf.net/contact.php</a>"
--".</li>\n"
-+"<li><a href=\"http://uml.sf.net/contact.php\">http://uml.sf.net/contact.php</"
-+"a>.</li>\n"
- "</ul>\n"
- msgstr ""
- "<p>您需要 Umbrello 沒有提供的功能？請讓我們知道。\n"
- "可以使用說明選單的中的「報告問題」來增加希望清單，\n"
- "或發信到 uml-devel 郵件論壇。</p>\n"
- "<ul>\n"
--"<li><a href=\"http://uml.sf.net/contact.php\">http://uml.sf.net/contact.php</a>"
--"</li>\n"
-+"<li><a href=\"http://uml.sf.net/contact.php\">http://uml.sf.net/contact.php</"
-+"a></li>\n"
- "</ul>\n"
- 
- #: tips.cpp:86
- msgid ""
- "<p>You can delete all selected objects by pressing Del or Backspace.</p>\n"
--msgstr ""
--"<p>按刪除鍵或後退鍵來刪除全部選中的物件。</p>\n"
-+msgstr "<p>按刪除鍵或後退鍵來刪除全部選中的物件。</p>\n"
- 
- #: tips.cpp:91
- msgid ""
-@@ -3569,20 +3569,18 @@
- "<p>Pressing the Escape key sets the current tool to the select tool.\n"
- "Backspace jumps to the previously used tool.</p>\n"
- msgstr ""
--"<p>按 ESC 鍵將所選的工具設定為目前使用的工具。按後退鍵跳至先前使用的工具。</p>\n"
-+"<p>按 ESC 鍵將所選的工具設定為目前使用的工具。按後退鍵跳至先前使用的工具。</"
-+"p>\n"
- 
- #: tips.cpp:103
--msgid ""
--"<p>You can select all objects by pressing Ctrl-A.</p>\n"
--msgstr ""
--"<p>按 Ctrl-A 選擇所有物件。</p>\n"
-+msgid "<p>You can select all objects by pressing Ctrl-A.</p>\n"
-+msgstr "<p>按 Ctrl-A 選擇所有物件。</p>\n"
- 
- #: tips.cpp:108
- msgid ""
--"<p>You can create and setup a new class using the New Class Wizard in the Code "
--"menu.</p>\n"
--msgstr ""
--"<p>使用代碼選單中的新增類別精靈可以建立和設定一個新類別。</p>\n"
-+"<p>You can create and setup a new class using the New Class Wizard in the "
-+"Code menu.</p>\n"
-+msgstr "<p>使用代碼選單中的新增類別精靈可以建立和設定一個新類別。</p>\n"
- 
- #: statewidget.cpp:176
- msgid "Enter Activity"
-@@ -3602,7 +3600,7 @@
- 
- #: listpopupmenu.cpp:231 listpopupmenu.cpp:486
- msgid "Change Font..."
--msgstr "改變字型..."
-+msgstr "改變字型…"
- 
- #: listpopupmenu.cpp:233
- msgid "Delete Selected Items"
-@@ -3622,11 +3620,11 @@
- 
- #: listpopupmenu.cpp:281 listpopupmenu.cpp:1155
- msgid "Enum Literal..."
--msgstr "Enum 常數..."
-+msgstr "Enum 常數…"
- 
- #: listpopupmenu.cpp:292 listpopupmenu.cpp:1143
- msgid "Entity Attribute..."
--msgstr "實體屬性..."
-+msgstr "實體屬性…"
- 
- #: listpopupmenu.cpp:318
- msgid "Move Up"
-@@ -3638,31 +3636,31 @@
- 
- #: listpopupmenu.cpp:325
- msgid "Rename Class..."
--msgstr "重新命名類別..."
-+msgstr "重新命名類別…"
- 
- #: listpopupmenu.cpp:326
- msgid "Rename Object..."
--msgstr "重新命名物件..."
-+msgstr "重新命名物件…"
- 
- #: listpopupmenu.cpp:334 listpopupmenu.cpp:423 listpopupmenu.cpp:564
- msgid "New Operation..."
--msgstr "新增操作..."
-+msgstr "新增操作…"
- 
- #: listpopupmenu.cpp:335 listpopupmenu.cpp:424 listpopupmenu.cpp:1302
- msgid "Select Operation..."
--msgstr "選擇操作..."
-+msgstr "選擇操作…"
- 
- #: listpopupmenu.cpp:346 listpopupmenu.cpp:430
- msgid "Change Text..."
--msgstr "更改文字..."
-+msgstr "更改文字…"
- 
- #: listpopupmenu.cpp:360 listpopupmenu.cpp:579 listpopupmenu.cpp:1043
- msgid "Activity..."
--msgstr "活動..."
-+msgstr "活動…"
- 
- #: listpopupmenu.cpp:366
- msgid "Change State Name..."
--msgstr "更改狀態名稱..."
-+msgstr "更改狀態名稱…"
- 
- #: listpopupmenu.cpp:376
- msgid "Flip Horizontal"
-@@ -3674,12 +3672,12 @@
- 
- #: listpopupmenu.cpp:388
- msgid "Change Activity Name..."
--msgstr "更改活動名稱..."
-+msgstr "更改活動名稱…"
- 
- #: listpopupmenu.cpp:397 listpopupmenu.cpp:400 listpopupmenu.cpp:1268
- #: listpopupmenu.cpp:1272
- msgid "Change Multiplicity..."
--msgstr "更改多重性..."
-+msgstr "更改多重性…"
- 
- #: listpopupmenu.cpp:403 listpopupmenu.cpp:1276
- msgid "Change Name"
-@@ -3687,11 +3685,11 @@
- 
- #: listpopupmenu.cpp:406 listpopupmenu.cpp:1260 listpopupmenu.cpp:1282
- msgid "Change Role A Name..."
--msgstr "更改角色 A 名稱..."
-+msgstr "更改角色 A 名稱…"
- 
- #: listpopupmenu.cpp:409 listpopupmenu.cpp:1264 listpopupmenu.cpp:1283
- msgid "Change Role B Name..."
--msgstr "更改角色 B 名稱..."
-+msgstr "更改角色 B 名稱…"
- 
- #: listpopupmenu.cpp:461
- msgid "New"
-@@ -3699,11 +3697,11 @@
- 
- #: listpopupmenu.cpp:471 listpopupmenu.cpp:1306
- msgid "Rename..."
--msgstr "重新命名..."
-+msgstr "重新命名…"
- 
- #: listpopupmenu.cpp:489 listpopupmenu.cpp:734 listpopupmenu.cpp:745
- msgid "Line Color..."
--msgstr "線條顏色..."
-+msgstr "線條顏色…"
- 
- #: listpopupmenu.cpp:492
- msgid "Expand All"
-@@ -3719,7 +3717,7 @@
- 
- #: listpopupmenu.cpp:501
- msgid "Externalize Folder..."
--msgstr "外部化資料夾..."
-+msgstr "外部化資料夾…"
- 
- #: listpopupmenu.cpp:504
- msgid "Internalize Folder"
-@@ -3727,7 +3725,7 @@
- 
- #: listpopupmenu.cpp:507
- msgid "Import Classes..."
--msgstr "匯入類別..."
-+msgstr "匯入類別…"
- 
- #: listpopupmenu.cpp:512
- msgid "Subsystem"
-@@ -3739,7 +3737,7 @@
- 
- #: listpopupmenu.cpp:555
- msgid "Text Line..."
--msgstr "文字線條..."
-+msgstr "文字線條…"
- 
- #: listpopupmenu.cpp:558
- msgid "Reset Label Positions"
-@@ -3747,27 +3745,27 @@
- 
- #: listpopupmenu.cpp:561
- msgid "New Parameter..."
--msgstr "新增參數..."
-+msgstr "新增參數…"
- 
- #: listpopupmenu.cpp:567
- msgid "New Attribute..."
--msgstr "新增屬性..."
-+msgstr "新增屬性…"
- 
- #: listpopupmenu.cpp:570 listpopupmenu.cpp:1232
- msgid "New Template..."
--msgstr "新增樣本..."
-+msgstr "新增樣本…"
- 
- #: listpopupmenu.cpp:573
- msgid "New Literal..."
--msgstr "新增常數..."
-+msgstr "新增常數…"
- 
- #: listpopupmenu.cpp:576
- msgid "New Entity Attribute..."
--msgstr "新增實體屬性..."
-+msgstr "新增實體屬性…"
- 
- #: listpopupmenu.cpp:582
- msgid "Export as Picture..."
--msgstr "匯出成圖片..."
-+msgstr "匯出成圖片…"
- 
- #: listpopupmenu.cpp:676
- msgid "Public Only"
-@@ -3783,11 +3781,11 @@
- 
- #: listpopupmenu.cpp:707
- msgid "Attribute..."
--msgstr "屬性..."
-+msgstr "屬性…"
- 
- #: listpopupmenu.cpp:708
- msgid "Operation..."
--msgstr "操作..."
-+msgstr "操作…"
- 
- #: listpopupmenu.cpp:722
- msgid "Refactor"
-@@ -3799,7 +3797,7 @@
- 
- #: listpopupmenu.cpp:735 listpopupmenu.cpp:746
- msgid "Fill Color..."
--msgstr "填充顏色..."
-+msgstr "填充顏色…"
- 
- #: listpopupmenu.cpp:736 listpopupmenu.cpp:747
- msgid "Use Fill Color"
-@@ -3807,59 +3805,59 @@
- 
- #: listpopupmenu.cpp:1007
- msgid "Actor..."
--msgstr "主角..."
-+msgstr "主角…"
- 
- #: listpopupmenu.cpp:1008
- msgid "Use Case..."
--msgstr "用例..."
-+msgstr "用例…"
- 
- #: listpopupmenu.cpp:1017
- msgid "Class..."
--msgstr "類別..."
-+msgstr "類別…"
- 
- #: listpopupmenu.cpp:1018
- msgid "Interface..."
--msgstr "介面..."
-+msgstr "介面…"
- 
- #: listpopupmenu.cpp:1019
- msgid "Datatype..."
--msgstr "資料型態..."
-+msgstr "資料型態…"
- 
- #: listpopupmenu.cpp:1020
- msgid "Enum..."
--msgstr "Enum..."
-+msgstr "Enum…"
- 
- #: listpopupmenu.cpp:1021
- msgid "Package..."
--msgstr "套件..."
-+msgstr "套件…"
- 
- #: listpopupmenu.cpp:1032
- msgid "State..."
--msgstr "狀態..."
-+msgstr "狀態…"
- 
- #: listpopupmenu.cpp:1053
- msgid "Subsystem..."
--msgstr "子系統..."
-+msgstr "子系統…"
- 
- #: listpopupmenu.cpp:1054
- msgid "Component..."
--msgstr "元件..."
-+msgstr "元件…"
- 
- #: listpopupmenu.cpp:1055
- msgid "Artifact..."
--msgstr "產出..."
-+msgstr "產出…"
- 
- #: listpopupmenu.cpp:1063
- msgid "Node..."
--msgstr "節點..."
-+msgstr "節點…"
- 
- #: listpopupmenu.cpp:1071
- msgid "Entity..."
--msgstr "實體..."
-+msgstr "實體…"
- 
- #: listpopupmenu.cpp:1080
- msgid "Object..."
--msgstr "物件..."
-+msgstr "物件…"
- 
- #: listpopupmenu.cpp:1089
- msgid "Attribute"
-@@ -3879,7 +3877,7 @@
- 
- #: listpopupmenu.cpp:1281
- msgid "Change Association Name..."
--msgstr "更改關聯名稱..."
-+msgstr "更改關聯名稱…"
- 
- #: listpopupmenu.cpp:1339
- msgid "Clear Diagram"
-diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdetoys/amor.po kde-i18n-zh_TW-3.5.10/messages/kdetoys/amor.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdetoys/amor.po	2006-07-22 10:03:53.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdetoys/amor.po	2011-11-11 15:45:17.000000000 +0100
-@@ -5,8 +5,7 @@
- "Project-Id-Version: amor\n"
- "POT-Creation-Date: 2005-11-30 03:24+0100\n"
- "PO-Revision-Date: 2006-01-24 14:53+0800\n"
--"Last-Translator: Frank Weng (a.k.a. Franklin) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Traditional Chinese <zh_l10n@linux.org.tw>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
-@@ -23,13 +22,14 @@
- 
- #: tips.cpp:8
- msgid ""
--"Real programmers don't comment their code. It was hard to write, it should be "
--"hard to understand."
-+"Real programmers don't comment their code. It was hard to write, it should "
-+"be hard to understand."
- msgstr "真正的程式設計師不會註解他們的程式碼。程式很難寫，也應該很難了解。"
- 
- #: tips.cpp:11
- msgid ""
--"It is much easier to suggest solutions when you know nothing about the problem."
-+"It is much easier to suggest solutions when you know nothing about the "
-+"problem."
- msgstr "當你對問題毫無所知時，比較容易去建議解決方法。"
- 
- #: tips.cpp:14
-@@ -88,7 +88,8 @@
- msgid ""
- "If you leave KDE applications open when you logout, they will be restarted "
- "automatically when you log back in."
--msgstr "如果當你登出時有 KDE 的應用程式還開啟，當你再次登入時，它們會自動重新啟動。"
-+msgstr ""
-+"如果當你登出時有 KDE 的應用程式還開啟，當你再次登入時，它們會自動重新啟動。"
- 
- #: tips.cpp:53
- msgid "The KDE file manager is also a web browser and an FTP client."
-@@ -99,7 +100,9 @@
- "Applications can display messages and tips in an Amor bubble using the "
- "showMessage() and\n"
- "showTip() DCOP calls"
--msgstr "應用程式可以用 showMessage() 與 showTip() 這兩個 DCOP 呼叫，來在 Amor 泡泡中顯示訊息與提示。"
-+msgstr ""
-+"應用程式可以用 showMessage() 與 showTip() 這兩個 DCOP 呼叫，來在 Amor 泡泡中"
-+"顯示訊息與提示。"
- 
- #: _translatorinfo.cpp:1
- msgid ""
-@@ -115,7 +118,7 @@
- 
- #: amor.cpp:325
- msgid "Error reading theme: "
--msgstr "讀取佈景發生錯誤："
-+msgstr "讀取布景發生錯誤："
- 
- #: amor.cpp:339 amor.cpp:348
- msgid "Error reading group: "
-@@ -123,7 +126,7 @@
- 
- #: amor.cpp:613
- msgid "&Configure..."
--msgstr "設定(&C)..."
-+msgstr "設定(&C)…"
- 
- #: amor.cpp:751
- msgid ""
-@@ -150,16 +153,12 @@
- "\n"
- 
- #: amor.cpp:754
--msgid ""
--"Original Author: Martin R. Jones <mjones@kde.org>\n"
--msgstr ""
--"原作者：Martin R. Jones <mjones@kde.org>\n"
-+msgid "Original Author: Martin R. Jones <mjones@kde.org>\n"
-+msgstr "原作者：Martin R. Jones <mjones@kde.org>\n"
- 
- #: amor.cpp:755
--msgid ""
--"Current Maintainer: Gerardo Puga <gpuga@gioia.ing.unlp.edu.ar>\n"
--msgstr ""
--"目前維護者：Gerardo Puga <gpuga@gioia.ing.unlp.edu.ar>\n"
-+msgid "Current Maintainer: Gerardo Puga <gpuga@gioia.ing.unlp.edu.ar>\n"
-+msgstr "目前維護者：Gerardo Puga <gpuga@gioia.ing.unlp.edu.ar>\n"
- 
- #: amor.cpp:757
- msgid "About Amor"
-@@ -167,7 +166,7 @@
- 
- #: amordialog.cpp:57
- msgid "Theme:"
--msgstr "佈景："
-+msgstr "布景："
- 
- #: amordialog.cpp:74
- msgid "Offset:"
-diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdetoys/kfifteenapplet.po kde-i18n-zh_TW-3.5.10/messages/kdetoys/kfifteenapplet.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdetoys/kfifteenapplet.po	2006-07-22 10:03:53.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdetoys/kfifteenapplet.po	2011-11-11 15:45:17.000000000 +0100
-@@ -8,8 +8,7 @@
- "Project-Id-Version: kfifteenapplet\n"
- "POT-Creation-Date: 2004-10-12 01:17+0200\n"
- "PO-Revision-Date: 2006-01-24 14:56+0800\n"
--"Last-Translator: Frank Weng (a.k.a. Franklin) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Traditional Chinese <zh_l10n@linux.org.tw>\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/kdetoys/kmoon.po kde-i18n-zh_TW-3.5.10/messages/kdetoys/kmoon.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdetoys/kmoon.po	2006-07-22 10:03:53.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdetoys/kmoon.po	2011-11-11 15:45:17.000000000 +0100
-@@ -5,8 +5,7 @@
- "Project-Id-Version: kmoon\n"
- "POT-Creation-Date: 2004-10-12 01:17+0200\n"
- "PO-Revision-Date: 2006-01-24 15:04+0800\n"
--"Last-Translator: Frank Weng (a.k.a. Franklin) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Traditional Chinese <zh_l10n@linux.org.tw>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
-@@ -19,7 +18,7 @@
- 
- #: kmoonapplet.cpp:84
- msgid "&Configure..."
--msgstr "設定(&C)..."
-+msgstr "設定(&C)…"
- 
- #: kmoonapplet.cpp:100
- msgid "About Moon Phase Indicator"
-diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdetoys/kodo.po kde-i18n-zh_TW-3.5.10/messages/kdetoys/kodo.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdetoys/kodo.po	2006-07-22 10:03:53.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdetoys/kodo.po	2011-11-11 15:45:17.000000000 +0100
-@@ -7,7 +7,7 @@
- "Project-Id-Version: kodo\n"
- "POT-Creation-Date: 2004-10-12 01:17+0200\n"
- "PO-Revision-Date: 2001-08-29 09:52+CST\n"
--"Last-Translator: Shell Hung <shell@shellhung.org>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Traditional Chinese <zh-l10n@linux.org.tw>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
-@@ -71,23 +71,23 @@
- 
- #: kodometer.cpp:91
- msgid "&Enable"
--msgstr "啟動 (&E)"
-+msgstr "啟動(&E)"
- 
- #: kodometer.cpp:92
- msgid "&Metric Display"
--msgstr "以公制顯示 (&M)"
-+msgstr "以公制顯示(&M)"
- 
- #: kodometer.cpp:94
- msgid "Auto &Reset Trip"
--msgstr "自動清除差值 (&R)"
-+msgstr "自動清除差值(&R)"
- 
- #: kodometer.cpp:96
- msgid "Reset &Trip"
--msgstr "重設差值 (&T)"
-+msgstr "重設差值(&T)"
- 
- #: kodometer.cpp:97
- msgid "Reset &Odometer"
--msgstr "重設量器 (&O)"
-+msgstr "重設量器(&O)"
- 
- #: _translatorinfo.cpp:1
- msgid ""
-diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdetoys/kteatime.po kde-i18n-zh_TW-3.5.10/messages/kdetoys/kteatime.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdetoys/kteatime.po	2006-07-22 10:03:53.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdetoys/kteatime.po	2011-11-11 15:45:17.000000000 +0100
-@@ -9,8 +9,7 @@
- "Project-Id-Version: kteatime\n"
- "POT-Creation-Date: 2006-04-20 04:01+0200\n"
- "PO-Revision-Date: 2006-06-19 10:37+0800\n"
--"Last-Translator: Frank Weng (a.k.a. Franklin) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Chinese Traditional <zh-l10n@linux.org.tw>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
-@@ -51,11 +50,11 @@
- 
- #: toplevel.cpp:124
- msgid "&Configure..."
--msgstr "設定 (&C)..."
-+msgstr "設定(&C)…"
- 
- #: toplevel.cpp:126
- msgid "&Anonymous..."
--msgstr "匿名(&A)..."
-+msgstr "匿名(&A)…"
- 
- #: toplevel.cpp:297
- msgid "The %1 is now ready!"
-@@ -71,7 +70,7 @@
- 
- #: toplevel.cpp:425
- msgid "There is no tea to begin steeping."
--msgstr "沒有茶可以泡..."
-+msgstr "沒有茶可以泡…"
- 
- #: toplevel.cpp:425
- msgid "No Tea"
-@@ -135,7 +134,7 @@
- 
- #: toplevel.cpp:739
- msgid "Configure Events..."
--msgstr "設定事件..."
-+msgstr "設定事件…"
- 
- #: toplevel.cpp:744
- msgid "Event"
-diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdetoys/ktux.po kde-i18n-zh_TW-3.5.10/messages/kdetoys/ktux.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdetoys/ktux.po	2006-07-22 10:03:53.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdetoys/ktux.po	2011-11-11 15:45:17.000000000 +0100
-@@ -7,7 +7,7 @@
- "Project-Id-Version: ktux\n"
- "POT-Creation-Date: 2004-10-12 01:17+0200\n"
- "PO-Revision-Date: 2001-08-30 11:33+CST\n"
--"Last-Translator: Chih-Wei Huang <cwhuang@linux.org.tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Traditional Chinese <zh-l10n@linux.org.tw>\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/kdetoys/kweather.po kde-i18n-zh_TW-3.5.10/messages/kdetoys/kweather.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdetoys/kweather.po	2008-08-19 20:43:06.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdetoys/kweather.po	2011-11-11 15:45:17.000000000 +0100
-@@ -9,8 +9,7 @@
- "Project-Id-Version: kweather\n"
- "POT-Creation-Date: 2008-07-29 01:19+0200\n"
- "PO-Revision-Date: 2007-02-27 09:21+0800\n"
--"Last-Translator: Frank Weng (a.k.a. Franklin) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Chinese Traditional <zh-l10n@linux.org.tw>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
-@@ -39,7 +38,7 @@
- #: rc.cpp:12
- #, no-c-format
- msgid "&Show icon only"
--msgstr "只顯示圖示 (&S)"
-+msgstr "只顯示圖示(&S)"
- 
- #. i18n: file prefdialogdata.ui line 161
- #: rc.cpp:15
-@@ -52,13 +51,14 @@
- #, no-c-format
- msgid ""
- "This feature will allow you to make KWeather take up only one slot on the "
--"kicker. Normally this application will take up two slots. The small view will "
--"only show the weather icon, while the normal view will display both the icon "
--"and the current weather statistics. For the small view the weather statistics "
--"will be put on the buttons tool tip."
-+"kicker. Normally this application will take up two slots. The small view "
-+"will only show the weather icon, while the normal view will display both the "
-+"icon and the current weather statistics. For the small view the weather "
-+"statistics will be put on the buttons tool tip."
- msgstr ""
--"這個功能可以讓您只留下一個部份在系統面板上。KWeather "
--"預設會顯示兩個部份：縮小顯示將只顯示出天氣的圖樣，而普通顯示則會同時顯示出天氣的圖樣以及目前天氣的統計數值。在縮小顯示下天氣的統計數值則放在按鈕的工具提示裡面。"
-+"這個功能可以讓您只留下一個部份在系統面板上。KWeather 預設會顯示兩個部份：縮小"
-+"顯示將只顯示出天氣的圖樣，而普通顯示則會同時顯示出天氣的圖樣以及目前天氣的統"
-+"計數值。在縮小顯示下天氣的統計數值則放在按鈕的工具提示裡面。"
- 
- #. i18n: file prefdialogdata.ui line 172
- #: rc.cpp:21
-@@ -82,7 +82,7 @@
- #: rc.cpp:30
- #, no-c-format
- msgid "E&nable logging"
--msgstr "啟用日誌 (&N)"
-+msgstr "啟用日誌(&N)"
- 
- #. i18n: file prefdialogdata.ui line 246
- #: rc.cpp:33
-@@ -154,7 +154,7 @@
- #: rc.cpp:69
- #, no-c-format
- msgid "&Update All"
--msgstr "全部更新 (&U)"
-+msgstr "全部更新(&U)"
- 
- #. i18n: file sidebarwidgetbase.ui line 25
- #: rc.cpp:72
-@@ -182,7 +182,7 @@
- 
- #: dockwidget.cpp:105 weatherlib.cpp:177
- msgid "The network is currently offline..."
--msgstr "網路目前為離線狀態..."
-+msgstr "網路目前為離線狀態…"
- 
- #: dockwidget.cpp:108 reportview.cpp:136
- msgid "Temperature:"
-@@ -265,11 +265,11 @@
- 
- #: kweather.cpp:90
- msgid "Show &Report"
--msgstr "顯示報告 (&R)"
-+msgstr "顯示報告(&R)"
- 
- #: kweather.cpp:92
- msgid "&Update Now"
--msgstr "現在更新 (&U)"
-+msgstr "現在更新(&U)"
- 
- #: kweather.cpp:95
- msgid "&About KWeather"
-@@ -277,7 +277,7 @@
- 
- #: kweather.cpp:97
- msgid "&Configure KWeather..."
--msgstr "設定 KWeather(&C)..."
-+msgstr "設定 KWeather(&C)…"
- 
- #: kweather.cpp:130
- msgid "Weather applet for the Kicker"
-@@ -692,4 +692,20 @@
- 
- #: weatherlib.cpp:225
- msgid "Retrieving weather data..."
--msgstr "取得天氣資料中..."
-+msgstr "取得天氣資料中…"
-+
-+#, fuzzy
-+#~ msgid "The network is unavailable for use."
-+#~ msgstr "Das Netzwerk ist nicht erreichbar."
-+
-+#, fuzzy
-+#~ msgid ""
-+#~ "Click here to see\n"
-+#~ "the detailed weather report..."
-+#~ msgstr ""
-+#~ "Klicken Sie hier, um einen detaillierten\n"
-+#~ "Wetterbericht anzeigen zu lassen ..."
-+
-+#, fuzzy
-+#~ msgid "Please try a different one"
-+#~ msgstr "Bitte versuchen Sie es mit einer anderen."
-diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdetoys/kworldclock.po kde-i18n-zh_TW-3.5.10/messages/kdetoys/kworldclock.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdetoys/kworldclock.po	2006-07-22 10:03:53.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdetoys/kworldclock.po	2011-11-11 15:45:17.000000000 +0100
-@@ -10,7 +10,7 @@
- "Project-Id-Version: kworldclock\n"
- "POT-Creation-Date: 2004-10-12 01:17+0200\n"
- "PO-Revision-Date: 2005-11-25 14:50+0800\n"
--"Last-Translator: Frank Weng <franklin at goodhorse dot idv dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
-@@ -75,11 +75,11 @@
- 
- #: main.cpp:168
- msgid "The name of the theme to use"
--msgstr "使用佈景主題的名稱"
-+msgstr "使用布景主題的名稱"
- 
- #: main.cpp:169
- msgid "List available themes"
--msgstr "列出可用的佈景主題"
-+msgstr "列出可用的布景主題"
- 
- #: main.cpp:170
- msgid "The name of the file to write to"
-@@ -103,7 +103,7 @@
- 
- #: mapwidget.cpp:96
- msgid "Add &Custom..."
--msgstr "新增自訂顏色(&C)..."
-+msgstr "新增自訂顏色(&C)…"
- 
- #: mapwidget.cpp:99
- msgid "&Remove Flag"
-@@ -115,7 +115,7 @@
- 
- #: mapwidget.cpp:114 zoneclock.cpp:70
- msgid "&Add..."
--msgstr "新增(&A)..."
-+msgstr "新增(&A)…"
- 
- #: mapwidget.cpp:117
- msgid "&Flags"
-@@ -127,7 +127,7 @@
- 
- #: mapwidget.cpp:123
- msgid "&Map Theme"
--msgstr "地圖佈景(&M)"
-+msgstr "地圖布景(&M)"
- 
- #: mapwidget.cpp:124
- msgid "Show &Daylight"
-@@ -151,7 +151,7 @@
- 
- #: zoneclock.cpp:69
- msgid "&Edit..."
--msgstr "編輯(&E)..."
-+msgstr "編輯(&E)…"
- 
- #: _translatorinfo.cpp:1
- msgid ""
-diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdeutils/ark.po kde-i18n-zh_TW-3.5.10/messages/kdeutils/ark.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdeutils/ark.po	2008-02-13 10:55:25.000000000 +0100
-+++ kde-i18n-zh_TW-3.5.10/messages/kdeutils/ark.po	2011-11-11 15:45:17.000000000 +0100
-@@ -10,8 +10,7 @@
- "Report-Msgid-Bugs-To: \n"
- "POT-Creation-Date: 2007-11-07 01:15+0100\n"
- "PO-Revision-Date: 2006-05-18 11:30+0800\n"
--"Last-Translator: Frank Weng (a.k.a. Franklin) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Traditional Chinese <zh_l10n@linux.org.tw>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
-@@ -90,10 +89,8 @@
- msgstr "已壓縮檔案"
- 
- #: archiveformatinfo.cpp:114
--msgid ""
--"All Valid Archives\n"
--msgstr ""
--"所有支援的壓縮檔\n"
-+msgid "All Valid Archives\n"
-+msgstr "所有支援的壓縮檔\n"
- 
- #: archiveformatinfo.cpp:115
- msgid "All Files"
-@@ -113,15 +110,15 @@
- 
- #: ark_part.cpp:119
- msgid "Add &File..."
--msgstr "加入檔案(&F)..."
-+msgstr "加入檔案(&F)…"
- 
- #: ark_part.cpp:122
- msgid "Add Folde&r..."
--msgstr "加入資料夾(&R)..."
-+msgstr "加入資料夾(&R)…"
- 
- #: ark_part.cpp:125
- msgid "E&xtract..."
--msgstr "解開(&X)..."
-+msgstr "解開(&X)…"
- 
- #: ark_part.cpp:128
- msgid "De&lete"
-@@ -151,7 +148,7 @@
- 
- #: ark_part.cpp:152
- msgid "Configure &Ark..."
--msgstr "設定 &ARK..."
-+msgstr "設定 &ARK…"
- 
- #: ark_part.cpp:156
- msgid "Show Search Bar"
-@@ -175,7 +172,7 @@
- 
- #: ark_part.cpp:323
- msgid "Downloading %1..."
--msgstr "正在下載 %1 中..."
-+msgstr "正在下載 %1 中…"
- 
- #: ark_part.cpp:415
- msgid "Total: 0 files"
-@@ -234,7 +231,7 @@
- 
- #: arkwidget.cpp:296
- msgid "Saving..."
--msgstr "儲存中..."
-+msgstr "儲存中…"
- 
- #: arkwidget.cpp:431
- #, c-format
-@@ -320,7 +317,7 @@
- 
- #: arkwidget.cpp:991 arkwidget.cpp:2064
- msgid "Creating archive..."
--msgstr "正在建立壓縮檔...."
-+msgstr "正在建立壓縮檔…."
- 
- #: arkwidget.cpp:1094
- msgid "Select Files to Add"
-@@ -328,7 +325,7 @@
- 
- #: arkwidget.cpp:1133
- msgid "Adding files..."
--msgstr "加入檔案中..."
-+msgstr "加入檔案中…"
- 
- #: arkwidget.cpp:1152
- msgid "Select Folder to Add"
-@@ -336,7 +333,7 @@
- 
- #: arkwidget.cpp:1157
- msgid "Adding folder..."
--msgstr "加入資料夾..."
-+msgstr "加入資料夾…"
- 
- #: arkwidget.cpp:1249
- msgid "Do you really want to delete the selected items?"
-@@ -344,7 +341,7 @@
- 
- #: arkwidget.cpp:1270
- msgid "Removing..."
--msgstr "移除中..."
-+msgstr "移除中…"
- 
- #: arkwidget.cpp:1317
- msgid "Open with:"
-@@ -356,7 +353,7 @@
- 
- #: arkwidget.cpp:1514 arkwidget.cpp:1541 arkwidget.cpp:1575 mainwindow.cpp:399
- msgid "Extracting..."
--msgstr "解壓中..."
-+msgstr "解壓中…"
- 
- #: arkwidget.cpp:1603
- msgid "Edit with:"
-@@ -364,11 +361,11 @@
- 
- #: arkwidget.cpp:1614
- msgid "Trouble editing the file..."
--msgstr "編輯檔案失敗..."
-+msgstr "編輯檔案失敗…"
- 
- #: arkwidget.cpp:1654
- msgid "Readding edited file..."
--msgstr "重新加入已編輯的檔案..."
-+msgstr "重新加入已編輯的檔案…"
- 
- #: arkwidget.cpp:1673
- msgid "Extracting file to view"
-@@ -376,8 +373,8 @@
- 
- #: arkwidget.cpp:1691
- msgid ""
--"The internal viewer is not able to display this file. Would you like to view it "
--"using an external program?"
-+"The internal viewer is not able to display this file. Would you like to view "
-+"it using an external program?"
- msgstr "內建的檢視器無法顯示此檔案。您想要使用外部的程式來開啟它？"
- 
- #: arkwidget.cpp:1692
-@@ -448,13 +445,15 @@
- 
- #: arkwidget.cpp:2165
- msgid "Opening the archive..."
--msgstr "開啟壓縮檔中..."
-+msgstr "開啟壓縮檔中…"
- 
- #: arkwidget.cpp:2189
- msgid ""
--"This archive is read-only. If you want to save it under a new name, go to the "
--"File menu and select Save As."
--msgstr "本壓縮檔是唯讀的，如果您希望將它儲存為另一個名稱，請在選單列中選取「檔案」→「另存新檔」。"
-+"This archive is read-only. If you want to save it under a new name, go to "
-+"the File menu and select Save As."
-+msgstr ""
-+"本壓縮檔是唯讀的，如果您希望將它儲存為另一個名稱，請在選單列中選取「檔案」→"
-+"「另存新檔」。"
- 
- #: arkwidget.cpp:2207
- #, c-format
-@@ -595,7 +594,7 @@
- 
- #: common_texts.cpp:26
- msgid "Keep entries &generic (Lha)"
--msgstr "項目保持通用 [Lha] (&G)"
-+msgstr "項目保持通用 [Lha](&G)"
- 
- #. i18n: file addition.ui line 32
- #: common_texts.cpp:27 rc.cpp:33
-@@ -611,7 +610,7 @@
- #: common_texts.cpp:29 rc.cpp:42
- #, no-c-format
- msgid "&Recursively add subfolders (Zip, Rar)"
--msgstr "遞迴地加入子資料夾 [Zip, Rar] (&R)"
-+msgstr "遞迴地加入子資料夾 [Zip, Rar](&R)"
- 
- #. i18n: file addition.ui line 48
- #: common_texts.cpp:30 rc.cpp:39
-@@ -629,21 +628,21 @@
- #: common_texts.cpp:32 rc.cpp:48
- #, no-c-format
- msgid "&Preserve permissions (Tar)"
--msgstr "保留權限 [Tar] (&P)"
-+msgstr "保留權限 [Tar](&P)"
- 
- #. i18n: file extraction.ui line 40
- #: common_texts.cpp:33 rc.cpp:51
- #, no-c-format
- msgid "&Ignore folder names (Zip)"
--msgstr "忽略資料夾名稱 [Zip] (&I)"
-+msgstr "忽略資料夾名稱 [Zip](&I)"
- 
- #: common_texts.cpp:34
- msgid "Convert filenames to &lowercase (Zip, Rar)"
--msgstr "將檔案名稱改成小寫 [Zip, Rar] (&L)"
-+msgstr "將檔案名稱改成小寫 [Zip, Rar](&L)"
- 
- #: common_texts.cpp:35
- msgid "Convert filenames to &uppercase (Rar)"
--msgstr "將檔案名稱改成大寫 [Rar] (&U)"
-+msgstr "將檔案名稱改成大寫 [Rar](&U)"
- 
- #: compressedfile.cpp:73
- msgid ""
-@@ -718,7 +717,8 @@
- 
- #: extractiondialog.cpp:164
- msgid ""
--"You do not have write permission to this folder. Please provide another folder."
-+"You do not have write permission to this folder. Please provide another "
-+"folder."
- msgstr "您沒有該資料夾的寫入權限。請選擇其它資料夾。"
- 
- #: filelistview.cpp:155
-@@ -838,7 +838,7 @@
- 
- #: mainwindow.cpp:434
- msgid "Compressing..."
--msgstr "正在壓縮中..."
-+msgstr "正在壓縮中…"
- 
- #: mainwindow.cpp:456
- msgid "Please Wait"
-@@ -866,13 +866,13 @@
- #: rc.cpp:54
- #, no-c-format
- msgid "Convert file names to &lowercase (Zip, Rar)"
--msgstr "將檔案名稱改成小寫 [Zip, Rar] (&L)"
-+msgstr "將檔案名稱改成小寫 [Zip, Rar](&L)"
- 
- #. i18n: file extraction.ui line 56
- #: rc.cpp:57
- #, no-c-format
- msgid "Convert file names to &uppercase (Rar)"
--msgstr "將檔案名稱改成大寫 [Rar] (&U]·"
-+msgstr "將檔案名稱改成大寫 [Rar](&U]·"
- 
- #. i18n: file general.ui line 27
- #: rc.cpp:63
-@@ -890,11 +890,11 @@
- #: rc.cpp:69
- #, no-c-format
- msgid ""
--"<font size=\"-1\"><i>Konqueror integration is only available if you install the "
--"Konqueror integration plugin from the kdeaddons package.</i></font>"
-+"<font size=\"-1\"><i>Konqueror integration is only available if you install "
-+"the Konqueror integration plugin from the kdeaddons package.</i></font>"
- msgstr ""
--"<font size=\"-1\"><i>只有在安裝在 kdeaddos 套件中 Konqueror 整合的外掛程式後，才可使用 Konqueror "
--"整合功能。</i></font>"
-+"<font size=\"-1\"><i>只有在安裝在 kdeaddos 套件中 Konqueror 整合的外掛程式"
-+"後，才可使用 Konqueror 整合功能。</i></font>"
- 
- #. i18n: file ark.kcfg line 9
- #: rc.cpp:72
-@@ -914,7 +914,9 @@
- msgid ""
- "If this option is enabled and you add filenames that already exist in an "
- "archive, only replace the old files if the added files are newer than them"
--msgstr "如啟用此選項，當您將檔案加入壓縮檔中，而壓縮檔內該檔早已存在；只會在新加入的檔案為較新的情況下，有會取代舊的檔案。"
-+msgstr ""
-+"如啟用此選項，當您將檔案加入壓縮檔中，而壓縮檔內該檔早已存在；只會在新加入的"
-+"檔案為較新的情況下，有會取代舊的檔案。"
- 
- #. i18n: file ark.kcfg line 17
- #: rc.cpp:81
-@@ -940,10 +942,12 @@
- #: rc.cpp:90
- #, no-c-format
- msgid ""
--"Save the user, group, and permission settings on files. Use with care, as this "
--"may result in files being extracted that do not belong to any valid user on "
--"your computer"
--msgstr "在檔案中儲存使用者、群組及權限設定。請小心使用，在您的電腦解開檔案時可能會導致其不屬於任何使用者。"
-+"Save the user, group, and permission settings on files. Use with care, as "
-+"this may result in files being extracted that do not belong to any valid "
-+"user on your computer"
-+msgstr ""
-+"在檔案中儲存使用者、群組及權限設定。請小心使用，在您的電腦解開檔案時可能會導"
-+"致其不屬於任何使用者。"
- 
- #. i18n: file ark.kcfg line 31
- #: rc.cpp:93
-@@ -973,8 +977,8 @@
- #: rc.cpp:105
- #, no-c-format
- msgid ""
--"Extract all the files into the extraction folder, ignoring any folder structure "
--"in the archive."
-+"Extract all the files into the extraction folder, ignoring any folder "
-+"structure in the archive."
- msgstr "將所有檔案解壓型解壓資料夾中，忽略壓縮檔的資料夾結構。"
- 
- #. i18n: file ark.kcfg line 47
-@@ -1017,10 +1021,12 @@
- #: rc.cpp:126
- #, no-c-format
- msgid ""
--"Enables integration with Konqueror's context menus, letting you easily archive "
--"or unarchive files. This option will only work if you have the kdeaddons "
--"package installed."
--msgstr "啟用將 Konqueror 整合到快顯選單，使你更容易建立或解開壓縮檔。只有在安裝 kdeaddons 套件後，此選項才能夠工作。"
-+"Enables integration with Konqueror's context menus, letting you easily "
-+"archive or unarchive files. This option will only work if you have the "
-+"kdeaddons package installed."
-+msgstr ""
-+"啟用將 Konqueror 整合到快顯選單，使你更容易建立或解開壓縮檔。只有在安裝 "
-+"kdeaddons 套件後，此選項才能夠工作。"
- 
- #. i18n: file ark.kcfg line 74
- #: rc.cpp:129
-@@ -1058,7 +1064,7 @@
- 
- #: tar.cpp:432
- msgid "Trouble writing to the tempfile..."
--msgstr "寫入暫存檔失敗..."
-+msgstr "寫入暫存檔失敗…"
- 
- #~ msgid ""
- #~ "\n"
-@@ -1082,7 +1088,8 @@
- #~ "是否要回到解壓縮對話方塊？"
- 
- #~ msgid ""
--#~ "Some files will not be extracted, because they would overwrite existing files.\n"
-+#~ "Some files will not be extracted, because they would overwrite existing "
-+#~ "files.\n"
- #~ "Would you like to go back to the extraction dialog?\n"
- #~ "\n"
- #~ "The following files will not be extracted if you choose to continue:"
-diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdeutils/irkick.po kde-i18n-zh_TW-3.5.10/messages/kdeutils/irkick.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdeutils/irkick.po	2006-07-22 10:03:58.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdeutils/irkick.po	2011-11-11 15:45:17.000000000 +0100
-@@ -6,8 +6,7 @@
- "Project-Id-Version: irkick\n"
- "POT-Creation-Date: 2005-07-24 01:36+0200\n"
- "PO-Revision-Date: 2006-02-09 12:04+0800\n"
--"Last-Translator: Frank Weng (a.k.a. Franklin) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Traditional Chinese <zh_l10n@linux.org.tw>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
-@@ -40,14 +39,14 @@
- 
- #: irkick.cpp:94
- msgid ""
--"The infrared system has severed its connection. Remote controls are no longer "
--"available."
-+"The infrared system has severed its connection. Remote controls are no "
-+"longer available."
- msgstr "紅外線系統已切斷連線，目前無法再遙控。"
- 
- #: irkick.cpp:102
- msgid ""
--"A connection to the infrared system has been made. Remote controls may now be "
--"available."
-+"A connection to the infrared system has been made. Remote controls may now "
-+"be available."
- msgstr "紅外線系統已連線。您可以開始遙控。"
- 
- #: irkick.cpp:118
-@@ -74,7 +73,7 @@
- 
- #: irkick.cpp:247
- msgid "Starting <b>%1</b>..."
--msgstr "開始 <b>%1</b>..."
-+msgstr "開始 <b>%1</b>…"
- 
- #: main.cpp:22
- msgid "IRKick"
-diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdeutils/kcalc.po kde-i18n-zh_TW-3.5.10/messages/kdeutils/kcalc.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdeutils/kcalc.po	2008-08-19 20:43:07.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdeutils/kcalc.po	2011-11-11 15:45:17.000000000 +0100
-@@ -5,8 +5,7 @@
- "Project-Id-Version: kcalc\n"
- "POT-Creation-Date: 2008-07-08 01:19+0200\n"
- "PO-Revision-Date: 2006-01-27 13:54+0800\n"
--"Last-Translator: Frank Weng (a.k.a. Franklin) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Traditional Chinese <zh_l10n@linux.org.tw>\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/kdeutils/kcharselectapplet.po kde-i18n-zh_TW-3.5.10/messages/kdeutils/kcharselectapplet.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdeutils/kcharselectapplet.po	2005-09-10 11:24:10.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdeutils/kcharselectapplet.po	2011-11-11 15:45:17.000000000 +0100
-@@ -7,7 +7,7 @@
- "Project-Id-Version: kcharselectapplet\n"
- "POT-Creation-Date: 2004-10-12 01:17+0200\n"
- "PO-Revision-Date: 2001-08-30 13:43+0800\n"
--"Last-Translator: Feng-Shiang Wen <fswen@mail2000.com.tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: zh-l10n <zh-l10n@linux.org.tw>\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/kdeutils/kcharselect.po kde-i18n-zh_TW-3.5.10/messages/kdeutils/kcharselect.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdeutils/kcharselect.po	2006-07-22 10:03:58.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdeutils/kcharselect.po	2011-11-11 15:45:17.000000000 +0100
-@@ -8,8 +8,7 @@
- "Project-Id-Version: kcharselect\n"
- "POT-Creation-Date: 2004-12-21 01:21+0100\n"
- "PO-Revision-Date: 2006-01-27 14:19+0800\n"
--"Last-Translator: Frank Weng (a.k.a. Franklin) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Traditional Chinese <zh_l10n@linux.org.tw>\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/kdeutils/kcmkvaio.po kde-i18n-zh_TW-3.5.10/messages/kdeutils/kcmkvaio.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdeutils/kcmkvaio.po	2006-10-01 18:34:14.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdeutils/kcmkvaio.po	2011-11-11 15:45:17.000000000 +0100
-@@ -6,8 +6,7 @@
- "Project-Id-Version: kcmkvaio\n"
- "POT-Creation-Date: 2004-10-12 01:17+0200\n"
- "PO-Revision-Date: 2006-02-13 10:07+0800\n"
--"Last-Translator: Frank Weng (a.k.a. Franklin) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Traditional Chinese <zh_l10n@linux.org.tw>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
-@@ -48,12 +47,12 @@
- #: rc.cpp:6
- #, no-c-format
- msgid ""
--"Cannot find the <i>Sony Programmable Interrupt Controller</i>"
--". If this is a Sony Vaio Laptop, make sure the <b>sonypi</b> "
--"driver module loads without failures."
-+"Cannot find the <i>Sony Programmable Interrupt Controller</i>. If this is a "
-+"Sony Vaio Laptop, make sure the <b>sonypi</b> driver module loads without "
-+"failures."
- msgstr ""
--"找不到 <i>Sony 可編程中斷控制器 (Sony Programmable Interrupt Controller</i>"
--"。如果您確定使用 Sony Vaio 筆記型電腦，請確認<b>sonypi</b>驅動程式有正確載入。"
-+"找不到 <i>Sony 可編程中斷控制器 (Sony Programmable Interrupt Controller</i>。"
-+"如果您確定使用 Sony Vaio 筆記型電腦，請確認<b>sonypi</b>驅動程式有正確載入。"
- 
- #. i18n: file kcmkvaio_general.ui line 61
- #: rc.cpp:9
-diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdeutils/kcmkwallet.po kde-i18n-zh_TW-3.5.10/messages/kdeutils/kcmkwallet.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdeutils/kcmkwallet.po	2006-10-01 18:34:14.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdeutils/kcmkwallet.po	2011-11-11 15:45:17.000000000 +0100
-@@ -6,8 +6,7 @@
- "Project-Id-Version: kcmkwallet\n"
- "POT-Creation-Date: 2006-08-23 02:35+0200\n"
- "PO-Revision-Date: 2006-02-09 11:34+0800\n"
--"Last-Translator: Frank Weng (a.k.a. Franklin) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Traditional Chinese <zh_l10n@linux.org.tw>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
-@@ -76,8 +75,11 @@
- #, no-c-format
- msgid ""
- "<p>The wallet subsytem allows a convenient and secure way to manage all your "
--"passwords. You can decide if you want to use this system with this option.</p>"
--msgstr "<p>wallet 子系統提供一個方便又安全的方式管理您的密碼。您可以決定要不要使用這個子系統。</p>"
-+"passwords. You can decide if you want to use this system with this option.</"
-+"p>"
-+msgstr ""
-+"<p>wallet 子系統提供一個方便又安全的方式管理您的密碼。您可以決定要不要使用這"
-+"個子系統。</p>"
- 
- #. i18n: file walletconfigwidget.ui line 56
- #: rc.cpp:12
-@@ -89,8 +91,8 @@
- #: rc.cpp:15
- #, no-c-format
- msgid ""
--"It is best to close your wallets when you are not using them to prevent others "
--"from viewing or using them."
-+"It is best to close your wallets when you are not using them to prevent "
-+"others from viewing or using them."
- msgstr "如果您不使用這個錢包，最好將它關閉，以避免其他人看到與使用它。"
- 
- #. i18n: file walletconfigwidget.ui line 86
-@@ -103,9 +105,10 @@
- #: rc.cpp:21 rc.cpp:27
- #, no-c-format
- msgid ""
--"<p><b>Close wallet after a period of inactivity</b>"
--"<br>When a wallet is closed the password is needed to access it again.</p>"
--msgstr "<p><b>當一陣子未使用之後關閉錢包</b><br>錢包關閉後，要再使用需要密碼。</p>"
-+"<p><b>Close wallet after a period of inactivity</b><br>When a wallet is "
-+"closed the password is needed to access it again.</p>"
-+msgstr ""
-+"<p><b>當一陣子未使用之後關閉錢包</b><br>錢包關閉後，要再使用需要密碼。</p>"
- 
- #. i18n: file walletconfigwidget.ui line 108
- #: rc.cpp:24
-@@ -123,9 +126,10 @@
- #: rc.cpp:33
- #, no-c-format
- msgid ""
--"<p><b>Close wallet as soon as the screensaver starts.</b>"
--"<br>When a wallet is closed the password is needed to access it again.</p>"
--msgstr "<p><b>當螢幕保護程式起動時關閉</b><br>錢包關閉後，要再使用需要密碼。</p>"
-+"<p><b>Close wallet as soon as the screensaver starts.</b><br>When a wallet "
-+"is closed the password is needed to access it again.</p>"
-+msgstr ""
-+"<p><b>當螢幕保護程式起動時關閉</b><br>錢包關閉後，要再使用需要密碼。</p>"
- 
- #. i18n: file walletconfigwidget.ui line 161
- #: rc.cpp:36
-@@ -137,10 +141,10 @@
- #: rc.cpp:39
- #, no-c-format
- msgid ""
--"<p><b>Close wallet as soon as applications that use it have stopped.</b>"
--"<br>Note that your wallets will only be closed when all applications that use "
--"it have stopped."
--"<br>When a wallet is closed the password is needed to access it again.</p>"
-+"<p><b>Close wallet as soon as applications that use it have stopped.</"
-+"b><br>Note that your wallets will only be closed when all applications that "
-+"use it have stopped.<br>When a wallet is closed the password is needed to "
-+"access it again.</p>"
- msgstr "<p><b>當最後一個應用程式也不再使用之後關閉"
- 
- #. i18n: file walletconfigwidget.ui line 174
-@@ -165,7 +169,7 @@
- #: rc.cpp:51 rc.cpp:54
- #, no-c-format
- msgid "New..."
--msgstr "新增..."
-+msgstr "新增…"
- 
- #. i18n: file walletconfigwidget.ui line 268
- #: rc.cpp:57
-diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdeutils/kcmlaptop.po kde-i18n-zh_TW-3.5.10/messages/kdeutils/kcmlaptop.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdeutils/kcmlaptop.po	2007-01-15 10:56:25.000000000 +0100
-+++ kde-i18n-zh_TW-3.5.10/messages/kdeutils/kcmlaptop.po	2011-11-11 15:45:17.000000000 +0100
-@@ -5,8 +5,7 @@
- "Project-Id-Version: kcmlaptop\n"
- "POT-Creation-Date: 2006-10-14 02:36+0200\n"
- "PO-Revision-Date: 2006-10-16 12:51+0800\n"
--"Last-Translator: Frank Weng (a.k.a. Franklin) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Chinese Traditional <zh-l10n@linux.org.tw>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
-@@ -27,8 +26,8 @@
- 
- #: battery.cpp:81
- msgid ""
--"This box enables a text message near the battery state icon containing battery "
--"level percentage"
-+"This box enables a text message near the battery state icon containing "
-+"battery level percentage"
- msgstr "開啟這個選項的話，會在面板中的電池圖示附近顯示的電量的百分比。"
- 
- #: battery.cpp:84
-@@ -96,14 +95,18 @@
- "<h1>Laptop Battery</h1>This module allows you to monitor your batteries. To "
- "make use of this module, you must have power management system software "
- "installed. (And, of course, you should have batteries in your machine.)"
--msgstr "<h1>電池監視器</h1>這個模組可以讓您監視電池。要使用這個模組，您必須安裝電源管理系統的軟體。當然，您的機器內必須安裝電池。"
-+msgstr ""
-+"<h1>電池監視器</h1>這個模組可以讓您監視電池。要使用這個模組，您必須安裝電源管"
-+"理系統的軟體。當然，您的機器內必須安裝電池。"
- 
- #: battery.cpp:286
- msgid ""
- "<qt>The battery monitor has been started, but the tray icon is currently "
--"disabled.  You can make it appear by selecting the <b>Show battery monitor</b> "
--"entry on this page and applying your changes.</qt>"
--msgstr "<qt>電池監視器已經開始，但目前系統匣圖示是關閉的。您可以用<b>顯示電池監視器</b>來開啟系統匣圖示。</qt>"
-+"disabled.  You can make it appear by selecting the <b>Show battery monitor</"
-+"b> entry on this page and applying your changes.</qt>"
-+msgstr ""
-+"<qt>電池監視器已經開始，但目前系統匣圖示是關閉的。您可以用<b>顯示電池監視器</"
-+"b>來開啟系統匣圖示。</qt>"
- 
- #: battery.cpp:361
- msgid "Present"
-@@ -166,7 +169,9 @@
- "<h1>Laptop Battery</h1>This module allows you to monitor your batteries. To "
- "make use of this module, you must have power management software installed. "
- "(And, of course, you should have batteries in your machine.)"
--msgstr "<h1>電池監視器</h1>這個模組可以讓您監視電池。要使用這個模組，您必須安裝電源管理系統的軟體。當然，您的機器內必須安裝電池。"
-+msgstr ""
-+"<h1>電池監視器</h1>這個模組可以讓您監視電池。要使用這個模組，您必須安裝電源管"
-+"理系統的軟體。當然，您的機器內必須安裝電池。"
- 
- #: pcmcia.cpp:44
- msgid "kcmlaptop"
-@@ -186,9 +191,10 @@
- 
- #: pcmcia.cpp:118
- msgid ""
--"<h1>PCMCIA Config</h1>This module shows information about the PCMCIA cards in "
--"your system, if there are PCMCIA cards."
--msgstr "<h1>PCMCIA 設定</h1>這個模組可以讓您顯示您系統上安裝的 PCMCIA 卡片資訊。"
-+"<h1>PCMCIA Config</h1>This module shows information about the PCMCIA cards "
-+"in your system, if there are PCMCIA cards."
-+msgstr ""
-+"<h1>PCMCIA 設定</h1>這個模組可以讓您顯示您系統上安裝的 PCMCIA 卡片資訊。"
- 
- #: power.cpp:123 profile.cpp:76
- msgid "Not Powered"
-@@ -271,9 +277,11 @@
- 
- #: power.cpp:198 power.cpp:288
- msgid ""
--"If enabled and the system load average is greater than this value none of the "
--"above options will be applied"
--msgstr "如果開啟這個選項的話，在系統平均負擔大於特定值以上時，則以上的選項將不會被套用。"
-+"If enabled and the system load average is greater than this value none of "
-+"the above options will be applied"
-+msgstr ""
-+"如果開啟這個選項的話，在系統平均負擔大於特定值以上時，則以上的選項將不會被套"
-+"用。"
- 
- #: power.cpp:204
- msgid "&Wait for:"
-@@ -295,8 +303,8 @@
- 
- #: power.cpp:218
- msgid ""
--"Options in this box apply when the laptop is plugged into the wall and has been "
--"idle for a while"
-+"Options in this box apply when the laptop is plugged into the wall and has "
-+"been idle for a while"
- msgstr "這裡的選項會在電腦插上電源並且停留一陣子之後啟用。"
- 
- #: buttons.cpp:204 power.cpp:222
-@@ -318,16 +326,19 @@
- #: power.cpp:304
- msgid ""
- "This panel configures the behavior of the automatic power-down feature - it "
--"works as a sort of extreme screen saver. You can configure different timeouts "
--"and types of behavior depending on whether or not your laptop is plugged in to "
--"the mains supply."
--msgstr "這個面板控制自動關機功能─像一種超級螢幕保護程式。您可以針對使用市電或電池以設置不同的延遲時間。"
-+"works as a sort of extreme screen saver. You can configure different "
-+"timeouts and types of behavior depending on whether or not your laptop is "
-+"plugged in to the mains supply."
-+msgstr ""
-+"這個面板控制自動關機功能─像一種超級螢幕保護程式。您可以針對使用市電或電池以設"
-+"置不同的延遲時間。"
- 
- #: power.cpp:312
- msgid ""
- "Different laptops may respond to 'standby' in different ways - in many it is "
- "only a temporary state and may not be useful for you."
--msgstr "不同的筆記電腦有不同的「待命」方式─它可能只是是一個臨時狀態，不一定對您有用。"
-+msgstr ""
-+"不同的筆記電腦有不同的「待命」方式─它可能只是是一個臨時狀態，不一定對您有用。"
- 
- #: acpi.cpp:148 apm.cpp:144 buttons.cpp:281 power.cpp:320 profile.cpp:216
- #: sony.cpp:102 warning.cpp:291
-@@ -338,9 +349,11 @@
- #: power.cpp:581
- msgid ""
- "<h1>Laptop Power Control</h1>This module allows you to control the power "
--"settings of your laptop and set timouts that will trigger state changes you can "
--"use to save power"
--msgstr "<h1>筆記型電腦電源控制</h1>這個模組可以讓您控制筆記型電腦的電源設定，並設定各種狀態啟用的條件以節省電力。"
-+"settings of your laptop and set timouts that will trigger state changes you "
-+"can use to save power"
-+msgstr ""
-+"<h1>筆記型電腦電源控制</h1>這個模組可以讓您控制筆記型電腦的電源設定，並設定各"
-+"種狀態啟用的條件以節省電力。"
- 
- #: warning.cpp:78 warning.cpp:79
- msgid "Critical &trigger:"
-@@ -440,7 +453,8 @@
- 
- #: warning.cpp:254
- msgid "Move the system into the hibernate state - also known as 'save-to-disk'"
--msgstr "將系統切入冬眠(hibernate)狀態─又稱 save-to-disk，將目前狀態存入磁碟中。"
-+msgstr ""
-+"將系統切入冬眠(hibernate)狀態─又稱 save-to-disk，將目前狀態存入磁碟中。"
- 
- #: warning.cpp:259
- msgid "&Logout"
-@@ -460,14 +474,14 @@
- 
- #: warning.cpp:275
- msgid ""
--"This panel controls how and when you receive warnings that your battery power "
--"is going to run out VERY VERY soon."
-+"This panel controls how and when you receive warnings that your battery "
-+"power is going to run out VERY VERY soon."
- msgstr "這個面板控制電池「即將」用完時如何處理。"
- 
- #: warning.cpp:277
- msgid ""
--"This panel controls how and when you receive warnings that your battery power "
--"is about to run out"
-+"This panel controls how and when you receive warnings that your battery "
-+"power is about to run out"
- msgstr "這個面板控制電池快用完時如何處理。"
- 
- #: warning.cpp:570 warning.cpp:587
-@@ -476,30 +490,32 @@
- 
- #: warning.cpp:598
- msgid ""
--"<h1>Low battery Warning</h1>This module allows you to set an alarm in case your "
--"battery's charge is about to run out."
-+"<h1>Low battery Warning</h1>This module allows you to set an alarm in case "
-+"your battery's charge is about to run out."
- msgstr "<h1>低電位警告</h1>這個模組可以讓您設定當電池電量不足時的警告。"
- 
- #: acpi.cpp:64
- msgid ""
- "This panel provides information about your system's ACPI implementation and "
- "lets you have access to some of the extra features provided by ACPI"
--msgstr "這個面板提供關於您電腦的 ACPI 資訊，並讓您調整 ACPI 提供的一些額外功能。"
-+msgstr ""
-+"這個面板提供關於您電腦的 ACPI 資訊，並讓您調整 ACPI 提供的一些額外功能。"
- 
- #: acpi.cpp:69
- msgid ""
- "NOTE: the Linux ACPI implementation is still a 'work in progress'. Some "
--"features, in particular suspend and hibernate are not yet available under 2.4 - "
--"and under 2.5 some particular ACPI implementations are still unstable, these "
--"check boxes let you only enable the things that work reliably. You should test "
--"these features very gingerly - save all your work, check them on and try a "
--"suspend/standby/hibernate from the popup menu on the battery icon in the panel "
--"if it fails to come back successfully uncheck the box again."
--msgstr ""
--"注意：Linux ACPI 實作還在實驗中。有些功能，特別是暫停(suspend)與冬眠(hibernate)在 2.4 版核心中尚未支援。另外在 2.5 "
--"版核心中某些版本的 ACPI "
--"還不穩定，這裡只讓您開啟部份穩定的功能選項。您必須非常小心的測試這些功能─儲存好您的工作，再試試從電池面板圖示的目錄中開啟暫停/待命/冬眠等功能。如果有問題的話"
--"，取消這些功能。"
-+"features, in particular suspend and hibernate are not yet available under "
-+"2.4 - and under 2.5 some particular ACPI implementations are still unstable, "
-+"these check boxes let you only enable the things that work reliably. You "
-+"should test these features very gingerly - save all your work, check them on "
-+"and try a suspend/standby/hibernate from the popup menu on the battery icon "
-+"in the panel if it fails to come back successfully uncheck the box again."
-+msgstr ""
-+"注意：Linux ACPI 實作還在實驗中。有些功能，特別是暫停(suspend)與冬眠"
-+"(hibernate)在 2.4 版核心中尚未支援。另外在 2.5 版核心中某些版本的 ACPI 還不穩"
-+"定，這裡只讓您開啟部份穩定的功能選項。您必須非常小心的測試這些功能─儲存好您的"
-+"工作，再試試從電池面板圖示的目錄中開啟暫停/待命/冬眠等功能。如果有問題的話，"
-+"取消這些功能。"
- 
- #: acpi.cpp:79 apm.cpp:77
- msgid ""
-@@ -523,8 +539,8 @@
- 
- #: acpi.cpp:93 apm.cpp:91
- msgid ""
--"If checked this box enables transitions to the 'suspend' state - a semi-powered "
--"down state, sometimes called 'suspend-to-ram'"
-+"If checked this box enables transitions to the 'suspend' state - a semi-"
-+"powered down state, sometimes called 'suspend-to-ram'"
- msgstr "開啟這個選項讓系統可以切入暫停(suspend)的狀態。"
- 
- #: acpi.cpp:98
-@@ -544,9 +560,11 @@
- #: acpi.cpp:107
- msgid ""
- "If checked this box enables transitions to the 'hibernate' state - a powered "
--"down state, sometimes called 'suspend-to-disk' - the kernel 'Software Suspend' "
--"mechanism will be used instead of using ACPI directly"
--msgstr "開啟這個選項的話，會用核心中的「軟體暫停」(Software Suspend)機制而不用 ACPI 的控制來執行冬眠狀態。"
-+"down state, sometimes called 'suspend-to-disk' - the kernel 'Software "
-+"Suspend' mechanism will be used instead of using ACPI directly"
-+msgstr ""
-+"開啟這個選項的話，會用核心中的「軟體暫停」(Software Suspend)機制而不用 ACPI "
-+"的控制來執行冬眠狀態。"
- 
- #: acpi.cpp:117
- msgid "Enable &performance profiles"
-@@ -554,9 +572,10 @@
- 
- #: acpi.cpp:119
- msgid ""
--"If checked this box enables access to ACPI performance profiles - usually OK in "
--"2.4 and later"
--msgstr "開啟這個選項以便設定 ACPI 效能設定。通常在 2.4 版以後的核心都可以使用。"
-+"If checked this box enables access to ACPI performance profiles - usually OK "
-+"in 2.4 and later"
-+msgstr ""
-+"開啟這個選項以便設定 ACPI 效能設定。通常在 2.4 版以後的核心都可以使用。"
- 
- #: acpi.cpp:123
- msgid "Enable &CPU throttling"
-@@ -564,20 +583,23 @@
- 
- #: acpi.cpp:125
- msgid ""
--"If checked this box enables access to ACPI throttle speed changes - usually OK "
--"in 2.4 and later"
--msgstr "開啟這個選項以便設定 ACPI 對 CPU 效能上限的控制。通常在 2.4 版以後的核心都可以使用。"
-+"If checked this box enables access to ACPI throttle speed changes - usually "
-+"OK in 2.4 and later"
-+msgstr ""
-+"開啟這個選項以便設定 ACPI 對 CPU 效能上限的控制。通常在 2.4 版以後的核心都可"
-+"以使用。"
- 
- #: acpi.cpp:129
- msgid ""
--"If the above boxes are disabled then there is no 'helper' application set up to "
--"help change ACPI states, there are two ways you can enable this application, "
--"either make the file /proc/acpi/sleep writeable by anyone every time your "
--"system boots or use the button below to make the KDE ACPI helper application "
--"set-uid root"
-+"If the above boxes are disabled then there is no 'helper' application set up "
-+"to help change ACPI states, there are two ways you can enable this "
-+"application, either make the file /proc/acpi/sleep writeable by anyone every "
-+"time your system boots or use the button below to make the KDE ACPI helper "
-+"application set-uid root"
- msgstr ""
--"如果以上的選項都關閉，則沒有其他應用程式可以改變 ACPI 狀態。這種狀況下有兩個方法，一個是在開機時將 /proc/acpi/sleep "
--"檔設定為所有人都可以讀寫，或是用底下的按鈕將 KDE ACPI 設定程式設為 set-uid root。"
-+"如果以上的選項都關閉，則沒有其他應用程式可以改變 ACPI 狀態。這種狀況下有兩個"
-+"方法，一個是在開機時將 /proc/acpi/sleep 檔設定為所有人都可以讀寫，或是用底下"
-+"的按鈕將 KDE ACPI 設定程式設為 set-uid root。"
- 
- #: acpi.cpp:138 apm.cpp:107
- msgid "Setup Helper Application"
-@@ -589,10 +611,12 @@
- 
- #: acpi.cpp:169 apm.cpp:191
- msgid ""
--"The %1 application does not seem to have the same size or checksum as when it "
--"was compiled we do NOT recommend you proceed with making it setuid-root without "
--"further investigation"
--msgstr "%1 這個軟體的大小或是檢查碼不正確。我們不建議在您弄清楚怎麼回事之前就將此軟體設定為 setuid-root."
-+"The %1 application does not seem to have the same size or checksum as when "
-+"it was compiled we do NOT recommend you proceed with making it setuid-root "
-+"without further investigation"
-+msgstr ""
-+"%1 這個軟體的大小或是檢查碼不正確。我們不建議在您弄清楚怎麼回事之前就將此軟體"
-+"設定為 setuid-root."
- 
- #: acpi.cpp:172 acpi.cpp:182 acpi.cpp:194 apm.cpp:174 apm.cpp:194 apm.cpp:204
- #: apm.cpp:216 sony.cpp:115 sony.cpp:127
-@@ -611,9 +635,10 @@
- 
- #: acpi.cpp:193
- msgid ""
--"The ACPI helper cannot be enabled because kdesu cannot be found.  Please make "
--"sure that it is installed correctly."
--msgstr "ACPI 設定程式無法開啟，因為找不到 kdesu 這支程式。請確定您的 KDE 有正確安裝。"
-+"The ACPI helper cannot be enabled because kdesu cannot be found.  Please "
-+"make sure that it is installed correctly."
-+msgstr ""
-+"ACPI 設定程式無法開啟，因為找不到 kdesu 這支程式。請確定您的 KDE 有正確安裝。"
- 
- #: acpi.cpp:276
- msgid ""
-@@ -626,7 +651,9 @@
- "'sonypi' device for your laptop - you should not enable the options below if "
- "you\n"
- "also use the 'sonypid' program in your system"
--msgstr "這個面板讓您控制您的電腦中 sonypi 設備的某些功能。如果您已經使用 sonypid 這支程式，請不要打開此選項。"
-+msgstr ""
-+"這個面板讓您控制您的電腦中 sonypi 設備的某些功能。如果您已經使用 sonypid 這支"
-+"程式，請不要打開此選項。"
- 
- #: sony.cpp:73
- msgid "Enable &scroll bar"
-@@ -642,16 +669,19 @@
- 
- #: sony.cpp:79
- msgid ""
--"When checked this box enables pressing the scroll bar to act in the same way as "
--"pressing the middle button on a 3 button mouse"
-+"When checked this box enables pressing the scroll bar to act in the same way "
-+"as pressing the middle button on a 3 button mouse"
- msgstr "開啟這個選項的話，按住捲軸的行為就會跟按下滑鼠中鍵一樣。"
- 
- #: sony.cpp:88
- msgid ""
--"The /dev/sonypi is not accessable, if you wish to use the above features its\n"
--"protections need to be changed. Clicking on the button below will change them\n"
-+"The /dev/sonypi is not accessable, if you wish to use the above features "
-+"its\n"
-+"protections need to be changed. Clicking on the button below will change "
-+"them\n"
- msgstr ""
--"/dev/sonypi 無法存取。如果您要使用這個功能，請改變它的權限。按下底下的按鈕可以改變其權限。\n"
-+"/dev/sonypi 無法存取。如果您要使用這個功能，請改變它的權限。按下底下的按鈕可"
-+"以改變其權限。\n"
- 
- #: sony.cpp:91
- msgid "Setup /dev/sonypi"
-@@ -663,21 +693,24 @@
- 
- #: sony.cpp:113
- msgid ""
--"You will need to supply a root password to allow the protections of /dev/sonypi "
--"to be changed."
-+"You will need to supply a root password to allow the protections of /dev/"
-+"sonypi to be changed."
- msgstr "您需要 root 密碼才能改變 /dev/sonypi 權限。"
- 
- #: sony.cpp:126
- msgid ""
--"The /dev/sonypi protections cannot be changed because kdesu cannot be found.  "
--"Please make sure that it is installed correctly."
--msgstr "/dev/sonypi 權限無法改變，因為找不到 kdesu 這支程式。請確定您的 KDE 有正確安裝。"
-+"The /dev/sonypi protections cannot be changed because kdesu cannot be "
-+"found.  Please make sure that it is installed correctly."
-+msgstr ""
-+"/dev/sonypi 權限無法改變，因為找不到 kdesu 這支程式。請確定您的 KDE 有正確安"
-+"裝。"
- 
- #: sony.cpp:187
- msgid ""
- "<h1>Sony Laptop Hardware Setup</h1>This module allows you to configure some "
- "Sony laptop hardware for your system"
--msgstr "<h1>Sony 筆記型電腦設定</h1>這個模組可以讓您設定部份 Sony 筆記型電腦硬體。"
-+msgstr ""
-+"<h1>Sony 筆記型電腦設定</h1>這個模組可以讓您設定部份 Sony 筆記型電腦硬體。"
- 
- #: profile.cpp:77
- msgid ""
-@@ -719,8 +752,9 @@
- 
- #: profile.cpp:205
- msgid ""
--"This panel allows you to set default values for system attributes so that they "
--"change when the laptop is plugged in to the wall or running on batteries."
-+"This panel allows you to set default values for system attributes so that "
-+"they change when the laptop is plugged in to the wall or running on "
-+"batteries."
- msgstr "這個面板讓您設定系統屬性的預設值，在電腦電源切換時可以應用。"
- 
- #: profile.cpp:211
-@@ -731,10 +765,12 @@
- 
- #: profile.cpp:411
- msgid ""
--"<h1>Laptop Power Profile Setup</h1>This module allows you to configure default "
--"values for static laptop system attributes that will change when the laptop is "
--"plugged in or unplugged from the wall."
--msgstr "<h1>筆記型電腦電源控制設定</h1>這個模組讓您設定系統屬性的預設值，在電腦電源切換時可以應用。"
-+"<h1>Laptop Power Profile Setup</h1>This module allows you to configure "
-+"default values for static laptop system attributes that will change when the "
-+"laptop is plugged in or unplugged from the wall."
-+msgstr ""
-+"<h1>筆記型電腦電源控制設定</h1>這個模組讓您設定系統屬性的預設值，在電腦電源切"
-+"換時可以應用。"
- 
- #: buttons.cpp:122
- msgid "Lid Switch Closed"
-@@ -812,42 +848,49 @@
- #: buttons.cpp:272
- msgid ""
- "This panel enables actions that are triggered when the lid closure switch or "
--"power switch on your laptop is pressed. Some laptops may already automatically "
--"do things like this, if you cannot disable them in your BIOS you probably "
--"should not enable anything in this panel."
-+"power switch on your laptop is pressed. Some laptops may already "
-+"automatically do things like this, if you cannot disable them in your BIOS "
-+"you probably should not enable anything in this panel."
- msgstr ""
--"這個面板開啟在關上螢幕或是切換電源時要啟動的動作。有些電腦可能會自己做一些動作，如果您無法從 BIOS 關閉的話您可能最好不要開啟這個面板上的任何設定。"
-+"這個面板開啟在關上螢幕或是切換電源時要啟動的動作。有些電腦可能會自己做一些動"
-+"作，如果您無法從 BIOS 關閉的話您可能最好不要開啟這個面板上的任何設定。"
- 
- #: buttons.cpp:614
- msgid ""
- "<h1>Laptop Power Control</h1>This module allows you to configure the power "
--"switch or lid closure switch on your laptop so they can trigger system actions"
--msgstr "<h1>筆記型電腦電源控制</h1>這個模組可以讓您設定電源切換或是關上螢幕時啟動的動作。"
-+"switch or lid closure switch on your laptop so they can trigger system "
-+"actions"
-+msgstr ""
-+"<h1>筆記型電腦電源控制</h1>這個模組可以讓您設定電源切換或是關上螢幕時啟動的動"
-+"作。"
- 
- #: apm.cpp:64
- msgid ""
--"This panel lets you configure your APM system and lets you have access to some "
--"of the extra features provided by it"
-+"This panel lets you configure your APM system and lets you have access to "
-+"some of the extra features provided by it"
- msgstr "這個面板讓您設定您的 APM 系統，並讓您能存取它提供的額外功能。"
- 
- #: apm.cpp:69
- msgid ""
--"NOTE: some APM implementations have buggy suspend/standby implementations. You "
--"should test these features very gingerly - save all your work, check them on "
--"and try a suspend/standby from the popup menu on the battery icon in the panel "
--"if it fails to come back successfully uncheck the box again."
-+"NOTE: some APM implementations have buggy suspend/standby implementations. "
-+"You should test these features very gingerly - save all your work, check "
-+"them on and try a suspend/standby from the popup menu on the battery icon in "
-+"the panel if it fails to come back successfully uncheck the box again."
- msgstr ""
--"注意：有些 APM 實作暫停/待命狀態時是有問題的。您必須非常小心的測試這些功能─儲存好您的工作，再試試從電池圖示的目錄中開啟暫停/待命功能。"
-+"注意：有些 APM 實作暫停/待命狀態時是有問題的。您必須非常小心的測試這些功能─儲"
-+"存好您的工作，再試試從電池圖示的目錄中開啟暫停/待命功能。"
- 
- #: apm.cpp:98
- msgid ""
--"If the above boxes are disabled then there is no 'helper' application set up to "
--"help change APM states, there are two ways you can enable this application, "
--"either make the file /proc/apm writeable by anyone every time your system boots "
--"or use the button below to make the %1 application set-uid root"
-+"If the above boxes are disabled then there is no 'helper' application set up "
-+"to help change APM states, there are two ways you can enable this "
-+"application, either make the file /proc/apm writeable by anyone every time "
-+"your system boots or use the button below to make the %1 application set-uid "
-+"root"
- msgstr ""
--"如果以上的選項都關閉，則沒有其他應用程式可以改變 APM 狀態。這種狀況下有兩個方法，一個是在開機時將 /proc/apm "
--"檔設定為所有人都可以讀寫，或是用底下的按鈕將 %1 程式設為 set-uid root。"
-+"如果以上的選項都關閉，則沒有其他應用程式可以改變 APM 狀態。這種狀況下有兩個方"
-+"法，一個是在開機時將 /proc/apm 檔設定為所有人都可以讀寫，或是用底下的按鈕將 %"
-+"1 程式設為 set-uid root。"
- 
- #: apm.cpp:109
- msgid "This button can be used to enable the APM helper application"
-@@ -858,7 +901,9 @@
- "Your system seems to have 'Software Suspend' installed, this can be used to "
- "hibernate or 'suspend to disk' your system if you want to use this for "
- "hibernation check the box below"
--msgstr "您的系統上有安裝軟體暫停功能，您可以勾選來使用它讓系統進入冬眠(hibernate)狀態。"
-+msgstr ""
-+"您的系統上有安裝軟體暫停功能，您可以勾選來使用它讓系統進入冬眠(hibernate)狀"
-+"態。"
- 
- #: apm.cpp:119
- msgid "Enable software suspend for hibernate"
-@@ -877,8 +922,9 @@
- "utility to do this, if you wish to use it you must make it set-uid root, the "
- "button below will do this for you"
- msgstr ""
--"如果關閉以上的選項，您需要登入為 root 或一支可以叫出軟體暫停功能的程式。KDE 有提供這樣的功能，如果您要使用 KDE 提供的功能，您必須將它設定為 "
--"setuid root。底下的按鈕可以提供您更改其權限。"
-+"如果關閉以上的選項，您需要登入為 root 或一支可以叫出軟體暫停功能的程式。KDE "
-+"有提供這樣的功能，如果您要使用 KDE 提供的功能，您必須將它設定為 setuid root。"
-+"底下的按鈕可以提供您更改其權限。"
- 
- #: apm.cpp:132
- msgid "Setup SS Helper Application"
-@@ -897,15 +943,16 @@
- 
- #: apm.cpp:173
- msgid ""
--"%1 cannot be enabled because kdesu cannot be found.  Please make sure that it "
--"is installed correctly."
-+"%1 cannot be enabled because kdesu cannot be found.  Please make sure that "
-+"it is installed correctly."
- msgstr "%1 無法開啟，因為找不到 kdesu 這支程式。請確定您的 KDE 有正確安裝。"
- 
- #: apm.cpp:215
- msgid ""
--"The Software Suspend helper cannot be enabled because kdesu cannot be found.  "
--"Please make sure that it is installed correctly."
--msgstr "無法開啟軟體暫停設定，因為找不到 kdesu 這支程式。請確定您的 KDE 有正確安裝。"
-+"The Software Suspend helper cannot be enabled because kdesu cannot be "
-+"found.  Please make sure that it is installed correctly."
-+msgstr ""
-+"無法開啟軟體暫停設定，因為找不到 kdesu 這支程式。請確定您的 KDE 有正確安裝。"
- 
- #: apm.cpp:279
- msgid ""
-diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdeutils/kcmlirc.po kde-i18n-zh_TW-3.5.10/messages/kdeutils/kcmlirc.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdeutils/kcmlirc.po	2008-08-19 20:43:07.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdeutils/kcmlirc.po	2011-11-11 15:45:17.000000000 +0100
-@@ -6,8 +6,7 @@
- "Project-Id-Version: kcmlirc\n"
- "POT-Creation-Date: 2008-07-08 01:19+0200\n"
- "PO-Revision-Date: 2006-02-13 11:12+0800\n"
--"Last-Translator: Frank Weng (a.k.a. Franklin) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Traditional Chinese <zh_l10n@linux.org.tw>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
-@@ -28,8 +27,8 @@
- 
- #: addaction.cpp:99
- msgid ""
--"You did not select a mode of that remote control. Please use %1, or revert back "
--"to select a different mode."
-+"You did not select a mode of that remote control. Please use %1, or revert "
-+"back to select a different mode."
- msgstr "您尚未選取遙控模式。請使用 %1，或是退回重新選擇不同的模式。"
- 
- #: addaction.cpp:101
-@@ -58,31 +57,30 @@
- 
- #: kcmlirc.cpp:55
- msgid ""
--"Use this to configure KDE's infrared remote control system in order to control "
--"any KDE application with your infrared remote control."
-+"Use this to configure KDE's infrared remote control system in order to "
-+"control any KDE application with your infrared remote control."
- msgstr "用這個來設定 KDE 的紅外線遙控系統。"
- 
- #: kcmlirc.cpp:57
- msgid ""
--"<h1>Remote Controls</h1>"
--"<p>This module allows you to configure bindings between your remote controls "
--"and KDE applications. Simply select your remote control and click Add under the "
--"Actions/Buttons list. If you want KDE to attempt to automatically assign "
--"buttons to a supported application's actions, try clicking the Auto-Populate "
--"button.</p>"
--"<p>To view the recognised applications and remote controls, simply select the "
--"<em>Loaded Extensions</em> tab.</p>"
-+"<h1>Remote Controls</h1><p>This module allows you to configure bindings "
-+"between your remote controls and KDE applications. Simply select your remote "
-+"control and click Add under the Actions/Buttons list. If you want KDE to "
-+"attempt to automatically assign buttons to a supported application's "
-+"actions, try clicking the Auto-Populate button.</p><p>To view the recognised "
-+"applications and remote controls, simply select the <em>Loaded Extensions</"
-+"em> tab.</p>"
- msgstr ""
--"<h1>遙控</h1>"
--"<p>這個模組讓您可以設定您的遙控按鍵與 KDE 應用程式之間的關聯。只要按下您要的按鍵，並點選「動作/按鈕清單」中的「加入」鍵即可。如果您要讓 KDE "
--"自動分配按鍵給已支援的應用程式，試著點選「自動分配」鍵。</p> "
--"<p>要顯示已加入遙控的應用程式，請選擇<em>載入的延伸程式</em>頁。,/p>"
-+"<h1>遙控</h1><p>這個模組讓您可以設定您的遙控按鍵與 KDE 應用程式之間的關聯。只"
-+"要按下您要的按鍵，並點選「動作/按鈕清單」中的「加入」鍵即可。如果您要讓 KDE "
-+"自動分配按鍵給已支援的應用程式，試著點選「自動分配」鍵。</p> <p>要顯示已加入"
-+"遙控的應用程式，請選擇<em>載入的延伸程式</em>頁。,/p>"
- 
- #: kcmlirc.cpp:61
- msgid ""
- "The Infrared Remote Control software is not currently running. This "
--"configuration module will not work properly without it. Would you like to start "
--"it now?"
-+"configuration module will not work properly without it. Would you like to "
-+"start it now?"
- msgstr "紅外線遙控軟體尚未執行中，如此這個設定無法正確運作。您要啟動它嗎？"
- 
- #: kcmlirc.cpp:61
-@@ -99,8 +97,8 @@
- 
- #: kcmlirc.cpp:66
- msgid ""
--"Would you like the infrared remote control software to start automatically when "
--"you begin KDE?"
-+"Would you like the infrared remote control software to start automatically "
-+"when you begin KDE?"
- msgstr "您要在 KDE 開始時自動啟動紅外線遙控軟體嗎？"
- 
- #: kcmlirc.cpp:66
-@@ -226,7 +224,9 @@
- msgid ""
- "You are attempting to configure an action for a button on [remote] (in mode "
- "[mode]). Press a button on this remote control or select from the list."
--msgstr "您決定設定某一遙控按鍵的動作(在模式 [mode] 下)。請按下此按鍵，或是從清單中選擇。"
-+msgstr ""
-+"您決定設定某一遙控按鍵的動作(在模式 [mode] 下)。請按下此按鍵，或是從清單中選"
-+"擇。"
- 
- #. i18n: file addactionbase.ui line 258
- #: rc.cpp:27 rc.cpp:294
-@@ -639,13 +639,13 @@
- #: rc.cpp:285
- #, no-c-format
- msgid "&Add..."
--msgstr "新增(&A)..."
-+msgstr "新增(&A)…"
- 
- #. i18n: file kcmlircbase.ui line 187
- #: rc.cpp:288
- #, no-c-format
- msgid "&Edit..."
--msgstr "編輯(&E)..."
-+msgstr "編輯(&E)…"
- 
- #. i18n: file kcmlircbase.ui line 271
- #: rc.cpp:306
-@@ -657,19 +657,19 @@
- #: rc.cpp:309
- #, no-c-format
- msgid "Auto-Populate..."
--msgstr "自動分配..."
-+msgstr "自動分配…"
- 
- #. i18n: file kcmlircbase.ui line 356
- #: rc.cpp:312
- #, no-c-format
- msgid "A&dd..."
--msgstr "新增(&D)..."
-+msgstr "新增(&D)…"
- 
- #. i18n: file kcmlircbase.ui line 367
- #: rc.cpp:315
- #, no-c-format
- msgid "Ed&it..."
--msgstr "編輯(&I)..."
-+msgstr "編輯(&I)…"
- 
- #. i18n: file kcmlircbase.ui line 378
- #: rc.cpp:318
-diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdeutils/kcmthinkpad.po kde-i18n-zh_TW-3.5.10/messages/kdeutils/kcmthinkpad.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdeutils/kcmthinkpad.po	2006-10-01 18:34:14.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdeutils/kcmthinkpad.po	2011-11-11 15:45:17.000000000 +0100
-@@ -6,8 +6,7 @@
- "Project-Id-Version: kcmthinkpad\n"
- "POT-Creation-Date: 2005-09-30 02:48+0200\n"
- "PO-Revision-Date: 2006-02-13 11:23+0800\n"
--"Last-Translator: Frank Weng (a.k.a. Franklin) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Traditional Chinese <zh_l10n@linux.org.tw>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
-@@ -46,16 +45,17 @@
- 
- #: main.cpp:95
- msgid ""
--"Could not write to dev.acpi_ibm.0.volume. Using software volume, required for "
--"R30/R31 models, or using a custom volume change step is disabled."
-+"Could not write to dev.acpi_ibm.0.volume. Using software volume, required "
-+"for R30/R31 models, or using a custom volume change step is disabled."
- msgstr "無法寫入 dev.acpi_ibm.0.volume。"
- 
- #: main.cpp:114
- msgid ""
--"Could not write to %1. To use the software volume, required for R30/R31 models "
--"and to use a custom volume change step, set the nvram device to world "
-+"Could not write to %1. To use the software volume, required for R30/R31 "
-+"models and to use a custom volume change step, set the nvram device to world "
- "writeable: <em>chmod 666 /dev/nvram</em>"
--msgstr "無法寫入 %1。請將 nvram 裝置設定為可寫入：<em>chmod 666 /dev/nvram</em>。"
-+msgstr ""
-+"無法寫入 %1。請將 nvram 裝置設定為可寫入：<em>chmod 666 /dev/nvram</em>。"
- 
- #: main.cpp:122
- msgid "Thinkpad Buttons KMilo Plugin Ready For Configuration"
-@@ -72,15 +72,16 @@
- #, no-c-format
- msgid ""
- "Could not read /dev/nvram. If you have an IBM Thinkpad load the nvram Linux "
--"module <em>insmod nvram</em> and create the node <em>"
--"mknod /dev/nvram c 10 144</em> then make the device readable <em>"
--"chmod 664 /dev/nvram</em> or writable <em>chmod 666 /dev/nvram</em>."
--"<p>  nvram must be writable for software volume control required for R30/R31 "
--"models and for using a custom volume change step."
-+"module <em>insmod nvram</em> and create the node <em>mknod /dev/nvram c 10 "
-+"144</em> then make the device readable <em>chmod 664 /dev/nvram</em> or "
-+"writable <em>chmod 666 /dev/nvram</em>.<p>  nvram must be writable for "
-+"software volume control required for R30/R31 models and for using a custom "
-+"volume change step."
- msgstr ""
--"無法讀取 /dev/nvram。如果您已載入 nvram 驅動程式模組（<em>insmod nvram</em>），並已產生 /dev/nvram （<em>"
--"mknod /dev/nvram c 10 144</em>），請確認 /dev/nvram 設定為可寫入（<em> "
--"chmod 666 /dev/nvram</em> 或 <em> chmod 664 /dev/nvram</em>）。"
-+"無法讀取 /dev/nvram。如果您已載入 nvram 驅動程式模組（<em>insmod nvram</"
-+"em>），並已產生 /dev/nvram （<em>mknod /dev/nvram c 10 144</em>），請確認 /"
-+"dev/nvram 設定為可寫入（<em> chmod 666 /dev/nvram</em> 或 <em> chmod 664 /"
-+"dev/nvram</em>）。"
- 
- #. i18n: file kcmthinkpad_general.ui line 41
- #: rc.cpp:9
-diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdeutils/kdelirc.po kde-i18n-zh_TW-3.5.10/messages/kdeutils/kdelirc.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdeutils/kdelirc.po	2006-07-22 10:03:58.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdeutils/kdelirc.po	2011-11-11 15:45:17.000000000 +0100
-@@ -6,8 +6,7 @@
- "Project-Id-Version: kdelirc\n"
- "POT-Creation-Date: 2004-10-12 01:17+0200\n"
- "PO-Revision-Date: 2006-02-10 12:38+0800\n"
--"Last-Translator: Frank Weng (a.k.a. Franklin) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Traditional Chinese <zh_l10n@linux.org.tw>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
-@@ -29,11 +28,11 @@
- 
- #: iraction.cpp:118
- msgid "Do actions before. "
--msgstr "在...之前進行動作。"
-+msgstr "在…之前進行動作。"
- 
- #: iraction.cpp:119
- msgid "Do actions after. "
--msgstr "在...之後進行動作。"
-+msgstr "在…之後進行動作。"
- 
- #: iraction.cpp:123
- msgid "Auto-start. "
-diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdeutils/kdessh.po kde-i18n-zh_TW-3.5.10/messages/kdeutils/kdessh.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdeutils/kdessh.po	2006-07-22 10:03:58.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdeutils/kdessh.po	2011-11-11 15:45:17.000000000 +0100
-@@ -6,7 +6,7 @@
- "Project-Id-Version: kdessh 1.2\n"
- "POT-Creation-Date: 2004-10-12 01:17+0200\n"
- "PO-Revision-Date: 2001-08-30 11:28CST\n"
--"Last-Translator: TopTech Localization Team <zh-l10n@toptk.com>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Traditional Chinese <zh-l10n@linux.org.tw>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
-@@ -76,10 +76,8 @@
- msgstr "你要求的動作需要經過認證。請輸入"
- 
- #: sshdlg.cpp:53
--msgid ""
--"Conversation with ssh failed.\n"
--msgstr ""
--"與 ssh 溝通失敗。\n"
-+msgid "Conversation with ssh failed.\n"
-+msgstr "與 ssh 溝通失敗。\n"
- 
- #: sshdlg.cpp:62
- msgid ""
-diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdeutils/kdf.po kde-i18n-zh_TW-3.5.10/messages/kdeutils/kdf.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdeutils/kdf.po	2006-07-22 10:03:58.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdeutils/kdf.po	2011-11-11 15:45:17.000000000 +0100
-@@ -9,7 +9,7 @@
- "Project-Id-Version: kdf\n"
- "POT-Creation-Date: 2004-12-29 14:54+0100\n"
- "PO-Revision-Date: 2002-04-15 02:42+0800\n"
--"Last-Translator: Anthony Fok <anthony@thizlinux.com>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
-@@ -47,13 +47,12 @@
- 
- #: kcmdf.cpp:53
- msgid ""
--"<h3>Hardware Information</h3>"
--"<br> All the information modules return information about a certain aspect of "
--"your computer hardware or your operating system. Not all modules are available "
--"on all hardware architectures and/or operating systems."
-+"<h3>Hardware Information</h3><br> All the information modules return "
-+"information about a certain aspect of your computer hardware or your "
-+"operating system. Not all modules are available on all hardware "
-+"architectures and/or operating systems."
- msgstr ""
--"<h3>硬體資訊</h3>"
--"<br> 所有模組會回報有關於您的電腦或作業系統的資訊。\n"
-+"<h3>硬體資訊</h3><br> 所有模組會回報有關於您的電腦或作業系統的資訊。\n"
- "並非每一個模組都能夠運作在所有的架構、系統上。"
- 
- #: kconftest.cpp:44
-@@ -181,7 +180,7 @@
- 
- #: kwikdisk.cpp:233
- msgid "&Configure KwikDisk..."
--msgstr "設定 KwikDisk(&C)..."
-+msgstr "設定 KwikDisk(&C)…"
- 
- #: kwikdisk.cpp:327
- msgid "Original author"
-@@ -246,7 +245,7 @@
- #~ msgstr "KDE 磁碟空間公用程式（又另一個？）"
- 
- #~ msgid "&Customize..."
--#~ msgstr "自訂選項(&C)..."
-+#~ msgstr "自訂選項(&C)…"
- 
- #~ msgid "Mount command"
- #~ msgstr "裝載命令"
-diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdeutils/kedit.po kde-i18n-zh_TW-3.5.10/messages/kdeutils/kedit.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdeutils/kedit.po	2008-08-19 20:43:07.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdeutils/kedit.po	2011-11-11 15:45:17.000000000 +0100
-@@ -7,7 +7,7 @@
- "Project-Id-Version: kedit 1.71\n"
- "POT-Creation-Date: 2008-07-08 01:19+0200\n"
- "PO-Revision-Date: 2004-07-18 06:48+0800\n"
--"Last-Translator: Kenduest Lee <kenduest@i18n.linux.org.tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Traditional Chinese <zh-l10n@linux.org.tw>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
-@@ -117,7 +117,7 @@
- 
- #: kedit.cpp:220
- msgid "&Insert File..."
--msgstr "插入文件[&I]..."
-+msgstr "插入文件[&I]…"
- 
- #: kedit.cpp:222
- msgid "In&sert Date"
-@@ -133,11 +133,11 @@
- 
- #: kedit.cpp:240
- msgid "Line:000000 Col: 000"
--msgstr "行數: 000000 列數: 000"
-+msgstr "列數: 000000 行數: 000"
- 
- #: kedit.cpp:246
- msgid "Line: 1 Col: 1"
--msgstr "行數: 1 列數: 1"
-+msgstr "列數: 1 行數: 1"
- 
- #: kedit.cpp:247
- msgid "INS"
-@@ -185,13 +185,14 @@
- 
- #: kedit.cpp:494
- msgid ""
--"The file you have requested is larger than KEdit is designed for. Please ensure "
--"you have enough system resources available to safely load this file, or "
--"consider using a program that is designed to handle large files such as KWrite."
-+"The file you have requested is larger than KEdit is designed for. Please "
-+"ensure you have enough system resources available to safely load this file, "
-+"or consider using a program that is designed to handle large files such as "
-+"KWrite."
- msgstr ""
--"該檔案的大小超過 KEdit "
--"程式目前所能夠支援處理的範圍。請確認您的系統有足夠的記憶體載入該檔案內容，或者是考慮使用能夠處理巨大文件檔案的其他編輯器程式，比方像是 KWrite 或者是 "
--"Kate 程式"
-+"該檔案的大小超過 KEdit 程式目前所能夠支援處理的範圍。請確認您的系統有足夠的記"
-+"憶體載入該檔案內容，或者是考慮使用能夠處理巨大文件檔案的其他編輯器程式，比方"
-+"像是 KWrite 或者是 Kate 程式"
- 
- #: kedit.cpp:497
- msgid "Attempting to Open Large File"
-@@ -254,7 +255,7 @@
- 
- #: kedit.cpp:889
- msgid "Line: %1 Col: %2"
--msgstr "行數: %1 列數: %2"
-+msgstr "列數: %1 行數: %2"
- 
- #: kedit.cpp:899
- #, c-format
-@@ -366,7 +367,7 @@
- 
- #: ktextfiledlg.cpp:65
- msgid "Select Encoding..."
--msgstr "選擇編碼..."
-+msgstr "選擇編碼…"
- 
- #: ktextfiledlg.cpp:93
- msgid "Select Encoding"
-diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdeutils/kfloppy.po kde-i18n-zh_TW-3.5.10/messages/kdeutils/kfloppy.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdeutils/kfloppy.po	2007-07-12 10:27:45.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdeutils/kfloppy.po	2011-11-11 15:45:17.000000000 +0100
-@@ -10,8 +10,7 @@
- "Project-Id-Version: kfloppy\n"
- "POT-Creation-Date: 2007-06-02 02:16+0200\n"
- "PO-Revision-Date: 2006-02-10 14:06+0800\n"
--"Last-Translator: Frank Weng (a.k.a. Franklin) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Traditional Chinese <zh_l10n@linux.org.tw>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
-@@ -330,8 +329,8 @@
- 
- #: floppy.cpp:192
- msgid ""
--"<qt>Quick format is only a high-level format: it creates only a file "
--"system.</qt>"
-+"<qt>Quick format is only a high-level format: it creates only a file system."
-+"</qt>"
- msgstr "<qt>快速格式化為高階格式化：它只會產生檔案系統。</qt>"
- 
- #: floppy.cpp:195
-@@ -340,8 +339,8 @@
- 
- #: floppy.cpp:197
- msgid ""
--"<qt>This first erases the floppy by writing zeros and then it creates the file "
--"system.</qt>"
-+"<qt>This first erases the floppy by writing zeros and then it creates the "
-+"file system.</qt>"
- msgstr "<qt>它會先清除磁碟中的資料再產生檔案系統。</qt>"
- 
- #: floppy.cpp:199
-@@ -350,8 +349,8 @@
- 
- #: floppy.cpp:201
- msgid ""
--"Full format is a low-level and high-level format. It erases everything on the "
--"disk."
-+"Full format is a low-level and high-level format. It erases everything on "
-+"the disk."
- msgstr "完整格式化包括低階與高階格式化。它會清除磁碟中的所有東西。"
- 
- #: floppy.cpp:210
-@@ -379,7 +378,9 @@
- "<qt>Check this if you want the floppy disk to be checked after formatting. "
- "Please note that the floppy will be checked twice if you have selected full "
- "formatting.</qt>"
--msgstr "<qt>選取這個選項，在格式化後會做一次檢查。請注意，如果您選擇完整格式化，那會檢查兩次。</qt>"
-+msgstr ""
-+"<qt>選取這個選項，在格式化後會做一次檢查。請注意，如果您選擇完整格式化，那會"
-+"檢查兩次。</qt>"
- 
- #: floppy.cpp:238
- msgid "Volume la&bel:"
-@@ -399,10 +400,11 @@
- 
- #: floppy.cpp:254
- msgid ""
--"<qt>This is for the volume label. Due to a limitation of MS-DOS the label can "
--"only be 11 characters long. Please note that Minix does not support labels, "
--"whatever you enter here.</qt>"
--msgstr "<qt>這裡可以輸入標籤。MS-DOS 的限制為十一個字元。Minix 則不支援此功能。</qt>"
-+"<qt>This is for the volume label. Due to a limitation of MS-DOS the label "
-+"can only be 11 characters long. Please note that Minix does not support "
-+"labels, whatever you enter here.</qt>"
-+msgstr ""
-+"<qt>這裡可以輸入標籤。MS-DOS 的限制為十一個字元。Minix 則不支援此功能。</qt>"
- 
- #: floppy.cpp:263 floppy.cpp:470
- msgid "&Format"
-@@ -423,10 +425,9 @@
- #: floppy.cpp:315
- msgid ""
- "KFloppy cannot find any of the needed programs for creating file systems; "
--"please check your installation."
--"<br>"
--"<br>Log:"
--msgstr "KFloppy 找不到任何產生檔案系統的程式。請確認您的安裝是否完整。<br> <br>紀錄："
-+"please check your installation.<br><br>Log:"
-+msgstr ""
-+"KFloppy 找不到任何產生檔案系統的程式。請確認您的安裝是否完整。<br> <br>紀錄："
- 
- #: floppy.cpp:347
- msgid "KDE Floppy Formatter"
-@@ -440,11 +441,12 @@
- 
- #: floppy.cpp:498
- msgid ""
--"<qt>Formatting will erase all data on the device:"
--"<br/><b>%1</b>"
--"<br/>(Please check the correctness of the device name.)"
--"<br/>Are you sure you wish to proceed?</qt>"
--msgstr "<qt>格式化將會清除磁碟裝置 <b>%1</b>上所有的資料。<br/>請確認裝置名稱是否正確。<br/> 您確定要進行嗎？</qt>"
-+"<qt>Formatting will erase all data on the device:<br/><b>%1</b><br/>(Please "
-+"check the correctness of the device name.)<br/>Are you sure you wish to "
-+"proceed?</qt>"
-+msgstr ""
-+"<qt>格式化將會清除磁碟裝置 <b>%1</b>上所有的資料。<br/>請確認裝置名稱是否正"
-+"確。<br/> 您確定要進行嗎？</qt>"
- 
- #: floppy.cpp:501 floppy.cpp:516
- msgid "Proceed?"
-diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdeutils/kgpg.po kde-i18n-zh_TW-3.5.10/messages/kdeutils/kgpg.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdeutils/kgpg.po	2008-08-19 20:43:07.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdeutils/kgpg.po	2011-11-11 15:45:17.000000000 +0100
-@@ -9,8 +9,7 @@
- "Project-Id-Version: kgpg\n"
- "POT-Creation-Date: 2008-07-11 01:32+0200\n"
- "PO-Revision-Date: 2006-02-10 12:45+0800\n"
--"Last-Translator: Frank Weng (a.k.a. Franklin) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Traditional Chinese <zh_l10n@linux.org.tw>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
-@@ -43,10 +42,12 @@
- 
- #: kgpg.cpp:150
- msgid ""
--"<qt>KGpg will now create a temporary archive file:"
--"<br><b>%1</b> to process the encryption. The file will be deleted after the "
--"encryption is finished.</qt>"
--msgstr "<qt>KGpg 現在會建立一個暫存的檔案庫：<br><b>%1</b> 來處理加密過程。在加密程序結束後這個檔案將會被刪除。</qt>"
-+"<qt>KGpg will now create a temporary archive file:<br><b>%1</b> to process "
-+"the encryption. The file will be deleted after the encryption is finished.</"
-+"qt>"
-+msgstr ""
-+"<qt>KGpg 現在會建立一個暫存的檔案庫：<br><b>%1</b> 來處理加密過程。在加密程序"
-+"結束後這個檔案將會被刪除。</qt>"
- 
- #: kgpg.cpp:150
- msgid "Temporary File Creation"
-@@ -78,7 +79,7 @@
- 
- #: kgpg.cpp:209 kgpglibrary.cpp:125 kgpglibrary.cpp:197
- msgid "Please wait..."
--msgstr "請稍候..."
-+msgstr "請稍候…"
- 
- #: kgpg.cpp:225
- msgid "Unable to create temporary file"
-@@ -94,15 +95,14 @@
- 
- #: kgpg.cpp:308 kgpgoptions.cpp:97
- msgid ""
--"<qt>"
--"<p>You must be aware that <b>shredding is not secure</b> "
--"on all file systems, and that parts of the file may have been saved in a "
--"temporary file or in the spooler of your printer if you previously opened it in "
--"an editor or tried to print it. Only works on files (not on folders).</p></qt>"
--msgstr ""
--"<qt>"
--"<p>你必須小心<b>並非在全部的檔案系統上撕碎都是安全的</b>，而檔案的某些部分個可能被儲存在暫存的檔案中或者在您印表機的排程器裡，如果您先前在編輯器中開啟"
--"它或嘗試列印它。這只對檔案有效（不適用於資料夾）。</p></qt>"
-+"<qt><p>You must be aware that <b>shredding is not secure</b> on all file "
-+"systems, and that parts of the file may have been saved in a temporary file "
-+"or in the spooler of your printer if you previously opened it in an editor "
-+"or tried to print it. Only works on files (not on folders).</p></qt>"
-+msgstr ""
-+"<qt><p>你必須小心<b>並非在全部的檔案系統上撕碎都是安全的</b>，而檔案的某些部"
-+"分個可能被儲存在暫存的檔案中或者在您印表機的排程器裡，如果您先前在編輯器中開"
-+"啟它或嘗試列印它。這只對檔案有效（不適用於資料夾）。</p></qt>"
- 
- #: kgpg.cpp:442
- msgid "Unable to read temporary archive file"
-@@ -122,13 +122,12 @@
- 
- #: kgpg.cpp:580
- msgid ""
--"<qt>You have not set a path to your GnuPG config file."
--"<br>This may cause some surprising results in KGpg's execution."
--"<br>Would you like to start KGpg's Wizard to fix this problem?</qt>"
--msgstr ""
--"<qt>您還沒設定 GnuPG 設定檔的路境。"
--"<br> 這可能會在 KGpg 執行時造成意外的結果。"
--"<br> 您要開啟 KGpg 精靈來修正這個問題嗎？</qt>"
-+"<qt>You have not set a path to your GnuPG config file.<br>This may cause "
-+"some surprising results in KGpg's execution.<br>Would you like to start "
-+"KGpg's Wizard to fix this problem?</qt>"
-+msgstr ""
-+"<qt>您還沒設定 GnuPG 設定檔的路境。<br> 這可能會在 KGpg 執行時造成意外的結"
-+"果。<br> 您要開啟 KGpg 精靈來修正這個問題嗎？</qt>"
- 
- #: kgpg.cpp:580
- msgid "Start Wizard"
-@@ -140,10 +139,11 @@
- 
- #: kgpg.cpp:624
- msgid ""
--"<qt><b>The GnuPG configuration file was not found</b>"
--". Please make sure you have GnuPG installed. Should KGpg try to create a config "
--"file ?</qt>"
--msgstr "<qt><b>找不到 GnuPG 組態檔案</b>。請確定您已經安裝 GnuPG。KGpg 是否應該建立一個設定檔案？</qt>"
-+"<qt><b>The GnuPG configuration file was not found</b>. Please make sure you "
-+"have GnuPG installed. Should KGpg try to create a config file ?</qt>"
-+msgstr ""
-+"<qt><b>找不到 GnuPG 組態檔案</b>。請確定您已經安裝 GnuPG。KGpg 是否應該建立一"
-+"個設定檔案？</qt>"
- 
- #: kgpg.cpp:624
- msgid "Create Config"
-@@ -155,17 +155,19 @@
- 
- #: kgpg.cpp:633
- msgid ""
--"<qt><b>The GnuPG configuration file was not found</b>"
--". Please make sure you have GnuPG installed and give the path to the config "
--"file.</qt>"
--msgstr "<qt><b>找不到 GnuPG 組態檔案</b>。請確定您已經安裝 GnuPG 並且設定檔中的路徑正確。</qt>"
-+"<qt><b>The GnuPG configuration file was not found</b>. Please make sure you "
-+"have GnuPG installed and give the path to the config file.</qt>"
-+msgstr ""
-+"<qt><b>找不到 GnuPG 組態檔案</b>。請確定您已經安裝 GnuPG 並且設定檔中的路徑正"
-+"確。</qt>"
- 
- #: kgpg.cpp:640
- msgid ""
--"Your GnuPG version seems to be older than 1.2.0. Photo Id's and Key Groups will "
--"not work properly. Please consider upgrading GnuPG (http://gnupg.org)."
-+"Your GnuPG version seems to be older than 1.2.0. Photo Id's and Key Groups "
-+"will not work properly. Please consider upgrading GnuPG (http://gnupg.org)."
- msgstr ""
--"您的 GnuPG 版本似乎比 1.2.0 舊。相片 Id 與金鑰群組將無法正常運作。請考慮升級 GnuPG (http://gnupg.org)。"
-+"您的 GnuPG 版本似乎比 1.2.0 舊。相片 Id 與金鑰群組將無法正常運作。請考慮升級 "
-+"GnuPG (http://gnupg.org)。"
- 
- #: kgpg.cpp:682
- msgid "Step Three: Select your Default Private Key"
-@@ -203,15 +205,14 @@
- 
- #: kgpg.cpp:927
- msgid ""
--"<qt>The use of <b>GnuPG Agent</b> is enabled in GnuPG's configuration file "
--"(%1)."
--"<br>However, the agent does not seem to be running. This could result in "
--"problems with signing/decryption."
--"<br>Please disable GnuPG Agent from KGpg settings, or fix the agent.</qt>"
--msgstr ""
--"<qt><b>GnuPG Agent</b> 的使用已經在 GnuPG 組態檔案(%1)中啟用了。"
--"<br>然而，此代理程式似乎並未執行。這樣可能會造成簽署/解密的問題。"
--"<br>請從 KGpg 設定之中停用 GnuPG Agent，或修正此代理程式。</qt>"
-+"<qt>The use of <b>GnuPG Agent</b> is enabled in GnuPG's configuration file (%"
-+"1).<br>However, the agent does not seem to be running. This could result in "
-+"problems with signing/decryption.<br>Please disable GnuPG Agent from KGpg "
-+"settings, or fix the agent.</qt>"
-+msgstr ""
-+"<qt><b>GnuPG Agent</b> 的使用已經在 GnuPG 組態檔案(%1)中啟用了。<br>然而，此"
-+"代理程式似乎並未執行。這樣可能會造成簽署/解密的問題。<br>請從 KGpg 設定之中停"
-+"用 GnuPG Agent，或修正此代理程式。</qt>"
- 
- #: kgpg.cpp:964
- msgid ""
-@@ -284,9 +285,11 @@
- 
- #: listkeys.cpp:316
- msgid ""
--"<qt><b>Some of your secret keys are untrusted.</b>"
--"<br>Change their trust if you want to use them for signing.</qt>"
--msgstr "<qt><b>您的部份秘密金鑰不被信任。</b> <br>如果您要用它們來簽署，請改變它們的信任狀態。</qt>"
-+"<qt><b>Some of your secret keys are untrusted.</b><br>Change their trust if "
-+"you want to use them for signing.</qt>"
-+msgstr ""
-+"<qt><b>您的部份祕密金鑰不被信任。</b> <br>如果您要用它們來簽署，請改變它們的"
-+"信任狀態。</qt>"
- 
- #: listkeys.cpp:437
- msgid "<p>Do you want to import file <b>%1</b> into your key ring?</p>"
-@@ -302,7 +305,7 @@
- 
- #: listkeys.cpp:537
- msgid "E&xport Public Keys..."
--msgstr "匯出公開金鑰(&X)..."
-+msgstr "匯出公開金鑰(&X)…"
- 
- #: listkeys.cpp:538
- msgid "&Delete Keys"
-@@ -310,7 +313,7 @@
- 
- #: listkeys.cpp:539
- msgid "&Sign Keys..."
--msgstr "簽署金鑰(&S)..."
-+msgstr "簽署金鑰(&S)…"
- 
- #: listkeys.cpp:540
- msgid "Delete Sign&ature"
-@@ -322,7 +325,7 @@
- 
- #: listkeys.cpp:542
- msgid "&Import Key..."
--msgstr "匯入金鑰(&I)..."
-+msgstr "匯入金鑰(&I)…"
- 
- #: listkeys.cpp:543
- msgid "Set as De&fault Key"
-@@ -342,7 +345,7 @@
- 
- #: listkeys.cpp:548
- msgid "&Create Group with Selected Keys..."
--msgstr "以選擇的金鑰建立群組(&C)..."
-+msgstr "以選擇的金鑰建立群組(&C)…"
- 
- #: listkeys.cpp:549
- msgid "&Delete Group"
-@@ -390,11 +393,11 @@
- 
- #: listkeys.cpp:567
- msgid "Export Secret Key..."
--msgstr "匯出私密金鑰..."
-+msgstr "匯出私密金鑰…"
- 
- #: listkeys.cpp:568
- msgid "Revoke Key..."
--msgstr "註銷金鑰..."
-+msgstr "註銷金鑰…"
- 
- #: listkeys.cpp:570
- msgid "Delete Key Pair"
-@@ -402,7 +405,7 @@
- 
- #: listkeys.cpp:571
- msgid "&Generate Key Pair..."
--msgstr "產生金鑰配對(&G)..."
-+msgstr "產生金鑰配對(&G)…"
- 
- #: listkeys.cpp:573
- msgid "&Regenerate Public Key"
-@@ -497,11 +500,11 @@
- #: listkeys.cpp:945
- msgid ""
- "The image must be a JPEG file. Remember that the image is stored within your "
--"public key.If you use a very large picture, your key will become very large as "
--"well! Keeping the image close to 240x288 is a good size to use."
-+"public key.If you use a very large picture, your key will become very large "
-+"as well! Keeping the image close to 240x288 is a good size to use."
- msgstr ""
--"相片必須是 JPEG 檔案。請記住相片儲存於您的公開金鑰中。如果您使用非常大的相片，您的金鑰也同樣會變得非常大！保持相片接近 240x288 "
--"是個很好用的尺寸。"
-+"相片必須是 JPEG 檔案。請記住相片儲存於您的公開金鑰中。如果您使用非常大的相"
-+"片，您的金鑰也同樣會變得非常大！保持相片接近 240x288 是個很好用的尺寸。"
- 
- #: listkeys.cpp:963
- msgid ""
-@@ -513,9 +516,10 @@
- 
- #: listkeys.cpp:969
- msgid ""
--"<qt>Are you sure you want to delete Photo id <b>%1</b>"
--"<br>from key <b>%2 &lt;%3&gt;</b> ?</qt>"
--msgstr "<qt>您確定要從金鑰 <b>%2 &lt;%3&gt;</b> <br>刪除相片 id <b>%1</b>？</qt>"
-+"<qt>Are you sure you want to delete Photo id <b>%1</b><br>from key <b>%2 &lt;"
-+"%3&gt;</b> ?</qt>"
-+msgstr ""
-+"<qt>您確定要從金鑰 <b>%2 &lt;%3&gt;</b> <br>刪除相片 id <b>%1</b>？</qt>"
- 
- #: listkeys.cpp:1014 listkeys.cpp:1245 listkeys.cpp:1376 listkeys.cpp:1623
- #: listkeys.cpp:2575
-@@ -632,10 +636,8 @@
- msgstr "儲存檔案"
- 
- #: listkeys.cpp:1556
--msgid ""
--"Your public key \"%1\" was successfully exported\n"
--msgstr ""
--"您的公開金鑰「%1」已經成功地匯出了\n"
-+msgid "Your public key \"%1\" was successfully exported\n"
-+msgstr "您的公開金鑰「%1」已經成功地匯出了\n"
- 
- #: listkeys.cpp:1558
- msgid ""
-@@ -652,7 +654,8 @@
- "\n"
- "Would you like to regenerate the public key?"
- msgstr ""
--"這個金鑰是一個被遺棄的私密金鑰（沒有公開金鑰的私密金鑰。）它現在已無法使用。\n"
-+"這個金鑰是一個被遺棄的私密金鑰（沒有公開金鑰的私密金鑰。）它現在已無法使"
-+"用。\n"
- "\n"
- "您想要重新產生公開金鑰嗎？"
- 
-@@ -670,8 +673,8 @@
- 
- #: listkeys.cpp:1720
- msgid ""
--"<qt>You cannot create a group containing signatures, subkeys or other "
--"groups.</qt>"
-+"<qt>You cannot create a group containing signatures, subkeys or other groups."
-+"</qt>"
- msgstr "<qt>您不能建立包含簽署、次鑰或其他群組的群組。</qt>"
- 
- #: listkeys.cpp:1723
-@@ -684,19 +687,20 @@
- 
- #: listkeys.cpp:1728
- msgid ""
--"Following keys are not valid or not trusted and will not be added to the group:"
-+"Following keys are not valid or not trusted and will not be added to the "
-+"group:"
- msgstr "下列金鑰沒有效力或不被信任因而無法加到群組中："
- 
- #: listkeys.cpp:1742
- msgid ""
--"<qt>No valid or trusted key was selected. The group <b>%1</b> "
--"will not be created.</qt>"
-+"<qt>No valid or trusted key was selected. The group <b>%1</b> will not be "
-+"created.</qt>"
- msgstr "<qt>尚未選擇有效和信任的金鑰。群組 <b>%1</b> 將不會被建立。</qt>"
- 
- #: listkeys.cpp:1769
- msgid ""
--"Following keys are in the group but are not valid or not in your keyring. They "
--"will be removed from the group."
-+"Following keys are in the group but are not valid or not in your keyring. "
-+"They will be removed from the group."
- msgstr "下列金鑰位於群組中但不具效力或不在您的鑰匙環中。它們將會從群組中移除。"
- 
- #: listkeys.cpp:1778
-@@ -709,31 +713,23 @@
- 
- #: listkeys.cpp:1865
- msgid ""
--"<qt>You are about to sign key:"
--"<br>"
--"<br>%1"
--"<br>ID: %2"
--"<br>Fingerprint: "
--"<br><b>%3</b>."
--"<br>"
--"<br>You should check the key fingerprint by phoning or meeting the key owner to "
--"be sure that someone is not trying to intercept your communications</qt>"
--msgstr ""
--"<qt>您將要簽署金鑰："
--"<br>"
--"<br>%1"
--"<br>ID: %2"
--"<br>指紋: "
--"<br><b>%3</b>。"
--"<br>"
--"<br>您應該打電話或與該金鑰的擁有者見面以檢查這個金鑰的指紋，確定沒有別人嘗試攔截您的通訊</qt>"
-+"<qt>You are about to sign key:<br><br>%1<br>ID: %2<br>Fingerprint: <br><b>%"
-+"3</b>.<br><br>You should check the key fingerprint by phoning or meeting the "
-+"key owner to be sure that someone is not trying to intercept your "
-+"communications</qt>"
-+msgstr ""
-+"<qt>您將要簽署金鑰：<br><br>%1<br>ID: %2<br>指紋: <br><b>%3</b>。<br><br>您應"
-+"該打電話或與該金鑰的擁有者見面以檢查這個金鑰的指紋，確定沒有別人嘗試攔截您的"
-+"通訊</qt>"
- 
- #: listkeys.cpp:1877
- msgid ""
--"<qt>You are about to sign the following keys in one pass."
--"<br><b>If you have not carefully checked all fingerprints, the security of your "
--"communications may be compromised.</b></qt>"
--msgstr "<qt>您將要一次簽署下列的金鑰。<br><b>如果您尚未很小心的檢查所有的指紋，您的通訊的安全性可能會遭到危害。</b></qt>"
-+"<qt>You are about to sign the following keys in one pass.<br><b>If you have "
-+"not carefully checked all fingerprints, the security of your communications "
-+"may be compromised.</b></qt>"
-+msgstr ""
-+"<qt>您將要一次簽署下列的金鑰。<br><b>如果您尚未很小心的檢查所有的指紋，您的通"
-+"訊的安全性可能會遭到危害。</b></qt>"
- 
- #: listkeys.cpp:1887
- #, c-format
-@@ -794,9 +790,8 @@
- 
- #: listkeys.cpp:2067
- msgid ""
--"<qt>Are you sure you want to delete signature"
--"<br><b>%1</b> from key:"
--"<br><b>%2</b>?</qt>"
-+"<qt>Are you sure you want to delete signature<br><b>%1</b> from key:<br><b>%"
-+"2</b>?</qt>"
- msgstr "<qt>您確定要刪除簽章<br><b>%1</b> 來自金鑰：<br><b>%2</b>？</qt>"
- 
- #: listkeys.cpp:2086
-@@ -805,8 +800,8 @@
- 
- #: listkeys.cpp:2137
- msgid ""
--"<b>Enter passphrase for %1</b>:"
--"<br>Passphrase should include non alphanumeric characters and random sequences"
-+"<b>Enter passphrase for %1</b>:<br>Passphrase should include non "
-+"alphanumeric characters and random sequences"
- msgstr "<b>輸入 %1 的密語</b>：<br>密語應該包含非字母字元並且為亂數次序"
- 
- #: listkeys.cpp:2141
-@@ -831,7 +826,7 @@
- 
- #: listkeys.cpp:2170
- msgid "Generating New Key..."
--msgstr "產生新的金鑰..."
-+msgstr "產生新的金鑰…"
- 
- #: listkeys.cpp:2275 listkeys.cpp:2738 listkeys.cpp:2772 listkeys.cpp:2859
- #: listkeys.cpp:2886 listkeys.cpp:2921
-@@ -858,18 +853,19 @@
- 
- #: listkeys.cpp:2329
- msgid "<qt>Cannot open file <b>%1</b> for printing...</qt>"
--msgstr "<qt>不能開啟檔案 <b>%1</b> 以供列印...</qt>"
-+msgstr "<qt>不能開啟檔案 <b>%1</b> 以供列印…</qt>"
- 
- #: listkeys.cpp:2348
- msgid ""
--"<p>Delete <b>SECRET KEY</b> pair <b>%1</b>?</p>Deleting this key pair means you "
--"will never be able to decrypt files encrypted with this key again."
--msgstr "<p>刪除 <b>私密金鑰</b> 配對 <b>%1</b> ？</p>刪除這個金鑰配對代表您將再也不能解密以這個金鑰加密的檔案。"
-+"<p>Delete <b>SECRET KEY</b> pair <b>%1</b>?</p>Deleting this key pair means "
-+"you will never be able to decrypt files encrypted with this key again."
-+msgstr ""
-+"<p>刪除 <b>私密金鑰</b> 配對 <b>%1</b> ？</p>刪除這個金鑰配對代表您將再也不能"
-+"解密以這個金鑰加密的檔案。"
- 
- #: listkeys.cpp:2409
- msgid ""
--"<qt>The following are secret key pairs:"
--"<br><b>%1</b>They will not be deleted."
-+"<qt>The following are secret key pairs:<br><b>%1</b>They will not be deleted."
- "<br></qt>"
- msgstr "<qt>下面是私密金鑰配對：<br><b>%1</b>它們將不會被刪除。<br></qt>"
- 
-@@ -890,7 +886,7 @@
- 
- #: listkeys.cpp:2483 listkeys.cpp:2493
- msgid "Importing..."
--msgstr "匯入..."
-+msgstr "匯入…"
- 
- #: listkeys.cpp:2614 listkeys.cpp:2616 listkeys.cpp:2619
- msgid " [Revocation signature]"
-@@ -906,7 +902,7 @@
- 
- #: listkeys.cpp:2660
- msgid "Loading Keys..."
--msgstr "載入金鑰..."
-+msgstr "載入金鑰…"
- 
- #: keyinfowidget.cpp:162 listkeys.cpp:2709 listkeys.cpp:2792 listkeys.cpp:2826
- #: listkeys.cpp:2955 listkeys.cpp:3113
-@@ -1022,10 +1018,12 @@
- 
- #: kgpgview.cpp:97
- msgid ""
--"<qt><b>Remote file dropped</b>."
--"<br>The remote file will now be copied to a temporary file to process requested "
--"operation. This temporary file will be deleted after operation.</qt>"
--msgstr "<qt><b>已拖放遠端檔案</b>。<br>這個遠端檔案將被複製到暫存檔案以進行要求的操作。這個暫存檔案將在操作完成後被刪除。</qt>"
-+"<qt><b>Remote file dropped</b>.<br>The remote file will now be copied to a "
-+"temporary file to process requested operation. This temporary file will be "
-+"deleted after operation.</qt>"
-+msgstr ""
-+"<qt><b>已拖放遠端檔案</b>。<br>這個遠端檔案將被複製到暫存檔案以進行要求的操"
-+"作。這個暫存檔案將在操作完成後被刪除。</qt>"
- 
- #: kgpgview.cpp:100
- msgid "Could not download file."
-@@ -1033,8 +1031,7 @@
- 
- #: kgpglibrary.cpp:225 kgpgview.cpp:130
- msgid ""
--"<p>The file <b>%1</b> is a public key."
--"<br>Do you want to import it ?</p>"
-+"<p>The file <b>%1</b> is a public key.<br>Do you want to import it ?</p>"
- msgstr "<p>檔案 <b>%1</b> 是一個公開金鑰。<br>您要匯入它嗎？</p>"
- 
- #: kgpgview.cpp:143
-@@ -1071,11 +1068,11 @@
- 
- #: kgpginterface.cpp:829 kgpgview.cpp:241
- msgid ""
--"<qt><b>Missing signature:</b>"
--"<br>Key id: %1"
--"<br>"
--"<br>Do you want to import this key from a keyserver?</qt>"
--msgstr "<qt><b>遺失簽章：</b><br>金鑰 id：%1<br><br>您是否要從金鑰伺服器匯入這個金鑰？</qt>"
-+"<qt><b>Missing signature:</b><br>Key id: %1<br><br>Do you want to import "
-+"this key from a keyserver?</qt>"
-+msgstr ""
-+"<qt><b>遺失簽章：</b><br>金鑰 id：%1<br><br>您是否要從金鑰伺服器匯入這個金"
-+"鑰？</qt>"
- 
- #: kgpgview.cpp:242
- msgid "Missing Key"
-@@ -1123,28 +1120,30 @@
- 
- #: popuppublic.cpp:159
- msgid ""
--"<b>ASCII encryption</b>: makes it possible to open the encrypted file/message "
--"in a text editor"
-+"<b>ASCII encryption</b>: makes it possible to open the encrypted file/"
-+"message in a text editor"
- msgstr "<b>ASCII 加密</b>：讓您可以在文字編輯器中開啟加密的檔案/訊息"
- 
- #: popuppublic.cpp:161
- msgid ""
--"<b>Hide user ID</b>: Do not put the keyid into encrypted packets. This option "
--"hides the receiver of the message and is a countermeasure against traffic "
--"analysis. It may slow down the decryption process because all available secret "
--"keys are tried."
--msgstr ""
--"<b>隱藏使用者 ID</b>：不要將 keyid "
--"放入加密封包。這個選項會隱藏這封郵件的收件者，這是一種反制傳輸分析的手段。它可能會拖慢解密程序的速度，因為所有可用的私密金鑰都會被試過。"
-+"<b>Hide user ID</b>: Do not put the keyid into encrypted packets. This "
-+"option hides the receiver of the message and is a countermeasure against "
-+"traffic analysis. It may slow down the decryption process because all "
-+"available secret keys are tried."
-+msgstr ""
-+"<b>隱藏使用者 ID</b>：不要將 keyid 放入加密封包。這個選項會隱藏這封郵件的收件"
-+"者，這是一種反制傳輸分析的手段。它可能會拖慢解密程序的速度，因為所有可用的私"
-+"密金鑰都會被試過。"
- 
- #: popuppublic.cpp:165
- msgid ""
--"<b>Allow encryption with untrusted keys</b>: when you import a public key, it "
--"is usually marked as untrusted and you cannot use it unless you sign it in "
--"order to make it 'trusted'. Checking this box enables you to use any key, even "
--"if it has not be signed."
-+"<b>Allow encryption with untrusted keys</b>: when you import a public key, "
-+"it is usually marked as untrusted and you cannot use it unless you sign it "
-+"in order to make it 'trusted'. Checking this box enables you to use any key, "
-+"even if it has not be signed."
- msgstr ""
--"<b>允許以不信任的金鑰加密</b>：當您匯入公鑰時，它通常會標記為不信任的，除非您為了讓它變成「信任的」而簽署它，否則您不能使用它。核取此方塊讓您可以使用任何"
-+"<b>允許以不信任的金鑰加密</b>：當您匯入公鑰時，它通常會標記為不信任的，除非您"
-+"為了讓它變成「信任的」而簽署它，否則您不能使用它。核取此方塊讓您可以使用任何"
- "金鑰，即使它尚未被簽署。"
- 
- #. i18n: file conf_encryption.ui line 76
-@@ -1155,25 +1154,25 @@
- 
- #: popuppublic.cpp:176
- msgid ""
--"<b>Shred source file</b>: permanently remove source file. No recovery will be "
--"possible"
-+"<b>Shred source file</b>: permanently remove source file. No recovery will "
-+"be possible"
- msgstr "<b>撕碎來源檔案</b>：永久移除來源檔案。將不可能恢復"
- 
- #: popuppublic.cpp:178
- msgid ""
--"<qt><b>Shred source file:</b><br />"
--"<p>Checking this option will shred (overwrite several times before erasing) the "
--"files you have encrypted. This way, it is almost impossible that the source "
--"file is recovered.</p>"
--"<p><b>But you must be aware that this is not secure</b> "
--"on all file systems, and that parts of the file may have been saved in a "
--"temporary file or in the spooler of your printer if you previously opened it in "
--"an editor or tried to print it. Only works on files (not on folders).</p></qt>"
--msgstr ""
--"<qt><b>撕碎原始檔案：</b><br />"
--"<p>核取這選項會撕碎（在消除前複寫多次）您剛剛加密的檔案。這樣一來，此原始檔案幾乎不可能被復原。</p>"
--"<p><b>但是您必須了解這並非在所有檔案系統都是安全的</b>，而檔案的某些部分個可能被儲存在暫存的檔案中或者在您印表機的排程器裡，如果您先前在編輯器中開啟它"
--"或嘗試列印它。這只對檔案有效（不適用於資料夾）。"
-+"<qt><b>Shred source file:</b><br /><p>Checking this option will shred "
-+"(overwrite several times before erasing) the files you have encrypted. This "
-+"way, it is almost impossible that the source file is recovered.</p><p><b>But "
-+"you must be aware that this is not secure</b> on all file systems, and that "
-+"parts of the file may have been saved in a temporary file or in the spooler "
-+"of your printer if you previously opened it in an editor or tried to print "
-+"it. Only works on files (not on folders).</p></qt>"
-+msgstr ""
-+"<qt><b>撕碎原始檔案：</b><br /><p>核取這選項會撕碎（在消除前複寫多次）您剛剛"
-+"加密的檔案。這樣一來，此原始檔案幾乎不可能被復原。</p><p><b>但是您必須了解這"
-+"並非在所有檔案系統都是安全的</b>，而檔案的某些部分個可能被儲存在暫存的檔案中"
-+"或者在您印表機的排程器裡，如果您先前在編輯器中開啟它或嘗試列印它。這只對檔案"
-+"有效（不適用於資料夾）。"
- 
- #: popuppublic.cpp:179
- msgid "<a href=\"whatsthis:%1\">Read this before using shredding</a>"
-@@ -1185,8 +1184,8 @@
- 
- #: popuppublic.cpp:186
- msgid ""
--"<b>Symmetrical encryption</b>: encryption does not use keys. You just need to "
--"give a password to encrypt/decrypt the file"
-+"<b>Symmetrical encryption</b>: encryption does not use keys. You just need "
-+"to give a password to encrypt/decrypt the file"
- msgstr "<b>對稱式加密</b>：加密不需使用金鑰。您只需要提供加密/解密檔案的密碼"
- 
- #: popuppublic.cpp:198
-@@ -1197,7 +1196,9 @@
- msgid ""
- "<b>Custom option</b>: for experienced users only, allows you to enter a gpg "
- "command line option, like: '--armor'"
--msgstr "<b>自訂選項</b>：只適合有經驗的使用者，讓您可以輸入 gpg 命令列選項，例如： '--armor'"
-+msgstr ""
-+"<b>自訂選項</b>：只適合有經驗的使用者，讓您可以輸入 gpg 命令列選項，例如： "
-+"'--armor'"
- 
- #: kgpgoptions.cpp:69 kgpgoptions.cpp:76 kgpgoptions.cpp:428
- #: kgpgoptions.cpp:584 kgpgoptions.cpp:590
-@@ -1256,8 +1257,8 @@
- 
- #: kgpgoptions.cpp:204
- msgid ""
--"Cannot create configuration file. Please check if destination media is mounted "
--"and if you have write access"
-+"Cannot create configuration file. Please check if destination media is "
-+"mounted and if you have write access"
- msgstr "不能建立組態檔案。請檢查目的媒體是否已掛載以及您是否有寫入權限"
- 
- #: kgpgoptions.cpp:456
-@@ -1329,7 +1330,8 @@
- msgid ""
- "<p>The file <b>%1</b> is a private key block. Please use KGpg key manager to "
- "import it.</p>"
--msgstr "<p>這個檔案 <b>%1</b> 是一個私密金鑰區塊。請使用 KGpg 金鑰管理來匯入它。</p>"
-+msgstr ""
-+"<p>這個檔案 <b>%1</b> 是一個私密金鑰區塊。請使用 KGpg 金鑰管理來匯入它。</p>"
- 
- #: kgpginterface.cpp:87
- msgid " or "
-@@ -1376,12 +1378,11 @@
- 
- #: kgpginterface.cpp:595
- msgid ""
--"<qt><b>Bad signature</b> from:"
--"<br>%1"
--"<br>Key ID: %2"
--"<br>"
--"<br><b>Text is corrupted.</b></qt>"
--msgstr "<qt><b>錯誤的簽章</b>來自：<br>%1<br>金鑰 ID： %2<br><br><b>文字已經損毀。</b></qt>"
-+"<qt><b>Bad signature</b> from:<br>%1<br>Key ID: %2<br><br><b>Text is "
-+"corrupted.</b></qt>"
-+msgstr ""
-+"<qt><b>錯誤的簽章</b>來自：<br>%1<br>金鑰 ID： %2<br><br><b>文字已經損毀。</"
-+"b></qt>"
- 
- #: kgpginterface.cpp:605 kgpginterface.cpp:815
- msgid "The signature is valid, but the key is untrusted"
-@@ -1433,12 +1434,11 @@
- 
- #: kgpginterface.cpp:806
- msgid ""
--"<qt><b>BAD signature</b> from:"
--"<br> %1"
--"<br>Key id: %2"
--"<br>"
--"<br><b>The file is corrupted!</b></qt>"
--msgstr "<qt><b>錯誤的簽章</b> 來自：<br> %1<br>金鑰 id： %2<br><br><b>這個檔案已經損毀！</b></qt>"
-+"<qt><b>BAD signature</b> from:<br> %1<br>Key id: %2<br><br><b>The file is "
-+"corrupted!</b></qt>"
-+msgstr ""
-+"<qt><b>錯誤的簽章</b> 來自：<br> %1<br>金鑰 id： %2<br><br><b>這個檔案已經損"
-+"毀！</b></qt>"
- 
- #: kgpginterface.cpp:910
- msgid "<qt>%1 Enter passphrase for <b>%2</b>:</qt>"
-@@ -1450,11 +1450,11 @@
- 
- #: kgpginterface.cpp:949
- msgid ""
--"<qt>Signing key <b>%1</b> with key <b>%2</b> failed."
--"<br>Do you want to try signing the key in console mode?</qt>"
-+"<qt>Signing key <b>%1</b> with key <b>%2</b> failed.<br>Do you want to try "
-+"signing the key in console mode?</qt>"
- msgstr ""
--"<qt>使用金鑰 <b>%2</b> 簽署金鑰 <b>%1</b> 失敗。"
--"<br>您想要嘗試在 console 模式中簽署這個金鑰嗎？</qt>"
-+"<qt>使用金鑰 <b>%2</b> 簽署金鑰 <b>%1</b> 失敗。<br>您想要嘗試在 console 模式"
-+"中簽署這個金鑰嗎？</qt>"
- 
- #: kgpginterface.cpp:981
- msgid ""
-@@ -1471,9 +1471,11 @@
- 
- #: kgpginterface.cpp:1158
- msgid ""
--"<qt><b>Changing expiration failed.</b>"
--"<br>Do you want to try changing the key expiration in console mode?</qt>"
--msgstr "<qt><b>變更使用期限失敗。</b><br>您是否要嘗試在 console 模式中變更金鑰的使用期限？</qt>"
-+"<qt><b>Changing expiration failed.</b><br>Do you want to try changing the "
-+"key expiration in console mode?</qt>"
-+msgstr ""
-+"<qt><b>變更使用期限失敗。</b><br>您是否要嘗試在 console 模式中變更金鑰的使用"
-+"期限？</qt>"
- 
- #: kgpginterface.cpp:1268
- msgid "<b>Bad passphrase</b>. Try again<br>"
-@@ -1485,141 +1487,113 @@
- 
- #: kgpginterface.cpp:1293
- msgid ""
--"<qt>Enter new passphrase for <b>%1</b>"
--"<br>If you forget this passphrase, all your encrypted files and messages will "
--"be lost !"
--"<br></qt>"
--msgstr "<qt>輸入 <b>%1</b> 的新密語<br>如果您忘記這個密語，所有您加密的檔案與郵件都會失去！<br></qt>"
-+"<qt>Enter new passphrase for <b>%1</b><br>If you forget this passphrase, all "
-+"your encrypted files and messages will be lost !<br></qt>"
-+msgstr ""
-+"<qt>輸入 <b>%1</b> 的新密語<br>如果您忘記這個密語，所有您加密的檔案與郵件都會"
-+"失去！<br></qt>"
- 
- #: keyservers.cpp:496 kgpginterface.cpp:1408
- #, c-format
- msgid ""
--"_n: <qt>%n key processed."
--"<br></qt>\n"
--"<qt>%n keys processed."
--"<br></qt>"
-+"_n: <qt>%n key processed.<br></qt>\n"
-+"<qt>%n keys processed.<br></qt>"
- msgstr "<qt>已經處理 %n 個金鑰。<br></qt>"
- 
- #: keyservers.cpp:498 kgpginterface.cpp:1410
- #, c-format
- msgid ""
--"_n: <qt>One key unchanged."
--"<br></qt>\n"
--"<qt>%n keys unchanged."
--"<br></qt>"
-+"_n: <qt>One key unchanged.<br></qt>\n"
-+"<qt>%n keys unchanged.<br></qt>"
- msgstr "<qt>%n 個金鑰沒有變更。<br></qt>"
- 
- #: keyservers.cpp:500 kgpginterface.cpp:1412
- #, c-format
- msgid ""
--"_n: <qt>One signature imported."
--"<br></qt>\n"
--"<qt>%n signatures imported."
--"<br></qt>"
-+"_n: <qt>One signature imported.<br></qt>\n"
-+"<qt>%n signatures imported.<br></qt>"
- msgstr "<qt>已經匯入 %n 個簽章。<br></qt>"
- 
- #: keyservers.cpp:502 kgpginterface.cpp:1414
- #, c-format
- msgid ""
--"_n: <qt>One key without ID."
--"<br></qt>\n"
--"<qt>%n keys without ID."
--"<br></qt>"
-+"_n: <qt>One key without ID.<br></qt>\n"
-+"<qt>%n keys without ID.<br></qt>"
- msgstr "<qt>%n 個金鑰沒有 ID。<br></qt>"
- 
- #: keyservers.cpp:504 kgpginterface.cpp:1416
- #, c-format
- msgid ""
--"_n: <qt>One RSA key imported."
--"<br></qt>\n"
--"<qt>%n RSA keys imported."
--"<br></qt>"
-+"_n: <qt>One RSA key imported.<br></qt>\n"
-+"<qt>%n RSA keys imported.<br></qt>"
- msgstr "<qt>已經匯入 %n 個 RSA 金鑰。<br></qt>"
- 
- #: keyservers.cpp:506 kgpginterface.cpp:1418
- #, c-format
- msgid ""
--"_n: <qt>One user ID imported."
--"<br></qt>\n"
--"<qt>%n user IDs imported."
--"<br></qt>"
-+"_n: <qt>One user ID imported.<br></qt>\n"
-+"<qt>%n user IDs imported.<br></qt>"
- msgstr "<qt>已經匯入 %n 個使用者 ID。<br></qt>"
- 
- #: keyservers.cpp:508 kgpginterface.cpp:1420
- #, c-format
- msgid ""
--"_n: <qt>One subkey imported."
--"<br></qt>\n"
--"<qt>%n subkeys imported."
--"<br></qt>"
-+"_n: <qt>One subkey imported.<br></qt>\n"
-+"<qt>%n subkeys imported.<br></qt>"
- msgstr "<qt>已經匯入 %n 個次鑰。<br></qt>"
- 
- #: keyservers.cpp:510 kgpginterface.cpp:1422
- #, c-format
- msgid ""
--"_n: <qt>One revocation certificate imported."
--"<br></qt>\n"
--"<qt>%n revocation certificates imported."
--"<br></qt>"
-+"_n: <qt>One revocation certificate imported.<br></qt>\n"
-+"<qt>%n revocation certificates imported.<br></qt>"
- msgstr "<qt>已經匯入 %n 個註銷憑証。<br></qt>"
- 
- #: keyservers.cpp:512 kgpginterface.cpp:1425
- #, c-format
- msgid ""
--"_n: <qt>One secret key processed."
--"<br></qt>\n"
--"<qt>%n secret keys processed."
--"<br></qt>"
-+"_n: <qt>One secret key processed.<br></qt>\n"
-+"<qt>%n secret keys processed.<br></qt>"
- msgstr "<qt>已經處理 %n 個私密金鑰。<br></qt>"
- 
- #: keyservers.cpp:514 kgpginterface.cpp:1429
- #, c-format
- msgid ""
--"_n: <qt><b>One secret key imported.</b>"
--"<br></qt>\n"
--"<qt><b>%n secret keys imported.</b>"
--"<br></qt>"
-+"_n: <qt><b>One secret key imported.</b><br></qt>\n"
-+"<qt><b>%n secret keys imported.</b><br></qt>"
- msgstr "<qt>已經匯入 %n 個私密金鑰。<br></qt>"
- 
- #: keyservers.cpp:516 kgpginterface.cpp:1431
- #, c-format
- msgid ""
--"_n: <qt>One secret key unchanged."
--"<br></qt>\n"
--"<qt>%n secret keys unchanged."
--"<br></qt>"
-+"_n: <qt>One secret key unchanged.<br></qt>\n"
-+"<qt>%n secret keys unchanged.<br></qt>"
- msgstr "<qt>%n 個私密金鑰沒有變更。<br></qt>"
- 
- #: keyservers.cpp:518 kgpginterface.cpp:1433
- #, c-format
- msgid ""
--"_n: <qt>One secret key not imported."
--"<br></qt>\n"
--"<qt>%n secret keys not imported."
--"<br></qt>"
-+"_n: <qt>One secret key not imported.<br></qt>\n"
-+"<qt>%n secret keys not imported.<br></qt>"
- msgstr "<qt>%n 個私密金鑰沒有匯入。<br></qt>"
- 
- #: keyservers.cpp:520 kgpginterface.cpp:1435
- #, c-format
- msgid ""
--"_n: <qt><b>One key imported:</b>"
--"<br></qt>\n"
--"<qt><b>%n keys imported:</b>"
--"<br></qt>"
-+"_n: <qt><b>One key imported:</b><br></qt>\n"
-+"<qt><b>%n keys imported:</b><br></qt>"
- msgstr "<qt><b>已經匯入 %n 個金鑰：</b><br></qt>"
- 
- #: kgpginterface.cpp:1437
- msgid ""
--"<qt>"
--"<br><b>You have imported a secret key.</b> "
--"<br>Please note that imported secret keys are not trusted by default."
--"<br>To fully use this secret key for signing and encryption, you must edit the "
--"key (double click on it) and set its trust to Full or Ultimate.</qt>"
--msgstr ""
--"<qt>"
--"<br><b>您已經匯入私密金鑰。</b> "
--"<br>請注意匯入的私密金鑰預設是不被信任的。"
--"<br>要能完全使用這個私密金鑰來簽署或加密，您必須編輯這個金鑰（雙擊它）並且把它的信任設為完全信任或絕對信任。</qt>"
-+"<qt><br><b>You have imported a secret key.</b> <br>Please note that imported "
-+"secret keys are not trusted by default.<br>To fully use this secret key for "
-+"signing and encryption, you must edit the key (double click on it) and set "
-+"its trust to Full or Ultimate.</qt>"
-+msgstr ""
-+"<qt><br><b>您已經匯入私密金鑰。</b> <br>請注意匯入的私密金鑰預設是不被信任"
-+"的。<br>要能完全使用這個私密金鑰來簽署或加密，您必須編輯這個金鑰（雙擊它）並"
-+"且把它的信任設為完全信任或絕對信任。</qt>"
- 
- #: keyservers.cpp:522 kgpginterface.cpp:1441
- msgid ""
-@@ -1643,7 +1617,7 @@
- 
- #: kgpginterface.cpp:1768
- msgid "Creation of the revocation certificate failed..."
--msgstr "註銷憑証的建立失敗了..."
-+msgstr "註銷憑証的建立失敗了…"
- 
- #. i18n: file kgpg.rc line 16
- #: rc.cpp:6
-@@ -1698,14 +1672,14 @@
- #, no-c-format
- msgid ""
- "<qt><b>Custom Decryption Command:</b><br />\n"
--"\t\t"
--"<p>This option allows the user to specify a custom command to be executed by "
--"GPG when decryption occurs. (This is recommended for advanced users only).</p>\n"
-+"\t\t<p>This option allows the user to specify a custom command to be "
-+"executed by GPG when decryption occurs. (This is recommended for advanced "
-+"users only).</p>\n"
- "\t\t</qt>"
- msgstr ""
- "<qt><b>自訂解密指令：</b><br />\n"
--"\t\t"
--"<p>這個選項允許使用者指定當發生解密動作時讓 GPG 執行的自訂指令。（只建議進階的使用者使用）。</p>\n"
-+"\t\t<p>這個選項允許使用者指定當發生解密動作時讓 GPG 執行的自訂指令。（只建議"
-+"進階的使用者使用）。</p>\n"
- "\t\t</qt>"
- 
- #. i18n: file conf_encryption.ui line 31
-@@ -1725,84 +1699,79 @@
- #, no-c-format
- msgid ""
- "<qt><b>PGP 6 compatibility:</b><br /> \n"
--"\t\t"
--"<p>Checking this option forces GnuPG to output encrypted packets that are as "
--"compliant with PGP (Pretty Good Privacy) 6 standards as possible thus allowing "
--"GnuPG users to inter operate with PGP 6 users.</p></qt>"
-+"\t\t<p>Checking this option forces GnuPG to output encrypted packets that "
-+"are as compliant with PGP (Pretty Good Privacy) 6 standards as possible thus "
-+"allowing GnuPG users to inter operate with PGP 6 users.</p></qt>"
- msgstr ""
- "<qt><b>PGP 6 相容性：</b><br /> \n"
--"\t\t"
--"<p>核取這個選項會強迫 GnuPG 儘可能輸出與 PGP (Pretty Good Privacy) 6 標準相容的加密封包，這樣可以使 GnuPG "
--"使用者與 PGP 6 使用者交流。</p></qt>"
-+"\t\t<p>核取這個選項會強迫 GnuPG 儘可能輸出與 PGP (Pretty Good Privacy) 6 標準"
-+"相容的加密封包，這樣可以使 GnuPG 使用者與 PGP 6 使用者交流。</p></qt>"
- 
- #. i18n: file conf_encryption.ui line 56
- #: rc.cpp:57
- #, no-c-format
- msgid ""
- "<qt><b>ASCII armored encryption:</b> <br /> \n"
--"\t\t"
--"<p>Checking this option outputs all encrypted files in a format that can be "
--"opened by a text editor and as such the output is suitable for placing in the "
--"body of an e-mail message.</p></qt>"
-+"\t\t<p>Checking this option outputs all encrypted files in a format that can "
-+"be opened by a text editor and as such the output is suitable for placing in "
-+"the body of an e-mail message.</p></qt>"
- msgstr ""
- "<qt><b>ASCII 封裝的加密：</b> <br /> \n"
--"\t\t"
--"<p>核取這個選項會把所有加密的檔案輸出為一種可以被文字編輯器開啟的格式，而這種格式很適合放在電子郵件訊息的主體中。</p></qt>"
-+"\t\t<p>核取這個選項會把所有加密的檔案輸出為一種可以被文字編輯器開啟的格式，而"
-+"這種格式很適合放在電子郵件訊息的主體中。</p></qt>"
- 
- #. i18n: file conf_encryption.ui line 68
- #: rc.cpp:64
- #, no-c-format
- msgid ""
- "<qt><b>Hide user ID:</b><br /> \n"
--"\t\t"
--"<p>Checking this option will remove the keyid of the recipient from all "
-+"\t\t<p>Checking this option will remove the keyid of the recipient from all "
- "encrypted packets. The advantage: traffic analysis of the encrypted packets "
- "cannot be performed as easily because the recipient is unknown. The "
--"disadvantage: the receiver of the encrypted packets is forced to try all secret "
--"keys before being able to decrypt the packets. This can be a lengthy process "
--"depending on the number of secret keys the receiver holds.</p></qt>"
-+"disadvantage: the receiver of the encrypted packets is forced to try all "
-+"secret keys before being able to decrypt the packets. This can be a lengthy "
-+"process depending on the number of secret keys the receiver holds.</p></qt>"
- msgstr ""
- "<qt><b>隱藏使用者 ID：</b><br /> \n"
--"\t\t"
--"<p>核取這個選項會移除所有加密封包的收件者 "
--"keyid。好處是：無法很輕易的進行傳輸分析，因為不知道收件者。壞處是：此加密封包的收件者會被強迫嘗試所有的私密金鑰才能解密這個封包。依據收件者所持有的私密金鑰"
--"數量，這可能是一個很長的過程。</p></qt>"
-+"\t\t<p>核取這個選項會移除所有加密封包的收件者 keyid。好處是：無法很輕易的進行"
-+"傳輸分析，因為不知道收件者。壞處是：此加密封包的收件者會被強迫嘗試所有的私密"
-+"金鑰才能解密這個封包。依據收件者所持有的私密金鑰數量，這可能是一個很長的過"
-+"程。</p></qt>"
- 
- #. i18n: file conf_encryption.ui line 80
- #: rc.cpp:71
- #, no-c-format
- msgid ""
- "<qt><b>Shred source file:</b><br /> \n"
--"\t\t"
--"<p>Checking this option will shred (overwrite several times before erasing) the "
--"files you have encrypted. This way, it is almost impossible that the source "
--"file is recovered. But <b>you must be aware that this is not 100% secure</b> "
--"on all file systems, and that parts of the file may have been saved in a "
--"temporary file or in the spooler of your printer if you previously opened it in "
--"an editor or tried to print it. Only works on files (not on folders).</p></qt>"
-+"\t\t<p>Checking this option will shred (overwrite several times before "
-+"erasing) the files you have encrypted. This way, it is almost impossible "
-+"that the source file is recovered. But <b>you must be aware that this is not "
-+"100% secure</b> on all file systems, and that parts of the file may have "
-+"been saved in a temporary file or in the spooler of your printer if you "
-+"previously opened it in an editor or tried to print it. Only works on files "
-+"(not on folders).</p></qt>"
- msgstr ""
- "<qt><b>撕碎原始檔案：</b><br /> \n"
--"\t\t"
--"<p>核取這選項會撕碎（在消除前複寫多次）您剛剛加密的檔案。這樣一來，此原始檔案幾乎不可能被復原。<b>"
--"但是您必須了解這並非在所有檔案系統都是 100% "
--"安全的</b>，而檔案的某些部分個可能被儲存在暫存的檔案中或者在您印表機的排程器裡，如果您先前在編輯器中開啟它或嘗試列印它。這只對檔案有效（不適用於資料夾）。<"
--"/p></qt>"
-+"\t\t<p>核取這選項會撕碎（在消除前複寫多次）您剛剛加密的檔案。這樣一來，此原始"
-+"檔案幾乎不可能被復原。<b>但是您必須了解這並非在所有檔案系統都是 100% 安全的</"
-+"b>，而檔案的某些部分個可能被儲存在暫存的檔案中或者在您印表機的排程器裡，如果"
-+"您先前在編輯器中開啟它或嘗試列印它。這只對檔案有效（不適用於資料夾）。</p></"
-+"qt>"
- 
- #. i18n: file conf_encryption.ui line 92
- #: rc.cpp:78
- #, no-c-format
- msgid ""
- "<qt><b>Allow encryption with untrusted keys:</b> <br />\n"
--"\t\t"
--"<p>When importing a public key, the key is usually marked as untrusted and as "
--"such cannot be used unless it is signed by the default key (Thus, making it "
--"'trusted'). Checking this box enables any key to be used even if it is "
--"untrusted.</p></qt>"
-+"\t\t<p>When importing a public key, the key is usually marked as untrusted "
-+"and as such cannot be used unless it is signed by the default key (Thus, "
-+"making it 'trusted'). Checking this box enables any key to be used even if "
-+"it is untrusted.</p></qt>"
- msgstr ""
- "<b>允許以不信任的金鑰加密：</b> <br />\n"
--"\t\t"
--"<p>當您匯入公開金鑰時，它通常會標記為不信任的，除非您為了讓它變成「信任的」而使用預設金鑰簽署它，否則您不能使用它。核取此方塊讓您可以使用任何金鑰，即使它尚未"
--"被簽署。</p></qt>"
-+"\t\t<p>當您匯入公開金鑰時，它通常會標記為不信任的，除非您為了讓它變成「信任"
-+"的」而使用預設金鑰簽署它，否則您不能使用它。核取此方塊讓您可以使用任何金鑰，"
-+"即使它尚未被簽署。</p></qt>"
- 
- #. i18n: file conf_encryption.ui line 133
- #: rc.cpp:82
-@@ -1815,14 +1784,13 @@
- #, no-c-format
- msgid ""
- "<qt><b>Custom encryption command:</b> <br />\n"
--"\t\t\t"
--"<p>When activated, an entry field will be shown in the key selection dialog, "
--"enabling you to enter a custom command for encryption. This option is "
--"recommended for experienced users only.</p></qt>"
-+"\t\t\t<p>When activated, an entry field will be shown in the key selection "
-+"dialog, enabling you to enter a custom command for encryption. This option "
-+"is recommended for experienced users only.</p></qt>"
- msgstr ""
- "<qt><b>自訂加密指令：</b> <br />\n"
--"\t\t\t"
--"<p>當啟用時，一個項目欄位會顯示在金鑰選擇對話盒，讓您可以輸入自訂的加密指令。這個選項只建議有經驗的使用者使用。</p></qt>"
-+"\t\t\t<p>當啟用時，一個項目欄位會顯示在金鑰選擇對話盒，讓您可以輸入自訂的加密"
-+"指令。這個選項只建議有經驗的使用者使用。</p></qt>"
- 
- #. i18n: file conf_encryption.ui line 163
- #: rc.cpp:89
-@@ -1835,15 +1803,13 @@
- #, no-c-format
- msgid ""
- "<qt><b>Use *.pgp extension for encrypted files:</b><br />\n"
--"\t\t"
--"<p>Checking this option will append a .pgp extension to all encrypted files "
--"instead of a .gpg extension. This option will maintain compatibility with users "
--"of PGP (Pretty Good Privacy) software.</p></qt>"
-+"\t\t<p>Checking this option will append a .pgp extension to all encrypted "
-+"files instead of a .gpg extension. This option will maintain compatibility "
-+"with users of PGP (Pretty Good Privacy) software.</p></qt>"
- msgstr ""
- "<qt><b>加密的檔案使用 *.pgp 延伸檔名：</b><br />\n"
--"\t\t"
--"<p>核取這個選項會在所有加密檔案後面加入 .pgp 延伸檔名取代 .gpg 延伸檔名。這個選項會維持與 PGP (Pretty Good Privacy) "
--"軟體使用者的相容性。</p></qt>"
-+"\t\t<p>核取這個選項會在所有加密檔案後面加入 .pgp 延伸檔名取代 .gpg 延伸檔名。"
-+"這個選項會維持與 PGP (Pretty Good Privacy) 軟體使用者的相容性。</p></qt>"
- 
- #. i18n: file conf_encryption.ui line 175
- #: rc.cpp:96
-@@ -1857,23 +1823,24 @@
- msgid ""
- "<qt><b>Encrypt files with:</b><br /> \n"
- "<p>Checking this option and selecting a key will force any file encryption "
--"operation to use the selected key. KGpg will not query for a recipient and the "
--"default key will be bypassed.</p></qt>"
-+"operation to use the selected key. KGpg will not query for a recipient and "
-+"the default key will be bypassed.</p></qt>"
- msgstr ""
- "<qt><b>以此加密檔案：</b><br /> \n"
--"<p>核取這個選項並且選擇一個金鑰將會強迫任何檔案加密操作都使用這個金鑰。KGpg 將不會詢問收件者同時會略過預設金鑰。</p></qt>"
-+"<p>核取這個選項並且選擇一個金鑰將會強迫任何檔案加密操作都使用這個金鑰。KGpg "
-+"將不會詢問收件者同時會略過預設金鑰。</p></qt>"
- 
- #. i18n: file conf_encryption.ui line 209
- #: rc.cpp:103 rc.cpp:119
- #, no-c-format
- msgid "..."
--msgstr "..."
-+msgstr "…"
- 
- #. i18n: file conf_encryption.ui line 225
- #: rc.cpp:106 rc.cpp:116 rc.cpp:136
- #, no-c-format
- msgid "Change..."
--msgstr "變更..."
-+msgstr "變更…"
- 
- #. i18n: file conf_encryption.ui line 233
- #: rc.cpp:109
-@@ -1886,25 +1853,24 @@
- #, no-c-format
- msgid ""
- "<qt><b>Always encrypt with:</b><br /> \n"
--"<p>This ensures all files/messages will also be encrypted with the chosen key. "
--"However, if the \"Encrypt files with:\" option is selected that chosen key will "
--"override the \"Always encrypt with:\" selection.</p></qt>"
-+"<p>This ensures all files/messages will also be encrypted with the chosen "
-+"key. However, if the \"Encrypt files with:\" option is selected that chosen "
-+"key will override the \"Always encrypt with:\" selection.</p></qt>"
- msgstr ""
- "<qt><b>永遠以此加密：</b><br /> \n"
--"<p>這樣可以確定所有的檔案/郵件都是使用選擇的金鑰加密。然而，如果選擇「以此加密檔案：」選項，該選擇的金鑰將會覆蓋「永遠以此加密：」的選擇。</p></qt>"
-+"<p>這樣可以確定所有的檔案/郵件都是使用選擇的金鑰加密。然而，如果選擇「以此加"
-+"密檔案：」選項，該選擇的金鑰將會覆蓋「永遠以此加密：」的選擇。</p></qt>"
- 
- #. i18n: file conf_gpg.ui line 18
- #: rc.cpp:122
- #, no-c-format
- msgid ""
- "<qt><b>Global Settings:</b><br />\n"
--"\t"
--"<p></p>\n"
-+"\t<p></p>\n"
- "\t</qt>"
- msgstr ""
- "<qt><b>全域設定：</b><br />\n"
--"\t"
--"<p></p>\n"
-+"\t<p></p>\n"
- "\t</qt>"
- 
- #. i18n: file conf_gpg.ui line 32
-@@ -1972,8 +1938,8 @@
- #, no-c-format
- msgid ""
- "<qt><b>Start KGpg automatically at KDE startup:</b><br />\n"
--"<p>If checked KGpg will start automatically each time that KDE starts up.</p>"
--"</qt>"
-+"<p>If checked KGpg will start automatically each time that KDE starts up.</"
-+"p></qt>"
- msgstr ""
- "<qt><b>KDE 啟動時自動啟動 KGpg：</b><br />\n"
- "<p>如果核取， KGpg 會在每一次 KDE 啟動時自動啟動。</p></qt>"
-@@ -1989,16 +1955,15 @@
- #, no-c-format
- msgid ""
- "<qt><b>Use mouse selection instead of clipboard:</b> <br />\n"
--"\t\t\t"
--"<p>If checked, clipboard operations in KGpg will use the selection clipboard, "
--"that means highlighting a text to copy, and middle button (or right+left "
--"together) to paste. If this option is not checked, the clipboard will work with "
--"Key shortcuts (Ctrl-c, Ctrl-v).</p></qt> "
-+"\t\t\t<p>If checked, clipboard operations in KGpg will use the selection "
-+"clipboard, that means highlighting a text to copy, and middle button (or "
-+"right+left together) to paste. If this option is not checked, the clipboard "
-+"will work with Key shortcuts (Ctrl-c, Ctrl-v).</p></qt> "
- msgstr ""
- "<qt><b>使用滑鼠選擇區代替剪貼簿：</b> <br />\n"
--"\t\t\t"
--"<p>如果核取，KGpg 中的剪貼簿操作將會使用選擇區剪貼簿，這表示反白文字為複製，而中鍵（或右 + "
--"左同按）為貼上。如果沒有核取此選項，剪貼簿將會以快捷鍵運作 (Ctrl-c, Ctrl-v)。</p></qt> "
-+"\t\t\t<p>如果核取，KGpg 中的剪貼簿操作將會使用選擇區剪貼簿，這表示反白文字為"
-+"複製，而中鍵（或右 + 左同按）為貼上。如果沒有核取此選項，剪貼簿將會以快捷鍵運"
-+"作 (Ctrl-c, Ctrl-v)。</p></qt> "
- 
- #. i18n: file conf_misc.ui line 82
- #: rc.cpp:171
-@@ -2015,12 +1980,10 @@
- #, no-c-format
- msgid ""
- "<qt><b>Display warning before creating temporary files:</b><br />\n"
--"\t\t\t"
--"<p></p></qt>"
-+"\t\t\t<p></p></qt>"
- msgstr ""
- "<qt><b>在建立暫存檔案之前顯示警示：</b><br />\n"
--"\t\t\t"
--"<p></p></qt>"
-+"\t\t\t<p></p></qt>"
- 
- #. i18n: file conf_misc.ui line 122
- #: rc.cpp:182
-@@ -2089,13 +2052,11 @@
- #, no-c-format
- msgid ""
- "<qt><b>Sign file service menu:</b><br />\n"
--"\t\t\t\t\t"
--"<p></p>\n"
-+"\t\t\t\t\t<p></p>\n"
- "\t\t\t\t\t</qt>"
- msgstr ""
- "<qt><b>簽署檔案服務選單：</b><br />\n"
--"\t\t\t\t\t"
--"<p></p>\n"
-+"\t\t\t\t\t<p></p>\n"
- "\t\t\t\t\t</qt>"
- 
- #. i18n: file conf_misc.ui line 275
-@@ -2109,13 +2070,11 @@
- #, no-c-format
- msgid ""
- "<qt><b>Decrypt file service menu:</b><br />\n"
--"\t\t\t\t\t"
--"<p></p>\n"
-+"\t\t\t\t\t<p></p>\n"
- "\t\t\t\t\t</qt>"
- msgstr ""
- "<qt><b>解密檔案服務選單：</b><br />\n"
--"\t\t\t\t\t"
--"<p></p>\n"
-+"\t\t\t\t\t<p></p>\n"
- "\t\t\t\t\t</qt>"
- 
- #. i18n: file conf_misc.ui line 291
-@@ -2147,13 +2106,11 @@
- #, no-c-format
- msgid ""
- "<qt><b>Event on unencrypted file drop:</b><br />\n"
--"\t\t\t\t\t"
--"<p></p>\n"
-+"\t\t\t\t\t<p></p>\n"
- "\t\t\t\t\t</qt>"
- msgstr ""
- "<qt><b>未加密的檔案拖放事件：</b><br />\n"
--"\t\t\t\t\t"
--"<p></p>\n"
-+"\t\t\t\t\t<p></p>\n"
- "\t\t\t\t\t</qt>"
- 
- #. i18n: file conf_misc.ui line 357
-@@ -2167,13 +2124,11 @@
- #, no-c-format
- msgid ""
- "<qt><b>Event on encrypted file drop:</b><br />\n"
--"\t\t\t\t\t"
--"<p></p>\n"
-+"\t\t\t\t\t<p></p>\n"
- "\t\t\t\t\t</qt>"
- msgstr ""
- "<qt><b>放下加密的檔案事件：</b><br />\n"
--"\t\t\t\t\t"
--"<p></p>\n"
-+"\t\t\t\t\t<p></p>\n"
- "\t\t\t\t\t</qt>"
- 
- #. i18n: file conf_misc.ui line 368
-@@ -2216,7 +2171,7 @@
- #: rc.cpp:280
- #, no-c-format
- msgid "Add..."
--msgstr "加入..."
-+msgstr "加入…"
- 
- #. i18n: file conf_servers.ui line 98
- #: rc.cpp:286
-@@ -2325,15 +2280,15 @@
- #, no-c-format
- msgid ""
- "<qt><b>Photo:</b><br />\n"
--"\t\t\t"
--"<p>A photo can be included with a public key for extra security. The photo can "
--"be used as an additional method of authenticating the key. However, it should "
--"not be relied upon as the only form of authentication.</p>\n"
-+"\t\t\t<p>A photo can be included with a public key for extra security. The "
-+"photo can be used as an additional method of authenticating the key. "
-+"However, it should not be relied upon as the only form of authentication.</"
-+"p>\n"
- "\t\t\t</qt>"
- msgstr ""
- "<qt><b>相片：</b><br />\n"
--"\t\t\t"
--"<p>相片可以包含在公開金鑰中以提供額外的安全性。該相片可以用來做為驗證該金鑰的另一種方式。然而，它不該被作為唯一的驗證方式。</p>\n"
-+"\t\t\t<p>相片可以包含在公開金鑰中以提供額外的安全性。該相片可以用來做為驗證該"
-+"金鑰的另一種方式。然而，它不該被作為唯一的驗證方式。</p>\n"
- "\t\t\t</qt>"
- 
- #. i18n: file keyproperties.ui line 106
-@@ -2352,13 +2307,13 @@
- #: rc.cpp:368
- #, no-c-format
- msgid "Change Expiration..."
--msgstr "變更五使用期限..."
-+msgstr "變更五使用期限…"
- 
- #. i18n: file keyproperties.ui line 169
- #: rc.cpp:371
- #, no-c-format
- msgid "Change Passphrase..."
--msgstr "變更密語..."
-+msgstr "變更密語…"
- 
- #. i18n: file keyproperties.ui line 182
- #: rc.cpp:374
-@@ -2455,19 +2410,19 @@
- #, no-c-format
- msgid ""
- "<qt><b>Text to search or ID of the key to import:</b><br />\n"
--"\t\t\t\t"
--"<p>There are multiple ways to search for a key, you can use a text or partial "
--"text search (example: entering Phil or Zimmerman will bring up all keys in "
--"which Phil or Zimmerman shows up) or you can search by the ID's of the key. Key "
--"ID's are strings of letters and numbers that uniquely identify a key (example: "
--"searching for 0xED7585F4 would bring up the key associated with that ID).</p>\n"
-+"\t\t\t\t<p>There are multiple ways to search for a key, you can use a text "
-+"or partial text search (example: entering Phil or Zimmerman will bring up "
-+"all keys in which Phil or Zimmerman shows up) or you can search by the ID's "
-+"of the key. Key ID's are strings of letters and numbers that uniquely "
-+"identify a key (example: searching for 0xED7585F4 would bring up the key "
-+"associated with that ID).</p>\n"
- "\t\t\t\t</qt>"
- msgstr ""
- "<qt><b>要搜尋的文字或要匯入的金鑰 ID：</b><br />\n"
--"\t\t\t\t"
--"<p>有很多種方式可以搜尋金鑰，您可以使用文字或部分文字搜尋（例如：輸入 Phil 或 Zimmerman 會找出所有顯示 Phil 或 Zimmerman "
--"的全部金鑰）或者您可以搜尋該金鑰的 ID。金鑰 ID 是一組包含文字與數字的字串，可用來辨識金鑰（例如：搜尋 0xED7585F4 會找出與該組 ID "
--"相關的金鑰）。</p>\n"
-+"\t\t\t\t<p>有很多種方式可以搜尋金鑰，您可以使用文字或部分文字搜尋（例如：輸"
-+"入 Phil 或 Zimmerman 會找出所有顯示 Phil 或 Zimmerman 的全部金鑰）或者您可以"
-+"搜尋該金鑰的 ID。金鑰 ID 是一組包含文字與數字的字串，可用來辨識金鑰（例如：搜"
-+"尋 0xED7585F4 會找出與該組 ID 相關的金鑰）。</p>\n"
- "\t\t\t\t</qt>"
- 
- #. i18n: file keyserver.ui line 62
-@@ -2475,8 +2430,8 @@
- #, no-c-format
- msgid ""
- "<b>Key Server Drop Down Dialog:</b>\n"
--"Allows the user to select the Key Server which will be used to import PGP/GnuPG "
--"keys into the local keyring."
-+"Allows the user to select the Key Server which will be used to import PGP/"
-+"GnuPG keys into the local keyring."
- msgstr ""
- "<b>金鑰伺服器下拉式清單對話盒：</b>\n"
- "允許使用者選擇要用來匯入 PGP/GnuPG 金鑰到本地鑰匙圈的金鑰伺服器。"
-@@ -2491,19 +2446,20 @@
- #: rc.cpp:440
- #, no-c-format
- msgid ""
--"<qt><b>Key Server:</b><br /> "
--"<p>A Key Server is a centralized repository of PGP/GnuPG keys connected to the "
--"Internet which can be conveniently accessed in order to obtain or deposit keys. "
--"Select from the drop down list to specify which key server should be used.</p> "
--"<p>Often these keys are held by people whom the user has never met and as such "
--"the authenticity is dubious at best. Refer to the GnuPG manual covering "
--"\"Web-of-Trust\" relationships to find out how GnuPG works around the problem "
--"of verifying authenticity.</p> </qt>"
--msgstr ""
--"<qt><b>金鑰伺服器：</b><br /> "
--"<p>金鑰伺服器是位於網際網路上集中存放 PGP/GnuPG 金鑰的檔案庫，可以很便利的獲得或寄存金鑰。請從下拉式清單選擇要使用的金鑰伺服器。</p> "
--"<p>通常持有這些金鑰的人們都素未謀面，因而在真實性上也很有問題。請參考 GnuPG 手冊「信任網」相關部份以了解 GnuPG "
--"如何處理檢驗真實性的問題。</p> </qt>"
-+"<qt><b>Key Server:</b><br /> <p>A Key Server is a centralized repository of "
-+"PGP/GnuPG keys connected to the Internet which can be conveniently accessed "
-+"in order to obtain or deposit keys. Select from the drop down list to "
-+"specify which key server should be used.</p> <p>Often these keys are held by "
-+"people whom the user has never met and as such the authenticity is dubious "
-+"at best. Refer to the GnuPG manual covering \"Web-of-Trust\" relationships "
-+"to find out how GnuPG works around the problem of verifying authenticity.</"
-+"p> </qt>"
-+msgstr ""
-+"<qt><b>金鑰伺服器：</b><br /> <p>金鑰伺服器是位於網際網路上集中存放 PGP/"
-+"GnuPG 金鑰的檔案庫，可以很便利的獲得或寄存金鑰。請從下拉式清單選擇要使用的金"
-+"鑰伺服器。</p> <p>通常持有這些金鑰的人們都素未謀面，因而在真實性上也很有問"
-+"題。請參考 GnuPG 手冊「信任網」相關部份以了解 GnuPG 如何處理檢驗真實性的問"
-+"題。</p> </qt>"
- 
- #. i18n: file keyserver.ui line 86
- #: rc.cpp:443
-@@ -2534,14 +2490,12 @@
- #, no-c-format
- msgid ""
- "<qt><b>Export:</b><br />\n"
--"\t\t\t\t"
--"<p>Depressing this key will export the specified key to the specified "
--"server.</p>\n"
-+"\t\t\t\t<p>Depressing this key will export the specified key to the "
-+"specified server.</p>\n"
- "\t\t\t\t</qt>"
- msgstr ""
- "<qt><b>匯出：</b><br />\n"
--"\t\t\t\t"
--"<p>按下這個按鈕會匯出指定的金鑰到指定的伺服器。</p>\n"
-+"\t\t\t\t<p>按下這個按鈕會匯出指定的金鑰到指定的伺服器。</p>\n"
- "\t\t\t\t</qt>"
- 
- #. i18n: file keyserver.ui line 247
-@@ -2555,14 +2509,12 @@
- #, no-c-format
- msgid ""
- "<qt><b>Key to be exported:</b><br />\n"
--"\t\t\t\t"
--"<p>This allows the user to specify the key from the drop down list that will be "
--"exported to the key server selected.</p>\n"
-+"\t\t\t\t<p>This allows the user to specify the key from the drop down list "
-+"that will be exported to the key server selected.</p>\n"
- "\t\t\t\t</qt>"
- msgstr ""
- "<qt><b>要匯出的金鑰：</b><br />\n"
--"\t\t\t\t"
--"<p>這裡讓使用者可以從下拉式清單指定金鑰匯出到選擇的金鑰伺服器。</p>\n"
-+"\t\t\t\t<p>這裡讓使用者可以從下拉式清單指定金鑰匯出到選擇的金鑰伺服器。</p>\n"
- "\t\t\t\t</qt>"
- 
- #. i18n: file kgpgrevokewidget.ui line 27
-@@ -2648,12 +2600,13 @@
- #, no-c-format
- msgid ""
- "<h1>Welcome to the KGpg Wizard</h1>\n"
--"This wizard will first setup some basic configuration options required for KGpg "
--"to work properly. Next, it will allow you to create your own key pair, enabling "
--"you to encrypt your files and emails."
-+"This wizard will first setup some basic configuration options required for "
-+"KGpg to work properly. Next, it will allow you to create your own key pair, "
-+"enabling you to encrypt your files and emails."
- msgstr ""
- "<h1>歡迎使用 KGpg 精靈</h1>\n"
--"這個精靈首先會設定一些 KGpg 正常運作所需的基本組態選項。接下來，他會讓您建立您自己的金鑰配對，使您可以加密您的檔案與郵件。"
-+"這個精靈首先會設定一些 KGpg 正常運作所需的基本組態選項。接下來，他會讓您建立"
-+"您自己的金鑰配對，使您可以加密您的檔案與郵件。"
- 
- #. i18n: file kgpgwizard.ui line 91
- #: rc.cpp:523
-@@ -2703,20 +2656,19 @@
- #: rc.cpp:544
- #, no-c-format
- msgid ""
--"<qt>This will install a shredder icon on your desktop."
--"<br>\n"
--"The shredder securely deletes files (overwriting them 35 times) dropped on to "
--"it.\n"
-+"<qt>This will install a shredder icon on your desktop.<br>\n"
-+"The shredder securely deletes files (overwriting them 35 times) dropped on "
-+"to it.\n"
- "Remember that if you download a file or open one in an editor, parts of the "
- "file may be saved in a temporary location. Shredding will not erase these "
- "temporary files.\n"
--"<br><b>Shredding may not be 100% secure if you use a journaling file system.</b>"
--"</qt>"
-+"<br><b>Shredding may not be 100% secure if you use a journaling file system."
-+"</b></qt>"
- msgstr ""
--"<qt>這樣會在您的桌面安裝碎紙機圖示。"
--"<br>\n"
-+"<qt>這樣會在您的桌面安裝碎紙機圖示。<br>\n"
- "碎紙機可以很安全的刪除（覆寫大約 35 次）丟到它裡面的檔案。\n"
--"記住如果您下載檔案或在編輯器中開啟檔案，該檔案的部分可能會儲存在暫存的位置。碎紙機將無法清除那些暫存檔案。\n"
-+"記住如果您下載檔案或在編輯器中開啟檔案，該檔案的部分可能會儲存在暫存的位置。"
-+"碎紙機將無法清除那些暫存檔案。\n"
- "<br><b>如果您使用日誌式檔案系統，碎紙機可能不是 100% 安全的。</b></qt>"
- 
- #. i18n: file kgpgwizard.ui line 280
-@@ -2741,8 +2693,8 @@
- #: rc.cpp:559
- #, no-c-format
- msgid ""
--"KGpg will now launch the key generation dialog to create your own key pair for "
--"encryption and decryption."
-+"KGpg will now launch the key generation dialog to create your own key pair "
-+"for encryption and decryption."
- msgstr "KGpg 現在會啟動金鑰產生對話盒以建立給您自己用來加密和解密的金鑰配對。"
- 
- #. i18n: file newkey.ui line 30
-@@ -2768,14 +2720,12 @@
- #, no-c-format
- msgid ""
- "<qt><b>Set as your default key:</b><br />\n"
--"\t\t\t"
--"<p>Checking this option sets the newly created key pair as the default key "
--"pair.</p>\n"
-+"\t\t\t<p>Checking this option sets the newly created key pair as the default "
-+"key pair.</p>\n"
- "\t\t\t</qt>"
- msgstr ""
- "<qt><b>設為您的預設金鑰：</b><br />\n"
--"\t\t\t"
--"<p>核取這個選項會把最新建立的金鑰配對設為預設的金鑰配對。</p>\n"
-+"\t\t\t<p>核取這個選項會把最新建立的金鑰配對設為預設的金鑰配對。</p>\n"
- "\t\t\t</qt>"
- 
- #. i18n: file newkey.ui line 113
-@@ -2806,8 +2756,8 @@
- #: rc.cpp:603
- #, no-c-format
- msgid ""
--"It is recommended to save or print a revocation certificate in case your key is "
--"compromised."
-+"It is recommended to save or print a revocation certificate in case your key "
-+"is compromised."
- msgstr "建議儲存或列印註銷憑證以備您的金鑰不再安全時之用。"
- 
- #. i18n: file newkey.ui line 166
-@@ -3118,21 +3068,23 @@
- 
- #: tips.cpp:3
- msgid ""
--"<p>If you want to decrypt a text file, simply drag and drop it into the editor "
--"window. Kgpg will do the rest. Even remote files can be dropped.</p>\n"
--"<p>Drag a public key into the editor window and kgpg will automatically import "
--"it if you want.</p>\n"
-+"<p>If you want to decrypt a text file, simply drag and drop it into the "
-+"editor window. Kgpg will do the rest. Even remote files can be dropped.</p>\n"
-+"<p>Drag a public key into the editor window and kgpg will automatically "
-+"import it if you want.</p>\n"
- msgstr ""
--"<p>如果您要解密文字檔案，只要將它拖放到編輯器視窗即可。Kgpg 會處理剩下的事。即使遠端檔案也同樣可以拖放。</p>\n"
-+"<p>如果您要解密文字檔案，只要將它拖放到編輯器視窗即可。Kgpg 會處理剩下的事。"
-+"即使遠端檔案也同樣可以拖放。</p>\n"
- "<p>如果您想要，將公開金鑰拖放到編輯器視窗中，Kgpg 會自動將它匯入。</p>\n"
- 
- #: tips.cpp:9
- msgid ""
--"<p>The easiest way to encrypt a file: simply right click on the file, and you "
--"have an encrypt option in the contextual menu.\n"
-+"<p>The easiest way to encrypt a file: simply right click on the file, and "
-+"you have an encrypt option in the contextual menu.\n"
- "This works in <strong>konqueror</strong> or on your Desktop!</p>\n"
- msgstr ""
--"<p>最簡單的加密檔案方式：只要在檔案上按右鍵，您就會在快顯選單中看到加密選項。\n"
-+"<p>最簡單的加密檔案方式：只要在檔案上按右鍵，您就會在快顯選單中看到加密選"
-+"項。\n"
- "這在 <strong>konqueror</strong> 或您的桌面都有效！</p>\n"
- 
- #: tips.cpp:15
-@@ -3140,74 +3092,75 @@
- "<p>If you want to encrypt a message for several persons, just select several "
- "encryption keys by pressing the \"Ctrl\" key.</p>\n"
- msgstr ""
--"<p>如果您想要將郵件同時加密給許多人，只要按「Ctrl」鍵選擇多個加密金鑰即可。</p>\n"
-+"<p>如果您想要將郵件同時加密給許多人，只要按「Ctrl」鍵選擇多個加密金鑰即可。</"
-+"p>\n"
- 
- #: tips.cpp:20
- msgid ""
--"<p><strong>You don't know anything about encryption?</strong>"
--"<br>\n"
-+"<p><strong>You don't know anything about encryption?</strong><br>\n"
- "No problem, simply create yourself a key pair in the key management window. "
--"Then, export your public key & mail it to your friends."
--"<br>\n"
-+"Then, export your public key & mail it to your friends.<br>\n"
- "Ask them to do the same & import their public keys. Finally, to send an "
--"encrypted message, type it in the Kgpg editor, then click \"encrypt\". Choose \n"
-+"encrypted message, type it in the Kgpg editor, then click \"encrypt\". "
-+"Choose \n"
- "your friend key and click \"encrypt\" again. The message will be encrypted, "
- "ready to be sent by email.</p>\n"
- msgstr ""
--"<p><strong>您完全不了解加密？</strong>"
--"<br>\n"
--"沒問題，只要在金鑰管理視窗中建立您自己的金鑰配對。接著，匯出您的公開金鑰並將它寄給您的朋友。"
--"<br>\n"
--"請他們做相同的程序並匯入他們的公開金鑰。最後，要傳送加密的郵件，可在 Kgpg 編輯器中輸入，然後按下「加密」。選擇\n"
--"您朋友的金鑰並按再次按下「加密」。這個郵件就會被加密，並且可以用電子郵件傳送。</p>\n"
-+"<p><strong>您完全不了解加密？</strong><br>\n"
-+"沒問題，只要在金鑰管理視窗中建立您自己的金鑰配對。接著，匯出您的公開金鑰並將"
-+"它寄給您的朋友。<br>\n"
-+"請他們做相同的程序並匯入他們的公開金鑰。最後，要傳送加密的郵件，可在 Kgpg 編"
-+"輯器中輸入，然後按下「加密」。選擇\n"
-+"您朋友的金鑰並按再次按下「加密」。這個郵件就會被加密，並且可以用電子郵件傳"
-+"送。</p>\n"
- 
- #: tips.cpp:28
- msgid ""
- "<p>To perform an operation on a key, open the key management window & right "
- "click on the key. A popup menu with all available options will appear.</p>\n"
- msgstr ""
--"<p>要進行金鑰的操作，開啟金鑰管理視窗並在金鑰上按右鍵。就會出現彈出式選單及所有可用的選項。</p>\n"
-+"<p>要進行金鑰的操作，開啟金鑰管理視窗並在金鑰上按右鍵。就會出現彈出式選單及所"
-+"有可用的選項。</p>\n"
- 
- #: tips.cpp:33
- msgid ""
- "<p>Decrypt a file with a single mouse click on it. You will then be prompted "
- "for password & that's all!</p>\n"
--msgstr ""
--"<p>要解密檔案只要用滑鼠單擊它。您將被提示輸入密碼，然後就這樣！</p>\n"
-+msgstr "<p>要解密檔案只要用滑鼠單擊它。您將被提示輸入密碼，然後就這樣！</p>\n"
- 
- #: tips.cpp:38
- msgid ""
- "<p>If you only want to open the key manager, type \"kgpg -k\" in the command "
- "line prompt.</p>\n"
--msgstr ""
--"<p>如果您只想開啟金鑰管理程式，在命令列提示中輸入「kgpg -k」。</p>\n"
-+msgstr "<p>如果您只想開啟金鑰管理程式，在命令列提示中輸入「kgpg -k」。</p>\n"
- 
- #: tips.cpp:43
- msgid ""
- "<p>Typing \"kgpg -s filename\" will decrypt the file filename and open it in "
- "Kgpg's editor.</p>\n"
- msgstr ""
--"<p>輸入「kgpg -s filename」會解密該檔案名稱的檔案，並在 Kgpg 編輯器中開啟它。</p>\n"
-+"<p>輸入「kgpg -s filename」會解密該檔案名稱的檔案，並在 Kgpg 編輯器中開啟它。"
-+"</p>\n"
- 
- #: kgpgeditor.cpp:143
- msgid "&Encrypt File..."
--msgstr "加密檔案(&E)..."
-+msgstr "加密檔案(&E)…"
- 
- #: kgpgeditor.cpp:144
- msgid "&Decrypt File..."
--msgstr "解密檔案(&D)..."
-+msgstr "解密檔案(&D)…"
- 
- #: kgpgeditor.cpp:149
- msgid "&Generate Signature..."
--msgstr "產生簽章(&G)..."
-+msgstr "產生簽章(&G)…"
- 
- #: kgpgeditor.cpp:150
- msgid "&Verify Signature..."
--msgstr "驗證簽章(&V)..."
-+msgstr "驗證簽章(&V)…"
- 
- #: kgpgeditor.cpp:151
- msgid "&Check MD5 Sum..."
--msgstr "檢查 MD5 sum(&C)..."
-+msgstr "檢查 MD5 sum(&C)…"
- 
- #: kgpgeditor.cpp:220 kgpgeditor.cpp:230 kgpgeditor.cpp:467 kgpgeditor.cpp:481
- #: kgpgeditor.cpp:513
-@@ -3228,13 +3181,14 @@
- 
- #: kgpgeditor.cpp:317
- msgid ""
--"The document could not been saved, as the selected encoding cannot encode every "
--"unicode character in it."
-+"The document could not been saved, as the selected encoding cannot encode "
-+"every unicode character in it."
- msgstr "無法儲存這個文件，因為選取的編碼無法包含文件中的所有 unicode 編碼。"
- 
- #: kgpgeditor.cpp:325 kgpgeditor.cpp:352
- msgid ""
--"The document could not be saved, please check your permissions and disk space."
-+"The document could not be saved, please check your permissions and disk "
-+"space."
- msgstr "無法儲存文件，請檢查您的權限與磁碟空間。"
- 
- #: kgpgeditor.cpp:379 kgpgeditor.cpp:388
-@@ -3263,7 +3217,7 @@
- 
- #: keyservers.cpp:178
- msgid "Connecting to the server..."
--msgstr "連線至伺服器..."
-+msgstr "連線至伺服器…"
- 
- #: keyservers.cpp:233
- msgid "You must choose a key."
-@@ -3275,7 +3229,7 @@
- 
- #: keyservers.cpp:374 keyservers.cpp:442
- msgid "<b>Connecting to the server...</b>"
--msgstr "<b>連線至伺服器...</b>"
-+msgstr "<b>連線至伺服器…</b>"
- 
- #: keyservers.cpp:375 keyservers.cpp:443
- msgid "&Abort"
-@@ -3283,3 +3237,7 @@
- 
- #~ msgid "&Unicode (utf-8) Encoding"
- #~ msgstr "&Unicode (utf-8) 編輯"
-+
-+#, fuzzy
-+#~ msgid "Edit Key Server"
-+#~ msgstr "Schlüsselserver bearbeiten"
-diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdeutils/khexedit2part.po kde-i18n-zh_TW-3.5.10/messages/kdeutils/khexedit2part.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdeutils/khexedit2part.po	2006-07-22 10:03:58.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdeutils/khexedit2part.po	2011-11-11 15:45:17.000000000 +0100
-@@ -6,8 +6,7 @@
- "Project-Id-Version: khexedit2part\n"
- "POT-Creation-Date: 2005-01-17 01:37+0100\n"
- "PO-Revision-Date: 2006-02-10 11:19+0800\n"
--"Last-Translator: Frank Weng (a.k.a. Franklin) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Traditional Chinese <zh_l10n@linux.org.tw>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
-@@ -101,3 +100,7 @@
- #: khepartfactory.cpp:36
- msgid "Author"
- msgstr "作者"
-+
-+#, fuzzy
-+#~ msgid "&Local"
-+#~ msgstr "&Lokal"
-diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdeutils/khexedit.po kde-i18n-zh_TW-3.5.10/messages/kdeutils/khexedit.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdeutils/khexedit.po	2007-01-15 10:56:25.000000000 +0100
-+++ kde-i18n-zh_TW-3.5.10/messages/kdeutils/khexedit.po	2011-11-11 15:45:17.000000000 +0100
-@@ -10,8 +10,7 @@
- "Project-Id-Version: khexedit\n"
- "POT-Creation-Date: 2006-04-17 03:54+0200\n"
- "PO-Revision-Date: 2006-02-10 11:52+0800\n"
--"Last-Translator: Frank Weng (a.k.a. Franklin) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Traditional Chinese <zh_l10n@linux.org.tw>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
-@@ -307,8 +306,8 @@
- 
- #: stringdialog.cc:197
- msgid ""
--"The filter expression you have specified is illegal. You must specify a valid "
--"regular expression.\n"
-+"The filter expression you have specified is illegal. You must specify a "
-+"valid regular expression.\n"
- "Continue without filter?"
- msgstr ""
- "您指定的過濾敘述是不合法的. 您必須指定一個有效的正規表示語句.\n"
-@@ -320,11 +319,11 @@
- 
- #: statusbarprogress.cc:268
- msgid "%1... %2 of %3"
--msgstr "%1... %2 之 %3"
-+msgstr "%1… %2 之 %3"
- 
- #: statusbarprogress.cc:272
- msgid "%1... %2%"
--msgstr "%1... %2%"
-+msgstr "%1… %2%"
- 
- #: dialog.cc:44
- msgid "Goto Offset"
-@@ -644,11 +643,11 @@
- 
- #: toplevel.cc:133
- msgid "&Insert..."
--msgstr "插入(&I)..."
-+msgstr "插入(&I)…"
- 
- #: toplevel.cc:143
- msgid "E&xport..."
--msgstr "匯出(&X)..."
-+msgstr "匯出(&X)…"
- 
- #: toplevel.cc:145
- msgid "&Cancel Operation"
-@@ -672,11 +671,11 @@
- 
- #: toplevel.cc:168
- msgid "&Goto Offset..."
--msgstr "跳到位移(&G)..."
-+msgstr "跳到位移(&G)…"
- 
- #: toplevel.cc:170
- msgid "&Insert Pattern..."
--msgstr "插入樣式(&I)..."
-+msgstr "插入樣式(&I)…"
- 
- #: toplevel.cc:173
- msgid "Copy as &Text"
-@@ -704,7 +703,7 @@
- 
- #: toplevel.cc:200
- msgid "Off&set as Decimal"
--msgstr "十進位顯示位移(&s)"
-+msgstr "十進位顯示位移(&S)"
- 
- #: toplevel.cc:202
- msgid "&Upper Case (Data)"
-@@ -730,23 +729,23 @@
- 
- #: toplevel.cc:219
- msgid "&Extract Strings..."
--msgstr "取得字串(&E)..."
-+msgstr "取得字串(&E)…"
- 
- #: toplevel.cc:223
- msgid "&Binary Filter..."
--msgstr "二進位過濾器(&B)..."
-+msgstr "二進位過濾器(&B)…"
- 
- #: toplevel.cc:225
- msgid "&Character Table"
--msgstr "字元表 (&C)"
-+msgstr "字元表(&C)"
- 
- #: toplevel.cc:227
- msgid "C&onverter"
--msgstr "轉換器 (&O)"
-+msgstr "轉換器(&O)"
- 
- #: toplevel.cc:229
- msgid "&Statistics"
--msgstr "統計資料 (&S)"
-+msgstr "統計資料(&S)"
- 
- #: toplevel.cc:234
- msgid "&Replace Bookmark"
-@@ -846,10 +845,8 @@
- msgstr "最近編輯的非本地端檔案: %1"
- 
- #: toplevel.cc:546
--msgid ""
--"Can not create new window.\n"
--msgstr ""
--"無法建立新視窗.\n"
-+msgid "Can not create new window.\n"
-+msgstr "無法建立新視窗.\n"
- 
- #: toplevel.cc:582
- msgid ""
-@@ -1069,27 +1066,21 @@
- msgstr "列印十六進位文件"
- 
- #: hexeditorwidget.cc:1123
--msgid ""
--"Could not print data.\n"
--msgstr ""
--"不能列印資料.\n"
-+msgid "Could not print data.\n"
-+msgstr "不能列印資料.\n"
- 
- #: hexeditorwidget.cc:1147
- #, c-format
- msgid ""
--"_n: <qt>Print threshold exceeded."
--"<br>You are about to print one page."
-+"_n: <qt>Print threshold exceeded.<br>You are about to print one page."
- "<br>Proceed?</qt>\n"
--"<qt>Print threshold exceeded."
--"<br>You are about to print %n pages."
--"<br>Proceed?</qt>"
-+"<qt>Print threshold exceeded.<br>You are about to print %n pages.<br>Proceed?"
-+"</qt>"
- msgstr "<qt>超過印表機處理能力。<br>您將印出約 %n 頁。<br>是否執行?</qt>"
- 
- #: hexeditorwidget.cc:1192 hexeditorwidget.cc:1209 hexeditorwidget.cc:1226
--msgid ""
--"Unable to export data.\n"
--msgstr ""
--"無法匯出資料.\n"
-+msgid "Unable to export data.\n"
-+msgstr "無法匯出資料.\n"
- 
- #: hexeditorwidget.cc:1237
- msgid ""
-@@ -1109,10 +1100,8 @@
- msgstr "編碼(&E)"
- 
- #: hexeditorwidget.cc:1259
--msgid ""
--"Could not encode data.\n"
--msgstr ""
--"無法便碼資料.\n"
-+msgid "Could not encode data.\n"
-+msgstr "無法便碼資料.\n"
- 
- #: hexeditorwidget.cc:1412
- msgid ""
-@@ -1161,12 +1150,8 @@
- #: hexeditorwidget.cc:1774
- #, c-format
- msgid ""
--"_n: <qt>Operation complete."
--"<br>"
--"<br>One replacement was made.</qt>\n"
--"<qt>Operation complete."
--"<br>"
--"<br>%n replacements were made.</qt>"
-+"_n: <qt>Operation complete.<br><br>One replacement was made.</qt>\n"
-+"<qt>Operation complete.<br><br>%n replacements were made.</qt>"
- msgstr "<qt>動作已完成。<br> <br>取代了 %n 筆資料。</qt>"
- 
- #: hexeditorwidget.cc:1795
-@@ -1182,10 +1167,8 @@
- msgstr "編碼方式"
- 
- #: hexeditorwidget.cc:1831
--msgid ""
--"Could not collect strings.\n"
--msgstr ""
--"無法收集字串.\n"
-+msgid "Could not collect strings.\n"
-+msgstr "無法收集字串.\n"
- 
- #: hexeditorwidget.cc:1833
- msgid "Collect Strings"
-@@ -1204,10 +1187,8 @@
- msgstr "紀錄檢視器"
- 
- #: hexeditorwidget.cc:1917
--msgid ""
--"Could not collect document statistics.\n"
--msgstr ""
--"無法收集文件統計資訊.\n"
-+msgid "Could not collect document statistics.\n"
-+msgstr "無法收集文件統計資訊.\n"
- 
- #: hexeditorwidget.cc:1920
- msgid "Collect Document Statistics"
-@@ -1289,10 +1270,8 @@
- "%1"
- 
- #: hexeditorwidget.cc:2103
--msgid ""
--"Could not read file.\n"
--msgstr ""
--"不能讀取檔案.\n"
-+msgid "Could not read file.\n"
-+msgstr "不能讀取檔案.\n"
- 
- #: hexeditorwidget.cc:2122
- msgid "You have specified a folder."
-@@ -1307,16 +1286,12 @@
- msgstr "嘗試開啟檔案時發生錯誤"
- 
- #: hexeditorwidget.cc:2150
--msgid ""
--"Could not write data to disk.\n"
--msgstr ""
--"不能將資料寫入磁碟.\n"
-+msgid "Could not write data to disk.\n"
-+msgstr "不能將資料寫入磁碟.\n"
- 
- #: hexeditorwidget.cc:2232
--msgid ""
--"Can not create text buffer.\n"
--msgstr ""
--"無法建立文字緩衝區.\n"
-+msgid "Can not create text buffer.\n"
-+msgstr "無法建立文字緩衝區.\n"
- 
- #: hexeditorwidget.cc:2234
- msgid "Loading Failed"
-@@ -1393,10 +1368,8 @@
- msgstr "您確定要取消文件掃描嗎?"
- 
- #: hexeditorwidget.cc:2432
--msgid ""
--"Could not finish operation.\n"
--msgstr ""
--"無法完成操作.\n"
-+msgid "Could not finish operation.\n"
-+msgstr "無法完成操作.\n"
- 
- #: exportdialog.cc:35 exportdialog.cc:493 exportdialog.cc:537
- #: exportdialog.cc:566 exportdialog.cc:634
-@@ -1437,7 +1410,7 @@
- 
- #: exportdialog.cc:191
- msgid "Choose..."
--msgstr "選擇..."
-+msgstr "選擇…"
- 
- #: exportdialog.cc:202
- msgid "Export Range"
-@@ -1473,7 +1446,7 @@
- 
- #: exportdialog.cc:317
- msgid "&Lines per table:"
--msgstr "表格行數(&L):"
-+msgstr "表格列數(&L):"
- 
- #: exportdialog.cc:325
- msgid "Filename &prefix (in package):"
-@@ -1562,7 +1535,7 @@
- 
- #: exportdialog.cc:427
- msgid "Elements per line:"
--msgstr "每行元素數:"
-+msgstr "每列元素數:"
- 
- #: exportdialog.cc:431
- msgid "Print unsigned values as hexadecimal"
-@@ -1595,7 +1568,8 @@
- #: exportdialog.cc:679
- msgid ""
- "You have specified an existing folder.\n"
--"If you continue, any existing file in the range \"%1\" to \"%2\" can be lost.\n"
-+"If you continue, any existing file in the range \"%1\" to \"%2\" can be "
-+"lost.\n"
- "Continue?"
- msgstr ""
- "您指定了已經存在的目錄。\n"
-@@ -1976,8 +1950,8 @@
- 
- #: optiondialog.cc:492
- msgid ""
--"Clicking this check box makes KHexEdit forget his recent document list when the "
--"program is closed.\n"
-+"Clicking this check box makes KHexEdit forget his recent document list when "
-+"the program is closed.\n"
- "Note: it will not erase any document of the recent document list created by "
- "KDE."
- msgstr ""
-diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdeutils/kjots.po kde-i18n-zh_TW-3.5.10/messages/kdeutils/kjots.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdeutils/kjots.po	2007-05-14 12:22:53.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdeutils/kjots.po	2011-11-11 15:45:17.000000000 +0100
-@@ -5,8 +5,7 @@
- "Project-Id-Version: kjots\n"
- "POT-Creation-Date: 2007-05-02 02:16+0200\n"
- "PO-Revision-Date: 2006-02-13 10:35+0800\n"
--"Last-Translator: Frank Weng (a.k.a. Franklin) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Traditional Chinese <zh_l10n@linux.org.tw>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
-@@ -39,7 +38,7 @@
- 
- #: KJotsMain.cpp:118
- msgid "New &Book..."
--msgstr "新書[&B]..."
-+msgstr "新書[&B]…"
- 
- #: KJotsMain.cpp:121
- msgid "Export Page"
-@@ -47,11 +46,11 @@
- 
- #: KJotsMain.cpp:122 KJotsMain.cpp:130
- msgid "To Text File..."
--msgstr "到文字檔..."
-+msgstr "到文字檔…"
- 
- #: KJotsMain.cpp:125 KJotsMain.cpp:133
- msgid "To HTML File..."
--msgstr "到 HTML 檔..."
-+msgstr "到 HTML 檔…"
- 
- #: KJotsMain.cpp:129
- msgid "Export Book"
-@@ -75,7 +74,7 @@
- 
- #: KJotsMain.cpp:164
- msgid "Rename..."
--msgstr "重新命名..."
-+msgstr "重新命名…"
- 
- #: KJotsMain.cpp:166
- msgid "Insert Date"
-@@ -124,15 +123,18 @@
- 
- #: KJotsMain.cpp:828
- msgid ""
--"This bookmark is from an older version of KJots and is not fully supported. It "
--"may or may not work. You should delete and recreate this bookmark."
--msgstr "這個書籤是從舊版本的 KJots 而來，目前已經不完全支援，有可能無法運作。您應該刪除並重新產生書籤。"
-+"This bookmark is from an older version of KJots and is not fully supported. "
-+"It may or may not work. You should delete and recreate this bookmark."
-+msgstr ""
-+"這個書籤是從舊版本的 KJots 而來，目前已經不完全支援，有可能無法運作。您應該刪"
-+"除並重新產生書籤。"
- 
- #: KJotsMain.cpp:1119
- msgid ""
--"All pages must be inside a book. Would you like to create a new book to put the "
--"page in, or would you prefer to not move the page at all?"
--msgstr "所有的頁都應該放在書本中。您要產生一本新書並將此頁放入，還是決定不移動此頁？"
-+"All pages must be inside a book. Would you like to create a new book to put "
-+"the page in, or would you prefer to not move the page at all?"
-+msgstr ""
-+"所有的頁都應該放在書本中。您要產生一本新書並將此頁放入，還是決定不移動此頁？"
- 
- #: KJotsMain.cpp:1123
- msgid "Create New Book"
-@@ -249,8 +251,8 @@
- #: rc.cpp:27
- #, no-c-format
- msgid ""
--"When \"Enable autosave\" is checked, KJots will automatically save changes made "
--"to books at the interval defined below."
-+"When \"Enable autosave\" is checked, KJots will automatically save changes "
-+"made to books at the interval defined below."
- msgstr "當選取「開啟自動儲存」時，KJots 會定時自動將書本的變更儲存起來。"
- 
- #. i18n: file confpagemisc.ui line 129
-diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdeutils/klaptopdaemon.po kde-i18n-zh_TW-3.5.10/messages/kdeutils/klaptopdaemon.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdeutils/klaptopdaemon.po	2008-02-13 10:55:25.000000000 +0100
-+++ kde-i18n-zh_TW-3.5.10/messages/kdeutils/klaptopdaemon.po	2011-11-11 15:45:17.000000000 +0100
-@@ -7,8 +7,7 @@
- "Project-Id-Version: klaptopdaemon\n"
- "POT-Creation-Date: 2008-02-03 01:21+0100\n"
- "PO-Revision-Date: 2006-10-16 12:51+0800\n"
--"Last-Translator: Frank Weng (a.k.a. Franklin) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Chinese Traditional <zh-l10n@linux.org.tw>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
-@@ -18,33 +17,35 @@
- #: portable.cpp:945
- msgid ""
- "Your computer seems to have a partial ACPI installation. ACPI was probably "
--"enabled, but some of the sub-options were not - you need to enable at least 'AC "
--"Adaptor' and 'Control Method Battery' and then rebuild your kernel."
-+"enabled, but some of the sub-options were not - you need to enable at least "
-+"'AC Adaptor' and 'Control Method Battery' and then rebuild your kernel."
- msgstr ""
--"您的電腦中似乎有安裝部份的 ACPI 功能。ACPI 可能已啟動，但是有些選項沒有啟動─您至少必須啟動「AC Adaptor」與「Control Method "
--"Battery」兩個核心選項，然後重編您的核心。"
-+"您的電腦中似乎有安裝部份的 ACPI 功能。ACPI 可能已啟動，但是有些選項沒有啟動─"
-+"您至少必須啟動「AC Adaptor」與「Control Method Battery」兩個核心選項，然後重"
-+"編您的核心。"
- 
- #: portable.cpp:949
- msgid ""
- "Your computer doesn't have the Linux APM (Advanced Power Management) or ACPI "
- "software installed, or doesn't have the APM kernel drivers installed - check "
--"out the <a href=\"http://www.linuxdoc.org/HOWTO/Laptop-HOWTO.html\">"
--"Linux Laptop-HOWTO</a> document for information on how to install APM."
-+"out the <a href=\"http://www.linuxdoc.org/HOWTO/Laptop-HOWTO.html\">Linux "
-+"Laptop-HOWTO</a> document for information on how to install APM."
- msgstr ""
--"您的電腦系統並沒有安裝 Linux APM (進階電源管理) 或 ACPI 的軟體程式，或者是核心並沒有支援或者是安裝 APM 的機制。建議您參考 <a "
--"href=\"http://www.linuxdoc.org/HOWTO/Laptop-HOWTO.html\">Linux Laptop-HOWTO</a> "
--"文件，以便於安裝以及啟動 APM 的功能。"
-+"您的電腦系統並沒有安裝 Linux APM (進階電源管理) 或 ACPI 的軟體程式，或者是核"
-+"心並沒有支援或者是安裝 APM 的機制。建議您參考 <a href=\"http://www.linuxdoc."
-+"org/HOWTO/Laptop-HOWTO.html\">Linux Laptop-HOWTO</a> 文件，以便於安裝以及啟"
-+"動 APM 的功能。"
- 
- #: portable.cpp:961
- msgid ""
- "\n"
--"If you make /usr/bin/apm setuid then you will also be able to choose 'suspend' "
--"and 'standby' in the above dialog - check out the help button below to find out "
--"how to do this"
-+"If you make /usr/bin/apm setuid then you will also be able to choose "
-+"'suspend' and 'standby' in the above dialog - check out the help button "
-+"below to find out how to do this"
- msgstr ""
- "\n"
--"如果您調整 /usr/bin/apm 檔案的權限，那您就可以在上面對話方塊上選擇使用暫停 (suspend) 以及待命 (standby) "
--"這兩個項目。請參考下方的說明鍵。"
-+"如果您調整 /usr/bin/apm 檔案的權限，那您就可以在上面對話方塊上選擇使用暫停 "
-+"(suspend) 以及待命 (standby) 這兩個項目。請參考下方的說明鍵。"
- 
- #: portable.cpp:969
- msgid ""
-@@ -79,14 +80,18 @@
- "Your system has APM installed but may not be able to use all of its features "
- "without further setup - look in the 'APM Config' tab for information about "
- "setting up APM for suspend and resume"
--msgstr "您的系統有安裝 APM，但是在進一步設定之前，沒辦法使用全部的功能。請參考「APM 設定」頁來設定 APM 的暫停與回復功能。"
-+msgstr ""
-+"您的系統有安裝 APM，但是在進一步設定之前，沒辦法使用全部的功能。請參考「APM "
-+"設定」頁來設定 APM 的暫停與回復功能。"
- 
- #: portable.cpp:1176
- msgid ""
--"Your system has ACPI installed but may not be able to use all of its features "
--"without further setup - look in the 'ACPI Config' tab for information about "
--"setting up ACPI for suspend and resume"
--msgstr "您的系統有安裝 ACPI，但是在進一步設定之前，沒辦法使用全部的功能。請參考「ACPI 設定」頁來設定 APM 的暫停與回復功能。"
-+"Your system has ACPI installed but may not be able to use all of its "
-+"features without further setup - look in the 'ACPI Config' tab for "
-+"information about setting up ACPI for suspend and resume"
-+msgstr ""
-+"您的系統有安裝 ACPI，但是在進一步設定之前，沒辦法使用全部的功能。請參考"
-+"「ACPI 設定」頁來設定 APM 的暫停與回復功能。"
- 
- #: portable.cpp:1333
- msgid "%1 MHz (%2)"
-@@ -98,19 +103,21 @@
- 
- #: portable.cpp:2151
- msgid ""
--"There is no /dev/apm file on this system. Please review the FreeBSD handbook on "
--"how to create a device node for the APM device driver (man 4 apm)."
--msgstr "系統上找不到 /dev/apm 檔。請參考 FreeBSD 手冊及 man 4 apm，來產生 APM 驅動程式所使用的裝置檔。"
-+"There is no /dev/apm file on this system. Please review the FreeBSD handbook "
-+"on how to create a device node for the APM device driver (man 4 apm)."
-+msgstr ""
-+"系統上找不到 /dev/apm 檔。請參考 FreeBSD 手冊及 man 4 apm，來產生 APM 驅動程"
-+"式所使用的裝置檔。"
- 
- #: portable.cpp:2154
- msgid ""
- "Your system has the proper device node for APM support, however you cannot "
- "access it. If you are logged in as root right now, you have a problem, "
--"otherwise contact your local sysadmin and ask for read/write access to "
--"/dev/apm."
-+"otherwise contact your local sysadmin and ask for read/write access to /dev/"
-+"apm."
- msgstr ""
--"您的系統有 APM 的裝置檔，但是您無法存取。如果您已經使用 root 身份登入，那麼可能有別的問題。否則請您與系統管理者聯絡，詢問關於存取 /dev/apm "
--"檔的問題。"
-+"您的系統有 APM 的裝置檔，但是您無法存取。如果您已經使用 root 身分登入，那麼可"
-+"能有別的問題。否則請您與系統管理者聯絡，詢問關於存取 /dev/apm 檔的問題。"
- 
- #: portable.cpp:2157 portable.cpp:2562
- msgid "Your kernel lacks support for Advanced Power Management."
-@@ -127,22 +134,26 @@
- #: portable.cpp:2556
- msgid ""
- "There is no /dev/apm file on this system. Please review the NetBSD "
--"documentation on how to create a device node for the APM device driver (man 4 "
--"apm)."
--msgstr "系統上找不到 /dev/apm 檔。請參考 NetBSD 手冊及 man 4 apm，來產生 APM 驅動程式所使用的裝置檔。"
-+"documentation on how to create a device node for the APM device driver (man "
-+"4 apm)."
-+msgstr ""
-+"系統上找不到 /dev/apm 檔。請參考 NetBSD 手冊及 man 4 apm，來產生 APM 驅動程式"
-+"所使用的裝置檔。"
- 
- #: portable.cpp:2559
- msgid ""
- "Your system has the proper device node for APM support, however you cannot "
- "access it. If you have APM compiled into the kernel this should not happen."
--msgstr "您的系統有 APM 的裝置檔，但是您無法存取。如果您的核心中已將 APM 支援編入，那麼不應該有這個問題。"
-+msgstr ""
-+"您的系統有 APM 的裝置檔，但是您無法存取。如果您的核心中已將 APM 支援編入，那"
-+"麼不應該有這個問題。"
- 
- #: portable.cpp:2866
- msgid ""
- "Your computer or operating system is not supported by the current version of "
- "the\n"
--"KDE laptop control panels. If you want help porting these panels to work with "
--"it\n"
-+"KDE laptop control panels. If you want help porting these panels to work "
-+"with it\n"
- "please contact paul@taniwha.com."
- msgstr ""
- "這個版本的 KDE laptop 控制程式不支援您目前的電腦或者是作業系統。\n"
-@@ -226,23 +237,23 @@
- 
- #: kpcmciainfo.cpp:201
- msgid "Resetting card..."
--msgstr "重設介面卡..."
-+msgstr "重設介面卡…"
- 
- #: kpcmciainfo.cpp:208
- msgid "Inserting new card..."
--msgstr "插入新的介面卡..."
-+msgstr "插入新的介面卡…"
- 
- #: kpcmciainfo.cpp:212
- msgid "Ejecting card..."
--msgstr "取出介面卡..."
-+msgstr "取出介面卡…"
- 
- #: kpcmciainfo.cpp:223
- msgid "Suspending card..."
--msgstr "暫停介面卡..."
-+msgstr "暫停介面卡…"
- 
- #: kpcmciainfo.cpp:226
- msgid "Resuming card..."
--msgstr "恢復介面卡..."
-+msgstr "恢復介面卡…"
- 
- #: kpcmciainfo.cpp:237
- msgid "Card type: %1 "
-@@ -318,7 +329,7 @@
- 
- #: kpcmciainfo.cpp:295
- msgid "Resu&me"
--msgstr "繼續 (&m)"
-+msgstr "繼續(&M)"
- 
- #: daemondock.cpp:54
- msgid "KLaptop Daemon"
-@@ -326,39 +337,39 @@
- 
- #: daemondock.cpp:83
- msgid "&Configure KLaptop..."
--msgstr "設定 KLaptop(&C)..."
-+msgstr "設定 KLaptop(&C)…"
- 
- #: daemondock.cpp:86
- msgid "Screen Brightness..."
--msgstr "螢幕亮度..."
-+msgstr "螢幕亮度…"
- 
- #: daemondock.cpp:90
- msgid "Performance Profile..."
--msgstr "效能設定..."
-+msgstr "效能設定…"
- 
- #: daemondock.cpp:99
- msgid "CPU Throttling..."
--msgstr "CPU 效能上限..."
-+msgstr "CPU 效能上限…"
- 
- #: daemondock.cpp:108
- msgid "Standby..."
--msgstr "待命..."
-+msgstr "待命…"
- 
- #: daemondock.cpp:109
- msgid "&Lock && Suspend..."
--msgstr "鎖住 && 暫停 (&L)"
-+msgstr "鎖住 && 暫停(&L)"
- 
- #: daemondock.cpp:110
- msgid "&Suspend..."
--msgstr "暫停 (&S)"
-+msgstr "暫停(&S)"
- 
- #: daemondock.cpp:111
- msgid "&Lock && Hibernate..."
--msgstr "鎖住 && 冬眠 (&L)..."
-+msgstr "鎖住 && 冬眠(&L)…"
- 
- #: daemondock.cpp:112
- msgid "&Hibernate..."
--msgstr "冬眠 (&L)..."
-+msgstr "冬眠(&L)…"
- 
- #: daemondock.cpp:116
- msgid "&Hide Monitor"
-@@ -367,9 +378,11 @@
- #: daemondock.cpp:239
- msgid ""
- "You will need to supply a root password to allow KLaptopDaemon to restart "
--"itself as the superuser. It may take up to a minute for the new daemon to start "
--"up and the old one to close."
--msgstr "您需要 root 密碼以便讓 KLaptopDaemon 重新啟動。這可能需要一些時間，以便將舊的關閉並重新啟動。"
-+"itself as the superuser. It may take up to a minute for the new daemon to "
-+"start up and the old one to close."
-+msgstr ""
-+"您需要 root 密碼以便讓 KLaptopDaemon 重新啟動。這可能需要一些時間，以便將舊的"
-+"關閉並重新啟動。"
- 
- #: daemondock.cpp:244 daemondock.cpp:261 daemondock.cpp:265
- msgid "KLaptopDaemon"
-@@ -377,8 +390,8 @@
- 
- #: daemondock.cpp:260
- msgid ""
--"PCMCIA cannot be enabled since kdesu cannot be found. Please make sure that it "
--"is installed correctly."
-+"PCMCIA cannot be enabled since kdesu cannot be found. Please make sure that "
-+"it is installed correctly."
- msgstr "PCMCIA 無法啟動，因為找不到 kdesu 程式。請確定您的 KDE 有正確安裝。"
- 
- #: daemondock.cpp:264
-@@ -387,8 +400,8 @@
- 
- #: daemondock.cpp:271
- msgid ""
--"Are you sure you want to hide the battery monitor? Your battery will still be "
--"monitored in the background."
-+"Are you sure you want to hide the battery monitor? Your battery will still "
-+"be monitored in the background."
- msgstr "您確定您要隱藏電池監控畫面？您的電池會在幕後持續監控。"
- 
- #: daemondock.cpp:271
-@@ -451,11 +464,11 @@
- 
- #: daemondock.cpp:422
- msgid "Card Slots..."
--msgstr "介面卡插槽..."
-+msgstr "介面卡插槽…"
- 
- #: daemondock.cpp:429
- msgid "Details..."
--msgstr "細節..."
-+msgstr "細節…"
- 
- #: daemondock.cpp:434
- msgid "Eject"
-diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdeutils/kmilo_delli8k.po kde-i18n-zh_TW-3.5.10/messages/kdeutils/kmilo_delli8k.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdeutils/kmilo_delli8k.po	2006-07-22 10:03:58.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdeutils/kmilo_delli8k.po	2011-11-11 15:45:17.000000000 +0100
-@@ -6,8 +6,7 @@
- "Project-Id-Version: kmilo_delli8k\n"
- "POT-Creation-Date: 2004-11-24 01:19+0100\n"
- "PO-Revision-Date: 2006-02-10 10:52+0800\n"
--"Last-Translator: Frank Weng (a.k.a. Franklin) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Traditional Chinese <zh_l10n@linux.org.tw>\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/kdeutils/kmilod.po kde-i18n-zh_TW-3.5.10/messages/kdeutils/kmilod.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdeutils/kmilod.po	2006-07-22 10:03:58.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdeutils/kmilod.po	2011-11-11 15:45:17.000000000 +0100
-@@ -6,8 +6,7 @@
- "Project-Id-Version: kmilod\n"
- "POT-Creation-Date: 2005-09-29 02:39+0200\n"
- "PO-Revision-Date: 2006-02-10 09:44+0800\n"
--"Last-Translator: Frank Weng (a.k.a. Franklin) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Traditional Chinese <zh_l10n@linux.org.tw>\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/kdeutils/kmilo_generic.po kde-i18n-zh_TW-3.5.10/messages/kdeutils/kmilo_generic.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdeutils/kmilo_generic.po	2008-02-13 10:55:25.000000000 +0100
-+++ kde-i18n-zh_TW-3.5.10/messages/kdeutils/kmilo_generic.po	2011-11-11 15:45:17.000000000 +0100
-@@ -6,8 +6,7 @@
- "Project-Id-Version: kmilo_generic\n"
- "POT-Creation-Date: 2008-02-07 01:30+0100\n"
- "PO-Revision-Date: 2006-02-10 10:54+0800\n"
--"Last-Translator: Frank Weng (a.k.a. Franklin) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Traditional Chinese <zh_l10n@linux.org.tw>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
-@@ -16,7 +15,7 @@
- 
- #: generic_monitor.cpp:126 generic_monitor.cpp:166 generic_monitor.cpp:260
- msgid "Starting KMix..."
--msgstr "啟動 KMix..."
-+msgstr "啟動 KMix…"
- 
- #: generic_monitor.cpp:139 generic_monitor.cpp:184 generic_monitor.cpp:282
- msgid "It seems that KMix is not running."
-diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdeutils/kmilo_kvaio.po kde-i18n-zh_TW-3.5.10/messages/kdeutils/kmilo_kvaio.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdeutils/kmilo_kvaio.po	2006-07-22 10:03:58.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdeutils/kmilo_kvaio.po	2011-11-11 15:45:17.000000000 +0100
-@@ -6,8 +6,7 @@
- "Project-Id-Version: kmilo_kvaio\n"
- "POT-Creation-Date: 2005-07-08 01:34+0200\n"
- "PO-Revision-Date: 2006-02-10 11:00+0800\n"
--"Last-Translator: Frank Weng (a.k.a. Franklin) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Traditional Chinese <zh_l10n@linux.org.tw>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
-@@ -64,7 +63,7 @@
- 
- #: kvaio.cpp:481 kvaio.cpp:548
- msgid "Starting KMix..."
--msgstr "開始 KMix..."
-+msgstr "開始 KMix…"
- 
- #: kvaio.cpp:500 kvaio.cpp:571
- msgid "It seems that KMix is not running."
-diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdeutils/kmilo_powerbook.po kde-i18n-zh_TW-3.5.10/messages/kdeutils/kmilo_powerbook.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdeutils/kmilo_powerbook.po	2006-07-22 10:03:58.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdeutils/kmilo_powerbook.po	2011-11-11 15:45:17.000000000 +0100
-@@ -6,8 +6,7 @@
- "Project-Id-Version: kmilo_powerbook\n"
- "POT-Creation-Date: 2005-11-30 03:22+0100\n"
- "PO-Revision-Date: 2006-02-10 12:29+0800\n"
--"Last-Translator: Frank Weng (a.k.a. Franklin) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Traditional Chinese <zh_l10n@linux.org.tw>\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/kdeutils/kmilo_thinkpad.po kde-i18n-zh_TW-3.5.10/messages/kdeutils/kmilo_thinkpad.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdeutils/kmilo_thinkpad.po	2006-07-22 10:03:58.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdeutils/kmilo_thinkpad.po	2011-11-11 15:45:17.000000000 +0100
-@@ -6,8 +6,7 @@
- "Project-Id-Version: kmilo_thinkpad\n"
- "POT-Creation-Date: 2005-06-14 01:28+0200\n"
- "PO-Revision-Date: 2006-02-10 12:35+0800\n"
--"Last-Translator: Frank Weng (a.k.a. Franklin) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Traditional Chinese <zh_l10n@linux.org.tw>\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/kdeutils/kregexpeditor.po kde-i18n-zh_TW-3.5.10/messages/kdeutils/kregexpeditor.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdeutils/kregexpeditor.po	2006-07-22 10:03:58.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdeutils/kregexpeditor.po	2011-11-11 15:45:17.000000000 +0100
-@@ -9,8 +9,7 @@
- "Project-Id-Version: kregexpeditor\n"
- "POT-Creation-Date: 2005-08-18 04:29+0200\n"
- "PO-Revision-Date: 2006-02-10 13:32+0800\n"
--"Last-Translator: Frank Weng (a.k.a. Franklin) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Traditional Chinese <zh_l10n@linux.org.tw>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
-@@ -42,40 +41,28 @@
- msgstr "選擇不合法"
- 
- #: characterswidget.cpp:124
--msgid ""
--"- A word character\n"
--msgstr ""
--"- 一字元\n"
-+msgid "- A word character\n"
-+msgstr "- 一字元\n"
- 
- #: characterswidget.cpp:127
--msgid ""
--"- A non-word character\n"
--msgstr ""
--"- 一特殊字元\n"
-+msgid "- A non-word character\n"
-+msgstr "- 一特殊字元\n"
- 
- #: characterswidget.cpp:130
--msgid ""
--"- A digit character\n"
--msgstr ""
--"- 一數字字元\n"
-+msgid "- A digit character\n"
-+msgstr "- 一數字字元\n"
- 
- #: characterswidget.cpp:133
--msgid ""
--"- A non-digit character\n"
--msgstr ""
--"- 一非數字字元\n"
-+msgid "- A non-digit character\n"
-+msgstr "- 一非數字字元\n"
- 
- #: characterswidget.cpp:136
--msgid ""
--"- A space character\n"
--msgstr ""
--"- 一空白字元\n"
-+msgid "- A space character\n"
-+msgstr "- 一空白字元\n"
- 
- #: characterswidget.cpp:139
--msgid ""
--"- A non-space character\n"
--msgstr ""
--"= 一非空白字元\n"
-+msgid "- A non-space character\n"
-+msgstr "= 一非空白字元\n"
- 
- #: characterswidget.cpp:156
- msgid "from "
-@@ -172,10 +159,8 @@
- msgstr "換頁字元(\\f)"
- 
- #: charselector.cpp:66
--msgid ""
--"The Line Feed Character (\\n)"
--msgstr ""
--"換行字元(\\n)"
-+msgid "The Line Feed Character (\\n)"
-+msgstr "換列字元(\\n)"
- 
- #: charselector.cpp:67
- msgid "The Carriage Return Character (\\r)"
-@@ -203,10 +188,11 @@
- 
- #: compoundwidget.cpp:55
- msgid ""
--"When the content of this box is typed in to the ASCII line,"
--"<br>this box will automatically be added around it,"
--"<br>if this check box is selected."
--msgstr "當對話框內容是以ASCII碼輸入時，<br>對話框將會自動循環增加， <br>如果此檢查方塊是被選取的。"
-+"When the content of this box is typed in to the ASCII line,<br>this box will "
-+"automatically be added around it,<br>if this check box is selected."
-+msgstr ""
-+"當對話框內容是以ASCII碼輸入時，<br>對話框將會自動循環增加， <br>如果此檢查方"
-+"塊是被選取的。"
- 
- #: compoundwidget.cpp:123
- msgid "Configure Compound"
-@@ -230,7 +216,7 @@
- 
- #: editorwindow.cpp:332
- msgid "&Save Regular Expression..."
--msgstr "儲存正規表示式 (&S)..."
-+msgstr "儲存正規表示式(&S)…"
- 
- #: editorwindow.cpp:377
- msgid "Enter name:"
-@@ -259,11 +245,13 @@
- 
- #: emacsregexpconverter.cpp:182
- msgid "Word boundary and non word boundary is not supported in Emacs syntax"
--msgstr "文字邊界(word boundary)與非文字邊界(non word boundary)在 Emacs 語法中不支援"
-+msgstr ""
-+"文字邊界(word boundary)與非文字邊界(non word boundary)在 Emacs 語法中不支援"
- 
- #: errormap.cpp:49
- msgid ""
--"Your regular expression is invalid, due to something preceding a 'line start'."
-+"Your regular expression is invalid, due to something preceding a 'line "
-+"start'."
- msgstr "您的正規表示式不合法，因為在「行開頭」前面還有東西。"
- 
- #: errormap.cpp:50 errormap.cpp:59 errormap.cpp:69
-@@ -277,55 +265,50 @@
- 
- #: errormap.cpp:68
- msgid ""
--"Your regular expression is invalid. 'Look Ahead' regular expression must be the "
--"last sub expression."
-+"Your regular expression is invalid. 'Look Ahead' regular expression must be "
-+"the last sub expression."
- msgstr "您的正規表示式有問題。'Lookahead' 表示式必須在最後面。"
- 
- #: infopage.cpp:35
- msgid ""
- "_: Translators, feel free to add yourself in the text below, asking for a "
--"postcard ;-), also feel free to add a section saying "
--"<h2>Translators</h2>. Kind regards, and thanks for your work - Jesper.\n"
--"<h1>Regular Expression Editor</h1>"
--"<p>What you are currently looking at is an editor for <i>Regular Expressions</i>"
--".</p>"
--"<p>The upper part in the middle is the editing area, the lower part is a "
--"verification window where you can try your regular expressions right away. The "
--"row of buttons is the editing actions. This is actually very similar to common "
--"drawing programs. Select an editing tool to start editing your regular "
--"expression, and press the mouse button in the editing area where you want this "
--"item inserted.</p>"
--"<p>For a more detailed description of this editor see the <a href=\"doc://\">"
--"info pages</a></p>"
--"<h2>What is a regular expression?</h2>If you do not know what a regular "
--"expression is, then it might be a good idea to read <a "
--"href=\"doc://whatIsARegExp\">the introduction to regular expressions</a>."
--"<p>"
--msgstr ""
--"<h1>正規表示式編輯器</h1> "
--"<p>您現在看的是一個<i>正規表示式</i>的編輯器。</p> "
--"<p>中間上方的部份是編輯區域，下方的部份則是檢查視窗，讓您可以試試您的正規表示式。那一排按鈕是編輯動作。實際上這跟常見的繪圖軟體滿類似的。選擇一個工具，開始編"
--"輯您的正規表示式，然後在您要插入的區域按下滑鼠按鍵。</p> "
--"<p>詳細的說明請參考<a href=\"doc://\">info pages</a></p> "
--"<h2>什麼是正規表示式？</h2>如果您不知道什麼是正規表示式，您可以去閱讀<a href=\"doc://whatIsARegExp\">"
--"正規表示式的介紹</a>。"
--"<p>"
-+"postcard ;-), also feel free to add a section saying <h2>Translators</h2>. "
-+"Kind regards, and thanks for your work - Jesper.\n"
-+"<h1>Regular Expression Editor</h1><p>What you are currently looking at is an "
-+"editor for <i>Regular Expressions</i>.</p><p>The upper part in the middle is "
-+"the editing area, the lower part is a verification window where you can try "
-+"your regular expressions right away. The row of buttons is the editing "
-+"actions. This is actually very similar to common drawing programs. Select an "
-+"editing tool to start editing your regular expression, and press the mouse "
-+"button in the editing area where you want this item inserted.</p><p>For a "
-+"more detailed description of this editor see the <a href=\"doc://\">info "
-+"pages</a></p><h2>What is a regular expression?</h2>If you do not know what a "
-+"regular expression is, then it might be a good idea to read <a href=\"doc://"
-+"whatIsARegExp\">the introduction to regular expressions</a>.<p>"
-+msgstr ""
-+"<h1>正規表示式編輯器</h1> <p>您現在看的是一個<i>正規表示式</i>的編輯器。</p> "
-+"<p>中間上方的部份是編輯區域，下方的部份則是檢查視窗，讓您可以試試您的正規表示"
-+"式。那一排按鈕是編輯動作。實際上這跟常見的繪圖軟體滿類似的。選擇一個工具，開"
-+"始編輯您的正規表示式，然後在您要插入的區域按下滑鼠按鍵。</p> <p>詳細的說明請"
-+"參考<a href=\"doc://\">info pages</a></p> <h2>什麼是正規表示式？</h2>如果您不"
-+"知道什麼是正規表示式，您可以去閱讀<a href=\"doc://whatIsARegExp\">正規表示式"
-+"的介紹</a>。<p>"
- 
- #: infopage.cpp:53
- msgid ""
- "<h2>Send the author an electronic postcard</h2>I don't get any money for "
--"working on KRegExpEditor, I therefore appreciate it very much when users tell "
--"me what they think about my work. I would therefore be very happy if you <a "
--"href=\"mailto:blackie@kde.org?subject=KRegExpEditor\">sent me a short mail</a>"
--", telling me that you use my regular expression editor."
--"<h2>Author</h2><a href=\"http://www.blackie.dk/\">Jesper K. Pedersen</a> "
--"&lt;<a href=\"mailto:blackie@kde.org\">blackie@kde.org</a>&gt;"
--msgstr ""
--"<h2>送電子信件給作者</h2>我寫 KRegExpEditor 並沒有收取任何費用，因此我很希望使用者告訴我他們的想法為何。如果您願意<a "
--"href=\"mailto:blackie@kde.org?subject=KRegExpEditor\">寫信給我</a>"
--"，告訴我您使用我的正規表示式編輯器的想法，我會很高興。 "
--"<h2>作者</h2><a href=\"http://www.blackie.dk/\">Jesper K. Pedersen</a> "
--"&lt;<a href=\"mailto:blackie@kde.org\">blackie@kde.org</a>&gt;"
-+"working on KRegExpEditor, I therefore appreciate it very much when users "
-+"tell me what they think about my work. I would therefore be very happy if "
-+"you <a href=\"mailto:blackie@kde.org?subject=KRegExpEditor\">sent me a short "
-+"mail</a>, telling me that you use my regular expression editor.<h2>Author</"
-+"h2><a href=\"http://www.blackie.dk/\">Jesper K. Pedersen</a> &lt;<a href="
-+"\"mailto:blackie@kde.org\">blackie@kde.org</a>&gt;"
-+msgstr ""
-+"<h2>送電子信件給作者</h2>我寫 KRegExpEditor 並沒有收取任何費用，因此我很希望"
-+"使用者告訴我他們的想法為何。如果您願意<a href=\"mailto:blackie@kde.org?"
-+"subject=KRegExpEditor\">寫信給我</a>，告訴我您使用我的正規表示式編輯器的想"
-+"法，我會很高興。 <h2>作者</h2><a href=\"http://www.blackie.dk/\">Jesper K. "
-+"Pedersen</a> &lt;<a href=\"mailto:blackie@kde.org\">blackie@kde.org</a>&gt;"
- 
- #: kregexpeditorgui.cpp:72
- msgid "Regular Expression Editor"
-@@ -334,30 +317,33 @@
- #: kregexpeditorprivate.cpp:66
- msgid ""
- "In this window you will find predefined regular expressions. Both regular "
--"expressions you have developed and saved, and regular expressions shipped with "
--"the system."
--msgstr "這個視窗中您會找到預先定義好的正規表示式，包括您之前發展與儲存的，還有系統本身的。"
-+"expressions you have developed and saved, and regular expressions shipped "
-+"with the system."
-+msgstr ""
-+"這個視窗中您會找到預先定義好的正規表示式，包括您之前發展與儲存的，還有系統本"
-+"身的。"
- 
- #: kregexpeditorprivate.cpp:74
- msgid ""
- "In this window you will develop your regular expressions. Select one of the "
- "actions from the action buttons above, and click the mouse in this window to "
- "insert the given action."
--msgstr "這個視窗讓您發展您自己的正規表示式。請在上面的動作按鈕中選取動作，再按下滑鼠加入。"
-+msgstr ""
-+"這個視窗讓您發展您自己的正規表示式。請在上面的動作按鈕中選取動作，再按下滑鼠"
-+"加入。"
- 
- #: kregexpeditorprivate.cpp:81
- msgid ""
--"Type in some text in this window, and see what the regular expression you have "
--"developed matches."
--"<p>Each second match will be colored in red and each other match will be "
--"colored blue, simply so you can distinguish them from each other."
--"<p>If you select part of the regular expression in the editor window, then this "
--"part will be highlighted - This allows you to <i>debug</i> "
-+"Type in some text in this window, and see what the regular expression you "
-+"have developed matches.<p>Each second match will be colored in red and each "
-+"other match will be colored blue, simply so you can distinguish them from "
-+"each other.<p>If you select part of the regular expression in the editor "
-+"window, then this part will be highlighted - This allows you to <i>debug</i> "
- "your regular expressions"
- msgstr ""
--"在此視窗中輸入一些文字，再看看您的正規表示式是否符合。 "
--"<p>second match 會被標為紅色，其他的會標為藍色，讓您可以分辨出來。</p> "
--"<p>如果您在編輯視窗中選取部份的表示式，則這部份會被標記高亮度，方便您除錯。"
-+"在此視窗中輸入一些文字，再看看您的正規表示式是否符合。 <p>second match 會被標"
-+"為紅色，其他的會標為藍色，讓您可以分辨出來。</p> <p>如果您在編輯視窗中選取部"
-+"份的表示式，則這部份會被標記高亮度，方便您除錯。"
- 
- #: kregexpeditorprivate.cpp:158
- msgid "ASCII syntax:"
-@@ -371,12 +357,13 @@
- msgid ""
- "This is the regular expression in ASCII syntax. You are likely only to be "
- "interested in this if you are a programmer, and need to develop a regular "
--"expression using QRegExp."
--"<p>You may develop your regular expression both by using the graphical editor, "
--"and by typing the regular expression in this line edit."
--msgstr ""
--"這是用 ASCII 語法的正規表示式。通常對程式設計師有用，例如要用 QRegExp 指定正規表示式的時候。 "
--"<p>您可以用圖形編輯器來發展您的正規表示式，或是將表示式輸入到這一行中。"
-+"expression using QRegExp.<p>You may develop your regular expression both by "
-+"using the graphical editor, and by typing the regular expression in this "
-+"line edit."
-+msgstr ""
-+"這是用 ASCII 語法的正規表示式。通常對程式設計師有用，例如要用 QRegExp 指定正"
-+"規表示式的時候。 <p>您可以用圖形編輯器來發展您的正規表示式，或是將表示式輸入"
-+"到這一列中。"
- 
- #: kregexpeditorprivate.cpp:374
- msgid "Could not open file '%1' for reading"
-@@ -420,16 +407,17 @@
- 
- #: regexpbuttons.cpp:67
- msgid ""
--"<qt>This will change the state of the editor to <i>selection state</i>."
--"<p>In this state you will not be inserting <i>regexp items</i>"
--", but instead select them. To select a number of items, press down the left "
--"mouse button and drag it over the items."
--"<p>When you have selected a number of items, you may use cut/copy/paste. These "
--"functions are found in the right mouse button menu.</qt>"
--msgstr ""
--"<qt>這會將編輯器的狀態改變為<i>選擇狀態</i>。 "
--"<p>這個狀態下您不能插入正規表示項目，但是可以用選的。要選擇多個項目時，按下左鍵並把它拖曳到您要選的項目上。 "
--"<p>當您選了多個項目之後，您可以用剪下/複製/貼上等功能。按下右鍵就可以看到目錄選單。</qt>"
-+"<qt>This will change the state of the editor to <i>selection state</i>.<p>In "
-+"this state you will not be inserting <i>regexp items</i>, but instead select "
-+"them. To select a number of items, press down the left mouse button and drag "
-+"it over the items.<p>When you have selected a number of items, you may use "
-+"cut/copy/paste. These functions are found in the right mouse button menu.</"
-+"qt>"
-+msgstr ""
-+"<qt>這會將編輯器的狀態改變為<i>選擇狀態</i>。 <p>這個狀態下您不能插入正規表示"
-+"項目，但是可以用選的。要選擇多個項目時，按下左鍵並把它拖曳到您要選的項目上。 "
-+"<p>當您選了多個項目之後，您可以用剪下/複製/貼上等功能。按下右鍵就可以看到目錄"
-+"選單。</qt>"
- 
- #: regexpbuttons.cpp:76
- msgid "Text"
-@@ -437,9 +425,12 @@
- 
- #: regexpbuttons.cpp:77
- msgid ""
--"<qt>This will insert a text field, where you may write text. The text you write "
--"will be matched literally. (i.e. you do not need to escape any characters)</qt>"
--msgstr "<qt>這將會在這插入一個文字欄位。你所輸入的文字將會被逐字匹配。 (你不需要跳脫字元)</qt>"
-+"<qt>This will insert a text field, where you may write text. The text you "
-+"write will be matched literally. (i.e. you do not need to escape any "
-+"characters)</qt>"
-+msgstr ""
-+"<qt>這將會在這插入一個文字欄位。你所輸入的文字將會被逐字匹配。 (你不需要跳脫"
-+"字元)</qt>"
- 
- #: regexpbuttons.cpp:82
- msgid "A single character specified in a range"
-@@ -447,12 +438,12 @@
- 
- #: regexpbuttons.cpp:83
- msgid ""
--"<qt>This will match a single character from a predefined range."
--"<p>When you insert this widget a dialog box will appear, which lets you specify "
--"which characters this <i>regexp item</i> will match.</qt>"
-+"<qt>This will match a single character from a predefined range.<p>When you "
-+"insert this widget a dialog box will appear, which lets you specify which "
-+"characters this <i>regexp item</i> will match.</qt>"
- msgstr ""
--"<qt>這將會符合預先定義好的範圍內的單一字元。 "
--"<p>當您插入此元件時，會有一個對話盒出現，讓您指定這個<i>正規表示項目</i>中要符合哪些字元。</qt>"
-+"<qt>這將會符合預先定義好的範圍內的單一字元。 <p>當您插入此元件時，會有一個對"
-+"話盒出現，讓您指定這個<i>正規表示項目</i>中要符合哪些字元。</qt>"
- 
- #: regexpbuttons.cpp:89
- msgid "Any character"
-@@ -468,29 +459,28 @@
- 
- #: regexpbuttons.cpp:95
- msgid ""
--"<qt>This <i>regexp item</i> will repeat the <i>regexp items</i> "
--"it surrounds a specified number of times."
--"<p>The number of times to repeat may be specified using ranges. e.g. You may "
--"specify that it should match from 2 to 4 times, that it should match exactly 5 "
--"times, or that it should match at least one time."
--"<p>Examples:"
--"<br>If you specify that it should match <i>any</i> time, and the content it "
--"surrounds is <tt>abc</tt>, then this <i>regexp item</i> "
--"will match the empty string, the string <tt>abc</tt>, the string <tt>abcabc</tt>"
--", the string <tt>abcabcabcabc</tt>, etc.</qt>"
--msgstr ""
--"<qt><i>正規表示項目</i>會重複它所包起來的其它項目數次。 "
--"<p>重複的次數可以用範圍來表示，例如重複二到四次，或是重複五次，或是至少一次等等。 "
--"<p>範例: "
--"<br>如果您指定要符合<i>任意</i>次數，內容包括<tt>abc</tt>，則包括空字串、<tt>abc</tt>、<tt>abcabc</tt>"
--"等字串都可以符合此項目。"
-+"<qt>This <i>regexp item</i> will repeat the <i>regexp items</i> it surrounds "
-+"a specified number of times.<p>The number of times to repeat may be "
-+"specified using ranges. e.g. You may specify that it should match from 2 to "
-+"4 times, that it should match exactly 5 times, or that it should match at "
-+"least one time.<p>Examples:<br>If you specify that it should match <i>any</"
-+"i> time, and the content it surrounds is <tt>abc</tt>, then this <i>regexp "
-+"item</i> will match the empty string, the string <tt>abc</tt>, the string "
-+"<tt>abcabc</tt>, the string <tt>abcabcabcabc</tt>, etc.</qt>"
-+msgstr ""
-+"<qt><i>正規表示項目</i>會重複它所包起來的其它項目數次。 <p>重複的次數可以用範"
-+"圍來表示，例如重複二到四次，或是重複五次，或是至少一次等等。 <p>範例: <br>如"
-+"果您指定要符合<i>任意</i>次數，內容包括<tt>abc</tt>，則包括空字串、<tt>abc</"
-+"tt>、<tt>abcabc</tt>等字串都可以符合此項目。"
- 
- #: regexpbuttons.cpp:109
- msgid ""
--"<qt>This <i>regexp item</i> will match any of its alternatives.</p>"
--"You specify alternatives by placing <i>regexp items</i> "
--"on top of each other inside this widget.</qt>"
--msgstr "<qt>這個正規表示項目會符合任何替代選擇。</p> 您可以指定替代選擇，只要將上面的項目放進此元件中。</qt>"
-+"<qt>This <i>regexp item</i> will match any of its alternatives.</p>You "
-+"specify alternatives by placing <i>regexp items</i> on top of each other "
-+"inside this widget.</qt>"
-+msgstr ""
-+"<qt>這個正規表示項目會符合任何替代選擇。</p> 您可以指定替代選擇，只要將上面的"
-+"項目放進此元件中。</qt>"
- 
- #: regexpbuttons.cpp:115
- msgid "Compound regexp"
-@@ -498,17 +488,15 @@
- 
- #: regexpbuttons.cpp:116
- msgid ""
--"<qt>This <i>regexp item</i> serves two purposes:"
--"<ul>"
--"<li>It makes it possible for you to collapse a huge <i>regexp item</i> "
--"into a small box. This makes it easier for you to get an overview of large <i>"
--"regexp items</i>. This is especially useful if you load a predefined <i>"
--"regexp item</i> you perhaps don't care about the inner workings of."
--msgstr ""
--"<qt>這個項目包括兩個目的： "
--"<ul> "
--"<li>讓您可以將一個巨大的正規表示項目拆解進小盒子內，方便您對這個大的項目有點概念。尤其在您載入一個預先定義好的正規表示項目，而您並不想真的去解析其內容時特別"
--"有用。"
-+"<qt>This <i>regexp item</i> serves two purposes:<ul><li>It makes it possible "
-+"for you to collapse a huge <i>regexp item</i> into a small box. This makes "
-+"it easier for you to get an overview of large <i>regexp items</i>. This is "
-+"especially useful if you load a predefined <i>regexp item</i> you perhaps "
-+"don't care about the inner workings of."
-+msgstr ""
-+"<qt>這個項目包括兩個目的： <ul> <li>讓您可以將一個巨大的正規表示項目拆解進小"
-+"盒子內，方便您對這個大的項目有點概念。尤其在您載入一個預先定義好的正規表示項"
-+"目，而您並不想真的去解析其內容時特別有用。"
- 
- #: regexpbuttons.cpp:124
- msgid "Beginning of line"
-@@ -534,7 +522,8 @@
- msgid ""
- "<qt>This asserts a word boundary (This part does not actually match any "
- "characters)</qt>"
--msgstr "<qt>這個會插入一個文字邊界(word boundary)，這部份將不會符合任何字元。</qt>"
-+msgstr ""
-+"<qt>這個會插入一個文字邊界(word boundary)，這部份將不會符合任何字元。</qt>"
- 
- #: regexpbuttons.cpp:138
- msgid "Non Word boundary"
-@@ -544,7 +533,9 @@
- msgid ""
- "<qt>This asserts a non-word boundary (This part does not actually match any "
- "characters)</qt>"
--msgstr "<qt>這個會插入一個非文字邊界(non word boundary)，這部份將不會符合任何字元。</qt>"
-+msgstr ""
-+"<qt>這個會插入一個非文字邊界(non word boundary)，這部份將不會符合任何字元。</"
-+"qt>"
- 
- #: regexpbuttons.cpp:143
- msgid "Positive Look Ahead"
-@@ -554,7 +545,9 @@
- msgid ""
- "<qt>This asserts a regular expression (This part does not actually match any "
- "characters). You can only use this at the end of a regular expression.</qt>"
--msgstr "<qt>這會插入一個正規表示項目(這部份不會真的符合任何字元)。您只能在表示式的最後面使用它。</qt>"
-+msgstr ""
-+"<qt>這會插入一個正規表示項目(這部份不會真的符合任何字元)。您只能在表示式的最"
-+"後面使用它。</qt>"
- 
- #: regexpbuttons.cpp:148
- msgid "Negative Look Ahead"
-@@ -562,16 +555,20 @@
- 
- #: regexpbuttons.cpp:149
- msgid ""
--"<qt>This asserts a regular expression that must not match (This part does not "
--"actually match any characters). You can only use this at the end of a regular "
--"expression.</qt>"
--msgstr "<qt>這會插入一個正規表示項目，表示不能符合此字元。您只能在表示式的最後面使用它。</qt>"
-+"<qt>This asserts a regular expression that must not match (This part does "
-+"not actually match any characters). You can only use this at the end of a "
-+"regular expression.</qt>"
-+msgstr ""
-+"<qt>這會插入一個正規表示項目，表示不能符合此字元。您只能在表示式的最後面使用"
-+"它。</qt>"
- 
- #: repeatregexp.cpp:59 repeatregexp.cpp:67
- msgid ""
--"<p>Value for attribute <b>%1</b> was not an integer for element <b>%2</b></p>"
--"<p>It contained the value <b>%3</b></p>"
--msgstr "<p>元素<b>%2</b>屬性的值<b>%1</b>並不是一個整數</p><p>它所包含的值是<b>%3</b></p>"
-+"<p>Value for attribute <b>%1</b> was not an integer for element <b>%2</b></"
-+"p><p>It contained the value <b>%3</b></p>"
-+msgstr ""
-+"<p>元素<b>%2</b>屬性的值<b>%1</b>並不是一個整數</p><p>它所包含的值是<b>%3</"
-+"b></p>"
- 
- #: repeatregexp.cpp:62 repeatregexp.cpp:70 textrangeregexp.cpp:131
- #: textregexp.cpp:58 widgetfactory.cpp:166 widgetfactory.cpp:195
-@@ -676,7 +673,7 @@
- 
- #: userdefinedregexps.cpp:157
- msgid "Rename..."
--msgstr "重新命名..."
-+msgstr "重新命名…"
- 
- #: userdefinedregexps.cpp:193
- msgid "New name:"
-@@ -700,9 +697,10 @@
- 
- #: verifybuttons.cpp:51
- msgid ""
--"Shows what part of the regular expression is being matched in the <i>"
--"verifier window</i>.(The window below the graphical editor window)."
--msgstr "顯示正規表示式中哪一部份符合 <i>檢查視窗</i>。（在圖形編輯器視窗下的視窗）"
-+"Shows what part of the regular expression is being matched in the "
-+"<i>verifier window</i>.(The window below the graphical editor window)."
-+msgstr ""
-+"顯示正規表示式中哪一部份符合 <i>檢查視窗</i>。（在圖形編輯器視窗下的視窗）"
- 
- #: verifybuttons.cpp:60
- msgid "Load text in the verifier window"
-@@ -722,10 +720,12 @@
- 
- #: verifybuttons.cpp:124
- msgid ""
--"Enabling this option will make the verifier update for each edit. If the verify "
--"window contains much text, or if the regular expression is either complex or "
--"matches a lot of time, this may be very slow."
--msgstr "開啟這個選項會讓檢查視窗在編輯後立即做檢查。如果檢查視窗內的文字太多，或是正規表示式很複雜，或是符合太多東西，這樣會變得很慢。"
-+"Enabling this option will make the verifier update for each edit. If the "
-+"verify window contains much text, or if the regular expression is either "
-+"complex or matches a lot of time, this may be very slow."
-+msgstr ""
-+"開啟這個選項會讓檢查視窗在編輯後立即做檢查。如果檢查視窗內的文字太多，或是正"
-+"規表示式很複雜，或是符合太多東西，這樣會變得很慢。"
- 
- #: verifybuttons.cpp:130
- msgid "RegExp Language"
-@@ -753,7 +753,8 @@
- msgid ""
- "<p>Error while reading XML file. The element just below the tag <b>%1</b> "
- "was not an element.</p>"
--msgstr "<p>讀取XML檔時發生錯誤。此元素正好在標籤<b>%1</b>之下但並不是一個元素。</p>"
-+msgstr ""
-+"<p>讀取XML檔時發生錯誤。此元素正好在標籤<b>%1</b>之下但並不是一個元素。</p>"
- 
- #: zerowidgets.cpp:75
- msgid ""
-diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdeutils/ksim.po kde-i18n-zh_TW-3.5.10/messages/kdeutils/ksim.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdeutils/ksim.po	2007-07-12 10:27:45.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdeutils/ksim.po	2011-11-11 15:45:17.000000000 +0100
-@@ -6,8 +6,7 @@
- "Project-Id-Version: ksim\n"
- "POT-Creation-Date: 2007-05-28 02:15+0200\n"
- "PO-Revision-Date: 2006-02-13 12:02+0800\n"
--"Last-Translator: Frank Weng (a.k.a. Franklin) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Traditional Chinese <zh_l10n@linux.org.tw>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
-@@ -32,22 +31,24 @@
- 
- #: library/pluginloader.cpp:93
- msgid ""
--"KSim was unable to load the plugin %1 due to the X-KSIM-LIBRARY property being "
--"empty in the plugins desktop file"
--msgstr "KSim 無法載入外掛程式 %1，因為外掛桌面檔案中的 X-KSIM-LIBRARY 屬性是空的。"
-+"KSim was unable to load the plugin %1 due to the X-KSIM-LIBRARY property "
-+"being empty in the plugins desktop file"
-+msgstr ""
-+"KSim 無法載入外掛程式 %1，因為外掛桌面檔案中的 X-KSIM-LIBRARY 屬性是空的。"
- 
- #: library/pluginloader.cpp:99
- msgid ""
--"KSim was unable to load the plugin %1 due to not being able to find the plugin, "
--"check that the plugin is installed and is in your $KDEDIR/lib path"
--msgstr "KSim 無法載入外掛程式 %1，因為找不到外掛程式。請確認外掛程式有安裝，並且在 $KDEDIR/lib 中。"
-+"KSim was unable to load the plugin %1 due to not being able to find the "
-+"plugin, check that the plugin is installed and is in your $KDEDIR/lib path"
-+msgstr ""
-+"KSim 無法載入外掛程式 %1，因為找不到外掛程式。請確認外掛程式有安裝，並且在 "
-+"$KDEDIR/lib 中。"
- 
- #: library/pluginloader.cpp:105
- msgid ""
- "<qt>An error occurred while trying \n"
- "to load the plugin '%1'. \n"
--"This could be caused by the following:"
--"<ul>\n"
-+"This could be caused by the following:<ul>\n"
- "<li>The plugin doesn't have the %2 macro</li>\n"
- "<li>The plugin has been damaged or has some unresolved symbols</li>\n"
- "</ul> \n"
-@@ -55,8 +56,7 @@
- "%3</qt>"
- msgstr ""
- "<qt>試著載入外掛程式 %1 時發生錯誤。\n"
--"這可能是以下原因引起："
--"<ul>\n"
-+"這可能是以下原因引起：<ul>\n"
- "<li>外掛程式中沒有 %2 巨集。</li>\n"
- "<li>外掛程式已損毀，或是含有未定義的符號。</li>\n"
- "</ul>\n"
-@@ -157,11 +157,11 @@
- 
- #: ksimpref.cpp:89
- msgid "Themes"
--msgstr "佈景主題"
-+msgstr "布景主題"
- 
- #: ksimpref.cpp:90
- msgid "Theme Selector"
--msgstr "選擇佈景主題"
-+msgstr "選擇布景主題"
- 
- #: ksimpref.cpp:124
- msgid ""
-@@ -171,8 +171,8 @@
- 
- #: ksimpref.cpp:149
- msgid ""
--"Failed to add %1's config page due to the plugin not being loaded or the config "
--"page has not been created"
-+"Failed to add %1's config page due to the plugin not being loaded or the "
-+"config page has not been created"
- msgstr "無法新增 %1 設定頁，因為外掛程式未載入，或是此設定頁並未被產生。"
- 
- #: ksimpref.cpp:159
-@@ -209,7 +209,7 @@
- #: monitors/cpu/ksimcpu.cpp:388 monitors/lm_sensors/sensorsconfig.cpp:80
- #: monitors/net/netconfig.cpp:72
- msgid "Modify..."
--msgstr "變更..."
-+msgstr "變更…"
- 
- #: monitors/cpu/ksimcpu.cpp:395
- msgid "Chart Legend"
-@@ -348,7 +348,7 @@
- 
- #: monitors/disk/ksimdisk.cpp:493 monitors/net/netconfig.cpp:67
- msgid "Add..."
--msgstr "新增..."
-+msgstr "新增…"
- 
- #: monitors/net/netconfig.cpp:146 monitors/net/netconfig.cpp:151
- msgid "&Add Net Device"
-@@ -364,11 +364,11 @@
- 
- #: monitors/net/netconfig.cpp:152
- msgid "&Modify..."
--msgstr "變更(&M)..."
-+msgstr "變更(&M)…"
- 
- #: monitors/net/netconfig.cpp:153
- msgid "&Remove..."
--msgstr "移除(&R)..."
-+msgstr "移除(&R)…"
- 
- #: monitors/net/netconfig.cpp:219
- msgid "Are you sure you want to remove the net interface '%1'?"
-@@ -477,7 +477,7 @@
- 
- #: monitors/snmp/probedialog.cpp:45
- msgid "Probing for common object identifiers..."
--msgstr "偵測共同物件代碼(common object identifier)..."
-+msgstr "偵測共同物件代碼(common object identifier)…"
- 
- #: monitors/snmp/monitordialog.cpp:92
- msgid "Please enter a name for this monitor"
-@@ -592,8 +592,8 @@
- 
- #: monitors/filesystem/fsystemconfig.cpp:67
- msgid ""
--"This option shortens the text to shrink down a mount point. E.G: a mount point "
--"/home/myuser would become myuser."
-+"This option shortens the text to shrink down a mount point. E.G: a mount "
-+"point /home/myuser would become myuser."
- msgstr "這個選項會簡化掛載點名稱。例如 /home/myuser 會變成 myuser。"
- 
- #: monitors/filesystem/fsystemconfig.cpp:80
-@@ -628,11 +628,12 @@
- msgid ""
- "GKrellm theme support. To use gkrellm themes just untar the themes into the "
- "folder below"
--msgstr "支援 GKrellm 佈景主題。要使用 gkrellm 佈景主題，只要 untar 到以下資料夾"
-+msgstr ""
-+"支援 GKrellm 布景主題。要使用 gkrellm 布景主題，只要 untar 到以下資料夾"
- 
- #: themeprefs.cpp:78
- msgid "Open Konqueror in KSim's theme folder"
--msgstr "在 KSim 的佈景資料夾中開啟 Konqueror"
-+msgstr "在 KSim 的布景資料夾中開啟 Konqueror"
- 
- #: themeprefs.cpp:90
- msgid "Author:"
-@@ -640,11 +641,11 @@
- 
- #: themeprefs.cpp:100
- msgid "Theme"
--msgstr "佈景主題"
-+msgstr "布景主題"
- 
- #: themeprefs.cpp:107
- msgid "Alternate themes:"
--msgstr "變更佈景主題："
-+msgstr "變更布景主題："
- 
- #: themeprefs.cpp:115
- msgid "Font:"
-@@ -738,7 +739,7 @@
- 
- #: generalprefs.cpp:97
- msgid "Recolor themes to the current color scheme"
--msgstr "在目前的佈景主題上重新著色"
-+msgstr "在目前的布景主題上重新著色"
- 
- #: generalprefs.cpp:131
- msgid "Show time"
-diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdeutils/ktimer.po kde-i18n-zh_TW-3.5.10/messages/kdeutils/ktimer.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdeutils/ktimer.po	2006-07-22 10:03:58.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdeutils/ktimer.po	2011-11-11 15:45:17.000000000 +0100
-@@ -7,7 +7,7 @@
- "Project-Id-Version: ktimer\n"
- "POT-Creation-Date: 2004-10-12 01:17+0200\n"
- "PO-Revision-Date: 2001-09-02 06:38-0500\n"
--"Last-Translator: Wei-Chih Lin <wlin5@pop3.utoledo.edu>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: zh-l10n <zh-l10n@linux.org.tw>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
-@@ -124,4 +124,4 @@
- msgstr "等於 ="
- 
- #~ msgid "..."
--#~ msgstr "..."
-+#~ msgstr "…"
-diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdeutils/kwalletmanager.po kde-i18n-zh_TW-3.5.10/messages/kdeutils/kwalletmanager.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdeutils/kwalletmanager.po	2008-08-19 20:43:07.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdeutils/kwalletmanager.po	2011-11-11 15:45:17.000000000 +0100
-@@ -6,8 +6,7 @@
- "Project-Id-Version: kwalletmanager\n"
- "POT-Creation-Date: 2008-07-08 01:20+0200\n"
- "PO-Revision-Date: 2006-07-28 16:12+0800\n"
--"Last-Translator: Frank Weng (a.k.a. Franklin) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Chinese Traditional <zh-l10n@linux.org.tw>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
-@@ -62,7 +61,7 @@
- 
- #: kwalleteditor.cpp:161
- msgid "&New Folder..."
--msgstr "新資料夾(&N)..."
-+msgstr "新資料夾(&N)…"
- 
- #: kwalleteditor.cpp:167
- msgid "&Delete Folder"
-@@ -70,23 +69,24 @@
- 
- #: kwalleteditor.cpp:175 kwalletpopup.cpp:45
- msgid "Change &Password..."
--msgstr "變更密碼(&P)..."
-+msgstr "變更密碼(&P)…"
- 
- #: kwalleteditor.cpp:181
- msgid "&Merge Wallet..."
--msgstr "合併錢包(&M)..."
-+msgstr "合併錢包(&M)…"
- 
- #: kwalleteditor.cpp:187
- msgid "&Import XML..."
--msgstr "匯入 XML(&I)..."
-+msgstr "匯入 XML(&I)…"
- 
- #: kwalleteditor.cpp:193
- msgid "&Export..."
--msgstr "匯出(&E)..."
-+msgstr "匯出(&E)…"
- 
- #: kwalleteditor.cpp:219
- msgid ""
--"This wallet was forced closed.  You must reopen it to continue working with it."
-+"This wallet was forced closed.  You must reopen it to continue working with "
-+"it."
- msgstr "錢包已被迫關閉。您要繼續使用的話必須重新打開。"
- 
- #: kwalleteditor.cpp:254
-@@ -155,7 +155,7 @@
- 
- #: kwalleteditor.cpp:588 kwalleteditor.cpp:598
- msgid "&New..."
--msgstr "新增(&N)..."
-+msgstr "新增(&N)…"
- 
- #: kwalleteditor.cpp:589
- msgid "&Rename"
-@@ -200,8 +200,8 @@
- #: kwalleteditor.cpp:850 kwalleteditor.cpp:880 kwalleteditor.cpp:910
- #: kwalleteditor.cpp:1001
- msgid ""
--"Folder '<b>%1</b>' already contains an entry '<b>%2</b>"
--"'.  Do you wish to replace it?"
-+"Folder '<b>%1</b>' already contains an entry '<b>%2</b>'.  Do you wish to "
-+"replace it?"
- msgstr "資料夾 <b>%1</b> 已經有一個叫 <b>%2</b> 的項目了。您要取代它嗎？"
- 
- #: kwalleteditor.cpp:949
-@@ -238,11 +238,11 @@
- 
- #: kwalletmanager.cpp:115 kwalletpopup.cpp:37
- msgid "&New Wallet..."
--msgstr "新的錢包(&N)..."
-+msgstr "新的錢包(&N)…"
- 
- #: kwalletmanager.cpp:118
- msgid "Configure &Wallet..."
--msgstr "設定錢包(&W)..."
-+msgstr "設定錢包(&W)…"
- 
- #: kwalletmanager.cpp:124
- msgid "Close &All Wallets"
-@@ -259,8 +259,8 @@
- 
- #: kwalletmanager.cpp:238
- msgid ""
--"Unable to close wallet cleanly. It is probably in use by other applications. Do "
--"you wish to force it closed?"
-+"Unable to close wallet cleanly. It is probably in use by other applications. "
-+"Do you wish to force it closed?"
- msgstr "無法完全關閉錢包。也許有別的應用程式正在使用。您要強迫它關閉嗎？"
- 
- #: kwalletmanager.cpp:238
-@@ -383,8 +383,8 @@
- #: rc.cpp:39
- #, no-c-format
- msgid ""
--"This is a binary data entry.  It cannot be editted as its format is unknown and "
--"application specific."
-+"This is a binary data entry.  It cannot be editted as its format is unknown "
-+"and application specific."
- msgstr "這是個格式未知的二進位資料的項目，因此找不到對應的應用程式來編輯。"
- 
- #. i18n: file walletwidget.ui line 398
-diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdeutils/superkaramba.po kde-i18n-zh_TW-3.5.10/messages/kdeutils/superkaramba.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdeutils/superkaramba.po	2008-08-19 20:43:07.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdeutils/superkaramba.po	2011-11-11 15:45:17.000000000 +0100
-@@ -6,8 +6,7 @@
- "Project-Id-Version: superkaramba\n"
- "POT-Creation-Date: 2008-07-08 01:20+0200\n"
- "PO-Revision-Date: 2006-02-13 10:46+0800\n"
--"Last-Translator: Frank Weng (a.k.a. Franklin) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Traditional Chinese <zh_l10n@linux.org.tw>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
-@@ -48,7 +47,7 @@
- 
- #: karamba.cpp:219
- msgid "Configure &Theme"
--msgstr "設定佈景主題(&T)"
-+msgstr "設定布景主題(&T)"
- 
- #: karamba.cpp:221
- msgid "To Des&ktop"
-@@ -56,11 +55,11 @@
- 
- #: karamba.cpp:223
- msgid "&Reload Theme"
--msgstr "重新載入佈景主題(&R)"
-+msgstr "重新載入布景主題(&R)"
- 
- #: karamba.cpp:225
- msgid "&Close This Theme"
--msgstr "關閉此佈景主題(&C)"
-+msgstr "關閉此布景主題(&C)"
- 
- #: karamba.cpp:2037
- msgid "Show System Tray Icon"
-@@ -68,7 +67,7 @@
- 
- #: karamba.cpp:2042
- msgid "&Manage Themes..."
--msgstr "管理佈景主題(&M)..."
-+msgstr "管理布景主題(&M)…"
- 
- #: karamba.cpp:2046
- msgid "&Quit SuperKaramba"
-@@ -87,13 +86,15 @@
- msgid ""
- "_n: 1 Running Theme:\n"
- "%n Running Themes:"
--msgstr "%n 個執行中的佈景主題："
-+msgstr "%n 個執行中的布景主題："
- 
- #: karambaapp.cpp:357
- msgid ""
--"<qt>Hiding the system tray icon will keep SuperKaramba running in background. "
--"To show it again use the theme menu.</qt>"
--msgstr "<qt>隱藏系統匣圖示時，SuperKaramba 還是會在背景中執行。要重新顯示系統匣圖示，請用佈景主題的選單。</qt>"
-+"<qt>Hiding the system tray icon will keep SuperKaramba running in "
-+"background. To show it again use the theme menu.</qt>"
-+msgstr ""
-+"<qt>隱藏系統匣圖示時，SuperKaramba 還是會在背景中執行。要重新顯示系統匣圖示，"
-+"請用布景主題的選單。</qt>"
- 
- #: karambaapp.cpp:359
- msgid "Hiding System Tray Icon"
-@@ -101,7 +102,7 @@
- 
- #: main.cpp:43 taskbartest.cpp:38
- msgid "A KDE Eye-candy Application"
--msgstr "KDE 管理佈景主題的應用程式"
-+msgstr "KDE 管理布景主題的應用程式"
- 
- #: main.cpp:51 taskbartest.cpp:45
- msgid "A required argument 'file'"
-@@ -117,7 +118,7 @@
- #: rc.cpp:6 rc.cpp:42
- #, no-c-format
- msgid "SuperKaramba Themes"
--msgstr "SuperKaramba 佈景主題"
-+msgstr "SuperKaramba 布景主題"
- 
- #. i18n: file themes_layout.ui line 41
- #: rc.cpp:9 rc.cpp:45
-@@ -177,7 +178,7 @@
- #: rc.cpp:39
- #, no-c-format
- msgid "Themes that user added to theme list."
--msgstr "使用者加入清單的佈景主題。"
-+msgstr "使用者加入清單的布景主題。"
- 
- #: taskbartest.cpp:53
- msgid "karamba"
-@@ -192,7 +193,9 @@
- "You are about to install and run %1 SuperKaramba theme. Since themes can "
- "contain executable code you should only install themes from sources that you "
- "trust. Continue?"
--msgstr "您要安裝並執行 %1 SuperKaramba 佈景主題。因為佈景主題中可能含有執行碼，您應該確認它的來源是您可以信任的。要繼續嗎？"
-+msgstr ""
-+"您要安裝並執行 %1 SuperKaramba 布景主題。因為布景主題中可能含有執行碼，您應該"
-+"確認它的來源是您可以信任的。要繼續嗎？"
- 
- #: themefile.cpp:215
- msgid "Executable Code Warning"
-@@ -216,23 +219,23 @@
- 
- #: themesdlg.cpp:131
- msgid "Get New Stuff"
--msgstr "取得新的佈景主題"
-+msgstr "取得新的布景主題"
- 
- #: themesdlg.cpp:132
- msgid "Download new themes."
--msgstr "下載新的佈景主題。"
-+msgstr "下載新的布景主題。"
- 
- #: themesdlg.cpp:134
- msgid "New Stuff..."
--msgstr "新的主題..."
-+msgstr "新的主題…"
- 
- #: themesdlg.cpp:147
- msgid "Open Local Theme"
--msgstr "開啟本地的佈景主題"
-+msgstr "開啟本地的布景主題"
- 
- #: themesdlg.cpp:148
- msgid "Add local theme to the list."
--msgstr "新增本地的佈景主題到清單中。"
-+msgstr "新增本地的布景主題到清單中。"
- 
- #: themesdlg.cpp:166 themesdlg.cpp:180 themesdlg.cpp:365
- msgid "Uninstall"
-@@ -240,11 +243,11 @@
- 
- #: themesdlg.cpp:207
- msgid "*.theme *.skz|Themes"
--msgstr "*.theme *.skz | 佈景主題檔"
-+msgstr "*.theme *.skz | 布景主題檔"
- 
- #: themesdlg.cpp:208
- msgid "Open Themes"
--msgstr "開啟佈景主題檔"
-+msgstr "開啟布景主題檔"
- 
- #: themewidget.cpp:78
- msgid "<p align=\"center\">%1 running</p>"
-diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdevelop/kdevdesigner.po kde-i18n-zh_TW-3.5.10/messages/kdevelop/kdevdesigner.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdevelop/kdevdesigner.po	2007-05-14 12:23:03.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdevelop/kdevdesigner.po	2011-11-11 15:45:17.000000000 +0100
-@@ -6,8 +6,7 @@
- "Project-Id-Version: kdevdesigner\n"
- "POT-Creation-Date: 2007-03-26 21:53+0200\n"
- "PO-Revision-Date: 2006-09-09 13:25+0800\n"
--"Last-Translator: Frank Weng (a.k.a. Franklin) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Chinese Traditional <zh-l10n@linux.org.tw>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
-@@ -52,7 +51,7 @@
- #: rc.cpp:15
- #, no-c-format
- msgid "&Layout"
--msgstr "佈局(&L)"
-+msgstr "布局(&L)"
- 
- #. i18n: file kdevdesigner_shell.rc line 21
- #: rc.cpp:18
-diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdevelop/kdevelop.po kde-i18n-zh_TW-3.5.10/messages/kdevelop/kdevelop.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdevelop/kdevelop.po	2008-08-19 20:43:15.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdevelop/kdevelop.po	2011-11-11 15:45:17.000000000 +0100
-@@ -1,7 +1,7 @@
- # translation of kdevelop.po to Chinese Traditional
- # Copyright (C) 2002,2003, 2004, 2006, 2007, 2008 Free Software Foundation, Inc.
- #
--# 繁體中文是由簡體中文翻譯轉換後修改而成，特此致謝。
-+# 傳統字漢語是由簡化字漢語翻譯轉換後修改而成，特此致謝。
- #
- # Qi Liang <cavendish@eyou.com>, 2001.
- # Xiong Jiang <jxiong@offtopic.org>, 2002,2003, 2004.
-@@ -15,7 +15,7 @@
- "Project-Id-Version: kdevelop\n"
- "POT-Creation-Date: 2008-08-01 01:17+0200\n"
- "PO-Revision-Date: 2008-07-22 17:49+0800\n"
--"Last-Translator: Franklin Weng <franklin@mail.everfocus.com.tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Chinese Traditional <zh@li.org>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
-@@ -143,7 +143,7 @@
- #: kdevdesigner/designer/multilineeditorimpl.cpp:130 rc.cpp:252 rc.cpp:285
- #, no-c-format
- msgid "&Layout"
--msgstr "佈局(&L)"
-+msgstr "布局(&L)"
- 
- #. i18n: file ./kdevdesigner/designer/kdevdesigner_part_sh.rc line 81
- #: rc.cpp:261 rc.cpp:294
-@@ -161,7 +161,7 @@
- #: rc.cpp:267 rc.cpp:303
- #, no-c-format
- msgid "Layout Toolbar"
--msgstr "佈局工具列"
-+msgstr "布局工具列"
- 
- #. i18n: file ./languages/ada/configproblemreporter.ui line 24
- #: rc.cpp:309 rc.cpp:1875 rc.cpp:2083
-@@ -248,13 +248,13 @@
- #: rc.cpp:8527
- #, no-c-format
- msgid "..."
--msgstr "..."
-+msgstr "…"
- 
- #. i18n: file ./languages/ada/addclassdlg.ui line 202
- #: rc.cpp:348
- #, no-c-format
- msgid "&Source path:"
--msgstr "源碼路徑(&S)："
-+msgstr "原始碼路徑(&S)："
- 
- #. i18n: file ./languages/ada/addclassdlg.ui line 227
- #: rc.cpp:354
-@@ -470,11 +470,12 @@
- msgid ""
- "Insert the base class which your new class will be derived from. If you have "
- "checked 'Generate QWidget child class' the new class will be derived from "
--"QWidget. If no base class is named, the new class will not have a parent class. "
--"You can also use template classes here (like BaseClass<int, int>)"
-+"QWidget. If no base class is named, the new class will not have a parent "
-+"class. You can also use template classes here (like BaseClass<int, int>)"
- msgstr ""
--"在此插入您的新類別要從哪個基礎類別衍生出來。如果您勾選了「產生 QWidget 子類別」，則新的類別就會由 QWidget "
--"衍生。如果沒有指定基礎類別，新的類別就不會有父類別。您也可以在此使用樣本類別（例如 BaseClass<int, int>）。"
-+"在此插入您的新類別要從哪個基礎類別衍生出來。如果您勾選了「產生 QWidget 子類"
-+"別」，則新的類別就會由 QWidget 衍生。如果沒有指定基礎類別，新的類別就不會有父"
-+"類別。您也可以在此使用樣本類別（例如 BaseClass<int, int>）。"
- 
- #. i18n: file ./languages/cpp/cppnewclassdlgbase.ui line 458
- #: languages/ruby/debugger/variablewidget.cpp:834
-@@ -584,7 +585,7 @@
- #: rc.cpp:523
- #, no-c-format
- msgid "&Source"
--msgstr "源碼(&S)"
-+msgstr "原始碼(&S)"
- 
- #. i18n: file ./languages/cpp/cppnewclassdlgbase.ui line 794
- #: rc.cpp:526
-@@ -654,7 +655,8 @@
- msgid ""
- "If this is checked the get method will be created inline; otherwise, it will "
- "not."
--msgstr "如果勾選此選項，會產生內含式（inline）的 get 方法。反之就不會是內含式。"
-+msgstr ""
-+"如果勾選此選項，會產生內含式（inline）的 get 方法。反之就不會是內含式。"
- 
- #. i18n: file ./languages/cpp/creategettersetter.ui line 61
- #: rc.cpp:565
-@@ -734,7 +736,8 @@
- msgid ""
- "If this is checked the set method will be created inline; otherwise, it will "
- "not."
--msgstr "如果勾選此選項，會產生內含式（inline）的 set 方法。反之就不會是內含式。"
-+msgstr ""
-+"如果勾選此選項，會產生內含式（inline）的 set 方法。反之就不會是內含式。"
- 
- #. i18n: file ./languages/cpp/createpcsdialogbase.ui line 16
- #: rc.cpp:610
-@@ -770,7 +773,7 @@
- #: rc.cpp:625
- #, no-c-format
- msgid "Creating..."
--msgstr "正在建立..."
-+msgstr "正在建立…"
- 
- #. i18n: file ./languages/cpp/configproblemreporter.ui line 24
- #: languages/cpp/cppsupportpart.cpp:585 rc.cpp:628
-@@ -785,7 +788,9 @@
- "If enabled, the C++ parser will report any syntax errors it detects. \n"
- "They will be displayed in the 'Problems' output view and as markers in the "
- "editor."
--msgstr "開啟此選項的話，C++ 剖析器會回報所有偵測到的語法錯誤，並顯示在「問題」的輸出檢視，同時標記在編輯器中。"
-+msgstr ""
-+"開啟此選項的話，C++ 剖析器會回報所有偵測到的語法錯誤，並顯示在「問題」的輸出"
-+"檢視，同時標記在編輯器中。"
- 
- #. i18n: file ./languages/cpp/configproblemreporter.ui line 39
- #: rc.cpp:635
-@@ -834,11 +839,13 @@
- #: rc.cpp:655
- #, no-c-format
- msgid ""
--"Often a macro that the C++ parser must understand in order to correctly parse a "
--"piece of code is defined somewhere in some far off header file that the parser "
--"doesn't look at. This textbox can be used to define those macros locally so "
--"that the C++ parser to understand them."
--msgstr "通常巨集都是定義在 C++ 剖析器可能看不到的別的標頭檔之中。這裡可以用來定義巨集所在地，讓剖析器可以找得到。"
-+"Often a macro that the C++ parser must understand in order to correctly "
-+"parse a piece of code is defined somewhere in some far off header file that "
-+"the parser doesn't look at. This textbox can be used to define those macros "
-+"locally so that the C++ parser to understand them."
-+msgstr ""
-+"通常巨集都是定義在 C++ 剖析器可能看不到的別的標頭檔之中。這裡可以用來定義巨集"
-+"所在地，讓剖析器可以找得到。"
- 
- #. i18n: file ./languages/cpp/ccconfigwidgetbase.ui line 16
- #: rc.cpp:658
-@@ -850,25 +857,25 @@
- #: rc.cpp:661
- #, no-c-format
- msgid "&Code Completion"
--msgstr "源碼補完(&C)"
-+msgstr "原始碼補完(&C)"
- 
- #. i18n: file ./languages/cpp/ccconfigwidgetbase.ui line 50
- #: rc.cpp:664
- #, no-c-format
- msgid "Code Completion Options"
--msgstr "源碼補完選項"
-+msgstr "原始碼補完選項"
- 
- #. i18n: file ./languages/cpp/ccconfigwidgetbase.ui line 69
- #: rc.cpp:667
- #, no-c-format
- msgid "A&utomatic code completion:"
--msgstr "自動源碼補完(&U)："
-+msgstr "自動原始碼補完(&U)："
- 
- #. i18n: file ./languages/cpp/ccconfigwidgetbase.ui line 75
- #: rc.cpp:670
- #, no-c-format
- msgid "Offer options to complete what you are typing."
--msgstr "在您輸入源碼時提供補完的選項。"
-+msgstr "在您輸入原始碼時提供補完的選項。"
- 
- #. i18n: file ./languages/cpp/ccconfigwidgetbase.ui line 116
- #: rc.cpp:673
-@@ -917,7 +924,8 @@
- "of member-variables and return-types \n"
- "of member-functions) in the \n"
- "completion-box."
--msgstr "在補完建議中完整計算樣本類別中的成員型態，包括成員變數與成員函式的傳回型態。"
-+msgstr ""
-+"在補完建議中完整計算樣本類別中的成員型態，包括成員變數與成員函式的傳回型態。"
- 
- #. i18n: file ./languages/cpp/ccconfigwidgetbase.ui line 191
- #: rc.cpp:718
-@@ -981,7 +989,9 @@
- "Parse preprocessed headers that are not part of this project \n"
- "into a special completion-database. To reparse the headers delete\n"
- "the database and reopen the project."
--msgstr "剖析不屬於此專案的預先處理標頭，將結果放到一個特殊的資料庫中。要重新剖析這些標頭，只需要刪除資料庫，並重新開啟專案。"
-+msgstr ""
-+"剖析不屬於此專案的預先處理標頭，將結果放到一個特殊的資料庫中。要重新剖析這些"
-+"標頭，只需要刪除資料庫，並重新開啟專案。"
- 
- #. i18n: file ./languages/cpp/ccconfigwidgetbase.ui line 350
- #: rc.cpp:759
-@@ -996,20 +1006,22 @@
- #, no-c-format
- msgid ""
- "Try to locate all included files and preprocess them. \n"
--"This makes macros and imported namespaces work correctly, and allows KDevelop\n"
-+"This makes macros and imported namespaces work correctly, and allows "
-+"KDevelop\n"
- "to know what code-items are visible from within which file.\n"
- "Note: Parsing may become very slow when this is enabled\n"
- "(It will become faster after some time)."
- msgstr ""
- "試著定位所有的引入檔，並預先處理。\n"
--"這可以讓巨集與匯入的命名空間正確運作，並讓 KDevelop 知道哪些項目在哪個檔案中。\n"
-+"這可以讓巨集與匯入的命名空間正確運作，並讓 KDevelop 知道哪些項目在哪個檔案"
-+"中。\n"
- "注意：剖析有可能會很慢，不過一陣子之後會變快。"
- 
- #. i18n: file ./languages/cpp/ccconfigwidgetbase.ui line 367
- #: rc.cpp:770
- #, no-c-format
- msgid "Code Completion Databases"
--msgstr "源碼補完資料庫"
-+msgstr "原始碼補完資料庫"
- 
- #. i18n: file ./languages/cpp/ccconfigwidgetbase.ui line 370
- #: rc.cpp:773
-@@ -1018,7 +1030,9 @@
- "<b>Code Completion Databases</b> are used to store the parsed headers for "
- "external libraries, to allow code completion for non-project classes and "
- "methods."
--msgstr "<b>源碼補完資料庫</b>用於儲存剖析過的外部函式庫標頭檔，以便非專案的類別與方法使用源碼補完功能。"
-+msgstr ""
-+"<b>原始碼補完資料庫</b>用於儲存剖析過的外部函式庫標頭檔，以便非專案的類別與方法"
-+"使用原始碼補完功能。"
- 
- #. i18n: file ./languages/cpp/ccconfigwidgetbase.ui line 379
- #: kdevdesigner/designer/widgetfactory.cpp:775 rc.cpp:776 rc.cpp:2688
-@@ -1032,13 +1046,13 @@
- #: rc.cpp:4615 rc.cpp:6314 rc.cpp:6647 rc.cpp:6677 rc.cpp:8584
- #, no-c-format
- msgid "&Add..."
--msgstr "新增(&A)..."
-+msgstr "新增(&A)…"
- 
- #. i18n: file ./languages/cpp/ccconfigwidgetbase.ui line 431
- #: rc.cpp:782
- #, no-c-format
- msgid "Click to start the Code Completion database creation wizard."
--msgstr "點擊以開啟源碼補完資料庫建立精靈。"
-+msgstr "點擊以開啟原始碼補完資料庫建立精靈。"
- 
- #. i18n: file ./languages/cpp/ccconfigwidgetbase.ui line 470
- #: rc.cpp:788
-@@ -1057,17 +1071,18 @@
- #, no-c-format
- msgid ""
- "Try to resolve the include-path by getting the command that would be used \n"
--"for compiling the file and parsing the gcc-options. The build-system needs to "
--"be working, \n"
-+"for compiling the file and parsing the gcc-options. The build-system needs "
-+"to be working, \n"
- "test for problems by running \"make -n -W myfile.cpp myfile.o\" in the "
- "directory. \n"
- "This also works with cmake, and maybe some other build-systems that build on "
- "make. \n"
--"The project needs to be compiled or at least configured before this system may "
--"work."
-+"The project needs to be compiled or at least configured before this system "
-+"may work."
- msgstr ""
- "試著剖析 gcc 選項解析引入路徑。\n"
--"系統必須要可以編譯專案，您可以用 \"make -n -W myfile.cpp myfile.o\" 來測試問題所在。\n"
-+"系統必須要可以編譯專案，您可以用 \"make -n -W myfile.cpp myfile.o\" 來測試問"
-+"題所在。\n"
- "這個功能也適用 cmake，或是其它基於 make 的建立系統。\n"
- "此專案必須編譯過，或至少 configure 過。"
- 
-@@ -1089,9 +1104,11 @@
- msgid ""
- "A semicolon-seperated list of include-paths to be used while searching for "
- "headers. \n"
--"Paths not starting with '/' will be interpreted as relative to the "
--"project-folder."
--msgstr "用於搜尋標頭檔的路徑，以分號區隔。若路徑未以 / 開頭，則表示該路徑相對於專案資料夾。"
-+"Paths not starting with '/' will be interpreted as relative to the project-"
-+"folder."
-+msgstr ""
-+"用於搜尋標頭檔的路徑，以分號區隔。若路徑未以 / 開頭，則表示該路徑相對於專案資"
-+"料夾。"
- 
- #. i18n: file ./languages/cpp/ccconfigwidgetbase.ui line 524
- #: rc.cpp:811
-@@ -1111,9 +1128,10 @@
- "means that both namespaces are treated as\n"
- "if they were one(\"a=b\" is equivalent to \"a<<b;b<<a\")"
- msgstr ""
--"這裡包含一份命名空間別名與匯入的清單，以分號區隔。例如：\"std<<_GLIBCXX_STD;NewNamespaceName=Old<<SomeGlobal"
--"lyImportedNamespace\" （當然不包含引號）。\"<<\" 表示右方的運算子被匯入左方，\"=\" "
--"則表示兩個命名空間會當成同一個（\"a=b\" 相當於 \"a<<b;b<<a\"）"
-+"這裡包含一份命名空間別名與匯入的清單，以分號區隔。例如：\"std<<_GLIBCXX_STD;"
-+"NewNamespaceName=Old<<SomeGloballyImportedNamespace\" （當然不包含引號）。"
-+"\"<<\" 表示右方的運算子被匯入左方，\"=\" 則表示兩個命名空間會當成同一個"
-+"（\"a=b\" 相當於 \"a<<b;b<<a\"）"
- 
- #. i18n: file ./languages/cpp/ccconfigwidgetbase.ui line 538
- #: rc.cpp:820
-@@ -1137,19 +1155,19 @@
- #: rc.cpp:829
- #, no-c-format
- msgid "Header/Source split (Highly Experimental)"
--msgstr "標頭/源碼區隔（實驗中）"
-+msgstr "標頭/原始碼區隔（實驗中）"
- 
- #. i18n: file ./languages/cpp/ccconfigwidgetbase.ui line 597
- #: rc.cpp:832
- #, no-c-format
- msgid "Enable split of Header/So&urce files"
--msgstr "開啟標頭檔與源碼檔的區隔"
-+msgstr "開啟標頭檔與原始碼檔的區隔"
- 
- #. i18n: file ./languages/cpp/ccconfigwidgetbase.ui line 600
- #: rc.cpp:835 rc.cpp:838
- #, no-c-format
- msgid "Check to have header and source appear in the same page."
--msgstr "勾選此選項則會將標頭檔與源碼檔同時顯示在同一頁中。"
-+msgstr "勾選此選項則會將標頭檔與原始碼檔同時顯示在同一頁中。"
- 
- #. i18n: file ./languages/cpp/ccconfigwidgetbase.ui line 622
- #: rc.cpp:841
-@@ -1163,7 +1181,7 @@
- msgid ""
- "Check to have the source file scroll as you \n"
- "navigate the header and vice versa"
--msgstr "勾選此選項的話，在導覽標頭時也會同時捲動源碼檔，反之亦然"
-+msgstr "勾選此選項的話，在導覽標頭時也會同時捲動原始碼檔，反之亦然"
- 
- #. i18n: file ./languages/cpp/ccconfigwidgetbase.ui line 649
- #: rc.cpp:855
-@@ -1215,7 +1233,8 @@
- "feature attempt to match the function under the \n"
- "cursor with the matching declaration/definition.\n"
- msgstr ""
--"勾選此選項的話，會有<b>切換標頭/實作</b>功能，試著符合游標指向的函式的宣告或定義。\n"
-+"勾選此選項的話，會有<b>切換標頭/實作</b>功能，試著符合游標指向的函式的宣告或"
-+"定義。\n"
- 
- #. i18n: file ./languages/cpp/ccconfigwidgetbase.ui line 740
- #: rc.cpp:888
-@@ -1232,7 +1251,9 @@
- "all the declarations and definitions \n"
- "for the current file and its matching \n"
- "header/implementation file."
--msgstr "勾選此選項的話，在編輯內容選單中會出現兩個子選單，包含所有目前檔案中的宣告與定義，以及符合這些宣告與定義的標頭與實作檔。"
-+msgstr ""
-+"勾選此選項的話，在編輯內容選單中會出現兩個子選單，包含所有目前檔案中的宣告與"
-+"定義，以及符合這些宣告與定義的標頭與實作檔。"
- 
- #. i18n: file ./languages/cpp/ccconfigwidgetbase.ui line 762
- #: rc.cpp:905
-@@ -1247,7 +1268,9 @@
- "Menus appear on the right mouse click context menu, \n"
- "hows menu items to navigate. Needs the \"Class View\"\n"
- "plugin enabled to have use all options."
--msgstr "按下滑鼠右鍵時會出現的選單要以什麼項目來導覽。若要開啟所有的選項，要在「類別檢視」外掛程式中開啟。"
-+msgstr ""
-+"按下滑鼠右鍵時會出現的選單要以什麼項目來導覽。若要開啟所有的選項，要在「類別"
-+"檢視」外掛程式中開啟。"
- 
- #. i18n: file ./languages/cpp/ccconfigwidgetbase.ui line 784
- #: rc.cpp:918
-@@ -1267,7 +1290,8 @@
- msgid ""
- "These are the suffixes used by the Class Wizard when creating new classes."
- "<br>Should be in the format: \".suffix\""
--msgstr "這些是類別精靈在建立新類別時使用的後置字串。<br> 格式應該是：\".suffix\""
-+msgstr ""
-+"這些是類別精靈在建立新類別時使用的後置字串。<br> 格式應該是：\".suffix\""
- 
- #. i18n: file ./languages/cpp/ccconfigwidgetbase.ui line 827
- #: rc.cpp:927
-@@ -1322,17 +1346,19 @@
- #: rc.cpp:950
- #, no-c-format
- msgid ""
--"Use Qt version 3 (When this is changed the project needs to be closed and "
--"re-opened.)"
-+"Use Qt version 3 (When this is changed the project needs to be closed and re-"
-+"opened.)"
- msgstr "使用 Qt3（若是修改此選項，此專案必須關閉並重新開啟。）"
- 
- #. i18n: file ./languages/cpp/ccconfigwidgetbase.ui line 928
- #: rc.cpp:953
- #, no-c-format
- msgid ""
--"Select this if your project is using Qt version 3.x."
--"<br>When this is changed the project needs to be closed and re-opened."
--msgstr "如果您的專案使用的是 Qt 3.x 版，則選擇此選項。<br> 若是修改此選項，此專案必須關閉並重新開啟。"
-+"Select this if your project is using Qt version 3.x.<br>When this is changed "
-+"the project needs to be closed and re-opened."
-+msgstr ""
-+"如果您的專案使用的是 Qt 3.x 版，則選擇此選項。<br> 若是修改此選項，此專案必須"
-+"關閉並重新開啟。"
- 
- #. i18n: file ./languages/cpp/ccconfigwidgetbase.ui line 936
- #: rc.cpp:956
-@@ -1344,17 +1370,19 @@
- #: rc.cpp:959
- #, no-c-format
- msgid ""
--"Use Qt version 4 (When this is changed the project needs to be closed and "
--"re-opened.)"
-+"Use Qt version 4 (When this is changed the project needs to be closed and re-"
-+"opened.)"
- msgstr "使用 Qt4（若是修改此選項，此專案必須關閉並重新開啟。）"
- 
- #. i18n: file ./languages/cpp/ccconfigwidgetbase.ui line 942
- #: rc.cpp:962
- #, no-c-format
- msgid ""
--"Select this if your project is using Qt version 4.x."
--"<br>When this is changed the project needs to be closed and re-opened."
--msgstr "如果您的專案使用的是 Qt 4.x 版，則選擇此選項。<br> 若是修改此選項，此專案必須關閉並重新開啟。"
-+"Select this if your project is using Qt version 4.x.<br>When this is changed "
-+"the project needs to be closed and re-opened."
-+msgstr ""
-+"如果您的專案使用的是 Qt 4.x 版，則選擇此選項。<br> 若是修改此選項，此專案必須"
-+"關閉並重新開啟。"
- 
- #. i18n: file ./languages/cpp/ccconfigwidgetbase.ui line 950
- #: rc.cpp:965
-@@ -1372,17 +1400,18 @@
- #: rc.cpp:971
- #, no-c-format
- msgid ""
--"This setting is only needed for Qt3 programs, for Qt4 just make sure the QMake "
--"Binary is set properly"
-+"This setting is only needed for Qt3 programs, for Qt4 just make sure the "
-+"QMake Binary is set properly"
- msgstr "這個設定只對 Qt3 程式有用。Qt4 程式只需要確定 QMake 執行檔路徑是正確的"
- 
- #. i18n: file ./languages/cpp/ccconfigwidgetbase.ui line 999
- #: rc.cpp:974
- #, no-c-format
- msgid ""
--"The Qt directory, will be red if it is not a valid Qt directory. This setting "
--"is only needed for Qt3 programs."
--msgstr "Qt 目錄。若是不正確的 Qt 目錄則會顯示為紅色。這個設定只對 Qt3 程式有用。"
-+"The Qt directory, will be red if it is not a valid Qt directory. This "
-+"setting is only needed for Qt3 programs."
-+msgstr ""
-+"Qt 目錄。若是不正確的 Qt 目錄則會顯示為紅色。這個設定只對 Qt3 程式有用。"
- 
- #. i18n: file ./languages/cpp/ccconfigwidgetbase.ui line 1002
- #: rc.cpp:977
-@@ -1478,11 +1507,12 @@
- #: rc.cpp:1019 rc.cpp:2345
- #, no-c-format
- msgid ""
--"KDevelop comes with its own UI designer that can either be embedded or be run "
--"as a separate program. Check this button if you wish to integrate the UI "
-+"KDevelop comes with its own UI designer that can either be embedded or be "
-+"run as a separate program. Check this button if you wish to integrate the UI "
- "designer into KDevelop."
- msgstr ""
--"KDevelop 自己有一套內建的使用者介面設計器，可以內嵌在 KDevelop，也可以單獨執行。勾選此選項的話，會將此設計器整合到 KDevelop 中。"
-+"KDevelop 自己有一套內建的使用者介面設計器，可以內嵌在 KDevelop，也可以單獨執"
-+"行。勾選此選項的話，會將此設計器整合到 KDevelop 中。"
- 
- #. i18n: file ./languages/cpp/ccconfigwidgetbase.ui line 1127
- #: rc.cpp:1022
-@@ -1500,11 +1530,12 @@
- #: rc.cpp:1028 rc.cpp:2354
- #, no-c-format
- msgid ""
--"KDevelop comes with its own UI designer that can either be embedded or be run "
--"as a separate program. Check this button if you wish to run KDevelop's UI "
--"designer as a separate program."
-+"KDevelop comes with its own UI designer that can either be embedded or be "
-+"run as a separate program. Check this button if you wish to run KDevelop's "
-+"UI designer as a separate program."
- msgstr ""
--"KDevelop 自己有一套內建的使用者介面設計器，可以內嵌在 KDevelop，也可以單獨執行。勾選此選項的話，會將此設計器當成應用程式單獨執行。"
-+"KDevelop 自己有一套內建的使用者介面設計器，可以內嵌在 KDevelop，也可以單獨執"
-+"行。勾選此選項的話，會將此設計器當成應用程式單獨執行。"
- 
- #. i18n: file ./languages/cpp/ccconfigwidgetbase.ui line 1141
- #: rc.cpp:1031
-@@ -1832,13 +1863,13 @@
- #: rc.cpp:1256 rc.cpp:2116
- #, no-c-format
- msgid "Re&format source"
--msgstr "重新安排源碼格式(&F)"
-+msgstr "重新安排原始碼格式(&F)"
- 
- #. i18n: file ./languages/cpp/subclassingdlgbase.ui line 173
- #: rc.cpp:1259 rc.cpp:2119
- #, no-c-format
- msgid "Reformat source by &default"
--msgstr "預設重新安排源碼(&D)"
-+msgstr "預設重新安排原始碼(&D)"
- 
- #. i18n: file ./languages/cpp/subclassingdlgbase.ui line 183
- #: rc.cpp:1262 rc.cpp:2146 rc.cpp:7243
-@@ -1862,7 +1893,7 @@
- #: rc.cpp:1274
- #, no-c-format
- msgid "Cpp Source"
--msgstr "C++ 源碼"
-+msgstr "C++ 原始碼"
- 
- #. i18n: file ./languages/cpp/classgeneratorconfigbase.ui line 46
- #: rc.cpp:1277
-@@ -1874,7 +1905,7 @@
- #: rc.cpp:1280
- #, no-c-format
- msgid "Objective-C Source"
--msgstr "Objective-C 源碼"
-+msgstr "Objective-C 原始碼"
- 
- #. i18n: file ./languages/cpp/classgeneratorconfigbase.ui line 56
- #: rc.cpp:1283
-@@ -1886,7 +1917,7 @@
- #: rc.cpp:1286
- #, no-c-format
- msgid "GTK C Source"
--msgstr "GTK C 源碼"
-+msgstr "GTK C 原始碼"
- 
- #. i18n: file ./languages/cpp/classgeneratorconfigbase.ui line 88
- #: rc.cpp:1289
-@@ -1958,7 +1989,7 @@
- #: rc.cpp:1340
- #, no-c-format
- msgid "&Reformat source before creating files"
--msgstr "建立檔案之前重新安排源碼格式(&R)"
-+msgstr "建立檔案之前重新安排原始碼格式(&R)"
- 
- #. i18n: file ./languages/cpp/app_templates/kxt/prefs-base.ui line 24
- #: rc.cpp:1343 rc.cpp:1391 rc.cpp:1427 rc.cpp:1981
-@@ -2060,8 +2091,8 @@
- #: rc.cpp:1412 rc.cpp:1421
- #, no-c-format
- msgid ""
--"<p>This is just an <i>%{APPNAMELC}</i>; it does not do anything interesting at "
--"all."
-+"<p>This is just an <i>%{APPNAMELC}</i>; it does not do anything interesting "
-+"at all."
- msgstr "<p>這只是 <i>%{APPNAMELC}</i>；它不會做什麼有趣的事情。"
- 
- #. i18n: file ./languages/cpp/debugger/debuggertracingdialogbase.ui line 16
-@@ -2082,11 +2113,12 @@
- msgid ""
- "<b>Enable tracing</b>\n"
- "<p>Tracing is a mechanism to automatically print values of the choosed "
--"expressions and continue execution when breakpoint is hit. You can think of it "
--"as printf debugging that does not require modifying the source.</p>"
-+"expressions and continue execution when breakpoint is hit. You can think of "
-+"it as printf debugging that does not require modifying the source.</p>"
- msgstr ""
- "<b>開啟追蹤</b>\n"
--"<p>追蹤是指在遇到中斷點的時候，自動印出所定義的表示式的值，並繼續執行的功能。您可以想像是印出除錯資訊，但不需要變更程式源碼。"
-+"<p>追蹤是指在遇到中斷點的時候，自動印出所定義的表示式的值，並繼續執行的功能。"
-+"您可以想像是印出除錯資訊，但不需要變更程式原始碼。"
- 
- #. i18n: file ./languages/cpp/debugger/debuggertracingdialogbase.ui line 50
- #: rc.cpp:1455
-@@ -2099,8 +2131,8 @@
- #, no-c-format
- msgid ""
- "<b>Custom format string</b>\n"
--"<p>Specify a C-style format string that will be used when printing the choosen "
--"expression. For example:\n"
-+"<p>Specify a C-style format string that will be used when printing the "
-+"choosen expression. For example:\n"
- "<p align=\"center\"> <tt>Tracepoint 1: g = %d</tt></p>\n"
- "If custom format string is not enabled, names and values of all expressions "
- "will be printed, using \"%d\" as format specifier for all expressions."
-@@ -2108,7 +2140,8 @@
- "<b>自訂格式字串</b>\n"
- "<p>指定一個 C 語言格式的字串，用於印出所定義的表示式。例如：\n"
- "<p align=\"center\"><tt>Tracepoint 1：g = %d</tt></p>\n"
--"如果沒有開啟自訂格式字串，則所有表示式的名稱與數值都會印出來，並使用 \"%d\" 做為所有表示式的格式。"
-+"如果沒有開啟自訂格式字串，則所有表示式的名稱與數值都會印出來，並使用 \"%d\" "
-+"做為所有表示式的格式。"
- 
- #. i18n: file ./languages/cpp/debugger/debuggertracingdialogbase.ui line 114
- #: rc.cpp:1467
-@@ -2147,12 +2180,13 @@
- #, no-c-format
- msgid ""
- "To run \"gdb\" binary from $PATH, leave this field empty. To run custom gdb, "
--"for example, for a different architecture, enter the executable name here. You "
--"can either run gdb from $PATH, but with a different name (say, \"arm-gdb\"), by "
--"typing the name here, or specify full path to the gdb executable."
--msgstr ""
--"若是要從 $PATH 變數中找 gdb 執行檔，則請將此欄位留白。要執行自訂的 gdb，如不同的平台上的 gdb，請在此輸入執行檔路徑。您也可以輸入在 "
--"$PATH 路徑中的其他 gdb （如 \"arm-gdb\"），或是直接輸入執行檔的完整路徑。"
-+"for example, for a different architecture, enter the executable name here. "
-+"You can either run gdb from $PATH, but with a different name (say, \"arm-gdb"
-+"\"), by typing the name here, or specify full path to the gdb executable."
-+msgstr ""
-+"若是要從 $PATH 變數中找 gdb 執行檔，則請將此欄位留白。要執行自訂的 gdb，如不"
-+"同的平臺上的 gdb，請在此輸入執行檔路徑。您也可以輸入在 $PATH 路徑中的其他 "
-+"gdb （如 \"arm-gdb\"），或是直接輸入執行檔的完整路徑。"
- 
- #. i18n: file ./languages/cpp/debugger/debuggerconfigwidgetbase.ui line 80
- #: rc.cpp:1486
-@@ -2170,29 +2204,30 @@
- #: rc.cpp:1492
- #, no-c-format
- msgid ""
--"If you want gdb to be executed by a special shell or tool insert it here. The "
--"main use-case is for Automake based projects where the application is actually "
--"only a script and libtool is needed to get it to run inside gdb."
-+"If you want gdb to be executed by a special shell or tool insert it here. "
-+"The main use-case is for Automake based projects where the application is "
-+"actually only a script and libtool is needed to get it to run inside gdb."
- msgstr ""
--"如果您要將 gdb 在特殊的 shell 或是工具中執行，請在此輸入。主要是用於 automake 專案，應用程式實際上只是文稿，要在 gdb 中執行需要 "
--"libtool。"
-+"如果您要將 gdb 在特殊的 shell 或是工具中執行，請在此輸入。主要是用於 "
-+"automake 專案，應用程式實際上只是文稿，要在 gdb 中執行需要 libtool。"
- 
- #. i18n: file ./languages/cpp/debugger/debuggerconfigwidgetbase.ui line 100
- #: rc.cpp:1498
- #, no-c-format
- msgid ""
--"If you want gdb to be executed by a special shell or tool insert it here. The "
--"main use-case is for Automake based projects where the application is actually "
--"only a script and <b>libtool</b> is needed to get it to run inside gdb."
-+"If you want gdb to be executed by a special shell or tool insert it here. "
-+"The main use-case is for Automake based projects where the application is "
-+"actually only a script and <b>libtool</b> is needed to get it to run inside "
-+"gdb."
- msgstr ""
--"如果您要將 gdb 在特殊的 shell 或是工具中執行，請在此輸入。主要是用於 automake 專案，應用程式實際上只是文稿，要在 gdb 中執行需要 "
--"<b>libtool</b>。"
-+"如果您要將 gdb 在特殊的 shell 或是工具中執行，請在此輸入。主要是用於 "
-+"automake 專案，應用程式實際上只是文稿，要在 gdb 中執行需要 <b>libtool</b>。"
- 
- #. i18n: file ./languages/cpp/debugger/debuggerconfigwidgetbase.ui line 127
- #: rc.cpp:1504
- #, no-c-format
- msgid "Display &demangled names"
--msgstr "顯示反解譯源碼後的名稱(&D)"
-+msgstr "顯示反解譯原始碼後的名稱(&D)"
- 
- #. i18n: file ./languages/cpp/debugger/debuggerconfigwidgetbase.ui line 132
- #: rc.cpp:1507
-@@ -2202,7 +2237,7 @@
- "can select to see the methods' mangled names.\n"
- "However, non-mangled names are easier to read."
- msgstr ""
--"當顯示反解譯的程式源碼時，您可以選擇顯示\n"
-+"當顯示反解譯的程式原始碼時，您可以選擇顯示\n"
- "編碼後的方法名稱。不過，未經編碼的方法名\n"
- "稱比較容易閱讀。"
- 
-@@ -2310,8 +2345,9 @@
- "but if you need to debug into these values then\n"
- "check this option."
- msgstr ""
--"顯示靜態成員將會使 gdb 在 KDE 和 Qt 中產生資料的速度變慢。它可能會改變那些 QString "
--"系列函式所依賴的資料的「簽章」。但是如果您需要對這些變數除錯的話，請勾選這個選項。"
-+"顯示靜態成員將會使 gdb 在 KDE 和 Qt 中產生資料的速度變慢。它可能會改變那些 "
-+"QString 系列函式所依賴的資料的「簽章」。但是如果您需要對這些變數除錯的話，請"
-+"勾選這個選項。"
- 
- #. i18n: file ./languages/cpp/debugger/debuggerconfigwidgetbase.ui line 222
- #: rc.cpp:1564
-@@ -2365,8 +2401,8 @@
- #: rc.cpp:1588
- #, no-c-format
- msgid ""
--"This script is intended for the actual commands needed to connect to a remotely "
--"running executable.\n"
-+"This script is intended for the actual commands needed to connect to a "
-+"remotely running executable.\n"
- "\tshell sleep 5\twait for remote program to start\n"
- "\ttarget remote ...\tconnect to the remote debugger\n"
- "\tcontinue\t[optional] run debugging to the first breakpoint."
-@@ -2394,13 +2430,14 @@
- msgid ""
- "This script is sourced by gdb after the two preceding scripts have been "
- "executed.\n"
--"This script is intended for the actual commands needed to connect to a remotely "
--"running executable.\n"
-+"This script is intended for the actual commands needed to connect to a "
-+"remotely running executable.\n"
- "\tshell sleep 5\twait for remote program to start\n"
- "\ttarget remote ...\tconnect to the remote debugger\n"
- "\tcontinue\t[optional] run debugging to the first breakpoint."
- msgstr ""
--"這是 gdb 在先執行完兩個文稿後執行的文稿，是連線到遠端執行的程式所需要的實際命令。\n"
-+"這是 gdb 在先執行完兩個文稿後執行的文稿，是連線到遠端執行的程式所需要的實際命"
-+"令。\n"
- "\tshell sleep 5\t會等待遠端程式啟動\n"
- "\ttarget remote ...\t會連線到遠端的除錯器\n"
- "\tcontinue\t[optional] 會執行到第一個中斷點。"
-@@ -2415,21 +2452,23 @@
- #: rc.cpp:1610
- #, no-c-format
- msgid ""
--"This shell script is run after the Config gdb script has been sourced by gdb.\n"
-+"This shell script is run after the Config gdb script has been sourced by "
-+"gdb.\n"
- "When debugging remotely this script is intended to actually start the remote "
- "process.\n"
--"[It is expected that the debug executable can be reached on the target, maybe "
--"by downloading it as a final build step]\n"
-+"[It is expected that the debug executable can be reached on the target, "
-+"maybe by downloading it as a final build step]\n"
- "1) Find a way to execute a command remotely - rsh, ssh, telnet, ...\n"
- "2a) Execute \"gdbserver ... application\" on target.\n"
- "or if your executable contains the gdb stub\n"
- "2b) Execute \"application\" on target."
- msgstr ""
--"這是 gdb 執行完設定文稿後執行的文稿。當遠端除錯時，這個文稿會實際啟動遠端的程式。\n"
--"【要除錯的執行檔應該要可以在目標平台上找到，也許要在編譯完後下載】\n"
-+"這是 gdb 執行完設定文稿後執行的文稿。當遠端除錯時，這個文稿會實際啟動遠端的程"
-+"式。\n"
-+"【要除錯的執行檔應該要可以在目標平臺上找到，也許要在編譯完後下載】\n"
- "1) 找出遠端執行命令的方式─rsh、ssh、telnet、... 等。\n"
--"2a) 在目標平台上執行 \"gdbserver ... application\"，或是\n"
--"2b) 若是您的執行檔中含有 gdb 資訊，則直接在目標平台上執行 \"application\"。"
-+"2a) 在目標平臺上執行 \"gdbserver ... application\"，或是\n"
-+"2b) 若是您的執行檔中含有 gdb 資訊，則直接在目標平臺上執行 \"application\"。"
- 
- #. i18n: file ./languages/cpp/debugger/debuggerconfigwidgetbase.ui line 364
- #: rc.cpp:1619
-@@ -2467,7 +2506,8 @@
- msgid ""
- "Select the Qt configuration to create a Code Completion database for. If you "
- "don't know what this option does, just go with the default."
--msgstr "選擇源碼補完資料庫的 Qt 設定。如果您不知道這個選項是幹嘛的，就請使用預設值。"
-+msgstr ""
-+"選擇原始碼補完資料庫的 Qt 設定。如果您不知道這個選項是幹嘛的，就請使用預設值。"
- 
- #. i18n: file ./languages/cpp/pcsimporter/qtimporter/settingsdialogbase.ui line 105
- #: rc.cpp:1640
-@@ -2507,7 +2547,9 @@
- msgid ""
- "Decide if you want to restrict the Code Completion database to only the base "
- "kdelibs API or the entire KDE include structure"
--msgstr "決定您是否要將源碼補完資料庫限制在基本的 kdelibs API，或是使用整個 KDE 的引入結構"
-+msgstr ""
-+"決定您是否要將原始碼補完資料庫限制在基本的 kdelibs API，或是使用整個 KDE 的引入"
-+"結構"
- 
- #. i18n: file ./languages/cpp/pcsimporter/kdelibsimporter/settingsdialogbase.ui line 65
- #: rc.cpp:1660
-@@ -2672,19 +2714,19 @@
- #: rc.cpp:1774
- #, no-c-format
- msgid "Code Help"
--msgstr "源碼協助"
-+msgstr "原始碼協助"
- 
- #. i18n: file ./languages/php/phpconfigwidgetbase.ui line 96
- #: rc.cpp:1777
- #, no-c-format
- msgid "&Enable code completion"
--msgstr "啟用源碼補完(&E)"
-+msgstr "啟用原始碼補完(&E)"
- 
- #. i18n: file ./languages/php/phpconfigwidgetbase.ui line 104
- #: rc.cpp:1780
- #, no-c-format
- msgid "Enable code &hinting"
--msgstr "啟用源碼提示(&H)"
-+msgstr "啟用原始碼提示(&H)"
- 
- #. i18n: file ./languages/php/phpconfigwidgetbase.ui line 114
- #: rc.cpp:1783
-@@ -2732,11 +2774,12 @@
- #: rc.cpp:1804
- #, no-c-format
- msgid ""
--"<font size=\"+1\">The php executable is called directly. Ideal for developers "
--"who want to develop terminal or graphical applications in PHP. \n"
-+"<font size=\"+1\">The php executable is called directly. Ideal for "
-+"developers who want to develop terminal or graphical applications in PHP. \n"
- "You need a correctly installed php cgi version.</font>"
- msgstr ""
--"<font size=\"+1\">直接呼叫 PHP 來執行。這對想要開發 PHP 的終端或圖形應用程式的開發者來說最為理想。\n"
-+"<font size=\"+1\">直接呼叫 PHP 來執行。這對想要開發 PHP 的終端或圖形應用程式"
-+"的開發者來說最為理想。\n"
- "您需要安裝正確的 PHP CGI 版本。</font>"
- 
- #. i18n: file ./languages/php/phpconfigwidgetbase.ui line 246
-@@ -2750,10 +2793,11 @@
- #, no-c-format
- msgid ""
- "<font size=\"+1\">Uses an existing webserver. The pages are previewed in \n"
--"the internal web browser. Please make sure that the webserver was compiled with "
--"PHP support.</font>"
-+"the internal web browser. Please make sure that the webserver was compiled "
-+"with PHP support.</font>"
- msgstr ""
--"<font size=\"+1\">使用現有的網頁伺服器。輸出的網頁會在內部的瀏覽器上預覽。請確定該網頁伺服器編譯的時候有編入 PHP 支援。</font>"
-+"<font size=\"+1\">使用現有的網頁伺服器。輸出的網頁會在內部的瀏覽器上預覽。請"
-+"確定該網頁伺服器編譯的時候有編入 PHP 支援。</font>"
- 
- #. i18n: file ./languages/php/phpconfigwidgetbase.ui line 289
- #: rc.cpp:1815
-@@ -2883,7 +2927,8 @@
- "\"irb\". Add this line to your .irbrc file:\n"
- "def cd(dir) Dir.chdir dir end"
- msgstr ""
--"這是 Ruby shell 的路徑（如果在 $PATH 內，則只需要輸入名稱）。預設為 \"irb\"。將以下這一行加入您的 .irbrc 檔：\n"
-+"這是 Ruby shell 的路徑（如果在 $PATH 內，則只需要輸入名稱）。預設為 \"irb\"。"
-+"將以下這一列加入您的 .irbrc 檔：\n"
- "def cd(dir) Dir.chdir dir end"
- 
- #. i18n: file ./languages/ruby/rubyconfigwidgetbase.ui line 78
-@@ -2908,9 +2953,11 @@
- #: rc.cpp:1921
- #, no-c-format
- msgid ""
--"This is the path (or just name, if in $PATH) to the Ruby interpreter. Defaults "
--"to \"ruby\""
--msgstr "這是 Ruby 直譯器的路徑（如果在 $PATH 內，則只需要輸入 ruby）。預設為 \"ruby\"。"
-+"This is the path (or just name, if in $PATH) to the Ruby interpreter. "
-+"Defaults to \"ruby\""
-+msgstr ""
-+"這是 Ruby 直譯器的路徑（如果在 $PATH 內，則只需要輸入 ruby）。預設為 \"ruby"
-+"\"。"
- 
- #. i18n: file ./languages/ruby/rubyconfigwidgetbase.ui line 122
- #: rc.cpp:1924
-@@ -2922,7 +2969,7 @@
- #: rc.cpp:1927
- #, no-c-format
- msgid "This is the name of the main program source file"
--msgstr "這是主程式源碼檔的名稱"
-+msgstr "這是主程式原始碼檔的名稱"
- 
- #. i18n: file ./languages/ruby/rubyconfigwidgetbase.ui line 141
- #: rc.cpp:1930 rc.cpp:5509 rc.cpp:6338
-@@ -2988,8 +3035,8 @@
- #: rc.cpp:1957
- #, no-c-format
- msgid ""
--"Check this if you want the debugger to show constants (with many constants this "
--"may be slow)."
-+"Check this if you want the debugger to show constants (with many constants "
-+"this may be slow)."
- msgstr "勾選此選項，則在除錯器中會顯示常數（如果常數太多就可能會變慢）。"
- 
- #. i18n: file ./languages/ruby/rubyconfigwidgetbase.ui line 243
-@@ -3412,8 +3459,9 @@
- "start-up. It will usually be shown in the state you left work so you can "
- "readily proceed."
- msgstr ""
--"若您打算在開啟 KDevelop 時繼續上次未完成的工作，您可以勾選此選項。如此 KDevelop "
--"在啟動時會自動載入上次的專案。通常它會顯示上次的狀態，這樣您可以繼續工作。"
-+"若您打算在開啟 KDevelop 時繼續上次未完成的工作，您可以勾選此選項。如此 "
-+"KDevelop 在啟動時會自動載入上次的專案。通常它會顯示上次的狀態，這樣您可以繼續"
-+"工作。"
- 
- #. i18n: file ./src/settingswidget.ui line 44
- #: rc.cpp:2267
-@@ -3425,7 +3473,7 @@
- #: rc.cpp:2270
- #, no-c-format
- msgid "Line wrappin&g"
--msgstr "自動折行(&G)"
-+msgstr "自動折列(&G)"
- 
- #. i18n: file ./src/settingswidget.ui line 58
- #: rc.cpp:2273
-@@ -3433,7 +3481,7 @@
- msgid ""
- "By default, KDevelop will wrap long lines around in the Messages Output View "
- "window"
--msgstr "KDevelop 預設會在訊息輸出檢視的視窗中，自動將過長的行折行。"
-+msgstr "KDevelop 預設會在訊息輸出檢視的視窗中，自動將過長的行折列。"
- 
- #. i18n: file ./src/settingswidget.ui line 61
- #: rc.cpp:2276
-@@ -3441,10 +3489,11 @@
- msgid ""
- "By default, KDevelop will wrap long lines around in the Messages Output View "
- "window so that valuable information will not be easily overlooked. In some "
--"cases this will clutter long message lists. Remove the checkbox mark if you do "
--"not want the lines wrap around."
-+"cases this will clutter long message lists. Remove the checkbox mark if you "
-+"do not want the lines wrap around."
- msgstr ""
--"KDevelop 在訊息輸出檢視視窗中，預設會折下過長的行，以便於閱讀重要資訊。不過在某些狀況下，會讓長的訊息變亂。如果您不希望折行，就取消勾選。"
-+"KDevelop 在訊息輸出檢視視窗中，預設會折下過長的行，以便於閱讀重要資訊。不過在"
-+"某些狀況下，會讓長的訊息變亂。如果您不希望折列，就取消勾選。"
- 
- #. i18n: file ./src/settingswidget.ui line 77
- #: rc.cpp:2279
-@@ -3481,16 +3530,17 @@
- #, no-c-format
- msgid ""
- "KDevelop preprocesses the messages the Messages Output View window receives "
--"during the build processes in order to filter superfluous information. You can "
--"control the level of detail KDevelop will display using the dropdown box in "
--"this field. \n"
--"<b>Very Short</b>  Displays only warnings, errors, and the filenames which are "
--"compiled. \n"
--"<b>Short</b>  Suppresses all compiler flags and formats the output to be more "
--"readable. \n"
-+"during the build processes in order to filter superfluous information. You "
-+"can control the level of detail KDevelop will display using the dropdown box "
-+"in this field. \n"
-+"<b>Very Short</b>  Displays only warnings, errors, and the filenames which "
-+"are compiled. \n"
-+"<b>Short</b>  Suppresses all compiler flags and formats the output to be "
-+"more readable. \n"
- "<b>Full</b>  Displays all output messages unmodified."
- msgstr ""
--"在編譯過程中，檢視視窗會接收並過濾多餘的資訊。您可以控制 KDevelop 要顯示多詳細的訊息。\n"
-+"在編譯過程中，檢視視窗會接收並過濾多餘的資訊。您可以控制 KDevelop 要顯示多詳"
-+"細的訊息。\n"
- "「很短」只顯示警告、錯誤以及目前正在編譯的檔案名稱。\n"
- "「短」會將編譯器旗標丟掉，將輸出重新安排以便於閱讀。\n"
- "「長」則完整呈現所有的輸出。"
-@@ -3517,13 +3567,14 @@
- #: rc.cpp:2309
- #, no-c-format
- msgid ""
--"By default, KDevelop uses a common parent directory for all new projects. Enter "
--"the absolute path of this common directory in the box or select it from your "
--"directory structure. KDevelop will place the any new project here as a "
--"subdirectory."
--msgstr ""
--"KDevelop 所有的新專案預設都存放在同一個父目錄之下。您可以在此輸入此目錄的絕對路徑，或是從您的目錄結構中挑選。KDevelop "
--"開啟新的專案時會在此目錄下建立一個子目錄。"
-+"By default, KDevelop uses a common parent directory for all new projects. "
-+"Enter the absolute path of this common directory in the box or select it "
-+"from your directory structure. KDevelop will place the any new project here "
-+"as a subdirectory."
-+msgstr ""
-+"KDevelop 所有的新專案預設都存放在同一個父目錄之下。您可以在此輸入此目錄的絕對"
-+"路徑，或是從您的目錄結構中挑選。KDevelop 開啟新的專案時會在此目錄下建立一個子"
-+"目錄。"
- 
- #. i18n: file ./src/settingswidget.ui line 209
- #: rc.cpp:2312
-@@ -3549,7 +3600,8 @@
- msgid ""
- "If checked, KDevelop will use the default terminal as set in KControl in KDE "
- "components, Component Chooser."
--msgstr "勾選此選項的話，KDevelop 會使用 KDE 控制中心裡，元件選擇器中設定的終端機。"
-+msgstr ""
-+"勾選此選項的話，KDevelop 會使用 KDE 控制中心裡，元件選擇器中設定的終端機。"
- 
- #. i18n: file ./src/settingswidget.ui line 294
- #: rc.cpp:2324
-@@ -3579,13 +3631,12 @@
- #: rc.cpp:2336
- #, no-c-format
- msgid ""
--"<qt>"
--"<h3>UI Designer Integration</h3>This will only be used when no project is "
--"opened. For the project specific setting see Project Options/C++ Specific and "
--"open the Qt tab.</qt>"
-+"<qt><h3>UI Designer Integration</h3>This will only be used when no project "
-+"is opened. For the project specific setting see Project Options/C++ Specific "
-+"and open the Qt tab.</qt>"
- msgstr ""
--"<qt>"
--"<h3>使用者介面設計器整合</h3> 這只會在沒有開啟任何專案時使用。在專案中請找「專案選項」中的「C++ 選項」並開啟 Qt 頁。</qt>"
-+"<qt><h3>使用者介面設計器整合</h3> 這只會在沒有開啟任何專案時使用。在專案中請"
-+"找「專案選項」中的「C++ 選項」並開啟 Qt 頁。</qt>"
- 
- #. i18n: file ./src/settingswidget.ui line 410
- #: rc.cpp:2348
-@@ -3616,13 +3667,14 @@
- #, no-c-format
- msgid ""
- "The make tool usually will display messages like “Entering directory”, or "
--"“Leaving directory” when it switches the directories it currently works in. As "
--"this clutters the messages list in the Messages Output View window, KDevelop "
--"suppresses those messages by default. Mark the checkbox if you want to protocol "
--"which directories make worked in."
--msgstr ""
--"make 通常在切換目錄時，會顯示 \"Entering directory\" 或 \"Leaving directory\" "
--"的訊息。因為這會讓訊息輸出檢視視窗內的訊息變得比較雜亂，KDevelop 預設是會省略這些訊息。如果您要知道 make 目前進行到哪個目錄，請勾選此選項。"
-+"“Leaving directory” when it switches the directories it currently works in. "
-+"As this clutters the messages list in the Messages Output View window, "
-+"KDevelop suppresses those messages by default. Mark the checkbox if you want "
-+"to protocol which directories make worked in."
-+msgstr ""
-+"make 通常在切換目錄時，會顯示 \"Entering directory\" 或 \"Leaving directory"
-+"\" 的訊息。因為這會讓訊息輸出檢視視窗內的訊息變得比較雜亂，KDevelop 預設是會"
-+"省略這些訊息。如果您要知道 make 目前進行到哪個目錄，請勾選此選項。"
- 
- #. i18n: file ./src/settingswidget.ui line 497
- #: rc.cpp:2378
-@@ -3634,13 +3686,13 @@
- #: rc.cpp:2381
- #, no-c-format
- msgid "Use kde language and disable \"jump-to-source\" functionality"
--msgstr "使用 KDE 定義的語言，並關閉「跳到源碼」的功能"
-+msgstr "使用 KDE 定義的語言，並關閉「跳到原始碼」的功能"
- 
- #. i18n: file ./src/profileengine/editor/profileeditorbase.ui line 16
- #: rc.cpp:2384
- #, no-c-format
- msgid "Profile Editor for The KDevelop Platform"
--msgstr "KDevelop 平台設定檔編輯器"
-+msgstr "KDevelop 平臺設定檔編輯器"
- 
- #. i18n: file ./src/profileengine/editor/profileeditorbase.ui line 63
- #: src/profileengine/editor/profileeditor.cpp:237 rc.cpp:2387 rc.cpp:2462
-@@ -3880,7 +3932,7 @@
- #: rc.cpp:2552 rc.cpp:2582
- #, no-c-format
- msgid "Source URL or working path:"
--msgstr "源碼網址或工作路徑："
-+msgstr "原始碼網址或工作路徑："
- 
- #. i18n: file ./vcs/subversion/svn_mergeoptiondlgbase.ui line 151
- #: rc.cpp:2555 rc.cpp:2567
-@@ -4084,7 +4136,7 @@
- #: rc.cpp:2727
- #, no-c-format
- msgid "Source Revision"
--msgstr "源碼版本"
-+msgstr "原始碼版本"
- 
- #. i18n: file ./vcs/subversion/svn_copydlgwidget.ui line 129
- #: rc.cpp:2730
-@@ -4108,7 +4160,7 @@
- #: kdevdesigner/designer/mainwindowactions.cpp:206 rc.cpp:2745
- #, no-c-format
- msgid "Source"
--msgstr "程式源碼"
-+msgstr "程式原始碼"
- 
- #. i18n: file ./vcs/subversion/svn_copydlgwidget.ui line 197
- #: rc.cpp:2748
-@@ -4168,7 +4220,8 @@
- #: rc.cpp:2788
- #, no-c-format
- msgid ""
--"Example for the url (if /home/user/subversion is the subversion repository):\n"
-+"Example for the url (if /home/user/subversion is the subversion "
-+"repository):\n"
- "file:///home/user/subversion/mynewproject"
- msgstr ""
- "此網址的範例（假設 subversion 主目錄為 /home/user/subversion）：\n"
-@@ -4196,8 +4249,8 @@
- #, no-c-format
- msgid ""
- "Subversion repository location. This should include the subdirectory for the "
--"project in the repository. The project subdirectory and further subdirectories "
--"will be created. \n"
-+"project in the repository. The project subdirectory and further "
-+"subdirectories will be created. \n"
- "\n"
- "So for example if you give http://localhost/svn/projectname the following "
- "directories will be created and the project imported into the trunk "
-@@ -4209,7 +4262,8 @@
- msgstr ""
- "Subversion 主目錄位置。專案目錄與其所有子目錄都會被建立。\n"
- "\n"
--"例如，您設定 http://localhost/svn/projectname，則會建立以下的目錄，並將專案匯入到 trunk 子目錄中：\n"
-+"例如，您設定 http://localhost/svn/projectname，則會建立以下的目錄，並將專案匯"
-+"入到 trunk 子目錄中：\n"
- "http://localhost/svn/projectname\n"
- "http://localhost/svn/projectname/tags\n"
- "http://localhost/svn/projectname/branches\n"
-@@ -4313,15 +4367,12 @@
- #: rc.cpp:2855
- #, no-c-format
- msgid ""
--"CVS Root location goes here, for example:"
--"<ul>\n"
--"<li>/home/cvsroot or</li>"
--"<li>:pserver:me@localhost:/home/cvs</li></ul>"
-+"CVS Root location goes here, for example:<ul>\n"
-+"<li>/home/cvsroot or</li><li>:pserver:me@localhost:/home/cvs</li></ul>"
- msgstr ""
- "請在此填寫 CVS 的根路徑。例如：\n"
--"<ul>"
--"<li>/home/cvsroot，或者</li> "
--"<li>:pserver:me@localhost:/home/cvs</li></ul>"
-+"<ul><li>/home/cvsroot，或者</li> <li>:pserver:me@localhost:/home/cvs</li></"
-+"ul>"
- 
- #. i18n: file ./vcs/cvsservice/cvsformbase.ui line 158
- #: rc.cpp:2859
-@@ -4375,10 +4426,11 @@
- #: rc.cpp:2883
- #, no-c-format
- msgid ""
--"<b>Changelog filename path</b>"
--"<br/>Insert here the Changelog filename you wish to use so that the message is "
--"appended"
--msgstr "<b>變更日誌檔案路徑</b><br/>請在此輸入您要用於新增訊息的變更日誌（Changelog）檔的檔名"
-+"<b>Changelog filename path</b><br/>Insert here the Changelog filename you "
-+"wish to use so that the message is appended"
-+msgstr ""
-+"<b>變更日誌檔案路徑</b><br/>請在此輸入您要用於新增訊息的變更日誌（Changelog）"
-+"檔的檔名"
- 
- #. i18n: file ./vcs/cvsservice/releaseinputdialogbase.ui line 16
- #: rc.cpp:2892
-@@ -4414,9 +4466,11 @@
- #: rc.cpp:2907
- #, no-c-format
- msgid ""
--"Fill the field with the release or branch name (e.g. <i>"
--"make_it_cool, kdevelop_alpha5, ...</i>)"
--msgstr "請輸入釋出名稱或分支名稱（例如：　<i>make_it_cool，kdevelop_alpha5，...等等</i>）"
-+"Fill the field with the release or branch name (e.g. <i>make_it_cool, "
-+"kdevelop_alpha5, ...</i>)"
-+msgstr ""
-+"請輸入釋出名稱或分支名稱（例如：　<i>make_it_cool，kdevelop_alpha5，...等等</"
-+"i>）"
- 
- #. i18n: file ./vcs/cvsservice/releaseinputdialogbase.ui line 106
- #: rc.cpp:2910
-@@ -4636,8 +4690,9 @@
- "need password-less login (see the ssh documentation for how to generate a "
- "public/private key pair) otherwise CVS will just hang forever."
- msgstr ""
--"將這個選項設為 ssh，可以使用 ssh 作為 CVS 的遠端 shell。注意您必須設定好不需密碼的登錄方（關於如何建立公開/私密金鑰配對，請參考 ssh "
--"HOWTO 文件），否則 CVS 將無法進行。"
-+"將這個選項設為 ssh，可以使用 ssh 作為 CVS 的遠端 shell。注意您必須設定好不需"
-+"密碼的登錄方（關於如何建立公開/私密金鑰配對，請參考 ssh HOWTO 文件），否則 "
-+"CVS 將無法進行。"
- 
- #. i18n: file ./vcs/cvsservice/cvsoptionswidgetbase.ui line 68
- #: rc.cpp:3045
-@@ -4709,13 +4764,13 @@
- #: rc.cpp:3081
- #, no-c-format
- msgid "&Init Local Repository..."
--msgstr "初始化本地主目錄(&I)..."
-+msgstr "初始化本地主目錄(&I)…"
- 
- #. i18n: file ./vcs/cvsservice/integrator/integratordlgbase.ui line 90
- #: rc.cpp:3084
- #, no-c-format
- msgid "Login to &Repository..."
--msgstr "登錄主目錄(&R)..."
-+msgstr "登錄主目錄(&R)…"
- 
- #. i18n: file ./vcs/cvsservice/integrator/integratordlgbase.ui line 154
- #: rc.cpp:3087
-@@ -4783,7 +4838,9 @@
- msgid ""
- "This is a front-end to KDE's KTrader: search your KDE documentation for more "
- "information about KDE services and KTrader"
--msgstr "這是 KDE 的 KTrader 的前端：關於 KDE 的服務以及 KTrader，請參考您的 KDE 文件以取得更多資訊。"
-+msgstr ""
-+"這是 KDE 的 KTrader 的前端：關於 KDE 的服務以及 KTrader，請參考您的 KDE 文件"
-+"以取得更多資訊。"
- 
- #. i18n: file ./parts/partexplorer/partexplorerformbase.ui line 46
- #: rc.cpp:3135
-@@ -4801,9 +4858,11 @@
- #: rc.cpp:3141
- #, no-c-format
- msgid ""
--"<b>Constraints</b>Refine your query by writing additional constraints such as "
--"<i>([X-KDevelop-Scope]='Global')</i>)."
--msgstr "<b>限制</b>加入新的限制條件，例如<i>([X-KDevelop-Scope]='Global')</i>，來調整您的查詢。"
-+"<b>Constraints</b>Refine your query by writing additional constraints such "
-+"as <i>([X-KDevelop-Scope]='Global')</i>)."
-+msgstr ""
-+"<b>限制</b>加入新的限制條件，例如<i>([X-KDevelop-Scope]='Global')</i>，來調整"
-+"您的查詢。"
- 
- #. i18n: file ./parts/partexplorer/partexplorerformbase.ui line 120
- #: rc.cpp:3144
-@@ -4979,7 +5038,9 @@
- msgid ""
- "If this is checked, the output of the application will be shown in the "
- "application output view; otherwise, all output will be ignored."
--msgstr "勾選此選項的話，使應用程式的輸出會顯示在應用程式輸出檢視中，否則所有的輸出都會被忽略。"
-+msgstr ""
-+"勾選此選項的話，使應用程式的輸出會顯示在應用程式輸出檢視中，否則所有的輸出都"
-+"會被忽略。"
- 
- #. i18n: file ./parts/tools/addtooldlg.ui line 49
- #: rc.cpp:3237 rc.cpp:4862
-@@ -4999,14 +5060,10 @@
- msgid ""
- "<p>The following placeholders can be used:</p>\n"
- "<p>\n"
--"<b>%D</b> - The project directory"
--"<br>\n"
--"<b>%S</b> - The current filename"
--"<br>\n"
--"<b>%T</b> - The current selection"
--"<br>\n"
--"<b>%W</b> - The current word under the cursor"
--"<br>\n"
-+"<b>%D</b> - The project directory<br>\n"
-+"<b>%S</b> - The current filename<br>\n"
-+"<b>%T</b> - The current selection<br>\n"
-+"<b>%W</b> - The current word under the cursor<br>\n"
- "</p>\n"
- "<p>If any of the used placeholders cannot be evaluated (for example\n"
- "if you use %T but there is no current selection), the tool will not be\n"
-@@ -5014,16 +5071,13 @@
- msgstr ""
- "<p>可以使用以下的符號：</p>\n"
- "<p>\n"
--"<b>%D</b>─專案目錄"
--"<br>\n"
--"<b>%S</b>─目前的檔名"
--"<br>\n"
--"<b>%T</b>─目前選取的文字"
--"<br>\n"
--"<b>%W</b>─目前游標下的字"
--"<br>\n"
-+"<b>%D</b>─專案目錄<br>\n"
-+"<b>%S</b>─目前的檔名<br>\n"
-+"<b>%T</b>─目前選取的文字<br>\n"
-+"<b>%W</b>─目前游標下的字<br>\n"
- "</p>\n"
--"<p>如果使用的符號無法取代（例如，若您使用 %T 但是並沒有選取任何文字），則此工具不會被執行。</p>"
-+"<p>如果使用的符號無法取代（例如，若您使用 %T 但是並沒有選取任何文字），則此工"
-+"具不會被執行。</p>"
- 
- #. i18n: file ./parts/tools/addtooldlg.ui line 102
- #: rc.cpp:3255
-@@ -5107,7 +5161,7 @@
- #: rc.cpp:3330
- #, no-c-format
- msgid "Source &Distribution"
--msgstr "源碼散佈(&D)"
-+msgstr "原始碼散布(&D)"
- 
- #. i18n: file ./parts/distpart/distpart_ui.ui line 151
- #: rc.cpp:3333
-@@ -5125,7 +5179,7 @@
- #: rc.cpp:3339
- #, no-c-format
- msgid "Source Options"
--msgstr "源碼選項"
-+msgstr "原始碼選項"
- 
- #. i18n: file ./parts/distpart/distpart_ui.ui line 184
- #: rc.cpp:3342
-@@ -5137,11 +5191,10 @@
- #: rc.cpp:3345
- #, no-c-format
- msgid ""
--"<b>Archive name format: </b>"
--"<br> %n - File name "
--"<br> %v - File version "
--"<br> %d - Date of archive"
--msgstr "<b>歸檔檔名格式：</b><br>%n － 檔名<br>%v － 檔案版本<br>%d － 歸檔日期"
-+"<b>Archive name format: </b><br> %n - File name <br> %v - File version <br> %"
-+"d - Date of archive"
-+msgstr ""
-+"<b>歸檔檔名格式：</b><br>%n － 檔名<br>%v － 檔案版本<br>%d － 歸檔日期"
- 
- #. i18n: file ./parts/distpart/distpart_ui.ui line 214
- #: rc.cpp:3348
-@@ -5165,7 +5218,7 @@
- #: rc.cpp:3357
- #, no-c-format
- msgid "&Create Source Archive"
--msgstr "建立源碼歸檔(&C)"
-+msgstr "建立原始碼歸檔(&C)"
- 
- #. i18n: file ./parts/distpart/distpart_ui.ui line 286
- #: rc.cpp:3360 rc.cpp:3483
-@@ -5274,9 +5327,9 @@
- #: rc.cpp:3413
- #, no-c-format
- msgid ""
--"Architecture target:<BR><b>(Note: You must have a compiler that supports this "
--"target)</b>"
--msgstr "目標平台：<BR><b>（注意：您必須有一個支援此目標平台的編譯器。）</b>"
-+"Architecture target:<BR><b>(Note: You must have a compiler that supports "
-+"this target)</b>"
-+msgstr "目標平臺：<BR><b>（注意：您必須有一個支援此目標平臺的編譯器。）</b>"
- 
- #. i18n: file ./parts/distpart/distpart_ui.ui line 579
- #: rc.cpp:3416
-@@ -5344,7 +5397,7 @@
- msgid ""
- "&Build Source \n"
- "Package"
--msgstr "建立源碼套件(&B)"
-+msgstr "建立原始碼套件(&B)"
- 
- #. i18n: file ./parts/distpart/distpart_ui.ui line 678
- #: rc.cpp:3450
-@@ -5512,8 +5565,8 @@
- "will be the author, everything between \n"
- "<....> is the email address."
- msgstr ""
--"如果在目錄中已經有一個 AUTHOR 檔案，並且裡面有電子郵件地址，格式為 XXXX <......>，則 XXXX 會當成作者，<......> "
--"則為其電子郵件地址。"
-+"如果在目錄中已經有一個 AUTHOR 檔案，並且裡面有電子郵件地址，格式為 XXXX "
-+"<......>，則 XXXX 會當成作者，<......> 則為其電子郵件地址。"
- 
- #. i18n: file ./parts/appwizard/importdlgbase.ui line 291
- #: rc.cpp:3557
-@@ -5696,19 +5749,19 @@
- #: rc.cpp:3656
- #, no-c-format
- msgid "Edit T&ype..."
--msgstr "編輯型態(&Y)..."
-+msgstr "編輯型態(&Y)…"
- 
- #. i18n: file ./parts/filecreate/fcconfigwidgetbase.ui line 61
- #: rc.cpp:3659
- #, no-c-format
- msgid "New &Subtype..."
--msgstr "新增子型態(&S)..."
-+msgstr "新增子型態(&S)…"
- 
- #. i18n: file ./parts/filecreate/fcconfigwidgetbase.ui line 69
- #: rc.cpp:3662
- #, no-c-format
- msgid "&New Type..."
--msgstr "新增類別型(&N)..."
-+msgstr "新增類別型(&N)…"
- 
- #. i18n: file ./parts/filecreate/fcconfigwidgetbase.ui line 75
- #: parts/filecreate/addglobaldlg.cpp:59 rc.cpp:3665 rc.cpp:3689
-@@ -5762,13 +5815,13 @@
- #: rc.cpp:3710
- #, no-c-format
- msgid "C&hange Content..."
--msgstr "更改內容(&H)..."
-+msgstr "更改內容(&H)…"
- 
- #. i18n: file ./parts/filecreate/fcconfigwidgetbase.ui line 355
- #: rc.cpp:3713
- #, no-c-format
- msgid "&New Template..."
--msgstr "新增樣本(&N)..."
-+msgstr "新增樣本(&N)…"
- 
- #. i18n: file ./parts/filecreate/fcconfigwidgetbase.ui line 371
- #: rc.cpp:3716
-@@ -5934,8 +5987,8 @@
- #: rc.cpp:3818
- #, no-c-format
- msgid ""
--"<qt>If the group's language is the same as the project's primary language, the "
--"group will be automatically opened.</qt>"
-+"<qt>If the group's language is the same as the project's primary language, "
-+"the group will be automatically opened.</qt>"
- msgstr "<qt>如果群組的語言與專案的主要語言相同，會自動開啟群組。</qt>"
- 
- #. i18n: file ./parts/snippet/snippetsettingsbase.ui line 208
-@@ -5948,11 +6001,12 @@
- #: rc.cpp:3824
- #, no-c-format
- msgid ""
--"<qt>Groups having a language which is supported by the current project will be "
--"opened automatically. "
--"<br>Even if the group's language is not the same as the project's primary "
--"language.</qt>"
--msgstr "<qt>如果專案支援群組的語言，會自動開啟群組。<br>即使群組的語言與專案的主要語言不同。</qt>"
-+"<qt>Groups having a language which is supported by the current project will "
-+"be opened automatically. <br>Even if the group's language is not the same as "
-+"the project's primary language.</qt>"
-+msgstr ""
-+"<qt>如果專案支援群組的語言，會自動開啟群組。<br>即使群組的語言與專案的主要語"
-+"言不同。</qt>"
- 
- #. i18n: file ./parts/filelist/projectviewconfigbase.ui line 16
- #: parts/filelist/filelist_widget.cpp:228
-@@ -5974,8 +6028,8 @@
- #: rc.cpp:3833 rc.cpp:3836
- #, no-c-format
- msgid ""
--"Uncheck this if you want the toolbar together with all other toolbars. You can "
--"disable it then"
-+"Uncheck this if you want the toolbar together with all other toolbars. You "
-+"can disable it then"
- msgstr "如果您要將此工具列與其他工具列放在一起，則取消此選項"
- 
- #. i18n: file ./parts/filelist/projectviewconfigbase.ui line 44
-@@ -6000,7 +6054,8 @@
- #: rc.cpp:3851 rc.cpp:3854
- #, no-c-format
- msgid ""
--"Check this if you want the currently open files closed before opening a session"
-+"Check this if you want the currently open files closed before opening a "
-+"session"
- msgstr "勾選此選項，則開啟工作階段時關閉所有已開啟的檔案"
- 
- #. i18n: file ./parts/filelist/projectviewprojectconfigbase.ui line 16
-@@ -6115,13 +6170,13 @@
- #: rc.cpp:3911
- #, no-c-format
- msgid "&Add Group..."
--msgstr "新增群組(&A)..."
-+msgstr "新增群組(&A)…"
- 
- #. i18n: file ./parts/fileview/filegroupsconfigwidgetbase.ui line 120
- #: rc.cpp:3914
- #, no-c-format
- msgid "&Edit Group..."
--msgstr "編輯群組(&E)..."
-+msgstr "編輯群組(&E)…"
- 
- #. i18n: file ./parts/fileview/filegroupsconfigwidgetbase.ui line 128
- #: rc.cpp:3917
-@@ -6238,7 +6293,7 @@
- "Indent NameSpace=false"
- msgstr ""
- "ANSI 型式編排。\n"
--"大括弧一律換行\n"
-+"大括弧一律換列\n"
- "縮排使用 4 個空白\n"
- "括弧縮排：否\n"
- "類別縮排：否\n"
-@@ -6290,7 +6345,7 @@
- "Indent NameSpace=false"
- msgstr ""
- "Linux 型式編排。\n"
--"定義區塊（命名空間、函式等）的大括弧一律換行，\n"
-+"定義區塊（命名空間、函式等）的大括弧一律換列，\n"
- "命令區塊（if switch 等）的大括弧則直接附在後面\n"
- "縮排使用 8 個空白\n"
- "括弧縮排：否\n"
-@@ -6318,7 +6373,7 @@
- "Indent NameSpace=false"
- msgstr ""
- "GNU 型式編排。\n"
--"大括弧一律換行\n"
-+"大括弧一律換列\n"
- "縮排使用 2 個空白\n"
- "區塊縮排：是\n"
- "括弧縮排：否\n"
-@@ -6407,7 +6462,9 @@
- "formatter will try to reformat. Use a\n"
- "space seperated list. eg. *.cpp *.hpp\n"
- "Can use * on its own for any file."
--msgstr "設定要重新排版的檔案延伸檔名。在清單中用空白區隔，例如：*.cpp *.hpp。您可以用 * 來表示所有檔案。"
-+msgstr ""
-+"設定要重新排版的檔案延伸檔名。在清單中用空白區隔，例如：*.cpp *.hpp。您可以"
-+"用 * 來表示所有檔案。"
- 
- #. i18n: file ./parts/astyle/astyleconfig.ui line 286
- #: rc.cpp:4083
-@@ -6449,7 +6506,7 @@
- #: rc.cpp:4101
- #, no-c-format
- msgid "Con&vert tabs"
--msgstr "轉換 tab (&V)"
-+msgstr "轉換 tab(&V)"
- 
- #. i18n: file ./parts/astyle/astyleconfig.ui line 370
- #: rc.cpp:4104
-@@ -6475,7 +6532,7 @@
- #: rc.cpp:4114
- #, no-c-format
- msgid "F&orce tabs"
--msgstr "強制 tab (&O)"
-+msgstr "強制 tab(&O)"
- 
- #. i18n: file ./parts/astyle/astyleconfig.ui line 430
- #: rc.cpp:4117
-@@ -6505,13 +6562,13 @@
- #: rc.cpp:4129
- #, no-c-format
- msgid "&Break"
--msgstr "換行(&B)"
-+msgstr "換列(&B)"
- 
- #. i18n: file ./parts/astyle/astyleconfig.ui line 507
- #: rc.cpp:4132
- #, no-c-format
- msgid "Break brackets from pre-block code (i.e. ANSI C/C++ style)."
--msgstr "區塊的大括弧會換行（ANSI C/C++ 型式）"
-+msgstr "區塊的大括弧會換列（ANSI C/C++ 型式）"
- 
- #. i18n: file ./parts/astyle/astyleconfig.ui line 515
- #: rc.cpp:4135
-@@ -6650,7 +6707,8 @@
- "Indent 'class' blocks, so that the inner 'public:',\n"
- "'protected:' and 'private: headers are indented in\n"
- "relation to the class block."
--msgstr "縮排類別區塊，因此內部的 public、protected、private 等標頭都會一起被縮排。"
-+msgstr ""
-+"縮排類別區塊，因此內部的 public、protected、private 等標頭都會一起被縮排。"
- 
- #. i18n: file ./parts/astyle/astyleconfig.ui line 698
- #: rc.cpp:4212
-@@ -6707,7 +6765,7 @@
- #: rc.cpp:4238
- #, no-c-format
- msgid "#Prepr&ocessors"
--msgstr "# 前置處理器 (&O)"
-+msgstr "# 前置處理器(&O)"
- 
- #. i18n: file ./parts/astyle/astyleconfig.ui line 753
- #: rc.cpp:4241
-@@ -6795,7 +6853,7 @@
- #: rc.cpp:4285
- #, no-c-format
- msgid "Break 'else if()' statements into two different lines."
--msgstr "將 else if() 敘述斷成不同的兩行。"
-+msgstr "將 else if() 敘述斷成不同的兩列。"
- 
- #. i18n: file ./parts/astyle/astyleconfig.ui line 854
- #: rc.cpp:4288
-@@ -6874,7 +6932,7 @@
- msgid ""
- "Don't break lines containing multiple statements into\n"
- "multiple single-statement lines."
--msgstr "如果一行中有多個敘述，不要將它們切成多個單一敘述的行。"
-+msgstr "如果一列中有多個敘述，不要將它們切成多個單一敘述的行。"
- 
- #. i18n: file ./parts/astyle/astyleconfig.ui line 942
- #: rc.cpp:4327
-@@ -6886,7 +6944,7 @@
- #: rc.cpp:4330
- #, no-c-format
- msgid "Don't break blocks residing completely on one line."
--msgstr "不要切開只有一行的區塊。"
-+msgstr "不要切開只有一列的區塊。"
- 
- #. i18n: file ./parts/astyle/astyleconfig.ui line 966
- #: rc.cpp:4333
-@@ -6930,7 +6988,8 @@
- msgid ""
- "Inserts the regular expression into the currently opened source code file. "
- "Escapes any special characters like backslash."
--msgstr "在目前開啟的源碼檔案中插入正規表示式。跳脫任何如反斜線之類別的特殊字元。"
-+msgstr ""
-+"在目前開啟的原始碼檔案中插入正規表示式。跳脫任何如反斜線之類別的特殊字元。"
- 
- #. i18n: file ./parts/regexptest/regexptestdlgbase.ui line 124
- #: rc.cpp:4357
-@@ -6942,8 +7001,8 @@
- #: rc.cpp:4360
- #, no-c-format
- msgid ""
--"enter a regular expression, for example <tt>KD.*</tt>"
--", which matches all strings beginning with \"KD\""
-+"enter a regular expression, for example <tt>KD.*</tt>, which matches all "
-+"strings beginning with \"KD\""
- msgstr "輸入一個正規表示式。例如 <tt>KD.*</tt>，它能符合所有以 KD 開頭的字串"
- 
- #. i18n: file ./parts/regexptest/regexptestdlgbase.ui line 150
-@@ -6980,8 +7039,8 @@
- #: rc.cpp:4381
- #, no-c-format
- msgid ""
--"A description of this syntax can be found in the documentation of the QRegExp "
--"class"
-+"A description of this syntax can be found in the documentation of the "
-+"QRegExp class"
- msgstr "您可以在 QRegExp 類別的說明文件中找到關於此語法的描述。"
- 
- #. i18n: file ./parts/regexptest/regexptestdlgbase.ui line 197
-@@ -6994,9 +7053,11 @@
- #: rc.cpp:4387
- #, no-c-format
- msgid ""
--"Matches a QRegExp non-greedy. Please read the QRegExp::setMinimal documentation "
--"for more details."
--msgstr "用非貪婪方式（non-greedy）比對一個 QRegExp 正規表示式。詳細資訊請參考 QRegExp::setMinimal 的說明。"
-+"Matches a QRegExp non-greedy. Please read the QRegExp::setMinimal "
-+"documentation for more details."
-+msgstr ""
-+"用非貪婪方式（non-greedy）比對一個 QRegExp 正規表示式。詳細資訊請參考 "
-+"QRegExp::setMinimal 的說明。"
- 
- #. i18n: file ./parts/regexptest/regexptestdlgbase.ui line 208
- #: rc.cpp:4390
-@@ -7014,7 +7075,7 @@
- #: rc.cpp:4396 rc.cpp:4618 rc.cpp:6317 rc.cpp:6650 rc.cpp:6680
- #, no-c-format
- msgid "&Edit..."
--msgstr "編輯(&E)..."
-+msgstr "編輯(&E)…"
- 
- #. i18n: file ./parts/regexptest/regexptestdlgbase.ui line 240
- #: rc.cpp:4399
-@@ -7067,7 +7128,9 @@
- "If checked, an option to go directly to the matching tag declaration will be "
- "shown. If more than one match, all matches will be shown in the main ctags "
- "result view."
--msgstr "勾選此選項的話，會顯示一個直接跳到宣告的選項。如果有一個以上的宣告符合，則所有符合的地方都會在主要的 ctags 結果檢視中顯示出來。"
-+msgstr ""
-+"勾選此選項的話，會顯示一個直接跳到宣告的選項。如果有一個以上的宣告符合，則所"
-+"有符合的地方都會在主要的 ctags 結果檢視中顯示出來。"
- 
- #. i18n: file ./parts/ctags2/ctags2_settingswidgetbase.ui line 69
- #: rc.cpp:4423
-@@ -7082,7 +7145,9 @@
- "If checked, an option to go directly to the matching tag definition will be "
- "shown. If more than one match, all matches will be shown in the main ctags "
- "result view."
--msgstr "勾選此選項的話，會顯示一個直接跳到定義的選項。如果有一個以上的定義符合，則所有符合的地方都會在主要的 ctags 結果檢視中顯示出來。"
-+msgstr ""
-+"勾選此選項的話，會顯示一個直接跳到定義的選項。如果有一個以上的定義符合，則所"
-+"有符合的地方都會在主要的 ctags 結果檢視中顯示出來。"
- 
- #. i18n: file ./parts/ctags2/ctags2_settingswidgetbase.ui line 80
- #: rc.cpp:4429
-@@ -7094,9 +7159,11 @@
- #: rc.cpp:4432
- #, no-c-format
- msgid ""
--"If checked, an option to do a full lookup of all macthing tags is shown in the "
--"context menu. The results will be shown in the main ctags results view."
--msgstr "勾選此選項的話，會在內容選單中顯示一個尋找所有符合的標籤的選項。結果會在主要的 ctags 結果檢視中顯示出來。"
-+"If checked, an option to do a full lookup of all macthing tags is shown in "
-+"the context menu. The results will be shown in the main ctags results view."
-+msgstr ""
-+"勾選此選項的話，會在內容選單中顯示一個尋找所有符合的標籤的選項。結果會在主要"
-+"的 ctags 結果檢視中顯示出來。"
- 
- #. i18n: file ./parts/ctags2/ctags2_settingswidgetbase.ui line 112
- #: rc.cpp:4438
-@@ -7108,10 +7175,12 @@
- #: rc.cpp:4441
- #, no-c-format
- msgid ""
--"If more than one hit was produced from an attempt to find an exact match, go to "
--"the first match in the list. Note: the <i>Go To Next Match</i> "
--"shortcut can be used to step between the matches."
--msgstr "如果有一個以上的地方符合，則跳到清單中的第一個地方。注意：「跳到下一個符合」的捷徑可以用於一個個檢視符合的地方。"
-+"If more than one hit was produced from an attempt to find an exact match, go "
-+"to the first match in the list. Note: the <i>Go To Next Match</i> shortcut "
-+"can be used to step between the matches."
-+msgstr ""
-+"如果有一個以上的地方符合，則跳到清單中的第一個地方。注意：「跳到下一個符合」"
-+"的捷徑可以用於一個個檢視符合的地方。"
- 
- #. i18n: file ./parts/ctags2/ctags2_settingswidgetbase.ui line 123
- #: rc.cpp:4444
-@@ -7133,7 +7202,9 @@
- msgid ""
- "Enter custom arguments to ctags database creation here. Note: do not set a "
- "custom tags file filename here, do that below instead."
--msgstr "請在此輸入要建立 ctags 資料庫的自訂參數。注意：不要自己設定標籤檔的檔名，請改用以下的路徑設定。"
-+msgstr ""
-+"請在此輸入要建立 ctags 資料庫的自訂參數。注意：不要自己設定標籤檔的檔名，請改"
-+"用以下的路徑設定。"
- 
- #. i18n: file ./parts/ctags2/ctags2_settingswidgetbase.ui line 158
- #: rc.cpp:4453
-@@ -7145,12 +7216,12 @@
- #: rc.cpp:4456 rc.cpp:4462
- #, no-c-format
- msgid ""
--"Enter the path to the exuberant ctags binary. If empty, <i>ctags</i> "
--"will be executed via $PATH. Note that it is sometimes installed as <i>"
--"exuberant-ctags</i>."
-+"Enter the path to the exuberant ctags binary. If empty, <i>ctags</i> will be "
-+"executed via $PATH. Note that it is sometimes installed as <i>exuberant-"
-+"ctags</i>."
- msgstr ""
--"請輸入 exuberant ctags 執行檔的路徑。如果留白的話，會執行在 $PATH 中的 ctags。注意，有的時候它會安裝為 "
--"exuberant-ctags。"
-+"請輸入 exuberant ctags 執行檔的路徑。如果留白的話，會執行在 $PATH 中的 "
-+"ctags。注意，有的時候它會安裝為 exuberant-ctags。"
- 
- #. i18n: file ./parts/ctags2/ctags2_settingswidgetbase.ui line 172
- #: rc.cpp:4459
-@@ -7174,9 +7245,11 @@
- #: rc.cpp:4471
- #, no-c-format
- msgid ""
--"Enter the full path of the project tagfile. If empty, the file will be called "
--"<i>tags</i> and reside in the root of the project."
--msgstr "請輸入專案標籤檔的完整路徑。留白的話，檔名預設為 <i>tags</i> 並放置在專案的根目錄中。"
-+"Enter the full path of the project tagfile. If empty, the file will be "
-+"called <i>tags</i> and reside in the root of the project."
-+msgstr ""
-+"請輸入專案標籤檔的完整路徑。留白的話，檔名預設為 <i>tags</i> 並放置在專案的根"
-+"目錄中。"
- 
- #. i18n: file ./parts/ctags2/ctags2_settingswidgetbase.ui line 246
- #: rc.cpp:4474
-@@ -7188,7 +7261,7 @@
- #: rc.cpp:4477
- #, no-c-format
- msgid "&Create..."
--msgstr "建立(&C)..."
-+msgstr "建立(&C)…"
- 
- #. i18n: file ./parts/ctags2/ctags2_settingswidgetbase.ui line 278
- #: rc.cpp:4483
-@@ -7236,9 +7309,9 @@
- #: rc.cpp:4519
- #, no-c-format
- msgid ""
--"Result view for a tag lookup. Click a line to go to the corresponding place in "
--"the code."
--msgstr "搜尋標籤的結果檢視。點選其中一行就會跳到相關的程式碼。"
-+"Result view for a tag lookup. Click a line to go to the corresponding place "
-+"in the code."
-+msgstr "搜尋標籤的結果檢視。點選其中一列就會跳到相關的程式碼。"
- 
- #. i18n: file ./parts/ctags2/ctags2_widgetbase.ui line 85
- #: languages/cpp/problemreporter.cpp:141 languages/php/phperrorview.cpp:132
-@@ -7251,9 +7324,11 @@
- #: rc.cpp:4525
- #, no-c-format
- msgid ""
--"Type the identifier you want to lookup. "
--"<p> The identifier will populate and display a reducing list as you type."
--msgstr "輸入您要尋找的識別子（identifier）。<p>識別子會在您輸入時集中並顯示一張簡易清單。"
-+"Type the identifier you want to lookup. <p> The identifier will populate and "
-+"display a reducing list as you type."
-+msgstr ""
-+"輸入您要尋找的識別子（identifier）。<p>識別子會在您輸入時集中並顯示一張簡易清"
-+"單。"
- 
- #. i18n: file ./parts/ctags2/ctags2_widgetbase.ui line 101
- #: rc.cpp:4528
-@@ -7277,8 +7352,8 @@
- #: rc.cpp:4537
- #, no-c-format
- msgid ""
--"Press to regenerate CTags database."
--"<p>This will take some time on a large project."
-+"Press to regenerate CTags database.<p>This will take some time on a large "
-+"project."
- msgstr "按下此鍵以重新產生 CTags 資料庫。<p>大型的專案這會花一點時間。"
- 
- #. i18n: file ./parts/ctags2/ctags2_selecttagfilebase.ui line 16
-@@ -7586,7 +7661,7 @@
- "You can enable and disable search\n"
- "sources and change their priority here."
- msgstr ""
--"您可以在此開啟與關閉搜尋源碼，\n"
-+"您可以在此開啟與關閉搜尋原始碼，\n"
- "並修改它們的屬性。"
- 
- #. i18n: file ./parts/documentation/find_documentationbase.ui line 25
-@@ -7676,8 +7751,8 @@
- #: rc.cpp:4814
- #, no-c-format
- msgid ""
--"The document tab can optionally be used to close the document, by clicking on "
--"the tab icon."
-+"The document tab can optionally be used to close the document, by clicking "
-+"on the tab icon."
- msgstr "點選文件分頁列上的圖示可以用於關閉此文件。"
- 
- #. i18n: file ./parts/uimode/uichooser.ui line 101
-@@ -7698,7 +7773,7 @@
- #: rc.cpp:4823
- #, no-c-format
- msgid "Toolview Tab Layout"
--msgstr "工具檢視頁佈局"
-+msgstr "工具檢視頁布局"
- 
- #. i18n: file ./parts/uimode/uichooser.ui line 124
- #: rc.cpp:4826
-@@ -7707,7 +7782,9 @@
- "Three different modes for the IDEAl toolview tabs. \"Text and icons\" is the "
- "most informative, but takes a lot of space. Those with a smaller screen will "
- "typically want \"Icons\"."
--msgstr "朽三種不同的 IDEAl 工具檢視頁模式。「文字與圖示」比較清楚，但是佔空間。螢幕較小的可以使用「圖示」。"
-+msgstr ""
-+"朽三種不同的 IDEAl 工具檢視頁模式。「文字與圖示」比較清楚，但是佔空間。螢幕較"
-+"小的可以使用「圖示」。"
- 
- #. i18n: file ./parts/uimode/uichooser.ui line 135
- #: rc.cpp:4829
-@@ -7829,10 +7906,11 @@
- #, no-c-format
- msgid ""
- "If checked, a tooltip will be shown when the mouse is over the bookmark, "
--"containing the text in the area surrounding it. "
--"<p> How many surrounding lines to include is decided by the value in the "
--"context box."
--msgstr "勾選此選項的話，當滑鼠移到書籤上方時，會出現一個工具提市，包含周邊區域的文字。<p>要出現多少行決定於這裡的數值。"
-+"containing the text in the area surrounding it. <p> How many surrounding "
-+"lines to include is decided by the value in the context box."
-+msgstr ""
-+"勾選此選項的話，當滑鼠移到書籤上方時，會出現一個工具提市，包含周邊區域的文"
-+"字。<p>要出現多少行決定於這裡的數值。"
- 
- #. i18n: file ./parts/bookmarks/bookmarks_settings_base.ui line 38
- #: rc.cpp:4907
-@@ -7857,10 +7935,12 @@
- #, no-c-format
- msgid ""
- "This decides if the bookmark panel should show the content of the bookmarked "
--"line in addition to the line number."
--"<p>This can be made optional depending on the start of the line, typically used "
--"for only showing lines containing a comment."
--msgstr "決定標記面板是否要顯示除行號外的標記行的內容。<p>您可以用行的開頭字串來決定，通常用於只顯示包含註解的行。"
-+"line in addition to the line number.<p>This can be made optional depending "
-+"on the start of the line, typically used for only showing lines containing a "
-+"comment."
-+msgstr ""
-+"決定標記面板是否要顯示除列號外的標記行的內容。<p>您可以用行的開頭字串來決定，"
-+"通常用於只顯示包含註解的行。"
- 
- #. i18n: file ./parts/bookmarks/bookmarks_settings_base.ui line 129
- #: rc.cpp:4919
-@@ -7884,7 +7964,7 @@
- #: rc.cpp:4928
- #, no-c-format
- msgid "Always show the bookmarked line in addition to the line number"
--msgstr "總是顯示除行號外的標記行"
-+msgstr "總是顯示除列號外的標記行"
- 
- #. i18n: file ./parts/scripting/scriptingglobalconfigbase.ui line 16
- #: parts/scripting/scriptingpart.cpp:57 rc.cpp:4931
-@@ -7908,8 +7988,9 @@
- "will allow you to get scripts in your home directory as well as system wide "
- "ones."
- msgstr ""
--"<b>注意</b>：系統會在您的 KDE 資源目錄中尋找這些要搜尋的目錄。因此如果您使用 \"kate/scripts\"，KScript 會尋找 "
--"\"$KDEDIRS/data/kate/scripts\"。這可以讓您取得系統以及您的家目錄中的文稿。"
-+"<b>注意</b>：系統會在您的 KDE 資源目錄中尋找這些要搜尋的目錄。因此如果您使用 "
-+"\"kate/scripts\"，KScript 會尋找 \"$KDEDIRS/data/kate/scripts\"。這可以讓您取"
-+"得系統以及您的家目錄中的文稿。"
- 
- #. i18n: file ./editors/editor-chooser/editchooser.ui line 24
- #: rc.cpp:4940
-@@ -7938,15 +8019,18 @@
- "<p><b>Action to take when an open file is changed on disk</b></p>\n"
- "<p><b>Do nothing</b> - The file will be marked as externally changed and the "
- "user will be asked to verify any attempt to overwrite it </p>\n"
--"<p><b>Alert the user</b> - A dialog will alert the user that a file has changed "
--"and offer the user to reload the file</p>\n"
--"<p><b>Automatically reload</b> - Any files that are not modified in memory are "
--"reloaded, and an alert is shown for any conflicts</p>"
-+"<p><b>Alert the user</b> - A dialog will alert the user that a file has "
-+"changed and offer the user to reload the file</p>\n"
-+"<p><b>Automatically reload</b> - Any files that are not modified in memory "
-+"are reloaded, and an alert is shown for any conflicts</p>"
- msgstr ""
- "<p><b>當已開啟的檔案在磁碟中已變更時要採取的動作</b></p>\n"
--"<p><b>什麼也不做</b>─檔案會被標記為被外部變更，使用者會被詢問是否要覆寫。</p>\n"
--"<p><b>警告使用者</b>─會跳出一個對話框，警告使用者檔案已變更，並允許使用者重新載入該檔案。</p>\n"
--"<p><b>自動重新載入</b>─所有在記憶體中變更的檔案會重新載入，如果有衝突時會顯示警告。</p>"
-+"<p><b>什麼也不做</b>─檔案會被標記為被外部變更，使用者會被詢問是否要覆寫。</"
-+"p>\n"
-+"<p><b>警告使用者</b>─會跳出一個對話框，警告使用者檔案已變更，並允許使用者重新"
-+"載入該檔案。</p>\n"
-+"<p><b>自動重新載入</b>─所有在記憶體中變更的檔案會重新載入，如果有衝突時會顯示"
-+"警告。</p>"
- 
- #. i18n: file ./editors/editor-chooser/editchooser.ui line 68
- #: rc.cpp:4956
-@@ -8097,7 +8181,7 @@
- #: rc.cpp:5040 rc.cpp:5935
- #, no-c-format
- msgid "Main &source file:"
--msgstr "主要源碼檔案(&S)："
-+msgstr "主要原始碼檔案(&S)："
- 
- #. i18n: file ./buildtools/ada/adaproject_optionsdlgbase.ui line 349
- #: rc.cpp:5043
-@@ -8173,7 +8257,7 @@
- #: rc.cpp:5079 rc.cpp:5121
- #, no-c-format
- msgid "Choose File to Add..."
--msgstr "選擇要新增的檔案..."
-+msgstr "選擇要新增的檔案…"
- 
- #. i18n: file ./buildtools/lib/parsers/qmake/tests/viewerbase.ui line 137
- #: rc.cpp:5082 rc.cpp:5103
-@@ -8278,11 +8362,12 @@
- #: rc.cpp:5166
- #, no-c-format
- msgid ""
--"For Automake and QMake type projects, the proper way to set these options are "
--"per target in the <b>Automake Manager</b> and <b>QMake Manager</b>"
--", respectively."
-+"For Automake and QMake type projects, the proper way to set these options "
-+"are per target in the <b>Automake Manager</b> and <b>QMake Manager</b>, "
-+"respectively."
- msgstr ""
--"Automake 與 QMake 專案要設定這些選項，應該到 Automake Manager 與 QMake Manager 對每個目標分別去設定。"
-+"Automake 與 QMake 專案要設定這些選項，應該到 Automake Manager 與 QMake "
-+"Manager 對每個目標分別去設定。"
- 
- #. i18n: file ./buildtools/lib/widgets/runoptionswidgetbase.ui line 66
- #: rc.cpp:5169
-@@ -8344,7 +8429,7 @@
- msgid ""
- "If the program is not up-to-date with the source code, compile it before "
- "starting its execution"
--msgstr "如果程式與源碼不同步，則在執行前先進行編譯"
-+msgstr "如果程式與原始碼不同步，則在執行前先進行編譯"
- 
- #. i18n: file ./buildtools/lib/widgets/runoptionswidgetbase.ui line 174
- #: rc.cpp:5202
-@@ -8356,7 +8441,7 @@
- #: rc.cpp:5205
- #, no-c-format
- msgid "Use &kdesu when installing"
--msgstr "安裝時使用 kdesu (&K)"
-+msgstr "安裝時使用 kdesu(&K)"
- 
- #. i18n: file ./buildtools/lib/widgets/runoptionswidgetbase.ui line 196
- #: rc.cpp:5208
-@@ -8527,8 +8612,8 @@
- #: rc.cpp:5321
- #, no-c-format
- msgid ""
--"This is the top level qmake project file, from which the project manager will "
--"be populated.\n"
-+"This is the top level qmake project file, from which the project manager "
-+"will be populated.\n"
- "Leave this empty to automatically search for a .pro file in the project "
- "directory."
- msgstr ""
-@@ -8545,9 +8630,11 @@
- #: rc.cpp:5328
- #, no-c-format
- msgid ""
--"The following settings determine what the project configuration dialog should "
--"do when another subproject is selected while the dialog is still open."
--msgstr "以下的設定是決定當對話框開啟中，而同時另一個子專案被選取時，專案設定對話框要做什麼動作。"
-+"The following settings determine what the project configuration dialog "
-+"should do when another subproject is selected while the dialog is still open."
-+msgstr ""
-+"以下的設定是決定當對話框開啟中，而同時另一個子專案被選取時，專案設定對話框要"
-+"做什麼動作。"
- 
- #. i18n: file ./buildtools/qmake/qmakeoptionswidgetbase.ui line 92
- #: rc.cpp:5331
-@@ -8618,8 +8705,8 @@
- #: rc.cpp:5361
- #, no-c-format
- msgid ""
--"This replaces the relative paths of added files with existing custom variables "
--"if the value assigned to it is the same as the path."
-+"This replaces the relative paths of added files with existing custom "
-+"variables if the value assigned to it is the same as the path."
- msgstr "若是指定的值與路徑相同，這會以現有的自訂變數取代新增檔案的相對路徑"
- 
- #. i18n: file ./buildtools/qmake/qmakeoptionswidgetbase.ui line 161
-@@ -8752,7 +8839,7 @@
- #: rc.cpp:5425
- #, no-c-format
- msgid "&use !include instead of include"
--msgstr "用 !include 而不用 include (&U)"
-+msgstr "用 !include 而不用 include(&U)"
- 
- #. i18n: file ./buildtools/qmake/createscopedlgbase.ui line 225
- #: rc.cpp:5428
-@@ -9035,13 +9122,13 @@
- #: rc.cpp:5596
- #, no-c-format
- msgid "Console"
--msgstr "控制台"
-+msgstr "控制臺"
- 
- #. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 586
- #: rc.cpp:5599
- #, no-c-format
- msgid "Check to build a win32 console app"
--msgstr "勾選以建立 win32 主控台應用程式"
-+msgstr "勾選以建立 win32 主控臺應用程式"
- 
- #. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 599
- #: rc.cpp:5602
-@@ -9217,7 +9304,7 @@
- #: rc.cpp:5695 rc.cpp:5716 rc.cpp:5734 rc.cpp:5773
- #, no-c-format
- msgid "Add..."
--msgstr "新增..."
-+msgstr "新增…"
- 
- #. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 1074
- #: rc.cpp:5710
-@@ -9489,9 +9576,11 @@
- #: rc.cpp:5956
- #, no-c-format
- msgid ""
--"There are myriads of buildtools out there that are not ant or make. If you use "
--"one of them (or have your own scripts), select this option."
--msgstr "編譯與建立專案的工具有無數種，如果您不是用 ant 或 make，或是有自己的文稿，請選擇此選項。"
-+"There are myriads of buildtools out there that are not ant or make. If you "
-+"use one of them (or have your own scripts), select this option."
-+msgstr ""
-+"編譯與建立專案的工具有無數種，如果您不是用 ant 或 make，或是有自己的文稿，請"
-+"選擇此選項。"
- 
- #. i18n: file ./buildtools/custommakefiles/custombuildoptionswidgetbase.ui line 93
- #: rc.cpp:5959
-@@ -9571,19 +9660,21 @@
- #: rc.cpp:6007
- #, no-c-format
- msgid ""
--"Add filetypes to be used in Projects, can be full filenames or shell wildcards"
-+"Add filetypes to be used in Projects, can be full filenames or shell "
-+"wildcards"
- msgstr "新增專案中使用的檔案類型，可以是完整檔名或是 shell 的萬用字元"
- 
- #. i18n: file ./buildtools/custommakefiles/custommanagerwidgetbase.ui line 45
- #: rc.cpp:6010
- #, no-c-format
- msgid ""
--"Each entry contains a filetype used in the project in the form of a filename or "
--"a filename wildcard (using shell wildcards). \n"
--"This will be used when adding/removing files in directories and re-populating "
--"the project"
-+"Each entry contains a filetype used in the project in the form of a filename "
-+"or a filename wildcard (using shell wildcards). \n"
-+"This will be used when adding/removing files in directories and re-"
-+"populating the project"
- msgstr ""
--"每個項目包含一個用於此專案的檔案型態，或是檔名的萬用字元（用 shell 形式的萬用字元）。\n"
-+"每個項目包含一個用於此專案的檔案型態，或是檔名的萬用字元（用 shell 形式的萬用"
-+"字元）。\n"
- "這會用於在目錄中新增、移除檔案並重建專案。"
- 
- #. i18n: file ./buildtools/custommakefiles/custommakeconfigwidgetbase.ui line 27
-@@ -9722,7 +9813,7 @@
- #: rc.cpp:6101
- #, no-c-format
- msgid "&Source Directory"
--msgstr "源碼目錄(&S)"
-+msgstr "原始碼目錄(&S)"
- 
- #. i18n: file ./buildtools/autotools/addexistingdlgbase.ui line 364
- #: rc.cpp:6104
-@@ -9884,9 +9975,11 @@
- #: rc.cpp:6221
- #, no-c-format
- msgid ""
--"<qt><b>Note:</b> If you cancel, your files will be created but will <b>not</b> "
--"be added to the project.</qt>"
--msgstr "<b>注意：</b>如果您取消的話，您的檔案將被建立，<b>但是不會</b>被新增到專案中。"
-+"<qt><b>Note:</b> If you cancel, your files will be created but will <b>not</"
-+"b> be added to the project.</qt>"
-+msgstr ""
-+"<b>注意：</b>如果您取消的話，您的檔案將被建立，<b>但是不會</b>被新增到專案"
-+"中。"
- 
- #. i18n: file ./buildtools/autotools/choosetargetdlgbase.ui line 172
- #: rc.cpp:6224
-@@ -10066,7 +10159,7 @@
- #: rc.cpp:6380
- #, no-c-format
- msgid "Top source &directory:"
--msgstr "最上層源碼目錄(&D)："
-+msgstr "最上層原始碼目錄(&D)："
- 
- #. i18n: file ./buildtools/autotools/configureoptionswidgetbase.ui line 214
- #: rc.cpp:6383 rc.cpp:6398
-@@ -10102,7 +10195,9 @@
- "If the name does not have a leading /\n"
- "then it is relative to the project directory.\n"
- "(in the General page)"
--msgstr "要到哪裡去找程式源碼檔。如果名稱不是以 / 開頭，則表示相對於此專案目錄（可以在「一般」頁中設定）。"
-+msgstr ""
-+"要到哪裡去找程式原始碼檔。如果名稱不是以 / 開頭，則表示相對於此專案目錄（可以在"
-+"「一般」頁中設定）。"
- 
- #. i18n: file ./buildtools/autotools/configureoptionswidgetbase.ui line 335
- #: rc.cpp:6434 rc.cpp:6438 rc.cpp:6442
-@@ -10110,7 +10205,8 @@
- msgid ""
- "Linker flags, e.g. -L<lib dir> if you have libraries in a\n"
- "nonstandard directory <lib dir>"
--msgstr "連結器旗標，例如 -L<函式庫目錄>，當您使用非標準函式庫目錄中的函式庫時使用。"
-+msgstr ""
-+"連結器旗標，例如 -L<函式庫目錄>，當您使用非標準函式庫目錄中的函式庫時使用。"
- 
- #. i18n: file ./buildtools/autotools/configureoptionswidgetbase.ui line 374
- #: rc.cpp:6446 rc.cpp:6450 rc.cpp:6457
-@@ -10118,7 +10214,9 @@
- msgid ""
- "C/C++ preprocessor flags, e.g. -I<include dir> if you have\n"
- "headers in a nonstandard directory <include dir>"
--msgstr "C/C++ 前置處理器旗標，例如 -I<標頭檔目錄>，當您使用的標頭檔並不是在標準的目錄中時使用。"
-+msgstr ""
-+"C/C++ 前置處理器旗標，例如 -I<標頭檔目錄>，當您使用的標頭檔並不是在標準的目錄"
-+"中時使用。"
- 
- #. i18n: file ./buildtools/autotools/configureoptionswidgetbase.ui line 403
- #: rc.cpp:6454
-@@ -10646,9 +10744,8 @@
- #: rc.cpp:6892
- #, no-c-format
- msgid ""
--"<b>New Form</b>"
--"<p>Select a template for the new form and click the <b>OK</b>"
--"-button to create it.</p>"
-+"<b>New Form</b><p>Select a template for the new form and click the <b>OK</b>-"
-+"button to create it.</p>"
- msgstr "<b>新表單</b><p>選取新表單的樣本，並按下<b>確定</b>建立。"
- 
- #. i18n: file ./kdevdesigner/designer/newform.ui line 115
-@@ -10697,7 +10794,7 @@
- #: rc.cpp:6934
- #, no-c-format
- msgid "&Edit Slots..."
--msgstr "編輯插槽(&E)..."
-+msgstr "編輯插槽(&E)…"
- 
- #. i18n: file ./kdevdesigner/designer/paletteeditoradvanced.ui line 44
- #: rc.cpp:6937
-@@ -10709,17 +10806,14 @@
- #: rc.cpp:6940
- #, no-c-format
- msgid ""
--"<b>Edit Palette</b>"
--"<p>Change the current widget or form's palette.</p>"
--"<p>Use a generated palette or select colors for each color group and each color "
--"role.</p>"
--"<p>The palette can be tested with different widget layouts in the preview "
--"section.</p>"
--msgstr ""
--"<b>編輯調色板</b>"
--"<p>變更目前的元件或表單的調色板。</p> "
--"<p>使用產生的調色板，或幫每個顏色群組與顏色角色選取顏色。</p> "
--"<p>調色板可以用前一段的不同的元件佈局來測試。</p>"
-+"<b>Edit Palette</b><p>Change the current widget or form's palette.</p><p>Use "
-+"a generated palette or select colors for each color group and each color "
-+"role.</p><p>The palette can be tested with different widget layouts in the "
-+"preview section.</p>"
-+msgstr ""
-+"<b>編輯調色板</b><p>變更目前的元件或表單的調色板。</p> <p>使用產生的調色板，"
-+"或幫每個顏色群組與顏色角色選取顏色。</p> <p>調色板可以用前一段的不同的元件布"
-+"局來測試。</p>"
- 
- #. i18n: file ./kdevdesigner/designer/paletteeditoradvanced.ui line 87
- #: rc.cpp:6943 rc.cpp:7633
-@@ -10846,36 +10940,29 @@
- #: rc.cpp:7003
- #, no-c-format
- msgid ""
--"<b>Select a color role.</b>"
--"<p>Available central color roles are: "
--"<ul> "
--"<li>Background - general background color.</li> "
--"<li>Foreground - general foreground color. </li> "
--"<li>Base - used as the background color for example, for text entry widgets; it "
--"is usually white or another light color. </li> "
--"<li>Text - the forground color used with Base. Usually this is the same as the "
--"Foreground, in which case it must provide good contrast both with the "
--"Background and with the Base. </li> "
--"<li>Button - general button background color; useful where buttons need a "
--"background different from Background, as in the Macintosh style. </li> "
--"<li>ButtonText - a foreground color used with the Button color. </li> "
--"<li>Highlight - a color used to indicate a selected or highlighted item. </li> "
--"<li>HighlightedText - a text color that contrasts to Highlight. </li> "
--"<li>BrightText - a text color that is very different from Foreground and "
--"contrasts well with, for example, black. </li> </ul> </p>"
--msgstr ""
--"<b>選取顏色角色。</b>"
--"<p>可用的中心顏色角色包括： "
--"<ul>"
--"<li>背景─產生背景顏色。</li> "
--"<li>前景─產生前景顏色。</li> "
--"<li>基色─在範例中做為背景顏色，在文字項目元件中，通常是白色或其它亮的顏色。</li> "
--"<li>文字─與基色一起使用的前景顏色。通常與「前景」使用一樣的顏色，必須要與基色與背景色有夠高的對比。</li> "
--"<li>按鍵─一般按鍵的背景顏色，用於按鍵的背景色與「背景」中的設定不同的時候，例如在麥金塔風格中。</li> "
--"<li>按鍵文字─按鍵中的前景顏色。</li> "
--"<li>高亮度─用於指出所選取或重點的項目。</li> "
--"<li>高亮度文字─與「高亮度」對比的文字顏色。</li> "
--"<li>亮文字─與前景非常不同的文字顏色，要與黑色這一類別的顏色有強烈對比。</li> </ul> </p>"
-+"<b>Select a color role.</b><p>Available central color roles are: <ul> "
-+"<li>Background - general background color.</li> <li>Foreground - general "
-+"foreground color. </li> <li>Base - used as the background color for example, "
-+"for text entry widgets; it is usually white or another light color. </li> "
-+"<li>Text - the forground color used with Base. Usually this is the same as "
-+"the Foreground, in which case it must provide good contrast both with the "
-+"Background and with the Base. </li> <li>Button - general button background "
-+"color; useful where buttons need a background different from Background, as "
-+"in the Macintosh style. </li> <li>ButtonText - a foreground color used with "
-+"the Button color. </li> <li>Highlight - a color used to indicate a selected "
-+"or highlighted item. </li> <li>HighlightedText - a text color that contrasts "
-+"to Highlight. </li> <li>BrightText - a text color that is very different "
-+"from Foreground and contrasts well with, for example, black. </li> </ul> </p>"
-+msgstr ""
-+"<b>選取顏色角色。</b><p>可用的中心顏色角色包括： <ul><li>背景─產生背景顏色。"
-+"</li> <li>前景─產生前景顏色。</li> <li>基色─在範例中做為背景顏色，在文字項目"
-+"元件中，通常是白色或其它亮的顏色。</li> <li>文字─與基色一起使用的前景顏色。通"
-+"常與「前景」使用一樣的顏色，必須要與基色與背景色有夠高的對比。</li> <li>按鍵─"
-+"一般按鍵的背景顏色，用於按鍵的背景色與「背景」中的設定不同的時候，例如在麥金"
-+"塔風格中。</li> <li>按鍵文字─按鍵中的前景顏色。</li> <li>高亮度─用於指出所選"
-+"取或重點的項目。</li> <li>高亮度文字─與「高亮度」對比的文字顏色。</li> <li>亮"
-+"文字─與前景非常不同的文字顏色，要與黑色這一類別的顏色有強烈對比。</li> </ul> "
-+"</p>"
- 
- #. i18n: file ./kdevdesigner/designer/paletteeditoradvanced.ui line 287
- #: rc.cpp:7006
-@@ -10977,23 +11064,14 @@
- #: rc.cpp:7054
- #, no-c-format
- msgid ""
--"<b>Select a color effect role.</b>"
--"<p>Available effect roles are: "
--"<ul> "
--"<li>Light - lighter than Button color. </li> "
--"<li>Midlight - between Button and Light. </li> "
--"<li>Mid - between Button and Dark. </li> "
--"<li>Dark - darker than Button. </li> "
--"<li>Shadow - a very dark color. </li> </ul>"
--msgstr ""
--"<b>選取顏色效果角色。</b>"
--"<p>可用的效果角色有："
--"<ul> "
--"<li>亮─比按鍵顏色亮的顏色。</li> "
--"<li>中亮─在按鍵色與「亮」之間。</li> "
--"<li>中─在按鍵色與「暗」之間。</li> "
--"<li>暗─比按鍵色暗的顏色。"
--"<li>陰影─非常暗的顏色。</li></ul>"
-+"<b>Select a color effect role.</b><p>Available effect roles are: <ul> "
-+"<li>Light - lighter than Button color. </li> <li>Midlight - between Button "
-+"and Light. </li> <li>Mid - between Button and Dark. </li> <li>Dark - darker "
-+"than Button. </li> <li>Shadow - a very dark color. </li> </ul>"
-+msgstr ""
-+"<b>選取顏色效果角色。</b><p>可用的效果角色有：<ul> <li>亮─比按鍵顏色亮的顏"
-+"色。</li> <li>中亮─在按鍵色與「亮」之間。</li> <li>中─在按鍵色與「暗」之間。"
-+"</li> <li>暗─比按鍵色暗的顏色。<li>陰影─非常暗的顏色。</li></ul>"
- 
- #. i18n: file ./kdevdesigner/designer/paletteeditoradvanced.ui line 500
- #: rc.cpp:7057
-@@ -11119,17 +11197,14 @@
- #: rc.cpp:7147
- #, no-c-format
- msgid ""
--"<b>Edit Iconview</b>"
--"<p>Add, edit or delete items in the icon view.</p>"
--"<p>Click the <b>New Item</b>-button to create a new item, then enter text and "
--"choose a pixmap.</p>"
--"<p>Select an item from the view and click the <b>Delete Item</b>"
--"-button to remove the item from the iconview.</p>"
--msgstr ""
--"<b>編輯圖示檢視</b>"
--"<p>新增、編輯或刪除在圖示檢視中的項目。</p> "
--"<p>點選「新增項目」並輸入文字與選擇像素圖，就可以在檢視中新增項目。</p> "
--"<p>選取檢視中的項目並點選「刪除項目」就可以移除項目。</p>"
-+"<b>Edit Iconview</b><p>Add, edit or delete items in the icon view.</"
-+"p><p>Click the <b>New Item</b>-button to create a new item, then enter text "
-+"and choose a pixmap.</p><p>Select an item from the view and click the "
-+"<b>Delete Item</b>-button to remove the item from the iconview.</p>"
-+msgstr ""
-+"<b>編輯圖示檢視</b><p>新增、編輯或刪除在圖示檢視中的項目。</p> <p>點選「新增"
-+"項目」並輸入文字與選擇像素圖，就可以在檢視中新增項目。</p> <p>選取檢視中的項"
-+"目並點選「刪除項目」就可以移除項目。</p>"
- 
- #. i18n: file ./kdevdesigner/designer/iconvieweditor.ui line 78
- #: rc.cpp:7150
-@@ -11295,13 +11370,12 @@
- #: rc.cpp:7261
- #, no-c-format
- msgid ""
--"<b>Preferences</b>"
--"<p>Change the preferences of Qt Designer. There is always one tab with general "
--"preferences. There may be additional tabs, depending on which plugins are "
--"installed.</p>"
-+"<b>Preferences</b><p>Change the preferences of Qt Designer. There is always "
-+"one tab with general preferences. There may be additional tabs, depending on "
-+"which plugins are installed.</p>"
- msgstr ""
--"<b>喜好設定</b>"
--"<p>更改 Qt 設計器的喜好設定。一定會有一個分頁做為一般的喜好設定。而根據所安裝的外掛程式，也有可能有其它的分頁。</p>"
-+"<b>喜好設定</b><p>更改 Qt 設計器的喜好設定。一定會有一個分頁做為一般的喜好設"
-+"定。而根據所安裝的外掛程式，也有可能有其它的分頁。</p>"
- 
- #. i18n: file ./kdevdesigner/designer/preferences.ui line 79
- #: rc.cpp:7267
-@@ -11419,10 +11493,11 @@
- #: rc.cpp:7327
- #, no-c-format
- msgid ""
--"<b>Customize the grid-settings for all forms.</b>"
--"<p>When <b>Snap to Grid</b> is checked, the widgets snap to the grid using the "
--"the X/Y resolution.</p>"
--msgstr "<b>調整所有表單的格線設定。</b><p>勾選「貼齊格線」的話，元件會使用 X/Y 解析度來貼齊格線。</p>"
-+"<b>Customize the grid-settings for all forms.</b><p>When <b>Snap to Grid</b> "
-+"is checked, the widgets snap to the grid using the the X/Y resolution.</p>"
-+msgstr ""
-+"<b>調整所有表單的格線設定。</b><p>勾選「貼齊格線」的話，元件會使用 X/Y 解析度"
-+"來貼齊格線。</p>"
- 
- #. i18n: file ./kdevdesigner/designer/preferences.ui line 326
- #: rc.cpp:7330 rc.cpp:7336
-@@ -11434,10 +11509,11 @@
- #: rc.cpp:7333 rc.cpp:7339
- #, no-c-format
- msgid ""
--"<b>Customize the grid-settings for all forms.</b>"
--"<p>When <b>Show Grid</b> is checked, a grid is shown on all forms using the X/Y "
--"resolution.</p>"
--msgstr "<b>自訂所有表單的格線設定。</b> <p>勾選「顯示格線」以後，所有表單都會使用 X/Y 軸顯示格線。</p>"
-+"<b>Customize the grid-settings for all forms.</b><p>When <b>Show Grid</b> is "
-+"checked, a grid is shown on all forms using the X/Y resolution.</p>"
-+msgstr ""
-+"<b>自訂所有表單的格線設定。</b> <p>勾選「顯示格線」以後，所有表單都會使用 X/"
-+"Y 軸顯示格線。</p>"
- 
- #. i18n: file ./kdevdesigner/designer/preferences.ui line 357
- #: rc.cpp:7342
-@@ -11515,18 +11591,17 @@
- #: rc.cpp:7399
- #, no-c-format
- msgid ""
--"<b>Edit Listview</b>"
--"<p>Use the controls on the <b>Items</b>-tab to add, edit or delete items in the "
--"listview. Change the column configuration of the listview using the controls on "
--"the <b>Columns</b>-tab.</p>Click the <b>New Item</b>"
--"-button to create a new item, then enter text and add a pixmap.</p>"
--"<p>Select an item from the list and click the <b>Delete Item</b>"
--"-button to remove the item from the list.</p>"
--msgstr ""
--"<b>編輯列表檢視</b>"
--"<p>您可以在「項目」頁中新增、編輯、刪除在列表檢視裡的項目，或是在「欄位」頁中修改欄位設定。</p>"
--"<p>點選「新增項目」並輸入文字與加入像素圖可以新增一個項目。</p>"
--"<p>在列表中選取一個項目並點選「刪除項目」可以刪除該項目。</p>"
-+"<b>Edit Listview</b><p>Use the controls on the <b>Items</b>-tab to add, edit "
-+"or delete items in the listview. Change the column configuration of the "
-+"listview using the controls on the <b>Columns</b>-tab.</p>Click the <b>New "
-+"Item</b>-button to create a new item, then enter text and add a pixmap.</"
-+"p><p>Select an item from the list and click the <b>Delete Item</b>-button to "
-+"remove the item from the list.</p>"
-+msgstr ""
-+"<b>編輯列表檢視</b><p>您可以在「項目」頁中新增、編輯、刪除在列表檢視裡的項"
-+"目，或是在「欄位」頁中修改欄位設定。</p><p>點選「新增項目」並輸入文字與加入像"
-+"素圖可以新增一個項目。</p><p>在列表中選取一個項目並點選「刪除項目」可以刪除該"
-+"項目。</p>"
- 
- #. i18n: file ./kdevdesigner/designer/listvieweditor.ui line 68
- #: kdevdesigner/designer/listvieweditorimpl.cpp:631 rc.cpp:7402
-@@ -11556,8 +11631,8 @@
- #: rc.cpp:7426
- #, no-c-format
- msgid ""
--"<b>Change the text of the item.</b>"
--"<p>The text will be changed in the current column of the selected item.</p>"
-+"<b>Change the text of the item.</b><p>The text will be changed in the "
-+"current column of the selected item.</p>"
- msgstr "<b>更改項目的文字。</b><p>會改變選取的項目中目前欄位的文字。</p>"
- 
- #. i18n: file ./kdevdesigner/designer/listvieweditor.ui line 163
-@@ -11570,8 +11645,8 @@
- #: rc.cpp:7432
- #, no-c-format
- msgid ""
--"<b>Select the current column.</b>"
--"<p>The item's text and pixmap will be changed for the current column</p>"
-+"<b>Select the current column.</b><p>The item's text and pixmap will be "
-+"changed for the current column</p>"
- msgstr "<b>選擇目前的欄位。</b><p>目前欄位的文字與像素圖都會被更改。</p>"
- 
- #. i18n: file ./kdevdesigner/designer/listvieweditor.ui line 174
-@@ -11584,26 +11659,30 @@
- #: rc.cpp:7444 rc.cpp:8467 rc.cpp:8524
- #, no-c-format
- msgid ""
--"<b>Delete the selected item's pixmap.</b>"
--"<p>The pixmap in the current column of the selected item will be deleted.</p>"
--msgstr "<b>刪除所選取的項目的像素圖。</b><p>所選取項目中目前欄位的像素圖會被刪除。</p>"
-+"<b>Delete the selected item's pixmap.</b><p>The pixmap in the current column "
-+"of the selected item will be deleted.</p>"
-+msgstr ""
-+"<b>刪除所選取的項目的像素圖。</b><p>所選取項目中目前欄位的像素圖會被刪除。</"
-+"p>"
- 
- #. i18n: file ./kdevdesigner/designer/listvieweditor.ui line 242
- #: rc.cpp:7453 rc.cpp:8476 rc.cpp:8533
- #, no-c-format
- msgid ""
--"<b>Select a pixmap file for the item.</b>"
--"<p>The pixmap will be changed in the current column of the selected item.</p>"
--msgstr "<b>選擇此項目的像素圖檔。</b><p>所選取項目中目前欄位的像素圖會被更改。</p>"
-+"<b>Select a pixmap file for the item.</b><p>The pixmap will be changed in "
-+"the current column of the selected item.</p>"
-+msgstr ""
-+"<b>選擇此項目的像素圖檔。</b><p>所選取項目中目前欄位的像素圖會被更改。</p>"
- 
- #. i18n: file ./kdevdesigner/designer/listvieweditor.ui line 260
- #: rc.cpp:7462
- #, no-c-format
- msgid ""
--"<b>Adds a new item to the list.</b>"
--"<p>The item will be inserted at the top of the list and can be moved using the "
--"up- and down-buttons.</p>"
--msgstr "<b>新增項目到列表中。</b><p>項目會被放在列表中的最頂端，可以用按鍵來移動。</p>"
-+"<b>Adds a new item to the list.</b><p>The item will be inserted at the top "
-+"of the list and can be moved using the up- and down-buttons.</p>"
-+msgstr ""
-+"<b>新增項目到列表中。</b><p>項目會被放在列表中的最頂端，可以用按鍵來移動。</"
-+"p>"
- 
- #. i18n: file ./kdevdesigner/designer/listvieweditor.ui line 268
- #: rc.cpp:7465 rc.cpp:8308
-@@ -11627,10 +11706,12 @@
- #: rc.cpp:7474
- #, no-c-format
- msgid ""
--"<b>Create a new sub-item for the selected item.</b>"
--"<p>New sub-items are inserted at the top of the list of sub-items, and new "
--"levels are created automatically.</p>"
--msgstr "<b>建立所選取項目的子項目。</b><p>新的子項目會被放在子項目列表中的最頂端，並且會自動建立新的等級。</p>"
-+"<b>Create a new sub-item for the selected item.</b><p>New sub-items are "
-+"inserted at the top of the list of sub-items, and new levels are created "
-+"automatically.</p>"
-+msgstr ""
-+"<b>建立所選取項目的子項目。</b><p>新的子項目會被放在子項目列表中的最頂端，並"
-+"且會自動建立新的等級。</p>"
- 
- #. i18n: file ./kdevdesigner/designer/listvieweditor.ui line 313
- #: rc.cpp:7477 rc.cpp:7573 rc.cpp:8362 rc.cpp:8440 rc.cpp:8494
-@@ -11642,8 +11723,8 @@
- #: rc.cpp:7480
- #, no-c-format
- msgid ""
--"<b>Move the selected item up.</b>"
--"<p>The item will be moved within its level in the hierarchy.</p>"
-+"<b>Move the selected item up.</b><p>The item will be moved within its level "
-+"in the hierarchy.</p>"
- msgstr "<b>將所選取的項目往上移。</b><p>項目會在它在階層中的等級內移動。</p>"
- 
- #. i18n: file ./kdevdesigner/designer/listvieweditor.ui line 330
-@@ -11656,8 +11737,8 @@
- #: rc.cpp:7486
- #, no-c-format
- msgid ""
--"<b>Move the selected item down.</b>"
--"<p>The item will be moved within its level in the hierarchy.</p>"
-+"<b>Move the selected item down.</b><p>The item will be moved within its "
-+"level in the hierarchy.</p>"
- msgstr "<b>將所選取的項目往下移。</b><p>項目會在它在階層中的等級內移動。</p>"
- 
- #. i18n: file ./kdevdesigner/designer/listvieweditor.ui line 347
-@@ -11670,8 +11751,8 @@
- #: rc.cpp:7492
- #, no-c-format
- msgid ""
--"<b>Move the selected item one level up.</b>"
--"<p>This will also change the level of the item's sub-items.</p>"
-+"<b>Move the selected item one level up.</b><p>This will also change the "
-+"level of the item's sub-items.</p>"
- msgstr "<b>將所選取的項目往上移一個等級。</b><p>這會一起改變子項目的等級。</p>"
- 
- #. i18n: file ./kdevdesigner/designer/listvieweditor.ui line 364
-@@ -11684,8 +11765,8 @@
- #: rc.cpp:7498
- #, no-c-format
- msgid ""
--"<b>Move the selected item one level down.</b>"
--"<p>This will also change the level of the item's sub-items.</p>"
-+"<b>Move the selected item one level down.</b><p>This will also change the "
-+"level of the item's sub-items.</p>"
- msgstr "<b>將所選取的項目往下移一個等級。</b><p>這會一起改變子項目的等級。</p>"
- 
- #. i18n: file ./kdevdesigner/designer/listvieweditor.ui line 377
-@@ -11710,9 +11791,10 @@
- #: rc.cpp:7525
- #, no-c-format
- msgid ""
--"<b>Select a pixmap file for the selected column.</b>"
--"<p>The pixmap will be displayed in the header of the listview.</p>"
--msgstr "選擇所選取欄位的像素圖檔。</b><p>此像素圖會被顯示在列表檢視的標頭。</p>"
-+"<b>Select a pixmap file for the selected column.</b><p>The pixmap will be "
-+"displayed in the header of the listview.</p>"
-+msgstr ""
-+"選擇所選取欄位的像素圖檔。</b><p>此像素圖會被顯示在列表檢視的標頭。</p>"
- 
- #. i18n: file ./kdevdesigner/designer/listvieweditor.ui line 490
- #: rc.cpp:7531
-@@ -11724,8 +11806,8 @@
- #: rc.cpp:7534
- #, no-c-format
- msgid ""
--"<b>Enter the text for the selected column.</b>"
--"<p>The text will be displayed in the header of the listview.</p>"
-+"<b>Enter the text for the selected column.</b><p>The text will be displayed "
-+"in the header of the listview.</p>"
- msgstr "<b>輸入選取欄位的文字。</b><p>文字會被顯示在列表檢視的標頭。</p>"
- 
- #. i18n: file ./kdevdesigner/designer/listvieweditor.ui line 501
-@@ -11776,9 +11858,10 @@
- #: rc.cpp:7561
- #, no-c-format
- msgid ""
--"<b>Move the selected item down.</b>"
--"<p>The top-most column will be the first column in the list.</p>"
--msgstr "<b>將所選取的項目下移。</b><p>最頂端的欄位會成為列表中的第一個欄位。</p>"
-+"<b>Move the selected item down.</b><p>The top-most column will be the first "
-+"column in the list.</p>"
-+msgstr ""
-+"<b>將所選取的項目下移。</b><p>最頂端的欄位會成為列表中的第一個欄位。</p>"
- 
- #. i18n: file ./kdevdesigner/designer/listvieweditor.ui line 556
- #: rc.cpp:7564 rc.cpp:8455
-@@ -11796,18 +11879,19 @@
- #: rc.cpp:7570
- #, no-c-format
- msgid ""
--"<b>Create a new column.</b>"
--"<p>New columns are appended at the end of (right of) the list and may be moved "
--"using the up- and down-buttons.</p>"
--msgstr "<b>建立一個新欄位。</b><p>新欄位會被附在列表的底端（右方），您可以移動。</p>"
-+"<b>Create a new column.</b><p>New columns are appended at the end of (right "
-+"of) the list and may be moved using the up- and down-buttons.</p>"
-+msgstr ""
-+"<b>建立一個新欄位。</b><p>新欄位會被附在列表的底端（右方），您可以移動。</p>"
- 
- #. i18n: file ./kdevdesigner/designer/listvieweditor.ui line 579
- #: rc.cpp:7576
- #, no-c-format
- msgid ""
--"<b>Move the selected item up.</b>"
--"<p>The top-most column will be the first column in the list.</p>"
--msgstr "<b>將所選取的項目上移。</b><p>最頂端的欄位會成為列表中的第一個欄位。</p>"
-+"<b>Move the selected item up.</b><p>The top-most column will be the first "
-+"column in the list.</p>"
-+msgstr ""
-+"<b>將所選取的項目上移。</b><p>最頂端的欄位會成為列表中的第一個欄位。</p>"
- 
- #. i18n: file ./kdevdesigner/designer/listvieweditor.ui line 587
- #: rc.cpp:7579
-@@ -11855,7 +11939,7 @@
- #: rc.cpp:7627
- #, no-c-format
- msgid "&Tune Palette..."
--msgstr "調整調色板(&T)..."
-+msgstr "調整調色板(&T)…"
- 
- #. i18n: file ./kdevdesigner/designer/paletteeditor.ui line 239
- #: rc.cpp:7630
-@@ -11873,10 +11957,11 @@
- #: rc.cpp:7663
- #, no-c-format
- msgid ""
--"<b>Edit Custom Widgets</b>"
--"<p>Add or delete custom widgets from <i>Qt Designer</i>"
--"'s database, and edit the properties of existing widgets.</p>"
--msgstr "<b>編輯自訂元件</b><p>從 Qt 設計器的資料庫中新增或刪除欄位元件，並編輯現有元件的屬性。</p>"
-+"<b>Edit Custom Widgets</b><p>Add or delete custom widgets from <i>Qt "
-+"Designer</i>'s database, and edit the properties of existing widgets.</p>"
-+msgstr ""
-+"<b>編輯自訂元件</b><p>從 Qt 設計器的資料庫中新增或刪除欄位元件，並編輯現有元"
-+"件的屬性。</p>"
- 
- #. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 64
- #: rc.cpp:7666
-@@ -11900,10 +11985,12 @@
- #: rc.cpp:7675
- #, no-c-format
- msgid ""
--"<b>Create an empty custom widget and add it to the list.</b>"
--"<p>New custom widgets have a default name and header file, which must both be "
--"changed to appropriate values.</p>"
--msgstr "<b>建立一個空的自訂元件，並加到列表中。</b><p>新的自訂元件會有預設的名稱與標頭檔，您必須修改為適合的值。</p>"
-+"<b>Create an empty custom widget and add it to the list.</b><p>New custom "
-+"widgets have a default name and header file, which must both be changed to "
-+"appropriate values.</p>"
-+msgstr ""
-+"<b>建立一個空的自訂元件，並加到列表中。</b><p>新的自訂元件會有預設的名稱與標"
-+"頭檔，您必須修改為適合的值。</p>"
- 
- #. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 86
- #: rc.cpp:7678
-@@ -11921,9 +12008,11 @@
- #: rc.cpp:7684
- #, no-c-format
- msgid ""
--"<b>Delete the selected custom widget.</b>"
--"<p>You can only delete widgets that are not used in any open form.</p>"
--msgstr "<b>刪除所選取的自訂元件。</b><p>您只能刪除沒有被任何開啟的表單所使用的元件。</p>"
-+"<b>Delete the selected custom widget.</b><p>You can only delete widgets that "
-+"are not used in any open form.</p>"
-+msgstr ""
-+"<b>刪除所選取的自訂元件。</b><p>您只能刪除沒有被任何開啟的表單所使用的元件。"
-+"</p>"
- 
- #. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 148
- #: rc.cpp:7693
-@@ -11935,7 +12024,7 @@
- #: rc.cpp:7696
- #, no-c-format
- msgid "&Load Descriptions..."
--msgstr "載入描述(&L)..."
-+msgstr "載入描述(&L)…"
- 
- #. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 178
- #: rc.cpp:7699
-@@ -11947,27 +12036,28 @@
- #: rc.cpp:7702
- #, no-c-format
- msgid ""
--"<b>Load Descriptions</b>"
--"<p>Loads a file which contains descriptions of custom widgets, so that these "
--"custom widgets can be used in the Qt Designer.</p>\n"
--"<p>Since it is a lot of work to type in all the information for custom widgets, "
--"you should consider using the createcw tool which is in "
--"$QTDIR/tools/designer/tools/createcw. Using createcw you can create custom "
--"widget description files for your custom widgets without the need to type in "
--"all the information manually. For more information about the README file in the "
-+"<b>Load Descriptions</b><p>Loads a file which contains descriptions of "
-+"custom widgets, so that these custom widgets can be used in the Qt Designer."
-+"</p>\n"
-+"<p>Since it is a lot of work to type in all the information for custom "
-+"widgets, you should consider using the createcw tool which is in $QTDIR/"
-+"tools/designer/tools/createcw. Using createcw you can create custom widget "
-+"description files for your custom widgets without the need to type in all "
-+"the information manually. For more information about the README file in the "
- "createcw directory</p>"
- msgstr ""
--"<b>載入描述</b>"
--"<p>載入自訂元件的描述檔，讓這些自訂元件可以在 Qt 設計器中被使用。</p>\n"
-+"<b>載入描述</b><p>載入自訂元件的描述檔，讓這些自訂元件可以在 Qt 設計器中被使"
-+"用。</p>\n"
- "<p>因為自訂元件時要輸入一大堆的資訊，您應該考慮使用 createcw 這個工具，放在 "
--"$QTDIR/tools/designer/tools/createcw。使用此工具，您可以建立自訂元件描述檔，而不需要手動輸入一大堆的資料。您可以參考 "
--"createcw 目錄中的 README 檔以取得更多資訊。</p>"
-+"$QTDIR/tools/designer/tools/createcw。使用此工具，您可以建立自訂元件描述檔，"
-+"而不需要手動輸入一大堆的資料。您可以參考 createcw 目錄中的 README 檔以取得更"
-+"多資訊。</p>"
- 
- #. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 190
- #: rc.cpp:7706
- #, no-c-format
- msgid "&Save Descriptions..."
--msgstr "儲存描述(&S)..."
-+msgstr "儲存描述(&S)…"
- 
- #. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 193
- #: rc.cpp:7709
-@@ -11979,10 +12069,12 @@
- #: rc.cpp:7712
- #, no-c-format
- msgid ""
--"<b>Save Descriptions</b>"
--"<p>Saves all the descriptions of the shown custom widgets to a file which can "
--"then be used to import the custom widgets elsewhere."
--msgstr "<b>儲存描述</b><p>將所顯示的自訂元件的所有描述儲存到一個檔案中，您可以使用此檔將這些元件匯入到別的地方。"
-+"<b>Save Descriptions</b><p>Saves all the descriptions of the shown custom "
-+"widgets to a file which can then be used to import the custom widgets "
-+"elsewhere."
-+msgstr ""
-+"<b>儲存描述</b><p>將所顯示的自訂元件的所有描述儲存到一個檔案中，您可以使用此"
-+"檔將這些元件匯入到別的地方。"
- 
- #. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 204
- #: rc.cpp:7715
-@@ -12000,8 +12092,8 @@
- #: rc.cpp:7727
- #, no-c-format
- msgid ""
--"<b>Select a pixmap file.</b>"
--"<p>The pixmap will be used to represent the widget in forms.</p>"
-+"<b>Select a pixmap file.</b><p>The pixmap will be used to represent the "
-+"widget in forms.</p>"
- msgstr "<b>選擇像素圖檔。</b><p>像素圖會用於在表單中顯示此元件。</p>"
- 
- #. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 286
-@@ -12014,9 +12106,11 @@
- #: rc.cpp:7733
- #, no-c-format
- msgid ""
--"<b>Change the header file's name for the selected custom widget.</b>"
--"<p>The header file will be included by forms using the widget.</p>"
--msgstr "<b>變更所選取自訂元件的標頭檔名。</b><p>標頭檔會引入到使用此元件的表單中。</p>"
-+"<b>Change the header file's name for the selected custom widget.</b><p>The "
-+"header file will be included by forms using the widget.</p>"
-+msgstr ""
-+"<b>變更所選取自訂元件的標頭檔名。</b><p>標頭檔會引入到使用此元件的表單中。</"
-+"p>"
- 
- #. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 306
- #: rc.cpp:7739
-@@ -12040,10 +12134,12 @@
- #: rc.cpp:7754
- #, no-c-format
- msgid ""
--"<b>Change how the include file will be included.</b>"
--"<p>Global include files will be included using &lt;&gt;-brackets, while local "
--"files will included using quotation marks.</p>"
--msgstr "<b>變更如何引入檔案。</b><p>全域引入檔會使用 &lt;&gt; 來引入，本地端引入檔則會用 \"\" 引入。</p>"
-+"<b>Change how the include file will be included.</b><p>Global include files "
-+"will be included using &lt;&gt;-brackets, while local files will included "
-+"using quotation marks.</p>"
-+msgstr ""
-+"<b>變更如何引入檔案。</b><p>全域引入檔會使用 &lt;&gt; 來引入，本地端引入檔則"
-+"會用 \"\" 引入。</p>"
- 
- #. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 340
- #: rc.cpp:7757
-@@ -12055,8 +12151,8 @@
- #: rc.cpp:7760
- #, no-c-format
- msgid ""
--"<b>Enter the classname for the selected custom widget.</b>"
--"<p>A class of that name must be defined in the header file.</p>"
-+"<b>Enter the classname for the selected custom widget.</b><p>A class of that "
-+"name must be defined in the header file.</p>"
- msgstr "<b>輸入所選取自訂元件的類別名稱。</b><p>此類別必須定義在標頭檔中。</p>"
- 
- #. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 351
-@@ -12152,10 +12248,12 @@
- #: rc.cpp:7805 rc.cpp:7811
- #, no-c-format
- msgid ""
--"<b>Set the size hint for the selected widget.</b>"
--"<p>The size hint provides the recommended size for the widget. Enter a sizehint "
--"of -1/-1 if no size is recommended.</p>"
--msgstr "<b>設定所選取元件的大小提示。</b><p>大小提示會提供此元件建議的大小。如果沒有任何建議值，請輸入 -1/-1。</p>"
-+"<b>Set the size hint for the selected widget.</b><p>The size hint provides "
-+"the recommended size for the widget. Enter a sizehint of -1/-1 if no size is "
-+"recommended.</p>"
-+msgstr ""
-+"<b>設定所選取元件的大小提示。</b><p>大小提示會提供此元件建議的大小。如果沒有"
-+"任何建議值，請輸入 -1/-1。</p>"
- 
- #. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 473
- #: rc.cpp:7808
-@@ -12226,10 +12324,11 @@
- #: rc.cpp:7860
- #, no-c-format
- msgid ""
--"<b>Add a new signal for the current custom widget.</b>"
--"<p>An argument list should be provided in the signal's name, and the name must "
--"be unique.</p>"
--msgstr "<b>新增目前的自訂元件的信號。</b><p>信號名稱必須唯一，並且應該提供一個參數列表。</p>"
-+"<b>Add a new signal for the current custom widget.</b><p>An argument list "
-+"should be provided in the signal's name, and the name must be unique.</p>"
-+msgstr ""
-+"<b>新增目前的自訂元件的信號。</b><p>信號名稱必須唯一，並且應該提供一個參數列"
-+"表。</p>"
- 
- #. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 632
- #: rc.cpp:7863
-@@ -12247,8 +12346,8 @@
- #: rc.cpp:7869
- #, no-c-format
- msgid ""
--"<b>Delete the signal.</b>"
--"<p>All connections using this signal will also be deleted.</p>"
-+"<b>Delete the signal.</b><p>All connections using this signal will also be "
-+"deleted.</p>"
- msgstr "<b>刪除信號。</b><p>所有與此信號的連線都會被刪除。</p>"
- 
- #. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 665
-@@ -12267,10 +12366,11 @@
- #: rc.cpp:7878 rc.cpp:7899
- #, no-c-format
- msgid ""
--"<b>Change the name of the selected slot.</b>"
--"<p>An argument list should be provided in the signal's name, and the name must "
--"be unique.</p>"
--msgstr "<b>變更所選取插槽的名稱。</b><p>插槽名稱必須唯一，並且應該提供一個參數列表。</p>"
-+"<b>Change the name of the selected slot.</b><p>An argument list should be "
-+"provided in the signal's name, and the name must be unique.</p>"
-+msgstr ""
-+"<b>變更所選取插槽的名稱。</b><p>插槽名稱必須唯一，並且應該提供一個參數列表。"
-+"</p>"
- 
- #. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 691
- #: rc.cpp:7881
-@@ -12338,8 +12438,8 @@
- #: rc.cpp:7914
- #, no-c-format
- msgid ""
--"<b>Change the slot's access policy.</b>"
--"<p>You can only connect to the widget's public slots.</p>"
-+"<b>Change the slot's access policy.</b><p>You can only connect to the "
-+"widget's public slots.</p>"
- msgstr "<b>變更插槽的存取政策。</b><p>您只能連線到元件的公開插槽。</p>"
- 
- #. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 829
-@@ -12358,10 +12458,11 @@
- #: rc.cpp:7923
- #, no-c-format
- msgid ""
--"<b>Add a new slot to the current custom widget.</b>"
--"<p>An argument list should be provided in the signal's name, and the name must "
--"be unique.</p>"
--msgstr "<b>新增目前自訂元件的插槽。</b><p>插槽名稱必須唯一，並且應該提供一個參數列表。</p>"
-+"<b>Add a new slot to the current custom widget.</b><p>An argument list "
-+"should be provided in the signal's name, and the name must be unique.</p>"
-+msgstr ""
-+"<b>新增目前自訂元件的插槽。</b><p>插槽名稱必須唯一，並且應該提供一個參數列"
-+"表。</p>"
- 
- #. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 846
- #: rc.cpp:7926
-@@ -12379,8 +12480,8 @@
- #: rc.cpp:7932
- #, no-c-format
- msgid ""
--"<b>Delete the slot.</b>"
--"<p>All connections using this slot will also be deleted.</p>"
-+"<b>Delete the slot.</b><p>All connections using this slot will also be "
-+"deleted.</p>"
- msgstr "<b>刪除插槽。</b><p>所有使用此插槽的連線都會被刪除。</p>"
- 
- #. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 867
-@@ -12405,10 +12506,11 @@
- #: rc.cpp:7944
- #, no-c-format
- msgid ""
--"<b>Add a new property to the current custom widget.</b>"
--"<p>The properties must be implemented in the class using Qt's property "
--"system.</p>"
--msgstr "<b>新增目前自訂元件的屬性。</b><p>屬性必須使用 Qt 的屬性系統，在類別中實作。</p>"
-+"<b>Add a new property to the current custom widget.</b><p>The properties "
-+"must be implemented in the class using Qt's property system.</p>"
-+msgstr ""
-+"<b>新增目前自訂元件的屬性。</b><p>屬性必須使用 Qt 的屬性系統，在類別中實作。"
-+"</p>"
- 
- #. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 932
- #: rc.cpp:7947
-@@ -12522,22 +12624,19 @@
- #: rc.cpp:8004
- #, no-c-format
- msgid ""
--"<b>Select the type of the property.</b>"
--"<p>The property must be implemented in the class using Qt's property system.</p>"
--"<p>You can use integer types to support enumeration properties in the property "
--"editor.</p>"
--msgstr ""
--"<b>選擇屬性的型態。</b>"
--"<p>屬性必須使用 Qt 的屬性系統，在類別中實作。</p>"
--"<p>您可以在屬性編輯器中使用整數型態來支援 enum 屬性。</p>"
-+"<b>Select the type of the property.</b><p>The property must be implemented "
-+"in the class using Qt's property system.</p><p>You can use integer types to "
-+"support enumeration properties in the property editor.</p>"
-+msgstr ""
-+"<b>選擇屬性的型態。</b><p>屬性必須使用 Qt 的屬性系統，在類別中實作。</p><p>您"
-+"可以在屬性編輯器中使用整數型態來支援 enum 屬性。</p>"
- 
- #. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 1065
- #: rc.cpp:8013
- #, no-c-format
- msgid ""
--"<b>The list of the current widget's properties.</b>"
--"<p>The properties of the custom widget can be changed in the property "
--"editor.</p>"
-+"<b>The list of the current widget's properties.</b><p>The properties of the "
-+"custom widget can be changed in the property editor.</p>"
- msgstr "<b>目前元件屬性列表。</b><p>自訂元件的屬性可以在屬性編輯器中變更。</p>"
- 
- #. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 1073
-@@ -12550,9 +12649,8 @@
- #: rc.cpp:8019
- #, no-c-format
- msgid ""
--"<b>Enter a name for the property.</b>"
--"<p>The properties must be implemented in the class using Qt's property "
--"system.</p>"
-+"<b>Enter a name for the property.</b><p>The properties must be implemented "
-+"in the class using Qt's property system.</p>"
- msgstr "<b>輸入屬性名稱。</b><p>屬性必須使用 Qt 的屬性系統，在類別中實作。</p>"
- 
- #. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 1084
-@@ -12608,25 +12706,23 @@
- #: rc.cpp:8088
- #, no-c-format
- msgid ""
--"<p>Qt Commercial Edition license holders: This program is licensed to you under "
--"the terms of the Qt Commercial License Agreement. For details, see the file "
--"LICENSE that came with this software distribution.</p>"
--"<p></p>"
--"<p>Qt Free Edition users: This program is licensed to you under the terms of "
--"the GNU General Public License Version 2. For details, see the file LICENSE.GPL "
--"that came with this software distribution.</p>"
--"<p>The program is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE "
--"WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.</p>"
--msgstr ""
--"<p>Qt Commercial Edition license holders: This program is licensed to you under "
--"the terms of the Qt Commercial License Agreement. For details, see the file "
--"LICENSE that came with this software distribution.</p>"
--"<p></p>"
--"<p>Qt Free Edition users: This program is licensed to you under the terms of "
--"the GNU General Public License Version 2. For details, see the file LICENSE.GPL "
--"that came with this software distribution.</p>"
--"<p>The program is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE "
--"WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.</p>"
-+"<p>Qt Commercial Edition license holders: This program is licensed to you "
-+"under the terms of the Qt Commercial License Agreement. For details, see the "
-+"file LICENSE that came with this software distribution.</p><p></p><p>Qt Free "
-+"Edition users: This program is licensed to you under the terms of the GNU "
-+"General Public License Version 2. For details, see the file LICENSE.GPL that "
-+"came with this software distribution.</p><p>The program is provided AS IS "
-+"with NO WARRANTY OF ANY KIND, INCLUDING THE WARRANTY OF DESIGN, "
-+"MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.</p>"
-+msgstr ""
-+"<p>Qt Commercial Edition license holders: This program is licensed to you "
-+"under the terms of the Qt Commercial License Agreement. For details, see the "
-+"file LICENSE that came with this software distribution.</p><p></p><p>Qt Free "
-+"Edition users: This program is licensed to you under the terms of the GNU "
-+"General Public License Version 2. For details, see the file LICENSE.GPL that "
-+"came with this software distribution.</p><p>The program is provided AS IS "
-+"with NO WARRANTY OF ANY KIND, INCLUDING THE WARRANTY OF DESIGN, "
-+"MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.</p>"
- 
- #. i18n: file ./kdevdesigner/designer/projectsettings.ui line 41
- #: rc.cpp:8094
-@@ -12662,10 +12758,12 @@
- #: rc.cpp:8133
- #, no-c-format
- msgid ""
--"<b>Form Settings</b>"
--"<p>Change settings for the form. Settings like <b>Comment</b> and <b>Author</b> "
--"are for your own use and are not required.</p>"
--msgstr "<b>表單設定</b><p>變更此表單的設定。「註解」與「作者」是給您自己參考用的，並非必須的設定。</p>"
-+"<b>Form Settings</b><p>Change settings for the form. Settings like "
-+"<b>Comment</b> and <b>Author</b> are for your own use and are not required.</"
-+"p>"
-+msgstr ""
-+"<b>表單設定</b><p>變更此表單的設定。「註解」與「作者」是給您自己參考用的，並"
-+"非必須的設定。</p>"
- 
- #. i18n: file ./kdevdesigner/designer/formsettings.ui line 64
- #: rc.cpp:8136
-@@ -12689,12 +12787,12 @@
- #: rc.cpp:8145
- #, no-c-format
- msgid ""
--"<b>Save Inline</b>"
--"<p>Saves the pixmaps as binary data in the .ui files. Pixmaps saved like this "
--"are not shared between forms. We recommend using Project image files instead."
-+"<b>Save Inline</b><p>Saves the pixmaps as binary data in the .ui files. "
-+"Pixmaps saved like this are not shared between forms. We recommend using "
-+"Project image files instead."
- msgstr ""
--"<b>儲存為內含</b>"
--"<p>將像素圖以二進位資料的方式儲存在 .ui 檔中。像素圖以這種方式儲存的話，就不會分享給其它表單。我們建議使用專案影像檔來取代。</p>"
-+"<b>儲存為內含</b><p>將像素圖以二進位資料的方式儲存在 .ui 檔中。像素圖以這種方"
-+"式儲存的話，就不會分享給其它表單。我們建議使用專案影像檔來取代。</p>"
- 
- #. i18n: file ./kdevdesigner/designer/formsettings.ui line 98
- #: rc.cpp:8148
-@@ -12718,7 +12816,8 @@
- "fastest and most efficient way to use pixmaps in your forms.</p>"
- msgstr ""
- "<b>像素圖使用專案影像檔</b>\n"
--"<p>每個專案都有許多像素圖。如果您開發一個專案，我們建議您使用此選項，它能讓這些影像共用，並且您的表單中要使用像素圖的話，這是最快也最有效率的方法。</p>"
-+"<p>每個專案都有許多像素圖。如果您開發一個專案，我們建議您使用此選項，它能讓這"
-+"些影像共用，並且您的表單中要使用像素圖的話，這是最快也最有效率的方法。</p>"
- 
- #. i18n: file ./kdevdesigner/designer/formsettings.ui line 116
- #: rc.cpp:8158
-@@ -12731,10 +12830,12 @@
- #: rc.cpp:8161
- #, no-c-format
- msgid ""
--"<b>Specify Pixmap-Loader function</b>"
--"<p>Specify the function which should be used for loading a pixmap in the "
--"generated code. <em>Only enter the function's name, without parentheses.</em>"
--msgstr "<b>指定像素圖載入函式</b><p>指定用於載入像素圖的函式。<em>只要輸入函式名稱，不需要加括號。</em>"
-+"<b>Specify Pixmap-Loader function</b><p>Specify the function which should be "
-+"used for loading a pixmap in the generated code. <em>Only enter the "
-+"function's name, without parentheses.</em>"
-+msgstr ""
-+"<b>指定像素圖載入函式</b><p>指定用於載入像素圖的函式。<em>只要輸入函式名稱，"
-+"不需要加括號。</em>"
- 
- #. i18n: file ./kdevdesigner/designer/formsettings.ui line 127
- #: rc.cpp:8164
-@@ -12752,18 +12853,18 @@
- #: rc.cpp:8170
- #, no-c-format
- msgid ""
--"<b>Use a given function for pixmaps</b>"
--"<p>If you choose this option you must define a function in the line edit at the "
--"right which will be used in the generated code for loading pixmaps. When "
--"choosing a pixmap in <i>Qt Designer</i> you will be asked to specify the "
--"arguments which will be passed to the function in the generated code."
--"<p> This approach makes it possible to use your own icon-loader function for "
--"loading pixmaps.  <i>Qt Designer</i> cannot preview the correct image if you "
--"use your own function."
--msgstr ""
--"<b>像素圖使用指定的函式</b>"
--"<p>如果您選擇此選項，您必須在右方定義一個函式，用於載入像素圖。當您在 Qt 設計器中選擇像素圖時，您會被要求指定要傳給這些函式的參數。</p>"
--"<p>這種方法能讓您使用自己的圖示載入函式。Qt 設計器將無法預覽這些影像。</p>"
-+"<b>Use a given function for pixmaps</b><p>If you choose this option you must "
-+"define a function in the line edit at the right which will be used in the "
-+"generated code for loading pixmaps. When choosing a pixmap in <i>Qt "
-+"Designer</i> you will be asked to specify the arguments which will be passed "
-+"to the function in the generated code.<p> This approach makes it possible to "
-+"use your own icon-loader function for loading pixmaps.  <i>Qt Designer</i> "
-+"cannot preview the correct image if you use your own function."
-+msgstr ""
-+"<b>像素圖使用指定的函式</b><p>如果您選擇此選項，您必須在右方定義一個函式，用"
-+"於載入像素圖。當您在 Qt 設計器中選擇像素圖時，您會被要求指定要傳給這些函式的"
-+"參數。</p><p>這種方法能讓您使用自己的圖示載入函式。Qt 設計器將無法預覽這些影"
-+"像。</p>"
- 
- #. i18n: file ./kdevdesigner/designer/formsettings.ui line 166
- #: rc.cpp:8176
-@@ -12775,12 +12876,12 @@
- #: rc.cpp:8179
- #, no-c-format
- msgid ""
--"<b>Enter the name of the class that will be created.</b>"
--"<p><em>classname.h</em> and <em>classname.cpp</em> will be generated as C++ "
--"output when it is compiled by uic.</p>"
-+"<b>Enter the name of the class that will be created.</b><p><em>classname.h</"
-+"em> and <em>classname.cpp</em> will be generated as C++ output when it is "
-+"compiled by uic.</p>"
- msgstr ""
--"<b>輸入要建立的類別名稱。</b>"
--"<p>在讓 uic 編譯時，會產生 <em>【類別名稱】.h</em> 與 <em>【類別名稱】.cpp</em> 兩個 C++ 檔。</p>"
-+"<b>輸入要建立的類別名稱。</b><p>在讓 uic 編譯時，會產生 <em>【類別名稱】.h</"
-+"em> 與 <em>【類別名稱】.cpp</em> 兩個 C++ 檔。</p>"
- 
- #. i18n: file ./kdevdesigner/designer/formsettings.ui line 177
- #: rc.cpp:8182
-@@ -12810,7 +12911,7 @@
- #: rc.cpp:8200
- #, no-c-format
- msgid "La&youts"
--msgstr "佈局(&Y)"
-+msgstr "布局(&Y)"
- 
- #. i18n: file ./kdevdesigner/designer/formsettings.ui line 278
- #: rc.cpp:8203
-@@ -12834,14 +12935,14 @@
- #: rc.cpp:8212
- #, no-c-format
- msgid ""
--"<b>Use a given function for margin and/or spacing</b>"
--"<p>If you choose this option you must define functions in the line edit below "
--"which will be used in the generated code for getting the margin and spacing "
--"value. <i>Qt Designer</i> cannot preview the correct margin or spacing if you "
--"use your own function. Instead, the default values will be used for preview."
-+"<b>Use a given function for margin and/or spacing</b><p>If you choose this "
-+"option you must define functions in the line edit below which will be used "
-+"in the generated code for getting the margin and spacing value. <i>Qt "
-+"Designer</i> cannot preview the correct margin or spacing if you use your "
-+"own function. Instead, the default values will be used for preview."
- msgstr ""
--"<b>使用指定函式來取得邊界與間距</b>"
--"<p>如果選取此選項，您必須在下方定義一個函式，用於取得邊界與間距值。Qt 設計器無法預覽實際的結果，將會以預設值來預覽。"
-+"<b>使用指定函式來取得邊界與間距</b><p>如果選取此選項，您必須在下方定義一個函"
-+"式，用於取得邊界與間距值。Qt 設計器無法預覽實際的結果，將會以預設值來預覽。"
- 
- #. i18n: file ./kdevdesigner/designer/formsettings.ui line 322
- #: rc.cpp:8215
-@@ -12871,10 +12972,12 @@
- #: rc.cpp:8227
- #, no-c-format
- msgid ""
--"<b>Specify spacing function</b>"
--"<p>Specify the function which should be used for getting the spacing in the "
--"generated code. <em>Only enter the function's name, without parentheses.</em>"
--msgstr "<b>指定間距函式</b><p>指定用於取得間距的函式。<em>只要輸入函式名稱，不需要加括號。</em>"
-+"<b>Specify spacing function</b><p>Specify the function which should be used "
-+"for getting the spacing in the generated code. <em>Only enter the function's "
-+"name, without parentheses.</em>"
-+msgstr ""
-+"<b>指定間距函式</b><p>指定用於取得間距的函式。<em>只要輸入函式名稱，不需要加"
-+"括號。</em>"
- 
- #. i18n: file ./kdevdesigner/designer/formsettings.ui line 405
- #: rc.cpp:8230
-@@ -12886,10 +12989,12 @@
- #: rc.cpp:8233
- #, no-c-format
- msgid ""
--"<b>Specify margin function</b>"
--"<p>Specify the function which should be used for getting the margin in the "
--"generated code. <em>Only enter the function's name, without parentheses.</em>"
--msgstr "<b>指定邊界函式</b><p>指定用於取得邊界的函式。<em>只要輸入函式名稱，不需要加括號。</em>"
-+"<b>Specify margin function</b><p>Specify the function which should be used "
-+"for getting the margin in the generated code. <em>Only enter the function's "
-+"name, without parentheses.</em>"
-+msgstr ""
-+"<b>指定邊界函式</b><p>指定用於取得邊界的函式。<em>只要輸入函式名稱，不需要加"
-+"括號。</em>"
- 
- #. i18n: file ./kdevdesigner/designer/dbconnection.ui line 41
- #: rc.cpp:8251
-@@ -12943,17 +13048,14 @@
- #: rc.cpp:8281
- #, no-c-format
- msgid ""
--"<b>Edit Listbox</b>"
--"<p>Add, edit or delete items in the listbox.</p>"
--"<p>Click the <b>New Item</b>-button to create a new listbox entry, then enter "
--"text and choose a pixmap.</p>"
--"<p>Select an item from the list and click the <b>Delete Item</b>"
--"-button to remove the item from the list.</p>"
--msgstr ""
--"<b>編輯列表盒（Listbox）</b>"
--"<p>新增、編輯或刪除列表盒中的項目。</p>"
--"<p>點選<b>新增項目</b>，並輸入文字與選擇像素圖，就可以在列表盒中新增項目。</p>"
--"<p>從清單中選取項目並點選<b>刪除項目</b>就可以刪除該項目。</p>"
-+"<b>Edit Listbox</b><p>Add, edit or delete items in the listbox.</p><p>Click "
-+"the <b>New Item</b>-button to create a new listbox entry, then enter text "
-+"and choose a pixmap.</p><p>Select an item from the list and click the "
-+"<b>Delete Item</b>-button to remove the item from the list.</p>"
-+msgstr ""
-+"<b>編輯列表盒（Listbox）</b><p>新增、編輯或刪除列表盒中的項目。</p><p>點選<b>"
-+"新增項目</b>，並輸入文字與選擇像素圖，就可以在列表盒中新增項目。</p><p>從清單"
-+"中選取項目並點選<b>刪除項目</b>就可以刪除該項目。</p>"
- 
- #. i18n: file ./kdevdesigner/designer/listboxeditor.ui line 153
- #: kdevdesigner/designer/actiondnd.cpp:399 rc.cpp:8305 rc.cpp:8356
-@@ -13007,18 +13109,18 @@
- #: rc.cpp:8377
- #, no-c-format
- msgid ""
--"<b>Multiline Edit</b>"
--"<p>This is a simple richtext editor. To improve its usability it provides "
--"toolbar items for the most common html tags: by clicking on a toolbar item, the "
--"corresponding tag will be written to the editor, where you can insert your "
--"text. If you have already written some text and want to format it, hilight it "
--"and click on the desired button.  To improve visualization this editor also "
--"supports a simple html-syntax-highlighting scheme."
--msgstr ""
--"<b>多行編輯</b>"
--"<p>這是一個簡單的 richtext 編輯器。它提供了工具列項目，包含了常用的 html "
--"標籤：點選其中一個項目，編輯器中就會出現相關的標籤，您可以在其中插入文字。如果您已經寫了一些東西，要重新安排格式，您可以選取文字後，再按下工具列中的按鈕。它也支"
--"援簡單的 html 語法標示機制。"
-+"<b>Multiline Edit</b><p>This is a simple richtext editor. To improve its "
-+"usability it provides toolbar items for the most common html tags: by "
-+"clicking on a toolbar item, the corresponding tag will be written to the "
-+"editor, where you can insert your text. If you have already written some "
-+"text and want to format it, hilight it and click on the desired button.  To "
-+"improve visualization this editor also supports a simple html-syntax-"
-+"highlighting scheme."
-+msgstr ""
-+"<b>多行編輯</b><p>這是一個簡單的 richtext 編輯器。它提供了工具列項目，包含了"
-+"常用的 html 標籤：點選其中一個項目，編輯器中就會出現相關的標籤，您可以在其中"
-+"插入文字。如果您已經寫了一些東西，要重新安排格式，您可以選取文字後，再按下工"
-+"具列中的按鈕。它也支援簡單的 html 語法標示機制。"
- 
- #. i18n: file ./kdevdesigner/designer/pixmapfunction.ui line 41
- #: rc.cpp:8392
-@@ -13054,16 +13156,16 @@
- #: rc.cpp:8443 rc.cpp:8497
- #, no-c-format
- msgid ""
--"<b>Move the selected item up.</b>"
--"<p>The top-most column will be the first column of the list.</p>"
-+"<b>Move the selected item up.</b><p>The top-most column will be the first "
-+"column of the list.</p>"
- msgstr "<b>將所選的項目上移。</b><p>最頂端的欄位會成為列表中的第一個欄位。</p>"
- 
- #. i18n: file ./kdevdesigner/designer/tableeditor.ui line 250
- #: rc.cpp:8449 rc.cpp:8503
- #, no-c-format
- msgid ""
--"<b>Move the selected item down.</b>"
--"<p>The top-most column will be the first column of the list.</p>"
-+"<b>Move the selected item down.</b><p>The top-most column will be the first "
-+"column of the list.</p>"
- msgstr "<b>將所選的項目下移。</b><p>最頂端的欄位會成為列表中的第一個欄位。</p>"
- 
- #. i18n: file ./kdevdesigner/designer/tableeditor.ui line 288
-@@ -13313,18 +13415,17 @@
- #: rc.cpp:8686
- #, no-c-format
- msgid ""
--"<b>Edit Functions</b>"
--"<p>Add, edit or delete the current form's slots or functions.</p>"
--"<p>Click the <b>Add Function</b>-button to create a new function; enter a name, "
--"choose an access mode and specify if it should be a slot or normal function.</p>"
--"<p>Select an entry from the list and click the <b>Delete Function</b>"
--"-button to remove a function; in case of a slot all connections using this slot "
--"will also be removed.</p>"
--msgstr ""
--"<b>編輯函式</b>"
--"<p>新增、編輯或刪除目前表單的插槽或函式。</p> "
--"<p>點選<b>新增函式</b>並輸入函式名稱、存取模式以及指定它是插槽函式還是一般函式，就可以新增一個函式。</p> "
--"<p>從列表中選取一個函式並點選<b>刪除函式</b>就可以刪除函式，如果該函式是插槽函式，則所有使用該插槽的連線都會被刪除。</p>"
-+"<b>Edit Functions</b><p>Add, edit or delete the current form's slots or "
-+"functions.</p><p>Click the <b>Add Function</b>-button to create a new "
-+"function; enter a name, choose an access mode and specify if it should be a "
-+"slot or normal function.</p><p>Select an entry from the list and click the "
-+"<b>Delete Function</b>-button to remove a function; in case of a slot all "
-+"connections using this slot will also be removed.</p>"
-+msgstr ""
-+"<b>編輯函式</b><p>新增、編輯或刪除目前表單的插槽或函式。</p> <p>點選<b>新增函"
-+"式</b>並輸入函式名稱、存取模式以及指定它是插槽函式還是一般函式，就可以新增一"
-+"個函式。</p> <p>從列表中選取一個函式並點選<b>刪除函式</b>就可以刪除函式，如果"
-+"該函式是插槽函式，則所有使用該插槽的連線都會被刪除。</p>"
- 
- #. i18n: file ./kdevdesigner/designer/editfunctions.ui line 62
- #: parts/classview/classtreebase.cpp:79 rc.cpp:8689
-@@ -13342,8 +13443,8 @@
- #: rc.cpp:8707
- #, no-c-format
- msgid ""
--"<b>This form's functions.</b>"
--"<p>Select the function you want to change or delete.</p>"
-+"<b>This form's functions.</b><p>Select the function you want to change or "
-+"delete.</p>"
- msgstr "<b>此表單的函式</b><p>選擇您要變更或刪除的函式。</p>"
- 
- #. i18n: file ./kdevdesigner/designer/editfunctions.ui line 172
-@@ -13362,12 +13463,11 @@
- #: rc.cpp:8716
- #, no-c-format
- msgid ""
--"<b>Check this button if only the slots should be displayed</b>"
--"<p>Otherwise all functions, i.e. normal C++ functions and slots are "
--"displayed.</p>\n"
-+"<b>Check this button if only the slots should be displayed</b><p>Otherwise "
-+"all functions, i.e. normal C++ functions and slots are displayed.</p>\n"
- msgstr ""
--"<b>如果只要顯示插槽，請勾選此選項。</b>"
--"<p>否則所有的函式，包括一般的 C++ 函式與插槽都會被顯示。</p>\n"
-+"<b>如果只要顯示插槽，請勾選此選項。</b><p>否則所有的函式，包括一般的 C++ 函式"
-+"與插槽都會被顯示。</p>\n"
- 
- #. i18n: file ./kdevdesigner/designer/editfunctions.ui line 204
- #: rc.cpp:8720
-@@ -13385,9 +13485,10 @@
- #: rc.cpp:8726
- #, no-c-format
- msgid ""
--"<b>Add a new function.</b>"
--"<p>New functions have a default name and public access.</p>"
--msgstr "<b>新增函式。</b><p>新函式會有預設名稱以及公開（public）的存取權限。</p>"
-+"<b>Add a new function.</b><p>New functions have a default name and public "
-+"access.</p>"
-+msgstr ""
-+"<b>新增函式。</b><p>新函式會有預設名稱以及公開（public）的存取權限。</p>"
- 
- #. i18n: file ./kdevdesigner/designer/editfunctions.ui line 218
- #: rc.cpp:8729
-@@ -13405,8 +13506,8 @@
- #: rc.cpp:8735
- #, no-c-format
- msgid ""
--"<b>Delete the selected function.</b>"
--"<p>All connections using this function are also removed.</p>"
-+"<b>Delete the selected function.</b><p>All connections using this function "
-+"are also removed.</p>"
- msgstr "<b>刪除所選取的函式。</b><p>所有使用此函式的連線都會被刪除。</p>"
- 
- #. i18n: file ./kdevdesigner/designer/editfunctions.ui line 242
-@@ -13431,10 +13532,10 @@
- #: rc.cpp:8747
- #, no-c-format
- msgid ""
--"<b>Change the name of the selected function.</b>"
--"<p>The name should include the argument list and must be syntactically "
--"correct.</p>"
--msgstr "<b>變更所選取函式的名稱。</b><p>名稱應該包括參數的列表，並且語法要正確。</p>"
-+"<b>Change the name of the selected function.</b><p>The name should include "
-+"the argument list and must be syntactically correct.</p>"
-+msgstr ""
-+"<b>變更所選取函式的名稱。</b><p>名稱應該包括參數的列表，並且語法要正確。</p>"
- 
- #. i18n: file ./kdevdesigner/designer/editfunctions.ui line 317
- #: rc.cpp:8750
-@@ -13452,9 +13553,10 @@
- #: rc.cpp:8756
- #, no-c-format
- msgid ""
--"<b>Change the return type of the selected function.</b>"
--"<p>Specifiy here the datatype which should be returned by the function.</p>"
--msgstr "<b>更改所選取函式的傳回型態。</b><p>在此指定此函式要傳回的資料型態。</p>"
-+"<b>Change the return type of the selected function.</b><p>Specifiy here the "
-+"datatype which should be returned by the function.</p>"
-+msgstr ""
-+"<b>更改所選取函式的傳回型態。</b><p>在此指定此函式要傳回的資料型態。</p>"
- 
- #. i18n: file ./kdevdesigner/designer/editfunctions.ui line 380
- #: rc.cpp:8759
-@@ -13496,10 +13598,11 @@
- #: rc.cpp:8777 rc.cpp:8795
- #, no-c-format
- msgid ""
--"<b>Change the access policy of the function</b>"
--"<p>All functions are created virtual and should be reimplemented in "
--"subclasses.</p>"
--msgstr "<b>修改函式的存取政策</b><p>所有的函式建立時都是虛擬函式，應該在子類別中重新實作。</p>"
-+"<b>Change the access policy of the function</b><p>All functions are created "
-+"virtual and should be reimplemented in subclasses.</p>"
-+msgstr ""
-+"<b>修改函式的存取政策</b><p>所有的函式建立時都是虛擬函式，應該在子類別中重新"
-+"實作。</p>"
- 
- #. i18n: file ./kdevdesigner/designer/editfunctions.ui line 455
- #: kdevdesigner/designer/hierarchyview.cpp:758
-@@ -13537,9 +13640,8 @@
- #: rc.cpp:8810
- #, no-c-format
- msgid ""
--"<b>Change the type of the function.</b>"
--"<p>The type specifies if the function is either a slot or a normal C++ "
--"function.</p>"
-+"<b>Change the type of the function.</b><p>The type specifies if the function "
-+"is either a slot or a normal C++ function.</p>"
- msgstr "<b>更改函式型態。</b><p>函式型態包括插槽與一般 C++ 函式。</p>"
- 
- #. i18n: file ./kdevdesigner/designer/variabledialog.ui line 41
-@@ -13580,8 +13682,8 @@
- "_: EMAIL OF TRANSLATORS\n"
- "Your emails"
- msgstr ""
--"cavendish@eyou.com, lark@linux.net.cn, leesongchen@263.net, "
--"jxiong@offtopic.org, franklin at goodhorse dot idv dot tw"
-+"cavendish@eyou.com, lark@linux.net.cn, leesongchen@263.net, jxiong@offtopic."
-+"org, franklin at goodhorse dot idv dot tw"
- 
- #: languages/ada/adasupportpart.cpp:62 languages/cpp/cppsupportpart.cpp:586
- #: languages/java/javasupportpart.cpp:151
-@@ -13600,17 +13702,18 @@
- #: languages/ada/adasupportpart.cpp:63
- #: languages/pascal/pascalsupport_part.cpp:73
- msgid ""
--"<b>Problem reporter</b>"
--"<p>This window shows various \"problems\" in your project. It displays errors "
--"reported by a language parser."
--msgstr "<b>問題報告者</b><p>這個視窗顯示您專案中的許多「問題」。它顯示語言剖析器報告的錯誤。"
-+"<b>Problem reporter</b><p>This window shows various \"problems\" in your "
-+"project. It displays errors reported by a language parser."
-+msgstr ""
-+"<b>問題報告者</b><p>這個視窗顯示您專案中的許多「問題」。它顯示語言剖析器報告"
-+"的錯誤。"
- 
- #: languages/ada/adasupportpart.cpp:128 languages/cpp/cppsupportpart.cpp:1465
- #: languages/csharp/csharpsupportpart.cpp:264
- #: languages/java/javasupportpart.cpp:511
- #: languages/perl/perlsupportpart.cpp:264 languages/php/phpsupportpart.cpp:427
- msgid "Updating..."
--msgstr "正在更新..."
-+msgstr "正在更新…"
- 
- #: languages/ada/adasupportpart.cpp:155 languages/cpp/cppsupportpart.cpp:1620
- #: languages/csharp/csharpsupportpart.cpp:293
-@@ -13621,8 +13724,8 @@
- 
- #: languages/ada/problemreporter.cpp:84
- msgid ""
--"<b>Problem reporter</b>"
--"<p>This window shows errors reported by a language parser."
-+"<b>Problem reporter</b><p>This window shows errors reported by a language "
-+"parser."
- msgstr "<b>問題報告者</b><p>這個視窗顯示語言剖析器報告的錯誤。"
- 
- #: languages/ada/problemreporter.cpp:86 languages/cpp/problemreporter.cpp:109
-@@ -13790,9 +13893,11 @@
- 
- #: languages/cpp/cppnewclassdlg.cpp:407
- msgid ""
--"Multiple inheritance requires QObject derivative to be first and unique in base "
--"class list."
--msgstr "多重繼承需要將 QObject 的衍生類別放在基礎類別列表中的第一個，也是唯一的一個類別。"
-+"Multiple inheritance requires QObject derivative to be first and unique in "
-+"base class list."
-+msgstr ""
-+"多重繼承需要將 QObject 的衍生類別放在基礎類別列表中的第一個，也是唯一的一個類"
-+"別。"
- 
- #: languages/cpp/cppnewclassdlg.cpp:873 languages/cpp/cppnewclassdlg.cpp:876
- #: languages/cpp/cppnewclassdlg.cpp:1032 languages/cpp/cppnewclassdlg.cpp:1035
-@@ -13826,13 +13931,14 @@
- 
- #: languages/cpp/cppnewclassdlg.cpp:1368
- msgid ""
--"Generated files will always be added to the active directory, so you must not "
--"give an explicit subdirectory."
-+"Generated files will always be added to the active directory, so you must "
-+"not give an explicit subdirectory."
- msgstr "產生的檔案將會放到目前的目錄裡，因此您不能指定子目錄。"
- 
- #: languages/cpp/cppnewclassdlg.cpp:1395
- msgid ""
--"KDevelop is not able to add classes to existing header or implementation files."
-+"KDevelop is not able to add classes to existing header or implementation "
-+"files."
- msgstr "KDevelop 還不能新增類別到已經存在的標頭檔或者實作檔案中。"
- 
- #: languages/cpp/simpletype.cpp:24
-@@ -13885,7 +13991,8 @@
- 
- #: languages/cpp/simpletype.cpp:36
- msgid ""
--"double long floating point value, 10 bytes, ranged ca. -3.4E+4932 to 3.4E+4932"
-+"double long floating point value, 10 bytes, ranged ca. -3.4E+4932 to 3.4E"
-+"+4932"
- msgstr "雙精確（double）長浮點數，10 個位元組，範圍 -3.4E+4932 到 3.4E+4932"
- 
- #: languages/cpp/simpletype.cpp:37
-@@ -13902,13 +14009,13 @@
- 
- #: languages/cpp/cppsupportpart.cpp:258
- msgid ""
--"<b>Switch Header/Implementation</b>"
--"<p>If you are currently looking at a header file, this brings you to the "
--"corresponding implementation file. If you are looking at an implementation file "
--"(.cpp etc.), this brings you to the corresponding header file."
-+"<b>Switch Header/Implementation</b><p>If you are currently looking at a "
-+"header file, this brings you to the corresponding implementation file. If "
-+"you are looking at an implementation file (.cpp etc.), this brings you to "
-+"the corresponding header file."
- msgstr ""
--"<b>在標頭檔和實作檔案之間切換</b>"
--"<p>如果您目前正在看標頭檔，這可以讓您檢視相對應的實作檔案。如果您正在看實作檔案(如 cpp)，這可以讓您檢視相應的標頭檔。"
-+"<b>在標頭檔和實作檔案之間切換</b><p>如果您目前正在看標頭檔，這可以讓您檢視相"
-+"對應的實作檔案。如果您正在看實作檔案(如 cpp)，這可以讓您檢視相應的標頭檔。"
- 
- #: languages/cpp/cppsupportpart.cpp:267 languages/php/phpsupportpart.cpp:128
- msgid "Complete Text"
-@@ -13920,12 +14027,11 @@
- 
- #: languages/cpp/cppsupportpart.cpp:271
- msgid ""
--"<b>Complete Text</p>"
--"<p>Completes current expression using memory class store for the current "
--"project and persistent class stores for external libraries."
-+"<b>Complete Text</p><p>Completes current expression using memory class store "
-+"for the current project and persistent class stores for external libraries."
- msgstr ""
--"<b>文字補完</p>"
--"<p>對目前專案中的類別使用儲存在記憶體中的類別，對外部函式庫使用永久類別儲存（persistent class store，PCS）來補完目前的表示式。"
-+"<b>文字補完</p><p>對目前專案中的類別使用儲存在記憶體中的類別，對外部函式庫使"
-+"用永久類別儲存（persistent class store，PCS）來補完目前的表示式。"
- 
- #: languages/cpp/cppsupportpart.cpp:276
- msgid "Create Accessor Methods"
-@@ -13941,10 +14047,9 @@
- 
- #: languages/cpp/cppsupportpart.cpp:284 languages/cpp/cppsupportpart.cpp:691
- msgid ""
--"<b>Make member</b>"
--"<p>Creates a class member function in implementation file based on the member "
--"declaration at the current line."
--msgstr "<b>建立成員</b><p>根據目前這一行的成員宣告，在實作檔中建立類別成員。"
-+"<b>Make member</b><p>Creates a class member function in implementation file "
-+"based on the member declaration at the current line."
-+msgstr "<b>建立成員</b><p>根據目前這一列的成員宣告，在實作檔中建立類別成員。"
- 
- #: languages/cpp/cppsupportpart.cpp:288
- msgid "Navigation Menu"
-@@ -13956,15 +14061,14 @@
- 
- #: languages/cpp/cppsupportpart.cpp:292
- msgid ""
--"<b>Navigate</b>"
--"<p>Shows a navigation-menu based on the type-evaluation of the item under the "
--"cursor."
-+"<b>Navigate</b><p>Shows a navigation-menu based on the type-evaluation of "
-+"the item under the cursor."
- msgstr "<b>導覽</b> <p>在游標處依該項目的計算型態顯示導覽選單"
- 
- #: languages/cpp/cppsupportpart.cpp:296 languages/java/javasupportpart.cpp:160
- #: parts/classview/classviewwidget.cpp:74
- msgid "New Class..."
--msgstr "新增類別..."
-+msgstr "新增類別…"
- 
- #: languages/cpp/cppsupportpart.cpp:299 languages/java/javasupportpart.cpp:163
- msgid "Generate a new class"
-@@ -13993,11 +14097,13 @@
- 
- #: languages/cpp/cppsupportpart.cpp:740
- msgid ""
--"<b>Go to declaration</b>"
--"<p>Provides a menu to select available function declarations in the current "
--"file and in the corresponding header (if the current file is an implementation) "
--"or source (if the current file is a header) file."
--msgstr "<b>跳到宣告</b><p>提供一個選單來選擇在目前的檔案以及相對應的標頭檔或源碼檔中可用的函式宣告。"
-+"<b>Go to declaration</b><p>Provides a menu to select available function "
-+"declarations in the current file and in the corresponding header (if the "
-+"current file is an implementation) or source (if the current file is a "
-+"header) file."
-+msgstr ""
-+"<b>跳到宣告</b><p>提供一個選單來選擇在目前的檔案以及相對應的標頭檔或原始碼檔中"
-+"可用的函式宣告。"
- 
- #: languages/cpp/cppsupportpart.cpp:783 parts/classview/classtreebase.cpp:45
- msgid "Go to Definition"
-@@ -14005,38 +14111,42 @@
- 
- #: languages/cpp/cppsupportpart.cpp:784
- msgid ""
--"<b>Go to definition</b>"
--"<p>Provides a menu to select available function definitions in the current file "
--"and in the corresponding header (if the current file is an implementation) or "
--"source (if the current file is a header) file."
--msgstr "<b>跳到定義</b><p>提供一個選單來選擇在目前的檔案以及相對應的標頭檔或源碼檔中可用的函式定義。"
-+"<b>Go to definition</b><p>Provides a menu to select available function "
-+"definitions in the current file and in the corresponding header (if the "
-+"current file is an implementation) or source (if the current file is a "
-+"header) file."
-+msgstr ""
-+"<b>跳到定義</b><p>提供一個選單來選擇在目前的檔案以及相對應的標頭檔或原始碼檔中"
-+"可用的函式定義。"
- 
- #: languages/cpp/cppsupportpart.cpp:824
- msgid "Extract Interface..."
--msgstr "展開介面..."
-+msgstr "展開介面…"
- 
- #: languages/cpp/cppsupportpart.cpp:825
- msgid ""
--"<b>Extract interface</b>"
--"<p>Extracts interface from the selected class and creates a new class with this "
--"interface. No implementation code is extracted and no implementation code is "
--"created."
--msgstr "<b>展開介面</b><p>從選取的類別中展開介面，並以此建立新的類別。不會展開與建立實作代碼。"
-+"<b>Extract interface</b><p>Extracts interface from the selected class and "
-+"creates a new class with this interface. No implementation code is extracted "
-+"and no implementation code is created."
-+msgstr ""
-+"<b>展開介面</b><p>從選取的類別中展開介面，並以此建立新的類別。不會展開與建立"
-+"實作代碼。"
- 
- #: languages/cpp/cppsupportpart.cpp:842
- #: languages/python/pythonsupportpart.cpp:102
- #: languages/ruby/rubysupport_part.cpp:671
- msgid "Create or Select Implementation..."
--msgstr "建立或選擇實作..."
-+msgstr "建立或選擇實作…"
- 
- #: languages/cpp/cppsupportpart.cpp:843
- #: languages/python/pythonsupportpart.cpp:103
- #: languages/ruby/rubysupport_part.cpp:672
- msgid ""
--"<b>Create or select implementation</b>"
--"<p>Creates or selects a subclass of selected form for use with integrated "
--"KDevDesigner."
--msgstr "<b>建立或選擇實作</b><p>建立或選擇所選取表單中的子類別，用於整合的 KDevDesigner。"
-+"<b>Create or select implementation</b><p>Creates or selects a subclass of "
-+"selected form for use with integrated KDevDesigner."
-+msgstr ""
-+"<b>建立或選擇實作</b><p>建立或選擇所選取表單中的子類別，用於整合的 "
-+"KDevDesigner。"
- 
- #: languages/cpp/cppsupportpart.cpp:1415 languages/cpp/cppsupportpart.cpp:1427
- msgid "Please select a class."
-@@ -14049,7 +14159,8 @@
- "installed.\n"
- "Remove old pcs files?"
- msgstr ""
--"永久類別儲存（Persistent class store，PCS）將被關閉：您安裝的 pcs 版本不正確。\n"
-+"永久類別儲存（Persistent class store，PCS）將被關閉：您安裝的 pcs 版本不正"
-+"確。\n"
- "要刪除舊的 pcs 檔案嗎？"
- 
- #: languages/cpp/cppsupportpart.cpp:2262
-@@ -14062,11 +14173,11 @@
- 
- #: languages/cpp/cppcodecompletion.cpp:437
- msgid "Jump to declaration of %1(...)"
--msgstr "跳到 %1(...) 的宣告"
-+msgstr "跳到 %1(…) 的宣告"
- 
- #: languages/cpp/cppcodecompletion.cpp:438
- msgid "Jump to definition of %1(...)"
--msgstr "跳到 %1(...) 的定義"
-+msgstr "跳到 %1(…) 的定義"
- 
- #: languages/cpp/cppcodecompletion.cpp:440
- #: languages/cpp/cppcodecompletion.cpp:1539
-@@ -14186,9 +14297,8 @@
- 
- #: languages/cpp/cppcodecompletion.cpp:1616
- msgid ""
--"<b>Navigation</b>"
--"<p>Provides a menu to navigate to positions of items that are involved in this "
--"expression"
-+"<b>Navigation</b><p>Provides a menu to navigate to positions of items that "
-+"are involved in this expression"
- msgstr "<b>導覽</b> <p>提供一個選單，可導覽在此表示式中項目的位置"
- 
- #: languages/cpp/cppcodecompletion.cpp:1632
-@@ -14198,8 +14308,7 @@
- 
- #: languages/cpp/cppcodecompletion.cpp:1636
- msgid ""
--"<b>Navigation</b>"
--"<p>Provides a menu to show involved items in the class-view "
-+"<b>Navigation</b><p>Provides a menu to show involved items in the class-view "
- msgstr "<b>導覽</b> <p>提供一個選單，在類別檢視中導覽這些項目"
- 
- #: languages/cpp/cppcodecompletion.cpp:1706
-@@ -14251,20 +14360,15 @@
- #: languages/cpp/problemreporter.cpp:91 languages/java/problemreporter.cpp:84
- #: languages/php/phperrorview.cpp:86
- msgid ""
--"<b>Problem reporter</b>"
--"<p>This window shows various \"problems\" in your project. It displays TODO "
--"entries, FIXME's and errors reported by a language parser. To add a TODO or "
--"FIXME entry, just type"
--"<br><tt>//@todo my todo</tt>"
--"<br><tt>//TODO: my todo</tt>"
--"<br><tt>//FIXME fix this</tt>"
--msgstr ""
--"<b>問題報告者</b>"
--"<p>這個視窗顯示您專案中的許多「問題」。它顯示待辦（TODO）的項目，待修正（FIXME）的項目以及由語言剖析器所回報的錯誤。要新增待辦或待修正的項目，只要輸"
--"入"
--"<br> <tt>//@todo my todo</tt>"
--"<br> <tt>//TODO: my todo</tt>"
--"<br> <tt>//FIXME fix this</tt>"
-+"<b>Problem reporter</b><p>This window shows various \"problems\" in your "
-+"project. It displays TODO entries, FIXME's and errors reported by a language "
-+"parser. To add a TODO or FIXME entry, just type<br><tt>//@todo my todo</"
-+"tt><br><tt>//TODO: my todo</tt><br><tt>//FIXME fix this</tt>"
-+msgstr ""
-+"<b>問題報告者</b><p>這個視窗顯示您專案中的許多「問題」。它顯示待辦（TODO）的"
-+"項目，待修正（FIXME）的項目以及由語言剖析器所回報的錯誤。要新增待辦或待修正的"
-+"項目，只要輸入<br> <tt>//@todo my todo</tt><br> <tt>//TODO: my todo</tt><br> "
-+"<tt>//FIXME fix this</tt>"
- 
- #: languages/cpp/problemreporter.cpp:130 languages/php/phperrorview.cpp:120
- msgid "Current"
-@@ -14406,7 +14510,7 @@
- #: languages/cpp/app_templates/kdevpart/kdevpart_part.cpp:94
- #: languages/cpp/app_templates/kdevpart2/kdevpart_part.cpp:94
- msgid "&Do Something..."
--msgstr "做點事(&D)..."
-+msgstr "做點事(&D)…"
- 
- #: languages/cpp/app_templates/kdevpart/kdevpart_part.cpp:96
- #: languages/cpp/app_templates/kdevpart2/kdevpart_part.cpp:96
-@@ -14445,7 +14549,7 @@
- #: languages/cpp/app_templates/kioslave/slave.cpp:51
- #: vcs/subversion/svn_kio.cpp:249
- msgid "Looking for %1..."
--msgstr "正在尋找 %1..."
-+msgstr "正在尋找 %1…"
- 
- #: languages/cpp/app_templates/dcopservice/main.cpp:24
- msgid "KDE"
-@@ -14461,7 +14565,7 @@
- 
- #: languages/cpp/app_templates/kpartplugin/plugin_app.cpp:32
- msgid "Cannot Translate Source"
--msgstr "無法翻譯源碼"
-+msgstr "無法翻譯原始碼"
- 
- #: languages/cpp/app_templates/kpartplugin/plugin_app.cpp:33
- msgid "You cannot translate anything except web pages with this plugin."
-@@ -14565,7 +14669,7 @@
- 
- #: languages/cpp/compiler/gccoptions/gccoptionsplugin.cpp:110
- msgid "Only check the code for syntax errors, do not produce object code"
--msgstr "只檢查源碼裡的語法錯誤，不產生目的碼"
-+msgstr "只檢查原始碼裡的語法錯誤，不產生目的碼"
- 
- #: languages/cpp/compiler/gccoptions/gccoptionsplugin.cpp:112
- msgid "Generate extra code to write profile information for gprof"
-@@ -14580,7 +14684,7 @@
- #: languages/pascal/compiler/dccoptions/dccoptionsplugin.cpp:59
- #: languages/pascal/compiler/fpcoptions/fpcoptionsplugin.cpp:60
- msgid "Code Generation"
--msgstr "源碼產生"
-+msgstr "原始碼產生"
- 
- #: languages/cpp/compiler/gccoptions/gccoptionsplugin.cpp:123
- msgid "Enable exception handling"
-@@ -14641,8 +14745,8 @@
- 
- #: languages/cpp/compiler/gccoptions/gccoptionsplugin.cpp:190
- msgid ""
--"<qt>Force memory operands to be copied into registers before doing arithmetic "
--"on them</qt>"
-+"<qt>Force memory operands to be copied into registers before doing "
-+"arithmetic on them</qt>"
- msgstr "<qt>在進行算術運算前，強制將記憶體內的運算物件複製到暫存器中</qt>"
- 
- #: languages/cpp/compiler/gccoptions/gccoptionsplugin.cpp:194
-@@ -14653,8 +14757,8 @@
- 
- #: languages/cpp/compiler/gccoptions/gccoptionsplugin.cpp:198
- msgid ""
--"<qt>Do not keep the frame pointer in a register for functions that do not need "
--"one</qt>"
-+"<qt>Do not keep the frame pointer in a register for functions that do not "
-+"need one</qt>"
- msgstr "<qt>如果函式不需要，就不要將框架指標（frame pointer）存在暫存器中</qt>"
- 
- #: languages/cpp/compiler/gccoptions/gccoptionsplugin.cpp:202
-@@ -14663,9 +14767,10 @@
- 
- #: languages/cpp/compiler/gccoptions/gccoptionsplugin.cpp:208
- msgid ""
--"<qt>Do not make member functions inline merely because they are defined inside "
--"the class scope</qt>"
--msgstr "<qt>不要因為成員函式定義在類別範圍中，就將它們當成內含（inline）函式</qt>"
-+"<qt>Do not make member functions inline merely because they are defined "
-+"inside the class scope</qt>"
-+msgstr ""
-+"<qt>不要因為成員函式定義在類別範圍中，就將它們當成內含（inline）函式</qt>"
- 
- #: languages/cpp/compiler/gccoptions/gccoptionsplugin.cpp:271
- msgid "Dialect"
-@@ -14673,7 +14778,7 @@
- 
- #: languages/cpp/compiler/gccoptions/gccoptionsplugin.cpp:273
- msgid "Interpret source code as Fortran 90 free form"
--msgstr "將程式源碼以 Fortran 90 自由格式來解譯"
-+msgstr "將程式原始碼以 Fortran 90 自由格式來解譯"
- 
- #: languages/cpp/compiler/gccoptions/gccoptionsplugin.cpp:276
- msgid "Allow certain Fortran 90 constructs"
-@@ -14742,7 +14847,8 @@
- "to the format string specified, and that the conversions specified\n"
- "in the format string make sense</qt>"
- msgstr ""
--"<qt>檢查 <i>printf()</i>、<i>scanf()</i> 等函式的參數，確保它們和指定的格式相符，並且格式中指定的型態轉換是合理的</qt>"
-+"<qt>檢查 <i>printf()</i>、<i>scanf()</i> 等函式的參數，確保它們和指定的格式相"
-+"符，並且格式中指定的型態轉換是合理的</qt>"
- 
- #: languages/cpp/compiler/gccoptions/gccoptionsplugin.cpp:350
- msgid ""
-@@ -14751,8 +14857,8 @@
- "`-Wformat -Wformat-nonliteral -Wformat-security \n"
- "-Wformat-y2k'.</qt>"
- msgstr ""
--"<qt>開啟 -Wformat 會加上不含在 -Wformat 裡的格式檢查。目前與 -Wformat -Wformat-nonliteral "
--"-Wformat-security -Wformat-y2k 相同。"
-+"<qt>開啟 -Wformat 會加上不含在 -Wformat 裡的格式檢查。目前與 -Wformat -"
-+"Wformat-nonliteral -Wformat-security -Wformat-y2k 相同。"
- 
- #: languages/cpp/compiler/gccoptions/gccoptionsplugin.cpp:355
- msgid "<qt>Warn when a declaration does not specify a type</qt>"
-@@ -14777,7 +14883,9 @@
- #: languages/cpp/compiler/gccoptions/gccoptionsplugin.cpp:367
- msgid ""
- "<qt>Warn if an aggregate or union initializer is not fully bracketed</qt>"
--msgstr "<qt>如果聚合（aggregate）或者聯合（union）初始值沒有完全放在括號中則提出警告</qt>"
-+msgstr ""
-+"<qt>如果聚合（aggregate）或者聯合（union）初始值沒有完全放在括號中則提出警告"
-+"</qt>"
- 
- #: languages/cpp/compiler/gccoptions/gccoptionsplugin.cpp:369
- msgid "<qt>Warn when parentheses are omitted in certain contexts</qt>"
-@@ -14787,7 +14895,9 @@
- msgid ""
- "<qt>Warn about code that may have undefined semantics because of\n"
- "violations of sequence point rules in the C standard</qt>"
--msgstr "<qt>對程式碼中出現的因違反 C 的標準中的順序規則而可能產生的未定義語法提出警告</qt>"
-+msgstr ""
-+"<qt>對程式碼中出現的因違反 C 的標準中的順序規則而可能產生的未定義語法提出警告"
-+"</qt>"
- 
- #: languages/cpp/compiler/gccoptions/gccoptionsplugin.cpp:374
- msgid "<qt>Warn when a function without explicit return type is defined</qt>"
-@@ -14799,8 +14909,8 @@
- "and lacks a <i>case</i> for one or more of the named codes of that "
- "enumeration</qt>"
- msgstr ""
--"<qt>如果當 <i>switch</i> 敘述的索引變數為 enum 型態，但缺少一個或多個該 enum 常數的 <i>case</i> "
--"敘述則提出警告</qt>"
-+"<qt>如果當 <i>switch</i> 敘述的索引變數為 enum 型態，但缺少一個或多個該 enum "
-+"常數的 <i>case</i> 敘述則提出警告</qt>"
- 
- #: languages/cpp/compiler/gccoptions/gccoptionsplugin.cpp:379
- msgid "<qt>Warn when trigraphs are encountered</qt>"
-@@ -14838,7 +14948,8 @@
- 
- #: languages/cpp/compiler/gccoptions/gccoptionsplugin.cpp:430
- msgid ""
--"<qt>Warn if an undefined identifier is evaluated in an <i>#if</i> directive</qt>"
-+"<qt>Warn if an undefined identifier is evaluated in an <i>#if</i> directive</"
-+"qt>"
- msgstr "<qt>如果 #if 指令中用到未定義的識別子（identifier）則提出警告</qt>"
- 
- #: languages/cpp/compiler/gccoptions/gccoptionsplugin.cpp:432
-@@ -14849,7 +14960,9 @@
- msgid ""
- "<qt>Warn about anything that depends on the <i>sizeof</i> a\n"
- "function type or of <i>void</i></qt>"
--msgstr "<qt>若看到對函式的型態或是 <i>void</i> 型態做 <i>sizeof</i>計算，則提出警告</qt>"
-+msgstr ""
-+"<qt>若看到對函式的型態或是 <i>void</i> 型態做 <i>sizeof</i>計算，則提出警告</"
-+"qt>"
- 
- #: languages/cpp/compiler/gccoptions/gccoptionsplugin.cpp:437
- msgid ""
-@@ -14861,7 +14974,8 @@
- msgid ""
- "<qt>Warn whenever a pointer is cast such that the required\n"
- "alignment of the target is increased</qt>"
--msgstr "<qt>當指標被強制轉型導致所需的位元對齊空間（alignment）增加時提出警告</qt>"
-+msgstr ""
-+"<qt>當指標被強制轉型導致所需的位元對齊空間（alignment）增加時提出警告</qt>"
- 
- #: languages/cpp/compiler/gccoptions/gccoptionsplugin.cpp:443
- msgid ""
-@@ -14876,18 +14990,23 @@
- "<qt>Warn if a prototype causes a type conversion that is different\n"
- "from what would happen to the same argument in the absence\n"
- "of a prototype</qt>"
--msgstr "<qt>如果函式原型會導致某些參數的型態轉換，而此轉換與沒有原型時的結果不相同時，則提出警告</qt>"
-+msgstr ""
-+"<qt>如果函式原型會導致某些參數的型態轉換，而此轉換與沒有原型時的結果不相同"
-+"時，則提出警告</qt>"
- 
- #: languages/cpp/compiler/gccoptions/gccoptionsplugin.cpp:450
- msgid ""
- "<qt>Warn when a comparison between signed and unsigned values\n"
- "could produce an incorrect result when the signed value\n"
- "is converted to unsigned</qt>"
--msgstr "<qt>當進行有號數與無號數的比對，而且此有號數在轉成無號數時會造成不同結果的時候提出警告</qt>"
-+msgstr ""
-+"<qt>當進行有號數與無號數的比對，而且此有號數在轉成無號數時會造成不同結果的時"
-+"候提出警告</qt>"
- 
- #: languages/cpp/compiler/gccoptions/gccoptionsplugin.cpp:454
- msgid ""
--"<qt>Warn about functions which might be candidates for attribute 'noreturn'</qt>"
-+"<qt>Warn about functions which might be candidates for attribute 'noreturn'</"
-+"qt>"
- msgstr "<qt>對有可能需要 noreturn 屬性的函式提出警告</qt>"
- 
- #: languages/cpp/compiler/gccoptions/gccoptionsplugin.cpp:456
-@@ -14905,19 +15024,25 @@
- msgid ""
- "<qt>Do not warn about uses of functions, variables, and types marked as\n"
- "deprecated by using the 'deprecated' attribute</qt>"
--msgstr "<qt>不要在使用由 deprecated 屬性標記為過時（deprecated）的函式、變數和型態時提出警告</qt>"
-+msgstr ""
-+"<qt>不要在使用由 deprecated 屬性標記為過時（deprecated）的函式、變數和型態時"
-+"提出警告</qt>"
- 
- #: languages/cpp/compiler/gccoptions/gccoptionsplugin.cpp:465
- msgid ""
- "<qt>Warn if a structure is given the packed attribute, but the packed\n"
- "attribute has no effect on the layout or size of the structure</qt>"
--msgstr "<qt>如果一個結構具有 packed 屬性，但 packed 屬性對結構的佈局或者大小沒有影響則提出警告</qt>"
-+msgstr ""
-+"<qt>如果一個結構具有 packed 屬性，但 packed 屬性對結構的布局或者大小沒有影響"
-+"則提出警告</qt>"
- 
- #: languages/cpp/compiler/gccoptions/gccoptionsplugin.cpp:468
- msgid ""
- "<qt>Warn if padding is included in a structure, either to align an\n"
- "element of the structure or to align the whole structure</qt>"
--msgstr "<qt>如果結構中因為要使元素或者整個結構對齊而需要進行填充（padding）時提出警告</qt>"
-+msgstr ""
-+"<qt>如果結構中因為要使元素或者整個結構對齊而需要進行填充（padding）時提出警告"
-+"</qt>"
- 
- #: languages/cpp/compiler/gccoptions/gccoptionsplugin.cpp:471
- msgid "<qt>Warn if anything is declared more than once in the same scope</qt>"
-@@ -14967,7 +15092,8 @@
- 
- #: languages/cpp/compiler/gccoptions/gccoptionsplugin.cpp:496
- msgid ""
--"<qt>Warn if an <i>extern</i> declaration is encountered within a function</qt>"
-+"<qt>Warn if an <i>extern</i> declaration is encountered within a function</"
-+"qt>"
- msgstr "<qt>如果在函式內部出現 <i>extern</i> 宣告則提出警告</qt>"
- 
- #: languages/cpp/compiler/gccoptions/gccoptionsplugin.cpp:503
-@@ -14988,15 +15114,17 @@
- "destructors in a class are private and the class has no friends or\n"
- "public static member functions</qt>"
- msgstr ""
--"<qt>如果一個類別其建構子與解構子都是私有（private）的，而且沒有朋友（friend）或者公開（public）的靜態成員函式，因此實際上是無法使用時提出"
--"警告</qt>"
-+"<qt>如果一個類別其建構子與解構子都是私有（private）的，而且沒有朋友（friend）"
-+"或者公開（public）的靜態成員函式，因此實際上是無法使用時提出警告</qt>"
- 
- #: languages/cpp/compiler/gccoptions/gccoptionsplugin.cpp:513
- msgid ""
- "<qt>Warn when a class declares a non-virtual destructor that should\n"
- "probably be virtual, because it looks like the class will be used\n"
- "polymorphically</qt>"
--msgstr "<qt>當一個類別宣告了非虛擬的解構子，但該類別可能被多形（polymorphic）使用，其解構子應該要是虛擬的時候提出警告</qt>"
-+msgstr ""
-+"<qt>當一個類別宣告了非虛擬的解構子，但該類別可能被多形（polymorphic）使用，其"
-+"解構子應該要是虛擬的時候提出警告</qt>"
- 
- #: languages/cpp/compiler/gccoptions/gccoptionsplugin.cpp:517
- msgid ""
-@@ -15005,7 +15133,8 @@
- "type of the same size. Previous versions of G++ would try to\n"
- "preserve unsignedness, but the standard mandates the current behavior</qt>"
- msgstr ""
--"<qt>如果重載決定選擇將無號數或 enum 型態提升為有號數的型態，而不是轉換為同樣大小的無符號型態，則提出警告。\n"
-+"<qt>如果重載決定選擇將無號數或 enum 型態提升為有號數的型態，而不是轉換為同樣"
-+"大小的無符號型態，則提出警告。\n"
- "以前的 G++ 版本會試圖保留為無號數，但標準則要求使用目前的做法</qt>"
- 
- #: languages/cpp/compiler/gccoptions/gccoptionsplugin.cpp:522
-@@ -15034,8 +15163,10 @@
- "  increment and decrement operators;\n"
- "* Item 7:  Never overload '&&', '||', or ','</qt>"
- msgstr ""
--"<qt>如果違反 Scott Meyers 的《Effective C++》一書中提供的下列準則時提出警告：\n"
--"* 第11條：對使用動態配置記憶體的類別，定義拷貝建構子（copy constructor）以及指定操作（assignment operator）；\n"
-+"<qt>如果違反 Scott Meyers 的《Effective C++》一書中提供的下列準則時提出警"
-+"告：\n"
-+"* 第11條：對使用動態配置記憶體的類別，定義拷貝建構子（copy constructor）以及"
-+"指定操作（assignment operator）；\n"
- "* 第12條：在建構子中優先使用初始化而不是賦值；\n"
- "* 第14條：基礎類別的解構子定義為虛擬函式；\n"
- "* 第15條：讓 operator= 傳回 *this 的參考（reference）\n"
-@@ -15060,7 +15191,8 @@
- msgid ""
- "<qt>Warn if an old-style (C-style) cast to a non-void type is used\n"
- "within a C++ program</qt>"
--msgstr "<qt>如果在 C++ 程式中使用了舊式（C 風格）的非 void 型態轉換，則提出警告</qt>"
-+msgstr ""
-+"<qt>如果在 C++ 程式中使用了舊式（C 風格）的非 void 型態轉換，則提出警告</qt>"
- 
- #: languages/cpp/compiler/gccoptions/gccoptionsplugin.cpp:552
- msgid ""
-@@ -15138,13 +15270,12 @@
- #: languages/cpp/debugger/debuggerpart.cpp:108
- #: languages/ruby/debugger/debuggerpart.cpp:112
- msgid ""
--"<b>Breakpoint list</b>"
--"<p>Displays a list of breakpoints with their current status. Clicking on a "
--"breakpoint item allows you to change the breakpoint and will take you to the "
--"source in the editor window."
-+"<b>Breakpoint list</b><p>Displays a list of breakpoints with their current "
-+"status. Clicking on a breakpoint item allows you to change the breakpoint "
-+"and will take you to the source in the editor window."
- msgstr ""
--"<b>中斷點列表</b>"
--"<p>顯示中斷點列表和它們目前的狀態。點選某一個中斷點，就可以改變此中斷點，並且會在編輯器視窗中顯示該中斷點的程式碼。"
-+"<b>中斷點列表</b><p>顯示中斷點列表和它們目前的狀態。點選某一個中斷點，就可以"
-+"改變此中斷點，並且會在編輯器視窗中顯示該中斷點的程式碼。"
- 
- #: languages/cpp/debugger/debuggerpart.cpp:115
- #: languages/ruby/debugger/debuggerpart.cpp:119
-@@ -15170,15 +15301,14 @@
- 
- #: languages/cpp/debugger/debuggerpart.cpp:128
- msgid ""
--"<b>Frame stack</b>"
--"<p>Often referred to as the \"call stack\", this is a list showing what "
--"function is currently active and who called each function to get to this point "
--"in your program. By clicking on an item you can see the values in any of the "
--"previous calling functions."
--msgstr ""
--"<b>框架堆疊</b>"
--"<p>通常又叫做「呼叫堆疊」。它是一個列表，顯示出目前執行中的是哪個函式，以及一路上是誰呼叫了這些函式，直到目前執行的位置。點選其中一個項目，您就可以看到在前面"
--"呼叫的任一函式的值。"
-+"<b>Frame stack</b><p>Often referred to as the \"call stack\", this is a list "
-+"showing what function is currently active and who called each function to "
-+"get to this point in your program. By clicking on an item you can see the "
-+"values in any of the previous calling functions."
-+msgstr ""
-+"<b>框架堆疊</b><p>通常又叫做「呼叫堆疊」。它是一個列表，顯示出目前執行中的是"
-+"哪個函式，以及一路上是誰呼叫了這些函式，直到目前執行的位置。點選其中一個項"
-+"目，您就可以看到在前面呼叫的任一函式的值。"
- 
- #: languages/cpp/debugger/debuggerpart.cpp:137
- msgid "Debugger function call stack"
-@@ -15190,15 +15320,14 @@
- 
- #: languages/cpp/debugger/debuggerpart.cpp:144
- msgid ""
--"<b>Machine code display</b>"
--"<p>A machine code view into your running executable with the current "
--"instruction highlighted. You can step instruction by instruction using the "
--"debuggers toolbar buttons of \"step over\" instruction and \"step into\" "
--"instruction."
--msgstr ""
--"<b>機器碼顯示</b>"
--"<p>顯示機器代碼的檢視，裡面顯示您目前執行的程式中的指令，目前執行中的指令會被標示出來。您可以使用除錯器工具列中的「單步指令」和「單步進入指令」按鈕來逐步執行"
--"指令。"
-+"<b>Machine code display</b><p>A machine code view into your running "
-+"executable with the current instruction highlighted. You can step "
-+"instruction by instruction using the debuggers toolbar buttons of \"step over"
-+"\" instruction and \"step into\" instruction."
-+msgstr ""
-+"<b>機器碼顯示</b><p>顯示機器代碼的檢視，裡面顯示您目前執行的程式中的指令，目"
-+"前執行中的指令會被標示出來。您可以使用除錯器工具列中的「單步指令」和「單步進"
-+"入指令」按鈕來逐步執行指令。"
- 
- #: languages/cpp/debugger/debuggerpart.cpp:152
- msgid "Disassemble"
-@@ -15210,10 +15339,11 @@
- 
- #: languages/cpp/debugger/debuggerpart.cpp:161
- msgid ""
--"<b>GDB output</b>"
--"<p>Shows all gdb commands being executed. You can also issue any other gdb "
--"command while debugging."
--msgstr "<b>GDB輸出</b><p>顯示所有被執行的 gdb 命令。您也可以在進行除錯的時候使用其它 gdb 命令。"
-+"<b>GDB output</b><p>Shows all gdb commands being executed. You can also "
-+"issue any other gdb command while debugging."
-+msgstr ""
-+"<b>GDB輸出</b><p>顯示所有被執行的 gdb 命令。您也可以在進行除錯的時候使用其它 "
-+"gdb 命令。"
- 
- #: languages/cpp/debugger/debuggerpart.cpp:164
- msgid "GDB"
-@@ -15239,13 +15369,13 @@
- #: languages/cpp/debugger/debuggerpart.cpp:193
- #: languages/ruby/debugger/debuggerpart.cpp:166
- msgid ""
--"<b>Start in debugger</b>"
--"<p>Starts the debugger with the project's main executable. You may set some "
--"breakpoints before this, or you can interrupt the program while it is running, "
--"in order to get information about variables, frame stack, and so on."
-+"<b>Start in debugger</b><p>Starts the debugger with the project's main "
-+"executable. You may set some breakpoints before this, or you can interrupt "
-+"the program while it is running, in order to get information about "
-+"variables, frame stack, and so on."
- msgstr ""
--"<b>在除錯器中執行</b>"
--"<p>在除錯器裡執行此專案的主要程式。開始前您可以先設定一些中斷點，或者您也可以在程式執行的時候中斷它，檢視變數、框架堆疊等資訊。"
-+"<b>在除錯器中執行</b><p>在除錯器裡執行此專案的主要程式。開始前您可以先設定一"
-+"些中斷點，或者您也可以在程式執行的時候中斷它，檢視變數、框架堆疊等資訊。"
- 
- #: languages/cpp/debugger/debuggerpart.cpp:200
- msgid "&Restart"
-@@ -15288,8 +15418,8 @@
- 
- #: languages/cpp/debugger/debuggerpart.cpp:220
- msgid ""
--"<b>Interrupt application</b>"
--"<p>Interrupts the debugged process or current GDB command."
-+"<b>Interrupt application</b><p>Interrupts the debugged process or current "
-+"GDB command."
- msgstr "<b>中斷應用程式</b><p>中斷被除錯的行程或目前的 gdb 命令。"
- 
- #: languages/cpp/debugger/debuggerpart.cpp:222
-@@ -15306,8 +15436,8 @@
- #: languages/cpp/debugger/debuggerpart.cpp:226
- #: languages/ruby/debugger/debuggerpart.cpp:189
- msgid ""
--"<b>Run to cursor</b>"
--"<p>Continues execution until the cursor position is reached."
-+"<b>Run to cursor</b><p>Continues execution until the cursor position is "
-+"reached."
- msgstr "<b>執行到游標位置</b><p>繼續執行程式到游標所在的位置。"
- 
- #: languages/cpp/debugger/debuggerpart.cpp:229
-@@ -15320,8 +15450,8 @@
- 
- #: languages/cpp/debugger/debuggerpart.cpp:233
- msgid ""
--"<b>Set Execution Position </b>"
--"<p>Set the execution pointer to the current cursor position."
-+"<b>Set Execution Position </b><p>Set the execution pointer to the current "
-+"cursor position."
- msgstr "<b>設定執行位置</b><p>將執行的指標設定到目前游標所在的位置。"
- 
- #: languages/cpp/debugger/debuggerpart.cpp:236
-@@ -15332,15 +15462,16 @@
- #: languages/cpp/debugger/debuggerpart.cpp:239
- #: languages/ruby/debugger/debuggerpart.cpp:195
- msgid "Step over the next line"
--msgstr "單步執行到下一行"
-+msgstr "單步執行到下一列"
- 
- #: languages/cpp/debugger/debuggerpart.cpp:240
- msgid ""
--"<b>Step over</b>"
--"<p>Executes one line of source in the current source file. If the source line "
--"is a call to a function the whole function is executed and the app will stop at "
--"the line following the function call."
--msgstr "<b>單步</b><p>執行目前檔案中的一行程式碼。如果這行程式碼是一個函式呼叫，則會執行完整個函式，並且停在函式返回後的那行代碼處。"
-+"<b>Step over</b><p>Executes one line of source in the current source file. "
-+"If the source line is a call to a function the whole function is executed "
-+"and the app will stop at the line following the function call."
-+msgstr ""
-+"<b>單步</b><p>執行目前檔案中的一列程式碼。如果這行程式碼是一個函式呼叫，則會"
-+"執行完整個函式，並且停在函式返回後的那行代碼處。"
- 
- #: languages/cpp/debugger/debuggerpart.cpp:247
- msgid "Step over Ins&truction"
-@@ -15352,8 +15483,7 @@
- 
- #: languages/cpp/debugger/debuggerpart.cpp:251
- msgid ""
--"<b>Step over instruction</b>"
--"<p>Steps over the next assembly instruction."
-+"<b>Step over instruction</b><p>Steps over the next assembly instruction."
- msgstr "<b>單步指令</b><p>單步執行完下一條組譯後的指令。"
- 
- #: languages/cpp/debugger/debuggerpart.cpp:254
-@@ -15368,10 +15498,12 @@
- 
- #: languages/cpp/debugger/debuggerpart.cpp:258
- msgid ""
--"<b>Step into</b>"
--"<p>Executes exactly one line of source. If the source line is a call to a "
--"function then execution will stop after the function has been entered."
--msgstr "<b>單步進入</b><p>僅執行一行程式碼。如果這行程式碼是一個函式呼叫，則進入函式，並停止在函式開始處。"
-+"<b>Step into</b><p>Executes exactly one line of source. If the source line "
-+"is a call to a function then execution will stop after the function has been "
-+"entered."
-+msgstr ""
-+"<b>單步進入</b><p>僅執行一列程式碼。如果這行程式碼是一個函式呼叫，則進入函"
-+"式，並停止在函式開始處。"
- 
- #: languages/cpp/debugger/debuggerpart.cpp:264
- msgid "Step into I&nstruction"
-@@ -15383,8 +15515,7 @@
- 
- #: languages/cpp/debugger/debuggerpart.cpp:268
- msgid ""
--"<b>Step into instruction</b>"
--"<p>Steps into the next assembly instruction."
-+"<b>Step into instruction</b><p>Steps into the next assembly instruction."
- msgstr "<b>單步進入指令</b><p>單步進入執行到下一條組譯後的指令。"
- 
- #: languages/cpp/debugger/debuggerpart.cpp:271
-@@ -15398,15 +15529,14 @@
- 
- #: languages/cpp/debugger/debuggerpart.cpp:275
- msgid ""
--"<b>Step out</b>"
--"<p>Executes the application until the currently executing function is "
--"completed. The debugger will then display the line after the original call to "
--"that function. If program execution is in the outermost frame (i.e. in main()) "
--"then this operation has no effect."
--msgstr ""
--"<b>單步跳出</b>"
--"<p>執行應用程式直到目前函式執行完畢。除錯器將會顯示原來呼叫該函式的地方之後的源碼。如果程式在最外層的框架執行（也就是在 main() "
--"中），這個操作會被忽略。"
-+"<b>Step out</b><p>Executes the application until the currently executing "
-+"function is completed. The debugger will then display the line after the "
-+"original call to that function. If program execution is in the outermost "
-+"frame (i.e. in main()) then this operation has no effect."
-+msgstr ""
-+"<b>單步跳出</b><p>執行應用程式直到目前函式執行完畢。除錯器將會顯示原來呼叫該"
-+"函式的地方之後的原始碼。如果程式在最外層的框架執行（也就是在 main() 中），這個"
-+"操作會被忽略。"
- 
- #: languages/cpp/debugger/dbgtoolbar.cpp:309
- #: languages/cpp/debugger/debuggerpart.cpp:283
-@@ -15419,24 +15549,16 @@
- 
- #: languages/cpp/debugger/debuggerpart.cpp:287
- msgid ""
--"<b>Debugger viewers</b>"
--"<p>Various information about application being executed. There are 4 views "
--"available:"
--"<br><b>Memory</b>"
--"<br><b>Disassemble</b>"
--"<br><b>Registers</b>"
--"<br><b>Libraries</b>"
--msgstr ""
--"<b>除錯器檢視器</b>"
--"<p>關於被執行程式的多種資訊。共可使用四個檢視："
--"<br><b>記憶體</b>"
--"<br><b>反解譯</b>"
--"<br><b>暫存器</b>"
--"<br><b>函式庫</b>"
-+"<b>Debugger viewers</b><p>Various information about application being "
-+"executed. There are 4 views available:<br><b>Memory</b><br><b>Disassemble</"
-+"b><br><b>Registers</b><br><b>Libraries</b>"
-+msgstr ""
-+"<b>除錯器檢視器</b><p>關於被執行程式的多種資訊。共可使用四個檢視：<br><b>記憶"
-+"體</b><br><b>反解譯</b><br><b>暫存器</b><br><b>函式庫</b>"
- 
- #: languages/cpp/debugger/debuggerpart.cpp:294
- msgid "Examine Core File..."
--msgstr "檢查內核（core）檔案..."
-+msgstr "檢查內核（core）檔案…"
- 
- #: languages/cpp/debugger/debuggerpart.cpp:297
- msgid "Examine core file"
-@@ -15444,15 +15566,14 @@
- 
- #: languages/cpp/debugger/debuggerpart.cpp:298
- msgid ""
--"<b>Examine core file</b>"
--"<p>This loads a core file, which is typically created after the application has "
--"crashed, e.g. with a segmentation fault. The core file contains an image of the "
--"program memory at the time it crashed, allowing you to do a post-mortem "
--"analysis."
--msgstr ""
--"<b>檢查內核檔案</b>"
--"<p>載入內核 core 檔。它通常在程式當掉，例如發生區段錯誤（segmentation "
--"fault）時產生。內核檔包含程式當掉時的記憶體映像，能讓您進行分析。"
-+"<b>Examine core file</b><p>This loads a core file, which is typically "
-+"created after the application has crashed, e.g. with a segmentation fault. "
-+"The core file contains an image of the program memory at the time it "
-+"crashed, allowing you to do a post-mortem analysis."
-+msgstr ""
-+"<b>檢查內核檔案</b><p>載入內核 core 檔。它通常在程式當掉，例如發生區段錯誤"
-+"（segmentation fault）時產生。內核檔包含程式當掉時的記憶體映像，能讓您進行分"
-+"析。"
- 
- #: languages/cpp/debugger/dbgpsdlg.cpp:59
- #: languages/cpp/debugger/debuggerpart.cpp:306
-@@ -15483,8 +15604,8 @@
- #: languages/cpp/debugger/debuggerpart.cpp:316
- #: languages/ruby/debugger/debuggerpart.cpp:230
- msgid ""
--"<b>Toggle breakpoint</b>"
--"<p>Toggles the breakpoint at the current line in editor."
-+"<b>Toggle breakpoint</b><p>Toggles the breakpoint at the current line in "
-+"editor."
- msgstr "<b>切換中斷點</b><p>在編輯器中切換目前的中斷點。"
- 
- #: languages/cpp/debugger/debuggerpart.cpp:399
-@@ -15503,8 +15624,8 @@
- 
- #: languages/cpp/debugger/debuggerpart.cpp:522
- msgid ""
--"<b>Evaluate expression</b>"
--"<p>Shows the value of the expression under the cursor."
-+"<b>Evaluate expression</b><p>Shows the value of the expression under the "
-+"cursor."
- msgstr "<b>計算表示式</b><p>在游標處顯示目前表示式的值。"
- 
- #: languages/cpp/debugger/debuggerpart.cpp:523
-@@ -15515,8 +15636,8 @@
- 
- #: languages/cpp/debugger/debuggerpart.cpp:527
- msgid ""
--"<b>Watch expression</b>"
--"<p>Adds an expression under the cursor to the Variables/Watch list."
-+"<b>Watch expression</b><p>Adds an expression under the cursor to the "
-+"Variables/Watch list."
- msgstr "<b>監控表示式</b><p>在變數/監控列表中加入目前在游標處的表示式。"
- 
- #: languages/cpp/debugger/debuggerpart.cpp:563
-@@ -15555,12 +15676,13 @@
- "Continue application execution\n"
- "\n"
- "Continues the execution of your application in the debugger. This only takes "
--"effect when the application has been halted by the debugger (i.e. a breakpoint "
--"has been activated or the interrupt was pressed)."
-+"effect when the application has been halted by the debugger (i.e. a "
-+"breakpoint has been activated or the interrupt was pressed)."
- msgstr ""
- "繼續執行程式\n"
- "\n"
--"在除錯器中繼續執行您的應用程式。只有在您的應用程式被除錯器暫停（也就是遇到中斷點，或者您按了中斷）的時候，繼續執行程式才有效。"
-+"在除錯器中繼續執行您的應用程式。只有在您的應用程式被除錯器暫停（也就是遇到中"
-+"斷點，或者您按了中斷）的時候，繼續執行程式才有效。"
- 
- #: languages/cpp/debugger/debuggerpart.cpp:743
- #: languages/ruby/debugger/debuggerpart.cpp:572
-@@ -15573,19 +15695,21 @@
- "Start in debugger\n"
- "\n"
- "Starts the debugger with the project's main executable. You may set some "
--"breakpoints before this, or you can interrupt the program while it is running, "
--"in order to get information about variables, frame stack, and so on."
-+"breakpoints before this, or you can interrupt the program while it is "
-+"running, in order to get information about variables, frame stack, and so on."
- msgstr ""
- "在除錯器裡執行\n"
- "\n"
--"在除錯器裡執行此專案的主要程式。開始前您可以先設定一些中斷點，或者您也可以在程式執行的時候中斷它，檢視變數、框架堆疊等資訊。"
-+"在除錯器裡執行此專案的主要程式。開始前您可以先設定一些中斷點，或者您也可以在"
-+"程式執行的時候中斷它，檢視變數、框架堆疊等資訊。"
- 
- #: languages/cpp/debugger/debuggerpart.cpp:771
- msgid ""
--"<b>GDB exited abnormally</b>"
--"<p>This is likely a bug in GDB. Examine the gdb output window and then stop the "
--"debugger"
--msgstr "<b>GDB 不正常離開</b><p>這可能是 GDB 的問題。請檢查 gdb 的輸出視窗，並停止除錯器。"
-+"<b>GDB exited abnormally</b><p>This is likely a bug in GDB. Examine the gdb "
-+"output window and then stop the debugger"
-+msgstr ""
-+"<b>GDB 不正常離開</b><p>這可能是 GDB 的問題。請檢查 gdb 的輸出視窗，並停止除"
-+"錯器。"
- 
- #: languages/cpp/debugger/debuggerpart.cpp:774
- msgid "GDB exited abnormally"
-@@ -15616,7 +15740,7 @@
- 
- #: languages/cpp/debugger/debuggerpart.cpp:951
- msgid "Choose a core file to examine..."
--msgstr "選擇要檢查的內核檔案..."
-+msgstr "選擇要檢查的內核檔案…"
- 
- #: languages/cpp/debugger/debuggerpart.cpp:958
- #, c-format
-@@ -15625,7 +15749,7 @@
- 
- #: languages/cpp/debugger/debuggerpart.cpp:967
- msgid "Choose a process to attach to..."
--msgstr "選擇要附加的行程..."
-+msgstr "選擇要附加的行程…"
- 
- #: languages/cpp/debugger/debuggerpart.cpp:979
- #, c-format
-@@ -15673,7 +15797,7 @@
- 
- #: languages/cpp/debugger/dbgtoolbar.cpp:225
- msgid "KDevelop debugger: Click to execute one line of code (\"step\")"
--msgstr "KDevelop 除錯器：點擊可執行一行程式碼（單步）"
-+msgstr "KDevelop 除錯器：點擊可執行一列程式碼（單步）"
- 
- #: languages/cpp/debugger/dbgtoolbar.cpp:246
- #: languages/ruby/debugger/dbgtoolbar.cpp:245
-@@ -15707,20 +15831,20 @@
- 
- #: languages/cpp/debugger/dbgtoolbar.cpp:327
- msgid "Execute one line of code, but run through functions"
--msgstr "執行一行程式碼，但不進入函式呼叫"
-+msgstr "執行一列程式碼，但不進入函式呼叫"
- 
- #: languages/cpp/debugger/dbgtoolbar.cpp:328
- msgid "Execute one assembler instruction, but run through functions"
--msgstr "執行一行組譯後的指令，但不進入函式呼叫"
-+msgstr "執行一列組譯後的指令，但不進入函式呼叫"
- 
- #: languages/cpp/debugger/dbgtoolbar.cpp:329
- msgid "Execute one line of code, stepping into functions if appropriate"
--msgstr "執行一行程式碼，如果遇到函式呼叫則進入函式"
-+msgstr "執行一列程式碼，如果遇到函式呼叫則進入函式"
- 
- #: languages/cpp/debugger/dbgtoolbar.cpp:330
- msgid ""
- "Execute one assembler instruction, stepping into functions if appropriate"
--msgstr "執行一行組譯後的指令，如果遇到函式呼叫則進入函式"
-+msgstr "執行一列組譯後的指令，如果遇到函式呼叫則進入函式"
- 
- #: languages/cpp/debugger/dbgtoolbar.cpp:331
- #: languages/ruby/debugger/dbgtoolbar.cpp:322
-@@ -15760,20 +15884,20 @@
- 
- #: languages/cpp/debugger/dbgtoolbar.cpp:339
- msgid "Execute one line of code, but run through functions."
--msgstr "執行一行程式碼，但不進入函式呼叫。"
-+msgstr "執行一列程式碼，但不進入函式呼叫。"
- 
- #: languages/cpp/debugger/dbgtoolbar.cpp:340
- msgid "Execute one assembler instruction, but run through functions."
--msgstr "執行一行組譯後的指令，但不進入函式呼叫。"
-+msgstr "執行一列組譯後的指令，但不進入函式呼叫。"
- 
- #: languages/cpp/debugger/dbgtoolbar.cpp:341
- msgid "Execute one line of code, stepping into functions if appropriate."
--msgstr "執行一行程式碼，如果可能則進入函式。"
-+msgstr "執行一列程式碼，如果可能則進入函式。"
- 
- #: languages/cpp/debugger/dbgtoolbar.cpp:342
- msgid ""
- "Execute one assembler instruction, stepping into functions if appropriate."
--msgstr "執行一行組譯後的指令，如果可能則進入函式。"
-+msgstr "執行一列組譯後的指令，如果可能則進入函式。"
- 
- #: languages/cpp/debugger/dbgtoolbar.cpp:343
- #: languages/ruby/debugger/dbgtoolbar.cpp:333
-@@ -15797,9 +15921,8 @@
- #: languages/cpp/debugger/gdbcontroller.cpp:296
- #, c-format
- msgid ""
--"<b>Gdb command sent when debugger is not running</b>"
--"<br>The command was:"
--"<br> %1"
-+"<b>Gdb command sent when debugger is not running</b><br>The command was:<br> "
-+"%1"
- msgstr "<b>Gdb 命令在除錯器未執行時送出。</b> <br>命令為：<br>%1"
- 
- #: languages/cpp/debugger/dbgpsdlg.cpp:176
-@@ -15818,8 +15941,8 @@
- 
- #: languages/cpp/debugger/gdbcontroller.cpp:484
- msgid ""
--"<b>Invalid gdb reply</b>"
--"<p>The 'stopped' packet does not include the 'reason' field'."
-+"<b>Invalid gdb reply</b><p>The 'stopped' packet does not include the "
-+"'reason' field'."
- msgstr "<b>不正確的 gdb 回覆</b> <p>stopped 封包未包含 reason 欄位。"
- 
- #: languages/cpp/debugger/gdbcontroller.cpp:486
-@@ -15845,10 +15968,8 @@
- msgstr "接收到信號"
- 
- #: languages/cpp/debugger/gdbcontroller.cpp:649
--msgid ""
--"gdb message:\n"
--msgstr ""
--"gdb 訊息：\n"
-+msgid "gdb message:\n"
-+msgstr "gdb 訊息：\n"
- 
- #: languages/cpp/debugger/gdbcontroller.cpp:691
- msgid "No such file or directory."
-@@ -15868,8 +15989,8 @@
- 
- #: languages/cpp/debugger/gdbcontroller.cpp:846
- msgid ""
--"<b>Could not start debugger.</b>"
--"<p>Could not run '%1'. Make sure that the path name is specified correctly."
-+"<b>Could not start debugger.</b><p>Could not run '%1'. Make sure that the "
-+"path name is specified correctly."
- msgstr "<b>無法啟動除錯器</b><p>無法執行 \"%1\"。請檢查指定的路徑是否正確。"
- 
- #: languages/cpp/debugger/gdbcontroller.cpp:850
-@@ -15890,17 +16011,18 @@
- msgstr ""
- "gdb 無法使用 tty* 或 pty* 裝置。\n"
- "請檢查 /dev/tty* 和 /dev/pty* 的設定。\n"
--"您也許需要以 root 身放對 tty* 和 pty* 裝置檔用 chmod ug+rw 的指令，並且/或者用 usermod -G tty username "
--"命令將使用者新增到 tty 群組中。"
-+"您也許需要以 root 身放對 tty* 和 pty* 裝置檔用 chmod ug+rw 的指令，並且/或者"
-+"用 usermod -G tty username 命令將使用者新增到 tty 群組中。"
- 
- #: languages/cpp/debugger/gdbcontroller.cpp:1157
- msgid ""
--"<b>Application does not exist</b>"
--"<p>The application you're trying to debug,"
-+"<b>Application does not exist</b><p>The application you're trying to debug,"
- "<br>    %1\n"
- "<br>does not exist. Check that you've specified the right application in the "
- "debugger configuration."
--msgstr "<b>應用程式不存在</b> <p>您試著要除錯的應用程式<br> %1<br> 不存在。請檢查您在除錯器設定中指定的應用程式是否正確。"
-+msgstr ""
-+"<b>應用程式不存在</b> <p>您試著要除錯的應用程式<br> %1<br> 不存在。請檢查您在"
-+"除錯器設定中指定的應用程式是否正確。"
- 
- #: languages/cpp/debugger/gdbcontroller.cpp:1163
- msgid "Application does not exist"
-@@ -15908,10 +16030,12 @@
- 
- #: languages/cpp/debugger/gdbcontroller.cpp:1175
- msgid ""
--"<b>Could not run application '%1'.</b>"
--"<p>The application does not have the executable bit set. Try rebuilding the "
--"project, or change permissions manually."
--msgstr "<b>無法執行應用程式 %1。</b><p>應用程式可能沒有設定執行位元。請試著重建此專案，或是手動修改權限。"
-+"<b>Could not run application '%1'.</b><p>The application does not have the "
-+"executable bit set. Try rebuilding the project, or change permissions "
-+"manually."
-+msgstr ""
-+"<b>無法執行應用程式 %1。</b><p>應用程式可能沒有設定執行位元。請試著重建此專"
-+"案，或是手動修改權限。"
- 
- #: languages/cpp/debugger/gdbcontroller.cpp:1180
- msgid "Could not run application"
-@@ -15953,9 +16077,11 @@
- 
- #: languages/cpp/debugger/dbgpsdlg.cpp:173
- msgid ""
--"<b>Could not parse output from the <tt>ps</tt> command!</b>"
--"<p>The following line could not be parsed:<b><tt>%1</tt>"
--msgstr "<b>無法剖析 <tt>ps</tt> 的輸出。</b> <p>以下的內容無法被剖析：<b><tt>%1</tt></b>"
-+"<b>Could not parse output from the <tt>ps</tt> command!</b><p>The following "
-+"line could not be parsed:<b><tt>%1</tt>"
-+msgstr ""
-+"<b>無法剖析 <tt>ps</tt> 的輸出。</b> <p>以下的內容無法被剖析：<b><tt>%1</"
-+"tt></b>"
- 
- #: languages/cpp/debugger/framestackwidget.cpp:539
- #, c-format
-@@ -16042,12 +16168,10 @@
- 
- #: languages/cpp/debugger/gdbbreakpointwidget.cpp:375
- msgid ""
--"<b>Data write breakpoint</b>"
--"<br>Expression: %1"
--"<br>Address: 0x%2"
--"<br>Old value: %3"
--"<br>New value: %4"
--msgstr "<b>資料寫入中斷點</b> <br>表示式：%1 <br>位址：0x%2 <br>舊值：%3 <br>新值：%4"
-+"<b>Data write breakpoint</b><br>Expression: %1<br>Address: 0x%2<br>Old "
-+"value: %3<br>New value: %4"
-+msgstr ""
-+"<b>資料寫入中斷點</b> <br>表示式：%1 <br>位址：0x%2 <br>舊值：%3 <br>新值：%4"
- 
- #: languages/cpp/debugger/gdbbreakpointwidget.cpp:728
- #: languages/ruby/debugger/rdbbreakpointwidget.cpp:667
-@@ -16071,7 +16195,9 @@
- "Controls if commands issued internally by KDevelop will be shown or not."
- "<br>This option will affect only future commands, it won't add or remove "
- "already issued commands from the view."
--msgstr "控制 KDevelop 內部產生的指令是否要顯示。<br> 這個選項只會影響之後的指令，並不會影響已顯示在檢視中的指令。"
-+msgstr ""
-+"控制 KDevelop 內部產生的指令是否要顯示。<br> 這個選項只會影響之後的指令，並不"
-+"會影響已顯示在檢視中的指令。"
- 
- #: languages/cpp/debugger/gdboutputwidget.cpp:339
- msgid "Copy All"
-@@ -16092,21 +16218,20 @@
- 
- #: languages/cpp/debugger/variablewidget.cpp:120
- msgid ""
--"<b>Variable tree</b>"
--"<p>The variable tree allows you to see the values of local variables and "
--"arbitrary expressions."
--"<p>Local variables are displayed automatically and are updated as you step "
--"through your program. For each expression you enter, you can either evaluate it "
--"once, or \"watch\" it (make it auto-updated). Expressions that are not "
--"auto-updated can be updated manually from the context menu. Expressions can be "
--"renamed to more descriptive names by clicking on the name column."
--"<p>To change the value of a variable or an expression, click on the value."
--msgstr ""
--"<b>變數樹</b>"
--"<p>變數樹允許您檢視本地變數與任意表示式的值。 "
--"<p>本地變數會自動顯示，並且在您單步執行時更新。對您輸入的每個表示式，您可以只計算一次，或是監控它（讓它自動更新）。沒有自動更新的表示式可以在選單中手動更新。"
--"您也可以點選名稱欄位，將表示式重新命名為更清楚的名字。 "
--"<p>要改變變數或表示式的值，則點選數值。"
-+"<b>Variable tree</b><p>The variable tree allows you to see the values of "
-+"local variables and arbitrary expressions.<p>Local variables are displayed "
-+"automatically and are updated as you step through your program. For each "
-+"expression you enter, you can either evaluate it once, or \"watch\" it (make "
-+"it auto-updated). Expressions that are not auto-updated can be updated "
-+"manually from the context menu. Expressions can be renamed to more "
-+"descriptive names by clicking on the name column.<p>To change the value of a "
-+"variable or an expression, click on the value."
-+msgstr ""
-+"<b>變數樹</b><p>變數樹允許您檢視本地變數與任意表示式的值。 <p>本地變數會自動"
-+"顯示，並且在您單步執行時更新。對您輸入的每個表示式，您可以只計算一次，或是監"
-+"控它（讓它自動更新）。沒有自動更新的表示式可以在選單中手動更新。您也可以點選"
-+"名稱欄位，將表示式重新命名為更清楚的名字。 <p>要改變變數或表示式的值，則點選"
-+"數值。"
- 
- #: languages/cpp/debugger/variablewidget.cpp:134
- msgid "<b>Expression entry</b><p>Type in expression to evaluate."
-@@ -16215,7 +16340,7 @@
- 
- #: languages/cpp/debugger/stty.cpp:333 languages/ruby/debugger/stty.cpp:317
- msgid "kdevelop: Debug application console"
--msgstr "kdevelop：除錯程式控制台"
-+msgstr "kdevelop：除錯程式控制臺"
- 
- #: languages/cpp/pcsimporter/qtimporter/settingsdialog.cpp:115
- msgid ""
-@@ -16287,7 +16412,7 @@
- 
- #: languages/php/phpsupportpart.cpp:97
- msgid "&New Class..."
--msgstr "新增類別(&N)..."
-+msgstr "新增類別(&N)…"
- 
- #: languages/php/phpsupportpart.cpp:100
- msgid "New class"
-@@ -16299,8 +16424,8 @@
- 
- #: languages/php/phpsupportpart.cpp:106
- msgid ""
--"<b>PHP problems</b>"
--"<p>This view shows PHP parser warnings, errors, and fatal errors."
-+"<b>PHP problems</b><p>This view shows PHP parser warnings, errors, and fatal "
-+"errors."
- msgstr "<b>PHP 錯誤</b><p>這個檢視顯示 PHP 剖析器的警告，錯誤以及嚴重錯誤。"
- 
- #: languages/php/phpsupportpart.cpp:118 languages/php/phpsupportpart.cpp:333
-@@ -16353,10 +16478,11 @@
- 
- #: languages/sql/sqlsupport_part.cpp:60
- msgid ""
--"<b>Output of SQL commands</b>"
--"<p>This window shows the output of SQL commands being executed. It can display "
--"results of SQL \"select\" commands in a table."
--msgstr "<b>SQL 命令輸出</b><p>此視窗顯示被執行的 SQL 命令。它能在一個表格中顯示 \"select\" 命令的結果。"
-+"<b>Output of SQL commands</b><p>This window shows the output of SQL commands "
-+"being executed. It can display results of SQL \"select\" commands in a table."
-+msgstr ""
-+"<b>SQL 命令輸出</b><p>此視窗顯示被執行的 SQL 命令。它能在一個表格中顯示 "
-+"\"select\" 命令的結果。"
- 
- #: languages/sql/sqlsupport_part.cpp:135
- msgid "Specify Your Database Connections"
-@@ -16424,7 +16550,7 @@
- #: languages/perl/perlsupportpart.cpp:70
- #: languages/python/pythonsupportpart.cpp:69
- msgid "Execute String..."
--msgstr "執行字串..."
-+msgstr "執行字串…"
- 
- #: languages/perl/perlsupportpart.cpp:73
- msgid "Executes a string as Perl code"
-@@ -16440,7 +16566,7 @@
- 
- #: languages/perl/perlsupportpart.cpp:80
- msgid "Find Perl Function Documentation..."
--msgstr "尋找 Perl 函式文件..."
-+msgstr "尋找 Perl 函式文件…"
- 
- #: languages/perl/perlsupportpart.cpp:83
- msgid "Show the documentation page of a Perl function"
-@@ -16448,7 +16574,7 @@
- 
- #: languages/perl/perlsupportpart.cpp:85
- msgid "Find Perl FAQ Entry..."
--msgstr "尋找 Perl 常見問題項目..."
-+msgstr "尋找 Perl 常見問題項目…"
- 
- #: languages/csharp/csharpsupportpart.cpp:88
- #: languages/perl/perlsupportpart.cpp:88
-@@ -16500,8 +16626,7 @@
- 
- #: languages/ruby/rubysupport_part.cpp:62
- msgid ""
--"<b>Run Test Under Cursor</b>"
--"<p>Runs the function under the cursor as test."
-+"<b>Run Test Under Cursor</b><p>Runs the function under the cursor as test."
- msgstr "<b>執行測試到游標位置</b><p>以測試繼續執行程式到游標所在的位置。"
- 
- #: languages/ruby/rubysupport_part.cpp:64
-@@ -16511,8 +16636,7 @@
- 
- #: languages/ruby/rubysupport_part.cpp:66
- msgid ""
--"<b>Launch Browser</b>"
--"<p>Opens a web browser pointing to the Ruby Rails server"
-+"<b>Launch Browser</b><p>Opens a web browser pointing to the Ruby Rails server"
- msgstr "<b>啟動瀏覽器</b> <p>開啟網頁瀏覽器，指到 Ruby Rails 伺服器"
- 
- #: languages/ruby/rubysupport_part.cpp:68
-@@ -16547,27 +16671,25 @@
- 
- #: languages/ruby/debugger/debuggerpart.cpp:97
- msgid ""
--"<b>Variable tree</b>"
--"<p>The variable tree allows you to see the variable values as you step through "
--"your program using the internal debugger. Click the right mouse button on items "
--"in this view to get a popup menu.\n"
-+"<b>Variable tree</b><p>The variable tree allows you to see the variable "
-+"values as you step through your program using the internal debugger. Click "
-+"the right mouse button on items in this view to get a popup menu.\n"
- "To speed up stepping through your code leave the tree items closed.\n"
- msgstr ""
--"<b>變數樹</b>"
--"<p>變數樹可以讓您在使用內部除錯器進行單步除錯時，看到變數的值。對著此檢視內的變數點擊滑鼠右鍵，會出現一個選單。\n"
-+"<b>變數樹</b><p>變數樹可以讓您在使用內部除錯器進行單步除錯時，看到變數的值。"
-+"對著此檢視內的變數點擊滑鼠右鍵，會出現一個選單。\n"
- "為了加速單步執行的速度，請把樹狀檢視中的項目關閉。\n"
- 
- #: languages/ruby/debugger/debuggerpart.cpp:125
- msgid ""
--"<b>Frame stack</b>"
--"<p>Often referred to as the \"call stack\", this is a list showing what method "
--"is currently active and who called each method to get to this point in your "
--"program. By clicking on an item you can see the values in any of the previous "
--"calling methods."
--msgstr ""
--"<b>框架堆疊</b>"
--"<p>通常又叫做「呼叫堆疊」。它是一個列表，顯示出目前執行中的是哪個函式，以及一路上是誰呼叫了這些函式，直到目前執行的位置。點選其中一個項目，您就可以看到在前面"
--"呼叫的任一函式的值。"
-+"<b>Frame stack</b><p>Often referred to as the \"call stack\", this is a list "
-+"showing what method is currently active and who called each method to get to "
-+"this point in your program. By clicking on an item you can see the values in "
-+"any of the previous calling methods."
-+msgstr ""
-+"<b>框架堆疊</b><p>通常又叫做「呼叫堆疊」。它是一個列表，顯示出目前執行中的是"
-+"哪個函式，以及一路上是誰呼叫了這些函式，直到目前執行的位置。點選其中一個項"
-+"目，您就可以看到在前面呼叫的任一函式的值。"
- 
- #: languages/ruby/debugger/debuggerpart.cpp:134
- msgid "Debugger method call stack"
-@@ -16579,10 +16701,11 @@
- 
- #: languages/ruby/debugger/debuggerpart.cpp:143
- msgid ""
--"<b>RDB output</b>"
--"<p>Shows all rdb commands being executed. You can also issue any other rdb "
--"command while debugging."
--msgstr "<b>RDB 輸出</b><p>顯示所有被執行的 rdb 命令。您也可以在進行除錯的時候使用其它 rdb 命令。"
-+"<b>RDB output</b><p>Shows all rdb commands being executed. You can also "
-+"issue any other rdb command while debugging."
-+msgstr ""
-+"<b>RDB 輸出</b><p>顯示所有被執行的 rdb 命令。您也可以在進行除錯的時候使用其"
-+"它 rdb 命令。"
- 
- #: languages/ruby/debugger/debuggerpart.cpp:146
- msgid "RDB"
-@@ -16594,24 +16717,27 @@
- 
- #: languages/ruby/debugger/debuggerpart.cpp:183
- msgid ""
--"<b>Interrupt application</b>"
--"<p>Interrupts the debugged process or current RDB command."
-+"<b>Interrupt application</b><p>Interrupts the debugged process or current "
-+"RDB command."
- msgstr "<b>中斷應用程式</b><p>中斷被除錯的行程或目前的 rdb 命令。"
- 
- #: languages/ruby/debugger/debuggerpart.cpp:196
- msgid ""
--"<b>Step over</b>"
--"<p>Executes one line of source in the current source file. If the source line "
--"is a call to a method the whole method is executed and the app will stop at the "
--"line following the method call."
--msgstr "<b>單步</b><p>執行目前檔案中的一行程式碼。如果這行程式碼是一個方法呼叫，則會執行完整個方法，並且停在方法返回後的那行代碼處。"
-+"<b>Step over</b><p>Executes one line of source in the current source file. "
-+"If the source line is a call to a method the whole method is executed and "
-+"the app will stop at the line following the method call."
-+msgstr ""
-+"<b>單步</b><p>執行目前檔案中的一列程式碼。如果這行程式碼是一個方法呼叫，則會"
-+"執行完整個方法，並且停在方法返回後的那行代碼處。"
- 
- #: languages/ruby/debugger/debuggerpart.cpp:207
- msgid ""
--"<b>Step into</b>"
--"<p>Executes exactly one line of source. If the source line is a call to a "
--"method then execution will stop after the method has been entered."
--msgstr "<b>單步進入</b><p>僅執行一行程式碼。如果這行程式碼是一個方法呼叫，則進入方法，並停止在方法開始處。"
-+"<b>Step into</b><p>Executes exactly one line of source. If the source line "
-+"is a call to a method then execution will stop after the method has been "
-+"entered."
-+msgstr ""
-+"<b>單步進入</b><p>僅執行一列程式碼。如果這行程式碼是一個方法呼叫，則進入方"
-+"法，並停止在方法開始處。"
- 
- #: languages/ruby/debugger/debuggerpart.cpp:217
- msgid "Steps out of the current method"
-@@ -16619,19 +16745,19 @@
- 
- #: languages/ruby/debugger/debuggerpart.cpp:218
- msgid ""
--"<b>Step out</b>"
--"<p>Executes the application until the currently executing method is completed. "
--"The debugger will then display the line after the original call to that method. "
--"If program execution is in the outermost frame (i.e. in the "
--"topleveltoggleWatchpoint) then this operation has no effect."
--msgstr ""
--"<b>單步跳出</b>"
--"<p>執行應用程式直到目前方法執行完畢。除錯器將會顯示原來呼叫該方法的地方之後的源碼。如果程式在最外層的框架執行（也就是在最頂層的監控點），這個操作會被忽略。"
-+"<b>Step out</b><p>Executes the application until the currently executing "
-+"method is completed. The debugger will then display the line after the "
-+"original call to that method. If program execution is in the outermost frame "
-+"(i.e. in the topleveltoggleWatchpoint) then this operation has no effect."
-+msgstr ""
-+"<b>單步跳出</b><p>執行應用程式直到目前方法執行完畢。除錯器將會顯示原來呼叫該"
-+"方法的地方之後的原始碼。如果程式在最外層的框架執行（也就是在最頂層的監控點），"
-+"這個操作會被忽略。"
- 
- #: languages/ruby/debugger/debuggerpart.cpp:321
- msgid ""
--"<b>Watch</b>"
--"<p>Adds an expression under the cursor to the Variables/Watch list."
-+"<b>Watch</b><p>Adds an expression under the cursor to the Variables/Watch "
-+"list."
- msgstr "<b>監控</b><p>在變數/監控列表中加入目前在游標處的表示式。"
- 
- #: languages/ruby/debugger/debuggerpart.cpp:323
-@@ -16649,7 +16775,7 @@
- 
- #: languages/ruby/debugger/dbgtoolbar.cpp:224
- msgid "KDevelop ruby debugger: Click to execute one line of code (\"step\")"
--msgstr "KDevelop ruby 除錯器：點擊可執行一行程式碼（單步）"
-+msgstr "KDevelop ruby 除錯器：點擊可執行一列程式碼（單步）"
- 
- #: languages/ruby/debugger/dbgtoolbar.cpp:302
- msgid "Step Over"
-@@ -16661,19 +16787,19 @@
- 
- #: languages/ruby/debugger/dbgtoolbar.cpp:320
- msgid "Execute one line of code, but run through methods"
--msgstr "執行一行程式碼，但不進入方法呼叫。"
-+msgstr "執行一列程式碼，但不進入方法呼叫。"
- 
- #: languages/ruby/debugger/dbgtoolbar.cpp:321
- msgid "Execute one line of code, stepping into methods if appropriate"
--msgstr "執行一行程式碼，如果可能則進入方法。"
-+msgstr "執行一列程式碼，如果可能則進入方法。"
- 
- #: languages/ruby/debugger/dbgtoolbar.cpp:329
- msgid "Execute one line of code, but run through methods."
--msgstr "執行一行程式碼，但不進入方法呼叫。"
-+msgstr "執行一列程式碼，但不進入方法呼叫。"
- 
- #: languages/ruby/debugger/dbgtoolbar.cpp:331
- msgid "Execute one line of code, stepping into methods if appropriate."
--msgstr "執行一行程式碼，如果可能則進入方法。"
-+msgstr "執行一列程式碼，如果可能則進入方法。"
- 
- #: languages/ruby/debugger/rdbbreakpointwidget.cpp:182
- msgid "Add empty breakpoint"
-@@ -16685,10 +16811,12 @@
- 
- #: languages/ruby/debugger/rdbbreakpointwidget.cpp:183
- msgid ""
--"<b>Add empty breakpoint</b>"
--"<p>Shows a popup menu that allows you to choose the type of breakpoint, then "
--"adds a breakpoint of the selected type to the breakpoints list."
--msgstr "<b>新增空的中斷點</b><p>會顯示一個彈出式選單來選擇中斷點的型態。然後在中斷點列表中增加一個所選定型態的中斷點。"
-+"<b>Add empty breakpoint</b><p>Shows a popup menu that allows you to choose "
-+"the type of breakpoint, then adds a breakpoint of the selected type to the "
-+"breakpoints list."
-+msgstr ""
-+"<b>新增空的中斷點</b><p>會顯示一個彈出式選單來選擇中斷點的型態。然後在中斷點"
-+"列表中增加一個所選定型態的中斷點。"
- 
- #: languages/ruby/debugger/rdbbreakpointwidget.cpp:188
- msgid "Delete selected breakpoint"
-@@ -16700,8 +16828,8 @@
- 
- #: languages/ruby/debugger/rdbbreakpointwidget.cpp:189
- msgid ""
--"<b>Delete selected breakpoint</b>"
--"<p>Deletes the selected breakpoint in the breakpoints list."
-+"<b>Delete selected breakpoint</b><p>Deletes the selected breakpoint in the "
-+"breakpoints list."
- msgstr "<b>刪除選取的中斷點</b><p>從中斷點列表中刪除所選取的中斷點。"
- 
- #: languages/ruby/debugger/rdbbreakpointwidget.cpp:193
-@@ -16714,10 +16842,11 @@
- 
- #: languages/ruby/debugger/rdbbreakpointwidget.cpp:194
- msgid ""
--"<b>Edit selected breakpoint</b>"
--"<p>Allows to edit location, condition and ignore count properties of the "
--"selected breakpoint in the breakpoints list."
--msgstr "<b>編輯選取的中斷點</b><p>修改在中斷點列表中選取的中斷點的位置，條件和忽略計數屬性。"
-+"<b>Edit selected breakpoint</b><p>Allows to edit location, condition and "
-+"ignore count properties of the selected breakpoint in the breakpoints list."
-+msgstr ""
-+"<b>編輯選取的中斷點</b><p>修改在中斷點列表中選取的中斷點的位置，條件和忽略計"
-+"數屬性。"
- 
- #: languages/ruby/debugger/rdbbreakpointwidget.cpp:198
- msgid "Remove all breakpoints"
-@@ -16773,10 +16902,8 @@
- msgstr "複製到剪貼簿"
- 
- #: languages/ruby/debugger/rdbcontroller.cpp:349
--msgid ""
--"rdb message:\n"
--msgstr ""
--"rdb 訊息：\n"
-+msgid "rdb message:\n"
-+msgstr "rdb 訊息：\n"
- 
- #: languages/ruby/debugger/rdbcontroller.cpp:397
- #: languages/ruby/debugger/rdbcontroller.cpp:399
-@@ -16784,7 +16911,7 @@
- #: languages/ruby/debugger/rdbcontroller.cpp:508
- #, c-format
- msgid "No source: %1"
--msgstr "沒有程式源碼：%1"
-+msgstr "沒有程式原始碼：%1"
- 
- #: languages/ruby/debugger/rdbcontroller.cpp:706
- msgid ""
-@@ -16795,8 +16922,8 @@
- msgstr ""
- "Ruby 除錯器無法使用 tty* 或 pty* 裝置。\n"
- "請檢查 /dev/tty* 和 /dev/pty* 的設定。\n"
--"您也許需要以 root 身放對 tty* 和 pty* 裝置檔用 chmod ug+rw 的指令，並且/或者用 usermod -G tty username "
--"命令將使用者新增到 tty 群組中。"
-+"您也許需要以 root 身放對 tty* 和 pty* 裝置檔用 chmod ug+rw 的指令，並且/或者"
-+"用 usermod -G tty username 命令將使用者新增到 tty 群組中。"
- 
- #: languages/csharp/csharpsupportpart.cpp:68
- msgid "Runs the CSharp program"
-@@ -16816,7 +16943,7 @@
- 
- #: languages/csharp/csharpsupportpart.cpp:80
- msgid "Find CSharp Function Documentation..."
--msgstr "尋找 C# 函式文件..."
-+msgstr "尋找 C# 函式文件…"
- 
- #: languages/csharp/csharpsupportpart.cpp:83
- msgid "Show the documentation page of a CSharp function"
-@@ -16824,7 +16951,7 @@
- 
- #: languages/csharp/csharpsupportpart.cpp:85
- msgid "Find CSharp FAQ Entry..."
--msgstr "尋找 C# 常見問題項目..."
-+msgstr "尋找 C# 常見問題項目…"
- 
- #: languages/csharp/csharpsupportpart.cpp:230
- msgid "Show CSharp Documentation"
-@@ -16848,13 +16975,12 @@
- 
- #: languages/fortran/fortransupportpart.cpp:71
- msgid ""
--"<b>Run ftnchek</b>"
--"<p>Runs <b>ftnchek</b> to check fortran programs for semantic errors. Configure "
--"ftnchek options in project settings dialog, <b>Ftnchek</b> tab."
--msgstr ""
--"<b>執行 ftnchek</b>"
--"<p>執行 <b>ftnchek</b> 來檢查 fortran 程式的語義錯誤。在專案設定對話框中的 <b>Ftnchek</b> "
--"頁中設定ftnchek 選項。"
-+"<b>Run ftnchek</b><p>Runs <b>ftnchek</b> to check fortran programs for "
-+"semantic errors. Configure ftnchek options in project settings dialog, "
-+"<b>Ftnchek</b> tab."
-+msgstr ""
-+"<b>執行 ftnchek</b><p>執行 <b>ftnchek</b> 來檢查 fortran 程式的語義錯誤。在專"
-+"案設定對話框中的 <b>Ftnchek</b> 頁中設定ftnchek 選項。"
- 
- #: languages/fortran/fortransupportpart.cpp:85
- msgid "There is currently a job running."
-@@ -16895,7 +17021,8 @@
- 
- #: languages/fortran/ftnchekconfigwidget.cpp:107
- msgid ""
--"Warn if different declarations of the same block are not equal in total length"
-+"Warn if different declarations of the same block are not equal in total "
-+"length"
- msgstr "如果同一個區塊的不同宣告，其總長度不同，則提出警告"
- 
- #: languages/fortran/ftnchekconfigwidget.cpp:108
-@@ -16920,7 +17047,9 @@
- msgid ""
- "A scalar dummy argument is actually the same as another and is (or may be) "
- "modified"
--msgstr "一個數量虛設參數（scalar dummy argument）實際上和另一個是一樣的，而且可能已被修改"
-+msgstr ""
-+"一個數量虛設參數（scalar dummy argument）實際上和另一個是一樣的，而且可能已被"
-+"修改"
- 
- #: languages/fortran/ftnchekconfigwidget.cpp:125
- msgid ""
-@@ -16930,9 +17059,11 @@
- 
- #: languages/fortran/ftnchekconfigwidget.cpp:127
- msgid ""
--"A scalar dummy argument is the same as a common variable in the subprogram, and "
--"either is modified"
--msgstr "一個數量虛設參數（scalar dummy argument）和一個在子程式中的共用變數是一樣的，而且其中一個已被修改"
-+"A scalar dummy argument is the same as a common variable in the subprogram, "
-+"and either is modified"
-+msgstr ""
-+"一個數量虛設參數（scalar dummy argument）和一個在子程式中的共用變數是一樣的，"
-+"而且其中一個已被修改"
- 
- #: languages/fortran/ftnchekconfigwidget.cpp:134
- msgid "ACCEPT and TYPE I/O statements"
-@@ -17067,7 +17198,7 @@
- 
- #: languages/pascal/compiler/fpcoptions/optiontabs.cpp:61
- msgid "Show line numbers when processing files"
--msgstr "處理檔案時顯示行號"
-+msgstr "處理檔案時顯示列號"
- 
- #: languages/pascal/compiler/fpcoptions/optiontabs.cpp:63
- msgid "Print information on loaded units"
-@@ -17202,7 +17333,7 @@
- 
- #: languages/pascal/compiler/fpcoptions/optiontabs.cpp:255
- msgid "List source"
--msgstr "列出程式源碼"
-+msgstr "列出程式原始碼"
- 
- #: languages/pascal/compiler/fpcoptions/optiontabs.cpp:257
- msgid "List register allocation and release info"
-@@ -17584,7 +17715,7 @@
- 
- #: languages/pascal/compiler/dccoptions/optiontabs.cpp:128
- msgid "Package source code directory:"
--msgstr "包裝程式源碼目錄："
-+msgstr "包裝程式原始碼目錄："
- 
- #: buildtools/autotools/autosubprojectview.cpp:220
- #: buildtools/autotools/autosubprojectview.cpp:221
-@@ -17809,13 +17940,13 @@
- 
- #: languages/python/pythonsupportpart.cpp:79
- msgid ""
--"<b>Start python interpreter</b>"
--"<p>Starts the Python interpreter without a program"
-+"<b>Start python interpreter</b><p>Starts the Python interpreter without a "
-+"program"
- msgstr "<b>啟動 Python 直譯器</b><p>啟動 Python 直譯器但不載入程式。"
- 
- #: languages/python/pythonsupportpart.cpp:81
- msgid "Python Documentation..."
--msgstr "Python 文件..."
-+msgstr "Python 文件…"
- 
- #: languages/python/pythonsupportpart.cpp:84
- msgid "Python documentation"
-@@ -17843,11 +17974,11 @@
- 
- #: languages/kjssupport/kjssupport_part.cpp:90
- msgid "KJS Console"
--msgstr "KJS 主控台"
-+msgstr "KJS 主控臺"
- 
- #: languages/kjssupport/kjssupport_part.cpp:90
- msgid "KJS Embed Console"
--msgstr "KJS 內嵌主控台"
-+msgstr "KJS 內嵌主控臺"
- 
- #: lib/util/kscriptactionmanager.cpp:98
- msgid "Unable to get KScript Runner for type \"%1\"."
-@@ -17867,7 +17998,7 @@
- 
- #: lib/util/execcommand.cpp:59
- msgid "Command running..."
--msgstr "命令正在執行..."
-+msgstr "命令正在執行…"
- 
- #: lib/util/execcommand.cpp:60
- msgid "Please wait until the \"%1\" command finishes."
-@@ -18025,14 +18156,14 @@
- 
- #: lib/widgets/kdevhtmlpart.cpp:57
- msgid ""
--"<b>Back</b>"
--"<p>Moves backwards one step in the <b>documentation</b> browsing history."
-+"<b>Back</b><p>Moves backwards one step in the <b>documentation</b> browsing "
-+"history."
- msgstr "<b>後退</b><p>在<b>文件</b>瀏覽歷史中往回退一步。"
- 
- #: lib/widgets/kdevhtmlpart.cpp:69
- msgid ""
--"<b>Forward</b>"
--"<p>Moves forward one step in the <b>documentation</b> browsing history."
-+"<b>Forward</b><p>Moves forward one step in the <b>documentation</b> browsing "
-+"history."
- msgstr "<b>前進</b><p>在<b>文件</b>瀏覽歷史中往前進一步。"
- 
- #: lib/widgets/kdevhtmlpart.cpp:99 parts/documentation/docutils.cpp:81
-@@ -18251,10 +18382,12 @@
- 
- #: src/mainwindowshare.cpp:116
- msgid ""
--"<b>Stop</b>"
--"<p>Stops all running processes (like building process, grep command, etc.). "
--"When placed onto a toolbar provides a popup menu to choose a process to stop."
--msgstr "<b>停止</b><p>停止所有執行的行程（例如編譯行程、grep 命令等）。如果放在工具列上，它會提供一個選單讓您選擇要停止的行程。"
-+"<b>Stop</b><p>Stops all running processes (like building process, grep "
-+"command, etc.). When placed onto a toolbar provides a popup menu to choose a "
-+"process to stop."
-+msgstr ""
-+"<b>停止</b><p>停止所有執行的行程（例如編譯行程、grep 命令等）。如果放在工具列"
-+"上，它會提供一個選單讓您選擇要停止的行程。"
- 
- #: src/mainwindowshare.cpp:130
- msgid "Lets you switch the menubar on/off."
-@@ -18323,10 +18456,11 @@
- 
- #: src/mainwindowshare.cpp:170
- msgid ""
--"<b>Last accessed window</b>"
--"<p>Switches to the last viewed window (Hold the Alt key pressed and walk on by "
--"repeating the Up key)."
--msgstr "<b>上次檢視的視窗</b><p>切換到上次檢視的視窗（按住 Alt 鍵，用上箭頭鍵輪流切換）。"
-+"<b>Last accessed window</b><p>Switches to the last viewed window (Hold the "
-+"Alt key pressed and walk on by repeating the Up key)."
-+msgstr ""
-+"<b>上次檢視的視窗</b><p>切換到上次檢視的視窗（按住 Alt 鍵，用上箭頭鍵輪流切"
-+"換）。"
- 
- #: src/mainwindowshare.cpp:172
- msgid "&First Accessed Window"
-@@ -18338,18 +18472,19 @@
- 
- #: src/mainwindowshare.cpp:174
- msgid ""
--"<b>First accessed window</b>"
--"<p>Switches to the first accessed window (Hold the Alt key pressed and walk on "
--"by repeating the Down key)."
--msgstr "<b>首次檢視的視窗</b><p>切換到首次檢視的視窗（按住 Alt 鍵，用下箭頭鍵輪流切換）。"
-+"<b>First accessed window</b><p>Switches to the first accessed window (Hold "
-+"the Alt key pressed and walk on by repeating the Down key)."
-+msgstr ""
-+"<b>首次檢視的視窗</b><p>切換到首次檢視的視窗（按住 Alt 鍵，用下箭頭鍵輪流切"
-+"換）。"
- 
- #: src/mainwindowshare.cpp:176
- msgid "Configure Plugins..."
--msgstr "設定外掛程式..."
-+msgstr "設定外掛程式…"
- 
- #: src/mainwindowshare.cpp:178
- msgid "Configure &Editor..."
--msgstr "設定編輯器(&E)..."
-+msgstr "設定編輯器(&E)…"
- 
- #: src/mainwindowshare.cpp:179
- msgid "Configure editor settings"
-@@ -18435,8 +18570,9 @@
- 
- #: src/main.cpp:51 src/main_assistant.cpp:48
- msgid ""
--"QEditor component, code completion, Abbrev component, C++ support, Java support"
--msgstr "QEditor 元件、程式源碼補完、Abbrev 元件、C++ 支援、Java 支援"
-+"QEditor component, code completion, Abbrev component, C++ support, Java "
-+"support"
-+msgstr "QEditor 元件、程式原始碼補完、Abbrev 元件、C++ 支援、Java 支援"
- 
- #: src/main.cpp:52 src/main_assistant.cpp:49
- msgid "Help with KParts infrastructure"
-@@ -18507,7 +18643,7 @@
- 
- #: src/main.cpp:71 src/main_assistant.cpp:67
- msgid "C++ code completion, persistent class store"
--msgstr "C++ 源碼補完，永久類別儲存"
-+msgstr "C++ 原始碼補完，永久類別儲存"
- 
- #: src/main.cpp:72 src/main.cpp:73 src/main.cpp:76 src/main_assistant.cpp:68
- #: src/main_assistant.cpp:69 src/main_assistant.cpp:72
-@@ -18526,7 +18662,7 @@
- msgid ""
- "Documentation Finder,  qmake projectmanager patches, usability improvements, "
- "bugfixes ... "
--msgstr "文件尋找器、qmake 專案管理員修補、可用性改進、錯誤修正..."
-+msgstr "文件尋找器、qmake 專案管理員修補、可用性改進、錯誤修正…"
- 
- #: src/main.cpp:78 src/main_assistant.cpp:74
- msgid "QMake project manager patches"
-@@ -18534,7 +18670,7 @@
- 
- #: src/main.cpp:79 src/main_assistant.cpp:75
- msgid "Cleanup and bugfixes for qEditor, AutoMake and much other stuff"
--msgstr "qEditor 整理程式源碼、錯誤修正、AutoMake 以及其它的協助"
-+msgstr "qEditor 整理程式原始碼、錯誤修正、AutoMake 以及其它的協助"
- 
- #: src/main.cpp:102 src/main_assistant.cpp:100
- msgid "Loading Settings"
-@@ -18550,8 +18686,8 @@
- 
- #: src/partcontroller.cpp:131
- msgid ""
--"<b>Open file</b>"
--"<p>Opens an existing file without adding it to the project.</p>"
-+"<b>Open file</b><p>Opens an existing file without adding it to the project.</"
-+"p>"
- msgstr "<b>開啟檔案</b><p>開啟現有的檔案，但是不加到專案中。</p>"
- 
- #: src/partcontroller.cpp:134
-@@ -18580,10 +18716,11 @@
- 
- #: src/partcontroller.cpp:144
- msgid ""
--"<b>Revert all</b>"
--"<p>Reverts all changes in opened files. Prompts to save changes so the "
--"reversion can be canceled for each modified file."
--msgstr "<b>全部返轉</b><p>返轉開啟的檔案中的所有修改。將對每個修改過的檔案詢問是否要儲存（也就是取消返轉）。"
-+"<b>Revert all</b><p>Reverts all changes in opened files. Prompts to save "
-+"changes so the reversion can be canceled for each modified file."
-+msgstr ""
-+"<b>全部返轉</b><p>返轉開啟的檔案中的所有修改。將對每個修改過的檔案詢問是否要"
-+"儲存（也就是取消返轉）。"
- 
- #: src/partcontroller.cpp:148
- msgid "Close current file"
-@@ -18631,9 +18768,11 @@
- 
- #: src/partcontroller.cpp:181
- msgid ""
--"<b>Goto Last Edit Position</b>"
--"<p>Open the last edited file and position cursor at the point of edit"
--msgstr "<b>跳到最後一次編輯的位置</b> <p>開啟最後一次編輯的檔案，並跳到游標所在的最後位置"
-+"<b>Goto Last Edit Position</b><p>Open the last edited file and position "
-+"cursor at the point of edit"
-+msgstr ""
-+"<b>跳到最後一次編輯的位置</b> <p>開啟最後一次編輯的檔案，並跳到游標所在的最後"
-+"位置"
- 
- #: src/partcontroller.cpp:1008
- msgid ""
-@@ -18674,7 +18813,8 @@
- 
- #: src/partcontroller.cpp:1483
- msgid ""
--"Conflict: The file \"%1\" has changed on disk while being modified in memory.\n"
-+"Conflict: The file \"%1\" has changed on disk while being modified in "
-+"memory.\n"
- "\n"
- "You should investigate before saving to make sure you are not losing data."
- msgstr ""
-@@ -18732,11 +18872,12 @@
- 
- #: src/main.cpp:38
- msgid "Advanced C++ code completion, C++ support, overall improvements"
--msgstr "進階的 C++ 源碼補完，C++ 支援，整體改進"
-+msgstr "進階的 C++ 原始碼補完，C++ 支援，整體改進"
- 
- #: src/main.cpp:49
- msgid ""
--"Automake manager patches, Astyle plugin update, plugin patches and improvements"
-+"Automake manager patches, Astyle plugin update, plugin patches and "
-+"improvements"
- msgstr "Automake 管理器修補，Astyle 外掛程式更新，外掛程式修補，與整體改進"
- 
- #: src/main.cpp:54
-@@ -18754,15 +18895,15 @@
- #: src/simplemainwindow.cpp:98
- msgid ""
- "Unable to find plugins, KDevelop will not work properly.\n"
--"Please make sure that KDevelop is installed in your KDE directory; otherwise, "
--"you have to add KDevelop's installation path to the environment variable "
--"KDEDIRS and run kbuildsycoca. Restart KDevelop afterwards.\n"
-+"Please make sure that KDevelop is installed in your KDE directory; "
-+"otherwise, you have to add KDevelop's installation path to the environment "
-+"variable KDEDIRS and run kbuildsycoca. Restart KDevelop afterwards.\n"
- "Example for BASH users:\n"
- "export KDEDIRS=/path/to/kdevelop:$KDEDIRS && kbuildsycoca"
- msgstr ""
- "找不到外掛程式，KDevelop 將無法正常運作。\n"
--"請確定 KDevelop 安裝在您的 KDE 目錄下，不然您需要把 KDevelop 的安裝路徑新增到環境變數 KDEDIRS 裡，並執行 "
--"kbuildsycoca，然後重新執行 KDevelop。\n"
-+"請確定 KDevelop 安裝在您的 KDE 目錄下，不然您需要把 KDevelop 的安裝路徑新增到"
-+"環境變數 KDEDIRS 裡，並執行 kbuildsycoca，然後重新執行 KDevelop。\n"
- "例如 Bash 用戶需要執行：\n"
- "export KDEDIRS=/path/to/kdevelop:$KDEDIRS && kbuildsycoca"
- 
-@@ -18838,8 +18979,7 @@
- msgid ""
- "The file %1 does not contain a valid KDevelop project session "
- "('KDevPrjSession').\n"
--msgstr ""
--"檔案 %1 中沒有包含有效的 KDevelop 專案工作階段（KDevPrjSession）。\n"
-+msgstr "檔案 %1 中沒有包含有效的 KDevelop 專案工作階段（KDevPrjSession）。\n"
- 
- #: src/projectsession.cpp:95
- msgid "The document type seems to be: '%1'."
-@@ -18894,10 +19034,10 @@
- 
- #: src/plugincontroller.cpp:219
- msgid ""
--"<b>Could not load plugin</b>"
--"<br>Plugin %1 could not be loaded"
--"<br>Library loader error: %2"
--msgstr "<b>無法載入外掛程式</b> <br>外掛程式 %1 無法被載入 <br>函式庫載入錯誤：%2"
-+"<b>Could not load plugin</b><br>Plugin %1 could not be loaded<br>Library "
-+"loader error: %2"
-+msgstr ""
-+"<b>無法載入外掛程式</b> <br>外掛程式 %1 無法被載入 <br>函式庫載入錯誤：%2"
- 
- #: src/plugincontroller.cpp:223
- msgid "Could not load plugin"
-@@ -18905,7 +19045,7 @@
- 
- #: src/statusbar.cpp:101
- msgid " Line: %1 Col: %2 "
--msgstr " 行：%1 欄：%2 "
-+msgstr " 列：%1 欄：%2 "
- 
- #: src/languageselectwidget.cpp:65
- msgid "Additional Language Support"
-@@ -18913,13 +19053,13 @@
- 
- #: src/languageselectwidget.cpp:115
- msgid ""
--"Primary language is '%1'. Please select additional languages the project might "
--"contain."
-+"Primary language is '%1'. Please select additional languages the project "
-+"might contain."
- msgstr "主要語言是 %1 ，請選擇專案可能含有的其它語言。"
- 
- #: src/projectmanager.cpp:96
- msgid "&Open Project..."
--msgstr "開啟專案(&O)..."
-+msgstr "開啟專案(&O)…"
- 
- #: src/projectmanager.cpp:99
- msgid "Open project"
-@@ -18991,11 +19131,11 @@
- 
- #: src/projectmanager.cpp:278
- msgid "Changing plugin profile..."
--msgstr "正在更改外掛程式設定檔案..."
-+msgstr "正在更改外掛程式設定檔案…"
- 
- #: src/projectmanager.cpp:281
- msgid "Loading project plugins..."
--msgstr "正在載入專案外掛程式..."
-+msgstr "正在載入專案外掛程式…"
- 
- #: src/projectmanager.cpp:290
- msgid "error during restoring of the KDevelop session !"
-@@ -19018,7 +19158,7 @@
- "%3"
- msgstr ""
- "這不是一個有效的專案檔。\n"
--"%1 行 %2 欄 XML 格式錯誤：\n"
-+"%1 列 %2 欄 XML 格式錯誤：\n"
- "%3"
- 
- #: src/projectmanager.cpp:385
-@@ -19074,7 +19214,7 @@
- 
- #: src/newui/button.cpp:58
- msgid "Assign Accelerator..."
--msgstr "指定快捷鍵..."
-+msgstr "指定快捷鍵…"
- 
- #: src/newui/button.cpp:60
- msgid "Clear Accelerator"
-@@ -19233,7 +19373,7 @@
- 
- #: vcs/subversion/subversion_part.cpp:101
- msgid "&Commit to Repository..."
--msgstr "提交到主目錄(&C)..."
-+msgstr "提交到主目錄(&C)…"
- 
- #: vcs/cvsservice/cvspart.cpp:148 vcs/subversion/subversion_part.cpp:102
- msgid "Commit file(s)"
-@@ -19260,11 +19400,11 @@
- 
- #: vcs/subversion/subversion_part.cpp:114
- msgid "Show logs..."
--msgstr "顯示紀錄..."
-+msgstr "顯示紀錄…"
- 
- #: vcs/subversion/subversion_part.cpp:115
- msgid "Blame..."
--msgstr "Blame..."
-+msgstr "Blame…"
- 
- #: vcs/cvsservice/cvspart.cpp:191 vcs/subversion/subversion_part.cpp:117
- msgid "&Remove From Repository"
-@@ -19339,8 +19479,8 @@
- 
- #: vcs/subversion/subversion_part.cpp:152
- msgid ""
--"<b>Resolve the conflicting state</b>"
--"<p>Remove the conflict state that can be set on a file after a merge failed."
-+"<b>Resolve the conflicting state</b><p>Remove the conflict state that can be "
-+"set on a file after a merge failed."
- msgstr "<b>解決衝突狀態</b><p>移除檔案合併失敗後造成衝突的部份。"
- 
- #: vcs/subversion/subversion_part.cpp:153
-@@ -19349,7 +19489,7 @@
- 
- #: vcs/subversion/subversion_part.cpp:156
- msgid "Copy this working copy to URL.."
--msgstr "複製此工作複本到網址..."
-+msgstr "複製此工作複本到網址…"
- 
- #: vcs/subversion/subversion_part.cpp:158
- msgid "Merge difference to working copy"
-@@ -19506,8 +19646,8 @@
- 
- #: vcs/subversion/svn_kio.cpp:1698
- msgid ""
--"This certificate from server could not be trusted automatically. Will you trust "
--"this certificate? "
-+"This certificate from server could not be trusted automatically. Will you "
-+"trust this certificate? "
- msgstr "從伺服器上取得的此憑證無法自動被信任。您要信任此憑證嗎？"
- 
- #: vcs/subversion/svn_kio.cpp:1903
-@@ -19724,12 +19864,14 @@
- msgid ""
- "If you just have installed new version of KDevelop, and if the error message "
- "was unknown protocol kdevsvn+*, try to restart KDE"
--msgstr "如果您安裝了新版的 KDevelop，並且錯誤訊息為：unknown protocol kdevsvn+*，請試著重新啟動 KDE"
-+msgstr ""
-+"如果您安裝了新版的 KDevelop，並且錯誤訊息為：unknown protocol kdevsvn+*，請試"
-+"著重新啟動 KDE"
- 
- #: vcs/subversion/subversion_core.cpp:703
- msgid ""
--"You don't have kompare installed. We recommend you to install kompare to view "
--"difference graphically"
-+"You don't have kompare installed. We recommend you to install kompare to "
-+"view difference graphically"
- msgstr "您未安裝 Kompare。我們建議您安裝 Kompare 可以有圖形化比較檔案的功能。"
- 
- #: vcs/subversion/subversion_core.cpp:715
-@@ -19895,11 +20037,11 @@
- 
- #: vcs/cvsservice/cvspartimpl.cpp:674
- msgid "Creating Tag/Branch for files ..."
--msgstr "正在為檔案建立標籤/分支..."
-+msgstr "正在為檔案建立標籤/分支…"
- 
- #: vcs/cvsservice/cvspartimpl.cpp:698
- msgid "Removing Tag from files ..."
--msgstr "正在從檔案中刪除標籤..."
-+msgstr "正在從檔案中刪除標籤…"
- 
- #: vcs/cvsservice/cvspartimpl.cpp:791
- #: vcs/cvsservice/integrator/integratordlg.cpp:101
-@@ -19971,7 +20113,7 @@
- 
- #: parts/diff/diffwidget.cpp:83 vcs/cvsservice/diffwidget.cpp:80
- msgid "&Save As..."
--msgstr "另存為(&S)..."
-+msgstr "另存為(&S)…"
- 
- #: parts/diff/diffwidget.cpp:88 vcs/cvsservice/diffwidget.cpp:85
- msgid "Highlight Syntax"
-@@ -19999,12 +20141,11 @@
- 
- #: vcs/cvsservice/cvspart.cpp:133
- msgid ""
--"<b>CVS</b>"
--"<p>Concurrent Versions System operations window. Shows output of Cervisia CVS "
--"Service."
-+"<b>CVS</b><p>Concurrent Versions System operations window. Shows output of "
-+"Cervisia CVS Service."
- msgstr ""
--"<b>CVS</b>"
--"<p>CVS（Concurrent Versions System）操作視窗，顯示 Cervisia CVS 服務的輸出。"
-+"<b>CVS</b><p>CVS（Concurrent Versions System）操作視窗，顯示 Cervisia CVS 服"
-+"務的輸出。"
- 
- #: vcs/cvsservice/cvspart.cpp:134
- msgid "CvsService Output"
-@@ -20109,9 +20250,10 @@
- 
- #: vcs/cvsservice/cvspart.cpp:189 vcs/cvsservice/cvspart.cpp:344
- msgid ""
--"<b>Add to repository as binary</b>"
--"<p>Adds file to repository as binary (-kb option)."
--msgstr "<b>以二進位模式新增到主目錄中</b><p>將檔案以二進位模式新增到主目錄中（-kb）。"
-+"<b>Add to repository as binary</b><p>Adds file to repository as binary (-kb "
-+"option)."
-+msgstr ""
-+"<b>以二進位模式新增到主目錄中</b><p>將檔案以二進位模式新增到主目錄中（-kb）。"
- 
- #: vcs/cvsservice/cvspart.cpp:196
- msgid "&Update/Revert to Another Release"
-@@ -20123,8 +20265,8 @@
- 
- #: vcs/cvsservice/cvspart.cpp:199 vcs/cvsservice/cvspart.cpp:354
- msgid ""
--"<b>Update/revert to another release</b>"
--"<p>Updates/reverts file(s) to another release."
-+"<b>Update/revert to another release</b><p>Updates/reverts file(s) to another "
-+"release."
- msgstr "<b>更新/返轉到另一個版本</b><p>將檔案更新/返轉到另一個版本。"
- 
- #: vcs/cvsservice/cvspart.cpp:201
-@@ -20173,9 +20315,10 @@
- 
- #: vcs/cvsservice/cvspart.cpp:219 vcs/cvsservice/cvspart.cpp:360
- msgid ""
--"<b>Ignore in CVS operations</b>"
--"<p>Ignore file(s) by adding it to .cvsignore file."
--msgstr "<b>在 CVS 操作中忽略</b><p>將檔案名放入 .cvsignore 檔案，CVS 操作將忽略它們。"
-+"<b>Ignore in CVS operations</b><p>Ignore file(s) by adding it to .cvsignore "
-+"file."
-+msgstr ""
-+"<b>在 CVS 操作中忽略</b><p>將檔案名放入 .cvsignore 檔案，CVS 操作將忽略它們。"
- 
- #: vcs/cvsservice/cvspart.cpp:221
- msgid "Do &Not Ignore in CVS Operations"
-@@ -20187,10 +20330,11 @@
- 
- #: vcs/cvsservice/cvspart.cpp:224 vcs/cvsservice/cvspart.cpp:362
- msgid ""
--"<b>Do not ignore in CVS operations</b>"
--"<p>Do not ignore file(s) by removing\n"
-+"<b>Do not ignore in CVS operations</b><p>Do not ignore file(s) by removing\n"
- "it from .cvsignore file."
--msgstr "<b>不要在 CVS 操作中忽略</b><p>將檔案名從 .cvsignore 檔案中刪除，CVS 操作將不再忽略它們。"
-+msgstr ""
-+"<b>不要在 CVS 操作中忽略</b><p>將檔案名從 .cvsignore 檔案中刪除，CVS 操作將不"
-+"再忽略它們。"
- 
- #: vcs/cvsservice/cvspart.cpp:226
- msgid "&Log to Server"
-@@ -20291,7 +20435,7 @@
- 
- #: vcs/cvsservice/cvsprocesswidget.cpp:193
- msgid "Done CVS command ..."
--msgstr "CVS 命令完成..."
-+msgstr "CVS 命令完成…"
- 
- #: vcs/cvsservice/integrator/integratordlg.cpp:62
- #: vcs/cvsservice/integrator/integratordlg.cpp:82
-@@ -20320,7 +20464,8 @@
- 
- #: vcs/cvsservice/integrator/integratordlg.cpp:131
- msgid ""
--"cvs import exited with status %1. Please check if the cvs location is correct."
-+"cvs import exited with status %1. Please check if the cvs location is "
-+"correct."
- msgstr "cvs import 離開狀態為 %1。請檢查 cvs 的位置是否正確。"
- 
- #: vcs/perforce/perforcepart.cpp:60 vcs/perforce/perforcepart.cpp:101
-@@ -20359,9 +20504,10 @@
- 
- #: vcs/perforce/perforcepart.cpp:76 vcs/perforce/perforcepart.cpp:114
- msgid ""
--"<b>Diff against repository</b>"
--"<p>Compares a client workspace file to a revision in the depot."
--msgstr "<b>和主目錄作比較</b><p>對客戶端工作空間的檔案和主目錄裡的某一版本作比較。"
-+"<b>Diff against repository</b><p>Compares a client workspace file to a "
-+"revision in the depot."
-+msgstr ""
-+"<b>和主目錄作比較</b><p>對客戶端工作空間的檔案和主目錄裡的某一版本作比較。"
- 
- #: vcs/perforce/perforcepart.cpp:77 vcs/perforce/perforcepart.cpp:115
- msgid "Add to Repository"
-@@ -20373,8 +20519,8 @@
- 
- #: vcs/perforce/perforcepart.cpp:80 vcs/perforce/perforcepart.cpp:117
- msgid ""
--"<b>Add to repository</b>"
--"<p>Open file(s) in a client workspace for addition to the depot."
-+"<b>Add to repository</b><p>Open file(s) in a client workspace for addition "
-+"to the depot."
- msgstr "<b>新增到主目錄</b><p>在客戶端工作空間中開啟檔案，新增到主目錄。"
- 
- #: vcs/perforce/perforcepart.cpp:81 vcs/perforce/perforcepart.cpp:118
-@@ -20383,8 +20529,8 @@
- 
- #: vcs/perforce/perforcepart.cpp:84 vcs/perforce/perforcepart.cpp:120
- msgid ""
--"<b>Remove from repository</b>"
--"<p>Open file(s) in a client workspace for deletion from the depot."
-+"<b>Remove from repository</b><p>Open file(s) in a client workspace for "
-+"deletion from the depot."
- msgstr "<b>從主目錄中刪除</b><p>在客戶端工作空間開啟檔案，從主目錄中刪除。"
- 
- #: vcs/perforce/perforcepart.cpp:121
-@@ -20462,13 +20608,13 @@
- 
- #: parts/diff/diffpart.cpp:54
- msgid ""
--"<b>Difference viewer</b>"
--"<p>Shows output of the diff format. Can utilize every installed component that "
--"is able to show diff output. For example if you have Kompare installed, "
--"Difference Viewer can use its graphical diff view."
-+"<b>Difference viewer</b><p>Shows output of the diff format. Can utilize "
-+"every installed component that is able to show diff output. For example if "
-+"you have Kompare installed, Difference Viewer can use its graphical diff "
-+"view."
- msgstr ""
--"<b>比較檢視器</b>"
--"<p>按 diff 格式顯示輸出。可以使用任何顯示比較輸出的元件。例如，如果您安裝了 Kompare，比較檢視器能用它顯示圖形化的差異。"
-+"<b>比較檢視器</b><p>按 diff 格式顯示輸出。可以使用任何顯示比較輸出的元件。例"
-+"如，如果您安裝了 Kompare，比較檢視器能用它顯示圖形化的差異。"
- 
- #: parts/diff/diffpart.cpp:57
- msgid "Output of the diff command"
-@@ -20476,7 +20622,7 @@
- 
- #: parts/diff/diffpart.cpp:60
- msgid "Difference Viewer..."
--msgstr "比較檢視器..."
-+msgstr "比較檢視器…"
- 
- #: parts/diff/diffpart.cpp:63
- msgid "Difference viewer"
-@@ -20492,10 +20638,11 @@
- 
- #: parts/diff/diffpart.cpp:125
- msgid ""
--"<b>Difference to disk file</b>"
--"<p>Shows the difference between the file contents in this editor and the file "
--"contents on disk."
--msgstr "<b>和磁碟檔案比較</b><p>顯示編輯器裡的檔案內容和磁碟上儲存的檔案內容之間的差異。"
-+"<b>Difference to disk file</b><p>Shows the difference between the file "
-+"contents in this editor and the file contents on disk."
-+msgstr ""
-+"<b>和磁碟檔案比較</b><p>顯示編輯器裡的檔案內容和磁碟上儲存的檔案內容之間的差"
-+"異。"
- 
- #: parts/diff/diffpart.cpp:168
- msgid "Could not invoke the \"diff\" command."
-@@ -20506,10 +20653,8 @@
- msgstr "比較元件：未發現差異。"
- 
- #: parts/diff/diffpart.cpp:185
--msgid ""
--"Diff command failed (%1):\n"
--msgstr ""
--"diff 命令失敗(%1)：\n"
-+msgid "Diff command failed (%1):\n"
-+msgstr "diff 命令失敗(%1)：\n"
- 
- #: parts/diff/diffpart.cpp:240
- msgid "Please Select Patch File"
-@@ -20529,8 +20674,8 @@
- 
- #: parts/partexplorer/partexplorerform.cpp:122
- msgid ""
--"<b>Matching services</b>"
--"<p>Results (if any) are shown grouped by matching service name."
-+"<b>Matching services</b><p>Results (if any) are shown grouped by matching "
-+"service name."
- msgstr "<b>比對服務</b><p>若有結果，則以比對服務名稱分組顯示。"
- 
- #: kdevdesigner/designer/mainwindowactions.cpp:310
-@@ -20556,24 +20701,23 @@
- 
- #: parts/partexplorer/partexplorer_plugin.cpp:46
- msgid ""
--"<b>Part explorer</b>"
--"<p>Shows a dialog for KTrader query execution. Search your KDE documentation "
--"for more information about KDE services and KTrader."
-+"<b>Part explorer</b><p>Shows a dialog for KTrader query execution. Search "
-+"your KDE documentation for more information about KDE services and KTrader."
- msgstr ""
--"<b>元件瀏覽器</b>"
--"<p>顯示一個執行 KTrader 查詢的對話框。關於 KDE 服務和 KTrader 的詳細資訊，請參考 KDE 文件。"
-+"<b>元件瀏覽器</b><p>顯示一個執行 KTrader 查詢的對話框。關於 KDE 服務和 "
-+"KTrader 的詳細資訊，請參考 KDE 文件。"
- 
- #: parts/replace/replace_part.cpp:43
- msgid ""
--"<b>Replace</b>"
--"<p>This window shows a preview of a string replace operation. Uncheck a line to "
--"exclude that replacement. Uncheck a file to exclude the whole file from the "
--"operation. Clicking on a line in the list will automatically open the "
--"corresponding source file and set the cursor to the line with the match."
--msgstr ""
--"<b>取代</b>"
--"<p>此視窗顯示字串取代操作的預覽。取消勾選某一行就可以將該行排除。取消勾選某個檔案也可以將該檔案排除。點擊列表中的某一行會自動開啟相關的程式源碼檔，並將游標設"
--"定在符合處。"
-+"<b>Replace</b><p>This window shows a preview of a string replace operation. "
-+"Uncheck a line to exclude that replacement. Uncheck a file to exclude the "
-+"whole file from the operation. Clicking on a line in the list will "
-+"automatically open the corresponding source file and set the cursor to the "
-+"line with the match."
-+msgstr ""
-+"<b>取代</b><p>此視窗顯示字串取代操作的預覽。取消勾選某一列就可以將該行排除。"
-+"取消勾選某個檔案也可以將該檔案排除。點擊列表中的某一列會自動開啟相關的程式源"
-+"碼檔，並將游標設定在符合處。"
- 
- #: parts/replace/replace_part.cpp:52 parts/replace/replace_part.cpp:57
- msgid "Project wide string replacement"
-@@ -20581,19 +20725,21 @@
- 
- #: parts/replace/replace_part.cpp:55
- msgid "Find-Select-Replace..."
--msgstr "尋找-選擇-取代..."
-+msgstr "尋找-選擇-取代…"
- 
- #: parts/replace/replace_part.cpp:58
- msgid ""
--"<b>Find-Select-Replace</b>"
--"<p>Opens the project wide string replacement dialog. There you can enter a "
--"string or a regular expression which is then searched for within all files in "
--"the locations you specify. Matches will be displayed in the <b>Replace</b> "
--"window, you can replace them with the specified string, exclude them from "
--"replace operation or cancel the whole replace."
--msgstr ""
--"<b>尋找-選擇-取代</b>開啟專案範圍字串取代對話框。您可以輸入字串或者正規表示式，然後在您指定位置的所有檔案中進行尋找。比對符合的結果將在<b>"
--"取代</b>視窗中顯示，您可以決定要用指定的字串來取代，排除某些地方不要做取代動作，還是要取消整個取代的動作。"
-+"<b>Find-Select-Replace</b><p>Opens the project wide string replacement "
-+"dialog. There you can enter a string or a regular expression which is then "
-+"searched for within all files in the locations you specify. Matches will be "
-+"displayed in the <b>Replace</b> window, you can replace them with the "
-+"specified string, exclude them from replace operation or cancel the whole "
-+"replace."
-+msgstr ""
-+"<b>尋找-選擇-取代</b>開啟專案範圍字串取代對話框。您可以輸入字串或者正規表示"
-+"式，然後在您指定位置的所有檔案中進行尋找。比對符合的結果將在<b>取代</b>視窗中"
-+"顯示，您可以決定要用指定的字串來取代，排除某些地方不要做取代動作，還是要取消"
-+"整個取代的動作。"
- 
- #: parts/replace/replace_part.cpp:102
- #, c-format
-@@ -20602,10 +20748,11 @@
- 
- #: parts/replace/replace_part.cpp:104
- msgid ""
--"<b>Replace Project Wide</b>"
--"<p>Opens the find in files dialog and sets the pattern to the text under the "
--"cursor."
--msgstr "<b>對整個專案執行取代</b><p>開啟「在檔案中尋找」對話框，並設定游標下文字的樣式。"
-+"<b>Replace Project Wide</b><p>Opens the find in files dialog and sets the "
-+"pattern to the text under the cursor."
-+msgstr ""
-+"<b>對整個專案執行取代</b><p>開啟「在檔案中尋找」對話框，並設定游標下文字的樣"
-+"式。"
- 
- #: parts/tools/toolsconfigwidget.cpp:130
- msgid "An entry with this title exists already."
-@@ -20650,7 +20797,7 @@
- 
- #: parts/quickopen/quickopen_part.cpp:58
- msgid "Quick Open File..."
--msgstr "快速開啟檔案..."
-+msgstr "快速開啟檔案…"
- 
- #: parts/quickopen/quickopen_part.cpp:61
- msgid "Quick open file in project"
-@@ -20658,14 +20805,15 @@
- 
- #: parts/quickopen/quickopen_part.cpp:62
- msgid ""
--"<b>Quick open</b>"
--"<p>Provides a file name input form with completion listbox to quickly open file "
--"in a project."
--msgstr "<b>快速開啟</b><p>提供一個具有補全功能的檔案名輸入表格，以便快速開啟專案中的檔案。"
-+"<b>Quick open</b><p>Provides a file name input form with completion listbox "
-+"to quickly open file in a project."
-+msgstr ""
-+"<b>快速開啟</b><p>提供一個具有補全功能的檔案名輸入表格，以便快速開啟專案中的"
-+"檔案。"
- 
- #: parts/quickopen/quickopen_part.cpp:64
- msgid "Quick Open Class..."
--msgstr "快速開啟類別..."
-+msgstr "快速開啟類別…"
- 
- #: parts/quickopen/quickopen_part.cpp:67
- msgid "Find class in project"
-@@ -20673,14 +20821,15 @@
- 
- #: parts/quickopen/quickopen_part.cpp:68
- msgid ""
--"<b>Find class</b>"
--"<p>Provides a class name input form with completion listbox to quickly open a "
--"file where the class is defined."
--msgstr "<b>尋找類別</b><p>提供一個具有補全功能的類別名稱輸入表格，以便快速開啟定義該類別的檔案。"
-+"<b>Find class</b><p>Provides a class name input form with completion listbox "
-+"to quickly open a file where the class is defined."
-+msgstr ""
-+"<b>尋找類別</b><p>提供一個具有補全功能的類別名稱輸入表格，以便快速開啟定義該"
-+"類別的檔案。"
- 
- #: parts/quickopen/quickopen_part.cpp:70
- msgid "Quick Open Method..."
--msgstr "快速開啟方法..."
-+msgstr "快速開啟方法…"
- 
- #: parts/quickopen/quickopen_part.cpp:71
- msgid "Quick open function in project"
-@@ -20688,7 +20837,7 @@
- 
- #: parts/quickopen/quickopen_part.cpp:73
- msgid "Switch To..."
--msgstr "切換到..."
-+msgstr "切換到…"
- 
- #: parts/quickopen/quickopen_part.cpp:74
- msgid "Switch to"
-@@ -20696,8 +20845,8 @@
- 
- #: parts/quickopen/quickopen_part.cpp:75
- msgid ""
--"<b>Switch to</b>"
--"<p>Prompts to enter the name of previously opened file to switch to."
-+"<b>Switch to</b><p>Prompts to enter the name of previously opened file to "
-+"switch to."
- msgstr "<b>切換到</b><p>詢問並切換到以前開啟的檔案。"
- 
- #: parts/quickopen/quickopenfunctionchooseform.cpp:34
-@@ -20743,11 +20892,12 @@
- 
- #: parts/grepview/grepviewpart.cpp:54
- msgid ""
--"<b>Find in files</b>"
--"<p>This window contains the output of a grep command. Clicking on an item in "
--"the list will automatically open the corresponding source file and set the "
--"cursor to the line with the match."
--msgstr "<b>在檔案中尋找</b><p>這個視窗顯示 grep 命令的輸出。點選列表中的項目將自動開啟相對應的程式源碼檔，並將游標置於符合的行。"
-+"<b>Find in files</b><p>This window contains the output of a grep command. "
-+"Clicking on an item in the list will automatically open the corresponding "
-+"source file and set the cursor to the line with the match."
-+msgstr ""
-+"<b>在檔案中尋找</b><p>這個視窗顯示 grep 命令的輸出。點選列表中的項目將自動開"
-+"啟相對應的程式原始碼檔，並將游標置於符合的行。"
- 
- #: parts/grepview/grepviewpart.cpp:61
- msgid "Output of the grep command"
-@@ -20755,7 +20905,7 @@
- 
- #: parts/grepview/grepviewpart.cpp:65
- msgid "Find in Fi&les..."
--msgstr "在檔案中尋找(&L)..."
-+msgstr "在檔案中尋找(&L)…"
- 
- #: parts/grepview/grepviewpart.cpp:68
- msgid "Search for expressions over several files"
-@@ -20763,13 +20913,14 @@
- 
- #: parts/grepview/grepviewpart.cpp:69
- msgid ""
--"<b>Find in files</b>"
--"<p>Opens the 'Find in files' dialog. There you can enter a regular expression "
--"which is then searched for within all files in the directories you specify. "
--"Matches will be displayed, you can switch to a match directly."
--msgstr ""
--"<b>在檔案中尋找</b>"
--"<p>開啟檔案「在檔案中尋找」對話框。您可以輸入一個正規表示式，在您指定目錄裡的所有檔案中尋找。比對符合的將被顯示出來，而且您可以直接切換到符合的檔案。"
-+"<b>Find in files</b><p>Opens the 'Find in files' dialog. There you can enter "
-+"a regular expression which is then searched for within all files in the "
-+"directories you specify. Matches will be displayed, you can switch to a "
-+"match directly."
-+msgstr ""
-+"<b>在檔案中尋找</b><p>開啟檔案「在檔案中尋找」對話框。您可以輸入一個正規表示"
-+"式，在您指定目錄裡的所有檔案中尋找。比對符合的將被顯示出來，而且您可以直接切"
-+"換到符合的檔案。"
- 
- #: parts/grepview/grepviewpart.cpp:119
- #, c-format
-@@ -20778,10 +20929,10 @@
- 
- #: parts/grepview/grepviewpart.cpp:121
- msgid ""
--"<b>Grep</b>"
--"<p>Opens the find in files dialog and sets the pattern to the text under the "
--"cursor."
--msgstr "<b>Grep</b><p>開啟「在檔案中尋找」對話框，並將游標下的文字作為尋找樣式。"
-+"<b>Grep</b><p>Opens the find in files dialog and sets the pattern to the "
-+"text under the cursor."
-+msgstr ""
-+"<b>Grep</b><p>開啟「在檔案中尋找」對話框，並將游標下的文字作為尋找樣式。"
- 
- #: parts/fileview/addfilegroupdlg.cpp:32 parts/grepview/grepdlg.cpp:95
- msgid "&Pattern:"
-@@ -20825,57 +20976,46 @@
- 
- #: parts/grepview/grepdlg.cpp:220
- msgid ""
--"<qt>Enter the regular expression you want to search for here."
--"<p>Possible meta characters are:"
--"<ul>"
--"<li><b>.</b> - Matches any character"
--"<li><b>^</b> - Matches the beginning of a line"
--"<li><b>$</b> - Matches the end of a line"
--"<li><b>\\&lt;</b> - Matches the beginning of a word"
--"<li><b>\\&gt;</b> - Matches the end of a word</ul>The following repetition "
--"operators exist:"
--"<ul>"
--"<li><b>?</b> - The preceding item is matched at most once"
--"<li><b>*</b> - The preceding item is matched zero or more times"
--"<li><b>+</b> - The preceding item is matched one or more times"
--"<li><b>{<i>n</i>}</b> - The preceding item is matched exactly <i>n</i> times"
--"<li><b>{<i>n</i>,}</b> - The preceding item is matched <i>n</i> or more times"
--"<li><b>{,<i>n</i>}</b> - The preceding item is matched at most <i>n</i> times"
--"<li><b>{<i>n</i>,<i>m</i>}</b> - The preceding item is matched at least <i>n</i>"
--", but at most <i>m</i> times.</ul>Furthermore, backreferences to bracketed "
--"subexpressions are available via the notation \\<i>n</i>.</qt>"
--msgstr ""
--"<qt>請在這裡輸入您要尋找的正規表示式。"
--"<p>可用的特殊字元有："
--"<ul> "
--"<li><b>.</b> - 符合任何字元 "
--"<li><b>^</b> - 符合行首 "
--"<li><b>$</b> - 符合行尾 "
--"<li><b>\\&lt;</b> - 符合字首 "
--"<li><b>\\&gt;</b> - 符合字尾 </ul> 可以有以下重覆運算子： "
--"<ul> "
--"<li><b>?</b> - 前面的項至少符合一次 "
--"<li><b>*</b> - 前面的項符合零或多次 "
--"<li><b>+</b> - 前面的項符合一或多次 "
--"<li><b>{<i>n</i>}</b> - 前面的項精確符合<i>n</i>次 "
--"<li><b>{<i>n</i>,}</b> - 前面的項符合<i>n</i>或更多次 "
--"<li><b>{,<i>n</i>}</b> - 前面的項至多符合<i>n</i>次 "
--"<li><b>{<i>n</i>,<i>m</i>}</b> - 前面的項至少符合 <i>n</i> 次，最多符合<i>m</i>次。 </ul> "
--"此外，可以使用記號\\<i>n</i>對用括號括起來的子表示式進行向後參考（back reference）。"
-+"<qt>Enter the regular expression you want to search for here.<p>Possible "
-+"meta characters are:<ul><li><b>.</b> - Matches any character<li><b>^</b> - "
-+"Matches the beginning of a line<li><b>$</b> - Matches the end of a "
-+"line<li><b>\\&lt;</b> - Matches the beginning of a word<li><b>\\&gt;</b> - "
-+"Matches the end of a word</ul>The following repetition operators exist:"
-+"<ul><li><b>?</b> - The preceding item is matched at most once<li><b>*</b> - "
-+"The preceding item is matched zero or more times<li><b>+</b> - The preceding "
-+"item is matched one or more times<li><b>{<i>n</i>}</b> - The preceding item "
-+"is matched exactly <i>n</i> times<li><b>{<i>n</i>,}</b> - The preceding item "
-+"is matched <i>n</i> or more times<li><b>{,<i>n</i>}</b> - The preceding item "
-+"is matched at most <i>n</i> times<li><b>{<i>n</i>,<i>m</i>}</b> - The "
-+"preceding item is matched at least <i>n</i>, but at most <i>m</i> times.</"
-+"ul>Furthermore, backreferences to bracketed subexpressions are available via "
-+"the notation \\<i>n</i>.</qt>"
-+msgstr ""
-+"<qt>請在這裡輸入您要尋找的正規表示式。<p>可用的特殊字元有：<ul> <li><b>.</b> "
-+"- 符合任何字元 <li><b>^</b> - 符合行首 <li><b>$</b> - 符合行尾 <li><b>\\&lt;"
-+"</b> - 符合字首 <li><b>\\&gt;</b> - 符合字尾 </ul> 可以有以下重覆運算子： "
-+"<ul> <li><b>?</b> - 前面的項至少符合一次 <li><b>*</b> - 前面的項符合零或多次 "
-+"<li><b>+</b> - 前面的項符合一或多次 <li><b>{<i>n</i>}</b> - 前面的項精確符合"
-+"<i>n</i>次 <li><b>{<i>n</i>,}</b> - 前面的項符合<i>n</i>或更多次 <li><b>{,"
-+"<i>n</i>}</b> - 前面的項至多符合<i>n</i>次 <li><b>{<i>n</i>,<i>m</i>}</b> - "
-+"前面的項至少符合 <i>n</i> 次，最多符合<i>m</i>次。 </ul> 此外，可以使用記號"
-+"\\<i>n</i>對用括號括起來的子表示式進行向後參考（back reference）。"
- 
- #: parts/grepview/grepdlg.cpp:244
- msgid ""
--"Enter the file name pattern of the files to search here. You may give several "
--"patterns separated by commas"
-+"Enter the file name pattern of the files to search here. You may give "
-+"several patterns separated by commas"
- msgstr "在此輸入要尋找的檔名樣式，多個樣式可以用逗號分隔。"
- 
- #: parts/grepview/grepdlg.cpp:247
- #, c-format
- msgid ""
--"You can choose a template for the pattern from the combo box and edit it here. "
--"The string %s in the template is replaced by the pattern input field, resulting "
--"in the regular expression to search for."
--msgstr "您可以從下拉式選單中選擇一個樣式的樣本並編輯它。樣本中的字串 %s 將被樣式輸入欄位中的輸入所代替，從而產生要尋找的正規表示式。"
-+"You can choose a template for the pattern from the combo box and edit it "
-+"here. The string %s in the template is replaced by the pattern input field, "
-+"resulting in the regular expression to search for."
-+msgstr ""
-+"您可以從下拉式選單中選擇一個樣式的樣本並編輯它。樣本中的字串 %s 將被樣式輸入"
-+"欄位中的輸入所代替，從而產生要尋找的正規表示式。"
- 
- #: parts/grepview/grepdlg.cpp:317
- msgid "Please enter a search pattern"
-@@ -20915,12 +21055,12 @@
- 
- #: parts/doxygen/doxygenpart.cpp:65
- msgid ""
--"<b>Build API documentation</b>"
--"<p>Runs doxygen on a project Doxyfile to generate API documentation. If the "
--"search engine is enabled in Doxyfile, this also runs doxytag to create it."
-+"<b>Build API documentation</b><p>Runs doxygen on a project Doxyfile to "
-+"generate API documentation. If the search engine is enabled in Doxyfile, "
-+"this also runs doxytag to create it."
- msgstr ""
--"<b>建立 API 文件</b>"
--"<p>用專案的 Doxyfile 檔案執行 doxygen，產生 API 文件。如果 Doxyfile 檔案啟用搜尋引擎，則將執行 doxytag 建立它。"
-+"<b>建立 API 文件</b><p>用專案的 Doxyfile 檔案執行 doxygen，產生 API 文件。如"
-+"果 Doxyfile 檔案啟用搜尋引擎，則將執行 doxytag 建立它。"
- 
- #: parts/doxygen/doxygenpart.cpp:68
- msgid "Clean API Documentation"
-@@ -20932,8 +21072,7 @@
- 
- #: parts/doxygen/doxygenpart.cpp:72
- msgid ""
--"<b>Clean API documentation</b>"
--"<p>Removes all generated by doxygen files."
-+"<b>Clean API documentation</b><p>Removes all generated by doxygen files."
- msgstr "<b>清除 API 文件</b><p>刪除所有 doxygen 產生的檔案。"
- 
- #: parts/doxygen/doxygenpart.cpp:77
-@@ -20950,10 +21089,10 @@
- 
- #: parts/doxygen/doxygenpart.cpp:83
- msgid ""
--"<b>Document Current Function</b>"
--"<p>Creates a documentation template according to a function's signature above a "
--"function definition/declaration."
--msgstr "<b>為目前函式編寫文件</b><p>根據一個函式的定義/宣告上的簽章來建立文件樣本。"
-+"<b>Document Current Function</b><p>Creates a documentation template "
-+"according to a function's signature above a function definition/declaration."
-+msgstr ""
-+"<b>為目前函式編寫文件</b><p>根據一個函式的定義/宣告上的簽章來建立文件樣本。"
- 
- #: parts/doxygen/doxygenpart.cpp:87
- msgid "Preview Doxygen Output"
-@@ -20965,9 +21104,11 @@
- 
- #: parts/doxygen/doxygenpart.cpp:89
- msgid ""
--"<b>Preview Doxygen output</b>"
--"<p>Runs Doxygen over the current file and shows the created index.html."
--msgstr "<b>預覽 Doxygen 輸出</b><p>對目前檔案執行 Doxygen，並顯示所建立的 index.html。"
-+"<b>Preview Doxygen output</b><p>Runs Doxygen over the current file and shows "
-+"the created index.html."
-+msgstr ""
-+"<b>預覽 Doxygen 輸出</b><p>對目前檔案執行 Doxygen，並顯示所建立的 index."
-+"html。"
- 
- #: parts/doxygen/doxygenpart.cpp:370
- msgid "Another process is still running. Please wait until it's finished."
-@@ -21275,15 +21416,15 @@
- 
- #: parts/doxygen/messages.cpp:122
- msgid "Source Browser"
--msgstr "程式源碼瀏覽器"
-+msgstr "程式原始碼瀏覽器"
- 
- #: parts/doxygen/messages.cpp:123
- msgid "Cross-reference with source files"
--msgstr "和程式源碼檔案進行交叉參考（cross-reference）"
-+msgstr "和程式原始碼檔案進行交叉參考（cross-reference）"
- 
- #: parts/doxygen/messages.cpp:124
- msgid "References will link to source code"
--msgstr "參考會連結到源碼"
-+msgstr "參考會連結到原始碼"
- 
- #: parts/doxygen/messages.cpp:125
- msgid "Use links to HTAGS"
-@@ -21291,7 +21432,7 @@
- 
- #: parts/doxygen/messages.cpp:126
- msgid "Inline sources"
--msgstr "內含源碼"
-+msgstr "內含原始碼"
- 
- #: parts/doxygen/messages.cpp:127
- msgid "Hide special comment blocks"
-@@ -21390,7 +21531,7 @@
- 
- #: parts/doxygen/messages.cpp:158
- msgid "Number of enum values per line"
--msgstr "每行中 enum 值的數目"
-+msgstr "每列中 enum 值的數目"
- 
- #: parts/doxygen/messages.cpp:159
- msgid "Generate treeview"
-@@ -21731,10 +21872,11 @@
- 
- #: parts/konsole/konsoleviewpart.cpp:38
- msgid ""
--"<b>Konsole</b>"
--"<p>This window contains an embedded konsole window. It will try to follow you "
--"when you navigate in the source directories"
--msgstr "<b>Konsole</b><p>這個視窗包含一個嵌入式的 konsole 終端機視窗。當您瀏覽程式源碼檔案目錄時它將試著跟隨您的目錄。"
-+"<b>Konsole</b><p>This window contains an embedded konsole window. It will "
-+"try to follow you when you navigate in the source directories"
-+msgstr ""
-+"<b>Konsole</b><p>這個視窗包含一個嵌入式的 konsole 終端機視窗。當您瀏覽程式源"
-+"碼檔案目錄時它將試著跟隨您的目錄。"
- 
- #: parts/konsole/konsoleviewpart.cpp:44 parts/konsole/konsoleviewpart.cpp:49
- msgid "Konsole"
-@@ -21779,12 +21921,12 @@
- 
- #: parts/distpart/distpart_part.cpp:52
- msgid "Make source and binary distribution"
--msgstr "製作程式源碼和執行套件"
-+msgstr "製作程式原始碼和執行套件"
- 
- #: parts/distpart/distpart_part.cpp:53
- msgid ""
--"<b>Project distribution & publishing</b>"
--"<p>Helps users package and publish their software."
-+"<b>Project distribution & publishing</b><p>Helps users package and publish "
-+"their software."
- msgstr "<b>專案分配與發布</b><p>協助使用者包裝並發布他們的軟體。"
- 
- #: parts/distpart/distpart_part.cpp:56
-@@ -21793,7 +21935,7 @@
- 
- #: parts/distpart/specsupport.cpp:92 parts/distpart/specsupport.cpp:191
- msgid "You need to create a source archive first."
--msgstr "您需要先建立一個程式源碼壓縮檔案。"
-+msgstr "您需要先建立一個程式原始碼壓縮檔案。"
- 
- #: parts/appwizard/filepropspage.cpp:69
- msgid "Header/Implementation file:"
-@@ -21828,7 +21970,8 @@
- 
- #: parts/appwizard/appwizarddlg.cpp:467
- msgid ""
--"The directory you have chosen as the location for the project is not writeable."
-+"The directory you have chosen as the location for the project is not "
-+"writeable."
- msgstr "您為專案指定的目錄無法寫入。"
- 
- #: parts/appwizard/appwizarddlg.cpp:489
-@@ -21885,7 +22028,7 @@
- 
- #: parts/appwizard/appwizardpart.cpp:45
- msgid "&New Project..."
--msgstr "新增專案(&N)..."
-+msgstr "新增專案(&N)…"
- 
- #: parts/appwizard/appwizardpart.cpp:48
- msgid "Generate a new project from a template"
-@@ -21893,14 +22036,15 @@
- 
- #: parts/appwizard/appwizardpart.cpp:49
- msgid ""
--"<b>New project</b>"
--"<p>This starts KDevelop's application wizard. It helps you to generate a "
--"skeleton for your application from a set of templates."
--msgstr "<b>新增專案</b><p>啟動 KDevelop 的應用程式精靈。它能幫助您從許多樣本建立您的應用程式的基本框架。"
-+"<b>New project</b><p>This starts KDevelop's application wizard. It helps you "
-+"to generate a skeleton for your application from a set of templates."
-+msgstr ""
-+"<b>新增專案</b><p>啟動 KDevelop 的應用程式精靈。它能幫助您從許多樣本建立您的"
-+"應用程式的基本框架。"
- 
- #: parts/appwizard/appwizardpart.cpp:54
- msgid "&Import Existing Project..."
--msgstr "匯入現有的專案(&I)..."
-+msgstr "匯入現有的專案(&I)…"
- 
- #: parts/appwizard/appwizardpart.cpp:57
- msgid "Import existing project"
-@@ -21908,8 +22052,8 @@
- 
- #: parts/appwizard/appwizardpart.cpp:58
- msgid ""
--"<b>Import existing project</b>"
--"<p>Creates a project file for a given directory."
-+"<b>Import existing project</b><p>Creates a project file for a given "
-+"directory."
- msgstr "<b>匯入現有的專案</b><p>為給定的目錄建立一個專案檔案。"
- 
- #: parts/appwizard/importdlg.cpp:61
-@@ -22000,16 +22144,15 @@
- 
- #: parts/filecreate/filecreate_widget3.cpp:44
- msgid ""
--"<b>New file</b>"
--"<p>This part makes the creation of new files easier. Select a type in the list "
--"to create a file. The list of project file types can be configured in project "
--"settings dialog, <b>New File Wizard</b> tab. Globally available file types are "
--"listed and can be configured in KDevelop settings dialog, <b>New File Wizard</b> "
--"tab."
--msgstr ""
--"<b>新增檔案</b>"
--"<p>它使建立新檔案更加容易。請從列表中選擇要建立的檔案型態。專案檔案型態列表可以在專案設定對話框的<b>新增檔案精靈</b>"
--"中進行設定。全域可用的檔案型態在 KDevelop 設定對話框的<b>新增檔案精靈</b>中列出，並可進行設定。"
-+"<b>New file</b><p>This part makes the creation of new files easier. Select a "
-+"type in the list to create a file. The list of project file types can be "
-+"configured in project settings dialog, <b>New File Wizard</b> tab. Globally "
-+"available file types are listed and can be configured in KDevelop settings "
-+"dialog, <b>New File Wizard</b> tab."
-+msgstr ""
-+"<b>新增檔案</b><p>它使建立新檔案更加容易。請從列表中選擇要建立的檔案型態。專"
-+"案檔案型態列表可以在專案設定對話框的<b>新增檔案精靈</b>中進行設定。全域可用的"
-+"檔案型態在 KDevelop 設定對話框的<b>新增檔案精靈</b>中列出，並可進行設定。"
- 
- #: parts/filecreate/filecreate_part.cpp:75
- #: parts/filecreate/filecreate_part.cpp:76
-@@ -22018,10 +22161,11 @@
- 
- #: parts/filecreate/filecreate_part.cpp:82
- msgid ""
--"<b>New file</b>"
--"<p>Creates a new file. Also adds it the project if the <b>Add to project</b> "
--"checkbox is turned on."
--msgstr "<b>新增檔案</b><p>建立新的檔案。如果勾選了<b>新增到專案</b>，則也會新增到專案中。"
-+"<b>New file</b><p>Creates a new file. Also adds it the project if the <b>Add "
-+"to project</b> checkbox is turned on."
-+msgstr ""
-+"<b>新增檔案</b><p>建立新的檔案。如果勾選了<b>新增到專案</b>，則也會新增到專案"
-+"中。"
- 
- #: buildtools/script/scriptprojectpart.cpp:57
- #: parts/filecreate/filecreate_part.cpp:83
-@@ -22138,11 +22282,11 @@
- 
- #: parts/snippet/snippet_widget.cpp:554
- msgid "Add Item..."
--msgstr "新增項目..."
-+msgstr "新增項目…"
- 
- #: parts/snippet/snippet_widget.cpp:555 parts/snippet/snippet_widget.cpp:566
- msgid "Add Group..."
--msgstr "新增群組..."
-+msgstr "新增群組…"
- 
- #: kdevdesigner/designer/hierarchyview.cpp:1050
- #: kdevdesigner/designer/hierarchyview.cpp:1055
-@@ -22150,7 +22294,7 @@
- #: parts/documentation/bookmarkview.cpp:126
- #: parts/snippet/snippet_widget.cpp:557 parts/snippet/snippet_widget.cpp:559
- msgid "Edit..."
--msgstr "編輯..."
-+msgstr "編輯…"
- 
- #: parts/snippet/snippet_widget.cpp:600
- msgid "Please enter the value for <b>%1</b>:"
-@@ -22172,10 +22316,12 @@
- 
- #: parts/snippet/snippet_widget.cpp:713 parts/snippet/snippet_widget.cpp:831
- msgid ""
--"If you enable this option, the value entered to the right will be saved. If you "
--"use the same variable later, even in another snippet, the value entered to the "
--"right will be the default value for that variable."
--msgstr "如果開啟此選項，輸入到右方的值會被儲存起來。稍候您使用相同變數時，即使是在別的片段，此值會被當成是該變數的預設值。"
-+"If you enable this option, the value entered to the right will be saved. If "
-+"you use the same variable later, even in another snippet, the value entered "
-+"to the right will be the default value for that variable."
-+msgstr ""
-+"如果開啟此選項，輸入到右方的值會被儲存起來。稍候您使用相同變數時，即使是在別"
-+"的片段，此值會被當成是該變數的預設值。"
- 
- #: parts/snippet/snippet_widget.cpp:814
- msgid "Enter the replacement values for %1:"
-@@ -22187,10 +22333,11 @@
- 
- #: parts/filelist/projectviewpart.cpp:260
- msgid ""
--"<b>View Session Toolbar</b>"
--"<p>This allows to create and work with view sessions. A view session is a set "
--"of open documents.</p>"
--msgstr "<b>檢視工作階段工具列</b><p>允許您建立並檢視工作階段。檢視工作階段是許多開啟文件的集合。</p>"
-+"<b>View Session Toolbar</b><p>This allows to create and work with view "
-+"sessions. A view session is a set of open documents.</p>"
-+msgstr ""
-+"<b>檢視工作階段工具列</b><p>允許您建立並檢視工作階段。檢視工作階段是許多開啟"
-+"文件的集合。</p>"
- 
- #: parts/filelist/projectviewpart.cpp:266
- msgid "<b>File List</b><p>This is the list of opened files.</p>"
-@@ -22202,7 +22349,7 @@
- 
- #: parts/filelist/projectviewpart.cpp:278
- msgid "Open Session..."
--msgstr "開啟工作階段..."
-+msgstr "開啟工作階段…"
- 
- #: parts/filelist/projectviewpart.cpp:282
- msgid "Open Session"
-@@ -22214,7 +22361,7 @@
- 
- #: parts/filelist/projectviewpart.cpp:286
- msgid "New Session..."
--msgstr "新增工作階段..."
-+msgstr "新增工作階段…"
- 
- #: parts/filelist/projectviewpart.cpp:288
- #: parts/filelist/projectviewpart.cpp:292
-@@ -22233,9 +22380,10 @@
- 
- #: parts/filelist/projectviewpart.cpp:494
- msgid ""
--"<qt>A view session named <b>%1</b> already exists."
--"<br>Do you want to overwrite it?</qt>"
--msgstr "<qt>一個名稱為 <b>%1</b> 的檢視工作階段已存在。<br> 您確定要覆寫它嗎？</qt>"
-+"<qt>A view session named <b>%1</b> already exists.<br>Do you want to "
-+"overwrite it?</qt>"
-+msgstr ""
-+"<qt>一個名稱為 <b>%1</b> 的檢視工作階段已存在。<br> 您確定要覆寫它嗎？</qt>"
- 
- #: parts/filelist/filelist_widget.cpp:95
- msgid "This file has unsaved changes."
-@@ -22269,27 +22417,26 @@
- 
- #: parts/fileview/partwidget.cpp:51
- msgid ""
--"<b>File tree</b>"
--"<p>The file viewer shows all files of the project in a tree layout."
-+"<b>File tree</b><p>The file viewer shows all files of the project in a tree "
-+"layout."
- msgstr "<b>檔案樹</b><p>檔案檢視器以樹狀圖顯示專案中的所有檔案。"
- 
- #: parts/fileview/partwidget.cpp:70
- msgid ""
--"<p>Here you can enter a name filter to limit which files are <b>"
--"not displayed</b>."
--"<p>To clear the filter, toggle off the filter button to the left."
--"<p>To reapply the last filter used, toggle on the filter button."
--msgstr ""
--"<p>您可以在此輸入名稱過濾器來限制哪些檔案<b>不要被顯示</b>。"
--"<p>將左側的過濾器按鈕切到關閉可以清除過濾器。"
--"<p>切到開啟時會重新套用上次使用的過濾器。"
-+"<p>Here you can enter a name filter to limit which files are <b>not "
-+"displayed</b>.<p>To clear the filter, toggle off the filter button to the "
-+"left.<p>To reapply the last filter used, toggle on the filter button."
-+msgstr ""
-+"<p>您可以在此輸入名稱過濾器來限制哪些檔案<b>不要被顯示</b>。<p>將左側的過濾器"
-+"按鈕切到關閉可以清除過濾器。<p>切到開啟時會重新套用上次使用的過濾器。"
- 
- #: parts/fileselector/fileselector_widget.cpp:228
- #: parts/fileview/partwidget.cpp:75
- msgid ""
--"<p>This button clears the name filter when toggled off, or reapplies the last "
--"filter used when toggled on."
--msgstr "<p>這個按鈕切到關閉時會清除名稱過濾器，開啟時會重新套用上次使用的過濾器。"
-+"<p>This button clears the name filter when toggled off, or reapplies the "
-+"last filter used when toggled on."
-+msgstr ""
-+"<p>這個按鈕切到關閉時會清除名稱過濾器，開啟時會重新套用上次使用的過濾器。"
- 
- #: parts/fileselector/fileselector_widget.cpp:355
- #: parts/fileview/partwidget.cpp:104
-@@ -22314,8 +22461,8 @@
- #: parts/fileview/filegroupswidget.cpp:184
- #: parts/fileview/filetreeviewwidgetimpl.cpp:43
- msgid ""
--"<b>Show non project files</b>"
--"<p>Shows files that do not belong to a project in a file tree."
-+"<b>Show non project files</b><p>Shows files that do not belong to a project "
-+"in a file tree."
- msgstr "<b>顯示非專案檔案</b><p>在檔案樹中顯示不屬於專案內的檔案。"
- 
- #: parts/fileview/filetreeviewwidgetimpl.cpp:99
-@@ -22336,10 +22483,11 @@
- 
- #: parts/fileview/vcsfiletreewidgetimpl.cpp:209
- msgid ""
--"<b>Show VCS fields</b>"
--"<p>Shows <b>Revision</b> and <b>Timestamp</b> for each file contained in VCS "
--"repository."
--msgstr "<b>顯示版本控制欄位</b><p>對每個在版本控制主目錄內的檔案顯示<b>版本</b>和<b>時間</b>。"
-+"<b>Show VCS fields</b><p>Shows <b>Revision</b> and <b>Timestamp</b> for each "
-+"file contained in VCS repository."
-+msgstr ""
-+"<b>顯示版本控制欄位</b><p>對每個在版本控制主目錄內的檔案顯示<b>版本</b>和<b>"
-+"時間</b>。"
- 
- #: parts/fileview/vcsfiletreewidgetimpl.cpp:213
- msgid "Sync with Repository"
-@@ -22347,8 +22495,7 @@
- 
- #: parts/fileview/vcsfiletreewidgetimpl.cpp:215
- msgid ""
--"<b>Sync with repository</b>"
--"<p>Synchronize file status with remote repository."
-+"<b>Sync with repository</b><p>Synchronize file status with remote repository."
- msgstr "<b>與主目錄同步</b><p>與遠端主目錄同步檔案狀態。"
- 
- #: parts/fileview/fileviewpart.cpp:81
-@@ -22357,10 +22504,12 @@
- 
- #: parts/fileview/filegroupspart.cpp:48
- msgid ""
--"<b>File group view</b>"
--"<p>The file group viewer shows all files of the project, in groups which can be "
--"configured in project settings dialog, <b>File Groups</b> tab."
--msgstr "<b>檔案群組檢視</b><p>檔案群組檢視依照專案設定中的<b>檔案群組</b>頁所設定的群組方式顯示專案的所有檔案。"
-+"<b>File group view</b><p>The file group viewer shows all files of the "
-+"project, in groups which can be configured in project settings dialog, "
-+"<b>File Groups</b> tab."
-+msgstr ""
-+"<b>檔案群組檢視</b><p>檔案群組檢視依照專案設定中的<b>檔案群組</b>頁所設定的群"
-+"組方式顯示專案的所有檔案。"
- 
- #: parts/fileview/filegroupspart.cpp:51 parts/fileview/filegroupspart.cpp:54
- #: parts/fileview/filegroupswidget.cpp:227
-@@ -22383,7 +22532,7 @@
- #: buildtools/qmake/qmakescopeitem.cpp:84
- #: parts/fileview/filegroupswidget.cpp:42
- msgid "Sources"
--msgstr "程式源碼"
-+msgstr "程式原始碼"
- 
- #: buildtools/qmake/qmakescopeitem.cpp:120
- #: parts/fileview/filegroupswidget.cpp:43
-@@ -22404,18 +22553,18 @@
- 
- #: parts/fileview/filegroupswidget.cpp:188
- msgid ""
--"<b>Display the Location Column</b>"
--"<p>Displays a column with the location of the files."
-+"<b>Display the Location Column</b><p>Displays a column with the location of "
-+"the files."
- msgstr "<b>顯示位置欄</b><p>顯示檔案位置的欄位。"
- 
- #: parts/fileview/filegroupswidget.cpp:229
- msgid "Customize..."
--msgstr "自訂..."
-+msgstr "自訂…"
- 
- #: parts/fileview/filegroupswidget.cpp:230
- msgid ""
--"<b>Customize</b>"
--"<p>Opens <b>Customize File Groups</b> dialog where the groups can be managed."
-+"<b>Customize</b><p>Opens <b>Customize File Groups</b> dialog where the "
-+"groups can be managed."
- msgstr "<b>自訂</b><p>開啟<b>自訂檔案群組</b>對話框，可以管理群組。"
- 
- #: parts/fileview/filegroupswidget.cpp:258
-@@ -22432,10 +22581,10 @@
- 
- #: parts/abbrev/abbrevpart.cpp:84
- msgid ""
--"<b>Expand current word</b>"
--"<p>Current word can be completed using the list of similar words in source "
--"files."
--msgstr "<b>展開目前單字</b><p>目前單字可以用程式源碼檔案中的相似單字列表進行補完。"
-+"<b>Expand current word</b><p>Current word can be completed using the list of "
-+"similar words in source files."
-+msgstr ""
-+"<b>展開目前單字</b><p>目前單字可以用程式原始碼檔案中的相似單字列表進行補完。"
- 
- #: parts/abbrev/abbrevpart.cpp:86
- msgid "Expand Abbreviation"
-@@ -22447,10 +22596,11 @@
- 
- #: parts/abbrev/abbrevpart.cpp:90
- msgid ""
--"<b>Expand abbreviation</b>"
--"<p>Enable and configure abbreviations in <b>KDevelop Settings</b>, <b>"
--"Abbreviations</b> tab."
--msgstr "<b>展開縮寫</b><p>開啟並設定 <b>KDevelop 設定</b>、<b>縮寫</b>頁中的縮寫項目。"
-+"<b>Expand abbreviation</b><p>Enable and configure abbreviations in "
-+"<b>KDevelop Settings</b>, <b>Abbreviations</b> tab."
-+msgstr ""
-+"<b>展開縮寫</b><p>開啟並設定 <b>KDevelop 設定</b>、<b>縮寫</b>頁中的縮寫項"
-+"目。"
- 
- #: parts/abbrev/abbrevpart.cpp:244
- msgid "Abbreviations"
-@@ -22468,20 +22618,20 @@
- 
- #: parts/astyle/astyle_part.cpp:53
- msgid "&Reformat Source"
--msgstr "重新格式化程式源碼(&R)"
-+msgstr "重新格式化程式原始碼(&R)"
- 
- #: parts/astyle/astyle_part.cpp:55
- msgid "Reformat source"
--msgstr "重新格式化程式源碼"
-+msgstr "重新格式化程式原始碼"
- 
- #: parts/astyle/astyle_part.cpp:56
- msgid ""
--"<b>Reformat source</b>"
--"<p>Source reformatting functionality using <b>astyle</b> "
--"library. Also available in <b>New Class</b> and <b>Subclassing</b> wizards."
-+"<b>Reformat source</b><p>Source reformatting functionality using <b>astyle</"
-+"b> library. Also available in <b>New Class</b> and <b>Subclassing</b> "
-+"wizards."
- msgstr ""
--"<b>重新編排程式源碼</b>"
--"<p>用 <b>astyle</b> 函式庫來重新格式化程式源碼。在 <b>新增類別</b>與<b>子類別</b>精靈中以可以使用。"
-+"<b>重新編排程式原始碼</b><p>用 <b>astyle</b> 函式庫來重新格式化程式原始碼。在 <b>"
-+"新增類別</b>與<b>子類別</b>精靈中以可以使用。"
- 
- #: parts/astyle/astyle_part.cpp:59 parts/astyle/astyle_part.cpp:61
- #: parts/astyle/astyle_part.cpp:410
-@@ -22490,12 +22640,11 @@
- 
- #: parts/astyle/astyle_part.cpp:62
- msgid ""
--"<b>Fomat files</b>"
--"<p>Formatting functionality using <b>astyle</b> library. Also available in <b>"
--"New Class</b> and <b>Subclassing</b> wizards."
-+"<b>Fomat files</b><p>Formatting functionality using <b>astyle</b> library. "
-+"Also available in <b>New Class</b> and <b>Subclassing</b> wizards."
- msgstr ""
--"<b>重新編排檔案</b>"
--"<p>用 <b>astyle</b> 函式庫來重新格式化程式源碼。在 <b>新增類別</b>與<b>子類別</b>精靈中以可以使用。"
-+"<b>重新編排檔案</b><p>用 <b>astyle</b> 函式庫來重新格式化程式原始碼。在 <b>新增"
-+"類別</b>與<b>子類別</b>精靈中以可以使用。"
- 
- #: parts/astyle/astyle_part.cpp:67 parts/astyle/astyle_part.cpp:68
- msgid "Formatting"
-@@ -22601,7 +22750,7 @@
- 
- #: parts/regexptest/regexptestpart.cpp:35
- msgid "Debug Regular Expression..."
--msgstr "除錯正規表示式..."
-+msgstr "除錯正規表示式…"
- 
- #: parts/regexptest/regexptestpart.cpp:38
- msgid "Debug regular expression"
-@@ -22609,20 +22758,19 @@
- 
- #: parts/regexptest/regexptestpart.cpp:39
- msgid ""
--"<b>Debug regular expression</b>"
--"<p>Allows to enter a regular expression and validate it. It is possible to "
--"check syntax of basic POSIX, extended POSIX regular expressions and also syntax "
--"allowed by QRegExp and KRegExp classes."
-+"<b>Debug regular expression</b><p>Allows to enter a regular expression and "
-+"validate it. It is possible to check syntax of basic POSIX, extended POSIX "
-+"regular expressions and also syntax allowed by QRegExp and KRegExp classes."
- msgstr ""
--"<b>除錯正規表示式</b>"
--"<p>允許輸入一個正規表示式並檢驗它。它可以檢查基本 POSIX、延伸 POSIX 正規表示式、和 QRegExp、KRegExp 類別所使用的語法。"
-+"<b>除錯正規表示式</b><p>允許輸入一個正規表示式並檢驗它。它可以檢查基本 "
-+"POSIX、延伸 POSIX 正規表示式、和 QRegExp、KRegExp 類別所使用的語法。"
- 
- #: parts/ctags2/ctags2_part.cpp:80
- msgid ""
--"<b>CTags</b>"
--"<p>Result view for a tag lookup. Click a line to go to the corresponding place "
--"in the code."
--msgstr "<b>CTags</b><p>搜尋標籤的結果檢視。點選其中一行就可以跳到相關的程式碼。"
-+"<b>CTags</b><p>Result view for a tag lookup. Click a line to go to the "
-+"corresponding place in the code."
-+msgstr ""
-+"<b>CTags</b><p>搜尋標籤的結果檢視。點選其中一列就可以跳到相關的程式碼。"
- 
- #: parts/ctags2/ctags2_part.cpp:81
- msgid "CTags Lookup"
-@@ -22838,15 +22986,14 @@
- 
- #: parts/documentation/documentation_part.cpp:99
- msgid ""
--"<b>Documentation browser</b>"
--"<p>The documentation browser gives access to various documentation sources (Qt "
--"DCF, Doxygen, KDoc, KDevelopTOC and DevHelp documentation) and the KDevelop "
--"manuals. It also provides documentation index and full text search "
--"capabilities."
--msgstr ""
--"<b>文件瀏覽器</b>"
--"<p>文件瀏覽器使您能夠查看各種文件來源（Qt DCF、Doxygen、KDoc、KDevelopTOC 和 DevHelp 文件）以及 KDevelop "
--"手冊等等。它也可以提供文件索引以及全文檢索。"
-+"<b>Documentation browser</b><p>The documentation browser gives access to "
-+"various documentation sources (Qt DCF, Doxygen, KDoc, KDevelopTOC and "
-+"DevHelp documentation) and the KDevelop manuals. It also provides "
-+"documentation index and full text search capabilities."
-+msgstr ""
-+"<b>文件瀏覽器</b><p>文件瀏覽器使您能夠查看各種文件來源（Qt DCF、Doxygen、"
-+"KDoc、KDevelopTOC 和 DevHelp 文件）以及 KDevelop 手冊等等。它也可以提供文件索"
-+"引以及全文檢索。"
- 
- #: parts/documentation/documentation_part.cpp:106
- msgid "Documentation browser"
-@@ -22858,7 +23005,7 @@
- 
- #: parts/documentation/documentation_part.cpp:212
- msgid "&Search in Documentation..."
--msgstr "在文件中搜尋(&S)..."
-+msgstr "在文件中搜尋(&S)…"
- 
- #: parts/documentation/documentation_part.cpp:215
- msgid "Full text search in the documentation"
-@@ -22866,14 +23013,13 @@
- 
- #: parts/documentation/documentation_part.cpp:216
- msgid ""
--"<b>Search in documentation</b>"
--"<p>Opens the Search in documentation tab. It allows a search term to be entered "
--"which will be searched for in the documentation. For this to work, a full text "
--"index must be created first, which can be done in the configuration dialog of "
--"the documentation plugin."
-+"<b>Search in documentation</b><p>Opens the Search in documentation tab. It "
-+"allows a search term to be entered which will be searched for in the "
-+"documentation. For this to work, a full text index must be created first, "
-+"which can be done in the configuration dialog of the documentation plugin."
- msgstr ""
--"<b>在文件中搜尋</b>"
--"<p>開啟「在文件中搜尋」頁。您可以輸入要搜尋的字在文件裡進行搜尋。您必須先在文件外掛程式的設定中建立全文檢索的索引才能開始搜尋。"
-+"<b>在文件中搜尋</b><p>開啟「在文件中搜尋」頁。您可以輸入要搜尋的字在文件裡進"
-+"行搜尋。您必須先在文件外掛程式的設定中建立全文檢索的索引才能開始搜尋。"
- 
- #: parts/documentation/documentation_part.cpp:223
- msgid "&Look in Documentation Index..."
-@@ -22886,18 +23032,20 @@
- #: parts/documentation/documentation_part.cpp:227
- #: parts/documentation/documentation_part.cpp:479
- msgid ""
--"<b>Look in documentation index</b>"
--"<p>Opens the documentation index tab. It allows a term to be entered which will "
--"be looked for in the documentation index."
--msgstr "<b>查看文件索引</b><p>開啟「文件索引」頁。您可以輸入要在文件索引頁中尋找的字。"
-+"<b>Look in documentation index</b><p>Opens the documentation index tab. It "
-+"allows a term to be entered which will be looked for in the documentation "
-+"index."
-+msgstr ""
-+"<b>查看文件索引</b><p>開啟「文件索引」頁。您可以輸入要在文件索引頁中尋找的"
-+"字。"
- 
- #: parts/documentation/documentation_part.cpp:232
- msgid "Man Page..."
--msgstr "手冊頁..."
-+msgstr "手冊頁…"
- 
- #: parts/documentation/documentation_part.cpp:235
- msgid "Show a manpage"
--msgstr "顯示手冊頁..."
-+msgstr "顯示手冊頁…"
- 
- #: parts/documentation/documentation_part.cpp:236
- msgid "<b>Show a manpage</b><p>Opens a man page using embedded viewer."
-@@ -22905,11 +23053,11 @@
- 
- #: parts/documentation/documentation_part.cpp:238
- msgid "Info Page..."
--msgstr "資訊頁..."
-+msgstr "資訊頁…"
- 
- #: parts/documentation/documentation_part.cpp:241
- msgid "Show an infopage"
--msgstr "顯示資訊頁..."
-+msgstr "顯示資訊頁…"
- 
- #: parts/documentation/documentation_part.cpp:242
- msgid "<b>Show an infopage</b><p>Opens an info page using embedded viewer."
-@@ -22917,20 +23065,21 @@
- 
- #: parts/documentation/documentation_part.cpp:244
- msgid "Find Documentation..."
--msgstr "尋找文件..."
-+msgstr "尋找文件…"
- 
- #: parts/documentation/documentation_part.cpp:248
- #: parts/documentation/documentation_part.cpp:470
- msgid ""
--"<b>Find documentation</b>"
--"<p>Opens the documentation finder tab and searches all possible sources of "
--"documentation like table of contents, index, man and info databases, Google, "
--"etc."
--msgstr "<b>尋找文件</b><p>開啟「文件尋找器」頁，搜尋所有可能的文件來源，如目錄、索引、手冊、資訊資料庫、Google 等。"
-+"<b>Find documentation</b><p>Opens the documentation finder tab and searches "
-+"all possible sources of documentation like table of contents, index, man and "
-+"info databases, Google, etc."
-+msgstr ""
-+"<b>尋找文件</b><p>開啟「文件尋找器」頁，搜尋所有可能的文件來源，如目錄、索"
-+"引、手冊、資訊資料庫、Google 等。"
- 
- #: parts/documentation/documentation_part.cpp:318
- msgid "Show Manual Page"
--msgstr "顯示手冊頁..."
-+msgstr "顯示手冊頁…"
- 
- #: parts/documentation/documentation_part.cpp:318
- msgid "Show manpage on:"
-@@ -22938,7 +23087,7 @@
- 
- #: parts/documentation/documentation_part.cpp:342
- msgid "Show Info Page"
--msgstr "顯示資訊頁..."
-+msgstr "顯示資訊頁…"
- 
- #: parts/documentation/documentation_part.cpp:342
- msgid "Show infopage on:"
-@@ -22961,11 +23110,12 @@
- 
- #: parts/documentation/documentation_part.cpp:487
- msgid ""
--"<b>Search in documentation</b>"
--"<p>Searches for a term under the cursor in the documentation. For this to work, "
--"a full text index must be created first, which can be done in the configuration "
--"dialog of the documentation plugin."
--msgstr "<b>在文件中搜尋</b><p>在文件中搜尋目前游標下的字。您必須先在文件外掛程式的設定中建立全文檢索的索引才能開始搜尋。"
-+"<b>Search in documentation</b><p>Searches for a term under the cursor in the "
-+"documentation. For this to work, a full text index must be created first, "
-+"which can be done in the configuration dialog of the documentation plugin."
-+msgstr ""
-+"<b>在文件中搜尋</b><p>在文件中搜尋目前游標下的字。您必須先在文件外掛程式的設"
-+"定中建立全文檢索的索引才能開始搜尋。"
- 
- #: parts/documentation/documentation_part.cpp:494
- #, c-format
-@@ -22974,8 +23124,7 @@
- 
- #: parts/documentation/documentation_part.cpp:496
- msgid ""
--"<b>Goto manpage</b>"
--"<p>Tries to open a man page for the term under the cursor."
-+"<b>Goto manpage</b><p>Tries to open a man page for the term under the cursor."
- msgstr "<b>跳到手冊頁</b><p>它將試圖開啟目前游標下的字的手冊頁。"
- 
- #: parts/documentation/documentation_part.cpp:499
-@@ -22985,8 +23134,8 @@
- 
- #: parts/documentation/documentation_part.cpp:501
- msgid ""
--"<b>Goto infopage</b>"
--"<p>Tries to open an info page for the term under the cursor."
-+"<b>Goto infopage</b><p>Tries to open an info page for the term under the "
-+"cursor."
- msgstr "<b>跳到資訊頁</b><p>它將試圖開啟目前游標下的字的資訊頁。"
- 
- #: parts/documentation/docutils.cpp:80
-@@ -23025,7 +23174,7 @@
- 
- #: parts/documentation/bookmarkview.cpp:223
- msgid "Custom..."
--msgstr "自訂..."
-+msgstr "自訂…"
- 
- #: parts/documentation/bookmarkview.cpp:241
- msgid "Add Bookmark"
-@@ -23107,8 +23256,8 @@
- "KDevelop dialog to set the htsearch location."
- msgstr ""
- "找不到 htsearch 執行檔。\n"
--"這是 ht://Dig 套件中的一部份，讓 KDevelop 可以執行全文檢索。請安裝 ht://Dig 並在「設定 "
--"KDevelop」對話框中的「文件」頁中設定 htsearch 的路徑。"
-+"這是 ht://Dig 套件中的一部份，讓 KDevelop 可以執行全文檢索。請安裝 ht://Dig "
-+"並在「設定 KDevelop」對話框中的「文件」頁中設定 htsearch 的路徑。"
- 
- #: parts/documentation/searchview.cpp:174
- msgid "Cannot find the htdig configuration file."
-@@ -23136,7 +23285,7 @@
- 
- #: parts/documentation/tools/htdig/htdigindex.cpp:82
- msgid "Generating index..."
--msgstr "正在產生索引..."
-+msgstr "正在產生索引…"
- 
- #: parts/documentation/tools/htdig/htdigindex.cpp:125
- #, c-format
-@@ -23242,7 +23391,7 @@
- 
- #: parts/filter/filterpart.cpp:40
- msgid "Execute Command..."
--msgstr "執行命令..."
-+msgstr "執行命令…"
- 
- #: parts/filter/filterpart.cpp:43
- msgid "Execute shell command"
-@@ -23250,13 +23399,13 @@
- 
- #: parts/filter/filterpart.cpp:44
- msgid ""
--"<b>Execute shell command</b>"
--"<p>Executes a shell command and outputs its result into the current document."
-+"<b>Execute shell command</b><p>Executes a shell command and outputs its "
-+"result into the current document."
- msgstr "<b>執行 shell 命令</b><p>執行 shell 命令，將它的結果輸出到目前文件中。"
- 
- #: parts/filter/filterpart.cpp:46
- msgid "Filter Selection Through Command..."
--msgstr "透過命令過濾選擇區..."
-+msgstr "透過命令過濾選擇區…"
- 
- #: parts/filter/filterpart.cpp:49
- msgid "Filter selection through a shell command"
-@@ -23264,10 +23413,11 @@
- 
- #: parts/filter/filterpart.cpp:50
- msgid ""
--"<b>Filter selection through shell command</b>"
--"<p>Filters selection through a shell command and outputs its result into the "
--"current document."
--msgstr "<b>透過 shell 命令過濾選擇區</b><p>將選擇區內容透過 shell 命令進行過濾，結果輸出到目前文件中。"
-+"<b>Filter selection through shell command</b><p>Filters selection through a "
-+"shell command and outputs its result into the current document."
-+msgstr ""
-+"<b>透過 shell 命令過濾選擇區</b><p>將選擇區內容透過 shell 命令進行過濾，結果"
-+"輸出到目前文件中。"
- 
- #: parts/filter/filterpart.cpp:96
- msgid "Execute Command"
-@@ -23283,11 +23433,12 @@
- 
- #: parts/outputviews/appoutputviewpart.cpp:46
- msgid ""
--"<b>Application output</b>"
--"<p>The stdout/stderr output window is a replacement for terminal-based "
--"application communication. Running terminal applications use this instead of a "
--"terminal window."
--msgstr "<b>應用程式輸出</b><p>標準輸出/標準錯誤的輸出視窗是用於取代以終端機為主的應用程式通訊。使用這個視窗來執行終端機應用程式。"
-+"<b>Application output</b><p>The stdout/stderr output window is a replacement "
-+"for terminal-based application communication. Running terminal applications "
-+"use this instead of a terminal window."
-+msgstr ""
-+"<b>應用程式輸出</b><p>標準輸出/標準錯誤的輸出視窗是用於取代以終端機為主的應用"
-+"程式通訊。使用這個視窗來執行終端機應用程式。"
- 
- #: parts/outputviews/appoutputviewpart.cpp:51
- msgid "Output of the executed user program"
-@@ -23347,15 +23498,15 @@
- 
- #: parts/outputviews/makeviewpart.cpp:45
- msgid ""
--"<b>Messages output</b>"
--"<p>The messages window shows the output of the compiler and used build tools "
--"like make, ant, uic, dcopidl etc. For compiler error messages, click on the "
--"error message. This will automatically open the source file and set the cursor "
--"to the line that caused the compiler error/warning."
--msgstr ""
--"<b>訊息輸出</b>"
--"<p>訊息視窗顯示編譯器和其它執行過的工具程式的輸出，比如 make、ant、uic、dcopidl "
--"等等。點擊編譯器的錯誤訊息會自動開啟程式檔案，並將游標置於引起編譯錯誤或警告的行。"
-+"<b>Messages output</b><p>The messages window shows the output of the "
-+"compiler and used build tools like make, ant, uic, dcopidl etc. For compiler "
-+"error messages, click on the error message. This will automatically open the "
-+"source file and set the cursor to the line that caused the compiler error/"
-+"warning."
-+msgstr ""
-+"<b>訊息輸出</b><p>訊息視窗顯示編譯器和其它執行過的工具程式的輸出，比如 make、"
-+"ant、uic、dcopidl 等等。點擊編譯器的錯誤訊息會自動開啟程式檔案，並將游標置於"
-+"引起編譯錯誤或警告的行。"
- 
- #: parts/outputviews/makeviewpart.cpp:52
- msgid "Compiler output messages"
-@@ -23371,8 +23522,8 @@
- 
- #: parts/outputviews/makeviewpart.cpp:58
- msgid ""
--"<b>Next error</b>"
--"<p>Switches to the file and line where the next error was reported from."
-+"<b>Next error</b><p>Switches to the file and line where the next error was "
-+"reported from."
- msgstr "<b>下一個錯誤</b><p>切換到引起下一個錯誤的檔案和行。"
- 
- #: parts/outputviews/makeviewpart.cpp:59
-@@ -23385,8 +23536,8 @@
- 
- #: parts/outputviews/makeviewpart.cpp:62
- msgid ""
--"<b>Previous error</b>"
--"<p>Switches to the file and line where the previous error was reported from."
-+"<b>Previous error</b><p>Switches to the file and line where the previous "
-+"error was reported from."
- msgstr "<b>上一個錯誤</b><p>切換到引起上一個錯誤的檔案和行。"
- 
- #: parts/outputviews/makeactionfilter.cpp:75
-@@ -23435,13 +23586,13 @@
- 
- #: parts/outputviews/makewidget.cpp:705
- msgid "Line Wrapping"
--msgstr "文字折行"
-+msgstr "文字折列"
- 
- #: parts/outputviews/makewidget.cpp:707
- msgid ""
--"<b>Line wrapping</b>"
--"<p>Enables or disables wrapping of command lines displayed."
--msgstr "<b>文字折行</b><p>開啟或關閉命令列顯示的文字折行功能。"
-+"<b>Line wrapping</b><p>Enables or disables wrapping of command lines "
-+"displayed."
-+msgstr "<b>文字折列</b><p>開啟或關閉命令列顯示的文字折列功能。"
- 
- #: parts/outputviews/makewidget.cpp:710
- msgid "Very Short Compiler Output"
-@@ -23449,8 +23600,8 @@
- 
- #: parts/outputviews/makewidget.cpp:711
- msgid ""
--"<b>Very short compiler output</b>"
--"<p>Displays only warnings, errors and the file names which are compiled."
-+"<b>Very short compiler output</b><p>Displays only warnings, errors and the "
-+"file names which are compiled."
- msgstr "<b>非常簡潔的編譯器輸出</b><p>只顯示警告、錯誤和編譯的檔案名。"
- 
- #: parts/outputviews/makewidget.cpp:713
-@@ -23459,9 +23610,10 @@
- 
- #: parts/outputviews/makewidget.cpp:714
- msgid ""
--"<b>Short compiler output</b>"
--"<p>Suppresses all the compiler flags and formats to something readable."
--msgstr "<b>簡潔的編譯器輸出</b><p>不顯示所有的編譯器選項，並使用容易閱讀的格式。"
-+"<b>Short compiler output</b><p>Suppresses all the compiler flags and formats "
-+"to something readable."
-+msgstr ""
-+"<b>簡潔的編譯器輸出</b><p>不顯示所有的編譯器選項，並使用容易閱讀的格式。"
- 
- #: parts/outputviews/makewidget.cpp:716
- msgid "Full Compiler Output"
-@@ -23477,8 +23629,8 @@
- 
- #: parts/outputviews/makewidget.cpp:722
- msgid ""
--"<b>Show directory navigation messages</b>"
--"<p>Shows <b>cd</b> commands that are executed while building."
-+"<b>Show directory navigation messages</b><p>Shows <b>cd</b> commands that "
-+"are executed while building."
- msgstr "<b>顯示目錄導覽訊息</b><p>顯示編譯時執行的 <b>cd</b> 命令。"
- 
- #: parts/texttools/texttoolspart.cpp:61 parts/texttools/texttoolspart.cpp:64
-@@ -23504,8 +23656,8 @@
- 
- #: parts/openwith/openwithpart.cpp:53
- msgid ""
--"<b>Open As</b>"
--"<p>Lists all encodings that can be used to open the selected file."
-+"<b>Open As</b><p>Lists all encodings that can be used to open the selected "
-+"file."
- msgstr "<b>開啟為</b><p>列出能用來開啟所選取檔案的所有編碼。"
- 
- #: parts/openwith/openwithpart.cpp:82
-@@ -23514,19 +23666,20 @@
- 
- #: parts/openwith/openwithpart.cpp:83
- msgid ""
--"<b>Open With</b>"
--"<p>Lists all applications that can be used to open the selected file."
-+"<b>Open With</b><p>Lists all applications that can be used to open the "
-+"selected file."
- msgstr "<b>開啟方式</b><p>列出能用來開啟所選取檔案的所有應用程式。"
- 
- #: parts/openwith/openwithpart.cpp:88
- msgid "Open With..."
--msgstr "開啟方式..."
-+msgstr "開啟方式…"
- 
- #: parts/openwith/openwithpart.cpp:89
- msgid ""
--"<b>Open With...</b>"
--"<p>Provides a dialog to choose the application to open the selected file."
--msgstr "<b>開啟方式......</b><p>提供一個對話框選擇用來開啟所選取檔案的應用程式。"
-+"<b>Open With...</b><p>Provides a dialog to choose the application to open "
-+"the selected file."
-+msgstr ""
-+"<b>開啟方式......</b><p>提供一個對話框選擇用來開啟所選取檔案的應用程式。"
- 
- #: parts/classview/hierarchydlg.cpp:52
- msgid "Refresh"
-@@ -23644,10 +23797,11 @@
- 
- #: parts/classview/classviewpart.cpp:161
- msgid ""
--"<b>Class browser</b>"
--"<p>The class browser shows all namespaces, classes and namespace and class "
--"members in a project."
--msgstr "<b>類別瀏覽器</b><p>類別瀏覽器顯示所有的命名空間、類別、和專案中的命名空間和類別成員。"
-+"<b>Class browser</b><p>The class browser shows all namespaces, classes and "
-+"namespace and class members in a project."
-+msgstr ""
-+"<b>類別瀏覽器</b><p>類別瀏覽器顯示所有的命名空間、類別、和專案中的命名空間和"
-+"類別成員。"
- 
- #: parts/classview/classviewpart.cpp:198
- msgid "Functions Navigation"
-@@ -23659,8 +23813,7 @@
- 
- #: parts/classview/classviewpart.cpp:204
- msgid ""
--"<b>Function navigator</b>"
--"<p>Navigates over functions contained in the file."
-+"<b>Function navigator</b><p>Navigates over functions contained in the file."
- msgstr "<b>函式導覽</b><p>此檔中包含的函式的導覽"
- 
- #: parts/classview/classviewpart.cpp:208
-@@ -23677,10 +23830,12 @@
- 
- #: parts/classview/classviewpart.cpp:214
- msgid ""
--"<b>Class inheritance diagram</b>"
--"<p>Displays inheritance relationship between classes in project. Note, it does "
--"not display classes outside inheritance hierarchy."
--msgstr "<b>類別繼承圖表</b><p>顯示專案中的類別之間的繼承關聯。注意，它不顯示繼承體系之外的類別。"
-+"<b>Class inheritance diagram</b><p>Displays inheritance relationship between "
-+"classes in project. Note, it does not display classes outside inheritance "
-+"hierarchy."
-+msgstr ""
-+"<b>類別繼承圖表</b><p>顯示專案中的類別之間的繼承關聯。注意，它不顯示繼承體系"
-+"之外的類別。"
- 
- #: parts/classview/classviewwidget.cpp:69
- msgid "Group by Directories"
-@@ -23700,10 +23855,11 @@
- 
- #: parts/classview/classviewwidget.cpp:72
- msgid ""
--"<b>View mode</b>"
--"<p>Class browser items can be grouped by directories, listed in a plain or java "
--"like view."
--msgstr "<b>檢視模式</b><p>類別瀏覽器顯示的項目可以按目錄分群組、簡單列表或者顯示為類似 Java 的檢視。"
-+"<b>View mode</b><p>Class browser items can be grouped by directories, listed "
-+"in a plain or java like view."
-+msgstr ""
-+"<b>檢視模式</b><p>類別瀏覽器顯示的項目可以按目錄分群組、簡單列表或者顯示為類"
-+"似 Java 的檢視。"
- 
- #: parts/classview/classviewwidget.cpp:76
- msgid "<b>New class</b><p>Calls the <b>New Class</b> wizard."
-@@ -23715,7 +23871,7 @@
- 
- #: parts/classview/classtreebase.cpp:55 parts/classview/classviewwidget.cpp:81
- msgid "Add Method..."
--msgstr "新增方法..."
-+msgstr "新增方法…"
- 
- #: parts/classview/classviewwidget.cpp:83
- msgid "<b>Add method</b><p>Calls the <b>New Method</b> wizard."
-@@ -23723,7 +23879,7 @@
- 
- #: parts/classview/classtreebase.cpp:57 parts/classview/classviewwidget.cpp:84
- msgid "Add Attribute..."
--msgstr "新增屬性..."
-+msgstr "新增屬性…"
- 
- #: parts/classview/classviewwidget.cpp:86
- msgid "<b>Add attribute</b><p>Calls the <b>New Attribute</b> wizard."
-@@ -23735,9 +23891,8 @@
- 
- #: parts/classview/classviewwidget.cpp:90
- msgid ""
--"<b>Open declaration</b>"
--"<p>Opens a file where the selected item is declared and jumps to the "
--"declaration line."
-+"<b>Open declaration</b><p>Opens a file where the selected item is declared "
-+"and jumps to the declaration line."
- msgstr "<b>開啟宣告</b><p>開啟宣告所選取的項目的檔案，並跳到宣告所在。"
- 
- #: parts/classview/classviewwidget.cpp:91
-@@ -23746,9 +23901,8 @@
- 
- #: parts/classview/classviewwidget.cpp:93
- msgid ""
--"<b>Open implementation</b>"
--"<p>Opens a file where the selected item is defined (implemented) and jumps to "
--"the definition line."
-+"<b>Open implementation</b><p>Opens a file where the selected item is defined "
-+"(implemented) and jumps to the definition line."
- msgstr "<b>開啟實作</b><p>開啟定義（實作）所選取的項目的檔案，並跳到定義所在。"
- 
- #: parts/classview/classviewwidget.cpp:95
-@@ -23761,15 +23915,15 @@
- 
- #: parts/classview/classtreebase.cpp:59
- msgid "Parent Classes..."
--msgstr "父類別..."
-+msgstr "父類別…"
- 
- #: parts/classview/classtreebase.cpp:60
- msgid "Child Classes..."
--msgstr "子類別..."
-+msgstr "子類別…"
- 
- #: parts/classview/classtreebase.cpp:61
- msgid "Class Tool..."
--msgstr "類別工具..."
-+msgstr "類別工具…"
- 
- #: parts/classview/classtreebase.cpp:65
- msgid "Struct"
-@@ -23816,15 +23970,14 @@
- 
- #: parts/fileselector/fileselector_part.cpp:53
- msgid ""
--"<b>File selector</b>"
--"<p>This file selector lists directory contents and provides some file "
--"management functions."
-+"<b>File selector</b><p>This file selector lists directory contents and "
-+"provides some file management functions."
- msgstr "<b>檔案選擇器</b><p>檔案選擇器列出目錄內容並提供一些檔案管理功能。"
- 
- #: buildtools/script/scriptprojectpart.cpp:53
- #: parts/fileselector/fileselector_part.cpp:57
- msgid "New File..."
--msgstr "新增檔案..."
-+msgstr "新增檔案…"
- 
- #: parts/fileselector/fileselector_widget.cpp:188
- msgid "Current Document Directory"
-@@ -23832,25 +23985,22 @@
- 
- #: parts/fileselector/fileselector_widget.cpp:217
- msgid ""
--"<p>Here you can enter a path for a directory to display."
--"<p>To go to a directory previously entered, press the arrow on the right and "
--"choose one. "
-+"<p>Here you can enter a path for a directory to display.<p>To go to a "
-+"directory previously entered, press the arrow on the right and choose one. "
- "<p>The entry has directory completion. Right-click to choose how completion "
- "should behave."
- msgstr ""
--"<p>您可以在此輸入要顯示的目錄路徑。 "
--"<p>要跳到先前輸入的目錄，您可以點選右側的箭頭來選擇。 "
--"<p>這裡有目錄補完的功能，點擊滑鼠右鍵可以選擇如何進行補完。"
-+"<p>您可以在此輸入要顯示的目錄路徑。 <p>要跳到先前輸入的目錄，您可以點選右側的"
-+"箭頭來選擇。 <p>這裡有目錄補完的功能，點擊滑鼠右鍵可以選擇如何進行補完。"
- 
- #: parts/fileselector/fileselector_widget.cpp:223
- msgid ""
--"<p>Here you can enter a name filter to limit which files are displayed."
--"<p>To clear the filter, toggle off the filter button to the left."
--"<p>To reapply the last filter used, toggle on the filter button."
--msgstr ""
--"<p>您可以在此輸入名稱過濾器來限制要顯示哪些檔案。 "
--"<p>將左側的過濾器按鈕切到關閉可以清除過濾器。 "
--"<p>切到開啟時會重新套用上次使用的過濾器。"
-+"<p>Here you can enter a name filter to limit which files are displayed.<p>To "
-+"clear the filter, toggle off the filter button to the left.<p>To reapply the "
-+"last filter used, toggle on the filter button."
-+msgstr ""
-+"<p>您可以在此輸入名稱過濾器來限制要顯示哪些檔案。 <p>將左側的過濾器按鈕切到關"
-+"閉可以清除過濾器。 <p>切到開啟時會重新套用上次使用的過濾器。"
- 
- #: parts/fileselector/fileselector_widget.cpp:588
- msgid "Toolbar"
-@@ -23902,7 +24052,8 @@
- 
- #: parts/fileselector/fileselector_widget.cpp:646
- msgid ""
--"<p>Decides how many locations to keep in the history of the location combo box"
-+"<p>Decides how many locations to keep in the history of the location combo "
-+"box"
- msgstr "<p>決定在位置下拉盒的歷史中保留多少個位置"
- 
- #: parts/fileselector/fileselector_widget.cpp:653
-@@ -23913,38 +24064,37 @@
- #: parts/fileselector/fileselector_widget.cpp:660
- msgid ""
- "<p>These options allow you to have the File Selector automatically change "
--"location to the directory of the active document on certain events."
--"<p>Auto synchronization is <em>lazy</em>, meaning it will not take effect until "
--"the file selector is visible."
--"<p>None of these are enabled by default, but you can always sync the location "
--"by pressing the sync button in the toolbar."
--msgstr ""
--"<p>這些選項能在特定事件發生時，將檔案選擇器自動變更到目前使用中的文件所在的目錄。 "
--"<p>自動同步具有<em>惰性</em>，也就是說它只有在檔案選擇器成為可見時才會起作用。 "
--"<p>這些功能預設都未開啟，但您隨時可以按鍵工具列上的同步按鈕進行同步。"
-+"location to the directory of the active document on certain events.<p>Auto "
-+"synchronization is <em>lazy</em>, meaning it will not take effect until the "
-+"file selector is visible.<p>None of these are enabled by default, but you "
-+"can always sync the location by pressing the sync button in the toolbar."
-+msgstr ""
-+"<p>這些選項能在特定事件發生時，將檔案選擇器自動變更到目前使用中的文件所在的目"
-+"錄。 <p>自動同步具有<em>惰性</em>，也就是說它只有在檔案選擇器成為可見時才會起"
-+"作用。 <p>這些功能預設都未開啟，但您隨時可以按鍵工具列上的同步按鈕進行同步。"
- 
- #: parts/fileselector/fileselector_widget.cpp:671
- msgid ""
--"<p>If this option is enabled (default), the location will be restored when you "
--"start KDev."
--"<p><strong>Note</strong> that if the session is handled by the KDE session "
--"manager, the location is always restored."
--msgstr ""
--"<p>如果開啟此選項（預設），當您啟動 KDev 時目錄位置將會自動回復。 "
--"<p><strong>注意</strong>：如果工作階段是由 KDE 工作階段管理員處理，則目錄位置將一定會被回復。"
-+"<p>If this option is enabled (default), the location will be restored when "
-+"you start KDev.<p><strong>Note</strong> that if the session is handled by "
-+"the KDE session manager, the location is always restored."
-+msgstr ""
-+"<p>如果開啟此選項（預設），當您啟動 KDev 時目錄位置將會自動回復。 <p><strong>"
-+"注意</strong>：如果工作階段是由 KDE 工作階段管理員處理，則目錄位置將一定會被"
-+"回復。"
- 
- #: parts/fileselector/fileselector_widget.cpp:676
- msgid ""
- "<p>If this option is enabled (default), the current filter will be restored "
--"when you start KDev."
--"<p><strong>Note</strong> that if the session is handled by the KDE session "
--"manager, the filter is always restored."
--"<p><strong>Note</strong> that some of the autosync settings may override the "
--"restored location if on."
-+"when you start KDev.<p><strong>Note</strong> that if the session is handled "
-+"by the KDE session manager, the filter is always restored.<p><strong>Note</"
-+"strong> that some of the autosync settings may override the restored "
-+"location if on."
- msgstr ""
- "<p>如果開啟此選項（預設），當您啟動 KDev 時目前的過濾器將會自動回復。 "
--"<p><strong>注意</strong>：如果工作階段是由 KDE 工作階段管理員處理，則過濾器將一定會被回復。 "
--"<p><strong>注意</strong>有些自動同步設定開啟的話，會取代回復的目錄位置。"
-+"<p><strong>注意</strong>：如果工作階段是由 KDE 工作階段管理員處理，則過濾器將"
-+"一定會被回復。 <p><strong>注意</strong>有些自動同步設定開啟的話，會取代回復的"
-+"目錄位置。"
- 
- #: parts/valgrind/valgrind_dialog.cpp:20
- msgid "Valgrind Memory Check"
-@@ -23978,27 +24128,19 @@
- 
- #: parts/valgrind/valgrind_part.cpp:51
- msgid ""
--"<b>Valgrind</b>"
--"<p>Shows the output of the valgrind. Valgrind detects"
--"<br>use of uninitialized memory"
--"<br>reading/writing memory after it has been free'd"
--"<br>reading/writing off the end of malloc'd blocks"
--"<br>reading/writing inappropriate areas on the stack"
--"<br>memory leaks -- where pointers to malloc'd blocks are lost forever"
--"<br>passing of uninitialised and/or unaddressable memory to system calls"
--"<br>mismatched use of malloc/new/new [] vs free/delete/delete []"
--"<br>some abuses of the POSIX pthread API."
--msgstr ""
--"<b>Valgrind</b>"
--"<p>顯示 Valgrind 的輸出。Valgrind 能偵測："
--"<br> 使用未初始化的記憶體"
--"<br> 在記憶體被釋放後進行讀/寫"
--"<br> 讀寫超越 malloc 配置的記憶區塊"
--"<br> 讀寫堆疊中不適當的區域"
--"<br> 記憶體滴漏 - malloc 配置的指標永遠遺失的問題"
--"<br> 傳遞未初始化和/或無法存取的記憶體位置給系統呼叫"
--"<br> 找出不對稱的 malloc/new/new [] 和 free/delete/delete [] 使用"
--"<br>一些對 POSIX pthread API 的不當使用。"
-+"<b>Valgrind</b><p>Shows the output of the valgrind. Valgrind detects<br>use "
-+"of uninitialized memory<br>reading/writing memory after it has been "
-+"free'd<br>reading/writing off the end of malloc'd blocks<br>reading/writing "
-+"inappropriate areas on the stack<br>memory leaks -- where pointers to "
-+"malloc'd blocks are lost forever<br>passing of uninitialised and/or "
-+"unaddressable memory to system calls<br>mismatched use of malloc/new/new [] "
-+"vs free/delete/delete []<br>some abuses of the POSIX pthread API."
-+msgstr ""
-+"<b>Valgrind</b><p>顯示 Valgrind 的輸出。Valgrind 能偵測：<br> 使用未初始化的"
-+"記憶體<br> 在記憶體被釋放後進行讀/寫<br> 讀寫超越 malloc 配置的記憶區塊<br> "
-+"讀寫堆疊中不適當的區域<br> 記憶體滴漏 - malloc 配置的指標永遠遺失的問題<br> "
-+"傳遞未初始化和/或無法存取的記憶體位置給系統呼叫<br> 找出不對稱的 malloc/new/"
-+"new [] 和 free/delete/delete [] 使用<br>一些對 POSIX pthread API 的不當使用。"
- 
- #: parts/valgrind/valgrind_part.cpp:61
- msgid "&Valgrind Memory Leak Check"
-@@ -24010,10 +24152,11 @@
- 
- #: parts/valgrind/valgrind_part.cpp:64
- msgid ""
--"<b>Valgrind memory leak check</b>"
--"<p>Runs Valgrind - a tool to help you find memory-management problems in your "
--"programs."
--msgstr "<b>Valgrind 記憶體滴漏檢查</b><p>執行 Valgrind - 幫助您發現程式中記憶體管理問題的工具。"
-+"<b>Valgrind memory leak check</b><p>Runs Valgrind - a tool to help you find "
-+"memory-management problems in your programs."
-+msgstr ""
-+"<b>Valgrind 記憶體滴漏檢查</b><p>執行 Valgrind - 幫助您發現程式中記憶體管理問"
-+"題的工具。"
- 
- #: parts/valgrind/valgrind_part.cpp:66
- msgid "P&rofile with KCachegrind"
-@@ -24025,10 +24168,11 @@
- 
- #: parts/valgrind/valgrind_part.cpp:69
- msgid ""
--"<b>Profile with KCachegrind</b>"
--"<p>Runs your program in calltree and then displays profiler information in "
--"KCachegrind."
--msgstr "<b>用 KCachegrind 分析</b><p>在 calltree 中執行您的程式，並在 KCachegrind 中顯示分析資訊。"
-+"<b>Profile with KCachegrind</b><p>Runs your program in calltree and then "
-+"displays profiler information in KCachegrind."
-+msgstr ""
-+"<b>用 KCachegrind 分析</b><p>在 calltree 中執行您的程式，並在 KCachegrind 中"
-+"顯示分析資訊。"
- 
- #: parts/valgrind/valgrind_part.cpp:90
- msgid "Open Valgrind Output"
-@@ -24054,7 +24198,7 @@
- 
- #: parts/valgrind/valgrind_widget.cpp:104
- msgid "&Open Valgrind Output..."
--msgstr "開啟 Valgrind 輸出(&O)..."
-+msgstr "開啟 Valgrind 輸出(&O)…"
- 
- #: parts/valgrind/valgrind_widget.cpp:106
- msgid "Expand All Items"
-@@ -24090,13 +24234,13 @@
- 
- #: parts/bookmarks/bookmarks_part.cpp:59
- msgid ""
--"<b>Bookmarks</b>"
--"<p>The bookmark viewer shows all the source bookmarks in the project."
--msgstr "<b>書籤</b><p>書籤檢視器顯示專案中的所有程式源碼書籤。"
-+"<b>Bookmarks</b><p>The bookmark viewer shows all the source bookmarks in the "
-+"project."
-+msgstr "<b>書籤</b><p>書籤檢視器顯示專案中的所有程式原始碼書籤。"
- 
- #: parts/bookmarks/bookmarks_part.cpp:62
- msgid "Source bookmarks"
--msgstr "程式源碼書籤"
-+msgstr "程式原始碼書籤"
- 
- #: parts/bookmarks/bookmarks_part.cpp:558
- msgid "Could not find file"
-@@ -24143,8 +24287,7 @@
- 
- #: buildtools/ant/antprojectpart.cpp:59
- msgid ""
--"<b>Build project</b>"
--"<p>Executes <b>ant dist</b> command to build the project."
-+"<b>Build project</b><p>Executes <b>ant dist</b> command to build the project."
- msgstr "<b>建立專案</b><p>執行 <b>ant dist</b> 命令來建立專案。"
- 
- #: buildtools/ant/antprojectpart.cpp:61
-@@ -24159,8 +24302,8 @@
- 
- #: buildtools/ant/antprojectpart.cpp:64
- msgid ""
--"<b>Build target</b>"
--"<p>Executes <b>ant target_name</b> command to build the specified target."
-+"<b>Build target</b><p>Executes <b>ant target_name</b> command to build the "
-+"specified target."
- msgstr "<b>建立目標</b><p>執行 <b>ant target_name</b> 命令來建立指定的目標。"
- 
- #: buildtools/ant/antprojectpart.cpp:467
-@@ -24218,15 +24361,14 @@
- 
- #: buildtools/qmake/trollprojectpart.cpp:83
- msgid ""
--"<b>QMake manager</b>"
--"<p>The QMake manager project tree consists of two parts. The 'overview' in the "
--"upper half shows the subprojects, each one having a .pro file. The 'details' "
--"view in the lower half shows the list of files for the active subproject "
--"selected in the overview."
--msgstr ""
--"<b>QMake 管理器</b>"
--"<p>QMake 專案樹包括兩部分，上半部分的「概要」顯示子專案，每個子專案有一個 pro "
--"檔。下半部分的「細節」檢視顯示概述列表中目前選取的子專案中的檔案列表。"
-+"<b>QMake manager</b><p>The QMake manager project tree consists of two parts. "
-+"The 'overview' in the upper half shows the subprojects, each one having a ."
-+"pro file. The 'details' view in the lower half shows the list of files for "
-+"the active subproject selected in the overview."
-+msgstr ""
-+"<b>QMake 管理器</b><p>QMake 專案樹包括兩部分，上半部分的「概要」顯示子專案，"
-+"每個子專案有一個 pro 檔。下半部分的「細節」檢視顯示概述列表中目前選取的子專案"
-+"中的檔案列表。"
- 
- #: buildtools/qmake/trollprojectpart.cpp:89
- msgid "QMake manager"
-@@ -24249,28 +24391,24 @@
- #: buildtools/qmake/trollprojectpart.cpp:98
- #: buildtools/qmake/trollprojectwidget.cpp:231
- msgid ""
--"<b>Compile file</b>"
--"<p>Runs <b>make filename.o</b> command from the directory where 'filename' is "
--"the name of currently opened file."
--"<br>Environment variables and make arguments can be specified in the project "
--"settings dialog, <b>Make Options</b> tab."
-+"<b>Compile file</b><p>Runs <b>make filename.o</b> command from the directory "
-+"where 'filename' is the name of currently opened file.<br>Environment "
-+"variables and make arguments can be specified in the project settings "
-+"dialog, <b>Make Options</b> tab."
- msgstr ""
--"<b>編譯檔案</b>"
--"<p>在目前開啟的檔案 filename 所在的目錄執行 <b>make </b> 命令。"
--"<br> 環境變數和編譯參數可以在專案設定中的<b>編譯選項</b>頁中指定。"
-+"<b>編譯檔案</b><p>在目前開啟的檔案 filename 所在的目錄執行 <b>make </b> 命"
-+"令。<br> 環境變數和編譯參數可以在專案設定中的<b>編譯選項</b>頁中指定。"
- 
- #: buildtools/autotools/autoprojectpart.cpp:107
- #: buildtools/qmake/trollprojectpart.cpp:107
- #: buildtools/qmake/trollprojectwidget.cpp:125
- msgid ""
--"<b>Build project</b>"
--"<p>Runs <b>make</b> from the project directory."
-+"<b>Build project</b><p>Runs <b>make</b> from the project directory."
- "<br>Environment variables and make arguments can be specified in the project "
- "settings dialog, <b>Make Options</b> tab."
- msgstr ""
--"<b>建立專案</b>"
--"<p>在專案目錄中執行 <b>make</b> 命令。"
--"<br>環境變數和編譯參數可以在專案設定中的<b>編譯選項</b>頁中指定。"
-+"<b>建立專案</b><p>在專案目錄中執行 <b>make</b> 命令。<br>環境變數和編譯參數可"
-+"以在專案設定中的<b>編譯選項</b>頁中指定。"
- 
- #: buildtools/qmake/trollprojectpart.cpp:111
- msgid "&Rebuild Project"
-@@ -24285,14 +24423,13 @@
- #: buildtools/qmake/trollprojectwidget.cpp:134
- #: buildtools/qmake/trollprojectwidget.cpp:1014
- msgid ""
--"<b>Rebuild project</b>"
--"<p>Runs <b>make clean</b> and then <b>make</b> from the project directory."
--"<br>Environment variables and make arguments can be specified in the project "
--"settings dialog, <b>Make Options</b> tab."
--msgstr ""
--"<b>重新編譯專案</b>"
--"<p>在專案目錄中執行 <b>make clean</b> 命令，然後執行 <b>make</b> 命令。"
--"<br>環境變數和編譯參數可以在專案設定中的<b>編譯選項</b>頁中指定。"
-+"<b>Rebuild project</b><p>Runs <b>make clean</b> and then <b>make</b> from "
-+"the project directory.<br>Environment variables and make arguments can be "
-+"specified in the project settings dialog, <b>Make Options</b> tab."
-+msgstr ""
-+"<b>重新編譯專案</b><p>在專案目錄中執行 <b>make clean</b> 命令，然後執行 "
-+"<b>make</b> 命令。<br>環境變數和編譯參數可以在專案設定中的<b>編譯選項</b>頁中"
-+"指定。"
- 
- #: buildtools/qmake/trollprojectpart.cpp:119
- msgid "&Install Project"
-@@ -24304,14 +24441,12 @@
- 
- #: buildtools/qmake/trollprojectpart.cpp:123
- msgid ""
--"<b>Install project</b>"
--"<p>Runs <b>make install</b> from the project directory."
-+"<b>Install project</b><p>Runs <b>make install</b> from the project directory."
- "<br>Environment variables and make arguments can be specified in the project "
- "settings dialog, <b>Make Options</b> tab."
- msgstr ""
--"<b>安裝專案</b>"
--"<p>在專案目錄中執行 <b>make install</b> 命令。"
--"<br>環境變數和 make 參數可以在專案設定中的<b>編譯選項</b>頁中指定。"
-+"<b>安裝專案</b><p>在專案目錄中執行 <b>make install</b> 命令。<br>環境變數和 "
-+"make 參數可以在專案設定中的<b>編譯選項</b>頁中指定。"
- 
- #: buildtools/autotools/autoprojectpart.cpp:166
- #: buildtools/custommakefiles/customprojectpart.cpp:132
-@@ -24328,14 +24463,12 @@
- #: buildtools/autotools/autoprojectpart.cpp:170
- #: buildtools/qmake/trollprojectpart.cpp:131
- msgid ""
--"<b>Clean project</b>"
--"<p>Runs <b>make clean</b> command from the project directory."
--"<br>Environment variables and make arguments can be specified in the project "
--"settings dialog, <b>Make Options</b> tab."
-+"<b>Clean project</b><p>Runs <b>make clean</b> command from the project "
-+"directory.<br>Environment variables and make arguments can be specified in "
-+"the project settings dialog, <b>Make Options</b> tab."
- msgstr ""
--"<b>清理專案</b>"
--"<p>在專案目錄中執行 <b>make clean</b> 命令。"
--"<br>環境變數和編譯參數可以在專案設定中的<b>編譯選項</b>頁中指定。"
-+"<b>清理專案</b><p>在專案目錄中執行 <b>make clean</b> 命令。<br>環境變數和編譯"
-+"參數可以在專案設定中的<b>編譯選項</b>頁中指定。"
- 
- #: buildtools/qmake/trollprojectpart.cpp:135
- msgid "&Dist-Clean Project"
-@@ -24347,14 +24480,12 @@
- 
- #: buildtools/qmake/trollprojectpart.cpp:139
- msgid ""
--"<b>Dist-Clean project</b>"
--"<p>Runs <b>make distclean</b> command from the project directory."
--"<br>Environment variables and make arguments can be specified in the project "
--"settings dialog, <b>Make Options</b> tab."
-+"<b>Dist-Clean project</b><p>Runs <b>make distclean</b> command from the "
-+"project directory.<br>Environment variables and make arguments can be "
-+"specified in the project settings dialog, <b>Make Options</b> tab."
- msgstr ""
--"<b>完全清理專案</b>"
--"<p>在專案目錄中執行 <b>make distclean</b> 命令。"
--"<br>環境變數和編譯參數可以在專案設定中的<b>編譯選項</b>頁中指定。"
-+"<b>完全清理專案</b><p>在專案目錄中執行 <b>make distclean</b> 命令。<br>環境變"
-+"數和編譯參數可以在專案設定中的<b>編譯選項</b>頁中指定。"
- 
- #: buildtools/qmake/trollprojectpart.cpp:146
- #: buildtools/qmake/trollprojectwidget.cpp:143
-@@ -24363,10 +24494,12 @@
- 
- #: buildtools/qmake/trollprojectpart.cpp:147
- msgid ""
--"<b>Execute program</b>"
--"<p>Executes the currently selected subproject if its an application or the "
--"program specified in project settings, <b>Run Options</b> tab."
--msgstr "<b>執行主程式</b><p>執行專案設定中的<b>執行選項</b>頁中指定的主程式，或是所選取的子專案應用程式。"
-+"<b>Execute program</b><p>Executes the currently selected subproject if its "
-+"an application or the program specified in project settings, <b>Run Options</"
-+"b> tab."
-+msgstr ""
-+"<b>執行主程式</b><p>執行專案設定中的<b>執行選項</b>頁中指定的主程式，或是所選"
-+"取的子專案應用程式。"
- 
- #: buildtools/qmake/trollprojectpart.cpp:149
- msgid "&Build Subproject"
-@@ -24380,15 +24513,14 @@
- #: buildtools/qmake/trollprojectpart.cpp:153
- #: buildtools/qmake/trollprojectwidget.cpp:241
- msgid ""
--"<b>Build subproject</b>"
--"<p>Runs <b>make</b> from the current subproject directory. Current subproject "
--"is a subproject selected in <b>QMake manager</b> 'overview' window."
--"<br>Environment variables and make arguments can be specified in the project "
--"settings dialog, <b>Make Options</b> tab."
--msgstr ""
--"<b>建立子專案</b>"
--"<p>在目前子專案目錄中執行 <b>make</b> 命令。目前子專案是在 <b>QMake 管理器</b>的「概要」視窗中選取的子專案。"
--"<br>環境變數和編譯參數可以在專案設定中的<b>編譯選項</b>頁中指定。"
-+"<b>Build subproject</b><p>Runs <b>make</b> from the current subproject "
-+"directory. Current subproject is a subproject selected in <b>QMake manager</"
-+"b> 'overview' window.<br>Environment variables and make arguments can be "
-+"specified in the project settings dialog, <b>Make Options</b> tab."
-+msgstr ""
-+"<b>建立子專案</b><p>在目前子專案目錄中執行 <b>make</b> 命令。目前子專案是在 "
-+"<b>QMake 管理器</b>的「概要」視窗中選取的子專案。<br>環境變數和編譯參數可以在"
-+"專案設定中的<b>編譯選項</b>頁中指定。"
- 
- #: buildtools/qmake/trollprojectpart.cpp:158
- msgid "&Rebuild Subproject"
-@@ -24402,17 +24534,15 @@
- #: buildtools/qmake/trollprojectpart.cpp:162
- #: buildtools/qmake/trollprojectwidget.cpp:251
- msgid ""
--"<b>Rebuild subproject</b>"
--"<p>Runs <b>make clean</b> and then <b>make</b> from the current subproject "
--"directory. Current subproject is a subproject selected in <b>QMake manager</b> "
--"'overview' window."
--"<br>Environment variables and make arguments can be specified in the project "
--"settings dialog, <b>Make Options</b> tab."
--msgstr ""
--"<b>重新編譯子專案</b>"
--"<p>在目前子專案目錄中執行 <b>make clean</b> 命令，然後執行 <b>make</b> 命令。目前子專案是在 <b>QMake 管理器</b>"
--"的「概要」視窗中選取的子專案。"
--"<br>環境變數和編譯參數可以在專案設定中的<b>編譯選項</b>頁中指定。"
-+"<b>Rebuild subproject</b><p>Runs <b>make clean</b> and then <b>make</b> from "
-+"the current subproject directory. Current subproject is a subproject "
-+"selected in <b>QMake manager</b> 'overview' window.<br>Environment variables "
-+"and make arguments can be specified in the project settings dialog, <b>Make "
-+"Options</b> tab."
-+msgstr ""
-+"<b>重新編譯子專案</b><p>在目前子專案目錄中執行 <b>make clean</b> 命令，然後執"
-+"行 <b>make</b> 命令。目前子專案是在 <b>QMake 管理器</b>的「概要」視窗中選取的"
-+"子專案。<br>環境變數和編譯參數可以在專案設定中的<b>編譯選項</b>頁中指定。"
- 
- #: buildtools/qmake/trollprojectpart.cpp:167
- msgid "&Install Subproject"
-@@ -24424,15 +24554,15 @@
- 
- #: buildtools/qmake/trollprojectpart.cpp:171
- msgid ""
--"<b>Install subproject</b>"
--"<p>Runs <b>make install</b> from the current subproject directory. Current "
--"subproject is a subproject selected in <b>QMake manager</b> 'overview' window."
--"<br>Environment variables and make arguments can be specified in the project "
--"settings dialog, <b>Make Options</b> tab."
--msgstr ""
--"<b>安裝子專案</b>"
--"<p>在目前子專案目錄中執行 <b>make install</b> 命令。目前子專案是在 <b>QMake 管理器</b>的「概要」視窗中選取的子專案。"
--"<br>環境變數和編譯參數可以在專案設定中的<b>編譯選項</b>頁中指定。"
-+"<b>Install subproject</b><p>Runs <b>make install</b> from the current "
-+"subproject directory. Current subproject is a subproject selected in "
-+"<b>QMake manager</b> 'overview' window.<br>Environment variables and make "
-+"arguments can be specified in the project settings dialog, <b>Make Options</"
-+"b> tab."
-+msgstr ""
-+"<b>安裝子專案</b><p>在目前子專案目錄中執行 <b>make install</b> 命令。目前子專"
-+"案是在 <b>QMake 管理器</b>的「概要」視窗中選取的子專案。<br>環境變數和編譯參"
-+"數可以在專案設定中的<b>編譯選項</b>頁中指定。"
- 
- #: buildtools/qmake/trollprojectpart.cpp:176
- msgid "&Clean Subproject"
-@@ -24444,15 +24574,14 @@
- 
- #: buildtools/qmake/trollprojectpart.cpp:180
- msgid ""
--"<b>Clean subproject</b>"
--"<p>Runs <b>make clean</b> from the current subproject directory. Current "
--"subproject is a subproject selected in <b>QMake manager</b> 'overview' window."
--"<br>Environment variables and make arguments can be specified in the project "
--"settings dialog, <b>Make Options</b> tab."
--msgstr ""
--"<b>清理子專案</b>"
--"<p>在目前子專案目錄中執行 <b>make clean</b> 命令。目前子專案是在 <b>QMake 管理器</b>的「概要」視窗中選取的子專案。"
--"<br>環境變數和編譯參數可以在專案設定中的<b>編譯選項</b>頁中指定。"
-+"<b>Clean subproject</b><p>Runs <b>make clean</b> from the current subproject "
-+"directory. Current subproject is a subproject selected in <b>QMake manager</"
-+"b> 'overview' window.<br>Environment variables and make arguments can be "
-+"specified in the project settings dialog, <b>Make Options</b> tab."
-+msgstr ""
-+"<b>清理子專案</b><p>在目前子專案目錄中執行 <b>make clean</b> 命令。目前子專案"
-+"是在 <b>QMake 管理器</b>的「概要」視窗中選取的子專案。<br>環境變數和編譯參數"
-+"可以在專案設定中的<b>編譯選項</b>頁中指定。"
- 
- #: buildtools/qmake/trollprojectpart.cpp:185
- msgid "&Dist-Clean Subproject"
-@@ -24464,15 +24593,15 @@
- 
- #: buildtools/qmake/trollprojectpart.cpp:189
- msgid ""
--"<b>Dist-Clean subproject</b>"
--"<p>Runs <b>make distclean</b> from the current subproject directory. Current "
--"subproject is a subproject selected in <b>QMake manager</b> 'overview' window."
--"<br>Environment variables and make arguments can be specified in the project "
--"settings dialog, <b>Make Options</b> tab."
--msgstr ""
--"<b>完全清理子專案</b>"
--"<p>在目前子專案目錄中執行 <b>make distclean</b> 命令。目前子專案是在 <b>QMake 管理器</b>的「概要」視窗中選取的子專案。"
--"<br>環境變數和編譯參數可以在專案設定中的<b>編譯選項</b>頁中指定。"
-+"<b>Dist-Clean subproject</b><p>Runs <b>make distclean</b> from the current "
-+"subproject directory. Current subproject is a subproject selected in "
-+"<b>QMake manager</b> 'overview' window.<br>Environment variables and make "
-+"arguments can be specified in the project settings dialog, <b>Make Options</"
-+"b> tab."
-+msgstr ""
-+"<b>完全清理子專案</b><p>在目前子專案目錄中執行 <b>make distclean</b> 命令。目"
-+"前子專案是在 <b>QMake 管理器</b>的「概要」視窗中選取的子專案。<br>環境變數和"
-+"編譯參數可以在專案設定中的<b>編譯選項</b>頁中指定。"
- 
- #: buildtools/qmake/trollprojectpart.cpp:194
- msgid "Execute Subproject"
-@@ -24486,19 +24615,18 @@
- #: buildtools/qmake/trollprojectpart.cpp:198
- #: buildtools/qmake/trollprojectwidget.cpp:262
- msgid ""
--"<b>Execute subproject</b>"
--"<p>Executes the target program for the currently selected subproject. This "
--"action is allowed only if a type of the subproject is 'application'. The type "
--"of the subproject can be defined in <b>Subproject Settings</b> "
--"dialog (open it from the subproject context menu)."
--msgstr ""
--"<b>執行子專案</b>"
--"<p>執行目前子專案的目標程式。只有當子專案的型態為「應用程式」時才允許這個動作。子專案的型態可以在<b>子專案設定</b>"
--"對話框中定義，該對話框可以在子專案內容選單中開啟。"
-+"<b>Execute subproject</b><p>Executes the target program for the currently "
-+"selected subproject. This action is allowed only if a type of the subproject "
-+"is 'application'. The type of the subproject can be defined in <b>Subproject "
-+"Settings</b> dialog (open it from the subproject context menu)."
-+msgstr ""
-+"<b>執行子專案</b><p>執行目前子專案的目標程式。只有當子專案的型態為「應用程"
-+"式」時才允許這個動作。子專案的型態可以在<b>子專案設定</b>對話框中定義，該對話"
-+"框可以在子專案內容選單中開啟。"
- 
- #: buildtools/qmake/trollprojectpart.cpp:291
- msgid "Loading Project..."
--msgstr "載入專案中..."
-+msgstr "載入專案中…"
- 
- #: buildtools/qmake/trollprojectpart.cpp:299
- msgid "Choose Qt3 directory"
-@@ -24512,10 +24640,11 @@
- 
- #: buildtools/qmake/trollprojectpart.cpp:312
- msgid ""
--"The directory you gave is not a proper Qt directory, the project might not work "
--"properly without one.\n"
--"Please make sure you give a directory that contains a bin with the qmake binary "
--"in it and for Qt3 project also contains an include directory with qt.h in it.\n"
-+"The directory you gave is not a proper Qt directory, the project might not "
-+"work properly without one.\n"
-+"Please make sure you give a directory that contains a bin with the qmake "
-+"binary in it and for Qt3 project also contains an include directory with qt."
-+"h in it.\n"
- "Do you want to try setting a Qt directory again?"
- msgstr ""
- "您指定的目錄不是 Qt 的目錄，專案無法正確運作。\n"
-@@ -24527,8 +24656,8 @@
- 
- #: buildtools/qmake/trollprojectpart.cpp:333
- msgid ""
--"You didn't specify a Qt directory, the project might not work properly without "
--"one.\n"
-+"You didn't specify a Qt directory, the project might not work properly "
-+"without one.\n"
- "Do you want to try setting a Qt directory again?"
- msgstr ""
- "您未指定 Qt 目錄，專案無法正確運行。\n"
-@@ -24564,8 +24693,8 @@
- 
- #: buildtools/qmake/trollprojectpart.cpp:382
- msgid ""
--"You didn't specify a QMake binary, the project might not work properly without "
--"one.\n"
-+"You didn't specify a QMake binary, the project might not work properly "
-+"without one.\n"
- "Do you want to try setting a QMake binary again?"
- msgstr ""
- "您未指定 QMake 執行檔，專案無法正常運作。\n"
-@@ -24657,11 +24786,11 @@
- 
- #: buildtools/qmake/qmakescopeitem.cpp:100
- msgid "Lexsources"
--msgstr "Lex 源碼檔"
-+msgstr "Lex 原始碼檔"
- 
- #: buildtools/qmake/qmakescopeitem.cpp:104
- msgid "Yaccsources"
--msgstr "Yacc 源碼檔"
-+msgstr "Yacc 原始碼檔"
- 
- #: buildtools/qmake/qmakescopeitem.cpp:108
- msgid "Images"
-@@ -24685,7 +24814,7 @@
- 
- #: buildtools/qmake/qmakescopeitem.cpp:133
- msgid "Source Files"
--msgstr "源碼檔案"
-+msgstr "原始碼檔案"
- 
- #: buildtools/qmake/trollprojectwidget.cpp:107
- msgid "Add subproject"
-@@ -24694,15 +24823,15 @@
- #: buildtools/qmake/trollprojectwidget.cpp:108
- #: buildtools/qmake/trollprojectwidget.cpp:1026
- msgid ""
--"<b>Add subproject</b>"
--"<p>Creates a <i>new</i> or adds an <i>existing</i> subproject to a currently "
--"selected subproject. This action is allowed only if a type of the subproject is "
--"'subdirectories'. The type of the subproject can be defined in <b>"
--"Subproject Settings</b> dialog (open it from the subproject context menu)."
--msgstr ""
--"<b>新增子專案</b>"
--"<p>在目前選擇的子專案中建立<i>新的</i>或者新增一個<i>現有的</i>子專案。只有當子專案的型態為「子目錄」時才允許這個動作。子專案的型態可以在<b>"
--"子專案設定</b>對話框中定義，該對話框能在子專案內容選單中開啟。"
-+"<b>Add subproject</b><p>Creates a <i>new</i> or adds an <i>existing</i> "
-+"subproject to a currently selected subproject. This action is allowed only "
-+"if a type of the subproject is 'subdirectories'. The type of the subproject "
-+"can be defined in <b>Subproject Settings</b> dialog (open it from the "
-+"subproject context menu)."
-+msgstr ""
-+"<b>新增子專案</b><p>在目前選擇的子專案中建立<i>新的</i>或者新增一個<i>現有的"
-+"</i>子專案。只有當子專案的型態為「子目錄」時才允許這個動作。子專案的型態可以"
-+"在<b>子專案設定</b>對話框中定義，該對話框能在子專案內容選單中開啟。"
- 
- #: buildtools/qmake/trollprojectwidget.cpp:116
- msgid "Create scope"
-@@ -24710,17 +24839,18 @@
- 
- #: buildtools/qmake/trollprojectwidget.cpp:117
- msgid ""
--"<b>Create scope</b>"
--"<p>Creates QMake scope in the project file in case the subproject is selected "
--"or creates nested scope in case the scope is selected."
--msgstr "<b>建立範圍</b><p>如果選取的是子專案，則在專案檔案中建立 QMake 範圍；如果選取的是一個範圍，則建立巢狀的範圍。"
-+"<b>Create scope</b><p>Creates QMake scope in the project file in case the "
-+"subproject is selected or creates nested scope in case the scope is selected."
-+msgstr ""
-+"<b>建立範圍</b><p>如果選取的是子專案，則在專案檔案中建立 QMake 範圍；如果選取"
-+"的是一個範圍，則建立巢狀的範圍。"
- 
- #: buildtools/qmake/trollprojectwidget.cpp:144
- msgid ""
--"<b>Execute main program</b>"
--"<p>Executes the main program specified in project settings, <b>Run Options</b> "
--"tab."
--msgstr "<b>執行主程式</b><p>執行在專案設定中的<b>執行選項</b>頁中指定的主程式。"
-+"<b>Execute main program</b><p>Executes the main program specified in project "
-+"settings, <b>Run Options</b> tab."
-+msgstr ""
-+"<b>執行主程式</b><p>執行在專案設定中的<b>執行選項</b>頁中指定的主程式。"
- 
- #: buildtools/qmake/trollprojectwidget.cpp:153
- msgid "Subproject settings"
-@@ -24728,24 +24858,15 @@
- 
- #: buildtools/qmake/trollprojectwidget.cpp:154
- msgid ""
--"<b>Subproject settings</b>"
--"<p>Opens <b>QMake Subproject Configuration</b> dialog for the currently "
--"selected subproject. It provides settings for:"
--"<br>subproject type and configuration,"
--"<br>include and library paths,"
--"<br>lists of dependencies and external libraries,"
--"<br>build order,"
--"<br>intermediate files locations,"
--"<br>compiler options."
--msgstr ""
--"<b>子專案設定</b>"
--"<p>為目前選取的子專案開啟 <b>QMake 子專案設定</b>對話框。它提供如下設定："
--"<br> 子專案型態和設定；"
--"<br> 引入標頭檔和函式庫路徑；"
--"<br> 相依性和外部函式庫列表；"
--"<br> 建立順序；"
--"<br> 中間檔案位置；"
--"<br> 編譯器選項。"
-+"<b>Subproject settings</b><p>Opens <b>QMake Subproject Configuration</b> "
-+"dialog for the currently selected subproject. It provides settings for:"
-+"<br>subproject type and configuration,<br>include and library paths,"
-+"<br>lists of dependencies and external libraries,<br>build order,"
-+"<br>intermediate files locations,<br>compiler options."
-+msgstr ""
-+"<b>子專案設定</b><p>為目前選取的子專案開啟 <b>QMake 子專案設定</b>對話框。它"
-+"提供如下設定：<br> 子專案型態和設定；<br> 引入標頭檔和函式庫路徑；<br> 相依性"
-+"和外部函式庫列表；<br> 建立順序；<br> 中間檔案位置；<br> 編譯器選項。"
- 
- #: buildtools/qmake/trollprojectwidget.cpp:204
- msgid "Create new file"
-@@ -24754,8 +24875,8 @@
- #: buildtools/qmake/trollprojectwidget.cpp:205
- #: buildtools/qmake/trollprojectwidget.cpp:1579
- msgid ""
--"<b>Create new file</b>"
--"<p>Creates a new file and adds it to a currently selected group."
-+"<b>Create new file</b><p>Creates a new file and adds it to a currently "
-+"selected group."
- msgstr "<b>建立新檔案</b><p>建立新檔案並將它新增到目前選取的群組中。"
- 
- #: buildtools/qmake/trollprojectwidget.cpp:212
-@@ -24765,11 +24886,12 @@
- #: buildtools/qmake/trollprojectwidget.cpp:213
- #: buildtools/qmake/trollprojectwidget.cpp:1581
- msgid ""
--"<b>Add existing files</b>"
--"<p>Adds existing files to a currently selected group. It is possible to copy "
--"files to a current subproject directory, create symbolic links or add them with "
--"the relative path."
--msgstr "<b>新增已存在的檔案</b><p>在目前選取的群組中新增已存在的檔案。可以複製檔案到目前子專案目錄中、建立符號連結或者透過相對路徑來新增。"
-+"<b>Add existing files</b><p>Adds existing files to a currently selected "
-+"group. It is possible to copy files to a current subproject directory, "
-+"create symbolic links or add them with the relative path."
-+msgstr ""
-+"<b>新增已存在的檔案</b><p>在目前選取的群組中新增已存在的檔案。可以複製檔案到"
-+"目前子專案目錄中、建立符號連結或者透過相對路徑來新增。"
- 
- #: buildtools/qmake/trollprojectwidget.cpp:222
- msgid "Remove file"
-@@ -24777,8 +24899,8 @@
- 
- #: buildtools/qmake/trollprojectwidget.cpp:223
- msgid ""
--"<b>Remove file</b>"
--"<p>Removes file from a current group. Does not remove file from disk."
-+"<b>Remove file</b><p>Removes file from a current group. Does not remove file "
-+"from disk."
- msgstr "<b>刪除檔案</b><p>從目前群組中刪除檔案。但不會從磁碟中刪除。"
- 
- #: buildtools/qmake/trollprojectwidget.cpp:276
-@@ -24848,11 +24970,12 @@
- #: buildtools/qmake/trollprojectwidget.cpp:956
- msgid ""
- "Couldn't delete subproject.\n"
--"This is an internal error, please write a bugreport to bugs.kde.org and include "
--"the output of kdevelop when runfrom a shell."
-+"This is an internal error, please write a bugreport to bugs.kde.org and "
-+"include the output of kdevelop when runfrom a shell."
- msgstr ""
- "無法刪除子專案。\n"
--"這是個內部錯誤，請向 bugs.kde.org 回報，若是在 shell 中執行，請 kdevelop 的輸出訊息附上。"
-+"這是個內部錯誤，請向 bugs.kde.org 回報，若是在 shell 中執行，請 kdevelop 的輸"
-+"出訊息附上。"
- 
- #: buildtools/qmake/trollprojectwidget.cpp:958
- msgid "Subproject Deletion failed"
-@@ -24865,14 +24988,12 @@
- 
- #: buildtools/qmake/trollprojectwidget.cpp:997
- msgid ""
--"<b>Build</b>"
--"<p>Runs <b>make</b> from the selected subproject directory."
-+"<b>Build</b><p>Runs <b>make</b> from the selected subproject directory."
- "<br>Environment variables and make arguments can be specified in the project "
- "settings dialog, <b>Make Options</b> tab."
- msgstr ""
--"<b>建立</b>"
--"<p>在所選取的子專案目錄中執行 <b>make</b> 命令。"
--"<br>環境變數和編譯參數可以在專案設定中的<b>編譯選項</b>頁中指定。"
-+"<b>建立</b><p>在所選取的子專案目錄中執行 <b>make</b> 命令。<br>環境變數和編譯"
-+"參數可以在專案設定中的<b>編譯選項</b>頁中指定。"
- 
- #: buildtools/autotools/autoprojectpart.cpp:147
- #: buildtools/autotools/autoprojectpart.cpp:150
-@@ -24885,14 +25006,12 @@
- 
- #: buildtools/qmake/trollprojectwidget.cpp:1001
- msgid ""
--"<b>Install</b>"
--"<p>Runs <b>make install</b> from the selected subproject directory."
--"<br>Environment variables and make arguments can be specified in the project "
--"settings dialog, <b>Make Options</b> tab."
-+"<b>Install</b><p>Runs <b>make install</b> from the selected subproject "
-+"directory.<br>Environment variables and make arguments can be specified in "
-+"the project settings dialog, <b>Make Options</b> tab."
- msgstr ""
--"<b>安裝</b>"
--"<p>在所選取的子專案目錄中執行 <b>make install</b> 命令。"
--"<br>環境變數和編譯參數可以在專案設定中的<b>編譯選項</b>頁中指定。"
-+"<b>安裝</b><p>在所選取的子專案目錄中執行 <b>make install</b> 命令。<br>環境變"
-+"數和編譯參數可以在專案設定中的<b>編譯選項</b>頁中指定。"
- 
- #: buildtools/autotools/autosubprojectview.cpp:241
- #: buildtools/qmake/trollprojectwidget.cpp:1004
-@@ -24901,14 +25020,12 @@
- 
- #: buildtools/qmake/trollprojectwidget.cpp:1005
- msgid ""
--"<b>Clean project</b>"
--"<p>Runs <b>make clean</b> command from the project directory."
--"<br> Environment variables and make arguments can be specified in the project "
--"settings dialog, <b>Make Options</b> tab."
-+"<b>Clean project</b><p>Runs <b>make clean</b> command from the project "
-+"directory.<br> Environment variables and make arguments can be specified in "
-+"the project settings dialog, <b>Make Options</b> tab."
- msgstr ""
--"<b>清理專案</b>"
--"<p>在專案目錄中執行 <b>make clean</b> 命令。"
--"<br>環境變數和編譯參數可以在專案設定中的<b>編譯選項</b>頁中指定。"
-+"<b>清理專案</b><p>在專案目錄中執行 <b>make clean</b> 命令。<br>環境變數和編譯"
-+"參數可以在專案設定中的<b>編譯選項</b>頁中指定。"
- 
- #: buildtools/qmake/trollprojectwidget.cpp:1008
- msgid "Dist-Clean"
-@@ -24916,14 +25033,12 @@
- 
- #: buildtools/qmake/trollprojectwidget.cpp:1009
- msgid ""
--"<b>Dist-Clean project</b>"
--"<p>Runs <b>make distclean</b> command from the project directory."
--"<br> Environment variables and make arguments can be specified in the project "
--"settings dialog, <b>Make Options</b> tab."
-+"<b>Dist-Clean project</b><p>Runs <b>make distclean</b> command from the "
-+"project directory.<br> Environment variables and make arguments can be "
-+"specified in the project settings dialog, <b>Make Options</b> tab."
- msgstr ""
--"<b>完全清理專案</b>"
--"<p>在專案目錄中執行 <b>make distclean</b> 命令。"
--"<br>環境變數和編譯參數可以在專案設定中的<b>編譯選項</b>頁中指定。"
-+"<b>完全清理專案</b><p>在專案目錄中執行 <b>make distclean</b> 命令。<br>環境變"
-+"數和編譯參數可以在專案設定中的<b>編譯選項</b>頁中指定。"
- 
- #: buildtools/qmake/trollprojectwidget.cpp:1013
- msgid "Rebuild"
-@@ -24936,10 +25051,11 @@
- 
- #: buildtools/qmake/trollprojectwidget.cpp:1018
- msgid ""
--"<b>Run qmake</b>"
--"<p>Runs <b>qmake</b> from the selected subproject directory. This creates or "
--"regenerates Makefile."
--msgstr "<b>執行 qmake</b><p>在目前選取的子專案目錄中執行 <b>qmake</b> 命令。它將建立或者重新產生 Makefile。"
-+"<b>Run qmake</b><p>Runs <b>qmake</b> from the selected subproject directory. "
-+"This creates or regenerates Makefile."
-+msgstr ""
-+"<b>執行 qmake</b><p>在目前選取的子專案目錄中執行 <b>qmake</b> 命令。它將建立"
-+"或者重新產生 Makefile。"
- 
- #: buildtools/qmake/trollprojectwidget.cpp:1019
- msgid "Run qmake recursively"
-@@ -24947,40 +25063,41 @@
- 
- #: buildtools/qmake/trollprojectwidget.cpp:1020
- msgid ""
--"<b>Run qmake recursively</b>"
--"<p>Runs <b>qmake</b> from the selectedsubproject directory and recurses into "
--"all subproject directories. This creates or regenerates Makefile."
-+"<b>Run qmake recursively</b><p>Runs <b>qmake</b> from the selectedsubproject "
-+"directory and recurses into all subproject directories. This creates or "
-+"regenerates Makefile."
- msgstr ""
--"<b>遞迴執行 qmake</b>"
--"<p>在目前選取的子專案目錄，以及其所有的子目錄中執行 <b>qmake</b> 命令。它將建立或者重新產生 Makefile。"
-+"<b>遞迴執行 qmake</b><p>在目前選取的子專案目錄，以及其所有的子目錄中執行 "
-+"<b>qmake</b> 命令。它將建立或者重新產生 Makefile。"
- 
- #: buildtools/qmake/trollprojectwidget.cpp:1025
- #: buildtools/qmake/trollprojectwidget.cpp:1050
- msgid "Add Subproject..."
--msgstr "新增子專案..."
-+msgstr "新增子專案…"
- 
- #: buildtools/autotools/autosubprojectview.cpp:189
- #: buildtools/qmake/trollprojectwidget.cpp:1031
- msgid "Remove Subproject..."
--msgstr "刪除子專案..."
-+msgstr "刪除子專案…"
- 
- #: buildtools/qmake/trollprojectwidget.cpp:1032
- msgid ""
--"<b>Remove subproject</b>"
--"<p>Removes currently selected subproject. Does not delete any file from disk. "
--"Deleted subproject can be later added by calling 'Add Subproject' action."
--msgstr "<b>刪除子專案</b><p>刪除目前選取的子專案，但不會從磁碟中刪除。被刪除的子專案以後還可以用「新增子專案」動作再次新增。"
-+"<b>Remove subproject</b><p>Removes currently selected subproject. Does not "
-+"delete any file from disk. Deleted subproject can be later added by calling "
-+"'Add Subproject' action."
-+msgstr ""
-+"<b>刪除子專案</b><p>刪除目前選取的子專案，但不會從磁碟中刪除。被刪除的子專案"
-+"以後還可以用「新增子專案」動作再次新增。"
- 
- #: buildtools/qmake/trollprojectwidget.cpp:1035
- #: buildtools/qmake/trollprojectwidget.cpp:1045
- msgid "Create Scope..."
--msgstr "建立範圍..."
-+msgstr "建立範圍…"
- 
- #: buildtools/qmake/trollprojectwidget.cpp:1036
- msgid ""
--"<b>Create scope</b>"
--"<p>Creates QMake scope in the project file of the currently selected "
--"subproject."
-+"<b>Create scope</b><p>Creates QMake scope in the project file of the "
-+"currently selected subproject."
- msgstr "<b>建立範圍</b><p>在目前選取的子專案的專案檔案中建立 QMake 範圍。"
- 
- #: buildtools/qmake/trollprojectwidget.cpp:1038
-@@ -24989,29 +25106,19 @@
- 
- #: buildtools/qmake/trollprojectwidget.cpp:1039
- msgid ""
--"<b>Subproject settings</b>"
--"<p>Opens <b>QMake Subproject Configuration</b> dialog. It provides settings "
--"for:"
--"<br>subproject type and configuration,"
--"<br>include and library paths,"
--"<br>lists of dependencies and external libraries,"
--"<br>build order,"
--"<br>intermediate files locations,"
--"<br>compiler options."
--msgstr ""
--"<b>子專案選項</b>"
--"<p>開啟 <b>QMake 子專案設定</b>對話框。它提供如下設定："
--"<br>子專案型態和設定；"
--"<br> 引入標頭檔和函式庫路徑；"
--"<br> 相依性和外部函式庫列表；"
--"<br> 建立順序；"
--"<br> 中間檔案位置；"
--"<br> 編譯器選項。"
-+"<b>Subproject settings</b><p>Opens <b>QMake Subproject Configuration</b> "
-+"dialog. It provides settings for:<br>subproject type and configuration,"
-+"<br>include and library paths,<br>lists of dependencies and external "
-+"libraries,<br>build order,<br>intermediate files locations,<br>compiler "
-+"options."
-+msgstr ""
-+"<b>子專案選項</b><p>開啟 <b>QMake 子專案設定</b>對話框。它提供如下設定：<br>"
-+"子專案型態和設定；<br> 引入標頭檔和函式庫路徑；<br> 相依性和外部函式庫列表；"
-+"<br> 建立順序；<br> 中間檔案位置；<br> 編譯器選項。"
- 
- #: buildtools/qmake/trollprojectwidget.cpp:1046
- msgid ""
--"<b>Create Scope</b>"
--"<p>Creates QMake scope in the currently selected scope."
-+"<b>Create Scope</b><p>Creates QMake scope in the currently selected scope."
- msgstr "<b>建立範圍</b><p>在目前所選取的範圍中建立 QMake 範圍。"
- 
- #: buildtools/qmake/trollprojectwidget.cpp:1047
-@@ -25024,53 +25131,44 @@
- 
- #: buildtools/qmake/trollprojectwidget.cpp:1051
- msgid ""
--"<b>Add subproject</b>"
--"<p>Creates a <i>new</i> or adds an <i>existing</i> subproject to the currently "
--"selected scope. This action is allowed only if a type of the subproject is "
--"'subdirectories'. The type of the subproject can be defined in <b>"
--"Subproject Settings</b> dialog (open it from the subproject context menu)."
--msgstr ""
--"<b>新增子專案</b>"
--"<p>在目前選擇的子專案中建立<i>新的</i>或者新增一個<i>現有的</i>子專案。只有當子專案的型態為「子目錄」時才允許這個動作。子專案的型態可以在<b>"
--"子專案設定</b>對話框中定義，該對話框能在子專案內容選單中開啟。"
-+"<b>Add subproject</b><p>Creates a <i>new</i> or adds an <i>existing</i> "
-+"subproject to the currently selected scope. This action is allowed only if a "
-+"type of the subproject is 'subdirectories'. The type of the subproject can "
-+"be defined in <b>Subproject Settings</b> dialog (open it from the subproject "
-+"context menu)."
-+msgstr ""
-+"<b>新增子專案</b><p>在目前選擇的子專案中建立<i>新的</i>或者新增一個<i>現有的"
-+"</i>子專案。只有當子專案的型態為「子目錄」時才允許這個動作。子專案的型態可以"
-+"在<b>子專案設定</b>對話框中定義，該對話框能在子專案內容選單中開啟。"
- 
- #: buildtools/qmake/trollprojectwidget.cpp:1056
- msgid "Disable Subproject..."
--msgstr "關閉子專案..."
-+msgstr "關閉子專案…"
- 
- #: buildtools/qmake/trollprojectwidget.cpp:1057
- msgid ""
--"<b>Disable subproject</b>"
--"<p>Disables the currently selected subproject when this scope is active. Does "
--"not delete the directory from disk. Deleted subproject can be later added by "
--"calling 'Add Subproject' action."
--msgstr "<b>關閉子專案</b><p>關閉目前選取的子專案，但不會從磁碟中刪除。被刪除的子專案以後還可以用「新增子專案」動作再次新增。"
-+"<b>Disable subproject</b><p>Disables the currently selected subproject when "
-+"this scope is active. Does not delete the directory from disk. Deleted "
-+"subproject can be later added by calling 'Add Subproject' action."
-+msgstr ""
-+"<b>關閉子專案</b><p>關閉目前選取的子專案，但不會從磁碟中刪除。被刪除的子專案"
-+"以後還可以用「新增子專案」動作再次新增。"
- 
- #: buildtools/qmake/trollprojectwidget.cpp:1062
- msgid ""
--"<b>Scope settings</b>"
--"<p>Opens <b>QMake Subproject Configuration</b> dialog. It provides settings "
--"for:"
--"<br>subproject type and configuration,"
--"<br>include and library paths,"
--"<br>lists of dependencies and external libraries,"
--"<br>build order,"
--"<br>intermediate files locations,"
--"<br>compiler options."
--msgstr ""
--"<b>範圍設定</b>"
--"<p>開啟 <b>QMake 子專案設定</b>對話框。它提供如下設定："
--"<br>子專案型態和設定；"
--"<br> 引入標頭檔和函式庫路徑；"
--"<br> 相依性和外部函式庫列表；"
--"<br> 建立順序；"
--"<br> 中間檔案位置；"
--"<br> 編譯器選項。"
-+"<b>Scope settings</b><p>Opens <b>QMake Subproject Configuration</b> dialog. "
-+"It provides settings for:<br>subproject type and configuration,<br>include "
-+"and library paths,<br>lists of dependencies and external libraries,<br>build "
-+"order,<br>intermediate files locations,<br>compiler options."
-+msgstr ""
-+"<b>範圍設定</b><p>開啟 <b>QMake 子專案設定</b>對話框。它提供如下設定：<br>子"
-+"專案型態和設定；<br> 引入標頭檔和函式庫路徑；<br> 相依性和外部函式庫列表；"
-+"<br> 建立順序；<br> 中間檔案位置；<br> 編譯器選項。"
- 
- #: buildtools/qmake/trollprojectwidget.cpp:1191
- msgid ""
--"You didn't select a subproject to add the file to or selected a subproject that "
--"has subdirs."
-+"You didn't select a subproject to add the file to or selected a subproject "
-+"that has subdirs."
- msgstr "您並未選擇要新增檔案的子專案，或是選到了一個有子目錄的專案。"
- 
- #: buildtools/qmake/trollprojectwidget.cpp:1191
-@@ -25087,8 +25185,8 @@
- 
- #: buildtools/qmake/trollprojectwidget.cpp:1377
- msgid ""
--"Please enter a filepattern relative the current subproject (example "
--"docs/*.html):"
-+"Please enter a filepattern relative the current subproject (example docs/*."
-+"html):"
- msgstr "請輸入相對於目前子專案的檔案樣式（例如 docs/*.html）："
- 
- #: buildtools/qmake/trollprojectwidget.cpp:1392
-@@ -25101,38 +25199,40 @@
- 
- #: buildtools/qmake/trollprojectwidget.cpp:1546
- msgid "Add Install Object..."
--msgstr "新增安裝物件..."
-+msgstr "新增安裝物件…"
- 
- #: buildtools/qmake/trollprojectwidget.cpp:1547
- msgid ""
--"<b>Add install object</b>"
--"<p>Creates QMake install object. It is possible to define a list of files to "
--"install and installation locations for each object. Warning! Install objects "
--"without path specified will not be saved to a project file."
-+"<b>Add install object</b><p>Creates QMake install object. It is possible to "
-+"define a list of files to install and installation locations for each "
-+"object. Warning! Install objects without path specified will not be saved to "
-+"a project file."
- msgstr ""
--"<b>新增安裝物件</b>"
--"<p>建立 QMake 安裝物件。您可以定義每個物件要安裝的檔案列表和安裝位置。警告！未指定路徑的安裝物件將不會被儲存在專案檔案中。"
-+"<b>新增安裝物件</b><p>建立 QMake 安裝物件。您可以定義每個物件要安裝的檔案列表"
-+"和安裝位置。警告！未指定路徑的安裝物件將不會被儲存在專案檔案中。"
- 
- #: buildtools/qmake/trollprojectwidget.cpp:1553
- msgid "Install Path..."
--msgstr "安裝路徑..."
-+msgstr "安裝路徑…"
- 
- #: buildtools/qmake/trollprojectwidget.cpp:1554
- msgid ""
--"<b>Install path</b>"
--"<p>Allows to choose the installation path for the current install object."
-+"<b>Install path</b><p>Allows to choose the installation path for the current "
-+"install object."
- msgstr "<b>安裝路徑</b><p>允許選擇目前安裝物件的安裝路徑。"
- 
- #: buildtools/qmake/trollprojectwidget.cpp:1555
- msgid "Add Pattern of Files to Install..."
--msgstr "新增要安裝的檔案樣式..."
-+msgstr "新增要安裝的檔案樣式…"
- 
- #: buildtools/qmake/trollprojectwidget.cpp:1556
- msgid ""
--"<b>Add pattern of files to install</b>"
--"<p>Defines the pattern to match files which will be installed. It is possible "
--"to use wildcards and relative paths like <i>docs/*</i>."
--msgstr "<b>新增要安裝的檔案樣式</b><p>定義和要安裝的檔案相符合的檔案樣式。您可以使用萬用字元和相對路徑，例如 <i>docs/*</i>。"
-+"<b>Add pattern of files to install</b><p>Defines the pattern to match files "
-+"which will be installed. It is possible to use wildcards and relative paths "
-+"like <i>docs/*</i>."
-+msgstr ""
-+"<b>新增要安裝的檔案樣式</b><p>定義和要安裝的檔案相符合的檔案樣式。您可以使用"
-+"萬用字元和相對路徑，例如 <i>docs/*</i>。"
- 
- #: buildtools/qmake/trollprojectwidget.cpp:1558
- msgid "Remove Install Object"
-@@ -25140,8 +25240,7 @@
- 
- #: buildtools/qmake/trollprojectwidget.cpp:1559
- msgid ""
--"<b>Remove install object</b>"
--"<p>Removes the install object the current group."
-+"<b>Remove install object</b><p>Removes the install object the current group."
- msgstr "<b>移除安裝物件</b><p>從目前群組中移除安裝物件"
- 
- #: buildtools/autotools/autodetailsview.cpp:189
-@@ -25149,31 +25248,33 @@
- #: buildtools/qmake/trollprojectwidget.cpp:1563
- #: buildtools/qmake/trollprojectwidget.cpp:1578
- msgid "Create New File..."
--msgstr "建立新檔案..."
-+msgstr "建立新檔案…"
- 
- #: buildtools/qmake/trollprojectwidget.cpp:1564
- msgid ""
--"<b>Create new file</b>"
--"<p>Creates a new translation file and adds it to a currently selected "
--"TRANSLATIONS group."
--msgstr "<b>建立新檔案</b><p>建立新的翻譯檔案並把它新增到目前選取的 TRANSLATIONS 群組中。"
-+"<b>Create new file</b><p>Creates a new translation file and adds it to a "
-+"currently selected TRANSLATIONS group."
-+msgstr ""
-+"<b>建立新檔案</b><p>建立新的翻譯檔案並把它新增到目前選取的 TRANSLATIONS 群組"
-+"中。"
- 
- #: buildtools/autotools/autodetailsview.cpp:198
- #: buildtools/autotools/autodetailsview.cpp:199
- #: buildtools/qmake/trollprojectwidget.cpp:1565
- #: buildtools/qmake/trollprojectwidget.cpp:1580
- msgid "Add Existing Files..."
--msgstr "新增已有的檔案..."
-+msgstr "新增已有的檔案…"
- 
- #: buildtools/qmake/trollprojectwidget.cpp:1566
- msgid ""
--"<b>Add existing files</b>"
--"<p>Adds existing translation (*.ts) files to a currently selected TRANSLATIONS "
--"group. It is possible to copy files to a current subproject directory, create "
--"symbolic links or add them with the relative path."
--msgstr ""
--"<b>新增已有的檔案</b>"
--"<p>新增已有的翻譯檔案 (*.ts) 到目前選取的 TRANSLATIONS 群組中。您可以複製檔案到目前子專案目錄中、建立符號連結或者透過相對路徑來新增。"
-+"<b>Add existing files</b><p>Adds existing translation (*.ts) files to a "
-+"currently selected TRANSLATIONS group. It is possible to copy files to a "
-+"current subproject directory, create symbolic links or add them with the "
-+"relative path."
-+msgstr ""
-+"<b>新增已有的檔案</b><p>新增已有的翻譯檔案 (*.ts) 到目前選取的 TRANSLATIONS "
-+"群組中。您可以複製檔案到目前子專案目錄中、建立符號連結或者透過相對路徑來新"
-+"增。"
- 
- #: buildtools/qmake/trollprojectwidget.cpp:1569
- msgid "Update Translation Files"
-@@ -25181,10 +25282,12 @@
- 
- #: buildtools/qmake/trollprojectwidget.cpp:1570
- msgid ""
--"<b>Update Translation Files</b>"
--"<p>Runs <b>lupdate</b> command from the current subproject directory. It "
--"collects translatable messages and saves them into translation files."
--msgstr "<b>更新翻譯檔案</b><p>在目前子專案目錄中執行 <b>lupdate</b> 命令。它會收集可翻譯的訊息並儲存到翻譯檔案中。"
-+"<b>Update Translation Files</b><p>Runs <b>lupdate</b> command from the "
-+"current subproject directory. It collects translatable messages and saves "
-+"them into translation files."
-+msgstr ""
-+"<b>更新翻譯檔案</b><p>在目前子專案目錄中執行 <b>lupdate</b> 命令。它會收集可"
-+"翻譯的訊息並儲存到翻譯檔案中。"
- 
- #: buildtools/qmake/trollprojectwidget.cpp:1572
- msgid "Release Binary Translations"
-@@ -25192,13 +25295,12 @@
- 
- #: buildtools/qmake/trollprojectwidget.cpp:1573
- msgid ""
--"<b>Release Binary Translations</b>"
--"<p>Runs <b>lrelease</b> command from the current subproject directory. It "
--"creates binary translation files that are ready to be loaded at program "
--"execution."
-+"<b>Release Binary Translations</b><p>Runs <b>lrelease</b> command from the "
-+"current subproject directory. It creates binary translation files that are "
-+"ready to be loaded at program execution."
- msgstr ""
--"<b>釋出編譯過的翻譯</b>"
--"<p>在目前子專案目錄中執行 <b>lrelease</b> 命令。它建立二進位的翻譯檔案，可在程式執行時直接載入。"
-+"<b>釋出編譯過的翻譯</b><p>在目前子專案目錄中執行 <b>lrelease</b> 命令。它建立"
-+"二進位的翻譯檔案，可在程式執行時直接載入。"
- 
- #: buildtools/qmake/trollprojectwidget.cpp:1590
- msgid "Choose Install Path"
-@@ -25206,7 +25308,7 @@
- 
- #: buildtools/qmake/trollprojectwidget.cpp:1590
- msgid "Enter a path (example /usr/local/share/... ):"
--msgstr "輸入一個路徑（例如 /usr/local/share/...）："
-+msgstr "輸入一個路徑（例如 /usr/local/share/…）："
- 
- #: buildtools/qmake/trollprojectwidget.cpp:1604
- msgid "Add Pattern of Files to Install"
-@@ -25240,31 +25342,31 @@
- #: buildtools/autotools/autodetailsview.cpp:580
- #: buildtools/qmake/trollprojectwidget.cpp:1775
- msgid "Edit ui-Subclass..."
--msgstr "編輯使用者介面子類別..."
-+msgstr "編輯使用者介面子類別…"
- 
- #: buildtools/autotools/autodetailsview.cpp:581
- #: buildtools/qmake/trollprojectwidget.cpp:1776
- msgid ""
--"<b>Edit ui-subclass</b>"
--"<p>Launches <b>Subclassing</b> wizard and prompts to implement missing in "
--"childclass slots and functions."
--msgstr "<b>編輯使用者介面子類別</b><p>啟動<b>子類別</b>精靈，提示還沒實作的子類別插槽和函式。"
-+"<b>Edit ui-subclass</b><p>Launches <b>Subclassing</b> wizard and prompts to "
-+"implement missing in childclass slots and functions."
-+msgstr ""
-+"<b>編輯使用者介面子類別</b><p>啟動<b>子類別</b>精靈，提示還沒實作的子類別插槽"
-+"和函式。"
- 
- #: buildtools/autotools/autodetailsview.cpp:565
- #: buildtools/qmake/trollprojectwidget.cpp:1781
- msgid "Subclassing Wizard..."
--msgstr "子類別精靈..."
-+msgstr "子類別精靈…"
- 
- #: buildtools/autotools/autodetailsview.cpp:566
- #: buildtools/qmake/trollprojectwidget.cpp:1782
- msgid ""
--"<b>Subclass widget</b>"
--"<p>Launches <b>Subclassing</b> wizard. It allows to create a subclass from the "
--"class defined in .ui file. There is also possibility to implement slots and "
--"functions defined in the base class."
-+"<b>Subclass widget</b><p>Launches <b>Subclassing</b> wizard. It allows to "
-+"create a subclass from the class defined in .ui file. There is also "
-+"possibility to implement slots and functions defined in the base class."
- msgstr ""
--"<b>子類別元件</b>"
--"<p>啟動<b>子類別</b>精靈。它允許從 .ui 檔案中定義的類別建立子類別。也可以實作基礎類別中定義的插槽和函式。"
-+"<b>子類別元件</b><p>啟動<b>子類別</b>精靈。它允許從 .ui 檔案中定義的類別建立"
-+"子類別。也可以實作基礎類別中定義的插槽和函式。"
- 
- #: buildtools/autotools/autodetailsview.cpp:586
- #: buildtools/qmake/trollprojectwidget.cpp:1787
-@@ -25274,29 +25376,28 @@
- #: buildtools/autotools/autodetailsview.cpp:587
- #: buildtools/qmake/trollprojectwidget.cpp:1788
- msgid ""
--"<b>Open ui.h file</b>"
--"<p>Opens .ui.h file associated with the selected .ui."
-+"<b>Open ui.h file</b><p>Opens .ui.h file associated with the selected .ui."
- msgstr "<b>開啟 ui.h 檔案</b><p>開啟和所選的 .ui 檔案相對應的 ui.h 檔案。"
- 
- #: buildtools/autotools/autodetailsview.cpp:574
- #: buildtools/qmake/trollprojectwidget.cpp:1790
- msgid "List of Subclasses..."
--msgstr "子類別列表..."
-+msgstr "子類別列表…"
- 
- #: buildtools/autotools/autodetailsview.cpp:575
- #: buildtools/qmake/trollprojectwidget.cpp:1791
- msgid ""
--"<b>List of subclasses</b>"
--"<p>Shows subclasses list editor. There is possibility to add or remove "
--"subclasses from the list."
--msgstr "<b>子類別列表</b><p>顯示子類別列表編輯器，可以在列表中新增或刪除子類別。"
-+"<b>List of subclasses</b><p>Shows subclasses list editor. There is "
-+"possibility to add or remove subclasses from the list."
-+msgstr ""
-+"<b>子類別列表</b><p>顯示子類別列表編輯器，可以在列表中新增或刪除子類別。"
- 
- #: buildtools/qmake/trollprojectwidget.cpp:1797
- msgid ""
--"<b>Remove file</b>"
--"<p>Removes file from a current group. For sources also removes the subclassing "
--"information."
--msgstr "<b>刪除檔案</b><p>從目前群組中刪除檔案。若是程式檔，則也會刪除子類別的資訊。"
-+"<b>Remove file</b><p>Removes file from a current group. For sources also "
-+"removes the subclassing information."
-+msgstr ""
-+"<b>刪除檔案</b><p>從目前群組中刪除檔案。若是程式檔，則也會刪除子類別的資訊。"
- 
- #: buildtools/qmake/trollprojectwidget.cpp:1798
- msgid "Exclude File"
-@@ -25304,8 +25405,8 @@
- 
- #: buildtools/qmake/trollprojectwidget.cpp:1799
- msgid ""
--"<b>Exclude File</b>"
--"<p>Excludes the file from this Scope. Does not touch subclassing information"
-+"<b>Exclude File</b><p>Excludes the file from this Scope. Does not touch "
-+"subclassing information"
- msgstr "<b>排除檔案</b> <p>從此範圍中排除檔案。不會碰到子類別資訊。"
- 
- #: buildtools/qmake/trollprojectwidget.cpp:1803
-@@ -25323,8 +25424,8 @@
- 
- #: buildtools/qmake/trollprojectwidget.cpp:1806
- msgid ""
--"<b>Remove pattern</b>"
--"<p>Removes install files pattern from the current install object."
-+"<b>Remove pattern</b><p>Removes install files pattern from the current "
-+"install object."
- msgstr "<b>刪除樣式</b><p>從目前安裝物件中刪除安裝檔案樣式。"
- 
- #: buildtools/qmake/trollprojectwidget.cpp:1817
-@@ -25343,9 +25444,11 @@
- 
- #: buildtools/qmake/trollprojectwidget.cpp:2052
- msgid ""
--"Please specify the executable name in the project options dialog or select an "
--"application subproject in the QMake Manager."
--msgstr "請先在專案選項中指定可執行檔的名稱，或是從 QMake 管理員中選擇一個應用程式子專案。"
-+"Please specify the executable name in the project options dialog or select "
-+"an application subproject in the QMake Manager."
-+msgstr ""
-+"請先在專案選項中指定可執行檔的名稱，或是從 QMake 管理員中選擇一個應用程式子專"
-+"案。"
- 
- #: buildtools/qmake/trollprojectwidget.cpp:2053
- msgid "No Executable Found"
-@@ -25365,11 +25468,12 @@
- #: buildtools/qmake/trollprojectwidget.cpp:2276
- msgid ""
- "Couldn't delete Function Scope.\n"
--"This is an internal error, please write a bugreport to bugs.kde.org and include "
--"the output of kdevelop when run from a shell."
-+"This is an internal error, please write a bugreport to bugs.kde.org and "
-+"include the output of kdevelop when run from a shell."
- msgstr ""
- "無法刪除函式範圍。\n"
--"這是個內部錯誤，請向 bugs.kde.org 回報，若是在 shell 中執行，請 kdevelop 的輸出訊息附上。"
-+"這是個內部錯誤，請向 bugs.kde.org 回報，若是在 shell 中執行，請 kdevelop 的輸"
-+"出訊息附上。"
- 
- #: buildtools/qmake/trollprojectwidget.cpp:2276
- msgid "Function Scope Deletion failed"
-@@ -25378,11 +25482,12 @@
- #: buildtools/qmake/trollprojectwidget.cpp:2284
- msgid ""
- "Couldn't delete Include Scope.\n"
--"This is an internal error, please write a bugreport to bugs.kde.org and include "
--"the output of kdevelop when run from a shell."
-+"This is an internal error, please write a bugreport to bugs.kde.org and "
-+"include the output of kdevelop when run from a shell."
- msgstr ""
- "無法刪除引入範圍。\n"
--"這是個內部錯誤，請向 bugs.kde.org 回報，若是在 shell 中執行，請 kdevelop 的輸出訊息附上。"
-+"這是個內部錯誤，請向 bugs.kde.org 回報，若是在 shell 中執行，請 kdevelop 的輸"
-+"出訊息附上。"
- 
- #: buildtools/qmake/trollprojectwidget.cpp:2284
- msgid "Include Scope Deletion failed"
-@@ -25391,11 +25496,12 @@
- #: buildtools/qmake/trollprojectwidget.cpp:2296
- msgid ""
- "Couldn't delete Scope.\n"
--"This is an internal error, please write a bugreport to bugs.kde.org and include "
--"the output of kdevelop when run from a shell."
-+"This is an internal error, please write a bugreport to bugs.kde.org and "
-+"include the output of kdevelop when run from a shell."
- msgstr ""
- "無法刪除範圍。\n"
--"這是個內部錯誤，請向 bugs.kde.org 回報，若是在 shell 中執行，請 kdevelop 的輸出訊息附上。"
-+"這是個內部錯誤，請向 bugs.kde.org 回報，若是在 shell 中執行，請 kdevelop 的輸"
-+"出訊息附上。"
- 
- #: buildtools/qmake/trollprojectwidget.cpp:2296
- msgid "Scope Deletion failed"
-@@ -25404,12 +25510,13 @@
- #: buildtools/qmake/trollprojectwidget.cpp:2462
- msgid ""
- "The project file \"%1\" has changed on disk\n"
--"(Or you have \"%2\" opened in the editor, which also triggers a reload when you "
--"change something in the QMake Manager).\n"
-+"(Or you have \"%2\" opened in the editor, which also triggers a reload when "
-+"you change something in the QMake Manager).\n"
- "\n"
- "Do you want to reload the it?"
- msgstr ""
--"專案檔 %1 在磁碟中已被變更（也有可能您在編輯器中開啟了 %2，並當您對 QMake 管理員做變更時觸發了重新載入動作）。\n"
-+"專案檔 %1 在磁碟中已被變更（也有可能您在編輯器中開啟了 %2，並當您對 QMake 管"
-+"理員做變更時觸發了重新載入動作）。\n"
- "\n"
- "您要重新載入嗎？"
- 
-@@ -25433,20 +25540,21 @@
- 
- #: buildtools/pascal/pascalproject_part.cpp:66
- msgid ""
--"<b>Build project</b>"
--"<p>Runs the compiler on a main source file of the project. The compiler and the "
--"main source file can be set in project settings, <b>Pascal Compiler</b> tab."
-+"<b>Build project</b><p>Runs the compiler on a main source file of the "
-+"project. The compiler and the main source file can be set in project "
-+"settings, <b>Pascal Compiler</b> tab."
- msgstr ""
--"<b>建立專案</b>"
--"<p>對專案的主要程式源碼檔案執行編譯器。編譯器和主程式源碼檔案可以在專案設定中的 <b>Pascal 編譯器</b>頁中指定。"
-+"<b>建立專案</b><p>對專案的主要程式原始碼檔案執行編譯器。編譯器和主程式原始碼檔案"
-+"可以在專案設定中的 <b>Pascal 編譯器</b>頁中指定。"
- 
- #: buildtools/pascal/pascalproject_part.cpp:72
- msgid ""
--"<b>Execute program</b>"
--"<p>Executes the main program specified in project settings, <b>Run options</b> "
--"tab. If nothing is set, the binary file with the same name as the main source "
--"file name is executed."
--msgstr "<b>執行程式</b><p>執行專案設定中的<b>執行選項</b>頁中指定的主程式。如果未指定，則執行和主程式源碼檔案具有相同名字的執行檔。"
-+"<b>Execute program</b><p>Executes the main program specified in project "
-+"settings, <b>Run options</b> tab. If nothing is set, the binary file with "
-+"the same name as the main source file name is executed."
-+msgstr ""
-+"<b>執行程式</b><p>執行專案設定中的<b>執行選項</b>頁中指定的主程式。如果未指"
-+"定，則執行和主程式原始碼檔案具有相同名字的執行檔。"
- 
- #: buildtools/pascal/pascalproject_part.cpp:341
- msgid ""
-@@ -25478,22 +25586,21 @@
- 
- #: buildtools/custommakefiles/customprojectpart.cpp:81
- msgid ""
--"<b>Re-Populate Project</b>"
--"<p>Re-Populate's the project, searches through the project directory and adds "
--"all files that match one of the wildcards set in the custom manager options to "
--"the project filelist."
--msgstr "<b>重新整理專案</b> <p>搜尋整個專案目錄，新增符合在自訂管理器選項中的專案檔案列表的檔案。"
-+"<b>Re-Populate Project</b><p>Re-Populate's the project, searches through the "
-+"project directory and adds all files that match one of the wildcards set in "
-+"the custom manager options to the project filelist."
-+msgstr ""
-+"<b>重新整理專案</b> <p>搜尋整個專案目錄，新增符合在自訂管理器選項中的專案檔案"
-+"列表的檔案。"
- 
- #: buildtools/custommakefiles/customprojectpart.cpp:87
- msgid ""
--"<b>Build project</b>"
--"<p>Runs <b>make</b> from the project directory."
-+"<b>Build project</b><p>Runs <b>make</b> from the project directory."
- "<br>Environment variables and make arguments can be specified in the project "
- "settings dialog, <b>Build Options</b> tab."
- msgstr ""
--"<b>建立專案</b>"
--"<p>在專案目錄中執行 <b>make</b> 命令。"
--"<br>環境變數和 make 參數可以在專案設定中的<b>建立選項</b>頁中指定。"
-+"<b>建立專案</b><p>在專案目錄中執行 <b>make</b> 命令。<br>環境變數和 make 參數"
-+"可以在專案設定中的<b>建立選項</b>頁中指定。"
- 
- #: buildtools/custommakefiles/customprojectpart.cpp:91
- msgid "&Build Active Directory"
-@@ -25505,38 +25612,32 @@
- 
- #: buildtools/custommakefiles/customprojectpart.cpp:95
- msgid ""
--"<b>Build active directory</b>"
--"<p>Constructs a series of make commands to build the active directory. "
--"Environment variables and make arguments can be specified in the project "
--"settings dialog, <b>Make Options</b> tab."
-+"<b>Build active directory</b><p>Constructs a series of make commands to "
-+"build the active directory. Environment variables and make arguments can be "
-+"specified in the project settings dialog, <b>Make Options</b> tab."
- msgstr ""
--"<b>建立活動目錄</b> "
--"<p>產生一系列編譯命令，來編譯目前的活動目錄。 "
--"<br>環境變數和 make 參數可以在專案設定中的<b>編譯選項</b>頁中指定。"
-+"<b>建立活動目錄</b> <p>產生一系列編譯命令，來編譯目前的活動目錄。 <br>環境變"
-+"數和 make 參數可以在專案設定中的<b>編譯選項</b>頁中指定。"
- 
- #: buildtools/custommakefiles/customprojectpart.cpp:103
- msgid ""
--"<b>Compile file</b>"
--"<p>Runs <b>make filename.o</b> command from the directory where 'filename' is "
--"the name of currently opened file."
--"<br>Environment variables and make arguments can be specified in the project "
--"settings dialog, <b>Build Options</b> tab."
-+"<b>Compile file</b><p>Runs <b>make filename.o</b> command from the directory "
-+"where 'filename' is the name of currently opened file.<br>Environment "
-+"variables and make arguments can be specified in the project settings "
-+"dialog, <b>Build Options</b> tab."
- msgstr ""
--"<b>編譯檔案</b>"
--"<p>在目前開啟的檔案 filename 所在的目錄執行 <b>make </b> 命令。"
--"<br> 環境變數和 make 參數可以在專案設定中的<b>建立選項</b>頁中指定。"
-+"<b>編譯檔案</b><p>在目前開啟的檔案 filename 所在的目錄執行 <b>make </b> 命"
-+"令。<br> 環境變數和 make 參數可以在專案設定中的<b>建立選項</b>頁中指定。"
- 
- #: buildtools/autotools/autoprojectpart.cpp:151
- #: buildtools/custommakefiles/customprojectpart.cpp:111
- msgid ""
--"<b>Install</b>"
--"<p>Runs <b>make install</b> command from the project directory."
-+"<b>Install</b><p>Runs <b>make install</b> command from the project directory."
- "<br>Environment variables and make arguments can be specified in the project "
- "settings dialog, <b>Make Options</b> tab."
- msgstr ""
--"<b>安裝</b>"
--"<p>在專案目錄中執行 <b>make install</b> 命令。"
--"<br>環境變數和 make 參數可以在專案設定中的<b>編譯選項</b>頁中指定。"
-+"<b>安裝</b><p>在專案目錄中執行 <b>make install</b> 命令。<br>環境變數和 make "
-+"參數可以在專案設定中的<b>編譯選項</b>頁中指定。"
- 
- #: buildtools/custommakefiles/customprojectpart.cpp:115
- msgid "Install Active Directory"
-@@ -25548,71 +25649,64 @@
- 
- #: buildtools/custommakefiles/customprojectpart.cpp:119
- msgid ""
--"<b>Install active directory</b>"
--"<p>Runs <b>make install</b> command from the active directory."
--"<br>Environment variables and make arguments can be specified in the project "
--"settings dialog, <b>Make Options</b> tab."
-+"<b>Install active directory</b><p>Runs <b>make install</b> command from the "
-+"active directory.<br>Environment variables and make arguments can be "
-+"specified in the project settings dialog, <b>Make Options</b> tab."
- msgstr ""
--"<b>安裝活動目錄</b>"
--"<p>在活動目錄中執行 <b>make install</b> 命令。"
--"<br>環境變數和 make 參數可以在專案設定中的<b>編譯選項</b>頁中指定。"
-+"<b>安裝活動目錄</b><p>在活動目錄中執行 <b>make install</b> 命令。<br>環境變數"
-+"和 make 參數可以在專案設定中的<b>編譯選項</b>頁中指定。"
- 
- #: buildtools/autotools/autoprojectpart.cpp:156
- #: buildtools/autotools/autosubprojectview.cpp:254
- #: buildtools/custommakefiles/customprojectpart.cpp:123
- msgid "Install (as root user)"
--msgstr "安裝（用 root 身份）"
-+msgstr "安裝（用 root 身分）"
- 
- #: buildtools/autotools/autoprojectpart.cpp:159
- #: buildtools/custommakefiles/customprojectpart.cpp:126
- msgid "Install as root user"
--msgstr "用 root 身份安裝"
-+msgstr "用 root 身分安裝"
- 
- #: buildtools/autotools/autoprojectpart.cpp:160
- #: buildtools/custommakefiles/customprojectpart.cpp:127
- msgid ""
--"<b>Install</b>"
--"<p>Runs <b>make install</b> command from the project directory with root "
--"privileges."
--"<br>It is executed via kdesu command."
--"<br>Environment variables and make arguments can be specified in the project "
--"settings dialog, <b>Make Options</b> tab."
--msgstr ""
--"<b>安裝</b>"
--"<p>在專案目錄中用 root 權限執行 <b>make install</b> 命令。"
--"<br> 它是透過 kdesu 命令來執行的。"
--"<br> 環境變數和 make 參數可以在專案設定中的<b>編譯選項</b>頁中指定。"
-+"<b>Install</b><p>Runs <b>make install</b> command from the project directory "
-+"with root privileges.<br>It is executed via kdesu command.<br>Environment "
-+"variables and make arguments can be specified in the project settings "
-+"dialog, <b>Make Options</b> tab."
-+msgstr ""
-+"<b>安裝</b><p>在專案目錄中用 root 權限執行 <b>make install</b> 命令。<br> 它"
-+"是透過 kdesu 命令來執行的。<br> 環境變數和 make 參數可以在專案設定中的<b>編譯"
-+"選項</b>頁中指定。"
- 
- #: buildtools/custommakefiles/customprojectpart.cpp:136
- msgid ""
--"<b>Clean project</b>"
--"<p>Runs <b>make clean</b> command from the project directory."
--"<br>Environment variables and make arguments can be specified in the project "
--"settings dialog, <b>Build Options</b> tab."
-+"<b>Clean project</b><p>Runs <b>make clean</b> command from the project "
-+"directory.<br>Environment variables and make arguments can be specified in "
-+"the project settings dialog, <b>Build Options</b> tab."
- msgstr ""
--"<b>清理專案</b>"
--"<p>在專案目錄中執行 <b>make clean</b> 命令。"
--"<br> 環境變數和 make 參數可以在專案設定中的<b>建立選項</b>頁中指定。"
-+"<b>清理專案</b><p>在專案目錄中執行 <b>make clean</b> 命令。<br> 環境變數和 "
-+"make 參數可以在專案設定中的<b>建立選項</b>頁中指定。"
- 
- #: buildtools/custommakefiles/customprojectpart.cpp:144
- msgid ""
--"<b>Execute program</b>"
--"<p>Executes the main program specified in project settings, <b>Run Options</b> "
--"tab. If it is not specified then the active target is used to determine the "
--"application to run."
--msgstr "<b>執行程式</b><p>執行專案設定的<b>執行選項</b>頁中指定的主程式。如果未指定，則根據目前的目標來決定要執行的應用程式。"
-+"<b>Execute program</b><p>Executes the main program specified in project "
-+"settings, <b>Run Options</b> tab. If it is not specified then the active "
-+"target is used to determine the application to run."
-+msgstr ""
-+"<b>執行程式</b><p>執行專案設定的<b>執行選項</b>頁中指定的主程式。如果未指定，"
-+"則根據目前的目標來決定要執行的應用程式。"
- 
- #: buildtools/custommakefiles/customprojectpart.cpp:151
- msgid ""
--"<b>Build target</b>"
--"<p>Runs <b>make targetname</b> from the project directory (targetname is the "
--"name of the target selected)."
--"<br>Environment variables and make arguments can be specified in the project "
--"settings dialog, <b>Build Options</b> tab."
--msgstr ""
--"<b>建立目標</b>"
--"<p>在專案目錄中執行 <b>make targetname</b> 命令（targetname 是所選取的目標名稱）。"
--"<br>環境變數和 make 參數可以在專案設定中的<b>建立選項</b>頁中指定。"
-+"<b>Build target</b><p>Runs <b>make targetname</b> from the project directory "
-+"(targetname is the name of the target selected).<br>Environment variables "
-+"and make arguments can be specified in the project settings dialog, <b>Build "
-+"Options</b> tab."
-+msgstr ""
-+"<b>建立目標</b><p>在專案目錄中執行 <b>make targetname</b> 命令（targetname 是"
-+"所選取的目標名稱）。<br>環境變數和 make 參數可以在專案設定中的<b>建立選項</b>"
-+"頁中指定。"
- 
- #: buildtools/custommakefiles/customprojectpart.cpp:158
- msgid "Make &Environment"
-@@ -25624,11 +25718,12 @@
- 
- #: buildtools/custommakefiles/customprojectpart.cpp:161
- msgid ""
--"<b>Make Environment</b>"
--"<p> Choose the set of environment variables to be passed on to make."
--"<br>Environment variables can be specified in the project settings dialog, <b>"
--"Build Options</b> tab."
--msgstr "<b>Make 環境</b><p>選擇傳遞給 make 的環境變數。<br>環境變數可以在專案設定中的<b>建立選項</b>頁中指定。"
-+"<b>Make Environment</b><p> Choose the set of environment variables to be "
-+"passed on to make.<br>Environment variables can be specified in the project "
-+"settings dialog, <b>Build Options</b> tab."
-+msgstr ""
-+"<b>Make 環境</b><p>選擇傳遞給 make 的環境變數。<br>環境變數可以在專案設定中的"
-+"<b>建立選項</b>頁中指定。"
- 
- #: buildtools/custommakefiles/customprojectpart.cpp:196
- msgid "Custom Manager"
-@@ -25652,10 +25747,11 @@
- 
- #: buildtools/custommakefiles/customprojectpart.cpp:245
- msgid ""
--"<b>Make active directory</b>"
--"<p>Chooses this directory as the destination for new files created using "
--"wizards like the <i>New Class</i> wizard."
--msgstr "<b>Make 活動目錄</b><p>選擇此目錄作為<i>新增類別</i>之類的精靈建立新檔案的目錄。"
-+"<b>Make active directory</b><p>Chooses this directory as the destination for "
-+"new files created using wizards like the <i>New Class</i> wizard."
-+msgstr ""
-+"<b>Make 活動目錄</b><p>選擇此目錄作為<i>新增類別</i>之類的精靈建立新檔案的目"
-+"錄。"
- 
- #: buildtools/custommakefiles/customprojectpart.cpp:259
- msgid "Remove from blacklist"
-@@ -25663,11 +25759,13 @@
- 
- #: buildtools/custommakefiles/customprojectpart.cpp:261
- msgid ""
--"<b>Remove from blacklist</b>"
--"<p>Removes the given file or directory from the blacklist if its already in it."
--"<br>The blacklist contains files and directories that should be ignored even if "
--"they match a project filetype pattern"
--msgstr "<b>從黑名單中移除</b>將指定的檔案與目錄從黑名單中移除。<br>黑名單中包含要忽略的檔案與目錄，即使符合專案檔案形態。"
-+"<b>Remove from blacklist</b><p>Removes the given file or directory from the "
-+"blacklist if its already in it.<br>The blacklist contains files and "
-+"directories that should be ignored even if they match a project filetype "
-+"pattern"
-+msgstr ""
-+"<b>從黑名單中移除</b>將指定的檔案與目錄從黑名單中移除。<br>黑名單中包含要忽略"
-+"的檔案與目錄，即使符合專案檔案形態。"
- 
- #: buildtools/custommakefiles/customprojectpart.cpp:269
- msgid "Add to blacklist"
-@@ -25675,11 +25773,12 @@
- 
- #: buildtools/custommakefiles/customprojectpart.cpp:271
- msgid ""
--"<b>Add to blacklist</b>"
--"<p>Adds the given file or directory to the blacklist."
--"<br>The blacklist contains files and directories that should be ignored even if "
--"they match a project filetype pattern"
--msgstr "<b>新增到黑名單</b><p>將指定的檔案或目錄新增到黑名單中。<br>黑名單中包含要忽略的檔案與目錄，即使符合專案檔案形態。"
-+"<b>Add to blacklist</b><p>Adds the given file or directory to the blacklist."
-+"<br>The blacklist contains files and directories that should be ignored even "
-+"if they match a project filetype pattern"
-+msgstr ""
-+"<b>新增到黑名單</b><p>將指定的檔案或目錄新增到黑名單中。<br>黑名單中包含要忽"
-+"略的檔案與目錄，即使符合專案檔案形態。"
- 
- #: buildtools/custommakefiles/customprojectpart.cpp:319
- msgid "Add Selected File/Dir(s) to Project"
-@@ -25687,12 +25786,12 @@
- 
- #: buildtools/custommakefiles/customprojectpart.cpp:321
- msgid ""
--"<b>Add to project</b>"
--"<p>Adds selected file/dir(s) to the list of files in project. Note that the "
--"files should be manually added to corresponding makefile or build.xml."
-+"<b>Add to project</b><p>Adds selected file/dir(s) to the list of files in "
-+"project. Note that the files should be manually added to corresponding "
-+"makefile or build.xml."
- msgstr ""
--"<b>新增到專案</b>"
--"<p>新增所選取的檔案或目錄到專案的檔案列表中。注意該檔案需要手動新增到相對應的 makefile 或 build.xml 中。"
-+"<b>新增到專案</b><p>新增所選取的檔案或目錄到專案的檔案列表中。注意該檔案需要"
-+"手動新增到相對應的 makefile 或 build.xml 中。"
- 
- #: buildtools/custommakefiles/customprojectpart.cpp:325
- msgid "Add Selected Dir(s) to Project (recursive)"
-@@ -25700,12 +25799,12 @@
- 
- #: buildtools/custommakefiles/customprojectpart.cpp:327
- msgid ""
--"<b>Add to project</b>"
--"<p>Recursively adds selected dir(s) to the list of files in project. Note that "
--"the files should be manually added to corresponding makefile or build.xml."
-+"<b>Add to project</b><p>Recursively adds selected dir(s) to the list of "
-+"files in project. Note that the files should be manually added to "
-+"corresponding makefile or build.xml."
- msgstr ""
--"<b>新增到專案</b>"
--"<p>遞迴新增所選取的目錄到專案的檔案列表中。注意該檔案需要手動新增到相對應的 makefile 或 build.xml 中。"
-+"<b>新增到專案</b><p>遞迴新增所選取的目錄到專案的檔案列表中。注意該檔案需要手"
-+"動新增到相對應的 makefile 或 build.xml 中。"
- 
- #: buildtools/custommakefiles/customprojectpart.cpp:334
- msgid "Remove Selected File/Dir(s) From Project"
-@@ -25713,12 +25812,12 @@
- 
- #: buildtools/custommakefiles/customprojectpart.cpp:336
- msgid ""
--"<b>Remove from project</b>"
--"<p>Removes selected file/dir(s) from the list of files in project. Note that "
--"the files should be manually excluded from corresponding makefile or build.xml."
-+"<b>Remove from project</b><p>Removes selected file/dir(s) from the list of "
-+"files in project. Note that the files should be manually excluded from "
-+"corresponding makefile or build.xml."
- msgstr ""
--"<b>從專案中刪除</b>"
--"<p>從專案的檔案列表中刪除所選取的檔案或目錄。注意該檔案需要從相對應的 makefile 或 build.xml 中手動排除。"
-+"<b>從專案中刪除</b><p>從專案的檔案列表中刪除所選取的檔案或目錄。注意該檔案需"
-+"要從相對應的 makefile 或 build.xml 中手動排除。"
- 
- #: buildtools/custommakefiles/customprojectpart.cpp:341
- msgid "Remove Selected Dir(s) From Project (recursive)"
-@@ -25726,13 +25825,12 @@
- 
- #: buildtools/custommakefiles/customprojectpart.cpp:343
- msgid ""
--"<b>Remove from project</b>"
--"<p>Recursively removes selected dir(s) from the list of files in project. Note "
--"that the files should be manually excluded from corresponding makefile or "
--"build.xml."
-+"<b>Remove from project</b><p>Recursively removes selected dir(s) from the "
-+"list of files in project. Note that the files should be manually excluded "
-+"from corresponding makefile or build.xml."
- msgstr ""
--"<b>從專案中刪除</b>"
--"<p>從專案的檔案列表中遞迴刪除所選取的目錄。注意該檔案需要從相對應的 makefile 或 build.xml 中手動排除。"
-+"<b>從專案中刪除</b><p>從專案的檔案列表中遞迴刪除所選取的目錄。注意該檔案需要"
-+"從相對應的 makefile 或 build.xml 中手動排除。"
- 
- #: buildtools/custommakefiles/customprojectpart.cpp:461
- msgid ""
-@@ -25793,11 +25891,11 @@
- #: buildtools/autotools/managecustomcommand.cpp:46
- msgid ""
- "_: this is a list of items in the combobox\n"
--"Make target,Make target (as root),Make command,Make command (as "
--"root),Command,Command (as root)"
-+"Make target,Make target (as root),Make command,Make command (as root),"
-+"Command,Command (as root)"
- msgstr ""
--"Make target,Make target (as root),Make command,Make command (as "
--"root),Command,Command (as root)"
-+"Make target,Make target (as root),Make command,Make command (as root),"
-+"Command,Command (as root)"
- 
- #: buildtools/autotools/addexistingfilesdlg.cpp:75
- #: buildtools/autotools/addfiledlg.cpp:51
-@@ -25899,10 +25997,11 @@
- 
- #: buildtools/autotools/removetargetdlg.cpp:48
- msgid ""
--"Do you really want to remove <b>%1</b>"
--"<br>with <b>all files</b> that are attached to it"
--"<br>and <b>all dependencies</b>?"
--msgstr "您真的要移除 <b>%1</b> 以及其<br>附加的<b>所有檔案</b>和<b>所有相依性資訊</b>嗎？"
-+"Do you really want to remove <b>%1</b><br>with <b>all files</b> that are "
-+"attached to it<br>and <b>all dependencies</b>?"
-+msgstr ""
-+"您真的要移除 <b>%1</b> 以及其<br>附加的<b>所有檔案</b>和<b>所有相依性資訊</b>"
-+"嗎？"
- 
- #: buildtools/autotools/removetargetdlg.cpp:111
- msgid ""
-@@ -25913,7 +26012,7 @@
- #: buildtools/autotools/removetargetdlg.cpp:117
- #, c-format
- msgid "Removing Target... %p%"
--msgstr "正在刪除目標...%p%"
-+msgstr "正在刪除目標…%p%"
- 
- #: buildtools/autotools/configureoptionswidget.cpp:239
- msgid "Re-run configure for %1 now?"
-@@ -25946,8 +26045,8 @@
- 
- #: buildtools/autotools/targetoptionsdlg.cpp:295
- msgid ""
--"Add Library: Choose the .a/.so file, give -l<libname> "
--"or use a variable with $(FOOBAR)"
-+"Add Library: Choose the .a/.so file, give -l<libname> or use a variable with "
-+"$(FOOBAR)"
- msgstr "新增函式庫。選擇 .a、.so 檔、用 -l<函式庫> 或是用變數 $(FOOBAR)"
- 
- #: buildtools/autotools/targetoptionsdlg.cpp:337
-@@ -25972,7 +26071,8 @@
- 
- #: buildtools/autotools/addsubprojectdlg.cpp:75
- msgid ""
--"There is no config.status in the project root directory. Run 'Configure' first"
-+"There is no config.status in the project root directory. Run 'Configure' "
-+"first"
- msgstr "專案的根目錄中沒有 config.status 檔案，請先執行 configure。"
- 
- #: buildtools/autotools/addsubprojectdlg.cpp:85
-@@ -26007,15 +26107,14 @@
- 
- #: buildtools/autotools/autoprojectpart.cpp:83
- msgid ""
--"<b>Automake manager</b>"
--"<p>The project tree consists of two parts. The 'overview' in the upper half "
--"shows the subprojects, each one having a Makefile.am. The 'details' view in the "
--"lower half shows the targets and files for the subproject selected in the "
--"overview."
--msgstr ""
--"<b>Automake 管理器</b>"
--"<p>專案樹包括兩部分，上半部分的「概要」顯示子專案，每個子專案有一個 Makefile.am "
--"檔案。下半部分的「細節」檢視顯示概述列表中選取的子專案的目標和檔案。"
-+"<b>Automake manager</b><p>The project tree consists of two parts. The "
-+"'overview' in the upper half shows the subprojects, each one having a "
-+"Makefile.am. The 'details' view in the lower half shows the targets and "
-+"files for the subproject selected in the overview."
-+msgstr ""
-+"<b>Automake 管理器</b><p>專案樹包括兩部分，上半部分的「概要」顯示子專案，每個"
-+"子專案有一個 Makefile.am 檔案。下半部分的「細節」檢視顯示概述列表中選取的子專"
-+"案的目標和檔案。"
- 
- #: buildtools/autotools/autoprojectpart.cpp:89
- msgid "Automake manager"
-@@ -26023,7 +26122,7 @@
- 
- #: buildtools/autotools/autoprojectpart.cpp:92
- msgid "Add Translation..."
--msgstr "新增翻譯..."
-+msgstr "新增翻譯…"
- 
- #: buildtools/autotools/autoprojectpart.cpp:95
- msgid "Add translation"
-@@ -26043,15 +26142,13 @@
- 
- #: buildtools/autotools/autoprojectpart.cpp:116
- msgid ""
--"<b>Build active target</b>"
--"<p>Constructs a series of make commands to build an active target. Also builds "
--"dependent targets."
--"<br>Environment variables and make arguments can be specified in the project "
--"settings dialog, <b>Make Options</b> tab."
-+"<b>Build active target</b><p>Constructs a series of make commands to build "
-+"an active target. Also builds dependent targets.<br>Environment variables "
-+"and make arguments can be specified in the project settings dialog, <b>Make "
-+"Options</b> tab."
- msgstr ""
--"<b>建立目前的目標</b> "
--"<p>產生一系列編譯命令，來編譯目前的目標，以及相依的目標。 "
--"<br>環境變數和 make 參數可以在專案設定中的<b>編譯選項</b>頁中指定。"
-+"<b>建立目前的目標</b> <p>產生一系列編譯命令，來編譯目前的目標，以及相依的目"
-+"標。 <br>環境變數和 make 參數可以在專案設定中的<b>編譯選項</b>頁中指定。"
- 
- #: buildtools/autotools/autoprojectpart.cpp:131
- msgid "Run Configure"
-@@ -26064,12 +26161,12 @@
- 
- #: buildtools/autotools/autoprojectpart.cpp:135
- msgid ""
--"<b>Run configure</b>"
--"<p>Executes <b>configure</b> with flags, arguments and environment variables "
--"specified in the project settings dialog, <b>Configure Options</b> tab."
-+"<b>Run configure</b><p>Executes <b>configure</b> with flags, arguments and "
-+"environment variables specified in the project settings dialog, <b>Configure "
-+"Options</b> tab."
- msgstr ""
--"<b>執行 configure</b>"
--"<p>用專案設定中的<b>設定選項</b>頁中指定的旗標、參數和環境變數來執行 <b>configure</b>。"
-+"<b>執行 configure</b><p>用專案設定中的<b>設定選項</b>頁中指定的旗標、參數和環"
-+"境變數來執行 <b>configure</b>。"
- 
- #: buildtools/autotools/autoprojectpart.cpp:140
- #: buildtools/autotools/autoprojectpart.cpp:143
-@@ -26078,16 +26175,11 @@
- 
- #: buildtools/autotools/autoprojectpart.cpp:144
- msgid ""
--"<b>Run automake && friends</b>"
--"<p>Executes"
--"<br><b>make -f Makefile.cvs</b>"
--"<br><b>./configure</b>"
--"<br>commands from the project directory."
--msgstr ""
--"<b>執行 automake 工具集</b>"
--"<p>在專案目錄中執行下列命令："
--"<br><b>make -f Makefile.cvs</b>"
--"<br><b>./configure</b>"
-+"<b>Run automake && friends</b><p>Executes<br><b>make -f Makefile.cvs</"
-+"b><br><b>./configure</b><br>commands from the project directory."
-+msgstr ""
-+"<b>執行 automake 工具集</b><p>在專案目錄中執行下列命令：<br><b>make -f "
-+"Makefile.cvs</b><br><b>./configure</b>"
- 
- #: buildtools/autotools/autoprojectpart.cpp:175
- msgid "&Distclean"
-@@ -26099,14 +26191,12 @@
- 
- #: buildtools/autotools/autoprojectpart.cpp:179
- msgid ""
--"<b>Distclean</b>"
--"<p>Runs <b>make distclean</b> command from the project directory."
--"<br>Environment variables and make arguments can be specified in the project "
--"settings dialog, <b>Make Options</b> tab."
-+"<b>Distclean</b><p>Runs <b>make distclean</b> command from the project "
-+"directory.<br>Environment variables and make arguments can be specified in "
-+"the project settings dialog, <b>Make Options</b> tab."
- msgstr ""
--"<b>徹底清理</b>"
--"<p>在專案目錄中執行 <b>make distclean</b> 命令。"
--"<br>環境變數和 make 參數可以在專案設定中的<b>編譯選項</b>頁中指定。"
-+"<b>徹底清理</b><p>在專案目錄中執行 <b>make distclean</b> 命令。<br>環境變數"
-+"和 make 參數可以在專案設定中的<b>編譯選項</b>頁中指定。"
- 
- #: buildtools/autotools/autoprojectpart.cpp:184
- msgid "Make Messages && Merge"
-@@ -26118,13 +26208,11 @@
- 
- #: buildtools/autotools/autoprojectpart.cpp:188
- msgid ""
--"<b>Make messages && merge</b>"
--"<p>Runs <b>make package-messages</b> command from the project directory."
--"<br>Environment variables and make arguments can be specified in the project "
--"settings dialog, <b>Make Options</b> tab."
-+"<b>Make messages && merge</b><p>Runs <b>make package-messages</b> command "
-+"from the project directory.<br>Environment variables and make arguments can "
-+"be specified in the project settings dialog, <b>Make Options</b> tab."
- msgstr ""
--"<b>產生並合併訊息</b>"
--"<p>在專案目錄中執行 <b>make package-messages</b> 命令。"
-+"<b>產生並合併訊息</b><p>在專案目錄中執行 <b>make package-messages</b> 命令。"
- "<br>環境變數和 make 參數可以在專案設定中的<b>編譯選項</b>頁中指定。"
- 
- #: buildtools/autotools/autoprojectpart.cpp:196
-@@ -26137,24 +26225,22 @@
- 
- #: buildtools/autotools/autoprojectpart.cpp:199
- msgid ""
--"<b>Build configuration menu</b>"
--"<p>Allows to switch between project build configurations."
--"<br>Build configuration is a set of build and top source directory settings, "
--"configure flags and arguments, compiler flags, etc."
--"<br>Modify build configurations in project settings dialog, <b>"
--"Configure Options</b> tab."
--msgstr ""
--"<b>建立設定選單</b>"
--"<p>可以在專案建立設定之間切換。"
--"<br> 建立設定是建立、最上層程式源碼目錄設定、設定旗標和參數、編譯器旗標等的集合。"
--"<br> 請在專案設定中的<b>設定選項</b>頁中改變建立設定。"
-+"<b>Build configuration menu</b><p>Allows to switch between project build "
-+"configurations.<br>Build configuration is a set of build and top source "
-+"directory settings, configure flags and arguments, compiler flags, etc."
-+"<br>Modify build configurations in project settings dialog, <b>Configure "
-+"Options</b> tab."
-+msgstr ""
-+"<b>建立設定選單</b><p>可以在專案建立設定之間切換。<br> 建立設定是建立、最上層"
-+"程式原始碼目錄設定、設定旗標和參數、編譯器旗標等的集合。<br> 請在專案設定中的"
-+"<b>設定選項</b>頁中改變建立設定。"
- 
- #: buildtools/autotools/autoprojectpart.cpp:212
- msgid ""
--"<b>Execute program</b>"
--"<p>Executes the currently active target or the main program specified in "
--"project settings, <b>Run Options</b> tab."
--msgstr "<b>執行主程式</b><p>執行在專案設定中的<b>執行選項</b>頁中指定的主程式。"
-+"<b>Execute program</b><p>Executes the currently active target or the main "
-+"program specified in project settings, <b>Run Options</b> tab."
-+msgstr ""
-+"<b>執行主程式</b><p>執行在專案設定中的<b>執行選項</b>頁中指定的主程式。"
- 
- #: buildtools/autotools/autoprojectpart.cpp:299
- msgid ""
-@@ -26324,32 +26410,35 @@
- #: buildtools/autotools/autodetailsview.cpp:179
- #: buildtools/autotools/autosubprojectview.cpp:175
- msgid "Options..."
--msgstr "選項..."
-+msgstr "選項…"
- 
- #: buildtools/autotools/autosubprojectview.cpp:177
- msgid ""
--"<qt><b>Options</b>"
--"<p>Shows subproject options dialog that provides settings for compiler, include "
--"paths, prefixes and build order.</qt>"
--msgstr "<qt><b>選項</b><p>顯示子專案選項對話框，提供編譯器設定、引入標頭檔路徑、前置字串和建立順序等設定。</qt>"
-+"<qt><b>Options</b><p>Shows subproject options dialog that provides settings "
-+"for compiler, include paths, prefixes and build order.</qt>"
-+msgstr ""
-+"<qt><b>選項</b><p>顯示子專案選項對話框，提供編譯器設定、引入標頭檔路徑、前置"
-+"字串和建立順序等設定。</qt>"
- 
- #: buildtools/autotools/autosubprojectview.cpp:182
- #: buildtools/autotools/autosubprojectview.cpp:183
- msgid "Add new subproject..."
--msgstr "新增子專案..."
-+msgstr "新增子專案…"
- 
- #: buildtools/autotools/autosubprojectview.cpp:185
- msgid ""
--"<qt><b>Add new subproject</b>"
--"<p>Creates a new subproject in currently selected subproject.</qt>"
-+"<qt><b>Add new subproject</b><p>Creates a new subproject in currently "
-+"selected subproject.</qt>"
- msgstr "<qt><b>新增子專案</b><p>在目前選取的子專案中新增子專案。</qt>"
- 
- #: buildtools/autotools/autosubprojectview.cpp:191
- msgid ""
--"<qt><b>Remove subproject</b>"
--"<p>Removes the subproject. Asks if the subproject should be also removed from "
--"disk. Only subprojects which do not hold other subprojects can be removed.</qt>"
--msgstr "<qt><b>刪除子專案</b><p>刪除子專案，並詢問是否要從磁碟上刪除子專案。只有不包含其它子專案的子專案才能被刪除。</qt>"
-+"<qt><b>Remove subproject</b><p>Removes the subproject. Asks if the "
-+"subproject should be also removed from disk. Only subprojects which do not "
-+"hold other subprojects can be removed.</qt>"
-+msgstr ""
-+"<qt><b>刪除子專案</b><p>刪除子專案，並詢問是否要從磁碟上刪除子專案。只有不包"
-+"含其它子專案的子專案才能被刪除。</qt>"
- 
- #: buildtools/autotools/autosubprojectview.cpp:194
- msgid "Add Existing Subprojects..."
-@@ -26357,37 +26446,40 @@
- 
- #: buildtools/autotools/autosubprojectview.cpp:196
- msgid ""
--"<qt><b>Add existing subprojects</b>"
--"<p>Imports existing subprojects containing Makefile.am.</qt>"
--msgstr "<qt><b>新增已存在的子專案</b><p>匯入已存在的，含有 Makefile.am 檔案的子專案。</qt>"
-+"<qt><b>Add existing subprojects</b><p>Imports existing subprojects "
-+"containing Makefile.am.</qt>"
-+msgstr ""
-+"<qt><b>新增已存在的子專案</b><p>匯入已存在的，含有 Makefile.am 檔案的子專案。"
-+"</qt>"
- 
- #: buildtools/autotools/autosubprojectview.cpp:199
- #: buildtools/autotools/autosubprojectview.cpp:200
- msgid "Add Target..."
--msgstr "新增目標..."
-+msgstr "新增目標…"
- 
- #: buildtools/autotools/autosubprojectview.cpp:202
- msgid ""
--"<qt><b>Add target</b>"
--"<p>Adds a new target to the currently selected subproject. Target can be a "
--"binary program, library, script, also a collection of data or header files.</qt>"
--msgstr "<qt><b>新增目標</b><p>在目前選取的子專案中新增新的目標。目標可以是可執行程式、函式庫、文稿，或者一組資料或標頭檔。</qt>"
-+"<qt><b>Add target</b><p>Adds a new target to the currently selected "
-+"subproject. Target can be a binary program, library, script, also a "
-+"collection of data or header files.</qt>"
-+msgstr ""
-+"<qt><b>新增目標</b><p>在目前選取的子專案中新增新的目標。目標可以是可執行程"
-+"式、函式庫、文稿，或者一組資料或標頭檔。</qt>"
- 
- #: buildtools/autotools/autosubprojectview.cpp:208
- #: buildtools/autotools/autosubprojectview.cpp:209
- msgid "Add Service..."
--msgstr "新增服務..."
-+msgstr "新增服務…"
- 
- #: buildtools/autotools/autosubprojectview.cpp:211
- msgid ""
--"<qt><b>Add service</b>"
--"<p>Creates a .desktop file describing the service.</qt>"
-+"<qt><b>Add service</b><p>Creates a .desktop file describing the service.</qt>"
- msgstr "<qt><b>新增服務</b><p>建立描述該服務的 .desktop 檔案。</qt>"
- 
- #: buildtools/autotools/autosubprojectview.cpp:214
- #: buildtools/autotools/autosubprojectview.cpp:215
- msgid "Add Application..."
--msgstr "新增應用程式..."
-+msgstr "新增應用程式…"
- 
- #: buildtools/autotools/autosubprojectview.cpp:217
- msgid "<qt><b>Add application</b><p>Creates an application .desktop file.</qt>"
-@@ -26395,14 +26487,12 @@
- 
- #: buildtools/autotools/autosubprojectview.cpp:223
- msgid ""
--"<qt><b>Build</b>"
--"<p>Runs <b>make</b> from the directory of the selected subproject."
--"<br> Environment variables and make arguments can be specified in the project "
--"settings dialog, <b>Make Options</b> tab.</qt>"
-+"<qt><b>Build</b><p>Runs <b>make</b> from the directory of the selected "
-+"subproject.<br> Environment variables and make arguments can be specified in "
-+"the project settings dialog, <b>Make Options</b> tab.</qt>"
- msgstr ""
--"<qt><b>建立</b> "
--"<p>在所選取的子專案目錄中執行 <b>make</b> 命令。"
--"<br> 環境變數和 make 參數可以在專案設定中的<b>編譯選項</b>頁中指定。</qt>"
-+"<qt><b>建立</b> <p>在所選取的子專案目錄中執行 <b>make</b> 命令。<br> 環境變數"
-+"和 make 參數可以在專案設定中的<b>編譯選項</b>頁中指定。</qt>"
- 
- #: buildtools/autotools/autosubprojectview.cpp:229
- msgid "Force Reedit"
-@@ -26410,52 +26500,43 @@
- 
- #: buildtools/autotools/autosubprojectview.cpp:231
- msgid ""
--"<qt><b>Force Reedit</b>"
--"<p>Runs <b>make force-reedit</b> from the directory of the selected subproject."
--"<br>This recreates makefile (tip: and solves most of .moc related problems)"
--"<br>Environment variables and make arguments can be specified in the project "
--"settings dialog, <b>Make Options</b> tab.</qt>"
-+"<qt><b>Force Reedit</b><p>Runs <b>make force-reedit</b> from the directory "
-+"of the selected subproject.<br>This recreates makefile (tip: and solves most "
-+"of .moc related problems)<br>Environment variables and make arguments can be "
-+"specified in the project settings dialog, <b>Make Options</b> tab.</qt>"
- msgstr ""
--"<qt><b>強制重新編輯</b>"
--"<p>在所選取的子專案目錄中執行 <b>make force-reedit</b> 命令。"
--"<br> 這將重新建立 makefile（提示：並解決一些和 .moc 有關的問題）。"
-+"<qt><b>強制重新編輯</b><p>在所選取的子專案目錄中執行 <b>make force-reedit</"
-+"b> 命令。<br> 這將重新建立 makefile（提示：並解決一些和 .moc 有關的問題）。"
- "<br> 環境變數和 make 參數可以在專案設定中的<b>編譯選項</b>頁中指定。</qt>"
- 
- #: buildtools/autotools/autosubprojectview.cpp:243
- msgid ""
--"<qt><b>Clean</b>"
--"<p>Runs <b>make clean</b> from the directory of the selected subproject."
--"<br> Environment variables and make arguments can be specified in the project "
--"settings dialog, <b>Make Options</b> tab.</qt>"
-+"<qt><b>Clean</b><p>Runs <b>make clean</b> from the directory of the selected "
-+"subproject.<br> Environment variables and make arguments can be specified in "
-+"the project settings dialog, <b>Make Options</b> tab.</qt>"
- msgstr ""
--"<qt><b>清理</b>"
--"<p>在所選取的子專案目錄中執行 <b>make clean</b> 命令。"
--"<br> 環境變數和 make 參數可以在專案設定中的<b>編譯選項</b>頁中指定。</qt>"
-+"<qt><b>清理</b><p>在所選取的子專案目錄中執行 <b>make clean</b> 命令。<br> 環"
-+"境變數和 make 參數可以在專案設定中的<b>編譯選項</b>頁中指定。</qt>"
- 
- #: buildtools/autotools/autosubprojectview.cpp:250
- msgid ""
--"<qt><b>Install</b>"
--"<p>Runs <b>make install</b> from the directory of the selected subproject."
--"<br> Environment variables and make arguments can be specified in the project "
--"settings dialog, <b>Make Options</b> tab.</qt>"
-+"<qt><b>Install</b><p>Runs <b>make install</b> from the directory of the "
-+"selected subproject.<br> Environment variables and make arguments can be "
-+"specified in the project settings dialog, <b>Make Options</b> tab.</qt>"
- msgstr ""
--"<qt><b>安裝</b>"
--"<p>在所選取的子專案目錄中執行 <b>make install</b> 命令。"
--"<br> 環境變數和 make 參數可以在專案設定中的<b>編譯選項</b>頁中指定。</qt>"
-+"<qt><b>安裝</b><p>在所選取的子專案目錄中執行 <b>make install</b> 命令。<br> "
-+"環境變數和 make 參數可以在專案設定中的<b>編譯選項</b>頁中指定。</qt>"
- 
- #: buildtools/autotools/autosubprojectview.cpp:256
- msgid ""
--"<qt><b>Install as root user</b>"
--"<p>Runs <b>make install</b> command from the directory of the selected "
--"subproject with root privileges."
--"<br> It is executed via kdesu command."
--"<br> Environment variables and make arguments can be specified in the project "
--"settings dialog, <b>Make Options</b> tab.</qt>"
--msgstr ""
--"<qt><b>用 root 身份安裝</b>"
--"<p>用 root 身份在所選取的子專案目錄中執行 <b>make install</b> 命令。"
--"<br> 它是透過 kdesu 命令來執行的。"
--"<br> 環境變數和 make 參數可以在專案設定中的<b>編譯選項</b>頁中指定。</qt>"
-+"<qt><b>Install as root user</b><p>Runs <b>make install</b> command from the "
-+"directory of the selected subproject with root privileges.<br> It is "
-+"executed via kdesu command.<br> Environment variables and make arguments can "
-+"be specified in the project settings dialog, <b>Make Options</b> tab.</qt>"
-+msgstr ""
-+"<qt><b>用 root 身分安裝</b><p>用 root 身分在所選取的子專案目錄中執行 <b>make "
-+"install</b> 命令。<br> 它是透過 kdesu 命令來執行的。<br> 環境變數和 make 參數"
-+"可以在專案設定中的<b>編譯選項</b>頁中指定。</qt>"
- 
- #: buildtools/autotools/autosubprojectview.cpp:263
- msgid "Expand Subtree"
-@@ -26467,15 +26548,15 @@
- 
- #: buildtools/autotools/autosubprojectview.cpp:268
- msgid "Manage Custom Commands..."
--msgstr "管理自訂命令..."
-+msgstr "管理自訂命令…"
- 
- #: buildtools/autotools/autosubprojectview.cpp:270
- msgid ""
--"<qt><b>Manage custom commands</b>"
--"<p>Allows to create, edit and delete custom build commands which appears in the "
--"subproject context menu."
--"<br></qt>"
--msgstr "<qt>管理自訂命令</b><p>允許建立、編輯與刪除會在子專案內容選單中出現的自訂建立命令。<br></qt>"
-+"<qt><b>Manage custom commands</b><p>Allows to create, edit and delete custom "
-+"build commands which appears in the subproject context menu.<br></qt>"
-+msgstr ""
-+"<qt>管理自訂命令</b><p>允許建立、編輯與刪除會在子專案內容選單中出現的自訂建立"
-+"命令。<br></qt>"
- 
- #: buildtools/autotools/autosubprojectview.cpp:283
- #, c-format
-@@ -26525,30 +26606,31 @@
- 
- #: buildtools/autotools/autodetailsview.cpp:182
- msgid ""
--"<b>Options</b>"
--"<p>Target options dialog that provides settings for linker flags and lists of "
--"dependencies and external libraries that are used when compiling the target."
--msgstr "<b>選項</b><p>目標選項對話框可以提供編譯目標時要用到的連結器旗標、相依性與外部函式庫列表等設定。"
-+"<b>Options</b><p>Target options dialog that provides settings for linker "
-+"flags and lists of dependencies and external libraries that are used when "
-+"compiling the target."
-+msgstr ""
-+"<b>選項</b><p>目標選項對話框可以提供編譯目標時要用到的連結器旗標、相依性與外"
-+"部函式庫列表等設定。"
- 
- #: buildtools/autotools/autodetailsview.cpp:193
- msgid ""
--"<b>Create new file</b>"
--"<p>Creates a new file and adds it to a currently selected target."
-+"<b>Create new file</b><p>Creates a new file and adds it to a currently "
-+"selected target."
- msgstr "<b>建立新檔案</b><p>建立新檔案並把它新增到目前選取的目標中。"
- 
- #: buildtools/autotools/autodetailsview.cpp:202
- msgid ""
--"<b>Add existing files</b>"
--"<p>Adds existing file to a currently selected target. Header files will not be "
--"included in SOURCES list of a target. They will be added to noinst_HEADERS "
--"instead."
-+"<b>Add existing files</b><p>Adds existing file to a currently selected "
-+"target. Header files will not be included in SOURCES list of a target. They "
-+"will be added to noinst_HEADERS instead."
- msgstr ""
--"<b>新增已存在的檔案</b>"
--"<p>新增已存在的檔案到目前選取的目標中。標頭檔將不被包含在目標的 SOURCES 列表中，而是被新增到 noinst_HEADERS。"
-+"<b>新增已存在的檔案</b><p>新增已存在的檔案到目前選取的目標中。標頭檔將不被包"
-+"含在目標的 SOURCES 列表中，而是被新增到 noinst_HEADERS。"
- 
- #: buildtools/autotools/autodetailsview.cpp:210
- msgid "Add Icon..."
--msgstr "新增圖示..."
-+msgstr "新增圖示…"
- 
- #: buildtools/autotools/autodetailsview.cpp:212
- msgid "<b>Add icon</b><p>Adds an icon to a KDEICON target."
-@@ -26560,24 +26642,24 @@
- 
- #: buildtools/autotools/autodetailsview.cpp:215
- msgid "Build Target..."
--msgstr "建立目標..."
-+msgstr "建立目標…"
- 
- #: buildtools/autotools/autodetailsview.cpp:218
- msgid ""
--"<b>Build target</b>"
--"<p>Constructs a series of make commands to build the selected target. Also "
--"builds dependent targets."
--msgstr "<b>建立目標</b><p>產生一系列 make 命令建立所選取的目標，以及相依的目標。"
-+"<b>Build target</b><p>Constructs a series of make commands to build the "
-+"selected target. Also builds dependent targets."
-+msgstr ""
-+"<b>建立目標</b><p>產生一系列 make 命令建立所選取的目標，以及相依的目標。"
- 
- #: buildtools/autotools/autodetailsview.cpp:224
- #: buildtools/autotools/autodetailsview.cpp:225
- msgid "Execute Target..."
--msgstr "執行目標..."
-+msgstr "執行目標…"
- 
- #: buildtools/autotools/autodetailsview.cpp:228
- msgid ""
--"<b>Execute target</b>"
--"<p>Executes the target and tries to build in case it is not built."
-+"<b>Execute target</b><p>Executes the target and tries to build in case it is "
-+"not built."
- msgstr "<b>執行目標</b><p>執行應用程式目標，若尚未建立則先嘗試建立。"
- 
- #: buildtools/autotools/autodetailsview.cpp:233
-@@ -26586,18 +26668,21 @@
- 
- #: buildtools/autotools/autodetailsview.cpp:236
- msgid ""
--"<b>Make target active</b>"
--"<p>Marks the currently selected target as 'active'. New files and classes by "
--"default go to an active target. Using the <b>Build Active Target</b> "
--"menu command builds it."
--msgstr "<b>焦點轉移到目標</b><p>將焦點轉移至目前選取的目標。新的檔案和類別預設將新增到此目標。<b>建立目前的目標</b>可以編譯它。"
-+"<b>Make target active</b><p>Marks the currently selected target as 'active'. "
-+"New files and classes by default go to an active target. Using the <b>Build "
-+"Active Target</b> menu command builds it."
-+msgstr ""
-+"<b>焦點轉移到目標</b><p>將焦點轉移至目前選取的目標。新的檔案和類別預設將新增"
-+"到此目標。<b>建立目前的目標</b>可以編譯它。"
- 
- #: buildtools/autotools/autodetailsview.cpp:247
- msgid ""
--"<b>Remove</b>"
--"<p>Shows a list of targets dependent on the selected target or file and asks "
--"for removal. Also asks if the target or file should be removed from disk."
--msgstr "<b>刪除</b><p>顯示相依於目前選取的目標或檔案的目標列表，詢問是否進行刪除，並詢問是否應該將目標或檔案從磁碟上刪除。"
-+"<b>Remove</b><p>Shows a list of targets dependent on the selected target or "
-+"file and asks for removal. Also asks if the target or file should be removed "
-+"from disk."
-+msgstr ""
-+"<b>刪除</b><p>顯示相依於目前選取的目標或檔案的目標列表，詢問是否進行刪除，並"
-+"詢問是否應該將目標或檔案從磁碟上刪除。"
- 
- #: buildtools/autotools/autodetailsview.cpp:319
- msgid "Add New File to '%1'"
-@@ -26626,7 +26711,7 @@
- 
- #: buildtools/autotools/addtranslationdlg.cpp:79
- msgid "Your sourcecode is already translated to all supported languages."
--msgstr "您的程式源碼已經被翻譯為所有支援的語言。"
-+msgstr "您的程式原始碼已經被翻譯為所有支援的語言。"
- 
- #: buildtools/autotools/addtranslationdlg.cpp:97
- msgid "A translation file for the language %1 exists already."
-@@ -26710,10 +26795,10 @@
- #: buildtools/autotools/addfiledlg.cpp:91
- #: buildtools/autotools/addfiledlg.cpp:103
- msgid ""
--"<b>A file with this name already exists.</b>"
--"<br>"
--"<br>Please use the \"Add existing file\" dialog."
--msgstr "<b>一個同名的檔案已經存在！</b><br><br>請使用「新增已存在的檔案」對話框。"
-+"<b>A file with this name already exists.</b><br><br>Please use the \"Add "
-+"existing file\" dialog."
-+msgstr ""
-+"<b>一個同名的檔案已經存在！</b><br><br>請使用「新增已存在的檔案」對話框。"
- 
- #: buildtools/autotools/addtargetdlg.cpp:45
- msgid "Data File"
-@@ -26993,8 +27078,8 @@
- 
- #: kdevdesigner/designer/propertyeditor.cpp:3879
- msgid ""
--"<p><b>QWidget::%1</b></p>"
--"<p>There is no documentation available for this property.</p>"
-+"<p><b>QWidget::%1</b></p><p>There is no documentation available for this "
-+"property.</p>"
- msgstr "<p><b>QWidget: %1</b></p> <p>沒有此屬性的文件。</p>"
- 
- #: kdevdesigner/designer/propertyeditor.cpp:4031
-@@ -27084,7 +27169,7 @@
- 
- #: kdevdesigner/designer/startdialogimpl.cpp:171
- msgid "QMAKE Project Files (*.pro)"
--msgstr "QMAKE 專案檔 (&.pro)"
-+msgstr "QMAKE 專案檔(&.pro)"
- 
- #: kdevdesigner/designer/startdialogimpl.cpp:177
- msgid "All Files (*)"
-@@ -27217,7 +27302,7 @@
- #: kdevdesigner/designer/kdevdesigner_part.cpp:118
- #: kdevdesigner/designer/mainwindowactions.cpp:193
- msgid "S&lots..."
--msgstr "插槽(&L)..."
-+msgstr "插槽(&L)…"
- 
- #: kdevdesigner/designer/mainwindowactions.cpp:194
- msgid "Opens a dialog for editing slots"
-@@ -27230,24 +27315,24 @@
- #: kdevdesigner/designer/kdevdesigner_part.cpp:120
- #: kdevdesigner/designer/mainwindowactions.cpp:200
- msgid "Co&nnections..."
--msgstr "連線(&N)..."
-+msgstr "連線(&N)…"
- 
- #: kdevdesigner/designer/mainwindowactions.cpp:201
- msgid "Opens a dialog for editing connections"
--msgstr "開啟編輯連線的對話框..."
-+msgstr "開啟編輯連線的對話框…"
- 
- #: kdevdesigner/designer/mainwindowactions.cpp:207
- msgid "&Source..."
--msgstr "程式源碼(&S)..."
-+msgstr "程式原始碼(&S)…"
- 
- #: kdevdesigner/designer/mainwindowactions.cpp:208
- msgid "Opens an editor to edit the form's source code"
--msgstr "開啟編輯器編輯此表單的程式源碼"
-+msgstr "開啟編輯器編輯此表單的程式原始碼"
- 
- #: kdevdesigner/designer/kdevdesigner_part.cpp:122
- #: kdevdesigner/designer/mainwindowactions.cpp:214
- msgid "&Form Settings..."
--msgstr "表單設定(&F)..."
-+msgstr "表單設定(&F)…"
- 
- #: kdevdesigner/designer/mainwindowactions.cpp:215
- msgid "Opens a dialog to change the form's settings"
-@@ -27255,7 +27340,7 @@
- 
- #: kdevdesigner/designer/mainwindowactions.cpp:221
- msgid "Preferences..."
--msgstr "喜好設定..."
-+msgstr "喜好設定…"
- 
- #: kdevdesigner/designer/mainwindowactions.cpp:222
- msgid "Opens a dialog to change preferences"
-@@ -27275,7 +27360,7 @@
- 
- #: kdevdesigner/designer/mainwindowactions.cpp:290
- msgid "&Goto Line..."
--msgstr "跳到行(&G)..."
-+msgstr "跳到行(&G)…"
- 
- #: kdevdesigner/designer/mainwindowactions.cpp:302
- msgid "Incremental search (Alt+I)"
-@@ -27300,91 +27385,91 @@
- #: kdevdesigner/designer/formwindow.cpp:2002
- #: kdevdesigner/designer/mainwindowactions.cpp:333
- msgid "Lay Out Horizontally"
--msgstr "水平佈局"
-+msgstr "水平布局"
- 
- #: kdevdesigner/designer/kdevdesigner_part.cpp:149
- #: kdevdesigner/designer/mainwindowactions.cpp:334
- msgid "Lay Out &Horizontally"
--msgstr "水平佈局(&H)"
-+msgstr "水平布局(&H)"
- 
- #: kdevdesigner/designer/mainwindowactions.cpp:335
- msgid "Lays out the selected widgets horizontally"
--msgstr "水平方式佈局選取的元件"
-+msgstr "水平方式布局選取的元件"
- 
- #: kdevdesigner/designer/formwindow.cpp:2012
- #: kdevdesigner/designer/mainwindowactions.cpp:340
- msgid "Lay Out Vertically"
--msgstr "垂直佈局"
-+msgstr "垂直布局"
- 
- #: kdevdesigner/designer/kdevdesigner_part.cpp:151
- #: kdevdesigner/designer/mainwindowactions.cpp:341
- msgid "Lay Out &Vertically"
--msgstr "垂直佈局(&V)"
-+msgstr "垂直布局(&V)"
- 
- #: kdevdesigner/designer/mainwindowactions.cpp:342
- msgid "Lays out the selected widgets vertically"
--msgstr "垂直方式佈局選取的元件"
-+msgstr "垂直方式布局選取的元件"
- 
- #: kdevdesigner/designer/formwindow.cpp:2045
- #: kdevdesigner/designer/mainwindowactions.cpp:347
- msgid "Lay Out in a Grid"
--msgstr "格狀佈局"
-+msgstr "格狀布局"
- 
- #: kdevdesigner/designer/mainwindowactions.cpp:348
- msgid "Lay Out in a &Grid"
--msgstr "格狀佈局(&G)"
-+msgstr "格狀布局(&G)"
- 
- #: kdevdesigner/designer/mainwindowactions.cpp:349
- msgid "Lays out the selected widgets in a grid"
--msgstr "格狀方式佈局選取的元件"
-+msgstr "格狀方式布局選取的元件"
- 
- #: kdevdesigner/designer/mainwindowactions.cpp:354
- msgid "Lay Out Horizontally (in Splitter)"
--msgstr "水平佈局（在 Splitter 中）"
-+msgstr "水平布局（在 Splitter 中）"
- 
- #: kdevdesigner/designer/kdevdesigner_part.cpp:155
- #: kdevdesigner/designer/mainwindowactions.cpp:355
- msgid "Lay Out Horizontally (in S&plitter)"
--msgstr "水平佈局（在 Splitter 中）(&P)"
-+msgstr "水平布局（在 Splitter 中）(&P)"
- 
- #: kdevdesigner/designer/mainwindowactions.cpp:356
- msgid "Lays out the selected widgets horizontally in a splitter"
--msgstr "在 Splitter 中水平佈局所選取的元件"
-+msgstr "在 Splitter 中水平布局所選取的元件"
- 
- #: kdevdesigner/designer/mainwindowactions.cpp:361
- msgid "Lay Out Vertically (in Splitter)"
--msgstr "垂直佈局（在 Splitter 中）"
-+msgstr "垂直布局（在 Splitter 中）"
- 
- #: kdevdesigner/designer/kdevdesigner_part.cpp:157
- #: kdevdesigner/designer/mainwindowactions.cpp:362
- msgid "Lay Out Vertically (in Sp&litter)"
--msgstr "垂直佈局（在 Splitter 中）(&L)"
-+msgstr "垂直布局（在 Splitter 中）(&L)"
- 
- #: kdevdesigner/designer/mainwindowactions.cpp:363
- msgid "Lays out the selected widgets vertically in a splitter"
--msgstr "在 Splitter 中垂直佈局所選取的元件"
-+msgstr "在 Splitter 中垂直布局所選取的元件"
- 
- #: kdevdesigner/designer/formwindow.cpp:2143
- #: kdevdesigner/designer/formwindow.cpp:2163
- #: kdevdesigner/designer/mainwindowactions.cpp:368
- msgid "Break Layout"
--msgstr "打破佈局"
-+msgstr "打破布局"
- 
- #: kdevdesigner/designer/formwindow.cpp:971
- #: kdevdesigner/designer/formwindow.cpp:1076
- #: kdevdesigner/designer/kdevdesigner_part.cpp:159
- #: kdevdesigner/designer/mainwindowactions.cpp:369
- msgid "&Break Layout"
--msgstr "打破佈局(&B)"
-+msgstr "打破布局(&B)"
- 
- #: kdevdesigner/designer/mainwindowactions.cpp:370
- msgid "Breaks the selected layout"
--msgstr "打破選取的佈局"
-+msgstr "打破選取的布局"
- 
- #: kdevdesigner/designer/mainwindow.cpp:224
- #: kdevdesigner/designer/mainwindowactions.cpp:376
- msgid "Layout"
--msgstr "佈局"
-+msgstr "布局"
- 
- #: kdevdesigner/designer/mainwindowactions.cpp:379
- #, c-format
-@@ -27399,15 +27484,14 @@
- 
- #: kdevdesigner/designer/mainwindowactions.cpp:383
- msgid ""
--"<b>A %1</b>"
--"<p>%2</p>"
--"<p>Click to insert a single %3,or double click to keep the tool selected."
-+"<b>A %1</b><p>%2</p><p>Click to insert a single %3,or double click to keep "
-+"the tool selected."
- msgstr "<b>%1</b><p>%2</p><p>點選以插入單一的 %3，或是雙擊保持選取此工具。"
- 
- #: kdevdesigner/designer/mainwindowactions.cpp:395
- #, c-format
- msgid "<b>The Layout toolbar</b>%1"
--msgstr "<b>佈局工具列</b>%1"
-+msgstr "<b>布局工具列</b>%1"
- 
- #: kdevdesigner/designer/mainwindowactions.cpp:431
- msgid "Pointer"
-@@ -27477,7 +27561,7 @@
- #: kdevdesigner/designer/kdevdesigner_part.cpp:145
- #: kdevdesigner/designer/mainwindowactions.cpp:490
- msgid "Edit &Custom Widgets..."
--msgstr "編輯自訂元件(&C)..."
-+msgstr "編輯自訂元件(&C)…"
- 
- #: kdevdesigner/designer/mainwindowactions.cpp:491
- msgid "Opens a dialog to add and change custom widgets"
-@@ -27514,10 +27598,11 @@
- 
- #: kdevdesigner/designer/mainwindowactions.cpp:579
- msgid ""
--"<b>The Custom Widgets toolbar</b>%1"
--"<p>Click <b>Edit Custom Widgets...</b>in the <b>Tools|Custom</b> "
--"menu to add and change custom widgets</p>"
--msgstr "<b>自訂元件工具列</b>%1<p>在<b>工具|自訂</b>選單中點擊<b>編輯自訂元件...</b>以新增與變更自訂元件。</p>"
-+"<b>The Custom Widgets toolbar</b>%1<p>Click <b>Edit Custom Widgets...</b>in "
-+"the <b>Tools|Custom</b> menu to add and change custom widgets</p>"
-+msgstr ""
-+"<b>自訂元件工具列</b>%1<p>在<b>工具|自訂</b>選單中點擊<b>編輯自訂元件...</b>"
-+"以新增與變更自訂元件。</p>"
- 
- #: kdevdesigner/designer/mainwindowactions.cpp:584
- msgid ""
-@@ -27528,7 +27613,7 @@
- #: kdevdesigner/designer/kdevdesigner_part.cpp:144
- #: kdevdesigner/designer/mainwindowactions.cpp:605
- msgid "Configure Toolbox..."
--msgstr "設定工具箱..."
-+msgstr "設定工具箱…"
- 
- #: kdevdesigner/designer/mainwindowactions.cpp:606
- msgid "Opens a dialog to configure the common widgets page of the toolbox"
-@@ -27546,11 +27631,11 @@
- #: kdevdesigner/designer/mainwindowactions.cpp:631
- #: kdevdesigner/designer/mainwindowactions.cpp:645
- msgid "&New..."
--msgstr "新增(&N)..."
-+msgstr "新增(&N)…"
- 
- #: kdevdesigner/designer/mainwindowactions.cpp:634
- msgid "Creates a new project, form or source file."
--msgstr "建立新專案、表單或程式源碼檔案。"
-+msgstr "建立新專案、表單或程式原始碼檔案。"
- 
- #: kdevdesigner/designer/mainwindowactions.cpp:647
- msgid "Creates a new dialog or file"
-@@ -27562,7 +27647,7 @@
- 
- #: kdevdesigner/designer/mainwindowactions.cpp:652
- msgid "&Dialog..."
--msgstr "對話框(&D)..."
-+msgstr "對話框(&D)…"
- 
- #: kdevdesigner/designer/mainwindowactions.cpp:655
- msgid "Creates a new dialog."
-@@ -27570,7 +27655,7 @@
- 
- #: kdevdesigner/designer/mainwindowactions.cpp:660
- msgid "&File..."
--msgstr "檔案&F)..."
-+msgstr "檔案&F)…"
- 
- #: kdevdesigner/designer/mainwindowactions.cpp:663
- msgid "Creates a new file."
-@@ -27578,7 +27663,7 @@
- 
- #: kdevdesigner/designer/mainwindowactions.cpp:678
- msgid "Opens an existing project, form or source file "
--msgstr "開啟現有的專案、表單或程式源碼檔案"
-+msgstr "開啟現有的專案、表單或程式原始碼檔案"
- 
- #: kdevdesigner/designer/mainwindowactions.cpp:692
- msgid "Closes the current project or document"
-@@ -27590,7 +27675,7 @@
- 
- #: kdevdesigner/designer/mainwindowactions.cpp:717
- msgid "Save &As..."
--msgstr "另存為(&A)..."
-+msgstr "另存為(&A)…"
- 
- #: kdevdesigner/designer/mainwindowactions.cpp:718
- msgid "Saves the current form with a new filename"
-@@ -27611,7 +27696,7 @@
- #: kdevdesigner/designer/kdevdesigner_part.cpp:100
- #: kdevdesigner/designer/mainwindowactions.cpp:740
- msgid "Create &Template..."
--msgstr "建立樣本(&T)..."
-+msgstr "建立樣本(&T)…"
- 
- #: kdevdesigner/designer/mainwindowactions.cpp:741
- msgid "Creates a new template"
-@@ -27633,7 +27718,7 @@
- msgid ""
- "Quits the application and prompts to save any changed forms, source files or "
- "project settings"
--msgstr "離開應用程式，並提示是否要儲存已變更的表單、程式源碼或專案設定"
-+msgstr "離開應用程式，並提示是否要儲存已變更的表單、程式原始碼或專案設定"
- 
- #: kdevdesigner/designer/mainwindowactions.cpp:788
- msgid "Pr&oject"
-@@ -27651,7 +27736,7 @@
- #: kdevdesigner/designer/kdevdesigner_part.cpp:125
- #: kdevdesigner/designer/mainwindowactions.cpp:808
- msgid "&Add File..."
--msgstr "新增檔案(&A)..."
-+msgstr "新增檔案(&A)…"
- 
- #: kdevdesigner/designer/mainwindowactions.cpp:810
- msgid "Adds a file to the current project"
-@@ -27659,12 +27744,12 @@
- 
- #: kdevdesigner/designer/mainwindowactions.cpp:818
- msgid "Image Collection..."
--msgstr "影像收集..."
-+msgstr "影像收集…"
- 
- #: kdevdesigner/designer/kdevdesigner_part.cpp:127
- #: kdevdesigner/designer/mainwindowactions.cpp:819
- msgid "&Image Collection..."
--msgstr "影像收集(&I)..."
-+msgstr "影像收集(&I)…"
- 
- #: kdevdesigner/designer/mainwindowactions.cpp:820
- msgid "Opens a dialog for editing the current project's image collection"
-@@ -27672,12 +27757,12 @@
- 
- #: kdevdesigner/designer/mainwindowactions.cpp:828
- msgid "Database Connections..."
--msgstr "資料庫連線..."
-+msgstr "資料庫連線…"
- 
- #: kdevdesigner/designer/kdevdesigner_part.cpp:129
- #: kdevdesigner/designer/mainwindowactions.cpp:829
- msgid "&Database Connections..."
--msgstr "資料庫連線(&D)..."
-+msgstr "資料庫連線(&D)…"
- 
- #: kdevdesigner/designer/mainwindowactions.cpp:830
- msgid "Opens a dialog for editing the current project's database connections"
-@@ -27685,11 +27770,11 @@
- 
- #: kdevdesigner/designer/mainwindowactions.cpp:839
- msgid "Project Settings..."
--msgstr "專案設定..."
-+msgstr "專案設定…"
- 
- #: kdevdesigner/designer/mainwindowactions.cpp:840
- msgid "&Project Settings..."
--msgstr "專案設定(&P)..."
-+msgstr "專案設定(&P)…"
- 
- #: kdevdesigner/designer/mainwindowactions.cpp:841
- msgid "Opens a dialog to change the project's settings"
-@@ -27715,8 +27800,8 @@
- 
- #: kdevdesigner/designer/mainwindowactions.cpp:874
- msgid ""
--"The preview will use the Motif look and feel which is used as the default style "
--"on most UNIX systems."
-+"The preview will use the Motif look and feel which is used as the default "
-+"style on most UNIX systems."
- msgstr "此預覽會使用大多數 UNIX 系統預設的 Motif 外觀"
- 
- #: kdevdesigner/designer/mainwindowactions.cpp:876
-@@ -27731,20 +27816,20 @@
- 
- #: kdevdesigner/designer/mainwindowactions.cpp:880
- msgid ""
--"The preview will use the CDE look and feel which is similar to some versions of "
--"the Common Desktop Environment."
-+"The preview will use the CDE look and feel which is similar to some versions "
-+"of the Common Desktop Environment."
- msgstr "此預覽會使用類似某些版本的共用桌面環境（CDE）風格的 CDE 外觀"
- 
- #: kdevdesigner/designer/mainwindowactions.cpp:882
- msgid ""
--"The preview will use the Motif look and feel which is used as the default style "
--"on SGI systems."
-+"The preview will use the Motif look and feel which is used as the default "
-+"style on SGI systems."
- msgstr "此預覽會使用 SGI 系統預設的 Motif 外觀"
- 
- #: kdevdesigner/designer/mainwindowactions.cpp:884
- msgid ""
--"The preview will use the advanced Motif look and feel used by the GIMP toolkit "
--"(GTK) on Linux."
-+"The preview will use the advanced Motif look and feel used by the GIMP "
-+"toolkit (GTK) on Linux."
- msgstr "此預覽會使用 Linux 上的 GIMP toolkit（GTK）的進階 Motif 外觀"
- 
- #: kdevdesigner/designer/mainwindowactions.cpp:886
-@@ -27753,7 +27838,7 @@
- 
- #: kdevdesigner/designer/mainwindowactions.cpp:887
- msgid "... in %1 Style"
--msgstr "... 以 %1 樣式"
-+msgstr "… 以 %1 樣式"
- 
- #: kdevdesigner/designer/mainwindowactions.cpp:888
- msgid "Opens a preview in %1 style"
-@@ -27761,10 +27846,11 @@
- 
- #: kdevdesigner/designer/mainwindowactions.cpp:889
- msgid ""
--"<b>Open a preview in %1 style.</b>"
--"<p>Use the preview to test the design and signal-slot connections of the "
--"current form. %2</p>"
--msgstr "<b>以 %1 樣式開啟預覽</b> <p>使用預覽來測試目前表單的設計與信號/插槽連線。%2</p>"
-+"<b>Open a preview in %1 style.</b><p>Use the preview to test the design and "
-+"signal-slot connections of the current form. %2</p>"
-+msgstr ""
-+"<b>以 %1 樣式開啟預覽</b> <p>使用預覽來測試目前表單的設計與信號/插槽連線。%"
-+"2</p>"
- 
- #: kdevdesigner/designer/mainwindowactions.cpp:905
- msgid "Tile"
-@@ -27872,7 +27958,7 @@
- 
- #: kdevdesigner/designer/mainwindowactions.cpp:1004
- msgid "&Register Qt..."
--msgstr "註冊 Qt(&R)..."
-+msgstr "註冊 Qt(&R)…"
- 
- #: kdevdesigner/designer/mainwindowactions.cpp:1005
- msgid "Opens a web browser at the evaluation form on www.trolltech.com"
-@@ -27893,7 +27979,7 @@
- 
- #: kdevdesigner/designer/mainwindowactions.cpp:1041
- msgid "Create a new project, form or source file..."
--msgstr "建立新專案、表單或程式源碼檔案..."
-+msgstr "建立新專案、表單或程式原始碼檔案…"
- 
- #: kdevdesigner/designer/mainwindowactions.cpp:1075
- msgid "Name of File"
-@@ -27920,7 +28006,7 @@
- 
- #: kdevdesigner/designer/mainwindowactions.cpp:1199
- msgid "Open a file..."
--msgstr "開啟檔案..."
-+msgstr "開啟檔案…"
- 
- #: kdevdesigner/designer/mainwindowactions.cpp:1211
- msgid "*.ui *.pro|Designer Files"
-@@ -27936,7 +28022,7 @@
- 
- #: kdevdesigner/designer/mainwindowactions.cpp:1279
- msgid "Importing '%1' using import filter ..."
--msgstr "正在使用匯入過濾器匯入 %1 ..."
-+msgstr "正在使用匯入過濾器匯入 %1…"
- 
- #: kdevdesigner/designer/mainwindowactions.cpp:1283
- msgid "Nothing to load in '%1'"
-@@ -27944,7 +28030,7 @@
- 
- #: kdevdesigner/designer/mainwindowactions.cpp:1322
- msgid "Reading file '%1'..."
--msgstr "正在讀取檔案 %1 ..."
-+msgstr "正在讀取檔案 %1…"
- 
- #: kdevdesigner/designer/mainwindowactions.cpp:1341
- msgid "Loaded file '%1'"
-@@ -27968,7 +28054,7 @@
- 
- #: kdevdesigner/designer/mainwindowactions.cpp:1398
- msgid "Enter a filename..."
--msgstr "輸入檔案名稱..."
-+msgstr "輸入檔案名稱…"
- 
- #: kdevdesigner/designer/mainwindowactions.cpp:1439
- #: kdevdesigner/designer/mainwindowactions.cpp:1494
-@@ -27990,21 +28076,23 @@
- "to paste into which does not contain a layout. Break the layout\n"
- "of the container you want to paste into and select this container\n"
- "and then paste again."
--msgstr "無法貼上元件。設計器找不到未佈局容器來貼上。請先打破要貼上的容器的佈局，並再試一次。"
-+msgstr ""
-+"無法貼上元件。設計器找不到未布局容器來貼上。請先打破要貼上的容器的布局，並再"
-+"試一次。"
- 
- #: kdevdesigner/designer/mainwindowactions.cpp:1730
- msgid "Edit the current form's slots..."
--msgstr "編輯目前表單的插槽..."
-+msgstr "編輯目前表單的插槽…"
- 
- #: kdevdesigner/designer/mainwindowactions.cpp:1741
- msgid "Edit the current form's connections..."
--msgstr "編輯目前表單的連線..."
-+msgstr "編輯目前表單的連線…"
- 
- #: kdevdesigner/designer/mainwindow.cpp:2968
- #: kdevdesigner/designer/mainwindowactions.cpp:1762
- #: kdevdesigner/designer/mainwindowactions.cpp:1785
- msgid "Edit Source"
--msgstr "編輯程式源碼"
-+msgstr "編輯程式原始碼"
- 
- #: kdevdesigner/designer/mainwindow.cpp:2969
- #: kdevdesigner/designer/mainwindowactions.cpp:1763
-@@ -28013,20 +28101,20 @@
- "There is no plugin for editing %1 code installed.\n"
- "Note: Plugins are not available in static Qt configurations."
- msgstr ""
--"沒有安裝編輯 %1 程式源碼的外掛程式。\n"
-+"沒有安裝編輯 %1 程式原始碼的外掛程式。\n"
- "注意：外掛程式在靜態 Qt 設定中沒有。"
- 
- #: kdevdesigner/designer/mainwindowactions.cpp:1841
- msgid "Edit the current form's settings..."
--msgstr "編輯目前表單的設定..."
-+msgstr "編輯目前表單的設定…"
- 
- #: kdevdesigner/designer/mainwindowactions.cpp:1870
- msgid "Edit preferences..."
--msgstr "編輯喜好設定..."
-+msgstr "編輯喜好設定…"
- 
- #: kdevdesigner/designer/mainwindowactions.cpp:2038
- msgid "Edit custom widgets..."
--msgstr "編輯自訂元件..."
-+msgstr "編輯自訂元件…"
- 
- #: kdevdesigner/designer/command.cpp:528 kdevdesigner/designer/command.cpp:540
- msgid "Set 'name' Property"
-@@ -28097,7 +28185,7 @@
- 
- #: kdevdesigner/designer/multilineeditorimpl.cpp:134
- msgid "Break"
--msgstr "換行"
-+msgstr "換列"
- 
- #: kdevdesigner/designer/multilineeditorimpl.cpp:139
- msgid "Paragraph"
-@@ -28149,7 +28237,7 @@
- 
- #: kdevdesigner/designer/multilineeditorimpl.cpp:217
- msgid "Word Wrapping"
--msgstr "文字折行"
-+msgstr "文字折列"
- 
- #: kdevdesigner/designer/multilineeditorimpl.cpp:279
- msgid "Set the Text of '%1'"
-@@ -28157,15 +28245,15 @@
- 
- #: kdevdesigner/designer/multilineeditorimpl.cpp:285
- msgid "Set 'wordWrap' of '%2'"
--msgstr "設定 %2 的文字折行屬性"
-+msgstr "設定 %2 的文字折列屬性"
- 
- #: kdevdesigner/designer/kdevdesigner_part.cpp:131
- msgid "&Designer Project Settings..."
--msgstr "設計器專案設定(&D)..."
-+msgstr "設計器專案設定(&D)…"
- 
- #: kdevdesigner/designer/kdevdesigner_part.cpp:153
- msgid "Lay Out in &Grid"
--msgstr "格狀佈局(&G)"
-+msgstr "格狀布局(&G)"
- 
- #: kdevdesigner/designer/kdevdesigner_part.cpp:161
- msgid "Add Spacer"
-@@ -28181,7 +28269,7 @@
- 
- #: kdevdesigner/designer/kdevdesigner_part.cpp:172
- msgid "Configure &KDevDesigner..."
--msgstr "設定 KDevDesigner(&K)..."
-+msgstr "設定 KDevDesigner(&K)…"
- 
- #: kdevdesigner/designer/kdevdesigner_part.cpp:277
- msgid "KDevDesignerPart"
-@@ -28262,7 +28350,7 @@
- 
- #: kdevdesigner/designer/actionlistview.cpp:95
- msgid "&Connect Action..."
--msgstr "連線動作(&C)..."
-+msgstr "連線動作(&C)…"
- 
- #: kdevdesigner/designer/actionlistview.cpp:97
- msgid "Delete Action"
-@@ -28270,11 +28358,11 @@
- 
- #: kdevdesigner/designer/workspace.cpp:598
- msgid "&Open Source File"
--msgstr "開啟程式源碼檔案(&O)"
-+msgstr "開啟程式原始碼檔案(&O)"
- 
- #: kdevdesigner/designer/workspace.cpp:601
- msgid "&Remove Source File From Project"
--msgstr "從專案中刪除程式源碼檔案(&R)"
-+msgstr "從專案中刪除程式原始碼檔案(&R)"
- 
- #: kdevdesigner/designer/workspace.cpp:604
- msgid "&Open Form"
-@@ -28287,15 +28375,15 @@
- 
- #: kdevdesigner/designer/workspace.cpp:610
- msgid "&Open Form Source"
--msgstr "開啟表單源碼(&O)"
-+msgstr "開啟表單原始碼(&O)"
- 
- #: kdevdesigner/designer/workspace.cpp:614
- msgid "&Remove Source File From Form"
--msgstr "從表單中刪除程式源碼檔案(&R)"
-+msgstr "從表單中刪除程式原始碼檔案(&R)"
- 
- #: kdevdesigner/designer/workspace.cpp:623
- msgid "&Open Source"
--msgstr "開啟源碼檔案(&O)"
-+msgstr "開啟原始碼檔案(&O)"
- 
- #: kdevdesigner/designer/variabledialogimpl.cpp:104
- msgid ""
-@@ -28376,7 +28464,7 @@
- 
- #: kdevdesigner/designer/hierarchyview.cpp:1052
- msgid "New..."
--msgstr "新增..."
-+msgstr "新增…"
- 
- #: kdevdesigner/designer/hierarchyview.cpp:1061
- msgid "Goto Implementation"
-@@ -28417,7 +28505,7 @@
- 
- #: kdevdesigner/designer/hierarchyview.cpp:1270
- msgid "List of all classes and its declarations of the current source file"
--msgstr "目前程式源碼檔中所有的類別與其宣告列表"
-+msgstr "目前程式原始碼檔中所有的類別與其宣告列表"
- 
- #: kdevdesigner/designer/customwidgeteditorimpl.cpp:222
- msgid "Adding Custom Widget"
-@@ -28538,7 +28626,7 @@
- msgid ""
- "The project already contains a source file with \n"
- "filename '%1'. Please choose a new filename."
--msgstr "此專案已經包含了檔案名稱為 %1 的源碼檔。請選擇新的檔名。"
-+msgstr "此專案已經包含了檔案名稱為 %1 的原始碼檔。請選擇新的檔名。"
- 
- #: kdevdesigner/designer/popupmenueditor.cpp:303
- msgid "new item"
-@@ -28587,9 +28675,11 @@
- 
- #: kdevdesigner/designer/mainwindow.cpp:205
- msgid ""
--"Ready - This is the non-commercial version of Qt - For commercial evaluations, "
--"use the help menu to register with Trolltech."
--msgstr "已就緒─這是非商頁版的 Qt─要進行商業用途，請使用「說明」選單向 Trolltech 註冊。"
-+"Ready - This is the non-commercial version of Qt - For commercial "
-+"evaluations, use the help menu to register with Trolltech."
-+msgstr ""
-+"已就緒─這是非商頁版的 Qt─要進行商業用途，請使用「說明」選單向 Trolltech 註"
-+"冊。"
- 
- #: kdevdesigner/designer/mainwindow.cpp:361
- #: kdevdesigner/designer/mainwindow.cpp:3747
-@@ -28598,28 +28688,25 @@
- 
- #: kdevdesigner/designer/mainwindow.cpp:363
- msgid ""
--"<b>The Property Editor</b>"
--"<p>You can change the appearance and behavior of the selected widget in the "
--"property editor.</p>"
--"<p>You can set properties for components and forms at design time and see the "
--"immediately see the effects of the changes. Each property has its own editor "
--"which (depending on the property) can be used to enter new values, open a "
--"special dialog, or to select values from a predefined list. Click <b>F1</b> "
--"to get detailed help for the selected property.</p>"
--"<p>You can resize the columns of the editor by dragging the separators in the "
--"list's header.</p>"
--"<p><b>Signal Handlers</b></p>"
--"<p>In the Signal Handlers tab you can define connections between the signals "
--"emitted by widgets and the slots in the form. (These connections can also be "
--"made using the connection tool.)"
--msgstr ""
--"<b>屬性編輯器</b>"
--"<p>您可以在屬性編輯器中變更所選取元件的外觀與行為。</p> "
--"<p>您可以在設計期設定元件與表單的屬性，並馬上看到改變後的效果。每個屬性都有自己的編輯器，可用於輸入新值、開啟特殊對話框，或是從特定的清單中選取值。按下 "
--"<b>F1</b> 可以取得所選取屬性的詳細說明。</p> "
--"<p>您可以拖曳標頭上的分隔符重新調整編輯器的欄位。</p> "
--"<p><b>信號處理器</b></p> "
--"<p>您可以在信號處理器頁中定義表單元件產生的信號，以及插槽之間的連線關係。（這些連線也可以用連線工具來設定）</p>"
-+"<b>The Property Editor</b><p>You can change the appearance and behavior of "
-+"the selected widget in the property editor.</p><p>You can set properties for "
-+"components and forms at design time and see the immediately see the effects "
-+"of the changes. Each property has its own editor which (depending on the "
-+"property) can be used to enter new values, open a special dialog, or to "
-+"select values from a predefined list. Click <b>F1</b> to get detailed help "
-+"for the selected property.</p><p>You can resize the columns of the editor by "
-+"dragging the separators in the list's header.</p><p><b>Signal Handlers</b></"
-+"p><p>In the Signal Handlers tab you can define connections between the "
-+"signals emitted by widgets and the slots in the form. (These connections can "
-+"also be made using the connection tool.)"
-+msgstr ""
-+"<b>屬性編輯器</b><p>您可以在屬性編輯器中變更所選取元件的外觀與行為。</p> <p>"
-+"您可以在設計期設定元件與表單的屬性，並馬上看到改變後的效果。每個屬性都有自己"
-+"的編輯器，可用於輸入新值、開啟特殊對話框，或是從特定的清單中選取值。按下 "
-+"<b>F1</b> 可以取得所選取屬性的詳細說明。</p> <p>您可以拖曳標頭上的分隔符重新"
-+"調整編輯器的欄位。</p> <p><b>信號處理器</b></p> <p>您可以在信號處理器頁中定義"
-+"表單元件產生的信號，以及插槽之間的連線關係。（這些連線也可以用連線工具來設"
-+"定）</p>"
- 
- #: kdevdesigner/designer/mainwindow.cpp:390
- msgid "Output Window"
-@@ -28631,20 +28718,17 @@
- 
- #: kdevdesigner/designer/mainwindow.cpp:407
- msgid ""
--"<b>The Object Explorer</b>"
--"<p>The Object Explorer provides an overview of the relationships between the "
--"widgets in a form. You can use the clipboard functions using a context menu for "
--"each item in the view. It is also useful for selecting widgets in forms that "
--"have complex layouts.</p>"
--"<p>The columns can be resized by dragging the separator in the list's "
--"header.</p>"
--"<p>The second tab shows all the form's slots, class variables, includes, "
--"etc.</p>"
--msgstr ""
--"<b>物件管理器</b>"
--"<p>物件管理器提供表單中的元件之間的關聯概要。您可以用內容選單對檢視中的每個項目做剪貼。它也可以用於選取有複雜佈局的表單中的元件。</p> "
--"<p>這些欄位可以透過拖曳標頭上的分隔器來調整大小。</p> "
--"<p>第二頁顯示所有表單的插槽，類別變數，引入檔等等。</p>"
-+"<b>The Object Explorer</b><p>The Object Explorer provides an overview of the "
-+"relationships between the widgets in a form. You can use the clipboard "
-+"functions using a context menu for each item in the view. It is also useful "
-+"for selecting widgets in forms that have complex layouts.</p><p>The columns "
-+"can be resized by dragging the separator in the list's header.</p><p>The "
-+"second tab shows all the form's slots, class variables, includes, etc.</p>"
-+msgstr ""
-+"<b>物件管理器</b><p>物件管理器提供表單中的元件之間的關聯概要。您可以用內容選"
-+"單對檢視中的每個項目做剪貼。它也可以用於選取有複雜布局的表單中的元件。</p> "
-+"<p>這些欄位可以透過拖曳標頭上的分隔器來調整大小。</p> <p>第二頁顯示所有表單的"
-+"插槽，類別變數，引入檔等等。</p>"
- 
- #: kdevdesigner/designer/mainwindow.cpp:424
- msgid "Start typing the buffer you want to switch to here (ALT+B)"
-@@ -28656,14 +28740,12 @@
- 
- #: kdevdesigner/designer/mainwindow.cpp:434
- msgid ""
--"<b>The Project Overview Window</b>"
--"<p>The Project Overview Window displays all the current project, including "
--"forms and source files.</p>"
--"<p>Use the search field to rapidly switch between files.</p>"
--msgstr ""
--"<b>專案概要視窗</b>"
--"<p>專案概要視窗顯示目前所有的專案，包括表單與程式源碼檔。</p> "
--"<p>使用搜尋欄位來快速在檔案間切換。</p>"
-+"<b>The Project Overview Window</b><p>The Project Overview Window displays "
-+"all the current project, including forms and source files.</p><p>Use the "
-+"search field to rapidly switch between files.</p>"
-+msgstr ""
-+"<b>專案概要視窗</b><p>專案概要視窗顯示目前所有的專案，包括表單與程式原始碼檔。"
-+"</p> <p>使用搜尋欄位來快速在檔案間切換。</p>"
- 
- #: kdevdesigner/designer/mainwindow.cpp:451
- msgid "Action Editor"
-@@ -28671,16 +28753,15 @@
- 
- #: kdevdesigner/designer/mainwindow.cpp:452
- msgid ""
--"<b>The Action Editor</b>"
--"<p>The Action Editor is used to add actions and action groups to a form, and to "
--"connect actions to slots. Actions and action groups can be dragged into menus "
--"and into toolbars, and may feature keyboard shortcuts and tooltips. If actions "
--"have pixmaps these are displayed on toolbar buttons and besides their names in "
--"menus.</p>"
--msgstr ""
--"<b>動作編輯器</b>"
--"<p>動作編輯器用於在表單中新增動作與動作群組，並將動作連線到插曹。動作與動作群組可以被拖曳到選單與工具列中，也可以指定鍵盤快捷鍵與工具提示。如果動作有像素圖，"
--"則會顯示在工具列按鈕，以及選單中它們的名稱旁邊。</p>"
-+"<b>The Action Editor</b><p>The Action Editor is used to add actions and "
-+"action groups to a form, and to connect actions to slots. Actions and action "
-+"groups can be dragged into menus and into toolbars, and may feature keyboard "
-+"shortcuts and tooltips. If actions have pixmaps these are displayed on "
-+"toolbar buttons and besides their names in menus.</p>"
-+msgstr ""
-+"<b>動作編輯器</b><p>動作編輯器用於在表單中新增動作與動作群組，並將動作連線到"
-+"插曹。動作與動作群組可以被拖曳到選單與工具列中，也可以指定鍵盤快捷鍵與工具提"
-+"示。如果動作有像素圖，則會顯示在工具列按鈕，以及選單中它們的名稱旁邊。</p>"
- 
- #: kdevdesigner/designer/mainwindow.cpp:472
- msgid "Toolbox"
-@@ -28688,23 +28769,21 @@
- 
- #: kdevdesigner/designer/mainwindow.cpp:1281
- msgid ""
--"<b>The Form Window</b>"
--"<p>Use the various tools to add widgets or to change the layout and behavior of "
--"the components in the form. Select one or multiple widgets to move them or lay "
--"them out. If a single widget is chosen it can be resized using the resize "
--"handles.</p>"
--"<p>Changes in the <b>Property Editor</b> are visible at design time, and you "
--"can preview the form in different styles.</p>"
--"<p>You can change the grid resolution, or turn the grid off in the <b>"
--"Preferences</b> dialog in the <b>Edit</b> menu."
--"<p>You can have several forms open, and all open forms are listed in the <b>"
--"Form List</b>."
--msgstr ""
--"<b>表單視窗</b>"
--"<p>使用不同的工具新增元件，或改變表單中元件的佈局與行為。選取一個或多個元件可以移動或進行佈局。如果選取單一元件，它可以調整大小。</p> "
--"<p>在<b>屬性編輯器</b>中的變更可以在設計期就看到，您也可以用不同的樣式來預覽表單。</p> "
--"<p>您可以在<b>編輯</b>選單中的<b>喜好設定</b>對話框中變更格子的解析度，或是關閉格線。</p> "
--"<p>您也可以同時開啟數個表單，每個表單都會列在<b>表單列表</b>中。"
-+"<b>The Form Window</b><p>Use the various tools to add widgets or to change "
-+"the layout and behavior of the components in the form. Select one or "
-+"multiple widgets to move them or lay them out. If a single widget is chosen "
-+"it can be resized using the resize handles.</p><p>Changes in the <b>Property "
-+"Editor</b> are visible at design time, and you can preview the form in "
-+"different styles.</p><p>You can change the grid resolution, or turn the grid "
-+"off in the <b>Preferences</b> dialog in the <b>Edit</b> menu.<p>You can have "
-+"several forms open, and all open forms are listed in the <b>Form List</b>."
-+msgstr ""
-+"<b>表單視窗</b><p>使用不同的工具新增元件，或改變表單中元件的布局與行為。選取"
-+"一個或多個元件可以移動或進行布局。如果選取單一元件，它可以調整大小。</p> <p>"
-+"在<b>屬性編輯器</b>中的變更可以在設計期就看到，您也可以用不同的樣式來預覽表"
-+"單。</p> <p>您可以在<b>編輯</b>選單中的<b>喜好設定</b>對話框中變更格子的解析"
-+"度，或是關閉格線。</p> <p>您也可以同時開啟數個表單，每個表單都會列在<b>表單列"
-+"表</b>中。"
- 
- #: kdevdesigner/designer/mainwindow.cpp:1336
- msgid "Cannot create an invalid project."
-@@ -28722,20 +28801,20 @@
- 
- #: kdevdesigner/designer/mainwindow.cpp:1580
- msgid "Choose Pixmap..."
--msgstr "選擇像素圖..."
-+msgstr "選擇像素圖…"
- 
- #: kdevdesigner/designer/mainwindow.cpp:1584
- msgid "Edit Text..."
--msgstr "編輯文字..."
-+msgstr "編輯文字…"
- 
- #: kdevdesigner/designer/mainwindow.cpp:1588
- msgid "Edit Title..."
--msgstr "編輯標題..."
-+msgstr "編輯標題…"
- 
- #: kdevdesigner/designer/mainwindow.cpp:1592
- #: kdevdesigner/designer/mainwindow.cpp:1702
- msgid "Edit Page Title..."
--msgstr "編輯頁面標題..."
-+msgstr "編輯頁面標題…"
- 
- #: kdevdesigner/designer/mainwindow.cpp:1623
- #: kdevdesigner/designer/mainwindow.cpp:1637
-@@ -28765,11 +28844,11 @@
- 
- #: kdevdesigner/designer/mainwindow.cpp:1667
- msgid "Rename Current Page..."
--msgstr "重新命名目前頁面..."
-+msgstr "重新命名目前頁面…"
- 
- #: kdevdesigner/designer/mainwindow.cpp:1705
- msgid "Edit Pages..."
--msgstr "編輯頁面..."
-+msgstr "編輯頁面…"
- 
- #: kdevdesigner/designer/mainwindow.cpp:1711
- msgid "Add Menu Item"
-@@ -28787,7 +28866,7 @@
- #: kdevdesigner/designer/mainwindow.cpp:1740
- #: kdevdesigner/designer/mainwindow.cpp:2643
- msgid "Set 'wordwrap' of '%1'"
--msgstr "設定 %1 的文字折行"
-+msgstr "設定 %1 的文字折列"
- 
- #: kdevdesigner/designer/mainwindow.cpp:1749
- #: kdevdesigner/designer/mainwindow.cpp:2652
-@@ -28846,7 +28925,7 @@
- 
- #: kdevdesigner/designer/mainwindow.cpp:2613
- msgid "Edit %1..."
--msgstr "編輯 %1..."
-+msgstr "編輯 %1…"
- 
- #: kdevdesigner/designer/mainwindow.cpp:2709
- msgid "Insert a %1 (custom widget)"
-@@ -28854,15 +28933,15 @@
- 
- #: kdevdesigner/designer/mainwindow.cpp:2710
- msgid ""
--"<b>%1 (custom widget)</b>"
--"<p>Click <b>Edit Custom Widgets...</b> in the <b>Tools|Custom</b> "
--"menu to add and change custom widgets. You can add properties as well as "
--"signals and slots to integrate them into Qt Designer, and provide a pixmap "
--"which will be used to represent the widget on the form.</p>"
--msgstr ""
--"<b>%1（自訂元件）</b>"
--"<p>點擊<b>工具|自訂</b>選單中的<b>編輯自訂元件...</b>可以新增並變更自訂元件。您可以新增屬性、信號與插槽以整合進 Qt "
--"設計器，並提供像素圖以便在表單中展示此元件。</p>"
-+"<b>%1 (custom widget)</b><p>Click <b>Edit Custom Widgets...</b> in the "
-+"<b>Tools|Custom</b> menu to add and change custom widgets. You can add "
-+"properties as well as signals and slots to integrate them into Qt Designer, "
-+"and provide a pixmap which will be used to represent the widget on the form."
-+"</p>"
-+msgstr ""
-+"<b>%1（自訂元件）</b><p>點擊<b>工具|自訂</b>選單中的<b>編輯自訂元件...</b>可"
-+"以新增並變更自訂元件。您可以新增屬性、信號與插槽以整合進 Qt 設計器，並提供像"
-+"素圖以便在表單中展示此元件。</p>"
- 
- #: kdevdesigner/designer/mainwindow.cpp:2844
- msgid "Restoring Last Session"
-@@ -28873,7 +28952,9 @@
- "Qt Designer found some temporary saved files, which were\n"
- "written when Qt Designer crashed last time. Do you want to\n"
- "load these files?"
--msgstr "Qt 設計器發現了一些暫存檔，是上次 Qt 設計器當掉時 儲存的。您要載入這些檔案嗎？"
-+msgstr ""
-+"Qt 設計器發現了一些暫存檔，是上次 Qt 設計器當掉時 儲存的。您要載入這些檔案"
-+"嗎？"
- 
- #: kdevdesigner/designer/mainwindow.cpp:2909
- msgid "There is no help available for this dialog at the moment."
-@@ -28895,16 +28976,15 @@
- #: kdevdesigner/designer/formwindow.cpp:380
- #: kdevdesigner/designer/formwindow.cpp:507
- msgid ""
--"<b>A %1 (custom widget)</b> "
--"<p>Click <b>Edit Custom Widgets...</b> in the <b>Tools|Custom</b> "
--"menu to add and change custom widgets. You can add properties as well as "
--"signals and slots to integrate custom widgets into <i>Qt Designer</i>"
--", and provide a pixmap which will be used to represent the widget on the "
--"form.</p>"
--msgstr ""
--"<b>%1（自訂元件）</b>"
--"<p>點擊<b>工具|自訂</b>選單中的<b>編輯自訂元件...</b>可以新增並變更自訂元件。您可以新增屬性、信號與插槽以整合進 Qt "
--"設計器，並提供像素圖以便在表單中展示此元件。</p>"
-+"<b>A %1 (custom widget)</b> <p>Click <b>Edit Custom Widgets...</b> in the "
-+"<b>Tools|Custom</b> menu to add and change custom widgets. You can add "
-+"properties as well as signals and slots to integrate custom widgets into "
-+"<i>Qt Designer</i>, and provide a pixmap which will be used to represent the "
-+"widget on the form.</p>"
-+msgstr ""
-+"<b>%1（自訂元件）</b><p>點擊<b>工具|自訂</b>選單中的<b>編輯自訂元件...</b>可"
-+"以新增並變更自訂元件。您可以新增屬性、信號與插槽以整合進 Qt 設計器，並提供像"
-+"素圖以便在表單中展示此元件。</p>"
- 
- #: kdevdesigner/designer/formwindow.cpp:387
- #: kdevdesigner/designer/formwindow.cpp:514
-@@ -28924,11 +29004,11 @@
- 
- #: kdevdesigner/designer/formwindow.cpp:663
- msgid "Set buddy for '%1' to..."
--msgstr "設定 %1 的對應元件為..."
-+msgstr "設定 %1 的對應元件為…"
- 
- #: kdevdesigner/designer/formwindow.cpp:665
- msgid "Connect '%1' with..."
--msgstr "將 %1 連線到..."
-+msgstr "將 %1 連線到…"
- 
- #: kdevdesigner/designer/formwindow.cpp:687
- #: kdevdesigner/designer/formwindow.cpp:733
-@@ -28945,7 +29025,7 @@
- 
- #: kdevdesigner/designer/formwindow.cpp:905
- msgid "Set buddy '%1' to ..."
--msgstr "設定 %1 的對應元件到..."
-+msgstr "設定 %1 的對應元件到…"
- 
- #: kdevdesigner/designer/formwindow.cpp:963
- #: kdevdesigner/designer/formwindow.cpp:1068
-@@ -28960,9 +29040,9 @@
- "must first be broken.\n"
- "Break the layout or cancel the operation?"
- msgstr ""
--"您試著插入元件到已佈局容器元件 %1。\n"
--"這是不可能的。要插入此元件，%1 的佈局必須先打破。\n"
--"要打破佈局還是要取消此動作？"
-+"您試著插入元件到已布局容器元件 %1。\n"
-+"這是不可能的。要插入此元件，%1 的布局必須先打破。\n"
-+"要打破布局還是要取消此動作？"
- 
- #: kdevdesigner/designer/formwindow.cpp:1047
- #, c-format
-@@ -28976,19 +29056,19 @@
- 
- #: kdevdesigner/designer/formwindow.cpp:1743
- msgid "Click widgets to change the tab order..."
--msgstr "點選元件以改變 tab 順序..."
-+msgstr "點選元件以改變 tab 順序…"
- 
- #: kdevdesigner/designer/formwindow.cpp:1754
- msgid "Drag a line to create a connection..."
--msgstr "拖曳線條以建立連線..."
-+msgstr "拖曳線條以建立連線…"
- 
- #: kdevdesigner/designer/formwindow.cpp:1756
- msgid "Drag a line to set a buddy..."
--msgstr "拖曳線條以設定對應元件..."
-+msgstr "拖曳線條以設定對應元件…"
- 
- #: kdevdesigner/designer/formwindow.cpp:1762
- msgid "Click on the form to insert a %1..."
--msgstr "點選表單以插入 %1..."
-+msgstr "點選表單以插入 %1…"
- 
- #: kdevdesigner/designer/formwindow.cpp:1834
- msgid ""
-@@ -29032,27 +29112,27 @@
- 
- #: kdevdesigner/designer/formwindow.cpp:2022
- msgid "Lay Out Horizontally (in splitter)"
--msgstr "水平佈局（在 Splitter 中）"
-+msgstr "水平布局（在 Splitter 中）"
- 
- #: kdevdesigner/designer/formwindow.cpp:2032
- msgid "Lay Out Vertically (in splitter)"
--msgstr "垂直佈局（在 Splitter 中）"
-+msgstr "垂直布局（在 Splitter 中）"
- 
- #: kdevdesigner/designer/formwindow.cpp:2066
- msgid "Lay Out Children Horizontally"
--msgstr "水平佈局子元件"
-+msgstr "水平布局子元件"
- 
- #: kdevdesigner/designer/formwindow.cpp:2087
- msgid "Lay Out Children Vertically"
--msgstr "垂直佈局子元件"
-+msgstr "垂直布局子元件"
- 
- #: kdevdesigner/designer/formwindow.cpp:2111
- msgid "Lay Out Children in a Grid"
--msgstr "格狀佈局子元件"
-+msgstr "格狀布局子元件"
- 
- #: kdevdesigner/designer/formwindow.cpp:2223
- msgid "Edit connections..."
--msgstr "編輯連線..."
-+msgstr "編輯連線…"
- 
- #: kdevdesigner/designer/projectsettingsimpl.cpp:96
- msgid ""
-@@ -29106,23 +29186,26 @@
- 
- #: parts/snippet/snippetdlg.ui.h:20
- msgid ""
--"To use variables in a snippet, you just have to enclose the variablename with "
--"$-characters. When you use the snippet, you will then be asked for a value for "
--"this variable. \n"
-+"To use variables in a snippet, you just have to enclose the variablename "
-+"with $-characters. When you use the snippet, you will then be asked for a "
-+"value for this variable. \n"
- "Example snippet: This is a $VAR$\n"
- "When you use this snippet you will be prompted for a value for the variable "
- "$VAR$. Any occourences of $VAR$ will then be replaced with whatever you've "
- "entered.\n"
--"If you need a single $-character in a snippet, which is not used to enclose a "
--"variable, type $$(two dollar characters) instead. They will automatically be "
--"replaced with a single $-character when you use the snippet.\n"
--"If you want to change the default delimiter to anything different, please use "
--"the settings dialog to do so."
-+"If you need a single $-character in a snippet, which is not used to enclose "
-+"a variable, type $$(two dollar characters) instead. They will automatically "
-+"be replaced with a single $-character when you use the snippet.\n"
-+"If you want to change the default delimiter to anything different, please "
-+"use the settings dialog to do so."
- msgstr ""
--"要在片段中使用變數，您只要將變數名稱以 $ 字元包起來。當您使用片段時，您會被詢問此變數的值。\n"
-+"要在片段中使用變數，您只要將變數名稱以 $ 字元包起來。當您使用片段時，您會被詢"
-+"問此變數的值。\n"
- "範例：這是一個 $VAR$\n"
--"當您使用此片段時您會被詢問此變數 $VAR$ 的值。所有的 $VAR$ 就會被您所輸入的值所取代。\n"
--"若是您需要在片段中使用 $ 字元，則輸入 $$ （連續兩個 $ 字元）。它會自動以 $ 取代。\n"
-+"當您使用此片段時您會被詢問此變數 $VAR$ 的值。所有的 $VAR$ 就會被您所輸入的值"
-+"所取代。\n"
-+"若是您需要在片段中使用 $ 字元，則輸入 $$ （連續兩個 $ 字元）。它會自動以 $ 取"
-+"代。\n"
- "如果您要改變預設的分隔子，您可以到設定對話框中去設定。"
- 
- #: parts/snippet/snippetdlg.ui.h:20
-diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdevelop/kdevtipofday.po kde-i18n-zh_TW-3.5.10/messages/kdevelop/kdevtipofday.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdevelop/kdevtipofday.po	2007-05-14 12:23:03.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdevelop/kdevtipofday.po	2011-11-11 15:45:17.000000000 +0100
-@@ -7,8 +7,7 @@
- "Project-Id-Version: kdevtipofday\n"
- "POT-Creation-Date: 2007-03-26 21:53+0200\n"
- "PO-Revision-Date: 2007-03-28 14:58+0800\n"
--"Last-Translator: Frank Weng (a.k.a. Franklin) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Chinese Traditional <zh-l10n@linux.org.tw>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
-@@ -25,54 +24,57 @@
- 
- #: tipofday_part.cpp:39
- msgid ""
--"<b>Tip of the day</b>"
--"<p>Will display another good tip \n"
-+"<b>Tip of the day</b><p>Will display another good tip \n"
- "contributed by KDevelop users."
- msgstr "<b>每日小提示</b> <p>將顯示另一個由 KDevelop 使用者提供的小密訣。"
- 
- #: tips.cc:3
- msgid ""
--"<p>If you want to specify additional command-line options to your make program, "
--"you can set them in the <b>Project Options</b> dialog, <b>Make Options</b> "
--"tab.\n"
-+"<p>If you want to specify additional command-line options to your make "
-+"program, you can set them in the <b>Project Options</b> dialog, <b>Make "
-+"Options</b> tab.\n"
- msgstr ""
--"<p>假如您想要對您的 make 程式指定命令列選項，您可以在「專案選項」設定中的「編譯選項」中設定。\n"
-+"<p>假如您想要對您的 make 程式指定命令列選項，您可以在「專案選項」設定中的「編"
-+"譯選項」中設定。\n"
- 
- #: tips.cc:8
- msgid ""
--"<p>If you use functions of other libraries than the target is currently linked "
--"with, you can specify them in the <b>Target Options</b> dialog.\n"
-+"<p>If you use functions of other libraries than the target is currently "
-+"linked with, you can specify them in the <b>Target Options</b> dialog.\n"
- msgstr ""
--"<p>假如您想要使用不同於目前目標所連結的函式庫的功能的話，您可以在「目標選項」對話框中設定。\n"
-+"<p>假如您想要使用不同於目前目標所連結的函式庫的功能的話，您可以在「目標選項」"
-+"對話框中設定。\n"
- 
- #: tips.cc:13
- msgid ""
--"<p>If you want to change your application's version number, you can change it "
--"in the <b>Project Options</b> dialog, <b>General</b> "
--"tab, automatically updating your project.\n"
-+"<p>If you want to change your application's version number, you can change "
-+"it in the <b>Project Options</b> dialog, <b>General</b> tab, automatically "
-+"updating your project.\n"
- msgstr ""
--"<p>假如您想要改變您的應用程式版本號，您可以在「專案選項」對話框中的「一般」頁裡改變它，讓它自動地更新您的專案。\n"
-+"<p>假如您想要改變您的應用程式版本號，您可以在「專案選項」對話框中的「一般」頁"
-+"裡改變它，讓它自動地更新您的專案。\n"
- 
- #: tips.cc:18
- msgid ""
--"<p>If you want to create a new project, choose \"Project\"->"
--"\"New Project\" from the menu.\n"
--msgstr ""
--"<p>假如您想要建立一個新的專案，從選單中選擇「專案」->「新專案」。\n"
-+"<p>If you want to create a new project, choose \"Project\"->\"New Project\" "
-+"from the menu.\n"
-+msgstr "<p>假如您想要建立一個新的專案，從選單中選擇「專案」->「新專案」。\n"
- 
- #: tips.cc:23
- msgid ""
- "<p>If you changed your applications' classes, you should update your API "
- "documentation by selecting \"Build API Documentation\" from the Build menu.\n"
- msgstr ""
--"<p>假如您改變了您應用程式的類別，您應該從「建立」選單中選擇 「建立 API 文件」來更新您的 API 文件。\n"
-+"<p>假如您改變了您應用程式的類別，您應該從「建立」選單中選擇 「建立 API 文件」"
-+"來更新您的 API 文件。\n"
- 
- #: tips.cc:28
- msgid ""
--"<p>You can save time if you select \"Compile File\" from the Build menu or the "
--"toolbar, to only compile your current implementation file.\n"
-+"<p>You can save time if you select \"Compile File\" from the Build menu or "
-+"the toolbar, to only compile your current implementation file.\n"
- msgstr ""
--"<p>假如您從「建立」選單或工具列中選擇「編譯檔案」，只編譯您目前實作的檔案，您可以節省很多時間。\n"
-+"<p>假如您從「建立」選單或工具列中選擇「編譯檔案」，只編譯您目前實作的檔案，您"
-+"可以節省很多時間。\n"
- 
- #: tips.cc:33
- msgid ""
-@@ -80,156 +82,145 @@
- "\"Search for Help on...\" from the Help menu or use \"Index\" tab of the "
- "documentation tree.\n"
- msgstr ""
--"<p>假如您正在尋找類別或類別成員資訊，從「說明」選單中選擇「搜尋說明...」或使用文件樹中的「索引」頁。\n"
-+"<p>假如您正在尋找類別或類別成員資訊，從「說明」選單中選擇「搜尋說明...」或使"
-+"用文件樹中的「索引」頁。\n"
- 
- #: tips.cc:38
- msgid ""
--"<p>If you want to have info about something in the KDevelop window, select the "
--"\"What's this?\" button in the toolbar and click on the item you don't know "
--"about.\n"
-+"<p>If you want to have info about something in the KDevelop window, select "
-+"the \"What's this?\" button in the toolbar and click on the item you don't "
-+"know about.\n"
- msgstr ""
--"<p>假如您想要在 KDevelop 視窗中知道某些資訊，在工具選單中選擇「這是什麼？」並在您所不知道的項目上按一下。\n"
-+"<p>假如您想要在 KDevelop 視窗中知道某些資訊，在工具選單中選擇「這是什麼？」並"
-+"在您所不知道的項目上按一下。\n"
- 
- #: tips.cc:43
- msgid ""
--"<p>Hint: You can search the documentation for a keyword by marking the word and "
--"select \"Search in Documentation\" in the right button popup menu.\n"
-+"<p>Hint: You can search the documentation for a keyword by marking the word "
-+"and select \"Search in Documentation\" in the right button popup menu.\n"
- msgstr ""
--"<p>提示：您可以選取某個單字，並按滑鼠右鍵，在彈出選單中選擇「在文件中尋找」在文件中尋找某個關鍵字。\n"
-+"<p>提示：您可以選取某個單字，並按滑鼠右鍵，在彈出選單中選擇「在文件中尋找」在"
-+"文件中尋找某個關鍵字。\n"
- 
- #: tips.cc:48
--msgid ""
--"<p>The KDevelop Team wishes you a nice day !\n"
--msgstr ""
--"<p>KDevelop 開發團隊希望您有美好的一天。\n"
-+msgid "<p>The KDevelop Team wishes you a nice day !\n"
-+msgstr "<p>KDevelop 開發團隊希望您有美好的一天。\n"
- 
- #: tips.cc:53
- msgid ""
--"<p>If you have found a bug in KDevelop, please let us know. Use KDE Bugzilla at "
--"http://bugs.kde.org/ or select \"Help\"->\"Report Bug\" from the menu.\n"
-+"<p>If you have found a bug in KDevelop, please let us know. Use KDE Bugzilla "
-+"at http://bugs.kde.org/ or select \"Help\"->\"Report Bug\" from the menu.\n"
- msgstr ""
- "<p>假如您在 KDevelop 中發現錯誤，請讓我們知道。您可以使用 KDE Bugzilla "
- "（http://bugs.kde.org/）或是選擇「說明」選單中的「報告問題」。\n"
- 
- #: tips.cc:58
- msgid ""
--"<p>If you want to add your own documentation to the documentation tree use <b>"
--"Documentation Tree</b> tab in the <b>Configure KDevelop</b> dialog.\n"
-+"<p>If you want to add your own documentation to the documentation tree use "
-+"<b>Documentation Tree</b> tab in the <b>Configure KDevelop</b> dialog.\n"
- msgstr ""
--"<p>假如您想要增加您自已的文件到文件樹中，您可以在「設定 KDevelop」對話框中的「文件樹」頁裡設定。\n"
-+"<p>假如您想要增加您自已的文件到文件樹中，您可以在「設定 KDevelop」對話框中的"
-+"「文件樹」頁裡設定。\n"
- 
- #: tips.cc:63
- msgid ""
--"<p>...that you can create a new class with \"New Class\" from the \"Project\" "
--"menu?\n"
--msgstr ""
--"<p>您可以從「專案」選單裡的「新增類別」來建立新的類別。\n"
-+"<p>...that you can create a new class with \"New Class\" from the \"Project"
-+"\" menu?\n"
-+msgstr "<p>您可以從「專案」選單裡的「新增類別」來建立新的類別。\n"
- 
- #: tips.cc:68
- msgid ""
- "<p>To open a project, select \"Open Project\" from the \"Project\" menu.\n"
--msgstr ""
--"<p>要開啟專案，從「專案」選單中選擇「開啟專案」。\n"
-+msgstr "<p>要開啟專案，從「專案」選單中選擇「開啟專案」。\n"
- 
- #: tips.cc:73
- msgid ""
- "<p>If you compile your project and get an error, you can click on the error "
- "message to switch to the file and line where the error occurred.\n"
- msgstr ""
--"<p>假如您編譯您的專案並得到錯誤，您可以點選該錯誤訊息，它會切換到發生錯誤的檔案以及發生錯誤的地方。\n"
-+"<p>假如您編譯您的專案並得到錯誤，您可以點選該錯誤訊息，它會切換到發生錯誤的檔"
-+"案以及發生錯誤的地方。\n"
- 
- #: tips.cc:78
- msgid ""
--"<p>...that you can debug your programs within KDevelop by selecting \"Debug\"->"
--"\"Start\" in the menu?\n"
--msgstr ""
--"<p>您可以在 KDevelop 選單中選擇「除錯」->「開始」來除錯您的程式。\n"
-+"<p>...that you can debug your programs within KDevelop by selecting \"Debug"
-+"\"->\"Start\" in the menu?\n"
-+msgstr "<p>您可以在 KDevelop 選單中選擇「除錯」->「開始」來除錯您的程式。\n"
- 
- #: tips.cc:83
- msgid ""
--"<p>...that you can switch between classes or namespaces by selecting the class "
--"or namespace combo in the toolbar?\n"
-+"<p>...that you can switch between classes or namespaces by selecting the "
-+"class or namespace combo in the toolbar?\n"
- msgstr ""
--"<p>您可以在工具列中的下拉式選單中選擇類別或命名空間，就可以在類別或命名空間之間切換。\n"
-+"<p>您可以在工具列中的下拉式選單中選擇類別或命名空間，就可以在類別或命名空間之"
-+"間切換。\n"
- 
- #: tips.cc:88
- msgid ""
- "<p>...that you can preview images and icons by selecting them in the file "
- "viewer's trees?\n"
--msgstr ""
--"<p>您可以選取影像與圖示，在檔案檢視器中預覽。\n"
-+msgstr "<p>您可以選取影像與圖示，在檔案檢視器中預覽。\n"
- 
- #: tips.cc:93
- msgid ""
- "<p>...that you can set the compiler options in the <b>Project Options</b> "
- "dialog, <b>Configure Options</b> tab?\n"
--msgstr ""
--"<p>您可以在「專案選項」對話框中的「設定選項」頁裡設定編譯器選項。\n"
-+msgstr "<p>您可以在「專案選項」對話框中的「設定選項」頁裡設定編譯器選項。\n"
- 
- #: tips.cc:98
- msgid ""
- "<p>...that you can copy text from the documentation browser to the clipboard "
- "and insert it into your sources?\n"
--msgstr ""
--"<p>您可以從文件瀏覽器複製文字到剪貼簿，並插入您的程式碼中。\n"
-+msgstr "<p>您可以從文件瀏覽器複製文字到剪貼簿，並插入您的程式碼中。\n"
- 
- #: tips.cc:103
- msgid ""
- "<p>...that you should keep your library documentation up to date after "
- "installing new libraries?\n"
--msgstr ""
--"<p>您安裝新的函式庫後，您應該讓您的函式庫文件保持更新。\n"
-+msgstr "<p>您安裝新的函式庫後，您應該讓您的函式庫文件保持更新。\n"
- 
- #: tips.cc:108
--msgid ""
--"<p>...that you can configure the syntax-highlighting of the editor?\n"
--msgstr ""
--"<p>您可以在編輯器中設定語法標示。\n"
-+msgid "<p>...that you can configure the syntax-highlighting of the editor?\n"
-+msgstr "<p>您可以在編輯器中設定語法標示。\n"
- 
- #: tips.cc:113
- msgid ""
- "<p>...that you can access more internal debug functions selecting \"Debug\"->"
- "\"Viewers\"?\n"
--msgstr ""
--"<p>您可以在「除錯」->「檢視器」中使用更多內部的除錯功能。\n"
-+msgstr "<p>您可以在「除錯」->「檢視器」中使用更多內部的除錯功能。\n"
- 
- #: tips.cc:118
- msgid ""
--"<p>...that you can move the cursor by words with Ctrl and left or right arrow?\n"
--msgstr ""
--"<p>您可以按 Ctrl 加左右方向鍵來讓游標跳著字走。\n"
-+"<p>...that you can move the cursor by words with Ctrl and left or right "
-+"arrow?\n"
-+msgstr "<p>您可以按 Ctrl 加左右方向鍵來讓游標跳著字走。\n"
- 
- #: tips.cc:123
--msgid ""
--"<p>...that your source bookmarks are stored in the project?\n"
--msgstr ""
--"<p>您的程式源碼的書籤存在專案之中。\n"
-+msgid "<p>...that your source bookmarks are stored in the project?\n"
-+msgstr "<p>您的程式原始碼的書籤存在專案之中。\n"
- 
- #: tips.cc:128
- msgid ""
- "<p>...that your documentation bookmarks are stored globally in KDevelop "
- "configuration?\n"
--msgstr ""
--"<p>您的文件書籤存在全域的 KDevelop 設定之中。\n"
-+msgstr "<p>您的文件書籤存在全域的 KDevelop 設定之中。\n"
- 
- #: tips.cc:133
- msgid ""
- "<p>...that you can start grep search from inside editor with context menu?\n"
--msgstr ""
--"<p>您可以從編輯器內的選單開始 grep 搜尋。\n"
-+msgstr "<p>您可以從編輯器內的選單開始 grep 搜尋。\n"
- 
- #: tips.cc:138
- msgid ""
--"<p>...that you can set the installation path in \"Project\"->"
--"\"Project Options\" \"Configure Options\" with just adding "
--"\"--prefix=/install/path/\" to the \"Configure arguments\"-list?\n"
-+"<p>...that you can set the installation path in \"Project\"->\"Project "
-+"Options\" \"Configure Options\" with just adding \"--prefix=/install/path/\" "
-+"to the \"Configure arguments\"-list?\n"
- msgstr ""
--"<p>您可以在「專案」->「專案選項」->「設定選項」中的「Configure 參數」裡加入 \"--prefix=/install/path/\" "
--"來設定安裝路徑。\n"
-+"<p>您可以在「專案」->「專案選項」->「設定選項」中的「Configure 參數」裡加入 "
-+"\"--prefix=/install/path/\" 來設定安裝路徑。\n"
- 
- #: tips.cc:143
- msgid ""
--"<p>...that you can compilie your project in \"debug-mode\" and "
--"\"optimized-mode\"?\n"
--msgstr ""
--"<p>您可以用「除錯模式」與「最佳化模式」來編譯您的專案。\n"
-+"<p>...that you can compilie your project in \"debug-mode\" and \"optimized-"
-+"mode\"?\n"
-+msgstr "<p>您可以用「除錯模式」與「最佳化模式」來編譯您的專案。\n"
-diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdewebdev/kfilereplace.po kde-i18n-zh_TW-3.5.10/messages/kdewebdev/kfilereplace.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdewebdev/kfilereplace.po	2008-08-19 20:43:10.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdewebdev/kfilereplace.po	2011-11-11 15:45:17.000000000 +0100
-@@ -8,8 +8,7 @@
- "Project-Id-Version: kfilereplace\n"
- "POT-Creation-Date: 2008-07-08 01:25+0200\n"
- "PO-Revision-Date: 2007-03-27 15:07+0800\n"
--"Last-Translator: Frank Weng (a.k.a. Franklin) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Chinese Traditional <zh-l10n@linux.org.tw>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
-@@ -30,7 +29,7 @@
- 
- #: configurationclasses.cpp:168
- msgid " Line:%3,Col:%4 - \"%1\" -> \"%2\""
--msgstr " 行：%3，字：%4 - \"%1\" -> \"%2\""
-+msgstr " 列：%3，字：%4 - \"%1\" -> \"%2\""
- 
- #: kfilereplace.cpp:49
- msgid "Could not find the KFileReplace part."
-@@ -59,7 +58,9 @@
- msgid ""
- "<qt>Cannot open the file <b>%1</b> and load the string list. This file seems "
- "not to be a valid old kfr file or it is broken.</qt>"
--msgstr "<qt>無法開啟檔案 <b>%1</b> 並載入字串列表。這個檔案似乎不是一個有效的舊 kfr 檔案或它已損壞。</qt>"
-+msgstr ""
-+"<qt>無法開啟檔案 <b>%1</b> 並載入字串列表。這個檔案似乎不是一個有效的舊 kfr "
-+"檔案或它已損壞。</qt>"
- 
- #: kfilereplacelib.cpp:158 kfilereplacelib.cpp:171 kfilereplacelib.cpp:177
- msgid "Cannot read data."
-@@ -79,21 +80,19 @@
- 
- #: kfilereplacepart.cpp:164
- msgid ""
--"<qt>You have selected <b>%1</b> as the encoding of the files."
--"<br>Selecting the correct encoding is very important as if you have files that "
--"have some other encoding than the selected one, after a replace you may damage "
--"those files."
--"<br>"
--"<br>In case you do not know the encoding of your files, select <i>utf8</i> "
--"and <b>enable</b> the creation of backup files. This setting will autodetect <i>"
--"utf8</i> and <i>utf16</i> files, but the changed files will be converted to <i>"
--"utf8</i>.</qt>"
-+"<qt>You have selected <b>%1</b> as the encoding of the files.<br>Selecting "
-+"the correct encoding is very important as if you have files that have some "
-+"other encoding than the selected one, after a replace you may damage those "
-+"files.<br><br>In case you do not know the encoding of your files, select "
-+"<i>utf8</i> and <b>enable</b> the creation of backup files. This setting "
-+"will autodetect <i>utf8</i> and <i>utf16</i> files, but the changed files "
-+"will be converted to <i>utf8</i>.</qt>"
- msgstr ""
--"<qt>您已經選擇了 <b>%1</b> 作為檔案的編碼。"
--"<br>選擇正確的編碼是非常重要的。如果檔案的編碼與選擇的不相符，那麼在作取代之後很有可能會導致檔案損壞。"
--"<br>"
--"<br>若您不清楚檔案的編碼，請選擇 <i>utf8</i> 並<b>啟用</b>副本的建立。這個設定會自動偵測 <i>utf8</i> 及 <i>"
--"utf16</i> 的檔案，但是有更動的檔案會被轉換成 <i>utf8</i>。</qt>"
-+"<qt>您已經選擇了 <b>%1</b> 作為檔案的編碼。<br>選擇正確的編碼是非常重要的。如"
-+"果檔案的編碼與選擇的不相符，那麼在作取代之後很有可能會導致檔案損壞。<br><br>"
-+"若您不清楚檔案的編碼，請選擇 <i>utf8</i> 並<b>啟用</b>副本的建立。這個設定會"
-+"自動偵測 <i>utf8</i> 及 <i>utf16</i> 的檔案，但是有更動的檔案會被轉換成 "
-+"<i>utf8</i>。</qt>"
- 
- #: kfilereplacepart.cpp:164
- msgid "File Encoding Warning"
-@@ -101,7 +100,7 @@
- 
- #: kfilereplacepart.cpp:173
- msgid "Replacing files (simulation)..."
--msgstr "正在取代檔案(模擬)..."
-+msgstr "正在取代檔案(模擬)…"
- 
- #: kfilereplacepart.cpp:174
- msgid "Replaced strings (simulation)"
-@@ -109,7 +108,7 @@
- 
- #: kfilereplacepart.cpp:178
- msgid "Replacing files..."
--msgstr "正在取代檔案..."
-+msgstr "正在取代檔案…"
- 
- #: kfilereplacepart.cpp:179
- msgid "Replaced strings"
-@@ -117,7 +116,7 @@
- 
- #: kfilereplacepart.cpp:233
- msgid "Stopping..."
--msgstr "正在停止..."
-+msgstr "正在停止…"
- 
- #: kfilereplacepart.cpp:247
- msgid "There are no results to save: the result list is empty."
-@@ -189,7 +188,7 @@
- 
- #: kfilereplacepart.cpp:570
- msgid "Customize Search/Replace Session..."
--msgstr "自訂搜尋/取代工作階段..."
-+msgstr "自訂搜尋/取代工作階段…"
- 
- #: kfilereplacepart.cpp:571
- msgid "&Search"
-@@ -209,11 +208,11 @@
- 
- #: kfilereplacepart.cpp:575
- msgid "Cre&ate Report File..."
--msgstr "建立報告檔案(&A)..."
-+msgstr "建立報告檔案(&A)…"
- 
- #: kfilereplacepart.cpp:578
- msgid "&Add String..."
--msgstr "加入字串(&A)..."
-+msgstr "加入字串(&A)…"
- 
- #: kfilereplacepart.cpp:580
- msgid "&Delete String"
-@@ -225,15 +224,15 @@
- 
- #: kfilereplacepart.cpp:582
- msgid "Edit Selected String..."
--msgstr "編輯選擇的字串..."
-+msgstr "編輯選擇的字串…"
- 
- #: kfilereplacepart.cpp:583
- msgid "&Save Strings List to File..."
--msgstr "儲存字串列表至檔案(&S)..."
-+msgstr "儲存字串列表至檔案(&S)…"
- 
- #: kfilereplacepart.cpp:584
- msgid "&Load Strings List From File..."
--msgstr "從檔案載入字串列表(&L)..."
-+msgstr "從檔案載入字串列表(&L)…"
- 
- #: kfilereplacepart.cpp:585
- msgid "&Load Recent Strings Files"
-@@ -269,7 +268,7 @@
- 
- #: kfilereplacepart.cpp:595
- msgid "Configure &KFileReplace..."
--msgstr "設定 &KFileReplace..."
-+msgstr "設定 &KFileReplace…"
- 
- #: kfilereplacepart.cpp:598 kfilereplaceview.cpp:530
- msgid "&Properties"
-@@ -318,7 +317,8 @@
- 
- #: kfilereplacepart.cpp:1199
- msgid ""
--"<qt>Do you want to replace the string <b>%1</b> with the string <b>%2</b>?</qt>"
-+"<qt>Do you want to replace the string <b>%1</b> with the string <b>%2</b>?</"
-+"qt>"
- msgstr "<qt>您要把字串 <b>%1</b> 取代為 <b>%2</b> 嗎?</qt>"
- 
- #: kfilereplacepart.cpp:1200
-@@ -331,7 +331,7 @@
- 
- #: kfilereplacepart.cpp:1406 kfilereplacepart.cpp:1446
- msgid " Line:%2, Col:%3 - \"%1\""
--msgstr " 行：%2，字：%3 - \"%1\""
-+msgstr " 列：%2，字：%3 - \"%1\""
- 
- #: kfilereplacepart.cpp:1512
- msgid "<qt>Cannot open the file <b>%1</b> and load the string list.</qt>"
-@@ -339,21 +339,21 @@
- 
- #: kfilereplacepart.cpp:1520
- msgid ""
--"<qt>File <b>%1</b> seems not to be written in new kfr format. Remember that the "
--"old kfr format will be soon abandoned. You can convert your old rules files by "
--"simply saving them with kfilereplace.</qt>"
-+"<qt>File <b>%1</b> seems not to be written in new kfr format. Remember that "
-+"the old kfr format will be soon abandoned. You can convert your old rules "
-+"files by simply saving them with kfilereplace.</qt>"
- msgstr ""
--"<qt>檔案 <b>%1</b> 似乎不是以新的 kfr 格式寫成。請注意舊 kfr 格式很快就會被廢棄。您可以把它於 KFileReplace "
--"內儲存一次，來達到轉換的效果。</qt>"
-+"<qt>檔案 <b>%1</b> 似乎不是以新的 kfr 格式寫成。請注意舊 kfr 格式很快就會被廢"
-+"棄。您可以把它於 KFileReplace 內儲存一次，來達到轉換的效果。</qt>"
- 
- #: kfilereplacepart.cpp:1540
- msgid ""
--"<qt>The format of kfr files has been changed; attempting to load <b>%1</b>"
--". Please see the KFilereplace manual for details. Do you want to load a "
--"search-and-replace list of strings?</qt>"
-+"<qt>The format of kfr files has been changed; attempting to load <b>%1</b>. "
-+"Please see the KFilereplace manual for details. Do you want to load a search-"
-+"and-replace list of strings?</qt>"
- msgstr ""
--"<qt>kfr 檔案的格式已經改變；正在嘗試載入 <b>%1</b>。請參閱 KFilereplace "
--"手冊取得更多資訊。您要載入一個搜尋-取代字串的列表嗎?</qt>"
-+"<qt>kfr 檔案的格式已經改變；正在嘗試載入 <b>%1</b>。請參閱 KFilereplace 手冊"
-+"取得更多資訊。您要載入一個搜尋-取代字串的列表嗎?</qt>"
- 
- #: kfilereplacepart.cpp:1540
- msgid "Load"
-@@ -377,9 +377,11 @@
- 
- #: kfilereplaceview.cpp:120
- msgid ""
--"<qt>Cannot invert string <b>%1</b>, because the search string would be "
--"empty.</qt>"
--msgstr "<qt>無法倒轉字串 <b>%1</b> 狀態的位置，因為這樣做的話搜尋字串會變成空白。</qt>"
-+"<qt>Cannot invert string <b>%1</b>, because the search string would be empty."
-+"</qt>"
-+msgstr ""
-+"<qt>無法倒轉字串 <b>%1</b> 狀態的位置，因為這樣做的話搜尋字串會變成空白。</"
-+"qt>"
- 
- #: kfilereplaceview.cpp:259
- msgid "File %1 cannot be opened. Might be a DCOP problem."
-@@ -407,7 +409,7 @@
- 
- #: kfilereplaceview.cpp:507
- msgid "Open &With..."
--msgstr "開啟用(&W)..."
-+msgstr "開啟用(&W)…"
- 
- #: knewprojectdlg.cpp:97
- msgid "Project Directory"
-@@ -955,8 +957,8 @@
- 
- #: whatthis.h:29
- msgid ""
--"Shows the statistics of your operations. Note that the columns content changes "
--"depending on what kind of operation you are performing."
-+"Shows the statistics of your operations. Note that the columns content "
-+"changes depending on what kind of operation you are performing."
- msgstr "顯示您操作的統計。注意欄位內容的改變會依據您所執行的動作種類而定。"
- 
- #: whatthis.h:31
-@@ -964,13 +966,16 @@
- "Shows a list of strings to search for (and if you specified it, a list of "
- "strings to replace with). Use the \"add strings\" dialog to edit your string "
- "list or double click on a string."
--msgstr "顯示搜尋的字串清單（以及要取代的字串清單，如果您有指定的話）。用「加入字串」對話框，或是在字串上雙擊來編輯您的字串清單。"
-+msgstr ""
-+"顯示搜尋的字串清單（以及要取代的字串清單，如果您有指定的話）。用「加入字串」"
-+"對話框，或是在字串上雙擊來編輯您的字串清單。"
- 
- #: whatthis.h:34
- msgid ""
--"Base folder for operations of search/replace. Insert path string here by hand "
--"or use the search button."
--msgstr "搜尋/取代時的基底資料夾。您可以手動在此插入路徑的字串，或是使用搜尋按鍵。"
-+"Base folder for operations of search/replace. Insert path string here by "
-+"hand or use the search button."
-+msgstr ""
-+"搜尋/取代時的基底資料夾。您可以手動在此插入路徑的字串，或是使用搜尋按鍵。"
- 
- #: whatthis.h:36
- msgid "Shell-like wildcards. Example: \"*.html;*.txt;*.xml\"."
-@@ -978,33 +983,40 @@
- 
- #: whatthis.h:38
- msgid ""
--"Insert the minimum file size you want to search, or leave it unchecked if you "
--"don't want minimum size limit."
--msgstr "在此插入您要搜尋的最小檔案大小。若您不打算限制最小檔案大小，則不要勾選。"
-+"Insert the minimum file size you want to search, or leave it unchecked if "
-+"you don't want minimum size limit."
-+msgstr ""
-+"在此插入您要搜尋的最小檔案大小。若您不打算限制最小檔案大小，則不要勾選。"
- 
- #: whatthis.h:40
- msgid ""
--"Insert the maximum file size you want to search, or leave it unchecked if you "
--"don't want maximum size limit."
--msgstr "在此插入您要搜尋的最大檔案大小。若您不打算限制最大檔案大小，則不要勾選。"
-+"Insert the maximum file size you want to search, or leave it unchecked if "
-+"you don't want maximum size limit."
-+msgstr ""
-+"在此插入您要搜尋的最大檔案大小。若您不打算限制最大檔案大小，則不要勾選。"
- 
- #: whatthis.h:42
- msgid ""
--"Insert the minimum value for file access date that you want to search, or leave "
--"it unchecked if you don't a minimum limit."
--msgstr "在此插入您要搜尋的最小檔案存取日期。若您不打算限制最小檔案存取日期，則不要勾選。"
-+"Insert the minimum value for file access date that you want to search, or "
-+"leave it unchecked if you don't a minimum limit."
-+msgstr ""
-+"在此插入您要搜尋的最小檔案存取日期。若您不打算限制最小檔案存取日期，則不要勾"
-+"選。"
- 
- #: whatthis.h:44
- msgid ""
--"Insert the maximum value for file access date that you want to search, or leave "
--"it unchecked if you don't a maximum limit."
--msgstr "在此插入您要搜尋的最大檔案存取日期。若您不打算限制最大檔案存取日期，則不要勾選。"
-+"Insert the maximum value for file access date that you want to search, or "
-+"leave it unchecked if you don't a maximum limit."
-+msgstr ""
-+"在此插入您要搜尋的最大檔案存取日期。若您不打算限制最大檔案存取日期，則不要勾"
-+"選。"
- 
- #: whatthis.h:46
- msgid ""
--"Select  \"writing\" if you want to use the date of the last modification, or  "
--"\"reading\" to use the the date of the last access."
--msgstr "選擇「寫入」使用檔案的最近變更日期，或是「讀取」使用檔案的最近存取日期。"
-+"Select  \"writing\" if you want to use the date of the last modification, "
-+"or  \"reading\" to use the the date of the last access."
-+msgstr ""
-+"選擇「寫入」使用檔案的最近變更日期，或是「讀取」使用檔案的最近存取日期。"
- 
- #: whatthis.h:48
- msgid "Minimum value for access date."
-@@ -1048,24 +1060,27 @@
- 
- #: whatthis.h:69
- msgid ""
--"If this option is enabled, KFR will show even the names of the files in which "
--"no string has been found or replaced."
--msgstr "開啟此選項的話，即使沒有在檔案中找到或取代字串，kfilereplace 也會顯示其名稱。"
-+"If this option is enabled, KFR will show even the names of the files in "
-+"which no string has been found or replaced."
-+msgstr ""
-+"開啟此選項的話，即使沒有在檔案中找到或取代字串，kfilereplace 也會顯示其名稱。"
- 
- #: whatthis.h:71
- msgid ""
--"Allows you to apply QT-like regular expressions on the search string. Note that "
--"a complex regular expression could affect speed performance"
--msgstr "讓您可以使用 QT 式的正規表示式來表示搜尋字串。注意，如果正規表示式太過複雜，會影響效率與速度。"
-+"Allows you to apply QT-like regular expressions on the search string. Note "
-+"that a complex regular expression could affect speed performance"
-+msgstr ""
-+"讓您可以使用 QT 式的正規表示式來表示搜尋字串。注意，如果正規表示式太過複雜，"
-+"會影響效率與速度。"
- 
- #: whatthis.h:73
- msgid ""
- "Enable \"commands\". For example: if search string is \"user\" and replace "
--"string is the command \"[$user:uid$]\", KFR will substitute \"user\" with the "
--"uid of the user."
-+"string is the command \"[$user:uid$]\", KFR will substitute \"user\" with "
-+"the uid of the user."
- msgstr ""
--"開啟「指令」模式。例如，如果搜尋字串是「user」，並且取代字串設為 \"[$user:uid$]\"，kfilereplace 會將 \"user\" "
--"置換為該使用者的使用者代碼（uid）。"
-+"開啟「指令」模式。例如，如果搜尋字串是「user」，並且取代字串設為 \"[$user:uid"
-+"$]\"，kfilereplace 會將 \"user\" 置換為該使用者的使用者代碼（uid）。"
- 
- #: whatthis.h:75
- msgid "Enable this option if you want leave original files untouched."
-@@ -1079,8 +1094,8 @@
- 
- #: whatthis.h:80
- msgid ""
--"Enable this option to perform replacing as a simulation, i.e. without make any "
--"changes in files."
-+"Enable this option to perform replacing as a simulation, i.e. without make "
-+"any changes in files."
- msgstr "開啟此選項以模擬取代，也就是實際上不做任何變動。"
- 
- #: whatthis.h:93
-diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdewebdev/kimagemapeditor.po kde-i18n-zh_TW-3.5.10/messages/kdewebdev/kimagemapeditor.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdewebdev/kimagemapeditor.po	2008-02-13 10:55:28.000000000 +0100
-+++ kde-i18n-zh_TW-3.5.10/messages/kdewebdev/kimagemapeditor.po	2011-11-11 15:45:17.000000000 +0100
-@@ -7,7 +7,7 @@
- "Project-Id-Version: KImageMapEditor\n"
- "POT-Creation-Date: 2007-12-30 01:24+0100\n"
- "PO-Revision-Date: 2006-08-01 13:00+0800\n"
--"Last-Translator: Stanley Wong <stanley18fan0k@yahoo.com.hk>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Chinese (Traditional) <zh-l10n@linux.org.tw>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
-@@ -91,14 +91,14 @@
- 
- #: arealistview.cpp:47
- msgid ""
--"<h3>Area List</h3>The area list shows you all areas of the map."
--"<br>The left column shows the link associated with the area; the right column "
--"shows the part of the image that is covered by the area."
--"<br>The maximum size of the preview images can be configured."
-+"<h3>Area List</h3>The area list shows you all areas of the map.<br>The left "
-+"column shows the link associated with the area; the right column shows the "
-+"part of the image that is covered by the area.<br>The maximum size of the "
-+"preview images can be configured."
- msgstr ""
--"<h3>區域列表</h3>區域列表會告訴您地圖上所有的區域。."
--"<br>左邊一欄顯示該區域指向的連結；右邊一欄顯示這區域覆蓋的影像範圍。"
--"<br>預覽影像的大小上限是可以被設定的。"
-+"<h3>區域列表</h3>區域列表會告訴您地圖上所有的區域。.<br>左邊一欄顯示該區域指"
-+"向的連結；右邊一欄顯示這區域覆蓋的影像範圍。<br>預覽影像的大小上限是可以被設"
-+"定的。"
- 
- #: arealistview.cpp:51
- msgid "A list of all areas"
-@@ -300,11 +300,11 @@
- 
- #: kimagemapeditor.cpp:529
- msgid "Map &Name..."
--msgstr "地圖名稱(&N)..."
-+msgstr "地圖名稱(&N)…"
- 
- #: kimagemapeditor.cpp:532
- msgid "Ne&w Map..."
--msgstr "新增地圖(&W)..."
-+msgstr "新增地圖(&W)…"
- 
- #: kimagemapeditor.cpp:534
- msgid "Create a new map"
-@@ -320,7 +320,7 @@
- 
- #: kimagemapeditor.cpp:540
- msgid "Edit &Default Area..."
--msgstr "編輯預設區域(&D)..."
-+msgstr "編輯預設區域(&D)…"
- 
- #: kimagemapeditor.cpp:542
- msgid "Edit the default area of the current active map"
-@@ -336,7 +336,7 @@
- 
- #: kimagemapeditor.cpp:551
- msgid "Add Image..."
--msgstr "加入影像..."
-+msgstr "加入影像…"
- 
- #: kimagemapeditor.cpp:553
- msgid "Add a new image"
-@@ -352,7 +352,7 @@
- 
- #: kimagemapeditor.cpp:559
- msgid "Edit Usemap..."
--msgstr "編輯 Usemap..."
-+msgstr "編輯 Usemap…"
- 
- #: kimagemapeditor.cpp:561
- msgid "Edit the usemap tag of the current visible image"
-@@ -472,7 +472,7 @@
- 
- #: kimagemapeditor.cpp:690
- msgid "Configure KImageMapEditor..."
--msgstr "設定 KImageMapEditor..."
-+msgstr "設定 KImageMapEditor…"
- 
- #: kimagemapeditor.cpp:695
- msgid "Show Area List"
-@@ -570,8 +570,7 @@
- 
- #: kimagemapeditor.cpp:1625
- msgid ""
--"<qt>The file <em>%1</em> already exists."
--"<br>Do you want to overwrite it?</qt>"
-+"<qt>The file <em>%1</em> already exists.<br>Do you want to overwrite it?</qt>"
- msgstr "<qt>檔案 <em>%1</em> 已經存在。<br>您要覆寫它嗎?</qt>"
- 
- #: kimagemapeditor.cpp:1626
-@@ -596,15 +595,16 @@
- 
- #: kimagemapeditor.cpp:2270
- msgid ""
--"<qt>The file <i>%1</i> could not be saved, because you do not have the required "
--"write permissions.</qt>"
-+"<qt>The file <i>%1</i> could not be saved, because you do not have the "
-+"required write permissions.</qt>"
- msgstr "<qt>檔案 <i>%1</i> 無法被儲存，因為您沒有需要的寫入權限。</qt>"
- 
- #: kimagemapeditor.cpp:2585
- msgid ""
--"<qt>Are you sure you want to delete the map <i>%1</i>? "
--"<br><b>There is no way to undo this.</b></qt>"
--msgstr "<qt>您真的要刪除地圖 <i>%1</i> 嗎? <br><b>這個動作是不可復原的。</b></qt>"
-+"<qt>Are you sure you want to delete the map <i>%1</i>? <br><b>There is no "
-+"way to undo this.</b></qt>"
-+msgstr ""
-+"<qt>您真的要刪除地圖 <i>%1</i> 嗎? <br><b>這個動作是不可復原的。</b></qt>"
- 
- #: kimagemapeditor.cpp:2587
- msgid "Delete Map?"
-@@ -612,8 +612,7 @@
- 
- #: kimagemapeditor.cpp:2634
- msgid ""
--"<qt>The file <i>%1</i> has been modified."
--"<br>Do you want to save it?</qt>"
-+"<qt>The file <i>%1</i> has been modified.<br>Do you want to save it?</qt>"
- msgstr "<qt>檔案 <i>%1</i> 已被修改。<br>您要儲存它嗎?</qt>"
- 
- #: kimagemapeditor.cpp:2760 kimagemapeditor.cpp:2762
-diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdewebdev/klinkstatus.po kde-i18n-zh_TW-3.5.10/messages/kdewebdev/klinkstatus.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdewebdev/klinkstatus.po	2008-08-19 20:43:10.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdewebdev/klinkstatus.po	2011-11-11 15:45:17.000000000 +0100
-@@ -8,8 +8,7 @@
- "Project-Id-Version: klinkstatus\n"
- "POT-Creation-Date: 2008-08-14 01:19+0200\n"
- "PO-Revision-Date: 2007-03-27 15:14+0800\n"
--"Last-Translator: Frank Weng (a.k.a. Franklin) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Chinese Traditional <zh-l10n@linux.org.tw>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
-@@ -101,14 +100,15 @@
- "\n"
- "Please specify one:"
- msgstr ""
--"因為您不是使用 HTTP 協定，因此無法猜測文件的根目錄，也無法解譯以 \"/\" 開頭的相對路徑。\n"
-+"因為您不是使用 HTTP 協定，因此無法猜測文件的根目錄，也無法解譯以 \"/\" 開頭的"
-+"相對路徑。\n"
- "\n"
- "請指定一個文件的根目錄："
- 
- #: ui/sessionwidget.cpp:241 ui/sessionwidget.cpp:364 ui/sessionwidget.cpp:387
- #: ui/sessionwidget.cpp:545 ui/sessionwidget.cpp:629
- msgid "Checking..."
--msgstr "正在檢查..."
-+msgstr "正在檢查…"
- 
- #: ui/sessionwidget.cpp:351
- msgid "Cowardly refusing to check an empty URL."
-@@ -126,7 +126,7 @@
- 
- #: ui/sessionwidget.cpp:531 ui/sessionwidget.cpp:539
- msgid "Adding level..."
--msgstr "正在加入等級..."
-+msgstr "正在加入等級…"
- 
- #: ui/sessionwidget.cpp:686
- msgid "Export Results as HTML"
-@@ -186,10 +186,11 @@
- 
- #: klinkstatus.cpp:75
- msgid ""
--"Could not find the KLinkStatus part; did you configure with '--prefix=/$KDEDIR' "
--"and perform 'make install'?"
-+"Could not find the KLinkStatus part; did you configure with '--prefix=/"
-+"$KDEDIR' and perform 'make install'?"
- msgstr ""
--"找不到 KLinkStatus part；您在 configure 時有沒有指定'--prefix=/$KDEDIR'並作'make install'?"
-+"找不到 KLinkStatus part；您在 configure 時有沒有指定'--prefix=/$KDEDIR'並"
-+"作'make install'?"
- 
- #: utils/xsl.cpp:165
- msgid "Message is null."
-@@ -205,8 +206,8 @@
- 
- #: utils/xsl.cpp:182
- msgid ""
--"<div><b>KLinkStatus encountered the following error while parsing a message:</b>"
--"<br />%1</div>"
-+"<div><b>KLinkStatus encountered the following error while parsing a message:"
-+"</b><br />%1</div>"
- msgstr "<div><b>KLinkStatus 在解析訊息時發生錯誤:</b><br />%1</div>"
- 
- #: _translatorinfo.cpp:1
-@@ -277,7 +278,7 @@
- 
- #: actionmanager.cpp:95
- msgid "Open URL..."
--msgstr "開啟 URL..."
-+msgstr "開啟 URL…"
- 
- #: actionmanager.cpp:100
- msgid "Close Tab"
-@@ -285,7 +286,7 @@
- 
- #: actionmanager.cpp:108
- msgid "Configure KLinkStatus..."
--msgstr "設定 KLinkStatus..."
-+msgstr "設定 KLinkStatus…"
- 
- #: actionmanager.cpp:114
- msgid "About KLinkStatus"
-@@ -293,11 +294,11 @@
- 
- #: actionmanager.cpp:118
- msgid "&Report Bug..."
--msgstr "報告問題(&R)..."
-+msgstr "報告問題(&R)…"
- 
- #: actionmanager.cpp:135
- msgid "E&xport Results as HTML..."
--msgstr "匯出結果成 HTML(&X)...."
-+msgstr "匯出結果成 HTML(&X)…."
- 
- #: actionmanager.cpp:143
- msgid "&Follow last Link checked"
-@@ -463,8 +464,8 @@
- #: rc.cpp:102
- #, no-c-format
- msgid ""
--"Check this one if you want to use Quanta's project preview prefix in the URL to "
--"check"
-+"Check this one if you want to use Quanta's project preview prefix in the URL "
-+"to check"
- msgstr "如果您想在檢查 URL 時對它使用 Quanta 專案的預覽字首，就選這項。"
- 
- #. i18n: file ./ui/settings/configsearchdialog.ui line 303
-diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdewebdev/kommander.po kde-i18n-zh_TW-3.5.10/messages/kdewebdev/kommander.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdewebdev/kommander.po	2008-08-19 20:43:10.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdewebdev/kommander.po	2011-11-11 15:45:17.000000000 +0100
-@@ -1,55 +1,56 @@
- # translation of kommander.po to Chinese Traditional
--# traditional Chinese translation of kommander.
-+# Traditional Chinese translation of kommander.
-+# This file is distributed under the same license as the kommander package.
- #
- # Stanley Wong<stanley18fan0k@yahoo.com.hk>, 2006.
- # Frank Weng (a.k.a. Franklin) <franklin at goodhorse dot idv dot tw>, 2007.
-+#
- msgid ""
- msgstr ""
--"Project-Id-Version: kommander\n"
-+"Project-Id-Version: kommander \n"
- "POT-Creation-Date: 2008-07-08 01:25+0200\n"
--"PO-Revision-Date: 2007-03-27 15:34+0800\n"
--"Last-Translator: Frank Weng (a.k.a. Franklin) <franklin at goodhorse dot idv "
--"dot tw>\n"
--"Language-Team: Chinese Traditional <zh-l10n@linux.org.tw>\n"
-+"PO-Revision-Date: 2011-11-09 12:32+0800\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
-+"Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
- "Content-Transfer-Encoding: 8bit\n"
--"X-Generator: KBabel 1.11.4\n"
-+"Plural-Forms: nplurals=1; plural=0;\n"
- 
- #: part/kommander_part.cpp:30
--#, fuzzy
- msgid ""
--"Executor Part is a component of the Kommander dialog system that executes .kmdr "
--"files inside a KDE KPart"
--msgstr "是 a of Kommander 或"
-+"Executor Part is a component of the Kommander dialog system that executes ."
-+"kmdr files inside a KDE KPart"
-+msgstr ""
-+"執行器部分是 Kommander 對話框系統的成份之一，它會在 KDE KPart 內部執行 .kmdr "
-+"檔案"
- 
- #: part/kommander_part.cpp:54
--#, fuzzy
- msgid "Kommander Executor Part"
--msgstr "Kommander 執行器"
-+msgstr "Kommander 執行器部分"
- 
- #: part/kommander_part.cpp:56
- msgid "Part of the KDEWebDev module."
--msgstr ""
-+msgstr "KDEWebDev 模組的一部份。"
- 
- #: editor/main.cpp:47 executor/main.cpp:61 part/kommander_part.cpp:58
--#, fuzzy
- msgid "Current maintainer"
--msgstr "複製目前一行(&L)"
-+msgstr "目前維護者"
- 
- #: editor/main.cpp:48 executor/main.cpp:62 part/kommander_part.cpp:59
- msgid "Previous maintainer"
--msgstr ""
-+msgstr "前任維護者"
- 
- #: editor/main.cpp:49 executor/main.cpp:63 part/kommander_part.cpp:60
- msgid "Original author"
--msgstr ""
-+msgstr "原來的作者"
- 
- #: pluginmanager/main.cpp:39
- msgid ""
- "kmdr-plugins is a component of the Kommander dialog system that manages "
- "installed plugins."
--msgstr "kmdr-plugins 是 Kommander 對話盒系統的一部份，用來管理已安裝的外掛程式。"
-+msgstr ""
-+"kmdr-plugins 是 Kommander 對話盒系統的一部份，用來管理已安裝的外掛程式。"
- 
- #: pluginmanager/main.cpp:46
- msgid "Register given library"
-@@ -185,7 +186,7 @@
- #: rc.cpp:746 rc.cpp:1016 rc.cpp:1181 rc.cpp:1238
- #, no-c-format
- msgid "..."
--msgstr "..."
-+msgstr "…"
- 
- #: editor/propertyeditor.cpp:1071 editor/propertyeditor.cpp:1132
- msgid "False"
-@@ -374,8 +375,8 @@
- 
- #: editor/propertyeditor.cpp:3244
- msgid ""
--"<p><b>QWidget::%1</b></p>"
--"<p>There is no documentation available for this property.</p>"
-+"<p><b>QWidget::%1</b></p><p>There is no documentation available for this "
-+"property.</p>"
- msgstr "<p><b>QWidget::%1</b></p><p>目前並沒有這個屬性的說明文件。</p>"
- 
- #: editor/propertyeditor.cpp:3395
-@@ -429,7 +430,7 @@
- 
- #: editor/messagelog.cpp:34
- msgid "Copy Current &Line"
--msgstr "複製目前一行(&L)"
-+msgstr "複製目前一列(&L)"
- 
- #: editor/messagelog.cpp:35
- msgid "&Copy Content"
-@@ -437,7 +438,7 @@
- 
- #: editor/messagelog.cpp:36
- msgid "&Save As..."
--msgstr "另存為(&S)..."
-+msgstr "另存為(&S)…"
- 
- #: editor/messagelog.cpp:122
- msgid ""
-@@ -524,7 +525,7 @@
- 
- #: editor/mainwindowactions.cpp:113
- msgid "Copies the selected widgets to the clipboard"
--msgstr "複製所選的 Widget 至剪貼薄"
-+msgstr "複製所選的視窗元件至剪貼薄"
- 
- #: editor/mainwindowactions.cpp:118
- msgid "Pastes the clipboard's contents"
-@@ -544,7 +545,7 @@
- 
- #: editor/mainwindowactions.cpp:134
- msgid "Raises the selected widgets"
--msgstr "把所選的 Widget 移上一層"
-+msgstr "把所選的視窗元件移上一層"
- 
- #: editor/mainwindowactions.cpp:137
- msgid "Send to Back"
-@@ -552,16 +553,15 @@
- 
- #: editor/mainwindowactions.cpp:139 editor/mainwindowactions.cpp:140
- msgid "Lowers the selected widgets"
--msgstr "把所選的 Widget 移後一層"
-+msgstr "把所選的視窗元件移後一層"
- 
- #: editor/mainwindowactions.cpp:143
--#, fuzzy
- msgid "Find in Form..."
--msgstr "開啟表單(&O)..."
-+msgstr "在表單中尋找…"
- 
- #: editor/mainwindowactions.cpp:144
- msgid "Search for a text in the whole form."
--msgstr ""
-+msgstr "在整個表單中搜尋文字。"
- 
- #: editor/formwindow.cpp:1848 editor/formwindow.cpp:1860
- #: editor/mainwindowactions.cpp:148
-@@ -582,7 +582,7 @@
- 
- #: editor/mainwindowactions.cpp:161
- msgid "Form Settings..."
--msgstr "表單設定..."
-+msgstr "表單設定…"
- 
- #: editor/mainwindowactions.cpp:163
- msgid "Opens a dialog to change the form's settings"
-@@ -600,7 +600,7 @@
- 
- #: editor/mainwindowactions.cpp:202
- msgid "Adjusts the size of the selected widget"
--msgstr "調整所選 Widget 的大小"
-+msgstr "調整所選視窗元件的大小"
- 
- #: editor/formwindow.cpp:1909 editor/mainwindowactions.cpp:206
- msgid "Lay Out Horizontally"
-@@ -608,7 +608,7 @@
- 
- #: editor/mainwindowactions.cpp:208
- msgid "Lays out the selected widgets horizontally"
--msgstr "把所選的 Widget 橫向編排"
-+msgstr "把所選的視窗元件橫向編排"
- 
- #: editor/formwindow.cpp:1919 editor/mainwindowactions.cpp:212
- msgid "Lay Out Vertically"
-@@ -616,7 +616,7 @@
- 
- #: editor/mainwindowactions.cpp:214
- msgid "Lays out the selected widgets vertically"
--msgstr "把所選的 Widget 垂直編排"
-+msgstr "把所選的視窗元件垂直編排"
- 
- #: editor/formwindow.cpp:1954 editor/mainwindowactions.cpp:218
- msgid "Lay Out in a Grid"
-@@ -624,7 +624,7 @@
- 
- #: editor/mainwindowactions.cpp:220
- msgid "Lays out the selected widgets in a grid"
--msgstr "把所選的 Widget 依格線分散編排"
-+msgstr "把所選的視窗元件依格線分散編排"
- 
- #: editor/mainwindowactions.cpp:224
- msgid "Lay Out Horizontally in Splitter"
-@@ -632,7 +632,7 @@
- 
- #: editor/mainwindowactions.cpp:227
- msgid "Lays out the selected widgets horizontally in a splitter"
--msgstr "把所選的 Widget 橫向編排，並以分割線分隔它們"
-+msgstr "把所選的視窗元件橫向編排，並以分割線分隔它們"
- 
- #: editor/mainwindowactions.cpp:231
- msgid "Lay Out Vertically in Splitter"
-@@ -640,7 +640,7 @@
- 
- #: editor/mainwindowactions.cpp:234
- msgid "Lays out the selected widgets vertically in a splitter"
--msgstr "把所選的 Widget 垂直編排，並以分割線分隔它們"
-+msgstr "把所選的視窗元件垂直編排，並以分割線分隔它們"
- 
- #: editor/formwindow.cpp:2054 editor/formwindow.cpp:2073
- #: editor/mainwindowactions.cpp:238
-@@ -666,9 +666,8 @@
- 
- #: editor/mainwindowactions.cpp:249
- msgid ""
--"<b>A %1</b>"
--"<p>%2</p>"
--"<p>Click to insert a single %3,or double click to keep the tool selected."
-+"<b>A %1</b><p>%2</p><p>Click to insert a single %3,or double click to keep "
-+"the tool selected."
- msgstr "<b>%1</b><p>%2</p><p>點選以插入單一的 %3，或是雙擊保持選取此工具。"
- 
- #: editor/mainwindowactions.cpp:254
-@@ -861,7 +860,7 @@
- 
- #: editor/mainwindowactions.cpp:571
- msgid "Configure &Plugins..."
--msgstr "設定外掛程式(&P)..."
-+msgstr "設定外掛程式(&P)…"
- 
- #: editor/mainwindowactions.cpp:573
- msgid "Opens a dialog to configure plugins"
-@@ -869,7 +868,7 @@
- 
- #: editor/mainwindowactions.cpp:576
- msgid "&Configure Editor..."
--msgstr "設定編輯器(&C)..."
-+msgstr "設定編輯器(&C)…"
- 
- #: editor/mainwindowactions.cpp:578
- msgid "Configure various aspects of this editor."
-@@ -881,11 +880,11 @@
- 
- #: editor/mainwindowactions.cpp:598
- msgid "Create a new dialog..."
--msgstr "建立一個新的對話盒..."
-+msgstr "建立一個新的對話盒…"
- 
- #: editor/mainwindowactions.cpp:621
- msgid "Open a file..."
--msgstr "開啟一個檔案..."
-+msgstr "開啟一個檔案…"
- 
- #: editor/mainwindowactions.cpp:626
- msgid "Open Files"
-@@ -893,7 +892,7 @@
- 
- #: editor/mainwindowactions.cpp:662
- msgid "Reading file '%1'..."
--msgstr "正在讀取檔案 '%1'..."
-+msgstr "正在讀取檔案 '%1'…"
- 
- #: editor/mainwindowactions.cpp:675
- msgid "Loaded file '%1'"
-@@ -909,11 +908,11 @@
- 
- #: editor/mainwindowactions.cpp:717
- msgid "Enter a filename..."
--msgstr "輸入一個檔案名稱..."
-+msgstr "輸入一個檔案名稱…"
- 
- #: editor/mainwindowactions.cpp:745
- msgid "Qt Designer is crashing. Attempting to save files..."
--msgstr "Qt Designer 已經當機。正在嘗試儲存檔案..."
-+msgstr "Qt Designer 已經當機。正在嘗試儲存檔案…"
- 
- #: editor/mainwindowactions.cpp:782 editor/mainwindowactions.cpp:845
- msgid "NewTemplate"
-@@ -937,7 +936,7 @@
- "of the container you want to paste into and select this container\n"
- "and then paste again."
- msgstr ""
--"無法貼上 Widget。Designer 找不到一個未被編排的容器來把它貼上。\n"
-+"無法貼上視窗元件。Designer 找不到一個未被編排的容器來把它貼上。\n"
- "請把要貼上去的容器的編排解除，然後再試一次。"
- 
- #: editor/mainwindowactions.cpp:900
-@@ -946,15 +945,15 @@
- 
- #: editor/formwindow.cpp:2135 editor/mainwindowactions.cpp:1063
- msgid "Edit connections..."
--msgstr "編輯連接..."
-+msgstr "編輯連接…"
- 
- #: editor/mainwindowactions.cpp:1082
- msgid "Edit the current form's settings..."
--msgstr "編輯目前表單的設定..."
-+msgstr "編輯目前表單的設定…"
- 
- #: editor/mainwindowactions.cpp:1090
- msgid "Edit preferences..."
--msgstr "編輯偏好設定..."
-+msgstr "編輯偏好設定…"
- 
- #: editor/command.cpp:499 editor/command.cpp:511
- msgid "Set 'name' Property"
-@@ -1023,7 +1022,7 @@
- 
- #: editor/main.cpp:46
- msgid "Project manager"
--msgstr ""
-+msgstr "專案管理員"
- 
- #: editor/main.cpp:71
- msgid "Kommander Dialog Editor"
-@@ -1070,7 +1069,7 @@
- 
- #: editor/actionlistview.cpp:95
- msgid "&Connect Action..."
--msgstr "連接動作(&C)..."
-+msgstr "連接動作(&C)…"
- 
- #: editor/actionlistview.cpp:97
- msgid "Delete Action"
-@@ -1082,7 +1081,7 @@
- 
- #: editor/workspace.cpp:661
- msgid "&Open Source File..."
--msgstr "開啟源代碼檔案(&O)..."
-+msgstr "開啟源代碼檔案(&O)…"
- 
- #: editor/workspace.cpp:664
- msgid "&Remove Source File From Project"
-@@ -1090,7 +1089,7 @@
- 
- #: editor/workspace.cpp:668
- msgid "&Open Form..."
--msgstr "開啟表單(&O)..."
-+msgstr "開啟表單(&O)…"
- 
- #: editor/workspace.cpp:672 editor/workspace.cpp:682
- msgid "&Remove Form From Project"
-@@ -1102,7 +1101,7 @@
- 
- #: editor/workspace.cpp:678
- msgid "&Open Form Source..."
--msgstr "開啟表單源代碼(&O)..."
-+msgstr "開啟表單源代碼(&O)…"
- 
- #: editor/widgetdatabase.cpp:139
- msgid "Push Button"
-@@ -1228,7 +1227,7 @@
- 
- #: editor/widgetdatabase.cpp:495
- msgid "The Text Label provides a widget to display static text."
--msgstr "Text Label 提供一個可以顯示靜態文字的 Widget。"
-+msgstr "Text Label 提供一個可以顯示靜態文字的視窗元件。"
- 
- #: editor/widgetdatabase.cpp:502
- msgid "Pixmap Label"
-@@ -1236,7 +1235,7 @@
- 
- #: editor/widgetdatabase.cpp:503
- msgid "The Pixmap Label provides a widget to display pixmaps."
--msgstr "Pixmap Label 提供一個可以顯示點陣圖的 Widget。"
-+msgstr "Pixmap Label 提供一個可以顯示點陣圖的視窗元件。"
- 
- #: editor/widgetdatabase.cpp:510
- msgid "A line edit"
-@@ -1321,19 +1320,16 @@
- msgstr "個作指令稿執行週期使用的計時器"
- 
- #: editor/widgetdatabase.cpp:683
--#, fuzzy
- msgid "A date selection widget"
--msgstr "把所選的 Widget 移上一層"
-+msgstr "日期選擇視窗元件"
- 
- #: editor/pixmapchooser.cpp:947
- msgid "All Pixmaps"
- msgstr "所有點陣圖"
- 
- #: editor/pixmapchooser.cpp:950
--msgid ""
--"%1-Pixmaps (%2)\n"
--msgstr ""
--"%1 點陣圖 (%2)\n"
-+msgid "%1-Pixmaps (%2)\n"
-+msgstr "%1 點陣圖 (%2)\n"
- 
- #: editor/pixmapchooser.cpp:956
- msgid "All Files (*)"
-@@ -1398,7 +1394,7 @@
- 
- #: editor/actiondnd.cpp:736
- msgid "Rename Item..."
--msgstr "重新命名項目..."
-+msgstr "重新命名項目…"
- 
- #: editor/actiondnd.cpp:740
- msgid "Delete Menu '%1'"
-@@ -1482,13 +1478,12 @@
- msgstr "高亮度標示(&H)"
- 
- #: editor/assoctexteditorimpl.cpp:187
--#, fuzzy
- msgid "Edit text"
- msgstr "編輯文字"
- 
- #: editor/assoctexteditorimpl.cpp:253
- msgid "Edit text - read only mode"
--msgstr ""
-+msgstr "編輯文字 - 唯讀模式"
- 
- #: editor/assoctexteditorimpl.cpp:271
- msgid "Set the 'text association' of '%1'"
-@@ -1526,49 +1521,43 @@
- 
- #: editor/mainwindow.cpp:245
- msgid ""
--"<h2>The Property Editor</h2>"
--"<p>You can change the appearance and behavior of the selected widget in the "
--"property editor.</p>"
--"<p>You can set properties for components and forms at design time and see the "
--"immediately see the effects of the changes. Each property has its own editor "
--"which (depending on the property) can be used to enter new values, open a "
--"special dialog, or to select values from a predefined list. Click <b>F1</b> "
--"to get detailed help for the selected property.</p>"
--"<p>You can resize the columns of the editor by dragging the separators in the "
--"list's header.</p>"
--"<p><b>Signal Handlers</b></p>"
--"<p>In the Signal Handlers tab you can define connections between the signals "
--"emitted by widgets and the slots in the form. (These connections can also be "
--"made using the connection tool.)"
--msgstr ""
--"<h2>屬性編輯器</h2> "
--"<p>您可以在屬性編輯器中變更所選取的元件的外觀與行為。</p> "
--"<p>您可以在設計期設定元件與表單的屬性，並立即檢視修改後的結果。每個屬性都有自己的編輯器，可用於輸入新值、開啟特殊對話框，或是從預先定義的清單中選取值。按下 "
--"<b>F1</b> 可以取得所選取屬性的詳細說明。</p> "
--"<p>您可以拖曳列表標頭上的分隔線來調整編輯器欄位的大小。</p> "
--"<p>您可以在<b>信號處理器</b>頁中定義表單中元件產生的信號以及信號處理槽的連線關係。您也可以用連線工具來定義這些關係。</p>"
-+"<h2>The Property Editor</h2><p>You can change the appearance and behavior of "
-+"the selected widget in the property editor.</p><p>You can set properties for "
-+"components and forms at design time and see the immediately see the effects "
-+"of the changes. Each property has its own editor which (depending on the "
-+"property) can be used to enter new values, open a special dialog, or to "
-+"select values from a predefined list. Click <b>F1</b> to get detailed help "
-+"for the selected property.</p><p>You can resize the columns of the editor by "
-+"dragging the separators in the list's header.</p><p><b>Signal Handlers</b></"
-+"p><p>In the Signal Handlers tab you can define connections between the "
-+"signals emitted by widgets and the slots in the form. (These connections can "
-+"also be made using the connection tool.)"
-+msgstr ""
-+"<h2>屬性編輯器</h2> <p>您可以在屬性編輯器中變更所選取的元件的外觀與行為。</"
-+"p> <p>您可以在設計期設定元件與表單的屬性，並立即檢視修改後的結果。每個屬性都"
-+"有自己的編輯器，可用於輸入新值、開啟特殊對話框，或是從預先定義的清單中選取"
-+"值。按下 <b>F1</b> 可以取得所選取屬性的詳細說明。</p> <p>您可以拖曳列表標頭上"
-+"的分隔線來調整編輯器欄位的大小。</p> <p>您可以在<b>訊號處理器</b>頁中定義表單"
-+"中元件產生的訊號以及訊號處理槽的連線關係。您也可以用連線工具來定義這些關係。"
-+"</p>"
- 
- #: editor/mainwindow.cpp:271
- msgid "Object Explorer"
- msgstr "物件總管"
- 
- #: editor/mainwindow.cpp:273
--#, fuzzy
- msgid ""
--"<h2>The Object Explorer</h2>"
--"<p>The Object Explorer provides an overview of the relationships between the "
--"widgets in a form. You can use the clipboard functions using a context menu for "
--"each item in the view. It is also useful for selecting widgets in forms that "
--"have complex layouts.</p>"
--"<p>The columns can be resized by dragging the separator in the list's "
--"header.</p>"
--"<p>The second tab shows all the form's slots, class variables, includes, "
--"etc.</p>"
--msgstr ""
--"<h2>物件總管</h2>"
--"<p>物件總管提供此表單中的元件之間的關係的概觀。您可以用剪貼功能 of 於中間 in a 您 a for in 是 for in 表單</p>"
--"<p> 分隔符 in 列表 秒</p>"
--"<p> 第二 全部 秒 類別</p>"
-+"<h2>The Object Explorer</h2><p>The Object Explorer provides an overview of "
-+"the relationships between the widgets in a form. You can use the clipboard "
-+"functions using a context menu for each item in the view. It is also useful "
-+"for selecting widgets in forms that have complex layouts.</p><p>The columns "
-+"can be resized by dragging the separator in the list's header.</p><p>The "
-+"second tab shows all the form's slots, class variables, includes, etc.</p>"
-+msgstr ""
-+"<h2>物件總管</h2><p>物件總管提供此表單中的元件之間的關係的概觀。您可以藉由檢"
-+"視中每個項目的快顯功能表來使用剪貼簿函式。它也用於在具有複雜版面配置的表單中"
-+"選取視窗元件。</p><p>欄位可以藉由拖曳清單頁首中分隔符號被調整大小。</p><p>第"
-+"二分頁顯示所有表單的插槽、類別變數、包含檔…等等。</p>"
- 
- #: editor/mainwindow.cpp:284 editor/mainwindow.cpp:293
- msgid "Dialogs"
-@@ -1576,37 +1565,38 @@
- 
- #: editor/mainwindow.cpp:287
- msgid "Start typing the buffer you want to switch to here (ALT+B)"
--msgstr "開始在此輸入您要切換的緩衝區（ALT+B）"
-+msgstr "開始在此輸入您要切換的緩衝區(ALT+B)"
- 
- #: editor/mainwindow.cpp:294
- msgid ""
--"<h2>The File Overview Window</h2>"
--"<p>The File Overview Window displays all open dialogs.</p>"
--msgstr "<h2> 檔案概觀視窗</h2><p>檔案概觀視窗顯示所有開啟的對話框。</p>"
-+"<h2>The File Overview Window</h2><p>The File Overview Window displays all "
-+"open dialogs.</p>"
-+msgstr "<h2>檔案概觀視窗</h2><p>檔案概觀視窗顯示所有開啟的對話框。</p>"
- 
- #: editor/mainwindow.cpp:305
- msgid "Action Editor"
- msgstr "動作編輯器"
- 
- #: editor/mainwindow.cpp:306
--#, fuzzy
- msgid ""
--"<b>The Action Editor</b>"
--"<p>The Action Editor is used to add actions and action groups to a form, and to "
--"connect actions to slots. Actions and action groups can be dragged into menus "
--"and into toolbars, and may feature keyboard shortcuts and tooltips. If actions "
--"have pixmaps these are displayed on toolbar buttons and beside their names in "
--"menus.</p>"
--msgstr "<b> 動作 編輯器</b><p> 動作 編輯器 是 到 和 到 a 和 到 到 動作 和 和 和 功能 和 開 和 in</p>"
-+"<b>The Action Editor</b><p>The Action Editor is used to add actions and "
-+"action groups to a form, and to connect actions to slots. Actions and action "
-+"groups can be dragged into menus and into toolbars, and may feature keyboard "
-+"shortcuts and tooltips. If actions have pixmaps these are displayed on "
-+"toolbar buttons and beside their names in menus.</p>"
-+msgstr ""
-+"<b>動作編輯器</b><p>動作編輯器被用來將動作和動作群組加入表單，以及連接動作到"
-+"插槽。動作和動作群組可以被拖曳進入選單和進入工具列，同時會具有快速鍵和提示"
-+"框。如果動作具有像素圖，它將被顯示於工具列按鈕以及在選單中它們的名稱旁邊。</"
-+"p>"
- 
- #: editor/mainwindow.cpp:316 editor/mainwindow.cpp:319
- msgid "Message Log"
- msgstr "訊息記錄"
- 
- #: editor/mainwindow.cpp:395 editor/mainwindow.cpp:449
--#, fuzzy
- msgid "<qt>Cannot create backup file <i>%1</i>.</qt>"
--msgstr "<qt>無法儲存記錄檔案<br><b>%1</b></qt>"
-+msgstr "<qt>無法建立備份檔案<i>%1</i>。</qt>"
- 
- #: editor/mainwindow.cpp:406
- msgid "There is a dialog already running."
-@@ -1617,30 +1607,27 @@
- msgstr "執行"
- 
- #: editor/mainwindow.cpp:439
--#, fuzzy
- msgid "<qt>Cannot create temporary file <i>%1</i>.</qt>"
--msgstr "<qt>無法儲存記錄檔案<br><b>%1</b></qt>"
-+msgstr "<qt>無法建立暫存檔<i>%1</i>。</qt>"
- 
- #: editor/mainwindow.cpp:786
--#, fuzzy
- msgid ""
--"<b>The Form Window</b>"
--"<p>Use the various tools to add widgets or to change the layout and behavior of "
--"the components in the form. Select one or multiple widgets to move them or lay "
--"them out. If a single widget is chosen it can be resized using the resize "
--"handles.</p>"
--"<p>Changes in the <b>Property Editor</b> are visible at design time, and you "
--"can preview the form in different styles.</p>"
--"<p>You can change the grid resolution, or turn the grid off in the <b>"
--"Preferences</b> dialog from the <b>Edit</b> menu."
--"<p>You can have several forms open, and all open forms are listed in the <b>"
--"Form List</b>."
--msgstr ""
--"<b> 表單 視窗</b>"
--"<p> 使用 到 或 到 和 of in 選擇 一個 或 到 或 a single 是</p>"
--"<p> 變化 in<b> 屬性 編輯器</b> 可見 於 時間 和 預覽 in</p>"
--"<p> 您 或 關 in<b> 喜好設定</b> 從<b> 編輯</b>"
--"<p> 您 表單 和 全部 表單 in<b> 表單 列表</b>."
-+"<b>The Form Window</b><p>Use the various tools to add widgets or to change "
-+"the layout and behavior of the components in the form. Select one or "
-+"multiple widgets to move them or lay them out. If a single widget is chosen "
-+"it can be resized using the resize handles.</p><p>Changes in the <b>Property "
-+"Editor</b> are visible at design time, and you can preview the form in "
-+"different styles.</p><p>You can change the grid resolution, or turn the grid "
-+"off in the <b>Preferences</b> dialog from the <b>Edit</b> menu.<p>You can "
-+"have several forms open, and all open forms are listed in the <b>Form List</"
-+"b>."
-+msgstr ""
-+"<b>表單視窗</b><p>使用各種工具以加入視窗元件或變更版面配置和表單成份的行為。"
-+"選取一個或多個視窗元件以移動它們或配置它們。如果選取了單一視窗元件，可以使用"
-+"調整大小控柄來調整大小。</p><p>在<b>內容編輯器</b>中變更是於設計時間中可見"
-+"的，而您可以以不同的樣式預覽表單。</p><p>您可以變更格線解析度，或從<b>編輯</"
-+"b>選單的<b>偏好設定</b>對話框中關閉格線。<p>您可以開啟多個表單，而所有開啟的"
-+"表單將列出於<b>表單清單</b>中。"
- 
- #: editor/mainwindow.cpp:891
- #, c-format
-@@ -1654,23 +1641,23 @@
- 
- #: editor/mainwindow.cpp:974
- msgid "Choose Pixmap..."
--msgstr "選擇點陣圖..."
-+msgstr "選擇點陣圖…"
- 
- #: editor/mainwindow.cpp:978
- msgid "Edit Text..."
--msgstr "編輯文字..."
-+msgstr "編輯文字…"
- 
- #: editor/mainwindow.cpp:982
- msgid "Edit Title..."
--msgstr "編輯標題..."
-+msgstr "編輯標題…"
- 
- #: editor/mainwindow.cpp:986 editor/mainwindow.cpp:1064
- msgid "Edit Page Title..."
--msgstr "編輯頁面標題..."
-+msgstr "編輯頁面標題…"
- 
- #: editor/mainwindow.cpp:1002 editor/mainwindow.cpp:1047
- msgid "Edit Kommander Text..."
--msgstr "編輯 Kommander 文字..."
-+msgstr "編輯 Kommander 文字…"
- 
- #: editor/mainwindow.cpp:1011 editor/mainwindow.cpp:1021
- #: editor/mainwindow.cpp:1057 editor/mainwindow.cpp:1497
-@@ -1684,11 +1671,11 @@
- 
- #: editor/mainwindow.cpp:1031
- msgid "Edit..."
--msgstr "編輯..."
-+msgstr "編輯…"
- 
- #: editor/mainwindow.cpp:1067
- msgid "Edit Pages..."
--msgstr "編輯頁面..."
-+msgstr "編輯頁面…"
- 
- #: editor/mainwindow.cpp:1073
- msgid "Add Menu Item"
-@@ -1736,7 +1723,7 @@
- 
- #: editor/mainwindow.cpp:1560
- msgid "Edit %1..."
--msgstr "編輯 %1..."
-+msgstr "編輯 %1…"
- 
- #: editor/mainwindow.cpp:1578
- msgid "Set the 'text' of '%2'"
-@@ -1789,16 +1776,15 @@
- 
- #: editor/formwindow.cpp:317 editor/formwindow.cpp:425
- msgid ""
--"<b>A %1 (custom widget)</b> "
--"<p>Click <b>Edit Custom Widgets...</b> in the <b>Tools|Custom</b> "
--"menu to add and change custom widgets. You can add properties as well as "
--"signals and slots to integrate custom widgets into <i>Qt Designer</i>"
--", and provide a pixmap which will be used to represent the widget on the "
--"form.</p>"
--msgstr ""
--"<b>%1（自訂元件）</b>"
--"<p>點擊<b>工具|自訂</b>選單中的<b>編輯自訂元件...</b>可以新增並變更自訂元件。您可以新增屬性、信號與插槽以整合進 Qt "
--"設計器，並提供像素圖以便在表單中展示此元件。</p>"
-+"<b>A %1 (custom widget)</b> <p>Click <b>Edit Custom Widgets...</b> in the "
-+"<b>Tools|Custom</b> menu to add and change custom widgets. You can add "
-+"properties as well as signals and slots to integrate custom widgets into "
-+"<i>Qt Designer</i>, and provide a pixmap which will be used to represent the "
-+"widget on the form.</p>"
-+msgstr ""
-+"<b>%1（自訂元件）</b><p>點擊<b>工具|自訂</b>選單中的<b>編輯自訂元件...</b>可"
-+"以新增並變更自訂元件。您可以新增屬性、訊號與插槽以整合進 Qt 設計器，並提供像"
-+"素圖以便在表單中展示此元件。</p>"
- 
- #: editor/formwindow.cpp:324 editor/formwindow.cpp:432
- msgid "A %1 (custom widget)"
-@@ -1820,7 +1806,7 @@
- 
- #: editor/formwindow.cpp:597
- msgid "Connect '%1' with..."
--msgstr "連接 '%1' 至..."
-+msgstr "連接 '%1' 至…"
- 
- #: editor/formwindow.cpp:620 editor/formwindow.cpp:676
- msgid "Change Tab Order"
-@@ -1837,9 +1823,9 @@
- "must first be broken.\n"
- "Break the layout or cancel the operation?"
- msgstr ""
--"您試著插入元件到已佈局容器元件 %1。\n"
--"這是不可能的。要插入此元件，%1 的佈局必須先打破。\n"
--"要打破佈局還是要取消此動作？"
-+"您試著插入元件到已布局容器元件 %1。\n"
-+"這是不可能的。要插入此元件，%1 的布局必須先打破。\n"
-+"要打破布局還是要取消此動作？"
- 
- #: editor/formwindow.cpp:874 editor/formwindow.cpp:964
- msgid "Inserting Widget"
-@@ -1855,15 +1841,15 @@
- 
- #: editor/formwindow.cpp:1661
- msgid "Click widgets to change the tab order..."
--msgstr "在 Widget 按一下來改變 Tab 鍵定位順序..."
-+msgstr "在 Widget 按一下來改變 Tab 鍵定位順序…"
- 
- #: editor/formwindow.cpp:1670
- msgid "Drag a line to create a connection..."
--msgstr "請在 Widget 之間劃一條線，來建立連接..."
-+msgstr "請在 Widget 之間劃一條線，來建立連接…"
- 
- #: editor/formwindow.cpp:1676
- msgid "Click on the form to insert a %1..."
--msgstr "請在表單上按一下來插入一%1..."
-+msgstr "請在表單上按一下來插入一%1…"
- 
- #: editor/formwindow.cpp:1784
- msgid "Lower"
-@@ -1906,31 +1892,27 @@
- msgstr "依格線分散編排子項目"
- 
- #: editor/functionsimpl.cpp:83 plugin/specialinformation.cpp:383
--#, fuzzy
- msgid "Slots"
--msgstr "Slot"
-+msgstr "插槽"
- 
- #: editor/functionsimpl.cpp:102
--#, fuzzy
- msgid "Functions"
--msgstr "函式(&F)："
-+msgstr "函式"
- 
- #: editor/functionsimpl.cpp:198
- msgid ""
- "To learn more about the slot, look at the documentation of the base Qt/KDE "
- "class, most probably <i>%1</i>."
- msgstr ""
-+"要學習更多關於插槽的資訊，請查看基礎 Qt/KDE 類別的文件，最有可能的是 <i>%1</"
-+"i>。"
- 
- #: editor/functionsimpl.cpp:202 editor/functionsimpl.cpp:225
- msgid ""
--"<qt>"
--"<h3>%1</h3>"
--"<p><b>Description:</b> %2\n"
-+"<qt><h3>%1</h3><p><b>Description:</b> %2\n"
- "<p><b>Syntax:</b> <i>%3</i>%4</qt>"
- msgstr ""
--"<qt>"
--"<h3>%1</h3>"
--"<p><b>描述：</b> %2\n"
-+"<qt><h3>%1</h3><p><b>描述：</b> %2\n"
- "<p><b>語法：</b> <i>%3</i>%4</qt>"
- 
- #: editor/functionsimpl.cpp:214
-@@ -1940,8 +1922,7 @@
- #: editor/functionsimpl.cpp:217
- #, c-format
- msgid ""
--"_n: "
--"<p>Only first argument is obligatory.\n"
-+"_n: <p>Only first argument is obligatory.\n"
- "<p>Only first %n arguments are obligatory."
- msgstr "<p>只有首 %n 個引數是必須的。"
- 
-@@ -1951,8 +1932,8 @@
- 
- #: plugin/specialinformation.cpp:288
- msgid ""
--"Returns scripts associated with widget. This is an advanced feature that would "
--"not be commonly used."
-+"Returns scripts associated with widget. This is an advanced feature that "
-+"would not be commonly used."
- msgstr "傳回與 Widget 有關聯的指令稿。這個進階的功能通常不會被使用。"
- 
- #: plugin/specialinformation.cpp:289
-@@ -1968,21 +1949,21 @@
- msgstr "已剔選的傳回 1，未剔選的傳回 0。"
- 
- #: plugin/specialinformation.cpp:295
--#, fuzzy
- msgid ""
--"Returns the list of child widgets contained in the parent widget. Set the <i>"
--"recursive</i> parameter to <i>true</i> to include widgets contained by child "
--"widgets."
--msgstr "列表 of in 設定<i></i> 到<i> 真</i> 到."
-+"Returns the list of child widgets contained in the parent widget. Set the "
-+"<i>recursive</i> parameter to <i>true</i> to include widgets contained by "
-+"child widgets."
-+msgstr ""
-+"回傳包含在上層視窗元件中的子視窗元件清單。設定<i>遞迴</i>參數為<i>真</i>以包"
-+"含由子視窗元件所包含的視窗元件。"
- 
- #: plugin/specialinformation.cpp:297
- msgid "Removes all content from the widget."
- msgstr "移除 Widget 中所有的內容。"
- 
- #: plugin/specialinformation.cpp:300
--#, fuzzy
- msgid "Get the column count"
--msgstr "刪除欄位"
-+msgstr "取得欄計數"
- 
- #: plugin/specialinformation.cpp:302
- msgid "Returns number of items in a widget such as combobox or listbox."
-@@ -2002,17 +1983,20 @@
- 
- #: plugin/specialinformation.cpp:310
- msgid ""
--"Executes the script associated with the widget. With the new parser the execute "
--"method can take one or more arguments."
-+"Executes the script associated with the widget. With the new parser the "
-+"execute method can take one or more arguments."
- msgstr ""
-+"執行與視窗元件相關聯的命令稿。執行方法可以利用新的剖析器而取用一或多個引數。"
- 
- #: plugin/specialinformation.cpp:312
- msgid ""
--"Returns the index of an item with the given text. Defaults to case sensitive. "
--"Matching can be an exact match or match if it contains the string. Only the "
--"first argument is requred. If no column is given it will search the first by "
--"default."
-+"Returns the index of an item with the given text. Defaults to case "
-+"sensitive. Matching can be an exact match or match if it contains the "
-+"string. Only the first argument is requred. If no column is given it will "
-+"search the first by default."
- msgstr ""
-+"以給定的文字回傳項目的索引。預設為大小寫須相符。可以是精確的匹配或是含有字串"
-+"的匹配。只有第一個引數是必要的。如果沒有給定欄，它將會按照預設搜尋第一個。"
- 
- #: plugin/specialinformation.cpp:314
- msgid "Inserts new column (or <i>count</i> columns) at <i>column</i> position."
-@@ -2045,7 +2029,8 @@
- 
- #: plugin/specialinformation.cpp:330
- msgid ""
--"Removes the column (or <i>count</i> consecutive columns) with the given index."
-+"Removes the column (or <i>count</i> consecutive columns) with the given "
-+"index."
- msgstr "移除位於指定索引的一個或多個欄位。"
- 
- #: plugin/specialinformation.cpp:332
-@@ -2063,31 +2048,35 @@
- "In case of Table widgets, returns the selection coordinates, separated by "
- "commas in TopRow,LeftColumn,BottomRow,RightColumn form. "
- msgstr ""
-+"回傳所選文字或目前項目的文字。\n"
-+"如果是表格視窗元件，就回傳選擇座標，形式則為由逗號所分隔的 TopRow，"
-+"LeftColumn，BottomRow，RightColumn。"
- 
- #: plugin/specialinformation.cpp:340
- msgid ""
--"Sets scripts associated with widget. This is an advanced feature that would not "
--"be commonly used."
-+"Sets scripts associated with widget. This is an advanced feature that would "
-+"not be commonly used."
- msgstr "設定元件相關的文稿。這是不常用的進階功能。"
- 
- #: plugin/specialinformation.cpp:342
- msgid "Enables or disables widget."
--msgstr "啟用或停用 Widget。"
-+msgstr "啟用或停用視窗元件。"
- 
- #: plugin/specialinformation.cpp:345
- msgid "Sets text of a cell in a table."
- msgstr "設定表格其中一個儲存格的文字。"
- 
- #: plugin/specialinformation.cpp:347
--#, fuzzy
- msgid "Inserts a widget into a cell of a table."
--msgstr "設定表格其中一個儲存格的文字。"
-+msgstr "插入視窗元件到表格的儲存格。"
- 
- #: plugin/specialinformation.cpp:349
- msgid ""
- "Returns the name of a widget inserted into a cell, or an empty string if the "
- "cell contains no widget or an unknown widget type."
- msgstr ""
-+"回傳被插入儲存格的視窗元件名稱，如果儲存格不含任何視窗元件或是不明的視窗元件"
-+"型態，就回傳空字串。"
- 
- #: plugin/specialinformation.cpp:351
- msgid "Sets/unsets checkbox."
-@@ -2102,22 +2091,22 @@
- msgstr "選取在指定索引的項目。索引以 0 為基底。"
- 
- #: plugin/specialinformation.cpp:358
--#, fuzzy
- msgid ""
- "Inserts a tab to the tabwidget with the specified label at the given index. "
- "Indexes are zero based."
--msgstr "選取在指定索引的項目。索引以 0 為基底。"
-+msgstr "以給定的索引與指定的標籤將分頁插入分頁元件。索引以零為基底。"
- 
- #: plugin/specialinformation.cpp:360
- msgid "Sets maximum numeric value"
- msgstr "設定最大數值(必需是數字)"
- 
- #: plugin/specialinformation.cpp:362
--#, fuzzy
- msgid ""
- "Sets pixmap at the given index to the specified icon. Use <i>index = -1</i> "
- "to set the pixmap for all items."
--msgstr "於 到 使用<i></i> 到 set for 全部."
-+msgstr ""
-+"以給定的索引設定像素圖到指定的圖示。使用<i>index = -1</i> 以設定像素圖用於所"
-+"有項目。"
- 
- #: plugin/specialinformation.cpp:364
- msgid "Sets caption of the row <i>row</i>."
-@@ -2129,176 +2118,169 @@
- 
- #: plugin/specialinformation.cpp:369
- msgid "Sets widget's content."
--msgstr "設定 Widget 的內容。"
-+msgstr "設定視窗元件的內容。"
- 
- #: plugin/specialinformation.cpp:372
- msgid "Shows/hides widget."
--msgstr "顯示/隱藏 Widget。"
-+msgstr "顯示/隱藏視窗元件。"
- 
- #: plugin/specialinformation.cpp:373
- msgid "Returns content of widget."
--msgstr "傳回 Widget 的內容。"
-+msgstr "傳回視窗元件的內容。"
- 
- #: plugin/specialinformation.cpp:375
- msgid "Returns type(class) of widget."
--msgstr "傳回 Widget 的類型(類別)。"
-+msgstr "傳回視窗元件的類型(類別)。"
- 
- #: plugin/specialinformation.cpp:377
- msgid ""
- "Makes the widget editable or read only, depending on the editable argument."
--msgstr ""
-+msgstr "讓視窗元件可編輯或唯讀是依據不同的可編輯引數。"
- 
- #: plugin/specialinformation.cpp:379
- msgid ""
--"Return the widget's geometry as <i>x y w h</i>. This is useful for positioning "
--"a created widget."
-+"Return the widget's geometry as <i>x y w h</i>. This is useful for "
-+"positioning a created widget."
- msgstr ""
-+"回傳視窗元件的幾何位置像是<i>x y w h</i>。對於已建立視窗元件的定位是很有用"
-+"的。"
- 
- #: plugin/specialinformation.cpp:381
--#, fuzzy
- msgid "Returns true if the widget has focus."
--msgstr "傳回指定項目索引的文字。"
-+msgstr "如果視窗元件具有焦點就回傳真值。"
- 
- #: plugin/specialinformation.cpp:387
--#, fuzzy
- msgid ""
--"Returns current widget's content. This was required inside widget A to return "
--"widget A content when requested by widget B. The new method is to use @A.text "
--"inside B instead of just @A if you just want the unaltered text."
--msgstr "秒 A 到 A B 新的 方法 是 到 A 文字 B of A 文字."
-+"Returns current widget's content. This was required inside widget A to "
-+"return widget A content when requested by widget B. The new method is to use "
-+"@A.text inside B instead of just @A if you just want the unaltered text."
-+msgstr ""
-+"回傳目前的視窗元件內容。這個在視窗元件 A 的內部是必要的，以便視窗元件 B 要求"
-+"時可以回傳視窗元件 A 的內容。如果您只想要取得未變更的文字，新的方法是在 B 的"
-+"內部使用 @A.text 以代替 @A。"
- 
- #: plugin/specialinformation.cpp:389
--#, fuzzy
- msgid ""
--"Returns selected text or text of current item. This is deprecated for <i>"
--"@mywidget.selected</i>."
--msgstr "文字 或 文字 of 是 for<i></i>."
-+"Returns selected text or text of current item. This is deprecated for "
-+"<i>@mywidget.selected</i>."
-+msgstr ""
-+"回傳所選文字或目前項目的文字。這已經不宜用於 <i>@mywidget.selected</i>。"
- 
- #: plugin/specialinformation.cpp:391
--#, fuzzy
- msgid ""
--"Does nothing. This is useful if you request a CheckBox or RadioButton to return "
--"a value where a state, typically the unchecked state, has no value. The @null "
--"prevents an error indicating it is empty."
--msgstr "無 是 a 核取方塊 或 圓鈕 到 a a 否 錯誤 是 空的."
-+"Does nothing. This is useful if you request a CheckBox or RadioButton to "
-+"return a value where a state, typically the unchecked state, has no value. "
-+"The @null prevents an error indicating it is empty."
-+msgstr ""
-+"沒做任何事。如果您要求核取方塊或單選按鈕要回傳值的位置狀態，這就會很有用，尤"
-+"其是取消核取的狀態會沒有任何值。@null 用來防止指出它是空的錯誤。"
- 
- #: plugin/specialinformation.cpp:393
- msgid "Returns the pid (process ID) of the current process."
- msgstr "傳回目前進程的 pid (process ID)。"
- 
- #: plugin/specialinformation.cpp:395
--#, fuzzy
- msgid ""
--"Returns DCOP identifier of current process. This is shorthand for <i>"
--"kmdr-executor-@pid</i>."
--msgstr "識別子 of 是 for<i>kmdr-executor-@pid</i>."
-+"Returns DCOP identifier of current process. This is shorthand for <i>kmdr-"
-+"executor-@pid</i>."
-+msgstr ""
-+"回傳目前進程的 DCOP 識別碼。這是 <i>kmdr-executor-@pid</i> 的簡短寫法。"
- 
- #: plugin/specialinformation.cpp:398
- msgid "Returns the pid of the parent Kommander window."
--msgstr "傳回 parent Kommander 視窗的 pid。"
-+msgstr "傳回上層 Kommander 視窗的 pid。"
- 
- #: plugin/specialinformation.cpp:400
- msgid "Writes <i>text</i> on stderr."
--msgstr "於 stderr 寫入<i>文字</i>。"
-+msgstr "於標準錯誤寫入<i>文字</i>。"
- 
- #: plugin/specialinformation.cpp:402
- msgid "Writes <i>text</i> on standard output."
- msgstr "於標準輸出寫入<i>文字</i>。"
- 
- #: plugin/specialinformation.cpp:404
--#, fuzzy
- msgid ""
--"Executes a script block. Bash is used if no shell is given. It is primarily for "
--"use in non-button widgets where script actions are not expected. Full path is "
--"not required for the shell which may be useful for portability. "
--"<p><i>If this is used inside a button it allows alternate script languages to "
--"be used and will return a value to the main script, which may be unexpected.</i>"
--msgstr "a 區塊 是 否 是 是 for in 完全 路徑 是 for for<p><i> 是 a 到 和 a 到</i>"
-+"Executes a script block. Bash is used if no shell is given. It is primarily "
-+"for use in non-button widgets where script actions are not expected. Full "
-+"path is not required for the shell which may be useful for portability. "
-+"<p><i>If this is used inside a button it allows alternate script languages "
-+"to be used and will return a value to the main script, which may be "
-+"unexpected.</i>"
-+msgstr ""
-+"執行命令稿區塊。如果沒有給定命令殼就使用 Bash。它主要用於非按鈕視窗元件，其未"
-+"被預期有命令稿動作。完整路徑對於命令殼並非必要，它對於可攜性會有用處。<p><i>"
-+"如果這用於按鈕內部，那麼它允許使用替代的命令稿語言集並將回傳值到主要命令稿，"
-+"該項也許是並未預期的。</i>"
- 
- #: plugin/specialinformation.cpp:406
--#, fuzzy
- msgid ""
--"Returns value of an environment (shell) variable. Do not use <i>$</i> "
--"in the name. For example, <i>@env(PATH)</i>."
--msgstr "of 變數<i></i> in 名稱 建立原因 例子<i></i>."
-+"Returns value of an environment (shell) variable. Do not use <i>$</i> in the "
-+"name. For example, <i>@env(PATH)</i>."
-+msgstr ""
-+"傳回環境 (命令殼) 變數的值。不要在名稱中使用 <i>$</i>。舉例來說，<i>@env"
-+"(PATH)</i>。"
- 
- #: plugin/specialinformation.cpp:408 plugin/specialinformation.cpp:410
- msgid "Executes an external shell command."
- msgstr "執行一個外部 Shell 命令。"
- 
- #: plugin/specialinformation.cpp:412
--#, fuzzy
- msgid "Parses an expression and returns computed value."
--msgstr "和."
-+msgstr "剖析運算式並回傳計算後的值。"
- 
- #: plugin/specialinformation.cpp:414
--#, fuzzy
- msgid ""
--"Executes loop: values from <i>items</i> list (passed as EOL-separated string) "
--"are assigned to the variable. "
--"<br><b>Old</b>"
--"<br> <i>@forEach(i,A\\nB\\nC\\n)"
--"<br>  @# @i=A"
--"<br>@end</i>"
--"<br><b>New</b>"
--"<br><i>foreach i in MyArray do"
--"<br>  //i = key, MyArray[i] = val"
--"<br>end "
--msgstr "從<i></i> 列表 字串 到 變數<br><i> i A n<br> i A<br></i>"
-+"Executes loop: values from <i>items</i> list (passed as EOL-separated "
-+"string) are assigned to the variable. <br><b>Old</b><br> <i>@forEach(i,A\\nB"
-+"\\nC\\n)<br>  @# @i=A<br>@end</i><br><b>New</b><br><i>foreach i in MyArray "
-+"do<br>  //i = key, MyArray[i] = val<br>end "
-+msgstr ""
-+"執行迴圈：來自<i>項目</i>清單 (以 EOL 分隔的字串傳遞) 的值被指派到變數。"
-+"<br><b>Old</b><br> <i>@forEach(i,A\\nB\\nC\\n)<br>  @# @i=A<br>@end</"
-+"i><br><b>New</b><br><i>foreach i in MyArray do<br>  //i = key, MyArray[i] = "
-+"val<br>end "
- 
- #: plugin/specialinformation.cpp:416
--#, fuzzy
- msgid ""
--"Executes loop: variable is set to <i>start</i> and is increased by <i>step</i> "
--"each time loop is executed. Execution stops when variable becomes larger then "
--"<i>end</i>. "
--"<br><b>Old</b>"
--"<br><i>@for(i,1,10,1)"
--"<br>  @# @i=1"
--"<br>@endif</i>"
--"<br><b>New</b>"
--"<br><i>for i=0 to 20 step 5 do"
--"<br>  debug(i)"
--"<br>end</i>."
--msgstr ""
--"變數 是 set 到<i> 開始</i> 和 是<i></i> 時間 是 執行 變數<i></i>"
--"<br><i> for i"
--"<br> i"
--"<br></i>."
-+"Executes loop: variable is set to <i>start</i> and is increased by <i>step</"
-+"i> each time loop is executed. Execution stops when variable becomes larger "
-+"then <i>end</i>. <br><b>Old</b><br><i>@for(i,1,10,1)<br>  @# @i=1<br>@endif</"
-+"i><br><b>New</b><br><i>for i=0 to 20 step 5 do<br>  debug(i)<br>end</i>."
-+msgstr ""
-+"執行迴圈：變數被設定到 <i>start</i> 並且增加 <i>step </i> 於每次迴圈被執行"
-+"時。當變數變大就執行停止然後 <i>end </i>。<br><b>Old</b><br><i>@for(i,1,10,1)"
-+"<br>  @# @i=1<br>@endif</i><br><b>New</b><br><i>for i=0 to 20 step 5 do<br>  "
-+"debug(i)<br>end</i>."
- 
- #: plugin/specialinformation.cpp:418
- msgid "Returns the value of a global variable."
- msgstr "傳回一個全域變數的數值。"
- 
- #: plugin/specialinformation.cpp:420
--#, fuzzy
- msgid ""
- "Translates the string into the current language. Texts in GUI would be "
- "automatically extracted for translation."
--msgstr "字串 文字 in 使用者介面 for."
-+msgstr "將字串翻譯為目前的語言。在圖形使用者介面中的文字將自動擷取以便翻譯。"
- 
- #: plugin/specialinformation.cpp:422
--#, fuzzy
- msgid ""
- "Executes block if expression is true (non-zero number or non-empty string.) "
--"<p><b>Old</b>Close with <b>@endif</b></p>"
--"<p><b>New</b>"
--"<br>if val == true then"
--"<br>//  do op"
--"<br>elseif cond"
--"<br>//  second chance"
--"<br>else"
--"<br>//  cond failed"
--"<br>endif</p>"
--msgstr "區塊 是 真 數字 或 空的 字串<p> 關閉 成為<b></b></p>"
-+"<p><b>Old</b>Close with <b>@endif</b></p><p><b>New</b><br>if val == true "
-+"then<br>//  do op<br>elseif cond<br>//  second chance<br>else<br>//  cond "
-+"failed<br>endif</p>"
-+msgstr ""
-+"如果運算式為真就執行區塊 (非零數字或非空字串。)<p><b>Old</b>Close with "
-+"<b>@endif</b></p><p><b>New</b><br>if val == true then<br>//  do op<br>elseif "
-+"cond<br>//  second chance<br>else<br>//  cond failed<br>endif</p>"
- 
- #: plugin/specialinformation.cpp:424
--#, fuzzy
- msgid ""
--"Executes another Kommander dialog. Current dialog directory is used if no path "
--"is given. Arguments may be given as named arguments which will become global "
--"variables in the new dialog. For instance: <i>var=val</i>"
--msgstr "Kommander 目前 是 否 路徑 是 引數 in 新的 建立原因<i></i>"
-+"Executes another Kommander dialog. Current dialog directory is used if no "
-+"path is given. Arguments may be given as named arguments which will become "
-+"global variables in the new dialog. For instance: <i>var=val</i>"
-+msgstr ""
-+"執行另外的 Kommander 對話框。如果沒有給定路徑就使用目前的對話框目錄。引數也許"
-+"會以具名引數被給定，其將成為新對話框中的全域變數。舉例來說：<i>var=val</i>"
- 
- #: plugin/specialinformation.cpp:426
- msgid "Reads setting from configration file for this dialog."
-@@ -2306,8 +2288,8 @@
- 
- #: plugin/specialinformation.cpp:428
- msgid ""
--"Sets the value of a global variable. Global variables exist for the life of the "
--"Kommander window."
-+"Sets the value of a global variable. Global variables exist for the life of "
-+"the Kommander window."
- msgstr "設定全域變數的數值。全域變數直至 Kommander 視窗消失之前都會存在。"
- 
- #: plugin/specialinformation.cpp:430
-@@ -2316,16 +2298,11 @@
- 
- #: plugin/specialinformation.cpp:432
- msgid ""
--"Begin of <b>switch</b> block. Following <b>case</b> values are compared to <i>"
--"expression</i>."
--"<p>@switch()"
--"<br>@case()"
--"<br>@end"
-+"Begin of <b>switch</b> block. Following <b>case</b> values are compared to "
-+"<i>expression</i>.<p>@switch()<br>@case()<br>@end"
- msgstr ""
- "<b>switch</b> 區塊的開始。底下的 <b>case</b> 的值會與<i>表示式</i>比較。 "
--"<p>@switch() "
--"<br> @case() "
--"<br>@end"
-+"<p>@switch() <br> @case() <br>@end"
- 
- #: plugin/specialinformation.cpp:434
- msgid "Executes an external DCOP call."
-@@ -2338,38 +2315,37 @@
- #: plugin/specialinformation.cpp:438
- msgid ""
- "Creates a new widget with the specified type and as the child of parent."
--msgstr ""
-+msgstr "以指定的型態建立新的視窗元件並做為上層的子項。"
- 
- #: plugin/specialinformation.cpp:440
- msgid ""
- "Returns true if there is a widget with the passed name, false otherwise."
--msgstr ""
-+msgstr "如果有傳遞名稱的視窗元件就回傳真值，否則為假。"
- 
- #: plugin/specialinformation.cpp:442
- msgid "Connects the signal of sender with the slot of the receiver"
--msgstr ""
-+msgstr "以收件者插槽連接傳送者的訊號"
- 
- #: plugin/specialinformation.cpp:444
--#, fuzzy
- msgid "Disconnects the signal of sender from the slot of the receiver"
--msgstr "顯示發出者及接收者之間的連接。"
-+msgstr "從收件者插槽中斷傳送者的訊號"
- 
- #: plugin/specialinformation.cpp:447
- msgid "Exits script execution and returns"
--msgstr ""
-+msgstr "離開命令稿執行並回傳"
- 
- #: plugin/specialinformation.cpp:449
- msgid "Exits the current block of a while, for or foreach loop"
--msgstr ""
-+msgstr "離開目前的 while, for 或 foreach 迴圈區塊"
- 
- #: plugin/specialinformation.cpp:451
- msgid "Exit a step and return to the beginning of a loop"
--msgstr ""
-+msgstr "離開此一步驟並回到迴圈的起始部份"
- 
- #: plugin/specialinformation.cpp:453
- msgid ""
- "Return from a script, optionaly with a value from the script to the caller"
--msgstr ""
-+msgstr "從命令稿回復，可選擇從命令稿傳值給呼叫者"
- 
- #: plugin/specialinformation.cpp:457
- msgid "Returns an EOL-separated list of all values in the array."
-@@ -2401,17 +2377,14 @@
- 
- #: plugin/specialinformation.cpp:471
- msgid ""
--"Adds all elements in the string to the array. String should have <i>"
--"key\\tvalue\\n</i> format."
-+"Adds all elements in the string to the array. String should have <i>key"
-+"\\tvalue\\n</i> format."
- msgstr ""
- "把字串中所有的元素加入至陣列中。字串必須是<i>key>\\tvalue\\n</i>的格式。"
- 
- #: plugin/specialinformation.cpp:474
--msgid ""
--"Returns all elements in the array in "
--"<pre>key\\tvalue\\n</pre> format."
--msgstr ""
--"以<i>key>\\tvalue\\n</i>的格式，傳回陣列中所有的元素。"
-+msgid "Returns all elements in the array in <pre>key\\tvalue\\n</pre> format."
-+msgstr "以<i>key>\\tvalue\\n</i>的格式，傳回陣列中所有的元素。"
- 
- #: plugin/specialinformation.cpp:476
- msgid ""
-@@ -2419,26 +2392,33 @@
- "separator character to split the string. The separator's default value is "
- "'\\t'."
- msgstr ""
-+"從字串建立整數索引的陣列 - 從 0 開始。使用分隔字元來分割字串。分隔符號的預設"
-+"值是 '\\t'。"
- 
- #: plugin/specialinformation.cpp:478
- msgid ""
- "Create a string from an integer indexed array. Concatenate the elements with "
- "the separator character. The separator's default value is '\\t'."
- msgstr ""
-+"從整數索引的陣列建立字串。以分隔字元來串連元素。分隔符號的預設值是 '\\t'。"
- 
- #: plugin/specialinformation.cpp:480
--#, fuzzy
- msgid ""
--"Remove keyNum elements starting with keyStart from an indexed array and reindex "
--"the array. If keyNum is not specified, remove only the keyStart element."
--msgstr "從陣列移除指定 Key 的元素。"
-+"Remove keyNum elements starting with keyStart from an indexed array and "
-+"reindex the array. If keyNum is not specified, remove only the keyStart "
-+"element."
-+msgstr ""
-+"從已索引的陣列中移除以  keyStart 開始的 keyNum 個元素並重新索引陣列。如果 "
-+"keyNum 未被指定，則只移除 keyStart 元素。"
- 
- #: plugin/specialinformation.cpp:482
- msgid ""
--"Insert the elements from string starting at key and reindex the array. Use the "
--"separator to separate the elements from the string. The separator's default "
--"value is '\\t'."
-+"Insert the elements from string starting at key and reindex the array. Use "
-+"the separator to separate the elements from the string. The separator's "
-+"default value is '\\t'."
- msgstr ""
-+"插入元素自以索引鍵開始的字串並重新索引陣列。使用分隔符號以從字串分隔元素。分"
-+"隔符號的預設值是 '\\t'。"
- 
- #: plugin/specialinformation.cpp:487
- msgid "Returns number of chars in the string."
-@@ -2508,23 +2488,25 @@
- 
- #: plugin/specialinformation.cpp:518
- msgid ""
--"Returns the given string with %1, %2, %3 replaced with <i>arg1</i>, <i>arg2</i>"
--", <i>arg3</i> accordingly."
--msgstr "傳回指定的字串，並且把字串中 %1, %2, %3 的部分以<i>arg1</i>，<i>arg2</i>，<i>arg3</i>分別取代。"
-+"Returns the given string with %1, %2, %3 replaced with <i>arg1</i>, <i>arg2</"
-+"i>, <i>arg3</i> accordingly."
-+msgstr ""
-+"傳回指定的字串，並且把字串中 %1, %2, %3 的部分以 <i>arg1</i>，<i>arg2</i>，"
-+"<i>arg3</i> 分別取代。"
- 
- #: plugin/specialinformation.cpp:520
- msgid "Round a floating point number by x digits."
--msgstr ""
-+msgstr "以 x 位數來四捨五入浮點數字。"
- 
- #: plugin/specialinformation.cpp:523
- msgid "Convert a string to an integer. If not possible use the default value"
--msgstr ""
-+msgstr "轉換字串為整數。如果不可能就使用預設值"
- 
- #: plugin/specialinformation.cpp:525
- msgid ""
- "Convert a string to a double precision floating point value. If not possible "
- "use the default value"
--msgstr ""
-+msgstr "轉換字串為雙倍精度浮點數值。如果不可能就使用預設值"
- 
- #: plugin/specialinformation.cpp:529
- msgid "Returns content of given file."
-@@ -2540,14 +2522,14 @@
- 
- #: plugin/specialinformation.cpp:535
- msgid "Checks to see if file exists."
--msgstr ""
-+msgstr "檢查看看是否檔案存在。"
- 
- #: plugin/specialinformation.cpp:538
--#, fuzzy
- msgid ""
--"Shows color dialog. Returns color in #RRGGBB format. Defaults to the parameter, "
--"if specified."
--msgstr "顯示顏色對話盒。以 #RRGGBB 的格式傳回顏色。"
-+"Shows color dialog. Returns color in #RRGGBB format. Defaults to the "
-+"parameter, if specified."
-+msgstr ""
-+"顯示顏色對話框。以 #RRGGBB 格式回傳顏色。如果已經指定，就以參數為預設值。"
- 
- #: plugin/specialinformation.cpp:540
- msgid "Shows text selection dialog. Returns entered text."
-@@ -2579,8 +2561,8 @@
- 
- #: plugin/specialinformation.cpp:554
- msgid ""
--"Shows multiple files selection dialog. Returns EOL-separated list of selected "
--"files."
-+"Shows multiple files selection dialog. Returns EOL-separated list of "
-+"selected files."
- msgstr "顯示多個檔案的選擇對話盒。傳回以 EOL 分隔的選擇檔案列表。"
- 
- #: plugin/specialinformation.cpp:558
-@@ -2735,10 +2717,10 @@
- #: rc.cpp:80
- #, no-c-format
- msgid ""
--"<b>New Form</b>"
--"<p>Select a template for the new form and click the <b>OK</b>"
--"-button to create it.</p>"
--msgstr "<b>開新表單</b><p>請為新的表單選擇一套範本，並按<b>確定</b>建立它。</p>"
-+"<b>New Form</b><p>Select a template for the new form and click the <b>OK</b>-"
-+"button to create it.</p>"
-+msgstr ""
-+"<b>開新表單</b><p>請為新的表單選擇一套範本，並按<b>確定</b>建立它。</p>"
- 
- #. i18n: file ./editor/newform.ui line 109
- #: rc.cpp:89
-@@ -2768,17 +2750,14 @@
- #: rc.cpp:104
- #, no-c-format
- msgid ""
--"<b>Edit Palette</b>"
--"<p>Change the current widget or form's palette.</p>"
--"<p>Use a generated palette or select colors for each color group and each color "
--"role.</p>"
--"<p>The palette can be tested with different widget layouts in the preview "
--"section.</p>"
--msgstr ""
--"<b>編輯調色板</b>"
--"<p>變更目前的元件或表單的調色板。</p> "
--"<p>使用產生的調色板，或幫每個顏色群組與顏色角色選取顏色。</p> "
--"<p>調色板可以用前一段的不同的元件佈局來測試。</p>"
-+"<b>Edit Palette</b><p>Change the current widget or form's palette.</p><p>Use "
-+"a generated palette or select colors for each color group and each color "
-+"role.</p><p>The palette can be tested with different widget layouts in the "
-+"preview section.</p>"
-+msgstr ""
-+"<b>編輯調色板</b><p>變更目前的元件或表單的調色板。</p> <p>使用產生的調色板，"
-+"或幫每個顏色群組與顏色角色選取顏色。</p> <p>調色板可以用前一段的不同的元件布"
-+"局來測試。</p>"
- 
- #. i18n: file ./editor/paletteeditoradvanced.ui line 81
- #: rc.cpp:107 rc.cpp:860
-@@ -2898,36 +2877,29 @@
- #: rc.cpp:167
- #, no-c-format
- msgid ""
--"<b>Select a color role.</b>"
--"<p>Available central color roles are: "
--"<ul> "
--"<li>Background - general background color.</li> "
--"<li>Foreground - general foreground color. </li> "
--"<li>Base - used as the background color for example, for text entry widgets; it "
--"is usually white or another light color. </li> "
--"<li>Text - the forground color used with Base. Usually this is the same as the "
--"Foreground, in which case it must provide good contrast both with the "
--"Background and with the Base. </li> "
--"<li>Button - general button background color; useful where buttons need a "
--"background different from Background, as in the Macintosh style. </li> "
--"<li>ButtonText - a foreground color used with the Button color. </li> "
--"<li>Highlight - a color used to indicate a selected or highlighted item. </li> "
--"<li>HighlightedText - a text color that contrasts to Highlight. </li> "
--"<li>BrightText - a text color that is very different from Foreground and "
--"contrasts well with, for example, black. </li> </ul> </p>"
--msgstr ""
--"<b>選取顏色角色。</b>"
--"<p>可用的中心顏色角色包括： "
--"<ul>"
--"<li>背景─產生背景顏色。</li> "
--"<li>前景─產生前景顏色。</li> "
--"<li>基色─在範例中做為背景顏色，在文字項目元件中，通常是白色或其它亮的顏色。</li> "
--"<li>文字─與基色一起使用的前景顏色。通常與「前景」使用一樣的顏色，必須要與基色與背景色有夠高的對比。</li> "
--"<li>按鍵─一般按鍵的背景顏色，用於按鍵的背景色與「背景」中的設定不同的時候，例如在麥金塔風格中。</li> "
--"<li>按鍵文字─按鍵中的前景顏色。</li> "
--"<li>高亮度─用於指出所選取或重點的項目。</li> "
--"<li>高亮度文字─與「高亮度」對比的文字顏色。</li> "
--"<li>亮文字─與前景非常不同的文字顏色，要與黑色這一類別的顏色有強烈對比。</li> </ul> </p>"
-+"<b>Select a color role.</b><p>Available central color roles are: <ul> "
-+"<li>Background - general background color.</li> <li>Foreground - general "
-+"foreground color. </li> <li>Base - used as the background color for example, "
-+"for text entry widgets; it is usually white or another light color. </li> "
-+"<li>Text - the forground color used with Base. Usually this is the same as "
-+"the Foreground, in which case it must provide good contrast both with the "
-+"Background and with the Base. </li> <li>Button - general button background "
-+"color; useful where buttons need a background different from Background, as "
-+"in the Macintosh style. </li> <li>ButtonText - a foreground color used with "
-+"the Button color. </li> <li>Highlight - a color used to indicate a selected "
-+"or highlighted item. </li> <li>HighlightedText - a text color that contrasts "
-+"to Highlight. </li> <li>BrightText - a text color that is very different "
-+"from Foreground and contrasts well with, for example, black. </li> </ul> </p>"
-+msgstr ""
-+"<b>選取顏色角色。</b><p>可用的中心顏色角色包括： <ul><li>背景─產生背景顏色。"
-+"</li> <li>前景─產生前景顏色。</li> <li>基色─在範例中做為背景顏色，在文字項目"
-+"元件中，通常是白色或其它亮的顏色。</li> <li>文字─與基色一起使用的前景顏色。通"
-+"常與「前景」使用一樣的顏色，必須要與基色與背景色有夠高的對比。</li> <li>按鍵─"
-+"一般按鍵的背景顏色，用於按鍵的背景色與「背景」中的設定不同的時候，例如在麥金"
-+"塔風格中。</li> <li>按鍵文字─按鍵中的前景顏色。</li> <li>高亮度─用於指出所選"
-+"取或重點的項目。</li> <li>高亮度文字─與「高亮度」對比的文字顏色。</li> <li>亮"
-+"文字─與前景非常不同的文字顏色，要與黑色這一類別的顏色有強烈對比。</li> </ul> "
-+"</p>"
- 
- #. i18n: file ./editor/paletteeditoradvanced.ui line 285
- #: rc.cpp:170
-@@ -3029,23 +3001,14 @@
- #: rc.cpp:218
- #, no-c-format
- msgid ""
--"<b>Select a color effect role.</b>"
--"<p>Available effect roles are: "
--"<ul> "
--"<li>Light - lighter than Button color. </li> "
--"<li>Midlight - between Button and Light. </li> "
--"<li>Mid - between Button and Dark. </li> "
--"<li>Dark - darker than Button. </li> "
--"<li>Shadow - a very dark color. </li> </ul>"
--msgstr ""
--"<b>選取顏色效果角色。</b>"
--"<p>可用的效果角色有："
--"<ul> "
--"<li>亮─比按鍵顏色亮的顏色。</li> "
--"<li>中亮─在按鍵色與「亮」之間。</li> "
--"<li>中─在按鍵色與「暗」之間。</li> "
--"<li>暗─比按鍵色暗的顏色。"
--"<li>陰影─非常暗的顏色。</li></ul>"
-+"<b>Select a color effect role.</b><p>Available effect roles are: <ul> "
-+"<li>Light - lighter than Button color. </li> <li>Midlight - between Button "
-+"and Light. </li> <li>Mid - between Button and Dark. </li> <li>Dark - darker "
-+"than Button. </li> <li>Shadow - a very dark color. </li> </ul>"
-+msgstr ""
-+"<b>選取顏色效果角色。</b><p>可用的效果角色有：<ul> <li>亮─比按鍵顏色亮的顏"
-+"色。</li> <li>中亮─在按鍵色與「亮」之間。</li> <li>中─在按鍵色與「暗」之間。"
-+"</li> <li>暗─比按鍵色暗的顏色。<li>陰影─非常暗的顏色。</li></ul>"
- 
- #. i18n: file ./editor/paletteeditoradvanced.ui line 506
- #: rc.cpp:221
-@@ -3117,7 +3080,7 @@
- #: rc.cpp:272 rc.cpp:278 rc.cpp:281 rc.cpp:287 rc.cpp:290 rc.cpp:293
- #, no-c-format
- msgid "Quote"
--msgstr ""
-+msgstr "引言"
- 
- #. i18n: file ./editor/functions.ui line 263
- #: rc.cpp:275
-@@ -3189,17 +3152,14 @@
- #: rc.cpp:329
- #, no-c-format
- msgid ""
--"<b>Edit Iconview</b>"
--"<p>Add, edit or delete items in the icon view.</p>"
--"<p>Click the <b>New Item</b>-button to create a new item, then enter text and "
--"choose a pixmap.</p>"
--"<p>Select an item from the view and click the <b>Delete Item</b>"
--"-button to remove the item from the iconview.</p>"
--msgstr ""
--"<b>編輯圖示檢視</b>"
--"<p>新增、編輯或刪除在圖示檢視中的項目。</p> "
--"<p>點選「新增項目」並輸入文字與選擇像素圖，就可以在檢視中新增項目。</p> "
--"<p>選取檢視中的項目並點選「刪除項目」就可以移除項目。</p>"
-+"<b>Edit Iconview</b><p>Add, edit or delete items in the icon view.</"
-+"p><p>Click the <b>New Item</b>-button to create a new item, then enter text "
-+"and choose a pixmap.</p><p>Select an item from the view and click the "
-+"<b>Delete Item</b>-button to remove the item from the iconview.</p>"
-+msgstr ""
-+"<b>編輯圖示檢視</b><p>新增、編輯或刪除在圖示檢視中的項目。</p> <p>點選「新增"
-+"項目」並輸入文字與選擇像素圖，就可以在檢視中新增項目。</p> <p>選取檢視中的項"
-+"目並點選「刪除項目」就可以移除項目。</p>"
- 
- #. i18n: file ./editor/iconvieweditor.ui line 72
- #: rc.cpp:332
-@@ -3380,7 +3340,7 @@
- #: rc.cpp:455
- #, no-c-format
- msgid "&Function..."
--msgstr "函式(&F)..."
-+msgstr "函式(&F)…"
- 
- #. i18n: file ./editor/assoctexteditor.ui line 137
- #: rc.cpp:458
-@@ -3392,7 +3352,7 @@
- #: rc.cpp:461
- #, no-c-format
- msgid "Fi&le..."
--msgstr "檔案..."
-+msgstr "檔案…"
- 
- #. i18n: file ./editor/preferences.ui line 35
- #: rc.cpp:464
-@@ -3404,13 +3364,12 @@
- #: rc.cpp:467
- #, no-c-format
- msgid ""
--"<b>Preferences</b>"
--"<p>Change the preferences of Qt Designer. There is always one tab with general "
--"preferences. There may be additional tabs, depending on which plugins are "
--"installed.</p>"
-+"<b>Preferences</b><p>Change the preferences of Qt Designer. There is always "
-+"one tab with general preferences. There may be additional tabs, depending on "
-+"which plugins are installed.</p>"
- msgstr ""
--"<b>偏好設定</b>"
--"<p>更改 Qt Designer 的偏好設定。這個對話盒一定會有一個作一般設定分頁，其他的分頁是由外掛程式提供的。</p>"
-+"<b>偏好設定</b><p>更改 Qt Designer 的偏好設定。這個對話盒一定會有一個作一般設"
-+"定分頁，其他的分頁是由外掛程式提供的。</p>"
- 
- #. i18n: file ./editor/preferences.ui line 62
- #: rc.cpp:470
-@@ -3486,11 +3445,13 @@
- 
- #. i18n: file ./editor/preferences.ui line 190
- #: rc.cpp:512
--#, fuzzy, no-c-format
-+#, no-c-format
- msgid ""
--"<b>Customize the grid appearance for all forms.</b>"
--"<p>When <b>Show Grid</b> is checked, all forms show a grid.</p>"
--msgstr "<b> 自訂 for 全部 表單</b><p><b> 顯示 格線</b> 是 全部 表單 a</p>"
-+"<b>Customize the grid appearance for all forms.</b><p>When <b>Show Grid</b> "
-+"is checked, all forms show a grid.</p>"
-+msgstr ""
-+"<b>自訂格線外觀用於所有表單。</b><p>當<b>顯示格線</b>被勾選時，所有表單都顯示"
-+"格線。</p>"
- 
- #. i18n: file ./editor/preferences.ui line 198
- #: rc.cpp:515
-@@ -3514,10 +3475,11 @@
- #: rc.cpp:524
- #, no-c-format
- msgid ""
--"<b>Customize the grid-settings for all forms.</b>"
--"<p>When <b>Snap to Grid</b> is checked, the widgets snap to the grid using the "
--"the X/Y resolution.</p>"
--msgstr "<b>調整所有表單的格線設定。</b><p>勾選「貼齊格線」的話，元件會使用 X/Y 解析度來貼齊格線。</p>"
-+"<b>Customize the grid-settings for all forms.</b><p>When <b>Snap to Grid</b> "
-+"is checked, the widgets snap to the grid using the the X/Y resolution.</p>"
-+msgstr ""
-+"<b>調整所有表單的格線設定。</b><p>勾選「貼齊格線」的話，元件會使用 X/Y 解析度"
-+"來貼齊格線。</p>"
- 
- #. i18n: file ./editor/preferences.ui line 258
- #: rc.cpp:527 rc.cpp:533
-@@ -3529,10 +3491,11 @@
- #: rc.cpp:530 rc.cpp:536
- #, no-c-format
- msgid ""
--"<b>Customize the grid-settings for all forms.</b>"
--"<p>When <b>Show Grid</b> is checked, a grid is shown on all forms using the X/Y "
--"resolution.</p>"
--msgstr "<b>自訂所有表單的格線設定。</b> <p>勾選「顯示格線」以後，所有表單都會使用 X/Y 軸顯示格線。</p>"
-+"<b>Customize the grid-settings for all forms.</b><p>When <b>Show Grid</b> is "
-+"checked, a grid is shown on all forms using the X/Y resolution.</p>"
-+msgstr ""
-+"<b>自訂所有表單的格線設定。</b> <p>勾選「顯示格線」以後，所有表單都會使用 X/"
-+"Y 軸顯示格線。</p>"
- 
- #. i18n: file ./editor/preferences.ui line 289
- #: rc.cpp:539
-@@ -3608,10 +3571,10 @@
- #: rc.cpp:575
- #, no-c-format
- msgid ""
--"<b>Enter the path to the documentation.</b>"
--"<p>You may provide an $environment variable as the first part of the "
--"pathname.</p>"
--msgstr "<b>輸入說明文件的路徑。</b><p>您可以在路徑文字的首段輸入一個環境變數。</p>"
-+"<b>Enter the path to the documentation.</b><p>You may provide an "
-+"$environment variable as the first part of the pathname.</p>"
-+msgstr ""
-+"<b>輸入說明文件的路徑。</b><p>您可以在路徑文字的首段輸入一個環境變數。</p>"
- 
- #. i18n: file ./editor/preferences.ui line 436
- #: rc.cpp:581
-@@ -3663,9 +3626,9 @@
- 
- #. i18n: file ./editor/preferences.ui line 488
- #: rc.cpp:605
--#, fuzzy, no-c-format
-+#, no-c-format
- msgid "Text labels will be usin in the toolbars if this is checked."
--msgstr "文字 in 是."
-+msgstr "如果勾選它，文字標籤將用於工具列。"
- 
- #. i18n: file ./editor/listvieweditor.ui line 35
- #: rc.cpp:623
-@@ -3677,18 +3640,17 @@
- #: rc.cpp:626
- #, no-c-format
- msgid ""
--"<b>Edit Listview</b>"
--"<p>Use the controls on the <b>Items</b>-tab to add, edit or delete items in the "
--"listview. Change the column configuration of the listview using the controls on "
--"the <b>Columns</b>-tab.</p>Click the <b>New Item</b>"
--"-button to create a new item, then enter text and add a pixmap.</p>"
--"<p>Select an item from the list and click the <b>Delete Item</b>"
--"-button to remove the item from the list.</p>"
--msgstr ""
--"<b>編輯列表檢視</b>"
--"<p>您可以在「項目」頁中新增、編輯、刪除在列表檢視裡的項目，或是在「欄位」頁中修改欄位設定。</p>"
--"<p>點選「新增項目」並輸入文字與加入像素圖可以新增一個項目。</p>"
--"<p>在列表中選取一個項目並點選「刪除項目」可以刪除該項目。</p>"
-+"<b>Edit Listview</b><p>Use the controls on the <b>Items</b>-tab to add, edit "
-+"or delete items in the listview. Change the column configuration of the "
-+"listview using the controls on the <b>Columns</b>-tab.</p>Click the <b>New "
-+"Item</b>-button to create a new item, then enter text and add a pixmap.</"
-+"p><p>Select an item from the list and click the <b>Delete Item</b>-button to "
-+"remove the item from the list.</p>"
-+msgstr ""
-+"<b>編輯列表檢視</b><p>您可以在「項目」頁中新增、編輯、刪除在列表檢視裡的項"
-+"目，或是在「欄位」頁中修改欄位設定。</p><p>點選「新增項目」並輸入文字與加入像"
-+"素圖可以新增一個項目。</p><p>在列表中選取一個項目並點選「刪除項目」可以刪除該"
-+"項目。</p>"
- 
- #. i18n: file ./editor/listvieweditor.ui line 85
- #: rc.cpp:638
-@@ -3712,8 +3674,8 @@
- #: rc.cpp:653
- #, no-c-format
- msgid ""
--"<b>Change the text of the item.</b>"
--"<p>The text will be changed in the current column of the selected item.</p>"
-+"<b>Change the text of the item.</b><p>The text will be changed in the "
-+"current column of the selected item.</p>"
- msgstr "<b>更改項目的文字。</b><p>選擇項目目前的欄位文字將會被更改。</p>"
- 
- #. i18n: file ./editor/listvieweditor.ui line 155
-@@ -3726,8 +3688,8 @@
- #: rc.cpp:659
- #, no-c-format
- msgid ""
--"<b>Select the current column.</b>"
--"<p>The item's text and pixmap will be changed for the current column</p>"
-+"<b>Select the current column.</b><p>The item's text and pixmap will be "
-+"changed for the current column</p>"
- msgstr "<b>選擇目前的欄位。</b><p>目前欄位的項目文字及點陣圖將會被更改</p>"
- 
- #. i18n: file ./editor/listvieweditor.ui line 166
-@@ -3740,26 +3702,29 @@
- #: rc.cpp:671 rc.cpp:1178 rc.cpp:1235
- #, no-c-format
- msgid ""
--"<b>Delete the selected item's pixmap.</b>"
--"<p>The pixmap in the current column of the selected item will be deleted.</p>"
--msgstr "<b>刪除選擇項目的點陣圖。</b><p>選擇項目目前的欄位的點陣圖將會被刪除。</p>"
-+"<b>Delete the selected item's pixmap.</b><p>The pixmap in the current column "
-+"of the selected item will be deleted.</p>"
-+msgstr ""
-+"<b>刪除選擇項目的點陣圖。</b><p>選擇項目目前的欄位的點陣圖將會被刪除。</p>"
- 
- #. i18n: file ./editor/listvieweditor.ui line 234
- #: rc.cpp:680 rc.cpp:1187 rc.cpp:1244
- #, no-c-format
- msgid ""
--"<b>Select a pixmap file for the item.</b>"
--"<p>The pixmap will be changed in the current column of the selected item.</p>"
--msgstr "<b>選擇此項目的像素圖檔。</b><p>所選取項目中目前欄位的像素圖會被更改。</p>"
-+"<b>Select a pixmap file for the item.</b><p>The pixmap will be changed in "
-+"the current column of the selected item.</p>"
-+msgstr ""
-+"<b>選擇此項目的像素圖檔。</b><p>所選取項目中目前欄位的像素圖會被更改。</p>"
- 
- #. i18n: file ./editor/listvieweditor.ui line 252
- #: rc.cpp:689
- #, no-c-format
- msgid ""
--"<b>Adds a new item to the list.</b>"
--"<p>The item will be inserted at the top of the list and can be moved using the "
--"up- and down-buttons.</p>"
--msgstr "<b>新增項目到列表中。</b><p>項目會被放在列表中的最頂端，可以用按鍵來移動。</p>"
-+"<b>Adds a new item to the list.</b><p>The item will be inserted at the top "
-+"of the list and can be moved using the up- and down-buttons.</p>"
-+msgstr ""
-+"<b>新增項目到列表中。</b><p>項目會被放在列表中的最頂端，可以用按鍵來移動。</"
-+"p>"
- 
- #. i18n: file ./editor/listvieweditor.ui line 260
- #: rc.cpp:692 rc.cpp:998
-@@ -3783,10 +3748,12 @@
- #: rc.cpp:701
- #, no-c-format
- msgid ""
--"<b>Create a new sub-item for the selected item.</b>"
--"<p>New sub-items are inserted at the top of the list of sub-items, and new "
--"levels are created automatically.</p>"
--msgstr "<b>建立所選取項目的子項目。</b><p>新的子項目會被放在子項目列表中的最頂端，並且會自動建立新的等級。</p>"
-+"<b>Create a new sub-item for the selected item.</b><p>New sub-items are "
-+"inserted at the top of the list of sub-items, and new levels are created "
-+"automatically.</p>"
-+msgstr ""
-+"<b>建立所選取項目的子項目。</b><p>新的子項目會被放在子項目列表中的最頂端，並"
-+"且會自動建立新的等級。</p>"
- 
- #. i18n: file ./editor/listvieweditor.ui line 305
- #: rc.cpp:704 rc.cpp:800 rc.cpp:1052 rc.cpp:1151 rc.cpp:1205
-@@ -3798,8 +3765,8 @@
- #: rc.cpp:707
- #, no-c-format
- msgid ""
--"<b>Move the selected item up.</b>"
--"<p>The item will be moved within its level in the hierarchy.</p>"
-+"<b>Move the selected item up.</b><p>The item will be moved within its level "
-+"in the hierarchy.</p>"
- msgstr "<b>將所選取的項目往上移。</b><p>項目會在它在階層中的等級內移動。</p>"
- 
- #. i18n: file ./editor/listvieweditor.ui line 322
-@@ -3812,8 +3779,8 @@
- #: rc.cpp:713
- #, no-c-format
- msgid ""
--"<b>Move the selected item down.</b>"
--"<p>The item will be moved within its level in the hierarchy.</p>"
-+"<b>Move the selected item down.</b><p>The item will be moved within its "
-+"level in the hierarchy.</p>"
- msgstr "<b>將所選取的項目往下移。</b><p>項目會在它在階層中的等級內移動。</p>"
- 
- #. i18n: file ./editor/listvieweditor.ui line 339
-@@ -3826,8 +3793,8 @@
- #: rc.cpp:719
- #, no-c-format
- msgid ""
--"<b>Move the selected item one level up.</b>"
--"<p>This will also change the level of the item's sub-items.</p>"
-+"<b>Move the selected item one level up.</b><p>This will also change the "
-+"level of the item's sub-items.</p>"
- msgstr "<b>將所選取的項目往上移一個等級。</b><p>這會一起改變子項目的等級。</p>"
- 
- #. i18n: file ./editor/listvieweditor.ui line 356
-@@ -3840,8 +3807,8 @@
- #: rc.cpp:725
- #, no-c-format
- msgid ""
--"<b>Move the selected item one level down.</b>"
--"<p>This will also change the level of the item's sub-items.</p>"
-+"<b>Move the selected item one level down.</b><p>This will also change the "
-+"level of the item's sub-items.</p>"
- msgstr "<b>將所選取的項目往下移一個等級。</b><p>這會一起改變子項目的等級。</p>"
- 
- #. i18n: file ./editor/listvieweditor.ui line 369
-@@ -3866,9 +3833,10 @@
- #: rc.cpp:752
- #, no-c-format
- msgid ""
--"<b>Select a pixmap file for the selected column.</b>"
--"<p>The pixmap will be displayed in the header of the listview.</p>"
--msgstr "選擇所選取欄位的像素圖檔。</b><p>此像素圖會被顯示在列表檢視的標頭。</p>"
-+"<b>Select a pixmap file for the selected column.</b><p>The pixmap will be "
-+"displayed in the header of the listview.</p>"
-+msgstr ""
-+"選擇所選取欄位的像素圖檔。</b><p>此像素圖會被顯示在列表檢視的標頭。</p>"
- 
- #. i18n: file ./editor/listvieweditor.ui line 482
- #: rc.cpp:758
-@@ -3880,8 +3848,8 @@
- #: rc.cpp:761
- #, no-c-format
- msgid ""
--"<b>Enter the text for the selected column.</b>"
--"<p>The text will be displayed in the header of the listview.</p>"
-+"<b>Enter the text for the selected column.</b><p>The text will be displayed "
-+"in the header of the listview.</p>"
- msgstr "<b>輸入選取欄位的文字。</b><p>文字會被顯示在列表檢視的標頭。</p>"
- 
- #. i18n: file ./editor/listvieweditor.ui line 493
-@@ -3932,9 +3900,10 @@
- #: rc.cpp:788
- #, no-c-format
- msgid ""
--"<b>Move the selected item down.</b>"
--"<p>The top-most column will be the first column in the list.</p>"
--msgstr "<b>將所選取的項目下移。</b><p>最頂端的欄位會成為列表中的第一個欄位。</p>"
-+"<b>Move the selected item down.</b><p>The top-most column will be the first "
-+"column in the list.</p>"
-+msgstr ""
-+"<b>將所選取的項目下移。</b><p>最頂端的欄位會成為列表中的第一個欄位。</p>"
- 
- #. i18n: file ./editor/listvieweditor.ui line 548
- #: rc.cpp:791 rc.cpp:1166
-@@ -3952,18 +3921,19 @@
- #: rc.cpp:797
- #, no-c-format
- msgid ""
--"<b>Create a new column.</b>"
--"<p>New columns are appended at the end of (right of) the list and may be moved "
--"using the up- and down-buttons.</p>"
--msgstr "<b>建立一個新欄位。</b><p>新欄位會被附在列表的底端（右方），您可以移動。</p>"
-+"<b>Create a new column.</b><p>New columns are appended at the end of (right "
-+"of) the list and may be moved using the up- and down-buttons.</p>"
-+msgstr ""
-+"<b>建立一個新欄位。</b><p>新欄位會被附在列表的底端（右方），您可以移動。</p>"
- 
- #. i18n: file ./editor/listvieweditor.ui line 571
- #: rc.cpp:803
- #, no-c-format
- msgid ""
--"<b>Move the selected item up.</b>"
--"<p>The top-most column will be the first column in the list.</p>"
--msgstr "<b>將所選取的項目上移。</b><p>最頂端的欄位會成為列表中的第一個欄位。</p>"
-+"<b>Move the selected item up.</b><p>The top-most column will be the first "
-+"column in the list.</p>"
-+msgstr ""
-+"<b>將所選取的項目上移。</b><p>最頂端的欄位會成為列表中的第一個欄位。</p>"
- 
- #. i18n: file ./editor/listvieweditor.ui line 579
- #: rc.cpp:806
-@@ -4011,7 +3981,7 @@
- #: rc.cpp:854
- #, no-c-format
- msgid "&Tune Palette..."
--msgstr "微調調色板(&T)..."
-+msgstr "微調調色板(&T)…"
- 
- #. i18n: file ./editor/paletteeditor.ui line 247
- #: rc.cpp:857
-@@ -4035,10 +4005,12 @@
- #: rc.cpp:908
- #, no-c-format
- msgid ""
--"<b>Form Settings</b>"
--"<p>Change settings for the form. Settings like <b>Comment</b> and <b>Author</b> "
--"are for your own use and are not required.</p>"
--msgstr "<b>表單設定</b><p>更改表單的設定。像是<b>註解</b>及<b>作者</b>的項目不是必須的。</p>"
-+"<b>Form Settings</b><p>Change settings for the form. Settings like "
-+"<b>Comment</b> and <b>Author</b> are for your own use and are not required.</"
-+"p>"
-+msgstr ""
-+"<b>表單設定</b><p>更改表單的設定。像是<b>註解</b>及<b>作者</b>的項目不是必須"
-+"的。</p>"
- 
- #. i18n: file ./editor/formsettings.ui line 122
- #: rc.cpp:923
-@@ -4110,17 +4082,14 @@
- #: rc.cpp:971
- #, no-c-format
- msgid ""
--"<b>Edit Listbox</b>"
--"<p>Add, edit or delete items in the listbox.</p>"
--"<p>Click the <b>New Item</b>-button to create a new listbox entry, then enter "
--"text and choose a pixmap.</p>"
--"<p>Select an item from the list and click the <b>Delete Item</b>"
--"-button to remove the item from the list.</p>"
--msgstr ""
--"<b>編輯列表盒（Listbox）</b>"
--"<p>新增、編輯或刪除列表盒中的項目。</p>"
--"<p>點選<b>新增項目</b>，並輸入文字與選擇像素圖，就可以在列表盒中新增項目。</p>"
--"<p>從清單中選取項目並點選<b>刪除項目</b>就可以刪除該項目。</p>"
-+"<b>Edit Listbox</b><p>Add, edit or delete items in the listbox.</p><p>Click "
-+"the <b>New Item</b>-button to create a new listbox entry, then enter text "
-+"and choose a pixmap.</p><p>Select an item from the list and click the "
-+"<b>Delete Item</b>-button to remove the item from the list.</p>"
-+msgstr ""
-+"<b>編輯列表盒（Listbox）</b><p>新增、編輯或刪除列表盒中的項目。</p><p>點選<b>"
-+"新增項目</b>，並輸入文字與選擇像素圖，就可以在列表盒中新增項目。</p><p>從清單"
-+"中選取項目並點選<b>刪除項目</b>就可以刪除該項目。</p>"
- 
- #. i18n: file ./editor/listboxeditor.ui line 229
- #: rc.cpp:1022
-@@ -4166,11 +4135,11 @@
- 
- #. i18n: file ./editor/multilineeditor.ui line 46
- #: rc.cpp:1067
--#, fuzzy, no-c-format
-+#, no-c-format
- msgid ""
--"<b>Edit Multiline Edit</b>"
--"<p>Enter the text and click the <b>OK</b>-Button to apply the changes.</p>"
--msgstr "<b> 編輯 編輯</b><p> Enter 文字 和<b> 確定</b> 按鈕 到</p>"
-+"<b>Edit Multiline Edit</b><p>Enter the text and click the <b>OK</b>-Button "
-+"to apply the changes.</p>"
-+msgstr "<b>編輯多列編輯</b><p>輸入文字並按一下<b>確定</b>按鈕以套用變更。</p>"
- 
- #. i18n: file ./editor/multilineeditor.ui line 84
- #: rc.cpp:1073
-@@ -4212,16 +4181,16 @@
- #: rc.cpp:1154 rc.cpp:1208
- #, no-c-format
- msgid ""
--"<b>Move the selected item up.</b>"
--"<p>The top-most column will be the first column of the list.</p>"
-+"<b>Move the selected item up.</b><p>The top-most column will be the first "
-+"column of the list.</p>"
- msgstr "<b>將所選的項目上移。</b><p>最頂端的欄位會成為列表中的第一個欄位。</p>"
- 
- #. i18n: file ./editor/tableeditor.ui line 235
- #: rc.cpp:1160 rc.cpp:1214
- #, no-c-format
- msgid ""
--"<b>Move the selected item down.</b>"
--"<p>The top-most column will be the first column of the list.</p>"
-+"<b>Move the selected item down.</b><p>The top-most column will be the first "
-+"column of the list.</p>"
- msgstr "<b>將所選的項目下移。</b><p>最頂端的欄位會成為列表中的第一個欄位。</p>"
- 
- #. i18n: file ./editor/tableeditor.ui line 273
-@@ -4292,19 +4261,16 @@
- 
- #. i18n: file ./editor/connectioneditor.ui line 41
- #: rc.cpp:1262
--#, fuzzy, no-c-format
-+#, no-c-format
- msgid ""
--"<b>Edit Connections</b>"
--"<p>Add and remove connections in the current form .</p>"
--"<p>Select a signal and a corresponding slot then press the <b>Connect</b>"
--"-button to create a connection.</p>"
--"<p>Select a connection from the list then press the <b>Disconnect</b>"
--"-button to delete the connection.</p>"
--msgstr ""
--"<b> 編輯 連線</b>"
--"<p> 新增 和 in</p>"
--"<p> 選擇 a 和 a 插槽<b> 連線</b> 到 a</p>"
--"<p> 選擇 a 從 列表<b> 斷線</b> 到</p>"
-+"<b>Edit Connections</b><p>Add and remove connections in the current form .</"
-+"p><p>Select a signal and a corresponding slot then press the <b>Connect</b>-"
-+"button to create a connection.</p><p>Select a connection from the list then "
-+"press the <b>Disconnect</b>-button to delete the connection.</p>"
-+msgstr ""
-+"<b>編輯連接</b><p>加入和移除目前表單中的連接。</p><p>選取訊號與相應插槽然後按"
-+"下<b>連接</b>按鈕以建立連接。</p><p>從清單選取連接然後按下<b>中斷連線</b>按鈕"
-+"以刪除連接。</p>"
- 
- #. i18n: file ./editor/connectioneditor.ui line 56
- #: rc.cpp:1265
-@@ -4328,7 +4294,7 @@
- #: rc.cpp:1274
- #, no-c-format
- msgid "Slot"
--msgstr "Slot"
-+msgstr "插槽"
- 
- #. i18n: file ./editor/connectioneditor.ui line 111
- #: rc.cpp:1277
-@@ -4338,31 +4304,32 @@
- 
- #. i18n: file ./editor/connectioneditor.ui line 119
- #: rc.cpp:1280
--#, fuzzy, no-c-format
-+#, no-c-format
- msgid ""
--"<b>A list of slots for the receiver.</b>"
--"<p>The slots that are displayed are only those which have arguments that "
--"correspond with the arguments of the signal that is currently selected in the "
--"Signal-list.</b>"
--msgstr "<b> A 列表 of for</b><p> 成為 of 是 in Signal 列表</b>"
-+"<b>A list of slots for the receiver.</b><p>The slots that are displayed are "
-+"only those which have arguments that correspond with the arguments of the "
-+"signal that is currently selected in the Signal-list.</b>"
-+msgstr ""
-+"<b>用於收件者的插槽清單。</b><p>只顯示具有引數的插槽，其引數是相應於目前所選"
-+"訊號清單中的訊號。</b>"
- 
- #. i18n: file ./editor/connectioneditor.ui line 127
- #: rc.cpp:1283
- #, no-c-format
- msgid "Displays the list of signals that the widget emits."
--msgstr "顯示所有 Widget 會發出的訊號。"
-+msgstr "顯示所有視窗元件會發出的訊號。"
- 
- #. i18n: file ./editor/connectioneditor.ui line 143
- #: rc.cpp:1286
- #, no-c-format
- msgid "Si&gnals:"
--msgstr "Si&gnals:"
-+msgstr "訊號(&G)："
- 
- #. i18n: file ./editor/connectioneditor.ui line 183
- #: rc.cpp:1289
- #, no-c-format
- msgid "&Slots:"
--msgstr "&Slots:"
-+msgstr "插槽(&S)："
- 
- #. i18n: file ./editor/connectioneditor.ui line 217
- #: rc.cpp:1292
-@@ -4374,7 +4341,7 @@
- #: rc.cpp:1295
- #, no-c-format
- msgid "Alt+D"
--msgstr ""
-+msgstr "Alt+D"
- 
- #. i18n: file ./editor/connectioneditor.ui line 226
- #: rc.cpp:1298
-@@ -4392,13 +4359,13 @@
- #: rc.cpp:1307
- #, no-c-format
- msgid "Alt+O"
--msgstr ""
-+msgstr "Alt+O"
- 
- #. i18n: file ./editor/connectioneditor.ui line 277
- #: rc.cpp:1316
- #, no-c-format
- msgid "Alt+C"
--msgstr ""
-+msgstr "Alt+C"
- 
- #. i18n: file ./editor/connectioneditor.ui line 318
- #: rc.cpp:1322
-@@ -4416,7 +4383,7 @@
- #: rc.cpp:1328
- #, no-c-format
- msgid "Alt+N"
--msgstr ""
-+msgstr "Alt+N"
- 
- #. i18n: file ./editor/connectioneditor.ui line 355
- #: rc.cpp:1331
-@@ -4448,12 +4415,11 @@
- 
- #: widget/parser.cpp:192
- msgid "Constant value expected"
--msgstr ""
-+msgstr "預期為常數"
- 
- #: widget/parser.cpp:223
--#, fuzzy
- msgid "'%1' (%2) is not a widget"
--msgstr "'%1' 不是一個 Widget"
-+msgstr "'%1' (%2) 並非視窗元件"
- 
- #: widget/parser.cpp:235 widget/parser.cpp:520
- msgid "'%1' is not a function"
-@@ -4465,7 +4431,7 @@
- 
- #: widget/parser.cpp:271 widget/parser.cpp:281
- msgid "Divide by zero"
--msgstr ""
-+msgstr "被零除"
- 
- #: widget/parser.cpp:426 widget/parser.cpp:428 widget/parser.cpp:434
- msgid "in function '%1': %2"
-@@ -4493,11 +4459,9 @@
- 
- #: widget/parser.cpp:741
- msgid ""
--"Expected '%1'"
--"<br>"
--"<br>Possible cause of the error is having a variable with the same name as a "
--"widget"
--msgstr ""
-+"Expected '%1'<br><br>Possible cause of the error is having a variable with "
-+"the same name as a widget"
-+msgstr "預期 '%1'<br><br>錯誤的可能原因在於與變數同名的視窗元件"
- 
- #: widget/parser.cpp:743
- msgid "Expected '%1'"
-@@ -4512,25 +4476,24 @@
- msgstr "<qt>無法啟動 shell 進程<br><b>%1</b></qt>"
- 
- #: widget/expression.cpp:199 widget/expression.cpp:208
--#, fuzzy
- msgid "error"
--msgstr "貼上錯誤"
-+msgstr "錯誤"
- 
- #: widget/kommanderfunctions.cpp:120
- msgid "Unterminated @execBegin ... @execEnd block."
--msgstr "未結束的 @execBegin ... @execEnd 區塊。"
-+msgstr "未結束的 @execBegin… @execEnd 區塊。"
- 
- #: widget/kommanderfunctions.cpp:138 widget/kommanderfunctions.cpp:164
- msgid "Unterminated @forEach ... @end block."
--msgstr "未結束的 @forEach ... @end 區塊。"
-+msgstr "未結束的 @forEach… @end 區塊。"
- 
- #: widget/kommanderfunctions.cpp:201
- msgid "Unterminated @if ... @endif block."
--msgstr "未結束的 @if ... @endif 區塊。"
-+msgstr "未結束的 @if… @endif 區塊。"
- 
- #: widget/kommanderfunctions.cpp:221
- msgid "Unterminated @switch ... @end block."
--msgstr "未結束的 @switch ... @end 區塊。"
-+msgstr "未結束的 @switch… @end 區塊。"
- 
- #: widget/kommanderfunctions.cpp:320
- #, c-format
-@@ -4550,10 +4513,8 @@
- msgstr "關聯文字的狀態無效。"
- 
- #: widget/kommanderwidget.cpp:134
--msgid ""
--"Line %1: %2.\n"
--msgstr ""
--"行 %1: %2.\n"
-+msgid "Line %1: %2.\n"
-+msgstr "行 %1: %2.\n"
- 
- #: widget/kommanderwidget.cpp:244
- msgid "Unknown special: '%1'."
-@@ -4609,12 +4570,11 @@
- 
- #: widget/kommanderwidget.cpp:597
- msgid "Unknown widget function: '%1'."
--msgstr "未知的 Widget 函式： '%1'。"
-+msgstr "未知的視窗元件函式： '%1'。"
- 
- #: widget/kommanderwidget.cpp:599
- msgid ""
--"Not enough arguments for '%1' (%2 instead of %3)."
--"<p>Correct syntax is: %4"
-+"Not enough arguments for '%1' (%2 instead of %3).<p>Correct syntax is: %4"
- msgstr "%1 的參數不足（應該有 %3 個，您只給了 %2 個）。 <p>正確的語法為：%4"
- 
- #: widget/kommanderwidget.cpp:604
-@@ -4622,20 +4582,20 @@
- msgstr "%1 的參數過多（應該有 %3 個，您給了 %2 個）。 <p>正確的語法為：%4"
- 
- #: executor/main.cpp:45
--#, fuzzy
- msgid ""
- "Executor is a component of the Kommander dialog system that executes .kmdr "
- "files given as arguments or via stdin"
--msgstr "是 a of Kommander 或"
-+msgstr ""
-+"執行器是 Kommander 對話框系統的成份之一，它會執行做為引數給定或透過標準輸入"
-+"的 .kmdr 檔案"
- 
- #: executor/main.cpp:50
- msgid "Read dialog from standard input"
- msgstr "從標準輸入讀取對話盒"
- 
- #: executor/main.cpp:51
--#, fuzzy
- msgid "Use given catalog for translation"
--msgstr "使用 for"
-+msgstr "使用給定的類別來翻譯"
- 
- #: executor/main.cpp:58
- msgid "Kommander Executor"
-@@ -4643,14 +4603,13 @@
- 
- #: executor/main.cpp:87
- msgid ""
--"Error: no dialog given. Use --stdin option to read dialog from standard input.\n"
--msgstr ""
--"錯誤：沒有指定的對話盒。請使用 --stdin 選項從標準輸入讀取對話盒。\n"
-+"Error: no dialog given. Use --stdin option to read dialog from standard "
-+"input.\n"
-+msgstr "錯誤：沒有指定的對話盒。請使用 --stdin 選項從標準輸入讀取對話盒。\n"
- 
- #: executor/instance.cpp:115
--#, fuzzy
- msgid "<qt>Unable to create dialog.</qt>"
--msgstr "<qt>無法從這個檔案建立對話盒：<br><b>%1</b></qt>"
-+msgstr "<qt>無法建立對話框。</qt>"
- 
- #: executor/instance.cpp:187
- msgid "<qt>Kommander file<br><b>%1</b><br>does not exist.</qt>"
-@@ -4658,27 +4617,28 @@
- 
- #: executor/instance.cpp:195
- msgid ""
--"<qt>This file does not have a <b>.kmdr</b> extension. As a security precaution "
--"Kommander will only run Kommander scripts with a clear identity.</qt>"
-+"<qt>This file does not have a <b>.kmdr</b> extension. As a security "
-+"precaution Kommander will only run Kommander scripts with a clear identity.</"
-+"qt>"
- msgstr ""
--"<qt>這個檔案不是以 <b>.kmdr</b> 作副檔名。基於安全的理由，Kommander只會執行這個形式為副檔名的 Kommander 指令稿。</qt>"
-+"<qt>這個檔案不是以 <b>.kmdr</b> 作副檔名。基於安全的理由，Kommander只會執行這"
-+"個形式為副檔名的 Kommander 指令稿。</qt>"
- 
- #: executor/instance.cpp:197
- msgid "Wrong Extension"
- msgstr "錯誤的副檔名"
- 
- #: executor/instance.cpp:214
--#, fuzzy
- msgid ""
--"<qt>This dialog is running from your <i>/tmp</i> directory.  This may mean that "
--"it was run from a KMail attachment or from a webpage. "
--"<p>Any script contained in this dialog will have write access to all of your "
--"home directory; <b>running such dialogs may be dangerous: </b>"
--"<p>are you sure you want to continue?</qt>"
--msgstr ""
--"<qt> 是 執行中 從<i></i> 從 a KMail attachment 或 從 a"
--"<p> 任何 in 到 全部 of<b> 執行中</b>"
--"<p> 到</qt>"
-+"<qt>This dialog is running from your <i>/tmp</i> directory.  This may mean "
-+"that it was run from a KMail attachment or from a webpage. <p>Any script "
-+"contained in this dialog will have write access to all of your home "
-+"directory; <b>running such dialogs may be dangerous: </b><p>are you sure you "
-+"want to continue?</qt>"
-+msgstr ""
-+"<qt>這個對話框是從您的 <i>/tmp</i> 目錄所執行。 這也許意味著它是從 KMail 附件"
-+"或從網頁所執行。<p>任何包含在這個對話框中的命令稿將有對您主目錄完整的存取權"
-+"限；<b>執行此類對話框也許會有危險：</b><p>確定要繼續？</qt>"
- 
- #: executor/instance.cpp:218 executor/instance.cpp:223
- msgid "Run Nevertheless"
-@@ -4686,12 +4646,14 @@
- 
- #: executor/instance.cpp:223
- msgid ""
--"<qt>The Kommander file <i>%1</i> does not have the <b>executable attribute</b> "
--"set and could possibly contain dangerous exploits."
--"<p>If you trust the scripting (viewable in kmdr-editor) in this program, make "
--"it executable to get rid of this warning."
--"<p>Are you sure you want to continue?</qt>"
--msgstr ""
-+"<qt>The Kommander file <i>%1</i> does not have the <b>executable attribute</"
-+"b> set and could possibly contain dangerous exploits.<p>If you trust the "
-+"scripting (viewable in kmdr-editor) in this program, make it executable to "
-+"get rid of this warning.<p>Are you sure you want to continue?</qt>"
-+msgstr ""
-+"<qt>Kommander 檔案 <i>%1</i> 沒有設定<b>可執行檔案屬性</b>並且可能會包含危險"
-+"動作。<p>如果您信賴這個程式中的命令稿 (可以在 kmdr-editor 中檢視)，就讓它成為"
-+"可執行檔案以避過這個警告。<p>確定要繼續？</qt>"
- 
- #: executor/register.cpp:66
- msgid "Return EOL-separated list of all values in the array."
-@@ -4729,29 +4691,26 @@
- "把字串中所有的元素加入至陣列中。字串必須是<i>key>\\tvalue\\n</i>的格式。"
- 
- #: executor/register.cpp:75
--msgid ""
--"Return all elements in the array in <i>key>\\tvalue\\n</i> format."
--msgstr ""
--"以<i>key>\\tvalue\\n</i>的格式，傳回陣列中所有的元素。"
-+msgid "Return all elements in the array in <i>key>\\tvalue\\n</i> format."
-+msgstr "以<i>key>\\tvalue\\n</i>的格式，傳回陣列中所有的元素。"
- 
- #: executor/register.cpp:77
- msgid ""
- "Create an integer indexed array - starting from 0 - from a string. Use the "
- "separator character to split the string."
--msgstr ""
-+msgstr "從字串建立整數索引的陣列 - 從 0 開始。使用分隔字元以分割字串。"
- 
- #: executor/register.cpp:78
- msgid ""
- "Create a string from an integer indexed array. Concatenate the elements with "
- "the separator character."
--msgstr ""
-+msgstr "從整數索引的陣列建立字串。以分隔字元來串連元素。"
- 
- #: executor/register.cpp:79
--#, fuzzy
- msgid ""
--"Remove the element specified by the key from an indexed array and reindex the "
--"array."
--msgstr "從陣列移除指定 Key 的元素。"
-+"Remove the element specified by the key from an indexed array and reindex "
-+"the array."
-+msgstr "從索引過的陣列移除以索引鍵指定的元素並重新索引陣列。"
- 
- #: executor/register.cpp:82
- msgid "Return number of chars in the string."
-@@ -4795,8 +4754,8 @@
- 
- #: executor/register.cpp:95
- msgid ""
--"Compare two strings. Return 0 if they are equal, -1 if the first one is lower, "
--"1 if the first one is higher"
-+"Compare two strings. Return 0 if they are equal, -1 if the first one is "
-+"lower, 1 if the first one is higher"
- msgstr "比較兩個字串。相等的傳回 0，第二個較大就傳回 -1，第一個較大則傳回 1"
- 
- #: executor/register.cpp:97
-@@ -4821,123 +4780,126 @@
- 
- #: widgets/popupmenu.cpp:56
- msgid ""
--"Insert an item into the popup menu. The executeWidget's execute method will be "
--"run when this item is selected. Returns the id of the inserted item. Use -1 for "
--"index to insert to the end. The icon is optional."
-+"Insert an item into the popup menu. The executeWidget's execute method will "
-+"be run when this item is selected. Returns the id of the inserted item. Use -"
-+"1 for index to insert to the end. The icon is optional."
- msgstr ""
-+"將項目插入快顯功能表。executeWidget 的執行方法將於這個項目被選時執行。回傳插"
-+"入項目的識別號。使用 -1 表示將索引插入結尾。圖示是可選的。"
- 
- #: widgets/popupmenu.cpp:57
- msgid ""
--"Insert a separator item into the popup menu. Use -1 for index to insert to the "
--"end."
--msgstr ""
-+"Insert a separator item into the popup menu. Use -1 for index to insert to "
-+"the end."
-+msgstr "插入分隔符號項目進入快顯功能表。使用 -1 表示將索引插入結尾。"
- 
- #: widgets/popupmenu.cpp:58
- msgid ""
--"Change an item specified by id in the popup menu. The executeWidget's execute "
--"method will be run when this item is selected."
-+"Change an item specified by id in the popup menu. The executeWidget's "
-+"execute method will be run when this item is selected."
- msgstr ""
-+"在快顯功能表中變更以識別號指定的項目。executeWidget 的執行方法將於這個項目被"
-+"選時執行。"
- 
- #: widgets/popupmenu.cpp:59
- msgid "Enable the item specified by id in the popup menu."
--msgstr ""
-+msgstr "在快顯功能表中啟用以識別號指定的項目。"
- 
- #: widgets/popupmenu.cpp:60
- msgid "Check if the item specified by id is enabled."
--msgstr ""
-+msgstr "檢查是否以識別號指定的項目已啟用。"
- 
- #: widgets/popupmenu.cpp:61
- msgid "Make the item specified by id visible."
--msgstr ""
-+msgstr "讓以識別號指定的項目可見。"
- 
- #: widgets/popupmenu.cpp:62
- msgid "Apply checked status for the item specified by id."
--msgstr ""
-+msgstr "套用已勾選狀態於以識別號指定的項目。"
- 
- #: widgets/popupmenu.cpp:63
- msgid "Check if the item specified by id is visible."
--msgstr ""
-+msgstr "檢查是否以識別號指定的項目是可見的。"
- 
- #: widgets/popupmenu.cpp:64
- msgid "Verify if the item specified by id is checked."
--msgstr ""
-+msgstr "驗證是否由識別號所指定的項目已被勾選。"
- 
- #: widgets/popupmenu.cpp:65
- msgid ""
- "Insert submenu widget into the popup menu. Use -1 for index to insert to the "
- "end. The icon is optional."
- msgstr ""
-+"將子選單視窗元件插入快顯功能表。使用 -1 表示插入至結尾的索引。圖示是可選的。"
- 
- #: widgets/timer.cpp:63
- msgid "Set the timer timeout interval in ms."
--msgstr ""
-+msgstr "以毫秒設定計時器逾時間隔"
- 
- #: widgets/treewidget.cpp:64
- msgid "Add column at end with column header"
--msgstr ""
-+msgstr "將欄加至結尾並附欄首"
- 
- #: widgets/treewidget.cpp:65
- msgid "Set sorting for a column"
--msgstr ""
-+msgstr "設定欄排序"
- 
- #: widgets/treewidget.cpp:68
- msgid "Get the column caption for column index"
--msgstr ""
-+msgstr "取得欄索引的題要"
- 
- #: widgets/treewidget.cpp:69
- msgid "Set the pixel width for column index - use 0 to hide"
--msgstr ""
-+msgstr "設定欄索引的像素寬度 - 使用 0 表示隱藏"
- 
- #: widgets/treewidget.cpp:70
- msgid "Set to <i>left</i>, <i>right</i> or <i>center</i>, case insensitive "
--msgstr ""
-+msgstr "設定為<i>left</i>、<i>right</i>或<i>center</i>，大小寫不須相符 "
- 
- #: widgets/toolbox.cpp:39
- msgid "Adds a widget to the toolbox. Returns the index of the widget."
--msgstr ""
-+msgstr "將視窗元件加入工具箱。回傳視窗元件的索引。"
- 
- #: widgets/toolbox.cpp:41
--#, fuzzy
- msgid "Returns the name of the active widget."
--msgstr "傳回指定項目索引的文字。"
-+msgstr "回傳現用視窗元件的名稱。"
- 
- #: widgets/toolbox.cpp:42
- msgid ""
--"Remove the selected widget, returns the index of the removed widget or -1 if no "
--"such widget was found."
-+"Remove the selected widget, returns the index of the removed widget or -1 if "
-+"no such widget was found."
- msgstr ""
-+"移除已選視窗元件，回傳移除的視窗元件的索引，或是 -1 表示找不到任何此類視窗元"
-+"件。"
- 
- #: widgets/toolbox.cpp:43
- msgid ""
- "Remove the widget from the index position, returns the index of the removed "
- "widget or -1 if no widget was found."
- msgstr ""
-+"從索引位置移除視窗元件，回傳已移除視窗元件的索引，或是 -1 表示找不到任何視窗"
-+"元件。"
- 
- #: widgets/toolbox.cpp:45
--#, fuzzy
- msgid "Activates the selected widget."
--msgstr "把所選的 Widget 移上一層"
-+msgstr "啟用已選視窗元件。"
- 
- #: widgets/toolbox.cpp:47
--#, fuzzy
- msgid "Returns the index of the active widget."
--msgstr "傳回指定項目索引的文字。"
-+msgstr "回傳現用視窗元件的索引。"
- 
- #: widgets/toolbox.cpp:49
--#, fuzzy
- msgid "Returns the widget having the supplied index."
--msgstr "傳回指定項目索引的文字。"
-+msgstr "回傳有給定索引的視窗元件。"
- 
- #: widgets/toolbox.cpp:51
--#, fuzzy
- msgid ""
- "Returns the index of the widget, -1 if the widget is not part of the toolbox."
--msgstr "傳回找到指定文字的項目的索引值。"
-+msgstr "回傳視窗元件的索引，-1 表示視窗元件不是工具箱的一部份。"
- 
- #: widgets/tabwidget.cpp:48
--#, fuzzy
- msgid "Sets an icon on the specified tab. Index is zero based."
--msgstr "選取在指定索引的項目。索引以 0 為基底。"
-+msgstr "設定在指定分頁上方的圖示。索引以零為基底。"
- 
- #: widgets/closebutton.cpp:116
- msgid "Failed to start shell process."
-@@ -4945,143 +4907,143 @@
- 
- #: widgets/combobox.cpp:50
- msgid "Make the ComboBox expose it's list without mousing around."
--msgstr ""
-+msgstr "讓下拉選單展開其清單而無需滑鼠位於周圍。"
- 
- #: widgets/fontdialog.cpp:49
- msgid ""
- "Sets the default font for the dialog, by specifying the family, the size and "
- "other style options."
--msgstr ""
-+msgstr "設定預設的對話框字型，藉由指定字族、大小和其他樣式選項。"
- 
- #: widgets/fontdialog.cpp:51
--#, fuzzy
- msgid "Returns the font family."
--msgstr "傳回指定檔案的內容。"
-+msgstr "回傳字族。"
- 
- #: widgets/fontdialog.cpp:53
--#, fuzzy
- msgid "Returns the font size in point."
--msgstr "傳回 Widget 的內容。"
-+msgstr "回傳字型尺寸的點數。"
- 
- #: widgets/fontdialog.cpp:55
--#, fuzzy
- msgid "Returns true, if the font is bold."
--msgstr "傳回指定項目索引的文字。"
-+msgstr "如果字型是粗體就回傳真值。"
- 
- #: widgets/fontdialog.cpp:57
--#, fuzzy
- msgid "Returns true, if the font is italic."
--msgstr "傳回指定項目索引的文字。"
-+msgstr "如果字型是斜體就回傳真值。"
- 
- #: widgets/aboutdialog.cpp:59
- msgid ""
--"Sets information about the application. This is the first method that must me "
--"called, any addition to the dialog done before initialization will be ignored."
-+"Sets information about the application. This is the first method that must "
-+"me called, any addition to the dialog done before initialization will be "
-+"ignored."
- msgstr ""
-+"設定應用程式相關資訊。這是第一個必須被呼叫的方法，任何於初始化之前對於對話框"
-+"所完成的附加都將被忽略。"
- 
- #: widgets/aboutdialog.cpp:61
- msgid "Add an author. Only the author name is required."
--msgstr ""
-+msgstr "加入作者。只有作者名稱為必要項。"
- 
- #: widgets/aboutdialog.cpp:63
- msgid "Add a translator. Only the name is required."
--msgstr ""
-+msgstr "加入翻譯者。只有名稱為必要項。"
- 
- #: widgets/aboutdialog.cpp:65
- msgid "Set a short description text."
--msgstr ""
-+msgstr "設定簡短描述文字。"
- 
- #: widgets/aboutdialog.cpp:67
- msgid "Set a homepage address."
--msgstr ""
-+msgstr "設定首頁位址。"
- 
- #: widgets/aboutdialog.cpp:69
- msgid "Set an email address, where bugs can be reported."
--msgstr ""
-+msgstr "設定電子郵件地址，錯誤可以向該處報告。"
- 
- #: widgets/aboutdialog.cpp:71
- msgid ""
- "Sets license information of the application. The parameter can be one of the "
- "license keys - GPL_V2, LGPL_V2, BSD, ARTISTIC -, or a freely specified text."
- msgstr ""
-+"設定應用程式的授權資訊。參數可以是授權索引鍵之一 - GPL_V2, LGPL_V2, BSD, "
-+"ARTISTIC -，或是自由指定的文字。"
- 
- #: widgets/aboutdialog.cpp:73
--#, fuzzy
- msgid "Returns the set version string."
--msgstr "傳回指定字串的一部份。"
-+msgstr "回傳設定版本字串。"
- 
- #: widgets/table.cpp:56
- msgid ""
- "Sets a column to sort ascending or descending. Optionally can sort with rows "
- "intact for database use."
--msgstr ""
-+msgstr "設定欄排序為遞升或遞降。可以選擇性地保持列完整排序以用於資料庫。"
- 
- #: widgets/table.cpp:57
- msgid "Scrolls the table so the cell indicated is visible."
--msgstr ""
-+msgstr "捲動表格好讓指定的儲存格為可見。"
- 
- #: widgets/table.cpp:58
- msgid ""
--"Select cells using the upper left and lower right cell addresses<br /><b>"
--"Not guaranteed to have KDE4 compatiblility</b>"
-+"Select cells using the upper left and lower right cell addresses<br /><b>Not "
-+"guaranteed to have KDE4 compatiblility</b>"
- msgstr ""
-+"使用左上和右下儲存格位址來選取儲存格<br/><b>無法保證具有 KDE4 的相容性</b>"
- 
- #: widgets/table.cpp:59
--#, fuzzy
- msgid "Select the row with the zero based index."
--msgstr "移除指定索引的項目。"
-+msgstr "使用零基底的索引來選取列。"
- 
- #: widgets/table.cpp:60
- msgid ""
--"Select the column with the zero based index.<br /><b>"
--"Not guaranteed to have KDE4 compatiblility</b>"
--msgstr ""
-+"Select the column with the zero based index.<br /><b>Not guaranteed to have "
-+"KDE4 compatiblility</b>"
-+msgstr "使用零基底的索引來選取欄。<br/><b>無法保證具有 KDE4 的相容性</b>"
- 
- #: widgets/table.cpp:61
- msgid ""
--"Set the column read only using zero based index.<br /><b>"
--"Not guaranteed to have KDE4 compatiblility</b>"
--msgstr ""
-+"Set the column read only using zero based index.<br /><b>Not guaranteed to "
-+"have KDE4 compatiblility</b>"
-+msgstr "使用零基底的索引來設定此欄唯讀。<br/><b>無法保證具有 KDE4 的相容性</b>"
- 
- #: widgets/table.cpp:62
- msgid ""
--"Set the row read only using zero based index.<br /><b>"
--"Not guaranteed to have KDE4 compatiblility</b>"
--msgstr ""
-+"Set the row read only using zero based index.<br /><b>Not guaranteed to have "
-+"KDE4 compatiblility</b>"
-+msgstr "使用零基底的索引來設定此列唯讀。<br/><b>無法保證具有 KDE4 的相容性</b>"
- 
- #: widgets/table.cpp:63
--#, fuzzy
- msgid "Returns the number of rows of the table"
--msgstr "傳回陣列中元素的數量。"
-+msgstr "回傳表格中列的數量"
- 
- #: widgets/textedit.cpp:47
- msgid "see if widget has been modified."
--msgstr ""
-+msgstr "看看是否視窗元件已被修改。"
- 
- #: working/plugintemplate/widget.cpp:43
- msgid "Call function1 with two arguments, second is optional."
--msgstr ""
-+msgstr "以兩個引數呼叫 function1，第二個是可選的。"
- 
- #: working/plugintemplate/widget.cpp:44
- msgid "Get a QString as a result of function2."
--msgstr ""
-+msgstr "取得 QString 做為 function2 的結果。"
- 
- #: working/plugintemplate/plugin.cpp:19
--#, fuzzy
- msgid "Kommander %{APPNAME} plugin."
--msgstr "加入 Kommander 外掛程式"
-+msgstr "Kommander %{APPNAME} 外掛程式。"
- 
-+#, fuzzy
- #~ msgid "Returns the index of an item with the given text."
--#~ msgstr "傳回找到指定文字的項目的索引值。"
-+#~ msgstr "Gibt den Index eines Elementes mit dem gegebenen Text zurück."
- 
-+#, fuzzy
- #~ msgid "Text to be inserted"
--#~ msgstr "要插入的文字"
-+#~ msgstr "Text, der eingefügt werden soll"
- 
-+#, fuzzy
- #~ msgid "Executes the script associated with the widget."
--#~ msgstr "執行與 Widget 關聯的指令稿。"
-+#~ msgstr "Führt das mit dem Bedienelement (Widget) verbundene Skript aus."
- 
-+#, fuzzy
- #~ msgid "Returns selected text or text of current item."
--#~ msgstr "傳回目前項目的選擇文字或文字。"
--
--#~ msgid "Unable to create dialog from input."
--#~ msgstr "無法從輸入的資料建立對話盒。"
-+#~ msgstr ""
-+#~ "Gibt den ausgewählten Text oder den Text des aktuellen Elementes zurück."
-diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdewebdev/kxsldbg.po kde-i18n-zh_TW-3.5.10/messages/kdewebdev/kxsldbg.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdewebdev/kxsldbg.po	2008-08-19 20:43:10.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdewebdev/kxsldbg.po	2011-11-11 15:45:17.000000000 +0100
-@@ -6,8 +6,7 @@
- "Project-Id-Version: kxsldbg\n"
- "POT-Creation-Date: 2008-07-08 01:25+0200\n"
- "PO-Revision-Date: 2006-09-12 15:06+0800\n"
--"Last-Translator: Frank Weng (a.k.a. Franklin) <franklin at goodhorse dot idv "
--"dot tw>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Chinese Traditional <zh-l10n@linux.org.tw>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
-@@ -52,7 +51,7 @@
- 
- #: kxsldbg.cpp:164
- msgid "File: %1  Line: %2  Col: %3"
--msgstr "檔案：%1  行：%2 欄：%3"
-+msgstr "檔案：%1  列：%2 欄：%3"
- 
- #: kxsldbgpart/xsldbglocallistitem.cpp:32
- #: kxsldbgpart/xsldbglocalvariablesimpl.cpp:71
-@@ -80,15 +79,15 @@
- #: kxsldbgpart/xsldbgbreakpointsimpl.cpp:116
- #: kxsldbgpart/xsldbgbreakpointsimpl.cpp:144
- msgid "A line number was provided without a file name."
--msgstr "提供了行號但沒有檔名。"
-+msgstr "提供了列號但沒有檔名。"
- 
- #: kxsldbgpart/xsldbgbreakpointsimpl.cpp:93
- msgid "No details provided or an invalid line number was supplied."
--msgstr "沒有提供詳情，或是行號不正確。"
-+msgstr "沒有提供詳情，或是列號不正確。"
- 
- #: kxsldbgpart/xsldbgbreakpointsimpl.cpp:121
- msgid "No details provided or an invalid line or ID was supplied."
--msgstr "沒有提供詳情，或是行號或代碼不正確。"
-+msgstr "沒有提供詳情，或是列號或代碼不正確。"
- 
- #: kxsldbgpart/xsldbgbreakpointsimpl.cpp:149
- msgid "No details provided."
-@@ -116,7 +115,7 @@
- 
- #: kxsldbgpart/xsldbginspector.cpp:101
- msgid "Sources"
--msgstr "源碼"
-+msgstr "原始碼"
- 
- #: kxsldbgpart/xsldbginspector.cpp:107
- msgid "Entities"
-@@ -135,64 +134,44 @@
- msgstr "從 xsldbg 刷新檢查員中的值"
- 
- #: kxsldbgpart/libxsldbg/files.cpp:192 kxsldbgpart/libxsldbg/files.cpp:215
--msgid ""
--"Error: Unable to open terminal %1.\n"
--msgstr ""
--"錯誤：無法開啟終端機 %1。\n"
-+msgid "Error: Unable to open terminal %1.\n"
-+msgstr "錯誤：無法開啟終端機 %1。\n"
- 
- #: kxsldbgpart/libxsldbg/files.cpp:195
--msgid ""
--"Error: Did not previously open terminal.\n"
--msgstr ""
--"錯誤：先前未開啟終端機。\n"
-+msgid "Error: Did not previously open terminal.\n"
-+msgstr "錯誤：先前未開啟終端機。\n"
- 
- #: kxsldbgpart/libxsldbg/files.cpp:497
--msgid ""
--"Error: The file name \"%1\" is too long.\n"
--msgstr ""
--"錯誤：檔案名稱 \"%1\" 太長。\n"
-+msgid "Error: The file name \"%1\" is too long.\n"
-+msgstr "錯誤：檔案名稱 \"%1\" 太長。\n"
- 
- #: kxsldbgpart/libxsldbg/files.cpp:521
--msgid ""
--"Error: Unable to change to directory %1.\n"
--msgstr ""
--"錯誤：無法變換到目錄 %1。\n"
-+msgid "Error: Unable to change to directory %1.\n"
-+msgstr "錯誤：無法變換到目錄 %1。\n"
- 
- #: kxsldbgpart/libxsldbg/files.cpp:524
--msgid ""
--"Changed to directory %1.\n"
--msgstr ""
--"變換到目錄 %1。\n"
-+msgid "Changed to directory %1.\n"
-+msgstr "變換到目錄 %1。\n"
- 
- #: kxsldbgpart/libxsldbg/files.cpp:552
--msgid ""
--"Setting XML Data file name to %1.\n"
--msgstr ""
--"設定 XML 資料檔案名稱為 %1。\n"
-+msgid "Setting XML Data file name to %1.\n"
-+msgstr "設定 XML 資料檔案名稱為 %1。\n"
- 
- #: kxsldbgpart/libxsldbg/files.cpp:564
--msgid ""
--"Setting stylesheet file name to %1.\n"
--msgstr ""
--"設定樣式表檔案名稱為 %1。\n"
-+msgid "Setting stylesheet file name to %1.\n"
-+msgstr "設定樣式表檔案名稱為 %1。\n"
- 
- #: kxsldbgpart/libxsldbg/files.cpp:581
--msgid ""
--"Setting stylesheet base path to %1.\n"
--msgstr ""
--"設定樣式表基礎路徑為 %1。\n"
-+msgid "Setting stylesheet base path to %1.\n"
-+msgstr "設定樣式表基礎路徑為 %1。\n"
- 
- #: kxsldbgpart/libxsldbg/files.cpp:598
--msgid ""
--"Missing file name.\n"
--msgstr ""
--"缺少檔名。\n"
-+msgid "Missing file name.\n"
-+msgstr "缺少檔名。\n"
- 
- #: kxsldbgpart/libxsldbg/files.cpp:1108 kxsldbgpart/libxsldbg/files.cpp:1143
--msgid ""
--"Encoding of text failed.\n"
--msgstr ""
--"文字編碼失敗。\n"
-+msgid "Encoding of text failed.\n"
-+msgstr "文字編碼失敗。\n"
- 
- #: kxsldbgpart/libxsldbg/files.cpp:1179
- #, c-format
-@@ -200,16 +179,12 @@
- msgstr "無法初始化編碼 %1。"
- 
- #: kxsldbgpart/libxsldbg/files.cpp:1184
--msgid ""
--"Invalid encoding %1.\n"
--msgstr ""
--"不合法的編碼 %1。\n"
-+msgid "Invalid encoding %1.\n"
-+msgstr "不合法的編碼 %1。\n"
- 
- #: kxsldbgpart/libxsldbg/files.cpp:1245
--msgid ""
--" ----- more ---- \n"
--msgstr ""
--" ----- 更多 ----- \n"
-+msgid " ----- more ---- \n"
-+msgstr " ----- 更多 ----- \n"
- 
- #: kxsldbgpart/libxsldbg/breakpoint_cmds.cpp:223
- #: kxsldbgpart/libxsldbg/breakpoint_cmds.cpp:318
-@@ -227,16 +202,12 @@
- #: kxsldbgpart/libxsldbg/search.cpp:1469 kxsldbgpart/libxsldbg/search.cpp:1515
- #: kxsldbgpart/libxsldbg/variable_cmds.cpp:105
- #: kxsldbgpart/libxsldbg/xsldbg.cpp:512 kxsldbgpart/libxsldbg/xsldbg.cpp:1061
--msgid ""
--"Error: Out of memory.\n"
--msgstr ""
--"錯誤：記憶體用盡。\n"
-+msgid "Error: Out of memory.\n"
-+msgstr "錯誤：記憶體用盡。\n"
- 
- #: kxsldbgpart/libxsldbg/files.cpp:1363
--msgid ""
--"Error: Unable to convert %1 to local file name.\n"
--msgstr ""
--"錯誤：無法轉換 %1 為本地端檔案名稱。\n"
-+msgid "Error: Unable to convert %1 to local file name.\n"
-+msgstr "錯誤：無法轉換 %1 為本地端檔案名稱。\n"
- 
- #: kxsldbgpart/libxsldbg/param_cmds.cpp:48
- msgid "Failed to add parameter"
-@@ -251,10 +222,8 @@
- #: kxsldbgpart/libxsldbg/param_cmds.cpp:71
- #: kxsldbgpart/libxsldbg/param_cmds.cpp:101
- #: kxsldbgpart/libxsldbg/param_cmds.cpp:115
--msgid ""
--"Error: Invalid arguments for the command %1.\n"
--msgstr ""
--"錯誤：命令 %1 的參數不合法。\n"
-+msgid "Error: Invalid arguments for the command %1.\n"
-+msgstr "錯誤：命令 %1 的參數不合法。\n"
- 
- #: kxsldbgpart/libxsldbg/param_cmds.cpp:96
- msgid "Failed to delete parameter"
-@@ -264,16 +233,12 @@
- #: kxsldbgpart/libxsldbg/breakpoint_cmds.cpp:695
- #: kxsldbgpart/libxsldbg/breakpoint_cmds.cpp:821
- #: kxsldbgpart/libxsldbg/param_cmds.cpp:107
--msgid ""
--"Error: Unable to parse %1 as a line number.\n"
--msgstr ""
--"錯誤：無法剖析 %1 為行號。\n"
-+msgid "Error: Unable to parse %1 as a line number.\n"
-+msgstr "錯誤：無法剖析 %1 為列號。\n"
- 
- #: kxsldbgpart/libxsldbg/param_cmds.cpp:112
--msgid ""
--"Error: Unable to find parameter %1.\n"
--msgstr ""
--"錯誤：找不到參數 %1。\n"
-+msgid "Error: Unable to find parameter %1.\n"
-+msgstr "錯誤：找不到參數 %1。\n"
- 
- #: kxsldbgpart/libxsldbg/param_cmds.cpp:146
- msgid "Unable to print parameters"
-@@ -281,16 +246,12 @@
- 
- #: kxsldbgpart/libxsldbg/option_cmds.cpp:73
- #: kxsldbgpart/libxsldbg/option_cmds.cpp:107
--msgid ""
--"Error: Unable to parse %1 as an option value.\n"
--msgstr ""
--"錯誤：無法剖析 %1 為選項值。\n"
-+msgid "Error: Unable to parse %1 as an option value.\n"
-+msgstr "錯誤：無法剖析 %1 為選項值。\n"
- 
- #: kxsldbgpart/libxsldbg/option_cmds.cpp:110
--msgid ""
--"Error: Unknown option name %1.\n"
--msgstr ""
--"錯誤：未知的選項名稱 %1。\n"
-+msgid "Error: Unknown option name %1.\n"
-+msgstr "錯誤：未知的選項名稱 %1。\n"
- 
- #: kxsldbgpart/libxsldbg/debugXSL.cpp:2012
- #: kxsldbgpart/libxsldbg/file_cmds.cpp:213
-@@ -298,34 +259,24 @@
- #: kxsldbgpart/libxsldbg/option_cmds.cpp:113
- #: kxsldbgpart/libxsldbg/option_cmds.cpp:116
- #: kxsldbgpart/libxsldbg/os_cmds.cpp:48
--msgid ""
--"Error: Missing arguments for the command %1.\n"
--msgstr ""
--"錯誤：命令 %1 缺少參數。\n"
-+msgid "Error: Missing arguments for the command %1.\n"
-+msgstr "錯誤：命令 %1 缺少參數。\n"
- 
- #: kxsldbgpart/libxsldbg/option_cmds.cpp:146
--msgid ""
--"Option %1 = %2\n"
--msgstr ""
--"選項 %1 = %2\n"
-+msgid "Option %1 = %2\n"
-+msgstr "選項 %1 = %2\n"
- 
- #: kxsldbgpart/libxsldbg/option_cmds.cpp:157
--msgid ""
--"Option %1 = \"%2\"\n"
--msgstr ""
--"選項 %1 = \"%2\"\n"
-+msgid "Option %1 = \"%2\"\n"
-+msgstr "選項 %1 = \"%2\"\n"
- 
- #: kxsldbgpart/libxsldbg/option_cmds.cpp:159
--msgid ""
--"Option %1 = \"\"\n"
--msgstr ""
--"選項 %1 = \"\"\n"
-+msgid "Option %1 = \"\"\n"
-+msgstr "選項 %1 = \"\"\n"
- 
- #: kxsldbgpart/libxsldbg/option_cmds.cpp:230
--msgid ""
--"\tNo expression watches set.\n"
--msgstr ""
--"\t沒有設定監控表示式。\n"
-+msgid "\tNo expression watches set.\n"
-+msgstr "\t沒有設定監控表示式。\n"
- 
- #: kxsldbgpart/libxsldbg/option_cmds.cpp:237
- msgid " WatchExpression %1 "
-@@ -333,40 +284,30 @@
- 
- #: kxsldbgpart/libxsldbg/option_cmds.cpp:263
- msgid ""
--"Error: Unable to add watch expression \"%1\". It already has been added or it "
--"cannot be watched.\n"
-+"Error: Unable to add watch expression \"%1\". It already has been added or "
-+"it cannot be watched.\n"
- msgstr ""
- "錯誤：無法新增監控表示式 \"%1\"。可能因為它已經新增過了，或是它無法被監控。\n"
- 
- #: kxsldbgpart/libxsldbg/option_cmds.cpp:287
--msgid ""
--"Error: Unable to parse %1 as a watchID.\n"
--msgstr ""
--"錯誤：無法剖析 %1 為監控代碼。\n"
-+msgid "Error: Unable to parse %1 as a watchID.\n"
-+msgstr "錯誤：無法剖析 %1 為監控代碼。\n"
- 
- #: kxsldbgpart/libxsldbg/option_cmds.cpp:292
--msgid ""
--"Error: Watch expression %1 does not exist.\n"
--msgstr ""
--"錯誤：監控表示式 %1 不存在。\n"
-+msgid "Error: Watch expression %1 does not exist.\n"
-+msgstr "錯誤：監控表示式 %1 不存在。\n"
- 
- #: kxsldbgpart/libxsldbg/options.cpp:296 kxsldbgpart/libxsldbg/options.cpp:326
--msgid ""
--"Error: Option %1 is not a valid boolean/integer option.\n"
--msgstr ""
--"錯誤：選項 %1 不是合法的布林/整數選項。\n"
-+msgid "Error: Option %1 is not a valid boolean/integer option.\n"
-+msgstr "錯誤：選項 %1 不是合法的布林/整數選項。\n"
- 
- #: kxsldbgpart/libxsldbg/options.cpp:368 kxsldbgpart/libxsldbg/options.cpp:399
--msgid ""
--"Error: Option %1 is not a valid string xsldbg option.\n"
--msgstr ""
--"錯誤：選項 %1 不是合法的字串 xsldbg 選項。\n"
-+msgid "Error: Option %1 is not a valid string xsldbg option.\n"
-+msgstr "錯誤：選項 %1 不是合法的字串 xsldbg 選項。\n"
- 
- #: kxsldbgpart/libxsldbg/options.cpp:511
--msgid ""
--" Parameter %1 %2=\"%3\"\n"
--msgstr ""
--" 參數 %1 %2 = \"%3\"\n"
-+msgid " Parameter %1 %2=\"%3\"\n"
-+msgstr " 參數 %1 %2 = \"%3\"\n"
- 
- #: kxsldbgpart/libxsldbg/options.cpp:546
- msgid ""
-@@ -378,31 +319,24 @@
- 
- #: kxsldbgpart/libxsldbg/template_cmds.cpp:184
- #: kxsldbgpart/libxsldbg/variable_cmds.cpp:36
--msgid ""
--"Error: Stylesheet is not valid.\n"
--msgstr ""
--"錯誤：樣式表不合法。\n"
-+msgid "Error: Stylesheet is not valid.\n"
-+msgstr "錯誤：樣式表不合法。\n"
- 
- #: kxsldbgpart/libxsldbg/variable_cmds.cpp:99
- msgid ""
- "Error: Cannot change a variable that does not use the select attribute.\n"
--msgstr ""
--"錯誤：無法變更未使用 select 屬性的變數。\n"
-+msgstr "錯誤：無法變更未使用 select 屬性的變數。\n"
- 
- #: kxsldbgpart/libxsldbg/variable_cmds.cpp:102
--msgid ""
--"Error: Variable %1 was not found.\n"
--msgstr ""
--"錯誤：找不到變數 %1。\n"
-+msgid "Error: Variable %1 was not found.\n"
-+msgstr "錯誤：找不到變數 %1。\n"
- 
- #: kxsldbgpart/libxsldbg/breakpoint_cmds.cpp:425
- #: kxsldbgpart/libxsldbg/search.cpp:484
- #: kxsldbgpart/libxsldbg/trace_cmds.cpp:68
- #: kxsldbgpart/libxsldbg/variable_cmds.cpp:111
--msgid ""
--"Error: Invalid arguments to command %1.\n"
--msgstr ""
--"錯誤：命令 %1 的參數不合法。\n"
-+msgid "Error: Invalid arguments to command %1.\n"
-+msgstr "錯誤：命令 %1 的參數不合法。\n"
- 
- #: kxsldbgpart/libxsldbg/breakpoint.cpp:619
- msgid "disabled"
-@@ -415,7 +349,7 @@
- #: kxsldbgpart/libxsldbg/breakpoint.cpp:639
- msgid ""
- "Breakpoint %1 %2 for template: \"%3\" mode: \"%4\" in file \"%5\" at line %6"
--msgstr "中斷點 %1 %2 樣本：\"%3\" 模式：\"%4\" 檔案：\"%5\" 行號：%6"
-+msgstr "中斷點 %1 %2 樣本：\"%3\" 模式：\"%4\" 檔案：\"%5\" 列號：%6"
- 
- #: kxsldbgpart/libxsldbg/breakpoint.cpp:641
- msgid "Breakpoint %1 %2 for template: \"%3\" mode: \"%4\""
-@@ -438,63 +372,50 @@
- 
- #: kxsldbgpart/libxsldbg/help_unix.cpp:90
- msgid ""
--"Error: Unable to display help. Help files not found in %1 or xsldbg not found "
--"in path.\n"
-+"Error: Unable to display help. Help files not found in %1 or xsldbg not "
-+"found in path.\n"
- msgstr ""
- "錯誤：無法顯示說明。說明檔在 %1 內找不到，或是 xsldbg 在路徑中找不到。\n"
- 
- #: kxsldbgpart/libxsldbg/help_unix.cpp:92
--msgid ""
--"Error: Unable to find xsldbg or help files.\n"
--msgstr ""
--"錯誤：找不到 xsldbg 或說明檔。\n"
-+msgid "Error: Unable to find xsldbg or help files.\n"
-+msgstr "錯誤：找不到 xsldbg 或說明檔。\n"
- 
- #: kxsldbgpart/libxsldbg/help_unix.cpp:97
--msgid ""
--"Error: Unable to print help file.\n"
--msgstr ""
--"錯誤：無法列印說明檔。\n"
-+msgid "Error: Unable to print help file.\n"
-+msgstr "錯誤：無法列印說明檔。\n"
- 
- #: kxsldbgpart/libxsldbg/help_unix.cpp:102
--msgid ""
--"Error: No path to documentation; aborting help.\n"
--msgstr ""
--"錯誤：沒有文件路徑，取消說明。\n"
-+msgid "Error: No path to documentation; aborting help.\n"
-+msgstr "錯誤：沒有文件路徑，取消說明。\n"
- 
- #: kxsldbgpart/libxsldbg/trace_cmds.cpp:69
--msgid ""
--"Warning: Assuming normal speed.\n"
--msgstr ""
--"警告：假設為正常速度。\n"
-+msgid "Warning: Assuming normal speed.\n"
-+msgstr "警告：假設為正常速度。\n"
- 
- #: kxsldbgpart/libxsldbg/debug.cpp:135
--msgid ""
--"Error: XSLT source and XML data are empty. Cannot enter the debugger.\n"
--msgstr ""
--"錯誤：XSLT 來源與 XML 資料為空的。無法進入除錯器。\n"
-+msgid "Error: XSLT source and XML data are empty. Cannot enter the debugger.\n"
-+msgstr "錯誤：XSLT 來源與 XML 資料為空的。無法進入除錯器。\n"
- 
- #: kxsldbgpart/libxsldbg/files_unix.cpp:67
--msgid ""
--"Error: USER environment variable is not set.\n"
--msgstr ""
--"錯誤：使用者環境變數未設定。\n"
-+msgid "Error: USER environment variable is not set.\n"
-+msgstr "錯誤：使用者環境變數未設定。\n"
- 
- #: kxsldbgpart/libxsldbg/files_unix.cpp:199
- msgid ""
--"Error: The value of the option docspath or searchresultspath is empty. See help "
--"on setoption or options command for more information.\n"
-+"Error: The value of the option docspath or searchresultspath is empty. See "
-+"help on setoption or options command for more information.\n"
- msgstr ""
--"錯誤：docspath 或 searchresultspath 選項值是空的。詳情請參考 setoption 說明或 options 命令的說明。\n"
-+"錯誤：docspath 或 searchresultspath 選項值是空的。詳情請參考 setoption 說明"
-+"或 options 命令的說明。\n"
- 
- #: kxsldbgpart/libxsldbg/file_cmds.cpp:71
- msgid "Entity %1 "
- msgstr "實體 %1"
- 
- #: kxsldbgpart/libxsldbg/file_cmds.cpp:78
--msgid ""
--"No external General Parsed entities present.\n"
--msgstr ""
--"沒有看到外部的「一般剖析」（General Parsed）實體。\n"
-+msgid "No external General Parsed entities present.\n"
-+msgstr "沒有看到外部的「一般剖析」（General Parsed）實體。\n"
- 
- #: kxsldbgpart/libxsldbg/file_cmds.cpp:80
- #, c-format
-@@ -505,41 +426,29 @@
- 
- #: kxsldbgpart/libxsldbg/file_cmds.cpp:121
- #: kxsldbgpart/libxsldbg/file_cmds.cpp:129
--msgid ""
--"SystemID \"%1\" was not found in current catalog.\n"
--msgstr ""
--"在目前的目錄中找不到系統代碼 %1。\n"
-+msgid "SystemID \"%1\" was not found in current catalog.\n"
-+msgstr "在目前的目錄中找不到系統代碼 %1。\n"
- 
- #: kxsldbgpart/libxsldbg/file_cmds.cpp:125
--msgid ""
--"SystemID \"%1\" maps to: \"%2\"\n"
--msgstr ""
--"系統代碼 \"%1\" 映射到：\"%2\"\n"
-+msgid "SystemID \"%1\" maps to: \"%2\"\n"
-+msgstr "系統代碼 \"%1\" 映射到：\"%2\"\n"
- 
- #: kxsldbgpart/libxsldbg/file_cmds.cpp:168
- #: kxsldbgpart/libxsldbg/file_cmds.cpp:176
--msgid ""
--"PublicID \"%1\" was not found in current catalog.\n"
--msgstr ""
--"在目前的目錄中找不到公開代碼 \"%1\"。\n"
-+msgid "PublicID \"%1\" was not found in current catalog.\n"
-+msgstr "在目前的目錄中找不到公開代碼 \"%1\"。\n"
- 
- #: kxsldbgpart/libxsldbg/file_cmds.cpp:172
--msgid ""
--"PublicID \"%1\" maps to: \"%2\"\n"
--msgstr ""
--"公開代碼 \"%1\" 映射到：\"%2\"\n"
-+msgid "PublicID \"%1\" maps to: \"%2\"\n"
-+msgstr "公開代碼 \"%1\" 映射到：\"%2\"\n"
- 
- #: kxsldbgpart/libxsldbg/template_cmds.cpp:135
--msgid ""
--" template: \"%1\" mode: \"%2\" in file \"%3\" at line %4\n"
--msgstr ""
--"樣本：\"%1\" 模式：\"%2\" 檔案：\"%3\" 行號：\"%4\"\n"
-+msgid " template: \"%1\" mode: \"%2\" in file \"%3\" at line %4\n"
-+msgstr "樣本：\"%1\" 模式：\"%2\" 檔案：\"%3\" 列號：\"%4\"\n"
- 
- #: kxsldbgpart/libxsldbg/template_cmds.cpp:226
--msgid ""
--"\tNo XSLT templates found.\n"
--msgstr ""
--"\t找不到 XSLT 樣本。\n"
-+msgid "\tNo XSLT templates found.\n"
-+msgstr "\t找不到 XSLT 樣本。\n"
- 
- #: kxsldbgpart/libxsldbg/template_cmds.cpp:228
- #, c-format
-@@ -557,10 +466,8 @@
- 
- #: kxsldbgpart/libxsldbg/template_cmds.cpp:261
- #: kxsldbgpart/libxsldbg/template_cmds.cpp:290
--msgid ""
--" Stylesheet %1\n"
--msgstr ""
--" 樣式表 %1\n"
-+msgid " Stylesheet %1\n"
-+msgstr " 樣式表 %1\n"
- 
- #: kxsldbgpart/libxsldbg/template_cmds.cpp:325
- #, c-format
-@@ -570,17 +477,13 @@
- msgstr "\t總共找到 %n 個 XSLT 樣式表"
- 
- #: kxsldbgpart/libxsldbg/template_cmds.cpp:328
--msgid ""
--"\tNo XSLT stylesheets found.\n"
--msgstr ""
--"\t沒有找到任何 XSLT 樣式表。\n"
-+msgid "\tNo XSLT stylesheets found.\n"
-+msgstr "\t沒有找到任何 XSLT 樣式表。\n"
- 
- #: kxsldbgpart/libxsldbg/xsldbg.cpp:270 kxsldbgpart/libxsldbg/xsldbg.cpp:298
- #: kxsldbgpart/libxsldbg/xsldbg.cpp:320
--msgid ""
--"%1 took %2 ms to complete.\n"
--msgstr ""
--"%1 花了 %2 毫秒完成。\n"
-+msgid "%1 took %2 ms to complete.\n"
-+msgstr "%1 花了 %2 毫秒完成。\n"
- 
- #: kxsldbgpart/libxsldbg/xsldbg.cpp:361
- #, c-format
-@@ -588,10 +491,8 @@
- msgstr "XInclude 處理 %1。"
- 
- #: kxsldbgpart/libxsldbg/xsldbg.cpp:399 kxsldbgpart/libxsldbg/xsldbg.cpp:446
--msgid ""
--"Error: Unable to write temporary results to %1.\n"
--msgstr ""
--"錯誤：無法將暫時結果寫到 %1。\n"
-+msgid "Error: Unable to write temporary results to %1.\n"
-+msgstr "錯誤：無法將暫時結果寫到 %1。\n"
- 
- #: kxsldbgpart/libxsldbg/xsldbg.cpp:409
- #, c-format
-@@ -609,52 +510,40 @@
- msgstr "儲存結果"
- 
- #: kxsldbgpart/libxsldbg/xsldbg.cpp:476
--msgid ""
--"Warning: Generating non-standard output XHTML.\n"
--msgstr ""
--"警告：產生非標準輸出 XHTML 中。\n"
-+msgid "Warning: Generating non-standard output XHTML.\n"
-+msgstr "警告：產生非標準輸出 XHTML 中。\n"
- 
- #: kxsldbgpart/libxsldbg/xsldbg.cpp:493
--msgid ""
--"Warning: Unsupported, non-standard output method %1.\n"
--msgstr ""
--"警告：未支援，非標準輸出方法 %1。\n"
-+msgid "Warning: Unsupported, non-standard output method %1.\n"
-+msgstr "警告：未支援，非標準輸出方法 %1。\n"
- 
- #: kxsldbgpart/libxsldbg/xsldbg.cpp:509
- msgid "Running stylesheet and saving result"
- msgstr "執行樣式表並儲存結果中"
- 
- #: kxsldbgpart/libxsldbg/xsldbg.cpp:516
--msgid ""
--"Error: Unable to save results of transformation to file %1.\n"
--msgstr ""
--"錯誤：無法儲存轉換結果到檔案 %1。\n"
-+msgid "Error: Unable to save results of transformation to file %1.\n"
-+msgstr "錯誤：無法儲存轉換結果到檔案 %1。\n"
- 
- #: kxsldbgpart/libxsldbg/xsldbg.cpp:558 kxsldbgpart/libxsldbg/xsldbg.cpp:887
- #: kxsldbgpart/libxsldbg/xsldbg.cpp:919 kxsldbgpart/libxsldbg/xsldbg.cpp:993
--msgid ""
--"Fatal error: Aborting debugger due to an unrecoverable error.\n"
--msgstr ""
--"嚴重錯誤：因為無法修復的錯誤而中止除錯器。\n"
-+msgid "Fatal error: Aborting debugger due to an unrecoverable error.\n"
-+msgstr "嚴重錯誤：因為無法修復的錯誤而中止除錯器。\n"
- 
- #: kxsldbgpart/kxsldbg_part.cpp:738 kxsldbgpart/libxsldbg/xsldbg.cpp:591
--msgid ""
--"Error: Too many file names supplied via command line.\n"
--msgstr ""
--"錯誤：命令列中指定了太多檔名。\n"
-+msgid "Error: Too many file names supplied via command line.\n"
-+msgstr "錯誤：命令列中指定了太多檔名。\n"
- 
- #: kxsldbgpart/libxsldbg/xsldbg.cpp:683
- msgid ""
--"Warning: Too many libxslt parameters provided via the command line option "
--"--param.\n"
--msgstr ""
--"警告：命令列選項 --param 提供了太多 libxslt 參數。\n"
-+"Warning: Too many libxslt parameters provided via the command line option --"
-+"param.\n"
-+msgstr "警告：命令列選項 --param 提供了太多 libxslt 參數。\n"
- 
- #: kxsldbgpart/libxsldbg/xsldbg.cpp:692
- msgid ""
- "Error: Argument \"%1\" to --param is not in the format <name>:<value>.\n"
--msgstr ""
--"錯誤：--param 參數 \"%1\" 的格式不是 <name>:<value>。\n"
-+msgstr "錯誤：--param 參數 \"%1\" 的格式不是 <name>:<value>。\n"
- 
- #: kxsldbgpart/libxsldbg/xsldbg.cpp:744
- msgid ""
-@@ -667,16 +556,12 @@
- "\n"
- 
- #: kxsldbgpart/libxsldbg/xsldbg.cpp:755
--msgid ""
--"Error: No XSLT source file supplied.\n"
--msgstr ""
--"錯誤：沒有提供 XSLT 源碼檔案。\n"
-+msgid "Error: No XSLT source file supplied.\n"
-+msgstr "錯誤：沒有提供 XSLT 原始碼檔案。\n"
- 
- #: kxsldbgpart/libxsldbg/xsldbg.cpp:758
--msgid ""
--"Error: No XML data file supplied.\n"
--msgstr ""
--"錯誤：沒有提供 XML 資料檔。\n"
-+msgid "Error: No XML data file supplied.\n"
-+msgstr "錯誤：沒有提供 XML 資料檔。\n"
- 
- #: kxsldbgpart/libxsldbg/xsldbg.cpp:795
- msgid ""
-@@ -698,10 +583,11 @@
- 
- #: kxsldbgpart/libxsldbg/xsldbg.cpp:857
- msgid ""
--"Going to the command shell; not all xsldbg commands will work as not all needed "
--"have been loaded.\n"
-+"Going to the command shell; not all xsldbg commands will work as not all "
-+"needed have been loaded.\n"
- msgstr ""
--"到命令列中的話，不是所有的 xsldbg 命令都能使用，因為不是所有需要的東西都能載入。\n"
-+"到命令列中的話，不是所有的 xsldbg 命令都能使用，因為不是所有需要的東西都能載"
-+"入。\n"
- 
- #: kxsldbgpart/libxsldbg/xsldbg.cpp:914
- #, c-format
-@@ -709,37 +595,28 @@
- msgstr "剖析樣式表 %1 中"
- 
- #: kxsldbgpart/libxsldbg/xsldbg.cpp:916
--msgid ""
--"Error: Cannot parse file %1.\n"
--msgstr ""
--"錯誤：無法剖析檔案 %1。\n"
-+msgid "Error: Cannot parse file %1.\n"
-+msgstr "錯誤：無法剖析檔案 %1。\n"
- 
- #: kxsldbgpart/libxsldbg/xsldbg.cpp:991 kxsldbgpart/libxsldbg/xsldbg.cpp:1035
--msgid ""
--"Error: Unable to parse file %1.\n"
--msgstr ""
--"錯誤：無法剖析檔案 %1。\n"
-+msgid "Error: Unable to parse file %1.\n"
-+msgstr "錯誤：無法剖析檔案 %1。\n"
- 
- #: kxsldbgpart/libxsldbg/nodeview_cmds.cpp:140
- #: kxsldbgpart/libxsldbg/nodeview_cmds.cpp:243
- #: kxsldbgpart/libxsldbg/nodeview_cmds.cpp:383
--msgid ""
--"Error: XPath %1 results in an empty Node Set.\n"
--msgstr ""
--"錯誤：XPath %1 導致一個空的節點集合。\n"
-+msgid "Error: XPath %1 results in an empty Node Set.\n"
-+msgstr "錯誤：XPath %1 導致一個空的節點集合。\n"
- 
- #: kxsldbgpart/libxsldbg/nodeview_cmds.cpp:175
- msgid ""
--"Information: Temporarily setting document's encoding to UTF-8. Previously was "
--"%1.\n"
--msgstr ""
--"資訊：暫時設定文件編碼為 UTF-8。先前為 %1。\n"
-+"Information: Temporarily setting document's encoding to UTF-8. Previously "
-+"was %1.\n"
-+msgstr "資訊：暫時設定文件編碼為 UTF-8。先前為 %1。\n"
- 
- #: kxsldbgpart/libxsldbg/nodeview_cmds.cpp:229
--msgid ""
--"Error: Unable to save temporary results to %1.\n"
--msgstr ""
--"錯誤：無法儲存暫時結果到 %1。\n"
-+msgid "Error: Unable to save temporary results to %1.\n"
-+msgstr "錯誤：無法儲存暫時結果到 %1。\n"
- 
- #: kxsldbgpart/libxsldbg/nodeview_cmds.cpp:251
- msgid "NULL string value supplied."
-@@ -752,24 +629,19 @@
- #: kxsldbgpart/libxsldbg/nodeview_cmds.cpp:358
- msgid ""
- "Warning: Unable to print expression. No stylesheet was properly loaded.\n"
--msgstr ""
--"警告：無法列印表示式。無法正確載入樣式表。\n"
-+msgstr "警告：無法列印表示式。無法正確載入樣式表。\n"
- 
- #: kxsldbgpart/libxsldbg/nodeview_cmds.cpp:418
--msgid ""
--" Global %1\n"
--msgstr ""
--" 全域 %1\n"
-+msgid " Global %1\n"
-+msgstr " 全域 %1\n"
- 
- #: kxsldbgpart/libxsldbg/nodeview_cmds.cpp:421
- msgid " Global "
- msgstr " 全域 "
- 
- #: kxsldbgpart/libxsldbg/nodeview_cmds.cpp:424
--msgid ""
--" Global = %1\n"
--msgstr ""
--" 全域 = %1\n"
-+msgid " Global = %1\n"
-+msgstr " 全域 = %1\n"
- 
- #: kxsldbgpart/libxsldbg/nodeview_cmds.cpp:427
- #: kxsldbgpart/libxsldbg/nodeview_cmds.cpp:430
-@@ -782,10 +654,8 @@
- 
- #: kxsldbgpart/libxsldbg/nodeview_cmds.cpp:430
- #: kxsldbgpart/libxsldbg/nodeview_cmds.cpp:568
--msgid ""
--"Warning: No value assigned to variable.\n"
--msgstr ""
--"警告：沒有指定值給變數。\n"
-+msgid "Warning: No value assigned to variable.\n"
-+msgstr "警告：沒有指定值給變數。\n"
- 
- #: kxsldbgpart/libxsldbg/nodeview_cmds.cpp:483
- msgid ""
-@@ -797,9 +667,9 @@
- 
- #: kxsldbgpart/libxsldbg/nodeview_cmds.cpp:520
- msgid ""
--"Error: Libxslt has not initialized variables yet; try stepping to a template.\n"
--msgstr ""
--"錯誤：Libxslt 尚未初始化變數。請試著進入樣本。\n"
-+"Error: Libxslt has not initialized variables yet; try stepping to a "
-+"template.\n"
-+msgstr "錯誤：Libxslt 尚未初始化變數。請試著進入樣本。\n"
- 
- #: kxsldbgpart/libxsldbg/nodeview_cmds.cpp:556
- #, c-format
-@@ -811,10 +681,8 @@
- msgstr " 本地端 "
- 
- #: kxsldbgpart/libxsldbg/nodeview_cmds.cpp:562
--msgid ""
--" Local = %1\n"
--msgstr ""
--" 本地端 = %1\n"
-+msgid " Local = %1\n"
-+msgstr " 本地端 = %1\n"
- 
- #: kxsldbgpart/libxsldbg/nodeview_cmds.cpp:565
- #: kxsldbgpart/libxsldbg/nodeview_cmds.cpp:568
-@@ -827,93 +695,69 @@
- 
- #: kxsldbgpart/libxsldbg/nodeview_cmds.cpp:583
- msgid ""
--"Error: Libxslt has not initialized variables yet; try stepping past the "
--"xsl:param elements in the template.\n"
--msgstr ""
--"錯誤：Libxslt 尚未初始化變數。請試著進入樣本中的 xsl:param 元素。\n"
-+"Error: Libxslt has not initialized variables yet; try stepping past the xsl:"
-+"param elements in the template.\n"
-+msgstr "錯誤：Libxslt 尚未初始化變數。請試著進入樣本中的 xsl:param 元素。\n"
- 
- #: kxsldbgpart/libxsldbg/search.cpp:407
- msgid ""
- "Error: Unable to write search Database to file %1. Try setting the "
- "\"searchresultspath\" option to a writable path.\n"
- msgstr ""
--"錯誤：無法將搜尋資料庫寫入檔案 %1。請試著將 searchresultspath 遠項設定為一個可寫入的路徑。\n"
-+"錯誤：無法將搜尋資料庫寫入檔案 %1。請試著將 searchresultspath 遠項設定為一個"
-+"可寫入的路徑。\n"
- 
- #: kxsldbgpart/libxsldbg/search.cpp:482
--msgid ""
--"Information: Transformed %1 using %2 and saved to %3.\n"
--msgstr ""
--"資訊：已使用 %2 轉換 %1 並儲存到 %3。\n"
-+msgid "Information: Transformed %1 using %2 and saved to %3.\n"
-+msgstr "資訊：已使用 %2 轉換 %1 並儲存到 %3。\n"
- 
- #: kxsldbgpart/libxsldbg/search.cpp:723
--msgid ""
--"Error: XSLT template named \"%1\" was not found.\n"
--msgstr ""
--"錯誤：找不到 XSLT 樣本名稱 \"%1\"。\n"
-+msgid "Error: XSLT template named \"%1\" was not found.\n"
-+msgstr "錯誤：找不到 XSLT 樣本名稱 \"%1\"。\n"
- 
- #: kxsldbgpart/libxsldbg/os_cmds.cpp:72
--msgid ""
--"Error: No command processor available for shell command \"%1\".\n"
--msgstr ""
--"錯誤：shell 命令 \"%1\" 找不到處理器。\n"
-+msgid "Error: No command processor available for shell command \"%1\".\n"
-+msgstr "錯誤：shell 命令 \"%1\" 找不到處理器。\n"
- 
- #: kxsldbgpart/libxsldbg/os_cmds.cpp:77
--msgid ""
--"Information: Starting shell command \"%1\".\n"
--msgstr ""
--"資訊：開始執行 shell 命令 \"%1\"。\n"
-+msgid "Information: Starting shell command \"%1\".\n"
-+msgstr "資訊：開始執行 shell 命令 \"%1\"。\n"
- 
- #: kxsldbgpart/libxsldbg/os_cmds.cpp:92
--msgid ""
--"Information: Finished shell command.\n"
--msgstr ""
--"資訊：已完成 shell 命令。\n"
-+msgid "Information: Finished shell command.\n"
-+msgstr "資訊：已完成 shell 命令。\n"
- 
- #: kxsldbgpart/libxsldbg/os_cmds.cpp:96
--msgid ""
--"Error: Unable to run command. System error %1.\n"
--msgstr ""
--"錯誤：無法執行命令。系統錯誤 %1。\n"
-+msgid "Error: Unable to run command. System error %1.\n"
-+msgstr "錯誤：無法執行命令。系統錯誤 %1。\n"
- 
- #: kxsldbgpart/libxsldbg/breakpoint_cmds.cpp:97
- #: kxsldbgpart/libxsldbg/breakpoint_cmds.cpp:352
- #: kxsldbgpart/libxsldbg/breakpoint_cmds.cpp:800
- #: kxsldbgpart/libxsldbg/debugXSL.cpp:510
--msgid ""
--"Error: Debugger has no files loaded. Try reloading files.\n"
--msgstr ""
--"錯誤：除錯器未載入檔案。請試著重新載入檔案。\n"
-+msgid "Error: Debugger has no files loaded. Try reloading files.\n"
-+msgstr "錯誤：除錯器未載入檔案。請試著重新載入檔案。\n"
- 
- #: kxsldbgpart/libxsldbg/debugXSL.cpp:532
--msgid ""
--"Error: The XSLT template named \"%1\" was not found.\n"
--msgstr ""
--"錯誤：找不到名為 \"%1\" 的 XSLT 樣本。\n"
-+msgid "Error: The XSLT template named \"%1\" was not found.\n"
-+msgstr "錯誤：找不到名為 \"%1\" 的 XSLT 樣本。\n"
- 
- #: kxsldbgpart/libxsldbg/debugXSL.cpp:535
--msgid ""
--" template: \"%1\"\n"
--msgstr ""
--" 樣本： \"%1\"\n"
-+msgid " template: \"%1\"\n"
-+msgstr " 樣本： \"%1\"\n"
- 
- #: kxsldbgpart/libxsldbg/debugXSL.cpp:560
- #: kxsldbgpart/libxsldbg/debugXSL.cpp:566
--msgid ""
--"Error: Unable to cd. No stylesheet loaded.\n"
--msgstr ""
--"錯誤：無法切換目錄。未載入樣式表。\n"
-+msgid "Error: Unable to cd. No stylesheet loaded.\n"
-+msgstr "錯誤：無法切換目錄。未載入樣式表。\n"
- 
- #: kxsldbgpart/libxsldbg/debugXSL.cpp:563
--msgid ""
--"Error: Unknown arguments to the command %1.\n"
--msgstr ""
--"錯誤：命令 %1 有未知的參數。\n"
-+msgid "Error: Unknown arguments to the command %1.\n"
-+msgstr "錯誤：命令 %1 有未知的參數。\n"
- 
- #: kxsldbgpart/libxsldbg/debugXSL.cpp:585
--msgid ""
--"Error: Invalid arguments to the command %1.\n"
--msgstr ""
--"錯誤：命令 %1 有不合法的參數。\n"
-+msgid "Error: Invalid arguments to the command %1.\n"
-+msgstr "錯誤：命令 %1 有不合法的參數。\n"
- 
- #: kxsldbgpart/libxsldbg/debugXSL.cpp:606
- msgid ""
-@@ -922,16 +766,12 @@
- msgstr "警告：XPath %1 是一個節點集，有 %n 個子節點。"
- 
- #: kxsldbgpart/libxsldbg/debugXSL.cpp:608
--msgid ""
--"Warning: XPath %1 is an empty Node Set.\n"
--msgstr ""
--"警告：XPath %1 是空的節點集。\n"
-+msgid "Warning: XPath %1 is an empty Node Set.\n"
-+msgstr "警告：XPath %1 是空的節點集。\n"
- 
- #: kxsldbgpart/libxsldbg/debugXSL.cpp:617
--msgid ""
--"Error: XPath %1 was not found.\n"
--msgstr ""
--"錯誤：找不到 XPath %1。\n"
-+msgid "Error: XPath %1 was not found.\n"
-+msgstr "錯誤：找不到 XPath %1。\n"
- 
- #: kxsldbgpart/libxsldbg/debugXSL.cpp:672
- #: kxsldbgpart/libxsldbg/debugXSL.cpp:675
-@@ -943,72 +783,52 @@
- #: kxsldbgpart/libxsldbg/debugXSL.cpp:694
- #: kxsldbgpart/libxsldbg/debugXSL.cpp:709
- #: kxsldbgpart/libxsldbg/debugXSL.cpp:762
--msgid ""
--" in file \"%1\" at line %2\n"
--msgstr ""
--"檔案：\"%1\" 行號： %2\n"
-+msgid " in file \"%1\" at line %2\n"
-+msgstr "檔案：\"%1\" 列號： %2\n"
- 
- #: kxsldbgpart/libxsldbg/debugXSL.cpp:692
- msgid "#%1 template: \"LIBXSLT_DEFAULT\" mode: \"\""
- msgstr "#%1 樣本：\"LIBXSLT_DEFAULT\" 模式：\"\""
- 
- #: kxsldbgpart/libxsldbg/debugXSL.cpp:735
--msgid ""
--"\tNo items in call stack.\n"
--msgstr ""
--"\t呼叫堆疊中沒有項目。\n"
-+msgid "\tNo items in call stack.\n"
-+msgstr "\t呼叫堆疊中沒有項目。\n"
- 
- #: kxsldbgpart/libxsldbg/debugXSL.cpp:758
- msgid "#%1 template: \"%2\""
- msgstr "#%1 樣本： \"%2\""
- 
- #: kxsldbgpart/libxsldbg/debugXSL.cpp:1025
--msgid ""
--"Information: Updating search database. This may take a while...\n"
--msgstr ""
--"資訊：更新搜尋資料庫中。可能要花一點時間...\n"
-+msgid "Information: Updating search database. This may take a while...\n"
-+msgstr "資訊：更新搜尋資料庫中。可能要花一點時間…\n"
- 
- #: kxsldbgpart/libxsldbg/debugXSL.cpp:1028
--msgid ""
--"Information: Looking for breakpoints.\n"
--msgstr ""
--"資訊：搜尋中斷點中。\n"
-+msgid "Information: Looking for breakpoints.\n"
-+msgstr "資訊：搜尋中斷點中。\n"
- 
- #: kxsldbgpart/libxsldbg/debugXSL.cpp:1030
--msgid ""
--"Information: Looking for imports and top-level stylesheets.\n"
--msgstr ""
--"資訊：搜尋匯入與頂層的樣式表中。\n"
-+msgid "Information: Looking for imports and top-level stylesheets.\n"
-+msgstr "資訊：搜尋匯入與頂層的樣式表中。\n"
- 
- #: kxsldbgpart/libxsldbg/debugXSL.cpp:1032
--msgid ""
--"Information: Looking for xsl:includes.\n"
--msgstr ""
--"資訊：搜尋 xsl:includes 中。\n"
-+msgid "Information: Looking for xsl:includes.\n"
-+msgstr "資訊：搜尋 xsl:includes 中。\n"
- 
- #: kxsldbgpart/libxsldbg/debugXSL.cpp:1034
--msgid ""
--"Information: Looking for templates.\n"
--msgstr ""
--"資訊：搜尋樣本中。\n"
-+msgid "Information: Looking for templates.\n"
-+msgstr "資訊：搜尋樣本中。\n"
- 
- #: kxsldbgpart/libxsldbg/debugXSL.cpp:1036
--msgid ""
--"Information: Looking for global variables.\n"
--msgstr ""
--"資訊：搜尋全域變數中。\n"
-+msgid "Information: Looking for global variables.\n"
-+msgstr "資訊：搜尋全域變數中。\n"
- 
- #: kxsldbgpart/libxsldbg/debugXSL.cpp:1038
--msgid ""
--"Information: Looking for local variables.\n"
--msgstr ""
--"資訊：搜尋本地端變數中。\n"
-+msgid "Information: Looking for local variables.\n"
-+msgstr "資訊：搜尋本地端變數中。\n"
- 
- #: kxsldbgpart/libxsldbg/debugXSL.cpp:1040
--msgid ""
--"Information: Formatting output.\n"
--msgstr ""
--"資訊：格式化輸出中。\n"
-+msgid "Information: Formatting output.\n"
-+msgstr "資訊：格式化輸出中。\n"
- 
- #: kxsldbgpart/libxsldbg/debugXSL.cpp:1108
- #: kxsldbgpart/libxsldbg/debugXSL.cpp:1118
-@@ -1023,24 +843,21 @@
- 
- #: kxsldbgpart/libxsldbg/debugXSL.cpp:1295
- #: kxsldbgpart/libxsldbg/debugXSL.cpp:2091
--msgid ""
--"Breakpoint for file \"%1\" at line %2.\n"
--msgstr ""
--"檔案 \"%1\" 的中斷點，在行號：%2。\n"
-+msgid "Breakpoint for file \"%1\" at line %2.\n"
-+msgstr "檔案 \"%1\" 的中斷點，在列號：%2。\n"
- 
- #: kxsldbgpart/libxsldbg/debugXSL.cpp:1297
- #: kxsldbgpart/libxsldbg/debugXSL.cpp:2093
--msgid ""
--"Breakpoint at text node in file \"%1\".\n"
--msgstr ""
--"檔案 \"%1\" 中的文字節點的中斷點。\n"
-+msgid "Breakpoint at text node in file \"%1\".\n"
-+msgstr "檔案 \"%1\" 中的文字節點的中斷點。\n"
- 
- #: kxsldbgpart/libxsldbg/debugXSL.cpp:1460
- msgid ""
--"Unable to print local help. Online help can be found at "
--"http://xsldbg.sourceforge.net/docs/index.html.\n"
-+"Unable to print local help. Online help can be found at http://xsldbg."
-+"sourceforge.net/docs/index.html.\n"
- msgstr ""
--"無法列印本地端說明文件。您可以在 http://xsldbg.sourceforge.net/docs/index.html 找到線上的說明文件。\n"
-+"無法列印本地端說明文件。您可以在 http://xsldbg.sourceforge.net/docs/index."
-+"html 找到線上的說明文件。\n"
- 
- #: kxsldbgpart/libxsldbg/debugXSL.cpp:1613
- msgid ""
-@@ -1058,72 +875,52 @@
- msgstr "\t總共有 %n 個中斷點。"
- 
- #: kxsldbgpart/libxsldbg/debugXSL.cpp:1634
--msgid ""
--"Error: Unable to delete breakpoint.\n"
--msgstr ""
--"錯誤：無法刪除中斷點。\n"
-+msgid "Error: Unable to delete breakpoint.\n"
-+msgstr "錯誤：無法刪除中斷點。\n"
- 
- #: kxsldbgpart/libxsldbg/debugXSL.cpp:1656
- #: kxsldbgpart/libxsldbg/debugXSL.cpp:1676
--msgid ""
--"Error: Unable to enable/disable breakpoint.\n"
--msgstr ""
--"錯誤：無法開啟/關閉中斷點。\n"
-+msgid "Error: Unable to enable/disable breakpoint.\n"
-+msgstr "錯誤：無法開啟/關閉中斷點。\n"
- 
- #: kxsldbgpart/libxsldbg/debugXSL.cpp:1709
- msgid " in file \"%1\" at line %2"
--msgstr "檔案：\"%1\" 行號：%2"
-+msgstr "檔案：\"%1\" 列號：%2"
- 
- #: kxsldbgpart/libxsldbg/debugXSL.cpp:1717
--msgid ""
--"Error: Unable to print working directory.\n"
--msgstr ""
--"錯誤：無法列印工作目錄。\n"
-+msgid "Error: Unable to print working directory.\n"
-+msgstr "錯誤：無法列印工作目錄。\n"
- 
- #: kxsldbgpart/libxsldbg/debugXSL.cpp:1737
- #: kxsldbgpart/libxsldbg/debugXSL.cpp:1759
--msgid ""
--"Error: Need to use the run command first.\n"
--msgstr ""
--"錯誤：需要先使用 run 命令。\n"
-+msgid "Error: Need to use the run command first.\n"
-+msgstr "錯誤：需要先使用 run 命令。\n"
- 
- #: kxsldbgpart/libxsldbg/debugXSL.cpp:1794
--msgid ""
--"Load of source deferred. Use the run command.\n"
--msgstr ""
--"載入源碼發生延遲。請使用 run 命令。\n"
-+msgid "Load of source deferred. Use the run command.\n"
-+msgstr "載入原始碼發生延遲。請使用 run 命令。\n"
- 
- #: kxsldbgpart/libxsldbg/debugXSL.cpp:1834
--msgid ""
--"Load of data file deferred. Use the run command.\n"
--msgstr ""
--"載入資料檔發生延遲。請使用 run 命令。\n"
-+msgid "Load of data file deferred. Use the run command.\n"
-+msgstr "載入資料檔發生延遲。請使用 run 命令。\n"
- 
- #: kxsldbgpart/libxsldbg/debugXSL.cpp:1911
- #: kxsldbgpart/libxsldbg/debugXSL.cpp:1932
- #: kxsldbgpart/libxsldbg/debugXSL.cpp:1940
--msgid ""
--"Warning: The %1 command is disabled.\n"
--msgstr ""
--"警告：命令 %1 已關閉。\n"
-+msgid "Warning: The %1 command is disabled.\n"
-+msgstr "警告：命令 %1 已關閉。\n"
- 
- #: kxsldbgpart/libxsldbg/debugXSL.cpp:1996
--msgid ""
--"Opening terminal %1.\n"
--msgstr ""
--"開啟終端機 %1。\n"
-+msgid "Opening terminal %1.\n"
-+msgstr "開啟終端機 %1。\n"
- 
- #: kxsldbgpart/libxsldbg/debugXSL.cpp:2016
--msgid ""
--"Warning: The %1 command is disabled\n"
--msgstr ""
--"警告：命令 %1 已關閉\n"
-+msgid "Warning: The %1 command is disabled\n"
-+msgstr "警告：命令 %1 已關閉\n"
- 
- #: kxsldbgpart/libxsldbg/debugXSL.cpp:2080
--msgid ""
--"Error: Unknown command %1. Try help.\n"
--msgstr ""
--"錯誤：未知的命令 %1。請找說明文件。\n"
-+msgid "Error: Unknown command %1. Try help.\n"
-+msgstr "錯誤：未知的命令 %1。請找說明文件。\n"
- 
- #: kxsldbgpart/libxsldbg/breakpoint_cmds.cpp:94
- #: kxsldbgpart/libxsldbg/breakpoint_cmds.cpp:345
-@@ -1131,42 +928,31 @@
- msgstr "加入中斷點失敗。"
- 
- #: kxsldbgpart/libxsldbg/breakpoint_cmds.cpp:113
--msgid ""
--"Error: Unable to parse %1 as a number of frames.\n"
--msgstr ""
--"錯誤：無法剖析 %1 為框架數量。\n"
-+msgid "Error: Unable to parse %1 as a number of frames.\n"
-+msgstr "錯誤：無法剖析 %1 為框架數量。\n"
- 
- #: kxsldbgpart/libxsldbg/breakpoint_cmds.cpp:151
--msgid ""
--"Error: Stylesheet is not valid or file is not loaded.\n"
--msgstr ""
--"錯誤：樣式表不合法，或是檔案未載入。\n"
-+msgid "Error: Stylesheet is not valid or file is not loaded.\n"
-+msgstr "錯誤：樣式表不合法，或是檔案未載入。\n"
- 
- #: kxsldbgpart/libxsldbg/breakpoint_cmds.cpp:191
- #: kxsldbgpart/libxsldbg/breakpoint_cmds.cpp:215
- #: kxsldbgpart/libxsldbg/breakpoint_cmds.cpp:302
- msgid ""
- "Warning: Breakpoint for file \"%1\" at line %2 does not seem to be valid.\n"
--msgstr ""
--"警告：檔案 \"%1\" 在行號 %2 的中斷點似乎不合法。\n"
-+msgstr "警告：檔案 \"%1\" 在列號 %2 的中斷點似乎不合法。\n"
- 
- #: kxsldbgpart/libxsldbg/breakpoint_cmds.cpp:213
--msgid ""
--"Error: Unable to find a stylesheet file whose name contains %1.\n"
--msgstr ""
--"錯誤：無法找到名稱內包含 %1 的樣式表檔案。\n"
-+msgid "Error: Unable to find a stylesheet file whose name contains %1.\n"
-+msgstr "錯誤：無法找到名稱內包含 %1 的樣式表檔案。\n"
- 
- #: kxsldbgpart/libxsldbg/breakpoint_cmds.cpp:249
--msgid ""
--"Error: Data file is invalid. Try the run command first.\n"
--msgstr ""
--"錯誤：資料檔不合法。請試著先使用 run 命令。\n"
-+msgid "Error: Data file is invalid. Try the run command first.\n"
-+msgstr "錯誤：資料檔不合法。請試著先使用 run 命令。\n"
- 
- #: kxsldbgpart/libxsldbg/breakpoint_cmds.cpp:304
--msgid ""
--"Error: Unable to find a data file whose name contains %1.\n"
--msgstr ""
--"錯誤：無法找到名稱內包含 %1 的資料檔案。\n"
-+msgid "Error: Unable to find a data file whose name contains %1.\n"
-+msgstr "錯誤：無法找到名稱內包含 %1 的資料檔案。\n"
- 
- #: kxsldbgpart/libxsldbg/breakpoint_cmds.cpp:419
- msgid "Error: Unable to find the added breakpoint."
-@@ -1175,29 +961,23 @@
- #: kxsldbgpart/libxsldbg/breakpoint_cmds.cpp:527
- #: kxsldbgpart/libxsldbg/breakpoint_cmds.cpp:722
- #: kxsldbgpart/libxsldbg/breakpoint_cmds.cpp:848
--msgid ""
--"Error: Invalid arguments for command %1.\n"
--msgstr ""
--"錯誤：命令 %1 有不合法的參數。\n"
-+msgid "Error: Invalid arguments for command %1.\n"
-+msgstr "錯誤：命令 %1 有不合法的參數。\n"
- 
- #: kxsldbgpart/libxsldbg/breakpoint_cmds.cpp:596
- #: kxsldbgpart/libxsldbg/breakpoint_cmds.cpp:952
- msgid ""
--"Information: Breakpoint validation has caused breakpoint %1 to be re-created.\n"
--msgstr ""
--"資訊：中斷點檢查造成中斷點 %1 被重新建立。\n"
-+"Information: Breakpoint validation has caused breakpoint %1 to be re-"
-+"created.\n"
-+msgstr "資訊：中斷點檢查造成中斷點 %1 被重新建立。\n"
- 
- #: kxsldbgpart/libxsldbg/breakpoint_cmds.cpp:603
--msgid ""
--"Warning: Breakpoint exits for file \"%1\" at line %2.\n"
--msgstr ""
--"警告：檔案 %1 行號 %2 的中斷點離開。\n"
-+msgid "Warning: Breakpoint exits for file \"%1\" at line %2.\n"
-+msgstr "警告：檔案 %1 列號 %2 的中斷點離開。\n"
- 
- #: kxsldbgpart/libxsldbg/breakpoint_cmds.cpp:626
--msgid ""
--"Error: No templates found or unable to add breakpoint.\n"
--msgstr ""
--"錯誤：找不到樣本，或無法加入中斷點。\n"
-+msgid "Error: No templates found or unable to add breakpoint.\n"
-+msgstr "錯誤：找不到樣本，或無法加入中斷點。\n"
- 
- #: kxsldbgpart/libxsldbg/breakpoint_cmds.cpp:631
- #, c-format
-@@ -1207,16 +987,12 @@
- msgstr "資訊：已新增 %n 中斷點。"
- 
- #: kxsldbgpart/libxsldbg/breakpoint_cmds.cpp:651
--msgid ""
--"Error: Failed to add breakpoint for file \"%1\" at line %2.\n"
--msgstr ""
--"錯誤：加入中斷點到檔案 \"%1\" 行號 %2 失敗。\n"
-+msgid "Error: Failed to add breakpoint for file \"%1\" at line %2.\n"
-+msgstr "錯誤：加入中斷點到檔案 \"%1\" 列號 %2 失敗。\n"
- 
- #: kxsldbgpart/libxsldbg/breakpoint_cmds.cpp:653
--msgid ""
--"Error: Failed to add breakpoint.\n"
--msgstr ""
--"錯誤：加入中斷點失敗。\n"
-+msgid "Error: Failed to add breakpoint.\n"
-+msgstr "錯誤：加入中斷點失敗。\n"
- 
- #: kxsldbgpart/libxsldbg/breakpoint_cmds.cpp:677
- msgid "Failed to delete breakpoint."
-@@ -1224,91 +1000,67 @@
- 
- #: kxsldbgpart/libxsldbg/breakpoint_cmds.cpp:714
- #: kxsldbgpart/libxsldbg/breakpoint_cmds.cpp:842
--msgid ""
--"Error: Breakpoint does not exist for file \"%1\" at line %2.\n"
--msgstr ""
--"錯誤：中斷點不存在於檔案 %1 行號 %2。\n"
-+msgid "Error: Breakpoint does not exist for file \"%1\" at line %2.\n"
-+msgstr "錯誤：中斷點不存在於檔案 %1 列號 %2。\n"
- 
- #: kxsldbgpart/libxsldbg/breakpoint_cmds.cpp:735
--msgid ""
--"Error: Unable to delete breakpoint %1.\n"
--msgstr ""
--"錯誤：無法刪除中斷點 %1。\n"
-+msgid "Error: Unable to delete breakpoint %1.\n"
-+msgstr "錯誤：無法刪除中斷點 %1。\n"
- 
- #: kxsldbgpart/libxsldbg/breakpoint_cmds.cpp:738
- #: kxsldbgpart/libxsldbg/breakpoint_cmds.cpp:864
--msgid ""
--"Error: Breakpoint %1 does not exist.\n"
--msgstr ""
--"錯誤：中斷點 %1 不存在。\n"
-+msgid "Error: Breakpoint %1 does not exist.\n"
-+msgstr "錯誤：中斷點 %1 不存在。\n"
- 
- #: kxsldbgpart/libxsldbg/breakpoint_cmds.cpp:745
--msgid ""
--"Error: Unable to delete breakpoint at template %1.\n"
--msgstr ""
--"錯誤：無法刪除樣本 %1 的中斷點。\n"
-+msgid "Error: Unable to delete breakpoint at template %1.\n"
-+msgstr "錯誤：無法刪除樣本 %1 的中斷點。\n"
- 
- #: kxsldbgpart/libxsldbg/breakpoint_cmds.cpp:748
- #: kxsldbgpart/libxsldbg/breakpoint_cmds.cpp:871
--msgid ""
--"Error: Breakpoint at template \"%1\" does not exist.\n"
--msgstr ""
--"錯誤：樣本 %1 的中斷點不存在。\n"
-+msgid "Error: Breakpoint at template \"%1\" does not exist.\n"
-+msgstr "錯誤：樣本 %1 的中斷點不存在。\n"
- 
- #: kxsldbgpart/libxsldbg/breakpoint_cmds.cpp:797
- msgid "Failed to enable/disable breakpoint."
- msgstr "開啟/關閉中斷點失敗。"
- 
- #: kxsldbgpart/libxsldbg/breakpoint_cmds.cpp:861
--msgid ""
--"Error: Unable to enable/disable breakpoint %1.\n"
--msgstr ""
--"錯誤：無法開啟/關閉中斷點 %1。\n"
-+msgid "Error: Unable to enable/disable breakpoint %1.\n"
-+msgstr "錯誤：無法開啟/關閉中斷點 %1。\n"
- 
- #: kxsldbgpart/libxsldbg/breakpoint_cmds.cpp:956
- #: kxsldbgpart/libxsldbg/breakpoint_cmds.cpp:995
--msgid ""
--"Warning: Validation of breakpoint %1 failed.\n"
--msgstr ""
--"警告：中斷點 %1 檢查失敗。\n"
-+msgid "Warning: Validation of breakpoint %1 failed.\n"
-+msgstr "警告：中斷點 %1 檢查失敗。\n"
- 
- #: kxsldbgpart/libxsldbg/breakpoint_cmds.cpp:984
- msgid ""
- "Information: Breakpoint validation has caused one or more breakpoints to be "
- "re-created.\n"
--msgstr ""
--"資訊：中斷點檢查造成一個或多個中斷點重新建立。\n"
-+msgstr "資訊：中斷點檢查造成一個或多個中斷點重新建立。\n"
- 
- #: kxsldbgpart/libxsldbg/utils.cpp:111
--msgid ""
--"Error: Unmatched quotes in input.\n"
--msgstr ""
--"錯誤：輸入中的引號不對稱。\n"
-+msgid "Error: Unmatched quotes in input.\n"
-+msgstr "錯誤：輸入中的引號不對稱。\n"
- 
- #: kxsldbgpart/libxsldbg/search_cmds.cpp:52
--msgid ""
--"Error: No path to documentation; aborting searching.\n"
--msgstr ""
--"錯誤：沒有文件路徑。搜尋中斷。\n"
-+msgid "Error: No path to documentation; aborting searching.\n"
-+msgstr "錯誤：沒有文件路徑。搜尋中斷。\n"
- 
- #: kxsldbgpart/libxsldbg/search_cmds.cpp:54
--msgid ""
--"Error: Error in value of USE_DOCS_MACRO; look at Makefile.am.\n"
--msgstr ""
--"錯誤：USE_DOCS_MACRO 的值錯誤。請查看 Makefile.am。\n"
-+msgid "Error: Error in value of USE_DOCS_MACRO; look at Makefile.am.\n"
-+msgstr "錯誤：USE_DOCS_MACRO 的值錯誤。請查看 Makefile.am。\n"
- 
- #: kxsldbgpart/libxsldbg/search_cmds.cpp:56
- msgid ""
- "Error: Required environment variable %1 not set to the directory of xsldbg "
- "documentation.\n"
--msgstr ""
--"錯誤：未將必要的環境變數 %1 設定為 xsldbg 文件的目錄。\n"
-+msgstr "錯誤：未將必要的環境變數 %1 設定為 xsldbg 文件的目錄。\n"
- 
- #: kxsldbgpart/libxsldbg/search_cmds.cpp:62
--msgid ""
--"Error: Stylesheet not valid, files not loaded yet?\n"
--msgstr ""
--"錯誤：樣式表不合法。檔案尚未載入嗎？\n"
-+msgid "Error: Stylesheet not valid, files not loaded yet?\n"
-+msgstr "錯誤：樣式表不合法。檔案尚未載入嗎？\n"
- 
- #. i18n: file ./kxsldbgpart/xsldbgbreakpoints.ui line 81
- #: kxsldbgpart/xsldbgbreakpointlistitem.cpp:38 rc.cpp:213
-@@ -1321,34 +1073,24 @@
- msgstr "已關閉"
- 
- #: kxsldbgpart/xsldbgconfigimpl.cpp:191
--msgid ""
--"\t\"XSL source\" \n"
--msgstr ""
--"\t\"XSL 源碼\"\n"
-+msgid "\t\"XSL source\" \n"
-+msgstr "\t\"XSL 原始碼\"\n"
- 
- #: kxsldbgpart/xsldbgconfigimpl.cpp:193
--msgid ""
--"\t\"XML data\" \n"
--msgstr ""
--"\t\"XML 資料\"\n"
-+msgid "\t\"XML data\" \n"
-+msgstr "\t\"XML 資料\"\n"
- 
- #: kxsldbgpart/xsldbgconfigimpl.cpp:195
--msgid ""
--"\t\"Output file\" \n"
--msgstr ""
--"\t\"輸出檔案\"\n"
-+msgid "\t\"Output file\" \n"
-+msgstr "\t\"輸出檔案\"\n"
- 
- #: kxsldbgpart/xsldbgconfigimpl.cpp:197
--msgid ""
--"Missing values for \n"
--msgstr ""
--"缺乏值：\n"
-+msgid "Missing values for \n"
-+msgstr "缺乏值：\n"
- 
- #: kxsldbgpart/xsldbgconfigimpl.cpp:201
--msgid ""
--"Output file is the same as either XSL Source or XML Data file\n"
--msgstr ""
--"輸出檔案與 XSL 源碼檔或 XML 資料檔相同\n"
-+msgid "Output file is the same as either XSL Source or XML Data file\n"
-+msgstr "輸出檔案與 XSL 原始碼檔或 XML 資料檔相同\n"
- 
- #: kxsldbgpart/xsldbgconfigimpl.cpp:220
- msgid ""
-@@ -1360,7 +1102,7 @@
- 
- #: kxsldbgpart/xsldbgconfigimpl.cpp:370
- msgid "Choose XSL Source to Debug"
--msgstr "選擇要除錯的 XSL 源碼檔"
-+msgstr "選擇要除錯的 XSL 原始碼檔"
- 
- #: kxsldbgpart/xsldbgconfigimpl.cpp:382
- msgid "Choose XML Data to Debug"
-@@ -1417,15 +1159,15 @@
- 
- #: kxsldbgpart/kxsldbg_part.cpp:109
- msgid "Configure Editor..."
--msgstr "設定編輯器..."
-+msgstr "設定編輯器…"
- 
- #: kxsldbgpart/kxsldbg_part.cpp:113
- msgid "Configure..."
--msgstr "設定..."
-+msgstr "設定…"
- 
- #: kxsldbgpart/kxsldbg_part.cpp:118
- msgid "Inspect..."
--msgstr "檢查..."
-+msgstr "檢查…"
- 
- #: kxsldbgpart/kxsldbg_part.cpp:125
- msgid "Run"
-@@ -1459,7 +1201,7 @@
- 
- #: kxsldbgpart/kxsldbg_part.cpp:171
- msgid "&Source"
--msgstr "源碼(&S)"
-+msgstr "原始碼(&S)"
- 
- #: kxsldbgpart/kxsldbg_part.cpp:176
- msgid "&Data"
-@@ -1475,7 +1217,7 @@
- 
- #: kxsldbgpart/kxsldbg_part.cpp:192
- msgid "Walk Through Stylesheet..."
--msgstr "走過樣式表..."
-+msgstr "走過樣式表…"
- 
- #: kxsldbgpart/kxsldbg_part.cpp:196
- msgid "Stop Wal&king Through Stylesheet"
-@@ -1495,15 +1237,15 @@
- 
- #: kxsldbgpart/kxsldbg_part.cpp:214
- msgid "Goto &XPath..."
--msgstr "跳到 XPath(&X)..."
-+msgstr "跳到 XPath(&X)…"
- 
- #: kxsldbgpart/kxsldbg_part.cpp:219
- msgid "Lookup SystemID..."
--msgstr "搜尋系統代碼..."
-+msgstr "搜尋系統代碼…"
- 
- #: kxsldbgpart/kxsldbg_part.cpp:224
- msgid "Lookup PublicID..."
--msgstr "搜尋公開代碼..."
-+msgstr "搜尋公開代碼…"
- 
- #: kxsldbgpart/kxsldbg_part.cpp:277
- msgid "KXsldbgPart"
-@@ -1577,13 +1319,13 @@
- #: rc.cpp:21 rc.cpp:78 rc.cpp:354
- #, no-c-format
- msgid "Source File"
--msgstr "源碼檔案"
-+msgstr "原始碼檔案"
- 
- #. i18n: file ./kxsldbgpart/xsldbgglobalvariables.ui line 62
- #: rc.cpp:24 rc.cpp:357
- #, no-c-format
- msgid "Source Line Number"
--msgstr "源碼行號"
-+msgstr "原始碼列號"
- 
- #. i18n: file ./kxsldbgpart/xsldbgglobalvariables.ui line 150
- #: rc.cpp:27 rc.cpp:333
-@@ -1625,13 +1367,13 @@
- #: rc.cpp:48 rc.cpp:69
- #, no-c-format
- msgid "Source File Name"
--msgstr "源碼檔案名稱"
-+msgstr "原始碼檔案名稱"
- 
- #. i18n: file ./kxsldbgpart/xsldbgcallstack.ui line 54
- #: rc.cpp:51 rc.cpp:72 rc.cpp:210
- #, no-c-format
- msgid "Line Number"
--msgstr "行號"
-+msgstr "列號"
- 
- #. i18n: file ./kxsldbgpart/xsldbgcallstack.ui line 75
- #: rc.cpp:54
-@@ -1655,7 +1397,7 @@
- #: rc.cpp:75
- #, no-c-format
- msgid "Xsldbg Source Files"
--msgstr "Xsldbg 源碼檔案"
-+msgstr "Xsldbg 原始碼檔案"
- 
- #. i18n: file ./kxsldbgpart/xsldbgsources.ui line 43
- #: rc.cpp:81
-@@ -1667,7 +1409,7 @@
- #: rc.cpp:84
- #, no-c-format
- msgid "Parent Line Number"
--msgstr "父母行號"
-+msgstr "父母列號"
- 
- #. i18n: file ./kxsldbgpart/xsldbgconfig.ui line 31
- #: rc.cpp:90
-@@ -1709,7 +1451,7 @@
- #: rc.cpp:123 rc.cpp:129 rc.cpp:135
- #, no-c-format
- msgid "..."
--msgstr "..."
-+msgstr "…"
- 
- #. i18n: file ./kxsldbgpart/xsldbgconfig.ui line 512
- #: rc.cpp:126
-@@ -1721,7 +1463,7 @@
- #: rc.cpp:132
- #, no-c-format
- msgid "XSL source:"
--msgstr "XSL 源碼："
-+msgstr "XSL 原始碼："
- 
- #. i18n: file ./kxsldbgpart/xsldbgconfig.ui line 621
- #: rc.cpp:141
-@@ -1865,7 +1607,7 @@
- #: rc.cpp:222
- #, no-c-format
- msgid "Line number:"
--msgstr "行號："
-+msgstr "列號："
- 
- #. i18n: file ./kxsldbgpart/xsldbgbreakpoints.ui line 154
- #: rc.cpp:225
-@@ -1949,7 +1691,7 @@
- #: rc.cpp:279
- #, no-c-format
- msgid "Add breakpoint using file name with line number or a template name"
--msgstr "使用檔名與行號或是樣本名稱新增中斷點"
-+msgstr "使用檔名與列號或是樣本名稱新增中斷點"
- 
- #. i18n: file ./kxsldbgpart/xsldbgwalkspeed.ui line 17
- #: rc.cpp:285
-@@ -2056,7 +1798,7 @@
- 
- #: xsldbgmain.cpp:51
- msgid "A KDE console application for xsldbg, an XSLT debugger"
--msgstr "xsldbg 的 KDE 主控台應用程式，XSLT 除錯器"
-+msgstr "xsldbg 的 KDE 主控臺應用程式，XSLT 除錯器"
- 
- #: xsldbgmain.cpp:57
- msgid "Start a shell"
-@@ -2153,37 +1895,30 @@
- #: xsldbgmain.cpp:95
- msgid ""
- "Print all error messages to stdout, normally error messages go to stderr"
--msgstr "將所有的錯誤列印到標準輸出（stdout）。通常錯誤訊息都是丟到標準錯誤（stderr）"
-+msgstr ""
-+"將所有的錯誤列印到標準輸出（stdout）。通常錯誤訊息都是丟到標準錯誤（stderr）"
- 
- #: xsldbgmain.cpp:96
- msgid ""
--"Disable the automatic restarting of execution when current processing pass is "
--"complete"
-+"Disable the automatic restarting of execution when current processing pass "
-+"is complete"
- msgstr "目前行程階段完成後關閉自動重新執行功能"
- 
- #: xsldbgmain.cpp:124
--msgid ""
--"Using libxml %1, libxslt %2 and libexslt %3\n"
--msgstr ""
--"使用 libxml %1, libxslt %2 與 libexslt %3\n"
-+msgid "Using libxml %1, libxslt %2 and libexslt %3\n"
-+msgstr "使用 libxml %1, libxslt %2 與 libexslt %3\n"
- 
- #: xsldbgmain.cpp:125
--msgid ""
--"xsldbg was compiled against libxml %1, libxslt %2 and libexslt %3\n"
--msgstr ""
--"xsldbg 編譯時使用了 libxml %1，libxslt %2 與 libexslt %3\n"
-+msgid "xsldbg was compiled against libxml %1, libxslt %2 and libexslt %3\n"
-+msgstr "xsldbg 編譯時使用了 libxml %1，libxslt %2 與 libexslt %3\n"
- 
- #: xsldbgmain.cpp:126
--msgid ""
--"libxslt %1 was compiled against libxml %2\n"
--msgstr ""
--"libxslt %1 編譯時使用了 libxml %2\n"
-+msgid "libxslt %1 was compiled against libxml %2\n"
-+msgstr "libxslt %1 編譯時使用了 libxml %2\n"
- 
- #: xsldbgmain.cpp:127
--msgid ""
--"libexslt %1 was compiled against libxml %2\n"
--msgstr ""
--"libexslt %1 編譯時使用了 libxml %2\n"
-+msgid "libexslt %1 was compiled against libxml %2\n"
-+msgstr "libexslt %1 編譯時使用了 libxml %2\n"
- 
- #: xsldbgmain.cpp:130
- msgid "Xsldbg"
-diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdewebdev/quanta.po kde-i18n-zh_TW-3.5.10/messages/kdewebdev/quanta.po
---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdewebdev/quanta.po	2008-08-19 20:43:10.000000000 +0200
-+++ kde-i18n-zh_TW-3.5.10/messages/kdewebdev/quanta.po	2011-11-11 15:45:17.000000000 +0100
-@@ -7,7 +7,7 @@
- "Project-Id-Version: quanta\n"
- "POT-Creation-Date: 2008-07-08 01:25+0200\n"
- "PO-Revision-Date: 2006-08-01 22:34+0800 \n"
--"Last-Translator: Stanley Wong <stanley18fan0k@yahoo.com.hk>\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
- "Language-Team: Chinese (Traditional) <zh-l10n@linux.org.tw>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
-@@ -17,7 +17,7 @@
- #: rc.cpp:6
- #, no-c-format
- msgid "Save &As..."
--msgstr "另存為(&A)..."
-+msgstr "另存為(&A)…"
- 
- #. i18n: file ./dialogs/fourbuttonmessagebox.ui line 90
- #: rc.cpp:9
-@@ -86,7 +86,7 @@
- #: rc.cpp:2901 rc.cpp:2907 rc.cpp:2910 rc.cpp:2988 rc.cpp:2991
- #, no-c-format
- msgid "..."
--msgstr "..."
-+msgstr "…"
- 
- #. i18n: file ./dialogs/tagdialogs/tagmail.ui line 67
- #: rc.cpp:45
-@@ -190,7 +190,7 @@
- #: rc.cpp:105 rc.cpp:611 rc.cpp:1502 rc.cpp:2778
- #, no-c-format
- msgid "&Add..."
--msgstr "加入(&A)..."
-+msgstr "加入(&A)…"
- 
- #. i18n: file ./dialogs/actionconfigdialogs.ui line 280
- #: rc.cpp:111
-@@ -208,7 +208,7 @@
- #: rc.cpp:120
- #, no-c-format
- msgid "C&ustom"
--msgstr "自訂(&U)..."
-+msgstr "自訂(&U)…"
- 
- #. i18n: file ./dialogs/actionconfigdialogs.ui line 365
- #: dialogs/actionconfigdialog.cpp:320 dialogs/tagdialogs/colorcombo.cpp:220
-@@ -446,7 +446,7 @@
- "<div align=\"center\">"
- "<h2>您的捐獻足以影響一切</h2></div>&nbsp;&nbsp;&nbsp;沒有一群熱心的贊助工程師，Quanta Plus 就不會有今天的成就：自 "
- "2002 年中 Andras Mantia 就開始全職開發 Quanta Plus；Michal Rudolf 在 2004 "
--"年春天以兼職身份加入開發行列；主管 Eric Laffoon 還是奉獻得最多的人：他除了每星期最少花 10-20 小時工作，還不斷在開設的公司 <a "
-+"年春天以兼職身分加入開發行列；主管 Eric Laffoon 還是奉獻得最多的人：他除了每星期最少花 10-20 小時工作，還不斷在開設的公司 <a "
- "href=\"http://kittyhooch.com\" target=\"_blank\">Kitty Hooch</a> "
- "LLP 撥款贊助我們，令 Quanta 可以持續發展。另一方面，我們這些受贊助的工程師也可以促使志願開發人員做得更好。\n"
- "<br>&nbsp;&nbsp;&nbsp;&nbsp;Kitty Hooch 是一間小公司，目前還沒有員工，只有兩個合夥人和幾個合約工人。它在 2001 "
-@@ -455,12 +455,12 @@
- "的酬金。幸好，當時社群沒有袖手旁觀，慷慨解囊，真是非常感謝！隨著更多人了解到資金的問題，捐助者的數目也不斷上升。到了現在，Quanta "
- "已經擁有一大群慷慨的贊助者了，使我們可以資助 Michal 兼職開發，贊助他全職開發也是我們的目標之一。而我們的最終目標，是成為殺手級的桌面應用程式。\n"
- "<div align=\"center\">"
--"<h3>在開放源碼的理想世界與金錢至上的現實生活\n"
-+"<h3>在開放原始碼的理想世界與金錢至上的現實生活\n"
- "之間取得平衡</h3></div>\n"
--"&nbsp;&nbsp;&nbsp;&nbsp;我們確信未來的軟體開發是開放源碼的世界，但是沒人敢保證這樣做會一定成功的：許多開源計劃都被寄予厚望，可是今天還有"
-+"&nbsp;&nbsp;&nbsp;&nbsp;我們確信未來的軟體開發是開放原始碼的世界，但是沒人敢保證這樣做會一定成功的：許多開放原始碼計劃都被寄予厚望，可是今天還有"
- "人維護的剩下多少個呢？2002 初，人們都認為 Quanta Plus 完了，只有 Eric Laffoon 盡自己的能力拯救這個夢想。雖然現在 Quanta "
- "已復活過來，還滿有生命力，但要維護這個頂級的程式並非易事。那麼，Quanta "
--"是如何做到的呢？我們認為成功的秘訣，是持續不斷的熱情和動力。只要消除了時間和金錢上的問題，工程師就可以全情投入。這樣，您為什麼認為開源計劃活不下去呢？"
-+"是如何做到的呢？我們認為成功的祕訣，是持續不斷的熱情和動力。只要消除了時間和金錢上的問題，工程師就可以全情投入。這樣，您為什麼認為開放原始碼計劃活不下去呢？"
- "<br>&nbsp;&nbsp;&nbsp;&nbsp;Quanta "
- "的發展也帶來一個難題：它愈來愈難管理，意味著我們需要更多時間和經濟上的支持。贊助工程師在此的影響甚大！我們希望 Quanta 可以發展得更快。Eric "
- "需要更多的時間發揮他的想像力，把更多刺激的新主意加入去。我們也有其他的開支的：我們需要開會討論，也需要更換古老設備，節省寶貴時間。<i>"
-@@ -1130,13 +1130,13 @@
- #: rc.cpp:590 rc.cpp:2563 rc.cpp:2575
- #, no-c-format
- msgid "Add..."
--msgstr "加入..."
-+msgstr "加入…"
- 
- #. i18n: file ./dialogs/settings/abbreviations.ui line 52
- #: rc.cpp:596
- #, no-c-format
- msgid "&New..."
--msgstr "新增(&N)..."
-+msgstr "新增(&N)…"
- 
- #. i18n: file ./dialogs/settings/abbreviations.ui line 68
- #: rc.cpp:599
-@@ -1166,7 +1166,7 @@
- #: rc.cpp:617 rc.cpp:1505 rc.cpp:2781
- #, no-c-format
- msgid "&Edit..."
--msgstr "編輯(&E)..."
-+msgstr "編輯(&E)…"
- 
- #. i18n: file ./dialogs/settings/abbreviations.ui line 207
- #: rc.cpp:620
-@@ -3330,7 +3330,7 @@
- #: rc.cpp:2188
- #, no-c-format
- msgid "&Add include"
--msgstr "加入 Include (&A)"
-+msgstr "加入 Include(&A)"
- 
- #. i18n: file ./components/debugger/gubed/gubedsettingss.ui line 355
- #: rc.cpp:2191
-@@ -3536,7 +3536,7 @@
- #: rc.cpp:2356
- #, no-c-format
- msgid "Bod&y Properties"
--msgstr "表格身部(Bod&y)屬性..."
-+msgstr "表格身部(Bod&y)屬性…"
- 
- #. i18n: file ./components/tableeditor/tableeditors.ui line 209
- #: rc.cpp:2359
-@@ -3632,7 +3632,7 @@
- #: rc.cpp:2404
- #, no-c-format
- msgid "Number of lines:"
--msgstr "行數："
-+msgstr "列數："
- 
- #. i18n: file ./treeviews/fileinfodlg.ui line 40
- #: rc.cpp:2407
-@@ -3770,7 +3770,7 @@
- #: rc.cpp:2485
- #, no-c-format
- msgid "&Fine-tune the DTEP after conversion"
--msgstr "轉換後微調 DTEP (&F)"
-+msgstr "轉換後微調 DTEP(&F)"
- 
- #. i18n: file ./plugins/pluginconfig.ui line 33
- #: plugins/quantapluginconfig.cpp:40 rc.cpp:2488
-@@ -3906,7 +3906,7 @@
- #: rc.cpp:2566
- #, no-c-format
- msgid "Configure..."
--msgstr "設定..."
-+msgstr "設定…"
- 
- #. i18n: file ./plugins/plugineditor.ui line 178
- #: rc.cpp:2572 rc.cpp:5363
-@@ -4073,13 +4073,13 @@
- #: rc.cpp:2670
- #, no-c-format
- msgid "New..."
--msgstr "新增..."
-+msgstr "新增…"
- 
- #. i18n: file ./project/projectuploads.ui line 111
- #: rc.cpp:2673
- #, no-c-format
- msgid "Edit..."
--msgstr "編輯..."
-+msgstr "編輯…"
- 
- #. i18n: file ./project/projectuploads.ui line 137
- #: rc.cpp:2679
-@@ -4254,7 +4254,7 @@
- #: project/teammembersdlg.cpp:247 rc.cpp:2772
- #, no-c-format
- msgid "Please select your identity from the member list."
--msgstr "請在成員列表中選擇您的身份。"
-+msgstr "請在成員列表中選擇您的身分。"
- 
- #. i18n: file ./project/teammembersdlgs.ui line 64
- #: rc.cpp:2775
-@@ -4410,13 +4410,13 @@
- #: rc.cpp:2886
- #, no-c-format
- msgid "&Add Files..."
--msgstr "加入檔案(&A)..."
-+msgstr "加入檔案(&A)…"
- 
- #. i18n: file ./project/projectnewlocals.ui line 244
- #: rc.cpp:2889
- #, no-c-format
- msgid "A&dd Folder..."
--msgstr "加入目錄(&D)..."
-+msgstr "加入目錄(&D)…"
- 
- #. i18n: file ./project/projectnewlocals.ui line 252
- #: rc.cpp:2892
-@@ -4464,7 +4464,7 @@
- #: rc.cpp:2922
- #, no-c-format
- msgid "&Use wget to download files from a site"
--msgstr "使用 wget 下載站台的檔案(&U)"
-+msgstr "使用 wget 下載站臺的檔案(&U)"
- 
- #. i18n: file ./project/projectnewgenerals.ui line 297
- #: rc.cpp:2931
-@@ -4683,7 +4683,7 @@
- #: rc.cpp:3058
- #, no-c-format
- msgid "Save as Template"
--msgstr "另存為範本..."
-+msgstr "另存為範本…"
- 
- #. i18n: file ./data/config/quantaui.rc line 38
- #: rc.cpp:3064
-@@ -5844,7 +5844,7 @@
- "Select the image format here.  The image format is usually reflects the file "
- "extension of your image file (.png corresponds to PNG in the drop down, .jpg "
- "corresponds to JPG, etc.)."
--msgstr "請在這裏選擇圖片格式。圖片的格式一般與副檔名有關。(.png 對應 PNG , .jpg 對應 JPG......)"
-+msgstr "請在這裏選擇圖片格式。圖片的格式一般與副檔名有關。(.png 對應 PNG , .jpg 對應 JPG…...)"
- 
- #. i18n: file ./scripts/picturewizard.kmdr line 469
- #: rc.cpp:3659
-@@ -7857,7 +7857,7 @@
- "<br>- core attributes\n"
- "   "
- msgstr ""
--"<b>BR</b> 元素會在目前的文字列中<i>強制換行</i>。\n"
-+"<b>BR</b> 元素會在目前的文字列中<i>強制換列</i>。\n"
- "     "
- "<br>- CLEAR=[ left | all | right | none ] (clear floating objects)\n"
- "     "
-@@ -8295,7 +8295,7 @@
- "The <b>br</b> element forces a <i>break</i> in the current line of text.\n"
- "   "
- msgstr ""
--"<b>br</b> 元素使目前的文字<i>折一行</i>。\n"
-+"<b>br</b> 元素使目前的文字<i>折一列</i>。\n"
- "   "
- 
- #. i18n: file extrafiles line 2275
-@@ -8371,7 +8371,7 @@
- 
- #: rc.cpp:5029 rc.cpp:5046
- msgid "Font..."
--msgstr "字型..."
-+msgstr "字型…"
- 
- #: rc.cpp:5030 rc.cpp:5047
- msgid "Font Size+1"
-@@ -8522,7 +8522,7 @@
- 
- #: rc.cpp:5080 rc.cpp:5136 rc.cpp:5152
- msgid "New Line"
--msgstr "換行"
-+msgstr "換列"
- 
- #: rc.cpp:5081 rc.cpp:5137 rc.cpp:5153
- msgid "Paragraph"
-@@ -8534,11 +8534,11 @@
- 
- #: rc.cpp:5083 rc.cpp:5139 rc.cpp:5155 rc.cpp:5185
- msgid "Anchor..."
--msgstr "超連結..."
-+msgstr "超連結…"
- 
- #: rc.cpp:5084 rc.cpp:5140 rc.cpp:5156
- msgid "Image..."
--msgstr "影像..."
-+msgstr "影像…"
- 
- #: rc.cpp:5085 rc.cpp:5141 rc.cpp:5157
- msgid "Horizontal Line"
-@@ -8732,7 +8732,7 @@
- #: rc.cpp:5209
- #, fuzzy
- msgid "tip"
--msgstr "停止(&t)"
-+msgstr "停止(&T)"
- 
- #: rc.cpp:5210
- msgid "footnote"
-@@ -8870,7 +8870,7 @@
- #: rc.cpp:5243
- #, fuzzy
- msgid "step"
--msgstr "停止(&t)"
-+msgstr "停止(&T)"
- 
- #: rc.cpp:5244
- msgid "substeps"
-@@ -9240,15 +9240,15 @@
- 
- #: rc.cpp:5354
- msgid "Anchor...(wml)"
--msgstr "超連結...(wml)"
-+msgstr "超連結…(wml)"
- 
- #: rc.cpp:5355
- msgid "A...(wml)"
--msgstr "A...(wml)"
-+msgstr "A…(wml)"
- 
- #: rc.cpp:5356
- msgid "Image...(wml)"
--msgstr "圖片...(wml)"
-+msgstr "圖片…(wml)"
- 
- #: rc.cpp:5357
- msgid "Timer (wml)"
-@@ -9789,7 +9789,7 @@
- 
- #: src/quanta.cpp:785
- msgid "<center><h3>The current document is empty...</h3></center>"
--msgstr "<center><h3>目前的文件是空白的...</h3></center>"
-+msgstr "<center><h3>目前的文件是空白的…</h3></center>"
- 
- #: src/quanta.cpp:933
- msgid " OVR "
-@@ -9861,7 +9861,7 @@
- 
- #: src/quanta.cpp:2052
- msgid "Break When '%1'..."
--msgstr "當'%1'發生時中斷..."
-+msgstr "當'%1'發生時中斷…"
- 
- #: src/quanta.cpp:2140
- msgid ""
-@@ -10162,7 +10162,7 @@
- 
- #: src/document.cpp:2792
- msgid "Working..."
--msgstr "工作中..."
-+msgstr "工作中…"
- 
- #: src/document.cpp:2793
- msgid ""
-@@ -10456,15 +10456,15 @@
- 
- #: src/quanta_init.cpp:485
- msgid "Message Window..."
--msgstr "訊息視窗..."
-+msgstr "訊息視窗…"
- 
- #: src/quanta_init.cpp:709
- msgid "Annotate..."
--msgstr "註解..."
-+msgstr "註解…"
- 
- #: src/quanta_init.cpp:710
- msgid "&Edit Current Tag..."
--msgstr "編輯目前的標籤(&E)..."
-+msgstr "編輯目前的標籤(&E)…"
- 
- #: src/quanta_init.cpp:713
- msgid "&Select Current Tag Area"
-@@ -10476,7 +10476,7 @@
- 
- #: src/quanta_init.cpp:720
- msgid "&Report Bug..."
--msgstr "報告錯誤(&R)..."
-+msgstr "報告錯誤(&R)…"
- 
- #: src/quanta_init.cpp:732
- msgid "Ti&p of the Day"
-@@ -10496,7 +10496,7 @@
- 
- #: src/quanta_init.cpp:754
- msgid "Save All..."
--msgstr "儲存全部..."
-+msgstr "儲存全部…"
- 
- #: src/quanta_init.cpp:757
- msgid "Reloa&d"
-@@ -10504,11 +10504,11 @@
- 
- #: src/quanta_init.cpp:762
- msgid "Save as Local Template..."
--msgstr "另存為本地範本..."
-+msgstr "另存為本地範本…"
- 
- #: src/quanta_init.cpp:766
- msgid "Save Selection to Local Template File..."
--msgstr "另存選擇區域到一個本地範本檔案..."
-+msgstr "另存選擇區域到一個本地範本檔案…"
- 
- #: src/quanta_init.cpp:774
- msgid "Find in Files..."
-@@ -10516,7 +10516,7 @@
- 
- #: src/quanta_init.cpp:785
- msgid "&Context Help..."
--msgstr "系絡求助(&C)..."
-+msgstr "系絡求助(&C)…"
- 
- #: src/quanta_init.cpp:789
- msgid "&Quanta Homepage"
-@@ -10532,39 +10532,39 @@
- 
- #: src/quanta_init.cpp:801
- msgid "Tag &Attributes..."
--msgstr "標籤的屬性(&A)..."
-+msgstr "標籤的屬性(&A)…"
- 
- #: src/quanta_init.cpp:805
- msgid "&Change the DTD..."
--msgstr "更換 DTD (&C)..."
-+msgstr "更換 DTD(&C)…"
- 
- #: src/quanta_init.cpp:809
- msgid "&Edit DTD Settings..."
--msgstr "更改 DTD 設定(&E)..."
-+msgstr "更改 DTD 設定(&E)…"
- 
- #: src/quanta_init.cpp:813
- msgid "&Load && Convert DTD..."
--msgstr "載入 && 轉換 DTD(&L)..."
-+msgstr "載入 && 轉換 DTD(&L)…"
- 
- #: src/quanta_init.cpp:816
- msgid "Load DTD E&ntities..."
--msgstr "載入 DTD 項目(&N)..."
-+msgstr "載入 DTD 項目(&N)…"
- 
- #: src/quanta_init.cpp:820
- msgid "Load DTD &Package (DTEP)..."
--msgstr "載入 DTD 套件(DTE&P)..."
-+msgstr "載入 DTD 套件(DTE&P)…"
- 
- #: src/quanta_init.cpp:824
- msgid "Send DTD Package (DTEP) in E&mail..."
--msgstr "以電子郵件傳送 DTD 套件(&M)..."
-+msgstr "以電子郵件傳送 DTD 套件(&M)…"
- 
- #: src/quanta_init.cpp:828
- msgid "&Download DTD Package (DTEP)..."
--msgstr "下載 &DTD 套件(DTEP)..."
-+msgstr "下載 &DTD 套件(DTEP)…"
- 
- #: src/quanta_init.cpp:831
- msgid "&Upload DTD Package (DTEP)..."
--msgstr "上傳 DTD 套件(DTEP)(&U)..."
-+msgstr "上傳 DTD 套件(DTEP)(&U)…"
- 
- #: src/quanta_init.cpp:839
- msgid "&Document Properties"
-@@ -10576,7 +10576,7 @@
- 
- #: src/quanta_init.cpp:847
- msgid "&Convert Tag && Attribute Case..."
--msgstr "轉換標籤 && 標籤屬性的大小寫(&C)..."
-+msgstr "轉換標籤 && 標籤屬性的大小寫(&C)…"
- 
- #: src/quanta_init.cpp:855
- msgid "&Source Editor"
-@@ -10604,11 +10604,11 @@
- 
- #: src/quanta_init.cpp:896
- msgid "Configure &Actions..."
--msgstr "設定動作(&A)..."
-+msgstr "設定動作(&A)…"
- 
- #: src/quanta_init.cpp:904
- msgid "Configure Pre&view..."
--msgstr "設定預覽(&V)..."
-+msgstr "設定預覽(&V)…"
- 
- #: src/quanta_init.cpp:907
- msgid "Load &Project Toolbar"
-@@ -10616,43 +10616,43 @@
- 
- #: src/quanta_init.cpp:911
- msgid "Load &Global Toolbar..."
--msgstr "載入全域工具列(&G)..."
-+msgstr "載入全域工具列(&G)…"
- 
- #: src/quanta_init.cpp:912
- msgid "Load &Local Toolbar..."
--msgstr "載入本地工具列(&L)..."
-+msgstr "載入本地工具列(&L)…"
- 
- #: src/quanta_init.cpp:913
- msgid "Save as &Local Toolbar..."
--msgstr "另存為本地工具列(&L)..."
-+msgstr "另存為本地工具列(&L)…"
- 
- #: src/quanta_init.cpp:914
- msgid "Save as &Project Toolbar..."
--msgstr "另存為專案工具列(&P)..."
-+msgstr "另存為專案工具列(&P)…"
- 
- #: src/quanta_init.cpp:915
- msgid "&New User Toolbar..."
--msgstr "新的使用者工具列(&N)..."
-+msgstr "新的使用者工具列(&N)…"
- 
- #: src/quanta_init.cpp:916
- msgid "&Remove User Toolbar..."
--msgstr "移除使用者工具列(&R)..."
-+msgstr "移除使用者工具列(&R)…"
- 
- #: src/quanta_init.cpp:917
- msgid "Re&name User Toolbar..."
--msgstr "重新命名使用者工具列(&N)..."
-+msgstr "重新命名使用者工具列(&N)…"
- 
- #: src/quanta_init.cpp:918
- msgid "Send Toolbar in E&mail..."
--msgstr "以電子郵件傳送工具列(&M)..."
-+msgstr "以電子郵件傳送工具列(&M)…"
- 
- #: src/quanta_init.cpp:919
- msgid "&Upload Toolbar..."
--msgstr "上傳的工具列(&U)..."
-+msgstr "上傳的工具列(&U)…"
- 
- #: src/quanta_init.cpp:920
- msgid "&Download Toolbar..."
--msgstr "下載工具列(&D)..."
-+msgstr "下載工具列(&D)…"
- 
- #: src/quanta_init.cpp:922
- msgid "Smart Tag Insertion"
-@@ -10676,7 +10676,7 @@
- 
- #: src/quanta_init.cpp:939
- msgid "Upload..."
--msgstr "上傳..."
-+msgstr "上傳…"
- 
- #: src/quanta_init.cpp:940
- msgid "Delete File"
-@@ -10684,7 +10684,7 @@
- 
- #: src/quanta_init.cpp:942
- msgid "Upload Opened Project Files..."
--msgstr "上傳已開啟的專案檔案..."
-+msgstr "上傳已開啟的專案檔案…"
- 
- #: src/quanta_init.cpp:1003
- msgid "&Preview"
-@@ -10704,27 +10704,27 @@
- 
- #: src/quanta_init.cpp:1040
- msgid "Table Editor..."
--msgstr "表格編輯器..."
-+msgstr "表格編輯器…"
- 
- #: src/quanta_init.cpp:1044
- msgid "Quick List..."
--msgstr "快速列表..."
-+msgstr "快速列表…"
- 
- #: src/quanta_init.cpp:1048
- msgid "Color..."
--msgstr "顏色..."
-+msgstr "顏色…"
- 
- #: src/quanta_init.cpp:1053
- msgid "Email..."
--msgstr "電子郵件..."
-+msgstr "電子郵件…"
- 
- #: src/quanta_init.cpp:1057
- msgid "Misc. Tag..."
--msgstr "其他標籤..."
-+msgstr "其他標籤…"
- 
- #: src/quanta_init.cpp:1061
- msgid "Frame Wizard..."
--msgstr "框架精靈..."
-+msgstr "框架精靈…"
- 
- #: src/quanta_init.cpp:1065
- msgid "Paste &HTML Quoted"
-@@ -10736,7 +10736,7 @@
- 
- #: src/quanta_init.cpp:1073
- msgid "Insert CSS..."
--msgstr "插入 CSS..."
-+msgstr "插入 CSS…"
- 
- #: src/quanta_init.cpp:1174
- msgid "Restore File"
-@@ -10850,7 +10850,7 @@
- 
- #: messages/messageoutput.cpp:50
- msgid "&Save As..."
--msgstr "另存為(&S)..."
-+msgstr "另存為(&S)…"
- 
- #: messages/messageoutput.cpp:155
- msgid ""
-@@ -10958,7 +10958,7 @@
- 
- #: dialogs/tagdialogs/colorcombo.cpp:178 dialogs/tagdialogs/colorcombo.cpp:232
- msgid "Custom..."
--msgstr "自定..."
-+msgstr "自定…"
- 
- #: dialogs/tagdialogs/tagimgdlg.cpp:107
- msgid ""
-@@ -11370,7 +11370,7 @@
- 
- #: components/csseditor/propertysetter.cpp:115
- msgid "More..."
--msgstr "更多..."
-+msgstr "更多…"
- 
- #: components/csseditor/tlpeditors.cpp:70
- msgid ""
-@@ -11403,7 +11403,7 @@
- 
- #: components/cvsservice/cvsservice.cpp:50
- msgid "&Commit..."
--msgstr "提交(&C)..."
-+msgstr "提交(&C)…"
- 
- #: components/cvsservice/cvsservice.cpp:55
- msgid "Update &To"
-@@ -11411,7 +11411,7 @@
- 
- #: components/cvsservice/cvsservice.cpp:56
- msgid "&Tag/Date..."
--msgstr "標籤/日期(&T)..."
-+msgstr "標籤/日期(&T)…"
- 
- #: components/cvsservice/cvsservice.cpp:58
- msgid "&HEAD"
-@@ -11423,11 +11423,11 @@
- 
- #: components/cvsservice/cvsservice.cpp:63
- msgid "&Add to Repository..."
--msgstr "加入到 CVS 倉庫中(&A)..."
-+msgstr "加入到 CVS 倉庫中(&A)…"
- 
- #: components/cvsservice/cvsservice.cpp:65
- msgid "&Remove From Repository..."
--msgstr "從 CVS 倉庫中移除(&R)..."
-+msgstr "從 CVS 倉庫中移除(&R)…"
- 
- #: components/cvsservice/cvsservice.cpp:67
- msgid "&Ignore in CVS Operations"
-@@ -11443,19 +11443,19 @@
- 
- #: components/cvsservice/cvsservice.cpp:140
- msgid "Running CVS update..."
--msgstr "正在執行 CVS 更新..."
-+msgstr "正在執行 CVS 更新…"
- 
- #: components/cvsservice/cvsservice.cpp:179
- msgid "Updating to revision %1 ..."
--msgstr "正在更新到修訂版本 %1 ..."
-+msgstr "正在更新到修訂版本 %1…"
- 
- #: components/cvsservice/cvsservice.cpp:183
- msgid "Updating to the version from %1 ..."
--msgstr "正在從 %1 更新到版本 ..."
-+msgstr "正在從 %1 更新到版本…"
- 
- #: components/cvsservice/cvsservice.cpp:221
- msgid "Updating to HEAD..."
--msgstr "正在更新到 HEAD..."
-+msgstr "正在更新到 HEAD…"
- 
- #: components/cvsservice/cvsservice.cpp:256
- msgid "Current"
-@@ -11463,11 +11463,11 @@
- 
- #: components/cvsservice/cvsservice.cpp:266
- msgid "Running CVS commit..."
--msgstr "正在執行 CVS 提交..."
-+msgstr "正在執行 CVS 提交…"
- 
- #: components/cvsservice/cvsservice.cpp:301
- msgid "Reverting to the version from the repository..."
--msgstr "正在還原成倉庫中的版本..."
-+msgstr "正在還原成倉庫中的版本…"
- 
- #: components/cvsservice/cvsservice.cpp:333
- msgid "Add the following files to repository?"
-@@ -11479,7 +11479,7 @@
- 
- #: components/cvsservice/cvsservice.cpp:336
- msgid "Adding file to the repository..."
--msgstr "正在加入檔案至倉庫..."
-+msgstr "正在加入檔案至倉庫…"
- 
- #: components/cvsservice/cvsservice.cpp:368
- msgid ""
-@@ -11493,11 +11493,11 @@
- 
- #: components/cvsservice/cvsservice.cpp:371
- msgid "Removing files from the repository..."
--msgstr "正在從倉庫移除檔案..."
-+msgstr "正在從倉庫移除檔案…"
- 
- #: components/cvsservice/cvsservice.cpp:395
- msgid "Showing CVS log..."
--msgstr "正在顯示 CVS 記錄..."
-+msgstr "正在顯示 CVS 記錄…"
- 
- #: components/cvsservice/cvsservice.cpp:433
- msgid "\"%1\" is already in the CVS ignore list."
-@@ -11750,7 +11750,7 @@
- #: components/debugger/debuggermanager.cpp:221
- #: components/debugger/debuggermanager.cpp:224
- msgid "Break When..."
--msgstr "中斷條件..."
-+msgstr "中斷條件…"
- 
- #: components/debugger/debuggermanager.cpp:222
- #: components/debugger/debuggermanager.cpp:225
-@@ -12083,7 +12083,7 @@
- #: treeviews/filestreeview.cpp:91 treeviews/filestreeview.cpp:109
- #: treeviews/templatestreeview.cpp:150 treeviews/templatestreeview.cpp:164
- msgid "&Insert in Project..."
--msgstr " 在專案中插入(&I)..."
-+msgstr " 在專案中插入(&I)…"
- 
- #: treeviews/filestreeview.cpp:93 treeviews/filestreeview.cpp:113
- #: treeviews/projecttreeview.cpp:135 treeviews/projecttreeview.cpp:153
-@@ -12100,15 +12100,15 @@
- 
- #: treeviews/filestreeview.cpp:99 treeviews/projecttreeview.cpp:143
- msgid "F&older..."
--msgstr "資料夾(&O)..."
-+msgstr "資料夾(&O)…"
- 
- #: treeviews/filestreeview.cpp:100 treeviews/projecttreeview.cpp:144
- msgid "&File..."
--msgstr "檔案(&F)..."
-+msgstr "檔案(&F)…"
- 
- #: treeviews/filestreeview.cpp:104 treeviews/filestreeview.cpp:121
- msgid "New Top &Folder..."
--msgstr "新增最上層資料夾(&F)..."
-+msgstr "新增最上層資料夾(&F)…"
- 
- #: treeviews/filestreeview.cpp:105 treeviews/filestreeview.cpp:228
- msgid "&Add Folder to Top"
-@@ -12116,7 +12116,7 @@
- 
- #: treeviews/filestreeview.cpp:106 treeviews/projecttreeview.cpp:152
- msgid "Create Site &Template..."
--msgstr "建立網站範本(&T)..."
-+msgstr "建立網站範本(&T)…"
- 
- #: treeviews/filestreeview.cpp:107 treeviews/projecttreeview.cpp:148
- #: treeviews/projecttreeview.cpp:162
-@@ -12126,7 +12126,7 @@
- #: treeviews/filestreeview.cpp:112
- #, fuzzy
- msgid "&Change Alias..."
--msgstr "讀入..."
-+msgstr "讀入…"
- 
- #: treeviews/filestreeview.cpp:123
- msgid "Files Tree"
-@@ -12172,7 +12172,7 @@
- #: treeviews/filestreeview.cpp:319
- #, fuzzy
- msgid "Change Alias"
--msgstr "讀入..."
-+msgstr "讀入…"
- 
- #: treeviews/structtreetag.cpp:119
- msgid ""
-@@ -12210,7 +12210,7 @@
- 
- #: treeviews/templatestreeview.cpp:76
- msgid "&Extract Site Template To..."
--msgstr "解壓縮網站範本至(&E)..."
-+msgstr "解壓縮網站範本至(&E)…"
- 
- #: treeviews/templatestreeview.cpp:135 treeviews/templatestreeview.cpp:139
- msgid "Text Snippet"
-@@ -12230,19 +12230,19 @@
- 
- #: treeviews/templatestreeview.cpp:148 treeviews/templatestreeview.cpp:161
- msgid "Send in E&mail..."
--msgstr "以 E&mail 傳送..."
-+msgstr "以 E&mail 傳送…"
- 
- #: treeviews/templatestreeview.cpp:149 treeviews/templatestreeview.cpp:162
- msgid "&Upload Template..."
--msgstr "上傳範本(&U)..."
-+msgstr "上傳範本(&U)…"
- 
- #: treeviews/templatestreeview.cpp:160
- msgid "&New Folder..."
--msgstr "新增資料夾(&N)..."
-+msgstr "新增資料夾(&N)…"
- 
- #: treeviews/templatestreeview.cpp:163 treeviews/templatestreeview.cpp:174
- msgid "&Download Template..."
--msgstr "下載範本(&D)..."
-+msgstr "下載範本(&D)…"
- 
- #: treeviews/templatestreeview.cpp:177
- msgid "Group"
-@@ -12366,7 +12366,7 @@
- 
- #: treeviews/basetreeview.cpp:630 treeviews/servertreeview.cpp:104
- msgid "Open &With..."
--msgstr "開啟用(&W)..."
-+msgstr "開啟用(&W)…"
- 
- #: treeviews/servertreeview.cpp:125
- msgid "Upload Tree"
-@@ -12406,19 +12406,19 @@
- 
- #: treeviews/scripttreeview.cpp:96
- msgid "&Send in Email..."
--msgstr "以 Email 傳送(&S)..."
-+msgstr "以 Email 傳送(&S)…"
- 
- #: treeviews/scripttreeview.cpp:97
- msgid "&Upload Script..."
--msgstr "上傳指令稿(&U)..."
-+msgstr "上傳指令稿(&U)…"
- 
- #: treeviews/scripttreeview.cpp:100
- msgid "&Download Script..."
--msgstr "下載指令稿(&D)..."
-+msgstr "下載指令稿(&D)…"
- 
- #: treeviews/scripttreeview.cpp:273
- msgid "Send script in email"
--msgstr "以 Email 傳送指令稿(&S)..."
-+msgstr "以 Email 傳送指令稿(&S)…"
- 
- #: treeviews/scripttreeview.cpp:275
- msgid ""
-@@ -12451,7 +12451,7 @@
- #: treeviews/basetreeview.cpp:497
- #, c-format
- msgid "Number of lines: %1"
--msgstr "行數：%1"
-+msgstr "列數：%1"
- 
- #: treeviews/basetreeview.cpp:498
- #, c-format
-@@ -12472,7 +12472,7 @@
- 
- #: treeviews/basetreeview.cpp:627
- msgid "&Other..."
--msgstr "其他(&O)..."
-+msgstr "其他(&O)…"
- 
- #: treeviews/basetreeview.cpp:628
- msgid "Open &With"
-@@ -12545,7 +12545,7 @@
- 
- #: treeviews/doctreeview.cpp:65
- msgid "&Download Documentation..."
--msgstr "下載文件(&D)..."
-+msgstr "下載文件(&D)…"
- 
- #: treeviews/tagattributetree.cpp:227
- msgid "Attribute Name"
-@@ -12649,7 +12649,7 @@
- 
- #: treeviews/projecttreeview.cpp:123
- msgid "&Confirm"
--msgstr "確認(&C)..."
-+msgstr "確認(&C)…"
- 
- #: treeviews/projecttreeview.cpp:129 utility/newstuff.cpp:73
- msgid "Load Toolbar"
-@@ -12657,7 +12657,7 @@
- 
- #: treeviews/projecttreeview.cpp:133
- msgid "&Upload File..."
--msgstr "上傳檔案(&U)..."
-+msgstr "上傳檔案(&U)…"
- 
- #: treeviews/projecttreeview.cpp:134
- msgid "&Quick File Upload"
-@@ -12674,7 +12674,7 @@
- 
- #: treeviews/projecttreeview.cpp:150
- msgid "&Upload Folder..."
--msgstr "上傳資料夾(&U)..."
-+msgstr "上傳資料夾(&U)…"
- 
- #: treeviews/projecttreeview.cpp:151
- msgid "&Quick Folder Upload"
-@@ -12686,7 +12686,7 @@
- 
- #: project/projectprivate.cpp:137 treeviews/projecttreeview.cpp:164
- msgid "&Upload Project..."
--msgstr "上傳專案(&U)..."
-+msgstr "上傳專案(&U)…"
- 
- #: treeviews/projecttreeview.cpp:165
- msgid "Re&scan Project Folder..."
-@@ -12729,15 +12729,15 @@
- 
- #: utility/tagactionset.cpp:284 utility/tagactionset.cpp:301
- msgid "Table..."
--msgstr "表格..."
-+msgstr "表格…"
- 
- #: utility/tagactionset.cpp:285
- msgid "Insert..."
--msgstr "插入..."
-+msgstr "插入…"
- 
- #: utility/tagactionset.cpp:286
- msgid "Remove..."
--msgstr "移除..."
-+msgstr "移除…"
- 
- #: utility/tagactionset.cpp:307
- msgid "Row Above"
-@@ -12889,11 +12889,11 @@
- 
- #: utility/quantabookmarks.cpp:222
- msgid "&Next: %1 - \"%2\""
--msgstr "下一個：%1 - \"%2\" (&N)"
-+msgstr "下一個：%1 - \"%2\"(&N)"
- 
- #: utility/quantabookmarks.cpp:229
- msgid "&Previous: %1 - \"%2\""
--msgstr "上一個：%1 - \"%2\" (&P)"
-+msgstr "上一個：%1 - \"%2\"(&P)"
- 
- #: utility/toolbartabwidget.cpp:45 utility/toolbartabwidget.cpp:188
- #: utility/toolbartabwidget.cpp:307
-@@ -12902,19 +12902,19 @@
- 
- #: utility/toolbartabwidget.cpp:46 utility/toolbartabwidget.cpp:309
- msgid "New Action..."
--msgstr "新的動作..."
-+msgstr "新的動作…"
- 
- #: utility/toolbartabwidget.cpp:48 utility/toolbartabwidget.cpp:326
- msgid "New Toolbar..."
--msgstr "新的工具列..."
-+msgstr "新的工具列…"
- 
- #: utility/toolbartabwidget.cpp:50 utility/toolbartabwidget.cpp:328
- msgid "Rename Toolbar..."
--msgstr "重新命名的工具列..."
-+msgstr "重新命名的工具列…"
- 
- #: utility/toolbartabwidget.cpp:51 utility/toolbartabwidget.cpp:331
- msgid "Configure Toolbars..."
--msgstr "設定工具列..."
-+msgstr "設定工具列…"
- 
- #: utility/toolbartabwidget.cpp:234
- msgid "Icons Only"
-@@ -13312,7 +13312,7 @@
- 
- #: plugins/quantaplugininterface.cpp:44
- msgid "Configure &Plugins..."
--msgstr "設定外掛程式(&P)..."
-+msgstr "設定外掛程式(&P)…"
- 
- #: plugins/quantaplugininterface.cpp:93
- msgid ""
-@@ -13401,11 +13401,11 @@
- 
- #: project/project.cpp:354
- msgid "Renaming files..."
--msgstr "正在重新命名檔案..."
-+msgstr "正在重新命名檔案…"
- 
- #: project/project.cpp:393
- msgid "Removing files..."
--msgstr "移除檔案中..."
-+msgstr "移除檔案中…"
- 
- #: project/project.cpp:430
- msgid ""
-@@ -13460,7 +13460,7 @@
- 
- #: project/project.cpp:865 project/project.cpp:880
- msgid "Upload project items..."
--msgstr "上傳專案項目 ..."
-+msgstr "上傳專案項目…"
- 
- #: project/project.cpp:896
- msgid "New Files in Project's Folder"
-@@ -13494,11 +13494,11 @@
- 
- #: project/projectupload.cpp:170
- msgid "Scanning project files..."
--msgstr "掃描專案檔案 ..."
-+msgstr "掃描專案檔案…"
- 
- #: project/projectupload.cpp:230
- msgid "Building the tree..."
--msgstr "正在建立樹狀..."
-+msgstr "正在建立樹狀…"
- 
- #: project/projectupload.cpp:361
- msgid "Confirm Upload"
-@@ -13618,11 +13618,11 @@
- 
- #: project/projectprivate.cpp:85
- msgid "&New Project..."
--msgstr "新的專案(&N)..."
-+msgstr "新的專案(&N)…"
- 
- #: project/projectprivate.cpp:89
- msgid "&Open Project..."
--msgstr "開啟專案(&O)..."
-+msgstr "開啟專案(&O)…"
- 
- #: project/projectprivate.cpp:95
- msgid "Open Recent Project"
-@@ -13634,11 +13634,11 @@
- 
- #: project/projectprivate.cpp:100
- msgid "&Close Project"
--msgstr "關閉專案(&C)..."
-+msgstr "關閉專案(&C)…"
- 
- #: project/projectprivate.cpp:105
- msgid "Open Project &View..."
--msgstr "開啟專案檢視(&V)..."
-+msgstr "開啟專案檢視(&V)…"
- 
- #: project/projectprivate.cpp:109
- msgid "Open project view"
-@@ -13650,7 +13650,7 @@
- 
- #: project/projectprivate.cpp:114
- msgid "Save Project View &As..."
--msgstr "另存專案檢視為(&A)..."
-+msgstr "另存專案檢視為(&A)…"
- 
- #: project/projectprivate.cpp:117
- msgid "&Delete Project View"
-@@ -13662,15 +13662,15 @@
- 
- #: project/projectprivate.cpp:125
- msgid "&Insert Files..."
--msgstr "插入檔案(&I)..."
-+msgstr "插入檔案(&I)…"
- 
- #: project/projectprivate.cpp:129
- msgid "Inser&t Folder..."
--msgstr "插入目錄(&T)..."
-+msgstr "插入目錄(&T)…"
- 
- #: project/projectprivate.cpp:133
- msgid "&Rescan Project Folder..."
--msgstr "重新掃描專案目錄(&R)..."
-+msgstr "重新掃描專案目錄(&R)…"
- 
- #: project/projectprivate.cpp:141
- msgid "&Project Properties"
-@@ -13678,19 +13678,19 @@
- 
- #: project/projectprivate.cpp:146
- msgid "Save as Project Template..."
--msgstr "另存為專案範本..."
-+msgstr "另存為專案範本…"
- 
- #: project/projectprivate.cpp:151
- msgid "Save Selection to Project Template File..."
--msgstr "另存選擇項目至專案範本檔案..."
-+msgstr "另存選擇項目至專案範本檔案…"
- 
- #: project/projectprivate.cpp:302
- msgid "Adding files to the project..."
--msgstr "正在加入檔案到專案..."
-+msgstr "正在加入檔案到專案…"
- 
- #: project/projectprivate.cpp:374
- msgid "Reading the project file..."
--msgstr "正在讀取專案檔案..."
-+msgstr "正在讀取專案檔案…"
- 
- #: project/projectprivate.cpp:384
- msgid "Invalid project file."
-@@ -13720,11 +13720,11 @@
- 
- #: project/projectprivate.cpp:1138
- msgid "<b>General Project Settings</b>"
--msgstr "<b>一般專案設定...</b>"
-+msgstr "<b>一般專案設定…</b>"
- 
- #: project/projectprivate.cpp:1140
- msgid "<b>More Project Settings</b>"
--msgstr "<b>更多的專案設定...</b>"
-+msgstr "<b>更多的專案設定…</b>"
- 
- #: project/projectprivate.cpp:1218
- msgid ""
-@@ -13938,7 +13938,7 @@
- #: ../lib/compatibility/kmdi/qextmdi/kmdiguiclient.cpp:144
- #: ../lib/compatibility/kmdi/qextmdi/kmdimainfrm.cpp:2600
- msgid "Ta&b Page Mode"
--msgstr "標籤頁模式 (&B)"
-+msgstr "標籤頁模式(&B)"
- 
- #: ../lib/compatibility/kmdi/qextmdi/kmdiguiclient.cpp:144
- #: ../lib/compatibility/kmdi/qextmdi/kmdimainfrm.cpp:2601
diff --git a/redhat/tde-i18n/kde-i18n-3.5.13.spec b/redhat/tde-i18n/kde-i18n-3.5.13.spec
deleted file mode 100644
index 635e08f94..000000000
--- a/redhat/tde-i18n/kde-i18n-3.5.13.spec
+++ /dev/null
@@ -1,1193 +0,0 @@
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?tde_prefix}" != "/usr"
-%define _variant .opt
-%endif
-
-# TDE 3.5.13 specific building variables
-BuildRequires: autoconf automake libtool m4
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-
-%define tde_tdedocdir %{tde_docdir}/kde
-
-# Builds all supported languages (not unsupported ones)
-%if "%{?KDE_LANGS}" == ""
-%define KDE_LANGS ar bg bn ca cs da de el en_GB es et fi fr he hi hu is it ja lt nl nb nn pa pl pt pt_BR ro ru sk sl sr sv ta tr uk zh_CN zh_TW
-%endif
-
-
-Name:		trinity-i18n
-Summary:	Internationalization support for Trinity
-Version:	3.5.13
-Release:	7%{?dist}%{?_variant}
-
-Vendor:		Trinity Project
-Packager:	Francois Andriot <francois.andriot@free.fr>
-URL:		http://www.trinitydesktop.org/
-
-Prefix:    %{tde_prefix}
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-# GFDL, with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts.
-License:	GFDL
-Group:		User Interface/Desktops
-BuildArch:	noarch
-
-# Speed build options
-%define debug_package %{nil}
-%define __spec_install_post %{nil}
-AutoReq: no
-
-Source0:	kde-i18n-%{version}.tar.gz
-
-# TDE 3.5.12: Translate 'kdesu' message was modified in 'kdebase' package
-Patch0:		kde-i18n-kdesu.patch
-
-# TDE 3.5.12: Translate 'Open Terminal Here' desktop shortcut
-Patch1:		trinity-kde-i18n-fr-openterminalhere.patch
-
-# TDE 3.5.13: French translations for new features
-Patch2:		kde-i18n-3.5.13-add_french_translations.patch
-
-# TDE 3.5.13: Updated translations for zh_TW, thanks to Wei-Lun Chao !
-Patch3:		kde-i18n-zh_TW-3.5.10.patch.gz
-
-BuildRequires:	findutils
-BuildRequires:	gettext
-BuildRequires:	trinity-arts-devel
-BuildRequires:	trinity-tdelibs-devel
-
-%description
-%{summary}.
-
-%package Afrikaans
-Summary: Afrikaans(af) language support for TDE
-Group: User Interface/Desktops
-Provides: %{name}-af = %{version}-%{release}
-#Requires: kde-filesystem
-%description Afrikaans
-%{summary}.
-
-%package Arabic 
-Summary: Arabic(ar) language support for TDE
-Group: User Interface/Desktops
-Provides: %{name}-ar = %{version}-%{release}
-#Requires: kde-filesystem
-%description Arabic
-%{summary}.
-
-%package Azerbaijani
-Summary: Azerbaijani(az) language support for TDE
-Group: User Interface/Desktops
-Provides: %{name}-az = %{version}-%{release}
-#Requires: kde-filesystem
-%description Azerbaijani
-%{summary}.
-
-%package Belarusian
-Summary: Belarusian(be) language support for TDE
-Group: User Interface/Desktops
-Provides: %{name}-be = %{version}-%{release}
-#Requires: kde-filesystem
-%description Belarusian
-%{summary}.
-
-%package Bulgarian
-Summary: Bulgarian(bg) language support for TDE
-Group: User Interface/Desktops
-Provides: %{name}-bg = %{version}-%{release}
-#Requires: kde-filesystem
-%description Bulgarian
-%{summary}.
-
-%package Bengali
-Summary: Bengali(bn) language support for TDE
-Group: User Interface/Desktops
-Provides: %{name}-bn = %{version}-%{release}
-#Requires: kde-filesystem
-%description Bengali
-%{summary}.
-
-%package Tibetan
-Summary: Tibetan(bo) language support for TDE
-Group: User Interface/Desktops
-Provides: %{name}-bo = %{version}-%{release}
-#Requires: kde-filesystem
-%description Tibetan
-%{summary}.
-
-%package Breton
-Summary: Breton(br) language support for TDE
-Group: User Interface/Desktops
-Provides: %{name}-br = %{version}-%{release}
-#Requires: kde-filesystem
-%description Breton
-%{summary}.
-
-%package Bosnian
-Summary: Bosnian(bs) language support for TDE
-Group: User Interface/Desktops
-Provides: %{name}-bs = %{version}-%{release}
-#Requires: kde-filesystem
-%description Bosnian
-%{summary}.
-
-%package Catalan
-Summary: Catalan(ca) language support for TDE
-Group: User Interface/Desktops
-Provides: %{name}-ca = %{version}-%{release}
-#Requires: kde-filesystem
-%description Catalan
-%{summary}.
-
-%package Czech
-Summary: Czech(cs) language support for TDE
-Group: User Interface/Desktops
-Provides: %{name}-cs = %{version}-%{release}
-#Requires: kde-filesystem
-%description Czech
-%{summary}.
-
-%package Cymraeg
-Summary: Cymraeg language support for TDE
-Group: User Interface/Desktops
-#Requires: kde-filesystem
-%description Cymraeg
-%{summary}.
-
-%package Welsh
-Summary: Welsh(cy) language support for TDE
-Group: User Interface/Desktops
-Provides: %{name}-cy = %{version}-%{release}
-#Requires: kde-filesystem
-%description Welsh
-%{summary}.
-
-%package Danish
-Summary: Danish(da) language support for TDE
-Group: User Interface/Desktops
-Provides: %{name}-da = %{version}-%{release}
-#Requires: kde-filesystem
-%description Danish
-%{summary}.
-
-%package German
-Summary: German(de) language support for TDE
-Group: User Interface/Desktops
-Provides: %{name}-de = %{version}-%{release}
-#Requires: kde-filesystem
-%description German
-%{summary}.
-
-%package Greek
-Summary: Greek(el) language support for TDE
-Group: User Interface/Desktops
-Provides: %{name}-el = %{version}-%{release}
-#Requires: kde-filesystem
-%description Greek
-%{summary}.
-
-%package British
-Summary: British(en_GB) English support for TDE
-Group: User Interface/Desktops
-Provides: %{name}-en_GB = %{version}-%{release}
-#Requires: kde-filesystem
-%description British
-%{summary}.
-
-%package Esperanto
-Summary: Esperanto(eo) support for TDE
-Group: User Interface/Desktops
-Provides: %{name}-eo = %{version}-%{release}
-#Requires: kde-filesystem
-%description Esperanto
-%{summary}.
-
-%package Spanish
-Summary: Spanish(es) language support for TDE
-Group: User Interface/Desktops
-Provides: %{name}-es = %{version}-%{release}
-#Requires: kde-filesystem
-%description Spanish
-%{summary}.
-
-%package Estonian
-Summary: Estonian(et) language support for TDE
-Group: User Interface/Desktops
-Provides: %{name}-et = %{version}-%{release}
-#Requires: kde-filesystem
-%description Estonian
-%{summary}.
-
-%package Basque
-Summary: Basque(eu) language support for TDE
-Group: User Interface/Desktops
-Provides: %{name}-eu = %{version}-%{release}
-#Requires: kde-filesystem
-%description Basque
-%{summary}.
-
-%package Farsi
-Summary: Farsi(fa) language support for TDE
-Group: User Interface/Desktops
-Provides: %{name}-fa = %{version}-%{release}
-#Requires: kde-filesystem
-%description Farsi
-%{summary}.
-
-%package Finnish
-Summary: Finnish(fi) language support for TDE
-Group: User Interface/Desktops
-Provides: %{name}-fi = %{version}-%{release}
-#Requires: kde-filesystem
-%description Finnish
-%{summary}.
-
-%package Faroese
-Summary: Faroese(fo) language support for TDE
-Group: User Interface/Desktops
-Provides: %{name}-fo = %{version}-%{release}
-#Requires: kde-filesystem
-%description Faroese
-%{summary}.
-
-%package French
-Summary: French(fr) language support for TDE
-Group: User Interface/Desktops
-Provides: %{name}-fr = %{version}-%{release}
-#Requires: kde-filesystem
-%description French
-%{summary}.
-
-%package Frisian
-Summary: Frisian(fy) language support for TDE
-Group: User Interface/Desktops
-Provides: %{name}-fy = %{version}-%{release}
-#Requires: kde-filesystem
-%description Frisian
-%{summary}.
-
-%package Irish
-Summary: Irish(ga) language support for TDE
-Group: User Interface/Desktops
-Obsoletes: kde-i18n-Gaeilge < %{version}
-Provides: %{name}-ga = %{version}-%{release}
-#Requires: kde-filesystem
-%description Irish
-%{summary}.
-
-%package Galician
-Summary: Galician(gl) language support for TDE
-Group: User Interface/Desktops
-Provides: %{name}-gl = %{version}-%{release}
-#Requires: kde-filesystem
-%description Galician
-%{summary}.
-
-%package Hebrew
-Summary: Hebrew(he) language support for TDE
-Group: User Interface/Desktops
-Provides: %{name}-he = %{version}-%{release}
-#Requires: kde-filesystem
-%description Hebrew
-%{summary}.
-
-%package Hindi
-Summary: Hindi(hi) language support for TDE
-Group: User Interface/Desktops
-Provides: %{name}-hi = %{version}-%{release}
-#Requires: kde-filesystem
-%description Hindi
-%{summary}.
-
-%package Croatian
-Summary: Croatian(hr) language support for TDE
-Group: User Interface/Desktops
-Provides: %{name}-hr = %{version}-%{release}
-#Requires: kde-filesystem
-%description Croatian
-%{summary}.
-
-%package Hungarian
-Summary: Hungarian(hu) language support for TDE
-Group: User Interface/Desktops
-Provides: %{name}-hu = %{version}-%{release}
-#Requires: kde-filesystem
-%description Hungarian
-%{summary}.
-
-%package Indonesian
-Summary: Indonesian(id) language support for TDE
-Group: User Interface/Desktops
-Provides: %{name}-id = %{version}-%{release}
-#Requires: kde-filesystem
-%description Indonesian
-%{summary}.
-
-%package Icelandic
-Summary: Icelandic(is) language support for TDE
-Group: User Interface/Desktops
-Provides: %{name}-is = %{version}-%{release}
-#Requires: kde-filesystem
-%description Icelandic
-%{summary}.
-
-%package Italian
-Summary: Italian(it) language support for TDE
-Group: User Interface/Desktops
-Provides: %{name}-it = %{version}-%{release}
-#Requires: kde-filesystem
-%description Italian
-%{summary}.
-
-%package Japanese
-Summary: Japanese(ja) language support for TDE
-Group: User Interface/Desktops
-Provides: %{name}-ja = %{version}-%{release}
-#Requires: kde-filesystem
-%description Japanese
-%{summary}.
-
-%package Korean
-Summary: Korean(ko) language support for TDE
-Group: User Interface/Desktops
-Provides: %{name}-ko = %{version}-%{release}
-#Requires: kde-filesystem
-%description Korean
-%{summary}.
-
-%package Kurdish
-Summary: Kurdish(ku) language support for TDE
-Group: User Interface/Desktops
-Provides: %{name}-ku = %{version}-%{release}
-#Requires: kde-filesystem
-%description Kurdish
-%{summary}.
-
-%package Lao
-Summary: Lao(lo) language support for TDE
-Group: User Interface/Desktops
-Provides: %{name}-lo = %{version}-%{release}
-#Requires: kde-filesystem
-%description Lao
-%{summary}.
-
-%package Lithuanian
-Summary: Lithuanian(lt) language support for TDE
-Group: User Interface/Desktops
-Provides: %{name}-lt = %{version}-%{release}
-#Requires: kde-filesystem
-%description Lithuanian
-%{summary}.
-
-%package Latvian
-Summary: Latvian(lv) language support for TDE
-Group: User Interface/Desktops
-Provides: %{name}-lv = %{version}-%{release}
-#Requires: kde-filesystem
-%description Latvian
-%{summary}.
-
-%package Maori
-Summary: Maori(mi) language support for TDE
-Group: User Interface/Desktops
-Provides: %{name}-mi = %{version}-%{release}
-#Requires: kde-filesystem
-%description Maori
-%{summary}.
-
-%package Macedonian
-Summary: Macedonian(mk) language support for TDE
-Group: User Interface/Desktops
-Provides: %{name}-mk = %{version}-%{release}
-#Requires: kde-filesystem
-%description Macedonian
-%{summary}.
-
-%package Maltese
-Summary: Maltese(mt) language support for TDE
-Group: User Interface/Desktops
-Provides: %{name}-mt = %{version}-%{release}
-#Requires: kde-filesystem
-%description Maltese
-%{summary}.
-
-%package Dutch
-Summary: Dutch(nl) language support for TDE
-Group: User Interface/Desktops
-Provides: %{name}-nl = %{version}-%{release}
-#Requires: kde-filesystem
-%description Dutch
-%{summary}.
-
-%package Norwegian
-Summary: Norwegian(no) (Bokmaal) language support for TDE
-Group: User Interface/Desktops
-Provides: %{name}-no = %{version}-%{release}
-#Requires: kde-filesystem
-%description Norwegian
-%{summary}.
-
-%package Norwegian-Nynorsk
-Summary: Norwegian(nn) (Nynorsk) language support for TDE
-Group: User Interface/Desktops
-Provides: %{name}-nn = %{version}-%{release}
-#Requires: kde-filesystem
-%description Norwegian-Nynorsk
-%{summary}.
-
-%package Occitan
-Summary: Occitan(oc) language support for TDE
-Group: User Interface/Desktops
-Provides: %{name}-oc = %{version}-%{release}
-#Requires: kde-filesystem
-%description Occitan
-%{summary}.
-
-%package Polish
-Summary: Polish(pl) language support for TDE
-Group: User Interface/Desktops
-Provides: %{name}-pl = %{version}-%{release}
-#Requires: kde-filesystem
-%description Polish
-%{summary}.
-
-%package Portuguese
-Summary: Portuguese(pt) language support for TDE
-Group: User Interface/Desktops
-Provides: %{name}-pt = %{version}-%{release}
-#Requires: kde-filesystem
-%description Portuguese
-%{summary}.
-
-%package Punjabi
-Summary: Punjabi(pa) language support for TDE
-Group: User Interface/Desktops
-Provides: %{name}-pa = %{version}-%{release}
-#Requires: kde-filesystem
-%description Punjabi
-%{summary}.
-
-%package Brazil
-Summary: Brazil(pt_BR) Portuguese language support for TDE
-Group: User Interface/Desktops
-Provides: %{name}-pt_BR = %{version}-%{release}
-#Requires: kde-filesystem
-%description Brazil
-%{summary}.
-
-%package Romanian
-Summary: Romanian(ro) language support for TDE
-Group: User Interface/Desktops
-Provides: %{name}-ro = %{version}-%{release}
-#Requires: kde-filesystem
-%description Romanian
-%{summary}.
-
-%package Russian
-Summary: Russian(ru) language support for TDE
-Group: User Interface/Desktops
-Provides: %{name}-ru = %{version}-%{release}
-#Requires: kde-filesystem
-%description Russian
-%{summary}.
-
-%package Slovak
-Summary: Slovak(sk) language support for TDE
-Group: User Interface/Desktops
-Provides: %{name}-sk = %{version}-%{release}
-#Requires: kde-filesystem
-%description Slovak
-%{summary}.
-
-%package Slovenian
-Summary: Slovenian(sl) language support for TDE
-Group: User Interface/Desktops
-Provides: %{name}-sl = %{version}-%{release}
-#Requires: kde-filesystem
-%description Slovenian
-%{summary}.
-
-%package Serbian
-Summary: Serbian(sr) language support for TDE
-Group: User Interface/Desktops
-Provides: %{name}-sr = %{version}-%{release}
-#Requires: kde-filesystem
-%description Serbian
-%{summary}.
-
-%package Swedish
-Summary: Swedish(sv) language support for TDE
-Group: User Interface/Desktops
-Provides: %{name}-sv = %{version}-%{release}
-#Requires: kde-filesystem
-%description Swedish
-%{summary}.
-
-%package Tamil
-Summary: Tamil(ta) language support for TDE
-Group: User Interface/Desktops
-Provides: %{name}-ta = %{version}-%{release}
-#Requires: kde-filesystem
-%description Tamil
-%{summary}.
-
-%package Tajik
-Summary: Tajik(tg) language support for TDE
-Group: User Interface/Desktops
-Provides: %{name}-tg = %{version}-%{release}
-#Requires: kde-filesystem
-%description Tajik
-%{summary}.
-
-%package Thai
-Summary: Thai(th) language support for TDE
-Group: User Interface/Desktops
-Provides: %{name}-th = %{version}-%{release}
-#Requires: kde-filesystem
-%description Thai
-%{summary}.
-
-%package Turkish
-Summary: Turkish(tr) language support for TDE
-Group: User Interface/Desktops
-Provides: %{name}-tr = %{version}-%{release}
-#Requires: kde-filesystem
-%description Turkish
-%{summary}.
-
-%package Ukrainian
-Summary: Ukrainian(uk) language support for TDE
-Group: User Interface/Desktops
-Provides: %{name}-uk = %{version}-%{release}
-#Requires: kde-filesystem
-%description Ukrainian
-%{summary}.
-
-%package Venda
-Summary: Venda(ven) language support for TDE
-Group: User Interface/Desktops
-Provides: %{name}-ven = %{version}-%{release}
-#Requires: kde-filesystem
-%description Venda
-%{summary}.
-
-%package Vietnamese
-Summary: Vietnamese(vi) language support for TDE
-Group: User Interface/Desktops
-Provides: %{name}-vi = %{version}-%{release}
-#Requires: kde-filesystem
-%description Vietnamese
-%{summary}.
-
-%package Walloon
-Summary: Walloon(wa) language support for TDE
-Group: User Interface/Desktops
-Provides: %{name}-wa = %{version}-%{release}
-#Requires: kde-filesystem
-%description Walloon
-%{summary}.
-
-%package Xhosa
-Summary: Xhosa(xh) (a Bantu language) support for TDE
-Group: User Interface/Desktops
-Provides: %{name}-xh = %{version}-%{release}
-#Requires: kde-filesystem
-%description Xhosa
-%{summary}.
-
-%package Chinese
-Summary: Chinese(zh_CN) (Simplified Chinese) language support for TDE
-Group: User Interface/Desktops
-Provides: %{name}-zh_CN = %{version}-%{release}
-#Requires: kde-filesystem
-%description Chinese
-%{summary}.
-
-%package Chinese-Big5
-Summary: Chinese(zh_TW) (Big5) language support for TDE
-Group: User Interface/Desktops
-Provides: %{name}-tz_TW = %{version}-%{release}
-Provides: trinity-kde-i18n-Chinese-Big5 = %{version}-%{release}
-Obsoletes: trinity-kde-i18n-Chinese-Big5 < %{version}-%{release}
-%description Chinese-Big5
-%{summary}.
-
-
-
-%prep
-%setup -q -n kde-i18n
-
-for l in %{KDE_LANGS}; do
-  for f in kde-i18n-${l}-*.tar.bz2; do
-    tar xjf "${f}"
-  done
-done
-
-# Patches for French translations
-%if "%( grep -w fr <<< '%{KDE_LANGS}' )" != ""
-%patch0
-%patch1
-%patch2 -p0
-%endif
-
-# Patches for Chinese (zh_TW) translations
-%patch3 -p0
-
-
-%build
-unset QTDIR; . /etc/profile.d/qt.sh
-export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
-
-export kde_htmldir="%{tde_tdedocdir}/HTML"
-
-for l in %{KDE_LANGS}; do
-  for f in kde-i18n-${l}-*/; do
-    if [ -d "${f}" ] && [ -x "${f}/configure" ] ; then 
-      pushd ${f}
-      %configure --prefix=%{tde_prefix} --datadir=%{tde_datadir} --docdir=%{tde_docdir}
-      %__make %{?_smp_mflags}
-      popd
-    fi
-  done
-done
-
-%install
-%__rm -rf %{?buildroot}
-export PATH="%{tde_bindir}:${PATH}"
-
-for l in %{KDE_LANGS}; do
-  for f in kde-i18n-${l}-*/; do
-    if [ -d "${f}" ] && [ -r "${f}/Makefile" ] ; then 
-      %__make install DESTDIR="%{?buildroot}" -C "${f}"
-    fi
-  done
-done
-
-# make symlinks relative
-%if "%{tde_prefix}" == "/usr"
-pushd "%{buildroot}%{tde_tdedocdir}/HTML"
-for lang in *; do
-  if [ -d "$lang" ]; then
-    pushd "$lang"
-    for i in */*/*; do
-      if [ -d $i -a -L $i/common ]; then
-        rm -f $i/common
-        ln -sf ../../../docs/common $i
-      fi
-    done
-
-    for i in */*; do
-      if [ -d $i -a -L $i/common ]; then
-        rm -f $i/common
-        ln -sf ../../docs/common $i
-      fi
-    done
-
-    for i in *; do
-      if [ -d $i -a -L $i/common ]; then
-        rm -f $i/common
-        ln -sf ../docs/common $i
-      fi
-    done
-
-    popd
-  fi
-done
-popd   
-%endif
-
-# remove zero-length file
-find "%{buildroot}%{tde_tdedocdir}/HTML" -size 0 -exec rm -f {} \;
-
-# See http://fedoraproject.org/wiki/Languages (???)
-%__rm -f %{buildroot}%{tde_datadir}/locale/*/flag.png
-
-# Removes conflict with KDE4
-%if "%{?tde_prefix}" == "/usr"
-%__rm -f %{buildroot}%{tde_datadir}/locale/*/entry.desktop
-%endif
-
-# remove obsolete KDE 3 application data translations
-%__rm -rf "%{buildroot}%{tde_datadir}/apps"
-
-%clean
-%__rm -rf %{buildroot}
-
-%if "%( grep -w af <<< '%{KDE_LANGS}' )" != ""
-%files Afrikaans
-%defattr(-,root,root,-)
-%lang(af) %{tde_datadir}/locale/af/*
-%lang(af) %{tde_tdedocdir}/HTML/af/
-%endif
-
-%if "%( grep -w ar <<< '%{KDE_LANGS}' )" != ""
-%files Arabic 
-%defattr(-,root,root,-)
-%lang(ar) %{tde_datadir}/locale/ar/*
-%endif
-
-%if "%( grep -w az <<< '%{KDE_LANGS}' )" != ""
-%files Azerbaijani
-%defattr(-,root,root,-)
-%lang(az) %{tde_datadir}/locale/az/*
-%endif
-
-%if "%( grep -w be <<< '%{KDE_LANGS}' )" != ""
-%files Belarusian
-%defattr(-,root,root,-)
-%lang(be) %{tde_datadir}/locale/be/*
-%endif
-
-%if "%( grep -w bg <<< '%{KDE_LANGS}' )" != ""
-%files Bulgarian
-%defattr(-,root,root,-)
-%lang(bg) %{tde_datadir}/locale/bg/*
-%endif
-
-%if "%( grep -w bn <<< '%{KDE_LANGS}' )" != ""
-%files Bengali
-%defattr(-,root,root,-)
-%lang(bn) %{tde_datadir}/locale/bn/*
-%endif
-
-%if "%( grep -w bo <<< '%{KDE_LANGS}' )" != ""
-%files Tibetan
-%defattr(-,root,root,-)
-%lang(bo) %{tde_datadir}/locale/bo/*
-%endif
-
-%if "%( grep -w br <<< '%{KDE_LANGS}' )" != ""
-%files Breton
-%defattr(-,root,root,-)
-%lang(br) %{tde_datadir}/locale/br/*
-%endif
-
-%if "%( grep -w bs <<< '%{KDE_LANGS}' )" != ""
-%files Bosnian
-%defattr(-,root,root,-)
-%lang(bs) %{tde_datadir}/locale/bs/*
-%endif
-
-%if "%( grep -w ca <<< '%{KDE_LANGS}' )" != ""
-%files Catalan
-%defattr(-,root,root,-)
-%lang(ca) %{tde_datadir}/locale/ca/*
-%lang(ca) %{tde_tdedocdir}/HTML/ca/
-%endif
-
-%if "%( grep -w cs <<< '%{KDE_LANGS}' )" != ""
-%files Czech
-%defattr(-,root,root,-)
-%lang(cs) %{tde_datadir}/locale/cs/*
-%lang(cs) %{tde_tdedocdir}/HTML/cs/
-%endif
-
-%if "%( grep -w cy <<< '%{KDE_LANGS}' )" != ""
-%files Welsh
-%defattr(-,root,root,-)
-%lang(cy) %{tde_datadir}/locale/cy/*
-%endif
-
-%if "%( grep -w da <<< '%{KDE_LANGS}' )" != ""
-%files Danish
-%defattr(-,root,root,-)
-%lang(da) %{tde_datadir}/locale/da/*
-%lang(da) %{tde_tdedocdir}/HTML/da/
-%endif
-
-%if "%( grep -w de <<< '%{KDE_LANGS}' )" != ""
-%files German
-%defattr(-,root,root,-)
-%lang(de) %{tde_datadir}/locale/de/*
-%lang(de) %{tde_tdedocdir}/HTML/de/
-%endif
-
-%if "%( grep -w el <<< '%{KDE_LANGS}' )" != ""
-%files Greek
-%defattr(-,root,root,-)
-%lang(el) %{tde_datadir}/locale/el/*
-%endif
-
-%if "%( grep -w en_GB <<< '%{KDE_LANGS}' )" != ""
-%files British
-%defattr(-,root,root,-)
-%lang(en_GB) %{tde_datadir}/locale/en_GB/*
-%lang(en_GB) %{tde_tdedocdir}/HTML/en_GB/
-%endif
-
-%if "%( grep -w eo <<< '%{KDE_LANGS}' )" != ""
-%files Esperanto
-%defattr(-,root,root,-)
-%lang(eo) %{tde_datadir}/locale/eo/*
-%endif
-
-%if "%( grep -w es <<< '%{KDE_LANGS}' )" != ""
-%files Spanish
-%defattr(-,root,root,-)
-%lang(es) %{tde_datadir}/locale/es/*
-%lang(es) %{tde_tdedocdir}/HTML/es/
-%endif
-
-%if "%( grep -w et <<< '%{KDE_LANGS}' )" != ""
-%files Estonian
-%defattr(-,root,root,-)
-%lang(et) %{tde_datadir}/locale/et/*
-%lang(et) %{tde_tdedocdir}/HTML/et/
-%endif
-
-%if "%( grep -w eu <<< '%{KDE_LANGS}' )" != ""
-%files Basque
-%defattr(-,root,root,-)
-%lang(eu) %{tde_datadir}/locale/eu/*
-%endif
-
-%if "%( grep -w fa <<< '%{KDE_LANGS}' )" != ""
-%files Farsi
-%defattr(-,root,root,-)
-%lang(fa) %{tde_datadir}/locale/fa/*
-%endif
-
-%if "%( grep -w fi <<< '%{KDE_LANGS}' )" != ""
-%files Finnish
-%defattr(-,root,root,-)
-%lang(fi) %{tde_datadir}/locale/fi/*
-%lang(fi) %{tde_tdedocdir}/HTML/fi/
-%endif
-
-%if "%( grep -w fo <<< '%{KDE_LANGS}' )" != ""
-%files Faroese
-%defattr(-,root,root,-)
-%lang(fo) %{tde_datadir}/locale/fo/*
-%endif
-
-%if "%( grep -w fr <<< '%{KDE_LANGS}' )" != ""
-%files French
-%defattr(-,root,root,-)
-%lang(fr) %{tde_datadir}/locale/fr/*
-%lang(fr) %{tde_tdedocdir}/HTML/fr/
-%endif
-
-%if "%( grep -w fy <<< '%{KDE_LANGS}' )" != ""
-%files Frisian
-%defattr(-,root,root,-)
-%lang(fy) %{tde_datadir}/locale/fy/*
-%endif
-
-%if "%( grep -w ga <<< '%{KDE_LANGS}' )" != ""
-%files Irish
-%defattr(-,root,root,-)
-%lang(ga) %{tde_datadir}/locale/ga/*
-%endif
-
-%if "%( grep -w gl <<< '%{KDE_LANGS}' )" != ""
-%files Galician
-%defattr(-,root,root,-)
-%lang(gl) %{tde_datadir}/locale/gl/*
-%endif
-
-%if "%( grep -w he <<< '%{KDE_LANGS}' )" != ""
-%files Hebrew
-%defattr(-,root,root,-)
-%lang(he) %{tde_datadir}/locale/he/*
-%lang(he) %{tde_tdedocdir}/HTML/he/
-%endif
-
-%if "%( grep -w hi <<< '%{KDE_LANGS}' )" != ""
-%files Hindi
-%defattr(-,root,root,-)
-%lang(hi) %{tde_datadir}/locale/hi/*
-%endif
-
-%if "%( grep -w hr <<< '%{KDE_LANGS}' )" != ""
-%files Croatian
-%defattr(-,root,root,-)
-%lang(hr) %{tde_datadir}/locale/hr/*
-%lang(hr) %{tde_tdedocdir}/HTML/hr/
-%endif
-
-%if "%( grep -w hu <<< '%{KDE_LANGS}' )" != ""
-%files Hungarian
-%defattr(-,root,root,-)
-%lang(hu) %{tde_datadir}/locale/hu/*
-%lang(hu) %{tde_tdedocdir}/HTML/hu/
-%endif
-
-%if "%( grep -w id <<< '%{KDE_LANGS}' )" != ""
-%files Indonesian
-%defattr(-,root,root,-)
-%lang(id) %{tde_datadir}/locale/id/*
-%lang(id) %{tde_tdedocdir}/HTML/id/
-%endif
-
-%if "%( grep -w is <<< '%{KDE_LANGS}' )" != ""
-%files Icelandic
-%defattr(-,root,root,-)
-%lang(is) %{tde_datadir}/locale/is/*
-%endif
-
-%if "%( grep -w it <<< '%{KDE_LANGS}' )" != ""
-%files Italian
-%defattr(-,root,root,-)
-%lang(it) %{tde_datadir}/locale/it/*
-%lang(it) %{tde_tdedocdir}/HTML/it/
-%endif
-
-%if "%( grep -w ja <<< '%{KDE_LANGS}' )" != ""
-%files Japanese
-%defattr(-,root,root,-)
-%lang(ja) %{tde_datadir}/locale/ja/*
-%lang(ja) %{tde_tdedocdir}/HTML/ja/
-%endif
-
-%if "%( grep -w ko <<< '%{KDE_LANGS}' )" != ""
-%files Korean
-%defattr(-,root,root,-)
-%lang(ko) %{tde_datadir}/locale/ko/*
-%lang(ko) %{tde_tdedocdir}/HTML/ko/
-%endif
-
-%if "%( grep -w ku <<< '%{KDE_LANGS}' )" != ""
-%files Kurdish
-%defattr(-,root,root,-)
-%lang(ku) %{tde_datadir}/locale/ku/*
-%lang(ku) %{tde_tdedocdir}/HTML/ku/
-%endif
-
-%if "%( grep -w lao <<< '%{KDE_LANGS}' )" != ""
-%files Lao
-%defattr(-,root,root,-)
-%lang(lo) %{tde_datadir}/locale/lo/*
-%lang(lo) %{tde_tdedocdir}/HTML/lo/
-%endif
-
-%if "%( grep -w lt <<< '%{KDE_LANGS}' )" != ""
-%files Lithuanian
-%defattr(-,root,root,-)
-%lang(lt) %{tde_datadir}/locale/lt/*
-%endif
-
-%if "%( grep -w lv <<< '%{KDE_LANGS}' )" != ""
-%files Latvian
-%defattr(-,root,root,-)
-%lang(lv) %{tde_datadir}/locale/lv/*
-%endif
-
-%if "%( grep -w mi <<< '%{KDE_LANGS}' )" != ""
-%files Maori
-%defattr(-,root,root,-)
-%lang(mi) %{tde_datadir}/locale/mi/*
-%endif
-
-%if "%( grep -w mk <<< '%{KDE_LANGS}' )" != ""
-%files Macedonian
-%defattr(-,root,root,-)
-%lang(mk) %{tde_datadir}/locale/mk/*
-%endif
-
-%if "%( grep -w mt <<< '%{KDE_LANGS}' )" != ""
-%files Maltese
-%defattr(-,root,root,-)
-%lang(mt) %{tde_datadir}/locale/mt/*
-%endif
-
-%if "%( grep -w nl <<< '%{KDE_LANGS}' )" != ""
-%files Dutch
-%defattr(-,root,root,-)
-%lang(nl) %{tde_datadir}/locale/nl/*
-%lang(nl) %{tde_tdedocdir}/HTML/nl/
-%endif
-
-%if "%( grep -w nb <<< '%{KDE_LANGS}' )" != ""
-%files Norwegian
-%defattr(-,root,root,-)
-%lang(nb) %{tde_datadir}/locale/nb/*
-#%lang(nb) %{tde_tdedocdir}/HTML/nb/
-%endif
-
-%if "%( grep -w nn <<< '%{KDE_LANGS}' )" != ""
-%files Norwegian-Nynorsk
-%defattr(-,root,root,-)
-%lang(nn) %{tde_datadir}/locale/nn/*
-#%lang(nn) %{tde_tdedocdir}/HTML/nn/
-%endif
-
-%if "%( grep -w oc <<< '%{KDE_LANGS}' )" != ""
-%files Occitan
-%defattr(-,root,root,-)
-%lang(oc) %{tde_datadir}/locale/oc/*
-%endif
-
-%if "%( grep -w pa <<< '%{KDE_LANGS}' )" != ""
-%files Punjabi
-%defattr(-,root,root,-)
-%lang(pa) %{tde_datadir}/locale/pa/*
-%endif
-
-%if "%( grep -w pl <<< '%{KDE_LANGS}' )" != ""
-%files Polish
-%defattr(-,root,root,-)
-%lang(pl) %{tde_datadir}/locale/pl/*
-%lang(pl) %{tde_tdedocdir}/HTML/pl/
-%endif
-
-%if "%( grep -w pt <<< '%{KDE_LANGS}' )" != ""
-%files Portuguese
-%defattr(-,root,root,-)
-%lang(pt) %{tde_datadir}/locale/pt/*
-%lang(pt) %{tde_tdedocdir}/HTML/pt/
-%endif
-
-%if "%( grep -w pt_BR <<< '%{KDE_LANGS}' )" != ""
-%files Brazil
-%defattr(-,root,root,-)
-%lang(pt_BR) %{tde_datadir}/locale/pt_BR/*
-%lang(pt_BR) %{tde_tdedocdir}/HTML/pt_BR/
-%endif
-
-%if "%( grep -w ro <<< '%{KDE_LANGS}' )" != ""
-%files Romanian
-%defattr(-,root,root,-)
-%lang(ro) %{tde_datadir}/locale/ro/*
-%lang(ro) %{tde_tdedocdir}/HTML/ro/
-%endif
-
-%if "%( grep -w ru <<< '%{KDE_LANGS}' )" != ""
-%files Russian
-%defattr(-,root,root,-)
-%lang(ru) %{tde_datadir}/locale/ru/*
-%lang(ru) %{tde_tdedocdir}/HTML/ru/
-%endif
-
-%if "%( grep -w sk <<< '%{KDE_LANGS}' )" != ""
-%files Slovak
-%defattr(-,root,root,-)
-%lang(sk) %{tde_datadir}/locale/sk/*
-%lang(sk) %{tde_tdedocdir}/HTML/sk/
-%endif
-
-%if "%( grep -w sl <<< '%{KDE_LANGS}' )" != ""
-%files Slovenian
-%defattr(-,root,root,-)
-%lang(sl) %{tde_datadir}/locale/sl/*
-%lang(sl) %{tde_tdedocdir}/HTML/sl/
-%endif
-
-%if "%( grep -w sr <<< '%{KDE_LANGS}' )" != ""
-%files Serbian
-%defattr(-,root,root,-)
-%lang(sr) %{tde_datadir}/locale/sr/*
-%lang(sr) %{tde_tdedocdir}/HTML/sr/
-%endif
-
-%if "%( grep -w sv <<< '%{KDE_LANGS}' )" != ""
-%files Swedish
-%defattr(-,root,root,-)
-%lang(sv) %{tde_datadir}/locale/sv/*
-%lang(sv) %{tde_tdedocdir}/HTML/sv/
-%endif
-
-%if "%( grep -w ta <<< '%{KDE_LANGS}' )" != ""
-%files Tamil
-%defattr(-,root,root,-)
-%lang(ta) %{tde_datadir}/locale/ta/*
-%endif
-
-%if "%( grep -w tg <<< '%{KDE_LANGS}' )" != ""
-%files Tajik
-%defattr(-,root,root,-)
-%lang(tg) %{tde_datadir}/locale/tg/*
-%endif
-
-%if "%( grep -w th <<< '%{KDE_LANGS}' )" != ""
-%files Thai
-%defattr(-,root,root,-)
-%lang(th) %{tde_datadir}/locale/th/*
-%endif
-
-%if "%( grep -w tr <<< '%{KDE_LANGS}' )" != ""
-%files Turkish
-%defattr(-,root,root,-)
-%lang(tr) %{tde_datadir}/locale/tr/*
-%lang(tr) %{tde_tdedocdir}/HTML/tr/
-%endif
-
-%if "%( grep -w uk <<< '%{KDE_LANGS}' )" != ""
-%files Ukrainian
-%defattr(-,root,root,-)
-%lang(uk) %{tde_tdedocdir}/HTML/uk/
-%lang(uk) %{tde_datadir}/locale/uk/*
-%endif
-
-%if "%( grep -w ven <<< '%{KDE_LANGS}' )" != ""
-%files Venda
-%defattr(-,root,root,-)
-%lang(ven) %{tde_datadir}/locale/ven/*
-%endif
-
-%if "%( grep -w vi <<< '%{KDE_LANGS}' )" != ""
-%files Vietnamese
-%defattr(-,root,root,-)
-%lang(vi) %{tde_datadir}/locale/vi/*
-%endif
-
-%if "%( grep -w wa <<< '%{KDE_LANGS}' )" != ""
-%files Walloon
-%defattr(-,root,root,-)
-%lang(wa) %{tde_datadir}/locale/wa/*
-%endif
-
-%if "%( grep -w xh <<< '%{KDE_LANGS}' )" != ""
-%files Xhosa
-%defattr(-,root,root,-)
-%lang(xh) %{tde_datadir}/locale/xh/*
-%lang(xh) %{tde_tdedocdir}/HTML/xh/
-%endif
-
-%if "%( grep -w zh_CN <<< '%{KDE_LANGS}' )" != ""
-%files Chinese
-%defattr(-,root,root,-)
-%lang(zh_CN) %{tde_datadir}/locale/zh_CN/*
-%lang(zh_CN) %{tde_tdedocdir}/HTML/zh_CN/
-%endif
-
-%if "%( grep -w zh_TW <<< '%{KDE_LANGS}' )" != ""
-%files Chinese-Big5
-%defattr(-,root,root,-)
-%lang(zh_TW) %{tde_datadir}/locale/zh_TW/*
-%lang(zh_TW) %{tde_tdedocdir}/HTML/zh_TW/
-%endif
-
-%changelog
-* Wed Aug 15 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13-7
-- Renames to 'trinity-i18n'
-- Updates 'zh_TW' translations
-
-* Sun Dec 18 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-6
-- Updates French translations (mostly Kickoff Menu related)
-
-* Sun Dec 04 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-5
-- Removes 'kde-filesystem" dependancy
-
-* Fri Nov 26 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-4
-- Fix HTML directory location
-
-* Fri Nov 11 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-3
-- Re-adds missing files 'entry.desktop'
-- Updates zh_TW translation, thanks to Wei-Lun Chao
-
-* Tue Nov 01 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-2
-- Add missing french translations for TDE 3.5.13
-
-* Sun Oct 30 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-1
-- Initial release for RHEL 6, RHEL 5 and Fedora 15
-
-* Sun Dec 19 2010 Francois Andriot <francois.andriot@free.fr> - 3.5.13-0
-- Initial version (French language only)
-- Based on RHEL SPEC file 'kde-i18n'
-- Add 'patch0' to reflect modifications in 'kdesu' from 'kdebase' package
-- Import to GIT
diff --git a/redhat/tde-i18n/tde-3.5.13.2-admin.patch b/redhat/tde-i18n/tde-3.5.13.2-admin.patch
deleted file mode 100644
index 4b27f5a90..000000000
--- a/redhat/tde-i18n/tde-3.5.13.2-admin.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-Index: b/admin/cvs.sh
-===================================================================
---- a/admin/cvs.sh	2013-05-22 17:34:41.870203477 +0200
-+++ b/admin/cvs.sh	2013-05-22 17:35:08.553206290 +0200
-@@ -68,7 +68,7 @@
-     echo "*** KDE requires automake $required_automake_version"
-     exit 1
-     ;;
--  automake*1.6.* | automake*1.7* | automake*1.8* | automake*1.9* | automake*1.10* | automake*1.11* | automake*1.12*)
-+  automake*1.6.* | automake*1.7* | automake*1.8* | automake*1.9* | automake*1.10* | automake*1.11* | automake*1.12* | automake*1.13* )
-     echo "*** $AUTOMAKE_STRING found."
-     UNSERMAKE=no
-     ;;
-@@ -128,7 +128,7 @@
- echo "*** Creating configure"
- call_and_fix_autoconf
- 
--if egrep "^AM_CONFIG_HEADER" configure.in >/dev/null 2>&1; then
-+if egrep "^A[MC]_CONFIG_HEADER" configure.in >/dev/null 2>&1; then
-   echo "*** Creating config.h template"
-   $AUTOHEADER || exit 1
-   touch config.h.in
-@@ -184,7 +184,7 @@
-   fi
- fi
- $ACLOCAL $ACLOCALFLAGS
--if egrep "^AM_CONFIG_HEADER" configure.in >/dev/null 2>&1; then
-+if egrep "^A[MC]_CONFIG_HEADER" configure.in >/dev/null 2>&1; then
-   echo "*** Creating config.h template"
-   $AUTOHEADER || exit 1
-   touch config.h.in
-Index: b/admin/configure.in.min
-===================================================================
---- a/admin/configure.in.min	2013-05-22 17:34:41.878202494 +0200
-+++ b/admin/configure.in.min	2013-05-22 17:34:43.385704000 +0200
-@@ -41,7 +41,7 @@
- KDE_SET_PREFIX
- 
- dnl generate the config header
--AM_CONFIG_HEADER(config.h) dnl at the distribution this done
-+AC_CONFIG_HEADER(config.h) dnl at the distribution this done
- 
- dnl Checks for programs.
- AC_PROG_CC
diff --git a/redhat/tde-i18n/tde-i18n-14.0.0-extra_translations.patch b/redhat/tde-i18n/tde-i18n-14.0.0-extra_translations.patch
deleted file mode 100644
index ca4c33788..000000000
--- a/redhat/tde-i18n/tde-i18n-14.0.0-extra_translations.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-diff -Nuar tde-i18n/tde-i18n-fr/messages/tdebase/kcmscreensaver.po.ori tde-i18n/tde-i18n-fr/messages/tdebase/kcmscreensaver.po
---- tde-i18n/tde-i18n-fr/messages/tdebase/kcmscreensaver.po.ori	2014-06-07 15:53:13.977782717 +0200
-+++ tde-i18n/tde-i18n-fr/messages/tdebase/kcmscreensaver.po	2014-06-07 16:44:38.180796311 +0200
-@@ -362,3 +362,9 @@
- 
- msgid "Hide all active windows from the screen saver and use the desktop background as the screen saver input."
- msgstr "Masquer toutes les fenêtres actives et afficher le fond d'écran lorsque l'économiseur d'écran est déclenché."
-+
-+msgid "&Vibrate unlock dialog box on failure"
-+msgstr "&Vibrer en cas d'échec de déverrouillage"
-+
-+msgid "Makes the unlock dialog box vibrate when entering an incorrect password."
-+msgstr "Faire vibrer la fenêtre de déverrouillage lorsqu'un mauvais mot de passe est saisi."
-diff -Nuar tde-i18n/tde-i18n-fr/messages/tdebase/kdesktop.po.ori tde-i18n/tde-i18n-fr/messages/tdebase/kdesktop.po
---- tde-i18n/tde-i18n-fr/messages/tdebase/kdesktop.po.ori	2014-06-07 15:49:50.020212889 +0200
-+++ tde-i18n/tde-i18n-fr/messages/tdebase/kdesktop.po	2014-06-07 16:44:58.546329306 +0200
-@@ -250,6 +250,10 @@
- msgid "Open Terminal Here..."
- msgstr "Ouvrir un Terminal..."
- 
-+#: krootwm.cc:135 (Trinity Specific)
-+msgid "Open Terminal..."
-+msgstr "Ouvrir un Terminal..."
-+
- #: krootwm.cc:137
- msgid "Configure Desktop..."
- msgstr "Configurer le bureau..."
diff --git a/redhat/tde-i18n/tde-i18n-14.0.0-updates.patch b/redhat/tde-i18n/tde-i18n-14.0.0-updates.patch
deleted file mode 100644
index 5565adc9c..000000000
--- a/redhat/tde-i18n/tde-i18n-14.0.0-updates.patch
+++ /dev/null
@@ -1,341 +0,0 @@
-diff --git a/tde-i18n-fr/messages/tdebase/kcmbackground.po b/tde-i18n-fr/messages/tdebase/kcmbackground.po
-index 34c18a6..808f1d8 100644
---- a/tde-i18n-fr/messages/tdebase/kcmbackground.po
-+++ b/tde-i18n-fr/messages/tdebase/kcmbackground.po
-@@ -920,3 +920,9 @@ msgstr "&Descendre"
- #, no-c-format
- msgid "Move &Up"
- msgstr "Mon&ter"
-+
-+msgid "Cross-fading background"
-+msgstr "Affichage progressif du fond d'écran"
-+
-+msgid "Enables a smooth fading effect when changing background image."
-+msgstr "Activer un effet de fondu lors du changement de fond d'écran."
-diff --git a/tde-i18n-fr/messages/tdebase/kcmenergy.po b/tde-i18n-fr/messages/tdebase/kcmenergy.po
-index f6e05b4..91d0ee8 100644
---- a/tde-i18n-fr/messages/tdebase/kcmenergy.po
-+++ b/tde-i18n-fr/messages/tdebase/kcmenergy.po
-@@ -102,3 +102,12 @@ msgstr ""
- "Choisissez la période d'inactivité après laquelle l'affichage doit être éteint. "
- "Ceci est le plus haut niveau d'économie d'énergie qui puisse être utilisé "
- "lorsque l'écran est physiquement allumé."
-+
-+msgid "&Enable specific display power management"
-+msgstr "&Activer la gestion spécifique de l'énergie"
-+
-+msgid "Configure KPowersave..."
-+msgstr "Configurer KPowersave..."
-+
-+msgid "Configure TDEPowersave..."
-+msgstr "Configurer TDEPowersave..."
-diff --git a/tde-i18n-fr/messages/tdebase/kcmkonq.po b/tde-i18n-fr/messages/tdebase/kcmkonq.po
-index e59de78..7015bde 100644
---- a/tde-i18n-fr/messages/tdebase/kcmkonq.po
-+++ b/tde-i18n-fr/messages/tdebase/kcmkonq.po
-@@ -877,3 +877,43 @@ msgstr ""
- #: rootopts.cpp:276
- msgid "Confirmation Required"
- msgstr "Confirmation requise"
-+
-+# TDE
-+msgid "Download path:"
-+msgstr "Dossier des téléchargements :"
-+
-+msgid "This folder will be used by default to load or save downloads from or to."
-+msgstr "Ce dossier sera utilisé par défaut pour télécharger des fichiers."
-+
-+msgid "Music path:"
-+msgstr "Dossier des musiques :"
-+
-+msgid "This folder will be used by default to load or save music from or to."
-+msgstr "Ce dossier sera utilisé par défaut pour lire ou enregistrer de la musique."
-+
-+msgid "Pictures path:"
-+msgstr "Dossier des images :"
-+
-+msgid "This folder will be used by default to load or save pictures from or to."
-+msgstr "Ce dossier sera utilisé par défaut pour lire en enregistrer des images."
-+
-+msgid "Public Share path:"
-+msgstr "Dossier des partages publics :"
-+
-+msgid "This folder will be used by default to load or save public shared files from or to."
-+msgstr "Ce dossier sera utilisé par défaut pour ouvrir ou enregistrer les fichiers partagés publiquement."
-+
-+msgid "Templates path:"
-+msgstr "Dossier des modèles :"
-+
-+msgid "This folder will be used by default to load or save templates from or to."
-+msgstr "Ce dossier sera utilisé par défaut pour ouvrir ou enregistrer des modèles."
-+
-+msgid "Videos path:"
-+msgstr "Dossier des vidéos :"
-+
-+msgid "This folder will be used by default to load or save videos from or to."
-+msgstr "Ce dossier sera utilisé par défaut pour lire en ouregistrer des vidéos."
-+
-+msgid "&Show free space overlay on device icons"
-+msgstr "&Afficher l'espace libre sur les icônes"
-diff --git a/tde-i18n-fr/messages/tdebase/kcmkonsole.po b/tde-i18n-fr/messages/tdebase/kcmkonsole.po
-index 0da666d..0cf24ae 100644
---- a/tde-i18n-fr/messages/tdebase/kcmkonsole.po
-+++ b/tde-i18n-fr/messages/tdebase/kcmkonsole.po
-@@ -160,14 +160,14 @@ msgstr "&Permettre aux programmes de redimensionner le terminal"
- #. i18n: file kcmkonsoledialog.ui line 174
- #: rc.cpp:36
- #, no-c-format
--msgid "Use Ctrl+S/Ctrl+Q flow control"
--msgstr "Utiliser les séquences de touches Ctrl+S/Ctrl+Q"
-+msgid "&Use Ctrl+S/Ctrl+Q flow control"
-+msgstr "&Utiliser les séquences de touches Ctrl+S/Ctrl+Q"
- 
- #. i18n: file kcmkonsoledialog.ui line 199
- #: rc.cpp:39
- #, no-c-format
--msgid "Enable bidirectional text rendering"
--msgstr "Activer le rendu bidirectionnel de texte"
-+msgid "E&nable bidirectional text rendering"
-+msgstr "Activer le re&ndu bidirectionnel de texte"
- 
- #. i18n: file kcmkonsoledialog.ui line 215
- #: rc.cpp:42
-@@ -184,8 +184,17 @@ msgstr "Espacement des &lignes :"
- #. i18n: file kcmkonsoledialog.ui line 297
- #: rc.cpp:48
- #, no-c-format
--msgid "Set tab title to match window title"
--msgstr "Définir le titre de l'onglet correspondant au titre de la fenêtre"
-+msgid "Set &tab title to match window title"
-+msgstr "Définir le &titre de l'onglet correspondant au titre de la fenêtre"
-+
-+msgid "Cycle tabs &with mouse wheel"
-+msgstr "Faire défiler les onglets en &utilisant la molette de la souris"
-+
-+msgid "Enable main &menu accelerator keys"
-+msgstr "Activer les touches d'accélération dans le &menu principal"
-+
-+msgid "Handle Meta &key as Alt Key"
-+msgstr "Considérer la t&ouche Meta comme la touche Alt"
- 
- #. i18n: file kcmkonsoledialog.ui line 309
- #: rc.cpp:51
-diff --git a/tde-i18n-fr/messages/tdebase/kicker.po b/tde-i18n-fr/messages/tdebase/kicker.po
-index c8fe511..abfdbf1 100644
---- a/tde-i18n-fr/messages/tdebase/kicker.po
-+++ b/tde-i18n-fr/messages/tdebase/kicker.po
-@@ -889,6 +889,18 @@ msgstr "Dossier personnel"
- msgid "My Documents"
- msgstr "Mes Documents"
- 
-+msgid "My Images"
-+msgstr "Mes Images"
-+
-+msgid "My Music"
-+msgstr "Ma Musique"
-+
-+msgid "My Videos"
-+msgstr "Mes Vidéos"
-+
-+msgid "My Downloads"
-+msgstr "Mes Téléchargements"
-+
- msgid "Switch to Kickoff Menu Style"
- msgstr "Utiliser le menu Kickoff"
- 
-diff --git a/tde-i18n-fr/messages/tdebase/konsole.po b/tde-i18n-fr/messages/tdebase/konsole.po
-index fc40788..7074527 100644
---- a/tde-i18n-fr/messages/tdebase/konsole.po
-+++ b/tde-i18n-fr/messages/tdebase/konsole.po
-@@ -203,8 +203,8 @@ msgid "New Sess&ion"
- msgstr "Nouvelle sess&ion"
- 
- #: konsole.cpp:739 konsole_part.cpp:476
--msgid "S&ettings"
--msgstr "Config&uration"
-+msgid "Se&ttings"
-+msgstr "Configura&tion"
- 
- #: konsole.cpp:794 konsole.cpp:1076
- msgid "&Detach Session"
-diff --git a/tde-i18n-fr/messages/tdebase/libtaskbar.po b/tde-i18n-fr/messages/tdebase/libtaskbar.po
-index dc2c448..033023c 100644
---- a/tde-i18n-fr/messages/tdebase/libtaskbar.po
-+++ b/tde-i18n-fr/messages/tdebase/libtaskbar.po
-@@ -445,3 +445,22 @@ msgstr "Demande votre attention"
- #: taskcontainer.cpp:1598
- msgid "Has unsaved changes"
- msgstr "Possède des modifications non enregistrées"
-+
-+# TDE R14
-+# taskbarcontainer.cpp
-+msgid "Move to Beginning"
-+msgstr "Déplacer en premier"
-+
-+msgid "Move Left"
-+msgstr "Déplacer à gauche"
-+
-+msgid "Move Right"
-+msgstr "Déplacer à droite"
-+
-+msgid "Move to End"
-+msgstr "Déplacer en dernier"
-+
-+# taskrmbmenu.cpp:
-+msgid "Move Task Button"
-+msgstr "Déplacer l'icone"
-+
-diff --git a/tde-i18n-fr/messages/tdebase/tderandr.po b/tde-i18n-fr/messages/tdebase/tderandr.po
-index 5be8618..d3c3cb1 100644
---- a/tde-i18n-fr/messages/tdebase/tderandr.po
-+++ b/tde-i18n-fr/messages/tdebase/tderandr.po
-@@ -305,9 +305,12 @@ msgstr "%1 Hz"
- ### TDE 3.5.13 ###
- 
- #: tderandrtray.cpp:237
--msgid "Global Configuation"
-+msgid "Global Configuration"
- msgstr "Configuration Globale"
- 
-+msgid "Color Profile"
-+msgstr "Profil de couleurs"
-+
- #: tderandrtray.cpp:239
- msgid "Configure Color Profiles..."
- msgstr "Configurer les profils de couleurs ..."
-@@ -354,4 +357,8 @@ msgstr "Sortie Vidéo suivante"
- msgid "%1 (Active)"
- msgstr "%1 (Active)"
- 
-+msgid "%1 (Connected, Inactive)"
-+msgstr "%1 (Connectée, Inactive)"
- 
-+msgid "%1 (Disconnected, Inactive)"
-+msgstr "%1 (Déconnectée, Inactive)"
-diff --git a/tde-i18n-fr/messages/tdelibs/tdelibs.po b/tde-i18n-fr/messages/tdelibs/tdelibs.po
-index 507dd8f..ccdafe8 100644
---- a/tde-i18n-fr/messages/tdelibs/tdelibs.po
-+++ b/tde-i18n-fr/messages/tdelibs/tdelibs.po
-@@ -5557,24 +5557,34 @@ msgstr "Liste déroulante et automatique"
- 
- #: tdeui/tdeabouttde.cpp:34
- msgid ""
--"The <b>Trinity Desktop Environment</b> is a fork of the "
-+"The <b>Trinity Desktop Environment</b> was born as a fork of the "
- "K Desktop Environment version 3.5, which was originally written by the KDE Team, "
- "a world-wide network of software engineers committed to <a "
- "href=\"http://www.gnu.org/philosophy/free-sw.html\">Free Software</a> "
--"development.<br><br>No single group, company or organization controls the "
-+"development. The name <i>Trinity</i> was chosen because the word means "
-+"<i>Three</i> as in <i>continuation of KDE 3</i>.<br>Since then, TDE has evolved to be "
-+"an indipendent and standalone computer desktop environment project. The developers "
-+"have molded the code to its own identity without giving up on the efficiency, "
-+"productivity and traditional user interface experience characteristic of the "
-+"original KDE 3 series.<br><br>No single group, company or organization controls the "
- "Trinity source code. Everyone is welcome to contribute to Trinity.<br><br>Visit <A "
--"HREF=\"http://www.trinitydesktop.org/\">http://www.trinitydesktop.org</A> for more information "
--"about Trinity, and <A HREF=\"http://www.kde.org/\">http://www.kde.org</A> "
-+"HREF=\"http://www.trinitydesktop.org\">http://www.trinitydesktop.org</A> for more information "
-+"about Trinity, and <A HREF=\"http://www.kde.org\">http://www.kde.org</A> "
- "for more information on the KDE project. "
- msgstr ""
--"L'<b>Environnement Bureautique Trinity</b> est un clone de l'environnement "
--"TDE version 3.5, originellement écrit par l'équipe KDE, des informaticiens "
--"du monde entier travaillant sur Internet au développement de <a "
--"href=\"http://www.gnu.org/philosophy/free-sw.fr.html\">logiciels libres</a>."
--"<br><br>Aucune société ni organisation ne contrôle le code source de Trinity, et chacun "
--"est invité à y contribuer.<br><br>Visitez <A HREF=\"http://www.trinitydesktop.org/\">"
--"http://www.trinitydesktop.org</A> pour plus d'informations sur Trinity, et <a "
--"href=\"http://www.kde.org/fr\">http://www.kde.org/fr</A> "
-+"L'<b>Environnement Bureautique Trinity</b> est né par un fork de "
-+"l'environnement KDE version 3.5, qui fut initialement créé par l'équipe KDE, "
-+"des informaticiens du monde entier travaillant sur Internet au "
-+"développement de <a href=\"http://www.gnu.org/philosophy/free-sw.fr.html\">"
-+"logiciels libres</a>. Le nom <i>Trinity</i> a été choisi car ce mot signifie "
-+"<i>trois</i>, indiquant la <i>continuité de KDE 3</i>.<br>Depuis, Trinity a évolué "
-+"pour devenir un environnement de bureau indépendant. Les développeurs ont "
-+"façonné le code pour lui donner une identité sans sacrifier les performances, "
-+"la productivité, et l'expérience de l'interface utilisateur classique de "
-+"KDE 3.<br>Aucune société ni organisation ne contrôle le code source de Trinity, "
-+"et chacun est invité à y contribuer.<br><br>Visitez <a "
-+"HREF=\"http://www.trinitydesktop.org\">http://www.trinitydesktop.org</A> pour plus d'informations "
-+"sur Trinity, et <A HREF=\"http://www.kde.org/fr\">http://www.kde.org/fr</A> "
- "pour plus d'informations sur le projet KDE."
- 
- #: tdeui/tdeabouttde.cpp:43
-@@ -5583,7 +5593,7 @@ msgid ""
- "do so. However, you - the user - must tell us when "
- "something does not work as expected or could be done better.<br><br>"
- "The Trinity Desktop Environment has a bug tracking system. Visit "
--"<A HREF=\"http://bugs.pearsoncomputing.net/\">http://bugs.pearsoncomputing.net</A> or "
-+"<A HREF=\"http://bugs.pearsoncomputing.net\">http://bugs.pearsoncomputing.net</A> or "
- "use the \"Report Bug...\" dialog from the \"Help\" menu to report bugs.<br><br>"
- "If you have a suggestion for improvement then you are welcome to use "
- "the bug tracking system to register your wish. Make sure you use the "
-@@ -5593,9 +5603,9 @@ msgstr ""
- "faire. Cependant, vous - l'utilisateur(trice) - devez nous signaler ce qui ne "
- "fonctionne pas correctement ou pourrait être perfectionné.<br><br>"
- "L'Environnement de Bureau Trinity possède un système de suivi des bogues. Allez "
--"sur <A HREF=\"http://bugs.pearsoncomputing.net/\">http://bugs.pearsoncomputing.net</A> "
--"ou utilisez la boîte de dialogue « Rapport de bogue » du menu « Aide » pour signaler les "
--"erreurs.<br><br>Si vous voulez suggérer une amélioration, vous êtes invité(e) à utiliser le "
-+"sur <A HREF=\"http://bugs.pearsoncomputing.net/\">http://bugs.pearsoncomputing.net/</A> "
-+"ou utilisez la boîte de dialogue « Rapport de bogue » du menu « Aide » pour signaler les erreurs.<br><br>"
-+"Si vous voulez suggérer une amélioration, vous êtes invité(e) à utiliser le "
- "système de suivi des bogues pour enregistrer votre souhait. Assurez-vous "
- "d'avoir utilisé l'option « Souhait » (wish)."
- 
-@@ -5606,12 +5616,13 @@ msgid ""
- "program interfaces. You can provide graphics, themes, sounds, and "
- "improved documentation. You decide!"
- "<br><br>"
--"Visit "
--"<A HREF=\"http://www.trinitydesktop.org/jobs/\">http://www.trinitydesktop.org/jobs/</A> "
--"for information on some projects in which you can participate."
-+"Visit the "
-+"<A HREF=\"http://www.trinitydesktop.org/jobs\">TDE Development</A> "
-+"webpage to find out how you can contribute or mail us using one of the "
-+"available <A HREF=\"http://www.trinitydesktop.org/mailinglist.php\">mailing lists</A>."
- "<br><br>"
- "If you need more information or documentation, then a visit to "
--"<A HREF=\"http://www.trinitydesktop.org/docs/\">http://www.trinitydesktop.org/docs/</A> "
-+"<A HREF=\"http://www.trinitydesktop.org/docs\">http://www.trinitydesktop.org/docs</A> "
- "will provide you with what you need."
- msgstr ""
- "Il n'est pas nécessaire d'être programmeur pour être membre de l'équipe de Trinity. "
-@@ -5629,23 +5640,21 @@ msgstr ""
- 
- #: tdeui/tdeabouttde.cpp:67
- msgid ""
--"Trinity is available free of charge, but making it is not free.<br><br>"
--"<br><br>"
--"The Trinity team does need financial support. Most of the money is used to "
--"reimburse members and others on expenses they experienced when "
--"contributing to Trinity. You are encouraged to support Trinity through a financial "
--"donation, using one of the ways described at "
-+"TDE is available free of charge, but making it is not free.<br><br>"
-+"The Trinity team <i>does need</i> financial support. The money is used to "
-+"support the expenses incurred to keep the TDE servers running, so that you - "
-+"the user - can access them at any time. You are encouraged to support Trinity "
-+"through a financial or hardware donation, using one of the ways described at "
- "<a href=\"http://www.trinitydesktop.org/donate.php\">http://www.trinitydesktop.org/donate.php</a>."
- "<br><br>Thank you very much in advance for your support!"
- msgstr ""
--"Trinity est disponible gratuitement, mais sa réalisation a un coût."
--"<br><br>"
--"<br>L'équipe de Trinity a besoin d'un appui financier. La majeure partie de ses "
--"fonds sert à rembourser les membres et d'autres intervenants des dépenses "
--"qu'ils ont engagées lors de leur contribution à Trinity. Pour apporter votre "
--"participation financière à Trinity, utilisez l'une des possibilités décrites à "
--"l'adresse <a href=\"http://www.trinitydesktop.org/donate.php\">http://www.trinitydesktop.org/donate.php</a>."
--"<br><br>Nous vous remercions vivement de votre soutien."
-+"TDE est disponible gratuitement, mais sa réalisation a un coût.<br><br>"
-+"L'équipe Trinity a <i>besoin</i> d'un appui financier. Cet argent permet "
-+"de supporter les dépenses liées au fonctionnement des serveurs TDE, pour "
-+"que vous puissiez y accéder à tout moment. Vous pouvez soutenir Trinity "
-+"en faisant un don d'argent ou de matériel, d'une manière décrite à l'adresse "
-+"<a href=\"http://www.trinitydesktop.org/donate.php\">http://www.trinitydesktop.org/donate.php</a>."
-+"<br><br>Nous vous remercions vivement de votre soutien!"
- 
- #: tdeui/tdeabouttde.cpp:81
- #, c-format
diff --git a/redhat/tde-i18n/tde-i18n-3.5.13.1.spec b/redhat/tde-i18n/tde-i18n-3.5.13.1.spec
deleted file mode 100644
index bd5bdbd80..000000000
--- a/redhat/tde-i18n/tde-i18n-3.5.13.1.spec
+++ /dev/null
@@ -1,1274 +0,0 @@
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?tde_prefix}" != "/usr"
-%define _variant .opt
-%endif
-
-# TDE 3.5.13 specific building variables
-BuildRequires: autoconf automake libtool m4
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-
-%define tde_tdedocdir %{tde_docdir}/tde
-
-# Builds all supported languages (not unsupported ones)
-%if "%{?KDE_LANGS}" == ""
-%define KDE_LANGS ar bg bn ca cs da de el en_GB es et fi fr he hi hu is it ja lt nl nb nn pa pl pt pt_BR ro ru sk sl sr sv ta tr uk zh_CN zh_TW
-%endif
-
-
-Name:		trinity-i18n
-Summary:	Internationalization support for Trinity
-Version:	3.5.13.1
-Release:	1%{?dist}%{?_variant}
-
-Vendor:		Trinity Project
-Packager:	Francois Andriot <francois.andriot@free.fr>
-URL:		http://www.trinitydesktop.org/
-
-Prefix:		%{tde_prefix}
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-# GFDL, with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts.
-License:	GFDL
-Group:		User Interface/Desktops
-BuildArch:	noarch
-
-# Speed build options
-%define debug_package %{nil}
-%define __spec_install_post %{nil}
-AutoReq: no
-
-Source0:	kde-i18n-%{version}.tar.gz
-
-# TDE 3.5.12: Translate 'kdesu' message was modified in 'kdebase' package
-Patch0:		kde-i18n-kdesu.patch
-
-# TDE 3.5.12: Translate 'Open Terminal Here' desktop shortcut
-Patch1:		trinity-kde-i18n-fr-openterminalhere.patch
-
-# TDE 3.5.13: French translations for new features
-Patch2:		kde-i18n-3.5.13-add_french_translations.patch
-
-# TDE 3.5.13: Updated translations for zh_TW, thanks to Wei-Lun Chao !
-Patch3:		kde-i18n-zh_TW-3.5.10.patch.gz
-
-BuildRequires:	findutils
-BuildRequires:	gettext
-BuildRequires:	trinity-arts-devel >= 3.5.13.1
-BuildRequires:	trinity-tdelibs-devel >= 3.5.13.1
-
-%description
-%{summary}.
-
-%package Afrikaans
-Summary: Afrikaans(af) language support for TDE
-Group: User Interface/Desktops
-Provides: %{name}-af = %{version}-%{release}
-Obsoletes:	 trinity-kde-i18n-Afrikaans < %{version}-%{release}
-Provides:	 trinity-kde-i18n-Afrikaans = %{version}-%{release}
-%description Afrikaans
-%{summary}.
-
-%package Arabic 
-Summary: Arabic(ar) language support for TDE
-Group: User Interface/Desktops
-Provides: %{name}-ar = %{version}-%{release}
-Obsoletes:	 trinity-kde-i18n-Arabic < %{version}-%{release}
-Provides:	 trinity-kde-i18n-Arabic = %{version}-%{release}
-%description Arabic
-%{summary}.
-
-%package Azerbaijani
-Summary: Azerbaijani(az) language support for TDE
-Group: User Interface/Desktops
-Provides: %{name}-az = %{version}-%{release}
-Obsoletes:	 trinity-kde-i18n-Arabic < %{version}-%{release}
-Provides:	 trinity-kde-i18n-Arabic = %{version}-%{release}
-%description Azerbaijani
-%{summary}.
-
-%package Belarusian
-Summary: Belarusian(be) language support for TDE
-Group: User Interface/Desktops
-Provides: %{name}-be = %{version}-%{release}
-Obsoletes:	 trinity-kde-i18n-Belarusian < %{version}-%{release}
-Provides:	 trinity-kde-i18n-Belarusian = %{version}-%{release}
-%description Belarusian
-%{summary}.
-
-%package Bulgarian
-Summary: Bulgarian(bg) language support for TDE
-Group: User Interface/Desktops
-Provides: %{name}-bg = %{version}-%{release}
-Obsoletes:	 trinity-kde-i18n-Bulgarian < %{version}-%{release}
-Provides:	 trinity-kde-i18n-Bulgarian = %{version}-%{release}
-%description Bulgarian
-%{summary}.
-
-%package Bengali
-Summary: Bengali(bn) language support for TDE
-Group: User Interface/Desktops
-Provides: %{name}-bn = %{version}-%{release}
-Obsoletes:	 trinity-kde-i18n-Bengali < %{version}-%{release}
-Provides:	 trinity-kde-i18n-Bengali = %{version}-%{release}
-%description Bengali
-%{summary}.
-
-%package Tibetan
-Summary: Tibetan(bo) language support for TDE
-Group: User Interface/Desktops
-Provides: %{name}-bo = %{version}-%{release}
-Obsoletes:	 trinity-kde-i18n-Tibetan < %{version}-%{release}
-Provides:	 trinity-kde-i18n-Tibetan = %{version}-%{release}
-%description Tibetan
-%{summary}.
-
-%package Breton
-Summary: Breton(br) language support for TDE
-Group: User Interface/Desktops
-Provides: %{name}-br = %{version}-%{release}
-Obsoletes:	 trinity-kde-i18n-Breton < %{version}-%{release}
-Provides:	 trinity-kde-i18n-Breton = %{version}-%{release}
-%description Breton
-%{summary}.
-
-%package Bosnian
-Summary: Bosnian(bs) language support for TDE
-Group: User Interface/Desktops
-Provides: %{name}-bs = %{version}-%{release}
-Obsoletes:	 trinity-kde-i18n-Bosnian < %{version}-%{release}
-Provides:	 trinity-kde-i18n-Bosnian = %{version}-%{release}
-%description Bosnian
-%{summary}.
-
-%package Catalan
-Summary: Catalan(ca) language support for TDE
-Group: User Interface/Desktops
-Provides: %{name}-ca = %{version}-%{release}
-Obsoletes:	 trinity-kde-i18n-Catalan < %{version}-%{release}
-Provides:	 trinity-kde-i18n-Catalan = %{version}-%{release}
-%description Catalan
-%{summary}.
-
-%package Czech
-Summary: Czech(cs) language support for TDE
-Group: User Interface/Desktops
-Provides: %{name}-cs = %{version}-%{release}
-Obsoletes:	 trinity-kde-i18n-Czech < %{version}-%{release}
-Provides:	 trinity-kde-i18n-Czech = %{version}-%{release}
-%description Czech
-%{summary}.
-
-%package Cymraeg
-Summary: Cymraeg language support for TDE
-Group: User Interface/Desktops
-Obsoletes:	 trinity-kde-i18n-Cymraeg < %{version}-%{release}
-Provides:	 trinity-kde-i18n-Cymraeg = %{version}-%{release}
-%description Cymraeg
-%{summary}.
-
-%package Welsh
-Summary: Welsh(cy) language support for TDE
-Group: User Interface/Desktops
-Provides: %{name}-cy = %{version}-%{release}
-Obsoletes:	 trinity-kde-i18n-Welsh < %{version}-%{release}
-Provides:	 trinity-kde-i18n-Welsh = %{version}-%{release}
-%description Welsh
-%{summary}.
-
-%package Danish
-Summary: Danish(da) language support for TDE
-Group: User Interface/Desktops
-Provides: %{name}-da = %{version}-%{release}
-Obsoletes:	 trinity-kde-i18n-Danish < %{version}-%{release}
-Provides:	 trinity-kde-i18n-Danish = %{version}-%{release}
-%description Danish
-%{summary}.
-
-%package German
-Summary: German(de) language support for TDE
-Group: User Interface/Desktops
-Provides: %{name}-de = %{version}-%{release}
-Obsoletes:	 trinity-kde-i18n-German < %{version}-%{release}
-Provides:	 trinity-kde-i18n-German = %{version}-%{release}
-%description German
-%{summary}.
-
-%package Greek
-Summary: Greek(el) language support for TDE
-Group: User Interface/Desktops
-Provides: %{name}-el = %{version}-%{release}
-Obsoletes:	 trinity-kde-i18n-Greek < %{version}-%{release}
-Provides:	 trinity-kde-i18n-Greek = %{version}-%{release}
-%description Greek
-%{summary}.
-
-%package British
-Summary: British(en_GB) English support for TDE
-Group: User Interface/Desktops
-Provides: %{name}-en_GB = %{version}-%{release}
-Obsoletes:	 trinity-kde-i18n-British < %{version}-%{release}
-Provides:	 trinity-kde-i18n-British = %{version}-%{release}
-%description British
-%{summary}.
-
-%package Esperanto
-Summary: Esperanto(eo) support for TDE
-Group: User Interface/Desktops
-Provides: %{name}-eo = %{version}-%{release}
-Obsoletes:	 trinity-kde-i18n-Esperanto < %{version}-%{release}
-Provides:	 trinity-kde-i18n-Esperanto = %{version}-%{release}
-%description Esperanto
-%{summary}.
-
-%package Spanish
-Summary: Spanish(es) language support for TDE
-Group: User Interface/Desktops
-Provides: %{name}-es = %{version}-%{release}
-Obsoletes:	 trinity-kde-i18n-Spanish < %{version}-%{release}
-Provides:	 trinity-kde-i18n-Spanish = %{version}-%{release}
-%description Spanish
-%{summary}.
-
-%package Estonian
-Summary: Estonian(et) language support for TDE
-Group: User Interface/Desktops
-Provides: %{name}-et = %{version}-%{release}
-Obsoletes:	 trinity-kde-i18n-Estonian < %{version}-%{release}
-Provides:	 trinity-kde-i18n-Estonian = %{version}-%{release}
-%description Estonian
-%{summary}.
-
-%package Basque
-Summary: Basque(eu) language support for TDE
-Group: User Interface/Desktops
-Provides: %{name}-eu = %{version}-%{release}
-Obsoletes:	 trinity-kde-i18n-Basque < %{version}-%{release}
-Provides:	 trinity-kde-i18n-Basque = %{version}-%{release}
-%description Basque
-%{summary}.
-
-%package Farsi
-Summary: Farsi(fa) language support for TDE
-Group: User Interface/Desktops
-Provides: %{name}-fa = %{version}-%{release}
-Obsoletes:	 trinity-kde-i18n-Farsi < %{version}-%{release}
-Provides:	 trinity-kde-i18n-Farsi = %{version}-%{release}
-%description Farsi
-%{summary}.
-
-%package Finnish
-Summary: Finnish(fi) language support for TDE
-Group: User Interface/Desktops
-Provides: %{name}-fi = %{version}-%{release}
-Obsoletes:	 trinity-kde-i18n-Finnish < %{version}-%{release}
-Provides:	 trinity-kde-i18n-Finnish = %{version}-%{release}
-%description Finnish
-%{summary}.
-
-%package Faroese
-Summary: Faroese(fo) language support for TDE
-Group: User Interface/Desktops
-Provides: %{name}-fo = %{version}-%{release}
-Obsoletes:	 trinity-kde-i18n-Faroese < %{version}-%{release}
-Provides:	 trinity-kde-i18n-Faroese = %{version}-%{release}
-%description Faroese
-%{summary}.
-
-%package French
-Summary: French(fr) language support for TDE
-Group: User Interface/Desktops
-Provides: %{name}-fr = %{version}-%{release}
-Obsoletes:	 trinity-kde-i18n-French < %{version}-%{release}
-Provides:	 trinity-kde-i18n-French = %{version}-%{release}
-%description French
-%{summary}.
-
-%package Frisian
-Summary: Frisian(fy) language support for TDE
-Group: User Interface/Desktops
-Provides: %{name}-fy = %{version}-%{release}
-Obsoletes:	 trinity-kde-i18n-Frisian < %{version}-%{release}
-Provides:	 trinity-kde-i18n-Frisian = %{version}-%{release}
-%description Frisian
-%{summary}.
-
-%package Irish
-Summary: Irish(ga) language support for TDE
-Group: User Interface/Desktops
-Provides: %{name}-ga = %{version}-%{release}
-Obsoletes:	 trinity-kde-i18n-Irish < %{version}-%{release}
-Provides:	 trinity-kde-i18n-Irish = %{version}-%{release}
-%description Irish
-%{summary}.
-
-%package Galician
-Summary: Galician(gl) language support for TDE
-Group: User Interface/Desktops
-Provides: %{name}-gl = %{version}-%{release}
-Obsoletes:	 trinity-kde-i18n-Galician < %{version}-%{release}
-Provides:	 trinity-kde-i18n-Galician = %{version}-%{release}
-%description Galician
-%{summary}.
-
-%package Hebrew
-Summary: Hebrew(he) language support for TDE
-Group: User Interface/Desktops
-Provides: %{name}-he = %{version}-%{release}
-Obsoletes:	 trinity-kde-i18n-Hebrew < %{version}-%{release}
-Provides:	 trinity-kde-i18n-Hebrew = %{version}-%{release}
-%description Hebrew
-%{summary}.
-
-%package Hindi
-Summary: Hindi(hi) language support for TDE
-Group: User Interface/Desktops
-Provides: %{name}-hi = %{version}-%{release}
-Obsoletes:	 trinity-kde-i18n-Hindi < %{version}-%{release}
-Provides:	 trinity-kde-i18n-Hindi = %{version}-%{release}
-%description Hindi
-%{summary}.
-
-%package Croatian
-Summary: Croatian(hr) language support for TDE
-Group: User Interface/Desktops
-Provides: %{name}-hr = %{version}-%{release}
-Obsoletes:	 trinity-kde-i18n-Croatian < %{version}-%{release}
-Provides:	 trinity-kde-i18n-Croatian = %{version}-%{release}
-%description Croatian
-%{summary}.
-
-%package Hungarian
-Summary: Hungarian(hu) language support for TDE
-Group: User Interface/Desktops
-Provides: %{name}-hu = %{version}-%{release}
-Obsoletes:	 trinity-kde-i18n-Hungarian < %{version}-%{release}
-Provides:	 trinity-kde-i18n-Hungarian = %{version}-%{release}
-%description Hungarian
-%{summary}.
-
-%package Indonesian
-Summary: Indonesian(id) language support for TDE
-Group: User Interface/Desktops
-Provides: %{name}-id = %{version}-%{release}
-Obsoletes:	 trinity-kde-i18n-Indonesian < %{version}-%{release}
-Provides:	 trinity-kde-i18n-Indonesian = %{version}-%{release}
-%description Indonesian
-%{summary}.
-
-%package Icelandic
-Summary: Icelandic(is) language support for TDE
-Group: User Interface/Desktops
-Provides: %{name}-is = %{version}-%{release}
-Obsoletes:	 trinity-kde-i18n-Icelandic < %{version}-%{release}
-Provides:	 trinity-kde-i18n-Icelandic = %{version}-%{release}
-%description Icelandic
-%{summary}.
-
-%package Italian
-Summary: Italian(it) language support for TDE
-Group: User Interface/Desktops
-Provides: %{name}-it = %{version}-%{release}
-Obsoletes:	 trinity-kde-i18n-Italian < %{version}-%{release}
-Provides:	 trinity-kde-i18n-Italian = %{version}-%{release}
-%description Italian
-%{summary}.
-
-%package Japanese
-Summary: Japanese(ja) language support for TDE
-Group: User Interface/Desktops
-Provides: %{name}-ja = %{version}-%{release}
-Obsoletes:	 trinity-kde-i18n-Japanese < %{version}-%{release}
-Provides:	 trinity-kde-i18n-Japanese = %{version}-%{release}
-%description Japanese
-%{summary}.
-
-%package Korean
-Summary: Korean(ko) language support for TDE
-Group: User Interface/Desktops
-Provides: %{name}-ko = %{version}-%{release}
-Obsoletes:	 trinity-kde-i18n-Korean < %{version}-%{release}
-Provides:	 trinity-kde-i18n-Korean = %{version}-%{release}
-%description Korean
-%{summary}.
-
-%package Kurdish
-Summary: Kurdish(ku) language support for TDE
-Group: User Interface/Desktops
-Provides: %{name}-ku = %{version}-%{release}
-Obsoletes:	 trinity-kde-i18n-Kurdish < %{version}-%{release}
-Provides:	 trinity-kde-i18n-Kurdish = %{version}-%{release}
-%description Kurdish
-%{summary}.
-
-%package Lao
-Summary: Lao(lo) language support for TDE
-Group: User Interface/Desktops
-Provides: %{name}-lo = %{version}-%{release}
-Obsoletes:	 trinity-kde-i18n-Lao < %{version}-%{release}
-Provides:	 trinity-kde-i18n-Lao = %{version}-%{release}
-%description Lao
-%{summary}.
-
-%package Lithuanian
-Summary: Lithuanian(lt) language support for TDE
-Group: User Interface/Desktops
-Provides: %{name}-lt = %{version}-%{release}
-Obsoletes:	 trinity-kde-i18n-Lithuanian < %{version}-%{release}
-Provides:	 trinity-kde-i18n-Lithuanian = %{version}-%{release}
-%description Lithuanian
-%{summary}.
-
-%package Latvian
-Summary: Latvian(lv) language support for TDE
-Group: User Interface/Desktops
-Provides: %{name}-lv = %{version}-%{release}
-Obsoletes:	 trinity-kde-i18n-Latvian < %{version}-%{release}
-Provides:	 trinity-kde-i18n-Latvian = %{version}-%{release}
-%description Latvian
-%{summary}.
-
-%package Maori
-Summary: Maori(mi) language support for TDE
-Group: User Interface/Desktops
-Provides: %{name}-mi = %{version}-%{release}
-Obsoletes:	 trinity-kde-i18n-Maori < %{version}-%{release}
-Provides:	 trinity-kde-i18n-Maori = %{version}-%{release}
-%description Maori
-%{summary}.
-
-%package Macedonian
-Summary: Macedonian(mk) language support for TDE
-Group: User Interface/Desktops
-Provides: %{name}-mk = %{version}-%{release}
-Obsoletes:	 trinity-kde-i18n-Macedonian < %{version}-%{release}
-Provides:	 trinity-kde-i18n-Macedonian = %{version}-%{release}
-%description Macedonian
-%{summary}.
-
-%package Maltese
-Summary: Maltese(mt) language support for TDE
-Group: User Interface/Desktops
-Provides: %{name}-mt = %{version}-%{release}
-Obsoletes:	 trinity-kde-i18n-Maltese < %{version}-%{release}
-Provides:	 trinity-kde-i18n-Maltese = %{version}-%{release}
-%description Maltese
-%{summary}.
-
-%package Dutch
-Summary: Dutch(nl) language support for TDE
-Group: User Interface/Desktops
-Provides: %{name}-nl = %{version}-%{release}
-Obsoletes:	 trinity-kde-i18n-Dutch < %{version}-%{release}
-Provides:	 trinity-kde-i18n-Dutch = %{version}-%{release}
-%description Dutch
-%{summary}.
-
-%package Norwegian
-Summary: Norwegian(no) (Bokmaal) language support for TDE
-Group: User Interface/Desktops
-Provides: %{name}-no = %{version}-%{release}
-Obsoletes:	 trinity-kde-i18n-Norwegian < %{version}-%{release}
-Provides:	 trinity-kde-i18n-Norwegian = %{version}-%{release}
-%description Norwegian
-%{summary}.
-
-%package Norwegian-Nynorsk
-Summary: Norwegian(nn) (Nynorsk) language support for TDE
-Group: User Interface/Desktops
-Provides: %{name}-nn = %{version}-%{release}
-Obsoletes:	 trinity-kde-i18n-Norwegian-Nynorsk < %{version}-%{release}
-Provides:	 trinity-kde-i18n-Norwegian-Nynorsk = %{version}-%{release}
-%description Norwegian-Nynorsk
-%{summary}.
-
-%package Occitan
-Summary: Occitan(oc) language support for TDE
-Group: User Interface/Desktops
-Provides: %{name}-oc = %{version}-%{release}
-Obsoletes:	 trinity-kde-i18n-Occitan < %{version}-%{release}
-Provides:	 trinity-kde-i18n-Occitan = %{version}-%{release}
-%description Occitan
-%{summary}.
-
-%package Polish
-Summary: Polish(pl) language support for TDE
-Group: User Interface/Desktops
-Provides: %{name}-pl = %{version}-%{release}
-Obsoletes:	 trinity-kde-i18n-Polish < %{version}-%{release}
-Provides:	 trinity-kde-i18n-Polish = %{version}-%{release}
-%description Polish
-%{summary}.
-
-%package Portuguese
-Summary: Portuguese(pt) language support for TDE
-Group: User Interface/Desktops
-Provides: %{name}-pt = %{version}-%{release}
-Obsoletes:	 trinity-kde-i18n-Portuguese < %{version}-%{release}
-Provides:	 trinity-kde-i18n-Portuguese = %{version}-%{release}
-%description Portuguese
-%{summary}.
-
-%package Punjabi
-Summary: Punjabi(pa) language support for TDE
-Group: User Interface/Desktops
-Provides: %{name}-pa = %{version}-%{release}
-Obsoletes:	 trinity-kde-i18n-Punjabi < %{version}-%{release}
-Provides:	 trinity-kde-i18n-Punjabi = %{version}-%{release}
-%description Punjabi
-%{summary}.
-
-%package Brazil
-Summary: Brazil(pt_BR) Portuguese language support for TDE
-Group: User Interface/Desktops
-Provides: %{name}-pt_BR = %{version}-%{release}
-Obsoletes:	 trinity-kde-i18n-Brazil < %{version}-%{release}
-Provides:	 trinity-kde-i18n-Brazil = %{version}-%{release}
-%description Brazil
-%{summary}.
-
-%package Romanian
-Summary: Romanian(ro) language support for TDE
-Group: User Interface/Desktops
-Provides: %{name}-ro = %{version}-%{release}
-Obsoletes:	 trinity-kde-i18n-Romanian < %{version}-%{release}
-Provides:	 trinity-kde-i18n-Romanian = %{version}-%{release}
-%description Romanian
-%{summary}.
-
-%package Russian
-Summary: Russian(ru) language support for TDE
-Group: User Interface/Desktops
-Provides: %{name}-ru = %{version}-%{release}
-Obsoletes:	 trinity-kde-i18n-Russian < %{version}-%{release}
-Provides:	 trinity-kde-i18n-Russian = %{version}-%{release}
-%description Russian
-%{summary}.
-
-%package Slovak
-Summary: Slovak(sk) language support for TDE
-Group: User Interface/Desktops
-Provides: %{name}-sk = %{version}-%{release}
-Obsoletes:	 trinity-kde-i18n-Slovak < %{version}-%{release}
-Provides:	 trinity-kde-i18n-Slovak = %{version}-%{release}
-%description Slovak
-%{summary}.
-
-%package Slovenian
-Summary: Slovenian(sl) language support for TDE
-Group: User Interface/Desktops
-Provides: %{name}-sl = %{version}-%{release}
-Obsoletes:	 trinity-kde-i18n-Slovenian < %{version}-%{release}
-Provides:	 trinity-kde-i18n-Slovenian = %{version}-%{release}
-%description Slovenian
-%{summary}.
-
-%package Serbian
-Summary: Serbian(sr) language support for TDE
-Group: User Interface/Desktops
-Provides: %{name}-sr = %{version}-%{release}
-Obsoletes:	 trinity-kde-i18n-Serbian < %{version}-%{release}
-Provides:	 trinity-kde-i18n-Serbian = %{version}-%{release}
-%description Serbian
-%{summary}.
-
-%package Swedish
-Summary: Swedish(sv) language support for TDE
-Group: User Interface/Desktops
-Provides: %{name}-sv = %{version}-%{release}
-Obsoletes:	 trinity-kde-i18n-Swedish < %{version}-%{release}
-Provides:	 trinity-kde-i18n-Swedish = %{version}-%{release}
-%description Swedish
-%{summary}.
-
-%package Tamil
-Summary: Tamil(ta) language support for TDE
-Group: User Interface/Desktops
-Provides: %{name}-ta = %{version}-%{release}
-Obsoletes:	 trinity-kde-i18n-Tamil < %{version}-%{release}
-Provides:	 trinity-kde-i18n-Tamil = %{version}-%{release}
-%description Tamil
-%{summary}.
-
-%package Tajik
-Summary: Tajik(tg) language support for TDE
-Group: User Interface/Desktops
-Provides: %{name}-tg = %{version}-%{release}
-Obsoletes:	 trinity-kde-i18n-Tajik < %{version}-%{release}
-Provides:	 trinity-kde-i18n-Tajik = %{version}-%{release}
-%description Tajik
-%{summary}.
-
-%package Thai
-Summary: Thai(th) language support for TDE
-Group: User Interface/Desktops
-Provides: %{name}-th = %{version}-%{release}
-Obsoletes:	 trinity-kde-i18n-Thai < %{version}-%{release}
-Provides:	 trinity-kde-i18n-Thai = %{version}-%{release}
-%description Thai
-%{summary}.
-
-%package Turkish
-Summary: Turkish(tr) language support for TDE
-Group: User Interface/Desktops
-Provides: %{name}-tr = %{version}-%{release}
-Obsoletes:	 trinity-kde-i18n-Turkish < %{version}-%{release}
-Provides:	 trinity-kde-i18n-Turkish = %{version}-%{release}
-%description Turkish
-%{summary}.
-
-%package Ukrainian
-Summary: Ukrainian(uk) language support for TDE
-Group: User Interface/Desktops
-Provides: %{name}-uk = %{version}-%{release}
-Obsoletes:	 trinity-kde-i18n-Ukrainian < %{version}-%{release}
-Provides:	 trinity-kde-i18n-Ukrainian = %{version}-%{release}
-%description Ukrainian
-%{summary}.
-
-%package Venda
-Summary: Venda(ven) language support for TDE
-Group: User Interface/Desktops
-Provides: %{name}-ven = %{version}-%{release}
-Obsoletes:	 trinity-kde-i18n-Venda < %{version}-%{release}
-Provides:	 trinity-kde-i18n-Venda = %{version}-%{release}
-%description Venda
-%{summary}.
-
-%package Vietnamese
-Summary: Vietnamese(vi) language support for TDE
-Group: User Interface/Desktops
-Provides: %{name}-vi = %{version}-%{release}
-Obsoletes:	 trinity-kde-i18n-Vietnamese < %{version}-%{release}
-Provides:	 trinity-kde-i18n-Vietnamese = %{version}-%{release}
-%description Vietnamese
-%{summary}.
-
-%package Walloon
-Summary: Walloon(wa) language support for TDE
-Group: User Interface/Desktops
-Provides: %{name}-wa = %{version}-%{release}
-Obsoletes:	 trinity-kde-i18n-Walloon < %{version}-%{release}
-Provides:	 trinity-kde-i18n-Walloon = %{version}-%{release}
-%description Walloon
-%{summary}.
-
-%package Xhosa
-Summary: Xhosa(xh) (a Bantu language) support for TDE
-Group: User Interface/Desktops
-Provides: %{name}-xh = %{version}-%{release}
-Obsoletes:	 trinity-kde-i18n-Xhosa < %{version}-%{release}
-Provides:	 trinity-kde-i18n-Xhosa = %{version}-%{release}
-%description Xhosa
-%{summary}.
-
-%package Chinese
-Summary: Chinese(zh_CN) (Simplified Chinese) language support for TDE
-Group: User Interface/Desktops
-Provides: %{name}-zh_CN = %{version}-%{release}
-Obsoletes:	 trinity-kde-i18n-Chinese < %{version}-%{release}
-Provides:	 trinity-kde-i18n-Chinese = %{version}-%{release}
-%description Chinese
-%{summary}.
-
-%package Chinese-Big5
-Summary: Chinese(zh_TW) (Big5) language support for TDE
-Group: User Interface/Desktops
-Provides: %{name}-tz_TW = %{version}-%{release}
-Obsoletes:	 trinity-kde-i18n-Chinese-Big5 < %{version}-%{release}
-Provides:	 trinity-kde-i18n-Chinese-Big5 = %{version}-%{release}
-%description Chinese-Big5
-%{summary}.
-
-
-
-%prep
-%setup -q -n kde-i18n-3.5.13.1
-
-# Patches for French translations
-pushd tde-i18n-fr
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
-popd
-
-# Patches for Chinese (zh_TW) translations
-pushd tde-i18n-zh_TW
-%patch3 -p1
-popd
-
-# Ugly hack to modify TQT include directory inside autoconf files.
-# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
-%__sed -i admin/acinclude.m4.in \
-  -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \
-  -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g"
-
-%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-
-
-%build
-unset QTDIR; . /etc/profile.d/qt3.sh
-export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
-export KDEDIR=%{tde_prefix}
-
-export kde_htmldir="%{tde_tdedocdir}/HTML"
-
-for l in %{KDE_LANGS}; do
-  for f in tde-i18n-${l}/; do
-    if [ -d "${f}" ]; then 
-      pushd ${f}
-      autoreconf -fiv
-      %__make -f ../admin/Makefile.common
-      %configure \
-        --prefix=%{tde_prefix} \
-        --datadir=%{tde_datadir} \
-        --docdir=%{tde_tdedocdir}
-      %__make %{?_smp_mflags}
-      popd
-    fi
-  done
-done
-
-%install
-%__rm -rf %{?buildroot}
-export PATH="%{tde_bindir}:${PATH}"
-
-for l in %{KDE_LANGS}; do
-  for f in tde-i18n-${l}/; do
-    if [ -d "${f}" ] && [ -r "${f}/Makefile" ] ; then 
-      %__make install DESTDIR="%{?buildroot}" -C "${f}"
-    fi
-  done
-done
-
-# make symlinks relative
-%if "%{tde_prefix}" == "/usr"
-pushd "%{buildroot}%{tde_tdedocdir}/HTML"
-for lang in *; do
-  if [ -d "$lang" ]; then
-    pushd "$lang"
-    for i in */*/*; do
-      if [ -d $i -a -L $i/common ]; then
-        rm -f $i/common
-        ln -sf ../../../docs/common $i
-      fi
-    done
-
-    for i in */*; do
-      if [ -d $i -a -L $i/common ]; then
-        rm -f $i/common
-        ln -sf ../../docs/common $i
-      fi
-    done
-
-    for i in *; do
-      if [ -d $i -a -L $i/common ]; then
-        rm -f $i/common
-        ln -sf ../docs/common $i
-      fi
-    done
-
-    popd
-  fi
-done
-popd   
-%endif
-
-# remove zero-length file
-find "%{buildroot}%{tde_tdedocdir}/HTML" -size 0 -exec rm -f {} \;
-
-# See http://fedoraproject.org/wiki/Languages (???)
-%__rm -f %{buildroot}%{tde_datadir}/locale/*/flag.png
-
-# Removes conflict with KDE4
-%if "%{?tde_prefix}" == "/usr"
-%__rm -f %{buildroot}%{tde_datadir}/locale/*/entry.desktop
-%endif
-
-# remove obsolete KDE 3 application data translations
-%__rm -rf "%{buildroot}%{tde_datadir}/apps"
-
-%clean
-%__rm -rf %{buildroot}
-
-%if "%( grep -w af <<< '%{KDE_LANGS}' )" != ""
-%files Afrikaans
-%defattr(-,root,root,-)
-%lang(af) %{tde_datadir}/locale/af/*
-%lang(af) %{tde_tdedocdir}/HTML/af/
-%endif
-
-%if "%( grep -w ar <<< '%{KDE_LANGS}' )" != ""
-%files Arabic 
-%defattr(-,root,root,-)
-%lang(ar) %{tde_datadir}/locale/ar/*
-%endif
-
-%if "%( grep -w az <<< '%{KDE_LANGS}' )" != ""
-%files Azerbaijani
-%defattr(-,root,root,-)
-%lang(az) %{tde_datadir}/locale/az/*
-%endif
-
-%if "%( grep -w be <<< '%{KDE_LANGS}' )" != ""
-%files Belarusian
-%defattr(-,root,root,-)
-%lang(be) %{tde_datadir}/locale/be/*
-%endif
-
-%if "%( grep -w bg <<< '%{KDE_LANGS}' )" != ""
-%files Bulgarian
-%defattr(-,root,root,-)
-%lang(bg) %{tde_datadir}/locale/bg/*
-%endif
-
-%if "%( grep -w bn <<< '%{KDE_LANGS}' )" != ""
-%files Bengali
-%defattr(-,root,root,-)
-%lang(bn) %{tde_datadir}/locale/bn/*
-%endif
-
-%if "%( grep -w bo <<< '%{KDE_LANGS}' )" != ""
-%files Tibetan
-%defattr(-,root,root,-)
-%lang(bo) %{tde_datadir}/locale/bo/*
-%endif
-
-%if "%( grep -w br <<< '%{KDE_LANGS}' )" != ""
-%files Breton
-%defattr(-,root,root,-)
-%lang(br) %{tde_datadir}/locale/br/*
-%endif
-
-%if "%( grep -w bs <<< '%{KDE_LANGS}' )" != ""
-%files Bosnian
-%defattr(-,root,root,-)
-%lang(bs) %{tde_datadir}/locale/bs/*
-%endif
-
-%if "%( grep -w ca <<< '%{KDE_LANGS}' )" != ""
-%files Catalan
-%defattr(-,root,root,-)
-%lang(ca) %{tde_datadir}/locale/ca/*
-%lang(ca) %{tde_tdedocdir}/HTML/ca/
-%endif
-
-%if "%( grep -w cs <<< '%{KDE_LANGS}' )" != ""
-%files Czech
-%defattr(-,root,root,-)
-%lang(cs) %{tde_datadir}/locale/cs/*
-%lang(cs) %{tde_tdedocdir}/HTML/cs/
-%endif
-
-%if "%( grep -w cy <<< '%{KDE_LANGS}' )" != ""
-%files Welsh
-%defattr(-,root,root,-)
-%lang(cy) %{tde_datadir}/locale/cy/*
-%endif
-
-%if "%( grep -w da <<< '%{KDE_LANGS}' )" != ""
-%files Danish
-%defattr(-,root,root,-)
-%lang(da) %{tde_datadir}/locale/da/*
-%lang(da) %{tde_tdedocdir}/HTML/da/
-%endif
-
-%if "%( grep -w de <<< '%{KDE_LANGS}' )" != ""
-%files German
-%defattr(-,root,root,-)
-%lang(de) %{tde_datadir}/locale/de/*
-%lang(de) %{tde_tdedocdir}/HTML/de/
-%endif
-
-%if "%( grep -w el <<< '%{KDE_LANGS}' )" != ""
-%files Greek
-%defattr(-,root,root,-)
-%lang(el) %{tde_datadir}/locale/el/*
-%endif
-
-%if "%( grep -w en_GB <<< '%{KDE_LANGS}' )" != ""
-%files British
-%defattr(-,root,root,-)
-%lang(en_GB) %{tde_datadir}/locale/en_GB/*
-%lang(en_GB) %{tde_tdedocdir}/HTML/en_GB/
-%endif
-
-%if "%( grep -w eo <<< '%{KDE_LANGS}' )" != ""
-%files Esperanto
-%defattr(-,root,root,-)
-%lang(eo) %{tde_datadir}/locale/eo/*
-%endif
-
-%if "%( grep -w es <<< '%{KDE_LANGS}' )" != ""
-%files Spanish
-%defattr(-,root,root,-)
-%lang(es) %{tde_datadir}/locale/es/*
-%lang(es) %{tde_tdedocdir}/HTML/es/
-%endif
-
-%if "%( grep -w et <<< '%{KDE_LANGS}' )" != ""
-%files Estonian
-%defattr(-,root,root,-)
-%lang(et) %{tde_datadir}/locale/et/*
-%lang(et) %{tde_tdedocdir}/HTML/et/
-%endif
-
-%if "%( grep -w eu <<< '%{KDE_LANGS}' )" != ""
-%files Basque
-%defattr(-,root,root,-)
-%lang(eu) %{tde_datadir}/locale/eu/*
-%endif
-
-%if "%( grep -w fa <<< '%{KDE_LANGS}' )" != ""
-%files Farsi
-%defattr(-,root,root,-)
-%lang(fa) %{tde_datadir}/locale/fa/*
-%endif
-
-%if "%( grep -w fi <<< '%{KDE_LANGS}' )" != ""
-%files Finnish
-%defattr(-,root,root,-)
-%lang(fi) %{tde_datadir}/locale/fi/*
-%lang(fi) %{tde_tdedocdir}/HTML/fi/
-%endif
-
-%if "%( grep -w fo <<< '%{KDE_LANGS}' )" != ""
-%files Faroese
-%defattr(-,root,root,-)
-%lang(fo) %{tde_datadir}/locale/fo/*
-%endif
-
-%if "%( grep -w fr <<< '%{KDE_LANGS}' )" != ""
-%files French
-%defattr(-,root,root,-)
-%lang(fr) %{tde_datadir}/locale/fr/*
-%lang(fr) %{tde_tdedocdir}/HTML/fr/
-%endif
-
-%if "%( grep -w fy <<< '%{KDE_LANGS}' )" != ""
-%files Frisian
-%defattr(-,root,root,-)
-%lang(fy) %{tde_datadir}/locale/fy/*
-%endif
-
-%if "%( grep -w ga <<< '%{KDE_LANGS}' )" != ""
-%files Irish
-%defattr(-,root,root,-)
-%lang(ga) %{tde_datadir}/locale/ga/*
-%endif
-
-%if "%( grep -w gl <<< '%{KDE_LANGS}' )" != ""
-%files Galician
-%defattr(-,root,root,-)
-%lang(gl) %{tde_datadir}/locale/gl/*
-%endif
-
-%if "%( grep -w he <<< '%{KDE_LANGS}' )" != ""
-%files Hebrew
-%defattr(-,root,root,-)
-%lang(he) %{tde_datadir}/locale/he/*
-%lang(he) %{tde_tdedocdir}/HTML/he/
-%endif
-
-%if "%( grep -w hi <<< '%{KDE_LANGS}' )" != ""
-%files Hindi
-%defattr(-,root,root,-)
-%lang(hi) %{tde_datadir}/locale/hi/*
-%endif
-
-%if "%( grep -w hr <<< '%{KDE_LANGS}' )" != ""
-%files Croatian
-%defattr(-,root,root,-)
-%lang(hr) %{tde_datadir}/locale/hr/*
-%lang(hr) %{tde_tdedocdir}/HTML/hr/
-%endif
-
-%if "%( grep -w hu <<< '%{KDE_LANGS}' )" != ""
-%files Hungarian
-%defattr(-,root,root,-)
-%lang(hu) %{tde_datadir}/locale/hu/*
-%lang(hu) %{tde_tdedocdir}/HTML/hu/
-%endif
-
-%if "%( grep -w id <<< '%{KDE_LANGS}' )" != ""
-%files Indonesian
-%defattr(-,root,root,-)
-%lang(id) %{tde_datadir}/locale/id/*
-%lang(id) %{tde_tdedocdir}/HTML/id/
-%endif
-
-%if "%( grep -w is <<< '%{KDE_LANGS}' )" != ""
-%files Icelandic
-%defattr(-,root,root,-)
-%lang(is) %{tde_datadir}/locale/is/*
-%endif
-
-%if "%( grep -w it <<< '%{KDE_LANGS}' )" != ""
-%files Italian
-%defattr(-,root,root,-)
-%lang(it) %{tde_datadir}/locale/it/*
-%lang(it) %{tde_tdedocdir}/HTML/it/
-%endif
-
-%if "%( grep -w ja <<< '%{KDE_LANGS}' )" != ""
-%files Japanese
-%defattr(-,root,root,-)
-%lang(ja) %{tde_datadir}/locale/ja/*
-%lang(ja) %{tde_tdedocdir}/HTML/ja/
-%endif
-
-%if "%( grep -w ko <<< '%{KDE_LANGS}' )" != ""
-%files Korean
-%defattr(-,root,root,-)
-%lang(ko) %{tde_datadir}/locale/ko/*
-%lang(ko) %{tde_tdedocdir}/HTML/ko/
-%endif
-
-%if "%( grep -w ku <<< '%{KDE_LANGS}' )" != ""
-%files Kurdish
-%defattr(-,root,root,-)
-%lang(ku) %{tde_datadir}/locale/ku/*
-%lang(ku) %{tde_tdedocdir}/HTML/ku/
-%endif
-
-%if "%( grep -w lao <<< '%{KDE_LANGS}' )" != ""
-%files Lao
-%defattr(-,root,root,-)
-%lang(lo) %{tde_datadir}/locale/lo/*
-%lang(lo) %{tde_tdedocdir}/HTML/lo/
-%endif
-
-%if "%( grep -w lt <<< '%{KDE_LANGS}' )" != ""
-%files Lithuanian
-%defattr(-,root,root,-)
-%lang(lt) %{tde_datadir}/locale/lt/*
-%endif
-
-%if "%( grep -w lv <<< '%{KDE_LANGS}' )" != ""
-%files Latvian
-%defattr(-,root,root,-)
-%lang(lv) %{tde_datadir}/locale/lv/*
-%endif
-
-%if "%( grep -w mi <<< '%{KDE_LANGS}' )" != ""
-%files Maori
-%defattr(-,root,root,-)
-%lang(mi) %{tde_datadir}/locale/mi/*
-%endif
-
-%if "%( grep -w mk <<< '%{KDE_LANGS}' )" != ""
-%files Macedonian
-%defattr(-,root,root,-)
-%lang(mk) %{tde_datadir}/locale/mk/*
-%endif
-
-%if "%( grep -w mt <<< '%{KDE_LANGS}' )" != ""
-%files Maltese
-%defattr(-,root,root,-)
-%lang(mt) %{tde_datadir}/locale/mt/*
-%endif
-
-%if "%( grep -w nl <<< '%{KDE_LANGS}' )" != ""
-%files Dutch
-%defattr(-,root,root,-)
-%lang(nl) %{tde_datadir}/locale/nl/*
-%lang(nl) %{tde_tdedocdir}/HTML/nl/
-%endif
-
-%if "%( grep -w nb <<< '%{KDE_LANGS}' )" != ""
-%files Norwegian
-%defattr(-,root,root,-)
-%lang(nb) %{tde_datadir}/locale/nb/*
-#%lang(nb) %{tde_tdedocdir}/HTML/nb/
-%endif
-
-%if "%( grep -w nn <<< '%{KDE_LANGS}' )" != ""
-%files Norwegian-Nynorsk
-%defattr(-,root,root,-)
-%lang(nn) %{tde_datadir}/locale/nn/*
-#%lang(nn) %{tde_tdedocdir}/HTML/nn/
-%endif
-
-%if "%( grep -w oc <<< '%{KDE_LANGS}' )" != ""
-%files Occitan
-%defattr(-,root,root,-)
-%lang(oc) %{tde_datadir}/locale/oc/*
-%endif
-
-%if "%( grep -w pa <<< '%{KDE_LANGS}' )" != ""
-%files Punjabi
-%defattr(-,root,root,-)
-%lang(pa) %{tde_datadir}/locale/pa/*
-%endif
-
-%if "%( grep -w pl <<< '%{KDE_LANGS}' )" != ""
-%files Polish
-%defattr(-,root,root,-)
-%lang(pl) %{tde_datadir}/locale/pl/*
-%lang(pl) %{tde_tdedocdir}/HTML/pl/
-%endif
-
-%if "%( grep -w pt <<< '%{KDE_LANGS}' )" != ""
-%files Portuguese
-%defattr(-,root,root,-)
-%lang(pt) %{tde_datadir}/locale/pt/*
-%lang(pt) %{tde_tdedocdir}/HTML/pt/
-%endif
-
-%if "%( grep -w pt_BR <<< '%{KDE_LANGS}' )" != ""
-%files Brazil
-%defattr(-,root,root,-)
-%lang(pt_BR) %{tde_datadir}/locale/pt_BR/*
-%lang(pt_BR) %{tde_tdedocdir}/HTML/pt_BR/
-%endif
-
-%if "%( grep -w ro <<< '%{KDE_LANGS}' )" != ""
-%files Romanian
-%defattr(-,root,root,-)
-%lang(ro) %{tde_datadir}/locale/ro/*
-%lang(ro) %{tde_tdedocdir}/HTML/ro/
-%endif
-
-%if "%( grep -w ru <<< '%{KDE_LANGS}' )" != ""
-%files Russian
-%defattr(-,root,root,-)
-%lang(ru) %{tde_datadir}/locale/ru/*
-%lang(ru) %{tde_tdedocdir}/HTML/ru/
-%endif
-
-%if "%( grep -w sk <<< '%{KDE_LANGS}' )" != ""
-%files Slovak
-%defattr(-,root,root,-)
-%lang(sk) %{tde_datadir}/locale/sk/*
-%lang(sk) %{tde_tdedocdir}/HTML/sk/
-%endif
-
-%if "%( grep -w sl <<< '%{KDE_LANGS}' )" != ""
-%files Slovenian
-%defattr(-,root,root,-)
-%lang(sl) %{tde_datadir}/locale/sl/*
-%lang(sl) %{tde_tdedocdir}/HTML/sl/
-%endif
-
-%if "%( grep -w sr <<< '%{KDE_LANGS}' )" != ""
-%files Serbian
-%defattr(-,root,root,-)
-%lang(sr) %{tde_datadir}/locale/sr/*
-%lang(sr) %{tde_tdedocdir}/HTML/sr/
-%endif
-
-%if "%( grep -w sv <<< '%{KDE_LANGS}' )" != ""
-%files Swedish
-%defattr(-,root,root,-)
-%lang(sv) %{tde_datadir}/locale/sv/*
-%lang(sv) %{tde_tdedocdir}/HTML/sv/
-%endif
-
-%if "%( grep -w ta <<< '%{KDE_LANGS}' )" != ""
-%files Tamil
-%defattr(-,root,root,-)
-%lang(ta) %{tde_datadir}/locale/ta/*
-%endif
-
-%if "%( grep -w tg <<< '%{KDE_LANGS}' )" != ""
-%files Tajik
-%defattr(-,root,root,-)
-%lang(tg) %{tde_datadir}/locale/tg/*
-%endif
-
-%if "%( grep -w th <<< '%{KDE_LANGS}' )" != ""
-%files Thai
-%defattr(-,root,root,-)
-%lang(th) %{tde_datadir}/locale/th/*
-%endif
-
-%if "%( grep -w tr <<< '%{KDE_LANGS}' )" != ""
-%files Turkish
-%defattr(-,root,root,-)
-%lang(tr) %{tde_datadir}/locale/tr/*
-%lang(tr) %{tde_tdedocdir}/HTML/tr/
-%endif
-
-%if "%( grep -w uk <<< '%{KDE_LANGS}' )" != ""
-%files Ukrainian
-%defattr(-,root,root,-)
-%lang(uk) %{tde_tdedocdir}/HTML/uk/
-%lang(uk) %{tde_datadir}/locale/uk/*
-%endif
-
-%if "%( grep -w ven <<< '%{KDE_LANGS}' )" != ""
-%files Venda
-%defattr(-,root,root,-)
-%lang(ven) %{tde_datadir}/locale/ven/*
-%endif
-
-%if "%( grep -w vi <<< '%{KDE_LANGS}' )" != ""
-%files Vietnamese
-%defattr(-,root,root,-)
-%lang(vi) %{tde_datadir}/locale/vi/*
-%endif
-
-%if "%( grep -w wa <<< '%{KDE_LANGS}' )" != ""
-%files Walloon
-%defattr(-,root,root,-)
-%lang(wa) %{tde_datadir}/locale/wa/*
-%endif
-
-%if "%( grep -w xh <<< '%{KDE_LANGS}' )" != ""
-%files Xhosa
-%defattr(-,root,root,-)
-%lang(xh) %{tde_datadir}/locale/xh/*
-%lang(xh) %{tde_tdedocdir}/HTML/xh/
-%endif
-
-%if "%( grep -w zh_CN <<< '%{KDE_LANGS}' )" != ""
-%files Chinese
-%defattr(-,root,root,-)
-%lang(zh_CN) %{tde_datadir}/locale/zh_CN/*
-%lang(zh_CN) %{tde_tdedocdir}/HTML/zh_CN/
-%endif
-
-%if "%( grep -w zh_TW <<< '%{KDE_LANGS}' )" != ""
-%files Chinese-Big5
-%defattr(-,root,root,-)
-%lang(zh_TW) %{tde_datadir}/locale/zh_TW/*
-%lang(zh_TW) %{tde_tdedocdir}/HTML/zh_TW/
-%endif
-
-%changelog
-* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13.1-1
-- Initial release for TDE 3.5.13.1
-
-* Wed Aug 15 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13-7
-- Renames to 'trinity-i18n'
-- Updates 'zh_TW' translations
-
-* Sun Dec 18 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-6
-- Updates French translations (mostly Kickoff Menu related)
-
-* Sun Dec 04 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-5
-- Removes 'kde-filesystem" dependancy
-
-* Fri Nov 26 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-4
-- Fix HTML directory location
-
-* Fri Nov 11 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-3
-- Re-adds missing files 'entry.desktop'
-- Updates zh_TW translation, thanks to Wei-Lun Chao
-
-* Tue Nov 01 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-2
-- Add missing french translations for TDE 3.5.13
-
-* Sun Oct 30 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-1
-- Initial release for RHEL 6, RHEL 5 and Fedora 15
-
-* Sun Dec 19 2010 Francois Andriot <francois.andriot@free.fr> - 3.5.13-0
-- Initial version (French language only)
-- Based on RHEL SPEC file 'kde-i18n'
-- Add 'patch0' to reflect modifications in 'kdesu' from 'kdebase' package
-- Import to GIT
diff --git a/redhat/tdelibs/kdelibs-3.5.12-fixx11h.patch b/redhat/tdelibs/kdelibs-3.5.12-fixx11h.patch
deleted file mode 100644
index 64fc9b841..000000000
--- a/redhat/tdelibs/kdelibs-3.5.12-fixx11h.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- branches/trinity/kdelibs/kdecore/fixx11h.h	2011/01/03 05:50:03	1211108
-+++ branches/trinity/kdelibs/kdecore/fixx11h.h	2011/01/12 22:19:14	1214091
-@@ -57,15 +57,18 @@
- 
- // template --->
- // Affects: Should be without side effects.
-+#ifndef _XTYPEDEF_BOOL
- #ifdef Bool
- #ifndef FIXX11H_Bool
- #define FIXX11H_Bool
- typedef Bool XBool;
- #undef Bool
-+#define _XTYPEDEF_BOOL
- typedef XBool Bool;
- #endif
- #undef Bool
- #endif
-+#endif // _XTYPEDEF_BOOL
- // template <---
- 
- // Affects: Should be without side effects.
diff --git a/redhat/tdelibs/kdelibs-3.5.12-kstandarddirs_trinity.patch b/redhat/tdelibs/kdelibs-3.5.12-kstandarddirs_trinity.patch
deleted file mode 100644
index e19aa739f..000000000
--- a/redhat/tdelibs/kdelibs-3.5.12-kstandarddirs_trinity.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- kdelibs/kdecore/kstandarddirs.cpp.ORI	2011-12-09 23:13:50.089238165 +0100
-+++ kdelibs/kdecore/kstandarddirs.cpp	2011-12-09 23:16:23.133210143 +0100
-@@ -839,7 +839,7 @@
-                 }
- 		// UGLY HACK - Chris CHeney
- 		if (local && (!strcmp("config", type)))
--		  candidates->append("/etc/kde3/");
-+		  candidates->append("/etc/trinity/");
- 		//
-                 local = false;
-             }
-@@ -1030,7 +1030,7 @@
-     if (!strcmp(type, "html-bundle"))
- 	return "share/doc-bundle/HTML/";
-     if (!strcmp(type, "html"))
--	return "share/doc/kde/HTML/";
-+	return "share/doc/HTML/";
-     if (!strcmp(type, "icon"))
- 	return "share/icons/";
-     if (!strcmp(type, "config"))
-@@ -1336,7 +1336,7 @@
-     }
-     else
-     {
--       localKdeDir =  TQDir::homeDirPath() + "/.kde3/";
-+       localKdeDir =  TQDir::homeDirPath() + "/.trinity/";
-     }
- 
-     if (localKdeDir != QString("-/"))
diff --git a/redhat/tdelibs/kdelibs-3.5.12.spec b/redhat/tdelibs/kdelibs-3.5.12.spec
deleted file mode 100644
index 4c31bba3e..000000000
--- a/redhat/tdelibs/kdelibs-3.5.12.spec
+++ /dev/null
@@ -1,369 +0,0 @@
-# Default version for this component
-%if "%{?version}" == ""
-%define version 3.5.12
-%endif
-%define release 10
-
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?_prefix}" != "/usr"
-%define _variant .opt
-%define _docdir %{_prefix}/share/doc
-%endif
-
-# TDE 3.5.12 specific variables
-BuildRequires:	autoconf automake libtool m4
-%define tde_docdir %{_docdir}
-%define tde_libdir %{_libdir}/kde3
-
-# Older RHEL/Fedora versions use packages named "qt", "qt-devel", ..
-# whereas newer versions use "qt3", "qt3-devel" ...
-%if 0%{?rhel} >= 6 || 0%{?fedora} >= 8
-%define _qt_suffix 3
-%endif
-
-
-Name:		trinity-kdelibs
-Version:	%{version}
-Release:	%{?release}%{?dist}%{?_variant}
-License:	GPL
-Summary:	TDE Libraries
-Group:		System Environment/Libraries
-
-Vendor:		Trinity Project
-Packager:	Francois Andriot <francois.andriot@free.fr>
-URL:		http://www.trinitydesktop.org/
-
-Prefix:		%{_prefix}
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:	kdelibs-%{version}.tar.gz
-
-# TDE 3.5.12 patches for RHEL/Fedora build
-## [kdelibs/kio/kio] Removes the maximum line length detection
-Patch0:		kdelibs-3.5.13-maxlinelength.patch
-## [kdecore] sets TDE 3.5.12 defaults directories
-Patch1:		kdelibs-3.5.12-kstandarddirs_trinity.patch
-## [kdelibs/kdecore] fixed a conflict between fixx11h.h and Xdefs.h
-Patch2:		kdelibs-3.5.12-fixx11h.patch
-
-BuildRequires:	libtool
-BuildRequires:	tqtinterface-devel
-BuildRequires:	trinity-arts-devel
-BuildRequires:	avahi-devel
-BuildRequires:	lua-devel
-BuildRequires:	krb5-devel libxslt-devel cups-devel libart_lgpl-devel pcre-devel
-BuildRequires:	libutempter-devel
-BuildRequires:	bzip2-devel
-BuildRequires:	openssl-devel
-BuildRequires:	gcc-c++
-BuildRequires:	alsa-lib-devel
-BuildRequires:	libidn-devel
-BuildRequires:	qt%{?_qt_suffix}-devel
-BuildRequires:	avahi-qt3-devel
-BuildRequires:	jasper-devel
-BuildRequires:	libtiff-devel
-BuildRequires:	OpenEXR-devel
-BuildRequires:	libtool-ltdl-devel
-BuildRequires:	glib2-devel
-
-Requires:		tqtinterface
-Requires:		trinity-arts
-Requires:		avahi
-Requires:		qt%{?_qt_suffix}
-Requires:		avahi-qt3
-
-
-#Provides:	kdelibs%{?_qt_suffix} = %{version}
-%if "%{?_prefix}" == "/usr"
-Obsoletes:		kdelibs%{?_qt_suffix} <= 3.5.10
-%endif
-
-%description
-Libraries for the Trinity Desktop Environment:
-KDE Libraries included: kdecore (KDE core library), kdeui (user interface),
-kfm (file manager), khtmlw (HTML widget), kio (Input/Output, networking),
-kspell (spelling checker), jscript (javascript), kab (addressbook),
-kimgio (image manipulation).
-
-
-%package devel
-Summary:	%{name} - Development files
-Group:		Development/Libraries
-Requires:	%{name} = %{version}-%{release}
-Provides:	kdelibs%{?_qt_suffix}-devel = %{version}
-%if "%{?_prefix}" == "/usr"
-Obsoletes:	kdelibs%{?_qt_suffix}-devel <= 3.5.10
-%endif
-
-%description devel
-This package includes the header files you will need to compile
-applications for TDE.
-
-%package apidocs
-Group:		Development/Libraries
-Summary:	%{name} - API documentation
-Requires:	%{name} = %{version}-%{release}
-Provides:	kdelibs%{?_qt_suffix}-apidocs = %{version}
-%if "%{?_prefix}" == "/usr"
-Obsoletes:	kdelibs%{?_qt_suffix}-apidocs <= 3.5.10
-%endif
-
-%description apidocs
-This package includes the TDE API documentation in HTML
-format for easy browsing
-
-
-%prep
-%setup -q -n kdelibs
-%patch0 -p1
-%patch1 -p1
-%patch2 -p3
-
-%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
-
-%build
-unset QTDIR || : ; . /etc/profile.d/qt.sh
-export PATH="%{_bindir}:${PATH}"
-export LD_LIBRARY_PATH="%{_libdir}"
-export LDFLAGS="-L%{_libdir} -I%{_includedir}"
-
-# On older RHEL, libXrandr is too old so krandr cannot be compiled.
-# Kspell2 does not compile either.
-%if 0%{?rhel} && 0%{?rhel} <= 5
-export DO_NOT_COMPILE="krandr"
-%endif
-
-%configure \
-  --disable-rpath \
-  --enable-new-ldflags \
-  --disable-dependency-tracking \
-  --disable-debug --disable-warnings --enable-final \
-  --disable-fast-malloc \
-  --enable-cups \
-  --enable-mitshm \
-  --enable-pie \
-  --enable-sendfile \
-  --with-distribution="$(cat /etc/redhat-release 2>/dev/null)" \
-  --with-alsa \
-  --without-aspell \
-  --without-hspell \
-  --disable-libfam \
-  --enable-dnotify \
-  --enable-inotify \
-  --with-utempter \
-  --with-jasper \
-  --with-openexr \
-  --with-xinerama \
-  --enable-closure \
-  --with-extra-includes=%{_includedir}/tqt
-  
-# Do NOT use %{?_smp_mflags} for this package, or it will fail to build !
-%__make
-
-
-%install
-%__rm -rf %{?buildroot}
-%__make install DESTDIR=%{?buildroot}
-
-%if "%{?_prefix}" != "/usr"
-%__mkdir_p "%{?buildroot}%{_sysconfdir}/ld.so.conf.d"
-cat <<EOF >"%{?buildroot}%{_sysconfdir}/ld.so.conf.d/trinity.conf"
-%{_libdir}
-EOF
-%endif
-
-# Moves the XDG configuration files to TDE directory
-%if "%{_prefix}" != "/usr"
-%__install -p -D -m644 \
-	"%{?buildroot}%{_sysconfdir}/xdg/menus/applications.menu" \
-	"%{?buildroot}%{_prefix}/etc/xdg/menus/kde-applications.menu"
-%__rm -rf "%{?buildroot}%{_sysconfdir}/xdg"
-%else
-%__mv -f "%{?buildroot}%{_sysconfdir}/xdg/menus/applications.menu" "%{?buildroot}%{_sysconfdir}/xdg/menus/kde-applications.menu"
-%endif
-
-
-%clean
-%__rm -rf %{?buildroot}
-
-
-%post
-/sbin/ldconfig
-
-%postun
-/sbin/ldconfig
-
-
-%files
-%defattr(-,root,root,-)
-%doc AUTHORS COPYING* README TODO
-%{_bindir}/artsmessage
-%{_bindir}/cupsdconf
-%{_bindir}/cupsdoprint
-%{_bindir}/dcop
-%{_bindir}/dcopclient
-%{_bindir}/dcopfind
-%{_bindir}/dcopobject
-%{_bindir}/dcopquit
-%{_bindir}/dcopref
-%{_bindir}/dcopserver
-%{_bindir}/dcopserver_shutdown
-%{_bindir}/dcopstart
-%{_bindir}/filesharelist
-%{_bindir}/fileshareset
-%{_bindir}/imagetops
-%{_bindir}/kab2kabc
-%{_bindir}/kaddprinterwizard
-%{_bindir}/kbuildsycoca
-%{_bindir}/kcmshell
-%{_bindir}/kconf_update
-%{_bindir}/kcookiejar
-%{_bindir}/kde-config
-%{_bindir}/kde-menu
-%{_bindir}/kded
-%{_bindir}/kdeinit
-%{_bindir}/kdeinit_shutdown
-%{_bindir}/kdeinit_wrapper
-%{_bindir}/kdesu_stub
-%{_bindir}/kdontchangethehostname
-%{_bindir}/kdostartupconfig
-%{_bindir}/kfile
-%{_bindir}/kfmexec
-%{_bindir}/khotnewstuff
-%{_bindir}/kinstalltheme
-%{_bindir}/kio_http_cache_cleaner
-%{_bindir}/kio_uiserver
-%{_bindir}/kioexec
-%{_bindir}/kioslave
-%{_bindir}/klauncher
-%{_bindir}/kmailservice
-%{_bindir}/kmimelist
-%attr(4755,root,root) %{_bindir}/kpac_dhcp_helper
-%{_bindir}/ksendbugmail
-%{_bindir}/kshell
-%{_bindir}/kstartupconfig
-%{_bindir}/ktelnetservice
-%{_bindir}/ktradertest
-%{_bindir}/kwrapper
-%{_bindir}/lnusertemp
-%{_bindir}/make_driver_db_cups
-%{_bindir}/make_driver_db_lpr
-%{_bindir}/meinproc
-%{_bindir}/networkstatustestservice
-%{_bindir}/start_kdeinit
-%{_bindir}/start_kdeinit_wrapper
-%attr(4755,root,root) %{_bindir}/kgrantpty
-%{_libdir}/lib*.so.*
-%{_libdir}/libkdeinit_*.so
-%{_libdir}/lib*.la
-%{tde_libdir}/
-%{_datadir}/applications/kde/*.desktop
-%{_datadir}/autostart/kab2kabc.desktop
-%{_datadir}/applnk/kio_iso.desktop
-%{_datadir}/apps/*
-%exclude %{_datadir}/apps/ksgmltools2/
-%config(noreplace) %{_datadir}/config/*
-%{_datadir}/emoticons/*
-%{_datadir}/icons/default.kde
-%{_datadir}/mimelnk/magic
-%{_datadir}/mimelnk/*/*.desktop
-%{_datadir}/services/*
-%{_datadir}/servicetypes/*
-%{_datadir}/icons/crystalsvg/
-%{tde_docdir}/HTML/en/kspell
-# remove conflicts with kdelibs-4
-%if "%{?_prefix}" != "/usr"
-%{_bindir}/checkXML
-%{_bindir}/ksvgtopng
-%{_bindir}/kunittestmodrunner
-%{_bindir}/preparetips
-%{_datadir}/icons/hicolor/index.theme
-%{_datadir}/locale/all_languages
-%{tde_docdir}/HTML/en/common/*
-%else
-%exclude %{_bindir}/checkXML
-%exclude %{_bindir}/ksvgtopng
-%exclude %{_bindir}/kunittestmodrunner
-%exclude %{_bindir}/preparetips
-%exclude %{_datadir}/config/colors
-%exclude %{_datadir}/config/kdebug.areas
-%exclude %{_datadir}/config/kdebugrc
-%exclude %{_datadir}/config/ksslcalist
-%exclude %{_datadir}/config/ui/ui_standards.rc
-%exclude %{_datadir}/icons/hicolor/index.theme
-%exclude %{_datadir}/locale/all_languages
-%exclude %{tde_docdir}/HTML/en/common/*
-%endif
-# ld.so.conf needed only if installed under '/opt/trinity'
-%if "%{?_prefix}" != "/usr"
-%{_sysconfdir}/ld.so.conf.d/trinity.conf
-%endif
-
-# Avoid conflict with 'redhat-menus' package
-%if "%{_prefix}" == "/usr"
-%{_sysconfdir}/xdg/menus/kde-applications.menu
-%else
-%{_prefix}/etc/xdg/menus/kde-applications.menu
-%endif
-
-%files devel
-%defattr(-,root,root,-)
-%{_bindir}/dcopidl*
-%{_bindir}/kconfig_compiler
-%{_bindir}/makekdewidgets
-%{_datadir}/apps/ksgmltools2/
-%{_includedir}/
-%{_libdir}/lib*.so
-%{_libdir}/lib*.a
-%exclude %{_libdir}/libkdeinit_*.so
-
-%files apidocs
-%defattr(-,root,root,-)
-%{_docdir}/%{name}-%{version}/
-%{tde_docdir}/HTML/en/kdelibs*
-
-
-%changelog
-* Fri Dec 09 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.12-10
-- Fix conflict with distro-provided KDE
-- Fix HTML directory location
-- Change defaults TDE directory to '/etc/trinity' and '~/.trinity'
-- Removes 'ld.so.conf.d' when installed under '/usr'
-
-* Sun Nov 29 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.12-9
-- Moves XDG files in TDE prefix to avoid conflict with distro-provided KDE
-- Disable 'max line length' detection
-- Add missing BuildRequires
-
-* Fri Sep 16 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.12-8
-- Add support for RHEL 5.
-
-* Thu Sep 15 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.12-7
-- Add missings 'BuildRequires'
-- Re-add lost 'ld.so.conf' file
-
-* Mon Sep 12 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.12-6
-- Add "Group" field
-
-* Sun Sep 04 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.12-5
-- Import to GIT
-- Removes cmake stuff, build with autotools only
-
-* Tue Aug 23 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.12-4
-- Add missing BuildRequires
-
-* Mon Aug 22 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.12-3
-- Correct macro to install under "/opt", if desired
-
-* Sun Dec 19 2010 Francois Andriot <francois.andriot@free.fr> - 3.5.12-2
-- Rebuilt 
-
-* Fri Dec 17 2010 Francois Andriot <francois.andriot@free.fr> - 3.5.12-1
-- Add macro _kde3_prefix to define custom installation prefix (ex: /opt/trinity)
-- Add '--with-extra-includes=%{_includedir}/tqt'
-
-* Wed Dec 14 2010 Francois Andriot <francois.andriot@free.fr> - 3.5.12-0
-- Initial version
diff --git a/redhat/tdelibs/kdelibs-3.5.13-add_dynamic_label_to_kpassword.patch b/redhat/tdelibs/kdelibs-3.5.13-add_dynamic_label_to_kpassword.patch
deleted file mode 100644
index b6f0ea0cb..000000000
--- a/redhat/tdelibs/kdelibs-3.5.13-add_dynamic_label_to_kpassword.patch
+++ /dev/null
@@ -1,139 +0,0 @@
-commit 3c75231601fb35f0c91022abeee5117c81f70a62
-Author: Timothy Pearson <kb9vqf@pearsoncomputing.net>
-Date:   1339293731 -0500
-
-    Add dynamic label support to kpassworddialog
-
-diff --git a/kdeui/kpassdlg.cpp b/kdeui/kpassdlg.cpp
-index a9625b8..489e14d 100644
---- ./kdeui/kpassdlg.cpp.orig	2011-08-11 04:30:26.000000000 +0200
-+++ ./kdeui/kpassdlg.cpp	2012-06-19 20:10:16.766136524 +0200
-@@ -32,6 +32,7 @@
- #include <tqhbox.h>
- #include <tqwhatsthis.h>
- #include <tqptrdict.h>
-+#include <tqtimer.h>
- 
- #include <kglobal.h>
- #include <kdebug.h>
-@@ -305,7 +306,7 @@
- KPasswordDialog::KPasswordDialog(Types type, bool enableKeep, int extraBttn,
-                                  TQWidget *parent, const char *name)
-     : KDialogBase(parent, name, true, "", Ok|Cancel|extraBttn,
--                  Ok, true), m_Keep(enableKeep? 1 : 0), m_Type(type), d(new KPasswordDialogPrivate)
-+                  Ok, true), m_Keep(enableKeep? 1 : 0), m_keepWarnLbl(0), m_Type(type), d(new KPasswordDialogPrivate)
- {
-     d->iconName = "password";
-     init();
-@@ -314,7 +315,7 @@
- KPasswordDialog::KPasswordDialog(Types type, bool enableKeep, int extraBttn, const TQString& icon,
- 				  TQWidget *parent, const char *name )
-     : KDialogBase(parent, name, true, "", Ok|Cancel|extraBttn,
--                  Ok, true), m_Keep(enableKeep? 1 : 0), m_Type(type), d(new KPasswordDialogPrivate)
-+                  Ok, true), m_Keep(enableKeep? 1 : 0), m_keepWarnLbl(0), m_Type(type), d(new KPasswordDialogPrivate)
- {
-     if ( icon.stripWhiteSpace().isEmpty() )
- 	d->iconName = "password";
-@@ -326,7 +327,7 @@
- KPasswordDialog::KPasswordDialog(int type, TQString prompt, bool enableKeep,
-                                  int extraBttn)
-     : KDialogBase(0L, "Password Dialog", true, "", Ok|Cancel|extraBttn,
--                  Ok, true), m_Keep(enableKeep? 1 : 0), m_Type(type), d(new KPasswordDialogPrivate)
-+                  Ok, true), m_Keep(enableKeep? 1 : 0), m_keepWarnLbl(0), m_Type(type), d(new KPasswordDialogPrivate)
- {
-     d->iconName = "password";
-     init();
-@@ -393,12 +394,20 @@
- 	m_pGrid->setRowStretch(8, 12);
- 	TQCheckBox* const cb = new TQCheckBox(i18n("&Keep password"), m_pMain);
- 	cb->setFixedSize(cb->tqsizeHint());
--	if (m_Keep > 1)
-+	m_keepWarnLbl = new TQLabel(m_pMain);
-+	m_keepWarnLbl->setAlignment(AlignLeft|AlignVCenter|WordBreak);
-+	if (m_Keep > 1) {
- 	    cb->setChecked(true);
--	else
-+	    m_keepWarnLbl->show();
-+	}
-+	else {
- 	    m_Keep = 0;
-+	    m_keepWarnLbl->hide();
-+	}
- 	connect(cb, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotKeep(bool)));
- 	m_pGrid->addWidget(cb, 9, 2, (TQ_Alignment)(AlignLeft|AlignVCenter));
-+//	m_pGrid->addWidget(m_keepWarnLbl, 13, 2, (TQ_Alignment)(AlignLeft|AlignVCenter));
-+	m_pGrid->addMultiCellWidget(m_keepWarnLbl, 13, 13, 0, 3);
-     } else if (m_Type == NewPassword) {
- 	m_pGrid->addRowSpacing(8, 10);
- 	lbl = new TQLabel(m_pMain);
-@@ -475,6 +484,13 @@
-     m_pHelpLbl->setFixedSize(275, m_pHelpLbl->heightForWidth(275));
- }
- 
-+void KPasswordDialog::setKeepWarning(TQString warn)
-+{
-+    if (m_keepWarnLbl) {
-+        m_keepWarnLbl->setText(warn);
-+    }
-+}
-+
- 
- TQString KPasswordDialog::prompt() const
- 
-@@ -550,9 +566,24 @@
- 
- void KPasswordDialog::slotKeep(bool keep)
- {
-+    if (m_keepWarnLbl->text() != "") {
-+        if (keep) {
-+            m_keepWarnLbl->show();
-+        }
-+        else {
-+            m_keepWarnLbl->hide();
-+        }
-+        TQTimer::singleShot(0, this, SLOT(slotLayout()));
-+    }
-+
-     m_Keep = keep;
- }
- 
-+void KPasswordDialog::slotLayout()
-+{
-+    resize(sizeHint());
-+}
-+
- 
- // static . antlarr: KDE 4: Make it const TQString & prompt
- int KPasswordDialog::getPassword(TQCString &password, TQString prompt,
-diff --git a/kdeui/kpassdlg.h b/kdeui/kpassdlg.h
-index de83bb3..2d124b0 100644
---- a/kdeui/kpassdlg.h
-+++ b/kdeui/kpassdlg.h
-@@ -246,6 +246,11 @@ public:
-     TQString prompt() const;
- 
-     /**
-+     * Sets the text to be dynamically displayed when the keep checkbox is checked
-+     */
-+    void setKeepWarning(TQString warn);
-+
-+    /**
-      * Adds a line of information to the dialog.
-      */
-     void addLine(TQString key, TQString value);
-@@ -380,6 +385,7 @@ protected slots:
-     void slotOk();
-     void slotCancel();
-     void slotKeep(bool);
-+    void slotLayout();
- 
- protected:
- 
-@@ -399,6 +405,7 @@ private:
- 
-     int m_Keep, m_Type, m_Row;
-     TQLabel *m_pHelpLbl;
-+    TQLabel *m_keepWarnLbl;
-     TQGridLayout *m_pGrid;
-     TQWidget *m_pMain;
-     KPasswordEdit *m_pEdit, *m_pEdit2;
diff --git a/redhat/tdelibs/kdelibs-3.5.13-add_inotify_support.patch b/redhat/tdelibs/kdelibs-3.5.13-add_inotify_support.patch
deleted file mode 100644
index 97afbc7a7..000000000
--- a/redhat/tdelibs/kdelibs-3.5.13-add_inotify_support.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-commit 24f144faf98249012e7b1657a5dfe93750f0dfde
-Author: Timothy Pearson <kb9vqf@pearsoncomputing.net>
-Date:   1326095653 -0600
-
-    Add inotify CMake support to tdelibs
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index e26c252..ede0a3a 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -76,6 +76,7 @@
- OPTION( WITH_UTEMPTER "Use utempter for utmp management" OFF )
- OPTION( WITH_AVAHI "Enable AVAHI support" OFF )
- OPTION( WITH_PCRE "Enable pcre regex support for kjs" ON )
-+OPTION( WITH_INOTIFY "Enable inotify support for kio" ON )
- 
- OPTION( WITH_ASPELL "Enable aspell support" OFF )
- OPTION( WITH_HSPELL "Enable hspell support" OFF )
-@@ -726,6 +727,26 @@ if( WITH_GCC_VISIBILITY )
-   set( HAVE_PCREPOSIX 1 )
- endif( )
-
-+##### check for inotify ###########################
-+
-+if( WITH_INOTIFY )
-+  check_include_file( "inotify.h" INOTIFY_FOUND )
-+  check_include_file( "sys/inotify.h" INOTIFY_SYS_FOUND )
-+  if( NOT INOTIFY_FOUND )
-+    if( NOT INOTIFY_SYS_FOUND )
-+      message(FATAL_ERROR "\ninotify support was requested, but inotify was not found on your system" )
-+    endif( NOT INOTIFY_SYS_FOUND )
-+  endif( NOT INOTIFY_FOUND )
-+  if( INOTIFY_FOUND )
-+      set( HAVE_INOTIFY 1 )
-+  endif( INOTIFY_FOUND )
-+  if( INOTIFY_SYS_FOUND )
-+      set( HAVE_INOTIFY 1 )
-+      set( HAVE_SYS_INOTIFY 1 )
-+  endif( INOTIFY_SYS_FOUND )
-+endif( )
-+
-+
- ##### check for aspell ##########################
- # we need ASPELL_DATADIR too
- 
-diff --git a/config.h.cmake b/config.h.cmake
-index 1893270..d9b0ef5 100644
---- a/config.h.cmake
-+++ b/config.h.cmake
-@@ -234,7 +234,7 @@
- #cmakedefine HAVE_INITGROUPS_PROTO 1
- 
- /* Define if your system has Linux Inode Notification */
--#undef HAVE_INOTIFY
-+#cmakedefine HAVE_INOTIFY 1
- 
- /* Define to 1 if you have the <inttypes.h> header file. */
- #cmakedefine HAVE_INTTYPES_H 1
-@@ -555,7 +555,7 @@
- #cmakedefine HAVE_SYS_FILIO_H 1
- 
- /* Define if your system has glibc support for inotify */
--#undef HAVE_SYS_INOTIFY
-+#cmakedefine HAVE_SYS_INOTIFY 1
- 
- /* Define to 1 if you have the <sys/mman.h> header file. */
- #cmakedefine HAVE_SYS_MMAN_H 1
diff --git a/redhat/tdelibs/kdelibs-3.5.13-enable_fam_gamin.patch b/redhat/tdelibs/kdelibs-3.5.13-enable_fam_gamin.patch
deleted file mode 100644
index 42e1993d3..000000000
--- a/redhat/tdelibs/kdelibs-3.5.13-enable_fam_gamin.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-commit 2b035349c31fe64c31d2c050892b117a3a807179
-Author: Timothy Pearson <kb9vqf@pearsoncomputing.net>
-Date:   1326668093 -0600
-
-    Add fam/gamin support to tdelibs CMake
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 5ce186b..a1a6429 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -77,6 +77,7 @@ OPTION( WITH_ELFICON "Enable ELF embedded icon support" ${WITH_ALL_OPTIONS} )
- OPTION( WITH_AVAHI "Enable AVAHI support" OFF )
- OPTION( WITH_PCRE "Enable pcre regex support for kjs" ON )
- OPTION( WITH_INOTIFY "Enable inotify support for kio" ON )
-+OPTION( WITH_GAMIN "Enable FAM/GAMIN support" OFF )
- 
- OPTION( WITH_ASPELL "Enable aspell support" OFF )
- OPTION( WITH_HSPELL "Enable hspell support" OFF )
-@@ -786,6 +787,23 @@ if( WITH_INOTIFY )
- endif( )
- 
- 
-+##### check for FAM/GAMIN ##########################
-+
-+if( WITH_GAMIN )
-+  check_include_file( "fam.h" HAVE_FAM_H )
-+  if( HAVE_FAM_H )
-+    pkg_search_module( GAMIN gamin )
-+    if( GAMIN_FOUND )
-+      set( HAVE_FAM 1 )
-+    else( GAMIN_FOUND )
-+      message(FATAL_ERROR "\nfam/gamin support was requested, but gamin was not found on your system" )
-+    endif( GAMIN_FOUND )
-+  else( HAVE_FAM_H )
-+    message(FATAL_ERROR "\nfam/gamin support was requested, but fam was not found on your system" )
-+  endif( HAVE_FAM_H )
-+endif( WITH_GAMIN )
-+
-+
- ##### check for aspell ##########################
- # we need ASPELL_DATADIR too
- 
-diff --git a/config.h.cmake b/config.h.cmake
-index d9b0ef5..4e4bd18 100644
---- a/config.h.cmake
-+++ b/config.h.cmake
-@@ -120,7 +120,7 @@
- #undef HAVE_FADVISE
- 
- /* Define if your system has libfam */
--#undef HAVE_FAM
-+#cmakedefine HAVE_FAM 1
- 
- /* Define to 1 if you have the <float.h> header file. */
- #cmakedefine HAVE_FLOAT_H 1
-diff --git a/kio/kio/CMakeLists.txt b/kio/kio/CMakeLists.txt
-index 9d8790f..25d4fad 100644
---- a/kio/kio/CMakeLists.txt
-+++ b/kio/kio/CMakeLists.txt
-@@ -25,8 +25,12 @@ include_directories(
-   ${CMAKE_SOURCE_DIR}/kio
-   ${CMAKE_SOURCE_DIR}/kio/kssl
-   ${CMAKE_SOURCE_DIR}/interfaces
-+  ${GAMIN_INCLUDEDIR}
- )
- 
-+link_directories(
-+  ${GAMIN_LIBDIR}
-+)
- 
- ##### headers ###################################
- 
-@@ -112,4 +116,5 @@
- 
- tde_add_library( ${target} STATIC_PIC AUTOMOC
-   SOURCES ${${target}_SRCS}
-+  LINK ${GAMIN_LIBRARIES}
- )
- 
diff --git a/redhat/tdelibs/kdelibs-3.5.13-enable_pcre.patch b/redhat/tdelibs/kdelibs-3.5.13-enable_pcre.patch
deleted file mode 100644
index 089570a75..000000000
--- a/redhat/tdelibs/kdelibs-3.5.13-enable_pcre.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-Index: kjs/CMakeLists.txt
-===================================================================
---- kjs/CMakeLists.txt	(revision 1261450)
-+++ kjs/CMakeLists.txt	(working copy)
-@@ -15,10 +15,12 @@
-   ${CMAKE_CURRENT_BINARY_DIR}
-   ${CMAKE_BINARY_DIR}
-   ${CMAKE_SOURCE_DIR}/kdecore
-+  ${LIBPCRE_INCLUDEDIR}
- )
- 
- link_directories(
-   ${TQT_LIBRARY_DIRS}
-+  ${LIBPCRE_LIBDIR}
- )
- 
- 
-@@ -59,6 +61,6 @@
- tde_add_library( ${target} SHARED
-   SOURCES ${${target}_SRCS}
-   VERSION 1.2.0
--  LINK kdecore-shared
-+  LINK kdecore-shared ${LIBPCRE_LIBRARIES}
-   DESTINATION ${LIB_INSTALL_DIR}
- )
-Index: CMakeLists.txt
-===================================================================
---- CMakeLists.txt	(revision 1261450)
-+++ CMakeLists.txt	(working copy)
-@@ -75,6 +75,7 @@
- OPTION( WITH_OPENEXR "Enable openexr support" OFF )
- OPTION( WITH_UTEMPTER "Use utempter for utmp management" OFF )
- OPTION( WITH_AVAHI "Enable AVAHI support" OFF )
-+OPTION( WITH_PCRE "Enable pcre regex support for kjs" ON )
- 
- OPTION( WITH_ASPELL "Enable aspell support" OFF )
- OPTION( WITH_HSPELL "Enable hspell support" OFF )
-@@ -715,6 +716,16 @@
-   endif( WITH_QT3 )
- endif( )
- 
-+##### check for pcre ###########################
-+
-+if( WITH_PCRE )
-+  pkg_search_module( LIBPCRE libpcre )
-+  if( NOT LIBPCRE_FOUND )
-+      message(FATAL_ERROR "\npcre support are requested, but not found on your system" )
-+  endif( NOT LIBPCRE_FOUND )
-+  set( HAVE_PCREPOSIX 1 )
-+endif( )
-+
- ##### check for aspell ##########################
- # we need ASPELL_DATADIR too
- 
-Index: config.h.cmake
-===================================================================
---- config.h.cmake	(revision 1261450)
-+++ config.h.cmake	(working copy)
-@@ -366,7 +366,7 @@
- #cmakedefine HAVE_PATHS_H 1
- 
- /* Define if you have pcreposix libraries and header files. */
--#undef HAVE_PCREPOSIX
-+#cmakedefine HAVE_PCREPOSIX 1
- 
- /* Define to 1 if you have the `poll' function. */
- #cmakedefine HAVE_POLL 1
diff --git a/redhat/tdelibs/kdelibs-3.5.13-fix_UTF8_encoding_for_WebDAV_directories.patch b/redhat/tdelibs/kdelibs-3.5.13-fix_UTF8_encoding_for_WebDAV_directories.patch
deleted file mode 100644
index 6fa9a085a..000000000
--- a/redhat/tdelibs/kdelibs-3.5.13-fix_UTF8_encoding_for_WebDAV_directories.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From 1f37c9cdb9bb47f8453cf26af8006c7c8d4ca3b3 Mon Sep 17 00:00:00 2001
-From: Thorsten Glaser <t.glaser@tarent.de>
-Date: Tue, 27 Dec 2011 14:28:27 +0100
-Subject: [PATCH] fix UTF-8 encoding for WebDAV directories
-
-idea derived from KIO slave http.cpp from KDE 4; reimplemented
-on top of Qt3/KDE3 APIs
-
-Bug: http://bugs.kde.org/show_bug.cgi?id=127251
-
-Signed-off-by: Thorsten Glaser <t.glaser@tarent.de>
----
- kioslave/http/http.cc |    6 ++++++
- 1 files changed, 6 insertions(+), 0 deletions(-)
-
-diff --git a/kioslave/http/http.cc b/kioslave/http/http.cc
-index a1495d7..16b785d 100644
---- a/kioslave/http/http.cc
-+++ b/kioslave/http/http.cc
-@@ -45,6 +45,7 @@
- #include <tqregexp.h>
- #include <tqdatetime.h>
- #include <tqstringlist.h>
-+#include <tqurl.h>
- 
- #include <kurl.h>
- #include <kidna.h>
-@@ -750,9 +751,14 @@ void HTTPProtocol::davStatList( const KURL& url, bool stat )
-       entry.clear();
- 
-       TQString urlStr = href.text();
-+#if 0
-       int encoding = remoteEncoding()->encodingMib();
-       if ((encoding == 106) && (!KStringHandler::isUtf8(KURL::decode_string(urlStr, 4).latin1())))
-         encoding = 4; // Use latin1 if the file is not actually utf-8
-+#else
-+      TQUrl::decode(urlStr);
-+      int encoding = 106;
-+#endif
- 
-       KURL thisURL ( urlStr, encoding );
- 
--- 
-1.7.2.3
-
diff --git a/redhat/tdelibs/kdelibs-3.5.13-fix_add_printer.patch b/redhat/tdelibs/kdelibs-3.5.13-fix_add_printer.patch
deleted file mode 100644
index 5fb5aa576..000000000
--- a/redhat/tdelibs/kdelibs-3.5.13-fix_add_printer.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-commit 87201a3741bd9d4b4638be7b3d8c44a737115b0f
-Author: Timothy Pearson <kb9vqf@pearsoncomputing.net>
-Date:   1325899796 -0600
-
-    Fix make_driver_db_cups path
-    This closes Bug 383
-
-diff --git a/kdeprint/cups/kmcupsmanager.cpp b/tdeprint/cups/kmcupsmanager.cpp
-index 635cfd5..4a64248 100644
---- a/kdeprint/cups/kmcupsmanager.cpp
-+++ b/kdeprint/cups/kmcupsmanager.cpp
-@@ -95,7 +95,7 @@ KMCupsManager::~KMCupsManager()
- 
- TQString KMCupsManager::driverDbCreationProgram()
- {
--	return TQString::tqfromLatin1("/opt/trinity/bin/make_driver_db_cups");
-+	return TQString(__KDE_BINDIR).append(TQString::fromLatin1("/make_driver_db_cups"));
- }
- 
- TQString KMCupsManager::driverDirectory()
diff --git a/redhat/tdelibs/kdelibs-3.5.13-fix_all_languages_installation.patch b/redhat/tdelibs/kdelibs-3.5.13-fix_all_languages_installation.patch
deleted file mode 100644
index 6b0b93760..000000000
--- a/redhat/tdelibs/kdelibs-3.5.13-fix_all_languages_installation.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- kdelibs/kdecore/CMakeLists.txt.ORI	2012-08-09 21:10:26.125863261 +0200
-+++ kdelibs/kdecore/CMakeLists.txt	2012-08-09 21:12:08.928750681 +0200
-@@ -73,7 +73,8 @@
- 
- ##### other data ################################
- 
--tde_install_empty_directory( ${LOCALE_INSTALL_DIR}/all_languages )
-+install( FILES all_languages.desktop
-+  DESTINATION ${LOCALE_INSTALL_DIR} RENAME all_languages )
- 
- install( FILES 40.colors Web.colors Royal.colors Rainbow.colors
-   DESTINATION ${CONFIG_INSTALL_DIR}/colors )
-@@ -87,7 +88,6 @@
- install( FILES eventsrc
-   DESTINATION ${DATA_INSTALL_DIR}/knotify )
- 
--
- ##### libkdecore ################################
- 
- set( target kdecore )
diff --git a/redhat/tdelibs/kdelibs-3.5.13-fix_build_kspell2.patch b/redhat/tdelibs/kdelibs-3.5.13-fix_build_kspell2.patch
deleted file mode 100644
index b34f3bf7e..000000000
--- a/redhat/tdelibs/kdelibs-3.5.13-fix_build_kspell2.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-commit 3e284fadb9110cdd2a2dcf9c2e960c74f15e0360
-Author: Slávek Banko <slavek.banko@axis.cz>
-Date:   1339570958 +0200
-
-    Fix FTBFS - incomplete build kspell2
-    This closes Bug 657
-
-diff --git a/kspell2/ui/CMakeLists.txt b/kspell2/ui/CMakeLists.txt
-index 65ea158..a83774d 100644
---- a/kspell2/ui/CMakeLists.txt
-+++ b/kspell2/ui/CMakeLists.txt
-@@ -54,12 +54,14 @@ tde_add_library( ${target} STATIC_PIC AUTOMOC
- set( target kspell2 )
- 
- set( ${target}_SRCS
-+  configwidget.cpp highlighter.cpp configdialog.cpp
-+  kspell2ui.ui configui.ui
-   dialog.cpp
- )
- 
- tde_add_library( ${target} SHARED AUTOMOC
-   SOURCES ${${target}_SRCS}
-   VERSION 1.0.0
--  LINK kspell2-static kspell2base-static kutils-shared
-+  LINK kspell2base-static kutils-shared
-   DESTINATION ${LIB_INSTALL_DIR}
- )
diff --git a/redhat/tdelibs/kdelibs-3.5.13-fix_composition_extension_detection.patch b/redhat/tdelibs/kdelibs-3.5.13-fix_composition_extension_detection.patch
deleted file mode 100644
index 1192b8616..000000000
--- a/redhat/tdelibs/kdelibs-3.5.13-fix_composition_extension_detection.patch
+++ /dev/null
@@ -1,159 +0,0 @@
-commit 41ea89f79d28c456b296e8ddcce0a12c21e13f94
-Author: Timothy Pearson <kb9vqf@pearsoncomputing.net>
-Date:   1337872714 -0500
-
-    Fix composition extension detection
-
-diff --git a/kdecore/kapplication.cpp b/kdecore/kapplication.cpp
-index 5c60e6f..b4caefc 100644
---- a/kdecore/kapplication.cpp
-+++ b/kdecore/kapplication.cpp
-@@ -1804,9 +1804,7 @@ bool KApplication::isCompositionManagerAvailable() {
- 
-         // Now that we did all that by way of introduction...read the file!
- 	FILE *pFile;
--	char buffer[255];
- 	pFile = fopen(filename, "r");
--	int kompmgrpid = 0;
- 	if (pFile) {
- 		have_manager = true;
- 		fclose(pFile);
-@@ -1840,18 +1838,23 @@ bool KApplication::detectCompositionManagerAvailable(bool force_available, bool
- 			compositing_manager_available = false;
- 		}
- 		else {
--			Window root_window = XDefaultRootWindow(dpy);
--			XCompositeRedirectSubwindows(dpy, root_window, CompositeRedirectManual);
--			XSync(dpy, false);
--			if (x11_composite_error_generated == true) {
--				compositing_manager_available = true;
-+			if (available) {		// FIXME This variable does double duty to avoid breaking the ABI for R14.0.  In reality it should be called perform_deep_check
-+				Window root_window = XDefaultRootWindow(dpy);
-+				XCompositeRedirectSubwindows(dpy, root_window, CompositeRedirectManual);
-+				XSync(dpy, false);
-+				if (x11_composite_error_generated == true) {
-+					compositing_manager_available = true;
-+				}
-+				else {
-+					XCompositeUnredirectSubwindows(dpy, root_window, CompositeRedirectManual);
-+					compositing_manager_available = false;
-+				}
-+				XSetErrorHandler(NULL);
-+				XCloseDisplay(dpy);
- 			}
- 			else {
--				XCompositeUnredirectSubwindows(dpy, root_window, CompositeRedirectManual);
--				compositing_manager_available = false;
-+				compositing_manager_available = true;
- 			}
--			XSetErrorHandler(NULL);
--			XCloseDisplay(dpy);
- 		}
- 	}
- 	
-@@ -1913,7 +1916,7 @@ Qt::HANDLE KApplication::getX11RGBAVisual(Display *dpy) {
- 		return argb_x11_visual;
- 	}
- 	else {
--		return NULL;
-+		return (Qt::HANDLE)NULL;
- 	}
- }
- 
-@@ -1923,7 +1926,7 @@ Qt::HANDLE KApplication::getX11RGBAColormap(Display *dpy) {
- 		return argb_x11_colormap;
- 	}
- 	else {
--		return NULL;
-+		return (Qt::HANDLE)NULL;
- 	}
- }
- 
-@@ -1997,8 +2000,20 @@ bool KApplication::detectCompositionManagerAvailable(bool force_available) {
- 	strcat(filename, home);
- 	strcat(filename, configfile);
- 
--	/* now that we did all that by way of introduction...remove the file! */
--	unlink(filename);
-+	/* now that we did all that by way of introduction...create or remove the file! */
-+	if (force_available) {
-+		FILE *pFile;
-+		char buffer[255];
-+		sprintf(buffer, "available");
-+		pFile = fopen(filename, "w");
-+		if (pFile) {
-+			fwrite(buffer,1,strlen(buffer), pFile);
-+			fclose(pFile);
-+		}
-+	}
-+	else {
-+		unlink(filename);
-+	}
- 
- 	free(filename);
- 	filename = NULL;
-@@ -2886,12 +2901,15 @@ void KApplication::invokeMailer(const TQString &_to, const TQString &_cc, const
-    TQString error;
-    // TODO this should check if cmd has a .desktop file, and use data from it, together
-    // with sending more ASN data
--   if (kdeinitExec(cmd, cmdTokens, &error, NULL, startup_id ))
--     if (Tty != kapp->type())
-+   if (kdeinitExec(cmd, cmdTokens, &error, NULL, startup_id )) {
-+     if (Tty != kapp->type()) {
-        TQMessageBox::critical(kapp->mainWidget(), i18n("Could not Launch Mail Client"),
-              i18n("Could not launch the mail client:\n\n%1").arg(error), i18n("&OK"));
--     else
-+       }
-+     else {
-        kdWarning() << "Could not launch mail client:\n" << error << endl;
-+     }
-+   }
- }
- #endif
- 
-@@ -3597,7 +3615,9 @@ void KApplication::sigpipeHandler(int)
- #ifndef NDEBUG
-     char msg[1000];
-     sprintf(msg, "*** SIGPIPE *** (ignored, pid = %ld)\n", (long) getpid());
--    write(2, msg, strlen(msg));
-+    if (write(2, msg, strlen(msg)) < 0) {
-+      // ERROR
-+    }
- #endif
- 
-     // Do nothing.
-diff --git a/kdecore/kdetcompmgr.cpp b/kdecore/kdetcompmgr.cpp
-index bfc3ac6..8b9b480 100644
---- a/kdecore/kdetcompmgr.cpp
-+++ b/kdecore/kdetcompmgr.cpp
-@@ -84,7 +84,6 @@ int main(int argc, char **argv)
-             if (lSize > 254)
-                 lSize = 254;
-             rewind (pFile);
--            size_t result = fread (buffer, 1, lSize, pFile);
-             fclose(pFile);
-             kompmgrpid = atoi(buffer);
-         }
-@@ -97,9 +96,7 @@ int main(int argc, char **argv)
-         }
-     }
- 
--//     app.detectCompositionManagerAvailable();
--
--//    if (!app.isCompositionManagerAvailable()) {
-+     if (app.detectCompositionManagerAvailable(false, false)) {		// Perform a shallow check for the composite extension (a deep check would cause noticeable flicker)
- 	KConfig config2("kwinrc", true);
- 	config2.setGroup( "Notification Messages" );
- 	if (config2.readBoolEntry("UseTranslucency",false)) {
-@@ -110,6 +107,10 @@ int main(int argc, char **argv)
- 		app.detectCompositionManagerAvailable(true, false);
- 		return 0;
- 	}
--//    }
-+     }
-+     else {
-+	app.detectCompositionManagerAvailable(true, false);
-+	return 1;
-+     }
- }
- 
diff --git a/redhat/tdelibs/kdelibs-3.5.13-fix_creation_of_profile_directory.patch b/redhat/tdelibs/kdelibs-3.5.13-fix_creation_of_profile_directory.patch
deleted file mode 100644
index b7f4e72dc..000000000
--- a/redhat/tdelibs/kdelibs-3.5.13-fix_creation_of_profile_directory.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- ./kdecore/kconfigbackend.cpp.orig	2011-08-11 04:30:15.000000000 +0200
-+++ ./kdecore/kconfigbackend.cpp	2012-06-18 23:27:20.034671093 +0200
-@@ -255,8 +255,7 @@
-       mLocalFileName = KGlobal::dirs()->saveLocation(resType) + mfileName;
- 
-    if (useKDEGlobals)
--      mGlobalFileName = KGlobal::dirs()->saveLocation("config") +
--	      TQString::tqfromLatin1("kdeglobals");
-+      mGlobalFileName = KGlobal::dirs()->saveLocation("config", TQString(), false) + TQString::fromLatin1("kdeglobals");
-    else
-       mGlobalFileName = TQString::null;
- 
diff --git a/redhat/tdelibs/kdelibs-3.5.13-fix_dcoptypes_h.patch b/redhat/tdelibs/kdelibs-3.5.13-fix_dcoptypes_h.patch
deleted file mode 100644
index 45b622f5b..000000000
--- a/redhat/tdelibs/kdelibs-3.5.13-fix_dcoptypes_h.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/dcop/dcoptypes.h.ORI	2012-04-24 16:24:05.448308109 -0400
-+++ a/dcop/dcoptypes.h	2012-04-24 16:43:55.299809919 -0400
-@@ -22,6 +22,9 @@
- #ifndef DCOPTYPES_H
- #define DCOPTYPES_H
- 
-+// generic template fallback for unknown types
-+template <class T> inline const char* dcopTypeName( const T& ) { return "<unknown>"; }
-+
- #include <dcopref.h>
- 
- // standard c/c++ types
-@@ -70,9 +73,6 @@
- // And some KDE types
- class KURL; inline const char* dcopTypeName( const KURL& ) { return "KURL"; }
- 
--// generic template fallback for unknown types
--template <class T> inline const char* dcopTypeName( const T& ) { return "<unknown>"; }
--
- // type initialization for standard c/c++ types
- inline void dcopTypeInit(bool& b){b=false;}
- inline void dcopTypeInit(char& c){c=0;}
diff --git a/redhat/tdelibs/kdelibs-3.5.13-fix_iso_kioslave.patch b/redhat/tdelibs/kdelibs-3.5.13-fix_iso_kioslave.patch
deleted file mode 100644
index 0e9ec5b62..000000000
--- a/redhat/tdelibs/kdelibs-3.5.13-fix_iso_kioslave.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-commit 0536f0b707bf86636096c962e9bb32adf3bb8112
-Author: Timothy Pearson <kb9vqf@pearsoncomputing.net>
-Date:   1341041394 -0500
-
-    Export kdemain symbol in iso kioslave
-    This closes Bug 465
-
-diff --git a/kioslave/iso/iso.cpp b/kioslave/iso/iso.cpp
-index 5865139..4bd128e 100644
---- a/kioslave/iso/iso.cpp
-+++ b/kioslave/iso/iso.cpp
-@@ -56,7 +56,7 @@ static const unsigned char zisofs_magic[8] = {
- 
- using namespace KIO;
- 
--extern "C" { int kdemain(int argc, char **argv); }
-+extern "C" { KDE_EXPORT int kdemain(int argc, char **argv); }
- 
- int kdemain( int argc, char **argv )
- {
diff --git a/redhat/tdelibs/kdelibs-3.5.13-fix_iso_kioslave_not_parsing_large_image_properly.patch b/redhat/tdelibs/kdelibs-3.5.13-fix_iso_kioslave_not_parsing_large_image_properly.patch
deleted file mode 100644
index f55310ed8..000000000
--- a/redhat/tdelibs/kdelibs-3.5.13-fix_iso_kioslave_not_parsing_large_image_properly.patch
+++ /dev/null
@@ -1,171 +0,0 @@
-commit b4bba7b553995a6b13214dbbabe18ff311007eea
-Author: Timothy Pearson <kb9vqf@pearsoncomputing.net>
-Date:   1341113466 -0500
-
-    Fix iso kioslave not parsing large images properly
-
-diff --git a/kioslave/iso/kiso.cpp b/kioslave/iso/kiso.cpp
-index c6faa65..6403f62 100644
---- a/kioslave/iso/kiso.cpp
-+++ b/kioslave/iso/kiso.cpp
-@@ -188,7 +188,7 @@ KIso::~KIso()
- }
- 
- /* callback function for libisofs */
--static int readf(char *buf, int start, int len,void *udata) {
-+static int readf(char *buf, long start, long len,void *udata) {
- 
-     TQIODevice* dev = ( static_cast<KIso*> (udata) )->device();
- 
-@@ -212,7 +212,7 @@ static int mycallb(struct iso_directory_record *idr,void *udata) {
-     bool special=false;
-     KArchiveEntry *entry=NULL,*oldentry=NULL;
-     char z_algo[2],z_params[2];
--    int z_size=0;
-+    long long z_size=0;
- 
-     if ((idr->flags[0] & 1) && !iso->showhidden) return 0;
-     if (iso->level) {
-@@ -289,7 +289,8 @@ static int mycallb(struct iso_directory_record *idr,void *udata) {
- 
- void KIso::addBoot(struct el_torito_boot_descriptor* bootdesc) {
- 
--    int i,size;
-+    int i;
-+    long long size;
-     boot_head boot;
-     boot_entry *be;
-     TQString path;
-diff --git a/kioslave/iso/kisofile.cpp b/kioslave/iso/kisofile.cpp
-index afac16b..ffae0d3 100644
---- a/kioslave/iso/kisofile.cpp
-+++ b/kioslave/iso/kisofile.cpp
-@@ -20,7 +20,7 @@
- 
- KIsoFile::KIsoFile( KArchive* archive, const TQString& name, int access,
-     int date, int adate,int cdate, const TQString& user, const TQString& group,
--    const TQString& symlink,int pos, int size) :
-+    const TQString& symlink,long long pos, long long size) :
-         KArchiveFile(archive, name, access, date, user, group, symlink, pos, size) {
- 
- 
-@@ -32,7 +32,7 @@ KIsoFile::KIsoFile( KArchive* archive, const TQString& name, int access,
- KIsoFile::~KIsoFile(){
- }
- 
--void KIsoFile::setZF(char algo[2],char parms[2],int realsize) {
-+void KIsoFile::setZF(char algo[2],char parms[2],long long realsize) {
-     m_algo[0]=algo[0];m_algo[1]=algo[1];
-     m_parms[0]=parms[0];m_parms[1]=parms[1];
-     m_realsize=realsize;
-diff --git a/kioslave/iso/kisofile.h b/kioslave/iso/kisofile.h
-index 193509c..696a8c1 100644
---- a/kioslave/iso/kisofile.h
-+++ b/kioslave/iso/kisofile.h
-@@ -29,9 +29,9 @@ class KIsoFile : public KArchiveFile  {
- public: 
-     KIsoFile( KArchive* archive, const TQString& name, int access, int date,
-                     int adate,int cdate, const TQString& user, const TQString& group,
--                   const TQString& symlink, int pos, int size);
-+                   const TQString& symlink, long long pos, long long size);
-     ~KIsoFile();
--    void setZF(char algo[2],char parms[2],int realsize);
-+    void setZF(char algo[2],char parms[2],long long realsize);
-     int adate() const { return m_adate; }
-     int cdate() const { return m_cdate; }
-     long long realsize() const { return m_realsize; }
-diff --git a/kioslave/iso/libisofs/isofs.c b/kioslave/iso/libisofs/isofs.c
-index ab13d9e..e599450 100644
---- a/kioslave/iso/libisofs/isofs.c
-+++ b/kioslave/iso/libisofs/isofs.c
-@@ -122,8 +122,8 @@ void FreeBootTable(boot_head *boot) {
- 	boot->defentry=NULL;
- }
- 
--int BootImageSize(int media,int len) {
--	int ret;
-+int BootImageSize(int media,long len) {
-+	long long ret;
- 
- 	switch(media & 0xf) {
- 		case 0:
-@@ -158,7 +158,7 @@ static boot_entry *CreateBootEntry(char *be) {
- 	return entry;
- }
- 
--int ReadBootTable(readfunc *read,int sector, boot_head *head, void *udata) {
-+int ReadBootTable(readfunc *read,long sector, boot_head *head, void *udata) {
- 
- 	char buf[2048], *c, *be;
- 	int i,end=0;
-@@ -221,7 +221,7 @@ err:
- /**
-  * Creates the linked list of the volume descriptors
-  */
--iso_vol_desc *ReadISO9660(readfunc *read,int sector,void *udata) {
-+iso_vol_desc *ReadISO9660(readfunc *read,long sector,void *udata) {
- 				
- 	int i;
- 	struct iso_volume_descriptor buf;
-@@ -577,10 +577,10 @@ int level=0,joliet=0,dirs,files;
- iconv_t iconv_d;
- int fd;
- 
--int readf(char *buf, int start, int len,void *udata) {
-+int readf(char *buf, long start, long len,void *udata) {
- 	int ret;
- 	
--	if ((ret=lseek(fd, start << 11, SEEK_SET))<0) return ret;
-+	if ((ret=lseek64(fd, start << 11, SEEK_SET))<0) return ret;
- 	ret=read(fd, buf, len << 11);
- 	if (ret<0) return ret;
- 	return (ret >> 11);
-diff --git a/kioslave/iso/libisofs/isofs.h b/kioslave/iso/libisofs/isofs.h
-index 52190e6..b8971a4 100644
---- a/kioslave/iso/libisofs/isofs.h
-+++ b/kioslave/iso/libisofs/isofs.h
-@@ -50,7 +50,7 @@ typedef struct _rr_entry {
- 	int		re; /* relocated */
- 	char	z_algo[2]; /* zizofs algorithm */
- 	char	z_params[2]; /* zizofs parameters */
--	int		z_size; /* zizofs real_size */
-+	long		z_size; /* zizofs real_size */
- } rr_entry;
- 
- typedef struct _iso_vol_desc {
-@@ -78,7 +78,7 @@ typedef struct _boot_head {
- /**
-  * this callback function needs to read 'len' sectors from 'start' into 'buf' 
-  */
--typedef int readfunc(char *buf,int start, int len,void *);
-+typedef int readfunc(char *buf,long start, long len,void *);
- 
- /**
-  * ProcessDir uses this callback
-@@ -107,7 +107,7 @@ time_t isodate_84261(char * p, int hs);
-  * If the function fails, returns NULL
-  * Don't forget to call FreeISO9660 after using the volume descriptor list!
-  */
--iso_vol_desc *ReadISO9660(readfunc *read,int sector,void *udata);
-+iso_vol_desc *ReadISO9660(readfunc *read,long sector,void *udata);
- 
- /**
-  * Frees the linked list of volume descriptors
-@@ -140,7 +140,7 @@ int JolietLevel(struct iso_volume_descriptor *ivd);
- /**
-  * Returns the size of the boot image (in 512 byte sectors)
-  */
--int BootImageSize(int media,int len);
-+int BootImageSize(int media,long len);
- 
- /**
-  * Frees the boot catalog entries in 'boot'. If you ever called ReadBootTable,
-@@ -151,7 +151,7 @@ void FreeBootTable(boot_head *boot);
- /**
-  * Reads the boot catalog into 'head'. Don't forget to call FreeBootTable!
-  */
--int ReadBootTable(readfunc *read,int sector, boot_head *head, void *udata);
-+int ReadBootTable(readfunc *read,long sector, boot_head *head, void *udata);
- 
- #ifdef __cplusplus
- } //extern "C"
diff --git a/redhat/tdelibs/kdelibs-3.5.13-fix_kdirwatch.patch b/redhat/tdelibs/kdelibs-3.5.13-fix_kdirwatch.patch
deleted file mode 100644
index c6792dfdc..000000000
--- a/redhat/tdelibs/kdelibs-3.5.13-fix_kdirwatch.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff -urN tdelibs/kio/kio/kdirwatch.cpp tdelibs.new/kio/kio/kdirwatch.cpp
---- tdelibs/kio/kio/kdirwatch.cpp	2012-04-05 13:26:08.000000000 -0500
-+++ tdelibs.new/kio/kio/kdirwatch.cpp	2012-04-08 17:51:15.000000000 -0500
-@@ -1155,6 +1155,7 @@
-     if(!e->dirty) return NoChange;
-     e->dirty = false;
-   }
-+  if (e->isDir) return Changed;
- #endif
- 
-   // Shouldn't happen: Ignore "unknown" notification method
-@@ -1184,6 +1185,8 @@
-   if (exists) {
- 
-     if (e->m_status == NonExistent) {
-+      // ctime is the 'creation time' on windows, but with qMax
-+      // we get the latest change of any kind, on any platform.
-       e->m_ctime = stat_buf.st_ctime;
-       e->m_status = Normal;
-       e->m_nlink = stat_buf.st_nlink;
diff --git a/redhat/tdelibs/kdelibs-3.5.13-fix_konq_filter.patch b/redhat/tdelibs/kdelibs-3.5.13-fix_konq_filter.patch
deleted file mode 100644
index 3589e6044..000000000
--- a/redhat/tdelibs/kdelibs-3.5.13-fix_konq_filter.patch
+++ /dev/null
@@ -1,83 +0,0 @@
-commit 06b514847fffb79985e4bcde9f8dcc685c5d9ac5
-Author: Timothy Pearson <kb9vqf@pearsoncomputing.net>
-Date:   1328040359 -0600
-
-    Fix konq filter in list view mode
-    Select all now only selects shown (filtered) items
-
-diff --git a/tdeui/klistview.cpp b/tdeui/klistview.cpp
-index e1c5811..b52fe68 100644
---- a/kdeui/klistview.cpp
-+++ b/kdeui/klistview.cpp
-@@ -2356,6 +2356,52 @@ void KListViewItem::paintCell(TQPainter *p, const TQColorGroup &cg, int column,
-   TQListViewItem::paintCell(p, _cg, column, width, tqalignment);
- }
- 
-+/*!
-+    If \a select is TRUE, all the items get selected; otherwise all
-+    the items get unselected. This only works in the selection modes \c
-+    Multi and \c Extended. In \c Single and \c NoSelection mode the
-+    selection of the current item is just set to \a select.
-+*/
-+
-+void KListView::selectAll( bool select )
-+{
-+    if ( selectionMode() == Multi || selectionMode() == Extended ) {
-+	bool b = signalsBlocked();
-+	blockSignals( TRUE );
-+	bool anything = FALSE;
-+	TQListViewItemIterator it( this );
-+	while ( it.current() ) {
-+	    TQListViewItem *i = it.current();
-+	    if ( select == TRUE ) {
-+		if ( (bool)i->isVisible() == TRUE ) {
-+		    i->setSelected( TRUE );
-+		    anything = TRUE;
-+		}
-+		if ( (bool)i->isVisible() == FALSE ) {
-+		    i->setSelected( FALSE );
-+		    anything = TRUE;
-+		}
-+	    }
-+	    else {
-+		if ( (bool)i->isSelected() != select ) {
-+		    i->setSelected( select );
-+		    anything = TRUE;
-+		}
-+	    }
-+	    ++it;
-+	}
-+	blockSignals( b );
-+	if ( anything ) {
-+	    emit selectionChanged();
-+// 	    d->useDoubleBuffer = TRUE;
-+	    triggerUpdate();
-+	}
-+    } else if ( currentItem() ) {
-+	TQListViewItem * i = currentItem();
-+	setSelected( i, select );
-+    }
-+}
-+
- void KListView::virtual_hook( int, void* )
- { /*BASE::virtual_hook( id, data );*/ }
- 
-diff --git a/tdeui/klistview.h b/tdeui/klistview.h
-index ed10192..c8bb837 100644
---- a/kdeui/klistview.h
-+++ b/kdeui/klistview.h
-@@ -660,6 +660,14 @@ public slots:
-    */
-   bool tabOrderedRenaming() const;
- 
-+  /**
-+   * Override TQListView selectAll() so that filtered
-+   * items are not selected
-+   *
-+   * @since 14.0
-+   */
-+  virtual void selectAll( bool select );
-+
- protected:
-   /**
-    * Determine whether a drop on position @p p would count as
diff --git a/redhat/tdelibs/kdelibs-3.5.13-fix_ktempfile_special_bits.patch b/redhat/tdelibs/kdelibs-3.5.13-fix_ktempfile_special_bits.patch
deleted file mode 100644
index 7f21fe176..000000000
--- a/redhat/tdelibs/kdelibs-3.5.13-fix_ktempfile_special_bits.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-commit 9068fffdf82dc9cf60e83639b3a9b397761304cd
-Author: Timothy Pearson <kb9vqf@pearsoncomputing.net>
-Date:   1338002515 -0500
-
-    Fix KTempFile not obeying special bits on file creation
-    This closes Bug 349
-    Add modem category to TDE hardware manager
-
-diff --git a/tdecore/ktempfile.cpp b/tdecore/ktempfile.cpp
-index 2c7b56e..4632f00 100644
---- a/kdecore/ktempfile.cpp
-+++ b/kdecore/ktempfile.cpp
-@@ -117,8 +117,12 @@ KTempFile::create(const TQString &filePrefix, const TQString &fileExtension,
-    // Success!
-    bOpen = true;
- 
--   // Set uid/gid (necessary for SUID programs)
--   fchown(mFd, getuid(), getgid());
-+   uid_t uid  = getuid();
-+   uid_t euid = geteuid();
-+   if (uid != euid) {
-+       // Set uid/gid (necessary for SUID programs)
-+       fchown(mFd, getuid(), getgid());
-+   }
- 
-    // Set close on exec
-    fcntl(mFd, F_SETFD, FD_CLOEXEC);
diff --git a/redhat/tdelibs/kdelibs-3.5.13-fix_slide_drawing.patch b/redhat/tdelibs/kdelibs-3.5.13-fix_slide_drawing.patch
deleted file mode 100644
index e5b499167..000000000
--- a/redhat/tdelibs/kdelibs-3.5.13-fix_slide_drawing.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-commit a1c30c142a7b631d6ff66f12d8b48c9aec07190f
-Author: Timothy Pearson <kb9vqf@pearsoncomputing.net>
-Date:   1331881108 -0500
-
-    Fix slider drawing on external paint devices
-
-diff --git a/tdefx/kstyle.cpp b/tdefx/kstyle.cpp
-index d4cb9bd..0220840 100644
---- a/kdefx/kstyle.cpp
-+++ b/kdefx/kstyle.cpp
-@@ -1138,11 +1138,14 @@ void KStyle::drawComplexControl( TQ_ComplexControl control,
- 			last    = querySubControlMetrics(control, widget, SC_ScrollBarLast,    opt);
- 			subline2 = addline;
- 
--			if ( useThreeButtonScrollBar )
--				if (horizontal)
-+			if ( useThreeButtonScrollBar ) {
-+				if (horizontal) {
- 					subline2.moveBy(-addline.width(), 0);
--				else
-+				}
-+				else {
- 					subline2.moveBy(0, -addline.height());
-+				}
-+			}
- 
- 			// Draw the up/left button set
- 			if ((controls & SC_ScrollBarSubLine) && subline.isValid()) {
-@@ -1238,7 +1241,14 @@ void KStyle::drawComplexControl( TQ_ComplexControl control,
- 			}
- 
- 			p2.end();
--			bitBlt((TQWidget*)widget, r.x(), r.y(), &pix);
-+
-+			TQPaintDevice* ppd = p->device();
-+			if (ppd->isExtDev()) {
-+				p->drawPixmap(0, 0, pix);
-+			}
-+			else {
-+				bitBlt((TQWidget*)widget, r.x(), r.y(), &pix);
-+			}
- 			break;
- 		}
- 
-@@ -2105,7 +2115,6 @@ TQImage TransparencyHandler::handleRealAlpha(TQImage img) {
- 	for (int y = 0; y < h; ++y) {
- 		TQRgb *ls = (TQRgb *)clearImage.scanLine( y );
- 		for (int x = 0; x < w; ++x) {
--			TQRgb l = ls[x];
- 			ls[x] = tqRgba( 0, 0, 0, 0 );
- 		}
- 	}
diff --git a/redhat/tdelibs/kdelibs-3.5.13-fix_spinbox_text_entry_when_base_not_10.patch b/redhat/tdelibs/kdelibs-3.5.13-fix_spinbox_text_entry_when_base_not_10.patch
deleted file mode 100644
index 9a34f74db..000000000
--- a/redhat/tdelibs/kdelibs-3.5.13-fix_spinbox_text_entry_when_base_not_10.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-commit d1c71f692f5329dbfe817bbed41c5137be608efa
-Author: Timothy Pearson <kb9vqf@pearsoncomputing.net>
-Date:   1341199632 -0500
-
-    Fix spinbox text entry when base is not 10
-
-diff --git a/kdeui/knuminput.cpp b/kdeui/knuminput.cpp
-index 27b86f9..118af6c 100644
---- a/kdeui/knuminput.cpp
-+++ b/kdeui/knuminput.cpp
-@@ -206,6 +206,7 @@ KIntSpinBox::KIntSpinBox(TQWidget *parent, const char *name)
- {
-     editor()->tqsetAlignment(AlignRight);
-     val_base = 10;
-+    setValidator(new KIntValidator(this, val_base));
-     setValue(0);
- }
- 
-@@ -219,11 +220,16 @@ KIntSpinBox::KIntSpinBox(int lower, int upper, int step, int value, int base,
- {
-     editor()->tqsetAlignment(AlignRight);
-     val_base = base;
-+    setValidator(new KIntValidator(this, val_base));
-     setValue(value);
- }
- 
- void KIntSpinBox::setBase(int base)
- {
-+    const KIntValidator* kvalidator = dynamic_cast<const KIntValidator*>(validator());
-+    if (kvalidator) {
-+    	const_cast<KIntValidator*>(kvalidator)->setBase(base);
-+    }
-     val_base = base;
- }
- 
diff --git a/redhat/tdelibs/kdelibs-3.5.13-fix_tdesu_internal_pathing.patch b/redhat/tdelibs/kdelibs-3.5.13-fix_tdesu_internal_pathing.patch
deleted file mode 100644
index deb93afaa..000000000
--- a/redhat/tdelibs/kdelibs-3.5.13-fix_tdesu_internal_pathing.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-commit e131f10b84dbec07ad49d36c192777a72189a39e
-Author: Timothy Pearson <kb9vqf@pearsoncomputing.net>
-Date:   1329026747 -0600
-
-    Fix tdesu internal pathing
-    This closes Bug 766
-
-diff --git a/tdesu/stub.cpp b/tdesu/stub.cpp
-index 7f083d7..5b222f5 100644
---- a/kdesu/stub.cpp
-+++ b/kdesu/stub.cpp
-@@ -121,11 +121,16 @@ int StubProcess::ConverseStub(int check)
- 	    TQCString path = getenv("PATH");
-             if (!path.isEmpty() && path[0] == ':')
-                 path = path.mid(1);
--	    if (m_User == "root") 
--		if (!path.isEmpty())
--		    path = "/sbin:/bin:/usr/sbin:/usr/bin:" + path;
--		else
--		    path = "/sbin:/bin:/usr/sbin:/usr/bin";
-+	    if (m_User == "root")
-+	       if (!path.isEmpty())
-+	          path = "/usr/local/sbin:/usr/sbin:/sbin:" + path;
-+	       else
-+                  if (strcmp(__KDE_BINDIR, "/usr/bin") == 0) {
-+		          path = "/usr/local/sbin:/usr/sbin:/sbin:/usr/local/bin:/usr/bin:/bin";
-+		  }
-+		  else {
-+			  path = "/usr/local/sbin:/usr/sbin:/sbin:/usr/local/bin:" __KDE_BINDIR ":/usr/bin:/bin";
-+		  }
- 	    writeLine(path);
- 	} else if (line == "user") {
- 	    writeLine(m_User);
diff --git a/redhat/tdelibs/kdelibs-3.5.13-fix_x11_threading_when_kinit_is_used.patch b/redhat/tdelibs/kdelibs-3.5.13-fix_x11_threading_when_kinit_is_used.patch
deleted file mode 100644
index 1cdb91958..000000000
--- a/redhat/tdelibs/kdelibs-3.5.13-fix_x11_threading_when_kinit_is_used.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-commit 6c806af1c99890adecb42abf52f4d6dc8ae72899
-Author: Timothy Pearson <kb9vqf@pearsoncomputing.net>
-Date:   1337556266 -0500
-
-    Initialize X11 threading when kinit is used to launch a program
-    This closes Bug 812
-    Thanks to Slávek Banko for the patch!
-
-diff --git a/kinit/kinit.cpp b/kinit/kinit.cpp
-index 2a74368..191757d 100644
---- a/kinit/kinit.cpp
-+++ b/kinit/kinit.cpp
-@@ -1615,6 +1615,7 @@ int tdeinit_x_errhandler( Display *dpy, XErrorEvent *err )
- // another X connection for startup notification purposes
- static void setupX()
- {
-+    XInitThreads();
-     XSetIOErrorHandler(kdeinit_xio_errhandler);
-     XSetErrorHandler(kdeinit_x_errhandler);
- }
diff --git a/redhat/tdelibs/kdelibs-3.5.13-fix_xrender_libdir.patch b/redhat/tdelibs/kdelibs-3.5.13-fix_xrender_libdir.patch
deleted file mode 100644
index 64cf9d6c1..000000000
--- a/redhat/tdelibs/kdelibs-3.5.13-fix_xrender_libdir.patch
+++ /dev/null
@@ -1,987 +0,0 @@
---- kdelibs/kdefx/CMakeLists.txt.ORI	2012-09-05 14:49:17.332664590 -0400
-+++ kdelibs/kdefx/CMakeLists.txt	2012-09-05 14:50:29.605179741 -0400
-@@ -20,6 +20,7 @@
- 
- link_directories(
-   ${TQT_LIBRARY_DIRS}
-+  ${XRENDER_LIBRARY_DIRS}
- )
- 
- 
---- kdelibs/kstyles/keramik/CMakeLists.txt.ORI	2012-09-05 14:52:39.488511648 -0400
-+++ kdelibs/kstyles/keramik/CMakeLists.txt	2012-09-05 14:52:46.135375114 -0400
-@@ -26,6 +26,7 @@
- 
- link_directories(
-   ${TQT_LIBRARY_DIRS}
-+  ${XRENDER_LIBRARY_DIRS}
- )
- 
- 
---- kdelibs/kstyles/plastik/CMakeLists.txt.ORI	2012-09-05 14:55:52.184554103 -0400
-+++ kdelibs/kstyles/plastik/CMakeLists.txt	2012-09-05 14:55:59.389406152 -0400
-@@ -25,6 +25,7 @@
- 
- link_directories(
-   ${TQT_LIBRARY_DIRS}
-+  ${XRENDER_LIBRARY_DIRS}
- )
- 
- 
---- kdelibs/kstyles/asteroid/CMakeLists.txt.ORI	2012-09-05 14:57:14.714859423 -0400
-+++ kdelibs/kstyles/asteroid/CMakeLists.txt	2012-09-05 14:57:25.833631121 -0400
-@@ -23,6 +23,7 @@
- 
- link_directories(
-   ${TQT_LIBRARY_DIRS}
-+  ${XRENDER_LIBRARY_DIRS}
- )
- 
- 
---- kdelibs/kstyles/highcolor/CMakeLists.txt.ORI	2012-09-05 14:59:43.880796883 -0400
-+++ kdelibs/kstyles/highcolor/CMakeLists.txt	2012-09-05 14:59:52.769614406 -0400
-@@ -23,6 +23,7 @@
- 
- link_directories(
-   ${TQT_LIBRARY_DIRS}
-+  ${XRENDER_LIBRARY_DIRS}
- )
- 
- 
---- kdelibs/kstyles/highcontrast/CMakeLists.txt.ORI	2012-09-05 15:00:52.531387606 -0400
-+++ kdelibs/kstyles/highcontrast/CMakeLists.txt	2012-09-05 15:00:59.908236179 -0400
-@@ -26,6 +26,7 @@
- 
- link_directories(
-   ${TQT_LIBRARY_DIRS}
-+  ${XRENDER_LIBRARY_DIRS}
- )
- 
- 
---- kdelibs/kstyles/light/CMakeLists.txt.ORI	2012-09-05 15:02:37.873225343 -0400
-+++ kdelibs/kstyles/light/CMakeLists.txt	2012-09-05 15:02:46.535047560 -0400
-@@ -23,6 +23,7 @@
- 
- link_directories(
-   ${TQT_LIBRARY_DIRS}
-+  ${XRENDER_LIBRARY_DIRS}
- )
- 
- 
---- kdelibs/kdecore/CMakeLists.txt.ORI	2012-09-05 15:04:44.597624532 -0400
-+++ kdelibs/kdecore/CMakeLists.txt	2012-09-05 15:04:58.009349300 -0400
-@@ -37,6 +37,7 @@
- link_directories(
-   ${TQT_LIBRARY_DIRS}
-   ${LIBIDN_LIBRARY_DIRS}
-+  ${XCOMPOSITE_LIBRARY_DIRS}
- )
- 
- 
---- kdelibs/dcop/client/CMakeLists.txt.ORI	2012-09-05 15:09:40.211558975 -0400
-+++ kdelibs/dcop/client/CMakeLists.txt	2012-09-05 15:09:46.973420255 -0400
-@@ -19,6 +19,7 @@
- 
- link_directories(
-   ${TQT_LIBRARY_DIRS}
-+  ${XRENDER_LIBRARY_DIRS}
- )
- 
- 
---- kdelibs/kjs/CMakeLists.txt.ORI	2012-09-05 15:10:44.871247689 -0400
-+++ kdelibs/kjs/CMakeLists.txt	2012-09-05 15:10:55.546035695 -0400
-@@ -21,6 +21,7 @@
- link_directories(
-   ${TQT_LIBRARY_DIRS}
-   ${LIBPCRE_LIBDIR}
-+  ${XRENDER_LIBRARY_DIRS}
- )
- 
- 
---- kdelibs/kio/misc/CMakeLists.txt.ORI	2012-09-05 15:11:50.982934593 -0400
-+++ kdelibs/kio/misc/CMakeLists.txt	2012-09-05 15:11:59.380767769 -0400
-@@ -40,6 +40,7 @@
- 
- link_directories(
-   ${TQT_LIBRARY_DIRS}
-+  ${XRENDER_LIBRARY_DIRS}
- )
- 
- 
---- kdelibs/kdecore/kconfig_compiler/CMakeLists.txt.ORI	2012-09-05 15:12:54.956663587 -0400
-+++ kdelibs/kdecore/kconfig_compiler/CMakeLists.txt	2012-09-05 15:13:01.689529800 -0400
-@@ -17,6 +17,7 @@
- 
- link_directories(
-   ${TQT_LIBRARY_DIRS}
-+  ${XRENDER_LIBRARY_DIRS}
- )
- 
- 
---- kdelibs/kwallet/client/CMakeLists.txt.ORI	2012-09-05 15:13:46.102647178 -0400
-+++ kdelibs/kwallet/client/CMakeLists.txt	2012-09-05 15:13:54.441481441 -0400
-@@ -19,6 +19,7 @@
- 
- link_directories(
-   ${TQT_LIBRARY_DIRS}
-+  ${XRENDER_LIBRARY_DIRS}
- )
- 
- 
---- kdelibs/kwallet/backend/CMakeLists.txt.ORI	2012-09-05 15:14:39.946576908 -0400
-+++ kdelibs/kwallet/backend/CMakeLists.txt	2012-09-05 15:14:46.189452800 -0400
-@@ -20,6 +20,7 @@
- 
- link_directories(
-   ${TQT_LIBRARY_DIRS}
-+  ${XRENDER_LIBRARY_DIRS}
- )
- 
- 
---- kdelibs/kunittest/CMakeLists.txt.ORI	2012-09-05 15:15:30.724567350 -0400
-+++ kdelibs/kunittest/CMakeLists.txt	2012-09-05 15:15:37.191438762 -0400
-@@ -18,6 +18,7 @@
- 
- link_directories(
-   ${TQT_LIBRARY_DIRS}
-+  ${XRENDER_LIBRARY_DIRS}
- )
- 
- 
---- kdelibs/kio/misc/kdesasl/CMakeLists.txt.ORI	2012-09-05 15:16:23.686514140 -0400
-+++ kdelibs/kio/misc/kdesasl/CMakeLists.txt	2012-09-05 15:16:30.107386437 -0400
-@@ -18,6 +18,7 @@
- 
- link_directories(
-   ${TQT_LIBRARY_DIRS}
-+  ${XRENDER_LIBRARY_DIRS}
- )
- 
- 
---- kdelibs/kdesu/CMakeLists.txt.ORI	2012-09-05 15:17:18.220429423 -0400
-+++ kdelibs/kdesu/CMakeLists.txt	2012-09-05 15:17:25.132291924 -0400
-@@ -19,6 +19,7 @@
- 
- link_directories(
-   ${TQT_LIBRARY_DIRS}
-+  ${XRENDER_LIBRARY_DIRS}
- )
- 
- 
---- kdelibs/kio/misc/kntlm/CMakeLists.txt.ORI	2012-09-05 15:18:10.203395218 -0400
-+++ kdelibs/kio/misc/kntlm/CMakeLists.txt	2012-09-05 15:18:16.090278085 -0400
-@@ -19,6 +19,7 @@
- 
- link_directories(
-   ${TQT_LIBRARY_DIRS}
-+  ${XRENDER_LIBRARY_DIRS}
- )
- 
- 
---- kdelibs/kdewidgets/CMakeLists.txt.ORI	2012-09-05 15:19:01.043383536 -0400
-+++ kdelibs/kdewidgets/CMakeLists.txt	2012-09-05 15:19:08.404237043 -0400
-@@ -29,6 +29,7 @@
- 
- link_directories(
-   ${TQT_LIBRARY_DIRS}
-+  ${XRENDER_LIBRARY_DIRS}
- )
- 
- 
---- kdelibs/kded/CMakeLists.txt.ORI	2012-09-05 15:19:53.290343643 -0400
-+++ kdelibs/kded/CMakeLists.txt	2012-09-05 15:19:59.050228986 -0400
-@@ -24,6 +24,7 @@
- 
- link_directories(
-   ${TQT_LIBRARY_DIRS}
-+  ${XRENDER_LIBRARY_DIRS}
- )
- 
- 
---- kdelibs/kinit/CMakeLists.txt.ORI	2012-09-05 15:20:56.013094954 -0400
-+++ kdelibs/kinit/CMakeLists.txt	2012-09-05 15:21:01.877978180 -0400
-@@ -26,6 +26,7 @@
- 
- link_directories(
-   ${TQT_LIBRARY_DIRS}
-+  ${XRENDER_LIBRARY_DIRS}
- )
- 
- 
---- kdelibs/kconf_update/CMakeLists.txt.ORI	2012-09-05 15:21:46.470090230 -0400
-+++ kdelibs/kconf_update/CMakeLists.txt	2012-09-05 15:21:52.129977515 -0400
-@@ -17,6 +17,7 @@
- 
- link_directories(
-   ${TQT_LIBRARY_DIRS}
-+  ${XRENDER_LIBRARY_DIRS}
- )
- 
- 
---- kdelibs/kabc/vcard/CMakeLists.txt.ORI	2012-09-05 15:22:33.653150519 -0400
-+++ kdelibs/kabc/vcard/CMakeLists.txt	2012-09-05 15:22:39.350037047 -0400
-@@ -21,6 +21,7 @@
- 
- link_directories(
-   ${TQT_LIBRARY_DIRS}
-+  ${XRENDER_LIBRARY_DIRS}
- )
- 
- 
---- kdelibs/kdeui/CMakeLists.txt.ORI	2012-09-05 15:23:43.705755018 -0400
-+++ kdelibs/kdeui/CMakeLists.txt	2012-09-05 15:23:52.102587723 -0400
-@@ -33,6 +33,7 @@
- 
- link_directories(
-   ${TQT_LIBRARY_DIRS}
-+  ${XRENDER_LIBRARY_DIRS}
- )
- 
- 
---- kdelibs/kimgio/CMakeLists.txt.ORI	2012-09-05 15:24:52.729379655 -0400
-+++ kdelibs/kimgio/CMakeLists.txt	2012-09-05 15:24:59.825238243 -0400
-@@ -20,6 +20,7 @@
- 
- link_directories(
-   ${TQT_LIBRARY_DIRS}
-+  ${XRENDER_LIBRARY_DIRS}
- )
- 
- 
---- kdelibs/kstyles/kthemestyle/CMakeLists.txt.ORI	2012-09-05 15:25:41.501407611 -0400
-+++ kdelibs/kstyles/kthemestyle/CMakeLists.txt	2012-09-05 15:25:48.051277056 -0400
-@@ -23,6 +23,7 @@
- 
- link_directories(
-   ${TQT_LIBRARY_DIRS}
-+  ${XRENDER_LIBRARY_DIRS}
- )
- 
- 
---- kdelibs/libkmid/CMakeLists.txt.ORI	2012-09-05 15:26:30.215436548 -0400
-+++ kdelibs/libkmid/CMakeLists.txt	2012-09-05 15:26:36.349314265 -0400
-@@ -19,6 +19,7 @@
- 
- link_directories(
-   ${TQT_LIBRARY_DIRS}
-+  ${XRENDER_LIBRARY_DIRS}
- )
- 
- 
---- kdelibs/kioslave/http/kcookiejar/CMakeLists.txt.ORI	2012-09-05 15:27:21.689410284 -0400
-+++ kdelibs/kioslave/http/kcookiejar/CMakeLists.txt	2012-09-05 15:27:28.281278845 -0400
-@@ -22,6 +22,7 @@
- 
- link_directories(
-   ${TQT_LIBRARY_DIRS}
-+  ${XRENDER_LIBRARY_DIRS}
- )
- 
- 
---- kdelibs/kstyles/utils/installtheme/CMakeLists.txt.ORI	2012-09-05 15:28:14.233362491 -0400
-+++ kdelibs/kstyles/utils/installtheme/CMakeLists.txt	2012-09-05 15:28:21.719213198 -0400
-@@ -17,6 +17,7 @@
- 
- link_directories(
-   ${TQT_LIBRARY_DIRS}
-+  ${XRENDER_LIBRARY_DIRS}
- )
- 
- ##### kinstalltheme #############################
---- kdelibs/dnssd/CMakeLists.txt.ORI	2012-09-05 15:29:09.718255841 -0400
-+++ kdelibs/dnssd/CMakeLists.txt	2012-09-05 15:29:15.350143500 -0400
-@@ -20,6 +20,7 @@
- 
- link_directories(
-   ${TQT_LIBRARY_DIRS}
-+  ${XRENDER_LIBRARY_DIRS}
- )
- 
- ##### headers ###################################
---- kdelibs/kstyles/highcontrast/config/CMakeLists.txt.ORI	2012-09-05 15:30:26.325727548 -0400
-+++ kdelibs/kstyles/highcontrast/config/CMakeLists.txt	2012-09-05 15:30:31.885616614 -0400
-@@ -19,6 +19,7 @@
- 
- link_directories(
-   ${TQT_LIBRARY_DIRS}
-+  ${XRENDER_LIBRARY_DIRS}
- )
- 
- 
---- kdelibs/libkscreensaver/CMakeLists.txt.ORI	2012-09-05 15:31:25.686543044 -0400
-+++ kdelibs/libkscreensaver/CMakeLists.txt	2012-09-05 15:31:31.287431270 -0400
-@@ -21,6 +21,7 @@
- 
- link_directories(
-   ${TQT_LIBRARY_DIRS}
-+  ${XRENDER_LIBRARY_DIRS}
- )
- 
- 
---- kdelibs/pics/CMakeLists.txt.ORI	2012-09-05 15:33:15.116358829 -0400
-+++ kdelibs/pics/CMakeLists.txt	2012-09-05 15:33:22.821205010 -0400
-@@ -28,6 +28,7 @@
- 
- link_directories(
-   ${TQT_LIBRARY_DIRS}
-+  ${XRENDER_LIBRARY_DIRS}
- )
- 
- 
---- kdelibs/kdeprint/tools/escputil/CMakeLists.txt.ORI	2012-09-05 15:34:18.809087161 -0400
-+++ kdelibs/kdeprint/tools/escputil/CMakeLists.txt	2012-09-05 15:34:24.838966757 -0400
-@@ -19,6 +19,7 @@
- 
- link_directories(
-   ${TQT_LIBRARY_DIRS}
-+  ${XRENDER_LIBRARY_DIRS}
- )
- 
- 
---- kdelibs/arts/message/CMakeLists.txt.ORI	2012-09-05 15:35:54.035185423 -0400
-+++ kdelibs/arts/message/CMakeLists.txt	2012-09-05 15:35:59.572074829 -0400
-@@ -18,6 +18,7 @@
- 
- link_directories(
-   ${TQT_LIBRARY_DIRS}
-+  ${XRENDER_LIBRARY_DIRS}
- )
- 
- 
---- kdelibs/kstyles/plastik/config/CMakeLists.txt.ORI	2012-09-05 15:37:59.047687962 -0400
-+++ kdelibs/kstyles/plastik/config/CMakeLists.txt	2012-09-05 15:38:04.596577086 -0400
-@@ -19,6 +19,7 @@
- 
- link_directories(
-   ${TQT_LIBRARY_DIRS}
-+  ${XRENDER_LIBRARY_DIRS}
- )
- 
- 
---- kdelibs/networkstatus/CMakeLists.txt.ORI	2012-09-05 15:39:15.031169518 -0400
-+++ kdelibs/networkstatus/CMakeLists.txt	2012-09-05 15:39:22.330023641 -0400
-@@ -22,6 +22,7 @@
- 
- link_directories(
-   ${TQT_LIBRARY_DIRS}
-+  ${XRENDER_LIBRARY_DIRS}
- )
- 
- 
---- kdelibs/kio/CMakeLists.txt.ORI	2012-09-05 15:40:44.810374939 -0400
-+++ kdelibs/kio/CMakeLists.txt	2012-09-05 15:40:54.052190177 -0400
-@@ -30,6 +30,7 @@
- 
- link_directories(
-   ${TQT_LIBRARY_DIRS}
-+  ${XRENDER_LIBRARY_DIRS}
- )
- 
- 
---- kdelibs/kio/tests/CMakeLists.txt.ORI	2012-09-05 15:41:48.532100927 -0400
-+++ kdelibs/kio/tests/CMakeLists.txt	2012-09-05 15:41:54.080989975 -0400
-@@ -18,6 +18,7 @@
- 
- link_directories(
-   ${TQT_LIBRARY_DIRS}
-+  ${XRENDER_LIBRARY_DIRS}
- )
- 
- 
---- kdelibs/kio/kioexec/CMakeLists.txt.ORI	2012-09-05 15:42:48.434903055 -0400
-+++ kdelibs/kio/kioexec/CMakeLists.txt	2012-09-05 15:42:54.144788864 -0400
-@@ -22,6 +22,7 @@
- 
- link_directories(
-   ${TQT_LIBRARY_DIRS}
-+  ${XRENDER_LIBRARY_DIRS}
- )
- 
- 
---- kdelibs/kio/misc/kfile/CMakeLists.txt.ORI	2012-09-05 15:43:44.232787087 -0400
-+++ kdelibs/kio/misc/kfile/CMakeLists.txt	2012-09-05 15:43:51.120649315 -0400
-@@ -21,6 +21,7 @@
- 
- link_directories(
-   ${TQT_LIBRARY_DIRS}
-+  ${XRENDER_LIBRARY_DIRS}
- )
- 
- 
-@@ -36,4 +37,4 @@
-   SOURCES ${${target}_SRCS}
-   LINK kio-shared
-   DESTINATION ${BIN_INSTALL_DIR}
--)
-\ No newline at end of file
-+)
---- kdelibs/kdoctools/CMakeLists.txt.ORI	2012-09-05 15:44:33.205807471 -0400
-+++ kdelibs/kdoctools/CMakeLists.txt	2012-09-05 15:44:39.466682225 -0400
-@@ -25,6 +25,7 @@
- 
- link_directories(
-   ${TQT_LIBRARY_DIRS}
-+  ${XRENDER_LIBRARY_DIRS}
- )
- 
- 
---- kdelibs/kio/misc/ksendbugmail/CMakeLists.txt.ORI	2012-09-05 15:45:24.401783247 -0400
-+++ kdelibs/kio/misc/ksendbugmail/CMakeLists.txt	2012-09-05 15:45:31.286645499 -0400
-@@ -19,6 +19,7 @@
- 
- link_directories(
-   ${TQT_LIBRARY_DIRS}
-+  ${XRENDER_LIBRARY_DIRS}
- )
- 
- 
---- kdelibs/interfaces/kscript/CMakeLists.txt.ORI	2012-09-05 15:46:39.496306960 -0400
-+++ kdelibs/interfaces/kscript/CMakeLists.txt	2012-09-05 15:46:45.331193604 -0400
-@@ -25,6 +25,7 @@
- 
- link_directories(
-   ${TQT_LIBRARY_DIRS}
-+  ${XRENDER_LIBRARY_DIRS}
- )
- 
- 
---- kdelibs/kparts/CMakeLists.txt.ORI	2012-09-05 15:47:41.529101602 -0400
-+++ kdelibs/kparts/CMakeLists.txt	2012-09-05 15:47:47.294989542 -0400
-@@ -25,6 +25,7 @@
- 
- link_directories(
-   ${TQT_LIBRARY_DIRS}
-+  ${XRENDER_LIBRARY_DIRS}
- )
- 
- 
---- kdelibs/kdeprint/CMakeLists.txt.ORI	2012-09-05 15:48:34.508071783 -0400
-+++ kdelibs/kdeprint/CMakeLists.txt	2012-09-05 15:48:41.700931937 -0400
-@@ -40,6 +40,7 @@
- 
- link_directories(
-   ${TQT_LIBRARY_DIRS}
-+  ${XRENDER_LIBRARY_DIRS}
- )
- 
- 
---- kdelibs/kdeprint/cups/cupsdconf2/CMakeLists.txt.ORI	2012-09-05 15:49:26.236065937 -0400
-+++ kdelibs/kdeprint/cups/cupsdconf2/CMakeLists.txt	2012-09-05 15:49:31.824957243 -0400
-@@ -24,6 +24,7 @@
- 
- link_directories(
-   ${TQT_LIBRARY_DIRS}
-+  ${XRENDER_LIBRARY_DIRS}
- )
- 
- 
---- kdelibs/kioslave/http/CMakeLists.txt.ORI	2012-09-05 15:50:45.284528209 -0400
-+++ kdelibs/kioslave/http/CMakeLists.txt	2012-09-05 15:50:52.468388422 -0400
-@@ -27,6 +27,7 @@
- 
- link_directories(
-   ${TQT_LIBRARY_DIRS}
-+  ${XRENDER_LIBRARY_DIRS}
- )
- 
- 
---- kdelibs/kioslave/file/CMakeLists.txt.ORI	2012-09-05 15:51:43.357398032 -0400
-+++ kdelibs/kioslave/file/CMakeLists.txt	2012-09-05 15:51:50.506258876 -0400
-@@ -26,6 +26,7 @@
- 
- link_directories(
-   ${TQT_LIBRARY_DIRS}
-+  ${XRENDER_LIBRARY_DIRS}
- )
- 
- 
---- kdelibs/kioslave/ftp/CMakeLists.txt.ORI	2012-09-05 15:52:39.615302790 -0400
-+++ kdelibs/kioslave/ftp/CMakeLists.txt	2012-09-05 15:52:45.935179729 -0400
-@@ -21,6 +21,7 @@
- 
- link_directories(
-   ${TQT_LIBRARY_DIRS}
-+  ${XRENDER_LIBRARY_DIRS}
- )
- 
- 
---- kdelibs/arts/kde/CMakeLists.txt.ORI	2012-09-05 15:53:32.040281826 -0400
-+++ kdelibs/arts/kde/CMakeLists.txt	2012-09-05 15:53:38.541155204 -0400
-@@ -25,6 +25,7 @@
- link_directories(
-   ${TQT_LIBRARY_DIRS}
-   ${ARTS_LIBRARY_DIRS}
-+  ${XRENDER_LIBRARY_DIRS}
- )
- 
- # pkg-config stripping -I/usr/include
---- kdelibs/interfaces/kimproxy/library/CMakeLists.txt.ORI	2012-09-05 15:54:52.117721726 -0400
-+++ kdelibs/interfaces/kimproxy/library/CMakeLists.txt	2012-09-05 15:55:02.693515629 -0400
-@@ -23,6 +23,7 @@
- 
- link_directories(
-   ${TQT_LIBRARY_DIRS}
-+  ${XRENDER_LIBRARY_DIRS}
- )
- 
- 
---- kdelibs/kresources/CMakeLists.txt.ORI	2012-09-05 15:55:55.219491830 -0400
-+++ kdelibs/kresources/CMakeLists.txt	2012-09-05 15:56:01.964360344 -0400
-@@ -24,6 +24,7 @@
- 
- link_directories(
-   ${TQT_LIBRARY_DIRS}
-+  ${XRENDER_LIBRARY_DIRS}
- )
- 
- 
---- kdelibs/kioslave/iso/CMakeLists.txt.ORI	2012-09-05 15:57:00.178225273 -0400
-+++ kdelibs/kioslave/iso/CMakeLists.txt	2012-09-05 15:57:06.535101301 -0400
-@@ -24,6 +24,7 @@
- 
- link_directories(
-   ${TQT_LIBRARY_DIRS}
-+  ${XRENDER_LIBRARY_DIRS}
- )
- 
- 
---- kdelibs/kioslave/gzip/CMakeLists.txt.ORI	2012-09-05 15:58:24.363583139 -0400
-+++ kdelibs/kioslave/gzip/CMakeLists.txt	2012-09-05 15:58:29.777477507 -0400
-@@ -18,6 +18,7 @@
- 
- link_directories(
-   ${TQT_LIBRARY_DIRS}
-+  ${XRENDER_LIBRARY_DIRS}
- )
- 
- 
---- kdelibs/kioslave/bzip2/CMakeLists.txt.ORI	2012-09-05 15:59:29.076320316 -0400
-+++ kdelibs/kioslave/bzip2/CMakeLists.txt	2012-09-05 15:59:34.117221927 -0400
-@@ -19,6 +19,7 @@
- 
- link_directories(
-   ${TQT_LIBRARY_DIRS}
-+  ${XRENDER_LIBRARY_DIRS}
- )
- 
- 
---- kdelibs/kioslave/metainfo/CMakeLists.txt.ORI	2012-09-05 16:00:23.606255852 -0400
-+++ kdelibs/kioslave/metainfo/CMakeLists.txt	2012-09-05 16:00:29.200146638 -0400
-@@ -20,6 +20,7 @@
- 
- link_directories(
-   ${TQT_LIBRARY_DIRS}
-+  ${XRENDER_LIBRARY_DIRS}
- )
- 
- 
---- kdelibs/krsync/CMakeLists.txt.ORI	2012-09-05 16:01:17.567202186 -0400
-+++ kdelibs/krsync/CMakeLists.txt	2012-09-05 16:01:23.763081184 -0400
-@@ -24,6 +24,7 @@
- 
- link_directories(
-   ${TQT_LIBRARY_DIRS}
-+  ${XRENDER_LIBRARY_DIRS}
- )
- 
- 
---- kdelibs/kio/misc/kssld/CMakeLists.txt.ORI	2012-09-05 16:02:12.759124170 -0400
-+++ kdelibs/kio/misc/kssld/CMakeLists.txt	2012-09-05 16:02:19.426993911 -0400
-@@ -23,6 +23,7 @@
- 
- link_directories(
-   ${TQT_LIBRARY_DIRS}
-+  ${XRENDER_LIBRARY_DIRS}
- )
- 
- 
---- kdelibs/kdeui/kdetrayproxy/CMakeLists.txt.ORI	2012-09-05 16:03:48.650271606 -0400
-+++ kdelibs/kdeui/kdetrayproxy/CMakeLists.txt	2012-09-05 16:03:54.752156274 -0400
-@@ -20,6 +20,7 @@
- 
- link_directories(
-   ${TQT_LIBRARY_DIRS}
-+  ${XRENDER_LIBRARY_DIRS}
- )
- 
- 
---- kdelibs/kio/misc/kwalletd/CMakeLists.txt.ORI	2012-09-05 16:04:55.631005088 -0400
-+++ kdelibs/kio/misc/kwalletd/CMakeLists.txt	2012-09-05 16:05:03.666853065 -0400
-@@ -24,6 +24,7 @@
- 
- link_directories(
-   ${TQT_LIBRARY_DIRS}
-+  ${XRENDER_LIBRARY_DIRS}
- )
- 
- 
---- kdelibs/knewstuff/CMakeLists.txt.ORI	2012-09-05 16:05:51.805942029 -0400
-+++ kdelibs/knewstuff/CMakeLists.txt	2012-09-05 16:05:57.713830182 -0400
-@@ -23,6 +23,7 @@
- 
- link_directories(
-   ${TQT_LIBRARY_DIRS}
-+  ${XRENDER_LIBRARY_DIRS}
- )
- 
- 
---- kdelibs/kio/kpasswdserver/CMakeLists.txt.ORI	2012-09-05 16:06:46.686902706 -0400
-+++ kdelibs/kio/kpasswdserver/CMakeLists.txt	2012-09-05 16:06:53.345776552 -0400
-@@ -24,6 +24,7 @@
- 
- link_directories(
-   ${TQT_LIBRARY_DIRS}
-+  ${XRENDER_LIBRARY_DIRS}
- )
- 
- 
---- kdelibs/kio/misc/kpac/CMakeLists.txt.ORI	2012-09-05 16:07:43.907818289 -0400
-+++ kdelibs/kio/misc/kpac/CMakeLists.txt	2012-09-05 16:07:49.444713316 -0400
-@@ -26,6 +26,7 @@
- 
- link_directories(
-   ${TQT_LIBRARY_DIRS}
-+  ${XRENDER_LIBRARY_DIRS}
- )
- 
- ##### other data ################################
---- kdelibs/kabc/CMakeLists.txt.ORI	2012-09-05 16:08:49.154580815 -0400
-+++ kdelibs/kabc/CMakeLists.txt	2012-09-05 16:08:57.154429020 -0400
-@@ -36,6 +36,7 @@
- 
- link_directories(
-   ${TQT_LIBRARY_DIRS}
-+  ${XRENDER_LIBRARY_DIRS}
- )
- 
- 
---- kdelibs/khtml/java/CMakeLists.txt.ORI	2012-09-05 16:09:55.224326707 -0400
-+++ kdelibs/khtml/java/CMakeLists.txt	2012-09-05 16:10:02.194194348 -0400
-@@ -28,6 +28,7 @@
- 
- link_directories(
-   ${TQT_LIBRARY_DIRS}
-+  ${XRENDER_LIBRARY_DIRS}
- )
- 
- 
---- kdelibs/kutils/CMakeLists.txt.ORI	2012-09-05 16:10:45.848365097 -0400
-+++ kdelibs/kutils/CMakeLists.txt	2012-09-05 16:10:51.715253615 -0400
-@@ -26,6 +26,7 @@
- 
- link_directories(
-   ${TQT_LIBRARY_DIRS}
-+  ${XRENDER_LIBRARY_DIRS}
- )
- 
- 
---- kdelibs/interfaces/kscript/sample/CMakeLists.txt.ORI	2012-09-05 16:11:52.986088900 -0400
-+++ kdelibs/interfaces/kscript/sample/CMakeLists.txt	2012-09-05 16:12:00.529945437 -0400
-@@ -20,6 +20,7 @@
- 
- link_directories(
-   ${TQT_LIBRARY_DIRS}
-+  ${XRENDER_LIBRARY_DIRS}
- )
- 
- 
---- kdelibs/khtml/kmultipart/CMakeLists.txt.ORI	2012-09-05 16:12:49.105021375 -0400
-+++ kdelibs/khtml/kmultipart/CMakeLists.txt	2012-09-05 16:12:55.035908513 -0400
-@@ -25,6 +25,7 @@
- 
- link_directories(
-   ${TQT_LIBRARY_DIRS}
-+  ${XRENDER_LIBRARY_DIRS}
- )
- 
- 
---- kdelibs/kcert/CMakeLists.txt.ORI	2012-09-05 16:13:43.686982413 -0400
-+++ kdelibs/kcert/CMakeLists.txt	2012-09-05 16:13:51.788828139 -0400
-@@ -26,6 +26,7 @@
- 
- link_directories(
-   ${TQT_LIBRARY_DIRS}
-+  ${XRENDER_LIBRARY_DIRS}
- )
- 
- 
---- kdelibs/arts/knotify/CMakeLists.txt.ORI	2012-09-05 16:14:42.802856412 -0400
-+++ kdelibs/arts/knotify/CMakeLists.txt	2012-09-05 16:14:50.217715126 -0400
-@@ -24,6 +24,7 @@
- link_directories(
-   ${TQT_LIBRARY_DIRS}
-   ${ARTS_LIBRARY_DIRS}
-+  ${XRENDER_LIBRARY_DIRS}
- )
- 
- 
---- kdelibs/interfaces/kmediaplayer/CMakeLists.txt.ORI	2012-09-05 16:15:47.850616551 -0400
-+++ kdelibs/interfaces/kmediaplayer/CMakeLists.txt	2012-09-05 16:15:53.805503001 -0400
-@@ -26,6 +26,7 @@
- 
- link_directories(
-   ${TQT_LIBRARY_DIRS}
-+  ${XRENDER_LIBRARY_DIRS}
- )
- 
- 
---- kdelibs/kdeprint/management/CMakeLists.txt.ORI	2012-09-05 16:16:51.704398570 -0400
-+++ kdelibs/kdeprint/management/CMakeLists.txt	2012-09-05 16:16:58.402270762 -0400
-@@ -32,6 +32,7 @@
- 
- link_directories(
-   ${TQT_LIBRARY_DIRS}
-+  ${XRENDER_LIBRARY_DIRS}
- )
- 
- 
---- kdelibs/kdeprint/lpdunix/CMakeLists.txt.ORI	2012-09-05 16:18:05.348992771 -0400
-+++ kdelibs/kdeprint/lpdunix/CMakeLists.txt	2012-09-05 16:18:13.274841407 -0400
-@@ -28,6 +28,7 @@
- 
- link_directories(
-   ${TQT_LIBRARY_DIRS}
-+  ${XRENDER_LIBRARY_DIRS}
- )
- 
- 
---- kdelibs/kdeprint/ext/CMakeLists.txt.ORI	2012-09-05 16:19:06.696820851 -0400
-+++ kdelibs/kdeprint/ext/CMakeLists.txt	2012-09-05 16:19:13.589689130 -0400
-@@ -26,6 +26,7 @@
- 
- link_directories(
-   ${TQT_LIBRARY_DIRS}
-+  ${XRENDER_LIBRARY_DIRS}
- )
- 
- 
---- kdelibs/interfaces/kmediaplayer/kfileaudiopreview/CMakeLists.txt.ORI	2012-09-05 16:20:09.255625011 -0400
-+++ kdelibs/interfaces/kmediaplayer/kfileaudiopreview/CMakeLists.txt	2012-09-05 16:20:16.883479148 -0400
-@@ -28,6 +28,7 @@
- link_directories(
-   ${TQT_LIBRARY_DIRS}
-   ${ARTS_LIBRARY_DIRS}
-+  ${XRENDER_LIBRARY_DIRS}
- )
- 
- 
---- kdelibs/khtml/CMakeLists.txt.ORI	2012-09-05 16:21:17.056328088 -0400
-+++ kdelibs/khtml/CMakeLists.txt	2012-09-05 16:21:23.855197987 -0400
-@@ -46,6 +46,7 @@
- 
- link_directories(
-   ${TQT_LIBRARY_DIRS}
-+  ${XRENDER_LIBRARY_DIRS}
- )
- 
- 
---- kdelibs/kspell2/ui/CMakeLists.txt.ORI	2012-09-05 16:22:21.155101145 -0400
-+++ kdelibs/kspell2/ui/CMakeLists.txt	2012-09-05 16:22:28.929952270 -0400
-@@ -25,6 +25,7 @@
- 
- link_directories(
-   ${TQT_LIBRARY_DIRS}
-+  ${XRENDER_LIBRARY_DIRS}
- )
- 
- 
---- kdelibs/kcmshell/CMakeLists.txt.ORI	2012-09-05 16:23:26.764844457 -0400
-+++ kdelibs/kcmshell/CMakeLists.txt	2012-09-05 16:23:32.943726066 -0400
-@@ -23,6 +23,7 @@
- 
- link_directories(
-   ${TQT_LIBRARY_DIRS}
-+  ${XRENDER_LIBRARY_DIRS}
- )
- 
- 
---- kdelibs/kmdi/kmdi/CMakeLists.txt.ORI	2012-09-05 16:24:30.703618985 -0400
-+++ kdelibs/kmdi/kmdi/CMakeLists.txt	2012-09-05 16:24:36.946499290 -0400
-@@ -25,6 +25,7 @@
- 
- link_directories(
-   ${TQT_LIBRARY_DIRS}
-+  ${XRENDER_LIBRARY_DIRS}
- )
- 
- 
---- kdelibs/kmdi/CMakeLists.txt.ORI	2012-09-05 16:25:27.631527239 -0400
-+++ kdelibs/kmdi/CMakeLists.txt	2012-09-05 16:25:33.639411986 -0400
-@@ -27,6 +27,7 @@
- 
- link_directories(
-   ${TQT_LIBRARY_DIRS}
-+  ${XRENDER_LIBRARY_DIRS}
- )
- 
- 
---- kdelibs/kspell2/plugins/ispell/CMakeLists.txt.ORI	2012-09-05 16:26:26.062406048 -0400
-+++ kdelibs/kspell2/plugins/ispell/CMakeLists.txt	2012-09-05 16:26:31.159308217 -0400
-@@ -19,6 +19,7 @@
- 
- link_directories(
-   ${TQT_LIBRARY_DIRS}
-+  ${XRENDER_LIBRARY_DIRS}
- )
- 
- 
---- kdelibs/kspell2/plugins/aspell/CMakeLists.txt.ORI	2012-09-05 16:27:38.670011962 -0400
-+++ kdelibs/kspell2/plugins/aspell/CMakeLists.txt	2012-09-05 16:27:44.931891687 -0400
-@@ -21,6 +21,7 @@
- link_directories(
-   ${TQT_LIBRARY_DIRS}
-   ${ASPELL_LIBRARY_DIRS}
-+  ${XRENDER_LIBRARY_DIRS}
- )
- 
- 
---- kdelibs/kabc/formats/CMakeLists.txt.ORI	2012-09-05 16:28:38.501862464 -0400
-+++ kdelibs/kabc/formats/CMakeLists.txt	2012-09-05 16:28:44.382749443 -0400
-@@ -24,6 +24,7 @@
- 
- link_directories(
-   ${TQT_LIBRARY_DIRS}
-+  ${XRENDER_LIBRARY_DIRS}
- )
- 
- 
---- kdelibs/kabc/plugins/ldapkio/CMakeLists.txt.ORI	2012-09-05 16:29:38.283713293 -0400
-+++ kdelibs/kabc/plugins/ldapkio/CMakeLists.txt	2012-09-05 16:29:44.129600887 -0400
-@@ -27,6 +27,7 @@
- 
- link_directories(
-   ${TQT_LIBRARY_DIRS}
-+  ${XRENDER_LIBRARY_DIRS}
- )
- 
- 
---- kdelibs/kabc/plugins/file/CMakeLists.txt.ORI	2012-09-05 16:30:42.311481817 -0400
-+++ kdelibs/kabc/plugins/file/CMakeLists.txt	2012-09-05 16:30:47.634379406 -0400
-@@ -27,6 +27,7 @@
- 
- link_directories(
-   ${TQT_LIBRARY_DIRS}
-+  ${XRENDER_LIBRARY_DIRS}
- )
- 
- 
---- kdelibs/interfaces/ktexteditor/CMakeLists.txt.ORI	2012-09-05 16:31:40.221367404 -0400
-+++ kdelibs/interfaces/ktexteditor/CMakeLists.txt	2012-09-05 16:31:47.174233563 -0400
-@@ -28,6 +28,7 @@
- 
- link_directories(
-   ${TQT_LIBRARY_DIRS}
-+  ${XRENDER_LIBRARY_DIRS}
- )
- 
- 
---- kdelibs/kabc/plugins/dir/CMakeLists.txt.ORI	2012-09-05 16:32:39.930217776 -0400
-+++ kdelibs/kabc/plugins/dir/CMakeLists.txt	2012-09-05 16:32:45.775105207 -0400
-@@ -27,6 +27,7 @@
- 
- link_directories(
-   ${TQT_LIBRARY_DIRS}
-+  ${XRENDER_LIBRARY_DIRS}
- )
- 
- 
---- kdelibs/kabc/plugins/net/CMakeLists.txt.ORI	2012-09-05 16:33:52.745814992 -0400
-+++ kdelibs/kabc/plugins/net/CMakeLists.txt	2012-09-05 16:34:01.271650687 -0400
-@@ -27,6 +27,7 @@
- 
- link_directories(
-   ${TQT_LIBRARY_DIRS}
-+  ${XRENDER_LIBRARY_DIRS}
- )
- 
- 
---- kdelibs/kdeprint/cups/CMakeLists.txt.ORI	2012-09-05 16:35:01.843483032 -0400
-+++ kdelibs/kdeprint/cups/CMakeLists.txt	2012-09-05 16:35:10.784310629 -0400
-@@ -35,6 +35,7 @@
- 
- link_directories(
-   ${TQT_LIBRARY_DIRS}
-+  ${XRENDER_LIBRARY_DIRS}
- )
- 
- 
---- kdelibs/kdeprint/rlpr/CMakeLists.txt.ORI	2012-09-05 16:36:01.783326981 -0400
-+++ kdelibs/kdeprint/rlpr/CMakeLists.txt	2012-09-05 16:36:08.502197359 -0400
-@@ -29,6 +29,7 @@
- 
- link_directories(
-   ${TQT_LIBRARY_DIRS}
-+  ${XRENDER_LIBRARY_DIRS}
- )
- 
- 
---- kdelibs/kate/plugins/wordcompletion/CMakeLists.txt.ORI	2012-09-05 16:37:02.425156810 -0400
-+++ kdelibs/kate/plugins/wordcompletion/CMakeLists.txt	2012-09-05 16:37:08.514039285 -0400
-@@ -21,6 +21,7 @@
- 
- link_directories(
-   ${TQT_LIBRARY_DIRS}
-+  ${XRENDER_LIBRARY_DIRS}
- )
- 
- ##### other data ################################
---- kdelibs/kate/plugins/isearch/CMakeLists.txt.ORI	2012-09-05 16:38:01.583014723 -0400
-+++ kdelibs/kate/plugins/isearch/CMakeLists.txt	2012-09-05 16:38:07.610898319 -0400
-@@ -22,6 +22,7 @@
- 
- link_directories(
-   ${TQT_LIBRARY_DIRS}
-+  ${XRENDER_LIBRARY_DIRS}
- )
- 
- 
---- kdelibs/kate/interfaces/CMakeLists.txt.ORI	2012-09-05 16:39:02.822865446 -0400
-+++ kdelibs/kate/interfaces/CMakeLists.txt	2012-09-05 16:39:11.673700838 -0400
-@@ -21,6 +21,7 @@
- 
- link_directories(
-   ${TQT_LIBRARY_DIRS}
-+  ${XRENDER_LIBRARY_DIRS}
- )
- 
- 
---- kdelibs/kdeprint/lpr/CMakeLists.txt.ORI	2012-09-05 16:40:04.179723987 -0400
-+++ kdelibs/kdeprint/lpr/CMakeLists.txt	2012-09-05 16:40:15.471513833 -0400
-@@ -29,6 +29,7 @@
- 
- link_directories(
-   ${TQT_LIBRARY_DIRS}
-+  ${XRENDER_LIBRARY_DIRS}
- )
- 
- 
---- kdelibs/kate/plugins/insertfile/CMakeLists.txt.ORI	2012-09-05 16:41:07.687541674 -0400
-+++ kdelibs/kate/plugins/insertfile/CMakeLists.txt	2012-09-05 16:41:13.326436653 -0400
-@@ -24,6 +24,7 @@
- 
- link_directories(
-   ${TQT_LIBRARY_DIRS}
-+  ${XRENDER_LIBRARY_DIRS}
- )
- 
- 
---- kdelibs/kate/plugins/kdatatool/CMakeLists.txt.ORI	2012-09-05 16:42:09.313393591 -0400
-+++ kdelibs/kate/plugins/kdatatool/CMakeLists.txt	2012-09-05 16:42:15.058286525 -0400
-@@ -24,6 +24,7 @@
- 
- link_directories(
-   ${TQT_LIBRARY_DIRS}
-+  ${XRENDER_LIBRARY_DIRS}
- )
- 
- 
---- kdelibs/kate/part/CMakeLists.txt.ORI	2012-09-05 16:43:06.975318648 -0400
-+++ kdelibs/kate/part/CMakeLists.txt	2012-09-05 16:43:13.228202040 -0400
-@@ -35,6 +35,7 @@
- link_directories(
-   ${TQT_LIBRARY_DIRS}
-   ${LUA_LIBRARY_DIRS}
-+  ${XRENDER_LIBRARY_DIRS}
- )
- 
- ##### kate (static library) #####################
diff --git a/redhat/tdelibs/kdelibs-3.5.13-kate_syntax.patch.gz b/redhat/tdelibs/kdelibs-3.5.13-kate_syntax.patch.gz
deleted file mode 100644
index 523bdfbfd..000000000
Binary files a/redhat/tdelibs/kdelibs-3.5.13-kate_syntax.patch.gz and /dev/null differ
diff --git a/redhat/tdelibs/kdelibs-3.5.13-maxlinelength.patch b/redhat/tdelibs/kdelibs-3.5.13-maxlinelength.patch
deleted file mode 100644
index ba009c708..000000000
--- a/redhat/tdelibs/kdelibs-3.5.13-maxlinelength.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-diff -Naur kdelibs.orig/kio/kio/kmimemagic.cpp kdelibs/kio/kio/kmimemagic.cpp
---- kdelibs.orig/kio/kio/kmimemagic.cpp	2011-08-11 04:30:08.000000000 +0200
-+++ kdelibs/kio/kio/kmimemagic.cpp	2011-11-19 23:23:41.000000000 +0100
-@@ -1988,8 +1988,9 @@
- 	return 1;
- }
- 
--/* Maximal length of a line we consider "reasonable". */
--#define TEXT_MAXLINELEN 300
-+/* Code removed below: conf files with big lines ARE text files,
-+ * there is no "reasonable" length
-+ */
- 
- // This code is taken from the "file" command, where it is licensed
- // in the "beer-ware license" :-)
-@@ -2007,23 +2008,6 @@
-         if ((*cp < 8) || (*cp>13 && *cp<32 && *cp!=27 ) || (*cp==0x7F))
-             return 0;
- 
--    /* Now, look whether the file consists of lines of
--     * "reasonable" length. */
--
--    for (i = 0; i < nbytes;) {
--        cp = (unsigned char *) memchr(buf, '\n', nbytes - i);
--        if (cp == NULL) {
--            /* Don't fail if we hit the end of buffer. */
--            if (i + TEXT_MAXLINELEN >= nbytes)
--                break;
--            else
--                return 0;
--        }
--        if (cp - buf > TEXT_MAXLINELEN)
--            return 0;
--        i += (cp - buf + 1);
--        buf = cp + 1;
--    }
-     conf->resultBuf = MIME_TEXT_PLAIN;
-     return 1;
- }
-
diff --git a/redhat/tdelibs/kdelibs-3.5.13-prevent_xdg_autostart_multiple_times.patch b/redhat/tdelibs/kdelibs-3.5.13-prevent_xdg_autostart_multiple_times.patch
deleted file mode 100644
index 6a5a8c9d4..000000000
--- a/redhat/tdelibs/kdelibs-3.5.13-prevent_xdg_autostart_multiple_times.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-commit e9f29cfb2a76657f150ec585fa6775f372d7e460
-Author: Timothy Pearson <kb9vqf@pearsoncomputing.net>
-Date:   1343238048 -0500
-
-    Prevent XDG autostart files from starting multiple times
-    This resolves Bug 1096
-
-diff --git a/kinit/autostart.cpp b/kinit/autostart.cpp
-index 4880039..c7feb17 100644
---- a/kinit/autostart.cpp
-+++ b/kinit/autostart.cpp
-@@ -214,6 +214,32 @@ AutoStart::loadAutoStartList()
-        }
-        m_startList->append(item);
-    }
-+
-+   // Check for duplicate entries and remove if found
-+   TQPtrListIterator<AutoStartItem> it1(*m_startList);
-+   TQPtrListIterator<AutoStartItem> it2(*m_startList);
-+   AutoStartItem *item1;
-+   AutoStartItem *item2;
-+   while ((item1 = it1.current()) != 0) {
-+       bool dupfound1 = false;
-+       it2.toFirst();
-+       while ((item2 = it2.current()) != 0) {
-+           bool dupfound2 = false;
-+           if (item2 != item1) {
-+               if (item1->service == item2->service) {
-+                   m_startList->removeRef(item2);
-+                   dupfound1 = true;
-+                   dupfound2 = true;
-+               }
-+           }
-+           if (!dupfound2) {
-+               ++it2;
-+           }
-+       }
-+       if (!dupfound1) {
-+           ++it1;
-+       }
-+   }
- }
- 
- TQString
-@@ -241,7 +267,7 @@ AutoStart::startService()
-      }
-      m_started.remove(m_started.begin());
-    }
--   
-+
-    // Check for items that don't depend on anything
-    AutoStartItem *item;
-    for(item = m_startList->first();
diff --git a/redhat/tdelibs/kdelibs-3.5.13-reduce_more_applications.patch b/redhat/tdelibs/kdelibs-3.5.13-reduce_more_applications.patch
deleted file mode 100644
index 62ce343a2..000000000
--- a/redhat/tdelibs/kdelibs-3.5.13-reduce_more_applications.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-commit 1c06ae32f64450c38f1294b8adda2fd9a6cc98b1
-Author: Darrell Anderson <humanreadable@yahoo.com>
-Date:   1331690106 -0500
-
-    Reduce "More Applications" and extra koffice items from TDE menu.
-    This partially resolves bug report 653.
-
-diff --git a/kded/applications.menu b/kded/applications.menu
-index 4b30a56..380196e 100644
---- a/kded/applications.menu
-+++ b/kded/applications.menu
-@@ -272,16 +272,6 @@
- 			</And>
- 		</Include>
- 		<Menu>
--			<Name>Email</Name>
--			<Directory>kde-internet-email.directory</Directory>
--			<Include>
--				<And>
--				<Category>Email</Category>
--				<Not><Category>X-KDE-More</Category></Not>
--				</And>
--			</Include>
--		</Menu>
--		<Menu>
- 		  <Name>Terminal</Name>
- 		  <Directory>kde-internet-terminal.directory</Directory>
- 		</Menu>
-@@ -321,12 +311,6 @@
- 		<Directory>kde-office.directory</Directory>
- 		<Layout>
- 			<Merge type="menus"/>
--			<Filename>kde-koshell.desktop</Filename>
--			<Filename>kde-Kontact.desktop</Filename>
--			<Separator/>
--			<Filename>kde-kword.desktop</Filename>
--			<Filename>kde-kspread.desktop</Filename>
--			<Filename>kde-kpresenter.desktop</Filename>
- 			<Merge type="files"/>
- 			<Separator/>
- 			<Menuname>More</Menuname>
diff --git a/redhat/tdelibs/kdelibs-3.5.13-restore_tdesu_keeppassword_default_disabled.patch b/redhat/tdelibs/kdelibs-3.5.13-restore_tdesu_keeppassword_default_disabled.patch
deleted file mode 100644
index 8c3f43a11..000000000
--- a/redhat/tdelibs/kdelibs-3.5.13-restore_tdesu_keeppassword_default_disabled.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-commit 87363770ea3fe6167445b6d445ca563f2a3f05fc
-Author: Darrell Anderson <humanreadable@yahoo.com>
-Date:   1339430277 -0500
-
-    Restore tdesu dialog "Keep password" check box default to disabled/unchecked.
-
-diff --git a/tdesu/defaults.h b/tdesu/defaults.h
-index 4649b2b..7fd724e 100644
---- a/kdesu/defaults.h
-+++ b/kdesu/defaults.h
-@@ -13,9 +13,8 @@
- #ifndef __Defaults_h_included__
- #define __Defaults_h_included__
- 
--/*const int defTimeout = 120*60;*/
- const int defTimeout = 120*60;
- const int defEchoMode = 0;
--const int defKeep = true;
-+const int defKeep = false;
- 
- #endif
diff --git a/redhat/tdelibs/kdelibs-3.5.13-update_iso_kioslave_better_handle_large_image.patch b/redhat/tdelibs/kdelibs-3.5.13-update_iso_kioslave_better_handle_large_image.patch
deleted file mode 100644
index 601bc41ea..000000000
--- a/redhat/tdelibs/kdelibs-3.5.13-update_iso_kioslave_better_handle_large_image.patch
+++ /dev/null
@@ -1,115 +0,0 @@
-commit dca4c677237b01768f5d6d798a2d918547d2ee8e
-Author: Timothy Pearson <kb9vqf@pearsoncomputing.net>
-Date:   1341289561 -0500
-
-    Update iso kioslave to better handle large images
-
-diff --git a/kioslave/iso/kiso.cpp b/kioslave/iso/kiso.cpp
-index c9e2d43..9ec1f1c 100644
---- a/kioslave/iso/kiso.cpp
-+++ b/kioslave/iso/kiso.cpp
-@@ -188,7 +188,7 @@ KIso::~KIso()
- }
- 
- /* callback function for libisofs */
--static int readf(char *buf, long start, long len,void *udata) {
-+static int readf(char *buf, long long start, long long len,void *udata) {
- 
-     TQIODevice* dev = ( static_cast<KIso*> (udata) )->device();
- 
-diff --git a/kioslave/iso/libisofs/isofs.c b/kioslave/iso/libisofs/isofs.c
-index e599450..f1db442 100644
---- a/kioslave/iso/libisofs/isofs.c
-+++ b/kioslave/iso/libisofs/isofs.c
-@@ -122,7 +122,7 @@ void FreeBootTable(boot_head *boot) {
- 	boot->defentry=NULL;
- }
- 
--int BootImageSize(int media,long len) {
-+int BootImageSize(int media,long long len) {
- 	long long ret;
- 
- 	switch(media & 0xf) {
-@@ -158,7 +158,7 @@ static boot_entry *CreateBootEntry(char *be) {
- 	return entry;
- }
- 
--int ReadBootTable(readfunc *read,long sector, boot_head *head, void *udata) {
-+int ReadBootTable(readfunc *read,long long sector, boot_head *head, void *udata) {
- 
- 	char buf[2048], *c, *be;
- 	int i,end=0;
-@@ -221,7 +221,7 @@ err:
- /**
-  * Creates the linked list of the volume descriptors
-  */
--iso_vol_desc *ReadISO9660(readfunc *read,long sector,void *udata) {
-+iso_vol_desc *ReadISO9660(readfunc *read,long long sector,void *udata) {
- 				
- 	int i;
- 	struct iso_volume_descriptor buf;
-@@ -577,7 +577,7 @@ int level=0,joliet=0,dirs,files;
- iconv_t iconv_d;
- int fd;
- 
--int readf(char *buf, long start, long len,void *udata) {
-+int readf(char *buf, long long start, long long len,void *udata) {
- 	int ret;
- 	
- 	if ((ret=lseek64(fd, start << 11, SEEK_SET))<0) return ret;
-diff --git a/kioslave/iso/libisofs/isofs.h b/kioslave/iso/libisofs/isofs.h
-index b8971a4..1d17de4 100644
---- a/kioslave/iso/libisofs/isofs.h
-+++ b/kioslave/iso/libisofs/isofs.h
-@@ -50,13 +50,13 @@ typedef struct _rr_entry {
- 	int		re; /* relocated */
- 	char	z_algo[2]; /* zizofs algorithm */
- 	char	z_params[2]; /* zizofs parameters */
--	long		z_size; /* zizofs real_size */
-+	long long	z_size; /* zizofs real_size */
- } rr_entry;
- 
- typedef struct _iso_vol_desc {
- 	struct _iso_vol_desc	*next;
- 	struct _iso_vol_desc	*prev;
--	struct iso_volume_descriptor	data;	
-+	struct iso_volume_descriptor	data;
- } iso_vol_desc;
- 
- typedef struct _boot_entry {
-@@ -78,7 +78,7 @@ typedef struct _boot_head {
- /**
-  * this callback function needs to read 'len' sectors from 'start' into 'buf' 
-  */
--typedef int readfunc(char *buf,long start, long len,void *);
-+typedef int readfunc(char *buf,long long start, long long len,void *);
- 
- /**
-  * ProcessDir uses this callback
-@@ -107,7 +107,7 @@ time_t isodate_84261(char * p, int hs);
-  * If the function fails, returns NULL
-  * Don't forget to call FreeISO9660 after using the volume descriptor list!
-  */
--iso_vol_desc *ReadISO9660(readfunc *read,long sector,void *udata);
-+iso_vol_desc *ReadISO9660(readfunc *read,long long sector,void *udata);
- 
- /**
-  * Frees the linked list of volume descriptors
-@@ -140,7 +140,7 @@ int JolietLevel(struct iso_volume_descriptor *ivd);
- /**
-  * Returns the size of the boot image (in 512 byte sectors)
-  */
--int BootImageSize(int media,long len);
-+int BootImageSize(int media,long long len);
- 
- /**
-  * Frees the boot catalog entries in 'boot'. If you ever called ReadBootTable,
-@@ -151,7 +151,7 @@ void FreeBootTable(boot_head *boot);
- /**
-  * Reads the boot catalog into 'head'. Don't forget to call FreeBootTable!
-  */
--int ReadBootTable(readfunc *read,long sector, boot_head *head, void *udata);
-+int ReadBootTable(readfunc *read,long long sector, boot_head *head, void *udata);
- 
- #ifdef __cplusplus
- } //extern "C"
diff --git a/redhat/tdelibs/kdelibs-3.5.13.1-disable_invalid_certificate_always_prompt.patch b/redhat/tdelibs/kdelibs-3.5.13.1-disable_invalid_certificate_always_prompt.patch
deleted file mode 100644
index 72346c83b..000000000
--- a/redhat/tdelibs/kdelibs-3.5.13.1-disable_invalid_certificate_always_prompt.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- kdelibs-3.5.13.1/kio/kio/tcpslavebase.cpp.ORI	2012-12-29 11:25:06.736204632 +0100
-+++ kdelibs-3.5.13.1/kio/kio/tcpslavebase.cpp	2012-12-29 11:25:32.731669416 +0100
-@@ -853,10 +853,12 @@
-             permacache = d->cc->isPermanent(pc);
-          }
- 
-+/*
-          if (!_IPmatchesCN && cp == KSSLCertificateCache::Accept) {
-             cp = KSSLCertificateCache::Prompt;
- //            ksv = KSSLCertificate::Ok;
-          }
-+*/
- 
-          // Precondition: cp is one of Reject, Accept or Prompt
-          switch (cp) {
diff --git a/redhat/tdelibs/kdelibs-3.5.13.1.spec b/redhat/tdelibs/kdelibs-3.5.13.1.spec
deleted file mode 100644
index 88d4e36f6..000000000
--- a/redhat/tdelibs/kdelibs-3.5.13.1.spec
+++ /dev/null
@@ -1,434 +0,0 @@
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?tde_prefix}" != "/usr"
-%define _variant .opt
-%endif
-
-# TDE 3.5.13 specific variables
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_docdir}
-
-Name:		trinity-tdelibs
-Version:	3.5.13.1
-Release:	2%{?dist}%{?_variant}
-License:	GPL
-Summary:	TDE Libraries
-Group:		Environment/Libraries
-
-Vendor:		Trinity Project
-Packager:	Francois Andriot <francois.andriot@free.fr>
-URL:		http://www.trinitydesktop.org/
-
-Prefix:		%{tde_prefix}
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:	kdelibs-3.5.13.1.tar.gz
-
-# [kdelibs] Security popup always appear on invalid SSL certificate, even when set
-#           to "always accept" [Bug #1287]
-Patch1:		kdelibs-3.5.13.1-disable_invalid_certificate_always_prompt.patch
-
-Obsoletes:	tdelibs < %{version}-%{release}
-Provides:	tdelibs = %{version}-%{release}
-Obsoletes:	trinity-kdelibs < %{version}-%{release}
-Provides:	trinity-kdelibs = %{version}-%{release}
-Obsoletes:	trinity-kdelibs-apidocs < %{version}-%{release}
-Provides:	trinity-kdelibs-apidocs = %{version}-%{release}
-
-
-BuildRequires:	cmake >= 2.8
-BuildRequires:	libtool
-BuildRequires:	trinity-tqtinterface-devel >= %{version}
-BuildRequires:	trinity-arts-devel >= %{version}
-BuildRequires:	krb5-devel
-BuildRequires:	libxslt-devel
-BuildRequires:	cups-devel
-BuildRequires:	libart_lgpl-devel
-BuildRequires:	pcre-devel
-BuildRequires:	openssl-devel
-BuildRequires:	gcc-c++
-BuildRequires:	alsa-lib-devel
-BuildRequires:	libidn-devel
-BuildRequires:	qt3-devel
-BuildRequires:	libtiff-devel
-BuildRequires:	glib2-devel
-BuildRequires:	gamin-devel
-BuildRequires:	aspell
-BuildRequires:	aspell-devel
-# LUA support are not ready yet
-#BuildRequires:	lua-devel
-
-
-
-# BZIP2 support
-%if 0%{?suse_version}
-BuildRequires:	libbz2-devel
-%else
-BuildRequires:	bzip2-devel
-%endif
-
-# UTEMPTER support
-%if 0%{?rhel} >=5 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires:	libutempter-devel
-%endif
-%if 0%{?rhel} == 4
-BuildRequires:	utempter
-%endif
-%if 0%{?suse_version}
-BuildRequires:	utempter-devel
-%endif
-
-# HSPELL support
-%if 0%{?rhel} >=5 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion}
-%define with_hspell 1
-BuildRequires:	hspell-devel
-%endif
-
-# JASPER support
-%if 0%{?rhel} >=5 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}
-%define with_jasper 1
-%if 0%{?suse_version}
-BuildRequires:	libjasper-devel
-%endif
-%if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires:	%{_lib}jasper-devel
-%endif
-%if 0%{?rhel} || 0%{?fedora}
-BuildRequires:	jasper-devel
-%endif
-%endif
-
-# AVAHI support
-%if 0%{?rhel} >=5 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}
-%define with_avahi 1
-%if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires:	trinity-avahi-tqt-devel >= %{version}
-BuildRequires:	%{_lib}avahi-client-devel
-Requires:		%{_lib}avahi-client3
-%endif
-%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version}
-BuildRequires:	trinity-avahi-tqt-devel >= %{version}
-BuildRequires:	avahi-devel
-Requires:		avahi
-%endif
-%endif
-
-# OPENEXR support
-%if 0%{?rhel} >=5 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}
-%define with_openexr 1
-BuildRequires:	OpenEXR-devel
-%endif
-
-# LIBTOOL
-%if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires:	%{_lib}ltdl-devel
-%endif
-%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version}
-BuildRequires:	libtool-ltdl-devel
-%endif
-%if 0%{?rhel} == 4
-BuildRequires:	libtool
-%endif
-
-# X11 support
-%if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires:	x11-proto-devel
-BuildRequires:	%{_lib}xcomposite%{?mgaversion:1}-devel
-%endif
-%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version}
-BuildRequires:	xorg-x11-proto-devel
-BuildRequires:	libXcomposite-devel
-%endif
-%if 0%{?rhel} == 4
-BuildRequires:	xorg-x11-devel
-%endif
-
-# ICEAUTH
-%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}
-Requires:		iceauth
-%endif
-%if 0%{?rhel} >= 5 || 0%{?fedora}
-Requires:		xorg-x11-server-utils
-%endif
-%if 0%{?rhel} == 4
-Requires:		xorg-x11
-%endif
-
-Requires:		trinity-tqtinterface >= %{version}
-Requires:		trinity-arts >= %{version}
-Requires:		qt3 >= 3.3.8.d
-
-%description
-Libraries for the Trinity Desktop Environment:
-TDE Libraries included: tdecore (TDE core library), kdeui (user interface),
-kfm (file manager), khtmlw (HTML widget), kio (Input/Output, networking),
-kspell (spelling checker), jscript (javascript), kab (addressbook),
-kimgio (image manipulation).
-
-%files
-%defattr(-,root,root,-)
-%doc AUTHORS COPYING COPYING-DOCS COPYING.LIB README TODO
-%{tde_bindir}/artsmessage
-%{tde_bindir}/cupsdconf
-%{tde_bindir}/cupsdoprint
-%{tde_bindir}/dcop
-%{tde_bindir}/dcopclient
-%{tde_bindir}/dcopfind
-%{tde_bindir}/dcopobject
-%{tde_bindir}/dcopquit
-%{tde_bindir}/dcopref
-%{tde_bindir}/dcopserver
-%{tde_bindir}/dcopserver_shutdown
-%{tde_bindir}/dcopstart
-%{tde_bindir}/filesharelist
-%{tde_bindir}/fileshareset
-%{tde_bindir}/imagetops
-%{tde_bindir}/kab2kabc
-%{tde_bindir}/kaddprinterwizard
-%{tde_bindir}/kbuildsycoca
-%{tde_bindir}/kcmshell
-%{tde_bindir}/kconf_update
-%{tde_bindir}/kcookiejar
-%{tde_bindir}/kde-config
-%{tde_bindir}/kde-menu
-%{tde_bindir}/kded
-%{tde_bindir}/kdeinit
-%{tde_bindir}/kdeinit_shutdown
-%{tde_bindir}/kdeinit_wrapper
-%{tde_bindir}/kdesu_stub
-%{tde_bindir}/kdontchangethehostname
-%{tde_bindir}/kdostartupconfig
-%{tde_bindir}/kfile
-%{tde_bindir}/kfmexec
-%{tde_bindir}/khotnewstuff
-%{tde_bindir}/kinstalltheme
-%{tde_bindir}/kio_http_cache_cleaner
-%{tde_bindir}/kio_uiserver
-%{tde_bindir}/kioexec
-%{tde_bindir}/kioslave
-%{tde_bindir}/klauncher
-%{tde_bindir}/kmailservice
-%{tde_bindir}/kmimelist
-%attr(4755,root,root) %{tde_bindir}/kpac_dhcp_helper
-%{tde_bindir}/ksendbugmail
-%{tde_bindir}/kshell
-%{tde_bindir}/kstartupconfig
-%{tde_bindir}/ktelnetservice
-%{tde_bindir}/ktradertest
-%{tde_bindir}/kwrapper
-%{tde_bindir}/lnusertemp
-%{tde_bindir}/make_driver_db_cups
-%{tde_bindir}/make_driver_db_lpr
-%{tde_bindir}/meinproc
-%{tde_bindir}/networkstatustestservice
-%{tde_bindir}/start_kdeinit
-%{tde_bindir}/start_kdeinit_wrapper
-%attr(4755,root,root) %{tde_bindir}/kgrantpty
-%{tde_tdelibdir}/*
-%{tde_libdir}/lib*.so.*
-%{tde_libdir}/lib[kt]deinit_*.la
-%{tde_libdir}/lib[kt]deinit_*.so
-%{tde_datadir}/applications/kde/*.desktop
-%{tde_datadir}/autostart/kab2kabc.desktop
-%{tde_datadir}/applnk/kio_iso.desktop
-%{tde_datadir}/apps/*
-%exclude %{tde_datadir}/apps/ksgmltools2/
-%config(noreplace) %{tde_datadir}/config/*
-%{tde_datadir}/emoticons/*
-%{tde_datadir}/icons/default.kde
-%{tde_datadir}/mimelnk/magic
-%{tde_datadir}/mimelnk/*/*.desktop
-%{tde_datadir}/services/*
-%{tde_datadir}/servicetypes/*
-%{tde_datadir}/icons/crystalsvg/
-%{tde_tdedocdir}/HTML/en/kspell/
-# remove conflicts with kdelibs-4
-%if "%{?tde_prefix}" != "/usr"
-%{tde_bindir}/checkXML
-%{tde_bindir}/ksvgtopng
-%{tde_bindir}/kunittestmodrunner
-%{tde_bindir}/preparetips
-%{tde_datadir}/icons/hicolor/index.theme
-%{tde_datadir}/locale/all_languages
-%{tde_tdedocdir}/HTML/en/common/*
-%{_sysconfdir}/ld.so.conf.d/trinity.conf
-%else
-%exclude %{tde_bindir}/checkXML
-%exclude %{tde_bindir}/ksvgtopng
-%exclude %{tde_bindir}/kunittestmodrunner
-%exclude %{tde_bindir}/preparetips
-%exclude %{tde_datadir}/config/colors
-%exclude %{tde_datadir}/config/kdebug.areas
-%exclude %{tde_datadir}/config/kdebugrc
-%exclude %{tde_datadir}/config/ksslcalist
-%exclude %{tde_datadir}/config/ui/ui_standards.rc
-%exclude %{tde_datadir}/icons/hicolor/index.theme
-%exclude %{tde_datadir}/locale/all_languages
-%exclude %{tde_tdedocdir}/HTML/en/common/*
-%endif
-
-# Avoid conflict with 'redhat-menus' package
-%if "%{tde_prefix}" == "/usr"
-%{_sysconfdir}/xdg/menus/kde-applications.menu
-%else
-%{tde_prefix}/etc/xdg/menus/kde-applications.menu
-%endif
-
-# New in TDE 3.5.13
-%{tde_bindir}/kdetcompmgr
-
-%pre
-# Bug 1074
-if [ -d %{tde_datadir}/locale/all_languages ]; then
-  rm -rf %{tde_datadir}/locale/all_languages
-fi
-
-%post
-/sbin/ldconfig || :
-
-%postun
-/sbin/ldconfig || :
-
-##########
-
-%package devel
-Summary:	%{name} - Development files
-Group:		Development/Libraries
-Requires:	%{name} = %{version}-%{release}
-
-Obsoletes:	tdelibs-devel < %{version}-%{release}
-Provides:	tdelibs-devel = %{version}-%{release}
-Obsoletes:	trinity-kdelibs-devel < %{version}-%{release}
-Provides:	trinity-kdelibs-devel = %{version}-%{release}
-
-%description devel
-This package includes the header files you will need to compile
-applications for TDE.
-
-%files devel
-%defattr(-,root,root,-)
-%{tde_bindir}/dcopidl*
-%{tde_bindir}/kconfig_compiler
-%{tde_bindir}/makekdewidgets
-%{tde_datadir}/apps/ksgmltools2/
-%{tde_tdeincludedir}/*
-%{tde_libdir}/*.la
-%{tde_libdir}/*.so
-%{tde_libdir}/*.a
-%exclude %{tde_libdir}/libkdeinit_*.la
-%exclude %{tde_libdir}/libkdeinit_*.so
-
-# New in TDE 3.5.13
-%{tde_datadir}/cmake/kdelibs.cmake
-
-%post devel
-/sbin/ldconfig || :
-
-%postun devel
-/sbin/ldconfig || :
-
-##########
-
-%if 0%{?suse_version} || 0%{?pclinuxos}
-%debug_package
-%endif
-
-##########
-
-%prep
-%setup -q -n kdelibs-3.5.13.1
-%patch1 -p1
-
-
-%build
-unset QTDIR || : ; . /etc/profile.d/qt3.sh
-export PATH="%{tde_bindir}:${QTDIR}/bin:${PATH}"
-export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
-export CMAKE_INCLUDE_PATH="%{tde_includedir}:%{tde_includedir}/tqt"
-
-# We need LD_LIBRARY_PATH here because ld.so.conf file has not been written yet
-export LD_LIBRARY_PATH="%{tde_libdir}"
-
-if [ -d /usr/X11R6 ]; then
-  export CXXFLAGS="${RPM_OPT_FLAGS} -L/usr/X11R6/%{_lib} -I/usr/X11R6/include"
-fi
-
-
-%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version}
-%__mkdir_p build
-cd build
-%endif
-
-%cmake \
-  -DCMAKE_INSTALL_PREFIX=%{tde_prefix} \
-  -DBIN_INSTALL_DIR=%{tde_bindir} \
-  -DDOC_INSTALL_DIR=%{tde_docdir} \
-  -DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \
-  -DLIB_INSTALL_DIR=%{tde_libdir} \
-  -DPKGCONFIG_INSTALL_DIR=%{tde_libdir}/pkgconfig \
-  -DSHARE_INSTALL_PREFIX=%{tde_datadir} \
-  -DCMAKE_SKIP_RPATH="OFF" \
-  -DWITH_ARTS=ON \
-  -DWITH_ALSA=ON \
-  -DWITH_LIBART=ON \
-  -DWITH_LIBIDN=ON \
-  -DWITH_SSL=ON \
-  -DWITH_CUPS=ON \
-  -DWITH_LUA=OFF \
-  -DWITH_TIFF=ON \
-  %{?with_jasper:-DWITH_JASPER=ON} \
-  %{?with_hspell:-DWITH_HSPELL=ON} \
-  %{?with_openexr:-DWITH_OPENEXR=ON} \
-  %{?with_avahi:-DWITH_AVAHI=ON} \
-%if 0%{?rhel} == 4
-  -DWITH_PCRE=OFF \
-  -DWITH_INOTIFY=OFF \
-%else
-  -DWITH_PCRE=ON \
-  -DWITH_INOTIFY=ON \
-%endif
-  -DWITH_UTEMPTER=ON \
-  -DWITH_ASPELL=ON \
-  -DWITH_GAMIN=ON \
-  ..
-
-%__make %{?_smp_mflags}
-
-
-%install
-%__rm -rf %{?buildroot}
-%__make install DESTDIR=%{?buildroot} -C build
-
-%if "%{?tde_prefix}" != "/usr"
-%__mkdir_p %{?buildroot}%{_sysconfdir}/ld.so.conf.d
-cat <<EOF >%{?buildroot}%{_sysconfdir}/ld.so.conf.d/trinity.conf
-%{tde_libdir}
-EOF
-%endif
-
-# Moves the XDG configuration files to TDE directory
-%if "%{tde_prefix}" != "/usr"
-%__install -p -D -m644 \
-	"%{?buildroot}%{_sysconfdir}/xdg/menus/applications.menu" \
-	"%{?buildroot}%{tde_prefix}/etc/xdg/menus/kde-applications.menu"
-%__rm -rf "%{?buildroot}%{_sysconfdir}/xdg"
-%else
-%__mv -f "%{?buildroot}%{_sysconfdir}/xdg/menus/applications.menu" "%{?buildroot}%{_sysconfdir}/xdg/menus/kde-applications.menu"
-%endif
-
-
-%clean
-%__rm -rf %{?buildroot}
-
-
-%changelog
-* Tue Sep 11 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13.1-1
-- Initial release for TDE 3.5.13.1
diff --git a/redhat/tdelibs/kdelibs-3.5.13.2-kpassivepopup_latin1.patch b/redhat/tdelibs/kdelibs-3.5.13.2-kpassivepopup_latin1.patch
deleted file mode 100644
index 45f75e3c6..000000000
--- a/redhat/tdelibs/kdelibs-3.5.13.2-kpassivepopup_latin1.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- trinity-tdelibs-3.5.13.2/kdeui/kpassivepopup.cpp.ORI	2013-02-16 23:33:04.657067698 +0100
-+++ trinity-tdelibs-3.5.13.2/kdeui/kpassivepopup.cpp	2013-02-16 23:34:42.083107895 +0100
-@@ -152,7 +152,7 @@
-     }
- 
-     if ( !text.isEmpty() ) {
--        msg = new TQLabel( text, vb, "msg_label" );
-+        const char* m = text.latin1(); msg = new TQLabel( TQString::fromUtf8(m), vb, "msg_label" );
-         msg->setAlignment( AlignLeft );
-     }
- 
diff --git a/redhat/tdelibs/kdelibs-3.5.13.spec b/redhat/tdelibs/kdelibs-3.5.13.spec
deleted file mode 100644
index 0392162bf..000000000
--- a/redhat/tdelibs/kdelibs-3.5.13.spec
+++ /dev/null
@@ -1,520 +0,0 @@
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?tde_prefix}" != "/usr"
-%define _variant .opt
-%endif
-
-# TDE 3.5.13 specific variables
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-
-%define tde_tdedocdir %{tde_docdir}/kde
-%define tde_tdeincludedir %{tde_includedir}/kde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_docdir}
-
-Name:		trinity-tdelibs
-Version:	3.5.13
-Release:	12%{?dist}%{?_variant}
-License:	GPL
-Summary:	TDE Libraries
-Group:		Environment/Libraries
-
-Vendor:		Trinity Project
-Packager:	Francois Andriot <francois.andriot@free.fr>
-URL:		http://www.trinitydesktop.org/
-
-Prefix:		%{tde_prefix}
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:	kdelibs-%{version}.tar.gz
-
-Obsoletes:	tdelibs < %{version}-%{release}
-Provides:	tdelibs = %{version}-%{release}
-Obsoletes:	trinity-kdelibs < %{version}-%{release}
-Provides:	trinity-kdelibs = %{version}-%{release}
-Obsoletes:	trinity-kdelibs-apidocs < %{version}-%{release}
-Provides:	trinity-kdelibs-apidocs = %{version}-%{release}
-
-## [kdelibs/kio] Disable 'max line length' detection [Bug #656]
-Patch10:	kdelibs-3.5.13-maxlinelength.patch
-## [kdelibs/kjs] Enable pcre support in kdelibs [Bug #569]
-Patch11:	kdelibs-3.5.13-enable_pcre.patch
-## [kdelibs/kate] Updated syntax highlighting files [Bug #764]
-Patch12:	kdelibs-3.5.13-kate_syntax.patch.gz
-## [kdelibs] Adds Inotify support (backport commit 24f144fa)
-Patch13:	kdelibs-3.5.13-add_inotify_support.patch
-## [kdelibs] Add fam/gamin support to tdelibs CMake (backport commit 2b035349)
-Patch14:	kdelibs-3.5.13-enable_fam_gamin.patch
-## [kdelibs/kioslave/http] Fix UTF8 Encoding for WebDAV directories [Bug #766] [Commit #e131f10b]
-Patch15:	kdelibs-3.5.13-fix_UTF8_encoding_for_WebDAV_directories.patch
-## [kdelibs/kdeprint] Fix add printer [Bug #383]
-Patch16:	kdelibs-3.5.13-fix_add_printer.patch
-## [kdelibs/kio/kdirwatch] Fix "Konqueror: Does not update file pane with file changes" [Bug #756]
-Patch17:	kdelibs-3.5.13-fix_kdirwatch.patch
-## [kdelibs/dcop] Fix 'dcoptypes.h' for compilation with GCC 4.7
-Patch18:	kdelibs-3.5.13-fix_dcoptypes_h.patch
-## [tdelibs] Fix konq filter in list view mode. [Commit #06b51484]
-Patch19:	kdelibs-3.5.13-fix_konq_filter.patch
-## [tdelibs] Fix tdesu internal pathing [Bug #766] [Commit #e131f10b]
-Patch20:	kdelibs-3.5.13-fix_tdesu_internal_pathing.patch
-## [tdelibs] Fix slider drawing on external paint devices [Commit #a1c30c14]
-Patch21:	kdelibs-3.5.13-fix_slide_drawing.patch
-## [tdelibs] Reduce "More Applications" and extra koffice items from TDE menu. [Commit #1c06ae32]
-Patch22:	kdelibs-3.5.13-reduce_more_applications.patch
-## [tdelibs] Fix creation of profile directory in system root [Bug #293] [Commit #049525ee]
-Patch23:	kdelibs-3.5.13-fix_creation_of_profile_directory.patch
-## [tdelibs] Initialize X11 threading when kinit is used to launch a program [Bug #812] [Commit #6c806af1]
-Patch24:	kdelibs-3.5.13-fix_x11_threading_when_kinit_is_used.patch
-## [tdelibs] Fix composition extension detection [Commit #41ea89f7]
-Patch25:	kdelibs-3.5.13-fix_composition_extension_detection.patch
-## [tdelibs] Fix KTempFile not obeying special bits on file creation [Bug #349] [Commit #9068fffd]
-Patch26:	kdelibs-3.5.13-fix_ktempfile_special_bits.patch
-## [tdelibs] Add dynamic label support to kpassworddialog [Commit #3c752316]
-Patch27:	kdelibs-3.5.13-add_dynamic_label_to_kpassword.patch
-## [tdelibs] Fix FTBFS - incomplete build kspell2 [Bug #657] [Commit #3e284fad]
-Patch28:	kdelibs-3.5.13-fix_build_kspell2.patch
-## [tdelibs] Export kdemain symbol in iso kioslave [Bug #465] [Commit #0536f0b7]
-Patch29:	kdelibs-3.5.13-fix_iso_kioslave.patch
-## [tdelibs] Fix iso kioslave not parsing large images properly [Commit #b4bba7b5]
-Patch30:	kdelibs-3.5.13-fix_iso_kioslave_not_parsing_large_image_properly.patch
-## [tdelibs] Fix spinbox text entry when base is not 10 [Commit #d1c71f69]
-Patch32:	kdelibs-3.5.13-fix_spinbox_text_entry_when_base_not_10.patch
-## [tdelibs] Update iso kioslave to better handle large images [Commit #dca4c677]
-Patch33:	kdelibs-3.5.13-update_iso_kioslave_better_handle_large_image.patch
-## [tdelibs] Restore tdesu dialog "Keep password" check box default to disabled/unchecked. [Commit #87363770]
-Patch34:	kdelibs-3.5.13-restore_tdesu_keeppassword_default_disabled.patch
-## [tdelibs] Fix language switch inside application [Bug #1074]
-Patch35:	kdelibs-3.5.13-fix_all_languages_installation.patch
-## [tdelibs] Prevent XDG autostart files from starting multiple times [Bug #1096] [Commit #e9f29cfb]
-Patch36:	kdelibs-3.5.13-prevent_xdg_autostart_multiple_times.patch
-## [tdelibs] Fix xrender include dir
-Patch37:	kdelibs-3.5.13-fix_xrender_libdir.patch
-
-BuildRequires:	cmake >= 2.8
-BuildRequires:	libtool
-BuildRequires:	tqtinterface-devel
-BuildRequires:	trinity-arts-devel
-BuildRequires:	avahi-tqt-devel >= 3.5.13
-BuildRequires:	krb5-devel
-BuildRequires:	libxslt-devel
-BuildRequires:	cups-devel
-BuildRequires:	libart_lgpl-devel
-BuildRequires:	pcre-devel
-BuildRequires:	openssl-devel
-BuildRequires:	gcc-c++
-BuildRequires:	alsa-lib-devel
-BuildRequires:	libidn-devel
-BuildRequires:	qt3-devel
-BuildRequires:	libtiff-devel
-BuildRequires:	glib2-devel
-BuildRequires:	gamin-devel
-BuildRequires:	aspell
-BuildRequires:	aspell-devel
-BuildRequires:	OpenEXR-devel
-# LUA support are not ready yet
-#BuildRequires:	lua-devel
-
-%if 0%{?suse_version}
-BuildRequires:	utempter-devel
-BuildRequires:	libbz2-devel
-%else
-BuildRequires:	libutempter-devel
-BuildRequires:	bzip2-devel
-%endif
-
-%if 0%{?rhel} == 4
-BuildRequires:	xorg-x11-devel
-%else
-
-# Hspell support
-%if 0%{?rhel} >=5 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion}
-%define with_hspell 1
-BuildRequires:	hspell-devel
-%endif
-
-# Jasper support
-%if 0%{?rhel} >=5 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}
-%define with_jasper 1
-%if 0%{?suse_version}
-BuildRequires:	libjasper-devel
-%else
-BuildRequires:	jasper-devel
-%endif
-%endif
-
-
-%if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires:	%{_lib}avahi-client-devel
-BuildRequires:	%{_lib}ltdl-devel
-BuildRequires:	x11-proto-devel
-BuildRequires:	%{_lib}xcomposite%{?mgaversion:1}-devel
-Requires:		%{_lib}avahi-client3
-%else
-BuildRequires:	avahi-devel
-BuildRequires:	libtool-ltdl-devel
-BuildRequires:	xorg-x11-proto-devel
-BuildRequires:	libXcomposite-devel
-%endif
-
-Requires:		avahi
-%endif
-
-Requires:		tqtinterface >= 3.5.13
-Requires:		trinity-arts >= 3.5.13
-Requires:		qt3
-
-
-%description
-Libraries for the Trinity Desktop Environment:
-TDE Libraries included: tdecore (TDE core library), kdeui (user interface),
-kfm (file manager), khtmlw (HTML widget), kio (Input/Output, networking),
-kspell (spelling checker), jscript (javascript), kab (addressbook),
-kimgio (image manipulation).
-
-%files
-%defattr(-,root,root,-)
-%doc AUTHORS COPYING COPYING-DOCS COPYING.LIB README TODO
-%{tde_bindir}/artsmessage
-%{tde_bindir}/cupsdconf
-%{tde_bindir}/cupsdoprint
-%{tde_bindir}/dcop
-%{tde_bindir}/dcopclient
-%{tde_bindir}/dcopfind
-%{tde_bindir}/dcopobject
-%{tde_bindir}/dcopquit
-%{tde_bindir}/dcopref
-%{tde_bindir}/dcopserver
-%{tde_bindir}/dcopserver_shutdown
-%{tde_bindir}/dcopstart
-%{tde_bindir}/filesharelist
-%{tde_bindir}/fileshareset
-%{tde_bindir}/imagetops
-%{tde_bindir}/kab2kabc
-%{tde_bindir}/kaddprinterwizard
-%{tde_bindir}/kbuildsycoca
-%{tde_bindir}/kcmshell
-%{tde_bindir}/kconf_update
-%{tde_bindir}/kcookiejar
-%{tde_bindir}/kde-config
-%{tde_bindir}/kde-menu
-%{tde_bindir}/kded
-%{tde_bindir}/kdeinit
-%{tde_bindir}/kdeinit_shutdown
-%{tde_bindir}/kdeinit_wrapper
-%{tde_bindir}/kdesu_stub
-%{tde_bindir}/kdontchangethehostname
-%{tde_bindir}/kdostartupconfig
-%{tde_bindir}/kfile
-%{tde_bindir}/kfmexec
-%{tde_bindir}/khotnewstuff
-%{tde_bindir}/kinstalltheme
-%{tde_bindir}/kio_http_cache_cleaner
-%{tde_bindir}/kio_uiserver
-%{tde_bindir}/kioexec
-%{tde_bindir}/kioslave
-%{tde_bindir}/klauncher
-%{tde_bindir}/kmailservice
-%{tde_bindir}/kmimelist
-%attr(4755,root,root) %{tde_bindir}/kpac_dhcp_helper
-%{tde_bindir}/ksendbugmail
-%{tde_bindir}/kshell
-%{tde_bindir}/kstartupconfig
-%{tde_bindir}/ktelnetservice
-%{tde_bindir}/ktradertest
-%{tde_bindir}/kwrapper
-%{tde_bindir}/lnusertemp
-%{tde_bindir}/make_driver_db_cups
-%{tde_bindir}/make_driver_db_lpr
-%{tde_bindir}/meinproc
-%{tde_bindir}/networkstatustestservice
-%{tde_bindir}/start_kdeinit
-%{tde_bindir}/start_kdeinit_wrapper
-%attr(4755,root,root) %{tde_bindir}/kgrantpty
-%{tde_tdelibdir}/*
-%{tde_libdir}/lib*.so.*
-%{tde_libdir}/lib[kt]deinit_*.la
-%{tde_libdir}/lib[kt]deinit_*.so
-%{tde_datadir}/applications/kde/*.desktop
-%{tde_datadir}/autostart/kab2kabc.desktop
-%{tde_datadir}/applnk/kio_iso.desktop
-%{tde_datadir}/apps/*
-%exclude %{tde_datadir}/apps/ksgmltools2/
-%config(noreplace) %{tde_datadir}/config/*
-%{tde_datadir}/emoticons/*
-%{tde_datadir}/icons/default.kde
-%{tde_datadir}/mimelnk/magic
-%{tde_datadir}/mimelnk/*/*.desktop
-%{tde_datadir}/services/*
-%{tde_datadir}/servicetypes/*
-%{tde_datadir}/icons/crystalsvg/
-%{tde_tdedocdir}/HTML/en/kspell/
-# remove conflicts with kdelibs-4
-%if "%{?tde_prefix}" != "/usr"
-%{tde_bindir}/checkXML
-%{tde_bindir}/ksvgtopng
-%{tde_bindir}/kunittestmodrunner
-%{tde_bindir}/preparetips
-%{tde_datadir}/icons/hicolor/index.theme
-%{tde_datadir}/locale/all_languages
-%{tde_tdedocdir}/HTML/en/common/*
-%{_sysconfdir}/ld.so.conf.d/trinity.conf
-%else
-%exclude %{tde_bindir}/checkXML
-%exclude %{tde_bindir}/ksvgtopng
-%exclude %{tde_bindir}/kunittestmodrunner
-%exclude %{tde_bindir}/preparetips
-%exclude %{tde_datadir}/config/colors
-%exclude %{tde_datadir}/config/kdebug.areas
-%exclude %{tde_datadir}/config/kdebugrc
-%exclude %{tde_datadir}/config/ksslcalist
-%exclude %{tde_datadir}/config/ui/ui_standards.rc
-%exclude %{tde_datadir}/icons/hicolor/index.theme
-%exclude %{tde_datadir}/locale/all_languages
-%exclude %{tde_tdedocdir}/HTML/en/common/*
-%endif
-
-# Avoid conflict with 'redhat-menus' package
-%if "%{tde_prefix}" == "/usr"
-%{_sysconfdir}/xdg/menus/kde-applications.menu
-%else
-%{tde_prefix}/etc/xdg/menus/kde-applications.menu
-%endif
-
-# New in TDE 3.5.13
-%{tde_bindir}/kdetcompmgr
-
-%pre
-# Bug 1074
-if [ -d %{tde_datadir}/locale/all_languages ]; then
-  rm -rf %{tde_datadir}/locale/all_languages
-fi
-
-%post
-/sbin/ldconfig || :
-
-%postun
-/sbin/ldconfig || :
-
-##########
-
-%package devel
-Summary:	%{name} - Development files
-Group:		Development/Libraries
-Requires:	%{name} = %{version}-%{release}
-
-Obsoletes:	tdelibs-devel < %{version}-%{release}
-Provides:	tdelibs-devel = %{version}-%{release}
-Obsoletes:	trinity-kdelibs-devel < %{version}-%{release}
-Provides:	trinity-kdelibs-devel = %{version}-%{release}
-
-%description devel
-This package includes the header files you will need to compile
-applications for TDE.
-
-%files devel
-%defattr(-,root,root,-)
-%{tde_bindir}/dcopidl*
-%{tde_bindir}/kconfig_compiler
-%{tde_bindir}/makekdewidgets
-%{tde_datadir}/apps/ksgmltools2/
-%{tde_tdeincludedir}/*
-%{tde_libdir}/*.la
-%{tde_libdir}/*.so
-%{tde_libdir}/*.a
-%exclude %{tde_libdir}/libkdeinit_*.la
-%exclude %{tde_libdir}/libkdeinit_*.so
-
-# New in TDE 3.5.13
-%{tde_datadir}/cmake/kdelibs.cmake
-
-%post devel
-/sbin/ldconfig || :
-
-%postun devel
-/sbin/ldconfig || :
-
-##########
-
-%if 0%{?suse_version}
-%debug_package
-%endif
-
-##########
-
-%prep
-%setup -q -n kdelibs
-%patch10 -p1
-%patch11 -p0
-%patch12 -p1
-%patch13 -p1
-%patch14 -p1
-%patch15 -p1
-%patch16 -p1
-%patch17 -p1
-%patch18 -p1
-%patch19 -p1
-%patch20 -p1
-%patch21 -p1
-%patch22 -p1
-%patch23 -p1
-%patch24 -p1
-%patch25 -p1
-%patch26 -p1
-%patch27 -p1
-%patch28 -p1
-%patch29 -p1
-%patch30 -p1
-%patch32 -p1
-%patch33 -p1
-%patch34 -p1
-%patch35 -p1
-%patch36 -p1
-%patch37 -p1
-
-
-%build
-unset QTDIR || : ; . /etc/profile.d/qt?.sh
-export PATH="%{tde_bindir}:${QTDIR}/bin:${PATH}"
-export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
-export CMAKE_INCLUDE_PATH="%{tde_includedir}:%{tde_includedir}/tqt"
-
-# We need LD_LIBRARY_PATH here because ld.so.conf file has not been written yet
-export LD_LIBRARY_PATH="%{tde_libdir}"
-
-
-%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version}
-%__mkdir_p build
-cd build
-%endif
-
-%cmake \
-  -DCMAKE_INSTALL_PREFIX=%{tde_prefix} \
-  -DBIN_INSTALL_DIR=%{tde_bindir} \
-  -DDOC_INSTALL_DIR=%{tde_docdir} \
-  -DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \
-  -DLIB_INSTALL_DIR=%{tde_libdir} \
-  -DPKGCONFIG_INSTALL_DIR=%{tde_libdir}/pkgconfig \
-  -DSHARE_INSTALL_PREFIX=%{tde_datadir} \
-  -DCMAKE_SKIP_RPATH="OFF" \
-  -DWITH_ARTS=ON \
-  -DWITH_ALSA=ON \
-  -DWITH_LIBART=ON \
-  -DWITH_LIBIDN=ON \
-  -DWITH_SSL=ON \
-  -DWITH_CUPS=ON \
-  -DWITH_LUA=OFF \
-  -DWITH_TIFF=ON \
-  %{?with_jasper:-DWITH_JASPER=ON} \
-  %{?with_hspell:-DWITH_HSPELL=ON} \
-%if 0%{?rhel} == 4
-  -DWITH_OPENEXR=OFF \
-  -DWITH_PCRE=OFF \
-  -DWITH_INOTIFY=OFF \
-  -DWITH_AVAHI=OFF \
-%else
-  -DWITH_OPENEXR=ON \
-  -DWITH_PCRE=ON \
-  -DWITH_INOTIFY=ON \
-  -DWITH_AVAHI=ON \
-%endif
-  -DWITH_UTEMPTER=ON \
-  -DWITH_ASPELL=ON \
-  -DWITH_GAMIN=ON \
-  ..
-
-%__make %{?_smp_mflags}
-
-
-%install
-%__rm -rf %{?buildroot}
-%__make install DESTDIR=%{?buildroot} -C build
-
-%if "%{?tde_prefix}" != "/usr"
-%__mkdir_p %{?buildroot}%{_sysconfdir}/ld.so.conf.d
-cat <<EOF >%{?buildroot}%{_sysconfdir}/ld.so.conf.d/trinity.conf
-%{tde_libdir}
-EOF
-%endif
-
-# Moves the XDG configuration files to TDE directory
-%if "%{tde_prefix}" != "/usr"
-%__install -p -D -m644 \
-	"%{?buildroot}%{_sysconfdir}/xdg/menus/applications.menu" \
-	"%{?buildroot}%{tde_prefix}/etc/xdg/menus/kde-applications.menu"
-%__rm -rf "%{?buildroot}%{_sysconfdir}/xdg"
-%else
-%__mv -f "%{?buildroot}%{_sysconfdir}/xdg/menus/applications.menu" "%{?buildroot}%{_sysconfdir}/xdg/menus/kde-applications.menu"
-%endif
-
-
-%clean
-%__rm -rf %{?buildroot}
-
-
-%changelog
-* Sat Aug 18 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13-12
-- Fix language switch inside application [Bug #1074]
-- Removes patch 'Add ability to set KLed off color [Commit #513ffc6e]'
-- Prevent XDG autostart files from starting multiple times [Bug #1096] [Commit #e9f29cfb]
-
-* Sun Jul 22 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13-11
-- Fix iso kioslave not parsing large images properly [Commit #b4bba7b5]
-- Add ability to set KLed off color [Commit #513ffc6e]
-- Fix spinbox text entry when base is not 10 [Commit #d1c71f69]
-- Update iso kioslave to better handle large images [Commit #dca4c677]
-- Restore tdesu dialog "Keep password" check box default to disabled/unchecked. [Commit #87363770]
-
-* Tue Jun 26 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13-10
-- Renames to 'trinity-tdelibs'
-- Enable 'aspell', 'hspell' and 'libidn'
-- Export kdemain symbol in iso kioslave [Bug #465] [Commit #0536f0b7]
-
-* Tue Jun 19 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13-9
-- Renames to 'tdelibs'
-- Fix 'ld.so.conf' file
-- Fix konq filter in list view mode. [Commit #06b51484]
-- Fix tdesu internal pathing [Bug #766] [Commit #e131f10b]
-- Fix slider drawing on external paint devices [Commit #a1c30c14]
-- Reduce "More Applications" and extra koffice items from TDE menu. [Commit #1c06ae32]
-- Fix creation of profile directory in system root [Bug #293] [Commit #049525ee]
-- Initialize X11 threading when kinit is used to launch a program [Bug #812] [Commit #6c806af1]
-- Fix composition extension detection [Commit #41ea89f7]
-- Fix KTempFile not obeying special bits on file creation [Bug #349] [Commit #9068fffd]
-- Add dynamic label support to kpassworddialog [Commit #3c752316]
-- Fix FTBFS - incomplete build kspell2 [Bug #657] [Commit #3e284fad]
-
-* Tue Apr 24 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13-8
-- Fix "Konqueror: Does not update file pane with file changes" [Bug #756] 
-- Fix compilation with GCC 4.7
-
-* Sat Jan 21 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13-7
-- Fix UTF8 Encoding for WebDAV directories
-- Fix hardcoded path in 'add printer' [Bug #383]
-
-* Mon Jan 16 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13-6
-- Adds 'fam' and 'gamin' support
-
-* Sat Jan 14 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13-5
-- Adds 'inotify' support
-
-* Sat Dec 31 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-4
-- Enable pcre support in kdelibs [Bug #569]
-- Updated Kate syntax highlighting files [Bug #764]
-- Disable 'max line length' detection [Bug #656]
-- Add 'Provides: kdelibs3' to avoid installing distro-provided KDE3 libraries
-
-* Sat Nov 12 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-3
-- Moves XDG files in TDE prefix to avoid conflict with distro-provided KDE
-
-* Thu Nov 03 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-2
-- Add missing BuildRequires
-
-* Sun Oct 30 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-1
-- Initial release for RHEL 6, RHEL 5 and Fedora 15
-
-* Wed Sep 02 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-0
-- Import to GIT
diff --git a/redhat/tdelibs/tdelibs-14.0.0.spec b/redhat/tdelibs/tdelibs-14.0.0.spec
index 070cae273..14cd5bf06 100644
--- a/redhat/tdelibs/tdelibs-14.0.0.spec
+++ b/redhat/tdelibs/tdelibs-14.0.0.spec
@@ -19,11 +19,6 @@
 #  Remove qt-devel and qt3-devel and any kde*-devel on your system !
 #  Having KDE libraries may cause FTBFS here !
 
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?tde_prefix}" != "/usr"
-%define _variant .opt
-%endif
-
 # TDE variables
 %define tde_version 14.0.0
 %define tde_prefix /opt/trinity
@@ -32,13 +27,17 @@
 %define tde_docdir %{tde_datadir}/doc
 %define tde_includedir %{tde_prefix}/include
 %define tde_libdir %{tde_prefix}/%{_lib}
-
 %define tde_tdedocdir %{tde_docdir}/tde
 %define tde_tdeincludedir %{tde_includedir}/tde
 %define tde_tdelibdir %{tde_libdir}/trinity
-
 %define _docdir %{tde_docdir}
 
+# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
+%if "%{?tde_prefix}" != "/usr"
+%define _variant .opt
+%endif
+
+
 Name:			trinity-tdelibs
 Version:		%{tde_version}
 Release:		%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
@@ -69,13 +68,12 @@ Provides:		trinity-kdelibs-apidocs = %{version}-%{release}
 
 # Trinity dependencies
 BuildRequires:	libtqt3-mt-devel >= 3.5.0
-BuildRequires:	libtqt4-devel >= 1:4.2.0
-BuildRequires:	trinity-arts-devel >= 1:1.5.10
+BuildRequires:	libtqt4-devel = 2:4.2.0
+BuildRequires:	trinity-arts-devel >= 2:1.5.10
 BuildRequires:	libdbus-tqt-1-devel >= 2:0.63
 BuildRequires:	libdbus-1-tqt-devel >= 2:0.9
 
-Requires:		trinity-arts >= 1:1.5.10
-
+Requires:		trinity-arts >= 2:1.5.10
 
 BuildRequires:	cmake >= 2.8
 BuildRequires:	gcc-c++
@@ -127,55 +125,6 @@ BuildRequires:	libbz2-devel
 BuildRequires:	bzip2-devel
 %endif
 
-# UDEV support
-%if 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} || 0%{?rhel} >= 6
-%define with_tdehwlib 1
-BuildRequires:	libudev-devel
-%endif
-
-# HAL support
-%if 0%{?rhel} == 5
-%define with_hal 1
-%endif
-
-# UDISKS support
-%if 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} || 0%{?rhel} == 6
-%define with_udisks 1
-BuildRequires:	udisks-devel
-Requires:		udisks
-%endif
-
-# PMOUNT support
-#Requires:		pmount
-
-# UDISKS2 support
-%if 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} || 0%{?rhel} >= 7
-%define with_udisks2 1
-%if 0%{?fedora} >= 18 || 0%{?rhel} >= 7
-BuildRequires:	libudisks2-devel
-%else
-BuildRequires:	udisks2-devel
-%endif
-Requires:		udisks2
-%endif
-
-# DEVICEKIT POWER support
-%if 0%{?rhel} == 6
-%define with_devkitpower 1
-Requires:		DeviceKit-power
-%endif
-
-# UPOWER support
-%if 0%{?fedora} || 0%{?suse_version} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?rhel} >= 7
-%define with_upower 1
-Requires:		upower
-%endif
-
-# SYSTEMD support
-%if 0%{?fedora} || 0%{?suse_version} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?rhel} >= 7
-%define with_systemd 1
-%endif
-
 # UTEMPTER support
 %if 0%{?rhel} >=5 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion}
 BuildRequires:	libutempter-devel
@@ -281,20 +230,6 @@ BuildRequires:	xz-devel
 %endif
 %endif
 
-# NETWORKMANAGER support
-%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 6 || 0%{?fedora} || 0%{?suse_version}
-%define with_nm 1
-%if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires:	%{_lib}nm-util-devel
-%endif
-%if 0%{?rhel} >= 6 || 0%{?fedora}
-BuildRequires:	NetworkManager-glib-devel
-%endif
-%if 0%{?suse_version}
-BuildRequires:	NetworkManager-devel
-%endif
-%endif
-
 # Certificates support
 %if 0%{?rhel} >= 6 || 0%{?fedora}
 %define	cacert	%{_sysconfdir}/ssl/certs/ca-certificates.crt
@@ -323,6 +258,69 @@ BuildRequires: libXt-devel
 # LIBMAGIC support
 BuildRequires:	file-devel
 
+# NETWORKMANAGER support
+%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 6 || 0%{?fedora} || 0%{?suse_version}
+%define with_nm 1
+%if 0%{?mgaversion} || 0%{?mdkversion}
+BuildRequires:	%{_lib}nm-util-devel
+%endif
+%if 0%{?rhel} >= 6 || 0%{?fedora}
+BuildRequires:	NetworkManager-glib-devel
+%endif
+%if 0%{?suse_version}
+BuildRequires:	NetworkManager-devel
+%endif
+%endif
+
+# UDEV support
+%if 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} || 0%{?rhel} >= 6
+%define with_tdehwlib 1
+BuildRequires:	libudev-devel
+%endif
+
+# HAL support
+%if 0%{?rhel} == 5
+%define with_hal 1
+%endif
+
+# UDISKS support
+%if 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} || 0%{?rhel} == 6
+%define with_udisks 1
+BuildRequires:	udisks-devel
+Requires:		udisks
+%endif
+
+# PMOUNT support
+#Requires:		pmount
+
+# UDISKS2 support
+%if 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} || 0%{?rhel} >= 7
+%define with_udisks2 1
+%if 0%{?fedora} >= 18 || 0%{?rhel} >= 7
+BuildRequires:	libudisks2-devel
+%else
+BuildRequires:	udisks2-devel
+%endif
+Requires:		udisks2
+%endif
+
+# DEVICEKIT POWER support
+%if 0%{?rhel} == 6
+%define with_devkitpower 1
+Requires:		DeviceKit-power
+%endif
+
+# UPOWER support
+%if 0%{?fedora} || 0%{?suse_version} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?rhel} >= 7
+%define with_upower 1
+Requires:		upower
+%endif
+
+# SYSTEMD support
+%if 0%{?fedora} || 0%{?suse_version} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?rhel} >= 7
+%define with_systemd 1
+%endif
+
 
 %description
 Libraries for the Trinity Desktop Environment:
@@ -491,6 +489,11 @@ applications for TDE.
 unset QTDIR QTINC QTLIB
 export PATH="%{tde_bindir}:${PATH}"
 export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
+
+if [ -d "/usr/X11R6" ]; then
+  export RPM_OPT_FLAGS="${RPM_OPT_FLAGS} -L/usr/X11R6/%{_lib} -I/usr/X11R6/include"
+fi
+
 export TDEDIR="%{tde_prefix}"
 
 if ! rpm -E %%cmake|grep -q "cd build"; then
@@ -504,6 +507,7 @@ fi
   -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
   -DCMAKE_SKIP_RPATH=OFF \
   -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
+  -DCMAKE_NO_BUILTIN_CHRPATH=ON \
   -DCMAKE_VERBOSE_MAKEFILE=ON \
   -DWITH_GCC_VISIBILITY=ON \
   \
diff --git a/redhat/tdelibs/tdelibs-3.5.13.2-cups_by_default.patch b/redhat/tdelibs/tdelibs-3.5.13.2-cups_by_default.patch
deleted file mode 100644
index dfb472ee1..000000000
--- a/redhat/tdelibs/tdelibs-3.5.13.2-cups_by_default.patch
+++ /dev/null
@@ -1,33 +0,0 @@
---- ./kdeprint/kmfactory.cpp.ORI	2013-05-09 00:14:51.664045869 +0200
-+++ ./kdeprint/kmfactory.cpp	2013-05-09 00:16:59.154367127 +0200
-@@ -249,8 +249,21 @@
- 		conf->writeEntry("PrintSystem", sys);
- 		conf->sync();
- 	}
--	else if ( sys.length()==1 && sys[0].isDigit() ) // discard old-style settings
-+	else if ( sys.length()==1 && sys[0].isDigit() ) { // discard old-style settings
-         	sys = "lpdunix";
-+	} else {
-+		//Always Autodetect
-+		//it will not try autodetect if user changes any option
-+		//when user force some option, AlwaysSearch will be "no" and then
-+		//kprinter will not to try autodetect again.
-+		if(conf->readEntry("AlwaysSearch") != "no" ) {
-+			sys = autoDetect();
-+			conf->writeEntry("PrintSystem",sys);
-+			conf->writeEntry("AlwaysSearch","yes");
-+			conf->sync();
-+		}
-+	}
-+
- 	return sys;
- }
- 
-@@ -278,6 +291,7 @@
- 	{
- 		KConfig	*conf = printConfig();
- 		conf->setGroup("General");
-+		conf->writeEntry("AlwaysSearch","no");
- 		conf->writeEntry("PrintSystem", syst);
- 		conf->sync();
- 
diff --git a/redhat/tdelibs/tdelibs-3.5.13.2-fix-starting-kde4-applications.patch b/redhat/tdelibs/tdelibs-3.5.13.2-fix-starting-kde4-applications.patch
deleted file mode 100644
index 2c9c88368..000000000
--- a/redhat/tdelibs/tdelibs-3.5.13.2-fix-starting-kde4-applications.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/tdeio/tdeio/kservice.cpp b/tdeio/tdeio/kservice.cpp
-index 67031d0..a4c67f3 100644
---- a/kio/kio/kservice.cpp
-+++ b/kio/kio/kservice.cpp
-@@ -103,7 +103,7 @@ KService::init( KDesktopFile *config )
-     // extract prefix
-     kde4applicationprefix = config->fileName();
-     int pos = kde4applicationprefix.find("/share/applications/kde4/");
--    kde4applicationprefix.truncate(pos-1);
-+    kde4applicationprefix.truncate(pos);
-   }
- 
-   config->setDesktopGroup();
diff --git a/redhat/tdelibs/tdelibs-3.5.13.2-fix_arts_include.patch b/redhat/tdelibs/tdelibs-3.5.13.2-fix_arts_include.patch
deleted file mode 100644
index 34cca461b..000000000
--- a/redhat/tdelibs/tdelibs-3.5.13.2-fix_arts_include.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff --git a/arts/kde/CMakeLists.txt b/arts/kde/CMakeLists.txt
-index 3b58525..091be35 100644
---- a/arts/kde/CMakeLists.txt
-+++ b/arts/kde/CMakeLists.txt
-@@ -27,11 +27,6 @@ link_directories(
-   ${ARTS_LIBRARY_DIRS}
- )
- 
--# pkg-config stripping -I/usr/include
--if( NOT ARTS_INCLUDE_DIRS )
--  set( ARTS_INCLUDE_DIRS "/usr/include" )
--endif()
--
- 
- ##### headers ###################################
- 
-@@ -58,7 +53,7 @@ set( ${target}_SRCS
- add_custom_command(
-   OUTPUT artskde.cc artskde.h
-   COMMAND ${ARTS_MCOPIDL_EXECUTABLE}
--    -I${ARTS_INCLUDE_DIRS} ${CMAKE_CURRENT_SOURCE_DIR}/artskde.idl
-+    -I${ARTS_INCLUDEDIR} ${CMAKE_CURRENT_SOURCE_DIR}/artskde.idl
-   DEPENDS artskde.idl
- )
- 
diff --git a/redhat/tdelibs/tdelibs-3.5.13.2-fix_kzip_empty_directory.patch b/redhat/tdelibs/tdelibs-3.5.13.2-fix_kzip_empty_directory.patch
deleted file mode 100644
index e56d7559d..000000000
--- a/redhat/tdelibs/tdelibs-3.5.13.2-fix_kzip_empty_directory.patch
+++ /dev/null
@@ -1,38 +0,0 @@
---- ./kio/kio/kzip.cpp.ORI	2013-05-31 23:15:23.021298550 +0200
-+++ ./kio/kio/kzip.cpp	2013-05-31 23:16:43.525633640 +0200
-@@ -1051,6 +1051,21 @@
-     return true;
- }
- 
-+bool KZip::writeDir(const TQString& name, const TQString& user, const TQString& group)
-+{
-+    // Zip files have no explicit directories, they are implicitly created during extraction time
-+    // when file entries have paths in them.
-+    // However, to support empty directories, we must create a dummy file entry which ends with '/'.
-+    TQString dirName = name;
-+    if (!name.endsWith("/")) {
-+        dirName = dirName.append('/');
-+    }
-+
-+    mode_t perm = 040755;
-+    time_t the_time = time(0);
-+    return writeFile(dirName, user, group, 0, perm, the_time, the_time, the_time, 0);
-+}
-+
- // Doesn't need to be reimplemented anymore. Remove for KDE-4.0
- bool KZip::writeFile( const TQString& name, const TQString& user, const TQString& group, uint size, const char* data )
- {
---- ./kio/kio/kzip.h.ORI	2013-05-31 23:18:30.829414791 +0200
-+++ ./kio/kio/kzip.h	2013-05-31 23:19:10.763589109 +0200
-@@ -191,10 +191,7 @@
-     /// Closes the archive
-     virtual bool closeArchive();
- 
--    /**
--     * @internal Not needed for zip
--     */
--    virtual bool writeDir( const TQString& name, const TQString& user, const TQString& group) { Q_UNUSED(name); Q_UNUSED(user); Q_UNUSED(group); return true; }
-+    virtual bool writeDir(const QString& name, const QString& user, const QString& group);
-     // TODO(BIC) uncomment and make virtual for KDE 4.
- //    bool writeDir( const TQString& name, const TQString& user, const TQString& group,
- //                        mode_t perm, time_t atime, time_t mtime, time_t ctime );
diff --git a/redhat/tdelibs/tdelibs-3.5.13.2-fix_xdg_menu.patch b/redhat/tdelibs/tdelibs-3.5.13.2-fix_xdg_menu.patch
deleted file mode 100644
index 822e74210..000000000
--- a/redhat/tdelibs/tdelibs-3.5.13.2-fix_xdg_menu.patch
+++ /dev/null
@@ -1,976 +0,0 @@
-diff -Nuar trinity-tdelibs-3.5.13.2/kded.ORI/applications.menu trinity-tdelibs-3.5.13.2/kded/applications.menu
---- trinity-tdelibs-3.5.13.2/kded.ORI/applications.menu	2013-07-28 15:03:29.861478619 +0200
-+++ trinity-tdelibs-3.5.13.2/kded/applications.menu	1970-01-01 01:00:00.000000000 +0100
-@@ -1,472 +0,0 @@
--<!DOCTYPE Menu PUBLIC "-//freedesktop//DTD Menu 1.0//EN"
--  "http://www.freedesktop.org/standards/menu-spec/1.0/menu.dtd">
--
--<Menu>
--  <Name>Applications</Name>
--  <Directory>kde-main.directory</Directory>
--  <!-- Search the default locations -->
--  <KDELegacyDirs/>
--  <DefaultAppDirs/>
--  <DefaultDirectoryDirs/>
--  <DefaultLayout>
--    <Merge type="menus"/>
--    <Merge type="files"/>
--    <Separator/>
--    <Menuname>More</Menuname>
--  </DefaultLayout>
--  <Layout>
--    <Merge type="menus"/>
--    <Menuname>Applications</Menuname>
--    <Merge type="files"/>
--  </Layout>
--
--  <Menu>
--    <Name>Applications</Name>
--    <Directory>kde-unknown.directory</Directory>
--    <OnlyUnallocated/>
--    <Include>
--      <Not>
--        <!-- Don't list non-KDE core applications -->
--        <And>
--          <Category>Core</Category>
--          <Not><Category>KDE</Category></Not>
--        </And>
--        <!-- Don't list SUSE's YaST in here -->
--        <Category>X-SuSE-YaST</Category>
--      </Not>
--    </Include>
--  </Menu>
--  <Menu>
--    <Name>Development</Name>
--    <Directory>kde-development.directory</Directory>
--    <Menu>
--      <Name>X-KDE-KDevelopIDE</Name>
--      <Directory>kde-development-kdevelop.directory</Directory>
--      <Include>
--        <And>
--        <Category>Development</Category>
--        <Category>X-KDE-KDevelopIDE</Category>
--        </And>
--      </Include>
--    </Menu>
--    <Menu>
--      <Name>Translation</Name>
--      <Directory>kde-development-translation.directory</Directory>
--      <Include>
--        <And>
--        <Category>Development</Category>
--        <Category>Translation</Category>
--        </And>
--      </Include>
--    </Menu>
--    <Menu>
--      <Name>Web Development</Name>
--      <Directory>kde-development-webdevelopment.directory</Directory>
--      <Include>
--        <And>
--        <Category>Development</Category>
--        <Category>WebDevelopment</Category>
--        </And>
--      </Include>
--    </Menu>
--      <Include>
--        <And>
--        <Category>Development</Category>
--        <Not><Category>X-KDE-KDevelopIDE</Category></Not>
--        <Not><Category>Translation</Category></Not>
--        <Not><Category>WebDevelopment</Category></Not>
--        </And>
--      </Include>
--  </Menu>
--  <Menu>
--    <Name>Science</Name>
--    <Directory>kde-science.directory</Directory>
--    <Include>
--      <And><!-- Include /any/ Science app which is not an Education app -->
--        <Or>
--          <Category>Astronomy</Category>
--          <Category>Biology</Category>
--          <Category>Chemistry</Category>
--          <Category>Geology</Category>
--          <Category>MedicalSoftware</Category>
--          <Category>Physics</Category>
--          <Category>Math</Category>
--          <Category>Science</Category>
--        </Or>
--        <Not><Category>Education</Category></Not>
--      </And>
--    </Include>
--  </Menu>
--  <Menu>
--    <Name>Edutainment</Name>
--    <Directory>kde-edutainment.directory</Directory>
--    <Menu>
--      <Name>Languages</Name>
--      <Directory>kde-edu-languages.directory</Directory>
--      <Include>
--        <And>
--        <Category>Education</Category>
--        <Or>
--        <Category>Languages</Category>
--        <Category>X-KDE-Edu-Language</Category>
--        </Or>
--        </And>
--      </Include>
--    </Menu>
--    <Menu>
--      <Name>Mathematics</Name>
--      <Directory>kde-edu-mathematics.directory</Directory>
--      <Include>
--        <And>
--        <Category>Education</Category>
--        <Category>Math</Category>
--        </And>
--      </Include>
--    </Menu>
--    <Menu>
--      <Name>Miscellaneous</Name>
--      <Directory>kde-edu-miscellaneous.directory</Directory>
--      <Include>
--        <And>
--        <Category>Education</Category>
--        <Not>
--        <Category>Languages</Category>
--        <Category>X-KDE-Edu-Language</Category>
--        <Category>Math</Category>
--        <Category>Science</Category>
--        <Category>Teaching</Category>
--        <Category>X-KDE-Edu-Teaching</Category>
--        </Not>
--        </And>
--      </Include>
--    </Menu>
--    <Menu>
--      <Name>Science</Name>
--      <Directory>kde-edu-science.directory</Directory>
--      <Include>
--        <And>
--        <Category>Education</Category>
--        <Category>Science</Category>
--        </And>
--      </Include>
--    </Menu>
--    <Menu>
--      <Name>Tools</Name>
--      <Directory>kde-edu-tools.directory</Directory>
--      <Include>
--        <And>
--        <Category>Education</Category>
--        <Or>
--        <Category>Teaching</Category>
--        <Category>X-KDE-Edu-Teaching</Category>
--        </Or>
--        </And>
--      </Include>
--    </Menu>
--  </Menu>
--  <Menu>
--    <Name>Games</Name>
--    <Directory>kde-games.directory</Directory>
--    <Menu>
--      <Name>Arcade</Name>
--      <Directory>kde-games-arcade.directory</Directory>
--      <Include>
--        <And>
--        <Category>Game</Category>
--        <Category>ArcadeGame</Category>
--        </And>
--      </Include>
--    </Menu>
--    <Menu>
--      <Name>Board</Name>
--      <Directory>kde-games-board.directory</Directory>
--      <Include>
--        <And>
--        <Category>Game</Category>
--        <Category>BoardGame</Category>
--        </And>
--      </Include>
--    </Menu>
--    <Menu>
--      <Name>Card</Name>
--      <Directory>kde-games-card.directory</Directory>
--      <Include>
--        <And>
--        <Category>Game</Category>
--        <Category>CardGame</Category>
--        </And>
--      </Include>
--    </Menu>
--    <Menu>
--      <Name>Kidsgames</Name>
--      <Directory>kde-games-kids.directory</Directory>
--      <Include>
--        <And>
--        <Category>Game</Category>
--        <Or>
--        <Category>X-KDE-KidsGame</Category>
--        <Category>KidsGame</Category>
--        </Or>
--        </And>
--      </Include>
--    </Menu>
--    <Menu>
--      <Name>TacticStrategy</Name>
--      <Directory>kde-games-strategy.directory</Directory>
--      <Include>
--        <And>
--        <Category>Game</Category>
--        <Category>StrategyGame</Category>
--        </And>
--      </Include>
--    </Menu>
--    <Include>
--      <And>
--      <Category>Game</Category>
--      <Not>
--      <Category>ArcadeGame</Category>
--      <Category>BoardGame</Category>
--      <Category>CardGame</Category>
--      <Category>X-KDE-KidsGame</Category>
--      <Category>KidsGame</Category>
--      <Category>StrategyGame</Category>
--      </Not>
--      </And>
--    </Include>
--  </Menu>
--  <Menu>
--    <Name>Graphics</Name>
--    <Directory>kde-graphics.directory</Directory>
--    <Include>
--      <And>
--      <Category>Graphics</Category>
--      <Not><Category>X-KDE-More</Category></Not>
--      <Not><Filename>ooo-draw.desktop</Filename></Not>
--      </And>
--    </Include>
--    <Menu>
--      <Name>More</Name>
--      <Directory>kde-more.directory</Directory>
--      <Include>
--        <And>
--        <Category>Graphics</Category>
--        <Category>X-KDE-More</Category>
--        </And>
--      </Include>
--    </Menu>
--  </Menu>
--  <Menu>
--    <Name>Internet</Name>
--    <Directory>kde-internet.directory</Directory>
--    <Include>
--      <And>
--      <Category>Network</Category>
--      <Not><Category>X-KDE-More</Category></Not>
--      </And>
--    </Include>
--    <Menu>
--      <Name>Terminal</Name>
--      <Directory>kde-internet-terminal.directory</Directory>
--    </Menu>
--    <Menu>
--      <Name>More</Name>
--      <Directory>kde-more.directory</Directory>
--      <Include>
--        <And>
--        <Category>Network</Category>
--        <Category>X-KDE-More</Category>
--        </And>
--      </Include>
--    </Menu>
--  </Menu>
--  <Menu>
--    <Name>Multimedia</Name>
--    <Directory>kde-multimedia.directory</Directory>
--    <Include>
--      <And>
--      <Category>AudioVideo</Category>
--      <Not><Category>X-KDE-More</Category></Not>
--      </And>
--    </Include>
--    <Menu>
--      <Name>More</Name>
--      <Directory>kde-more.directory</Directory>
--      <Include>
--        <And>
--        <Category>AudioVideo</Category>
--        <Category>X-KDE-More</Category>
--        </And>
--      </Include>
--    </Menu>
--  </Menu>
--  <Menu>
--    <Name>Office</Name>
--    <Directory>kde-office.directory</Directory>
--    <Layout>
--      <Merge type="menus"/>
--      <Merge type="files"/>
--      <Separator/>
--      <Menuname>More</Menuname>
--    </Layout>
--    <Include>
--      <And>
--      <Category>Office</Category>
--        <Not><Category>X-KDE-More</Category></Not>
--      </And>
--    <Filename>ooo-draw.desktop</Filename>
--    </Include>
--    <Menu>
--      <Name>More</Name>
--      <Directory>kde-more.directory</Directory>
--      <Include>
--        <And>
--          <Category>Office</Category>
--          <Category>X-KDE-More</Category>
--        </And>
--      </Include>
--    </Menu>
--  </Menu>
--  <Menu>
--    <Name>Settingsmenu</Name>
--    <Directory>kde-settingsmenu.directory</Directory>
--    <Include>
--      <Category>Settings</Category>
--    </Include>
--  </Menu>
--  <Menu>
--    <Name>System</Name>
--    <Directory>kde-system.directory</Directory>
--    <Include>
--      <And>
--      <Category>System</Category>
--      <Not><Category>X-KDE-More</Category></Not>
--      </And>
--    </Include>
--    <Menu>
--      <Name>SuperUser</Name>
--      <Directory>kde-system-su.directory</Directory>
--      <Include>
--        <And>
--        <Category>X-KDE-System-su</Category>
--        <Not><Category>X-KDE-More</Category></Not>
--        </And>
--      </Include>
--    </Menu>
--    <Menu>
--      <Name>More</Name>
--      <Directory>kde-more.directory</Directory>
--      <Include>
--        <And>
--        <Category>System</Category>
--        <Category>X-KDE-More</Category>
--        </And>
--      </Include>
--    </Menu>
--    <Menu>
--      <Name>ScreenSavers</Name>
--      <Directory>kde-system-screensavers.directory</Directory>
--    </Menu>
--    <Menu>
--      <Name>Terminal</Name>
--      <Directory>kde-system-terminal.directory</Directory>
--    </Menu>
--  </Menu>
--  <Menu>
--    <Name>Utilities</Name>
--    <Directory>kde-utilities.directory</Directory>
--    <Include>
--      <And>
--      <Category>Utility</Category>
--      <Not><Category>Accessibility</Category></Not>
--      <Not><Category>X-KDE-Utilities-Desktop</Category></Not>
--      <Not><Category>X-KDE-Utilities-Peripherals</Category></Not>
--      <Not><Category>X-KDE-Utilities-PIM</Category></Not>
--      <Not><Category>X-KDE-More</Category></Not>
--      </And>
--    </Include>
--    <Menu>
--      <Name>Accessibility</Name>
--      <Directory>kde-utilities-accessibility.directory</Directory>
--      <Include>
--        <And>
--        <Category>Utility</Category>
--        <Category>Accessibility</Category>
--        </And>
--      </Include>
--    </Menu>
--    <Menu>
--      <Name>Desktop</Name>
--      <Directory>kde-utilities-desktop.directory</Directory>
--      <Include>
--        <And>
--        <Category>Utility</Category>
--        <Category>X-KDE-Utilities-Desktop</Category>
--        </And>
--      </Include>
--    </Menu>
--    <Menu>
--      <Name>Editors</Name>
--      <Directory>kde-editors.directory</Directory>
--      <Include>
--        <Category>TextEditor</Category>
--      </Include>
--    </Menu>
--    <Menu>
--      <Name>PIM</Name>
--      <Directory>kde-utilities-pim.directory</Directory>
--      <Include>
--        <And>
--        <Category>Utility</Category>
--        <Category>X-KDE-Utilities-PIM</Category>
--        </And>
--      </Include>
--    </Menu>
--    <Menu>
--      <Name>Toys</Name>
--      <Directory>kde-toys.directory</Directory>
--      <Include>
--        <Category>Amusement</Category>
--      </Include>
--    </Menu>
--    <Menu>
--      <Name>XUtilities</Name>
--      <Directory>kde-utilities-xutils.directory</Directory>
--    </Menu>
--    <Menu>
--      <Name>More</Name>
--      <Directory>kde-more.directory</Directory>
--      <Include>
--        <And>
--        <Category>Utility</Category>
--        <Category>X-KDE-More</Category>
--        </And>
--      </Include>
--    </Menu>
--    <Menu>
--      <Name>More</Name>
--      <Directory>kde-more.directory</Directory>
--      <Include>
--        <And>
--        <Category>Utility</Category>
--        <Category>X-KDE-More</Category>
--        </And>
--      </Include>
--    </Menu>
--  </Menu>
--  <Include>
--    <And>
--    <Category>KDE</Category>
--    <Category>Core</Category>
--    </And>
--  </Include>
--  <DefaultMergeDirs/>
--
--  <Menu>
--    <Name>Debian</Name>
--    <Directory>debian.directory</Directory>
--    <MergeFile>debian-menu.menu</MergeFile>
--  </Menu>
--
--  <MergeDir>applications-merged</MergeDir>
--  <MergeFile>applications-kmenuedit.menu</MergeFile>
--</Menu>
-diff -Nuar trinity-tdelibs-3.5.13.2/kded.ORI/CMakeLists.txt trinity-tdelibs-3.5.13.2/kded/CMakeLists.txt
---- trinity-tdelibs-3.5.13.2/kded.ORI/CMakeLists.txt	2013-07-28 15:03:29.861478619 +0200
-+++ trinity-tdelibs-3.5.13.2/kded/CMakeLists.txt	2013-07-28 15:03:45.806126508 +0200
-@@ -35,7 +35,7 @@
- ##### other data ################################
- 
- install( FILES kdedmodule.desktop DESTINATION ${SERVICETYPES_INSTALL_DIR} )
--install( FILES applications.menu DESTINATION ${XDG_MENU_INSTALL_DIR} )
-+install( FILES tde-applications.menu DESTINATION ${XDG_MENU_INSTALL_DIR} )
- install( FILES kded.upd DESTINATION ${KCONF_UPDATE_INSTALL_DIR} )
- 
- 
-diff -Nuar trinity-tdelibs-3.5.13.2/kded.ORI/kbuildsycoca.cpp trinity-tdelibs-3.5.13.2/kded/kbuildsycoca.cpp
---- trinity-tdelibs-3.5.13.2/kded.ORI/kbuildsycoca.cpp	2013-07-28 15:03:29.861478619 +0200
-+++ trinity-tdelibs-3.5.13.2/kded/kbuildsycoca.cpp	2013-07-28 15:04:11.314563211 +0200
-@@ -379,7 +379,7 @@
-      connect(g_vfolder, TQT_SIGNAL(newService(const TQString &, KService **)),
-              this, TQT_SLOT(slotCreateEntry(const TQString &, KService **)));
-              
--     VFolderMenu::SubMenu *kdeMenu = g_vfolder->parseMenu("applications.menu", true);
-+     VFolderMenu::SubMenu *kdeMenu = g_vfolder->parseMenu("tde-applications.menu", true);
- 
-      KServiceGroup *entry = g_bsgf->addNew("/", kdeMenu->directoryFile, 0, false);
-      entry->setLayoutInfo(kdeMenu->layoutList);
-diff -Nuar trinity-tdelibs-3.5.13.2/kded.ORI/tde-applications.menu trinity-tdelibs-3.5.13.2/kded/tde-applications.menu
---- trinity-tdelibs-3.5.13.2/kded.ORI/tde-applications.menu	1970-01-01 01:00:00.000000000 +0100
-+++ trinity-tdelibs-3.5.13.2/kded/tde-applications.menu	2013-06-07 19:23:04.000000000 +0200
-@@ -0,0 +1,472 @@
-+<!DOCTYPE Menu PUBLIC "-//freedesktop//DTD Menu 1.0//EN"
-+  "http://www.freedesktop.org/standards/menu-spec/1.0/menu.dtd">
-+
-+<Menu>
-+  <Name>Applications</Name>
-+  <Directory>tde-main.directory</Directory>
-+  <!-- Search the default locations -->
-+  <KDELegacyDirs/>
-+  <DefaultAppDirs/>
-+  <DefaultDirectoryDirs/>
-+  <DefaultLayout>
-+    <Merge type="menus"/>
-+    <Merge type="files"/>
-+    <Separator/>
-+    <Menuname>More</Menuname>
-+  </DefaultLayout>
-+  <Layout>
-+    <Merge type="menus"/>
-+    <Menuname>Applications</Menuname>
-+    <Merge type="files"/>
-+  </Layout>
-+
-+  <Menu>
-+    <Name>Applications</Name>
-+    <Directory>tde-unknown.directory</Directory>
-+    <OnlyUnallocated/>
-+    <Include>
-+      <Not>
-+        <!-- Don't list non-KDE core applications -->
-+        <And>
-+          <Category>Core</Category>
-+          <Not><Category>KDE</Category></Not>
-+        </And>
-+        <!-- Don't list SUSE's YaST in here -->
-+        <Category>X-SuSE-YaST</Category>
-+      </Not>
-+    </Include>
-+  </Menu>
-+  <Menu>
-+    <Name>Development</Name>
-+    <Directory>tde-development.directory</Directory>
-+    <Menu>
-+      <Name>X-KDE-KDevelopIDE</Name>
-+      <Directory>tde-development-kdevelop.directory</Directory>
-+      <Include>
-+        <And>
-+        <Category>Development</Category>
-+        <Category>X-KDE-KDevelopIDE</Category>
-+        </And>
-+      </Include>
-+    </Menu>
-+    <Menu>
-+      <Name>Translation</Name>
-+      <Directory>tde-development-translation.directory</Directory>
-+      <Include>
-+        <And>
-+        <Category>Development</Category>
-+        <Category>Translation</Category>
-+        </And>
-+      </Include>
-+    </Menu>
-+    <Menu>
-+      <Name>Web Development</Name>
-+      <Directory>tde-development-webdevelopment.directory</Directory>
-+      <Include>
-+        <And>
-+        <Category>Development</Category>
-+        <Category>WebDevelopment</Category>
-+        </And>
-+      </Include>
-+    </Menu>
-+      <Include>
-+        <And>
-+        <Category>Development</Category>
-+        <Not><Category>X-KDE-KDevelopIDE</Category></Not>
-+        <Not><Category>Translation</Category></Not>
-+        <Not><Category>WebDevelopment</Category></Not>
-+        </And>
-+      </Include>
-+  </Menu>
-+  <Menu>
-+    <Name>Science</Name>
-+    <Directory>tde-science.directory</Directory>
-+    <Include>
-+      <And><!-- Include /any/ Science app which is not an Education app -->
-+        <Or>
-+          <Category>Astronomy</Category>
-+          <Category>Biology</Category>
-+          <Category>Chemistry</Category>
-+          <Category>Geology</Category>
-+          <Category>MedicalSoftware</Category>
-+          <Category>Physics</Category>
-+          <Category>Math</Category>
-+          <Category>Science</Category>
-+        </Or>
-+        <Not><Category>Education</Category></Not>
-+      </And>
-+    </Include>
-+  </Menu>
-+  <Menu>
-+    <Name>Edutainment</Name>
-+    <Directory>tde-edutainment.directory</Directory>
-+    <Menu>
-+      <Name>Languages</Name>
-+      <Directory>tde-edu-languages.directory</Directory>
-+      <Include>
-+        <And>
-+        <Category>Education</Category>
-+        <Or>
-+        <Category>Languages</Category>
-+        <Category>X-KDE-Edu-Language</Category>
-+        </Or>
-+        </And>
-+      </Include>
-+    </Menu>
-+    <Menu>
-+      <Name>Mathematics</Name>
-+      <Directory>tde-edu-mathematics.directory</Directory>
-+      <Include>
-+        <And>
-+        <Category>Education</Category>
-+        <Category>Math</Category>
-+        </And>
-+      </Include>
-+    </Menu>
-+    <Menu>
-+      <Name>Miscellaneous</Name>
-+      <Directory>tde-edu-miscellaneous.directory</Directory>
-+      <Include>
-+        <And>
-+        <Category>Education</Category>
-+        <Not>
-+        <Category>Languages</Category>
-+        <Category>X-KDE-Edu-Language</Category>
-+        <Category>Math</Category>
-+        <Category>Science</Category>
-+        <Category>Teaching</Category>
-+        <Category>X-KDE-Edu-Teaching</Category>
-+        </Not>
-+        </And>
-+      </Include>
-+    </Menu>
-+    <Menu>
-+      <Name>Science</Name>
-+      <Directory>tde-edu-science.directory</Directory>
-+      <Include>
-+        <And>
-+        <Category>Education</Category>
-+        <Category>Science</Category>
-+        </And>
-+      </Include>
-+    </Menu>
-+    <Menu>
-+      <Name>Tools</Name>
-+      <Directory>tde-edu-tools.directory</Directory>
-+      <Include>
-+        <And>
-+        <Category>Education</Category>
-+        <Or>
-+        <Category>Teaching</Category>
-+        <Category>X-KDE-Edu-Teaching</Category>
-+        </Or>
-+        </And>
-+      </Include>
-+    </Menu>
-+  </Menu>
-+  <Menu>
-+    <Name>Games</Name>
-+    <Directory>tde-games.directory</Directory>
-+    <Menu>
-+      <Name>Arcade</Name>
-+      <Directory>tde-games-arcade.directory</Directory>
-+      <Include>
-+        <And>
-+        <Category>Game</Category>
-+        <Category>ArcadeGame</Category>
-+        </And>
-+      </Include>
-+    </Menu>
-+    <Menu>
-+      <Name>Board</Name>
-+      <Directory>tde-games-board.directory</Directory>
-+      <Include>
-+        <And>
-+        <Category>Game</Category>
-+        <Category>BoardGame</Category>
-+        </And>
-+      </Include>
-+    </Menu>
-+    <Menu>
-+      <Name>Card</Name>
-+      <Directory>tde-games-card.directory</Directory>
-+      <Include>
-+        <And>
-+        <Category>Game</Category>
-+        <Category>CardGame</Category>
-+        </And>
-+      </Include>
-+    </Menu>
-+    <Menu>
-+      <Name>Kidsgames</Name>
-+      <Directory>tde-games-kids.directory</Directory>
-+      <Include>
-+        <And>
-+        <Category>Game</Category>
-+        <Or>
-+        <Category>X-KDE-KidsGame</Category>
-+        <Category>KidsGame</Category>
-+        </Or>
-+        </And>
-+      </Include>
-+    </Menu>
-+    <Menu>
-+      <Name>TacticStrategy</Name>
-+      <Directory>tde-games-strategy.directory</Directory>
-+      <Include>
-+        <And>
-+        <Category>Game</Category>
-+        <Category>StrategyGame</Category>
-+        </And>
-+      </Include>
-+    </Menu>
-+    <Include>
-+      <And>
-+      <Category>Game</Category>
-+      <Not>
-+      <Category>ArcadeGame</Category>
-+      <Category>BoardGame</Category>
-+      <Category>CardGame</Category>
-+      <Category>X-KDE-KidsGame</Category>
-+      <Category>KidsGame</Category>
-+      <Category>StrategyGame</Category>
-+      </Not>
-+      </And>
-+    </Include>
-+  </Menu>
-+  <Menu>
-+    <Name>Graphics</Name>
-+    <Directory>tde-graphics.directory</Directory>
-+    <Include>
-+      <And>
-+      <Category>Graphics</Category>
-+      <Not><Category>X-KDE-More</Category></Not>
-+      <Not><Filename>ooo-draw.desktop</Filename></Not>
-+      </And>
-+    </Include>
-+    <Menu>
-+      <Name>More</Name>
-+      <Directory>tde-more.directory</Directory>
-+      <Include>
-+        <And>
-+        <Category>Graphics</Category>
-+        <Category>X-KDE-More</Category>
-+        </And>
-+      </Include>
-+    </Menu>
-+  </Menu>
-+  <Menu>
-+    <Name>Internet</Name>
-+    <Directory>tde-internet.directory</Directory>
-+    <Include>
-+      <And>
-+      <Category>Network</Category>
-+      <Not><Category>X-KDE-More</Category></Not>
-+      </And>
-+    </Include>
-+    <Menu>
-+      <Name>Terminal</Name>
-+      <Directory>tde-internet-terminal.directory</Directory>
-+    </Menu>
-+    <Menu>
-+      <Name>More</Name>
-+      <Directory>tde-more.directory</Directory>
-+      <Include>
-+        <And>
-+        <Category>Network</Category>
-+        <Category>X-KDE-More</Category>
-+        </And>
-+      </Include>
-+    </Menu>
-+  </Menu>
-+  <Menu>
-+    <Name>Multimedia</Name>
-+    <Directory>tde-multimedia.directory</Directory>
-+    <Include>
-+      <And>
-+      <Category>AudioVideo</Category>
-+      <Not><Category>X-KDE-More</Category></Not>
-+      </And>
-+    </Include>
-+    <Menu>
-+      <Name>More</Name>
-+      <Directory>tde-more.directory</Directory>
-+      <Include>
-+        <And>
-+        <Category>AudioVideo</Category>
-+        <Category>X-KDE-More</Category>
-+        </And>
-+      </Include>
-+    </Menu>
-+  </Menu>
-+  <Menu>
-+    <Name>Office</Name>
-+    <Directory>tde-office.directory</Directory>
-+    <Layout>
-+      <Merge type="menus"/>
-+      <Merge type="files"/>
-+      <Separator/>
-+      <Menuname>More</Menuname>
-+    </Layout>
-+    <Include>
-+      <And>
-+      <Category>Office</Category>
-+        <Not><Category>X-KDE-More</Category></Not>
-+      </And>
-+    <Filename>ooo-draw.desktop</Filename>
-+    </Include>
-+    <Menu>
-+      <Name>More</Name>
-+      <Directory>tde-more.directory</Directory>
-+      <Include>
-+        <And>
-+          <Category>Office</Category>
-+          <Category>X-KDE-More</Category>
-+        </And>
-+      </Include>
-+    </Menu>
-+  </Menu>
-+  <Menu>
-+    <Name>Settingsmenu</Name>
-+    <Directory>tde-settingsmenu.directory</Directory>
-+    <Include>
-+      <Category>Settings</Category>
-+    </Include>
-+  </Menu>
-+  <Menu>
-+    <Name>System</Name>
-+    <Directory>tde-system.directory</Directory>
-+    <Include>
-+      <And>
-+      <Category>System</Category>
-+      <Not><Category>X-KDE-More</Category></Not>
-+      </And>
-+    </Include>
-+    <Menu>
-+      <Name>SuperUser</Name>
-+      <Directory>tde-system-su.directory</Directory>
-+      <Include>
-+        <And>
-+        <Category>X-KDE-System-su</Category>
-+        <Not><Category>X-KDE-More</Category></Not>
-+        </And>
-+      </Include>
-+    </Menu>
-+    <Menu>
-+      <Name>More</Name>
-+      <Directory>tde-more.directory</Directory>
-+      <Include>
-+        <And>
-+        <Category>System</Category>
-+        <Category>X-KDE-More</Category>
-+        </And>
-+      </Include>
-+    </Menu>
-+    <Menu>
-+      <Name>ScreenSavers</Name>
-+      <Directory>tde-system-screensavers.directory</Directory>
-+    </Menu>
-+    <Menu>
-+      <Name>Terminal</Name>
-+      <Directory>tde-system-terminal.directory</Directory>
-+    </Menu>
-+  </Menu>
-+  <Menu>
-+    <Name>Utilities</Name>
-+    <Directory>tde-utilities.directory</Directory>
-+    <Include>
-+      <And>
-+      <Category>Utility</Category>
-+      <Not><Category>Accessibility</Category></Not>
-+      <Not><Category>X-KDE-Utilities-Desktop</Category></Not>
-+      <Not><Category>X-KDE-Utilities-Peripherals</Category></Not>
-+      <Not><Category>X-KDE-Utilities-PIM</Category></Not>
-+      <Not><Category>X-KDE-More</Category></Not>
-+      </And>
-+    </Include>
-+    <Menu>
-+      <Name>Accessibility</Name>
-+      <Directory>tde-utilities-accessibility.directory</Directory>
-+      <Include>
-+        <And>
-+        <Category>Utility</Category>
-+        <Category>Accessibility</Category>
-+        </And>
-+      </Include>
-+    </Menu>
-+    <Menu>
-+      <Name>Desktop</Name>
-+      <Directory>tde-utilities-desktop.directory</Directory>
-+      <Include>
-+        <And>
-+        <Category>Utility</Category>
-+        <Category>X-KDE-Utilities-Desktop</Category>
-+        </And>
-+      </Include>
-+    </Menu>
-+    <Menu>
-+      <Name>Editors</Name>
-+      <Directory>tde-editors.directory</Directory>
-+      <Include>
-+        <Category>TextEditor</Category>
-+      </Include>
-+    </Menu>
-+    <Menu>
-+      <Name>PIM</Name>
-+      <Directory>tde-utilities-pim.directory</Directory>
-+      <Include>
-+        <And>
-+        <Category>Utility</Category>
-+        <Category>X-KDE-Utilities-PIM</Category>
-+        </And>
-+      </Include>
-+    </Menu>
-+    <Menu>
-+      <Name>Toys</Name>
-+      <Directory>tde-toys.directory</Directory>
-+      <Include>
-+        <Category>Amusement</Category>
-+      </Include>
-+    </Menu>
-+    <Menu>
-+      <Name>XUtilities</Name>
-+      <Directory>tde-utilities-xutils.directory</Directory>
-+    </Menu>
-+    <Menu>
-+      <Name>More</Name>
-+      <Directory>tde-more.directory</Directory>
-+      <Include>
-+        <And>
-+        <Category>Utility</Category>
-+        <Category>X-KDE-More</Category>
-+        </And>
-+      </Include>
-+    </Menu>
-+    <Menu>
-+      <Name>More</Name>
-+      <Directory>tde-more.directory</Directory>
-+      <Include>
-+        <And>
-+        <Category>Utility</Category>
-+        <Category>X-KDE-More</Category>
-+        </And>
-+      </Include>
-+    </Menu>
-+  </Menu>
-+  <Include>
-+    <And>
-+    <Category>KDE</Category>
-+    <Category>Core</Category>
-+    </And>
-+  </Include>
-+  <DefaultMergeDirs/>
-+
-+  <Menu>
-+    <Name>Debian</Name>
-+    <Directory>debian.directory</Directory>
-+    <MergeFile>debian-menu.menu</MergeFile>
-+  </Menu>
-+
-+  <MergeDir>applications-merged</MergeDir>
-+  <MergeFile>applications-kmenuedit.menu</MergeFile>
-+</Menu>
diff --git a/redhat/tdelibs/tdelibs-3.5.13.2-xdg_dirs_set_path.patch b/redhat/tdelibs/tdelibs-3.5.13.2-xdg_dirs_set_path.patch
deleted file mode 100644
index 28fe715b4..000000000
--- a/redhat/tdelibs/tdelibs-3.5.13.2-xdg_dirs_set_path.patch
+++ /dev/null
@@ -1,150 +0,0 @@
---- ./kdecore/kglobalsettings.h.Ori	2013-05-08 22:16:42.771982104 +0200
-+++ ./kdecore/kglobalsettings.h	2013-05-08 22:18:33.882577602 +0200
-@@ -253,6 +253,29 @@
-      */
-     static TQString documentPath() { initStatic(); return *s_documentPath; }
- 
-+    /**
-+     * The path where documents are stored of the current user.
-+     * @return the path of the videos directory
-+     */
-+    static TQString videosPath() { initStatic(); return *s_videosPath; }
-+
-+    /**
-+     * The path where documents are stored of the current user.
-+     * @return the path of the music directory
-+     */
-+    static TQString musicPath() { initStatic(); return *s_musicPath; }
-+
-+    /**
-+     * The path where documents are stored of the current user.
-+     * @return the path of the downloads directory
-+     */
-+    static TQString downloadPath() { initStatic(); return *s_downloadPath; }
-+
-+    /**
-+     * The path where documents are stored of the current user.
-+     * @return the path of the pictures directory
-+     */
-+    static TQString picturesPath() { initStatic(); return *s_picturesPath; }
- 
-     /**
-      * The default color to use when highlighting toolbar buttons.
-@@ -560,6 +583,10 @@
-     static TQString* s_autostartPath;
-     static TQString* s_trashPath;
-     static TQString* s_documentPath;
-+    static TQString* s_picturesPath;
-+    static TQString* s_downloadPath;
-+    static TQString* s_musicPath;
-+    static TQString* s_videosPath;
-     static TQFont *_generalFont;
-     static TQFont *_fixedFont;
-     static TQFont *_toolBarFont;
---- ./kdecore/kglobalsettings.cpp.xdg_path	2013-01-09 19:23:09.000000000 +0100
-+++ ./kdecore/kglobalsettings.cpp	2013-05-08 22:26:26.451376166 +0200
-@@ -62,6 +62,10 @@
- TQString* KGlobalSettings::s_autostartPath = 0;
- TQString* KGlobalSettings::s_trashPath = 0;
- TQString* KGlobalSettings::s_documentPath = 0;
-+TQString* KGlobalSettings::s_videosPath = 0;
-+TQString* KGlobalSettings::s_musicPath = 0;
-+TQString* KGlobalSettings::s_downloadPath = 0;
-+TQString* KGlobalSettings::s_picturesPath = 0;
- TQFont *KGlobalSettings::_generalFont = 0;
- TQFont *KGlobalSettings::_fixedFont = 0;
- TQFont *KGlobalSettings::_toolBarFont = 0;
-@@ -83,7 +87,7 @@
- 
- // helper function for reading xdg user dirs: it is required in order to take 
- // care of locale stuff
--void readXdgUserDirs(TQString *desktop, TQString *documents)
-+void readXdgUserDirs(TQString *desktop, TQString *documents, TQString *videos, TQString *music, TQString *download, TQString *pictures)
- {
- 	TQFile f( TQDir::homeDirPath() + "/.config/user-dirs.dirs" );
- 
-@@ -101,6 +105,14 @@
- 			*desktop = line.remove("XDG_DESKTOP_DIR=").remove("\"").replace("$HOME", TQDir::homeDirPath());
- 		else if (line.startsWith("XDG_DOCUMENTS_DIR="))
- 			*documents = line.remove("XDG_DOCUMENTS_DIR=").remove("\"").replace("$HOME", TQDir::homeDirPath());
-+		else if (line.startsWith("XDG_MUSIC_DIR="))
-+			*videos = line.remove("XDG_MUSIC_DIR=").remove("\"").replace("$HOME", TQDir::homeDirPath());
-+		else if (line.startsWith("XDG_DOWNLOAD_DIR="))
-+			*download = line.remove("XDG_DOWNLOAD_DIR=").remove("\"").replace("$HOME", TQDir::homeDirPath());
-+		else if (line.startsWith("XDG_VIDEOS_DIR="))
-+			*music = line.remove("XDG_VIDEOS_DIR=").remove("\"").replace("$HOME", TQDir::homeDirPath());
-+		else if (line.startsWith("XDG_PICTURES_DIR="))
-+			*pictures = line.remove("XDG_PICTURES_DIR=").remove("\"").replace("$HOME", TQDir::homeDirPath());
- 
- 		line = s.readLine();
- 	}
-@@ -515,30 +527,45 @@
-     s_autostartPath = new TQString();
-     s_trashPath = new TQString();
-     s_documentPath = new TQString();
-+    s_videosPath = new TQString();
-+    s_musicPath = new TQString();
-+    s_downloadPath = new TQString();
-+    s_picturesPath = new TQString();
-+
- 
-     KConfigGroup g( KGlobal::config(), "Paths" );
- 
--	// Read desktop and documents path using XDG_USER_DIRS
--	readXdgUserDirs(s_desktopPath, s_documentPath);
-+    // Read desktop and documents path using XDG_USER_DIRS
-+    readXdgUserDirs(s_desktopPath, s_documentPath, s_musicPath, s_videosPath, s_downloadPath, s_picturesPath);
- 	
-     if (s_desktopPath->isEmpty() == true) {
-       *s_desktopPath = TQDir::homeDirPath() + "/Desktop/";
-     }
-+
-     *s_desktopPath = TQDir::cleanDirPath( *s_desktopPath );
-     if ( !s_desktopPath->endsWith("/") )
-       s_desktopPath->append('/');
- 
--    if (s_documentPath->isEmpty() == true) {
--#ifdef Q_WS_WIN
--      *s_documentPath = getWin32ShellFoldersPath("Personal");
--#else
--      *s_documentPath = TQDir::homeDirPath() + "/Documents/";
--#endif
--    }
-     *s_documentPath = TQDir::cleanDirPath( *s_documentPath );
-     if ( !s_documentPath->endsWith("/"))
-       s_documentPath->append('/');
- 
-+    *s_musicPath = TQDir::cleanDirPath( *s_musicPath );
-+    if ( !s_musicPath->endsWith("/"))
-+      s_musicPath->append('/');
-+
-+    *s_videosPath = TQDir::cleanDirPath( *s_videosPath );
-+    if ( !s_videosPath->endsWith("/"))
-+      s_videosPath->append('/');
-+
-+    *s_downloadPath = TQDir::cleanDirPath( *s_downloadPath );
-+    if ( !s_downloadPath->endsWith("/"))
-+      s_downloadPath->append('/');
-+
-+    *s_picturesPath = TQDir::cleanDirPath( *s_picturesPath );
-+    if ( !s_picturesPath->endsWith("/"))
-+      s_picturesPath->append('/');
-+
-     // Trash Path - TODO remove in KDE4 (kio_trash can't use it for interoperability reasons)
-     *s_trashPath = *s_desktopPath + i18n("Trash") + "/";
-     *s_trashPath = g.readPathEntry( "Trash" , *s_trashPath);
-@@ -603,6 +630,14 @@
-     s_desktopPath = 0L;
-     delete s_documentPath;
-     s_documentPath = 0L;
-+    delete s_videosPath;
-+    s_videosPath = 0L;
-+    delete s_picturesPath;
-+    s_picturesPath = 0L;
-+    delete s_downloadPath;
-+    s_downloadPath = 0L;
-+    delete s_musicPath;
-+    s_musicPath = 0L;
- }
- 
- KGlobalSettings::KMouseSettings & KGlobalSettings::mouseSettings()
diff --git a/redhat/tdelibs/tdelibs-3.5.13.2.spec b/redhat/tdelibs/tdelibs-3.5.13.2.spec
index 61d08bfe8..c7c44212c 100644
--- a/redhat/tdelibs/tdelibs-3.5.13.2.spec
+++ b/redhat/tdelibs/tdelibs-3.5.13.2.spec
@@ -1,50 +1,64 @@
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?tde_prefix}" != "/usr"
-%define _variant .opt
-%endif
-
+#
+# spec file for package tdelibs
+#
+# Copyright (c) 2014 François Andriot <francois.andriot@free.fr>
+#
+# All modifications and additions to the file contributed by third parties
+# remain the property of their copyright owners, unless otherwise agreed
+# upon. The license for this file, and modifications and additions to the
+# file, is the same license as for the pristine package itself (unless the
+# license for the pristine package is not an Open Source License, in which
+# case the license is the MIT License). An "Open Source License" is a
+# license that conforms to the Open Source Definition (Version 1.9)
+# published by the Open Source Initiative.
+#
+# Please submit bugfixes or comments via http:/www.trinitydesktop.org/
+#
+
+# BUILD WARNING:
+#  Remove qt-devel and qt3-devel and any kde*-devel on your system !
+#  Having KDE libraries may cause FTBFS here !
+
+# TDE variables
 %define tde_version 3.5.13.2
-
-# TDE specific variables
+%define tde_prefix /opt/trinity
 %define tde_bindir %{tde_prefix}/bin
 %define tde_datadir %{tde_prefix}/share
 %define tde_docdir %{tde_datadir}/doc
 %define tde_includedir %{tde_prefix}/include
 %define tde_libdir %{tde_prefix}/%{_lib}
-
 %define tde_tdedocdir %{tde_docdir}/tde
 %define tde_tdeincludedir %{tde_includedir}/tde
 %define tde_tdelibdir %{tde_libdir}/trinity
-
 %define _docdir %{tde_docdir}
 
+# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
+%if "%{?tde_prefix}" != "/usr"
+%define _variant .opt
+%endif
+
+
 Name:			trinity-tdelibs
 Version:		%{tde_version}
-Release:		%{?!preversion:3}%{?preversion:2_%{preversion}}%{?dist}%{?_variant}
-License:		GPL
+Release:		%{?!preversion:4}%{?preversion:3_%{preversion}}%{?dist}%{?_variant}
 Summary:		TDE Libraries
-Group:			Environment/Libraries
-
-Vendor:			Trinity Project
-Packager:		Francois Andriot <francois.andriot@free.fr>
+Group:			System/GUI/Other
 URL:			http://www.trinitydesktop.org/
 
+%if 0%{?suse_version}
+License:	GPL-2.0+
+%else
+License:	GPLv2+
+%endif
+
+#Vendor:			Trinity Project
+#Packager:		Francois Andriot <francois.andriot@free.fr>
+
 Prefix:			%{tde_prefix}
 BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0:		%{name}-%{version}%{?preversion:~%{preversion}}.tar.gz
 
-# Fix categories in T-menu
-Patch1:			tdelibs-3.5.13.2-fix_xdg_menu.patch
-# Fix startup of KDE4 applications
-Patch2:			tdelibs-3.5.13.2-fix-starting-kde4-applications.patch
-# Fix ARTS includes directory
-Patch3:			tdelibs-3.5.13.2-fix_arts_include.patch
-
-# Patches from Mandriva
-Patch101:		tdelibs-3.5.13.2-xdg_dirs_set_path.patch
-Patch102:		tdelibs-3.5.13.2-cups_by_default.patch
-
 Obsoletes:		tdelibs < %{version}-%{release}
 Provides:		tdelibs = %{version}-%{release}
 Obsoletes:		trinity-kdelibs < %{version}-%{release}
@@ -52,21 +66,30 @@ Provides:		trinity-kdelibs = %{version}-%{release}
 Obsoletes:		trinity-kdelibs-apidocs < %{version}-%{release}
 Provides:		trinity-kdelibs-apidocs = %{version}-%{release}
 
-
-BuildRequires:	cmake >= 2.8
-BuildRequires:	libtool
+# Trinity dependencies
 BuildRequires:	qt3-devel >= 3.3.8.d
-BuildRequires:	trinity-tqtinterface-devel >= %{tde_version}
+BuildRequires:	libtqt4-devel = 1:4.2.0
 BuildRequires:	trinity-arts-devel >= 1:1.5.10
+BuildRequires:	libdbus-tqt-1-devel >= 1:0.63
+BuildRequires:	libdbus-1-tqt-devel >= 1:0.9
+
+Requires:		trinity-arts >= 1:1.5.10
+
+BuildRequires:	cmake >= 2.8
+BuildRequires:	gcc-c++
+BuildRequires:	pkgconfig
+
 BuildRequires:	krb5-devel
 BuildRequires:	libxslt-devel
 BuildRequires:	cups-devel
 BuildRequires:	openssl-devel
-BuildRequires:	gcc-c++
 BuildRequires:	alsa-lib-devel
 BuildRequires:	libidn-devel
 BuildRequires:	libtiff-devel
+
+# GLIB2 support
 BuildRequires:	glib2-devel
+
 # LUA support are not ready yet
 #BuildRequires:	lua-devel
 
@@ -154,31 +177,33 @@ BuildRequires:	OpenEXR-devel
 %endif
 
 # LIBTOOL
+BuildRequires:	libtool
 %if 0%{?mgaversion} || 0%{?mdkversion}
 BuildRequires:	%{_lib}ltdl-devel
 %endif
 %if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version} >= 1220
 BuildRequires:	libtool-ltdl-devel
 %endif
-%if 0%{?rhel} == 4 || 0%{?suse_version} == 1140
-BuildRequires:	libtool
-%endif
 
-# X11 support
+# XCOMPOSITE support
 %if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires:	x11-proto-devel
 %if 0%{?mgaversion} >= 4
 BuildRequires:	%{_lib}xcomposite-devel
 %else
 BuildRequires:	%{_lib}xcomposite%{?mgaversion:1}-devel
 %endif
 %endif
-%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version}
-BuildRequires:	xorg-x11-proto-devel
-%endif
 %if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version} >= 1220
 BuildRequires:	libXcomposite-devel
 %endif
+
+# X11 support
+%if 0%{?mgaversion} || 0%{?mdkversion}
+BuildRequires:	x11-proto-devel
+%endif
+%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version}
+BuildRequires:	xorg-x11-proto-devel
+%endif
 %if 0%{?rhel} == 4
 BuildRequires:	xorg-x11-devel
 %endif
@@ -219,16 +244,23 @@ Requires:		openssl
 Requires:		openssl
 %endif
 
-# Trinity dependencies
-Requires:		qt3 >= 3.3.8.d
-Requires:		trinity-tqtinterface >= %{tde_version}
-Requires:		trinity-arts >= 1:1.5.10
+# XRANDR support
+#  On RHEL5, xrandr library is too old.
+%if 0%{?fedora} >= 15 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 6 || 0%{?suse_version}
+%define with_xrandr 1
+%endif
+
+# XT support
+%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version}
+BuildRequires: libXt-devel
+%endif
+
 
 
 %description
 Libraries for the Trinity Desktop Environment:
-TDE Libraries included: tdecore (TDE core library), kdeui (user interface),
-kfm (file manager), khtmlw (HTML widget), tdeio (Input/Output, networking),
+TDE Libraries included: tdecore (TDE core library), tdeui (user interface),
+kfm (file manager), tdehtmlw (HTML widget), tdeio (Input/Output, networking),
 kspell (spelling checker), jscript (javascript), kab (addressbook),
 kimgio (image manipulation).
 
@@ -370,7 +402,7 @@ applications for TDE.
 
 ##########
 
-%if 0%{?suse_version} || 0%{?pclinuxos}
+%if 0%{?pclinuxos}
 %debug_package
 %endif
 
@@ -378,28 +410,21 @@ applications for TDE.
 
 %prep
 %setup -q -n %{name}-%{version}%{?preversion:~%{preversion}}
-%patch1 -p1 -b .xdg
-%patch2 -p1 -b .kde4
-%patch3 -p1 -b .arts
-%patch101 -p1 -b .xdg_path
-%patch102 -p1 -b .cups_by_default
 
 
 %build
-unset QTDIR; . /etc/profile.d/qt3.sh
-export PATH="%{tde_bindir}:${QTDIR}/bin:${PATH}"
+unset QTDIR QTINC QTLIB
+. /etc/profile.d/qt3.sh
+export PATH="${QTDIR}/bin:${PATH}"
+export PATH="%{tde_bindir}:${PATH}"
 export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
-export CMAKE_INCLUDE_PATH="%{tde_includedir}:%{tde_includedir}/tqt"
-
-# We need LD_LIBRARY_PATH here because ld.so.conf file has not been written yet
-export LD_LIBRARY_PATH="%{tde_libdir}"
-
-export KDEDIR="%{tde_prefix}"
 
 if [ -d "/usr/X11R6" ]; then
   export RPM_OPT_FLAGS="${RPM_OPT_FLAGS} -L/usr/X11R6/%{_lib} -I/usr/X11R6/include"
 fi
 
+export KDEDIR="%{tde_prefix}"
+
 if ! rpm -E %%cmake|grep -q "cd build"; then
   %__mkdir_p build
   cd build
@@ -411,6 +436,7 @@ fi
   -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
   -DCMAKE_SKIP_RPATH=OFF \
   -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
+  -DCMAKE_NO_BUILTIN_CHRPATH=ON \
   -DCMAKE_VERBOSE_MAKEFILE=ON \
   \
   -DCMAKE_INSTALL_PREFIX="%{tde_prefix}" \
diff --git a/redhat/tdelibs/trinity-tdelibs-3.5.13.3.spec b/redhat/tdelibs/trinity-tdelibs-3.5.13.3.spec
deleted file mode 100644
index 778e2eefe..000000000
--- a/redhat/tdelibs/trinity-tdelibs-3.5.13.3.spec
+++ /dev/null
@@ -1,480 +0,0 @@
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?tde_prefix}" != "/usr"
-%define _variant .opt
-%endif
-
-# TDE 3.5.13 specific variables
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_docdir}
-
-Name:		trinity-tdelibs
-Version:	3.5.13.2
-Release:	%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
-License:	GPL
-Summary:	TDE Libraries
-Group:		Environment/Libraries
-
-Vendor:		Trinity Project
-Packager:	Francois Andriot <francois.andriot@free.fr>
-URL:		http://www.trinitydesktop.org/
-
-Prefix:		%{tde_prefix}
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:	%{name}-%{version}%{?preversion:~%{preversion}}.tar.gz
-
-Patch1:		tdelibs-3.5.13.2-xdg_dirs_set_path.patch
-Patch2:		tdelibs-3.5.13.2-cups_by_default.patch
-Patch4:		tdelibs-3.5.13.2-fix_kzip_empty_directory.patch
-
-Obsoletes:	tdelibs < %{version}-%{release}
-Provides:	tdelibs = %{version}-%{release}
-Obsoletes:	trinity-kdelibs < %{version}-%{release}
-Provides:	trinity-kdelibs = %{version}-%{release}
-Obsoletes:	trinity-kdelibs-apidocs < %{version}-%{release}
-Provides:	trinity-kdelibs-apidocs = %{version}-%{release}
-
-
-BuildRequires:	cmake >= 2.8
-BuildRequires:	libtool
-BuildRequires:	qt3-devel
-BuildRequires:	trinity-tqtinterface-devel >= %{version}
-BuildRequires:	trinity-arts-devel >= %{version}
-BuildRequires:	krb5-devel
-BuildRequires:	libxslt-devel
-BuildRequires:	cups-devel
-BuildRequires:	libart_lgpl-devel
-BuildRequires:	openssl-devel
-BuildRequires:	gcc-c++
-BuildRequires:	alsa-lib-devel
-BuildRequires:	libidn-devel
-BuildRequires:	libtiff-devel
-BuildRequires:	glib2-devel
-# LUA support are not ready yet
-#BuildRequires:	lua-devel
-
-# ASPELL support
-BuildRequires:	aspell
-BuildRequires:	aspell-devel
-
-# GAMIN support
-#  Not on openSUSE.
-%if 0%{?rhel} || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion}
-%define with_gamin 1
-BuildRequires:	gamin-devel
-%endif
-
-# PCRE support
-%if 0%{?rhel} >=5 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}
-%define with_pcre 1
-BuildRequires:	pcre-devel
-%endif
-
-# INOTIFY support
-%if 0%{?rhel} >=5 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}
-%define with_inotify 1
-%endif
-
-# BZIP2 support
-%if 0%{?suse_version}
-BuildRequires:	libbz2-devel
-%else
-BuildRequires:	bzip2-devel
-%endif
-
-# UTEMPTER support
-%if 0%{?rhel} >=5 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires:	libutempter-devel
-%endif
-%if 0%{?rhel} == 4
-BuildRequires:	utempter
-%endif
-%if 0%{?suse_version}
-BuildRequires:	utempter-devel
-%endif
-
-# HSPELL support
-%if 0%{?rhel} >=5 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion}
-%define with_hspell 1
-BuildRequires:	hspell-devel
-%endif
-
-# JASPER support
-%if 0%{?rhel} >=5 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}
-%define with_jasper 1
-%if 0%{?suse_version}
-BuildRequires:	libjasper-devel
-%endif
-%if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires:	%{_lib}jasper-devel
-%endif
-%if 0%{?rhel} || 0%{?fedora}
-BuildRequires:	jasper-devel
-%endif
-%endif
-
-# AVAHI support
-%if 0%{?rhel} >=5 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}
-%define with_avahi 1
-BuildRequires:	trinity-avahi-tqt-devel >= %{version}
-%if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires:	%{_lib}avahi-client-devel
-Requires:		%{_lib}avahi-client3
-%endif
-%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version}
-BuildRequires:	avahi-devel
-Requires:		avahi
-%endif
-%endif
-
-# OPENEXR support
-%if 0%{?rhel} >=5 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}
-%define with_openexr 1
-BuildRequires:	OpenEXR-devel
-%endif
-
-# LIBTOOL
-%if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires:	%{_lib}ltdl-devel
-%endif
-%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version} >= 1220
-BuildRequires:	libtool-ltdl-devel
-%endif
-%if 0%{?rhel} == 4 || 0%{?suse_version} == 1140
-BuildRequires:	libtool
-%endif
-
-# X11 support
-%if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires:	x11-proto-devel
-BuildRequires:	%{_lib}xcomposite%{?mgaversion:1}-devel
-%endif
-%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version}
-BuildRequires:	xorg-x11-proto-devel
-%endif
-%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version} >= 1220
-BuildRequires:	libXcomposite-devel
-%endif
-%if 0%{?rhel} == 4
-BuildRequires:	xorg-x11-devel
-%endif
-
-# ICEAUTH
-%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version} >= 1220
-Requires:		iceauth
-%endif
-%if 0%{?rhel} >= 5 || 0%{?fedora}
-Requires:		xorg-x11-server-utils
-%endif
-%if 0%{?rhel} == 4 || 0%{?suse_version}
-Requires:		xorg-x11
-%endif
-
-# XZ support
-%if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires:	%{_lib}lzma-devel
-%endif
-%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version}
-BuildRequires:	xz-devel
-%endif
-
-Requires:		trinity-tqtinterface >= %{version}
-Requires:		trinity-arts >= %{version}
-Requires:		qt3 >= 3.3.8.d
-
-%description
-Libraries for the Trinity Desktop Environment:
-TDE Libraries included: tdecore (TDE core library), kdeui (user interface),
-kfm (file manager), khtmlw (HTML widget), kio (Input/Output, networking),
-kspell (spelling checker), jscript (javascript), kab (addressbook),
-kimgio (image manipulation).
-
-%files
-%defattr(-,root,root,-)
-%doc AUTHORS COPYING COPYING-DOCS COPYING.LIB README TODO
-%{tde_bindir}/artsmessage
-%{tde_bindir}/cupsdconf
-%{tde_bindir}/cupsdoprint
-%{tde_bindir}/dcop
-%{tde_bindir}/dcopclient
-%{tde_bindir}/dcopfind
-%{tde_bindir}/dcopobject
-%{tde_bindir}/dcopquit
-%{tde_bindir}/dcopref
-%{tde_bindir}/dcopserver
-%{tde_bindir}/dcopserver_shutdown
-%{tde_bindir}/dcopstart
-%{tde_bindir}/filesharelist
-%{tde_bindir}/fileshareset
-%{tde_bindir}/imagetops
-%{tde_bindir}/kab2kabc
-%{tde_bindir}/kaddprinterwizard
-%{tde_bindir}/kbuildsycoca
-%{tde_bindir}/kcmshell
-%{tde_bindir}/kconf_update
-%{tde_bindir}/kcookiejar
-%{tde_bindir}/kde-config
-%{tde_bindir}/kde-menu
-%{tde_bindir}/kded
-%{tde_bindir}/kdeinit
-%{tde_bindir}/kdeinit_shutdown
-%{tde_bindir}/kdeinit_wrapper
-%{tde_bindir}/kdesu_stub
-%{tde_bindir}/kdontchangethehostname
-%{tde_bindir}/kdostartupconfig
-%{tde_bindir}/kfile
-%{tde_bindir}/kfmexec
-%{tde_bindir}/khotnewstuff
-%{tde_bindir}/kinstalltheme
-%{tde_bindir}/kio_http_cache_cleaner
-%{tde_bindir}/kio_uiserver
-%{tde_bindir}/kioexec
-%{tde_bindir}/kioslave
-%{tde_bindir}/klauncher
-%{tde_bindir}/kmailservice
-%{tde_bindir}/kmimelist
-%attr(4755,root,root) %{tde_bindir}/kpac_dhcp_helper
-%{tde_bindir}/ksendbugmail
-%{tde_bindir}/kshell
-%{tde_bindir}/kstartupconfig
-%{tde_bindir}/ktelnetservice
-%{tde_bindir}/ktradertest
-%{tde_bindir}/kwrapper
-%{tde_bindir}/lnusertemp
-%{tde_bindir}/make_driver_db_cups
-%{tde_bindir}/make_driver_db_lpr
-%{tde_bindir}/meinproc
-%{tde_bindir}/networkstatustestservice
-%{tde_bindir}/start_kdeinit
-%{tde_bindir}/start_kdeinit_wrapper
-%attr(4755,root,root) %{tde_bindir}/kgrantpty
-%{tde_tdelibdir}/*
-%{tde_libdir}/lib*.so.*
-%{tde_libdir}/lib[kt]deinit_*.la
-%{tde_libdir}/lib[kt]deinit_*.so
-%{tde_datadir}/applications/kde/*.desktop
-%{tde_datadir}/autostart/kab2kabc.desktop
-%{tde_datadir}/applnk/kio_iso.desktop
-%{tde_datadir}/apps/*
-%exclude %{tde_datadir}/apps/ksgmltools2/
-%config(noreplace) %{tde_datadir}/config/*
-%{tde_datadir}/emoticons/*
-%{tde_datadir}/icons/default.kde
-%{_sysconfdir}/alternatives/default.kde
-%{tde_datadir}/mimelnk/magic
-%{tde_datadir}/mimelnk/*/*.desktop
-%{tde_datadir}/services/*
-%{tde_datadir}/servicetypes/*
-%{tde_datadir}/icons/crystalsvg/
-%{tde_tdedocdir}/HTML/en/kspell/
-# remove conflicts with kdelibs-4
-%if "%{?tde_prefix}" != "/usr"
-%{tde_bindir}/checkXML
-%{tde_bindir}/ksvgtopng
-%{tde_bindir}/kunittestmodrunner
-%{tde_bindir}/preparetips
-%{tde_datadir}/icons/hicolor/index.theme
-%{tde_datadir}/locale/all_languages
-%{tde_tdedocdir}/HTML/en/common/*
-%{_sysconfdir}/ld.so.conf.d/trinity.conf
-%else
-%exclude %{tde_bindir}/checkXML
-%exclude %{tde_bindir}/ksvgtopng
-%exclude %{tde_bindir}/kunittestmodrunner
-%exclude %{tde_bindir}/preparetips
-%exclude %{tde_datadir}/config/colors
-%exclude %{tde_datadir}/config/kdebug.areas
-%exclude %{tde_datadir}/config/kdebugrc
-%exclude %{tde_datadir}/config/ksslcalist
-%exclude %{tde_datadir}/config/ui/ui_standards.rc
-%exclude %{tde_datadir}/icons/hicolor/index.theme
-%exclude %{tde_datadir}/locale/all_languages
-%exclude %{tde_tdedocdir}/HTML/en/common/*
-%endif
-
-# Avoid conflict with 'redhat-menus' package
-%if "%{tde_prefix}" == "/usr"
-%{_sysconfdir}/xdg/menus/kde-applications.menu
-%else
-%{tde_prefix}/etc/xdg/menus/kde-applications.menu
-%endif
-
-# New in TDE 3.5.13
-%{tde_bindir}/kdetcompmgr
-
-%pre
-# TDE Bug #1074
-if [ -d "%{tde_datadir}/locale/all_languages" ]; then
-  rm -rf "%{tde_datadir}/locale/all_languages"
-fi
-
-%post
-/sbin/ldconfig || :
-# Sets default theme as 'crystalsvg'
-update-alternatives --install \
-  %{tde_datadir}/icons/default.kde \
-  default.kde \
-  %{tde_datadir}/icons/crystalsvg \
-  10 || :
-
-%preun
-if [ $1 -eq 0 ]; then
-  update-alternatives --remove \
-    default.kde \
-    %{tde_datadir}/icons/crystalsvg || :
-fi
-
-%postun
-/sbin/ldconfig || :
-
-##########
-
-%package devel
-Summary:	%{name} - Development files
-Group:		Development/Libraries
-Requires:	%{name} = %{version}-%{release}
-
-Obsoletes:	tdelibs-devel < %{version}-%{release}
-Provides:	tdelibs-devel = %{version}-%{release}
-Obsoletes:	trinity-kdelibs-devel < %{version}-%{release}
-Provides:	trinity-kdelibs-devel = %{version}-%{release}
-
-%description devel
-This package includes the header files you will need to compile
-applications for TDE.
-
-%files devel
-%defattr(-,root,root,-)
-%{tde_bindir}/dcopidl*
-%{tde_bindir}/kconfig_compiler
-%{tde_bindir}/makekdewidgets
-%{tde_datadir}/apps/ksgmltools2/
-%{tde_tdeincludedir}/*
-%{tde_libdir}/*.la
-%{tde_libdir}/*.so
-%{tde_libdir}/*.a
-%exclude %{tde_libdir}/lib[kt]deinit_*.la
-%exclude %{tde_libdir}/lib[kt]deinit_*.so
-
-# New in TDE 3.5.13
-%{tde_datadir}/cmake/[kt]delibs.cmake
-
-%post devel
-/sbin/ldconfig || :
-
-%postun devel
-/sbin/ldconfig || :
-
-##########
-
-%if 0%{?suse_version} || 0%{?pclinuxos}
-%debug_package
-%endif
-
-##########
-
-%prep
-%setup -q -n %{name}-%{version}%{?preversion:~%{preversion}}
-%patch1 -p1 -b .xdg_path
-%patch2 -p1 -b .cups_by_default
-%patch4 -p1 -b .kzip
-
-
-%build
-unset QTDIR || : ; . /etc/profile.d/qt3.sh
-export PATH="%{tde_bindir}:${QTDIR}/bin:${PATH}"
-export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
-export CMAKE_INCLUDE_PATH="%{tde_includedir}:%{tde_includedir}/tqt"
-
-# We need LD_LIBRARY_PATH here because ld.so.conf file has not been written yet
-export LD_LIBRARY_PATH="%{tde_libdir}"
-
-export KDEDIR="%{tde_prefix}"
-
-if [ -d "/usr/X11R6" ]; then
-  export CXXFLAGS="${RPM_OPT_FLAGS} -L/usr/X11R6/%{_lib} -I/usr/X11R6/include"
-fi
-
-
-%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version}
-%__mkdir_p build
-cd build
-%endif
-
-%cmake \
-  -DCMAKE_INSTALL_PREFIX="%{tde_prefix}" \
-  -DBIN_INSTALL_DIR="%{tde_bindir}" \
-  -DDOC_INSTALL_DIR="%{tde_docdir}" \
-  -DINCLUDE_INSTALL_DIR="%{tde_tdeincludedir}" \
-  -DLIB_INSTALL_DIR="%{tde_libdir}" \
-  -DPKGCONFIG_INSTALL_DIR="%{tde_libdir}/pkgconfig" \
-  -DSHARE_INSTALL_PREFIX="%{tde_datadir}" \
-  -DCMAKE_SKIP_RPATH=OFF \
-  -DWITH_ARTS=ON \
-  -DWITH_ALSA=ON \
-  -DWITH_LIBART=ON \
-  -DWITH_LIBIDN=ON \
-  -DWITH_SSL=ON \
-  -DWITH_CUPS=ON \
-  -DWITH_LUA=OFF \
-  -DWITH_TIFF=ON \
-  %{?with_jasper:-DWITH_JASPER=ON} \
-  %{?with_openexr:-DWITH_OPENEXR=ON} \
-  -DWITH_UTEMPTER=ON \
-  %{?with_avahi:-DWITH_AVAHI=ON} \
-  %{?!with_pcre:-DWITH_PCRE=OFF} \
-  %{?!with_inotify:-DWITH_INOTIFY=OFF} \
-  %{?!with_gamin:-DWITH_GAMIN=OFF} %{?with_gamin:-DWITH_GAMIN=ON} \
-  -DWITH_SUDO_KDESU_BACKEND=OFF \
-  -DWITH_LZMA=ON \
-  -DWITH_ASPELL=ON \
-  %{?with_hspell:-DWITH_HSPELL=ON} \
-  ..
-
-%__make %{?_smp_mflags} || %__make
-
-
-%install
-%__rm -rf "%{?buildroot}"
-%__make install DESTDIR="%{?buildroot}" -C build
-
-%if "%{?tde_prefix}" != "/usr"
-%__mkdir_p "%{?buildroot}%{_sysconfdir}/ld.so.conf.d"
-cat <<EOF >"%{?buildroot}%{_sysconfdir}/ld.so.conf.d/trinity.conf"
-%{tde_libdir}
-EOF
-%endif
-
-# Moves the XDG configuration files to TDE directory
-%if "%{tde_prefix}" != "/usr"
-%__install -p -D -m644 \
-  "%{?buildroot}%{_sysconfdir}/xdg/menus/applications.menu" \
-  "%{?buildroot}%{tde_prefix}/etc/xdg/menus/kde-applications.menu"
-%__rm -rf "%{?buildroot}%{_sysconfdir}/xdg"
-%else
-%__mv -f "%{?buildroot}%{_sysconfdir}/xdg/menus/applications.menu" "%{?buildroot}%{_sysconfdir}/xdg/menus/kde-applications.menu"
-%endif
-
-# Makes 'default.kde' theme an alternative with 'crystalsvg-updated'
-%__rm -f "%{?buildroot}%{tde_datadir}/icons/default.kde"
-%__ln_s "%{_sysconfdir}/alternatives/default.kde" "%{?buildroot}%{tde_datadir}/icons/default.kde"
-%__mkdir_p "%{?buildroot}%{_sysconfdir}/alternatives"
-%__ln_s "%{tde_datadir}/icons/crystalsvg" "%{?buildroot}%{_sysconfdir}/alternatives/default.kde"
-
-
-%clean
-%__rm -rf "%{?buildroot}"
-
-
-%changelog
-* Sat Jan 19 2013 Francois Andriot <francois.andriot@free.fr> - 3.5.13.2-1
-- Initial release for TDE 3.5.13.2
-- 
cgit v1.2.1


From 02d68e6db5ea4dad623e5042e808cca9624a718b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Andriot?= <albator78@libertysurf.fr>
Date: Fri, 3 Oct 2014 20:03:33 +0200
Subject: RPM packaging: update TQT3

---
 redhat/dependencies/tqt3/assistant-tqt3.desktop |  1 -
 redhat/dependencies/tqt3/designer-tqt3.desktop  |  1 -
 redhat/dependencies/tqt3/linguist-tqt3.desktop  |  1 -
 redhat/dependencies/tqt3/tqassistant.desktop    | 12 ++++
 redhat/dependencies/tqt3/tqdesigner.desktop     | 77 +++++++++++++++++++++++++
 redhat/dependencies/tqt3/tqlinguist.desktop     | 25 ++++++++
 redhat/dependencies/tqt3/tqt3-14.0.0.spec       | 44 +++++++++-----
 redhat/dependencies/tqt3/tqt3config.desktop     |  1 -
 redhat/dependencies/tqt3/tqtconfig.desktop      | 12 ++++
 9 files changed, 155 insertions(+), 19 deletions(-)
 delete mode 120000 redhat/dependencies/tqt3/assistant-tqt3.desktop
 delete mode 120000 redhat/dependencies/tqt3/designer-tqt3.desktop
 delete mode 120000 redhat/dependencies/tqt3/linguist-tqt3.desktop
 create mode 100644 redhat/dependencies/tqt3/tqassistant.desktop
 create mode 100644 redhat/dependencies/tqt3/tqdesigner.desktop
 create mode 100644 redhat/dependencies/tqt3/tqlinguist.desktop
 delete mode 120000 redhat/dependencies/tqt3/tqt3config.desktop
 create mode 100644 redhat/dependencies/tqt3/tqtconfig.desktop

diff --git a/redhat/dependencies/tqt3/assistant-tqt3.desktop b/redhat/dependencies/tqt3/assistant-tqt3.desktop
deleted file mode 120000
index 7cf2e4114..000000000
--- a/redhat/dependencies/tqt3/assistant-tqt3.desktop
+++ /dev/null
@@ -1 +0,0 @@
-../../../ubuntu/trusty/dependencies/tqt3/debian/maintain/assistant-tqt3.desktop
\ No newline at end of file
diff --git a/redhat/dependencies/tqt3/designer-tqt3.desktop b/redhat/dependencies/tqt3/designer-tqt3.desktop
deleted file mode 120000
index 5ca95a1c4..000000000
--- a/redhat/dependencies/tqt3/designer-tqt3.desktop
+++ /dev/null
@@ -1 +0,0 @@
-../../../ubuntu/trusty/dependencies/tqt3/debian/maintain/designer-tqt3.desktop
\ No newline at end of file
diff --git a/redhat/dependencies/tqt3/linguist-tqt3.desktop b/redhat/dependencies/tqt3/linguist-tqt3.desktop
deleted file mode 120000
index 7ad540738..000000000
--- a/redhat/dependencies/tqt3/linguist-tqt3.desktop
+++ /dev/null
@@ -1 +0,0 @@
-../../../ubuntu/trusty/dependencies/tqt3/debian/maintain/linguist-tqt3.desktop
\ No newline at end of file
diff --git a/redhat/dependencies/tqt3/tqassistant.desktop b/redhat/dependencies/tqt3/tqassistant.desktop
new file mode 100644
index 000000000..3b7076fe7
--- /dev/null
+++ b/redhat/dependencies/tqt3/tqassistant.desktop
@@ -0,0 +1,12 @@
+[Desktop Entry]
+Encoding=UTF-8
+Exec=tqassistant
+Name=TQt3 Assistant
+Name[de]=TQt3 Assistent
+Comment=TQt3 Helpcenter
+Comment[de]= TQt3 Hilfezentrum
+MimeType=application/x-assistant;
+Icon=tqassistant
+Terminal=false
+Type=Application
+Categories=Qt;Development;
diff --git a/redhat/dependencies/tqt3/tqdesigner.desktop b/redhat/dependencies/tqt3/tqdesigner.desktop
new file mode 100644
index 000000000..172be103f
--- /dev/null
+++ b/redhat/dependencies/tqt3/tqdesigner.desktop
@@ -0,0 +1,77 @@
+[Desktop Entry]
+Encoding=UTF-8
+Exec=tqdesigner
+Name=TQt3 Designer
+Name[bg]=TQt3 Дизайнер
+Name[br]=Ergrafer TQt3
+Name[ca]=Dissenyador TQt3
+Name[cs]=TQt3 designer
+Name[de]=TQt3-Designer
+Name[eo]=TQt3-Desegnilo
+Name[es]=Diseñador TQt3
+Name[et]=TQt3 disainer
+Name[eu]=TQt3 Diseinatzailea
+Name[gl]=Deseñador de TQt3
+Name[he]=TQt3 בצעמ
+Name[it]=Designer TQt3
+Name[ja]=TQt3デザイナー
+Name[ko]=TQt3 디자이너
+Name[lv]=TQt3 Dizainers
+Name[mk]=TQt3 дизајнер
+Name[no]=TQt3-designer
+Name[oc]=Dessinador TQt3
+Name[pl]=Projektant TQt3
+Name[sk]=TQt3 Dizajnér
+Name[sl]=Snovalnik TQt3
+Name[ta]=TQt3 À¨¼ôÀ¡Ç÷
+Name[uk]=Дизайнер TQt3
+Name[zh_CN.GB2312]=TQt3 设计者
+Name[zh_TW.Big5]=TQt3 設計器
+Comment=TQt3 interface designer
+Comment[az]=TQt3 axtar üz dizayn proqramı
+Comment[bg]=TQt3 interface дизайнер
+Comment[br]=Ergrafer etrefas TQt3
+Comment[ca]=Dissenyador d'interfícies TQt3
+Comment[cs]=Editor UI pro TQt3
+Comment[da]=TQt3 grænseflade designer
+Comment[de]=Schnittstellen-Designer für TQt3
+Comment[el]=Σχεδιασμός περιβάλλοντων TQt3
+Comment[eo]=TQt3-Interfacdesegnilo
+Comment[es]=Diseñador de interfaces de TQt3
+Comment[et]=TQt3 dialoogide redaktor
+Comment[eu]=TQt3 interfaze diseinatzailea
+Comment[fi]=TQt3:n käyttöliittymäsuunnittelija
+Comment[fr]=Conception d'interfaces avec TQt3
+Comment[gl]=Editor de interfaces de TQt3
+Comment[he]=TQt3-ל םיקשממ בצעמ
+Comment[hu]=TQt3 felülettervező
+Comment[is]=Viðmótshönnunartól fyrir TQt3
+Comment[it]=Editor per le interfaccie TQt3
+Comment[ja]=TQt3インターフェースデザイナー
+Comment[ko]=TQt3 인터페이스 디자이너
+Comment[lt]=TQt3 sąsajos redaktorius
+Comment[lv]=TQt3 starsejas dizainers
+Comment[mk]=Дизајнер на TQt3 дијалози
+Comment[nl]=TQt3 interface-ontwerper
+Comment[no]=TQt3-grensesnittdesigner
+Comment[no_NY]=Redigering av TQt3-miljø
+Comment[oc]=Dessinador d'interfacies TQt3
+Comment[pl]=Projektant interfejsu TQt3
+Comment[pt]=Editor de interfaces do TQt3
+Comment[pt_BR]=Designer de interface TQt3
+Comment[ro]=Dezvoltator de interfeţe TQt3
+Comment[ru]=редактор интерфейсов приложений TQt3
+Comment[sk]=TQt3 dizajnér rozhrania
+Comment[sl]=Snovalnik vmesnikov za TQt3
+Comment[sr]=Dizajner TQt3 interfejsa
+Comment[sv]=Editor för gränssnitt till TQt3
+Comment[ta]=TQt3 À¨¼ôÀ¡Ç÷
+Comment[tr]=TQt3 arayüz tasarım programı
+Comment[uk]=Редактор інтерфейсу для TQt3
+Comment[zh_CN.GB2312]=TQt3 界面设计程序
+Comment[zh_TW.Big5]=TQt3 介面編輯器
+MimeType=application/x-designer;
+Icon=tqdesigner
+Terminal=false
+Type=Application
+Categories=Qt;Development;
diff --git a/redhat/dependencies/tqt3/tqlinguist.desktop b/redhat/dependencies/tqt3/tqlinguist.desktop
new file mode 100644
index 000000000..f07db29aa
--- /dev/null
+++ b/redhat/dependencies/tqt3/tqlinguist.desktop
@@ -0,0 +1,25 @@
+[Desktop Entry]
+Exec=tqlinguist
+Name=TQt3 Linguist
+Name[de]=TQt3-Linguist
+Name[eo]=TQt3-Lingvisto
+Name[es]=Lingüista TQt3
+Name[ko]=TQt3 언어학자
+Name[lv]=TQt3 Lingvists
+Comment=Tool for translating message catalogues of TQt3 based programs
+Comment[da]=Redskab til at oversætte TQt3 baserede programmer
+Comment[de]=Dienstprogramm zur Übersetzung von Programmen, die auf TQt3 basieren
+Comment[eo]=Ilo por tradukado de mesaĝaroj de TQt3-bazitaj programoj
+Comment[es]=Herramienta para la traducción de catálogos de mensajes de programas basados en TQt3
+Comment[he]=TQt3 תוססובמ תוינכות לש תועדוה יגולטק םוגרתל ילכ
+Comment[hu]=Segédprogram a TQt3-alapú programok üzenetfájljainak lefordításához
+Comment[ko]=TQt3를 바탕으로 하는 프로그램에서 쓸 번역된 메세지 목록을 관리하는 도구
+Comment[lv]=Rīks ziņojumu katalogu tulkošanai uz TQt3 bāzētās programmās
+Comment[pt]=Ferramenta para traduzir os catálogos de mensagens de programas do TQt3
+Comment[pt_BR]=Ferramenta para traduzir os catálogos de mensagens de programas do TQt3
+Comment[sv]=Verktyg för att översätta meddelandekataloger från TQt3-baserade program
+MimeType=application/x-linguist;
+Terminal=false
+Icon=tqlinguist
+Type=Application
+Categories=Qt;Development
diff --git a/redhat/dependencies/tqt3/tqt3-14.0.0.spec b/redhat/dependencies/tqt3/tqt3-14.0.0.spec
index 4cc81241a..ee69c314e 100644
--- a/redhat/dependencies/tqt3/tqt3-14.0.0.spec
+++ b/redhat/dependencies/tqt3/tqt3-14.0.0.spec
@@ -45,11 +45,15 @@ Prefix:		/usr
 BuildRoot:	%{_tmppath}/%{name}-%{tde_version}-%{release}-root-%(%{__id_u} -n)
 
 Source0:	%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-Source1:	assistant-tqt3.desktop
-Source2:	designer-tqt3.desktop
-Source3:	linguist-tqt3.desktop
-Source4:	tqt3config.desktop
-Source5:	build-examples.sh
+Source1:	build-examples.sh
+
+Source11:	tqassistant.desktop
+Source12:	tqdesigner.desktop
+Source13:	tqlinguist.desktop
+Source14:	tqtconfig.desktop
+
+Source22:	tqdesigner.png
+Source23:	tqlinguist.png
 
 BuildRequires: desktop-file-utils
 BuildRequires: libmng-devel
@@ -1012,7 +1016,6 @@ or automake.
 %{_libdir}/tqt3/plugins/designer/libkdevdlgplugin.so
 %{_libdir}/tqt3/plugins/designer/librcplugin.so
 %{_libdir}/tqt3/plugins/designer/libwizards.so
-#{_datadir}/applications/designer-tqt3.desktop
 %dir %{_datadir}/tqt3/tools/tqtconv2ui
 %{_datadir}/tqt3/tools/tqtconv2ui/main.cpp
 %{_datadir}/tqt3/tools/tqtconv2ui/tqtconv2ui.pro
@@ -1020,7 +1023,8 @@ or automake.
 %{_datadir}/tqt3/tools/tqtcreatecw/README
 %{_datadir}/tqt3/tools/tqtcreatecw/main.cpp
 %{_datadir}/tqt3/tools/tqtcreatecw/tqtcreatecw.pro
-
+%{_datadir}/applications/tqdesigner.desktop
+%{_datadir}/icons/hicolor/32x32/apps/tqdesigner.png
 
 ###########
 
@@ -1083,9 +1087,10 @@ development files by the translator.
 %{_datadir}/tqt3/phrasebooks/*
 %{_datadir}/tqt3/doc/html/linguist*html
 %{_datadir}/tqt3/doc/html/linguist*dcf
-#{_datadir}/applications/linguist-tqt3.desktop
 %dir %{_docdir}/tqt3-linguist
 %{_docdir}/tqt3-linguist/qt_untranslated.ts
+%{_datadir}/applications/tqlinguist.desktop
+%{_datadir}/icons/hicolor/32x32/apps/tqlinguist.png
 
 ##########
 
@@ -1109,9 +1114,11 @@ the package tqt3-apps-devel.
 %files -n tqt3-assistant
 %defattr(-,root,root,-)
 %{_bindir}/tqassistant
-#{_datadir}/applications/assistant-tqt3.desktop
+%{_datadir}/icons/hicolor/32x32/apps/tqassistant.png
 %{_datadir}/tqt3/doc/html/assistant*html
 %{_datadir}/tqt3/doc/html/assistant*dcf
+%{_datadir}/applications/tqassistant.desktop
+%{_datadir}/icons/hicolor/32x32/apps/tqassistant.png
 
 ##########
 
@@ -1132,7 +1139,8 @@ install this package.
 %files -n tqt3-qtconfig
 %defattr(-,root,root,-)
 %{_bindir}/tqtconfig
-#{_datadir}/applications/tqt3config.desktop
+%{_datadir}/applications/tqtconfig.desktop
+%{_datadir}/icons/hicolor/32x32/apps/tqtconfig.png
 
 ###########
 
@@ -1465,10 +1473,16 @@ for i in designer/designer assistant linguist/linguist; do
 done
 
 # desktop lnk files
-#install -m644 -D "%{SOURCE1}" "%{?buildroot}%{_datadir}/applications/assistant-tqt3.desktop"
-#install -m644 -D "%{SOURCE2}" "%{?buildroot}%{_datadir}/applications/designer-tqt3.desktop"
-#install -m644 -D "%{SOURCE3}" "%{?buildroot}%{_datadir}/applications/linguist-tqt3.desktop"
-#install -m644 -D "%{SOURCE4}" "%{?buildroot}%{_datadir}/applications/tqt3config.desktop"
+%__install -m644 -D "%{SOURCE11}" "%{?buildroot}%{_datadir}/applications/tqassistant.desktop"
+%__install -m644 -D "%{SOURCE12}" "%{?buildroot}%{_datadir}/applications/tqdesigner.desktop"
+%__install -m644 -D "%{SOURCE13}" "%{?buildroot}%{_datadir}/applications/tqlinguist.desktop"
+%__install -m644 -D "%{SOURCE14}" "%{?buildroot}%{_datadir}/applications/tqtconfig.desktop"
+
+# Install applications icons
+%__install -m644 -D "tools/assistant/images/appicon.png" "%{?buildroot}%{_datadir}/icons/hicolor/32x32/apps/tqassistant.png"
+%__install -m644 -D "tools/designer/designer/images/designer_appicon.png" "%{?buildroot}%{_datadir}/icons/hicolor/32x32/apps/tqdesigner.png"
+%__install -m644 -D "tools/linguist/linguist/images/appicon.png" "%{?buildroot}%{_datadir}/icons/hicolor/32x32/apps/tqlinguist.png"
+%__install -m644 -D "tools/qtconfig/images/appicon.png" "%{?buildroot}%{_datadir}/icons/hicolor/32x32/apps/tqtconfig.png"
 
 # build attic package and copy it to tqt3-compat-headers
 pushd src
@@ -1507,7 +1521,7 @@ find tqt3-examples -name "tt3" -print | xargs rm -rf
 find tqt3-examples -name ".moc" | xargs rm -rf
 find tqt3-examples -name ".obj" | xargs rm -rf
 find tqt3-examples -name "Makefile" | xargs rm -rf
-install -D -m 755 %{SOURCE5} %{?buildroot}%{_docdir}/tqt3-examples/build-examples
+install -D -m 755 %{SOURCE1} %{?buildroot}%{_docdir}/tqt3-examples/build-examples
 tar cvvfz tqt3-examples.tar.gz tqt3-examples/
 install -D -m644  tqt3-examples.tar.gz %{?buildroot}%{_docdir}/tqt3-examples/tqt3-examples.tar.gz
 
diff --git a/redhat/dependencies/tqt3/tqt3config.desktop b/redhat/dependencies/tqt3/tqt3config.desktop
deleted file mode 120000
index 01b50805b..000000000
--- a/redhat/dependencies/tqt3/tqt3config.desktop
+++ /dev/null
@@ -1 +0,0 @@
-../../../ubuntu/trusty/dependencies/tqt3/debian/maintain/tqt3config.desktop
\ No newline at end of file
diff --git a/redhat/dependencies/tqt3/tqtconfig.desktop b/redhat/dependencies/tqt3/tqtconfig.desktop
new file mode 100644
index 000000000..fcce2eda1
--- /dev/null
+++ b/redhat/dependencies/tqt3/tqtconfig.desktop
@@ -0,0 +1,12 @@
+[Desktop Entry]
+Encoding=UTF-8
+Exec=tqtconfig
+Name=TQt3 Configuration
+Name[de]=TQt3 Konfiguration
+Comment=A graphical configuration tool for programs using TQt 3
+Comment[de]=Ein grafisches Konfigurationstool für TQt3-Programme
+MimeType=application/x-qtconfig;
+Terminal=false
+Icon=tqtconfig
+Type=Application
+Categories=Qt;Settings;
-- 
cgit v1.2.1


From 98fe68715898e58e8eee1e415a5834a83531cd18 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Andriot?= <albator78@libertysurf.fr>
Date: Fri, 3 Oct 2014 20:26:57 +0200
Subject: RPM Packaging: update tqt3

---
 redhat/dependencies/tqt3/tqt3-14.0.0.spec | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/redhat/dependencies/tqt3/tqt3-14.0.0.spec b/redhat/dependencies/tqt3/tqt3-14.0.0.spec
index ee69c314e..c284c9872 100644
--- a/redhat/dependencies/tqt3/tqt3-14.0.0.spec
+++ b/redhat/dependencies/tqt3/tqt3-14.0.0.spec
@@ -52,9 +52,6 @@ Source12:	tqdesigner.desktop
 Source13:	tqlinguist.desktop
 Source14:	tqtconfig.desktop
 
-Source22:	tqdesigner.png
-Source23:	tqlinguist.png
-
 BuildRequires: desktop-file-utils
 BuildRequires: libmng-devel
 BuildRequires: glibc-devel
-- 
cgit v1.2.1


From 4e2da6f4fa02537aa129ff3a826e5084962fc877 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Andriot?= <albator78@libertysurf.fr>
Date: Fri, 3 Oct 2014 22:02:16 +0200
Subject: RPM Packaging: update TQT3

---
 redhat/dependencies/tqt3/tqassistant.desktop | 1 +
 redhat/dependencies/tqt3/tqdesigner.desktop  | 1 +
 redhat/dependencies/tqt3/tqlinguist.desktop  | 1 +
 redhat/dependencies/tqt3/tqt3-14.0.0.spec    | 9 ++++++++-
 redhat/dependencies/tqt3/tqtconfig.desktop   | 1 +
 5 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/redhat/dependencies/tqt3/tqassistant.desktop b/redhat/dependencies/tqt3/tqassistant.desktop
index 3b7076fe7..c178007d8 100644
--- a/redhat/dependencies/tqt3/tqassistant.desktop
+++ b/redhat/dependencies/tqt3/tqassistant.desktop
@@ -3,6 +3,7 @@ Encoding=UTF-8
 Exec=tqassistant
 Name=TQt3 Assistant
 Name[de]=TQt3 Assistent
+GenericName=Document Browser
 Comment=TQt3 Helpcenter
 Comment[de]= TQt3 Hilfezentrum
 MimeType=application/x-assistant;
diff --git a/redhat/dependencies/tqt3/tqdesigner.desktop b/redhat/dependencies/tqt3/tqdesigner.desktop
index 172be103f..2152b777b 100644
--- a/redhat/dependencies/tqt3/tqdesigner.desktop
+++ b/redhat/dependencies/tqt3/tqdesigner.desktop
@@ -27,6 +27,7 @@ Name[ta]=TQt3 À¨¼ôÀ¡Ç÷
 Name[uk]=Дизайнер TQt3
 Name[zh_CN.GB2312]=TQt3 设计者
 Name[zh_TW.Big5]=TQt3 設計器
+GenericName=Interface Designer
 Comment=TQt3 interface designer
 Comment[az]=TQt3 axtar üz dizayn proqramı
 Comment[bg]=TQt3 interface дизайнер
diff --git a/redhat/dependencies/tqt3/tqlinguist.desktop b/redhat/dependencies/tqt3/tqlinguist.desktop
index f07db29aa..6cbbe713d 100644
--- a/redhat/dependencies/tqt3/tqlinguist.desktop
+++ b/redhat/dependencies/tqt3/tqlinguist.desktop
@@ -6,6 +6,7 @@ Name[eo]=TQt3-Lingvisto
 Name[es]=Lingüista TQt3
 Name[ko]=TQt3 언어학자
 Name[lv]=TQt3 Lingvists
+GenericName=Translation Tool
 Comment=Tool for translating message catalogues of TQt3 based programs
 Comment[da]=Redskab til at oversætte TQt3 baserede programmer
 Comment[de]=Dienstprogramm zur Übersetzung von Programmen, die auf TQt3 basieren
diff --git a/redhat/dependencies/tqt3/tqt3-14.0.0.spec b/redhat/dependencies/tqt3/tqt3-14.0.0.spec
index c284c9872..723bf83af 100644
--- a/redhat/dependencies/tqt3/tqt3-14.0.0.spec
+++ b/redhat/dependencies/tqt3/tqt3-14.0.0.spec
@@ -1475,6 +1475,13 @@ done
 %__install -m644 -D "%{SOURCE13}" "%{?buildroot}%{_datadir}/applications/tqlinguist.desktop"
 %__install -m644 -D "%{SOURCE14}" "%{?buildroot}%{_datadir}/applications/tqtconfig.desktop"
 
+%if 0%{?suse_version}
+%suse_update_desktop_file tqassistant
+%suse_update_desktop_file tqdesigner
+%suse_update_desktop_file tqlinguist
+%suse_update_desktop_file tqtconfig
+%endif
+
 # Install applications icons
 %__install -m644 -D "tools/assistant/images/appicon.png" "%{?buildroot}%{_datadir}/icons/hicolor/32x32/apps/tqassistant.png"
 %__install -m644 -D "tools/designer/designer/images/designer_appicon.png" "%{?buildroot}%{_datadir}/icons/hicolor/32x32/apps/tqdesigner.png"
@@ -1484,7 +1491,7 @@ done
 # build attic package and copy it to tqt3-compat-headers
 pushd src
 tar cvvfz attic.tar.gz attic/
-install -D -m644 attic.tar.gz %{?buildroot}%{_docdir}/tqt3-compat-headers/attic.tar.gz
+install -D -m644 "attic.tar.gz" "%{?buildroot}%{_docdir}/tqt3-compat-headers/attic.tar.gz"
 popd
 
 # install the man pages
diff --git a/redhat/dependencies/tqt3/tqtconfig.desktop b/redhat/dependencies/tqt3/tqtconfig.desktop
index fcce2eda1..d20d2191d 100644
--- a/redhat/dependencies/tqt3/tqtconfig.desktop
+++ b/redhat/dependencies/tqt3/tqtconfig.desktop
@@ -3,6 +3,7 @@ Encoding=UTF-8
 Exec=tqtconfig
 Name=TQt3 Configuration
 Name[de]=TQt3 Konfiguration
+GenericName=Configuration Utility
 Comment=A graphical configuration tool for programs using TQt 3
 Comment[de]=Ein grafisches Konfigurationstool für TQt3-Programme
 MimeType=application/x-qtconfig;
-- 
cgit v1.2.1


From c64029af7aba4d885977f5d9aab2b5c5536d5c9f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Andriot?= <albator78@libertysurf.fr>
Date: Fri, 3 Oct 2014 22:03:08 +0200
Subject: RPM Packaging: update kopete-otr

---
 redhat/applications/kopete-otr/kopete-otr-14.0.0.spec | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/redhat/applications/kopete-otr/kopete-otr-14.0.0.spec b/redhat/applications/kopete-otr/kopete-otr-14.0.0.spec
index 835c6b649..854bd79c9 100644
--- a/redhat/applications/kopete-otr/kopete-otr-14.0.0.spec
+++ b/redhat/applications/kopete-otr/kopete-otr-14.0.0.spec
@@ -54,13 +54,11 @@ BuildRequires:	desktop-file-utils
 
 BuildRequires:	trinity-tdenetwork-devel >= %{tde_version}
 
-# Kopete is provided by kdenetwork
+# Kopete is provided by tdenetwork
 Requires:		trinity-kopete >= %{tde_version}
-%if 0%{?suse_version} >= 1230
-BuildRequires:	libotr2-devel
-%else
+
+# OTR support
 BuildRequires:	libotr-devel
-%endif
 
 %description
 This plugin enables Off-The-Record encryption for the TDE instant
@@ -102,7 +100,7 @@ export PATH="%{tde_bindir}:${PATH}"
   --enable-rpath \
   --disable-gcc-hidden-visibility
 
-%__make %{_smp_mflags}
+%__make %{_smp_mflags} || %__make
 
 
 %install
-- 
cgit v1.2.1


From e6514292cef38549a22e8bd792663ad5c9b31567 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Andriot?= <albator78@libertysurf.fr>
Date: Fri, 3 Oct 2014 22:08:25 +0200
Subject: RPM Packaging: update some packages

---
 redhat/applications/krusader/krusader-3.5.13.2.spec   |  3 ++-
 redhat/applications/tork/tork-14.0.0.spec             |  1 +
 redhat/dependencies/arts/arts-14.0.0.spec             | 15 +++++++--------
 redhat/tde-i18n/tde-i18n-14.0.0.spec                  | 11 ++---------
 redhat/tdebase/tdebase-14.0.0-default_menu_icon.patch |  4 ++--
 redhat/tdebindings/tdebindings-14.0.0.spec            |  1 -
 redhat/tdeedu/tdeedu-14.0.0.spec                      |  1 -
 redhat/tdenetwork/tdenetwork-14.0.0.spec              |  2 +-
 redhat/tdeutils/tdeutils-14.0.0.spec                  |  4 ++--
 redhat/tdewebdev/tdewebdev-14.0.0.spec                |  9 +--------
 10 files changed, 18 insertions(+), 33 deletions(-)

diff --git a/redhat/applications/krusader/krusader-3.5.13.2.spec b/redhat/applications/krusader/krusader-3.5.13.2.spec
index a5e2f7623..22728025c 100644
--- a/redhat/applications/krusader/krusader-3.5.13.2.spec
+++ b/redhat/applications/krusader/krusader-3.5.13.2.spec
@@ -87,7 +87,8 @@ great on your desktop.
 
 
 %build
-unset QTDIR; . /etc/profile.d/qt3.sh
+unset QTDIR QTINC QTLIB
+. /etc/profile.d/qt3.sh
 export PATH="%{tde_bindir}:${PATH}"
 
 # Warning: --enable-final causes FTBFS
diff --git a/redhat/applications/tork/tork-14.0.0.spec b/redhat/applications/tork/tork-14.0.0.spec
index 35595c05c..a750ee4e4 100644
--- a/redhat/applications/tork/tork-14.0.0.spec
+++ b/redhat/applications/tork/tork-14.0.0.spec
@@ -114,6 +114,7 @@ done
 %doc AUTHORS COPYING README TODO ChangeLog USINGTORK
 %{tde_bindir}/tork
 %{tde_bindir}/torkarkollon
+%{tde_bindir}/usewithtor
 %{tde_tdeappdir}/tork.desktop
 %{tde_datadir}/apps/konqueror/servicemenus/tork_downloadwithfirefox.desktop
 %{tde_datadir}/apps/konqueror/servicemenus/tork_downloadwithkonqueror.desktop
diff --git a/redhat/dependencies/arts/arts-14.0.0.spec b/redhat/dependencies/arts/arts-14.0.0.spec
index 0afd17efd..1f7408f49 100644
--- a/redhat/dependencies/arts/arts-14.0.0.spec
+++ b/redhat/dependencies/arts/arts-14.0.0.spec
@@ -15,11 +15,6 @@
 # Please submit bugfixes or comments via http:/www.trinitydesktop.org/
 #
 
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?tde_prefix}" != "/usr"
-%define _variant .opt
-%endif
-
 # TDE variables
 %define tde_version 14.0.0
 %define tde_prefix /opt/trinity
@@ -27,13 +22,17 @@
 %define tde_includedir %{tde_prefix}/include
 %define tde_libdir %{tde_prefix}/%{_lib}
 %define tde_datadir %{tde_prefix}/share
-
 %define tde_tdeincludedir %{tde_includedir}/tde
-
 %define _docdir %{tde_datadir}/doc
 
+# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
+%if "%{?tde_prefix}" != "/usr"
+%define _variant .opt
+%endif
+
+
 Name:		trinity-arts
-Epoch:		1
+Epoch:		2
 Version:	1.5.10
 Release:	%{?!preversion:2}%{?preversion:1_%{preversion}}%{?dist}%{?_variant}
 Summary:	ARTS (analog realtime synthesizer) - the TDE sound system
diff --git a/redhat/tde-i18n/tde-i18n-14.0.0.spec b/redhat/tde-i18n/tde-i18n-14.0.0.spec
index ed153b693..47129a3c7 100644
--- a/redhat/tde-i18n/tde-i18n-14.0.0.spec
+++ b/redhat/tde-i18n/tde-i18n-14.0.0.spec
@@ -47,14 +47,11 @@ AutoReq: no
 
 Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
 
-# Main patch: lots of updates for TDE R14.0.0
-Patch1:		tde-i18n-14.0.0-extra_translations.patch
-Patch2:		tde-i18n-14.0.0-updates.patch
+BuildRequires:	trinity-arts-devel >= 1:1.5.10
+BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
 
 BuildRequires:	findutils
 BuildRequires:	gettext
-BuildRequires:	trinity-arts-devel >= 1:1.5.10
-BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
 
 %description
 %{summary}.
@@ -684,10 +681,6 @@ Provides:	 trinity-kde-i18n-Chinese-Big5 = %{version}-%{release}
 %prep
 %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
 
-# Patches for French translations
-%patch1 -p1
-%patch2 -p1
-
 
 %build
 unset QTDIR QTINC QTLIB
diff --git a/redhat/tdebase/tdebase-14.0.0-default_menu_icon.patch b/redhat/tdebase/tdebase-14.0.0-default_menu_icon.patch
index 4aa8bd35a..db8052381 100644
--- a/redhat/tdebase/tdebase-14.0.0-default_menu_icon.patch
+++ b/redhat/tdebase/tdebase-14.0.0-default_menu_icon.patch
@@ -5,10 +5,10 @@
  fi
  
 +# Default Start Button icon for TDE
-+if [ ! -e  $tdehome/share/config/kickerrc ]; then
++if [ ! -e "$tdehome/share/config/kickerrc" ]; then
 +  if [ -r "%{tde_starticon}" ]; then
 +    [ -d "$tdehome/share/config" ] || mkdir -p "$tdehome/share/config"
-+    cat <<EOF >$tdehome/share/config/kickerrc
++    cat <<EOF >"$tdehome/share/config/kickerrc"
 +[KMenu]
 +CustomIcon=%{tde_starticon}
 +EOF
diff --git a/redhat/tdebindings/tdebindings-14.0.0.spec b/redhat/tdebindings/tdebindings-14.0.0.spec
index ecc1090ac..a32f8d1aa 100644
--- a/redhat/tdebindings/tdebindings-14.0.0.spec
+++ b/redhat/tdebindings/tdebindings-14.0.0.spec
@@ -1010,7 +1010,6 @@ exit 1
 %build
 unset QTDIR QTINC QTLIB
 export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
 
 unset JAVA_HOME ||:
 %{?java_home:JAVA_HOME=%{java_home}; export JAVA_HOME}
diff --git a/redhat/tdeedu/tdeedu-14.0.0.spec b/redhat/tdeedu/tdeedu-14.0.0.spec
index 43686086d..bcb387ef5 100644
--- a/redhat/tdeedu/tdeedu-14.0.0.spec
+++ b/redhat/tdeedu/tdeedu-14.0.0.spec
@@ -1321,7 +1321,6 @@ Provides:	trinity-kdeedu-devel = %{version}-%{release}
 %build
 unset QTDIR QTINC QTLIB
 export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
 
 # Specific path for RHEL4
 if [ -d "/usr/X11R6" ]; then
diff --git a/redhat/tdenetwork/tdenetwork-14.0.0.spec b/redhat/tdenetwork/tdenetwork-14.0.0.spec
index c99664674..4f3efc16b 100644
--- a/redhat/tdenetwork/tdenetwork-14.0.0.spec
+++ b/redhat/tdenetwork/tdenetwork-14.0.0.spec
@@ -1107,7 +1107,7 @@ update-desktop-database 2> /dev/null || :
 
 ##########
 
-%if 0%{?suse_version} || 0%{?pclinuxos}
+%if 0%{?pclinuxos}
 %debug_package
 %endif
 
diff --git a/redhat/tdeutils/tdeutils-14.0.0.spec b/redhat/tdeutils/tdeutils-14.0.0.spec
index b68866c50..e7298311e 100644
--- a/redhat/tdeutils/tdeutils-14.0.0.spec
+++ b/redhat/tdeutils/tdeutils-14.0.0.spec
@@ -968,7 +968,7 @@ Development files for %{name}.
 
 ##########
 
-%if 0%{?suse_version} || 0%{?pclinuxos}
+%if 0%{?pclinuxos}
 %debug_package
 %endif
 
@@ -1025,7 +1025,7 @@ fi
   -DWITH_SNMP=ON \
   -DWITH_SENSORS=ON \
   -DWITH_XMMS=ON \
-  -DWITH_KNEWSTUFF=ON \
+  -DWITH_TDENEWSTUFF=ON \
   -DBUILD_ALL=ON \
   %{?!build_klaptopdaemon:-DBUILD_KLAPTOPDAEMON=OFF} \
   ..
diff --git a/redhat/tdewebdev/tdewebdev-14.0.0.spec b/redhat/tdewebdev/tdewebdev-14.0.0.spec
index cc00be441..6da94dfe9 100644
--- a/redhat/tdewebdev/tdewebdev-14.0.0.spec
+++ b/redhat/tdewebdev/tdewebdev-14.0.0.spec
@@ -41,9 +41,6 @@ Source3:	http://download.sourceforge.net/quanta/php_manual_en_20030401.tar.bz2
 Source4:	http://download.sourceforge.net/quanta/javascript.tar.bz2
 Source5:	hi48-app-kxsldbg.png
 
-Patch0:		tdewebdev-14.0.0-ftbfs.patch
-Patch1:		kdewebdev-3.5.4-kxsldbg-icons.patch
-
 BuildRequires:	autoconf automake libtool m4
 BuildRequires:	desktop-file-utils
 BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
@@ -491,9 +488,6 @@ Requires:	trinity-kommander-devel = %{version}-%{release}
 
 %prep
 %setup -q -n %{name}-%{version}%{?preversion:~%{preversion}} -a 1 -a 2 -a 3 -a 4
-%patch0 -p1 -b .ftbfs
-%patch1 -p1 -b .kxsldbg-icons
-rm -rf lib/compatibility
 
 %__install -m644 -p %{SOURCE5} kxsldbg/
 %if 0%{?build_kxsldbg} == 0
@@ -508,11 +502,10 @@ rm -rf lib/compatibility
 %build
 unset QTDIR QTINC QTLIB
 export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
 
 # Specific path for RHEL4
 if [ -d "/usr/X11R6" ]; then
-  export CXXFLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}"
+  export RPM_OPT_FLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}"
 fi
 
 # Warning: GCC visibility causes FTBFS [Bug #1285]
-- 
cgit v1.2.1


From 7b7982286c26e1d2464e4be9adeb03f27f984238 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Andriot?= <albator78@libertysurf.fr>
Date: Fri, 3 Oct 2014 22:17:49 +0200
Subject: RPM Packaging: update tde-i18n

---
 redhat/Makefile.r14                                |    2 +-
 .../applications/bibletime/bibletime-14.0.0.spec   |    4 +-
 redhat/build/build_rpm_package.sh                  |   27 +-
 redhat/build/get_rpm_package_name.sh               |    1 +
 .../kde-i18n-3.5.13-add_french_translations.patch  | 1113 --------------------
 redhat/tde-i18n/kde-i18n-kdesu.patch               |   45 -
 redhat/tde-i18n/kde-i18n-zh_TW-3.5.10.patch.gz     |  Bin 1335843 -> 0 bytes
 redhat/tde-i18n/tde-i18n-3.5.13.2.spec             |   28 -
 .../trinity-kde-i18n-fr-openterminalhere.patch     |   16 -
 .../trinity-tde-i18n-fr-3.5.13.2-updates.patch     |  578 ----------
 redhat/tdegames/tdegames-14.0.0.spec               |    2 +-
 11 files changed, 31 insertions(+), 1785 deletions(-)
 delete mode 100644 redhat/tde-i18n/kde-i18n-3.5.13-add_french_translations.patch
 delete mode 100644 redhat/tde-i18n/kde-i18n-kdesu.patch
 delete mode 100644 redhat/tde-i18n/kde-i18n-zh_TW-3.5.10.patch.gz
 delete mode 100644 redhat/tde-i18n/trinity-kde-i18n-fr-openterminalhere.patch
 delete mode 100644 redhat/tde-i18n/trinity-tde-i18n-fr-3.5.13.2-updates.patch

diff --git a/redhat/Makefile.r14 b/redhat/Makefile.r14
index f7ea7839f..705f98633 100644
--- a/redhat/Makefile.r14
+++ b/redhat/Makefile.r14
@@ -199,7 +199,7 @@ ifneq ($(wildcard /boot/vmlinuz*.el6*),)
 endif
 
 m4:
-# Build on CentOS 5 only (vendor-provided Poppler is too old)
+# Build on CentOS 5 only (vendor-provided m4 is too old)
 ifneq ($(wildcard /boot/vmlinuz*.el5*),)
 	$(call buildpkg,3rdparty/m4)
 endif
diff --git a/redhat/applications/bibletime/bibletime-14.0.0.spec b/redhat/applications/bibletime/bibletime-14.0.0.spec
index 02b0f8a64..0fd3639ec 100644
--- a/redhat/applications/bibletime/bibletime-14.0.0.spec
+++ b/redhat/applications/bibletime/bibletime-14.0.0.spec
@@ -26,7 +26,7 @@
 Name:			trinity-%{tde_pkg}
 Summary:		A bible study tool for Trinity
 Version:		1.6.6.0
-Release:		%{?!preversion:7}%{?preversion:6_%{preversion}}%{?dist}%{?_variant}
+Release:		%{?!preversion:8}%{?preversion:7_%{preversion}}%{?dist}%{?_variant}
 
 License:		GPLv2+
 Group:			Applications/Utilities
@@ -102,7 +102,7 @@ export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}"
   --enable-rpath \
   --disable-gcc-hidden-visibility \
   \
-%if 0%{?fedora} >= 20 || 0%{?pclinuxos} || 0%{?rhel} >= 7
+%if 0%{?pclinuxos} || 0%{?rhel} >= 7
   --with-sword-dir=%{tde_prefix}
 %endif
 
diff --git a/redhat/build/build_rpm_package.sh b/redhat/build/build_rpm_package.sh
index cd8bb1662..b927b8a0f 100755
--- a/redhat/build/build_rpm_package.sh
+++ b/redhat/build/build_rpm_package.sh
@@ -21,6 +21,29 @@ LOGFILE=/tmp/log.${COMP##*/}
 TEMPDIR="$(mktemp -d)"
 cp -f ${SPECFILE} ${SOURCES} ${TARBALL} "${TEMPDIR}"
 
+# Check if there are patches
+PATCHDIR="${SPECFILE%/*}/patches/${TDE_VERSION}"
+PATCHLIST="${PATCHDIR}/patches"
+if [ -r "${PATCHLIST}" ]; then
+  while read l; do
+    case "${l}" in
+      ""|"#"*);;
+      *)
+        if [ -r "${PATCHDIR}/${l}" ]; then
+          echo "Applying patch '${l}'..."
+          cat "${PATCHDIR}/${l}" >>"${TEMPDIR}/one.patch"
+        fi
+      ;;
+    esac
+  done < "${PATCHLIST}"
+fi
+
+if [ -r "${TEMPDIR}/one.patch" ]; then
+  sed -i "${TEMPDIR}/"*.spec \
+      -e "/^Source0:/ s/$/\nPatch0: one.patch/" \
+      -e "/%setup/ s/$/\n%patch0 -p1 -b .orig/"
+fi
+
 # Determines if we are running an i386 or x86_64 distro
 if [ "$(rpm -q --qf '%{arch}\n' kernel | tail -n 1)" = "i686" ]; then
 	ARGS="${ARGS} --target=i686"
@@ -39,11 +62,13 @@ rpmbuild -ba \
   --define "_rpmdir ${RPMDIR}" \
   --define "_srcrpmdir ${SRPMDIR}" \
   --define '_build_create_debug 1' \
+  --define "vendor Trinity\ Desktop" \
+  --define "packager Francois\ Andriot\ <francois.andriot@free.fr>" \
   --define "tde_version ${TDE_VERSION}" \
   --define "tde_prefix /opt/trinity" \
   --define "preversion ${PREVERSION}" \
   ${ARGS} \
-  "${SPECFILE}"
+  "${TEMPDIR}/${SPECFILE##*/}"
 RET=$?
 
 # Removes BUILDDIR if build succeeded
diff --git a/redhat/build/get_rpm_package_name.sh b/redhat/build/get_rpm_package_name.sh
index 2d9309738..0ccdfa036 100755
--- a/redhat/build/get_rpm_package_name.sh
+++ b/redhat/build/get_rpm_package_name.sh
@@ -23,6 +23,7 @@ case "${PKGNAME}" in
   "avahi-tqt") PKGNAME="libavahi-tqt";;
   "dbus-tqt") PKGNAME="libdbus-tqt-1";;
   "dbus-1-tqt") PKGNAME="libdbus-1-tqt";;
+  "libart-lgpl") PKGNAME="libart_lgpl_2-2";;
 esac
 
 # Use the Trinity Prefix, or not.
diff --git a/redhat/tde-i18n/kde-i18n-3.5.13-add_french_translations.patch b/redhat/tde-i18n/kde-i18n-3.5.13-add_french_translations.patch
deleted file mode 100644
index d6fa447dc..000000000
--- a/redhat/tde-i18n/kde-i18n-3.5.13-add_french_translations.patch
+++ /dev/null
@@ -1,1113 +0,0 @@
-diff -Nuar kde-i18n-fr-3.5.10.ORI/messages/kdebase/kcmiccconfig.po kde-i18n-fr-3.5.10.p/messages/kdebase/kcmiccconfig.po
---- kde-i18n-fr-3.5.10.ORI/messages/kdebase/kcmiccconfig.po	1970-01-01 01:00:00.000000000 +0100
-+++ kde-i18n-fr-3.5.10/messages/kdebase/kcmiccconfig.po	2011-12-18 12:12:34.087743324 +0100
-@@ -0,0 +1,76 @@
-+# TDE 3.5.13 'iccconfig.cpp' translation
-+
-+#: iccconfig.cpp:82
-+msgid "<b>The global ICC color profile is a system wide setting, and requires administrator access</b><br>To alter the system's global ICC profile, click on the \"Administrator Mode\" button below."
-+msgstr "<b>Le profil de couleurs ICC global est un réglage système, et nécessite les droits d'administrateur.</b><br>Pour modifier le profil ICC global, cliquez sur le bouton \"Mode administrateur\" ci-dessous."
-+
-+#: iccconfig.cpp:155
-+#: iccconfig.cpp:189
-+msgid "Please enter the new profile name below:"
-+msgstr "Veuillez indiquer le nom du nouveau profil:"
-+
-+#: iccconfig.cpp:159
-+#: iccconfig.cpp:193
-+msgid "ICC Profile Configuration"
-+msgstr "Configuration du profil ICC"
-+
-+#: iccconfig.cpp:166
-+#: iccconfig.cpp:200
-+msgid "Error: A profile with that name already exists"
-+msgstr "Erreur: Il existe déja un profil portant ce nom."
-+
-+#: iccconfig.cpp:406
-+msgid ""
-+"<h1>ICC Profile Configuration</h1> This module allows you to configure KDE support"
-+" for ICC profiles. This allows you to easily color correct your monitor"
-+" for a more lifelike and vibrant image."
-+msgstr ""
-+"<h1>Configuration du profil ICC</h1> Ce module vous permet de configurer le support"
-+" ICC de Trinity. Il permet de calibrer  les couleurs de votre moniteur, "
-+" afin d'obtenir une image plus vivante et plus vibrante."
-+
-+#: iccconfigbase.ui:31
-+msgid "ICC Color Profile Configuration"
-+msgstr "Configuration des profils de couleurs ICC"
-+
-+#: iccconfigbase.ui:42
-+msgid "System Settings"
-+msgstr "Paramètres Système"
-+
-+#: iccconfigbase.ui:53
-+msgid "&Enable global ICC color profile support"
-+msgstr "Activer le profil ICC global"
-+
-+#: iccconfigbase.ui:61
-+#: iccconfigbase.ui:148
-+msgid "*.icc|ICC Standard Color Profiles (*.icc)\n*.icm|Windows(R) Color Profiles (*.icm)"
-+msgstr "*.icc|Profils de couleurs ICC standards (*.icc)\n*.icm|Profils de couleurs Windows(R) (*.icm)"
-+
-+#: iccconfigbase.ui:69
-+#: iccconfigbase.ui:156
-+msgid "ICC File"
-+msgstr "Fichier ICC"
-+
-+#: iccconfigbase.ui:79
-+msgid "User Settings"
-+msgstr "Paramètres Utilisateurs"
-+
-+#: iccconfigbase.ui:90
-+msgid "&Enable user ICC color profile support"
-+msgstr "Activer le profil ICC utilisateur"
-+
-+#: iccconfigbase.ui:103
-+msgid "Current Profile"
-+msgstr "Profil actuel"
-+
-+#: iccconfigbase.ui:111
-+msgid "Create New"
-+msgstr "Créer"
-+
-+#: iccconfigbase.ui:119
-+msgid "Rename"
-+msgstr "Renommer"
-+
-+#: iccconfigbase.ui:140
-+msgid "Settings for output"
-+msgstr "Appliquer à la sortie"
-diff -Nuar kde-i18n-fr-3.5.10.ORI/messages/kdebase/kdesktop.po kde-i18n-fr-3.5.10.p/messages/kdebase/kdesktop.po
---- kde-i18n-fr-3.5.10.ORI/messages/kdebase/kdesktop.po	2008-08-19 20:29:30.000000000 +0200
-+++ kde-i18n-fr-3.5.10/messages/kdebase/kdesktop.po	2011-12-18 18:12:48.482642367 +0100
-@@ -553,6 +553,36 @@
- "</ul>\n"
- "</qt>"
- 
-+# kdesktop/minicli_ui.ui:188
-+msgid "Autocomplete shows available &applications"
-+msgstr "L'autocomplétion affiche les &applications disponibles"
-+
-+# kdesktop/minicli_ui.ui:191
-+msgid ""
-+"<qt>When enabled, the system shows available applications in the autocompletion area."
-+"</qt>"
-+msgstr ""
-+"<qt>Lorsque cette case est cochée, le système affiche les applications "
-+"disponibles dans la zone d'autocomplétion.</qt>"
-+
-+
-+# kdesktop/minicli_ui.ui:200
-+msgid "Autocomplete uses &filesystem instead of history"
-+msgstr "L'autocomplétion utilise le système de &fichiers au lieu de l'historique"
-+
-+# kdesktop/minicli_ui.ui:203
-+msgid ""
-+"<qt>This selects whether the filesystem and the past command history will be used for autocompletion."
-+"</qt>"
-+msgstr ""
-+"<qt>En cochant cette case, l'autocomplétion utilise le système de fichiers à la place  de l'historique."
-+"</qt>"
-+
-+
-+# kdesktop/minicli_ui.ui:212
-+msgid "Autocomplete uses &both history and filesystem"
-+msgstr "L'autocomplétion utilise l'historique &et le système de fichiers"
-+
- #. i18n: file minicli_ui.ui line 199
- #: rc.cpp:14
- #, no-c-format
-@@ -1144,3 +1182,20 @@
- "Cependant, certains écrans de veille\n"
- "       effectuent des calculs utiles, dans ces cas, il est souhaitable de ne "
- "pas les désactiver."
-+
-+### TDE 3.5.13 ###
-+#: lockdlg.cc:109
-+msgid "Desktop Session Locked"
-+msgstr "Session de bureau verrouillée"
-+
-+#: lockdlg.cc:128
-+msgid "This computer is in use and has been locked."
-+msgstr "Cet ordinateur est en cours d'utilisation et a été verrouillé."
-+
-+#: lockdlg.cc:129
-+msgid "Only '%1' may unlock this session."
-+msgstr "Seul '%1' peut déverouiller cette session."
-+
-+#: lockdlg.cc:139
-+msgid "This session has been locked since %1"
-+msgstr "Cette session est verrouillée depuis %1"
-diff -Nuar kde-i18n-fr-3.5.10.ORI/messages/kdebase/kicker.po kde-i18n-fr-3.5.10.p/messages/kdebase/kicker.po
---- kde-i18n-fr-3.5.10.ORI/messages/kdebase/kicker.po	2008-08-19 20:29:30.000000000 +0200
-+++ kde-i18n-fr-3.5.10/messages/kdebase/kicker.po	2011-12-18 20:30:31.365135597 +0100
-@@ -754,3 +754,292 @@
- #, no-c-format
- msgid "Custom size"
- msgstr "Taille personnalisée"
-+
-+### TDE 3.5.13 ###
-+#: panelextension.cpp:385
-+msgid "&Launch Process Manager..."
-+msgstr "Gestionnaire de taches..."
-+
-+## Kickoff menu (k_new_mnu.cpp) 
-+msgid "User&nbsp;<b>%1</b>&nbsp;on&nbsp;<b>%2</b>"
-+msgstr "Utilisateur&nbsp;<b>%1</b>&nbsp;sur&nbsp;<b>%2</b>"
-+
-+msgid "Most commonly used applications and documents"
-+msgstr "Applications et documents utilisés récemment"
-+
-+msgid "Search:"
-+msgstr "Chercher:"
-+
-+msgid "List of installed applications"
-+msgstr "Liste des applications installées"
-+
-+msgid ""
-+"Information and configuration of your "
-+"system, access to personal files, network resources and connected disk drives"
-+msgstr ""
-+"Informations et configuration de votre "
-+"système, accès aux fichiers personnels, ressources réseau et disques connectés"
-+
-+msgid "Recently used applications and documents"
-+msgstr "Applications et documents utilisés récemment"
-+
-+msgid ""
-+"<qt>Logout, switch user, switch off or reset,"
-+" suspend of the system"
-+msgstr ""
-+"<qt>Se déconnecter, changer d'utilisateur, éteindre,"
-+" redémarrer ou interrompre le système"
-+               
-+msgid "<p align=\"center\"> <u>F</u>avorites</p>"
-+msgstr "<p align=\"center\"> <u>F</u>avoris</p>"
-+
-+msgid "<p align=\"center\"><u>H</u>istory</p>"
-+msgstr "<p align=\"center\"><u>H</u>istorique</p>"
-+
-+msgid "<p align=\"center\"> <u>C</u>omputer</p>"
-+msgstr "<p align=\"center\"> <u>O</u>rdinateur</p>"
-+
-+msgid "<p align=\"center\"><u>A</u>pplications</p>"
-+msgstr "<p align=\"center\"><u>A</u>pplications</p>"
-+
-+msgid "<p align=\"center\"><u>L</u>eave</p>"
-+msgstr "<p align=\"center\"><u>Q</u>uitter</p>"
-+
-+msgid "Search Internet"
-+msgstr "Chercher sur Internet"
-+
-+msgid "Search Index"
-+msgstr "Chercher dans l'index"
-+
-+msgid "Applications, Contacts and Documents"
-+msgstr "Applications, Concacts et Documents"
-+
-+msgid "Start '%1'"
-+msgstr "Démarrer '%1'"
-+
-+msgid "Start '%1' (current)"
-+msgstr "Démarrer '%1' (actuel)"
-+
-+msgid "Restart and boot directly into '%1'"
-+msgstr "Redémarrer et amorcer directement '%1'"
-+
-+msgid "Start a parallel session"
-+msgstr "Démarrer une session parallèle"
-+
-+msgid "Switch to Session of User '%1'"
-+msgstr "Basculer vers la session de l'utilisateur '%1'"
-+
-+msgid "Session: %1"
-+msgstr "Session: %1"
-+
-+msgid "New Applications"
-+msgstr "Nouvelles Applications"
-+
-+msgid "Session"
-+msgstr "Session"
-+
-+msgid "Logout"
-+msgstr "Déconnexion"
-+
-+msgid "End session"
-+msgstr "Terminer la session"
-+
-+msgid "Lock"
-+msgstr "Verrouiller"
-+
-+msgid "Lock screen"
-+msgstr "Verrouiller l'écran"
-+
-+msgid "Save current Session for next login"
-+msgstr "Enregistrer la session courante pour la prochaine connexion"
-+
-+msgid "Manage parallel sessions"
-+msgstr "Gérer les sessions parallèles"
-+
-+msgid "System"
-+msgstr "Système"
-+
-+msgid "Shutdown Computer"
-+msgstr "Eteindre l'ordinateur"
-+
-+msgid "Turn off computer"
-+msgstr "Eteindre l'ordinateur"
-+
-+msgid "&Restart Computer"
-+msgstr "&Redémarrer l'ordinateur"
-+
-+msgid "Restart and boot the default system"
-+msgstr "Redémarrer et amorcer le système par défaut"
-+
-+msgid "Start Operating System"
-+msgstr "Démarrer le système d'Exploitation"
-+
-+msgid "Restart and boot another operating system"
-+msgstr "Redémarrer et amorcer un autre système d'exploitation"
-+
-+msgid "System Information"
-+msgstr "Informations Système"
-+
-+msgid "System Folders"
-+msgstr "Dossiers Système"
-+
-+msgid "Home Folder"
-+msgstr "Dossier personnel"
-+
-+msgid "My Documents"
-+msgstr "Mes Documents"
-+
-+msgid "Network Folders"
-+msgstr "Dossiers Réseau"
-+
-+msgid ""
-+"<center><b>%1</b></center>\n"
-+"You do not have permission to execute "
-+"this command."
-+msgstr ""
-+"<center><b>%1</b></center>\n"
-+"Vous n'êst pas autorisé(e) à exécuter "
-+"cette commande."
-+
-+msgid ""
-+"<center><b>%1</b></center>\n"
-+"Could not run the specified command."
-+msgstr ""
-+"<center><b>%1</b></center>\n"
-+"La commande spécifiée n'a pas pu être exécutée."
-+
-+msgid ""
-+"<center><b>%1</b></center>\n"
-+"The specified command does not exist."
-+msgstr ""
-+"<center><b>%1</b></center>\n"
-+"La commande spécifiée n'existe pas."
-+
-+msgid "Documents"
-+msgstr "Documents"
-+
-+msgid "Open Addressbook at %1"
-+msgstr "Ouvrir le carnet d'adresse à %1"
-+
-+msgid "- Add ext:type to specify a file extension."
-+msgstr "- Ajouter ext:type pour indiquer une extension de fichier"
-+
-+msgid "- When searching for a phrase, add quotes."
-+msgstr "- Pour chercher une phrase, ajouter des guillemets."
-+
-+msgid "- To exclude search terms, use the minus symbol in front."
-+msgstr "- Pour exclure des éléments recherchés, utiliser le préfixe moins."
-+
-+msgid "- To search for optional terms, use OR."
-+msgstr "- Pour chercher des termes optionnels, utiliser OR."
-+
-+msgid "- You can use upper and lower case."
-+msgstr "- Vous pouvez écrire en majuscules ou minuscules."
-+
-+msgid "Search Quick Tips"
-+msgstr "Astuces de la recherche rapide"
-+
-+msgid "%1 = %2"
-+msgstr "%1 = %2"
-+
-+msgid "Send Email to %1"
-+msgstr "Envoyer un Email à %1"
-+
-+msgid "Open Local File: %1"
-+msgstr "Ouvrir le fichier local: %1"
-+
-+msgid "Open Local Dir: %1"
-+msgstr "Ouvrir le répertoire local: %1"
-+
-+msgid "Open Remote Location: %1"
-+msgstr "Ouvrir l'emplacement distant: %1"
-+
-+msgid "Run '%1'"
-+msgstr "Exécuter '%1'"
-+
-+msgid "No matches found"
-+msgstr "Aucune correspondance trouvée"
-+
-+msgid "top %1 of %2"
-+msgstr "Haut %1 de %2"
-+
-+msgid "%1 (top %2 of %3)"
-+msgstr "%1 (haut %2 de %3)"
-+
-+msgid "Do you really want to end the session?"
-+msgstr "Voulez-vous vraiment terminer cette session ?"
-+
-+msgid "Logout Confirmation"
-+msgstr "Confirmer la déconnexion"
-+
-+msgid "Do you really want to turn off the computer?"
-+msgstr "Voulez-vous vraiment éteindre l'ordinateur ?"
-+
-+msgid "Shutdown Confirmation"
-+msgstr "Confirmer l'arrêt"
-+
-+msgid "Shutdown"
-+msgstr "Arrêter"
-+
-+msgid "Do you really want to reset the computer and boot (another operating system)?"
-+msgstr "Voulez-vous réellement redémarrer l'ordinateur et amorcer (un autre système d'exploitation) ?"
-+
-+msgid "Restart Confirmation"
-+msgstr "Confirmer le redémarrage"
-+
-+msgid "Restart"
-+msgstr "Redémarrer"
-+
-+msgid "Do you really want to reset the computer and boot Microsoft Windows"
-+msgstr "Voulez-vous réellement redémarrer l'ordinateur et amorcer Windows"
-+
-+msgid "Start Windows Confirmation"
-+msgstr "Confirmer le démarrage de Windows"
-+
-+msgid "Start Windows"
-+msgstr "Démarrer Windows"
-+
-+msgid "Could not start Tomboy."
-+msgstr "Impossible de démarrer Tomboy."
-+
-+msgid "Remove From Favorites"
-+msgstr "Supprimer des favoris"
-+
-+msgid "Add to Favorites"
-+msgstr "Ajouter aux favoris"
-+
-+msgid "Advanced"
-+msgstr "Avancé"
-+
-+msgid "Clear Recently Used Applications"
-+msgstr "Vider la liste d'applications récentes"
-+
-+msgid "Clear Recently Used Documents"
-+msgstr "Vider la liste des documents récents"
-+
-+msgid "Media"
-+msgstr "Media"
-+
-+msgid "(%1 available)"
-+msgstr "(%1 disponible)"
-+
-+msgid "Directory: %1"
-+msgstr "Répertoire: %1"
-+
-+msgid "Suspend Computer"
-+msgstr "Mettre en veille l'ordinateur"
-+
-+msgid "Suspend to Disk"
-+msgstr "Mettre en veille l'ordinateur (sur disque)"
-+
-+msgid "Pause without logging out"
-+msgstr "Mettre en pause sans se déconnecter"
-+
-+msgid "Suspend to RAM"
-+msgstr "Mettre en veille l'ordinateur (en RAM)"
-+
-+msgid "Standby"
-+msgstr "Mettre en veille"
-+
-+msgid "Suspend failed"
-+msgstr "La mise en veille a échoué"
-diff -Nuar kde-i18n-fr-3.5.10.ORI/messages/kdebase/konsole.po kde-i18n-fr-3.5.10.p/messages/kdebase/konsole.po
---- kde-i18n-fr-3.5.10.ORI/messages/kdebase/konsole.po	2008-08-19 20:29:30.000000000 +0200
-+++ kde-i18n-fr-3.5.10/messages/kdebase/konsole.po	2011-12-18 12:12:34.093743256 +0100
-@@ -1475,3 +1475,8 @@
- #: zmodem_dialog.cpp:28
- msgid "&Stop"
- msgstr "A&rrêter"
-+
-+### TDE 3.5.13 ###
-+#: konsole.cpp:736
-+msgid "&Open.."
-+msgstr "Ouvrir.."
-diff -Nuar kde-i18n-fr-3.5.10.ORI/messages/kdebase/krandr.po kde-i18n-fr-3.5.10.p/messages/kdebase/krandr.po
---- kde-i18n-fr-3.5.10.ORI/messages/kdebase/krandr.po	2008-08-19 20:29:30.000000000 +0200
-+++ kde-i18n-fr-3.5.10/messages/kdebase/krandr.po	2011-12-18 12:12:34.094743245 +0100
-@@ -301,3 +301,33 @@
- "_: Refresh rate in Hertz (Hz)\n"
- "%1 Hz"
- msgstr "%1 Hz"
-+
-+### TDE 3.5.13 ###
-+
-+#: krandrtray.cpp:237
-+msgid "Global Configuation"
-+msgstr "Configuration Globale"
-+
-+#: krandrtray.cpp:239
-+msgid "Configure Color Profiles..."
-+msgstr "Configurer les profils de couleurs ..."
-+
-+#: krandrtray.cpp:249
-+msgid "Configure Shortcut Keys..."
-+msgstr "Configurer les raccourcis clavier..."
-+
-+#: krandrtray.cpp:477
-+msgid "Configure Display Color Profiles"
-+msgstr "Configuration des profils de couleurs"
-+
-+#: krandrbindings.cpp:29
-+msgid "Display Control"
-+msgstr "Paramètres d'affichage"
-+
-+#: krandrbindings.cpp:31
-+msgid "Switch Displays"
-+msgstr "Permuter l'affichage"
-+
-+#: configdialog.cpp:49
-+msgid "Global &Shortcuts"
-+msgstr "Raccourcis Globaux"
-diff -Nuar kde-i18n-fr-3.5.10.ORI/messages/kdebase/ksmserver.po kde-i18n-fr-3.5.10.p/messages/kdebase/ksmserver.po
---- kde-i18n-fr-3.5.10.ORI/messages/kdebase/ksmserver.po	2007-05-14 10:07:36.000000000 +0200
-+++ kde-i18n-fr-3.5.10/messages/kdebase/ksmserver.po	2011-12-18 12:12:34.095743233 +0100
-@@ -92,3 +92,14 @@
- "_: current option in boot loader\n"
- " (current)"
- msgstr " (courant)"
-+
-+### TDE 3.5.13 ###
-+
-+#: shutdown.cpp:202
-+msgid "Synchronizing remote folders"
-+msgstr "Synchronisation des dossiers distants"
-+
-+#: shutdown.cpp:207
-+msgid "Saving your settings..."
-+msgstr "Enregistrement de vos paramètres ..."
-+
-diff -Nuar kde-i18n-fr-3.5.10.ORI/messages/kdebase/ksplash.po kde-i18n-fr-3.5.10.p/messages/kdebase/ksplash.po
---- kde-i18n-fr-3.5.10.ORI/messages/kdebase/ksplash.po	2005-09-10 13:02:44.000000000 +0200
-+++ kde-i18n-fr-3.5.10/messages/kdebase/ksplash.po	2011-12-18 12:12:34.095743233 +0100
-@@ -105,5 +105,5 @@
- msgstr "Rétablissement de la session"
- 
- #: themeengine/objkstheme.cpp:135
--msgid "KDE is up and running"
--msgstr "KDE est prêt"
-+msgid "Trinity is up and running"
-+msgstr "Trinity est prêt"
-diff -Nuar kde-i18n-fr-3.5.10.ORI/messages/kdebase/Makefile.in kde-i18n-fr-3.5.10.p/messages/kdebase/Makefile.in
---- kde-i18n-fr-3.5.10.ORI/messages/kdebase/Makefile.in	2008-08-20 09:14:47.000000000 +0200
-+++ kde-i18n-fr-3.5.10/messages/kdebase/Makefile.in	2011-12-18 12:12:34.096743221 +0100
-@@ -192,8 +192,8 @@
- SUBDIRS =.
- #>- POFILES = AUTO
- #>+ 2
--POFILES = kio_sftp.po kate.po kjobviewer.po libkickermenu_konsole.po kcmkicker.po nsplugin.po display.po extensionproxy.po kdcop.po kcmbackground.po kstyle_keramik_config.po kcmlaunch.po kcminfo.po kcmkwinrules.po kasbarextension.po khtmlkttsd.po libdmctl.po ksplashthemes.po kgreet_classic.po kcontrol.po kmenuapplet.po kio_tar.po kcmview1394.po kcmbell.po kcmcomponentchooser.po kdmgreet.po kdesktop.po kpersonalizer.po ksplash.po kcmaccessibility.po kminipagerapplet.po kcmkded.po kio_remote.po kio_home.po kdeprintfax.po kcmicons.po filetypes.po kcmenergy.po kappfinder.po kthememanager.po kcmtaskbar.po kcmcgi.po kio_media.po libkickermenu_tom.po kio_finger.po ktip.po kaccess.po kio_pop3.po kdesud.po kio_fish.po kicker.po kcmkdnssd.po krdb.po libkickermenu_systemmenu.po kcmkio.po krunapplet.po kcmhtmlsearch.po kcmfonts.po libtaskbar.po useraccount.po knetattach.po kcmkonsole.po appletproxy.po dockbarextension.po kcmkonq.po kio_nntp.po kwriteconfig.po kio_ldap.po konsole.po kstart.po klipper.po kcmspellchecking.po kcmkurifilt.po kdepasswd.po clockapplet.po mediaapplet.po kdialog.po kcmlayout.po kpager.po kwin_clients.po kdebugdialog.po kcmnotify.po kio_nfs.po kcmprintmgr.po ksystemtrayapplet.po kcmxinerama.po kreadconfig.po kay.po libkickermenu_remotemenu.po lockout.po kcmkwindecoration.po kxkb.po kprinter.po libtaskmanager.po kio_system.po trashapplet.po kcmcrypto.po kcmnic.po privacy.po libkickermenu_kdeprint.po kscreensaver.po libkonq.po libkickermenu_recentdocs.po kmenuedit.po kio_trash.po kio_floppy.po krandr.po khotkeys.po kcmkclock.po kio_man.po ksystraycmd.po kcmsmartcard.po kwin.po libkicker.po khelpcenter.po ksmserver.po kgreet_winbind.po drkonqi.po kwin_lib.po kio_settings.po ksysguard.po kfontinst.po kcmscreensaver.po konqueror.po kdesu.po kcmsmserver.po kcmcolors.po kcminput.po kcmlocale.po kio_print.po kickermenu_kate.po kcmstyle.po kcmkeys.po kcmioslaveinfo.po kfmclient.po kfindpart.po kio_mac.po kio_smb.po kcmmedia.po naughtyapplet.po kcmkwm.po htmlsearch.po kcmcss.po kcmusb.po kcmperformance.po kio_thumbnail.po kcmarts.po libkickermenu_prefmenu.po joystick.po kdmconfig.po kcmaccess.po kcmkonqhtml.po quicklauncher.po kcmsamba.po kdeprint_part.po kio_smtp.po
--GMOFILES = kio_sftp.gmo kate.gmo kjobviewer.gmo libkickermenu_konsole.gmo kcmkicker.gmo nsplugin.gmo display.gmo extensionproxy.gmo kdcop.gmo kcmbackground.gmo kstyle_keramik_config.gmo kcmlaunch.gmo kcminfo.gmo kcmkwinrules.gmo kasbarextension.gmo khtmlkttsd.gmo libdmctl.gmo ksplashthemes.gmo kgreet_classic.gmo kcontrol.gmo kmenuapplet.gmo kio_tar.gmo kcmview1394.gmo kcmbell.gmo kcmcomponentchooser.gmo kdmgreet.gmo kdesktop.gmo kpersonalizer.gmo ksplash.gmo kcmaccessibility.gmo kminipagerapplet.gmo kcmkded.gmo kio_remote.gmo kio_home.gmo kdeprintfax.gmo kcmicons.gmo filetypes.gmo kcmenergy.gmo kappfinder.gmo kthememanager.gmo kcmtaskbar.gmo kcmcgi.gmo kio_media.gmo libkickermenu_tom.gmo kio_finger.gmo ktip.gmo kaccess.gmo kio_pop3.gmo kdesud.gmo kio_fish.gmo kicker.gmo kcmkdnssd.gmo krdb.gmo libkickermenu_systemmenu.gmo kcmkio.gmo krunapplet.gmo kcmhtmlsearch.gmo kcmfonts.gmo libtaskbar.gmo useraccount.gmo knetattach.gmo kcmkonsole.gmo appletproxy.gmo dockbarextension.gmo kcmkonq.gmo kio_nntp.gmo kwriteconfig.gmo kio_ldap.gmo konsole.gmo kstart.gmo klipper.gmo kcmspellchecking.gmo kcmkurifilt.gmo kdepasswd.gmo clockapplet.gmo mediaapplet.gmo kdialog.gmo kcmlayout.gmo kpager.gmo kwin_clients.gmo kdebugdialog.gmo kcmnotify.gmo kio_nfs.gmo kcmprintmgr.gmo ksystemtrayapplet.gmo kcmxinerama.gmo kreadconfig.gmo kay.gmo libkickermenu_remotemenu.gmo lockout.gmo kcmkwindecoration.gmo kxkb.gmo kprinter.gmo libtaskmanager.gmo kio_system.gmo trashapplet.gmo kcmcrypto.gmo kcmnic.gmo privacy.gmo libkickermenu_kdeprint.gmo kscreensaver.gmo libkonq.gmo libkickermenu_recentdocs.gmo kmenuedit.gmo kio_trash.gmo kio_floppy.gmo krandr.gmo khotkeys.gmo kcmkclock.gmo kio_man.gmo ksystraycmd.gmo kcmsmartcard.gmo kwin.gmo libkicker.gmo khelpcenter.gmo ksmserver.gmo kgreet_winbind.gmo drkonqi.gmo kwin_lib.gmo kio_settings.gmo ksysguard.gmo kfontinst.gmo kcmscreensaver.gmo konqueror.gmo kdesu.gmo kcmsmserver.gmo kcmcolors.gmo kcminput.gmo kcmlocale.gmo kio_print.gmo kickermenu_kate.gmo kcmstyle.gmo kcmkeys.gmo kcmioslaveinfo.gmo kfmclient.gmo kfindpart.gmo kio_mac.gmo kio_smb.gmo kcmmedia.gmo naughtyapplet.gmo kcmkwm.gmo htmlsearch.gmo kcmcss.gmo kcmusb.gmo kcmperformance.gmo kio_thumbnail.gmo kcmarts.gmo libkickermenu_prefmenu.gmo joystick.gmo kdmconfig.gmo kcmaccess.gmo kcmkonqhtml.gmo quicklauncher.gmo kcmsamba.gmo kdeprint_part.gmo kio_smtp.gmo
-+POFILES = kio_sftp.po kate.po kjobviewer.po libkickermenu_konsole.po kcmkicker.po nsplugin.po display.po extensionproxy.po kdcop.po kcmbackground.po kstyle_keramik_config.po kcmlaunch.po kcminfo.po kcmkwinrules.po kasbarextension.po khtmlkttsd.po libdmctl.po ksplashthemes.po kgreet_classic.po kcontrol.po kmenuapplet.po kio_tar.po kcmview1394.po kcmbell.po kcmcomponentchooser.po kdmgreet.po kdesktop.po kpersonalizer.po ksplash.po kcmaccessibility.po kminipagerapplet.po kcmkded.po kio_remote.po kio_home.po kdeprintfax.po kcmicons.po filetypes.po kcmenergy.po kappfinder.po kthememanager.po kcmtaskbar.po kcmcgi.po kio_media.po libkickermenu_tom.po kio_finger.po ktip.po kaccess.po kio_pop3.po kdesud.po kio_fish.po kicker.po kcmkdnssd.po krdb.po libkickermenu_systemmenu.po kcmkio.po krunapplet.po kcmhtmlsearch.po kcmfonts.po libtaskbar.po useraccount.po knetattach.po kcmkonsole.po appletproxy.po dockbarextension.po kcmkonq.po kio_nntp.po kwriteconfig.po kio_ldap.po konsole.po kstart.po klipper.po kcmspellchecking.po kcmkurifilt.po kdepasswd.po clockapplet.po mediaapplet.po kdialog.po kcmlayout.po kpager.po kwin_clients.po kdebugdialog.po kcmnotify.po kio_nfs.po kcmprintmgr.po ksystemtrayapplet.po kcmxinerama.po kreadconfig.po kay.po libkickermenu_remotemenu.po lockout.po kcmkwindecoration.po kxkb.po kprinter.po libtaskmanager.po kio_system.po trashapplet.po kcmcrypto.po kcmnic.po privacy.po libkickermenu_kdeprint.po kscreensaver.po libkonq.po libkickermenu_recentdocs.po kmenuedit.po kio_trash.po kio_floppy.po krandr.po khotkeys.po kcmkclock.po kio_man.po ksystraycmd.po kcmsmartcard.po kwin.po libkicker.po khelpcenter.po ksmserver.po kgreet_winbind.po drkonqi.po kwin_lib.po kio_settings.po ksysguard.po kfontinst.po kcmscreensaver.po konqueror.po kdesu.po kcmsmserver.po kcmcolors.po kcminput.po kcmlocale.po kio_print.po kickermenu_kate.po kcmstyle.po kcmkeys.po kcmioslaveinfo.po kfmclient.po kfindpart.po kio_mac.po kio_smb.po kcmmedia.po naughtyapplet.po kcmkwm.po htmlsearch.po kcmcss.po kcmusb.po kcmperformance.po kio_thumbnail.po kcmarts.po libkickermenu_prefmenu.po joystick.po kdmconfig.po kcmaccess.po kcmkonqhtml.po quicklauncher.po kcmsamba.po kdeprint_part.po kio_smtp.po kcmiccconfig.po
-+GMOFILES = kio_sftp.gmo kate.gmo kjobviewer.gmo libkickermenu_konsole.gmo kcmkicker.gmo nsplugin.gmo display.gmo extensionproxy.gmo kdcop.gmo kcmbackground.gmo kstyle_keramik_config.gmo kcmlaunch.gmo kcminfo.gmo kcmkwinrules.gmo kasbarextension.gmo khtmlkttsd.gmo libdmctl.gmo ksplashthemes.gmo kgreet_classic.gmo kcontrol.gmo kmenuapplet.gmo kio_tar.gmo kcmview1394.gmo kcmbell.gmo kcmcomponentchooser.gmo kdmgreet.gmo kdesktop.gmo kpersonalizer.gmo ksplash.gmo kcmaccessibility.gmo kminipagerapplet.gmo kcmkded.gmo kio_remote.gmo kio_home.gmo kdeprintfax.gmo kcmicons.gmo filetypes.gmo kcmenergy.gmo kappfinder.gmo kthememanager.gmo kcmtaskbar.gmo kcmcgi.gmo kio_media.gmo libkickermenu_tom.gmo kio_finger.gmo ktip.gmo kaccess.gmo kio_pop3.gmo kdesud.gmo kio_fish.gmo kicker.gmo kcmkdnssd.gmo krdb.gmo libkickermenu_systemmenu.gmo kcmkio.gmo krunapplet.gmo kcmhtmlsearch.gmo kcmfonts.gmo libtaskbar.gmo useraccount.gmo knetattach.gmo kcmkonsole.gmo appletproxy.gmo dockbarextension.gmo kcmkonq.gmo kio_nntp.gmo kwriteconfig.gmo kio_ldap.gmo konsole.gmo kstart.gmo klipper.gmo kcmspellchecking.gmo kcmkurifilt.gmo kdepasswd.gmo clockapplet.gmo mediaapplet.gmo kdialog.gmo kcmlayout.gmo kpager.gmo kwin_clients.gmo kdebugdialog.gmo kcmnotify.gmo kio_nfs.gmo kcmprintmgr.gmo ksystemtrayapplet.gmo kcmxinerama.gmo kreadconfig.gmo kay.gmo libkickermenu_remotemenu.gmo lockout.gmo kcmkwindecoration.gmo kxkb.gmo kprinter.gmo libtaskmanager.gmo kio_system.gmo trashapplet.gmo kcmcrypto.gmo kcmnic.gmo privacy.gmo libkickermenu_kdeprint.gmo kscreensaver.gmo libkonq.gmo libkickermenu_recentdocs.gmo kmenuedit.gmo kio_trash.gmo kio_floppy.gmo krandr.gmo khotkeys.gmo kcmkclock.gmo kio_man.gmo ksystraycmd.gmo kcmsmartcard.gmo kwin.gmo libkicker.gmo khelpcenter.gmo ksmserver.gmo kgreet_winbind.gmo drkonqi.gmo kwin_lib.gmo kio_settings.gmo ksysguard.gmo kfontinst.gmo kcmscreensaver.gmo konqueror.gmo kdesu.gmo kcmsmserver.gmo kcmcolors.gmo kcminput.gmo kcmlocale.gmo kio_print.gmo kickermenu_kate.gmo kcmstyle.gmo kcmkeys.gmo kcmioslaveinfo.gmo kfmclient.gmo kfindpart.gmo kio_mac.gmo kio_smb.gmo kcmmedia.gmo naughtyapplet.gmo kcmkwm.gmo htmlsearch.gmo kcmcss.gmo kcmusb.gmo kcmperformance.gmo kio_thumbnail.gmo kcmarts.gmo libkickermenu_prefmenu.gmo joystick.gmo kdmconfig.gmo kcmaccess.gmo kcmkonqhtml.gmo quicklauncher.gmo kcmsamba.gmo kdeprint_part.gmo kio_smtp.gmo kcmiccconfig.gmo
- #>- all: all-recursive
- #>+ 1
- all: all-nls docs-am  all-recursive
-@@ -531,7 +531,7 @@
- .NOEXPORT:
- 
- #>+ 2
--KDE_DIST=libkickermenu_remotemenu.po appletproxy.po kcminput.po kcmaccessibility.po krandr.po kickermenu_kate.po kwin.po libtaskmanager.po libkickermenu_tom.po kappfinder.po dockbarextension.po kcmmedia.po filetypes.po kreadconfig.po kio_smtp.po ksplashthemes.po kcmcolors.po display.po kfmclient.po kate.po kcmnotify.po libkonq.po kstyle_keramik_config.po privacy.po kxkb.po kio_finger.po kcontrol.po konqueror.po kcmsamba.po ksmserver.po mediaapplet.po kcmenergy.po kdeprintfax.po kcmview1394.po kio_tar.po kcmxinerama.po libkickermenu_systemmenu.po kjobviewer.po kio_mac.po kcmkwindecoration.po ksplash.po kio_nfs.po ksystemtrayapplet.po htmlsearch.po kwin_lib.po kthememanager.po klipper.po kaccess.po kdepasswd.po kicker.po khtmlkttsd.po kwriteconfig.po kcmkonsole.po kmenuapplet.po kmenuedit.po kcmsmartcard.po kcmkeys.po kcmcgi.po kcmkclock.po Makefile.in kdesu.po kcmstyle.po kcmhtmlsearch.po kcminfo.po kdialog.po kcmcrypto.po libkickermenu_prefmenu.po kio_media.po kminipagerapplet.po kcmkonqhtml.po kcmaccess.po ksysguard.po kdesktop.po kio_floppy.po kcmnic.po kio_nntp.po kdmconfig.po trashapplet.po extensionproxy.po kio_ldap.po ktip.po kcmusb.po kcmperformance.po kdebugdialog.po khotkeys.po kgreet_winbind.po kio_smb.po libkickermenu_kdeprint.po kdmgreet.po knetattach.po nsplugin.po kcmcss.po kio_sftp.po kcmkio.po kcmfonts.po useraccount.po kcmkwm.po kwin_clients.po kio_settings.po libkickermenu_recentdocs.po kdcop.po kcmkdnssd.po libtaskbar.po kcmkurifilt.po kio_pop3.po joystick.po libkicker.po krunapplet.po kcmbackground.po lockout.po kcmkwinrules.po libdmctl.po krdb.po kio_home.po kdesud.po kcmioslaveinfo.po kio_remote.po kgreet_classic.po konsole.po libkickermenu_konsole.po kcmkonq.po kcmspellchecking.po kcmprintmgr.po kio_thumbnail.po kcmbell.po kdeprint_part.po kcmcomponentchooser.po kcmlocale.po kcmarts.po kasbarextension.po kio_system.po kay.po kscreensaver.po khelpcenter.po kprinter.po kpager.po drkonqi.po kcmscreensaver.po kcmlaunch.po kstart.po kcmlayout.po kfindpart.po kio_print.po kcmicons.po quicklauncher.po kio_fish.po clockapplet.po ksystraycmd.po kcmkicker.po kio_trash.po kfontinst.po kcmtaskbar.po naughtyapplet.po Makefile.am kio_man.po kpersonalizer.po kcmkded.po kcmsmserver.po 
-+KDE_DIST=libkickermenu_remotemenu.po appletproxy.po kcminput.po kcmaccessibility.po krandr.po kickermenu_kate.po kwin.po libtaskmanager.po libkickermenu_tom.po kappfinder.po dockbarextension.po kcmmedia.po filetypes.po kreadconfig.po kio_smtp.po ksplashthemes.po kcmcolors.po display.po kfmclient.po kate.po kcmnotify.po libkonq.po kstyle_keramik_config.po privacy.po kxkb.po kio_finger.po kcontrol.po konqueror.po kcmsamba.po ksmserver.po mediaapplet.po kcmenergy.po kdeprintfax.po kcmview1394.po kio_tar.po kcmxinerama.po libkickermenu_systemmenu.po kjobviewer.po kio_mac.po kcmkwindecoration.po ksplash.po kio_nfs.po ksystemtrayapplet.po htmlsearch.po kwin_lib.po kthememanager.po klipper.po kaccess.po kdepasswd.po kicker.po khtmlkttsd.po kwriteconfig.po kcmkonsole.po kmenuapplet.po kmenuedit.po kcmsmartcard.po kcmkeys.po kcmcgi.po kcmkclock.po Makefile.in kdesu.po kcmstyle.po kcmhtmlsearch.po kcminfo.po kdialog.po kcmcrypto.po libkickermenu_prefmenu.po kio_media.po kminipagerapplet.po kcmkonqhtml.po kcmaccess.po ksysguard.po kdesktop.po kio_floppy.po kcmnic.po kio_nntp.po kdmconfig.po trashapplet.po extensionproxy.po kio_ldap.po ktip.po kcmusb.po kcmperformance.po kdebugdialog.po khotkeys.po kgreet_winbind.po kio_smb.po libkickermenu_kdeprint.po kdmgreet.po knetattach.po nsplugin.po kcmcss.po kio_sftp.po kcmkio.po kcmfonts.po useraccount.po kcmkwm.po kwin_clients.po kio_settings.po libkickermenu_recentdocs.po kdcop.po kcmkdnssd.po libtaskbar.po kcmkurifilt.po kio_pop3.po joystick.po libkicker.po krunapplet.po kcmbackground.po lockout.po kcmkwinrules.po libdmctl.po krdb.po kio_home.po kdesud.po kcmioslaveinfo.po kio_remote.po kgreet_classic.po konsole.po libkickermenu_konsole.po kcmkonq.po kcmspellchecking.po kcmprintmgr.po kio_thumbnail.po kcmbell.po kdeprint_part.po kcmcomponentchooser.po kcmlocale.po kcmarts.po kasbarextension.po kio_system.po kay.po kscreensaver.po khelpcenter.po kprinter.po kpager.po drkonqi.po kcmscreensaver.po kcmlaunch.po kstart.po kcmlayout.po kfindpart.po kio_print.po kcmicons.po quicklauncher.po kio_fish.po clockapplet.po ksystraycmd.po kcmkicker.po kio_trash.po kfontinst.po kcmtaskbar.po naughtyapplet.po Makefile.am kio_man.po kpersonalizer.po kcmkded.po kcmsmserver.po kcmiccconfig.po
- 
- #>+ 469
- kio_sftp.gmo: kio_sftp.po
-@@ -1002,15 +1002,18 @@
- kio_smtp.gmo: kio_smtp.po
- 	rm -f kio_smtp.gmo; $(GMSGFMT) -o kio_smtp.gmo $(srcdir)/kio_smtp.po
- 	test ! -f kio_smtp.gmo || touch kio_smtp.gmo
-+kcmiccconfig.gmo: kcmiccconfig.po
-+	rm -f kcmiccconfig.gmo; $(GMSGFMT) -o kcmiccconfig.gmo $(srcdir)/kcmiccconfig.po
-+	test ! -f kcmiccconfig.gmo || touch kcmiccconfig.gmo
- 
- #>+ 3
- clean-nls:
--	-rm -f  kio_sftp.gmo kate.gmo kjobviewer.gmo libkickermenu_konsole.gmo kcmkicker.gmo nsplugin.gmo display.gmo extensionproxy.gmo kdcop.gmo kcmbackground.gmo kstyle_keramik_config.gmo kcmlaunch.gmo kcminfo.gmo kcmkwinrules.gmo kasbarextension.gmo khtmlkttsd.gmo libdmctl.gmo ksplashthemes.gmo kgreet_classic.gmo kcontrol.gmo kmenuapplet.gmo kio_tar.gmo kcmview1394.gmo kcmbell.gmo kcmcomponentchooser.gmo kdmgreet.gmo kdesktop.gmo kpersonalizer.gmo ksplash.gmo kcmaccessibility.gmo kminipagerapplet.gmo kcmkded.gmo kio_remote.gmo kio_home.gmo kdeprintfax.gmo kcmicons.gmo filetypes.gmo kcmenergy.gmo kappfinder.gmo kthememanager.gmo kcmtaskbar.gmo kcmcgi.gmo kio_media.gmo libkickermenu_tom.gmo kio_finger.gmo ktip.gmo kaccess.gmo kio_pop3.gmo kdesud.gmo kio_fish.gmo kicker.gmo kcmkdnssd.gmo krdb.gmo libkickermenu_systemmenu.gmo kcmkio.gmo krunapplet.gmo kcmhtmlsearch.gmo kcmfonts.gmo libtaskbar.gmo useraccount.gmo knetattach.gmo kcmkonsole.gmo appletproxy.gmo dockbarextension.gmo kcmkonq.gmo kio_nntp.gmo kwriteconfig.gmo kio_ldap.gmo konsole.gmo kstart.gmo klipper.gmo kcmspellchecking.gmo kcmkurifilt.gmo kdepasswd.gmo clockapplet.gmo mediaapplet.gmo kdialog.gmo kcmlayout.gmo kpager.gmo kwin_clients.gmo kdebugdialog.gmo kcmnotify.gmo kio_nfs.gmo kcmprintmgr.gmo ksystemtrayapplet.gmo kcmxinerama.gmo kreadconfig.gmo kay.gmo libkickermenu_remotemenu.gmo lockout.gmo kcmkwindecoration.gmo kxkb.gmo kprinter.gmo libtaskmanager.gmo kio_system.gmo trashapplet.gmo kcmcrypto.gmo kcmnic.gmo privacy.gmo libkickermenu_kdeprint.gmo kscreensaver.gmo libkonq.gmo libkickermenu_recentdocs.gmo kmenuedit.gmo kio_trash.gmo kio_floppy.gmo krandr.gmo khotkeys.gmo kcmkclock.gmo kio_man.gmo ksystraycmd.gmo kcmsmartcard.gmo kwin.gmo libkicker.gmo khelpcenter.gmo ksmserver.gmo kgreet_winbind.gmo drkonqi.gmo kwin_lib.gmo kio_settings.gmo ksysguard.gmo kfontinst.gmo kcmscreensaver.gmo konqueror.gmo kdesu.gmo kcmsmserver.gmo kcmcolors.gmo kcminput.gmo kcmlocale.gmo kio_print.gmo kickermenu_kate.gmo kcmstyle.gmo kcmkeys.gmo kcmioslaveinfo.gmo kfmclient.gmo kfindpart.gmo kio_mac.gmo kio_smb.gmo kcmmedia.gmo naughtyapplet.gmo kcmkwm.gmo htmlsearch.gmo kcmcss.gmo kcmusb.gmo kcmperformance.gmo kio_thumbnail.gmo kcmarts.gmo libkickermenu_prefmenu.gmo joystick.gmo kdmconfig.gmo kcmaccess.gmo kcmkonqhtml.gmo quicklauncher.gmo kcmsamba.gmo kdeprint_part.gmo kio_smtp.gmo
-+	-rm -f  kio_sftp.gmo kate.gmo kjobviewer.gmo libkickermenu_konsole.gmo kcmkicker.gmo nsplugin.gmo display.gmo extensionproxy.gmo kdcop.gmo kcmbackground.gmo kstyle_keramik_config.gmo kcmlaunch.gmo kcminfo.gmo kcmkwinrules.gmo kasbarextension.gmo khtmlkttsd.gmo libdmctl.gmo ksplashthemes.gmo kgreet_classic.gmo kcontrol.gmo kmenuapplet.gmo kio_tar.gmo kcmview1394.gmo kcmbell.gmo kcmcomponentchooser.gmo kdmgreet.gmo kdesktop.gmo kpersonalizer.gmo ksplash.gmo kcmaccessibility.gmo kminipagerapplet.gmo kcmkded.gmo kio_remote.gmo kio_home.gmo kdeprintfax.gmo kcmicons.gmo filetypes.gmo kcmenergy.gmo kappfinder.gmo kthememanager.gmo kcmtaskbar.gmo kcmcgi.gmo kio_media.gmo libkickermenu_tom.gmo kio_finger.gmo ktip.gmo kaccess.gmo kio_pop3.gmo kdesud.gmo kio_fish.gmo kicker.gmo kcmkdnssd.gmo krdb.gmo libkickermenu_systemmenu.gmo kcmkio.gmo krunapplet.gmo kcmhtmlsearch.gmo kcmfonts.gmo libtaskbar.gmo useraccount.gmo knetattach.gmo kcmkonsole.gmo appletproxy.gmo dockbarextension.gmo kcmkonq.gmo kio_nntp.gmo kwriteconfig.gmo kio_ldap.gmo konsole.gmo kstart.gmo klipper.gmo kcmspellchecking.gmo kcmkurifilt.gmo kdepasswd.gmo clockapplet.gmo mediaapplet.gmo kdialog.gmo kcmlayout.gmo kpager.gmo kwin_clients.gmo kdebugdialog.gmo kcmnotify.gmo kio_nfs.gmo kcmprintmgr.gmo ksystemtrayapplet.gmo kcmxinerama.gmo kreadconfig.gmo kay.gmo libkickermenu_remotemenu.gmo lockout.gmo kcmkwindecoration.gmo kxkb.gmo kprinter.gmo libtaskmanager.gmo kio_system.gmo trashapplet.gmo kcmcrypto.gmo kcmnic.gmo privacy.gmo libkickermenu_kdeprint.gmo kscreensaver.gmo libkonq.gmo libkickermenu_recentdocs.gmo kmenuedit.gmo kio_trash.gmo kio_floppy.gmo krandr.gmo khotkeys.gmo kcmkclock.gmo kio_man.gmo ksystraycmd.gmo kcmsmartcard.gmo kwin.gmo libkicker.gmo khelpcenter.gmo ksmserver.gmo kgreet_winbind.gmo drkonqi.gmo kwin_lib.gmo kio_settings.gmo ksysguard.gmo kfontinst.gmo kcmscreensaver.gmo konqueror.gmo kdesu.gmo kcmsmserver.gmo kcmcolors.gmo kcminput.gmo kcmlocale.gmo kio_print.gmo kickermenu_kate.gmo kcmstyle.gmo kcmkeys.gmo kcmioslaveinfo.gmo kfmclient.gmo kfindpart.gmo kio_mac.gmo kio_smb.gmo kcmmedia.gmo naughtyapplet.gmo kcmkwm.gmo htmlsearch.gmo kcmcss.gmo kcmusb.gmo kcmperformance.gmo kio_thumbnail.gmo kcmarts.gmo libkickermenu_prefmenu.gmo joystick.gmo kdmconfig.gmo kcmaccess.gmo kcmkonqhtml.gmo quicklauncher.gmo kcmsamba.gmo kdeprint_part.gmo kio_smtp.gmo kcmiccconfig.gmo
- 
- #>+ 10
- install-nls:
- 	$(mkinstalldirs) $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES
--	@for base in kio_sftp kate kjobviewer libkickermenu_konsole kcmkicker nsplugin display extensionproxy kdcop kcmbackground kstyle_keramik_config kcmlaunch kcminfo kcmkwinrules kasbarextension khtmlkttsd libdmctl ksplashthemes kgreet_classic kcontrol kmenuapplet kio_tar kcmview1394 kcmbell kcmcomponentchooser kdmgreet kdesktop kpersonalizer ksplash kcmaccessibility kminipagerapplet kcmkded kio_remote kio_home kdeprintfax kcmicons filetypes kcmenergy kappfinder kthememanager kcmtaskbar kcmcgi kio_media libkickermenu_tom kio_finger ktip kaccess kio_pop3 kdesud kio_fish kicker kcmkdnssd krdb libkickermenu_systemmenu kcmkio krunapplet kcmhtmlsearch kcmfonts libtaskbar useraccount knetattach kcmkonsole appletproxy dockbarextension kcmkonq kio_nntp kwriteconfig kio_ldap konsole kstart klipper kcmspellchecking kcmkurifilt kdepasswd clockapplet mediaapplet kdialog kcmlayout kpager kwin_clients kdebugdialog kcmnotify kio_nfs kcmprintmgr ksystemtrayapplet kcmxinerama kreadconfig kay libkickermenu_remotemenu lockout kcmkwindecoration kxkb kprinter libtaskmanager kio_system trashapplet kcmcrypto kcmnic privacy libkickermenu_kdeprint kscreensaver libkonq libkickermenu_recentdocs kmenuedit kio_trash kio_floppy krandr khotkeys kcmkclock kio_man ksystraycmd kcmsmartcard kwin libkicker khelpcenter ksmserver kgreet_winbind drkonqi kwin_lib kio_settings ksysguard kfontinst kcmscreensaver konqueror kdesu kcmsmserver kcmcolors kcminput kcmlocale kio_print kickermenu_kate kcmstyle kcmkeys kcmioslaveinfo kfmclient kfindpart kio_mac kio_smb kcmmedia naughtyapplet kcmkwm htmlsearch kcmcss kcmusb kcmperformance kio_thumbnail kcmarts libkickermenu_prefmenu joystick kdmconfig kcmaccess kcmkonqhtml quicklauncher kcmsamba kdeprint_part kio_smtp ; do \
-+	@for base in kio_sftp kate kjobviewer libkickermenu_konsole kcmkicker nsplugin display extensionproxy kdcop kcmbackground kstyle_keramik_config kcmlaunch kcminfo kcmkwinrules kasbarextension khtmlkttsd libdmctl ksplashthemes kgreet_classic kcontrol kmenuapplet kio_tar kcmview1394 kcmbell kcmcomponentchooser kdmgreet kdesktop kpersonalizer ksplash kcmaccessibility kminipagerapplet kcmkded kio_remote kio_home kdeprintfax kcmicons filetypes kcmenergy kappfinder kthememanager kcmtaskbar kcmcgi kio_media libkickermenu_tom kio_finger ktip kaccess kio_pop3 kdesud kio_fish kicker kcmkdnssd krdb libkickermenu_systemmenu kcmkio krunapplet kcmhtmlsearch kcmfonts libtaskbar useraccount knetattach kcmkonsole appletproxy dockbarextension kcmkonq kio_nntp kwriteconfig kio_ldap konsole kstart klipper kcmspellchecking kcmkurifilt kdepasswd clockapplet mediaapplet kdialog kcmlayout kpager kwin_clients kdebugdialog kcmnotify kio_nfs kcmprintmgr ksystemtrayapplet kcmxinerama kreadconfig kay libkickermenu_remotemenu lockout kcmkwindecoration kxkb kprinter libtaskmanager kio_system trashapplet kcmcrypto kcmnic privacy libkickermenu_kdeprint kscreensaver libkonq libkickermenu_recentdocs kmenuedit kio_trash kio_floppy krandr khotkeys kcmkclock kio_man ksystraycmd kcmsmartcard kwin libkicker khelpcenter ksmserver kgreet_winbind drkonqi kwin_lib kio_settings ksysguard kfontinst kcmscreensaver konqueror kdesu kcmsmserver kcmcolors kcminput kcmlocale kio_print kickermenu_kate kcmstyle kcmkeys kcmioslaveinfo kfmclient kfindpart kio_mac kio_smb kcmmedia naughtyapplet kcmkwm htmlsearch kcmcss kcmusb kcmperformance kio_thumbnail kcmarts libkickermenu_prefmenu joystick kdmconfig kcmaccess kcmkonqhtml quicklauncher kcmsamba kdeprint_part kio_smtp kcmiccconfig ; do \
- 	  echo $(INSTALL_DATA) $$base.gmo $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/$$base.mo ;\
- 	  if test -f $$base.gmo; then $(INSTALL_DATA) $$base.gmo $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/$$base.mo ;\
- 	  elif test -f $(srcdir)/$$base.gmo; then $(INSTALL_DATA) $(srcdir)/$$base.gmo $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/$$base.mo ;\
-@@ -1176,6 +1179,7 @@
- 	rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/kcmsamba.mo
- 	rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/kdeprint_part.mo
- 	rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/kio_smtp.mo
-+	rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/kcmiccconfig.mo
- 
- #>+ 2
- all-nls: $(GMOFILES)
-diff -Nuar kde-i18n-fr-3.5.10.ORI/messages/kdelibs/kdelibs.po kde-i18n-fr-3.5.10.p/messages/kdelibs/kdelibs.po
---- kde-i18n-fr-3.5.10.ORI/messages/kdelibs/kdelibs.po	2008-08-19 20:29:58.000000000 +0200
-+++ kde-i18n-fr-3.5.10/messages/kdelibs/kdelibs.po	2011-12-18 12:19:38.552013274 +0100
-@@ -5557,123 +5557,104 @@
- 
- #: kdeui/kaboutkde.cpp:34
- msgid ""
--"The <b>K Desktop Environment</b> is written and maintained by the KDE Team, a "
--"world-wide network of software engineers committed to <a "
-+"The <b>Trinity Desktop Environment</b> is a fork of the "
-+"K Desktop Environment version 3.5, which was originally written by the KDE Team, "
-+"a world-wide network of software engineers committed to <a "
- "href=\"http://www.gnu.org/philosophy/free-sw.html\">Free Software</a> "
--"development."
--"<br>"
--"<br>No single group, company or organization controls the KDE source code. "
--"Everyone is welcome to contribute to KDE."
--"<br>"
--"<br>Visit <A HREF=\"http://www.kde.org/\">http://www.kde.org</A> "
-+"development.<br><br>No single group, company or organization controls the "
-+"Trinity source code. Everyone is welcome to contribute to Trinity.<br><br>Visit <A "
-+"HREF=\"http://www.trinitydesktop.org/\">http://www.trinitydesktop.org</A> for more information "
-+"about Trinity, and <A HREF=\"http://www.kde.org/\">http://www.kde.org</A> "
- "for more information on the KDE project. "
- msgstr ""
--"L'<b>Environnement Bureautique KDE</b> est écrit et maintenu par l'équipe de "
--"KDE, des informaticiens du monde entier travaillant sur Internet au "
--"développement de <a href=\"http://www.gnu.org/philosophy/free-sw.fr.html\">"
--"logiciels libres</a>."
--"<br>"
--"<br>Aucune société ni organisation ne contrôle le code source de KDE, et chacun "
--"est invité à y contribuer."
--"<br>"
--"<br>Visitez <a href=\"http://www.kde.org/fr\">http://www.kde.org/fr</A> "
-+"L'<b>Environnement Bureautique Trinity</b> est un clone de l'environnement "
-+"KDE version 3.5, originellement écrit par l'équipe KDE, des informaticiens "
-+"du monde entier travaillant sur Internet au développement de <a "
-+"href=\"http://www.gnu.org/philosophy/free-sw.fr.html\">logiciels libres</a>."
-+"<br><br>Aucune société ni organisation ne contrôle le code source de Trinity, et chacun "
-+"est invité à y contribuer.<br><br>Visitez <A HREF=\"http://www.trinitydesktop.org/\">"
-+"http://www.trinitydesktop.org</A> pour plus d'informations sur Trinity, et <a "
-+"href=\"http://www.kde.org/fr\">http://www.kde.org/fr</A> "
- "pour plus d'informations sur le projet KDE."
- 
- #: kdeui/kaboutkde.cpp:43
- msgid ""
--"Software can always be improved, and the KDE Team is ready to do so. However, "
--"you - the user - must tell us when something does not work as expected or could "
--"be done better."
--"<br>"
--"<br>The K Desktop Environment has a bug tracking system. Visit <A "
--"HREF=\"http://bugs.kde.org/\">http://bugs.kde.org</A> "
--"or use the \"Report Bug...\" dialog from the \"Help\" menu to report bugs."
--"<br>"
--"<br>If you have a suggestion for improvement then you are welcome to use the "
--"bug tracking system to register your wish. Make sure you use the severity "
--"called \"Wishlist\"."
-+"Software can always be improved, and the Trinity Team is ready to "
-+"do so. However, you - the user - must tell us when "
-+"something does not work as expected or could be done better.<br><br>"
-+"The Trinity Desktop Environment has a bug tracking system. Visit "
-+"<A HREF=\"http://bugs.pearsoncomputing.net/\">http://bugs.pearsoncomputing.net</A> or "
-+"use the \"Report Bug...\" dialog from the \"Help\" menu to report bugs.<br><br>"
-+"If you have a suggestion for improvement then you are welcome to use "
-+"the bug tracking system to register your wish. Make sure you use the "
-+"severity called \"Wishlist\"."
- msgstr ""
--"Les logiciels peuvent toujours être améliorés et l'équipe KDE est prête à le "
-+"Les logiciels peuvent toujours être améliorés et l'équipe Trinity est prête à le "
- "faire. Cependant, vous - l'utilisateur(trice) - devez nous signaler ce qui ne "
--"fonctionne pas correctement ou pourrait être perfectionné."
--"<br>"
--"<br>L'Environnement de Bureau KDE possède un système de suivi des bogues. Allez "
--"sur <A HREF=\"http://bugs.kde.org/\">http://bugs.kde.org/</A> "
--"ou utilisez la boîte de dialogue « Rapport de bogue » du menu « Aide » pour "
--"signaler les erreurs."
--"<br>"
--"<br>Si vous voulez suggérer une amélioration, vous êtes invité(e) à utiliser le "
-+"fonctionne pas correctement ou pourrait être perfectionné.<br><br>"
-+"L'Environnement de Bureau Trinity possède un système de suivi des bogues. Allez "
-+"sur <A HREF=\"http://bugs.pearsoncomputing.net/\">http://bugs.pearsoncomputing.net</A> "
-+"ou utilisez la boîte de dialogue « Rapport de bogue » du menu « Aide » pour signaler les "
-+"erreurs.<br><br>Si vous voulez suggérer une amélioration, vous êtes invité(e) à utiliser le "
- "système de suivi des bogues pour enregistrer votre souhait. Assurez-vous "
- "d'avoir utilisé l'option « Souhait » (wish)."
- 
- #: kdeui/kaboutkde.cpp:54
- msgid ""
--"You do not have to be a software developer to be a member of the KDE team. You "
--"can join the national teams that translate program interfaces. You can provide "
--"graphics, themes, sounds, and improved documentation. You decide!"
--"<br>"
--"<br>Visit <A HREF=\"http://www.kde.org/jobs/\">http://www.kde.org/jobs/</A> "
-+"You do not have to be a software developer to be a member of the "
-+"Trinity team. You can join the national teams that translate "
-+"program interfaces. You can provide graphics, themes, sounds, and "
-+"improved documentation. You decide!"
-+"<br><br>"
-+"Visit "
-+"<A HREF=\"http://www.trinitydesktop.org/jobs/\">http://www.trinitydesktop.org/jobs/</A> "
- "for information on some projects in which you can participate."
--"<br>"
--"<br>If you need more information or documentation, then a visit to <A "
--"HREF=\"http://developer.kde.org/\">http://developer.kde.org</A> "
-+"<br><br>"
-+"If you need more information or documentation, then a visit to "
-+"<A HREF=\"http://www.trinitydesktop.org/docs/\">http://www.trinitydesktop.org/docs/</A> "
- "will provide you with what you need."
- msgstr ""
--"Il n'est pas nécessaire d'être programmeur pour être membre de l'équipe de KDE. "
-+"Il n'est pas nécessaire d'être programmeur pour être membre de l'équipe de Trinity. "
- "Vous pouvez rejoindre les équipes nationales qui traduisent les interfaces des "
- "programmes. Vous pouvez réaliser des images, des thèmes, des sons et des "
- "documentations enrichies. C'est vous qui décidez !"
--"<br>"
--"<br>Visitez <A HREF=\"http://www.kde.org/fr/jobs.html\">"
--"http://www.kde.org/fr/jobs.html</A> pour des informations sur certains projets "
--"auxquels vous pouvez participer."
--"<br>"
--"<br>Pour plus d'informations ou de documentations, une visite de <A "
--"HREF=\"http://developer.kde.org/\">http://developer.kde.org/</A> "
-+"<br><br>"
-+"Visitez "
-+"<A HREF=\"http://www.trinitydesktop.org/jobs/\">http://www.trinitydesktop.org/jobs/</A>"
-+"pour des informations sur certains projets auxquels vous pouvez participer."
-+"<br><br>"
-+"Pour plus d'informations ou de documentations, une visite de <A "
-+"HREF=\"http://www.trinitydesktop.org/docs/\">http://www.trinitydesktop.org/docs/</A> "
- "devrait vous fournir ce dont vous avez besoin."
- 
- #: kdeui/kaboutkde.cpp:67
- msgid ""
--"KDE is available free of charge, but making it is not free."
--"<br>"
--"<br>Thus, the KDE team formed the KDE e.V., a non-profit organization legally "
--"founded in Tuebingen, Germany. The KDE e.V. represents the KDE project in legal "
--"and financial matters. See <a href=\"http://www.kde-ev.org/\">"
--"http://www.kde-ev.org</a> for information on the KDE e.V."
--"<br>"
--"<br>The KDE team does need financial support. Most of the money is used to "
--"reimburse members and others on expenses they experienced when contributing to "
--"KDE. You are encouraged to support KDE through a financial donation, using one "
--"of the ways described at <a href=\"http://www.kde.org/support/\">"
--"http://www.kde.org/support/</a>."
--"<br>"
--"<br>Thank you very much in advance for your support."
--msgstr ""
--"KDE est disponible gratuitement, mais sa réalisation a un coût."
--"<br>"
--"<br>C'est pourquoi l'équipe de KDE a formé l'association KDE, une association à "
--"but non lucratif fondée à Tübingen (Allemagne). L'association KDE représente "
--"les aspects juridiques et financiers du Projet KDE. Consultez <a "
--"href=\"http://www.kde-ev.org\">http://www.kde-ev.org/</a> "
--"pour plus d'informations sur l'association KDE."
--"<br>"
--"<br>L'équipe de KDE a besoin d'un appui financier. La majeure partie de ses "
-+"Trinity is available free of charge, but making it is not free.<br><br>"
-+"<br><br>"
-+"The Trinity team does need financial support. Most of the money is used to "
-+"reimburse members and others on expenses they experienced when "
-+"contributing to Trinity. You are encouraged to support Trinity through a financial "
-+"donation, using one of the ways described at "
-+"<a href=\"http://www.trinitydesktop.org/donate.php\">http://www.trinitydesktop.org/donate.php</a>."
-+"<br><br>Thank you very much in advance for your support!"
-+msgstr ""
-+"Trinity est disponible gratuitement, mais sa réalisation a un coût."
-+"<br><br>"
-+"<br>L'équipe de Trinity a besoin d'un appui financier. La majeure partie de ses "
- "fonds sert à rembourser les membres et d'autres intervenants des dépenses "
--"qu'ils ont engagées lors de leur contribution à KDE. Pour apporter votre "
--"participation financière à KDE, utilisez l'une des possibilités décrites à "
--"l'adresse <a "
--"href=\"http://www.kde.org/support/\">http://www.kde.org/support/</a>."
--"<br>"
--"<br>Nous vous remercions vivement de votre soutien."
-+"qu'ils ont engagées lors de leur contribution à Trinity. Pour apporter votre "
-+"participation financière à Trinity, utilisez l'une des possibilités décrites à "
-+"l'adresse <a href=\"http://www.trinitydesktop.org/donate.php\">http://www.trinitydesktop.org/donate.php</a>."
-+"<br><br>Nous vous remercions vivement de votre soutien."
- 
- #: kdeui/kaboutkde.cpp:81
- #, c-format
--msgid "K Desktop Environment. Release %1"
--msgstr "Environnement de bureau KDE. Version %1"
-+msgid "Trinity Desktop Environment. Release %1"
-+msgstr "Environnement de bureau Trinity. Version %1"
- 
- #: kdeui/kaboutkde.cpp:83
- msgid ""
--"_: About KDE\n"
-+"_: About Trinity\n"
- "&About"
- msgstr "À &propos"
- 
-@@ -5682,12 +5663,12 @@
- msgstr "Rapport de bogues et &souhaits"
- 
- #: kdeui/kaboutkde.cpp:85
--msgid "&Join the KDE Team"
--msgstr "Re&joignez l'équipe de KDE"
-+msgid "&Join the Trinity Team"
-+msgstr "Re&joignez l'équipe de Trinity"
- 
- #: kdeui/kaboutkde.cpp:86
--msgid "&Support KDE"
--msgstr "&Soutenez KDE"
-+msgid "&Support Trinity"
-+msgstr "&Soutenez Trinity"
- 
- #: kdeui/kstdguiitem.cpp:110 khtml/java/kjavaappletserver.cpp:804
- msgid "&Yes"
-@@ -6286,6 +6267,10 @@
- msgid "&Browse..."
- msgstr "&Parcourir..."
- 
-+#: kdeui/kdialog.cpp:428
-+msgid "Please wait..."
-+msgstr "Veuillez patienter ..."
-+
- #: kdeui/kdialogbase.cpp:636
- msgid "&Try"
- msgstr "&Essayer"
-@@ -6623,8 +6608,8 @@
- msgstr "À &propos de : %1"
- 
- #: kdeui/khelpmenu.cpp:176 kdeui/kstdaction_p.h:114
--msgid "About &KDE"
--msgstr "À propos de &KDE"
-+msgid "About &Trinity"
-+msgstr "À propos de &Trinity"
- 
- #: kdeui/kactionclasses.cpp:2072
- msgid "Exit F&ull Screen Mode"
-diff -Nuar kde-i18n-fr-3.5.10.ORI/messages/kdebase/kcontrol.po kde-i18n-fr-3.5.10/messages/kdebase/kcontrol.po
---- kde-i18n-fr-3.5.10.ORI/messages/kdebase/kcontrol.po	2011-12-18 22:34:04.982863520 +0100
-+++ kde-i18n-fr-3.5.10/messages/kdebase/kcontrol.po	2011-12-18 22:40:37.574949536 +0100
-@@ -34,8 +34,8 @@
- msgstr "duranceau@kde.org,caulier.gilles@free.fr,cousin@kde.org,kde@macolu.org"
- 
- #: aboutwidget.cpp:43 main.cpp:104
--msgid "KDE Control Center"
--msgstr "Centre de configuration de KDE"
-+msgid "Trinity Control Center"
-+msgstr "Centre de configuration de Trinity"
- 
- #: aboutwidget.cpp:45
- msgid "Configure your desktop environment."
-@@ -43,17 +43,17 @@
- 
- #: aboutwidget.cpp:47
- msgid ""
--"Welcome to the \"KDE Control Center\", a central place to configure your "
-+"Welcome to the \"Trinity 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 ""
--"Bienvenue dans le « Centre de configuration de KDE », l'endroit où configurer "
-+"Bienvenue dans le « Centre de configuration de Trinity », l'endroit où configurer "
- "votre environnement. Sélectionnez un élément dans l'index à gauche pour charger "
- "le module de configuration correspondant."
- 
- #: aboutwidget.cpp:53 main.cpp:108
--msgid "KDE Info Center"
--msgstr "Centre d'informations de KDE"
-+msgid "Trinity Info Center"
-+msgstr "Centre d'informations de Trinity"
- 
- #: aboutwidget.cpp:55
- msgid "Get system and desktop environment information"
-@@ -61,10 +61,10 @@
- 
- #: aboutwidget.cpp:57
- msgid ""
--"Welcome to the \"KDE Info Center\", a central place to find information about "
-+"Welcome to the \"Trinity Info Center\", a central place to find information about "
- "your computer system."
- msgstr ""
--"Bienvenue dans le « Centre d'informations de KDE », l'endroit où trouver des "
-+"Bienvenue dans le « Centre d'informations de Trinity », l'endroit où trouver des "
- "informations sur votre système."
- 
- #: aboutwidget.cpp:61
-@@ -76,8 +76,8 @@
- "configuration particulière."
- 
- #: aboutwidget.cpp:64
--msgid "KDE version:"
--msgstr "Version de KDE :"
-+msgid "Trinity version:"
-+msgstr "Version de Trinity :"
- 
- #: aboutwidget.cpp:65
- msgid "User:"
-@@ -137,13 +137,13 @@
- 
- #: helpwidget.cpp:51
- msgid ""
--"<h1>KDE Info Center</h1>There is no quick help available for the active info "
-+"<h1>Trinity Info Center</h1>There is no quick help available for the active info "
- "module."
- "<br>"
- "<br>Click <a href = \"kinfocenter/index.html\">here</a> "
- "to read the general Info Center manual."
- msgstr ""
--"<h1>Centre d'informations de KDE</h1> Désolé, aucune aide rapide n'est "
-+"<h1>Centre d'informations de Trinity</h1> Désolé, aucune aide rapide n'est "
- "disponible pour le module d'information courant."
- "<br>"
- "<br> Cliquez <a href = \"kinfocenter/index.html\">ici</a> "
-@@ -151,13 +151,13 @@
- 
- #: helpwidget.cpp:56
- msgid ""
--"<h1>KDE Control Center</h1>There is no quick help available for the active "
-+"<h1>Trinity Control Center</h1>There is no quick help available for the active "
- "control module."
- "<br>"
- "<br>Click <a href = \"kcontrol/index.html\">here</a> "
- "to read the general Control Center manual."
- msgstr ""
--"<h1>Centre de configuration de KDE</h1> Désolé, aucune aide rapide n'est "
-+"<h1>Centre de configuration de Trinity</h1> Désolé, aucune aide rapide n'est "
- "disponible pour le module de configuration courant."
- "<br>"
- "<br> Cliquez <a href = \"kcontrol/index.html\">ici</a> "
-@@ -173,16 +173,16 @@
- "<br>Cliquez sur le bouton « Mode superutilisateur » ci-dessous."
- 
- #: main.cpp:105
--msgid "The KDE Control Center"
--msgstr "Le Centre de configuration de KDE"
-+msgid "The Trinity Control Center"
-+msgstr "Le Centre de configuration de Trinity"
- 
- #: main.cpp:106 main.cpp:110
- msgid "(c) 1998-2004, The KDE Control Center Developers"
- msgstr "(c) 1998-2004, Les développeurs du Centre de configuration de KDE"
- 
- #: main.cpp:109
--msgid "The KDE Info Center"
--msgstr "Le Centre d'informations de KDE"
-+msgid "The Trinity Info Center"
-+msgstr "Le Centre d'informations de Trinity"
- 
- #: main.cpp:128 main.cpp:130
- msgid "Current Maintainer"
---- kde-i18n-fr-3.5.10.ORI/messages/kdebase/kpersonalizer.po	2011-12-19 21:25:27.471340645 +0100
-+++ kde-i18n-fr-3.5.10/messages/kdebase/kpersonalizer.po	2011-12-19 21:29:05.386322708 +0100
-@@ -79,8 +79,8 @@
- msgstr "Le style Platinium"
- 
- #: kcountrypage.cpp:48
--msgid "<h3>Welcome to KDE %1</h3>"
--msgstr "<h3>Bienvenue dans KDE %1</h3>"
-+msgid "<h3>Welcome to Trinity %1</h3>"
-+msgstr "<h3>Bienvenue dans Trinity %1</h3>"
- 
- #: kcountrypage.cpp:90 kcountrypage.cpp:117 kfindlanguage.cpp:82
- msgid "without name"
-@@ -111,8 +111,8 @@
- msgstr "L'assistant se redémarre lui-même"
- 
- #: main.cpp:32
--msgid "Personalizer is running before KDE session"
--msgstr "L'assistant démarre avant la session KDE elle-même"
-+msgid "Personalizer is running before Trinity session"
-+msgstr "L'assistant démarre avant la session Trinity elle-même"
- 
- #: kpersonalizer.cpp:67
- msgid "Step 1: Introduction"
-@@ -141,13 +141,13 @@
- #: kpersonalizer.cpp:152
- msgid ""
- "<p>Are you sure you want to quit the Desktop Settings Wizard?</p>"
--"<p>The Desktop Settings Wizard helps you to configure the KDE desktop to your "
-+"<p>The Desktop Settings Wizard helps you to configure the Trinity desktop to your "
- "personal liking.</p>"
- "<p>Click <b>Cancel</b> to return and finish your setup.</p>"
- msgstr ""
- "<p>Voulez-vous vraiment quitter l'assistant de configuration du bureau ?</p> "
- "<p>L'assistant de configuration du bureau vous aide à configurer le bureau de "
--"KDE selon vos convenances.</p> "
-+"Trinity selon vos convenances.</p> "
- "<p>Cliquez sur « <b>Annuler</b> » pour retourner et terminer vos réglages.</p>"
- 
- #: kpersonalizer.cpp:156
-@@ -171,14 +171,14 @@
- "<br><b>Titlebar double-click:</b> <i>Shade window</i>"
- "<br><b>Mouse selection:</b> <i>Single click</i>"
- "<br><b>Application startup notification:</b> <i>busy cursor</i>"
--"<br><b>Keyboard scheme:</b> <i>KDE default</i>"
-+"<br><b>Keyboard scheme:</b> <i>Trinity default</i>"
- "<br>"
- msgstr ""
- "<b>Activation des fenêtres :</b> <i>Cliquer pour avoir le focus</i>"
- "<br><b>Double-clic sur la barre de titre :</b> <i>Enroule la fenêtre</i>"
- "<br><b>Sélection par la souris :</b> <i>Simple clic</i>"
- "<br><b>Notification de démarrage des applications :</b><i> Curseur occupé</i>"
--"<br><b>Actions du clavier :</b> <i>KDE par défaut</i>"
-+"<br><b>Actions du clavier :</b> <i>Trinity par défaut</i>"
- "<br>"
- 
- #: kospage.cpp:364
-@@ -320,34 +320,34 @@
- #: rc.cpp:6
- #, no-c-format
- msgid ""
--"<p>This Personalizer will help you configure the basic setup of your KDE "
-+"<p>This Personalizer will help you configure the basic setup of your Trinity "
- "desktop in five quick, easy steps. You can set things like your country (for "
- "date and time formats, etc.), language, desktop behavior and more.</p>\n"
--"<p>You will be able to change all the settings later using the KDE Control "
-+"<p>You will be able to change all the settings later using the Trinity Control "
- "Center. You may choose to postpone your personalization until later by clicking "
- "on <b>Skip Wizard</b>. Any changes made so far, will then be reversed, except "
- "for the country and language settings. However, new users are encouraged to use "
- "this simple method.</p>\n"
--"<p>If you already like your KDE configuration and wish to quit the Wizard, "
-+"<p>If you already like your Trinity configuration and wish to quit the Wizard, "
- "click <b>Skip Wizard</b>, then <b>Quit</b>.</p>"
- msgstr ""
- "<p>Cet assistant vous aidera à configurer les réglages de base de votre bureau "
--"KDE en cinq étapes simples. Vous pouvez régler des paramètres comme votre pays "
-+"Trinity en cinq étapes simples. Vous pouvez régler des paramètres comme votre pays "
- "(pour les formats de date et d'heure, etc.), votre langue, le comportement du "
- "bureau et plein d'autres encore.</p>\n"
- "<p>Vous pourrez changer tous ces réglages ultérieurement en utilisant le Centre "
--"de configuration de KDE. Vous pouvez choisir de différer votre personnalisation "
-+"de configuration de Trinity. Vous pouvez choisir de différer votre personnalisation "
- "en cliquant sur « <b>Passer l'assistant</b> ». Cependant, il est conseillé pour "
- "les nouveaux utilisateurs d'utiliser cette méthode.</p>\n"
--"<p>Si votre configuration de KDE est déjà à votre goût et que vous désirez "
-+"<p>Si votre configuration de Trinity est déjà à votre goût et que vous désirez "
- "quitter l'assistant, cliquez sur « <b>Passer l'assistant</b> » puis sur  « <b>"
- "Quitter</b> ».</p>"
- 
- #. i18n: file kcountrypagedlg.ui line 100
- #: rc.cpp:11
- #, no-c-format
--msgid "<h3>Welcome to KDE %VERSION%!</h3>"
--msgstr "<h3>Bienvenue dans KDE %VERSION% !</h3>"
-+msgid "<h3>Welcome to Trinity %VERSION%!</h3>"
-+msgstr "<h3>Bienvenue dans Trinity %VERSION% !</h3>"
- 
- #. i18n: file kcountrypagedlg.ui line 148
- #: rc.cpp:14
-@@ -359,14 +359,14 @@
- #: rc.cpp:17
- #, no-c-format
- msgid ""
--"<P>KDE offers many visually appealing special effects, such as smoothed fonts, "
-+"<P>Trinity offers many visually appealing special effects, such as smoothed fonts, "
- "previews in the file manager and animated menus. All this beauty, however, "
- "comes at a small performance cost. </P>\n"
- "If you have a fast, new processor, you might want to turn them all on, but for "
- "those of us with slower processors, starting off with less eye candy helps to "
- "keep your desktop more responsive."
- msgstr ""
--"<P>KDE offre de nombreux effets visuels, comme les polices lissées, les aperçus "
-+"<P>Trinity offre de nombreux effets visuels, comme les polices lissées, les aperçus "
- "dans le gestionnaire de fichiers et les menus animés. Toutes ces choses "
- "superbes ont un coût en termes de performances.</P>\n"
- "Si vous avez un processeur récent et rapide, vous pouvez toutes les activer, "
-@@ -426,8 +426,8 @@
- #. i18n: file kospagedlg.ui line 79
- #: rc.cpp:44
- #, no-c-format
--msgid "KDE (TM)"
--msgstr "KDE ™"
-+msgid "Trinity (TM)"
-+msgstr "Trinity"
- 
- #. i18n: file kospagedlg.ui line 90
- #: rc.cpp:47
-@@ -454,22 +454,22 @@
- "<b>System Behavior</b>"
- "<br>\n"
- "Graphical User Interfaces behave differently on various Operating Systems.\n"
--"KDE allows you to customize its behavior according to your needs."
-+"Trinity allows you to customize its behavior according to your needs."
- msgstr ""
- "<b>Comportement du système</b>"
- "<br>\n"
- "Les interfaces utilisateur graphiques se comportent différemment sur les "
- "différents systèmes d'exploitation.\n"
--"KDE vous permet de personnaliser son comportement selon vos désirs."
-+"Trinity vous permet de personnaliser son comportement selon vos désirs."
- 
- #. i18n: file kospagedlg.ui line 168
- #: rc.cpp:61
- #, no-c-format
- msgid ""
--"For motion impaired users, KDE provides keyboard gestures to activate special "
-+"For motion impaired users, Trinity provides keyboard gestures to activate special "
- "keyboard settings."
- msgstr ""
--"Pour les utilisateurs à déplacement réduit, KDE fournit des gestes permettant "
-+"Pour les utilisateurs à déplacement réduit, Trinity fournit des gestes permettant "
- "d'activer des réglages spéciaux du clavier."
- 
- #. i18n: file kospagedlg.ui line 179
-@@ -494,26 +494,26 @@
- #: rc.cpp:71
- #, no-c-format
- msgid ""
--"You can refine the settings you made by starting the KDE Control Center by "
-+"You can refine the settings you made by starting the Trinity Control Center by "
- "choosing the entry <b>Control Center</b> in the K menu."
- msgstr ""
- "Vous pouvez affiner les réglages que vous avez faits en lançant le <b>"
--"Centre de configuration de KDE</b> en choisissant l'entrée <b>"
-+"Centre de configuration de Trinity</b> en choisissant l'entrée <b>"
- "Centre de configuration</b> du menu K."
- 
- #. i18n: file krefinepagedlg.ui line 133
- #: rc.cpp:74
- #, no-c-format
--msgid "You can also start the KDE Control Center using the button below."
-+msgid "You can also start the Trinity Control Center using the button below."
- msgstr ""
--"Vous pouvez également démarrer le Centre de configuration de KDE à l'aide du "
-+"Vous pouvez également démarrer le Centre de configuration de Trinity à l'aide du "
- "bouton ci-dessous."
- 
- #. i18n: file krefinepagedlg.ui line 203
- #: rc.cpp:77
- #, no-c-format
--msgid "&Launch KDE Control Center"
--msgstr "&Lancer le Centre de configuration de KDE"
-+msgid "&Launch Trinity Control Center"
-+msgstr "&Lancer le Centre de configuration de Trinity"
- 
- #. i18n: file kstylepagedlg.ui line 32
- #: rc.cpp:80
---- kde-i18n-fr-3.5.10/messages/kdebase/konqueror.po.ORI	2011-12-19 21:45:36.416030332 +0100
-+++ kde-i18n-fr-3.5.10/messages/kdebase/konqueror.po	2011-12-19 21:51:16.528801717 +0100
-@@ -1203,6 +1203,9 @@
- msgid "Open in &New Tab"
- msgstr "Ouvrir dans un &nouvel onglet"
- 
-+msgid "Open in &Background Tab"
-+msgstr "Ouvrir dans un onglet en arrière-&plan"
-+
- #: konq_mainwindow.cc:4689
- msgid "Open the document in a new tab"
- msgstr "Ouvrir le document dans un nouvel onglet"
diff --git a/redhat/tde-i18n/kde-i18n-kdesu.patch b/redhat/tde-i18n/kde-i18n-kdesu.patch
deleted file mode 100644
index 7c083cd42..000000000
--- a/redhat/tde-i18n/kde-i18n-kdesu.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-diff -rcb kde-i18n-fr-3.5.10.ORI/messages/kdebase/kdesu.po kde-i18n-fr-3.5.10/messages/kdebase/kdesu.po
-*** kde-i18n-fr-3.5.10.ORI/messages/kdebase/kdesu.po	2010-12-19 01:32:05.649657741 +0100
---- kde-i18n-fr-3.5.10/messages/kdebase/kdesu.po	2010-12-19 01:33:50.416539931 +0100
-***************
-*** 132,151 ****
-  #: sudlg.cpp:36
-  msgid ""
-  "The action you requested needs root privileges. Please enter root's password "
-! "below or click Ignore to continue with your current privileges."
-  msgstr ""
-  "L'action requise nécessite les droits du superutilisateur. Veuillez saisir "
-! "ci-dessous le mot de passe du superutilisateur ou cliquez sur « Ignorer » pour "
-! "continuer avec vos droits actuels."
-  
-  #: 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 ""
-  "L'action requise nécessite des droits supplémentaires. Veuillez saisir "
-! "ci-dessous le mot de passe de « %1 » ou cliquez sur « Ignorer » pour continuer "
-! "avec vos droits actuels."
-  
-  #: sudlg.cpp:48
-  msgid "&Ignore"
---- 132,149 ----
-  #: sudlg.cpp:36
-  msgid ""
-  "The action you requested needs root privileges. Please enter root's password "
-! "below."
-  msgstr ""
-  "L'action requise nécessite les droits du superutilisateur. Veuillez saisir "
-! "ci-dessous le mot de passe du superutilisateur."
-  
-  #: sudlg.cpp:40
-  msgid ""
-  "The action you requested needs additional privileges. Please enter the password "
-! "for \"%1\" below."
-  msgstr ""
-  "L'action requise nécessite des droits supplémentaires. Veuillez saisir "
-! "ci-dessous le mot de passe de « %1 »."
-  
-  #: sudlg.cpp:48
-  msgid "&Ignore"
-Seulement dans kde-i18n-fr-3.5.10/messages/kdebase: kdesu.po~
diff --git a/redhat/tde-i18n/kde-i18n-zh_TW-3.5.10.patch.gz b/redhat/tde-i18n/kde-i18n-zh_TW-3.5.10.patch.gz
deleted file mode 100644
index 3787c6d9a..000000000
Binary files a/redhat/tde-i18n/kde-i18n-zh_TW-3.5.10.patch.gz and /dev/null differ
diff --git a/redhat/tde-i18n/tde-i18n-3.5.13.2.spec b/redhat/tde-i18n/tde-i18n-3.5.13.2.spec
index 94cfcdab9..444ed210b 100644
--- a/redhat/tde-i18n/tde-i18n-3.5.13.2.spec
+++ b/redhat/tde-i18n/tde-i18n-3.5.13.2.spec
@@ -47,21 +47,6 @@ AutoReq: no
 
 Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
 
-# TDE 3.5.12: Translate 'kdesu' message was modified in 'kdebase' package
-Patch0:		kde-i18n-kdesu.patch
-
-# TDE 3.5.12: Translate 'Open Terminal Here' desktop shortcut
-Patch1:		trinity-kde-i18n-fr-openterminalhere.patch
-
-# TDE 3.5.13: French translations for new features
-Patch2:		kde-i18n-3.5.13-add_french_translations.patch
-
-# TDE 3.5.13: Updated translations for zh_TW, thanks to Wei-Lun Chao !
-Patch3:		kde-i18n-zh_TW-3.5.10.patch.gz
-
-# TDE 3.5.13.2: Updated french translations
-Patch4:		trinity-tde-i18n-fr-3.5.13.2-updates.patch
-
 BuildRequires:	findutils
 BuildRequires:	gettext
 BuildRequires:	trinity-arts-devel >= 1:1.5.10
@@ -695,19 +680,6 @@ Provides:	 trinity-kde-i18n-Chinese-Big5 = %{version}-%{release}
 %prep
 %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
 
-# Patches for French translations
-pushd tde-i18n-fr
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch4 -p1
-popd
-
-# Patches for Chinese (zh_TW) translations
-pushd tde-i18n-zh_TW
-zcat %{PATCH3} | patch -p1 || :
-popd
-
 %__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
 %__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
 
diff --git a/redhat/tde-i18n/trinity-kde-i18n-fr-openterminalhere.patch b/redhat/tde-i18n/trinity-kde-i18n-fr-openterminalhere.patch
deleted file mode 100644
index d45075fff..000000000
--- a/redhat/tde-i18n/trinity-kde-i18n-fr-openterminalhere.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -rcb kde-i18n-fr-3.5.10.ori/messages/kdebase/kdesktop.po kde-i18n-fr-3.5.10/messages/kdebase/kdesktop.po
-*** kde-i18n-fr-3.5.10.ori/messages/kdebase/kdesktop.po	2011-07-21 10:02:12.261100210 +0200
---- kde-i18n-fr-3.5.10/messages/kdebase/kdesktop.po	2011-07-21 10:05:55.365975529 +0200
-***************
-*** 246,251 ****
---- 246,255 ----
-  msgid "Run Command..."
-  msgstr "Exécuter une commande..."
-  
-+ #: krootwm.cc:135 (Trinity Specific)
-+ msgid "Open Terminal Here..."
-+ msgstr "Ouvrir un Terminal..."
-+ 
-  #: krootwm.cc:137
-  msgid "Configure Desktop..."
-  msgstr "Configurer le bureau..."
diff --git a/redhat/tde-i18n/trinity-tde-i18n-fr-3.5.13.2-updates.patch b/redhat/tde-i18n/trinity-tde-i18n-fr-3.5.13.2-updates.patch
deleted file mode 100644
index 5f0844433..000000000
--- a/redhat/tde-i18n/trinity-tde-i18n-fr-3.5.13.2-updates.patch
+++ /dev/null
@@ -1,578 +0,0 @@
---- tde-i18n-fr/messages/kdelibs/kdelibs.po.ORI	2013-05-11 13:46:34.210204854 +0200
-+++ tde-i18n-fr/messages/kdelibs/kdelibs.po	2013-05-11 13:47:23.882174000 +0200
-@@ -5659,8 +5659,36 @@
- msgstr "À &propos"
- 
- #: kdeui/kaboutkde.cpp:84
--msgid "&Report Bugs or Wishes"
--msgstr "Rapport de bogues et &souhaits"
-+msgid "&Report Bugs/Request Enhancements"
-+msgstr "Rapport de bogues / &Améliorations"
-+
-+msgid "&Report Bug/Request Enhancement..."
-+msgstr "&Rapport de bogue/Amélioration..."
-+
-+msgid ""
-+"Reporting bugs and requesting enhancements are maintained using the Bugzilla reporting system.\n"
-+"You'll need a login account and password to use the reporting system.\n"
-+"To control spam and rogue elements the login requires a valid email address.\n"
-+"Consider using any large email service if you want to avoid using your private email address.\n"
-+"\n"
-+"Selecting the button below opens your web browser to http://bugs.trinitydesktop.org,\n"
-+"where you will find the report form.\n"
-+"The information displayed above will be transferred to the reporting system.\n"
-+"Session cookies must be enabled to use the reporting system.\n"
-+"\n"
-+"Thank you for helping!"
-+msgstr ""
-+"Les rapports de bogues et demandes d'améliorations sont traités par le système Bugzilla.\n"
-+"Vous devez posséder un identifiant et un mot de passe pour utiliser le système de rapport.\n"
-+"Pour éviter le spam et les rapports indésirables, vous devez avoir une adresse email valide.\n"
-+"Vous pouvez créer une adresse email spécifique si vous ne voulez pas utiliser votre adresse email privée.\n"
-+"\n"
-+"Cliquez sur le bouton ci-dessous pour ouvrir votre navigateur à l'adresse http://bugs.trinitydesktop.org,\n"
-+"où vous trouverez le formulaire de rapport.\n"
-+"Les informations affichés ci-dessus seront transférées au système de rapport.\n"
-+"Les cookies de session doivent être activés pour utiliser le système de rapport.\n"
-+"\n"
-+"Merci pour votre aide!"
-
- #: kdeui/kaboutkde.cpp:85
- msgid "&Join the Trinity Team"
---- tde-i18n-fr/messages/kdebase/krandr.po.ORI	2013-05-11 13:51:27.100137014 +0200
-+++ tde-i18n-fr/messages/kdebase/krandr.po	2013-05-11 13:57:36.051526232 +0200
-@@ -331,3 +331,24 @@
- #: configdialog.cpp:49
- msgid "Global &Shortcuts"
- msgstr "Raccourcis Globaux"
-+
-+msgid "Start KRandRTray automatically when you log in?"
-+msgstr "Démarrer KRandRTray automatiquement à l'ouverture de session ?"
-+
-+msgid "Start Automatically"
-+msgstr "Démarrer automatiquement"
-+
-+msgid "Do Not Start"
-+msgstr "Ne pas démarrer"
-+
-+msgid "Output Port"
-+msgstr "Sortie Vidéo"
-+
-+msgid "Next available output"
-+msgstr "Sortie Vidéo suivante"
-+
-+#, c-format
-+msgid "%1 (Active)"
-+msgstr "%1 (Active)"
-+
-+
---- /dev/null	2013-05-11 10:08:04.442569174 +0200
-+++ tde-i18n-fr/messages/kdebase/kcmdisplayconfig.po	2013-05-11 14:23:12.893229163 +0200
-@@ -0,0 +1,123 @@
-+msgid "<b>The global display configuration is a system wide setting, and requires administrator access</b><br>To alter the system's global display configuration, click on the \"Administrator Mode\" button below."
-+msgstr "<b>La configuration d'affichage globale est un réglage système, et nécessite les droits administrateur.</b><br>Pour modifier la configuration système globale, cliquer sur le bouton \"Mode superutilisateur\"."
-+
-+msgid "Color Profiles"
-+msgstr "Profils de couleurs"
-+
-+msgid "<h1>Monitor & Display Configuration</h1> This module allows you to configure monitors attached to your computer via TDE."
-+msgstr "<h1>Configuration de l'affichage</h1>Ce module permet de configurer les moniteurs attachés à votre ordinateur via TDE."
-+
-+msgid "Global Settings"
-+msgstr "Paramètres globaux"
-+
-+msgid "Global"
-+msgstr "Général"
-+
-+msgid "&Enable global display control"
-+msgstr "&Activer le contrôle de l'affichage"
-+
-+msgid "Resolution and Layout"
-+msgstr "Résolution et disposition"
-+
-+msgid "Monitors"
-+msgstr "Moniteurs"
-+
-+msgid "Drag the monitor icons to match the physical arrangement of your monitors."
-+msgstr "Déplacez les icônes pour qu'elles correspondent à la disposition de vos moniteurs."
-+
-+msgid "Display:"
-+msgstr "Sortie Vidéo:"
-+
-+msgid "&Screen resolution"
-+msgstr "&Résolution de l'écran:"
-+
-+msgid "Less"
-+msgstr "Moins"
-+
-+msgid "More"
-+msgstr "Plus"
-+
-+msgid "unset"
-+msgstr "Non définie"
-+
-+msgid "&Refresh rate"
-+msgstr "&Taux de rafraichissement"
-+
-+msgid "Screen Transformations"
-+msgstr "Transformation de l'écran"
-+
-+msgid "&Mirror screen horizontally"
-+msgstr "Miroir &horizonal"
-+
-+msgid "Mirror screen &vertically"
-+msgstr "Miroir &vertical"
-+
-+msgid "&Use this device as the primary monitor."
-+msgstr "Utiliser en tant que moniteur &primaire."
-+
-+msgid "&Extend my Trinity desktop onto this monitor."
-+msgstr "&Etendre mon bureau Trinity sur ce moniteur."
-+
-+msgid "&Rescan Displays"
-+msgstr "&Redétecter les écrans"
-+
-+msgid "Load &Existing Profile"
-+msgstr "Charger un profil &existant."
-+
-+msgid "&Test Settings"
-+msgstr "&Tester les réglages"
-+
-+msgid "&Identify"
-+msgstr "&Identifier"
-+
-+msgid "Brightness and Gamma"
-+msgstr "Luminosité et Gamma"
-+
-+msgid "Visual Calibration Aid"
-+msgstr "Aide visuelle à la calibration"
-+
-+msgid "Target gamma:"
-+msgstr "Gamma cible:"
-+
-+msgid "Hardware Gamma Control"
-+msgstr "Contrôle du Gamma matériel"
-+
-+msgid "All"
-+msgstr "Tous"
-+
-+msgid "Red"
-+msgstr "Rouge"
-+
-+msgid "Green"
-+msgstr "Vert"
-+
-+msgid "Blue"
-+msgstr "Bleu"
-+
-+msgid "Adjust the gamma sliders to make the squares above fade into their backgrounds as much as possible."
-+msgstr "Ajustez les niveaux de gamma jusqu'à ce que les carrés disparaissent dans le fond autant que possible."
-+
-+msgid "Tip: Most computer software expects a gamma of 2.2.\\nAdditionally, any ICC settings for the selected screen will override the gamma controls available on this tab."
-+msgstr "Astuce: La plupart des logiciels attendent un gamma de 2.2.<br>De plus, les réglages ICC spécifiques pour l'écran sélectionné, s'ils existent, seront prioritaires sur ceux-ci."
-+
-+msgid "Power Management"
-+msgstr "Gestion de l'Energie"
-+
-+msgid "Energy Star (DPMS)"
-+msgstr "Energy Star (DPMS)"
-+
-+msgid "&Enable DPMS power save modes"
-+msgstr "&Activer les modes d'économie d'énergie DPMS"
-+
-+msgid "Enable &standby after"
-+msgstr "Interrompre l'écran après"
-+
-+msgid "Enable &suspend after"
-+msgstr "Activer la mise en veille après"
-+
-+msgid "Enable &power down after"
-+msgstr "Activer l'arrêt après"
-+
-+msgid "minutes."
-+msgstr "minutes."
-+
---- tde-i18n-fr/messages/kdebase/kicker.po.ORI	2013-05-11 20:59:51.416285023 +0200
-+++ tde-i18n-fr/messages/kdebase/kicker.po	2013-05-11 21:01:03.139885540 +0200
-@@ -889,6 +889,24 @@
- msgid "My Documents"
- msgstr "Mes Documents"
- 
-+msgid "My Images"
-+msgstr "Mes Images"
-+
-+msgid "My Music"
-+msgstr "Ma Musique"
-+
-+msgid "My Videos"
-+msgstr "Mes Vidéos"
-+
-+msgid "My Downloads"
-+msgstr "Mes Téléchargements"
-+
-+msgid "Switch to Kickoff Menu Style"
-+msgstr "Utiliser le menu Kickoff"
-+
-+msgid "Switch to Trinity Classic Menu Style"
-+msgstr "Utiliser le menu Classique"
-+
- msgid "Network Folders"
- msgstr "Dossiers Réseau"
- 
---- tde-i18n-fr/messages/kdebase/kcmsmserver.po.ORI	2013-05-11 21:07:13.314644518 +0200
-+++ tde-i18n-fr/messages/kdebase/kcmsmserver.po	2013-05-11 21:12:44.468153019 +0200
-@@ -63,6 +63,12 @@
- "Cochez cette option si vous désirez que le gestionnaire de session affiche une "
- "demande de confirmation avant d'arrêter la session."
- 
-+msgid "Show fancy &logout fadeaway"
-+msgstr "Afficher un fondu gris lors de la déconnexion"
-+
-+msgid "Show logout stat&us dialog"
-+msgstr "Afficher la fenêtre d'état de déconnexion"
-+
- #. i18n: file smserverconfigdlg.ui line 62
- #: rc.cpp:15
- #, no-c-format
-@@ -177,3 +180,16 @@
- "Vous pouvez saisir ici une liste (séparée par des virgules) des applications "
- "qui ne doivent pas être enregistrées, et qui ne seront par conséquent pas "
- "relancées lorsque la session sera restaurée. Par exemple, « xterm,xconsole »."
-+
-+msgid "The new window manager will be used when TDE is started the next time."
-+msgstr "Le nouveau gestionnaire de fenêtres sera utilisé au prochain démarrage de TDE."
-+
-+msgid "Window manager change"
-+msgstr "Modification du gestionnaire de fenêtres"
-+
-+msgid "KWin (KDE default)"
-+msgstr "TWin (par défaut)"
-+
-+msgid "Window Manager"
-+msgstr "Gestionnaire de fenêtres"
-+
---- tde-i18n-fr/messages/kdebase/kcmkdnssd.po.ORI	2013-05-11 21:14:32.762027927 +0200
-+++ tde-i18n-fr/messages/kdebase/kcmkdnssd.po	2013-05-11 21:15:59.767319820 +0200
-@@ -184,3 +184,7 @@
- 
- #~ msgid "Alt+I"
- #~ msgstr "Alt+I"
-+
-+msgid "Enable &Zeroconf network browsing"
-+msgstr "Activer le parcours du réseau avec Zeroconf"
-+
---- tde-i18n-fr/messages/kdebase/kcmenergy.po.ORI	2013-05-11 21:18:10.672748597 +0200
-+++ tde-i18n-fr/messages/kdebase/kcmenergy.po	2013-05-11 21:19:44.590902968 +0200
-@@ -102,3 +102,10 @@
- "Choisissez la période d'inactivité après laquelle l'affichage doit être éteint. "
- "Ceci est le plus haut niveau d'économie d'énergie qui puisse être utilisé "
- "lorsque l'écran est physiquement allumé."
-+
-+msgid "&Enable specific display power management"
-+msgstr "&Activer la gestion spécifique de l'énergie"
-+
-+msgid "Configure KPowersave..."
-+msgstr "Configurer KPowersave..."
-+
---- tde-i18n-fr/messages/kdebase/kio_media.po.ORI	2013-05-11 21:43:21.810972521 +0200
-+++ tde-i18n-fr/messages/kdebase/kio_media.po	2013-05-11 21:43:43.080556048 +0200
-@@ -564,3 +564,7 @@
- #: propsdlgplugin/propsdlgshareplugin.cpp:67
- msgid "&Mounting"
- msgstr "&Montage"
-+
-+msgid "Decrypt"
-+msgstr "Décrypter"
-+
---- tde-i18n-fr/messages/kdebase/kcmmedia.po.ORI	2013-05-11 21:52:54.856736846 +0200
-+++ tde-i18n-fr/messages/kdebase/kcmmedia.po	2013-05-11 21:53:11.780404569 +0200
-@@ -216,3 +216,10 @@
- #, no-c-format
- msgid "Command:"
- msgstr "Commande :"
-+
-+msgid "Mount options"
-+msgstr "Options de montage par défaut"
-+
-+msgid "Here you can specify default mount options for your storage media. Please note that some options are not supported for certain filesystems and/or medium. You will be able to redefine all these options on per-volume basis later, using Properties dialog of the corresponding volume.<br>\nSome of the options are tristate. Leave them \"undefined\" to let KDE choose the best value depending on your media."
-+msgstr "Vous pouvez spécifier ici les options de montage par défaut pour les périphériques amovibles. Veuillez noter que certaines options ne sont pas supportées avec certains systèmes de fichiers ou médias. Vous pourrez redéfinir individuellement toutes ces options pour chaque média ultérieurement, en utilisant la boite de dialogue Propriétés sur ce média.<br>\nCertaines options ont 3 états. Laissez-les grisées pour laisser TDE choisir la meilleure valeur pour vous."
-+
---- tde-i18n-fr/messages/kdebase/kcmkonq.po.ORI	2013-05-11 22:03:57.845711507 +0200
-+++ tde-i18n-fr/messages/kdebase/kcmkonq.po	2013-05-11 22:07:46.429213872 +0200
-@@ -64,6 +64,17 @@
- "seule fenêtre. Quand cette option n'est pas cochée, tous les transferts "
- "apparaissent dans des fenêtres séparées."
- 
-+msgid "Show archived &files as folders"
-+msgstr "Afficher les fichiers &archives comme des dossiers"
-+
-+msgid ""
-+"Checking this option will list archived"
-+" files as folders when using tree view."
-+
-+msgstr ""
-+"Si vous cochez cette option, tous les fichiers archives (ZIP, TAR ...)"
-+" seront affichés comme des dossiers dans l'explorateur de fichiers."
-+
- #: behaviour.cpp:85
- msgid "Show file &tips"
- msgstr "Af&ficher les info-bulles des fichiers"
---- tde-i18n-fr/messages/kdebase/kcmkicker.po.ORI	2013-05-11 23:14:47.566479096 +0200
-+++ tde-i18n-fr/messages/kdebase/kcmkicker.po	2013-05-11 23:29:07.733152080 +0200
-@@ -1032,12 +1032,22 @@
- "y configurer l'aspect et le comportement des poignées d'applets, la teinture de "
- "la transparence et d'autres choses."
- 
-+
-+msgid "Start menu style:"
-+msgstr "Style de menu démarrer:"
-+
-+msgid "Trinity Classic"
-+msgstr "Classique"
-+
- #. i18n: file menutab.ui line 27
- #: rc.cpp:369
- #, no-c-format
- msgid "K Menu"
- msgstr "Menu K"
- 
-+msgid "Open menu on mouse hover"
-+msgstr "Ouvrir le menu au survol de la souris"
-+
- #. i18n: file menutab.ui line 49
- #: rc.cpp:372
- #, no-c-format
-@@ -1122,6 +1126,15 @@
- msgid "Show side ima&ge"
- msgstr "Afficher le &bandeau latéral"
- 
-+msgid "Display text in K Menu button"
-+msgstr "Afficher du texte sur le bouton K Menu"
-+
-+msgid "Text:"
-+msgstr "Texte:"
-+
-+msgid "K Menu button icon:"
-+msgstr "Icone du bouton K Menu:"
-+
- #. i18n: file menutab.ui line 126
- #: rc.cpp:405
- #, no-c-format
-@@ -1281,6 +1300,42 @@
- "Lorsque cette option est sélectionnée, la zone du menu « sous la main » "
- "contiendra les applications les plus utilisées."
- 
-+msgid "Show T&ooltip"
-+msgstr "Afficher les info-bulles"
-+
-+msgid "<qt>When this option is selected, a tooltip appears when hovering the mouse pointer over Application Launcher Menu items. Enabling this option also requires that tooltips are enabled in the Panels->Appearance configuration dialog."
-+msgstr "<qt>Cette option affiche une info-bulle lorsque la souris survole les applications dans le menu de démarrage. Cette option nécessite que les bulles d'aide soient activées dans la rubrique Tableau de bords->Apparence"
-+
-+msgid "Recent Documents Menu"
-+msgstr "Menus des documents récents"
-+
-+msgid "K Menu Search"
-+msgstr "Menus de recherche"
-+
-+msgid "Show search field in K Menu"
-+msgstr "Afficher le champ de recherche dans le menu K"
-+
-+msgid "Blur the background when transparency is enabled"
-+msgstr "Flouter le fond d'écran lorsque la transparence est activée"
-+
-+msgid "When checked, the displayed semi-transparent background image will be blurred to reduce eyestrain"
-+msgstr "Si vous cochez cette case, le fond d'écran semi-transparent sera flouté pour réduire la fatigue visuelle"
-+
-+msgid "Show resize handle on panels"
-+msgstr "Afficher les poignées de redimensionnement"
-+
-+msgid "Enabling this option will show a resize handle on the resizable end of each panel."
-+msgstr "Activer cette option affichera une poignée de redimensionnement à chaque extremité de chaque panneau."
-+
-+msgid "Use deep buttons"
-+msgstr "Utiliser des textures profonds"
-+
-+msgid "Enabling this option will yield more highly textured panels."
-+msgstr "Activer cette option affichera des panneaux davantage texturés."
-+
-+msgid "Enable icon activation effects"
-+msgstr "Activer les effets d'activation des icones"
-+
- #. i18n: file positiontab.ui line 17
- #: rc.cpp:464
- #, no-c-format
---- tde-i18n-fr/messages/kdebase/ksmserver.po.ORI	2013-05-12 22:22:06.947460769 +0200
-+++ tde-i18n-fr/messages/kdebase/ksmserver.po	2013-05-12 22:26:35.822041371 +0200
-@@ -103,3 +103,39 @@
- msgid "Saving your settings..."
- msgstr "Enregistrement de vos paramètres ..."
- 
-+msgid "Would you like to turn off your computer?"
-+msgstr "Souhaitez-vous éteindre votre ordinateur ?"
-+
-+msgid ""
-+"This computer will turn off automatically\n"
-+"after %1 seconds."
-+msgstr ""
-+"Cet ordinateur s'éteindra automatiquement\n"
-+"dans %1 secondes."
-+
-+msgid "Would you like to reboot your computer?"
-+msgstr "Souhaitez-vous redémarrer votre ordinateur ?"
-+
-+msgid "Would you like to reboot to \"%1\"?"
-+msgstr "Voulez-vous redémarrer \"%1\" ?"
-+
-+msgid ""
-+"This computer will reboot automatically\n"
-+"after %1 seconds."
-+msgstr ""
-+"Cet ordinateur redémarrera automatiquement\n"
-+"après %1 secondes."
-+
-+msgid "Would you like to end your current session?"
-+msgstr "Souhaitez-vous fermer votre session ?"
-+
-+msgid ""
-+"This session will end\n"
-+"after %1 seconds automatically."
-+msgstr ""
-+"Cette session sera fermée automatiquement\n"
-+"après %1 secondes."
-+
-+msgid "Confirm"
-+msgstr "Confirmer"
-+
---- tde-i18n-fr/messages/kdebase/kcmkonqhtml.po.ORI	2013-05-12 22:40:57.371286882 +0200
-+++ tde-i18n-fr/messages/kdebase/kcmkonqhtml.po	2013-05-12 22:45:34.458496871 +0200
-@@ -1546,3 +1546,21 @@
- #, no-c-format
- msgid "Use a&rtsdsp to pipe plugin sound through aRts"
- msgstr "Utiliser « a&rtsdsp » pour rediriger le son du module vers aRts"
-+
-+msgid "Sm&ooth scrolling"
-+msgstr "Déflilement fluide"
-+
-+msgid "Enabled"
-+msgstr "Activé"
-+
-+msgid "Disabled"
-+msgstr "Désactivé"
-+
-+msgid ""
-+"Determines whether Konqueror should use smooth steps to scroll HTML pages, or whole steps:<br>"
-+"<ul><li><b>Always</b>: Always use smooth steps when scrolling.</li>"
-+"<li><b>Never</b>: Never use smooth scrolling, scroll with whole steps instead.</li>"
-+msgstr ""
-+"Détermine si Konqueror doit utiliser un défilement fluide des pages HTML, ou un défilement par étapes:<br>"
-+"<ul><li><b>Toujours</b>: Toujours utiliser le défilement fluide.</li>"
-+"<li><b>Jamais</b>: Ne jamais utiliser le défilement fluide, défiler pas par pas.</li>"
---- tde-i18n-fr/messages/kdebase/kcmkwm.po.ORI	2013-05-12 22:53:03.442689656 +0200
-+++ tde-i18n-fr/messages/kdebase/kcmkwm.po	2013-05-12 23:06:59.007771110 +0200
-@@ -1185,3 +1185,22 @@
- msgstr ""
- "<qt>La gestion de la transparence est récente et peut causer des problèmes, "
- "<br> incluant des plantages (du moteur de transparence ou même de X).</qt>"
-+
-+msgid "Enable the Trinity window composition manager"
-+msgstr "Activer le gestionnaire de composition de fenêtres de Trinity"
-+
-+msgid "Use shadows (standard effects should be disabled in the Styles module if this is checked)"
-+msgstr "Utiliser les ombres (l'effet standard d'ombre doit être désactivé dans le menu Styles)"
-+
-+msgid "Base shadow size:"
-+msgstr "Taille de base de l'ombre:"
-+
-+msgid "Active window shadow size multiplier:"
-+msgstr "Multiplier la taille de l'ombre de la fenêtre active:"
-+
-+msgid "Dock shadow size multiplier:"
-+msgstr "Multiplier la taille de l'ombre du dock:"
-+
-+msgid "Fade-in menus (requires menu fade effect to be disabled in the Styles module)"
-+msgstr "Apparition progressive des menus (nécessite que l'apparition progressive soit désactivée dans le menu Styles)"
-+
---- tde-i18n-fr/messages/kdebase/kcmscreensaver.po.ORI	2013-05-14 23:49:35.272995867 +0200
-+++ tde-i18n-fr/messages/kdebase/kcmscreensaver.po	2013-05-15 00:00:03.074900231 +0200
-@@ -338,3 +338,33 @@
- #: scrnsave.cpp:470
- msgid "Loading..."
- msgstr "Chargement..."
-+
-+msgid "&Delay saver start after lock"
-+msgstr "Retarder l'économiseur d'écran"
-+
-+msgid "When manually locking the screen, wait to start the screen saver until the configured start delay has elapsed."
-+msgstr "Lors du verrouillage manuel de l'écran, attendre le délai indiqué pour démarrer l'économiseur d'écran."
-+
-+msgid "&Use Secure Attention Key"
-+msgstr "Utiliser les touches de sécurité"
-+
-+msgid "Require Secure Attention Key prior to displaying the unlock dialog."
-+msgstr "Exiger l'appui sur CTRL+ALT+SUPPR avant de demander le mot de passe."
-+
-+msgid "Use &legacy lock windows"
-+msgstr "Utiliser l'ancienne fenêtre de verrouillage"
-+
-+msgid "Use old-style unmanaged X11 lock windows."
-+msgstr "Utiliser l'ancienne fenêtre X11 de verrouillage, non gérée par Trinity."
-+
-+msgid "&Hide active windows from saver"
-+msgstr "&Masquer les fenêtres actives"
-+
-+msgid "Hide all active windows from the screen saver and use the desktop background as the screen saver input."
-+msgstr "Masquer toutes les fenêtres actives et afficher le fond d'écran lorsque l'économiseur d'écran est déclenché."
-+
-+msgid "&Vibrate unlock dialog box on failure"
-+msgstr "&Vibrer en cas d'échec de déverrouillage"
-+
-+msgid "Makes the unlock dialog box vibrate when entering an incorrect password."
-+msgstr "Faire vibrer la fenêtre de déverrouillage lorsqu'un mauvais mot de passe est saisi."
---- tde-i18n-fr/messages/kdebase/kdmconfig.po.ORI	2013-05-15 00:01:50.557981168 +0200
-+++ tde-i18n-fr/messages/kdebase/kdmconfig.po	2013-05-15 00:03:54.685758336 +0200
-@@ -895,3 +895,24 @@
- "_: EMAIL OF TRANSLATORS\n"
- "Your emails"
- msgstr "cousin@kde.org,caulier.gilles@free.fr,kde@macolu.org"
-+
-+msgid "Secure Attention Key"
-+msgstr "Touches de sécurité"
-+
-+msgid "Enable Secure Attention Key"
-+msgstr "Activer les touches de sécurité"
-+
-+msgid "Secure Attention Key support is not available on your system.  Please check for the presence of evdev and uinput."
-+msgstr "Le support des touches de sécurité n'est pas disponible sur votre système. Veuillez vérifier la présence de evdev et uinput."
-+
-+msgid "Here you can enable or disable the Secure Attention Key [SAK] anti-spoofing measure."
-+msgstr "Vous pouvez activer ou désactiver les touches de sécurité, mesure anti-usurpation."
-+
-+msgid "Restart X-Server with session exit"
-+msgstr "Redémarrer le serveur X après la fermeture de la session."
-+
-+msgid "Whether the login manager should restart the local X-Server after a session exit instead of resetting. Use this when the X-Server leaks memory, crashes the system on reset attempts, or otherwise exhibits display issues."
-+msgstr "Spécifie si le gestionnaire de connexion doit redémarrer le serveur X local après une fermeture de session au lieu de le réinitialiser. Utilisez cette option si le serveur X a des problèmes de stabilité, d'affichage, ou des fuite mémoire."
-+
-+msgid "Allow &Root Login"
-+msgstr "Autoriser la connexion en tant qu'utilisateur &Root"
---- tde-i18n-fr/messages/kdebase/kcmbackground.po.ORI	2013-05-15 20:43:56.647074858 +0200
-+++ tde-i18n-fr/messages/kdebase/kcmbackground.po	2013-05-15 20:46:02.044250812 +0200
-@@ -920,3 +920,9 @@
- #, no-c-format
- msgid "Move &Up"
- msgstr "Mon&ter"
-+
-+msgid "Cross-fading background"
-+msgstr "Affichage progressif du fond d'écran"
-+
-+msgid "Enables a smooth fading effect when changing background image."
-+msgstr "Activer un effet de fondu lors du changement de fond d'écran."
---- tde-i18n-fr/messages/kdebase/kminipagerapplet.po.ORI	2013-05-17 21:28:37.998756359 +0200
-+++ tde-i18n-fr/messages/kdebase/kminipagerapplet.po	2013-05-17 21:29:50.398145568 +0200
-@@ -193,3 +193,6 @@
- #, no-c-format
- msgid "Show window icons in previews?"
- msgstr "Afficher les icônes des fenêtres dans les aperçus ?"
-+
-+msgid "&Cycle on Wheel"
-+msgstr "&Changer de bureau à la molette"
diff --git a/redhat/tdegames/tdegames-14.0.0.spec b/redhat/tdegames/tdegames-14.0.0.spec
index a995053c9..b52acfc5a 100644
--- a/redhat/tdegames/tdegames-14.0.0.spec
+++ b/redhat/tdegames/tdegames-14.0.0.spec
@@ -1532,7 +1532,7 @@ update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
 %build
 unset QTDIR QTINC QTLIB
 export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
+export TDEDIR="%{tde_prefix}"
 
 # Specific path for RHEL4
 if [ -d "/usr/X11R6" ]; then
-- 
cgit v1.2.1


From 80c577532936b071edecd855fb86012496194e3c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Andriot?= <albator78@libertysurf.fr>
Date: Fri, 3 Oct 2014 22:21:34 +0200
Subject: RPM Packaging: update TQT3

---
 redhat/dependencies/tqt3/tqt3-14.0.0.spec | 37 ++++++++++++++++++++++++-------
 1 file changed, 29 insertions(+), 8 deletions(-)

diff --git a/redhat/dependencies/tqt3/tqt3-14.0.0.spec b/redhat/dependencies/tqt3/tqt3-14.0.0.spec
index 723bf83af..4b566c17a 100644
--- a/redhat/dependencies/tqt3/tqt3-14.0.0.spec
+++ b/redhat/dependencies/tqt3/tqt3-14.0.0.spec
@@ -52,21 +52,42 @@ Source12:	tqdesigner.desktop
 Source13:	tqlinguist.desktop
 Source14:	tqtconfig.desktop
 
-BuildRequires: desktop-file-utils
-BuildRequires: libmng-devel
+
 BuildRequires: glibc-devel
-BuildRequires: libjpeg-devel
-BuildRequires: libpng-devel
-BuildRequires: zlib-devel
-BuildRequires: giflib-devel
+BuildRequires: gcc-c++
+BuildRequires: make
+
+BuildRequires: desktop-file-utils
 BuildRequires: perl
 BuildRequires: sed
 BuildRequires: findutils
 BuildRequires: tar
+
+# ZLIB support
+BuildRequires: zlib-devel
+
+# JPEG support
+BuildRequires: libjpeg-devel
+
+# MNG support
+BuildRequires: libmng-devel
+
+# PNG support
+BuildRequires: libpng-devel
+
+# GIF support
+BuildRequires: giflib-devel
+
+# FREETYPE support
 BuildRequires: freetype-devel
+
+# FONTCONFIG support
 BuildRequires: fontconfig-devel
-BuildRequires: gcc-c++
-BuildRequires: make
+
+# SUSE desktop files utility
+%if 0%{?suse_version}
+BuildRequires:	update-desktop-files
+%endif
 
 # CUPS support
 BuildRequires: cups-devel
-- 
cgit v1.2.1


From 473c7cd7fa5b1650b203cb5207a4320b0c57a9c0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Andriot?= <albator78@libertysurf.fr>
Date: Fri, 3 Oct 2014 22:45:35 +0200
Subject: RPM Packaging: update TQT3

---
 redhat/dependencies/tqt3/tqt3-14.0.0.spec | 52 +++++++++++++++----------------
 1 file changed, 26 insertions(+), 26 deletions(-)

diff --git a/redhat/dependencies/tqt3/tqt3-14.0.0.spec b/redhat/dependencies/tqt3/tqt3-14.0.0.spec
index 4b566c17a..ed5b5c55e 100644
--- a/redhat/dependencies/tqt3/tqt3-14.0.0.spec
+++ b/redhat/dependencies/tqt3/tqt3-14.0.0.spec
@@ -981,8 +981,8 @@ For TQt3 development, you most likely want to install this package.
 %{_bindir}/tquic
 %{_bindir}/tqmoc
 %{_bindir}/tqembed
-%{_mandir}/man1/lrelease-tqt3.1*
 %{_mandir}/man1/lupdate-tqt3.1.gz
+%{_mandir}/man1/lrelease-tqt3.1*
 %{_mandir}/man1/moc-tqt3.1*
 %{_mandir}/man1/uic-tqt3.1*
 
@@ -1007,6 +1007,7 @@ that are written using TQt3.
 Summary:	TQt3 Designer
 Group:		System/GUI/Other
 Requires:	%{libtqt3}-mt = %{version}-%{release}
+Requires:	tqt3-doc = %{version}-%{release}
 
 %description -n tqt3-designer
 The TQt Designer is a GUI design program that interactively lets you
@@ -1091,6 +1092,7 @@ developer includes with his application.
 Summary:	The TQt3 Linguist
 Group:		System/GUI/Other
 Requires:	%{libtqt3}-mt = %{version}-%{release}
+Requires:	tqt3-doc = %{version}-%{release}
 
 %description -n tqt3-linguist
 This package contains the TQt3 Linguist which provides translators a
@@ -1116,6 +1118,7 @@ development files by the translator.
 Summary:	The TQt3 assistant application
 Group:		System/GUI/Other
 Requires:	%{libtqt3}-mt = %{version}-%{release}
+Requires:	tqt3-doc = %{version}-%{release}
 
 %description -n tqt3-assistant
 This package contains the TQt3 Assistant, an easy to use frontend for
@@ -1144,6 +1147,7 @@ the package tqt3-apps-devel.
 Summary:	The TQt3 Configuration Application
 Group:		Development/Libraries/X11
 Requires:	%{libtqt3}-mt = %{version}-%{release}
+Requires:	tqt3-doc = %{version}-%{release}
 
 %description -n tqt3-qtconfig
 The TQt Configuration program allows endusers to configure the look
@@ -1331,10 +1335,6 @@ export PATH=${QTDIR}/bin:${PATH}
 export MANPATH=${QTDIR}/doc/man:${MANPATH}
 export LD_LIBRARY_PATH="${QTDIR}/lib"
 
-%if 0%{?rhel} == 5
-%__sed -i src/kernel/ntqstyle.h -e "s|#ifdef ENABLE_TQSTYLECONTROLELEMENTDATA_SLOW_COPY|#if 1|"
-%endif
-
 # Checks for supplementary include dir
 INCDIRS=""
 for d in \
@@ -1457,35 +1457,35 @@ export LD_LIBRARY_PATH=${QTDIR}/lib
 %__make INSTALL_ROOT=%{?buildroot} install
 %__make INSTALL_ROOT=%{?buildroot} plugins-install
 
-%__install -m755 bin/tqtrename140 %{?buildroot}%{_bindir}
-%__install -m755 bin/tqt20fix %{?buildroot}%{_bindir}
-%__install -m755 bin/tqtfindtr %{?buildroot}%{_bindir}
+%__install -m755 "bin/tqtrename140" "%{?buildroot}%{_bindir}"
+%__install -m755 "bin/tqt20fix" "%{?buildroot}%{_bindir}"
+%__install -m755 "bin/tqtfindtr" "%{?buildroot}%{_bindir}"
 
 # install tqtconv2ui
-%__install -m755 bin/tqtconv2ui %{?buildroot}%{_bindir}/tqtconv2ui
+%__install -m755 "bin/tqtconv2ui" "%{?buildroot}%{_bindir}/tqtconv2ui"
 
 # install tqvfb
-%__install -m755 -D tools/tqvfb/tqvfb %{?buildroot}%{_bindir}/tqvfb
-%__install -m644 -D tools/tqvfb/pda.skin %{?buildroot}%{_sysconfdir}/tqt3/tqvfb/pda.skin
-%__install -m644 -D tools/tqvfb/pda_down.png %{?buildroot}%{_datadir}/tqvfb/pda_down.png
-%__install -m644 -D tools/tqvfb/pda_up.png %{?buildroot}%{_datadir}/tqvfb/pda_up.png
+%__install -m755 -D "tools/tqvfb/tqvfb" "%{?buildroot}%{_bindir}/tqvfb"
+%__install -m644 -D "tools/tqvfb/pda.skin" "%{?buildroot}%{_sysconfdir}/tqt3/tqvfb/pda.skin"
+%__install -m644 -D "tools/tqvfb/pda_down.png" "%{?buildroot}%{_datadir}/tqvfb/pda_down.png"
+%__install -m644 -D "tools/tqvfb/pda_up.png" "%{?buildroot}%{_datadir}/tqvfb/pda_up.png"
 
 ## create tqt3-apps-dev-package
 cp tools/designer/interfaces/*.h %{?buildroot}%{?_includedir}/tqt3/
 cp tools/designer/editor/*.h %{?buildroot}%{?_includedir}/tqt3/
 
 # language file for linguist
-%__install -D -m644 translations/qt_untranslated.ts %{?buildroot}%{?_docdir}/tqt3-linguist/qt_untranslated.ts
+%__install -D -m644 "translations/qt_untranslated.ts" "%{?buildroot}%{?_docdir}/tqt3-linguist/qt_untranslated.ts"
 
 # fix that stupid friggin professional file
-perl -pi -e 's{\$$\$$QT_SOURCE_TREE}{$(QTDIR)}' src/qt_professional.pri
+perl -pi -e 's{\$$\$$QT_SOURCE_TREE}{$(QTDIR)}' "src/qt_professional.pri"
 
 ## i18n files for designer, linguist and assistant
 for i in designer/designer assistant linguist/linguist; do
   pushd "tools/${i}"
   tqlrelease "${i##*/}.pro"
   for j in ${i##*/}_*.qm; do
-    install -m644 "${j}" %{?buildroot}%{_datadir}/tqt3/translations/
+    install -m644 "${j}" "%{?buildroot}%{_datadir}/tqt3/translations/"
   done
   popd
 done
@@ -1497,10 +1497,10 @@ done
 %__install -m644 -D "%{SOURCE14}" "%{?buildroot}%{_datadir}/applications/tqtconfig.desktop"
 
 %if 0%{?suse_version}
-%suse_update_desktop_file tqassistant
-%suse_update_desktop_file tqdesigner
-%suse_update_desktop_file tqlinguist
-%suse_update_desktop_file tqtconfig
+%suse_update_desktop_file tqassistant Documentation
+%suse_update_desktop_file tqdesigner GUIDesigner
+%suse_update_desktop_file tqlinguist Translation
+%suse_update_desktop_file tqtconfig Settings
 %endif
 
 # Install applications icons
@@ -1511,15 +1511,15 @@ done
 
 # build attic package and copy it to tqt3-compat-headers
 pushd src
-tar cvvfz attic.tar.gz attic/
+tar cvvfz "attic.tar.gz" attic/
 install -D -m644 "attic.tar.gz" "%{?buildroot}%{_docdir}/tqt3-compat-headers/attic.tar.gz"
 popd
 
 # install the man pages
-install -D -m644 doc/man/man1/moc.1 %{?buildroot}%{_mandir}/man1/moc-tqt3.1
-install -D -m644 doc/man/man1/uic.1 %{?buildroot}%{_mandir}/man1/uic-tqt3.1
-install -D -m644 doc/man/man1/lrelease.1 %{?buildroot}%{_mandir}/man1/lrelease-tqt3.1
-install -D -m644 doc/man/man1/lupdate.1 %{?buildroot}%{_mandir}/man1/lupdate-tqt3.1
+install -D -m644 "doc/man/man1/moc.1" "%{?buildroot}%{_mandir}/man1/moc-tqt3.1"
+install -D -m644 "doc/man/man1/uic.1" "%{?buildroot}%{_mandir}/man1/uic-tqt3.1"
+install -D -m644 "doc/man/man1/lrelease.1" "%{?buildroot}%{_mandir}/man1/lrelease-tqt3.1"
+install -D -m644 "doc/man/man1/lupdate.1" "%{?buildroot}%{_mandir}/man1/lupdate-tqt3.1"
 
 # Install source for the designer tools, such as tqtcreatecw.
 cp -ra tools/designer/tools %{?buildroot}%{_datadir}/tqt3/tools
@@ -1548,7 +1548,7 @@ find tqt3-examples -name ".obj" | xargs rm -rf
 find tqt3-examples -name "Makefile" | xargs rm -rf
 install -D -m 755 %{SOURCE1} %{?buildroot}%{_docdir}/tqt3-examples/build-examples
 tar cvvfz tqt3-examples.tar.gz tqt3-examples/
-install -D -m644  tqt3-examples.tar.gz %{?buildroot}%{_docdir}/tqt3-examples/tqt3-examples.tar.gz
+install -D -m644 "tqt3-examples.tar.gz" "%{?buildroot}%{_docdir}/tqt3-examples/tqt3-examples.tar.gz"
 
 %clean
 %__rm -rf %{buildroot}
-- 
cgit v1.2.1


From df34b5611a633200e1f2dd319ea7cb1f63755b0c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Andriot?= <albator78@libertysurf.fr>
Date: Fri, 3 Oct 2014 23:04:32 +0200
Subject: RPM Packaging: update tqt3

---
 redhat/dependencies/tqt3/tqt3-14.0.0.spec          |   3 +-
 .../tdebase/tdebase-14.0.0-default_menu_icon.patch |  20 ---
 ...tdebase-14.0.0-fix_twin_rules_translation.patch |  34 ----
 .../tdebase-14.0.0-kcm_xcursor_applytheme.patch    | 136 ---------------
 .../tdebase/tdebase-14.0.0-konsole_wordseps.patch  |  48 ------
 .../tdebase-14.0.0-mandriva_use_drakclock.patch    |  16 --
 .../tdebase-14.0.0-open_terminal_here.patch        |  20 ---
 .../tdebase/tdebase-14.0.0-suspend_unmount.patch   | 151 -----------------
 ...e-14.0.0-tdehardwarebackend_fix_iocharset.patch |  25 ---
 redhat/tdebase/tdebase-14.0.0-vibrate_dialog.patch | 186 ---------------------
 10 files changed, 2 insertions(+), 637 deletions(-)
 delete mode 100644 redhat/tdebase/tdebase-14.0.0-default_menu_icon.patch
 delete mode 100644 redhat/tdebase/tdebase-14.0.0-fix_twin_rules_translation.patch
 delete mode 100644 redhat/tdebase/tdebase-14.0.0-kcm_xcursor_applytheme.patch
 delete mode 100644 redhat/tdebase/tdebase-14.0.0-konsole_wordseps.patch
 delete mode 100644 redhat/tdebase/tdebase-14.0.0-mandriva_use_drakclock.patch
 delete mode 100644 redhat/tdebase/tdebase-14.0.0-open_terminal_here.patch
 delete mode 100644 redhat/tdebase/tdebase-14.0.0-suspend_unmount.patch
 delete mode 100644 redhat/tdebase/tdebase-14.0.0-tdehardwarebackend_fix_iocharset.patch
 delete mode 100644 redhat/tdebase/tdebase-14.0.0-vibrate_dialog.patch

diff --git a/redhat/dependencies/tqt3/tqt3-14.0.0.spec b/redhat/dependencies/tqt3/tqt3-14.0.0.spec
index ed5b5c55e..a30a5904e 100644
--- a/redhat/dependencies/tqt3/tqt3-14.0.0.spec
+++ b/redhat/dependencies/tqt3/tqt3-14.0.0.spec
@@ -1500,7 +1500,7 @@ done
 %suse_update_desktop_file tqassistant Documentation
 %suse_update_desktop_file tqdesigner GUIDesigner
 %suse_update_desktop_file tqlinguist Translation
-%suse_update_desktop_file tqtconfig Settings
+%suse_update_desktop_file tqtconfig Utility
 %endif
 
 # Install applications icons
@@ -1550,6 +1550,7 @@ install -D -m 755 %{SOURCE1} %{?buildroot}%{_docdir}/tqt3-examples/build-example
 tar cvvfz tqt3-examples.tar.gz tqt3-examples/
 install -D -m644 "tqt3-examples.tar.gz" "%{?buildroot}%{_docdir}/tqt3-examples/tqt3-examples.tar.gz"
 
+
 %clean
 %__rm -rf %{buildroot}
 
diff --git a/redhat/tdebase/tdebase-14.0.0-default_menu_icon.patch b/redhat/tdebase/tdebase-14.0.0-default_menu_icon.patch
deleted file mode 100644
index db8052381..000000000
--- a/redhat/tdebase/tdebase-14.0.0-default_menu_icon.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- trinity-tdebase-14.0.0~pre737+02bf1e69/starttde.ORI	2013-07-07 20:01:47.656584924 +0200
-+++ trinity-tdebase-14.0.0~pre737+02bf1e69/starttde	2013-07-07 20:04:37.039608089 +0200
-@@ -347,6 +347,17 @@
-   fi
- fi
- 
-+# Default Start Button icon for TDE
-+if [ ! -e "$tdehome/share/config/kickerrc" ]; then
-+  if [ -r "%{tde_starticon}" ]; then
-+    [ -d "$tdehome/share/config" ] || mkdir -p "$tdehome/share/config"
-+    cat <<EOF >"$tdehome/share/config/kickerrc"
-+[KMenu]
-+CustomIcon=%{tde_starticon}
-+EOF
-+  fi
-+fi
-+
- # XCursor mouse theme needs to be applied here to work even for kded or ksmserver.
- if test -n "$kcminputrc_mouse_cursortheme" -o -n "$kcminputrc_mouse_cursorsize" ; then
-   kapplymousetheme "$kcminputrc_mouse_cursortheme" "$kcminputrc_mouse_cursorsize"
diff --git a/redhat/tdebase/tdebase-14.0.0-fix_twin_rules_translation.patch b/redhat/tdebase/tdebase-14.0.0-fix_twin_rules_translation.patch
deleted file mode 100644
index d34db88d8..000000000
--- a/redhat/tdebase/tdebase-14.0.0-fix_twin_rules_translation.patch
+++ /dev/null
@@ -1,34 +0,0 @@
---- trinity-tdebase/twin/data/update_default_rules.cpp.ORI	2013-07-27 11:49:19.337804333 +0200
-+++ trinity-tdebase/twin/data/update_default_rules.cpp	2013-07-27 19:12:32.144222960 +0200
-@@ -15,12 +15,18 @@
- #include <kdebug.h>
- #include <kinstance.h>
- #include <kstandarddirs.h>
-+#include <tdeaboutdata.h>
-+#include <tdecmdlineargs.h>
-+#include <tdeglobal.h>
- 
- int main( int argc, char* argv[] )
-     {
-     if( argc != 2 )
-         return 1;
--    TDEInstance inst( "twin_update_default_rules" );
-+    TDEAboutData about( "twin_update_default_rules", I18N_NOOP("TWin"), 0, 0, TDEAboutData::License_GPL, I18N_NOOP( "(c) 2004 KWin and KControl Authors" ) );
-+    TDECmdLineArgs::init( argc, argv, &about );
-+    TDEInstance inst( &about );
-+    Q_UNUSED( TDEGlobal::locale() ); // jump-start locales to get to translated desriptions
-     TQString file = locate( "data", TQString( "twin/default_rules/" ) + argv[ 1 ] );
-     if( file.isEmpty())
-         {
-@@ -43,8 +49,10 @@
-         dest_cfg.setGroup( TQString::number( pos ));
-         for( TQMap< TQString, TQString >::ConstIterator it = entries.begin();
-              it != entries.end();
--             ++it )
-+             ++it ) {
-+				 printf("DEBUG: %s\n", it.key().latin1());
-             dest_cfg.writeEntry( it.key(), *it );
-+			}
-         }
-     dest_cfg.setGroup( "General" );
-     dest_cfg.writeEntry( "count", pos );
diff --git a/redhat/tdebase/tdebase-14.0.0-kcm_xcursor_applytheme.patch b/redhat/tdebase/tdebase-14.0.0-kcm_xcursor_applytheme.patch
deleted file mode 100644
index b5adadbc9..000000000
--- a/redhat/tdebase/tdebase-14.0.0-kcm_xcursor_applytheme.patch
+++ /dev/null
@@ -1,136 +0,0 @@
---- tdebase/kcontrol/input/xcursor/themepage.cpp.ORI	2013-07-22 19:33:45.153674930 +0200
-+++ tdebase/kcontrol/input/xcursor/themepage.cpp	2013-07-23 15:24:01.664497762 +0200
-@@ -33,6 +33,8 @@
- #include <tdeio/netaccess.h>
- #include <ktar.h>
- 
-+#include "../../krdb/krdb.h"
-+
- #include <tqlayout.h>
- #include <tqdir.h>
- #include <tqpixmap.h>
-@@ -42,6 +44,7 @@
- #include <tqpainter.h>
- #include <tqfileinfo.h>
- #include <tqpushbutton.h>
-+#include <dcopref.h>
- 
- #include <cstdlib> // for getenv()
- 
-@@ -53,6 +56,10 @@
- #include <X11/Xlib.h>
- #include <X11/Xcursor/Xcursor.h>
- 
-+#ifdef HAVE_XFIXES
-+#  include <X11/extensions/Xfixes.h>
-+#endif
-+
- // Check for older version
- #if !defined(XCURSOR_LIB_MAJOR) && defined(XCURSOR_MAJOR)
- # define XCURSOR_LIB_MAJOR	XCURSOR_MAJOR
-@@ -133,6 +140,65 @@
- {
- }
- 
-+bool ThemePage::applyTheme(TQString theme, TQString size)
-+{
-+#ifdef HAVE_XCURSOR
-+    if (theme.isEmpty()) {
-+        return false;
-+    }
-+
-+    // Apply the TDE cursor theme to ourselves
-+    XcursorSetTheme(tqt_xdisplay(), theme.latin1());
-+
-+    // Tell tdelauncher to set the XCURSOR_THEME and XCURSOR_SIZE environment
-+    // variables when launching applications.
-+    DCOPRef tdelauncher("tdelauncher");
-+    tdelauncher.send("setLaunchEnv", TQCString("XCURSOR_THEME"), TQFile::encodeName(theme));
-+    if( !size.isEmpty()) {
-+        tdelauncher.send("setLaunchEnv", TQCString("XCURSOR_SIZE"), size);
-+    }
-+
-+    // Update the Xcursor X resources
-+    runRdb(0);
-+
-+    // Apply the TDE cursor size to ourselves
-+    if (!size.isEmpty()) {
-+    	XcursorSetDefaultSize(tqt_xdisplay(), size.toUInt());
-+    }
-+
-+    // Reload the standard cursors
-+    TQStringList names;
-+
-+    // Qt cursors
-+    names << "left_ptr"       << "up_arrow"      << "cross"      << "wait"
-+          << "left_ptr_watch" << "ibeam"         << "size_ver"   << "size_hor"
-+          << "size_bdiag"     << "size_fdiag"    << "size_all"   << "split_v"
-+          << "split_h"        << "pointing_hand" << "openhand"
-+          << "closedhand"     << "forbidden"     << "whats_this" << "copy" << "move" << "link";
-+
-+    // X core cursors
-+    names << "X_cursor"            << "right_ptr"           << "hand1"
-+          << "hand2"               << "watch"               << "xterm"
-+          << "crosshair"           << "left_ptr_watch"      << "center_ptr"
-+          << "sb_h_double_arrow"   << "sb_v_double_arrow"   << "fleur"
-+          << "top_left_corner"     << "top_side"            << "top_right_corner"
-+          << "right_side"          << "bottom_right_corner" << "bottom_side"
-+          << "bottom_left_corner"  << "left_side"           << "question_arrow"
-+          << "pirate";
-+
-+    for (int i = 0; i < names.size(); ++i)
-+    {
-+        const char* name = (*(names.at(i))).ascii();
-+        Cursor handle = XcursorLibraryLoadCursor(tqt_xdisplay(), name);
-+        XFixesChangeCursorByName(tqt_xdisplay(), handle, TQFile::encodeName(name));
-+        XFreeCursor(tqt_xdisplay(), handle); // Don't leak the cursor
-+    }
-+
-+    return true;
-+#else // HAVE_XCURSOR
-+    return false;
-+#endif
-+}
- 
- void ThemePage::save()
- {
-@@ -145,10 +209,17 @@
- 	c.setGroup( "Mouse" );
- 	c.writeEntry( "cursorTheme", selectedTheme != "system" ? selectedTheme : TQString::null );
- 
--	KMessageBox::information( this, i18n("You have to restart TDE for these "
-+    // The Kcontrol panel does not allow to set cursor size for now.
-+    // So we keep the same size as written in config file.
-+    TQCString size = c.readEntry("cursorSize", TQString()).local8Bit();
-+
-+    if (!applyTheme(selectedTheme, size))
-+    {
-+		KMessageBox::information( this, i18n("You have to restart TDE for these "
- 				"changes to take effect."), i18n("Cursor Settings Changed"),
- 				"CursorSettingsChanged" );
--
-+	}
-+	
- 	currentTheme = selectedTheme;
- }
- 
---- tdebase/kcontrol/input/xcursor/themepage.h.ORI	2013-07-22 19:49:33.467191658 +0200
-+++ tdebase/kcontrol/input/xcursor/themepage.h	2013-07-22 19:56:03.990484896 +0200
-@@ -45,6 +45,7 @@
- 		void load();
- 		void load( bool useDefaults );
- 		void defaults();
-+		bool applyTheme(TQString theme, TQString size);
- 
- 	signals:
- 		void changed( bool );
---- tdebase/kcontrol/input/xcursor/CMakeLists.txt.ORI	2013-07-23 15:24:41.178064068 +0200
-+++ tdebase/kcontrol/input/xcursor/CMakeLists.txt	2013-07-23 15:27:31.694851294 +0200
-@@ -21,5 +21,6 @@
- 
- tde_add_library( themepage STATIC_PIC AUTOMOC
-   SOURCES
--    themepage.cpp previewwidget.cpp
-+    themepage.cpp previewwidget.cpp ../../krdb/krdb.cpp
-+  LINK Xfixes
- )
diff --git a/redhat/tdebase/tdebase-14.0.0-konsole_wordseps.patch b/redhat/tdebase/tdebase-14.0.0-konsole_wordseps.patch
deleted file mode 100644
index a0cb449a4..000000000
--- a/redhat/tdebase/tdebase-14.0.0-konsole_wordseps.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-diff -Nuar trinity-tdebase-14.0.0~pre737+02bf1e69.ORI/kcontrol/konsole/kcmkonsole.cpp trinity-tdebase-14.0.0~pre737+02bf1e69/kcontrol/konsole/kcmkonsole.cpp
---- trinity-tdebase-14.0.0~pre737+02bf1e69.ORI/kcontrol/konsole/kcmkonsole.cpp	2013-07-10 07:56:40.070802259 +0200
-+++ trinity-tdebase-14.0.0~pre737+02bf1e69/kcontrol/konsole/kcmkonsole.cpp	2013-07-10 07:58:53.680465150 +0200
-@@ -107,7 +107,7 @@
-     dialog->frameCB->setChecked(config.readBoolEntry("has frame",true));
-     dialog->line_spacingSB->setValue(config.readUnsignedNumEntry( "LineSpacing", 0 ));
-     dialog->silence_secondsSB->setValue(config.readUnsignedNumEntry( "SilenceSeconds", 10 ));
--    dialog->word_connectorLE->setText(config.readEntry("wordseps",":@-./_~"));
-+    dialog->word_connectorLE->setText(config.readEntry("wordseps",":@-./_~+"));
-     dialog->metaAsAltModeCB->setChecked(config.readBoolEntry("metaAsAltMode",false));
-
-     dialog->SchemaEditor1->setSchema(config.readEntry("schema"));
-diff -Nuar trinity-tdebase-14.0.0~pre737+02bf1e69.ORI/konsole/konsole/konsole.cpp trinity-tdebase-14.0.0~pre737+02bf1e69/konsole/konsole/konsole.cpp
---- trinity-tdebase-14.0.0~pre737+02bf1e69.ORI/konsole/konsole/konsole.cpp	2013-07-10 07:56:40.112802782 +0200
-+++ trinity-tdebase-14.0.0~pre737+02bf1e69/konsole/konsole/konsole.cpp	2013-07-10 07:58:53.698465376 +0200
-@@ -1573,7 +1573,7 @@
-      b_warnQuit=config->readBoolEntry( "WarnQuit", true );
-      b_allowResize=config->readBoolEntry( "AllowResize", false);
-      b_bidiEnabled = config->readBoolEntry("EnableBidi",false);
--     s_word_seps= config->readEntry("wordseps",":@-./_~");
-+     s_word_seps= config->readEntry("wordseps",":@-./_~+");
-      b_framevis = config->readBoolEntry("has frame",true);
-      b_metaAsAlt = config->readBoolEntry("metaAsAltMode",false);
-      TQPtrList<TEWidget> tes = activeTEs();
-diff -Nuar trinity-tdebase-14.0.0~pre737+02bf1e69.ORI/konsole/konsole/konsole_part.cpp trinity-tdebase-14.0.0~pre737+02bf1e69/konsole/konsole/konsole_part.cpp
---- trinity-tdebase-14.0.0~pre737+02bf1e69.ORI/konsole/konsole/konsole_part.cpp	2013-07-10 07:56:40.112802782 +0200
-+++ trinity-tdebase-14.0.0~pre737+02bf1e69/konsole/konsole/konsole_part.cpp	2013-07-10 07:58:53.684465202 +0200
-@@ -565,7 +565,7 @@
-   n_keytab=config->readNumEntry("keytab",0); // act. the keytab for this session
-   n_scroll = TQMIN(config->readUnsignedNumEntry("scrollbar",TEWidget::SCRRIGHT),2);
-   m_histSize = config->readNumEntry("history",DEFAULT_HISTORY_SIZE);
--  s_word_seps= config->readEntry("wordseps",":@-./_~");
-+  s_word_seps= config->readEntry("wordseps",":@-./_~+"); 
-   n_encoding = config->readNumEntry("encoding",0);
- 
-   TQFont tmpFont = TDEGlobalSettings::fixedFont();
-diff -Nuar trinity-tdebase-14.0.0~pre737+02bf1e69.ORI/konsole/konsole/TEWidget.cpp trinity-tdebase-14.0.0~pre737+02bf1e69/konsole/konsole/TEWidget.cpp
---- trinity-tdebase-14.0.0~pre737+02bf1e69.ORI/konsole/konsole/TEWidget.cpp	2013-07-10 07:56:40.112802782 +0200
-+++ trinity-tdebase-14.0.0~pre737+02bf1e69/konsole/konsole/TEWidget.cpp	2013-07-10 07:58:53.690465276 +0200
-@@ -352,7 +352,7 @@
- ,preserve_line_breaks(true)
- ,column_selection_mode(false)
- ,scrollLoc(SCRNONE)
--,word_characters(":@-./_~")
-+,word_characters(":@-./_~+")
- ,m_bellMode(BELLSYSTEM)
- ,blinking(false)
- ,cursorBlinking(false)
diff --git a/redhat/tdebase/tdebase-14.0.0-mandriva_use_drakclock.patch b/redhat/tdebase/tdebase-14.0.0-mandriva_use_drakclock.patch
deleted file mode 100644
index 9bee958e8..000000000
--- a/redhat/tdebase/tdebase-14.0.0-mandriva_use_drakclock.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- ./kicker/applets/clock/clock.cpp.orig	2014-09-13 20:24:15.429011133 +0200
-+++ ./kicker/applets/clock/clock.cpp	2014-09-13 20:25:02.281084675 +0200
-@@ -1515,11 +1515,8 @@
-             preferences();
-             break;
-         case 103:
--            proc << locate("exe", "tdesu");
--            proc << "--nonewdcop";
--            proc << TQString("%1 tde-clock.desktop --lang %2")
--                .arg(locate("exe", "tdecmshell"))
--                .arg(TDEGlobal::locale()->language());
-+            // Mageia/Mandriva only
-+            proc << locate("exe", "drakclock");
-             proc.start(TDEProcess::DontCare);
-             break;
-         case 104:
diff --git a/redhat/tdebase/tdebase-14.0.0-open_terminal_here.patch b/redhat/tdebase/tdebase-14.0.0-open_terminal_here.patch
deleted file mode 100644
index cc361c712..000000000
--- a/redhat/tdebase/tdebase-14.0.0-open_terminal_here.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- tdebase/kdesktop/krootwm.cc.openterminalhere	2013-07-24 21:45:14.083030776 +0200
-+++ tdebase/kdesktop/krootwm.cc	2013-07-26 17:37:34.561203115 +0200
-@@ -132,7 +132,7 @@
-   if (kapp->authorize("run_command"))
-   {
-      new TDEAction(i18n("Run Command..."), "run", 0, TQT_TQOBJECT(m_pDesktop), TQT_SLOT( slotExecuteCommand() ), m_actionCollection, "exec" );
--     new TDEAction(i18n("Open Terminal Here..." ), "terminal", CTRL+Key_T, this, TQT_SLOT( slotOpenTerminal() ),
-+     new TDEAction(i18n("Open Terminal..." ), "terminal", CTRL+Key_T, this, TQT_SLOT( slotOpenTerminal() ),
- 	m_actionCollection, "open_terminal" );
-   }
- 
-@@ -760,7 +760,7 @@
-     TDEConfigGroupSaver gs(TDEGlobal::config(), "General");
-     TQString terminal = TDEGlobal::config()->readPathEntry("TerminalApplication", "konsole");
- 
--    *p << terminal << "--workdir=" + TDEGlobalSettings::desktopPath() + "/";
-+    *p << terminal;
- 
-     p->start(TDEProcess::DontCare);
- 
diff --git a/redhat/tdebase/tdebase-14.0.0-suspend_unmount.patch b/redhat/tdebase/tdebase-14.0.0-suspend_unmount.patch
deleted file mode 100644
index 01d9e479b..000000000
--- a/redhat/tdebase/tdebase-14.0.0-suspend_unmount.patch
+++ /dev/null
@@ -1,151 +0,0 @@
---- ./tdeioslave/media/libmediacommon/medium.cpp.ori	2013-05-08 22:57:09.317384423 +0200
-+++ ./tdeioslave/media/libmediacommon/medium.cpp	2013-05-08 22:57:36.730837358 +0200
-@@ -46,6 +46,7 @@
- 	loadUserLabel();
- 
- 	m_halmounted = false;
-+	m_isHotplug = false;
- }
- 
- Medium::Medium()
-@@ -69,6 +70,7 @@
- 	m_properties+= "false";        /* HIDDEN */
- 	
- 	m_halmounted = false;
-+	m_isHotplug = false;
- }
- 
- const Medium Medium::create(const TQStringList &properties)
---- ./tdeioslave/media/libmediacommon/medium.h.ORI	2013-05-08 22:59:10.772959829 +0200
-+++ ./tdeioslave/media/libmediacommon/medium.h	2013-05-08 22:59:56.602044404 +0200
-@@ -92,6 +92,9 @@
- 	void setHalMounted(bool flag) const { m_halmounted = flag; }
- 	bool halMounted() const { return m_halmounted; }
- 
-+	void setIsHotplug( bool state ) { m_isHotplug = state; }
-+	bool isHotplug() const { return m_isHotplug; }
-+
- //private:
- 	Medium();
- 
-@@ -100,6 +103,8 @@
- 
- 	TQStringList m_properties;
- 	mutable bool m_halmounted;
-+
-+	bool m_isHotplug;
- 	
- friend class TQValueListNode<const Medium>;
- };
---- ./tdeioslave/media/mediamanager/mediamanager.cpp.ori	2013-05-08 23:00:39.673183801 +0200
-+++ ./tdeioslave/media/mediamanager/mediamanager.cpp	2013-05-08 23:04:47.639224260 +0200
-@@ -354,6 +354,57 @@
-     emit mediumChanged(name);
- }
- 
-+TQString MediaManager::unmountAllSuspend()
-+{
-+    TQPtrList<Medium> list = m_mediaList.list();
-+
-+    TQPtrList<Medium>::const_iterator it = list.begin();
-+    TQPtrList<Medium>::const_iterator end = list.end();
-+
-+    TQString result;
-+
-+    for (; it!=end; ++it)
-+    {
-+        if ( (*it)->isMounted() && (*it)->isHotplug() )
-+        {
-+            TQString tmp = unmount( (*it)->id() );
-+            if ( !tmp.isEmpty() ) { // umount failed
-+                result = tmp;
-+            } else {
-+                m_suspendResumeMountList.append( (*it)->id() );
-+            }
-+        }
-+    }
-+
-+    // return last error
-+    return result;
-+}
-+
-+TQString MediaManager::remountAllResume()
-+{
-+    TQString result;
-+
-+    for (TQStringList::const_iterator it = m_suspendResumeMountList.begin();
-+         it != m_suspendResumeMountList.end();
-+         ++it)
-+    {
-+        const Medium *m = m_mediaList.findById(*it);
-+
-+        if ( m && m->needMounting() )
-+        {
-+            TQString tmp = mount( *it );
-+            if ( !tmp.isEmpty() ) { // mount failed
-+                result = tmp;
-+            }
-+        }
-+    }
-+
-+    m_suspendResumeMountList.clear();
-+
-+    // return last error
-+    return result;
-+}
-+
- 
- extern "C" {
-     KDE_EXPORT KDEDModule *create_mediamanager(const TQCString &obj)
---- ./tdeioslave/media/mediamanager/mediamanager.h.ORI	2013-05-08 23:05:36.250251036 +0200
-+++ ./tdeioslave/media/mediamanager/mediamanager.h	2013-05-08 23:07:27.650019601 +0200
-@@ -60,6 +60,20 @@
- 	bool removableUnplug(const TQString &devNode);
- 	bool removableCamera(const TQString &devNode);
- 
-+       /**
-+         * Unmount manually all partitions when going to suspend
-+         *
-+         * @return last error if any
-+         */
-+        TQString unmountAllSuspend();
-+
-+        /**
-+         * Remount previously unmounted partitions in unmountAllSuspend()
-+         *
-+         * @return last error if any
-+         */
-+        TQString remountAllResume();
-+
- k_dcop_signals:
- 	void mediumAdded(const TQString &name, bool allowNotification);
- 	void mediumRemoved(const TQString &name, bool allowNotification);
-@@ -89,6 +103,7 @@
- 	TDEBackend *m_tdebackend;
- 	MediaDirNotify m_dirNotify;
- 	FstabBackend *m_fstabbackend;
-+	TQStringList m_suspendResumeMountList;
- };
- 
- #endif
---- ./tdeioslave/media/mediamanager/halbackend.cpp.ori	2013-05-08 23:08:12.196126863 +0200
-+++ ./tdeioslave/media/mediamanager/halbackend.cpp	2013-05-08 23:08:51.096347073 +0200
-@@ -541,6 +541,7 @@
-             libhal_volume_is_mounted(halVolume) );		/* Mounted ? */
-     }
- 
-+    medium->setIsHotplug( libhal_drive_is_hotpluggable(halDrive) );
- 
-     char* name = libhal_volume_policy_compute_display_name(halDrive, halVolume, m_halStoragePolicy);
-     TQString volume_name = TQString::fromUtf8(name);
---- ./tdeioslave/media/mediamanager/halbackend.h.ORI	2013-05-08 23:09:35.761451488 +0200
-+++ ./tdeioslave/media/mediamanager/halbackend.h	2013-05-08 23:10:21.608531952 +0200
-@@ -89,6 +89,8 @@
- 	TQString decrypt(const TQString &id, const TQString &password);
- 	TQString undecrypt(const TQString &id);
- 
-+	static bool isHotplug( const TQString & id );
-+
- private:
- 	/**
- 	* Append a device in the media list. This function will check if the device
diff --git a/redhat/tdebase/tdebase-14.0.0-tdehardwarebackend_fix_iocharset.patch b/redhat/tdebase/tdebase-14.0.0-tdehardwarebackend_fix_iocharset.patch
deleted file mode 100644
index 98077c646..000000000
--- a/redhat/tdebase/tdebase-14.0.0-tdehardwarebackend_fix_iocharset.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- tdebase/tdeioslave/media/mediamanager/tdehardwarebackend.cpp.new	2013-11-11 21:27:09.960234089 +0100
-+++ tdebase/tdeioslave/media/mediamanager/tdehardwarebackend.cpp	2013-11-11 21:32:16.081679386 +0100
-@@ -979,9 +979,21 @@
- 	}
- 
- 	if (valids.contains("utf8")) {
--		value = config.readBoolEntry("utf8", true);
-+		// From "man mount": only some filesystems support 'iocharset' option.
-+		if( (sdevice->fileSystemName() == "fat")
-+		 || (sdevice->fileSystemName() == "iso9660")
-+		 || (sdevice->fileSystemName() == "jfs")
-+		 || (sdevice->fileSystemName() == "msdos")
-+		 || (sdevice->fileSystemName() == "ntfs")
-+		 || (sdevice->fileSystemName() == "umsdos")
-+		 || (sdevice->fileSystemName() == "vfat")
-+		) {
-+			value = config.readBoolEntry("utf8", true);
-+		} else {
-+			value = false;
-+       }
- 		tmp = TQString("utf8=%1").arg(value ? "true" : "false");
- 		result << tmp;
- 	}
- 
- 	if (valids.contains("shortname")) {
diff --git a/redhat/tdebase/tdebase-14.0.0-vibrate_dialog.patch b/redhat/tdebase/tdebase-14.0.0-vibrate_dialog.patch
deleted file mode 100644
index 426920d2c..000000000
--- a/redhat/tdebase/tdebase-14.0.0-vibrate_dialog.patch
+++ /dev/null
@@ -1,186 +0,0 @@
---- trinity-tdebase-3.5.13.2~pre102+43d29f86/kcontrol/screensaver/scrnsave.h.ORI	2013-05-14 22:12:18.159235590 +0200
-+++ trinity-tdebase-3.5.13.2~pre102+43d29f86/kcontrol/screensaver/scrnsave.h	2013-05-14 22:12:56.657422259 +0200
-@@ -58,6 +58,7 @@
-     void slotLock( bool );
-     void slotDelaySaverStart( bool );
-     void slotUseTSAK( bool );
-+    void slotVibrateUnlock( bool );
-     void slotUseUnmanagedLockWindows( bool );
-     void slotHideActiveWindowsFromSaver( bool );
-     void slotHideCancelButton( bool );
-@@ -102,6 +103,7 @@
-     TQGroupBox   *mSettingsGroup;
-     TQCheckBox   *mDelaySaverStartCheckBox;
-     TQCheckBox   *mUseTSAKCheckBox;
-+    TQCheckBox   *mVibrateUnlockCheckBox;
-     TQCheckBox   *mUseUnmanagedLockWindowsCheckBox;
-     TQCheckBox   *mHideActiveWindowsFromSaverCheckBox;
-     TQCheckBox   *mHideCancelButtonCheckBox;
-@@ -121,6 +123,7 @@
-     bool        mImmutable;
-     bool        mDelaySaverStart;
-     bool        mUseTSAK;
-+    bool        mVibrateUnlock;
-     bool        mUseUnmanagedLockWindows;
-     bool        mHideActiveWindowsFromSaver;
-     bool        mHideCancelButton;
---- trinity-tdebase-3.5.13.2~pre102+43d29f86/kcontrol/screensaver/scrnsave.cpp.vibrate_dialog	2013-04-26 22:15:23.000000000 +0200
-+++ trinity-tdebase-3.5.13.2~pre102+43d29f86/kcontrol/screensaver/scrnsave.cpp	2013-05-14 22:24:37.354375502 +0200
-@@ -271,6 +271,13 @@
-     settingsGroupLayout->addWidget(mHideActiveWindowsFromSaverCheckBox, 3, 1);
-     TQWhatsThis::add( mHideActiveWindowsFromSaverCheckBox, i18n("Hide all active windows from the screen saver and use the desktop background as the screen saver input.") );
- 
-+    mVibrateUnlockCheckBox = new TQCheckBox( i18n("&Vibrate unlock dialog box on failure"), mSettingsGroup );
-+    mVibrateUnlockCheckBox->setEnabled( true );
-+    mVibrateUnlockCheckBox->setChecked( mVibrateUnlock );
-+    connect( mVibrateUnlockCheckBox, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotVibrateUnlock( bool ) ) );
-+    settingsGroupLayout->addWidget(mVibrateUnlockCheckBox, 4, 1);
-+    TQWhatsThis::add( mVibrateUnlockCheckBox, i18n("Makes the unlock dialog box vibrate when entering an incorrect password.") );
-+
-     mHideCancelButtonCheckBox = new TQCheckBox( i18n("Hide &cancel button"), mSettingsGroup );
-     mHideCancelButtonCheckBox->setEnabled( true );
-     mHideCancelButtonCheckBox->setChecked( mHideCancelButton );
-@@ -437,6 +444,7 @@
-     mLock = config->readBoolEntry("Lock", false);
-     mDelaySaverStart = config->readBoolEntry("DelaySaverStart", true);
-     mUseTSAK = config->readBoolEntry("UseTDESAK", true);
-+    mVibrateUnlock = config->readBoolEntry("VibrateUnlock", true);
-     mUseUnmanagedLockWindows = config->readBoolEntry("UseUnmanagedLockWindows", false);
-     mHideActiveWindowsFromSaver = config->readBoolEntry("HideActiveWindowsFromSaver", true);
-     mHideCancelButton = config->readBoolEntry("HideCancelButton", false);
-@@ -490,6 +498,7 @@
-     config->writeEntry("Lock", mLock);
-     config->writeEntry("DelaySaverStart", mDelaySaverStart);
-     config->writeEntry("UseTDESAK", mUseTSAK);
-+    config->writeEntry("VibrateUnlock", mVibrateUnlock);
-     config->writeEntry("UseUnmanagedLockWindows", mUseUnmanagedLockWindows);
-     config->writeEntry("HideActiveWindowsFromSaver", mHideActiveWindowsFromSaver);
-     config->writeEntry("HideCancelButton", mHideCancelButton);
-@@ -705,10 +714,14 @@
-         mUseTSAKCheckBox->setChecked( false );
-     }
-     if (!mUseUnmanagedLockWindows) {
-+        mVibrateUnlockCheckBox->setEnabled( true );
-+        mVibrateUnlockCheckBox->setChecked( mVibrateUnlock );
-         mHideActiveWindowsFromSaverCheckBox->setEnabled( true );
-         mHideActiveWindowsFromSaverCheckBox->setChecked( mHideActiveWindowsFromSaver );
-     }
-     else {
-+        mVibrateUnlockCheckBox->setEnabled( false );
-+        mVibrateUnlockCheckBox->setChecked( false );
-         mHideActiveWindowsFromSaverCheckBox->setEnabled( false );
-         mHideActiveWindowsFromSaverCheckBox->setChecked( false );
-     }
-@@ -969,6 +982,16 @@
-     processLockouts();
-     mChanged = true;
-     emit changed(true);
-+}
-+
-+//---------------------------------------------------------------------------
-+//
-+void KScreenSaver::slotVibrateUnlock( bool u )
-+{
-+    if (mVibrateUnlockCheckBox->isEnabled()) mVibrateUnlock = u;
-+    processLockouts();
-+    mChanged = true;
-+    emit changed(true);
- }
- 
- //---------------------------------------------------------------------------
---- trinity-tdebase-3.5.13.2~pre102+43d29f86/kdesktop/lock/lockdlg.h.vibrate_dialog	2013-01-09 02:12:13.000000000 +0100
-+++ trinity-tdebase-3.5.13.2~pre102+43d29f86/kdesktop/lock/lockdlg.h	2013-05-14 22:42:50.562878532 +0200
-@@ -60,6 +60,7 @@
-     void slotOK();
-     void layoutClicked();
-     void slotActivity();
-+    void moveTimerDone();
- 
- protected slots:
-     virtual void reject();
-@@ -79,6 +80,8 @@
-     void handleVerify();
-     void reapVerify();
-     void cantCheck();
-+    void movedialog( int _move );
-+    void badPasswordLogin();
-     GreeterPluginHandle *mPlugin;
-     KGreeterPlugin *greet;
-     TQFrame      *frame;
-@@ -95,6 +98,8 @@
-     int         sPid, sFd;
-     TQListView   *lv;
-     TQDateTime   m_lockStartDT;
-+    bool        waitMoveDialog;
-+    bool	VibrateUnlock;
- };
- 
- #endif
---- trinity-tdebase-3.5.13.2~pre102+43d29f86/kdesktop/lock/lockdlg.cc.vibrate_dialog	2013-01-09 02:12:13.000000000 +0100
-+++ trinity-tdebase-3.5.13.2~pre102+43d29f86/kdesktop/lock/lockdlg.cc	2013-05-14 22:42:12.809621715 +0200
-@@ -55,6 +55,7 @@
- #include <X11/keysym.h>
- #include <X11/Xatom.h>
- #include <fixx11h.h>
-+#include <tdeapplication.h>
- 
- #ifndef AF_LOCAL
- # define AF_LOCAL	AF_UNIX
-@@ -246,6 +247,11 @@
-         mLayoutButton->hide(); // no kxkb running
-     }
-     capsLocked();
-+
-+    TDEConfig* config = new TDEConfig("kdesktoprc");
-+    config->setGroup("ScreenSaver");
-+    VibrateUnlock = config->readBoolEntry("VibrateUnlock", true);
-+    delete config;
- }
- 
- PasswordDlg::~PasswordDlg()
-@@ -302,6 +308,37 @@
-     }
- }
- 
-+void PasswordDlg::movedialog( int _move )
-+{
-+     waitMoveDialog = true;
-+     this->move(pos().x()+_move, pos().y());
-+     TQTimer::singleShot( 50, this, TQT_SLOT(moveTimerDone()) );
-+     while (waitMoveDialog) {
-+          kapp->processEvents();
-+     }
-+}
-+
-+void PasswordDlg::moveTimerDone()
-+{
-+     waitMoveDialog = false;
-+}
-+
-+void PasswordDlg::badPasswordLogin()
-+{
-+     if ( VibrateUnlock && mUnlockingFailed )
-+     {
-+          for ( int i = 0 ; i<2 ; i++)
-+          {
-+               movedialog( 10 );
-+               movedialog( -20 );
-+               movedialog( 20 );
-+               movedialog( -20 );
-+               movedialog( 20 );
-+               movedialog( -10 );
-+          }
-+     }
-+}
-+
- //---------------------------------------------------------------------------
- //
- // Handle timer events.
-@@ -442,6 +479,7 @@
-                 mFailedTimerId = startTimer(1500);
-                 ok->setEnabled(false);
-                 mNewSessButton->setEnabled( false );
-+                badPasswordLogin();
-                 return;
-             case AuthAbort:
-                 return;
-- 
cgit v1.2.1


From 6a1e5d1b40c6218d7e15f00bf428774ac50c0a10 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Andriot?= <albator78@libertysurf.fr>
Date: Fri, 3 Oct 2014 23:47:08 +0200
Subject: RPM Packaging: update tqt3

---
 redhat/dependencies/tqt3/tqt3-14.0.0.spec    |   15 +-
 redhat/tdebase/trinity-kdebase-3.5.13.3.spec | 3416 -------------------------
 redhat/tdebase/trinity-tdebase-3.5.13.3.spec | 3514 --------------------------
 3 files changed, 9 insertions(+), 6936 deletions(-)
 delete mode 100644 redhat/tdebase/trinity-kdebase-3.5.13.3.spec
 delete mode 100644 redhat/tdebase/trinity-tdebase-3.5.13.3.spec

diff --git a/redhat/dependencies/tqt3/tqt3-14.0.0.spec b/redhat/dependencies/tqt3/tqt3-14.0.0.spec
index a30a5904e..21f080922 100644
--- a/redhat/dependencies/tqt3/tqt3-14.0.0.spec
+++ b/redhat/dependencies/tqt3/tqt3-14.0.0.spec
@@ -260,7 +260,7 @@ BuildRequires: util-linux
 # GCC visibility stuff
 %if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version} || 0%{?rhel} >= 6
 %define EXTRA_CFLAGS -fvisibility=hidden -fvisibility-inlines-hidden
-%endif 
+%endif
 
 %description
 
@@ -291,16 +291,19 @@ applications.
 %files -n %{libtqt3}-mt
 %defattr(-,root,root,-)
 %doc FAQ LICENSE* README* changes*
+%dir %{_datadir}/icons/hicolor
+%dir %{_datadir}/icons/hicolor/32x32
+%dir %{_datadir}/icons/hicolor/32x32/apps
+%dir %{_datadir}/tqt3/
+%dir %{_datadir}/tqt3/doc/
+%dir %{_datadir}/tqt3/doc/html/
+%dir %{_datadir}/tqt3/tools/
 %dir %{_libdir}/tqt3/
 %dir %{_libdir}/tqt3/plugins/
 %dir %{_libdir}/tqt3/plugins/designer/
 %dir %{_libdir}/tqt3/plugins/imageformats/
 %dir %{_libdir}/tqt3/plugins/inputmethods/
 %dir %{_libdir}/tqt3/plugins/sqldrivers/
-%dir %{_datadir}/tqt3/
-%dir %{_datadir}/tqt3/doc/
-%dir %{_datadir}/tqt3/doc/html/
-%dir %{_datadir}/tqt3/tools/
 %dir %{_sysconfdir}/tqt3
 %{_libdir}/libtqt-mt.so.3
 %{_libdir}/libtqt-mt.so.3.5
@@ -981,7 +984,7 @@ For TQt3 development, you most likely want to install this package.
 %{_bindir}/tquic
 %{_bindir}/tqmoc
 %{_bindir}/tqembed
-%{_mandir}/man1/lupdate-tqt3.1.gz
+%{_mandir}/man1/lupdate-tqt3.1*
 %{_mandir}/man1/lrelease-tqt3.1*
 %{_mandir}/man1/moc-tqt3.1*
 %{_mandir}/man1/uic-tqt3.1*
diff --git a/redhat/tdebase/trinity-kdebase-3.5.13.3.spec b/redhat/tdebase/trinity-kdebase-3.5.13.3.spec
deleted file mode 100644
index 0b8329c17..000000000
--- a/redhat/tdebase/trinity-kdebase-3.5.13.3.spec
+++ /dev/null
@@ -1,3416 +0,0 @@
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?tde_prefix}" != "/usr"
-%define _variant .opt
-%endif
-
-# TDE 3.5.13 specific building variables
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-
-%define tde_tdeappdir %{tde_datadir}/applications/kde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-# Older RHEL/Fedora versions use packages named "qt", "qt-devel", ..
-# whereas newer versions use "qt3", "qt3-devel" ...
-%if 0%{?rhel} >= 6 || 0%{?fedora} >= 8 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}
-%define _qt_suffix 3
-%endif
-
-
-Name:		trinity-tdebase
-Version:	3.5.13.2
-Release:	1%{?dist}%{?_variant}
-License:	GPL
-Summary:	Trinity Base Programs
-Group:		User Interface/Desktops
-
-Obsoletes:	trinity-kdebase < %{version}-%{release}
-Provides:	trinity-kdebase = %{version}-%{release}
-Obsoletes:	trinity-kdebase-libs < %{version}-%{release}
-Provides:	trinity-kdebase-libs = %{version}-%{release}
-Obsoletes:	trinity-kdebase-extras < %{version}-%{release}
-Provides:	trinity-kdebase-extras = %{version}-%{release}
-Obsoletes:	tdebase < %{version}-%{release}
-Provides:	tdebase = %{version}-%{release}
-
-
-Vendor:		Trinity Project
-Packager:	Francois Andriot <francois.andriot@free.fr>
-URL:		http://www.trinitydesktop.org/
-
-Prefix:		%{tde_prefix}
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:	%{name}-%{version}.tar.gz
-
-# Wrapper script to prevent Plasma launch at Trinity Startup
-Source1:	plasma-desktop
-
-# Pam configuration files for RHEL / Fedora
-%if 0%{?suse_version} == 0
-Source2:	pamd.kdm-trinity%{?dist}
-Source3:	pamd.kdm-trinity-np%{?dist}
-Source4:	pamd.kcheckpass-trinity%{?dist}
-Source5:	pamd.kscreensaver-trinity%{?dist}
-%endif
-
-# openSUSE: configuration file for TDM
-Source6:	suse-displaymanagers-tdm
-
-# Fedora / RHEL: use selinux policies
-%if 0%{?fedora} >= 17 || 0%{?rhel} >= 6
-Source8:	file_contexts%{?dist}
-%endif
-
-
-Patch1:		kdebase-3.5.13.2-set_kdm_minuid.patch
-Patch2:		kdebase-3.5.13.2-add_ck_shutdown.patch
-Patch3:		kdebase-3.5.13.2-fix_startkde.patch
-
-# TDE 3.5.13 patches
-## [kdebase/kdesktop] Modifies 'open terminal here' on desktop [RHEL/Fedora]
-Patch11:	kdebase-3.5.12-desktop-openterminalhere.patch
-## [kdebase/kdm/kfrontend] Global Xsession file is '/etc/X11/xinit/Xsession' [RHEL/Fedora]
-Patch13:	kdebase-3.5.13-genkdmconf_Xsession_location.patch
-## [kdebase/kdm/kfrontend] Global Xsession file is '/etc/X11/xdm/Xsession' [openSUSE]
-Patch14:	kdebase-3.5.13-genkdmconf_Xsession_location_xdm.patch
-## [kdebase/startkde] Sets default Start Icon in 'kickerrc' [RHEL/Fedora]
-Patch15:	kdebase-3.5.13.1-startkde_icon.patch
-## [kdebase/kioslave/man] Fix kio_man for older distros without 'man-db' [Bug #714]
-Patch21:	kdebase-3.5.13-kio_man_utf8.patch
-## [kdebase/kdm/kfrontend] Allows to hide KDM menu button [RHEL/Fedora]
-Patch30:	kdebase-3.5.12-kdm_hide_menu_button.patch
-## [kdebase/kdm] Fix PID file is 'tdm.pid' instead of 'kdm.pid' (needed for openSUSE)
-Patch32:	kdebase-3.5.13.1-fix_tdm_pid_file.patch
-
-### Patches for RHEL4 (should not go upstream)
-
-## [tdebase] Fix build on RHEL4, detect old libraries without pkg file
-Patch201:	kdebase-3.5.13-fix_lib_detection.patch
-## [tdebase] Do not build against DBUS-TQT, only DBUS and DBUS-QT
-Patch202:	kdebase-3.5.13.2-build_without_dbustqt.patch
-## [tdebase] Do not build against ConsoleKit
-Patch203:	kdebase-3.5.13-build_without_consolekit.patch
-## [tdebase] Add WITH_COMPOSITE option to CMakeLists.txt
-Patch204:	kdebase-3.5.13.2-add_disable_composite_option.patch
-## [tdebase] Downgrade halbackend to support Hal 0.4
-Patch205:	kdebase-3.5.13-support_hal_04.patch
-## [tdebase] Other(s) FTBFS ...
-Patch206:	kdebase-3.5.13-fix_rhel4_compilation.patch
-
-### Distribution-specific settings ###
-
-# Fedora 15 Theme: "Lovelock"
-%if 0%{?fedora} == 15
-Requires:	lovelock-backgrounds-single
-%define tde_bg /usr/share/backgrounds/lovelock/default/standard/lovelock.png
-%define tde_starticon /usr/share/icons/hicolor/96x96/apps/fedora-logo-icon.png
-
-Requires:	fedora-release-notes
-%define tde_aboutlabel Fedora 15
-%define tde_aboutpage /usr/share/doc/HTML/fedora-release-notes/index.html
-%endif
-
-# Fedora 16 Theme: "Verne"
-%if 0%{?fedora} == 16
-Requires:	verne-backgrounds-single
-%define tde_bg /usr/share/backgrounds/verne/default/standard/verne.png
-%define tde_starticon /usr/share/icons/hicolor/96x96/apps/fedora-logo-icon.png
-
-Requires:	fedora-release-notes
-%define tde_aboutlabel Fedora 16
-%define tde_aboutpage /usr/share/doc/HTML/fedora-release-notes/index.html
-%endif
-
-# Fedora 17 Theme: "Beefy Miracle"
-%if 0%{?fedora} == 17
-Requires:	beefy-miracle-backgrounds-single
-%define tde_bg /usr/share/backgrounds/beefy-miracle/default/standard/beefy-miracle.png
-%define tde_starticon /usr/share/icons/hicolor/96x96/apps/fedora-logo-icon.png
-
-Requires:	fedora-release-notes
-%define tde_aboutlabel Fedora 17
-%define tde_aboutpage /usr/share/doc/HTML/fedora-release-notes/index.html
-%endif
-
-# Fedora 18 Theme: "Spherical Cow"
-%if 0%{?fedora} == 18
-Requires:	spherical-cow-backgrounds-single
-%define tde_bg /usr/share/backgrounds/spherical-cow/default/standard/spherical-cow.png
-Requires:	fedora-logos
-%define tde_starticon /usr/share/icons/hicolor/96x96/apps/fedora-logo-icon.png
-
-Requires:	fedora-release-notes
-%define tde_aboutlabel Fedora 18
-%define tde_aboutpage /usr/share/doc/HTML/fedora-release-notes/index.html
-%endif
-
-# RHEL 4 Theme
-%if 0%{?rhel} == 4
-Requires:	desktop-backgrounds-basic
-%define tde_bg /usr/share/backgrounds/images/default.png
-Requires:	redhat-logos
-%define tde_starticon /usr/share/pixmaps/redhat/rpmlogo-64.xpm
-
-Requires:	indexhtml
-%define tde_aboutlabel Enterprise Linux 4
-%define tde_aboutpage /usr/share/doc/HTML/index.html
-%endif
-
-# RHEL 5 Theme
-%if 0%{?rhel} == 5
-Requires:	desktop-backgrounds-basic
-%define tde_bg /usr/share/backgrounds/images/default.jpg
-%define tde_starticon /usr/share/pixmaps/redhat-starthere.png
-
-Requires:	indexhtml
-%define tde_aboutlabel Enterprise Linux 5
-%define tde_aboutpage /usr/share/doc/HTML/index.html
-%endif
-
-# RHEL 6 Theme
-%if 0%{?rhel} == 6
-Requires:	redhat-logos
-%define tde_bg /usr/share/backgrounds/default.png
-%define tde_starticon /usr/share/icons/hicolor/96x96/apps/system-logo-icon.png
-
-Requires:	redhat-indexhtml
-%define tde_aboutlabel Enterprise Linux 6
-%define tde_aboutpage /usr/share/doc/HTML/index.html
-%endif
-
-# Mageia 2 Theme
-%if 0%{?mgaversion} == 2
-Requires:	mageia-theme-Default
-%define tde_bg /usr/share/mga/backgrounds/default.jpg
-%define tde_starticon /usr/share/icons/hicolor/scalable/apps/mageia-menu.svg
-
-Requires:	indexhtml
-%define tde_aboutlabel Mageia 2
-%define tde_aboutpage /usr/share/mga/about/index.html
-%endif
-
-# Mandriva 2011 Theme: "rosa"
-%if "%{distribution}" == "Mandriva Linux" && "%{?mdkversion}" == "201100"
-Requires:	mandriva-theme
-%define tde_bg /usr/share/mdk/backgrounds/default.jpg
-%define tde_starticon /usr/share/icons/mandriva.png
-
-Requires:	indexhtml
-%define tde_aboutlabel Mandriva 2011
-%define tde_aboutpage /usr/share/mdk/about/index.html
-%endif
-
-# PCLINUXOS 2012
-%if "%{?pclinuxos}" == "2012"
-Requires:	trinity-wallpaper-theme-default
-%define tde_bg %{tde_datadir}/wallpapers/Pulse2012/contents/images/1600x1200.jpg
-Requires:	desktop-common-data
-%define tde_starticon /usr/share/icons/pclinuxos.png
-
-Requires:	indexhtml
-%define tde_aboutlabel PCLinuxOS 2012
-%define tde_aboutpage /usr/share/mdk/about/index.html
-%endif
-
-# PCLINUXOS 2013
-%if "%{?pclinuxos}" == "2013"
-Requires:	trinity-wallpaper-theme-default
-%define tde_bg %{tde_datadir}/wallpapers/Pulse2012/contents/images/1600x1200.jpg
-Requires:	desktop-common-data
-%define tde_starticon /usr/share/icons/pclinuxos.png
-
-Requires:	indexhtml
-%define tde_aboutlabel PCLinuxOS 2013
-%define tde_aboutpage /usr/share/mdk/about/index.html
-%endif
-
-# OpenSuse 11.4 Theme
-%if "%{?suse_version}" == "1140"
-Requires:	hicolor-icon-theme-branding
-%define tde_starticon /usr/share/icons/hicolor/scalable/apps/distributor.svg
-
-Requires:	opensuse-manuals_en
-%define tde_aboutlabel OpenSuse 11.4
-%define tde_aboutpage /usr/share/doc/manual/opensuse-manuals_en/manual/book.opensuse.startup.html
-%endif
-
-# OpenSuse 12.2 Theme
-%if "%{?suse_version}" == "1220"
-Requires:	wallpaper-branding
-%define tde_bg /usr/share/wallpapers/openSUSEdefault/contents/images/1600x1200.jpg
-Requires:	hicolor-icon-theme-branding
-%define tde_starticon /usr/share/icons/hicolor/scalable/apps/distributor.svg
-
-Requires:	opensuse-manuals_en
-%define tde_aboutlabel OpenSuse 12.2
-%define tde_aboutpage /usr/share/doc/manual/opensuse-manuals_en/book.opensuse.startup.html
-%endif
-
-# OpenSuse 12.3 Theme
-%if "%{?suse_version}" == "1230"
-Requires:	wallpaper-branding
-%define tde_bg /usr/share/wallpapers/openSUSEdefault/contents/images/1600x1200.jpg
-Requires:	hicolor-icon-theme-branding
-%define tde_starticon /usr/share/icons/hicolor/scalable/apps/distributor.svg
-
-Requires:	opensuse-manuals_en
-%define tde_aboutlabel OpenSuse 12.3
-%define tde_aboutpage /usr/share/doc/manual/opensuse-manuals_en/book.opensuse.startup.html
-%endif
-
-BuildRequires:	cmake >= 2.8
-BuildRequires:	trinity-tqtinterface-devel >= %{version}
-BuildRequires:	trinity-arts-devel >= %{version}
-BuildRequires:	trinity-tdelibs-devel >= %{version}
-BuildRequires:	gcc-c++
-BuildRequires:	make
-BuildRequires:	qt%{?_qt_suffix}-devel
-BuildRequires:	openssl-devel
-BuildRequires:	audiofile-devel
-BuildRequires:	alsa-lib-devel
-BuildRequires:	libraw1394-devel
-BuildRequires:	libvorbis-devel
-BuildRequires:	glib2-devel
-BuildRequires:	pcre-devel
-
-# LIBUSB support
-BuildRequires:	pam-devel
-%if 0%{?mageia} || 0%{?mandriva} || 0%{?pclinuxos}
-BuildRequires:	%{_lib}usb1.0-devel
-BuildRequires:	%{_lib}usb-compat0.1-devel
-%else
-BuildRequires:	libusb-devel
-%endif
-
-# ESOUND support
-%if 0%{?rhel} || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version}
-%define with_esound 1
-BuildRequires:	esound-devel
-%endif
-
-# OPENLDAP support
-%if 0%{?suse_version}
-BuildRequires:	openldap2-devel
-%else
-BuildRequires:	openldap-devel
-%endif
-
-# SENSORS support
-%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel}
-BuildRequires:	lm_sensors-devel
-%endif
-%if 0%{?suse_version}
-BuildRequires:	libsensors4-devel
-%endif
-
-# TSAK support (requires libudev-devel)
-#  On RHEL5, udev is built statically, so TSAK cannot build.
-%if 0%{?fedora} >= 15 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 6 || 0%{?suse_version}
-%define with_tsak 1
-BuildRequires:	libudev-devel
-%endif
-
-# XRANDR support
-#  On RHEL5, xrandr library is too old.
-%if 0%{?fedora} >= 15 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 6 || 0%{?suse_version}
-%define with_xrandr 1
-%endif
-
-# XTEST support
-#  On RHEL4, xtest library is too old.
-%if 0%{?fedora} >= 15 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 5 || 0%{?suse_version}
-%define with_xtest 1
-%endif
-
-# HAL support
-#  On RHEL4, we do not use HAL (too old)
-%if 0%{?fedora} >= 15 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 5 || 0%{?suse_version}
-%define with_hal 1
-BuildRequires:	hal-devel >= 0.4.8
-%endif
-
-# OPENEXR support
-#  Disabled on RHEL4
-%if 0%{?fedora} >= 15 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 5 || 0%{?suse_version}
-%define with_exr 1
-BuildRequires:	OpenEXR-devel
-%endif
-
-# XSCREENSAVER support
-#  Disabled on RHEL4
-%if 0%{?fedora} >= 15 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 5 || 0%{?suse_version}
-%define with_xscreensaver 1
-%if 0%{?rhel} == 5
-BuildRequires:	xorg-x11-proto-devel
-BuildRequires:	gnome-screensaver
-%endif
-%if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires:	%{_lib}xscrnsaver%{?mgaversion:1}-devel
-%endif
-%if 0%{?fedora} || 0%{?rhel} >= 6 || 0%{?suse_version} >= 1220
-BuildRequires:	libXScrnSaver-devel
-%endif
-%if 0%{?suse_version} == 1140
-BuildRequires:	xscreensaver
-%endif
-%endif
-
-# AVAHI support
-#  Disabled on RHEL4 and RHEL5
-%if 0%{?fedora} >= 15 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 6 || 0%{?suse_version}
-BuildRequires:	trinity-avahi-tqt-devel
-Requires:		trinity-avahi-tqt
-%if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires:	%{_lib}avahi-client-devel
-Requires:		%{_lib}avahi-client3
-%else
-BuildRequires:	avahi-devel
-Requires:		avahi
-%endif
-%endif
-
-# NAS support
-# (what is nas btw ?)
-%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires:	nas-devel
-%endif
-
-# DBUS support
-#  TQT bindings not available for RHEL4
-%if 0%{?rhel} == 4
-# Dbus bindings were rebuilt with Qt support
-BuildRequires:	dbus-devel >= 0.22-12.EL.9p1
-Requires:		dbus-qt
-%else
-BuildRequires:	trinity-dbus-tqt-devel
-Requires:		trinity-dbus-tqt >= %{version}
-%endif
-
-%if 0%{?fedora} >= 17
-BuildRequires:	perl-Digest-MD5
-%endif
-
-# JACK support
-%if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires:	%{_lib}jack-devel
-%endif
-%if 0%{?fedora} || 0%{?rhel} >= 5
-BuildRequires:	jack-audio-connection-kit-devel
-%endif
-
-# LIBART support
-%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version} || 0%{?fedora} || 0%{?rhel} >= 5
-%define with_libart 1
-%if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires:	%{_lib}art_lgpl-devel
-%endif
-%if 0%{?suse_version} || 0%{?fedora} || 0%{?rhel}
-BuildRequires:	libart_lgpl-devel
-%endif
-%endif
-
-# SAMBA support
-%if 0%{?rhel} == 4
-BuildRequires:	samba-common
-%endif
-%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version}
-BuildRequires:	libsmbclient-devel
-%endif
-
-# IMAKE
-%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} >= 1220
-BuildRequires:	imake
-%endif
-
-# X11 stuff ...
-%if 0%{?rhel} == 4
-BuildRequires:	xorg-x11-devel
-%endif
-
-%if 0%{?suse_version} == 1140
-BuildRequires:	xorg-x11-libxkbfile-devel
-BuildRequires:	xorg-x11-libfontenc-devel
-%endif
-
-%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} >= 1220
-BuildRequires:	libxkbfile-devel
-BuildRequires:	libfontenc-devel
-%endif
-
-%if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires:	%{_lib}xcomposite%{?mgaversion:1}-devel
-BuildRequires:	%{_lib}xdamage-devel
-BuildRequires:	%{_lib}xdmcp%{?mgaversion:6}-devel
-BuildRequires:	%{_lib}xtst-devel
-BuildRequires:	x11-font-util
-BuildRequires:	x11-proto-devel
-%endif
-
-%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version} >= 1220
-BuildRequires:	libXcomposite-devel
-BuildRequires:	libXdamage-devel
-BuildRequires:	libXdmcp-devel
-BuildRequires:	libXtst-devel
-BuildRequires:	xorg-x11-proto-devel
-%endif
-
-%if 0%{?rhel} >= 5 || 0%{?fedora}
-BuildRequires:	xorg-x11-font-utils
-%endif
-
-%if 0%{?suse_version} >= 1220
-BuildRequires:	font-util
-BuildRequires:	bdftopcf
-%endif
-
-# tdebase is a metapackage that installs all sub-packages
-Requires: %{name}-runtime-data-common = %{version}-%{release}
-Requires: %{name}-data = %{version}-%{release}
-Requires: %{name}-bin = %{version}-%{release}
-Requires: %{name}-kio-plugins = %{version}-%{release}
-Requires: %{name}-kio-pim-plugins = %{version}-%{release}
-Requires: trinity-kappfinder = %{version}-%{release}
-Requires: trinity-kate = %{version}-%{release}
-Requires: trinity-kwrite = %{version}-%{release}
-Requires: trinity-kcontrol = %{version}-%{release}
-Requires: trinity-kdepasswd = %{version}-%{release}
-Requires: trinity-tdeprint = %{version}-%{release}
-Requires: trinity-kdesktop = %{version}-%{release}
-Requires: trinity-tdm = %{version}-%{release}
-Requires: trinity-kfind = %{version}-%{release}
-Requires: trinity-khelpcenter = %{version}-%{release}
-Requires: trinity-kicker = %{version}-%{release}
-Requires: trinity-klipper = %{version}-%{release}
-Requires: trinity-kmenuedit = %{version}-%{release}
-Requires: trinity-konqueror = %{version}-%{release}
-Requires: trinity-konqueror-nsplugins = %{version}-%{release}
-Requires: trinity-konsole = %{version}-%{release}
-Requires: trinity-kpager = %{version}-%{release}
-Requires: trinity-kpersonalizer = %{version}-%{release}
-Requires: trinity-ksmserver = %{version}-%{release}
-Requires: trinity-ksplash = %{version}-%{release}
-Requires: trinity-ksysguard = %{version}-%{release}
-Requires: trinity-ksysguardd = %{version}-%{release}
-Requires: trinity-ktip = %{version}-%{release}
-Requires: trinity-twin = %{version}-%{release}
-Requires: trinity-libkonq = %{version}-%{release}
-Requires: %{name}-libtqt3-integration = %{version}-%{release}
- 
-Requires:	trinity-tqtinterface >= %{version}
-Requires:	trinity-arts >= %{version}
-Requires:	trinity-tdelibs >= %{version}
-Requires:	qt%{?_qt_suffix}
-Requires:	openssl
-
-
-# RHEL 6 Configuration files are provided in separate packages
-%if 0%{?rhel} || 0%{?fedora}
-%if "%{?tde_prefix}" == "/usr"
-Requires:	kde-settings-kdm
-%endif
-Requires:	redhat-menus
-%endif
-
-%if 0%{?suse_version}
-Requires:	desktop-data-openSUSE
-%endif
-
-%description
-TDE (the Trinity Desktop Environment) is a powerful Open Source graphical
-desktop environment for Unix workstations. It combines ease of use,
-contemporary functionality, and outstanding graphical design with the
-technological superiority of the Unix operating system.
-
-This metapackage includes the nucleus of TDE, namely the minimal package
-set necessary to run TDE as a desktop environment. This includes the
-window manager, taskbar, control center, a text editor, file manager,
-web browser, X terminal emulator, and many other programs and components.
-
-%files
-%defattr(-,root,root,-)
-%doc AUTHORS COPYING COPYING-DOCS README README.pam
-
-##########
-
-%package devel
-Summary:	%{summary} - Development files
-Group:		Development/Libraries
-Requires:	%{name} = %{version}-%{release}
-Requires:	trinity-tdelibs-devel
-
-Requires:	%{name}-bin-devel = %{version}-%{release}
-Requires:	trinity-kate-devel = %{version}-%{release}
-Requires:	trinity-kcontrol-devel = %{version}-%{release}
-Requires:	trinity-kdesktop-devel = %{version}-%{release}
-Requires:	trinity-kicker-devel = %{version}-%{release}
-Requires:	trinity-konqueror-devel = %{version}-%{release}
-Requires:	trinity-ksplash-devel = %{version}-%{release}
-Requires:	trinity-ksysguard-devel = %{version}-%{release}
-Requires:	trinity-libkonq-devel = %{version}-%{release}
-Requires:	trinity-tdm-devel = %{version}-%{release}
-Requires:	trinity-twin-devel = %{version}-%{release}
-
-Provides:	trinity-kdebase-devel = %{version}-%{release}
-Obsoletes:	trinity-kdebase-devel < %{version}-%{release}
-Provides:	tdebase-devel = %{version}-%{release}
-Obsoletes:	tdebase-devel < %{version}-%{release}
-
-Obsoletes:	trinity-kdebase-cmake < %{version}-%{release}
-Obsoletes:	tdebase-cmake < %{version}-%{release}
-
-%description devel
-This is a meta-package that installs all tdebase development packages.
-
-Header files for developing applications using %{name}.
-Install tdebase-devel if you want to develop or compile Konqueror,
-Kate plugins or KWin styles.
-
-%files devel
-%{tde_datadir}/cmake/*.cmake
-
-##########
-
-%package kio-pim-plugins
-Summary:	PIM KIOslaves from %{name}
-Group:		Environment/Libraries
-
-Provides:	trinity-kdebase-pim-ioslaves = %{version}-%{release}
-Obsoletes:	trinity-kdebase-pim-ioslaves < %{version}-%{release}
-Provides:	tdebase-kio-pim-plugins = %{version}-%{release}
-Obsoletes:	tdebase-kio-pim-plugins < %{version}-%{release}
-
-%description kio-pim-plugins
-Protocol handlers (KIOslaves) for personal information management, including:
- * kio_ldap
- * kio_nntp
- * kio_pop3
- * kio_smtp
-
-%files kio-pim-plugins
-%defattr(-,root,root,-)
-%{tde_tdelibdir}/kio_ldap.la
-%{tde_tdelibdir}/kio_ldap.so
-%{tde_tdelibdir}/kio_nntp.la
-%{tde_tdelibdir}/kio_nntp.so
-%{tde_tdelibdir}/kio_pop3.la
-%{tde_tdelibdir}/kio_pop3.so
-%{tde_tdelibdir}/kio_smtp.la
-%{tde_tdelibdir}/kio_smtp.so
-%{tde_datadir}/services/ldap.protocol
-%{tde_datadir}/services/ldaps.protocol
-%{tde_datadir}/services/nntp.protocol
-%{tde_datadir}/services/nntps.protocol
-%{tde_datadir}/services/pop3.protocol
-%{tde_datadir}/services/pop3s.protocol
-%{tde_datadir}/services/smtp.protocol
-%{tde_datadir}/services/smtps.protocol
-
-##########
-
-%package runtime-data-common
-Summary:	Shared common files for Trinity and KDE4
-Group:		Environment/Libraries
-
-Provides:	tdebase-runtime-data-common = %{version}-%{release}
-Obsoletes:	tdebase-runtime-data-common < %{version}-%{release}
-
-%description runtime-data-common
-Shared common files for both Trinity and KDE4
-Such as the desktop right-click-"Create New" list
-
-%files runtime-data-common
-%defattr(-,root,root,-)
-%{tde_datadir}/autostart/khotkeys.desktop
-%{tde_datadir}/desktop-directories/*
-%{tde_datadir}/icons/hicolor/*/apps/kxkb.png
-%{tde_datadir}/icons/hicolor/*/apps/knetattach.*
-%{tde_datadir}/icons/hicolor/*/apps/khotkeys.png
-%{tde_datadir}/icons/hicolor/*/apps/kmenuedit.png
-%{tde_datadir}/icons/hicolor/*/apps/ksplash.png
-%{tde_datadir}/locale/en_US/entry.desktop
-%{tde_datadir}/locale/l10n/*.desktop
-%{tde_datadir}/locale/l10n/*/entry.desktop
-%{tde_datadir}/locale/l10n/*/flag.png
-%{tde_datadir}/sounds/pop.wav
-%{tde_datadir}/templates
-
-%post runtime-data-common
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f}  2> /dev/null || :
-done
-
-%postun runtime-data-common
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f}  2> /dev/null || :
-done
-
-##########
-
-%package -n trinity-kappfinder
-Summary:	non-TDE application finder for TDE
-Group:		Applications/Utilities
-Requires:	%{name}-data = %{version}-%{release}
-
-%description -n trinity-kappfinder
-kappfinder searches your workstation for many common applications and
-creates menu entries for them.
-
-%files -n trinity-kappfinder
-%defattr(-,root,root,-)
-%{tde_bindir}/kappfinder
-%{tde_tdeappdir}/kappfinder.desktop
-%{tde_datadir}/applnk/System/kappfinder.desktop
-%{tde_datadir}/apps/kappfinder
-%{tde_datadir}/icons/hicolor/*/apps/kappfinder.png
-
-%post -n trinity-kappfinder
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f}  2> /dev/null || :
-done
-update-desktop-database %{tde_appdir} 2> /dev/null || : 
-
-%postun -n trinity-kappfinder
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f}  2> /dev/null || :
-done
-update-desktop-database %{tde_appdir} 2> /dev/null || : 
-
-##########
-
-%package -n trinity-libkateinterfaces
-Summary:	Common libraries used by kwrite and kate
-Group:		Environment/Libraries
-
-%description -n trinity-libkateinterfaces
-%{summary}
-
-%files -n trinity-libkateinterfaces
-%defattr(-,root,root,-)
-%{tde_libdir}/libkateinterfaces.so.*
-
-%post -n trinity-libkateinterfaces
-/sbin/ldconfig || :
-
-%postun -n trinity-libkateinterfaces
-/sbin/ldconfig || :
-
-##########
-
-%package -n trinity-kate
-Summary:	advanced text editor for TDE
-Group:		Applications/Text
-Requires:	%{name}-data = %{version}-%{release}
-Requires:	trinity-kwrite = %{version}-%{release}
-Requires:	trinity-libkateinterfaces = %{version}-%{release}
-
-%description -n trinity-kate
-Kate is a multi document editor, based on a rewritten version of the kwrite
-editing widget of TDE.
-
-It is a multi-view editor that lets you view several instances of the same
-document with all instances being synced, or view more files at the same
-time for easy reference or simultaneous editing. The terminal emulation
-and sidebar are docked windows that can be plugged out of the main window,
-or replaced therein according to your preference.
-
-Some random features:
-* Editing of big files
-* Extensible syntax highlighting
-* Folding
-* Dynamic word wrap
-* Selectable encoding
-* Filter command
-* Global grep dialog
-
-%files -n trinity-kate
-%defattr(-,root,root,-)
-%{tde_bindir}/kate
-%{tde_tdelibdir}/kate.la
-%{tde_tdelibdir}/kate.so
-%{tde_libdir}/libkateutils.so.*
-%{tde_libdir}/lib[kt]deinit_kate.la
-%{tde_libdir}/lib[kt]deinit_kate.so
-%{tde_tdeappdir}/kate.desktop
-%{tde_datadir}/apps/kate/
-%{tde_datadir}/apps/kconf_update/kate-2.4.upd
-%{_sysconfdir}/trinity/katerc
-%{tde_datadir}/icons/hicolor/*/apps/kate.png
-%{tde_datadir}/icons/hicolor/*/apps/kate2.svgz
-%{tde_datadir}/servicetypes/kateplugin.desktop
-%{tde_tdedocdir}/HTML/en/kate/
-
-%post -n trinity-kate
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f}  2> /dev/null || :
-done
-update-desktop-database %{tde_appdir} 2> /dev/null || : 
-/sbin/ldconfig || :
-
-%postun -n trinity-kate
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f}  2> /dev/null || :
-done
-update-desktop-database %{tde_appdir} 2> /dev/null || : 
-/sbin/ldconfig || :
-
-##########
-
-%package -n trinity-kate-devel
-Summary:	Development files for kate
-Group:		Development/Libraries
-Requires:	trinity-kate = %{version}-%{release}
-
-%description -n trinity-kate-devel
-%{summary}
-
-%files -n trinity-kate-devel
-%{tde_tdeincludedir}/kate/
-%{tde_libdir}/libkateutils.so
-%{tde_libdir}/libkateutils.la
-%{tde_libdir}/libkateinterfaces.so
-%{tde_libdir}/libkateinterfaces.la
-
-%post -n trinity-kate-devel
-/sbin/ldconfig || :
-
-%postun -n trinity-kate-devel
-/sbin/ldconfig || :
-
-##########
-
-%package -n trinity-kwrite
-Summary:	advanced text editor for TDE
-Group:		Applications/Utilities
-Requires:	%{name}-data = %{version}-%{release}
-Requires:	trinity-libkateinterfaces = %{version}-%{release}
-
-%description -n trinity-kwrite
-Kwrite is a text editor for TDE.
-
-%files -n trinity-kwrite
-%defattr(-,root,root,-)
-%{tde_bindir}/kwrite
-%{tde_tdelibdir}/kwrite.la
-%{tde_tdelibdir}/kwrite.so
-%{tde_libdir}/lib[kt]deinit_kwrite.la
-%{tde_libdir}/lib[kt]deinit_kwrite.so
-%{tde_tdeappdir}/kwrite.desktop
-%{tde_datadir}/apps/kwrite/kwriteui.rc
-%{tde_datadir}/icons/hicolor/*/apps/kwrite.png
-%{tde_datadir}/icons/hicolor/*/apps/kwrite2.svgz
-%{tde_tdedocdir}/HTML/en/kwrite/
-
-
-%post -n trinity-kwrite
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f}  2> /dev/null || :
-done
-update-desktop-database %{tde_appdir} 2> /dev/null || : 
-
-%postun -n trinity-kwrite
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f}  2> /dev/null || :
-done
-update-desktop-database %{tde_appdir} 2> /dev/null || : 
-
-##########
-
-%package -n trinity-kcontrol
-Summary:	control center for TDE
-Group:		Applications/Utilities
-Requires:	%{name}-data = %{version}-%{release}
-
-# Requires 'usb.ids'
-Requires:	usbutils
-%if 0%{?suse_version} == 0
-Requires:	hwdata
-%endif
-
-%description -n trinity-kcontrol
-The Trinity Control Center provides you with a centralized and convenient
-way to configure all of your TDE settings.
-
-It is made up of multiple modules. Each module is a separate application,
-but the control center organizes all of these programs into a convenient
-location.
-
-In combination with udev KControl supports the advanced
-configuration of Logitech mice, though the user must be a member of the
-plugdev group.
-
-%files -n trinity-kcontrol
-%defattr(-,root,root,-)
-%{tde_bindir}/kaccess
-%{tde_bindir}/kcontrol
-%{tde_bindir}/kdeinstallktheme
-%{tde_bindir}/keditfiletype
-%{tde_bindir}/kfontinst
-%{tde_bindir}/kfontview
-%{tde_bindir}/kinfocenter
-%{tde_bindir}/klocaldomainurifilterhelper
-%{tde_bindir}/krdb
-%{tde_tdelibdir}/fontthumbnail.la
-%{tde_tdelibdir}/fontthumbnail.so
-%{tde_tdelibdir}/kaccess.la
-%{tde_tdelibdir}/kaccess.so
-%{tde_tdelibdir}/kcm_access.la
-%{tde_tdelibdir}/kcm_access.so
-%{tde_tdelibdir}/kcm_arts.la
-%{tde_tdelibdir}/kcm_arts.so
-%{tde_tdelibdir}/kcm_background.la
-%{tde_tdelibdir}/kcm_background.so
-%{tde_tdelibdir}/kcm_bell.la
-%{tde_tdelibdir}/kcm_bell.so
-%{tde_tdelibdir}/kcm_clock.la
-%{tde_tdelibdir}/kcm_clock.so
-%{tde_tdelibdir}/kcm_colors.la
-%{tde_tdelibdir}/kcm_colors.so
-%{tde_tdelibdir}/kcm_componentchooser.la
-%{tde_tdelibdir}/kcm_componentchooser.so
-%{tde_tdelibdir}/kcm_crypto.la
-%{tde_tdelibdir}/kcm_crypto.so
-%{tde_tdelibdir}/kcm_css.la
-%{tde_tdelibdir}/kcm_css.so
-%{tde_tdelibdir}/kcm_display.la
-%{tde_tdelibdir}/kcm_display.so
-%{tde_tdelibdir}/kcm_energy.la
-%{tde_tdelibdir}/kcm_energy.so
-%{tde_tdelibdir}/kcm_filetypes.la
-%{tde_tdelibdir}/kcm_filetypes.so
-%{tde_tdelibdir}/kcm_fontinst.la
-%{tde_tdelibdir}/kcm_fontinst.so
-%{tde_tdelibdir}/kcm_fonts.la
-%{tde_tdelibdir}/kcm_fonts.so
-#%{tde_tdelibdir}/kcm_hwmanager.la
-#%{tde_tdelibdir}/kcm_hwmanager.so
-%{tde_tdelibdir}/kcm_icons.la
-%{tde_tdelibdir}/kcm_icons.so
-%{tde_tdelibdir}/kcm_info.la
-%{tde_tdelibdir}/kcm_info.so
-%{tde_tdelibdir}/kcm_input.la
-%{tde_tdelibdir}/kcm_input.so
-%{tde_tdelibdir}/kcm_ioslaveinfo.la
-%{tde_tdelibdir}/kcm_ioslaveinfo.so
-%{tde_tdelibdir}/kcm_joystick.la
-%{tde_tdelibdir}/kcm_joystick.so
-%{tde_tdelibdir}/kcm_kded.la
-%{tde_tdelibdir}/kcm_kded.so
-%{tde_tdelibdir}/kcm_[kt]dm.la
-%{tde_tdelibdir}/kcm_[kt]dm.so
-%{tde_tdelibdir}/kcm_kdnssd.so
-%{tde_tdelibdir}/kcm_kdnssd.la
-%{tde_tdelibdir}/kcm_keys.la
-%{tde_tdelibdir}/kcm_keys.so
-%{tde_tdelibdir}/kcm_kicker.la
-%{tde_tdelibdir}/kcm_kicker.so
-%{tde_tdelibdir}/kcm_kio.la
-%{tde_tdelibdir}/kcm_kio.so
-%{tde_tdelibdir}/kcm_knotify.la
-%{tde_tdelibdir}/kcm_knotify.so
-%{tde_tdelibdir}/kcm_konqhtml.la
-%{tde_tdelibdir}/kcm_konqhtml.so
-%{tde_tdelibdir}/kcm_konq.la
-%{tde_tdelibdir}/kcm_konq.so
-%{tde_tdelibdir}/kcm_kthememanager.la
-%{tde_tdelibdir}/kcm_kthememanager.so
-%{tde_tdelibdir}/kcm_kurifilt.la
-%{tde_tdelibdir}/kcm_kurifilt.so
-%{tde_tdelibdir}/kcm_launch.la
-%{tde_tdelibdir}/kcm_launch.so
-%{tde_tdelibdir}/kcm_locale.la
-%{tde_tdelibdir}/kcm_locale.so
-%{tde_tdelibdir}/kcm_nic.la
-%{tde_tdelibdir}/kcm_nic.so
-%{tde_tdelibdir}/kcm_performance.la
-%{tde_tdelibdir}/kcm_performance.so
-%{tde_tdelibdir}/kcm_privacy.la
-%{tde_tdelibdir}/kcm_privacy.so
-%{tde_tdelibdir}/kcm_samba.la
-%{tde_tdelibdir}/kcm_samba.so
-%{tde_tdelibdir}/kcm_screensaver.la
-%{tde_tdelibdir}/kcm_screensaver.so
-%{tde_tdelibdir}/kcm_smserver.la
-%{tde_tdelibdir}/kcm_smserver.so
-%{tde_tdelibdir}/kcm_spellchecking.la
-%{tde_tdelibdir}/kcm_spellchecking.so
-%{tde_tdelibdir}/kcm_style.la
-%{tde_tdelibdir}/kcm_style.so
-%{tde_tdelibdir}/kcm_taskbar.la
-%{tde_tdelibdir}/kcm_taskbar.so
-%{tde_tdelibdir}/kcm_usb.la
-%{tde_tdelibdir}/kcm_usb.so
-%{tde_tdelibdir}/kcm_view1394.la
-%{tde_tdelibdir}/kcm_view1394.so
-%{tde_tdelibdir}/kcm_xinerama.la
-%{tde_tdelibdir}/kcm_xinerama.so
-%{tde_tdelibdir}/kcontrol.la
-%{tde_tdelibdir}/kcontrol.so
-%{tde_tdelibdir}/kfile_font.la
-%{tde_tdelibdir}/kfile_font.so
-%{tde_tdelibdir}/kio_fonts.la
-%{tde_tdelibdir}/kio_fonts.so
-%{tde_tdelibdir}/kstyle_keramik_config.la
-%{tde_tdelibdir}/kstyle_keramik_config.so
-%{tde_tdelibdir}/libkfontviewpart.la
-%{tde_tdelibdir}/libkfontviewpart.so
-%{tde_tdelibdir}/libkshorturifilter.la
-%{tde_tdelibdir}/libkshorturifilter.so
-%{tde_tdelibdir}/libkuriikwsfilter.la
-%{tde_tdelibdir}/libkuriikwsfilter.so
-%{tde_tdelibdir}/libkurisearchfilter.la
-%{tde_tdelibdir}/libkurisearchfilter.so
-%{tde_tdelibdir}/liblocaldomainurifilter.la
-%{tde_tdelibdir}/liblocaldomainurifilter.so
-%{tde_libdir}/lib[kt]deinit_kaccess.la
-%{tde_libdir}/lib[kt]deinit_kaccess.so
-%{tde_libdir}/lib[kt]deinit_kcontrol.la
-%{tde_libdir}/lib[kt]deinit_kcontrol.so
-%{tde_libdir}/libkfontinst.so.*
-%{tde_tdeappdir}/arts.desktop
-%{tde_tdeappdir}/background.desktop
-%{tde_tdeappdir}/bell.desktop
-%{tde_tdeappdir}/cache.desktop
-%{tde_tdeappdir}/cdinfo.desktop
-%{tde_tdeappdir}/clock.desktop
-%{tde_tdeappdir}/colors.desktop
-%{tde_tdeappdir}/componentchooser.desktop
-%{tde_tdeappdir}/cookies.desktop
-%{tde_tdeappdir}/crypto.desktop
-%{tde_tdeappdir}/desktopbehavior.desktop
-%{tde_tdeappdir}/desktop.desktop
-%{tde_tdeappdir}/desktoppath.desktop
-%{tde_tdeappdir}/devices.desktop
-%{tde_tdeappdir}/display.desktop
-%{tde_tdeappdir}/dma.desktop
-%{tde_tdeappdir}/ebrowsing.desktop
-%{tde_tdeappdir}/filebrowser.desktop
-%{tde_tdeappdir}/filetypes.desktop
-%{tde_tdeappdir}/fonts.desktop
-#%{tde_tdeappdir}/hwmanager.desktop
-%{tde_tdeappdir}/icons.desktop
-%{tde_tdeappdir}/installktheme.desktop
-%{tde_tdeappdir}/interrupts.desktop
-%{tde_tdeappdir}/ioports.desktop
-%{tde_tdeappdir}/ioslaveinfo.desktop
-%{tde_tdeappdir}/joystick.desktop
-%{tde_tdeappdir}/kcm_kdnssd.desktop
-%{tde_tdeappdir}/kcmaccess.desktop
-%{tde_tdeappdir}/kcmcss.desktop
-%{tde_tdeappdir}/kcmfontinst.desktop
-%{tde_tdeappdir}/kcmkded.desktop
-%{tde_tdeappdir}/kcmlaunch.desktop
-%{tde_tdeappdir}/kcmnotify.desktop
-%{tde_tdeappdir}/kcmperformance.desktop
-%{tde_tdeappdir}/kcmsmserver.desktop
-%{tde_tdeappdir}/kcmtaskbar.desktop
-%{tde_tdeappdir}/kcmusb.desktop
-%{tde_tdeappdir}/kcmview1394.desktop
-%{tde_tdeappdir}/KControl.desktop
-%{tde_tdeappdir}/[kt]dm.desktop
-%{tde_tdeappdir}/keys.desktop
-%{tde_tdeappdir}/kfontview.desktop
-%{tde_tdeappdir}/khtml_behavior.desktop
-%{tde_tdeappdir}/khtml_fonts.desktop
-%{tde_tdeappdir}/khtml_java_js.desktop
-%{tde_tdeappdir}/kinfocenter.desktop
-%{tde_tdeappdir}/kthememanager.desktop
-%{tde_tdeappdir}/lanbrowser.desktop
-%{tde_tdeappdir}/language.desktop
-%{tde_tdeappdir}/media.desktop
-%{tde_tdeappdir}/memory.desktop
-%{tde_tdeappdir}/mouse.desktop
-%{tde_tdeappdir}/netpref.desktop
-%{tde_tdeappdir}/nic.desktop
-%{tde_tdeappdir}/opengl.desktop
-%{tde_tdeappdir}/panel_appearance.desktop
-%{tde_tdeappdir}/panel.desktop
-%{tde_tdeappdir}/partitions.desktop
-%{tde_tdeappdir}/pci.desktop
-%{tde_tdeappdir}/privacy.desktop
-%{tde_tdeappdir}/processor.desktop
-%{tde_tdeappdir}/proxy.desktop
-%{tde_tdeappdir}/screensaver.desktop
-%{tde_tdeappdir}/scsi.desktop
-%{tde_tdeappdir}/smbstatus.desktop
-%{tde_tdeappdir}/sound.desktop
-%{tde_tdeappdir}/spellchecking.desktop
-%{tde_tdeappdir}/style.desktop
-%{tde_tdeappdir}/useragent.desktop
-%{tde_tdeappdir}/xserver.desktop
-%{tde_datadir}/applnk/.hidden/energy.desktop
-%{tde_datadir}/applnk/.hidden/fileappearance.desktop
-%{tde_datadir}/applnk/.hidden/filebehavior.desktop
-%{tde_datadir}/applnk/.hidden/filepreviews.desktop
-%{tde_datadir}/applnk/.hidden/kcmkonqyperformance.desktop
-%{tde_datadir}/applnk/.hidden/kicker_config_appearance.desktop
-%{tde_datadir}/applnk/.hidden/kicker_config.desktop
-%{tde_datadir}/applnk/.hidden/smb.desktop
-%{tde_datadir}/applnk/.hidden/xinerama.desktop
-%{tde_datadir}/applnk/Settings/LookNFeel/
-%{tde_datadir}/applnk/Settings/WebBrowsing/khtml_appearance.desktop
-%{tde_datadir}/applnk/Settings/WebBrowsing/nsplugin.desktop
-%{tde_datadir}/applnk/Settings/WebBrowsing/smb.desktop
-%{tde_datadir}/apps/kcm_componentchooser/kcm_browser.desktop
-%{tde_datadir}/apps/kcm_componentchooser/kcm_kemail.desktop
-%{tde_datadir}/apps/kcm_componentchooser/kcm_terminal.desktop
-%{tde_datadir}/apps/konqsidebartng/virtual_folders/services/fonts.desktop
-%{tde_datadir}/apps/konqueror/servicemenus/installfont.desktop
-%{tde_datadir}/mimelnk/application/x-ktheme.desktop
-%{tde_datadir}/mimelnk/fonts/folder.desktop
-%{tde_datadir}/mimelnk/fonts/package.desktop
-%{tde_datadir}/mimelnk/fonts/system-folder.desktop
-%{tde_datadir}/services/fonts.protocol
-%{tde_datadir}/services/fontthumbnail.desktop
-%{tde_datadir}/services/kaccess.desktop
-%{tde_datadir}/services/kfile_font.desktop
-%{tde_datadir}/services/kfontviewpart.desktop
-%{tde_datadir}/services/kshorturifilter.desktop
-%{tde_datadir}/services/kuriikwsfilter.desktop
-%{tde_datadir}/services/kurisearchfilter.desktop
-%{tde_datadir}/services/localdomainurifilter.desktop
-
-%{tde_datadir}/apps/usb.ids
-%{tde_datadir}/apps/kcmview1394/oui.db
-
-# The following features are not compiled under RHEL 5
-%if 0%{?rhel} >= 6 || 0%{?fedora} >= 15 || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version}
-%{tde_bindir}/krandrtray
-%{tde_tdelibdir}/kcm_displayconfig.la
-%{tde_tdelibdir}/kcm_displayconfig.so
-%{tde_tdelibdir}/kcm_iccconfig.la
-%{tde_tdelibdir}/kcm_iccconfig.so
-%{tde_tdelibdir}/kcm_randr.la
-%{tde_tdelibdir}/kcm_randr.so
-%{tde_tdeappdir}/displayconfig.desktop
-%{tde_tdeappdir}/iccconfig.desktop
-%{tde_tdeappdir}/krandrtray.desktop
-%{tde_datadir}/applnk/.hidden/randr.desktop
-%{tde_datadir}/autostart/krandrtray-autostart.desktop
-%endif
-
-%post -n trinity-kcontrol
-/sbin/ldconfig || :
-update-desktop-database %{tde_appdir} 2> /dev/null || : 
-
-%postun -n trinity-kcontrol
-/sbin/ldconfig || :
-update-desktop-database %{tde_appdir} 2> /dev/null || : 
-
-##########
-
-%package -n trinity-kcontrol-devel
-Summary:	Development files for kcontrol
-Group:		Development/Libraries
-Requires:	trinity-kcontrol = %{version}-%{release}
-
-%description -n trinity-kcontrol-devel
-%{summary}
-
-%files -n trinity-kcontrol-devel
-%{tde_libdir}/libkfontinst.la
-%{tde_libdir}/libkfontinst.so
-
-%post -n trinity-kcontrol-devel
-/sbin/ldconfig || :
-
-%postun -n trinity-kcontrol-devel
-/sbin/ldconfig || :
-
-##########
-
-%package bin
-Summary:	core binaries for the TDE base module
-Group:		Applications/Utilities
-Requires:	%{name}-data = %{version}-%{release}
-Requires:	pam
-
-Provides:	tdebase-bin = %{version}-%{release}
-Obsoletes:	tdebase-bin < %{version}-%{release}
-
-%description bin
-This package contains miscellaneous programs needed by other
-TDE applications, particularly those in the TDE base module.
-
-%files bin
-%defattr(-,root,root,-)
-%{tde_bindir}/krootbacking
-#%{tde_bindir}/tdeinit_phase1
-%if 0%{?with_tsak}
-%attr(4511,root,root) %{tde_bindir}/[kt]dmtsak
-%{tde_bindir}/tsak
-%endif
-%{tde_bindir}/kdebugdialog
-%{tde_bindir}/kreadconfig
-%{tde_bindir}/kwriteconfig
-%{tde_bindir}/kstart
-%{_sysconfdir}/trinity/kxkb_groups
-%{tde_bindir}/drkonqi
-%{tde_bindir}/kapplymousetheme
-%{tde_bindir}/kblankscrn.kss
-%attr(4755,root,root) %{tde_bindir}/kcheckpass
-%{tde_bindir}/kcminit
-%{tde_bindir}/kcminit_startup
-%{tde_bindir}/kdcop
-%{tde_bindir}/[kt]desu
-%attr(0755,root,root) %{tde_bindir}/[kt]desud
-%{tde_bindir}/kdialog
-%{tde_bindir}/khotkeys
-%{tde_bindir}/knetattach
-%{tde_bindir}/krandom.kss
-%{tde_bindir}/ksystraycmd
-%{tde_bindir}/kxkb
-%{tde_libdir}/kconf_update_bin/khotkeys_update
-%{tde_tdelibdir}/kcminit.la
-%{tde_tdelibdir}/kcminit.so
-%{tde_tdelibdir}/kcminit_startup.la
-%{tde_tdelibdir}/kcminit_startup.so
-%{tde_tdelibdir}/kcm_keyboard.la
-%{tde_tdelibdir}/kcm_keyboard.so
-%{tde_tdelibdir}/kcm_khotkeys_init.la
-%{tde_tdelibdir}/kcm_khotkeys_init.so
-%{tde_tdelibdir}/kcm_khotkeys.la
-%{tde_tdelibdir}/kcm_khotkeys.so
-%{tde_tdelibdir}/kded_khotkeys.la
-%{tde_tdelibdir}/kded_khotkeys.so
-%{tde_tdelibdir}/kgreet_classic.la
-%{tde_tdelibdir}/kgreet_classic.so
-%{tde_tdelibdir}/kgreet_winbind.la
-%{tde_tdelibdir}/kgreet_winbind.so
-%{tde_tdelibdir}/khotkeys.la
-%{tde_tdelibdir}/khotkeys.so
-%{tde_tdelibdir}/khotkeys_arts.la
-%{tde_tdelibdir}/khotkeys_arts.so
-%{tde_tdelibdir}/kxkb.la
-%{tde_tdelibdir}/kxkb.so
-%{tde_libdir}/lib[kt]deinit_kcminit.la
-%{tde_libdir}/lib[kt]deinit_kcminit.so
-%{tde_libdir}/lib[kt]deinit_kcminit_startup.la
-%{tde_libdir}/lib[kt]deinit_kcminit_startup.so
-%{tde_libdir}/lib[kt]deinit_khotkeys.la
-%{tde_libdir}/lib[kt]deinit_khotkeys.so
-%{tde_libdir}/lib[kt]deinit_kxkb.la
-%{tde_libdir}/lib[kt]deinit_kxkb.so
-%{tde_libdir}/libkhotkeys_shared.so.*
-%{tde_tdeappdir}/keyboard.desktop
-%{tde_tdeappdir}/keyboard_layout.desktop
-%{tde_tdeappdir}/khotkeys.desktop
-%{tde_tdeappdir}/knetattach.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/
-%{tde_datadir}/apps/drkonqi/
-%{tde_datadir}/apps/kconf_update/khotkeys_32b1_update.upd
-%{tde_datadir}/apps/kconf_update/khotkeys_printscreen.upd
-%{tde_datadir}/apps/kconf_update/konqueror_gestures_trinity21_update.upd
-%{tde_datadir}/apps/kdcop/kdcopui.rc
-%{tde_datadir}/apps/khotkeys/
-%{tde_datadir}/services/kded/khotkeys.desktop
-%{tde_datadir}/services/kxkb.desktop
-%if 0%{?suse_version} == 0
-%{_sysconfdir}/pam.d/kcheckpass-trinity
-%{_sysconfdir}/pam.d/kscreensaver-trinity
-%endif
-%{tde_tdedocdir}/HTML/en/kdcop/
-%{tde_tdedocdir}/HTML/en/kdebugdialog//
-%{tde_tdedocdir}/HTML/en/[kt]desu/
-%{tde_tdedocdir}/HTML/en/knetattach/
-%{tde_tdedocdir}/HTML/en/kxkb/
-
-%post bin
-/sbin/ldconfig || :
-update-desktop-database %{tde_appdir} 2> /dev/null || : 
-
-%postun bin
-/sbin/ldconfig || :
-update-desktop-database %{tde_appdir} 2> /dev/null || : 
-
-##########
-
-%package bin-devel
-Summary:	Development files for core binaries for the TDE base module
-Group:		Development/Libraries
-Requires:	%{name}-bin = %{version}-%{release}
-
-Obsoletes:	tdebase-bin-devel < %{version}-%{release}
-Provides:	tdebase-bin-devel = %{version}-%{release}
-
-%description bin-devel
-%{summary}
-
-%files bin-devel
-%{tde_libdir}/libkhotkeys_shared.la
-%{tde_libdir}/libkhotkeys_shared.so
-
-%post bin-devel
-/sbin/ldconfig || :
-
-%postun bin-devel
-/sbin/ldconfig || :
-
-##########
-
-%package data
-Summary:	shared data files for the TDE base module
-Group:		Environment/Libraries
-Requires:	%{name}-runtime-data-common = %{version}-%{release}
-
-Obsoletes:	tdebase-data < %{version}-%{release}
-Provides:	tdebase-data = %{version}-%{release}
-
-%description data
-This package contains the architecture-independent shared data files
-needed for a basic TDE desktop installation.
-
-%files data
-%defattr(-,root,root,-)
-%{_sysconfdir}/trinity/kshorturifilterrc
-%{tde_datadir}/applnk/.hidden/battery.desktop
-%{tde_datadir}/applnk/.hidden/bwarning.desktop
-%{tde_datadir}/applnk/.hidden/cwarning.desktop
-%{tde_datadir}/applnk/.hidden/.directory
-%{tde_datadir}/applnk/.hidden/email.desktop
-%{tde_datadir}/applnk/.hidden/kcmkonq.desktop
-%{tde_datadir}/applnk/.hidden/kcmkxmlrpcd.desktop
-%{tde_datadir}/applnk/.hidden/konqhtml.desktop
-%{tde_datadir}/applnk/.hidden/passwords.desktop
-%{tde_datadir}/applnk/.hidden/power.desktop
-%{tde_datadir}/applnk/.hidden/socks.desktop
-%{tde_datadir}/applnk/.hidden/userinfo.desktop
-%{tde_datadir}/applnk/.hidden/virtualdesktops.desktop
-%{tde_datadir}/apps/kaccess/eventsrc
-%{tde_datadir}/apps/kcmcss/template.css
-%{tde_datadir}/apps/kcminput/
-%{tde_datadir}/apps/kcmkeys/
-%{tde_datadir}/apps/kcmlocale/pics/background.png
-%{tde_datadir}/apps/kconf_update/convertShortcuts.pl
-%{tde_datadir}/apps/kconf_update/kaccel.upd
-%{tde_datadir}/apps/kconf_update/kcmdisplayrc.upd
-%{tde_datadir}/apps/kconf_update/kuriikwsfilter.upd
-%{tde_datadir}/apps/kconf_update/mouse_cursor_theme.upd
-%{tde_datadir}/apps/kconf_update/socks.upd
-%{tde_datadir}/apps/kcontrol/
-%{tde_datadir}/apps/kdisplay/
-%{tde_datadir}/apps/kfontview/
-%{tde_datadir}/apps/kinfocenter/kinfocenterui.rc
-%{tde_datadir}/apps/kthememanager/themes/*
-%{tde_datadir}/icons/crystalsvg/*/apps/access.png
-%{tde_datadir}/icons/crystalsvg/*/apps/acroread.png
-%{tde_datadir}/icons/crystalsvg/*/apps/applixware.png
-%{tde_datadir}/icons/crystalsvg/*/apps/arts.png
-%{tde_datadir}/icons/crystalsvg/*/apps/background.png
-%{tde_datadir}/icons/crystalsvg/*/apps/bell.png
-%{tde_datadir}/icons/crystalsvg/*/apps/cache.png
-%{tde_datadir}/icons/crystalsvg/*/apps/clanbomber.png
-%{tde_datadir}/icons/crystalsvg/*/apps/clock.png
-%{tde_datadir}/icons/crystalsvg/*/apps/colors.png
-%{tde_datadir}/icons/crystalsvg/*/apps/date.png
-%{tde_datadir}/icons/crystalsvg/*/apps/email.png
-%{tde_datadir}/icons/crystalsvg/*/apps/energy.png
-%{tde_datadir}/icons/crystalsvg/*/apps/energy_star.png
-%{tde_datadir}/icons/crystalsvg/*/apps/filetypes.png
-%{tde_datadir}/icons/crystalsvg/*/apps/fonts.png
-%{tde_datadir}/icons/crystalsvg/*/apps/gimp.png
-%{tde_datadir}/icons/crystalsvg/*/apps/help_index.png
-%{tde_datadir}/icons/crystalsvg/*/apps/hwinfo.png
-%{tde_datadir}/icons/crystalsvg/*/apps/kcmdevices.png
-%{tde_datadir}/icons/crystalsvg/*/apps/kcmdf.png
-%{tde_datadir}/icons/crystalsvg/*/apps/kcmkwm.png
-%{tde_datadir}/icons/crystalsvg/*/apps/kcmmemory.png
-%{tde_datadir}/icons/crystalsvg/*/apps/kcmpartitions.png
-%{tde_datadir}/icons/crystalsvg/*/apps/kcmpci.png
-%{tde_datadir}/icons/crystalsvg/*/apps/kcontrol.png
-%{tde_datadir}/icons/crystalsvg/*/apps/[kt]dmconfig.png
-%{tde_datadir}/icons/crystalsvg/*/apps/key_bindings.png
-%{tde_datadir}/icons/crystalsvg/*/apps/kfm_home.png
-%{tde_datadir}/icons/crystalsvg/*/apps/kscreensaver.png
-%{tde_datadir}/icons/crystalsvg/*/apps/kthememgr.png
-%{tde_datadir}/icons/crystalsvg/*/apps/licq.png
-%{tde_datadir}/icons/crystalsvg/*/apps/linuxconf.png
-%{tde_datadir}/icons/crystalsvg/*/apps/locale.png
-%{tde_datadir}/icons/crystalsvg/*/apps/looknfeel.png
-%{tde_datadir}/icons/crystalsvg/*/apps/multimedia.png
-%{tde_datadir}/icons/crystalsvg/*/apps/netscape.png
-%{tde_datadir}/icons/crystalsvg/*/apps/package_applications.png
-%{tde_datadir}/icons/crystalsvg/*/apps/package_development.png
-%{tde_datadir}/icons/crystalsvg/*/apps/package_favourite.png
-%{tde_datadir}/icons/crystalsvg/*/apps/package_games.png
-%{tde_datadir}/icons/crystalsvg/*/apps/package_games_kids.png
-%{tde_datadir}/icons/crystalsvg/*/apps/package_multimedia.png
-%{tde_datadir}/icons/crystalsvg/*/apps/package_network.png
-%{tde_datadir}/icons/crystalsvg/*/apps/package.png
-%{tde_datadir}/icons/crystalsvg/*/apps/package_settings.png
-%{tde_datadir}/icons/crystalsvg/*/apps/package_toys.png
-%{tde_datadir}/icons/crystalsvg/*/apps/package_utilities.png
-%{tde_datadir}/icons/crystalsvg/*/apps/penguin.png
-%{tde_datadir}/icons/crystalsvg/*/apps/personal.png
-%{tde_datadir}/icons/crystalsvg/*/apps/phppg.png
-%{tde_datadir}/icons/crystalsvg/*/apps/proxy.png
-%{tde_datadir}/icons/crystalsvg/*/apps/pysol.png
-%{tde_datadir}/icons/crystalsvg/*/apps/randr.png
-%{tde_datadir}/icons/crystalsvg/*/apps/samba.png
-%{tde_datadir}/icons/crystalsvg/*/apps/staroffice.png
-%{tde_datadir}/icons/crystalsvg/*/apps/stylesheet.png
-%{tde_datadir}/icons/crystalsvg/*/apps/terminal.png
-%{tde_datadir}/icons/crystalsvg/*/apps/tux.png
-%{tde_datadir}/icons/crystalsvg/*/apps/wp.png
-%{tde_datadir}/icons/crystalsvg/*/apps/xclock.png
-%{tde_datadir}/icons/crystalsvg/*/apps/xfmail.png
-%{tde_datadir}/icons/crystalsvg/*/apps/xmag.png
-%{tde_datadir}/icons/crystalsvg/*/apps/xpaint.png
-%{tde_datadir}/icons/crystalsvg/scalable/apps/access.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/acroread.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/aim.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/aktion.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/antivirus.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/applixware.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/arts.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/background.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/bell.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/browser.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/cache.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/camera.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/clanbomber.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/clock.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/colors.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/core.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/date.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/display.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/download_manager.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/email.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/energy.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/error.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/fifteenpieces.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/filetypes.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/fonts.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/galeon.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/gnome_apps.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/hardware.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/hwinfo.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/ieee1394.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/kcmdevices.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/kcmkwm.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/kcmx.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/locale.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/my_mac.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/netscape.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/openoffice.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/package_development.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/package_games_kids.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/package_toys.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/penguin.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/personal.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/quicktime.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/realplayer.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/samba.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/shell.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/staroffice.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/stylesheet.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/terminal.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/tux.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/wine.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/x.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/xapp.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/xcalc.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/xchat.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/xclock.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/xeyes.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/xpaint.svgz
-%{tde_datadir}/icons/crystalsvg/*/devices/laptop.png
-%{tde_datadir}/icons/crystalsvg/*/devices/laptop.svgz
-%{tde_datadir}/icons/crystalsvg/*/actions/newfont.png
-%{tde_datadir}/icons/crystalsvg/*/apps/abiword.png
-%{tde_datadir}/icons/crystalsvg/*/apps/agent.png
-%{tde_datadir}/icons/crystalsvg/*/apps/alevt.png
-%{tde_datadir}/icons/crystalsvg/*/apps/assistant.png
-%{tde_datadir}/icons/crystalsvg/*/apps/blender.png
-%{tde_datadir}/icons/crystalsvg/*/apps/bluefish.png
-%{tde_datadir}/icons/crystalsvg/*/apps/cookie.png
-%{tde_datadir}/icons/crystalsvg/*/apps/designer.png
-%{tde_datadir}/icons/crystalsvg/*/apps/dia.png
-%{tde_datadir}/icons/crystalsvg/*/apps/dlgedit.png
-%{tde_datadir}/icons/crystalsvg/*/apps/eclipse.png
-%{tde_datadir}/icons/crystalsvg/*/apps/edu_languages.png
-%{tde_datadir}/icons/crystalsvg/*/apps/edu_mathematics.png
-%{tde_datadir}/icons/crystalsvg/*/apps/edu_miscellaneous.png
-%{tde_datadir}/icons/crystalsvg/*/apps/edu_science.png
-%{tde_datadir}/icons/crystalsvg/*/apps/emacs.png
-%{tde_datadir}/icons/crystalsvg/*/apps/enhanced_browsing.png
-%{tde_datadir}/icons/crystalsvg/*/apps/evolution.png
-%{tde_datadir}/icons/crystalsvg/*/apps/fifteenpieces.png
-%{tde_datadir}/icons/crystalsvg/*/apps/gabber.png
-%{tde_datadir}/icons/crystalsvg/*/apps/gaim.png
-%{tde_datadir}/icons/crystalsvg/*/apps/gnome_apps.png
-%{tde_datadir}/icons/crystalsvg/*/apps/gnomemeeting.png
-%{tde_datadir}/icons/crystalsvg/*/apps/gnucash.png
-%{tde_datadir}/icons/crystalsvg/*/apps/gnumeric.png
-%{tde_datadir}/icons/crystalsvg/*/apps/gv.png
-%{tde_datadir}/icons/crystalsvg/*/apps/gvim.png
-%{tde_datadir}/icons/crystalsvg/*/apps/icons.png
-%{tde_datadir}/icons/crystalsvg/*/apps/iconthemes.png
-%{tde_datadir}/icons/crystalsvg/*/apps/ieee1394.png
-%{tde_datadir}/icons/crystalsvg/*/apps/input_devices_settings.png
-%{tde_datadir}/icons/crystalsvg/*/apps/kcmkicker.png
-%{tde_datadir}/icons/crystalsvg/*/apps/kcmmidi.png
-%{tde_datadir}/icons/crystalsvg/*/apps/kcmprocessor.png
-%{tde_datadir}/icons/crystalsvg/*/apps/kcmscsi.png
-%{tde_datadir}/icons/crystalsvg/*/apps/kcmsound.png
-%{tde_datadir}/icons/crystalsvg/*/apps/kcmsystem.png
-%{tde_datadir}/icons/crystalsvg/*/apps/kcmx.png
-%{tde_datadir}/icons/crystalsvg/*/apps/keyboard.png
-%{tde_datadir}/icons/crystalsvg/*/apps/keyboard_layout.png
-%{tde_datadir}/icons/crystalsvg/*/apps/knotify.png
-%{tde_datadir}/icons/crystalsvg/*/apps/kvirc.png
-%{tde_datadir}/icons/crystalsvg/*/apps/linguist.png
-%{tde_datadir}/icons/crystalsvg/*/apps/lyx.png
-%{tde_datadir}/icons/crystalsvg/*/apps/mac.png
-%{tde_datadir}/icons/crystalsvg/*/apps/mathematica.png
-%{tde_datadir}/icons/crystalsvg/*/apps/nedit.png
-%{tde_datadir}/icons/crystalsvg/*/apps/opera.png
-%{tde_datadir}/icons/crystalsvg/*/apps/package_application.png
-%{tde_datadir}/icons/crystalsvg/*/apps/package_editors.png
-%{tde_datadir}/icons/crystalsvg/*/apps/package_edutainment.png
-%{tde_datadir}/icons/crystalsvg/*/apps/package_games_arcade.png
-%{tde_datadir}/icons/crystalsvg/*/apps/package_games_board.png
-%{tde_datadir}/icons/crystalsvg/*/apps/package_games_card.png
-%{tde_datadir}/icons/crystalsvg/*/apps/package_games_strategy.png
-%{tde_datadir}/icons/crystalsvg/*/apps/package_graphics.png
-%{tde_datadir}/icons/crystalsvg/*/apps/package_system.png
-%{tde_datadir}/icons/crystalsvg/*/apps/package_wordprocessing.png
-%{tde_datadir}/icons/crystalsvg/*/apps/pan.png
-%{tde_datadir}/icons/crystalsvg/*/apps/panel_settings.png
-%{tde_datadir}/icons/crystalsvg/*/apps/plan.png
-%{tde_datadir}/icons/crystalsvg/*/apps/planner.png
-%{tde_datadir}/icons/crystalsvg/*/apps/pybliographic.png
-%{tde_datadir}/icons/crystalsvg/*/apps/realplayer.png
-%{tde_datadir}/icons/crystalsvg/*/apps/remote.png
-%{tde_datadir}/icons/crystalsvg/*/apps/scribus.png
-%{tde_datadir}/icons/crystalsvg/*/apps/sodipodi.png
-%{tde_datadir}/icons/crystalsvg/*/apps/style.png
-%{tde_datadir}/icons/crystalsvg/*/apps/usb.png
-%{tde_datadir}/icons/crystalsvg/*/apps/vnc.png
-%{tde_datadir}/icons/crystalsvg/*/apps/wabi.png
-%{tde_datadir}/icons/crystalsvg/*/apps/wine.png
-%{tde_datadir}/icons/crystalsvg/*/apps/xcalc.png
-%{tde_datadir}/icons/crystalsvg/*/apps/xchat.png
-%{tde_datadir}/icons/crystalsvg/*/apps/xclipboard.png
-%{tde_datadir}/icons/crystalsvg/*/apps/xconsole.png
-%{tde_datadir}/icons/crystalsvg/*/apps/xedit.png
-%{tde_datadir}/icons/crystalsvg/*/apps/xemacs.png
-%{tde_datadir}/icons/crystalsvg/*/apps/xeyes.png
-%{tde_datadir}/icons/crystalsvg/*/apps/xfig.png
-%{tde_datadir}/icons/crystalsvg/*/apps/xload.png
-%{tde_datadir}/icons/crystalsvg/*/apps/xmms.png
-%{tde_datadir}/icons/crystalsvg/*/apps/xosview.png
-%{tde_datadir}/icons/crystalsvg/*/apps/xv.png
-%{tde_datadir}/icons/crystalsvg/*/apps/galeon.png
-%{tde_datadir}/icons/crystalsvg/*/apps/kcmdrkonqi.png
-%{tde_datadir}/icons/crystalsvg/*/apps/pinguin.png
-%{tde_datadir}/icons/crystalsvg/*/apps/x.png
-%{tde_datadir}/icons/crystalsvg/*/apps/xapp.png
-%{tde_datadir}/icons/crystalsvg/*/apps/xawtv.png
-%{tde_datadir}/icons/crystalsvg/*/apps/kcmopengl.png
-%{tde_datadir}/icons/crystalsvg/*/apps/wmaker_apps.png
-%{tde_datadir}/icons/crystalsvg/*/apps/qtella.png
-%{tde_datadir}/services/searchproviders
-%{tde_datadir}/services/useragentstrings/*.desktop
-%{tde_datadir}/servicetypes/searchprovider.desktop
-%{tde_datadir}/servicetypes/uasprovider.desktop
-%exclude %{tde_datadir}/sounds/pop.wav
-%{tde_datadir}/sounds/
-%{tde_datadir}/wallpapers/*
-
-%if "%{tde_prefix}" != "/usr"
-%{tde_prefix}/etc/xdg/menus/applications-merged/kde-essential.menu
-%{tde_prefix}/etc/xdg/menus/kde-information.menu
-%{tde_prefix}/etc/xdg/menus/kde-screensavers.menu
-%{tde_prefix}/etc/xdg/menus/kde-settings.menu
-%else
-%{_sysconfdir}/xdg/menus/applications-merged/kde-essential.menu
-%{_sysconfdir}/xdg/menus/kde-information.menu
-%{_sysconfdir}/xdg/menus/kde-screensavers.menu
-%{_sysconfdir}/xdg/menus/kde-settings.menu
-%endif
-
-%{tde_tdedocdir}/HTML/en/kcontrol/
-%exclude %{tde_tdedocdir}/HTML/en/kcontrol/kcmkonsole/
-%{tde_tdedocdir}/HTML/en/kinfocenter/
-%{tde_datadir}/config/kdm
-
-%pre data
-# Make sure that KDM configuration files are now under '/etc/trinity/kdm'
-if [ -d "%{tde_datadir}/config/kdm" ] && [ ! -L "%{tde_datadir}/config/kdm" ]; then
-  if [ -d "%{_sysconfdir}/trinity/kdm" ]; then
-    %__rm -rf "%{tde_datadir}/config/kdm"
-  else
-    if [ ! -d "%{_sysconfdir}/trinity" ]; then
-      %__mkdir_p "%{_sysconfdir}/trinity"
-    fi
-    %__mv -f "%{tde_datadir}/config/kdm" "%{_sysconfdir}/trinity/kdm"
-  fi
-fi
-
-%post data
-for f in crystalsvg ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f}  2> /dev/null || :
-done
-
-%if "%{distribution}" == "Mandriva Linux"
-# Mandriva-specific: we have to choose a background for current distribution variant (Free, One, Powerpack, ...)
-# First, we read the "product" key in /etc/product.id
-eval $(tr "," ";" </etc/product.id) 2>/dev/null
-# Then, we create a symbolic link to the corresponding background
-if [ -r "%{_datadir}/mdk/backgrounds/Mandriva-${product:-Free}-1280x1024-1300.jpg" "%{tde_bg}" ]; then
-  %__ln -sf "%{_datadir}/mdk/backgrounds/Mandriva-${product:-Free}-1280x1024-1300.jpg" "%{tde_bg}"
-fi
-%endif
-
-%postun data
-for f in crystalsvg ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f}  2> /dev/null || :
-done
-
-##########
-
-%package kio-plugins
-Summary:	core I/O slaves for TDE
-Group:		Applications/Utilities
-Requires:	trinity-kdesktop = %{version}-%{release}
-Requires:	cyrus-sasl
-Requires:	psmisc
-%if 0%{?with_hal}
-Requires:	hal >= 0.4.8
-%endif
-%if 0%{?rhel} == 4 || 0%{?suse_version}
-Requires:	cryptsetup
-%else
-Requires:	cryptsetup-luks
-%endif
-
-Obsoletes:	tdebase-kio-plugins < %{version}-%{release}
-Provides:	tdebase-kio-plugins = %{version}-%{release}
-
-%description kio-plugins
-This package includes the base kioslaves. They include, amongst many
-others, file, http, and ftp.
-
-It also includes the media kioslave, which handles removable devices,
-and which works best with hal (and therefore udev) and pmount. Media
-also extends the functionality of many other kioslaves. To use this
-service, please make sure that your user is a member of the plugdev
-group.
-
-%files kio-plugins
-%defattr(-,root,root,-)
-%{tde_bindir}/kio_media_mounthelper
-%{tde_bindir}/ktrash
-%{tde_tdelibdir}/cursorthumbnail.la
-%{tde_tdelibdir}/cursorthumbnail.so
-%{tde_tdelibdir}/djvuthumbnail.la
-%{tde_tdelibdir}/djvuthumbnail.so
-%{tde_tdelibdir}/htmlthumbnail.la
-%{tde_tdelibdir}/htmlthumbnail.so
-%{tde_tdelibdir}/imagethumbnail.la
-%{tde_tdelibdir}/imagethumbnail.so
-%{tde_tdelibdir}/kcm_cgi.la
-%{tde_tdelibdir}/kcm_cgi.so
-%{tde_tdelibdir}/kcm_media.la
-%{tde_tdelibdir}/kcm_media.so
-%{tde_tdelibdir}/kded_homedirnotify.la
-%{tde_tdelibdir}/kded_homedirnotify.so
-%{tde_tdelibdir}/kded_mediamanager.la
-%{tde_tdelibdir}/kded_mediamanager.so
-%{tde_tdelibdir}/kded_medianotifier.la
-%{tde_tdelibdir}/kded_medianotifier.so
-%{tde_tdelibdir}/kded_remotedirnotify.la
-%{tde_tdelibdir}/kded_remotedirnotify.so
-%{tde_tdelibdir}/kded_systemdirnotify.la
-%{tde_tdelibdir}/kded_systemdirnotify.so
-%{tde_tdelibdir}/kfile_media.la
-%{tde_tdelibdir}/kfile_media.so
-%{tde_tdelibdir}/kfile_trash.la
-%{tde_tdelibdir}/kfile_trash.so
-%{tde_tdelibdir}/kio_about.la
-%{tde_tdelibdir}/kio_about.so
-%{tde_tdelibdir}/kio_cgi.la
-%{tde_tdelibdir}/kio_cgi.so
-%{tde_tdelibdir}/kio_filter.la
-%{tde_tdelibdir}/kio_filter.so
-%{tde_tdelibdir}/kio_finger.la
-%{tde_tdelibdir}/kio_finger.so
-%{tde_tdelibdir}/kio_fish.la
-%{tde_tdelibdir}/kio_fish.so
-%{tde_tdelibdir}/kio_floppy.la
-%{tde_tdelibdir}/kio_floppy.so
-%{tde_tdelibdir}/kio_home.la
-%{tde_tdelibdir}/kio_home.so
-%{tde_tdelibdir}/kio_info.la
-%{tde_tdelibdir}/kio_info.so
-%{tde_tdelibdir}/kio_mac.la
-%{tde_tdelibdir}/kio_mac.so
-%{tde_tdelibdir}/kio_man.la
-%{tde_tdelibdir}/kio_man.so
-%{tde_tdelibdir}/kio_media.la
-%{tde_tdelibdir}/kio_media.so
-%{tde_tdelibdir}/kio_nfs.la
-%{tde_tdelibdir}/kio_nfs.so
-%{tde_tdelibdir}/kio_remote.la
-%{tde_tdelibdir}/kio_remote.so
-%{tde_tdelibdir}/kio_settings.la
-%{tde_tdelibdir}/kio_settings.so
-%{tde_tdelibdir}/kio_sftp.la
-%{tde_tdelibdir}/kio_sftp.so
-%{tde_tdelibdir}/kio_smb.la
-%{tde_tdelibdir}/kio_smb.so
-%{tde_tdelibdir}/kio_system.la
-%{tde_tdelibdir}/kio_system.so
-%{tde_tdelibdir}/kio_tar.la
-%{tde_tdelibdir}/kio_tar.so
-%{tde_tdelibdir}/kio_thumbnail.la
-%{tde_tdelibdir}/kio_thumbnail.so
-%{tde_tdelibdir}/kio_trash.la
-%{tde_tdelibdir}/kio_trash.so
-%{tde_tdelibdir}/libkmanpart.la
-%{tde_tdelibdir}/libkmanpart.so
-%{tde_tdelibdir}/textthumbnail.la
-%{tde_tdelibdir}/textthumbnail.so
-%{tde_tdeappdir}/kcmcgi.desktop
-%{tde_datadir}/apps/kio_finger/kio_finger.css
-%{tde_datadir}/apps/kio_finger/kio_finger.pl
-%{tde_datadir}/apps/kio_info/kde-info2html
-%{tde_datadir}/apps/kio_info/kde-info2html.conf
-%{tde_datadir}/apps/kio_man/kio_man.css
-%{tde_datadir}/apps/konqueror/dirtree/remote/smb-network.desktop
-%{tde_datadir}/apps/remoteview/smb-network.desktop
-%{tde_datadir}/apps/systemview/*.desktop
-%{tde_datadir}/config.kcfg/mediamanagersettings.kcfg
-%{tde_datadir}/mimelnk/application/x-smb-server.desktop
-%{tde_datadir}/mimelnk/application/x-smb-workgroup.desktop
-%{tde_datadir}/mimelnk/inode/system_directory.desktop
-%{tde_datadir}/mimelnk/media/*.desktop
-%{tde_datadir}/services/about.protocol
-%{tde_datadir}/services/applications.protocol
-%{tde_datadir}/services/ar.protocol
-%{tde_datadir}/services/bzip.protocol
-%{tde_datadir}/services/bzip2.protocol
-%{tde_datadir}/services/cgi.protocol
-%{tde_datadir}/services/cursorthumbnail.desktop
-%{tde_datadir}/services/djvuthumbnail.desktop
-%{tde_datadir}/services/finger.protocol
-%{tde_datadir}/services/fish.protocol
-%{tde_datadir}/services/floppy.protocol
-%{tde_datadir}/services/gzip.protocol
-%{tde_datadir}/services/home.protocol
-%{tde_datadir}/services/htmlthumbnail.desktop
-%{tde_datadir}/services/imagethumbnail.desktop
-%{tde_datadir}/services/info.protocol
-%{tde_datadir}/services/kded/homedirnotify.desktop
-%{tde_datadir}/services/kded/mediamanager.desktop
-%{tde_datadir}/services/kded/medianotifier.desktop
-%{tde_datadir}/services/kded/remotedirnotify.desktop
-%{tde_datadir}/services/kded/systemdirnotify.desktop
-%{tde_datadir}/services/kfile_media.desktop
-%{tde_datadir}/services/kfile_trash_system.desktop
-%{tde_datadir}/services/kmanpart.desktop
-%{tde_datadir}/services/mac.protocol
-%{tde_datadir}/services/man.protocol
-%{tde_datadir}/services/media.protocol
-%{tde_datadir}/services/nfs.protocol
-%{tde_datadir}/services/nxfish.protocol
-%{tde_datadir}/services/programs.protocol
-%{tde_datadir}/services/remote.protocol
-%{tde_datadir}/services/settings.protocol
-%{tde_datadir}/services/sftp.protocol
-%{tde_datadir}/services/smb.protocol
-%{tde_datadir}/services/system.protocol
-%{tde_datadir}/services/tar.protocol
-%{tde_datadir}/services/textthumbnail.desktop
-%{tde_datadir}/services/thumbnail.protocol
-%{tde_datadir}/services/trash.protocol
-%{tde_datadir}/services/zip.protocol
-%{tde_datadir}/servicetypes/thumbcreator.desktop
-%{tde_datadir}/services/kfile_trash.desktop
-%{tde_tdedocdir}/HTML/en/kioslave/
-%if 0%{?with_exr}
-%{tde_tdelibdir}/exrthumbnail.la
-%{tde_tdelibdir}/exrthumbnail.so
-%{tde_datadir}/services/exrthumbnail.desktop
-%endif
-%if 0%{?with_hal}
-%{tde_tdelibdir}/media_propsdlgplugin.la
-%{tde_tdelibdir}/media_propsdlgplugin.so
-%{tde_datadir}/services/media_propsdlgplugin.desktop
-%endif
-
-%post kio-plugins
-update-desktop-database %{tde_appdir} 2> /dev/null || : 
-
-%postun kio-plugins
-update-desktop-database %{tde_appdir} 2> /dev/null || : 
-
-
-##########
-
-%package -n trinity-kdepasswd
-Summary:	password changer for TDE
-Group:		Applications/Utilities
-
-%description -n trinity-kdepasswd
-This is a simple application which allows users to change their
-system passwords.
-
-%files -n trinity-kdepasswd
-%defattr(-,root,root,-)
-%{tde_bindir}/kdepasswd
-%{tde_tdelibdir}/kcm_useraccount.la
-%{tde_tdelibdir}/kcm_useraccount.so
-%{tde_tdeappdir}/kcm_useraccount.desktop
-%{tde_tdeappdir}/kdepasswd.desktop
-%exclude %{tde_datadir}/apps/[kt]dm/pics/users/default1.png
-%exclude %{tde_datadir}/apps/[kt]dm/pics/users/default2.png
-%exclude %{tde_datadir}/apps/[kt]dm/pics/users/default3.png
-%exclude %{tde_datadir}/apps/[kt]dm/pics/users/root1.png
-%{tde_datadir}/apps/[kt]dm/pics/users/*.png
-%{tde_datadir}/config.kcfg/kcm_useraccount.kcfg
-%{tde_datadir}/config.kcfg/kcm_useraccount_pass.kcfg
-
-%post -n trinity-kdepasswd
-update-desktop-database %{tde_appdir} 2> /dev/null || : 
-
-%postun -n trinity-kdepasswd
-update-desktop-database %{tde_appdir} 2> /dev/null || : 
-
-##########
-
-%package -n trinity-tdeprint
-Summary:	print system for TDE
-Group:		Applications/Utilities
-Requires:	%{name}-data = %{version}-%{release}
-Requires:	psutils
-
-%description -n trinity-tdeprint
-This package contains the TDE printing subsystem. It can use CUPS,
-lpd-ng or the traditional lpd. It also includes support for fax and
-pdf printing.
-
-Installation of smbclient will make you able to use smb shared printers.
-
-%files -n trinity-tdeprint
-%defattr(-,root,root,-)
-%{tde_bindir}/[kt]deprintfax
-%{tde_bindir}/kjobviewer
-%{tde_bindir}/kprinter
-%{tde_tdelibdir}/kcm_printmgr.la
-%{tde_tdelibdir}/kcm_printmgr.so
-%{tde_tdelibdir}/kio_print.la
-%{tde_tdelibdir}/kio_print.so
-%{tde_tdelibdir}/kjobviewer.la
-%{tde_tdelibdir}/kjobviewer.so
-%{tde_tdelibdir}/kprinter.la
-%{tde_tdelibdir}/kprinter.so
-%{tde_tdelibdir}/lib[kt]deprint_part.la
-%{tde_tdelibdir}/lib[kt]deprint_part.so
-%{tde_libdir}/lib[kt]deinit_kjobviewer.la
-%{tde_libdir}/lib[kt]deinit_kjobviewer.so
-%{tde_libdir}/lib[kt]deinit_kprinter.la
-%{tde_libdir}/lib[kt]deinit_kprinter.so
-%{tde_tdeappdir}/[kt]deprintfax.desktop
-%{tde_tdeappdir}/[kt]jobviewer.desktop
-%{tde_tdeappdir}/printers.desktop
-%{tde_datadir}/apps/[kt]deprint/
-%{tde_datadir}/apps/[kt]deprintfax/
-%{tde_datadir}/apps/[kt]jobviewer/
-%{tde_datadir}/apps/[kt]deprint_part/kdeprint_part.rc
-%{tde_datadir}/icons/hicolor/*/apps/kdeprintfax.png
-%{tde_datadir}/icons/hicolor/*/apps/kjobviewer.png
-%{tde_datadir}/icons/hicolor/*/apps/printmgr.png
-%{tde_datadir}/icons/hicolor/scalable/apps/kdeprintfax.svgz
-%{tde_datadir}/icons/hicolor/scalable/apps/kjobviewer.svgz
-%{tde_datadir}/icons/hicolor/scalable/apps/printmgr.svgz
-%{tde_datadir}/mimelnk/print/class.desktop
-%{tde_datadir}/mimelnk/print/driver.desktop
-%{tde_datadir}/mimelnk/print/folder.desktop
-%{tde_datadir}/mimelnk/print/jobs.desktop
-%{tde_datadir}/mimelnk/print/manager.desktop
-%{tde_datadir}/mimelnk/print/printer.desktop
-%{tde_datadir}/mimelnk/print/printermodel.desktop
-%{tde_datadir}/services/kdeprint_part.desktop
-%{tde_datadir}/services/print.protocol
-%{tde_datadir}/services/printdb.protocol
-%{tde_tdedocdir}/HTML/en/[kt]deprint/
-
-%post -n trinity-tdeprint
-/sbin/ldconfig || :
-update-desktop-database %{tde_appdir} 2> /dev/null || : 
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f}  2> /dev/null || :
-done
-
-%postun -n trinity-tdeprint
-/sbin/ldconfig || :
-update-desktop-database %{tde_appdir} 2> /dev/null || : 
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f}  2> /dev/null || :
-done
-
-##########
-
-%package -n trinity-kdesktop
-Summary:	miscellaneous binaries and files for the TDE desktop
-Group:		Applications/Utilities
-Requires:	%{name}-bin = %{version}-%{release}
-Requires:	%{name}-data = %{version}-%{release}
-Requires:	trinity-libkonq = %{version}-%{release}
-Requires:	eject
-%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion}
-Requires:	xdg-utils
-%endif
-
-%description -n trinity-kdesktop
-This package contains miscellaneous binaries and files integral to
-the TDE desktop.
-
-%files -n trinity-kdesktop
-%defattr(-,root,root,-)
-%{_sysconfdir}/trinity/kdesktop_custom_menu1
-%{_sysconfdir}/trinity/kdesktop_custom_menu2
-%{tde_bindir}/kcheckrunning
-%{tde_bindir}/kxdglauncher
-%{tde_bindir}/kdeeject
-%{tde_bindir}/kdesktop
-%{tde_bindir}/kdesktop_lock
-%{tde_bindir}/kwebdesktop
-%{tde_tdelibdir}/kdesktop.la
-%{tde_tdelibdir}/kdesktop.so
-%{tde_libdir}/lib[kt]deinit_kdesktop.la
-%{tde_libdir}/lib[kt]deinit_kdesktop.so
-%{tde_datadir}/apps/kdesktop/
-%{tde_datadir}/apps/konqueror/servicemenus/kdesktopSetAsBackground.desktop
-%{tde_datadir}/autostart/kdesktop.desktop
-%{tde_datadir}/config.kcfg/kdesktop.kcfg
-%{tde_datadir}/config.kcfg/klaunch.kcfg
-%{tde_datadir}/config.kcfg/kwebdesktop.kcfg
-%{tde_datadir}/icons/crystalsvg/*/apps/error.png
-
-%post -n trinity-kdesktop
-/sbin/ldconfig || :
-for f in crystalsvg ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f}  2> /dev/null || :
-done
-
-%postun -n trinity-kdesktop
-/sbin/ldconfig || :
-for f in crystalsvg ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f}  2> /dev/null || :
-done
-
-##########
-
-%package -n trinity-kdesktop-devel
-Summary:	Development files for kdesktop
-Group:		Development/Libraries
-Requires:	trinity-kdesktop = %{version}-%{release}
-
-%description -n trinity-kdesktop-devel
-%{summary}
-
-%files -n trinity-kdesktop-devel
-%{tde_tdeincludedir}/KBackgroundIface.h
-%{tde_tdeincludedir}/KDesktopIface.h
-%{tde_tdeincludedir}/KScreensaverIface.h
-
-##########
-
-%package -n trinity-tdm
-Summary:	X Display manager for TDE
-Group:		Applications/Utilities
-Requires:	%{name}-bin = %{version}-%{release}
-Requires:	%{name}-data = %{version}-%{release}
-Requires:	pam
-
-# Provides the global Xsession script (/etc/X11/xinit/Xsession or /etc/X11/Xsession)
-%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} == 4
-Requires:	xinitrc
-%endif
-%if 0%{?suse_version} == 1140
-Requires:	xorg-x11
-%endif
-%if 0%{?suse_version} >= 1220
-Requires:	xdm
-%endif
-%if 0%{?rhel} >= 5 || 0%{?fedora}
-Requires:	xorg-x11-xinit
-%endif
-
-# Required for Fedora LiveCD
-%if 0%{?rhel} || 0%{?fedora}
-Provides:	service(graphical-login)
-%endif
-# Required for Mandriva's installer
-%if 0%{?mgaversion} || 0%{?mdkversion}
-Provides:	dm
-%endif
-
-%description -n trinity-tdm
-tdm manages a collection of X servers, which may be on the local host or
-remote machines. It provides services similar to those provided by init,
-getty, and login on character-based terminals: prompting for login name and
-password, authenticating the user, and running a session. tdm supports XDMCP
-(X Display Manager Control Protocol) and can also be used to run a chooser
-process which presents the user with a menu of possible hosts that offer
-XDMCP display management.
-
-A collection of icons to associate with individual users is included with
-TDE, but as part of the kdepasswd package.
-
-The menu package will help to provide TDM with a list of window managers
-that can be launched, if the window manager does not register with TDM
-already. Most users won't need this.
-
-%files -n trinity-tdm
-%defattr(-,root,root,-)
-%{tde_tdelibdir}/kgreet_pam.la
-%{tde_tdelibdir}/kgreet_pam.so
-%{tde_bindir}/gen[kt]dmconf
-%{tde_bindir}/[kt]dm
-%{tde_bindir}/[kt]dm_config
-%{tde_bindir}/[kt]dmctl
-%{tde_bindir}/[kt]dm_greet
-%{tde_bindir}/krootimage
-%{tde_datadir}/apps/[kt]dm/pics/kdelogo.png
-%{tde_datadir}/apps/[kt]dm/pics/kdelogo-crystal.png
-%{tde_datadir}/apps/[kt]dm/pics/shutdown.jpg
-%{tde_datadir}/apps/[kt]dm/pics/users/default1.png
-%{tde_datadir}/apps/[kt]dm/pics/users/default2.png
-%{tde_datadir}/apps/[kt]dm/pics/users/default3.png
-%{tde_datadir}/apps/[kt]dm/pics/users/root1.png
-%{tde_datadir}/apps/[kt]dm/sessions/*.desktop
-%{tde_datadir}/apps/[kt]dm/themes/
-%{_sysconfdir}/trinity/[kt]dm/
-%{tde_tdedocdir}/HTML/en/[kt]dm/
-%if 0%{?suse_version} == 0
-%{_sysconfdir}/pam.d/kdm-trinity
-%{_sysconfdir}/pam.d/kdm-trinity-np
-%endif
-%if 0%{?suse_version}
-/usr/lib/X11/displaymanagers/tdm
-%endif
-%if 0%{?fedora} >= 18
-/usr/lib/systemd/system/tdm.service
-%endif
-
-# Distribution specific stuff
-%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version}
-%{_datadir}/xsessions/tde.desktop
-%endif
-
-# Fedora 17: https://bugzilla.redhat.com/show_bug.cgi?id=795506
-%if 0%{?fedora} >= 17
-/etc/selinux/targeted/contexts/files/file_contexts.tde
-%endif
-
-# https://wiki.mageia.org/en/How_to_add_a_new_Window_Manager_or_Display_Manager
-%if 0%{?mgaversion} || 0%{?mdkversion}
-%{_sysconfdir}/X11/wmsession.d/45TDE
-%{_datadir}/X11/dm.d/45TDE.conf
-%endif
-
-%post -n trinity-tdm
-%if 0%{?mgaversion} || 0%{?mdkversion}
-%make_session
-%endif
-%if 0%{?fedora} >= 17
-if ! grep -q "trinity" "/etc/selinux/targeted/contexts/files/file_contexts.local"; then
-  cat "/etc/selinux/targeted/contexts/files/file_contexts.tde" >>"/etc/selinux/targeted/contexts/files/file_contexts.local"
-  restorecon -R "%{tde_prefix}"
-fi
-%endif
-
-%postun -n trinity-tdm
-%if 0%{?mgaversion} || 0%{?mdkversion}
-%make_session
-%endif
-
-##########
-
-%package -n trinity-tdm-devel
-Summary:	Development files for tdm
-Group:		Development/Libraries
-Requires:	trinity-tdm = %{version}-%{release}
-
-%description -n trinity-tdm-devel
-%{summary}
-
-%files -n trinity-tdm-devel
-%{tde_tdeincludedir}/kgreeterplugin.h
-
-##########
-
-%package -n trinity-kfind
-Summary:	file-find utility for TDE
-Group:		Applications/Utilities
-Requires:	%{name}-data = %{version}-%{release}
-
-%description -n trinity-kfind
-kfind can be used to find files and directories on your
-workstations.
-
-%files -n trinity-kfind
-%defattr(-,root,root,-)
-%{tde_bindir}/kfind
-%{tde_tdelibdir}/libkfindpart.la
-%{tde_tdelibdir}/libkfindpart.so
-%{tde_tdeappdir}/Kfind.desktop
-%{tde_datadir}/apps/kfindpart/
-%{tde_datadir}/icons/hicolor/*/apps/kfind.png
-%{tde_datadir}/services/kfindpart.desktop
-%{tde_datadir}/servicetypes/findpart.desktop
-%{tde_tdedocdir}/HTML/en/kfind/
-
-%post -n trinity-kfind
-update-desktop-database %{tde_appdir} 2> /dev/null || : 
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f}  2> /dev/null || :
-done
-
-%postun -n trinity-kfind
-update-desktop-database %{tde_appdir} 2> /dev/null || : 
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f}  2> /dev/null || :
-done
-
-##########
-
-%package -n trinity-khelpcenter
-Summary:	help center for TDE
-Group:		Applications/Utilities
-Requires:	%{name}-data = %{version}-%{release}
-Requires:	htdig
-
-%description -n trinity-khelpcenter
-The TDE Help Center provides documentation on how to use the KDE desktop.
-
-The htdig package is needed to build a searchable archive of TDE
-documentation.
-
-%files -n trinity-khelpcenter
-%defattr(-,root,root,-)
-#%{tde_bindir}/khc_beagle_index.pl
-#%{tde_bindir}/khc_beagle_search.pl
-%{tde_bindir}/khc_docbookdig.pl
-%{tde_bindir}/khc_htdig.pl
-%{tde_bindir}/khc_htsearch.pl
-%{tde_bindir}/khc_indexbuilder
-%{tde_bindir}/khc_mansearch.pl
-%{tde_bindir}/khelpcenter
-%{tde_tdelibdir}/khelpcenter.la
-%{tde_tdelibdir}/khelpcenter.so
-%{tde_libdir}/lib[kt]deinit_khelpcenter.la
-%{tde_libdir}/lib[kt]deinit_khelpcenter.so
-%{tde_tdeappdir}/Help.desktop
-%{tde_datadir}/apps/khelpcenter/
-%{tde_datadir}/config.kcfg/khelpcenter.kcfg
-%{tde_datadir}/icons/hicolor/*/apps/khelpcenter.*
-%{tde_datadir}/services/khelpcenter.desktop
-%{tde_tdedocdir}/HTML/en/khelpcenter/
-
-%post -n trinity-khelpcenter
-update-desktop-database %{tde_appdir} 2> /dev/null || : 
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f}  2> /dev/null || :
-done
-/sbin/ldconfig || :
-
-%postun -n trinity-khelpcenter
-update-desktop-database %{tde_appdir} 2> /dev/null || : 
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f}  2> /dev/null || :
-done
-/sbin/ldconfig || :
-
-##########
-
-%package -n trinity-kicker
-Summary:	desktop panel for TDE
-Group:		Applications/Utilities
-Requires:	%{name}-data = %{version}-%{release}
-
-%description -n trinity-kicker
-Kicker provides the TDE panel on you desktop. It can be used as a
-program launcher and can load plugins to provide additional
-functionality.
-
-%files -n trinity-kicker
-%defattr(-,root,root,-)
-%{tde_bindir}/appletproxy
-%{tde_bindir}/extensionproxy
-%{tde_bindir}/kasbar
-%{tde_bindir}/kicker
-%{tde_libdir}/kconf_update_bin/kicker-3.4-reverseLayout
-%{tde_tdelibdir}/appletproxy.la
-%{tde_tdelibdir}/appletproxy.so
-%{tde_tdelibdir}/clock_panelapplet.la
-%{tde_tdelibdir}/clock_panelapplet.so
-%{tde_tdelibdir}/dockbar_panelextension.la
-%{tde_tdelibdir}/dockbar_panelextension.so
-%{tde_tdelibdir}/extensionproxy.la
-%{tde_tdelibdir}/extensionproxy.so
-%{tde_tdelibdir}/kasbar_panelextension.la
-%{tde_tdelibdir}/kasbar_panelextension.so
-%{tde_tdelibdir}/kicker.la
-%{tde_tdelibdir}/kickermenu_find.la
-%{tde_tdelibdir}/kickermenu_find.so
-%{tde_tdelibdir}/kickermenu_kate.so
-%{tde_tdelibdir}/kickermenu_kate.la
-%{tde_tdelibdir}/kickermenu_[kt]deprint.la
-%{tde_tdelibdir}/kickermenu_[kt]deprint.so
-%{tde_tdelibdir}/kickermenu_konqueror.la
-%{tde_tdelibdir}/kickermenu_konqueror.so
-%{tde_tdelibdir}/kickermenu_konsole.la
-%{tde_tdelibdir}/kickermenu_konsole.so
-%{tde_tdelibdir}/kickermenu_prefmenu.la
-%{tde_tdelibdir}/kickermenu_prefmenu.so
-%{tde_tdelibdir}/kickermenu_recentdocs.la
-%{tde_tdelibdir}/kickermenu_recentdocs.so
-%{tde_tdelibdir}/kickermenu_remotemenu.la
-%{tde_tdelibdir}/kickermenu_remotemenu.so
-%{tde_tdelibdir}/kickermenu_systemmenu.la
-%{tde_tdelibdir}/kickermenu_systemmenu.so
-%{tde_tdelibdir}/kicker.so
-%{tde_tdelibdir}/launcher_panelapplet.la
-%{tde_tdelibdir}/launcher_panelapplet.so
-%{tde_tdelibdir}/lockout_panelapplet.la
-%{tde_tdelibdir}/lockout_panelapplet.so
-%{tde_tdelibdir}/media_panelapplet.la
-%{tde_tdelibdir}/media_panelapplet.so
-%{tde_tdelibdir}/menu_panelapplet.la
-%{tde_tdelibdir}/menu_panelapplet.so
-%{tde_tdelibdir}/minipager_panelapplet.la
-%{tde_tdelibdir}/minipager_panelapplet.so
-%{tde_tdelibdir}/naughty_panelapplet.la
-%{tde_tdelibdir}/naughty_panelapplet.so
-%{tde_tdelibdir}/run_panelapplet.la
-%{tde_tdelibdir}/run_panelapplet.so
-%{tde_tdelibdir}/sidebar_panelextension.la
-%{tde_tdelibdir}/sidebar_panelextension.so
-%{tde_tdelibdir}/systemtray_panelapplet.la
-%{tde_tdelibdir}/systemtray_panelapplet.so
-%{tde_tdelibdir}/taskbar_panelapplet.la
-%{tde_tdelibdir}/taskbar_panelapplet.so
-%{tde_tdelibdir}/taskbar_panelextension.la
-%{tde_tdelibdir}/taskbar_panelextension.so
-%{tde_tdelibdir}/trash_panelapplet.la
-%{tde_tdelibdir}/trash_panelapplet.so
-%{tde_libdir}/libkasbar.so.*
-%{tde_libdir}/lib[kt]deinit_appletproxy.la
-%{tde_libdir}/lib[kt]deinit_appletproxy.so
-%{tde_libdir}/lib[kt]deinit_extensionproxy.la
-%{tde_libdir}/lib[kt]deinit_extensionproxy.so
-%{tde_libdir}/lib[kt]deinit_kicker.la
-%{tde_libdir}/lib[kt]deinit_kicker.so
-%{tde_libdir}/libkickermain.so.*
-%{tde_libdir}/libtaskbar.so.*
-%{tde_libdir}/libtaskmanager.so.*
-%{tde_libdir}/libkickoffsearch_interfaces.so.*
-%{tde_tdeappdir}/kcmkicker.desktop
-%{tde_datadir}/applnk/.hidden/kicker_config_arrangement.desktop
-%{tde_datadir}/applnk/.hidden/kicker_config_hiding.desktop
-%{tde_datadir}/applnk/.hidden/kicker_config_menus.desktop
-%{tde_datadir}/apps/clockapplet/pics/lcd.png
-%{tde_datadir}/apps/kconf_update/kicker-3.1-properSizeSetting.pl
-%{tde_datadir}/apps/kconf_update/kicker-3.5-kconfigXTize.pl
-%{tde_datadir}/apps/kconf_update/kicker-3.5-taskbarEnums.pl
-%{tde_datadir}/apps/kconf_update/kickerrc.upd
-%{tde_datadir}/apps/kicker/
-%exclude %{tde_datadir}/apps/kicker/applets/klipper.desktop
-%exclude %{tde_datadir}/apps/kicker/applets/ksysguardapplet.desktop
-%{tde_datadir}/apps/naughtyapplet/pics/naughty-happy.png
-%{tde_datadir}/apps/naughtyapplet/pics/naughty-sad.png
-%{tde_datadir}/autostart/panel.desktop
-%{tde_datadir}/config.kcfg/kickerSettings.kcfg
-%{tde_datadir}/config.kcfg/launcherapplet.kcfg
-%{tde_datadir}/config.kcfg/pagersettings.kcfg
-%{tde_datadir}/config.kcfg/taskbar.kcfg
-%{tde_datadir}/icons/crystalsvg/*/apps/systemtray.png
-%{tde_datadir}/icons/crystalsvg/*/apps/taskbar.png
-%{tde_datadir}/icons/crystalsvg/*/apps/kbinaryclock.png
-%{tde_datadir}/icons/crystalsvg/*/apps/kdisknav.png
-%{tde_datadir}/icons/crystalsvg/*/apps/kicker.png
-%{tde_datadir}/icons/crystalsvg/*/apps/panel.png
-%{tde_datadir}/icons/crystalsvg/*/apps/runprocesscatcher.png
-%{tde_datadir}/icons/crystalsvg/*/apps/window_list.png
-%{tde_datadir}/icons/crystalsvg/*/apps/kbinaryclock.svgz
-%{tde_datadir}/icons/crystalsvg/*/apps/systemtray.svgz
-%{tde_datadir}/servicetypes/kickoffsearchplugin.desktop
-%{tde_tdedocdir}/HTML/en/kicker/
-
-%post -n trinity-kicker
-update-desktop-database %{tde_appdir} 2> /dev/null || : 
-for f in crystalsvg ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f}  2> /dev/null || :
-done
-/sbin/ldconfig || :
-
-%postun -n trinity-kicker
-update-desktop-database %{tde_appdir} 2> /dev/null || : 
-for f in crystalsvg ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f}  2> /dev/null || :
-done
-/sbin/ldconfig || :
-
-##########
-
-%package -n trinity-kicker-devel
-Summary:	Development files for kicker
-Group:		Development/Libraries
-Requires:	trinity-kicker = %{version}-%{release}
-
-%description -n trinity-kicker-devel
-%{summary}
-
-%files -n trinity-kicker-devel
-%{tde_tdeincludedir}/kickoff-search-plugin.h
-%{tde_tdeincludedir}/kickoffsearchinterface.h
-%{tde_libdir}/libkasbar.la
-%{tde_libdir}/libkasbar.so
-%{tde_libdir}/libkickermain.la
-%{tde_libdir}/libkickermain.so
-%{tde_libdir}/libkickoffsearch_interfaces.la
-%{tde_libdir}/libkickoffsearch_interfaces.so
-%{tde_libdir}/libtaskbar.la
-%{tde_libdir}/libtaskbar.so
-%{tde_libdir}/libtaskmanager.la
-%{tde_libdir}/libtaskmanager.so
-
-%post -n trinity-kicker-devel
-/sbin/ldconfig || :
-
-%postun -n trinity-kicker-devel
-/sbin/ldconfig || :
-
-##########
-
-%package -n trinity-klipper
-Summary:	clipboard utility for Trinity
-Group:		Applications/Utilities
-Requires:	%{name}-data = %{version}-%{release}
-
-%description -n trinity-klipper
-klipper provides standard clipboard functions (cut and paste, history
-saving) plus additional features, like the ability to offer actions to 
-take dependent on the clipboard contents. For example, it can launch a 
-web browser if the clipboard contains a URL.
-
-%files -n trinity-klipper
-%defattr(-,root,root,-)
-%{tde_bindir}/klipper
-%{_sysconfdir}/trinity/klipperrc
-%{tde_tdelibdir}/klipper.la
-%{tde_tdelibdir}/klipper.so
-%{tde_tdelibdir}/klipper_panelapplet.la
-%{tde_tdelibdir}/klipper_panelapplet.so
-%{tde_libdir}/lib[kt]deinit_klipper.la
-%{tde_libdir}/lib[kt]deinit_klipper.so
-%{tde_tdeappdir}/klipper.desktop
-%{tde_datadir}/apps/kconf_update/klipper-1-2.pl
-%{tde_datadir}/apps/kconf_update/klipper-trinity1.sh
-%{tde_datadir}/apps/kconf_update/klipperrc.upd
-%{tde_datadir}/apps/kconf_update/klippershortcuts.upd
-%{tde_datadir}/apps/kicker/applets/klipper.desktop
-%{tde_datadir}/autostart/klipper.desktop
-%{tde_datadir}/icons/hicolor/*/apps/klipper.*
-%{tde_tdedocdir}/HTML/en/klipper/
-
-%post -n trinity-klipper
-update-desktop-database %{tde_appdir} 2> /dev/null || : 
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f}  2> /dev/null || :
-done
-/sbin/ldconfig || :
-
-%postun -n trinity-klipper
-update-desktop-database %{tde_appdir} 2> /dev/null || : 
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f}  2> /dev/null || :
-done
-/sbin/ldconfig || :
-
-##########
-
-%package -n trinity-kmenuedit
-Summary:	menu editor for TDE
-Group:		Applications/Utilities
-Requires:	%{name}-data = %{version}-%{release}
-
-%description -n trinity-kmenuedit
-The TDE menu editor allows you to make customisations to the KDE menu
-structure.
-
-%files -n trinity-kmenuedit
-%defattr(-,root,root,-)
-%{tde_bindir}/kcontroledit
-%{tde_bindir}/kmenuedit
-%{tde_tdelibdir}/kcontroledit.la
-%{tde_tdelibdir}/kcontroledit.so
-%{tde_tdelibdir}/kmenuedit.la
-%{tde_tdelibdir}/kmenuedit.so
-%{tde_libdir}/lib[kt]deinit_kcontroledit.la
-%{tde_libdir}/lib[kt]deinit_kcontroledit.so
-%{tde_libdir}/lib[kt]deinit_kmenuedit.la
-%{tde_libdir}/lib[kt]deinit_kmenuedit.so
-%{tde_tdeappdir}/kmenuedit.desktop
-%{tde_datadir}/applnk/System/kmenuedit.desktop
-%{tde_datadir}/apps/kcontroledit/
-%{tde_datadir}/apps/kmenuedit/
-%{tde_tdedocdir}/HTML/en/kmenuedit/
-
-%post -n trinity-kmenuedit
-update-desktop-database %{tde_appdir} 2> /dev/null || : 
-/sbin/ldconfig || :
-
-%postun -n trinity-kmenuedit
-update-desktop-database %{tde_appdir} 2> /dev/null || : 
-/sbin/ldconfig || :
-
-##########
-
-%package -n trinity-konqueror
-Summary:	TDE's advanced file manager, web browser and document viewer
-Group:		Applications/Utilities
-Requires:	%{name}-data = %{version}-%{release}
-Requires:	trinity-kcontrol = %{version}-%{release}
-Requires:	%{name}-kio-plugins = %{version}-%{release}
-Requires:	trinity-kdesktop = %{version}-%{release}
-Requires:	trinity-kfind = %{version}-%{release}
-Requires:	trinity-libkonq = %{version}-%{release}
-
-%description -n trinity-konqueror
-Konqueror is the file manager for the Trinity Desktop Environment.
-It supports basic file management on local UNIX filesystems,
-from simple cut/copy and paste operations to advanced remote
-and local network file browsing.
-
-It is also the canvas for all the latest TDE technology,
-from KIO slaves (which provide mechanisms for file access) to
-component embedding via the KParts object interface, and it
-is one of the most customizable applications available.
-
-Konqueror is an Open Source web browser with HTML4.0 compliance,
-supporting Java applets, JavaScript, CSS1 and (partially) CSS2,
-as well as Netscape plugins (for example, Flash or RealVideo plugins).
-
-It is a universal viewing application, capable of embedding
-read-only viewing components in itself to view documents without
-ever launching another application.
-
-%files -n trinity-konqueror
-%defattr(-,root,root,-)
-%{_sysconfdir}/trinity/konqsidebartng.rc
-%{tde_bindir}/kbookmarkmerger
-%{tde_bindir}/keditbookmarks
-%{tde_bindir}/kfmclient
-%{tde_bindir}/konqueror
-%{tde_tdelibdir}/kcm_history.la
-%{tde_tdelibdir}/kcm_history.so
-%{tde_tdelibdir}/kded_konqy_preloader.la
-%{tde_tdelibdir}/kded_konqy_preloader.so
-%{tde_tdelibdir}/keditbookmarks.la
-%{tde_tdelibdir}/keditbookmarks.so
-%{tde_tdelibdir}/kfmclient.la
-%{tde_tdelibdir}/kfmclient.so
-%{tde_tdelibdir}/konq_aboutpage.la
-%{tde_tdelibdir}/konq_aboutpage.so
-%{tde_tdelibdir}/konq_iconview.la
-%{tde_tdelibdir}/konq_iconview.so
-%{tde_tdelibdir}/konq_listview.la
-%{tde_tdelibdir}/konq_listview.so
-%{tde_tdelibdir}/konq_remoteencoding.la
-%{tde_tdelibdir}/konq_remoteencoding.so
-%{tde_tdelibdir}/konq_shellcmdplugin.la
-%{tde_tdelibdir}/konq_shellcmdplugin.so
-%{tde_tdelibdir}/konq_sidebar.la
-%{tde_tdelibdir}/konq_sidebar.so
-%{tde_tdelibdir}/konq_sidebartree_bookmarks.la
-%{tde_tdelibdir}/konq_sidebartree_bookmarks.so
-%{tde_tdelibdir}/konq_sidebartree_dirtree.la
-%{tde_tdelibdir}/konq_sidebartree_dirtree.so
-%{tde_tdelibdir}/konq_sidebartree_history.la
-%{tde_tdelibdir}/konq_sidebartree_history.so
-%{tde_tdelibdir}/konqsidebar_tree.la
-%{tde_tdelibdir}/konqsidebar_tree.so
-%{tde_tdelibdir}/konqsidebar_web.la
-%{tde_tdelibdir}/konqsidebar_web.so
-%{tde_tdelibdir}/konqueror.la
-%{tde_tdelibdir}/konqueror.so
-%{tde_tdelibdir}/libkhtmlkttsdplugin.la
-%{tde_tdelibdir}/libkhtmlkttsdplugin.so
-%{tde_libdir}/lib[kt]deinit_keditbookmarks.la
-%{tde_libdir}/lib[kt]deinit_keditbookmarks.so
-%{tde_libdir}/lib[kt]deinit_kfmclient.la
-%{tde_libdir}/lib[kt]deinit_kfmclient.so
-%{tde_libdir}/lib[kt]deinit_konqueror.la
-%{tde_libdir}/lib[kt]deinit_konqueror.so
-%{tde_libdir}/libkonqsidebarplugin.so.*
-%{tde_tdeappdir}/Home.desktop
-%{tde_tdeappdir}/kcmhistory.desktop
-%{tde_tdeappdir}/kfmclient.desktop
-%{tde_tdeappdir}/kfmclient_dir.desktop
-%{tde_tdeappdir}/kfmclient_html.desktop
-%{tde_tdeappdir}/kfmclient_war.desktop
-%{tde_tdeappdir}/khtml_filter.desktop
-%{tde_tdeappdir}/konqbrowser.desktop
-%{tde_tdeappdir}/konquerorsu.desktop
-%{tde_datadir}/applnk/.hidden/konqfilemgr.desktop
-%{tde_datadir}/applnk/Internet/keditbookmarks.desktop
-%{tde_datadir}/applnk/konqueror.desktop
-%{tde_datadir}/apps/kconf_update/kfmclient_3_2.upd
-%{tde_datadir}/apps/kconf_update/kfmclient_3_2_update.sh
-%{tde_datadir}/apps/kconf_update/konqsidebartng.upd
-%{tde_datadir}/apps/kconf_update/move_konqsidebartng_entries.sh
-%{tde_datadir}/apps/keditbookmarks/keditbookmarks-genui.rc
-%{tde_datadir}/apps/keditbookmarks/keditbookmarksui.rc
-%{tde_datadir}/apps/khtml/kpartplugins/khtmlkttsd.desktop
-%{tde_datadir}/apps/khtml/kpartplugins/khtmlkttsd.rc
-%{tde_datadir}/apps/konqiconview/
-%{tde_datadir}/apps/konqlistview/
-%exclude %{tde_datadir}/apps/konqsidebartng/virtual_folders/services/fonts.desktop
-%{tde_datadir}/apps/konqsidebartng/
-%{tde_datadir}/apps/konqueror/about/
-%{tde_datadir}/apps/konqueror/icons/
-%{tde_datadir}/apps/konqueror/konq-simplebrowser.rc
-%{tde_datadir}/apps/konqueror/konqueror.rc
-%{tde_datadir}/apps/konqueror/pics/indicator_connect.png
-%{tde_datadir}/apps/konqueror/pics/indicator_empty.png
-%{tde_datadir}/apps/konqueror/pics/indicator_noconnect.png
-%{tde_datadir}/apps/konqueror/pics/indicator_viewactive.png
-%{tde_datadir}/apps/konqueror/profiles/
-%exclude %{tde_datadir}/apps/konqueror/servicemenus/kdesktopSetAsBackground.desktop
-%exclude %{tde_datadir}/apps/konqueror/servicemenus/konsolehere.desktop
-%exclude %{tde_datadir}/apps/konqueror/servicemenus/installfont.desktop
-%{tde_datadir}/apps/konqueror/servicemenus/*.desktop
-%{tde_datadir}/apps/konqueror/servicemenus/media_safelyremove.desktop_tdebase
-%{_sysconfdir}/alternatives/media_safelyremove.desktop_tdebase
-%{tde_datadir}/apps/konqueror/tiles/*.png
-%{tde_datadir}/autostart/konqy_preload.desktop
-%{tde_datadir}/config.kcfg/keditbookmarks.kcfg
-%{tde_datadir}/config.kcfg/konq_listview.kcfg
-%{tde_datadir}/config.kcfg/konqueror.kcfg
-%{tde_datadir}/icons/crystalsvg/*/apps/keditbookmarks.png
-%{tde_datadir}/icons/crystalsvg/*/apps/kfm_home.svgz
-%{tde_datadir}/icons/hicolor/*/apps/kfm.png
-%{tde_datadir}/icons/hicolor/*/apps/konqueror.*
-%{tde_datadir}/services/kded/konqy_preloader.desktop
-%{tde_datadir}/services/konq_*.desktop
-%{tde_datadir}/servicetypes/konqaboutpage.desktop
-%{tde_tdedocdir}/HTML/en/konqueror/
-
-%post -n trinity-konqueror
-update-desktop-database %{tde_appdir} 2> /dev/null || : 
-for f in crystalsvg hicolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f}  2> /dev/null || :
-done
-/sbin/ldconfig || :
-update-alternatives --install \
-  %{tde_datadir}/apps/konqueror/servicemenus/media_safelyremove.desktop \
-  media_safelyremove.desktop_konqueror \
-  %{tde_datadir}/apps/konqueror/servicemenus/media_safelyremove.desktop_tdebase \
-  10 || :
-
-%postun -n trinity-konqueror
-update-desktop-database %{tde_appdir} 2> /dev/null || : 
-for f in crystalsvg hicolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f}  2> /dev/null || :
-done
-/sbin/ldconfig || :
-
-%preun -n trinity-konqueror
-if [ $1 -eq 0 ]; then
-  update-alternatives --remove \
-    media_safelyremove.desktop_konqueror \
-    %{tde_datadir}/apps/konqueror/servicemenus/media_safelyremove.desktop_tdebase || :
-fi
-
-##########
-
-%package -n trinity-konqueror-devel
-Summary:	Development files for konqueror
-Group:		Development/Libraries
-Requires:	trinity-konqueror = %{version}-%{release}
-
-%description -n trinity-konqueror-devel
-%{summary}
-
-%files -n trinity-konqueror-devel
-%{tde_tdeincludedir}/konqsidebarplugin.h
-%{tde_tdeincludedir}/KonquerorIface.h
-%{tde_libdir}/libkonqsidebarplugin.la
-%{tde_libdir}/libkonqsidebarplugin.so
-
-%post -n trinity-konqueror-devel
-/sbin/ldconfig || :
-
-%postun -n trinity-konqueror-devel
-/sbin/ldconfig || :
-
-##########
-
-%package -n trinity-konqueror-nsplugins
-Summary:	Netscape plugin support for Konqueror
-Group:		Applications/Utilities
-Requires:	trinity-konqueror = %{version}-%{release}
-
-%description -n trinity-konqueror-nsplugins
-This package includes support for Netscape plugins in Konqueror.
-
-%files -n trinity-konqueror-nsplugins
-%defattr(-,root,root,-)
-%{tde_bindir}/nspluginscan
-%{tde_bindir}/nspluginviewer
-%{tde_tdelibdir}/kcm_nsplugins.la
-%{tde_tdelibdir}/kcm_nsplugins.so
-%{tde_tdelibdir}/libnsplugin.la
-%{tde_tdelibdir}/libnsplugin.so
-%{tde_tdeappdir}/khtml_plugins.desktop
-%{tde_datadir}/apps/plugin/nspluginpart.rc
-
-%post -n trinity-konqueror-nsplugins
-update-desktop-database %{tde_appdir} 2> /dev/null || : 
-
-%postun -n trinity-konqueror-nsplugins
-update-desktop-database %{tde_appdir} 2> /dev/null || : 
-
-##########
-
-%package -n trinity-konsole
-Summary:	X terminal emulator for TDE
-Group:		Applications/Utilities
-Requires:	%{name}-data = %{version}-%{release}
-
-%description -n trinity-konsole
-Konsole is an X terminal emulation which provides a command-line interface
-(CLI) while using the graphical K Desktop Environment. Konsole helps to
-better organize user's desktop by containing multiple sessions in a single
-window (a less cluttered desktop).
-
-Its advanced features include a simple configuration and the ability to use
-multiple terminal shells in a single window
-
-Using Konsole, a user can open:
-* Linux console sessions
-* Midnight Commander file manager sessions
-* Shell sessions
-* Root consoles sessions
-
-%files -n trinity-konsole
-%defattr(-,root,root,-)
-%{tde_bindir}/konsole
-%{tde_tdelibdir}/kcm_konsole.la
-%{tde_tdelibdir}/kcm_konsole.so
-%{tde_tdelibdir}/kded_kwrited.la
-%{tde_tdelibdir}/kded_kwrited.so
-%{tde_tdelibdir}/konsole.la
-%{tde_tdelibdir}/konsole.so
-%{tde_tdelibdir}/libkonsolepart.la
-%{tde_tdelibdir}/libkonsolepart.so
-%{tde_libdir}/lib[kt]deinit_konsole.la
-%{tde_libdir}/lib[kt]deinit_konsole.so
-%{tde_tdeappdir}/konsole.desktop
-%{tde_tdeappdir}/konsolesu.desktop
-%{tde_datadir}/applnk/.hidden/kcmkonsole.desktop
-%{tde_datadir}/apps/kconf_update/konsole.upd
-%{tde_datadir}/apps/kconf_update/schemaStrip.pl
-%{tde_datadir}/apps/konqueror/servicemenus/konsolehere.desktop
-%{tde_datadir}/apps/konsole/
-%{tde_datadir}/icons/hicolor/*/apps/konsole.*
-%{tde_datadir}/mimelnk/application/x-konsole.desktop
-%{tde_datadir}/services/kded/kwrited.desktop
-%{tde_datadir}/services/konsolepart.desktop
-%{tde_datadir}/services/konsole-script.desktop
-%{tde_datadir}/services/kwrited.desktop
-%{tde_datadir}/servicetypes/terminalemulator.desktop
-%{tde_tdedocdir}/HTML/en/konsole/
-%{tde_tdedocdir}/HTML/en/kcontrol/kcmkonsole/
-
-%post -n trinity-konsole
-update-desktop-database %{tde_appdir} 2> /dev/null || : 
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f}  2> /dev/null || :
-done
-/sbin/ldconfig || :
-
-%postun -n trinity-konsole
-update-desktop-database %{tde_appdir} 2> /dev/null || : 
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f}  2> /dev/null || :
-done
-/sbin/ldconfig || :
-
-##########
-
-%package -n trinity-kpager
-Summary:	desktop pager for TDE
-Group:		Applications/Utilities
-Requires:	%{name}-data = %{version}-%{release}
-
-%description -n trinity-kpager
-This package contains TDE's desktop pager, which displays your virtual
-desktops iconically in a window, along with icons of any running
-applications. It is used to switch between applications or desktops.
-
-%files -n trinity-kpager
-%defattr(-,root,root,-)
-%{tde_bindir}/kpager
-%{tde_tdeappdir}/kpager.desktop
-%{tde_datadir}/applnk/Utilities/kpager.desktop
-%{tde_datadir}/icons/hicolor/*/apps/kpager.png
-%{tde_tdedocdir}/HTML/en/kpager/
-
-%post -n trinity-kpager
-update-desktop-database %{tde_appdir} 2> /dev/null || : 
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f}  2> /dev/null || :
-done
-
-%postun -n trinity-kpager
-update-desktop-database %{tde_appdir} 2> /dev/null || : 
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f}  2> /dev/null || :
-done
-
-##########
-
-%package -n trinity-kpersonalizer
-Summary:	installation personalizer for TDE
-Group:		Applications/Utilities
-Requires:	%{name}-data = %{version}-%{release}
-
-%description -n trinity-kpersonalizer
-TDE Personalizer is the application that configures the TDE desktop for you.
-It's a very useful wizard that allows you to quickly change the TDE desktop to
-suit your own needs. When you run TDE for the first time, KPersonalizer is
-automatically started. KPersonalizer can also be called later.
-
-%files -n trinity-kpersonalizer
-%defattr(-,root,root,-)
-%{tde_bindir}/kpersonalizer
-%{tde_tdeappdir}/kpersonalizer.desktop
-%{tde_datadir}/applnk/System/kpersonalizer.desktop
-%{tde_datadir}/apps/kpersonalizer/
-%{tde_datadir}/icons/crystalsvg/*/apps/kpersonalizer.png
-
-%post -n trinity-kpersonalizer
-update-desktop-database %{tde_appdir} 2> /dev/null || : 
-for f in crystalsvg ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f}  2> /dev/null || :
-done
-
-%postun -n trinity-kpersonalizer
-update-desktop-database %{tde_appdir} 2> /dev/null || : 
-for f in crystalsvg ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f}  2> /dev/null || :
-done
-
-##########
-
-%package -n trinity-ksmserver
-Summary:	session manager for TDE
-Group:		Applications/Utilities
-Requires:	%{name}-data = %{version}-%{release}
-Requires:	trinity-twin = %{version}-%{release}
-
-%description -n trinity-ksmserver
-This package contains the KDE session manager. It is responsible for
-restoring your TDE session on login. It is also needed to properly
-start a KDE session. It registers KDE with X display managers, and
-provides the 'starttde' command, for starting an X session with KDE
-from the console.
-
-If you are running TDE for the first time for a certain user,
-kpersonalizer is used to help with setup. If it is not present,
-KDE will start, but many good defaults will not be set.
-
-%files -n trinity-ksmserver
-%defattr(-,root,root,-)
-%{tde_bindir}/ksmserver
-%{tde_bindir}/start[kt]de
-%{tde_bindir}/migratekde3
-%{tde_tdelibdir}/ksmserver.la
-%{tde_tdelibdir}/ksmserver.so
-%{tde_libdir}/lib[kt]deinit_ksmserver.la
-%{tde_libdir}/lib[kt]deinit_ksmserver.so
-%{tde_datadir}/apps/kconf_update/ksmserver.upd
-%{tde_datadir}/apps/kconf_update/move_session_config.sh
-%{tde_datadir}/apps/ksmserver/pics/shutdownkonq.png
-
-# Remove conflicts with redhat-menus
-%if "%{?tde_prefix}" != "/usr"
-%{tde_bindir}/plasma-desktop
-%endif
-
-%post -n trinity-ksmserver
-/sbin/ldconfig || :
-
-%postun -n trinity-ksmserver
-/sbin/ldconfig || :
-
-##########
-
-%package -n trinity-ksplash
-Summary:	the TDE splash screen
-Group:		Applications/Utilities
-Requires:	%{name}-data = %{version}-%{release}
-
-%description -n trinity-ksplash
-This package includes the TDE Splash screen, which is seen when
-a TDE session is launched.
-
-%files -n trinity-ksplash
-%defattr(-,root,root,-)
-%{tde_bindir}/ksplash
-%{tde_bindir}/ksplashsimple
-%{tde_tdelibdir}/kcm_ksplashthemes.la
-%{tde_tdelibdir}/kcm_ksplashthemes.so
-%{tde_tdelibdir}/ksplashdefault.la
-%{tde_tdelibdir}/ksplashdefault.so
-%{tde_tdelibdir}/ksplashunified.la
-%{tde_tdelibdir}/ksplashunified.so
-%{tde_tdelibdir}/ksplashredmond.la
-%{tde_tdelibdir}/ksplashredmond.so
-%{tde_tdelibdir}/ksplashstandard.la
-%{tde_tdelibdir}/ksplashstandard.so
-%{tde_libdir}/libksplashthemes.so.*
-%{tde_tdeappdir}/ksplashthememgr.desktop
-%{tde_datadir}/apps/ksplash
-%{tde_datadir}/services/ksplashdefault.desktop
-%{tde_datadir}/services/ksplash.desktop
-%{tde_datadir}/services/ksplashunified.desktop
-%{tde_datadir}/services/ksplashredmond.desktop
-%{tde_datadir}/services/ksplashstandard.desktop
-%{tde_datadir}/servicetypes/ksplashplugins.desktop
-%{tde_tdedocdir}/HTML/en/ksplashml/
-
-%post -n trinity-ksplash
-update-desktop-database %{tde_appdir} 2> /dev/null || : 
-/sbin/ldconfig || :
-
-%postun -n trinity-ksplash
-update-desktop-database %{tde_appdir} 2> /dev/null || : 
-/sbin/ldconfig || :
-
-##########
-
-%package -n trinity-ksplash-devel
-Summary:	Development files for ksplash
-Group:		Development/Libraries
-Requires:	trinity-ksplash = %{version}-%{release}
-
-%description -n trinity-ksplash-devel
-%{summary}
-
-%files -n trinity-ksplash-devel
-%{tde_tdeincludedir}/ksplash/*
-%{tde_libdir}/libksplashthemes.la
-%{tde_libdir}/libksplashthemes.so
-
-%post -n trinity-ksplash-devel
-/sbin/ldconfig || :
-
-%postun -n trinity-ksplash-devel
-/sbin/ldconfig || :
-
-##########
-
-%package -n trinity-ksysguard
-Summary:	system guard for TDE
-Group:		Applications/Utilities
-Requires:	%{name}-data = %{version}-%{release}
-Requires:	trinity-ksysguardd = %{version}-%{release}
-
-%description -n trinity-ksysguard
-TDE System Guard allows you to monitor various statistics about your
-computer.
-
-%files -n trinity-ksysguard
-%defattr(-,root,root,-)
-%{tde_bindir}/kpm
-%{tde_bindir}/ksysguard
-%{tde_tdelibdir}/sysguard_panelapplet.la
-%{tde_tdelibdir}/sysguard_panelapplet.so
-%{tde_libdir}/libksgrd.so.*
-%{tde_tdeappdir}/ksysguard.desktop
-%{tde_datadir}/apps/kicker/applets/ksysguardapplet.desktop
-%{tde_datadir}/apps/ksysguard/
-%{tde_datadir}/icons/crystalsvg/*/apps/ksysguard.png
-%{tde_datadir}/mimelnk/application/x-ksysguard.desktop
-%{tde_tdedocdir}/HTML/en/ksysguard/
-
-%post -n trinity-ksysguard
-update-desktop-database %{tde_appdir} 2> /dev/null || : 
-for f in crystalsvg ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f}  2> /dev/null || :
-done
-/sbin/ldconfig || :
-
-%postun -n trinity-ksysguard
-update-desktop-database %{tde_appdir} 2> /dev/null || : 
-for f in crystalsvg ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f}  2> /dev/null || :
-done
-/sbin/ldconfig || :
-
-##########
-
-%package -n trinity-ksysguard-devel
-Summary:	Development files for ksysguard
-Group:		Development/Libraries
-Requires:	trinity-ksysguard = %{version}-%{release}
-
-%description -n trinity-ksysguard-devel
-%{summary}
-
-%files -n trinity-ksysguard-devel
-%{tde_tdeincludedir}/ksgrd/*
-%{tde_libdir}/libksgrd.la
-%{tde_libdir}/libksgrd.so
-
-%post -n trinity-ksysguard-devel
-/sbin/ldconfig || :
-
-%postun -n trinity-ksysguard-devel
-/sbin/ldconfig || :
-
-##########
-
-%package -n trinity-ksysguardd
-Summary:	system guard daemon for TDE
-Group:		Applications/Utilities
-Requires:	%{name}-data = %{version}-%{release}
-
-%description -n trinity-ksysguardd
-TDE System Guard Daemon is the daemon part of ksysguard. The daemon can
-be installed on a remote machine to enable ksysguard on another machine
-to monitor it through the daemon running there.
-
-%files -n trinity-ksysguardd
-%defattr(-,root,root,-)
-%{tde_bindir}/ksysguardd
-%config(noreplace) %{_sysconfdir}/trinity/ksysguarddrc
-
-##########
-
-%package -n trinity-ktip
-Summary:	useful tips for TDE
-Group:		Applications/Utilities
-Requires:	%{name}-data = %{version}-%{release}
-
-%description -n trinity-ktip
-ktip provides many useful tips on using TDE when you log in.
-
-%files -n trinity-ktip
-%defattr(-,root,root,-)
-%{tde_bindir}/ktip
-%{tde_tdeappdir}/ktip.desktop
-%{tde_datadir}/applnk/Toys/ktip.desktop
-%{tde_datadir}/apps/kdewizard/pics/wizard_small.png
-%{tde_datadir}/apps/kdewizard/tips/
-%{tde_datadir}/autostart/ktip.desktop
-%{tde_datadir}/icons/hicolor/*/apps/ktip.*
-
-%post -n trinity-ktip
-update-desktop-database %{tde_appdir} 2> /dev/null || : 
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f}  2> /dev/null || :
-done
-
-%postun -n trinity-ktip
-update-desktop-database %{tde_appdir} 2> /dev/null || : 
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f}  2> /dev/null || :
-done
-
-##########
-
-%package -n trinity-twin
-Summary:	the TDE window manager
-Group:		Applications/Utilities
-Requires:	%{name}-data = %{version}-%{release}
-
-%description -n trinity-twin
-This package contains the default X window manager for TDE.
-
-%files -n trinity-twin
-%defattr(-,root,root,-)
-%{tde_bindir}/kompmgr
-%{tde_bindir}/[kt]win
-%{tde_bindir}/[kt]win_killer_helper
-#%{tde_bindir}/[kt]win_resumer_helper
-%{tde_bindir}/[kt]win_rules_dialog
-%{tde_libdir}/kconf_update_bin/[kt]win_update_default_rules
-%{tde_libdir}/kconf_update_bin/[kt]win_update_window_settings
-%{tde_tdelibdir}/kcm_[kt]win*.la
-%{tde_tdelibdir}/kcm_[kt]win*.so
-%{tde_tdelibdir}/[kt]win*.la
-%{tde_tdelibdir}/[kt]win*.so
-%{tde_libdir}/lib[kt]decorations.so.*
-%{tde_libdir}/lib[kt]deinit_[kt]win_rules_dialog.la
-%{tde_libdir}/lib[kt]deinit_[kt]win_rules_dialog.so
-%{tde_libdir}/lib[kt]deinit_[kt]win.la
-%{tde_libdir}/lib[kt]deinit_[kt]win.so
-%{tde_tdeappdir}/showdesktop.desktop
-%{tde_tdeappdir}/[kt]windecoration.desktop
-%{tde_tdeappdir}/[kt]winoptions.desktop
-%{tde_tdeappdir}/[kt]winrules.desktop
-%{tde_datadir}/applnk/.hidden/[kt]winactions.desktop
-%{tde_datadir}/applnk/.hidden/[kt]winadvanced.desktop
-%{tde_datadir}/applnk/.hidden/[kt]winfocus.desktop
-%{tde_datadir}/applnk/.hidden/[kt]winmoving.desktop
-%{tde_datadir}/applnk/.hidden/[kt]wintranslucency.desktop
-%{tde_datadir}/apps/kconf_update/[kt]win3_plugin.pl
-%{tde_datadir}/apps/kconf_update/[kt]win3_plugin.upd
-%{tde_datadir}/apps/kconf_update/[kt]win_focus1.sh
-%{tde_datadir}/apps/kconf_update/[kt]win_focus1.upd
-%{tde_datadir}/apps/kconf_update/[kt]win_focus2.sh
-%{tde_datadir}/apps/kconf_update/[kt]win_focus2.upd
-%{tde_datadir}/apps/kconf_update/[kt]win_fsp_workarounds_1.upd
-%{tde_datadir}/apps/kconf_update/[kt]winiconify.upd
-%{tde_datadir}/apps/kconf_update/[kt]winsticky.upd
-%{tde_datadir}/apps/kconf_update/[kt]win.upd
-%{tde_datadir}/apps/kconf_update/[kt]winupdatewindowsettings.upd
-%{tde_datadir}/apps/kconf_update/pluginlibFix.pl
-%{tde_datadir}/apps/[kt]win/
-%{tde_datadir}/config.kcfg/[kt]win.kcfg
-%{tde_datadir}/icons/crystalsvg/*/apps/[kt]win.png
-%{tde_tdedocdir}/HTML/en/kompmgr/
-
-%post -n trinity-twin
-update-desktop-database %{tde_appdir} 2> /dev/null || : 
-for f in crystalsvg ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f}  2> /dev/null || :
-done
-/sbin/ldconfig || :
-
-%postun -n trinity-twin
-update-desktop-database %{tde_appdir} 2> /dev/null || : 
-for f in crystalsvg ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f}  2> /dev/null || :
-done
-/sbin/ldconfig || :
-
-##########
-
-%package -n trinity-twin-devel
-Summary:	Development files for twin
-Group:		Development/Libraries
-Requires:	trinity-twin = %{version}-%{release}
-
-%description -n trinity-twin-devel
-%{summary}
-
-%files -n trinity-twin-devel
-%{tde_tdeincludedir}/[kt]win/
-%{tde_tdeincludedir}/kcommondecoration.h
-%{tde_tdeincludedir}/kdecoration.h
-%{tde_tdeincludedir}/kdecoration_p.h
-%{tde_tdeincludedir}/kdecoration_plugins_p.h
-%{tde_tdeincludedir}/kdecorationfactory.h
-%{tde_tdeincludedir}/KWinInterface.h
-%{tde_libdir}/libkdecorations.la
-%{tde_libdir}/libkdecorations.so
-
-%post -n trinity-twin-devel
-/sbin/ldconfig || :
-
-%postun -n trinity-twin-devel
-/sbin/ldconfig || :
-
-##########
-
-%package -n trinity-libkonq
-Summary:	core libraries for Konqueror
-Group:		Environment/Libraries
-
-%description -n trinity-libkonq
-These libraries are used by several TDE applications, most notably
-Konqueror and the kdesktop package.
-
-%files -n trinity-libkonq
-%defattr(-,root,root,-)
-%{tde_tdelibdir}/kded_favicons.la
-%{tde_tdelibdir}/kded_favicons.so
-%{tde_tdelibdir}/konq_sound.la
-%{tde_tdelibdir}/konq_sound.so
-%{tde_libdir}/libkonq.so.*
-%{tde_datadir}/apps/kbookmark/directory_bookmarkbar.desktop
-%{tde_datadir}/apps/kconf_update/favicons.upd
-%{tde_datadir}/apps/kconf_update/move_favicons.sh
-%{tde_datadir}/apps/konqueror/pics/arrow_bottomleft.png
-%{tde_datadir}/apps/konqueror/pics/arrow_bottomright.png
-%{tde_datadir}/apps/konqueror/pics/arrow_topleft.png
-%{tde_datadir}/apps/konqueror/pics/arrow_topright.png
-%{tde_datadir}/apps/konqueror/pics/thumbnailfont_7x4.png
-%{tde_datadir}/services/kded/favicons.desktop
-%{tde_datadir}/servicetypes/konqpopupmenuplugin.desktop
-
-%post -n trinity-libkonq
-/sbin/ldconfig || :
-
-%postun -n trinity-libkonq
-/sbin/ldconfig || :
-
-##########
-
-%package libtqt3-integration
-Summary:	Integration library between TQt3 and TDE
-Group:		Environment/Libraries
-
-Obsoletes:	tdebase-libtqt3-integration < %{version}-%{release}
-Provides:	tdebase-libtqt3-integration = %{version}-%{release}
-
-%description libtqt3-integration
-These libraries allow you to use TDE dialogs in native TQt3 applications.
-
-%files libtqt3-integration
-%defattr(-,root,root,-)
-%{tde_tdelibdir}/plugins/integration/libqtkde.la
-%{tde_tdelibdir}/plugins/integration/libqtkde.so
-%{tde_tdelibdir}/plugins/integration/libqtkde.so.*
-%{tde_tdelibdir}/kded_kdeintegration.la
-%{tde_tdelibdir}/kded_kdeintegration.so
-%{tde_datadir}/services/kded/kdeintegration.desktop
-
-##########
-
-%package -n trinity-libkonq-devel
-Summary:	development files for Konqueror's core libraries
-Group:		Development/Libraries
-Requires:	trinity-libkonq = %{version}-%{release}
-
-%description -n trinity-libkonq-devel
-This package contains headers and other development files for the core
-Konqueror libraries.
-
-%files -n trinity-libkonq-devel
-%defattr(-,root,root,-)
-%{tde_tdeincludedir}/kfileivi.h
-%{tde_tdeincludedir}/kivdirectoryoverlay.h
-%{tde_tdeincludedir}/knewmenu.h
-%{tde_tdeincludedir}/konqbookmarkmanager.h
-%{tde_tdeincludedir}/konq_*.h
-%{tde_tdeincludedir}/libkonq_export.h
-%{tde_libdir}/libkonq.la
-%{tde_libdir}/libkonq.so
-
-%post -n trinity-libkonq-devel
-/sbin/ldconfig || :
-
-%postun -n trinity-libkonq-devel
-/sbin/ldconfig || :
-
-##########
-
-%if 0%{?suse_version} || 0%{?pclinuxos}
-%debug_package
-%endif
-
-##########
-
-%prep
-%setup -q
-%patch1 -p1 -b .minuid
-%patch2 -p1 -b .ck
-%patch3 -p4 -b .startkde
-
-%patch11 -p1 -b .openterminalhere
-%if 0%{?rhel} || 0%{?fedora}
-%patch13 -p1 -b .Xsession
-%endif
-%if 0%{?suse_version}
-%patch14 -p1 -b .Xsession
-%endif
-%patch15 -p1 -b .tdeicon
-%if 0%{?rhel} || 0%{?mgaversion} || 0%{?mdkversion}
-%patch21 -p1 -b .man
-%endif
-%patch30 -p1 -b .xtestsupport
-%patch32 -p1 -b .pid
-
-%if 0%{?rhel} == 4
-%patch201 -p1 -b .libdetect
-%patch202 -p1 -b .dbustqt
-%patch203 -p1 -b .consolekit
-%patch204 -p1 -b .composite
-%patch205 -p1 -b .hal04
-%patch206 -p1 -b .rhel4
-%endif
-
-# Applies an optional distro-specific graphical theme
-%if "%{?tde_bg}" != ""
-# KDM Background
-%__sed -i "kdm/kfrontend/genkdmconf.c" \
-	-e 's|"Wallpaper=isadora.png\n"|"Wallpaper=%{tde_bg}\n"|'
-
-# TDE user default background
-%__sed -i "kpersonalizer/keyecandypage.cpp" \
-	-e 's|#define DEFAULT_WALLPAPER "isadora.png"|#define DEFAULT_WALLPAPER "%{tde_bg}"|'
-%__sed -i "startkde" \
-	-e 's|/usr/share/wallpapers/isadora.png.desktop|%{tde_bg}|' \
-	-e 's|Wallpaper=isadora.png|Wallpaper=%{tde_bg}|'
-%endif
-
-# TDE branding: removes KUbuntu references [Bug #617]
-%__sed -i "kcontrol/kdm/kdm-appear.cpp" \
-	-e "s|Welcome to Kubuntu |Welcome to %{tde_aboutlabel} |"
-%__sed -i "konqueror/about/konq_aboutpage.cc" \
-	-e "s|About Kubuntu|About %{tde_aboutlabel}|" \
-	-e "s|help:/kubuntu/|%{tde_aboutpage}|" \
-	-e "s|Kubuntu Documentation|%{tde_aboutlabel} Documentation|"
-%__sed -i "konqueror/about/launch.html" \
-	-e "s|help:/kubuntu/about-kubuntu/index.html|%{tde_aboutpage}|"
-%__sed -i "kdm/config.def" \
-	-e "s|Welcome to Trinity |Welcome to %{tde_aboutlabel} |"
-
-# TDE default directory in 'startkde' script (KDEDIR)
-%__sed -i "startkde" \
-	-e "s|/opt/trinity|%{tde_prefix}|g"
-
-# TDE default start button icon
-%__sed -i "startkde" \
-	-e "s|%%{tde_starticon}|%{tde_starticon}|g"
-
-
-%build
-unset QTDIR || : ; . /etc/profile.d/qt3.sh
-export PATH="%{tde_bindir}:${PATH}"
-export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
-export CMAKE_INCLUDE_PATH="%{tde_includedir}:%{tde_includedir}/tqt"
-export LD_LIBRARY_PATH="%{tde_libdir}"
-
-# Avoids building against KDE3's old stuff, if installed
-export KDEDIR=%{tde_prefix}
-
-# Shitty hack for RHEL4 ...
-if [ -d "/usr/X11R6" ]; then
-  export CMAKE_INCLUDE_PATH="${CMAKE_INCLUDE_PATH}:/usr/X11R6/include:/usr/X11R6/%{_lib}"
-  export CFLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}"
-  export CXXFLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}"
-fi
-
-# Samba 4.0 includes (Fedora 18)
-if [ -d "/usr/include/samba-4.0" ]; then
-  export CMAKE_INCLUDE_PATH="${CMAKE_INCLUDE_PATH}:/usr/include/samba-4.0"
-fi
-
-%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version}
-%__mkdir_p build
-cd build
-%endif
-
-%cmake \
-  -DBIN_INSTALL_DIR="%{tde_bindir}" \
-  -DINCLUDE_INSTALL_DIR="%{tde_tdeincludedir}" \
-  -DLIB_INSTALL_DIR="%{tde_libdir}" \
-  -DSHARE_INSTALL_PREFIX="%{tde_datadir}" \
-  -DCMAKE_SKIP_RPATH="OFF" \
-  -DCONFIG_INSTALL_DIR="/etc/trinity" \
-  -DSYSCONF_INSTALL_DIR="/etc/trinity" \
-  -DXDG_MENU_INSTALL_DIR="/etc/xdg/menus" \
-  -DWITH_SASL=ON \
-  -DWITH_LDAP=ON \
-  -DWITH_SAMBA=ON \
-  %{?with_exr:-DWITH_OPENEXR=ON} \
-  -DWITH_XCOMPOSITE=ON \
-  -DWITH_XCURSOR=ON \
-  -DWITH_XFIXES=ON \
-  %{?with_xrandr:-DWITH_XRANDR=ON} \
-  -DWITH_XRENDER=ON \
-  -DWITH_XDAMAGE=ON \
-  -DWITH_XEXT=ON \
-  %{?with_xtest:-DWITH_XTEST=ON} \
-  %{?with_xscreensaver:-DWITH_XSCREENSAVER=ON} \
-  %{?with_libart:-DWITH_LIBART=ON} \
-  -DWITH_LIBUSB=ON \
-  -DWITH_LIBRAW1394=ON \
-  -DWITH_SUDO_KDESU_BACKEND=OFF \
-  -DWITH_PAM=ON \
-  -DWITH_SHADOW=ON \
-  -DWITH_XDMCP=ON \
-  -DWITH_XINERAMA=ON \
-  -DWITH_ARTS=ON \
-  -DWITH_I8K=ON \
-  %{?with_hal:-DWITH_HAL=ON} \
-  -DWITH_KDESKTOP_LOCK_BACKTRACE=OFF \
-  -DBUILD_ALL=ON \
-%if 0%{?suse_version}
-  -DKCHECKPASS_PAM_SERVICE="xdm" \
-  -DKDM_PAM_SERVICE="xdm" \
-  -DKSCREENSAVER_PAM_SERVICE="xdm" \
-%else
-  -DKCHECKPASS_PAM_SERVICE="kcheckpass-trinity" \
-  -DKDM_PAM_SERVICE="kdm-trinity" \
-  -DKSCREENSAVER_PAM_SERVICE="kscreensaver-trinity" \
-%endif
-  %{!?with_tsak:-DBUILD_TSAK=OFF} \
-%if 0%{?fedora} >= 16 || 0%{?suse_version} >= 1220
-  -DTDM_DEFMINUID=1000 \
-%else
-  -DTDM_DEFMINUID=500 \
-%endif
-  -DTDM_DEFMAXUID=65000 \
-  ..
-
-%__make %{?_smp_mflags}
-
-
-%install
-%__rm -rf %{?buildroot}
-%__make install DESTDIR=%{?buildroot} -C build
-
-# Removes obsolete Kerry-related files
-%__rm -f %{?buildroot}%{tde_bindir}/khc_beagle_index.pl
-%__rm -f %{?buildroot}%{tde_bindir}/khc_beagle_search.pl
-
-# Adds a GDM/KDM/XDM session called 'TDE'
-
-# Under RHEL/Fedora/Suse, static 'xsessions' files go to '/usr/share/xsessions'.
-%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version}
-%__install -D -m 644 \
-	"%{?buildroot}%{tde_datadir}/apps/kdm/sessions/tde.desktop" \
-	"%{?buildroot}%{_datadir}/xsessions/tde.desktop"
-
-# Force session name to be 'TDE'
-%__sed -i "%{?buildroot}%{_datadir}/xsessions/tde.desktop" \
-	-e "s,^Name=.*,Name=TDE,"
-%endif
-
-# Mageia/Mandriva/PCLinuxOS stores its session file in different folder than RHEL/Fedora
-# Generated files for TDM/KDM4 go to '/usr/share/apps/kdm/sessions'
-%if 0%{?mgaversion} || 0%{?mdkversion}
-%__install -d -m 755 %{?buildroot}%{_sysconfdir}/X11/wmsession.d
-cat <<EOF >"%{?buildroot}%{_sysconfdir}/X11/wmsession.d/45TDE"
-NAME=TDE
-ICON=kde-wmsession.xpm
-DESC=The Trinity Desktop Environment
-EXEC=%{tde_bindir}/startkde
-SCRIPT:
-exec %{tde_bindir}/startkde
-EOF
-
-%__install -d -m 755 %{?buildroot}%{_datadir}/X11/dm.d
-cat <<EOF >"%{?buildroot}%{_datadir}/X11/dm.d/45TDE.conf"
-NAME=TDM
-DESCRIPTION=TDM (Trinity Display Manager)
-PACKAGE=trinity-tdm
-EXEC=%{tde_bindir}/kdm
-FNDSESSION_EXEC="/usr/sbin/chksession -k"
-EOF
-%endif
-
-# TDE 3.5.12: add script "plasma-desktop" to avoid conflict with KDE4
-%if "%{?tde_prefix}" != "/usr"
-%__install -m 755 "%{SOURCE1}" "%{?buildroot}%{tde_bindir}"
-%endif
-
-# PAM configuration files (except openSUSE)
-%if 0%{?suse_version} == 0
-%__install -D -m 644 "%{SOURCE2}" "%{?buildroot}%{_sysconfdir}/pam.d/kdm-trinity"
-%__install -D -m 644 "%{SOURCE3}" "%{?buildroot}%{_sysconfdir}/pam.d/kdm-trinity-np"
-%__install -D -m 644 "%{SOURCE4}" "%{?buildroot}%{_sysconfdir}/pam.d/kcheckpass-trinity"
-%__install -D -m 644 "%{SOURCE5}" "%{?buildroot}%{_sysconfdir}/pam.d/kscreensaver-trinity"
-%endif
-
-# KDM configuration for RHEL/Fedora
-%__sed -i "%{?buildroot}%{_sysconfdir}/trinity/kdm/kdmrc" \
-%if 0%{?fedora} >= 16 || 0%{?suse_version} >= 1220
-	-e "s/^#*MinShowUID=.*/MinShowUID=1000/"
-%else
-	-e "s/^#*MinShowUID=.*/MinShowUID=500/"
-%endif
-
-# Moves the XDG configuration files to TDE directory
-%if "%{tde_prefix}" != "/usr"
-%__mkdir_p "%{?buildroot}%{tde_prefix}/etc"
-%__mv -f "%{?buildroot}%{_sysconfdir}/xdg" "%{?buildroot}%{tde_prefix}/etc"
-%endif
-
-# Symlinks 'usb.ids' (Use system-provided version, not TDE provided version)
-%__rm -f "%{?buildroot}%{tde_datadir}/apps/usb.ids"
-%if 0%{?suse_version} 
-%__ln_s -f "/usr/share/usb.ids" "%{?buildroot}%{tde_datadir}/apps/usb.ids"
-%else
-%__ln_s -f "/usr/share/hwdata/usb.ids" "%{?buildroot}%{tde_datadir}/apps/usb.ids"
-%endif
-
-# Makes 'media_safelyremove.desktop' an alternative
-%__mv -f "%{buildroot}%{tde_datadir}/apps/konqueror/servicemenus/media_safelyremove.desktop" "%{buildroot}%{tde_datadir}/apps/konqueror/servicemenus/media_safelyremove.desktop_tdebase"
-%__ln_s "%{_sysconfdir}/alternatives/media_safelyremove.desktop_tdebase" "%{buildroot}%{tde_datadir}/apps/konqueror/servicemenus/media_safelyremove.desktop"
-%__mkdir_p "%{?buildroot}%{_sysconfdir}/alternatives"
-%__ln_s "%{tde_datadir}/apps/konqueror/servicemenus/media_safelyremove.desktop_tdebase" "%{?buildroot}%{_sysconfdir}/alternatives/media_safelyremove.desktop_tdebase"
-
-# SUSE: creates DM config file, used by '/etc/init.d/xdm'
-#  You must set 'DISPLAYMANAGER=tdm' in '/etc/sysconfig/displaymanager'
-%if 0%{?suse_version}
-%__install -D -m 644 "%{SOURCE6}" "%{?buildroot}/usr/lib/X11/displaymanagers/tdm"
-%__sed -i "%{?buildroot}/usr/lib/X11/displaymanagers/tdm" -e "s|/opt/trinity/bin|%{tde_bindir}|g"
-%endif
-
-# Fedora 18: no more SYSV init script, we have to use systemd.
-%if 0%{?fedora} >= 18
-%__install -D -m 644 "%{SOURCE7}" "%{?buildroot}/usr/lib/systemd/system/tdm.service"
-%endif
-
-# Fedora 17: requires SELINUX policies
-%if 0%{?fedora} >= 17 || 0%{?rhel} >= 6
-%__install -D -m 644 "%{SOURCE8}" "%{?buildroot}/etc/selinux/targeted/contexts/files/file_contexts.tde"
-%endif
-
-# Symlink KDM configuration
-%__mkdir_p "%{?buildroot}%{tde_datadir}/config"
-%__ln_s "%{_sysconfdir}/trinity/kdm" "%{?buildroot}%{tde_datadir}/config/kdm"
-
-
-%clean
-%__rm -rf %{?buildroot}
-
-
-%changelog
-* Sat Jan 19 2013 Francois Andriot <francois.andriot@free.fr> - 3.5.13.2-1
-- Initial release for TDE 3.5.13.2
diff --git a/redhat/tdebase/trinity-tdebase-3.5.13.3.spec b/redhat/tdebase/trinity-tdebase-3.5.13.3.spec
deleted file mode 100644
index 149cb30c4..000000000
--- a/redhat/tdebase/trinity-tdebase-3.5.13.3.spec
+++ /dev/null
@@ -1,3514 +0,0 @@
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?tde_prefix}" != "/usr"
-%define _variant .opt
-%endif
-
-# TDE 3.5.13 specific building variables
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-
-%define tde_tdeappdir %{tde_datadir}/applications/kde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-# Older RHEL/Fedora versions use packages named "qt", "qt-devel", ..
-# whereas newer versions use "qt3", "qt3-devel" ...
-%if 0%{?rhel} >= 6 || 0%{?fedora} >= 8 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}
-%define _qt_suffix 3
-%endif
-
-
-Name:		trinity-tdebase
-Version:	3.5.13.2
-Release:	%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
-License:	GPL
-Summary:	Trinity Base Programs
-Group:		User Interface/Desktops
-
-Obsoletes:	trinity-kdebase < %{version}-%{release}
-Provides:	trinity-kdebase = %{version}-%{release}
-Obsoletes:	trinity-kdebase-libs < %{version}-%{release}
-Provides:	trinity-kdebase-libs = %{version}-%{release}
-Obsoletes:	trinity-kdebase-extras < %{version}-%{release}
-Provides:	trinity-kdebase-extras = %{version}-%{release}
-Obsoletes:	tdebase < %{version}-%{release}
-Provides:	tdebase = %{version}-%{release}
-
-
-Vendor:		Trinity Project
-Packager:	Francois Andriot <francois.andriot@free.fr>
-URL:		http://www.trinitydesktop.org/
-
-Prefix:		%{tde_prefix}
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:	%{name}-%{version}%{?preversion:~%{preversion}}.tar.gz
-
-# Wrapper script to prevent Plasma launch at Trinity Startup
-Source1:	plasma-desktop
-
-# Pam configuration files for RHEL / Fedora
-%if 0%{?suse_version} == 0
-Source2:	pamd.kdm-trinity%{?dist}
-Source3:	pamd.kdm-trinity-np%{?dist}
-Source4:	pamd.kcheckpass-trinity%{?dist}
-Source5:	pamd.kscreensaver-trinity%{?dist}
-%endif
-
-# openSUSE: configuration file for TDM
-Source6:	suse-displaymanagers-tdm
-
-# Fedora 18: use SYSTEMD for TDM startup
-%if 0%{?fedora} >= 18
-Source7:	tdm.service%{?dist}
-%endif
-
-# Fedora 17: special selinux policy required
-%if 0%{?fedora} == 17 || 0%{?rhel} == 6
-%define with_selinux_policy 1
-Source8:	tdm%{?dist}.pp
-%endif
-
-# TDE 3.5.13 patches
-## [kdebase/kdesu] Remove 'ignore' button on 'kdesu' dialog box [RHEL/Fedora]
-Patch10:	tdebase-3.5.13.2-kdesu-noignorebutton.patch
-## [kdebase/kdesktop] Modifies 'open terminal here' on desktop [RHEL/Fedora]
-Patch11:	kdebase-3.5.12-desktop-openterminalhere.patch
-## [kdebase/kdm/kfrontend] Global Xsession file is '/etc/X11/xinit/Xsession' [RHEL/Fedora]
-Patch13:	kdebase-3.5.13-genkdmconf_Xsession_location.patch
-## [kdebase/kdm/kfrontend] Global Xsession file is '/etc/X11/xdm/Xsession' [openSUSE]
-Patch14:	kdebase-3.5.13-genkdmconf_Xsession_location_xdm.patch
-## [kdebase/startkde] Sets default Start Icon in 'kickerrc' [RHEL/Fedora]
-Patch15:	kdebase-3.5.13.1-startkde_icon.patch
-## [kdebase/kdm/kfrontend] Allows to hide KDM menu button [RHEL/Fedora]
-Patch30:	kdebase-3.5.12-kdm_hide_menu_button.patch
-## [kdebase/kdm] Fix PID file is 'tdm.pid' instead of 'kdm.pid' (needed for openSUSE)
-Patch31:	kdebase-3.5.13.1-fix_tdm_pid_file.patch
-## [kdebase/kicker] Fixes for Kickoff menu
-Patch39:	tdebase-3.5.13.2-kickoff_default_favs.patch
-Patch40:	tdebase-3.5.13.2-kickoff_add_packagekit_shortcut.patch
-## [kdebase/kcontrol] Adds FR translation for KCM ICC
-Patch41:	tdebase-3.5.13.2-displayconfig_translation.patch
-
-# Patches from Mandriva
-Patch45:	tdebase-3.5.13.2-vibrate_dialog.patch
-Patch50:	tdebase-3.5.13.2-kcontrol_menu_entry.patch
-Patch51:	tdebase-3.5.13.2-kdesktop_crossfade.patch
-Patch52:	tdebase-3.5.13.2-select_wm_gui.patch
-Patch53:	tdebase-3.5.13.2-kickoff_xdg_dirs.patch
-Patch54:	tdebase-3.5.13.2-suspend_unmount.patch
-Patch55:	tdebase-3.5.13.2-bookmark_global_copy.patch
-Patch56:	tdebase-3.5.13.2-kdm_theme_selector.patch
-Patch57:	tdebase-3.5.13.2-kbackground_xml_selector.patch
-
-# Patches from Pardus Linux (then Mandriva)
-Patch108:	tdebase-3.5.13.2-kdm_utf8_password.patch
-Patch112:	tdebase-3.5.13.2-fix_media_safelyremove.patch
-
-### Specific patches for RHEL4 (should not go upstream)
-
-## [tdebase] Fix build on RHEL4, detect old libraries without pkg file
-Patch201:	kdebase-3.5.13-fix_lib_detection.patch
-## [tdebase] Do not build against DBUS-TQT, only DBUS and DBUS-QT
-Patch202:	kdebase-3.5.13.2-build_without_dbustqt.patch
-## [tdebase] Do not build against ConsoleKit
-Patch203:	kdebase-3.5.13-build_without_consolekit.patch
-## [tdebase] Add WITH_COMPOSITE option to CMakeLists.txt
-Patch204:	kdebase-3.5.13.2-add_disable_composite_option.patch
-## [tdebase] Downgrade halbackend to support Hal 0.4
-Patch205:	kdebase-3.5.13-support_hal_04.patch
-## [tdebase] Other(s) FTBFS ...
-Patch206:	kdebase-3.5.13-fix_rhel4_compilation.patch
-
-### Distribution-specific settings ###
-
-# Fedora 15 Theme: "Lovelock"
-%if 0%{?fedora} == 15
-Requires:	lovelock-backgrounds-single
-%define tde_bg /usr/share/backgrounds/lovelock/default/standard/lovelock.png
-%define tde_starticon /usr/share/icons/hicolor/96x96/apps/fedora-logo-icon.png
-
-Requires:	fedora-release-notes
-%define tde_aboutlabel Fedora 15
-%define tde_aboutpage /usr/share/doc/HTML/fedora-release-notes/index.html
-%endif
-
-# Fedora 16 Theme: "Verne"
-%if 0%{?fedora} == 16
-Requires:	verne-backgrounds-single
-%define tde_bg /usr/share/backgrounds/verne/default/standard/verne.png
-%define tde_starticon /usr/share/icons/hicolor/96x96/apps/fedora-logo-icon.png
-
-Requires:	fedora-release-notes
-%define tde_aboutlabel Fedora 16
-%define tde_aboutpage /usr/share/doc/HTML/fedora-release-notes/index.html
-%endif
-
-# Fedora 17 Theme: "Beefy Miracle"
-%if 0%{?fedora} == 17
-Requires:	beefy-miracle-backgrounds-single
-%define tde_bg /usr/share/backgrounds/beefy-miracle/default/standard/beefy-miracle.png
-%define tde_starticon /usr/share/icons/hicolor/96x96/apps/fedora-logo-icon.png
-
-Requires:	fedora-release-notes
-%define tde_aboutlabel Fedora 17
-%define tde_aboutpage /usr/share/doc/HTML/fedora-release-notes/index.html
-%endif
-
-# Fedora 18 Theme: "Spherical Cow"
-%if 0%{?fedora} == 18
-Requires:	spherical-cow-backgrounds-single
-%define tde_bg /usr/share/backgrounds/spherical-cow/default/standard/spherical-cow.png
-Requires:	fedora-logos
-%define tde_starticon /usr/share/icons/hicolor/96x96/apps/fedora-logo-icon.png
-
-Requires:	fedora-release-notes
-%define tde_aboutlabel Fedora 18
-%define tde_aboutpage /usr/share/doc/HTML/fedora-release-notes/index.html
-%endif
-
-# RHEL 4 Theme
-%if 0%{?rhel} == 4
-Requires:	desktop-backgrounds-basic
-%define tde_bg /usr/share/backgrounds/images/default.png
-Requires:	redhat-logos
-%define tde_starticon /usr/share/pixmaps/redhat/rpmlogo-64.xpm
-
-Requires:	indexhtml
-%define tde_aboutlabel Enterprise Linux 4
-%define tde_aboutpage /usr/share/doc/HTML/index.html
-%endif
-
-# RHEL 5 Theme
-%if 0%{?rhel} == 5
-Requires:	desktop-backgrounds-basic
-%define tde_bg /usr/share/backgrounds/images/default.jpg
-%define tde_starticon /usr/share/pixmaps/redhat-starthere.png
-
-Requires:	indexhtml
-%define tde_aboutlabel Enterprise Linux 5
-%define tde_aboutpage /usr/share/doc/HTML/index.html
-%endif
-
-# RHEL 6 Theme
-%if 0%{?rhel} == 6
-Requires:	redhat-logos
-%define tde_bg /usr/share/backgrounds/default.png
-%define tde_starticon /usr/share/icons/hicolor/96x96/apps/system-logo-icon.png
-
-Requires:	redhat-indexhtml
-%define tde_aboutlabel Enterprise Linux 6
-%define tde_aboutpage /usr/share/doc/HTML/index.html
-%endif
-
-# Mageia 2 Theme
-%if 0%{?mgaversion} == 2
-Requires:	mageia-theme-Default
-%define tde_bg /usr/share/mga/backgrounds/default.jpg
-%define tde_starticon /usr/share/icons/hicolor/scalable/apps/mageia-menu.svg
-
-Requires:	indexhtml
-%define tde_aboutlabel Mageia 2
-%define tde_aboutpage /usr/share/mga/about/index.html
-%endif
-
-# Mageia 3 Theme
-%if 0%{?mgaversion} == 3
-Requires:	mageia-theme-Default
-%define tde_bg /usr/share/mga/backgrounds/default.jpg
-Requires:	Default-kde4-config
-%define tde_starticon /var/lib/mageia/kde4-profiles/Default/share/apps/mageia/pics/mgabutton.svg
-
-Requires:	indexhtml
-%define tde_aboutlabel Mageia 3
-%define tde_aboutpage /usr/share/mga/about/index.html
-%endif
-
-# Mandriva 2011 Theme: "rosa"
-%if "%{distribution}" == "Mandriva Linux" && "%{?mdkversion}" == "201100"
-Requires:	mandriva-theme
-%define tde_bg /usr/share/mdk/backgrounds/default.jpg
-%define tde_starticon /usr/share/icons/mandriva.png
-
-Requires:	indexhtml
-%define tde_aboutlabel Mandriva 2011
-%define tde_aboutpage /usr/share/mdk/about/index.html
-%endif
-
-# PCLINUXOS 2012
-%if "%{?pclinuxos}" == "2012"
-Requires:	trinity-wallpaper-theme-default
-%define tde_bg %{tde_datadir}/wallpapers/Pulse2012/contents/images/1600x1200.jpg
-Requires:	desktop-common-data
-%define tde_starticon /usr/share/icons/pclinuxos.png
-
-Requires:	indexhtml
-%define tde_aboutlabel PCLinuxOS 2012
-%define tde_aboutpage /usr/share/mdk/about/index.html
-%endif
-
-# PCLINUXOS 2013
-%if "%{?pclinuxos}" == "2013"
-Requires:	trinity-wallpaper-theme-default
-%define tde_bg %{tde_datadir}/wallpapers/Pulse2012/contents/images/1600x1200.jpg
-Requires:	desktop-common-data
-%define tde_starticon /usr/share/icons/pclinuxos.png
-
-Requires:	indexhtml
-%define tde_aboutlabel PCLinuxOS 2013
-%define tde_aboutpage /usr/share/mdk/about/index.html
-%endif
-
-# OpenSuse 11.4 Theme
-%if "%{?suse_version}" == "1140"
-Requires:	hicolor-icon-theme-branding
-%define tde_starticon /usr/share/icons/hicolor/scalable/apps/distributor.svg
-
-Requires:	opensuse-manuals_en
-%define tde_aboutlabel OpenSuse 11.4
-%define tde_aboutpage /usr/share/doc/manual/opensuse-manuals_en/manual/book.opensuse.startup.html
-%endif
-
-# OpenSuse 12.2 Theme
-%if "%{?suse_version}" == "1220"
-Requires:	wallpaper-branding
-%define tde_bg /usr/share/wallpapers/openSUSEdefault/contents/images/1600x1200.jpg
-Requires:	hicolor-icon-theme-branding
-%define tde_starticon /usr/share/icons/hicolor/scalable/apps/distributor.svg
-
-Requires:	opensuse-manuals_en
-%define tde_aboutlabel OpenSuse 12.2
-%define tde_aboutpage /usr/share/doc/manual/opensuse-manuals_en/book.opensuse.startup.html
-%endif
-
-# OpenSuse 12.3 Theme
-%if "%{?suse_version}" == "1230"
-Requires:	wallpaper-branding
-%define tde_bg /usr/share/wallpapers/openSUSEdefault/contents/images/1600x1200.jpg
-Requires:	hicolor-icon-theme-branding
-%define tde_starticon /usr/share/icons/hicolor/scalable/apps/distributor.svg
-
-Requires:	opensuse-manuals_en
-%define tde_aboutlabel OpenSuse 12.3
-%define tde_aboutpage /usr/share/doc/manual/opensuse-manuals_en/book.opensuse.startup.html
-%endif
-
-BuildRequires:	cmake >= 2.8
-BuildRequires:	trinity-tqtinterface-devel >= %{version}
-BuildRequires:	trinity-arts-devel >= %{version}
-BuildRequires:	trinity-tdelibs-devel >= %{version}
-BuildRequires:	gcc-c++
-BuildRequires:	make
-BuildRequires:	qt%{?_qt_suffix}-devel
-BuildRequires:	openssl-devel
-BuildRequires:	audiofile-devel
-BuildRequires:	alsa-lib-devel
-BuildRequires:	libraw1394-devel
-BuildRequires:	libvorbis-devel
-BuildRequires:	glib2-devel
-BuildRequires:	pcre-devel
-
-# LIBUSB support
-BuildRequires:	pam-devel
-%if 0%{?mageia} || 0%{?mandriva} || 0%{?pclinuxos}
-BuildRequires:	%{_lib}usb1.0-devel
-BuildRequires:	%{_lib}usb-compat0.1-devel
-%else
-BuildRequires:	libusb-devel
-%endif
-
-# ESOUND support
-%if 0%{?rhel} || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version}
-%define with_esound 1
-BuildRequires:	esound-devel
-%endif
-
-# OPENLDAP support
-%if 0%{?suse_version}
-BuildRequires:	openldap2-devel
-%else
-BuildRequires:	openldap-devel
-%endif
-
-# SENSORS support
-%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel}
-BuildRequires:	lm_sensors-devel
-%endif
-%if 0%{?suse_version}
-BuildRequires:	libsensors4-devel
-%endif
-
-# TSAK support (requires libudev-devel)
-#  On RHEL5, udev is built statically, so TSAK cannot build.
-%if 0%{?fedora} >= 15 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 6 || 0%{?suse_version}
-%define with_tsak 1
-BuildRequires:	libudev-devel
-%endif
-
-# XRANDR support
-#  On RHEL5, xrandr library is too old.
-%if 0%{?fedora} >= 15 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 6 || 0%{?suse_version}
-%define with_xrandr 1
-%endif
-
-# XTEST support
-#  On RHEL4, xtest library is too old.
-%if 0%{?fedora} >= 15 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 5 || 0%{?suse_version}
-%define with_xtest 1
-%endif
-
-# HAL support
-#  On RHEL4, we do not use HAL (too old)
-%if 0%{?fedora} >= 15 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 5 || 0%{?suse_version}
-%define with_hal 1
-BuildRequires:	hal-devel >= 0.4.8
-%endif
-
-# OPENEXR support
-#  Disabled on RHEL4
-%if 0%{?fedora} >= 15 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 5 || 0%{?suse_version}
-%define with_exr 1
-BuildRequires:	OpenEXR-devel
-%endif
-
-# XSCREENSAVER support
-#  Disabled on RHEL4
-%if 0%{?fedora} >= 15 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 5 || 0%{?suse_version}
-%define with_xscreensaver 1
-%if 0%{?rhel} == 5
-BuildRequires:	xorg-x11-proto-devel
-BuildRequires:	gnome-screensaver
-%endif
-%if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires:	%{_lib}xscrnsaver%{?mgaversion:1}-devel
-%endif
-%if 0%{?fedora} || 0%{?rhel} >= 6 || 0%{?suse_version} >= 1220
-BuildRequires:	libXScrnSaver-devel
-%endif
-%if 0%{?suse_version} == 1140
-BuildRequires:	xscreensaver
-%endif
-%endif
-
-# AVAHI support
-#  Disabled on RHEL4 and RHEL5
-%if 0%{?fedora} >= 15 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 6 || 0%{?suse_version}
-BuildRequires:	trinity-avahi-tqt-devel
-Requires:		trinity-avahi-tqt
-%if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires:	%{_lib}avahi-client-devel
-Requires:		%{_lib}avahi-client3
-%else
-BuildRequires:	avahi-devel
-Requires:		avahi
-%endif
-%endif
-
-# NAS support
-# (what is nas btw ?)
-%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires:	nas-devel
-%endif
-
-# DBUS support
-#  TQT bindings not available for RHEL4
-%if 0%{?rhel} == 4
-# Dbus bindings were rebuilt with Qt support
-BuildRequires:	dbus-devel >= 0.22-12.EL.9p1
-Requires:		dbus-qt
-%else
-BuildRequires:	trinity-dbus-tqt-devel
-Requires:		trinity-dbus-tqt >= %{version}
-%endif
-
-%if 0%{?fedora} >= 17
-BuildRequires:	perl-Digest-MD5
-%endif
-
-# JACK support
-%if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires:	%{_lib}jack-devel
-%endif
-%if 0%{?fedora} || 0%{?rhel} >= 5
-BuildRequires:	jack-audio-connection-kit-devel
-%endif
-
-# LIBART support
-%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version} || 0%{?fedora} || 0%{?rhel} >= 5
-%define with_libart 1
-%if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires:	%{_lib}art_lgpl-devel
-%endif
-%if 0%{?suse_version} || 0%{?fedora} || 0%{?rhel}
-BuildRequires:	libart_lgpl-devel
-%endif
-%endif
-
-# SAMBA support
-%if 0%{?rhel} == 4
-BuildRequires:	samba-common
-%endif
-%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version}
-BuildRequires:	libsmbclient-devel
-%endif
-
-# IMAKE
-%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} >= 1220
-BuildRequires:	imake
-%endif
-
-# Distribution-specific package manager
-%if 0%{?rhel} >= 6 || 0%{?fedora}
-BuildRequires:	gnome-packagekit
-%endif
-
-# X11 stuff ...
-%if 0%{?rhel} == 4
-BuildRequires:	xorg-x11-devel
-%endif
-
-%if 0%{?suse_version} == 1140
-BuildRequires:	xorg-x11-libxkbfile-devel
-BuildRequires:	xorg-x11-libfontenc-devel
-%endif
-
-%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} >= 1220
-BuildRequires:	libxkbfile-devel
-BuildRequires:	libfontenc-devel
-%endif
-
-%if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires:	%{_lib}xcomposite%{?mgaversion:1}-devel
-BuildRequires:	%{_lib}xdamage-devel
-BuildRequires:	%{_lib}xdmcp%{?mgaversion:6}-devel
-BuildRequires:	%{_lib}xtst%{?mgaversion:6}-devel
-BuildRequires:	x11-font-util
-BuildRequires:	x11-proto-devel
-%endif
-
-%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version} >= 1220
-BuildRequires:	libXcomposite-devel
-BuildRequires:	libXdamage-devel
-BuildRequires:	libXdmcp-devel
-BuildRequires:	libXtst-devel
-BuildRequires:	xorg-x11-proto-devel
-%endif
-
-%if 0%{?rhel} >= 5 || 0%{?fedora}
-BuildRequires:	xorg-x11-font-utils
-%endif
-
-%if 0%{?suse_version} >= 1220
-BuildRequires:	font-util
-BuildRequires:	bdftopcf
-%endif
-
-# tdebase is a metapackage that installs all sub-packages
-Requires: %{name}-runtime-data-common = %{version}-%{release}
-Requires: %{name}-data = %{version}-%{release}
-Requires: %{name}-bin = %{version}-%{release}
-Requires: %{name}-tdeio-plugins = %{version}-%{release}
-Requires: %{name}-tdeio-pim-plugins = %{version}-%{release}
-Requires: trinity-kappfinder = %{version}-%{release}
-Requires: trinity-kate = %{version}-%{release}
-Requires: trinity-kwrite = %{version}-%{release}
-Requires: trinity-kcontrol = %{version}-%{release}
-Requires: trinity-kdepasswd = %{version}-%{release}
-Requires: trinity-tdeprint = %{version}-%{release}
-Requires: trinity-kdesktop = %{version}-%{release}
-Requires: trinity-tdm = %{version}-%{release}
-Requires: trinity-kfind = %{version}-%{release}
-Requires: trinity-khelpcenter = %{version}-%{release}
-Requires: trinity-kicker = %{version}-%{release}
-Requires: trinity-klipper = %{version}-%{release}
-Requires: trinity-kmenuedit = %{version}-%{release}
-Requires: trinity-konqueror = %{version}-%{release}
-Requires: trinity-konqueror-nsplugins = %{version}-%{release}
-Requires: trinity-konsole = %{version}-%{release}
-Requires: trinity-kpager = %{version}-%{release}
-Requires: trinity-kpersonalizer = %{version}-%{release}
-Requires: trinity-ksmserver = %{version}-%{release}
-Requires: trinity-ksplash = %{version}-%{release}
-Requires: trinity-ksysguard = %{version}-%{release}
-Requires: trinity-ksysguardd = %{version}-%{release}
-Requires: trinity-ktip = %{version}-%{release}
-Requires: trinity-twin = %{version}-%{release}
-Requires: trinity-libkonq = %{version}-%{release}
-Requires: %{name}-libtqt3-integration = %{version}-%{release}
-Requires: %{name}-tdeio-smb-plugin = %{version}-%{release}
- 
-Requires:	trinity-tqtinterface >= %{version}
-Requires:	trinity-arts >= %{version}
-Requires:	trinity-tdelibs >= %{version}
-Requires:	qt%{?_qt_suffix}
-Requires:	openssl
-
-
-# RHEL 6 Configuration files are provided in separate packages
-%if 0%{?rhel} || 0%{?fedora}
-%if "%{?tde_prefix}" == "/usr"
-Requires:	kde-settings-kdm
-%endif
-Requires:	redhat-menus
-%endif
-
-%if 0%{?suse_version}
-Requires:	desktop-data-openSUSE
-%endif
-
-%description
-TDE (the Trinity Desktop Environment) is a powerful Open Source graphical
-desktop environment for Unix workstations. It combines ease of use,
-contemporary functionality, and outstanding graphical design with the
-technological superiority of the Unix operating system.
-
-This metapackage includes the nucleus of TDE, namely the minimal package
-set necessary to run TDE as a desktop environment. This includes the
-window manager, taskbar, control center, a text editor, file manager,
-web browser, X terminal emulator, and many other programs and components.
-
-%files
-%defattr(-,root,root,-)
-%doc AUTHORS COPYING COPYING-DOCS README README.pam
-
-##########
-
-%package devel
-Summary:	%{summary} - Development files
-Group:		Development/Libraries
-Requires:	%{name} = %{version}-%{release}
-Requires:	trinity-tdelibs-devel
-
-Requires:	%{name}-bin-devel = %{version}-%{release}
-Requires:	trinity-kate-devel = %{version}-%{release}
-Requires:	trinity-kcontrol-devel = %{version}-%{release}
-Requires:	trinity-kdesktop-devel = %{version}-%{release}
-Requires:	trinity-kicker-devel = %{version}-%{release}
-Requires:	trinity-konqueror-devel = %{version}-%{release}
-Requires:	trinity-ksplash-devel = %{version}-%{release}
-Requires:	trinity-ksysguard-devel = %{version}-%{release}
-Requires:	trinity-libkonq-devel = %{version}-%{release}
-Requires:	trinity-tdm-devel = %{version}-%{release}
-Requires:	trinity-twin-devel = %{version}-%{release}
-
-Provides:	trinity-kdebase-devel = %{version}-%{release}
-Obsoletes:	trinity-kdebase-devel < %{version}-%{release}
-Provides:	tdebase-devel = %{version}-%{release}
-Obsoletes:	tdebase-devel < %{version}-%{release}
-
-Obsoletes:	trinity-kdebase-cmake < %{version}-%{release}
-Obsoletes:	tdebase-cmake < %{version}-%{release}
-
-%description devel
-This is a meta-package that installs all tdebase development packages.
-
-Header files for developing applications using %{name}.
-Install tdebase-devel if you want to develop or compile Konqueror,
-Kate plugins or KWin styles.
-
-%files devel
-%defattr(-,root,root,-)
-%{tde_datadir}/cmake/*.cmake
-
-##########
-
-%package tdeio-pim-plugins
-Summary:	PIM TDEIOslaves from %{name}
-Group:		Environment/Libraries
-
-Provides:	trinity-kdebase-pim-ioslaves = %{version}-%{release}
-Obsoletes:	trinity-kdebase-pim-ioslaves < %{version}-%{release}
-Provides:	tdebase-kio-pim-plugins = %{version}-%{release}
-Obsoletes:	tdebase-kio-pim-plugins < %{version}-%{release}
-Provides:	trinity-tdebase-kio-pim-plugins = %{version}-%{release}
-Obsoletes:	trinity-tdebase-kio-pim-plugins < %{version}-%{release}
-
-%description tdeio-pim-plugins
-Protocol handlers (TDEIOslaves) for personal information management, including:
- * kio_ldap
- * kio_nntp
- * kio_pop3
- * kio_smtp
-
-%files tdeio-pim-plugins
-%defattr(-,root,root,-)
-%{tde_tdelibdir}/kio_ldap.la
-%{tde_tdelibdir}/kio_ldap.so
-%{tde_tdelibdir}/kio_nntp.la
-%{tde_tdelibdir}/kio_nntp.so
-%{tde_tdelibdir}/kio_pop3.la
-%{tde_tdelibdir}/kio_pop3.so
-%{tde_tdelibdir}/kio_smtp.la
-%{tde_tdelibdir}/kio_smtp.so
-%{tde_datadir}/services/ldap.protocol
-%{tde_datadir}/services/ldaps.protocol
-%{tde_datadir}/services/nntp.protocol
-%{tde_datadir}/services/nntps.protocol
-%{tde_datadir}/services/pop3.protocol
-%{tde_datadir}/services/pop3s.protocol
-%{tde_datadir}/services/smtp.protocol
-%{tde_datadir}/services/smtps.protocol
-
-##########
-
-%package runtime-data-common
-Summary:	Shared common files for Trinity and KDE4
-Group:		Environment/Libraries
-
-Provides:	tdebase-runtime-data-common = %{version}-%{release}
-Obsoletes:	tdebase-runtime-data-common < %{version}-%{release}
-
-%description runtime-data-common
-Shared common files for both Trinity and KDE4
-Such as the desktop right-click-"Create New" list
-
-%files runtime-data-common
-%defattr(-,root,root,-)
-%{tde_datadir}/autostart/khotkeys.desktop
-%{tde_datadir}/desktop-directories/*
-%{tde_datadir}/icons/hicolor/*/apps/kxkb.png
-%{tde_datadir}/icons/hicolor/*/apps/knetattach.*
-%{tde_datadir}/icons/hicolor/*/apps/khotkeys.png
-%{tde_datadir}/icons/hicolor/*/apps/kmenuedit.png
-%{tde_datadir}/icons/hicolor/*/apps/ksplash.png
-%{tde_datadir}/locale/en_US/entry.desktop
-%{tde_datadir}/locale/l10n/*.desktop
-%{tde_datadir}/locale/l10n/*/entry.desktop
-%{tde_datadir}/locale/l10n/*/flag.png
-%{tde_datadir}/sounds/pop.wav
-%{tde_datadir}/templates
-
-%post runtime-data-common
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f}  2> /dev/null || :
-done
-
-%postun runtime-data-common
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f}  2> /dev/null || :
-done
-
-##########
-
-%package -n trinity-kappfinder
-Summary:	non-TDE application finder for TDE
-Group:		Applications/Utilities
-Requires:	%{name}-data = %{version}-%{release}
-
-%description -n trinity-kappfinder
-kappfinder searches your workstation for many common applications and
-creates menu entries for them.
-
-%files -n trinity-kappfinder
-%defattr(-,root,root,-)
-%{tde_bindir}/kappfinder
-%{tde_tdeappdir}/kappfinder.desktop
-%{tde_datadir}/applnk/System/kappfinder.desktop
-%{tde_datadir}/apps/kappfinder
-%{tde_datadir}/icons/hicolor/*/apps/kappfinder.png
-
-%post -n trinity-kappfinder
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f}  2> /dev/null || :
-done
-update-desktop-database %{tde_appdir} 2> /dev/null || : 
-
-%postun -n trinity-kappfinder
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f}  2> /dev/null || :
-done
-update-desktop-database %{tde_appdir} 2> /dev/null || : 
-
-##########
-
-%package -n trinity-libkateinterfaces
-Summary:	Common libraries used by kwrite and kate
-Group:		Environment/Libraries
-
-%description -n trinity-libkateinterfaces
-%{summary}
-
-%files -n trinity-libkateinterfaces
-%defattr(-,root,root,-)
-%{tde_libdir}/libkateinterfaces.so.*
-
-%post -n trinity-libkateinterfaces
-/sbin/ldconfig || :
-
-%postun -n trinity-libkateinterfaces
-/sbin/ldconfig || :
-
-##########
-
-%package -n trinity-kate
-Summary:	advanced text editor for TDE
-Group:		Applications/Text
-Requires:	%{name}-data = %{version}-%{release}
-Requires:	trinity-kwrite = %{version}-%{release}
-Requires:	trinity-libkateinterfaces = %{version}-%{release}
-
-%description -n trinity-kate
-Kate is a multi document editor, based on a rewritten version of the kwrite
-editing widget of TDE.
-
-It is a multi-view editor that lets you view several instances of the same
-document with all instances being synced, or view more files at the same
-time for easy reference or simultaneous editing. The terminal emulation
-and sidebar are docked windows that can be plugged out of the main window,
-or replaced therein according to your preference.
-
-Some random features:
-* Editing of big files
-* Extensible syntax highlighting
-* Folding
-* Dynamic word wrap
-* Selectable encoding
-* Filter command
-* Global grep dialog
-
-%files -n trinity-kate
-%defattr(-,root,root,-)
-%{tde_bindir}/kate
-%{tde_tdelibdir}/kate.la
-%{tde_tdelibdir}/kate.so
-%{tde_libdir}/libkateutils.so.*
-%{tde_libdir}/lib[kt]deinit_kate.la
-%{tde_libdir}/lib[kt]deinit_kate.so
-%{tde_tdeappdir}/kate.desktop
-%{tde_datadir}/apps/kate/
-%{tde_datadir}/apps/kconf_update/kate-2.4.upd
-%{_sysconfdir}/trinity/katerc
-%{tde_datadir}/icons/hicolor/*/apps/kate.png
-%{tde_datadir}/icons/hicolor/*/apps/kate2.svgz
-%{tde_datadir}/servicetypes/kateplugin.desktop
-%{tde_tdedocdir}/HTML/en/kate/
-
-%post -n trinity-kate
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f}  2> /dev/null || :
-done
-update-desktop-database %{tde_appdir} 2> /dev/null || : 
-/sbin/ldconfig || :
-
-%postun -n trinity-kate
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f}  2> /dev/null || :
-done
-update-desktop-database %{tde_appdir} 2> /dev/null || : 
-/sbin/ldconfig || :
-
-##########
-
-%package -n trinity-kate-devel
-Summary:	Development files for kate
-Group:		Development/Libraries
-Requires:	trinity-kate = %{version}-%{release}
-
-%description -n trinity-kate-devel
-%{summary}
-
-%files -n trinity-kate-devel
-%defattr(-,root,root,-)
-%{tde_tdeincludedir}/kate/
-%{tde_libdir}/libkateutils.so
-%{tde_libdir}/libkateutils.la
-%{tde_libdir}/libkateinterfaces.so
-%{tde_libdir}/libkateinterfaces.la
-
-%post -n trinity-kate-devel
-/sbin/ldconfig || :
-
-%postun -n trinity-kate-devel
-/sbin/ldconfig || :
-
-##########
-
-%package -n trinity-kwrite
-Summary:	advanced text editor for TDE
-Group:		Applications/Utilities
-Requires:	%{name}-data = %{version}-%{release}
-Requires:	trinity-libkateinterfaces = %{version}-%{release}
-
-%description -n trinity-kwrite
-Kwrite is a text editor for TDE.
-
-%files -n trinity-kwrite
-%defattr(-,root,root,-)
-%{tde_bindir}/kwrite
-%{tde_tdelibdir}/kwrite.la
-%{tde_tdelibdir}/kwrite.so
-%{tde_libdir}/lib[kt]deinit_kwrite.la
-%{tde_libdir}/lib[kt]deinit_kwrite.so
-%{tde_tdeappdir}/kwrite.desktop
-%{tde_datadir}/apps/kwrite/kwriteui.rc
-%{tde_datadir}/icons/hicolor/*/apps/kwrite.png
-%{tde_datadir}/icons/hicolor/*/apps/kwrite2.svgz
-%{tde_tdedocdir}/HTML/en/kwrite/
-
-
-%post -n trinity-kwrite
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f}  2> /dev/null || :
-done
-update-desktop-database %{tde_appdir} 2> /dev/null || : 
-
-%postun -n trinity-kwrite
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f}  2> /dev/null || :
-done
-update-desktop-database %{tde_appdir} 2> /dev/null || : 
-
-##########
-
-%package -n trinity-kcontrol
-Summary:	control center for TDE
-Group:		Applications/Utilities
-Requires:	%{name}-data = %{version}-%{release}
-
-# Requires 'usb.ids'
-Requires:	usbutils
-%if 0%{?suse_version} == 0
-Requires:	hwdata
-%endif
-
-%description -n trinity-kcontrol
-The Trinity Control Center provides you with a centralized and convenient
-way to configure all of your TDE settings.
-
-It is made up of multiple modules. Each module is a separate application,
-but the control center organizes all of these programs into a convenient
-location.
-
-In combination with udev KControl supports the advanced
-configuration of Logitech mice, though the user must be a member of the
-plugdev group.
-
-%files -n trinity-kcontrol
-%defattr(-,root,root,-)
-%{tde_bindir}/kaccess
-%{tde_bindir}/kcontrol
-%{tde_bindir}/kdeinstallktheme
-%{tde_bindir}/keditfiletype
-%{tde_bindir}/kfontinst
-%{tde_bindir}/kfontview
-%{tde_bindir}/kinfocenter
-%{tde_bindir}/klocaldomainurifilterhelper
-%{tde_bindir}/krdb
-%{tde_tdelibdir}/fontthumbnail.la
-%{tde_tdelibdir}/fontthumbnail.so
-%{tde_tdelibdir}/kaccess.la
-%{tde_tdelibdir}/kaccess.so
-%{tde_tdelibdir}/kcm_access.la
-%{tde_tdelibdir}/kcm_access.so
-%{tde_tdelibdir}/kcm_arts.la
-%{tde_tdelibdir}/kcm_arts.so
-%{tde_tdelibdir}/kcm_background.la
-%{tde_tdelibdir}/kcm_background.so
-%{tde_tdelibdir}/kcm_bell.la
-%{tde_tdelibdir}/kcm_bell.so
-%{tde_tdelibdir}/kcm_clock.la
-%{tde_tdelibdir}/kcm_clock.so
-%{tde_tdelibdir}/kcm_colors.la
-%{tde_tdelibdir}/kcm_colors.so
-%{tde_tdelibdir}/kcm_componentchooser.la
-%{tde_tdelibdir}/kcm_componentchooser.so
-%{tde_tdelibdir}/kcm_crypto.la
-%{tde_tdelibdir}/kcm_crypto.so
-%{tde_tdelibdir}/kcm_css.la
-%{tde_tdelibdir}/kcm_css.so
-%{tde_tdelibdir}/kcm_display.la
-%{tde_tdelibdir}/kcm_display.so
-%{tde_tdelibdir}/kcm_energy.la
-%{tde_tdelibdir}/kcm_energy.so
-%{tde_tdelibdir}/kcm_filetypes.la
-%{tde_tdelibdir}/kcm_filetypes.so
-%{tde_tdelibdir}/kcm_fontinst.la
-%{tde_tdelibdir}/kcm_fontinst.so
-%{tde_tdelibdir}/kcm_fonts.la
-%{tde_tdelibdir}/kcm_fonts.so
-#%{tde_tdelibdir}/kcm_hwmanager.la
-#%{tde_tdelibdir}/kcm_hwmanager.so
-%{tde_tdelibdir}/kcm_icons.la
-%{tde_tdelibdir}/kcm_icons.so
-%{tde_tdelibdir}/kcm_info.la
-%{tde_tdelibdir}/kcm_info.so
-%{tde_tdelibdir}/kcm_input.la
-%{tde_tdelibdir}/kcm_input.so
-%{tde_tdelibdir}/kcm_ioslaveinfo.la
-%{tde_tdelibdir}/kcm_ioslaveinfo.so
-%{tde_tdelibdir}/kcm_joystick.la
-%{tde_tdelibdir}/kcm_joystick.so
-%{tde_tdelibdir}/kcm_kded.la
-%{tde_tdelibdir}/kcm_kded.so
-%{tde_tdelibdir}/kcm_[kt]dm.la
-%{tde_tdelibdir}/kcm_[kt]dm.so
-%{tde_tdelibdir}/kcm_kdnssd.so
-%{tde_tdelibdir}/kcm_kdnssd.la
-%{tde_tdelibdir}/kcm_keys.la
-%{tde_tdelibdir}/kcm_keys.so
-%{tde_tdelibdir}/kcm_kicker.la
-%{tde_tdelibdir}/kcm_kicker.so
-%{tde_tdelibdir}/kcm_kio.la
-%{tde_tdelibdir}/kcm_kio.so
-%{tde_tdelibdir}/kcm_knotify.la
-%{tde_tdelibdir}/kcm_knotify.so
-%{tde_tdelibdir}/kcm_konqhtml.la
-%{tde_tdelibdir}/kcm_konqhtml.so
-%{tde_tdelibdir}/kcm_konq.la
-%{tde_tdelibdir}/kcm_konq.so
-%{tde_tdelibdir}/kcm_kthememanager.la
-%{tde_tdelibdir}/kcm_kthememanager.so
-%{tde_tdelibdir}/kcm_kurifilt.la
-%{tde_tdelibdir}/kcm_kurifilt.so
-%{tde_tdelibdir}/kcm_launch.la
-%{tde_tdelibdir}/kcm_launch.so
-%{tde_tdelibdir}/kcm_locale.la
-%{tde_tdelibdir}/kcm_locale.so
-%{tde_tdelibdir}/kcm_nic.la
-%{tde_tdelibdir}/kcm_nic.so
-%{tde_tdelibdir}/kcm_performance.la
-%{tde_tdelibdir}/kcm_performance.so
-%{tde_tdelibdir}/kcm_privacy.la
-%{tde_tdelibdir}/kcm_privacy.so
-%{tde_tdelibdir}/kcm_screensaver.la
-%{tde_tdelibdir}/kcm_screensaver.so
-%{tde_tdelibdir}/kcm_smserver.la
-%{tde_tdelibdir}/kcm_smserver.so
-%{tde_tdelibdir}/kcm_spellchecking.la
-%{tde_tdelibdir}/kcm_spellchecking.so
-%{tde_tdelibdir}/kcm_style.la
-%{tde_tdelibdir}/kcm_style.so
-%{tde_tdelibdir}/kcm_taskbar.la
-%{tde_tdelibdir}/kcm_taskbar.so
-%{tde_tdelibdir}/kcm_usb.la
-%{tde_tdelibdir}/kcm_usb.so
-%{tde_tdelibdir}/kcm_view1394.la
-%{tde_tdelibdir}/kcm_view1394.so
-%{tde_tdelibdir}/kcm_xinerama.la
-%{tde_tdelibdir}/kcm_xinerama.so
-%{tde_tdelibdir}/kcontrol.la
-%{tde_tdelibdir}/kcontrol.so
-%{tde_tdelibdir}/kfile_font.la
-%{tde_tdelibdir}/kfile_font.so
-%{tde_tdelibdir}/kio_fonts.la
-%{tde_tdelibdir}/kio_fonts.so
-%{tde_tdelibdir}/kstyle_keramik_config.la
-%{tde_tdelibdir}/kstyle_keramik_config.so
-%{tde_tdelibdir}/libkfontviewpart.la
-%{tde_tdelibdir}/libkfontviewpart.so
-%{tde_tdelibdir}/libkshorturifilter.la
-%{tde_tdelibdir}/libkshorturifilter.so
-%{tde_tdelibdir}/libkuriikwsfilter.la
-%{tde_tdelibdir}/libkuriikwsfilter.so
-%{tde_tdelibdir}/libkurisearchfilter.la
-%{tde_tdelibdir}/libkurisearchfilter.so
-%{tde_tdelibdir}/liblocaldomainurifilter.la
-%{tde_tdelibdir}/liblocaldomainurifilter.so
-%{tde_libdir}/lib[kt]deinit_kaccess.la
-%{tde_libdir}/lib[kt]deinit_kaccess.so
-%{tde_libdir}/lib[kt]deinit_kcontrol.la
-%{tde_libdir}/lib[kt]deinit_kcontrol.so
-%{tde_libdir}/libkfontinst.so.*
-%{tde_tdeappdir}/arts.desktop
-%{tde_tdeappdir}/background.desktop
-%{tde_tdeappdir}/bell.desktop
-%{tde_tdeappdir}/cache.desktop
-%{tde_tdeappdir}/cdinfo.desktop
-%{tde_tdeappdir}/clock.desktop
-%{tde_tdeappdir}/colors.desktop
-%{tde_tdeappdir}/componentchooser.desktop
-%{tde_tdeappdir}/cookies.desktop
-%{tde_tdeappdir}/crypto.desktop
-%{tde_tdeappdir}/desktopbehavior.desktop
-%{tde_tdeappdir}/desktop.desktop
-%{tde_tdeappdir}/desktoppath.desktop
-%{tde_tdeappdir}/devices.desktop
-%{tde_tdeappdir}/display.desktop
-%{tde_tdeappdir}/dma.desktop
-%{tde_tdeappdir}/ebrowsing.desktop
-%{tde_tdeappdir}/filebrowser.desktop
-%{tde_tdeappdir}/filetypes.desktop
-%{tde_tdeappdir}/fonts.desktop
-#%{tde_tdeappdir}/hwmanager.desktop
-%{tde_tdeappdir}/icons.desktop
-%{tde_tdeappdir}/installktheme.desktop
-%{tde_tdeappdir}/interrupts.desktop
-%{tde_tdeappdir}/ioports.desktop
-%{tde_tdeappdir}/ioslaveinfo.desktop
-%{tde_tdeappdir}/joystick.desktop
-%{tde_tdeappdir}/kcm_kdnssd.desktop
-%{tde_tdeappdir}/kcmaccess.desktop
-%{tde_tdeappdir}/kcmcss.desktop
-%{tde_tdeappdir}/kcmfontinst.desktop
-%{tde_tdeappdir}/kcmkded.desktop
-%{tde_tdeappdir}/kcmlaunch.desktop
-%{tde_tdeappdir}/kcmnotify.desktop
-%{tde_tdeappdir}/kcmperformance.desktop
-%{tde_tdeappdir}/kcmsmserver.desktop
-%{tde_tdeappdir}/kcmtaskbar.desktop
-%{tde_tdeappdir}/kcmusb.desktop
-%{tde_tdeappdir}/kcmview1394.desktop
-%{tde_tdeappdir}/KControl.desktop
-%{tde_tdeappdir}/[kt]dm.desktop
-%{tde_tdeappdir}/keys.desktop
-%{tde_tdeappdir}/kfontview.desktop
-%{tde_tdeappdir}/khtml_behavior.desktop
-%{tde_tdeappdir}/khtml_fonts.desktop
-%{tde_tdeappdir}/khtml_java_js.desktop
-%{tde_tdeappdir}/kinfocenter.desktop
-%{tde_tdeappdir}/kthememanager.desktop
-%{tde_tdeappdir}/lanbrowser.desktop
-%{tde_tdeappdir}/language.desktop
-%{tde_tdeappdir}/media.desktop
-%{tde_tdeappdir}/memory.desktop
-%{tde_tdeappdir}/mouse.desktop
-%{tde_tdeappdir}/netpref.desktop
-%{tde_tdeappdir}/nic.desktop
-%{tde_tdeappdir}/opengl.desktop
-%{tde_tdeappdir}/panel_appearance.desktop
-%{tde_tdeappdir}/panel.desktop
-%{tde_tdeappdir}/partitions.desktop
-%{tde_tdeappdir}/pci.desktop
-%{tde_tdeappdir}/privacy.desktop
-%{tde_tdeappdir}/processor.desktop
-%{tde_tdeappdir}/proxy.desktop
-%{tde_tdeappdir}/screensaver.desktop
-%{tde_tdeappdir}/scsi.desktop
-%{tde_tdeappdir}/smbstatus.desktop
-%{tde_tdeappdir}/sound.desktop
-%{tde_tdeappdir}/spellchecking.desktop
-%{tde_tdeappdir}/style.desktop
-%{tde_tdeappdir}/useragent.desktop
-%{tde_tdeappdir}/xserver.desktop
-%{tde_datadir}/applnk/.hidden/energy.desktop
-%{tde_datadir}/applnk/.hidden/fileappearance.desktop
-%{tde_datadir}/applnk/.hidden/filebehavior.desktop
-%{tde_datadir}/applnk/.hidden/filepreviews.desktop
-%{tde_datadir}/applnk/.hidden/kcmkonqyperformance.desktop
-%{tde_datadir}/applnk/.hidden/kicker_config_appearance.desktop
-%{tde_datadir}/applnk/.hidden/kicker_config.desktop
-%{tde_datadir}/applnk/.hidden/smb.desktop
-%{tde_datadir}/applnk/.hidden/xinerama.desktop
-%{tde_datadir}/applnk/Settings/LookNFeel/
-%{tde_datadir}/applnk/Settings/WebBrowsing/khtml_appearance.desktop
-%{tde_datadir}/applnk/Settings/WebBrowsing/nsplugin.desktop
-%{tde_datadir}/applnk/Settings/WebBrowsing/smb.desktop
-%{tde_datadir}/apps/kcm_componentchooser/kcm_browser.desktop
-%{tde_datadir}/apps/kcm_componentchooser/kcm_kemail.desktop
-%{tde_datadir}/apps/kcm_componentchooser/kcm_terminal.desktop
-%{tde_datadir}/apps/konqsidebartng/virtual_folders/services/fonts.desktop
-%{tde_datadir}/apps/konqueror/servicemenus/installfont.desktop
-%{tde_datadir}/mimelnk/application/x-ktheme.desktop
-%{tde_datadir}/mimelnk/fonts/folder.desktop
-%{tde_datadir}/mimelnk/fonts/package.desktop
-%{tde_datadir}/mimelnk/fonts/system-folder.desktop
-%{tde_datadir}/services/fonts.protocol
-%{tde_datadir}/services/fontthumbnail.desktop
-%{tde_datadir}/services/kaccess.desktop
-%{tde_datadir}/services/kfile_font.desktop
-%{tde_datadir}/services/kfontviewpart.desktop
-%{tde_datadir}/services/kshorturifilter.desktop
-%{tde_datadir}/services/kuriikwsfilter.desktop
-%{tde_datadir}/services/kurisearchfilter.desktop
-%{tde_datadir}/services/localdomainurifilter.desktop
-
-%{tde_datadir}/apps/usb.ids
-%{tde_datadir}/apps/kcmview1394/oui.db
-
-# The following features are not compiled under RHEL 5 and older
-%if 0%{?rhel} >= 6 || 0%{?fedora} >= 15 || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version}
-%{tde_bindir}/krandrtray
-%{tde_tdelibdir}/kcm_displayconfig.la
-%{tde_tdelibdir}/kcm_displayconfig.so
-%{tde_tdelibdir}/kcm_iccconfig.la
-%{tde_tdelibdir}/kcm_iccconfig.so
-%{tde_tdelibdir}/kcm_randr.la
-%{tde_tdelibdir}/kcm_randr.so
-%{tde_tdeappdir}/displayconfig.desktop
-%{tde_tdeappdir}/iccconfig.desktop
-%{tde_tdeappdir}/krandrtray.desktop
-%{tde_datadir}/applnk/.hidden/randr.desktop
-%{tde_datadir}/autostart/krandrtray-autostart.desktop
-%endif
-
-%post -n trinity-kcontrol
-/sbin/ldconfig || :
-update-desktop-database %{tde_appdir} 2> /dev/null || : 
-
-%postun -n trinity-kcontrol
-/sbin/ldconfig || :
-update-desktop-database %{tde_appdir} 2> /dev/null || : 
-
-##########
-
-%package -n trinity-kcontrol-devel
-Summary:	Development files for kcontrol
-Group:		Development/Libraries
-Requires:	trinity-kcontrol = %{version}-%{release}
-
-%description -n trinity-kcontrol-devel
-%{summary}
-
-%files -n trinity-kcontrol-devel
-%defattr(-,root,root,-)
-%{tde_libdir}/libkfontinst.la
-%{tde_libdir}/libkfontinst.so
-
-%post -n trinity-kcontrol-devel
-/sbin/ldconfig || :
-
-%postun -n trinity-kcontrol-devel
-/sbin/ldconfig || :
-
-##########
-
-%package bin
-Summary:	core binaries for the TDE base module
-Group:		Applications/Utilities
-Requires:	%{name}-data = %{version}-%{release}
-Requires:	pam
-
-Provides:	tdebase-bin = %{version}-%{release}
-Obsoletes:	tdebase-bin < %{version}-%{release}
-
-%description bin
-This package contains miscellaneous programs needed by other
-TDE applications, particularly those in the TDE base module.
-
-%files bin
-%defattr(-,root,root,-)
-%{tde_bindir}/krootbacking
-#%{tde_bindir}/tdeinit_phase1
-%if 0%{?with_tsak}
-%attr(4511,root,root) %{tde_bindir}/[kt]dmtsak
-%{tde_bindir}/tsak
-%endif
-%{tde_bindir}/kdebugdialog
-%{tde_bindir}/kreadconfig
-%{tde_bindir}/kwriteconfig
-%{tde_bindir}/kstart
-%{_sysconfdir}/trinity/kxkb_groups
-%{tde_bindir}/drkonqi
-%{tde_bindir}/crashtest
-%{tde_bindir}/kapplymousetheme
-%{tde_bindir}/kblankscrn.kss
-%attr(4755,root,root) %{tde_bindir}/kcheckpass
-%{tde_bindir}/kcminit
-%{tde_bindir}/kcminit_startup
-%{tde_bindir}/kdcop
-%{tde_bindir}/[kt]desu
-%attr(0755,root,root) %{tde_bindir}/[kt]desud
-%{tde_bindir}/kdialog
-%{tde_bindir}/khotkeys
-%{tde_bindir}/knetattach
-%{tde_bindir}/krandom.kss
-%{tde_bindir}/ksystraycmd
-%{tde_bindir}/kxkb
-%{tde_libdir}/kconf_update_bin/khotkeys_update
-%{tde_tdelibdir}/kcminit.la
-%{tde_tdelibdir}/kcminit.so
-%{tde_tdelibdir}/kcminit_startup.la
-%{tde_tdelibdir}/kcminit_startup.so
-%{tde_tdelibdir}/kcm_keyboard.la
-%{tde_tdelibdir}/kcm_keyboard.so
-%{tde_tdelibdir}/kcm_khotkeys_init.la
-%{tde_tdelibdir}/kcm_khotkeys_init.so
-%{tde_tdelibdir}/kcm_khotkeys.la
-%{tde_tdelibdir}/kcm_khotkeys.so
-%{tde_tdelibdir}/kded_khotkeys.la
-%{tde_tdelibdir}/kded_khotkeys.so
-%{tde_tdelibdir}/kgreet_classic.la
-%{tde_tdelibdir}/kgreet_classic.so
-%{tde_tdelibdir}/kgreet_winbind.la
-%{tde_tdelibdir}/kgreet_winbind.so
-%{tde_tdelibdir}/khotkeys.la
-%{tde_tdelibdir}/khotkeys.so
-%{tde_tdelibdir}/khotkeys_arts.la
-%{tde_tdelibdir}/khotkeys_arts.so
-%{tde_tdelibdir}/kxkb.la
-%{tde_tdelibdir}/kxkb.so
-%{tde_libdir}/lib[kt]deinit_kcminit.la
-%{tde_libdir}/lib[kt]deinit_kcminit.so
-%{tde_libdir}/lib[kt]deinit_kcminit_startup.la
-%{tde_libdir}/lib[kt]deinit_kcminit_startup.so
-%{tde_libdir}/lib[kt]deinit_khotkeys.la
-%{tde_libdir}/lib[kt]deinit_khotkeys.so
-%{tde_libdir}/lib[kt]deinit_kxkb.la
-%{tde_libdir}/lib[kt]deinit_kxkb.so
-%{tde_libdir}/libkhotkeys_shared.so.*
-%{tde_tdeappdir}/keyboard.desktop
-%{tde_tdeappdir}/keyboard_layout.desktop
-%{tde_tdeappdir}/khotkeys.desktop
-%{tde_tdeappdir}/knetattach.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/
-%{tde_datadir}/apps/drkonqi/
-%{tde_datadir}/apps/kconf_update/khotkeys_32b1_update.upd
-%{tde_datadir}/apps/kconf_update/khotkeys_printscreen.upd
-%{tde_datadir}/apps/kconf_update/konqueror_gestures_trinity21_update.upd
-%{tde_datadir}/apps/kdcop/kdcopui.rc
-%{tde_datadir}/apps/khotkeys/
-%{tde_datadir}/services/kded/khotkeys.desktop
-%{tde_datadir}/services/kxkb.desktop
-%if 0%{?suse_version} == 0
-%{_sysconfdir}/pam.d/kcheckpass-trinity
-%{_sysconfdir}/pam.d/kscreensaver-trinity
-%endif
-%{tde_tdedocdir}/HTML/en/kdcop/
-%{tde_tdedocdir}/HTML/en/kdebugdialog//
-%{tde_tdedocdir}/HTML/en/[kt]desu/
-%{tde_tdedocdir}/HTML/en/knetattach/
-%{tde_tdedocdir}/HTML/en/kxkb/
-
-%post bin
-/sbin/ldconfig || :
-update-desktop-database %{tde_appdir} 2> /dev/null || : 
-
-%postun bin
-/sbin/ldconfig || :
-update-desktop-database %{tde_appdir} 2> /dev/null || : 
-
-##########
-
-%package bin-devel
-Summary:	Development files for core binaries for the TDE base module
-Group:		Development/Libraries
-Requires:	%{name}-bin = %{version}-%{release}
-
-Obsoletes:	tdebase-bin-devel < %{version}-%{release}
-Provides:	tdebase-bin-devel = %{version}-%{release}
-
-%description bin-devel
-%{summary}
-
-%files bin-devel
-%defattr(-,root,root,-)
-%{tde_libdir}/libkhotkeys_shared.la
-%{tde_libdir}/libkhotkeys_shared.so
-
-%post bin-devel
-/sbin/ldconfig || :
-
-%postun bin-devel
-/sbin/ldconfig || :
-
-##########
-
-%package data
-Summary:	shared data files for the TDE base module
-Group:		Environment/Libraries
-Requires:	%{name}-runtime-data-common = %{version}-%{release}
-
-Obsoletes:	tdebase-data < %{version}-%{release}
-Provides:	tdebase-data = %{version}-%{release}
-
-%description data
-This package contains the architecture-independent shared data files
-needed for a basic TDE desktop installation.
-
-%files data
-%defattr(-,root,root,-)
-%{_sysconfdir}/trinity/kshorturifilterrc
-%{tde_datadir}/applnk/.hidden/battery.desktop
-%{tde_datadir}/applnk/.hidden/bwarning.desktop
-%{tde_datadir}/applnk/.hidden/cwarning.desktop
-%{tde_datadir}/applnk/.hidden/.directory
-%{tde_datadir}/applnk/.hidden/email.desktop
-%{tde_datadir}/applnk/.hidden/kcmkonq.desktop
-%{tde_datadir}/applnk/.hidden/kcmkxmlrpcd.desktop
-%{tde_datadir}/applnk/.hidden/konqhtml.desktop
-%{tde_datadir}/applnk/.hidden/passwords.desktop
-%{tde_datadir}/applnk/.hidden/power.desktop
-%{tde_datadir}/applnk/.hidden/socks.desktop
-%{tde_datadir}/applnk/.hidden/userinfo.desktop
-%{tde_datadir}/applnk/.hidden/virtualdesktops.desktop
-%{tde_datadir}/apps/kaccess/eventsrc
-%{tde_datadir}/apps/kcmcss/template.css
-%{tde_datadir}/apps/kcminput/
-%{tde_datadir}/apps/kcmkeys/
-%{tde_datadir}/apps/kcmlocale/pics/background.png
-%{tde_datadir}/apps/kconf_update/convertShortcuts.pl
-%{tde_datadir}/apps/kconf_update/kaccel.upd
-%{tde_datadir}/apps/kconf_update/kcmdisplayrc.upd
-%{tde_datadir}/apps/kconf_update/kuriikwsfilter.upd
-%{tde_datadir}/apps/kconf_update/mouse_cursor_theme.upd
-%{tde_datadir}/apps/kconf_update/socks.upd
-%{tde_datadir}/apps/kcontrol/
-%{tde_datadir}/apps/kdisplay/
-%{tde_datadir}/apps/kfontview/
-%{tde_datadir}/apps/kinfocenter/kinfocenterui.rc
-%{tde_datadir}/apps/kthememanager/themes/*
-%{tde_datadir}/icons/crystalsvg/*/apps/access.png
-%{tde_datadir}/icons/crystalsvg/*/apps/acroread.png
-%{tde_datadir}/icons/crystalsvg/*/apps/applixware.png
-%{tde_datadir}/icons/crystalsvg/*/apps/arts.png
-%{tde_datadir}/icons/crystalsvg/*/apps/background.png
-%{tde_datadir}/icons/crystalsvg/*/apps/bell.png
-%{tde_datadir}/icons/crystalsvg/*/apps/cache.png
-%{tde_datadir}/icons/crystalsvg/*/apps/clanbomber.png
-%{tde_datadir}/icons/crystalsvg/*/apps/clock.png
-%{tde_datadir}/icons/crystalsvg/*/apps/colors.png
-%{tde_datadir}/icons/crystalsvg/*/apps/date.png
-%{tde_datadir}/icons/crystalsvg/*/apps/email.png
-%{tde_datadir}/icons/crystalsvg/*/apps/energy.png
-%{tde_datadir}/icons/crystalsvg/*/apps/energy_star.png
-%{tde_datadir}/icons/crystalsvg/*/apps/filetypes.png
-%{tde_datadir}/icons/crystalsvg/*/apps/fonts.png
-%{tde_datadir}/icons/crystalsvg/*/apps/gimp.png
-%{tde_datadir}/icons/crystalsvg/*/apps/help_index.png
-%{tde_datadir}/icons/crystalsvg/*/apps/hwinfo.png
-%{tde_datadir}/icons/crystalsvg/*/apps/kcmdevices.png
-%{tde_datadir}/icons/crystalsvg/*/apps/kcmdf.png
-%{tde_datadir}/icons/crystalsvg/*/apps/kcmkwm.png
-%{tde_datadir}/icons/crystalsvg/*/apps/kcmmemory.png
-%{tde_datadir}/icons/crystalsvg/*/apps/kcmpartitions.png
-%{tde_datadir}/icons/crystalsvg/*/apps/kcmpci.png
-%{tde_datadir}/icons/crystalsvg/*/apps/kcontrol.png
-%{tde_datadir}/icons/crystalsvg/*/apps/[kt]dmconfig.png
-%{tde_datadir}/icons/crystalsvg/*/apps/key_bindings.png
-%{tde_datadir}/icons/crystalsvg/*/apps/kfm_home.png
-%{tde_datadir}/icons/crystalsvg/*/apps/kscreensaver.png
-%{tde_datadir}/icons/crystalsvg/*/apps/kthememgr.png
-%{tde_datadir}/icons/crystalsvg/*/apps/licq.png
-%{tde_datadir}/icons/crystalsvg/*/apps/linuxconf.png
-%{tde_datadir}/icons/crystalsvg/*/apps/locale.png
-%{tde_datadir}/icons/crystalsvg/*/apps/looknfeel.png
-%{tde_datadir}/icons/crystalsvg/*/apps/multimedia.png
-%{tde_datadir}/icons/crystalsvg/*/apps/netscape.png
-%{tde_datadir}/icons/crystalsvg/*/apps/package_applications.png
-%{tde_datadir}/icons/crystalsvg/*/apps/package_development.png
-%{tde_datadir}/icons/crystalsvg/*/apps/package_favourite.png
-%{tde_datadir}/icons/crystalsvg/*/apps/package_games.png
-%{tde_datadir}/icons/crystalsvg/*/apps/package_games_kids.png
-%{tde_datadir}/icons/crystalsvg/*/apps/package_multimedia.png
-%{tde_datadir}/icons/crystalsvg/*/apps/package_network.png
-%{tde_datadir}/icons/crystalsvg/*/apps/package.png
-%{tde_datadir}/icons/crystalsvg/*/apps/package_settings.png
-%{tde_datadir}/icons/crystalsvg/*/apps/package_toys.png
-%{tde_datadir}/icons/crystalsvg/*/apps/package_utilities.png
-%{tde_datadir}/icons/crystalsvg/*/apps/penguin.png
-%{tde_datadir}/icons/crystalsvg/*/apps/personal.png
-%{tde_datadir}/icons/crystalsvg/*/apps/phppg.png
-%{tde_datadir}/icons/crystalsvg/*/apps/proxy.png
-%{tde_datadir}/icons/crystalsvg/*/apps/pysol.png
-%{tde_datadir}/icons/crystalsvg/*/apps/randr.png
-%{tde_datadir}/icons/crystalsvg/*/apps/samba.png
-%{tde_datadir}/icons/crystalsvg/*/apps/staroffice.png
-%{tde_datadir}/icons/crystalsvg/*/apps/stylesheet.png
-%{tde_datadir}/icons/crystalsvg/*/apps/terminal.png
-%{tde_datadir}/icons/crystalsvg/*/apps/tux.png
-%{tde_datadir}/icons/crystalsvg/*/apps/wp.png
-%{tde_datadir}/icons/crystalsvg/*/apps/xclock.png
-%{tde_datadir}/icons/crystalsvg/*/apps/xfmail.png
-%{tde_datadir}/icons/crystalsvg/*/apps/xmag.png
-%{tde_datadir}/icons/crystalsvg/*/apps/xpaint.png
-%{tde_datadir}/icons/crystalsvg/scalable/apps/access.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/acroread.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/aim.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/aktion.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/antivirus.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/applixware.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/arts.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/background.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/bell.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/browser.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/cache.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/camera.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/clanbomber.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/clock.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/colors.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/core.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/date.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/display.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/download_manager.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/email.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/energy.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/error.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/fifteenpieces.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/filetypes.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/fonts.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/galeon.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/gnome_apps.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/hardware.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/hwinfo.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/ieee1394.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/kcmdevices.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/kcmkwm.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/kcmx.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/locale.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/my_mac.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/netscape.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/openoffice.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/package_development.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/package_games_kids.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/package_toys.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/penguin.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/personal.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/quicktime.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/realplayer.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/samba.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/shell.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/staroffice.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/stylesheet.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/terminal.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/tux.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/wine.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/x.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/xapp.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/xcalc.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/xchat.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/xclock.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/xeyes.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/xpaint.svgz
-%{tde_datadir}/icons/crystalsvg/*/devices/laptop.png
-%{tde_datadir}/icons/crystalsvg/*/devices/laptop.svgz
-%{tde_datadir}/icons/crystalsvg/*/actions/newfont.png
-%{tde_datadir}/icons/crystalsvg/*/apps/abiword.png
-%{tde_datadir}/icons/crystalsvg/*/apps/agent.png
-%{tde_datadir}/icons/crystalsvg/*/apps/alevt.png
-%{tde_datadir}/icons/crystalsvg/*/apps/assistant.png
-%{tde_datadir}/icons/crystalsvg/*/apps/blender.png
-%{tde_datadir}/icons/crystalsvg/*/apps/bluefish.png
-%{tde_datadir}/icons/crystalsvg/*/apps/cookie.png
-%{tde_datadir}/icons/crystalsvg/*/apps/designer.png
-%{tde_datadir}/icons/crystalsvg/*/apps/dia.png
-%{tde_datadir}/icons/crystalsvg/*/apps/dlgedit.png
-%{tde_datadir}/icons/crystalsvg/*/apps/eclipse.png
-%{tde_datadir}/icons/crystalsvg/*/apps/edu_languages.png
-%{tde_datadir}/icons/crystalsvg/*/apps/edu_mathematics.png
-%{tde_datadir}/icons/crystalsvg/*/apps/edu_miscellaneous.png
-%{tde_datadir}/icons/crystalsvg/*/apps/edu_science.png
-%{tde_datadir}/icons/crystalsvg/*/apps/emacs.png
-%{tde_datadir}/icons/crystalsvg/*/apps/enhanced_browsing.png
-%{tde_datadir}/icons/crystalsvg/*/apps/evolution.png
-%{tde_datadir}/icons/crystalsvg/*/apps/fifteenpieces.png
-%{tde_datadir}/icons/crystalsvg/*/apps/gabber.png
-%{tde_datadir}/icons/crystalsvg/*/apps/gaim.png
-%{tde_datadir}/icons/crystalsvg/*/apps/gnome_apps.png
-%{tde_datadir}/icons/crystalsvg/*/apps/gnomemeeting.png
-%{tde_datadir}/icons/crystalsvg/*/apps/gnucash.png
-%{tde_datadir}/icons/crystalsvg/*/apps/gnumeric.png
-%{tde_datadir}/icons/crystalsvg/*/apps/gv.png
-%{tde_datadir}/icons/crystalsvg/*/apps/gvim.png
-%{tde_datadir}/icons/crystalsvg/*/apps/icons.png
-%{tde_datadir}/icons/crystalsvg/*/apps/iconthemes.png
-%{tde_datadir}/icons/crystalsvg/*/apps/ieee1394.png
-%{tde_datadir}/icons/crystalsvg/*/apps/input_devices_settings.png
-%{tde_datadir}/icons/crystalsvg/*/apps/kcmkicker.png
-%{tde_datadir}/icons/crystalsvg/*/apps/kcmmidi.png
-%{tde_datadir}/icons/crystalsvg/*/apps/kcmprocessor.png
-%{tde_datadir}/icons/crystalsvg/*/apps/kcmscsi.png
-%{tde_datadir}/icons/crystalsvg/*/apps/kcmsound.png
-%{tde_datadir}/icons/crystalsvg/*/apps/kcmsystem.png
-%{tde_datadir}/icons/crystalsvg/*/apps/kcmx.png
-%{tde_datadir}/icons/crystalsvg/*/apps/keyboard.png
-%{tde_datadir}/icons/crystalsvg/*/apps/keyboard_layout.png
-%{tde_datadir}/icons/crystalsvg/*/apps/knotify.png
-%{tde_datadir}/icons/crystalsvg/*/apps/kvirc.png
-%{tde_datadir}/icons/crystalsvg/*/apps/linguist.png
-%{tde_datadir}/icons/crystalsvg/*/apps/lyx.png
-%{tde_datadir}/icons/crystalsvg/*/apps/mac.png
-%{tde_datadir}/icons/crystalsvg/*/apps/mathematica.png
-%{tde_datadir}/icons/crystalsvg/*/apps/nedit.png
-%{tde_datadir}/icons/crystalsvg/*/apps/opera.png
-%{tde_datadir}/icons/crystalsvg/*/apps/package_application.png
-%{tde_datadir}/icons/crystalsvg/*/apps/package_editors.png
-%{tde_datadir}/icons/crystalsvg/*/apps/package_edutainment.png
-%{tde_datadir}/icons/crystalsvg/*/apps/package_games_arcade.png
-%{tde_datadir}/icons/crystalsvg/*/apps/package_games_board.png
-%{tde_datadir}/icons/crystalsvg/*/apps/package_games_card.png
-%{tde_datadir}/icons/crystalsvg/*/apps/package_games_strategy.png
-%{tde_datadir}/icons/crystalsvg/*/apps/package_graphics.png
-%{tde_datadir}/icons/crystalsvg/*/apps/package_system.png
-%{tde_datadir}/icons/crystalsvg/*/apps/package_wordprocessing.png
-%{tde_datadir}/icons/crystalsvg/*/apps/pan.png
-%{tde_datadir}/icons/crystalsvg/*/apps/panel_settings.png
-%{tde_datadir}/icons/crystalsvg/*/apps/plan.png
-%{tde_datadir}/icons/crystalsvg/*/apps/planner.png
-%{tde_datadir}/icons/crystalsvg/*/apps/pybliographic.png
-%{tde_datadir}/icons/crystalsvg/*/apps/realplayer.png
-%{tde_datadir}/icons/crystalsvg/*/apps/remote.png
-%{tde_datadir}/icons/crystalsvg/*/apps/scribus.png
-%{tde_datadir}/icons/crystalsvg/*/apps/sodipodi.png
-%{tde_datadir}/icons/crystalsvg/*/apps/style.png
-%{tde_datadir}/icons/crystalsvg/*/apps/usb.png
-%{tde_datadir}/icons/crystalsvg/*/apps/vnc.png
-%{tde_datadir}/icons/crystalsvg/*/apps/wabi.png
-%{tde_datadir}/icons/crystalsvg/*/apps/wine.png
-%{tde_datadir}/icons/crystalsvg/*/apps/xcalc.png
-%{tde_datadir}/icons/crystalsvg/*/apps/xchat.png
-%{tde_datadir}/icons/crystalsvg/*/apps/xclipboard.png
-%{tde_datadir}/icons/crystalsvg/*/apps/xconsole.png
-%{tde_datadir}/icons/crystalsvg/*/apps/xedit.png
-%{tde_datadir}/icons/crystalsvg/*/apps/xemacs.png
-%{tde_datadir}/icons/crystalsvg/*/apps/xeyes.png
-%{tde_datadir}/icons/crystalsvg/*/apps/xfig.png
-%{tde_datadir}/icons/crystalsvg/*/apps/xload.png
-%{tde_datadir}/icons/crystalsvg/*/apps/xmms.png
-%{tde_datadir}/icons/crystalsvg/*/apps/xosview.png
-%{tde_datadir}/icons/crystalsvg/*/apps/xv.png
-%{tde_datadir}/icons/crystalsvg/*/apps/galeon.png
-%{tde_datadir}/icons/crystalsvg/*/apps/kcmdrkonqi.png
-%{tde_datadir}/icons/crystalsvg/*/apps/pinguin.png
-%{tde_datadir}/icons/crystalsvg/*/apps/x.png
-%{tde_datadir}/icons/crystalsvg/*/apps/xapp.png
-%{tde_datadir}/icons/crystalsvg/*/apps/xawtv.png
-%{tde_datadir}/icons/crystalsvg/*/apps/kcmopengl.png
-%{tde_datadir}/icons/crystalsvg/*/apps/wmaker_apps.png
-%{tde_datadir}/icons/crystalsvg/*/apps/qtella.png
-%{tde_datadir}/services/searchproviders
-%{tde_datadir}/services/useragentstrings/*.desktop
-%{tde_datadir}/servicetypes/searchprovider.desktop
-%{tde_datadir}/servicetypes/uasprovider.desktop
-%exclude %{tde_datadir}/sounds/pop.wav
-%{tde_datadir}/sounds/
-%{tde_datadir}/wallpapers/*
-
-%if "%{tde_prefix}" != "/usr"
-%{tde_prefix}/etc/xdg/menus/applications-merged/kde-essential.menu
-%{tde_prefix}/etc/xdg/menus/kde-information.menu
-%{tde_prefix}/etc/xdg/menus/kde-screensavers.menu
-%{tde_prefix}/etc/xdg/menus/kde-settings.menu
-%else
-%{_sysconfdir}/xdg/menus/applications-merged/kde-essential.menu
-%{_sysconfdir}/xdg/menus/kde-information.menu
-%{_sysconfdir}/xdg/menus/kde-screensavers.menu
-%{_sysconfdir}/xdg/menus/kde-settings.menu
-%endif
-
-%{tde_tdedocdir}/HTML/en/kcontrol/
-%exclude %{tde_tdedocdir}/HTML/en/kcontrol/kcmkonsole/
-%{tde_tdedocdir}/HTML/en/kinfocenter/
-
-%post data
-for f in crystalsvg ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f}  2> /dev/null || :
-done
-
-%if "%{distribution}" == "Mandriva Linux"
-# Mandriva-specific: we have to choose a background for current distribution variant (Free, One, Powerpack, ...)
-# First, we read the "product" key in /etc/product.id
-eval $(tr "," ";" </etc/product.id) 2>/dev/null
-# Then, we create a symbolic link to the corresponding background
-if [ -r "%{_datadir}/mdk/backgrounds/Mandriva-${product:-Free}-1280x1024-1300.jpg" "%{tde_bg}" ]; then
-  %__ln -sf "%{_datadir}/mdk/backgrounds/Mandriva-${product:-Free}-1280x1024-1300.jpg" "%{tde_bg}"
-fi
-%endif
-
-%if "%{distribution}" == "Mageia"
-if [ ! -r "%{tde_bg}" ] && [ -r "%{_datadir}/mga/backgrounds/Mageia-Default-1920x1440.png" ]; then
-  %__ln -sf "%{_datadir}/mga/backgrounds/Mageia-Default-1920x1440.png" "%{tde_bg}"
-fi
-%endif
-
-%postun data
-for f in crystalsvg ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f}  2> /dev/null || :
-done
-
-##########
-
-%package tdeio-plugins
-Summary:	core I/O slaves for TDE
-Group:		Applications/Utilities
-Requires:	trinity-kdesktop = %{version}-%{release}
-Requires:	cyrus-sasl
-Requires:	psmisc
-%if 0%{?with_hal}
-Requires:	hal >= 0.4.8
-%endif
-%if 0%{?rhel} == 4 || 0%{?suse_version}
-Requires:	cryptsetup
-%else
-Requires:	cryptsetup-luks
-%endif
-
-Obsoletes:	tdebase-kio-plugins < %{version}-%{release}
-Provides:	tdebase-kio-plugins = %{version}-%{release}
-Obsoletes:	trinity-tdebase-kio-plugins < %{version}-%{release}
-Provides:	trinity-tdebase-kio-plugins = %{version}-%{release}
-
-%description tdeio-plugins
-This package includes the base tdeioslaves. They include, amongst many
-others, file, http, and ftp.
-
-It also includes the media tdeioslave, which handles removable devices,
-and which works best with hal (and therefore udev) and pmount. Media
-also extends the functionality of many other tdeioslaves. To use this
-service, please make sure that your user is a member of the plugdev
-group.
-
-%files tdeio-plugins
-%defattr(-,root,root,-)
-%{tde_bindir}/kio_media_mounthelper
-%{tde_bindir}/ktrash
-%{tde_tdelibdir}/cursorthumbnail.la
-%{tde_tdelibdir}/cursorthumbnail.so
-%{tde_tdelibdir}/djvuthumbnail.la
-%{tde_tdelibdir}/djvuthumbnail.so
-%{tde_tdelibdir}/htmlthumbnail.la
-%{tde_tdelibdir}/htmlthumbnail.so
-%{tde_tdelibdir}/imagethumbnail.la
-%{tde_tdelibdir}/imagethumbnail.so
-%{tde_tdelibdir}/kcm_cgi.la
-%{tde_tdelibdir}/kcm_cgi.so
-%{tde_tdelibdir}/kcm_media.la
-%{tde_tdelibdir}/kcm_media.so
-%{tde_tdelibdir}/kded_homedirnotify.la
-%{tde_tdelibdir}/kded_homedirnotify.so
-%{tde_tdelibdir}/kded_mediamanager.la
-%{tde_tdelibdir}/kded_mediamanager.so
-%{tde_tdelibdir}/kded_medianotifier.la
-%{tde_tdelibdir}/kded_medianotifier.so
-%{tde_tdelibdir}/kded_remotedirnotify.la
-%{tde_tdelibdir}/kded_remotedirnotify.so
-%{tde_tdelibdir}/kded_systemdirnotify.la
-%{tde_tdelibdir}/kded_systemdirnotify.so
-%{tde_tdelibdir}/kfile_media.la
-%{tde_tdelibdir}/kfile_media.so
-%{tde_tdelibdir}/kfile_trash.la
-%{tde_tdelibdir}/kfile_trash.so
-%{tde_tdelibdir}/kio_about.la
-%{tde_tdelibdir}/kio_about.so
-%{tde_tdelibdir}/kio_cgi.la
-%{tde_tdelibdir}/kio_cgi.so
-%{tde_tdelibdir}/kio_filter.la
-%{tde_tdelibdir}/kio_filter.so
-%{tde_tdelibdir}/kio_finger.la
-%{tde_tdelibdir}/kio_finger.so
-%{tde_tdelibdir}/kio_fish.la
-%{tde_tdelibdir}/kio_fish.so
-%{tde_tdelibdir}/kio_floppy.la
-%{tde_tdelibdir}/kio_floppy.so
-%{tde_tdelibdir}/kio_home.la
-%{tde_tdelibdir}/kio_home.so
-%{tde_tdelibdir}/kio_info.la
-%{tde_tdelibdir}/kio_info.so
-%{tde_tdelibdir}/kio_mac.la
-%{tde_tdelibdir}/kio_mac.so
-%{tde_tdelibdir}/kio_man.la
-%{tde_tdelibdir}/kio_man.so
-%{tde_tdelibdir}/kio_media.la
-%{tde_tdelibdir}/kio_media.so
-%{tde_tdelibdir}/kio_nfs.la
-%{tde_tdelibdir}/kio_nfs.so
-%{tde_tdelibdir}/kio_remote.la
-%{tde_tdelibdir}/kio_remote.so
-%{tde_tdelibdir}/kio_settings.la
-%{tde_tdelibdir}/kio_settings.so
-%{tde_tdelibdir}/kio_sftp.la
-%{tde_tdelibdir}/kio_sftp.so
-%{tde_tdelibdir}/kio_system.la
-%{tde_tdelibdir}/kio_system.so
-%{tde_tdelibdir}/kio_tar.la
-%{tde_tdelibdir}/kio_tar.so
-%{tde_tdelibdir}/kio_thumbnail.la
-%{tde_tdelibdir}/kio_thumbnail.so
-%{tde_tdelibdir}/kio_trash.la
-%{tde_tdelibdir}/kio_trash.so
-%{tde_tdelibdir}/libkmanpart.la
-%{tde_tdelibdir}/libkmanpart.so
-%{tde_tdelibdir}/textthumbnail.la
-%{tde_tdelibdir}/textthumbnail.so
-%{tde_tdeappdir}/kcmcgi.desktop
-%{tde_datadir}/apps/kio_finger/kio_finger.css
-%{tde_datadir}/apps/kio_finger/kio_finger.pl
-%{tde_datadir}/apps/kio_info/kde-info2html
-%{tde_datadir}/apps/kio_info/kde-info2html.conf
-%{tde_datadir}/apps/kio_man/kio_man.css
-%{tde_datadir}/apps/systemview/*.desktop
-%{tde_datadir}/config.kcfg/mediamanagersettings.kcfg
-%{tde_datadir}/mimelnk/application/x-smb-server.desktop
-%{tde_datadir}/mimelnk/inode/system_directory.desktop
-%{tde_datadir}/mimelnk/media/*.desktop
-%{tde_datadir}/services/about.protocol
-%{tde_datadir}/services/applications.protocol
-%{tde_datadir}/services/ar.protocol
-%{tde_datadir}/services/bzip.protocol
-%{tde_datadir}/services/bzip2.protocol
-%{tde_datadir}/services/cgi.protocol
-%{tde_datadir}/services/cursorthumbnail.desktop
-%{tde_datadir}/services/djvuthumbnail.desktop
-%{tde_datadir}/services/finger.protocol
-%{tde_datadir}/services/fish.protocol
-%{tde_datadir}/services/floppy.protocol
-%{tde_datadir}/services/gzip.protocol
-%{tde_datadir}/services/home.protocol
-%{tde_datadir}/services/htmlthumbnail.desktop
-%{tde_datadir}/services/imagethumbnail.desktop
-%{tde_datadir}/services/info.protocol
-%{tde_datadir}/services/kded/homedirnotify.desktop
-%{tde_datadir}/services/kded/mediamanager.desktop
-%{tde_datadir}/services/kded/medianotifier.desktop
-%{tde_datadir}/services/kded/remotedirnotify.desktop
-%{tde_datadir}/services/kded/systemdirnotify.desktop
-%{tde_datadir}/services/kfile_media.desktop
-%{tde_datadir}/services/kfile_trash_system.desktop
-%{tde_datadir}/services/lzma.protocol
-%{tde_datadir}/services/kmanpart.desktop
-%{tde_datadir}/services/mac.protocol
-%{tde_datadir}/services/man.protocol
-%{tde_datadir}/services/media.protocol
-%{tde_datadir}/services/nfs.protocol
-%{tde_datadir}/services/nxfish.protocol
-%{tde_datadir}/services/programs.protocol
-%{tde_datadir}/services/remote.protocol
-%{tde_datadir}/services/settings.protocol
-%{tde_datadir}/services/sftp.protocol
-%{tde_datadir}/services/system.protocol
-%{tde_datadir}/services/tar.protocol
-%{tde_datadir}/services/textthumbnail.desktop
-%{tde_datadir}/services/thumbnail.protocol
-%{tde_datadir}/services/trash.protocol
-%{tde_datadir}/services/xz.protocol
-%{tde_datadir}/services/zip.protocol
-%{tde_datadir}/servicetypes/thumbcreator.desktop
-%{tde_datadir}/services/kfile_trash.desktop
-%{tde_tdedocdir}/HTML/en/kioslave/
-%if 0%{?with_exr}
-%{tde_tdelibdir}/exrthumbnail.la
-%{tde_tdelibdir}/exrthumbnail.so
-%{tde_datadir}/services/exrthumbnail.desktop
-%endif
-%if 0%{?with_hal}
-%{tde_tdelibdir}/media_propsdlgplugin.la
-%{tde_tdelibdir}/media_propsdlgplugin.so
-%{tde_datadir}/services/media_propsdlgplugin.desktop
-%endif
-
-%post tdeio-plugins
-update-desktop-database %{tde_appdir} 2> /dev/null || : 
-
-%postun tdeio-plugins
-update-desktop-database %{tde_appdir} 2> /dev/null || : 
-
-
-##########
-
-%package -n trinity-kdepasswd
-Summary:	password changer for TDE
-Group:		Applications/Utilities
-
-%description -n trinity-kdepasswd
-This is a simple application which allows users to change their
-system passwords.
-
-%files -n trinity-kdepasswd
-%defattr(-,root,root,-)
-%{tde_bindir}/kdepasswd
-%{tde_tdelibdir}/kcm_useraccount.la
-%{tde_tdelibdir}/kcm_useraccount.so
-%{tde_tdeappdir}/kcm_useraccount.desktop
-%{tde_tdeappdir}/kdepasswd.desktop
-%exclude %{tde_datadir}/apps/[kt]dm/pics/users/default1.png
-%exclude %{tde_datadir}/apps/[kt]dm/pics/users/default2.png
-%exclude %{tde_datadir}/apps/[kt]dm/pics/users/default3.png
-%exclude %{tde_datadir}/apps/[kt]dm/pics/users/root1.png
-%{tde_datadir}/apps/[kt]dm/pics/users/*.png
-%{tde_datadir}/config.kcfg/kcm_useraccount.kcfg
-%{tde_datadir}/config.kcfg/kcm_useraccount_pass.kcfg
-
-%post -n trinity-kdepasswd
-update-desktop-database %{tde_appdir} 2> /dev/null || : 
-
-%postun -n trinity-kdepasswd
-update-desktop-database %{tde_appdir} 2> /dev/null || : 
-
-##########
-
-%package -n trinity-tdeprint
-Summary:	print system for TDE
-Group:		Applications/Utilities
-Requires:	%{name}-data = %{version}-%{release}
-Requires:	psutils
-
-%description -n trinity-tdeprint
-This package contains the TDE printing subsystem. It can use CUPS,
-lpd-ng or the traditional lpd. It also includes support for fax and
-pdf printing.
-
-Installation of smbclient will make you able to use smb shared printers.
-
-%files -n trinity-tdeprint
-%defattr(-,root,root,-)
-%{tde_bindir}/[kt]deprintfax
-%{tde_bindir}/kjobviewer
-%{tde_bindir}/kprinter
-%{tde_tdelibdir}/kcm_printmgr.la
-%{tde_tdelibdir}/kcm_printmgr.so
-%{tde_tdelibdir}/kio_print.la
-%{tde_tdelibdir}/kio_print.so
-%{tde_tdelibdir}/kjobviewer.la
-%{tde_tdelibdir}/kjobviewer.so
-%{tde_tdelibdir}/kprinter.la
-%{tde_tdelibdir}/kprinter.so
-%{tde_tdelibdir}/lib[kt]deprint_part.la
-%{tde_tdelibdir}/lib[kt]deprint_part.so
-%{tde_libdir}/lib[kt]deinit_kjobviewer.la
-%{tde_libdir}/lib[kt]deinit_kjobviewer.so
-%{tde_libdir}/lib[kt]deinit_kprinter.la
-%{tde_libdir}/lib[kt]deinit_kprinter.so
-%{tde_tdeappdir}/[kt]deprintfax.desktop
-%{tde_tdeappdir}/[kt]jobviewer.desktop
-%{tde_tdeappdir}/printers.desktop
-%{tde_datadir}/apps/[kt]deprint/
-%{tde_datadir}/apps/[kt]deprintfax/
-%{tde_datadir}/apps/[kt]jobviewer/
-%{tde_datadir}/apps/[kt]deprint_part/kdeprint_part.rc
-%{tde_datadir}/icons/hicolor/*/apps/kdeprintfax.png
-%{tde_datadir}/icons/hicolor/*/apps/kjobviewer.png
-%{tde_datadir}/icons/hicolor/*/apps/printmgr.png
-%{tde_datadir}/icons/hicolor/scalable/apps/kdeprintfax.svgz
-%{tde_datadir}/icons/hicolor/scalable/apps/kjobviewer.svgz
-%{tde_datadir}/icons/hicolor/scalable/apps/printmgr.svgz
-%{tde_datadir}/mimelnk/print/class.desktop
-%{tde_datadir}/mimelnk/print/driver.desktop
-%{tde_datadir}/mimelnk/print/folder.desktop
-%{tde_datadir}/mimelnk/print/jobs.desktop
-%{tde_datadir}/mimelnk/print/manager.desktop
-%{tde_datadir}/mimelnk/print/printer.desktop
-%{tde_datadir}/mimelnk/print/printermodel.desktop
-%{tde_datadir}/services/kdeprint_part.desktop
-%{tde_datadir}/services/print.protocol
-%{tde_datadir}/services/printdb.protocol
-%{tde_tdedocdir}/HTML/en/[kt]deprint/
-
-%post -n trinity-tdeprint
-/sbin/ldconfig || :
-update-desktop-database %{tde_appdir} 2> /dev/null || : 
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f}  2> /dev/null || :
-done
-
-%postun -n trinity-tdeprint
-/sbin/ldconfig || :
-update-desktop-database %{tde_appdir} 2> /dev/null || : 
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f}  2> /dev/null || :
-done
-
-##########
-
-%package -n trinity-kdesktop
-Summary:	miscellaneous binaries and files for the TDE desktop
-Group:		Applications/Utilities
-Requires:	%{name}-bin = %{version}-%{release}
-Requires:	%{name}-data = %{version}-%{release}
-Requires:	trinity-libkonq = %{version}-%{release}
-Requires:	eject
-%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion}
-Requires:	xdg-utils
-%endif
-
-%description -n trinity-kdesktop
-This package contains miscellaneous binaries and files integral to
-the TDE desktop.
-
-%files -n trinity-kdesktop
-%defattr(-,root,root,-)
-%{_sysconfdir}/trinity/kdesktop_custom_menu1
-%{_sysconfdir}/trinity/kdesktop_custom_menu2
-%{tde_bindir}/kcheckrunning
-%{tde_bindir}/kxdglauncher
-%{tde_bindir}/kdeeject
-%{tde_bindir}/kdesktop
-%{tde_bindir}/kdesktop_lock
-%{tde_bindir}/kwebdesktop
-%{tde_tdelibdir}/kdesktop.la
-%{tde_tdelibdir}/kdesktop.so
-%{tde_libdir}/lib[kt]deinit_kdesktop.la
-%{tde_libdir}/lib[kt]deinit_kdesktop.so
-%{tde_datadir}/apps/kdesktop/
-%{tde_datadir}/apps/konqueror/servicemenus/kdesktopSetAsBackground.desktop
-%{tde_datadir}/autostart/kdesktop.desktop
-%{tde_datadir}/config.kcfg/kdesktop.kcfg
-%{tde_datadir}/config.kcfg/klaunch.kcfg
-%{tde_datadir}/config.kcfg/kwebdesktop.kcfg
-%{tde_datadir}/icons/crystalsvg/*/apps/error.png
-
-%post -n trinity-kdesktop
-/sbin/ldconfig || :
-for f in crystalsvg ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f}  2> /dev/null || :
-done
-
-%postun -n trinity-kdesktop
-/sbin/ldconfig || :
-for f in crystalsvg ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f}  2> /dev/null || :
-done
-
-##########
-
-%package -n trinity-kdesktop-devel
-Summary:	Development files for kdesktop
-Group:		Development/Libraries
-Requires:	trinity-kdesktop = %{version}-%{release}
-
-%description -n trinity-kdesktop-devel
-%{summary}
-
-%files -n trinity-kdesktop-devel
-%defattr(-,root,root,-)
-%{tde_tdeincludedir}/KBackgroundIface.h
-%{tde_tdeincludedir}/KDesktopIface.h
-%{tde_tdeincludedir}/KScreensaverIface.h
-
-##########
-
-%package -n trinity-tdm
-Summary:	X Display manager for TDE
-Group:		Applications/Utilities
-Requires:	%{name}-bin = %{version}-%{release}
-Requires:	%{name}-data = %{version}-%{release}
-Requires:	pam
-
-# Provides the global Xsession script (/etc/X11/xinit/Xsession or /etc/X11/Xsession)
-%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} == 4
-Requires:	xinitrc
-%endif
-%if 0%{?suse_version} == 1140
-Requires:	xorg-x11
-%endif
-%if 0%{?suse_version} >= 1220
-Requires:	xdm
-%endif
-%if 0%{?rhel} >= 5 || 0%{?fedora}
-Requires:	xorg-x11-xinit
-%endif
-
-# Required for Fedora LiveCD
-%if 0%{?rhel} || 0%{?fedora}
-Provides:	service(graphical-login)
-%endif
-# Required for Mandriva's installer
-%if 0%{?mgaversion} || 0%{?mdkversion}
-Provides:	dm
-%endif
-
-%description -n trinity-tdm
-tdm manages a collection of X servers, which may be on the local host or
-remote machines. It provides services similar to those provided by init,
-getty, and login on character-based terminals: prompting for login name and
-password, authenticating the user, and running a session. tdm supports XDMCP
-(X Display Manager Control Protocol) and can also be used to run a chooser
-process which presents the user with a menu of possible hosts that offer
-XDMCP display management.
-
-A collection of icons to associate with individual users is included with
-TDE, but as part of the kdepasswd package.
-
-The menu package will help to provide TDM with a list of window managers
-that can be launched, if the window manager does not register with TDM
-already. Most users won't need this.
-
-%files -n trinity-tdm
-%defattr(-,root,root,-)
-%{tde_tdelibdir}/kgreet_pam.la
-%{tde_tdelibdir}/kgreet_pam.so
-%{tde_bindir}/gen[kt]dmconf
-%{tde_bindir}/[kt]dm
-%{tde_bindir}/[kt]dm_config
-%{tde_bindir}/[kt]dmctl
-%{tde_bindir}/[kt]dm_greet
-%{tde_bindir}/krootimage
-%{tde_datadir}/apps/[kt]dm/pics/kdelogo.png
-%{tde_datadir}/apps/[kt]dm/pics/kdelogo-crystal.png
-%{tde_datadir}/apps/[kt]dm/pics/shutdown.jpg
-%{tde_datadir}/apps/[kt]dm/pics/users/default1.png
-%{tde_datadir}/apps/[kt]dm/pics/users/default2.png
-%{tde_datadir}/apps/[kt]dm/pics/users/default3.png
-%{tde_datadir}/apps/[kt]dm/pics/users/root1.png
-%{tde_datadir}/apps/[kt]dm/sessions/*.desktop
-%{tde_datadir}/apps/[kt]dm/themes/
-%{tde_datadir}/config/kdm
-%{_sysconfdir}/trinity/[kt]dm/
-%{tde_tdedocdir}/HTML/en/[kt]dm/
-%if 0%{?suse_version} == 0
-%{_sysconfdir}/pam.d/kdm-trinity
-%{_sysconfdir}/pam.d/kdm-trinity-np
-%endif
-%if 0%{?suse_version}
-/usr/lib/X11/displaymanagers/tdm
-%endif
-%if 0%{?fedora} >= 18
-/usr/lib/systemd/system/tdm.service
-%endif
-
-# Distribution specific stuff
-%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version}
-%{_datadir}/xsessions/tde.desktop
-%endif
-
-# https://wiki.mageia.org/en/How_to_add_a_new_Window_Manager_or_Display_Manager
-%if 0%{?mgaversion} || 0%{?mdkversion}
-%{_sysconfdir}/X11/wmsession.d/45TDE
-%{_datadir}/X11/dm.d/45TDE.conf
-%endif
-
-# SELINUX policy
-%if 0%{?with_selinux_policy}
-%{?_sysconfdir}/trinity/kdm/tdm.pp
-%endif
-
-%pre -n trinity-tdm
-# Make sure that TDM configuration files are now under '/etc/trinity/kdm'
-if [ -d "%{tde_datadir}/config/kdm" ] && [ ! -L "%{tde_datadir}/config/kdm" ]; then
-  if [ -d "%{_sysconfdir}/trinity/kdm" ]; then
-    # If there is already something under '/etc/trinity/kdm', simply delete old configuration
-    echo "Deleting TDM configuration under '%{tde_datadir}/config/kdm'"
-    %__rm -rf "%{tde_datadir}/config/kdm"
-  else
-    # Else, move '/opt/trinity/share/config/kdm' to '/etc/trinity/kdm'
-    if [ ! -d "%{_sysconfdir}/trinity" ]; then
-      %__mkdir_p "%{_sysconfdir}/trinity"
-    fi
-    echo "Migrating TDM configuration from '%{tde_datadir}/config/kdm' to '%{_sysconfdir}/trinity/kdm'"
-    %__mv -f "%{tde_datadir}/config/kdm" "%{_sysconfdir}/trinity/kdm.migr"
-  fi
-fi
-
-%post -n trinity-tdm
-%if 0%{?mgaversion} || 0%{?mdkversion}
-%make_session
-%endif
-%if 0%{?with_selinux_policy}
-/usr/sbin/semodule -i "%{?_sysconfdir}/trinity/kdm/tdm.pp"
-%endif
-# Default user icon in TDM
-if [ ! -r "%{tde_datadir}/apps/kdm/faces/.default.face.icon" ]; then
-  [ -d "%{tde_datadir}/apps/kdm/faces" ] || mkdir -p "%{tde_datadir}/apps/kdm/faces"
-  %__cp -f "%{tde_datadir}/apps/kdm/pics/users/default2.png" "%{tde_datadir}/apps/kdm/faces/.default.face.icon"
-fi
-
-%posttrans -n trinity-tdm
-# Make sure that TDM configuration files are now under '/etc/trinity/kdm'
-if [ -d "%{_sysconfdir}/trinity/kdm.migr" ] && [ -d "%{_sysconfdir}/trinity/kdm" ]; then
-  %__mv -f "%{_sysconfdir}/trinity/kdm.migr/"* "%{_sysconfdir}/trinity/kdm/"
-  rmdir "%{_sysconfdir}/trinity/kdm.migr/"
-fi
-
-%postun -n trinity-tdm
-%if 0%{?mgaversion} || 0%{?mdkversion}
-%make_session
-%endif
-
-##########
-
-%package -n trinity-tdm-devel
-Summary:	Development files for tdm
-Group:		Development/Libraries
-Requires:	trinity-tdm = %{version}-%{release}
-
-%description -n trinity-tdm-devel
-%{summary}
-
-%files -n trinity-tdm-devel
-%defattr(-,root,root,-)
-%{tde_tdeincludedir}/kgreeterplugin.h
-
-##########
-
-%package -n trinity-kfind
-Summary:	file-find utility for TDE
-Group:		Applications/Utilities
-Requires:	%{name}-data = %{version}-%{release}
-
-%description -n trinity-kfind
-kfind can be used to find files and directories on your
-workstations.
-
-%files -n trinity-kfind
-%defattr(-,root,root,-)
-%{tde_bindir}/kfind
-%{tde_tdelibdir}/libkfindpart.la
-%{tde_tdelibdir}/libkfindpart.so
-%{tde_tdeappdir}/Kfind.desktop
-%{tde_datadir}/apps/kfindpart/
-%{tde_datadir}/icons/hicolor/*/apps/kfind.png
-%{tde_datadir}/services/kfindpart.desktop
-%{tde_datadir}/servicetypes/findpart.desktop
-%{tde_tdedocdir}/HTML/en/kfind/
-
-%post -n trinity-kfind
-update-desktop-database %{tde_appdir} 2> /dev/null || : 
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f}  2> /dev/null || :
-done
-
-%postun -n trinity-kfind
-update-desktop-database %{tde_appdir} 2> /dev/null || : 
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f}  2> /dev/null || :
-done
-
-##########
-
-%package -n trinity-khelpcenter
-Summary:	help center for TDE
-Group:		Applications/Utilities
-Requires:	%{name}-data = %{version}-%{release}
-Requires:	htdig
-
-%description -n trinity-khelpcenter
-The TDE Help Center provides documentation on how to use the KDE desktop.
-
-The htdig package is needed to build a searchable archive of TDE
-documentation.
-
-%files -n trinity-khelpcenter
-%defattr(-,root,root,-)
-#%{tde_bindir}/khc_beagle_index.pl
-#%{tde_bindir}/khc_beagle_search.pl
-%{tde_bindir}/khc_docbookdig.pl
-%{tde_bindir}/khc_htdig.pl
-%{tde_bindir}/khc_htsearch.pl
-%{tde_bindir}/khc_indexbuilder
-%{tde_bindir}/khc_mansearch.pl
-%{tde_bindir}/khelpcenter
-%{tde_tdelibdir}/khelpcenter.la
-%{tde_tdelibdir}/khelpcenter.so
-%{tde_libdir}/lib[kt]deinit_khelpcenter.la
-%{tde_libdir}/lib[kt]deinit_khelpcenter.so
-%{tde_tdeappdir}/Help.desktop
-%{tde_datadir}/apps/khelpcenter/
-%{tde_datadir}/config.kcfg/khelpcenter.kcfg
-%{tde_datadir}/icons/hicolor/*/apps/khelpcenter.*
-%{tde_datadir}/services/khelpcenter.desktop
-%{tde_tdedocdir}/HTML/en/khelpcenter/
-
-%post -n trinity-khelpcenter
-update-desktop-database %{tde_appdir} 2> /dev/null || : 
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f}  2> /dev/null || :
-done
-/sbin/ldconfig || :
-
-%postun -n trinity-khelpcenter
-update-desktop-database %{tde_appdir} 2> /dev/null || : 
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f}  2> /dev/null || :
-done
-/sbin/ldconfig || :
-
-##########
-
-%package -n trinity-kicker
-Summary:	desktop panel for TDE
-Group:		Applications/Utilities
-Requires:	%{name}-data = %{version}-%{release}
-
-%description -n trinity-kicker
-Kicker provides the TDE panel on you desktop. It can be used as a
-program launcher and can load plugins to provide additional
-functionality.
-
-%files -n trinity-kicker
-%defattr(-,root,root,-)
-%{tde_bindir}/appletproxy
-%{tde_bindir}/extensionproxy
-%{tde_bindir}/kasbar
-%{tde_bindir}/kicker
-%{tde_libdir}/kconf_update_bin/kicker-3.4-reverseLayout
-%{tde_tdelibdir}/appletproxy.la
-%{tde_tdelibdir}/appletproxy.so
-%{tde_tdelibdir}/clock_panelapplet.la
-%{tde_tdelibdir}/clock_panelapplet.so
-%{tde_tdelibdir}/dockbar_panelextension.la
-%{tde_tdelibdir}/dockbar_panelextension.so
-%{tde_tdelibdir}/extensionproxy.la
-%{tde_tdelibdir}/extensionproxy.so
-%{tde_tdelibdir}/kasbar_panelextension.la
-%{tde_tdelibdir}/kasbar_panelextension.so
-%{tde_tdelibdir}/kicker.la
-%{tde_tdelibdir}/kickermenu_find.la
-%{tde_tdelibdir}/kickermenu_find.so
-%{tde_tdelibdir}/kickermenu_kate.so
-%{tde_tdelibdir}/kickermenu_kate.la
-%{tde_tdelibdir}/kickermenu_[kt]deprint.la
-%{tde_tdelibdir}/kickermenu_[kt]deprint.so
-%{tde_tdelibdir}/kickermenu_konqueror.la
-%{tde_tdelibdir}/kickermenu_konqueror.so
-%{tde_tdelibdir}/kickermenu_konsole.la
-%{tde_tdelibdir}/kickermenu_konsole.so
-%{tde_tdelibdir}/kickermenu_prefmenu.la
-%{tde_tdelibdir}/kickermenu_prefmenu.so
-%{tde_tdelibdir}/kickermenu_recentdocs.la
-%{tde_tdelibdir}/kickermenu_recentdocs.so
-%{tde_tdelibdir}/kickermenu_remotemenu.la
-%{tde_tdelibdir}/kickermenu_remotemenu.so
-%{tde_tdelibdir}/kickermenu_systemmenu.la
-%{tde_tdelibdir}/kickermenu_systemmenu.so
-%{tde_tdelibdir}/kicker.so
-%{tde_tdelibdir}/launcher_panelapplet.la
-%{tde_tdelibdir}/launcher_panelapplet.so
-%{tde_tdelibdir}/lockout_panelapplet.la
-%{tde_tdelibdir}/lockout_panelapplet.so
-%{tde_tdelibdir}/media_panelapplet.la
-%{tde_tdelibdir}/media_panelapplet.so
-%{tde_tdelibdir}/menu_panelapplet.la
-%{tde_tdelibdir}/menu_panelapplet.so
-%{tde_tdelibdir}/minipager_panelapplet.la
-%{tde_tdelibdir}/minipager_panelapplet.so
-%{tde_tdelibdir}/naughty_panelapplet.la
-%{tde_tdelibdir}/naughty_panelapplet.so
-%{tde_tdelibdir}/run_panelapplet.la
-%{tde_tdelibdir}/run_panelapplet.so
-%{tde_tdelibdir}/sidebar_panelextension.la
-%{tde_tdelibdir}/sidebar_panelextension.so
-%{tde_tdelibdir}/systemtray_panelapplet.la
-%{tde_tdelibdir}/systemtray_panelapplet.so
-%{tde_tdelibdir}/taskbar_panelapplet.la
-%{tde_tdelibdir}/taskbar_panelapplet.so
-%{tde_tdelibdir}/taskbar_panelextension.la
-%{tde_tdelibdir}/taskbar_panelextension.so
-%{tde_tdelibdir}/trash_panelapplet.la
-%{tde_tdelibdir}/trash_panelapplet.so
-%{tde_libdir}/libkasbar.so.*
-%{tde_libdir}/lib[kt]deinit_appletproxy.la
-%{tde_libdir}/lib[kt]deinit_appletproxy.so
-%{tde_libdir}/lib[kt]deinit_extensionproxy.la
-%{tde_libdir}/lib[kt]deinit_extensionproxy.so
-%{tde_libdir}/lib[kt]deinit_kicker.la
-%{tde_libdir}/lib[kt]deinit_kicker.so
-%{tde_libdir}/libkickermain.so.*
-%{tde_libdir}/libtaskbar.so.*
-%{tde_libdir}/libtaskmanager.so.*
-%{tde_libdir}/libkickoffsearch_interfaces.so.*
-%{tde_tdeappdir}/kcmkicker.desktop
-%{tde_datadir}/applnk/.hidden/kicker_config_arrangement.desktop
-%{tde_datadir}/applnk/.hidden/kicker_config_hiding.desktop
-%{tde_datadir}/applnk/.hidden/kicker_config_menus.desktop
-%{tde_datadir}/apps/clockapplet/pics/lcd.png
-%{tde_datadir}/apps/kconf_update/kicker-3.1-properSizeSetting.pl
-%{tde_datadir}/apps/kconf_update/kicker-3.5-kconfigXTize.pl
-%{tde_datadir}/apps/kconf_update/kicker-3.5-taskbarEnums.pl
-%{tde_datadir}/apps/kconf_update/kickerrc.upd
-%{tde_datadir}/apps/kicker/
-%exclude %{tde_datadir}/apps/kicker/applets/klipper.desktop
-%exclude %{tde_datadir}/apps/kicker/applets/ksysguardapplet.desktop
-%{tde_datadir}/apps/naughtyapplet/pics/naughty-happy.png
-%{tde_datadir}/apps/naughtyapplet/pics/naughty-sad.png
-%{tde_datadir}/autostart/panel.desktop
-%{tde_datadir}/config.kcfg/kickerSettings.kcfg
-%{tde_datadir}/config.kcfg/launcherapplet.kcfg
-%{tde_datadir}/config.kcfg/pagersettings.kcfg
-%{tde_datadir}/config.kcfg/taskbar.kcfg
-%{tde_datadir}/icons/crystalsvg/*/apps/systemtray.png
-%{tde_datadir}/icons/crystalsvg/*/apps/taskbar.png
-%{tde_datadir}/icons/crystalsvg/*/apps/kbinaryclock.png
-%{tde_datadir}/icons/crystalsvg/*/apps/kdisknav.png
-%{tde_datadir}/icons/crystalsvg/*/apps/kicker.png
-%{tde_datadir}/icons/crystalsvg/*/apps/panel.png
-%{tde_datadir}/icons/crystalsvg/*/apps/runprocesscatcher.png
-%{tde_datadir}/icons/crystalsvg/*/apps/window_list.png
-%{tde_datadir}/icons/crystalsvg/*/apps/kbinaryclock.svgz
-%{tde_datadir}/icons/crystalsvg/*/apps/systemtray.svgz
-%{tde_datadir}/servicetypes/kickoffsearchplugin.desktop
-%{tde_tdedocdir}/HTML/en/kicker/
-
-%post -n trinity-kicker
-update-desktop-database %{tde_appdir} 2> /dev/null || : 
-for f in crystalsvg ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f}  2> /dev/null || :
-done
-/sbin/ldconfig || :
-
-%postun -n trinity-kicker
-update-desktop-database %{tde_appdir} 2> /dev/null || : 
-for f in crystalsvg ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f}  2> /dev/null || :
-done
-/sbin/ldconfig || :
-
-##########
-
-%package -n trinity-kicker-devel
-Summary:	Development files for kicker
-Group:		Development/Libraries
-Requires:	trinity-kicker = %{version}-%{release}
-
-%description -n trinity-kicker-devel
-%{summary}
-
-%files -n trinity-kicker-devel
-%defattr(-,root,root,-)
-%{tde_tdeincludedir}/kickoff-search-plugin.h
-%{tde_tdeincludedir}/kickoffsearchinterface.h
-%{tde_libdir}/libkasbar.la
-%{tde_libdir}/libkasbar.so
-%{tde_libdir}/libkickermain.la
-%{tde_libdir}/libkickermain.so
-%{tde_libdir}/libkickoffsearch_interfaces.la
-%{tde_libdir}/libkickoffsearch_interfaces.so
-%{tde_libdir}/libtaskbar.la
-%{tde_libdir}/libtaskbar.so
-%{tde_libdir}/libtaskmanager.la
-%{tde_libdir}/libtaskmanager.so
-
-%post -n trinity-kicker-devel
-/sbin/ldconfig || :
-
-%postun -n trinity-kicker-devel
-/sbin/ldconfig || :
-
-##########
-
-%package -n trinity-klipper
-Summary:	clipboard utility for Trinity
-Group:		Applications/Utilities
-Requires:	%{name}-data = %{version}-%{release}
-
-%description -n trinity-klipper
-klipper provides standard clipboard functions (cut and paste, history
-saving) plus additional features, like the ability to offer actions to 
-take dependent on the clipboard contents. For example, it can launch a 
-web browser if the clipboard contains a URL.
-
-%files -n trinity-klipper
-%defattr(-,root,root,-)
-%{tde_bindir}/klipper
-%{_sysconfdir}/trinity/klipperrc
-%{tde_tdelibdir}/klipper.la
-%{tde_tdelibdir}/klipper.so
-%{tde_tdelibdir}/klipper_panelapplet.la
-%{tde_tdelibdir}/klipper_panelapplet.so
-%{tde_libdir}/lib[kt]deinit_klipper.la
-%{tde_libdir}/lib[kt]deinit_klipper.so
-%{tde_tdeappdir}/klipper.desktop
-%{tde_datadir}/apps/kconf_update/klipper-1-2.pl
-%{tde_datadir}/apps/kconf_update/klipper-trinity1.sh
-%{tde_datadir}/apps/kconf_update/klipperrc.upd
-%{tde_datadir}/apps/kconf_update/klippershortcuts.upd
-%{tde_datadir}/apps/kicker/applets/klipper.desktop
-%{tde_datadir}/autostart/klipper.desktop
-%{tde_datadir}/icons/hicolor/*/apps/klipper.*
-%{tde_tdedocdir}/HTML/en/klipper/
-
-%post -n trinity-klipper
-update-desktop-database %{tde_appdir} 2> /dev/null || : 
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f}  2> /dev/null || :
-done
-/sbin/ldconfig || :
-
-%postun -n trinity-klipper
-update-desktop-database %{tde_appdir} 2> /dev/null || : 
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f}  2> /dev/null || :
-done
-/sbin/ldconfig || :
-
-##########
-
-%package -n trinity-kmenuedit
-Summary:	menu editor for TDE
-Group:		Applications/Utilities
-Requires:	%{name}-data = %{version}-%{release}
-
-%description -n trinity-kmenuedit
-The TDE menu editor allows you to make customisations to the KDE menu
-structure.
-
-%files -n trinity-kmenuedit
-%defattr(-,root,root,-)
-%{tde_bindir}/kcontroledit
-%{tde_bindir}/kmenuedit
-%{tde_tdelibdir}/kcontroledit.la
-%{tde_tdelibdir}/kcontroledit.so
-%{tde_tdelibdir}/kmenuedit.la
-%{tde_tdelibdir}/kmenuedit.so
-%{tde_libdir}/lib[kt]deinit_kcontroledit.la
-%{tde_libdir}/lib[kt]deinit_kcontroledit.so
-%{tde_libdir}/lib[kt]deinit_kmenuedit.la
-%{tde_libdir}/lib[kt]deinit_kmenuedit.so
-%{tde_tdeappdir}/kmenuedit.desktop
-%{tde_datadir}/applnk/System/kmenuedit.desktop
-%{tde_datadir}/apps/kcontroledit/
-%{tde_datadir}/apps/kmenuedit/
-%{tde_tdedocdir}/HTML/en/kmenuedit/
-
-%post -n trinity-kmenuedit
-update-desktop-database %{tde_appdir} 2> /dev/null || : 
-/sbin/ldconfig || :
-
-%postun -n trinity-kmenuedit
-update-desktop-database %{tde_appdir} 2> /dev/null || : 
-/sbin/ldconfig || :
-
-##########
-
-%package -n trinity-konqueror
-Summary:	TDE's advanced file manager, web browser and document viewer
-Group:		Applications/Utilities
-Requires:	%{name}-data = %{version}-%{release}
-Requires:	trinity-kcontrol = %{version}-%{release}
-Requires:	%{name}-tdeio-plugins = %{version}-%{release}
-Requires:	trinity-kdesktop = %{version}-%{release}
-Requires:	trinity-kfind = %{version}-%{release}
-Requires:	trinity-libkonq = %{version}-%{release}
-
-%description -n trinity-konqueror
-Konqueror is the file manager for the Trinity Desktop Environment.
-It supports basic file management on local UNIX filesystems,
-from simple cut/copy and paste operations to advanced remote
-and local network file browsing.
-
-It is also the canvas for all the latest TDE technology,
-from KIO slaves (which provide mechanisms for file access) to
-component embedding via the KParts object interface, and it
-is one of the most customizable applications available.
-
-Konqueror is an Open Source web browser with HTML4.0 compliance,
-supporting Java applets, JavaScript, CSS1 and (partially) CSS2,
-as well as Netscape plugins (for example, Flash or RealVideo plugins).
-
-It is a universal viewing application, capable of embedding
-read-only viewing components in itself to view documents without
-ever launching another application.
-
-%files -n trinity-konqueror
-%defattr(-,root,root,-)
-%{_sysconfdir}/trinity/konqsidebartng.rc
-%{tde_bindir}/kbookmarkmerger
-%{tde_bindir}/keditbookmarks
-%{tde_bindir}/kfmclient
-%{tde_bindir}/konqueror
-%{tde_tdelibdir}/kcm_history.la
-%{tde_tdelibdir}/kcm_history.so
-%{tde_tdelibdir}/kded_konqy_preloader.la
-%{tde_tdelibdir}/kded_konqy_preloader.so
-%{tde_tdelibdir}/keditbookmarks.la
-%{tde_tdelibdir}/keditbookmarks.so
-%{tde_tdelibdir}/kfmclient.la
-%{tde_tdelibdir}/kfmclient.so
-%{tde_tdelibdir}/konq_aboutpage.la
-%{tde_tdelibdir}/konq_aboutpage.so
-%{tde_tdelibdir}/konq_iconview.la
-%{tde_tdelibdir}/konq_iconview.so
-%{tde_tdelibdir}/konq_listview.la
-%{tde_tdelibdir}/konq_listview.so
-%{tde_tdelibdir}/konq_remoteencoding.la
-%{tde_tdelibdir}/konq_remoteencoding.so
-%{tde_tdelibdir}/konq_shellcmdplugin.la
-%{tde_tdelibdir}/konq_shellcmdplugin.so
-%{tde_tdelibdir}/konq_sidebar.la
-%{tde_tdelibdir}/konq_sidebar.so
-%{tde_tdelibdir}/konq_sidebartree_bookmarks.la
-%{tde_tdelibdir}/konq_sidebartree_bookmarks.so
-%{tde_tdelibdir}/konq_sidebartree_dirtree.la
-%{tde_tdelibdir}/konq_sidebartree_dirtree.so
-%{tde_tdelibdir}/konq_sidebartree_history.la
-%{tde_tdelibdir}/konq_sidebartree_history.so
-%{tde_tdelibdir}/konqsidebar_tree.la
-%{tde_tdelibdir}/konqsidebar_tree.so
-%{tde_tdelibdir}/konqsidebar_web.la
-%{tde_tdelibdir}/konqsidebar_web.so
-%{tde_tdelibdir}/konqueror.la
-%{tde_tdelibdir}/konqueror.so
-%{tde_tdelibdir}/libkhtmlkttsdplugin.la
-%{tde_tdelibdir}/libkhtmlkttsdplugin.so
-%{tde_libdir}/lib[kt]deinit_keditbookmarks.la
-%{tde_libdir}/lib[kt]deinit_keditbookmarks.so
-%{tde_libdir}/lib[kt]deinit_kfmclient.la
-%{tde_libdir}/lib[kt]deinit_kfmclient.so
-%{tde_libdir}/lib[kt]deinit_konqueror.la
-%{tde_libdir}/lib[kt]deinit_konqueror.so
-%{tde_libdir}/libkonqsidebarplugin.so.*
-%{tde_tdeappdir}/Home.desktop
-%{tde_tdeappdir}/kcmhistory.desktop
-%{tde_tdeappdir}/kfmclient.desktop
-%{tde_tdeappdir}/kfmclient_dir.desktop
-%{tde_tdeappdir}/kfmclient_html.desktop
-%{tde_tdeappdir}/kfmclient_war.desktop
-%{tde_tdeappdir}/khtml_filter.desktop
-%{tde_tdeappdir}/konqbrowser.desktop
-%{tde_tdeappdir}/konquerorsu.desktop
-%{tde_datadir}/applnk/.hidden/konqfilemgr.desktop
-%{tde_datadir}/applnk/Internet/keditbookmarks.desktop
-%{tde_datadir}/applnk/konqueror.desktop
-%{tde_datadir}/apps/kconf_update/kfmclient_3_2.upd
-%{tde_datadir}/apps/kconf_update/kfmclient_3_2_update.sh
-%{tde_datadir}/apps/kconf_update/konqsidebartng.upd
-%{tde_datadir}/apps/kconf_update/move_konqsidebartng_entries.sh
-%{tde_datadir}/apps/keditbookmarks/keditbookmarks-genui.rc
-%{tde_datadir}/apps/keditbookmarks/keditbookmarksui.rc
-%{tde_datadir}/apps/khtml/kpartplugins/khtmlkttsd.desktop
-%{tde_datadir}/apps/khtml/kpartplugins/khtmlkttsd.rc
-%{tde_datadir}/apps/konqiconview/
-%{tde_datadir}/apps/konqlistview/
-%exclude %{tde_datadir}/apps/konqsidebartng/virtual_folders/services/fonts.desktop
-%{tde_datadir}/apps/konqsidebartng/
-%{tde_datadir}/apps/konqueror/about/
-%{tde_datadir}/apps/konqueror/icons/
-%{tde_datadir}/apps/konqueror/konq-simplebrowser.rc
-%{tde_datadir}/apps/konqueror/konqueror.rc
-%{tde_datadir}/apps/konqueror/pics/indicator_connect.png
-%{tde_datadir}/apps/konqueror/pics/indicator_empty.png
-%{tde_datadir}/apps/konqueror/pics/indicator_noconnect.png
-%{tde_datadir}/apps/konqueror/pics/indicator_viewactive.png
-%{tde_datadir}/apps/konqueror/profiles/
-%exclude %{tde_datadir}/apps/konqueror/servicemenus/kdesktopSetAsBackground.desktop
-%exclude %{tde_datadir}/apps/konqueror/servicemenus/konsolehere.desktop
-%exclude %{tde_datadir}/apps/konqueror/servicemenus/installfont.desktop
-%{tde_datadir}/apps/konqueror/servicemenus/*.desktop
-%{tde_datadir}/apps/konqueror/servicemenus/media_safelyremove.desktop_tdebase
-%{_sysconfdir}/alternatives/media_safelyremove.desktop_tdebase
-%{tde_datadir}/apps/konqueror/tiles/*.png
-%{tde_datadir}/autostart/konqy_preload.desktop
-%{tde_datadir}/config.kcfg/keditbookmarks.kcfg
-%{tde_datadir}/config.kcfg/konq_listview.kcfg
-%{tde_datadir}/config.kcfg/konqueror.kcfg
-%{tde_datadir}/icons/crystalsvg/*/apps/keditbookmarks.png
-%{tde_datadir}/icons/crystalsvg/*/apps/kfm_home.svgz
-%{tde_datadir}/icons/hicolor/*/apps/kfm.png
-%{tde_datadir}/icons/hicolor/*/apps/konqueror.*
-%{tde_datadir}/services/kded/konqy_preloader.desktop
-%{tde_datadir}/services/konq_*.desktop
-%{tde_datadir}/servicetypes/konqaboutpage.desktop
-%{tde_tdedocdir}/HTML/en/konqueror/
-
-%post -n trinity-konqueror
-update-desktop-database %{tde_appdir} 2> /dev/null || : 
-for f in crystalsvg hicolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f}  2> /dev/null || :
-done
-/sbin/ldconfig || :
-update-alternatives --install \
-  %{tde_datadir}/apps/konqueror/servicemenus/media_safelyremove.desktop \
-  media_safelyremove.desktop_konqueror \
-  %{tde_datadir}/apps/konqueror/servicemenus/media_safelyremove.desktop_tdebase \
-  10 || :
-
-%postun -n trinity-konqueror
-update-desktop-database %{tde_appdir} 2> /dev/null || : 
-for f in crystalsvg hicolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f}  2> /dev/null || :
-done
-/sbin/ldconfig || :
-
-%preun -n trinity-konqueror
-if [ $1 -eq 0 ]; then
-  update-alternatives --remove \
-    media_safelyremove.desktop_konqueror \
-    %{tde_datadir}/apps/konqueror/servicemenus/media_safelyremove.desktop_tdebase || :
-fi
-
-##########
-
-%package -n trinity-konqueror-devel
-Summary:	Development files for konqueror
-Group:		Development/Libraries
-Requires:	trinity-konqueror = %{version}-%{release}
-
-%description -n trinity-konqueror-devel
-%{summary}
-
-%files -n trinity-konqueror-devel
-%defattr(-,root,root,-)
-%{tde_tdeincludedir}/konqsidebarplugin.h
-%{tde_tdeincludedir}/KonquerorIface.h
-%{tde_libdir}/libkonqsidebarplugin.la
-%{tde_libdir}/libkonqsidebarplugin.so
-
-%post -n trinity-konqueror-devel
-/sbin/ldconfig || :
-
-%postun -n trinity-konqueror-devel
-/sbin/ldconfig || :
-
-##########
-
-%package -n trinity-konqueror-nsplugins
-Summary:	Netscape plugin support for Konqueror
-Group:		Applications/Utilities
-Requires:	trinity-konqueror = %{version}-%{release}
-
-%description -n trinity-konqueror-nsplugins
-This package includes support for Netscape plugins in Konqueror.
-
-%files -n trinity-konqueror-nsplugins
-%defattr(-,root,root,-)
-%{tde_bindir}/nspluginscan
-%{tde_bindir}/nspluginviewer
-%{tde_tdelibdir}/kcm_nsplugins.la
-%{tde_tdelibdir}/kcm_nsplugins.so
-%{tde_tdelibdir}/libnsplugin.la
-%{tde_tdelibdir}/libnsplugin.so
-%{tde_tdeappdir}/khtml_plugins.desktop
-%{tde_datadir}/apps/plugin/nspluginpart.rc
-
-%post -n trinity-konqueror-nsplugins
-update-desktop-database %{tde_appdir} 2> /dev/null || : 
-
-%postun -n trinity-konqueror-nsplugins
-update-desktop-database %{tde_appdir} 2> /dev/null || : 
-
-##########
-
-%package -n trinity-konsole
-Summary:	X terminal emulator for TDE
-Group:		Applications/Utilities
-Requires:	%{name}-data = %{version}-%{release}
-
-%description -n trinity-konsole
-Konsole is an X terminal emulation which provides a command-line interface
-(CLI) while using the graphical K Desktop Environment. Konsole helps to
-better organize user's desktop by containing multiple sessions in a single
-window (a less cluttered desktop).
-
-Its advanced features include a simple configuration and the ability to use
-multiple terminal shells in a single window
-
-Using Konsole, a user can open:
-* Linux console sessions
-* Midnight Commander file manager sessions
-* Shell sessions
-* Root consoles sessions
-
-%files -n trinity-konsole
-%defattr(-,root,root,-)
-%{tde_bindir}/konsole
-%{tde_tdelibdir}/kcm_konsole.la
-%{tde_tdelibdir}/kcm_konsole.so
-%{tde_tdelibdir}/kded_kwrited.la
-%{tde_tdelibdir}/kded_kwrited.so
-%{tde_tdelibdir}/konsole.la
-%{tde_tdelibdir}/konsole.so
-%{tde_tdelibdir}/libkonsolepart.la
-%{tde_tdelibdir}/libkonsolepart.so
-%{tde_libdir}/lib[kt]deinit_konsole.la
-%{tde_libdir}/lib[kt]deinit_konsole.so
-%{tde_tdeappdir}/konsole.desktop
-%{tde_tdeappdir}/konsolesu.desktop
-%{tde_datadir}/applnk/.hidden/kcmkonsole.desktop
-%{tde_datadir}/apps/kconf_update/konsole.upd
-%{tde_datadir}/apps/kconf_update/schemaStrip.pl
-%{tde_datadir}/apps/konqueror/servicemenus/konsolehere.desktop
-%{tde_datadir}/apps/konsole/
-%{tde_datadir}/icons/hicolor/*/apps/konsole.*
-%{tde_datadir}/mimelnk/application/x-konsole.desktop
-%{tde_datadir}/services/kded/kwrited.desktop
-%{tde_datadir}/services/konsolepart.desktop
-%{tde_datadir}/services/konsole-script.desktop
-%{tde_datadir}/services/kwrited.desktop
-%{tde_datadir}/servicetypes/terminalemulator.desktop
-%{tde_tdedocdir}/HTML/en/konsole/
-%{tde_tdedocdir}/HTML/en/kcontrol/kcmkonsole/
-
-%post -n trinity-konsole
-update-desktop-database %{tde_appdir} 2> /dev/null || : 
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f}  2> /dev/null || :
-done
-/sbin/ldconfig || :
-
-%postun -n trinity-konsole
-update-desktop-database %{tde_appdir} 2> /dev/null || : 
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f}  2> /dev/null || :
-done
-/sbin/ldconfig || :
-
-##########
-
-%package -n trinity-kpager
-Summary:	desktop pager for TDE
-Group:		Applications/Utilities
-Requires:	%{name}-data = %{version}-%{release}
-
-%description -n trinity-kpager
-This package contains TDE's desktop pager, which displays your virtual
-desktops iconically in a window, along with icons of any running
-applications. It is used to switch between applications or desktops.
-
-%files -n trinity-kpager
-%defattr(-,root,root,-)
-%{tde_bindir}/kpager
-%{tde_tdeappdir}/kpager.desktop
-%{tde_datadir}/applnk/Utilities/kpager.desktop
-%{tde_datadir}/icons/hicolor/*/apps/kpager.png
-%{tde_tdedocdir}/HTML/en/kpager/
-
-%post -n trinity-kpager
-update-desktop-database %{tde_appdir} 2> /dev/null || : 
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f}  2> /dev/null || :
-done
-
-%postun -n trinity-kpager
-update-desktop-database %{tde_appdir} 2> /dev/null || : 
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f}  2> /dev/null || :
-done
-
-##########
-
-%package -n trinity-kpersonalizer
-Summary:	installation personalizer for TDE
-Group:		Applications/Utilities
-Requires:	%{name}-data = %{version}-%{release}
-
-%description -n trinity-kpersonalizer
-TDE Personalizer is the application that configures the TDE desktop for you.
-It's a very useful wizard that allows you to quickly change the TDE desktop to
-suit your own needs. When you run TDE for the first time, KPersonalizer is
-automatically started. KPersonalizer can also be called later.
-
-%files -n trinity-kpersonalizer
-%defattr(-,root,root,-)
-%{tde_bindir}/kpersonalizer
-%{tde_tdeappdir}/kpersonalizer.desktop
-%{tde_datadir}/applnk/System/kpersonalizer.desktop
-%{tde_datadir}/apps/kpersonalizer/
-%{tde_datadir}/icons/crystalsvg/*/apps/kpersonalizer.png
-
-%post -n trinity-kpersonalizer
-update-desktop-database %{tde_appdir} 2> /dev/null || : 
-for f in crystalsvg ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f}  2> /dev/null || :
-done
-
-%postun -n trinity-kpersonalizer
-update-desktop-database %{tde_appdir} 2> /dev/null || : 
-for f in crystalsvg ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f}  2> /dev/null || :
-done
-
-##########
-
-%package -n trinity-ksmserver
-Summary:	session manager for TDE
-Group:		Applications/Utilities
-Requires:	%{name}-data = %{version}-%{release}
-Requires:	trinity-twin = %{version}-%{release}
-
-%description -n trinity-ksmserver
-This package contains the KDE session manager. It is responsible for
-restoring your TDE session on login. It is also needed to properly
-start a KDE session. It registers KDE with X display managers, and
-provides the 'starttde' command, for starting an X session with KDE
-from the console.
-
-If you are running TDE for the first time for a certain user,
-kpersonalizer is used to help with setup. If it is not present,
-KDE will start, but many good defaults will not be set.
-
-%files -n trinity-ksmserver
-%defattr(-,root,root,-)
-%{tde_bindir}/ksmserver
-%{tde_bindir}/start[kt]de
-%{tde_bindir}/migratekde3
-%{tde_tdelibdir}/ksmserver.la
-%{tde_tdelibdir}/ksmserver.so
-%{tde_libdir}/lib[kt]deinit_ksmserver.la
-%{tde_libdir}/lib[kt]deinit_ksmserver.so
-%{tde_datadir}/apps/kconf_update/ksmserver.upd
-%{tde_datadir}/apps/kconf_update/move_session_config.sh
-%{tde_datadir}/apps/ksmserver/pics/shutdownkonq.png
-%{tde_datadir}/apps/ksmserver/windowmanagers/compiz-custom.desktop
-%{tde_datadir}/apps/ksmserver/windowmanagers/compiz.desktop
-%{tde_datadir}/apps/ksmserver/windowmanagers/kwin4.desktop
-%{tde_datadir}/apps/ksmserver/windowmanagers/metacity.desktop
-%{tde_datadir}/apps/ksmserver/windowmanagers/openbox.desktop
-
-# Remove conflicts with redhat-menus
-%if "%{?tde_prefix}" != "/usr"
-%{tde_bindir}/plasma-desktop
-%endif
-
-%post -n trinity-ksmserver
-/sbin/ldconfig || :
-
-%postun -n trinity-ksmserver
-/sbin/ldconfig || :
-
-##########
-
-%package -n trinity-ksplash
-Summary:	the TDE splash screen
-Group:		Applications/Utilities
-Requires:	%{name}-data = %{version}-%{release}
-
-%description -n trinity-ksplash
-This package includes the TDE Splash screen, which is seen when
-a TDE session is launched.
-
-%files -n trinity-ksplash
-%defattr(-,root,root,-)
-%{tde_bindir}/ksplash
-%{tde_bindir}/ksplashsimple
-%{tde_tdelibdir}/kcm_ksplashthemes.la
-%{tde_tdelibdir}/kcm_ksplashthemes.so
-%{tde_tdelibdir}/ksplashdefault.la
-%{tde_tdelibdir}/ksplashdefault.so
-%{tde_tdelibdir}/ksplashunified.la
-%{tde_tdelibdir}/ksplashunified.so
-%{tde_tdelibdir}/ksplashredmond.la
-%{tde_tdelibdir}/ksplashredmond.so
-%{tde_tdelibdir}/ksplashstandard.la
-%{tde_tdelibdir}/ksplashstandard.so
-%{tde_libdir}/libksplashthemes.so.*
-%{tde_tdeappdir}/ksplashthememgr.desktop
-%{tde_datadir}/apps/ksplash
-%{tde_datadir}/services/ksplashdefault.desktop
-%{tde_datadir}/services/ksplash.desktop
-%{tde_datadir}/services/ksplashunified.desktop
-%{tde_datadir}/services/ksplashredmond.desktop
-%{tde_datadir}/services/ksplashstandard.desktop
-%{tde_datadir}/servicetypes/ksplashplugins.desktop
-%{tde_tdedocdir}/HTML/en/ksplashml/
-
-%post -n trinity-ksplash
-update-desktop-database %{tde_appdir} 2> /dev/null || : 
-/sbin/ldconfig || :
-
-%postun -n trinity-ksplash
-update-desktop-database %{tde_appdir} 2> /dev/null || : 
-/sbin/ldconfig || :
-
-##########
-
-%package -n trinity-ksplash-devel
-Summary:	Development files for ksplash
-Group:		Development/Libraries
-Requires:	trinity-ksplash = %{version}-%{release}
-
-%description -n trinity-ksplash-devel
-%{summary}
-
-%files -n trinity-ksplash-devel
-%defattr(-,root,root,-)
-%{tde_tdeincludedir}/ksplash/*
-%{tde_libdir}/libksplashthemes.la
-%{tde_libdir}/libksplashthemes.so
-
-%post -n trinity-ksplash-devel
-/sbin/ldconfig || :
-
-%postun -n trinity-ksplash-devel
-/sbin/ldconfig || :
-
-##########
-
-%package -n trinity-ksysguard
-Summary:	system guard for TDE
-Group:		Applications/Utilities
-Requires:	%{name}-data = %{version}-%{release}
-Requires:	trinity-ksysguardd = %{version}-%{release}
-
-%description -n trinity-ksysguard
-TDE System Guard allows you to monitor various statistics about your
-computer.
-
-%files -n trinity-ksysguard
-%defattr(-,root,root,-)
-%{tde_bindir}/kpm
-%{tde_bindir}/ksysguard
-%{tde_tdelibdir}/sysguard_panelapplet.la
-%{tde_tdelibdir}/sysguard_panelapplet.so
-%{tde_libdir}/libksgrd.so.*
-%{tde_tdeappdir}/ksysguard.desktop
-%{tde_datadir}/apps/kicker/applets/ksysguardapplet.desktop
-%{tde_datadir}/apps/ksysguard/
-%{tde_datadir}/icons/crystalsvg/*/apps/ksysguard.png
-%{tde_datadir}/mimelnk/application/x-ksysguard.desktop
-%{tde_tdedocdir}/HTML/en/ksysguard/
-
-%post -n trinity-ksysguard
-update-desktop-database %{tde_appdir} 2> /dev/null || : 
-for f in crystalsvg ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f}  2> /dev/null || :
-done
-/sbin/ldconfig || :
-
-%postun -n trinity-ksysguard
-update-desktop-database %{tde_appdir} 2> /dev/null || : 
-for f in crystalsvg ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f}  2> /dev/null || :
-done
-/sbin/ldconfig || :
-
-##########
-
-%package -n trinity-ksysguard-devel
-Summary:	Development files for ksysguard
-Group:		Development/Libraries
-Requires:	trinity-ksysguard = %{version}-%{release}
-
-%description -n trinity-ksysguard-devel
-%{summary}
-
-%files -n trinity-ksysguard-devel
-%defattr(-,root,root,-)
-%{tde_tdeincludedir}/ksgrd/*
-%{tde_libdir}/libksgrd.la
-%{tde_libdir}/libksgrd.so
-
-%post -n trinity-ksysguard-devel
-/sbin/ldconfig || :
-
-%postun -n trinity-ksysguard-devel
-/sbin/ldconfig || :
-
-##########
-
-%package -n trinity-ksysguardd
-Summary:	system guard daemon for TDE
-Group:		Applications/Utilities
-Requires:	%{name}-data = %{version}-%{release}
-
-%description -n trinity-ksysguardd
-TDE System Guard Daemon is the daemon part of ksysguard. The daemon can
-be installed on a remote machine to enable ksysguard on another machine
-to monitor it through the daemon running there.
-
-%files -n trinity-ksysguardd
-%defattr(-,root,root,-)
-%{tde_bindir}/ksysguardd
-%config(noreplace) %{_sysconfdir}/trinity/ksysguarddrc
-
-##########
-
-%package -n trinity-ktip
-Summary:	useful tips for TDE
-Group:		Applications/Utilities
-Requires:	%{name}-data = %{version}-%{release}
-
-%description -n trinity-ktip
-ktip provides many useful tips on using TDE when you log in.
-
-%files -n trinity-ktip
-%defattr(-,root,root,-)
-%{tde_bindir}/ktip
-%{tde_tdeappdir}/ktip.desktop
-%{tde_datadir}/applnk/Toys/ktip.desktop
-%{tde_datadir}/apps/kdewizard/pics/wizard_small.png
-%{tde_datadir}/apps/kdewizard/tips/
-%{tde_datadir}/autostart/ktip.desktop
-%{tde_datadir}/icons/hicolor/*/apps/ktip.*
-
-%post -n trinity-ktip
-update-desktop-database %{tde_appdir} 2> /dev/null || : 
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f}  2> /dev/null || :
-done
-
-%postun -n trinity-ktip
-update-desktop-database %{tde_appdir} 2> /dev/null || : 
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f}  2> /dev/null || :
-done
-
-##########
-
-%package -n trinity-twin
-Summary:	the TDE window manager
-Group:		Applications/Utilities
-Requires:	%{name}-data = %{version}-%{release}
-
-%description -n trinity-twin
-This package contains the default X window manager for TDE.
-
-%files -n trinity-twin
-%defattr(-,root,root,-)
-%{tde_bindir}/kompmgr
-%{tde_bindir}/[kt]win
-%{tde_bindir}/[kt]win_killer_helper
-#%{tde_bindir}/[kt]win_resumer_helper
-%{tde_bindir}/[kt]win_rules_dialog
-%{tde_libdir}/kconf_update_bin/[kt]win_update_default_rules
-%{tde_libdir}/kconf_update_bin/[kt]win_update_window_settings
-%{tde_tdelibdir}/kcm_[kt]win*.la
-%{tde_tdelibdir}/kcm_[kt]win*.so
-%{tde_tdelibdir}/[kt]win*.la
-%{tde_tdelibdir}/[kt]win*.so
-%{tde_libdir}/lib[kt]decorations.so.*
-%{tde_libdir}/lib[kt]deinit_[kt]win_rules_dialog.la
-%{tde_libdir}/lib[kt]deinit_[kt]win_rules_dialog.so
-%{tde_libdir}/lib[kt]deinit_[kt]win.la
-%{tde_libdir}/lib[kt]deinit_[kt]win.so
-%{tde_tdeappdir}/showdesktop.desktop
-%{tde_tdeappdir}/[kt]windecoration.desktop
-%{tde_tdeappdir}/[kt]winoptions.desktop
-%{tde_tdeappdir}/[kt]winrules.desktop
-%{tde_datadir}/applnk/.hidden/[kt]winactions.desktop
-%{tde_datadir}/applnk/.hidden/[kt]winadvanced.desktop
-%{tde_datadir}/applnk/.hidden/[kt]winfocus.desktop
-%{tde_datadir}/applnk/.hidden/[kt]winmoving.desktop
-%{tde_datadir}/applnk/.hidden/[kt]wintranslucency.desktop
-%{tde_datadir}/apps/kconf_update/[kt]win3_plugin.pl
-%{tde_datadir}/apps/kconf_update/[kt]win3_plugin.upd
-%{tde_datadir}/apps/kconf_update/[kt]win_focus1.sh
-%{tde_datadir}/apps/kconf_update/[kt]win_focus1.upd
-%{tde_datadir}/apps/kconf_update/[kt]win_focus2.sh
-%{tde_datadir}/apps/kconf_update/[kt]win_focus2.upd
-%{tde_datadir}/apps/kconf_update/[kt]win_fsp_workarounds_1.upd
-%{tde_datadir}/apps/kconf_update/[kt]winiconify.upd
-%{tde_datadir}/apps/kconf_update/[kt]winsticky.upd
-%{tde_datadir}/apps/kconf_update/[kt]win.upd
-%{tde_datadir}/apps/kconf_update/[kt]winupdatewindowsettings.upd
-%{tde_datadir}/apps/kconf_update/pluginlibFix.pl
-%{tde_datadir}/apps/[kt]win/
-%{tde_datadir}/config.kcfg/[kt]win.kcfg
-%{tde_datadir}/icons/crystalsvg/*/apps/[kt]win.png
-%{tde_tdedocdir}/HTML/en/kompmgr/
-
-%post -n trinity-twin
-update-desktop-database %{tde_appdir} 2> /dev/null || : 
-for f in crystalsvg ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f}  2> /dev/null || :
-done
-/sbin/ldconfig || :
-
-%postun -n trinity-twin
-update-desktop-database %{tde_appdir} 2> /dev/null || : 
-for f in crystalsvg ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f}  2> /dev/null || :
-done
-/sbin/ldconfig || :
-
-##########
-
-%package -n trinity-twin-devel
-Summary:	Development files for twin
-Group:		Development/Libraries
-Requires:	trinity-twin = %{version}-%{release}
-
-%description -n trinity-twin-devel
-%{summary}
-
-%files -n trinity-twin-devel
-%defattr(-,root,root,-)
-%{tde_tdeincludedir}/[kt]win/
-%{tde_tdeincludedir}/kcommondecoration.h
-%{tde_tdeincludedir}/kdecoration.h
-%{tde_tdeincludedir}/kdecoration_p.h
-%{tde_tdeincludedir}/kdecoration_plugins_p.h
-%{tde_tdeincludedir}/kdecorationfactory.h
-%{tde_tdeincludedir}/KWinInterface.h
-%{tde_libdir}/libkdecorations.la
-%{tde_libdir}/libkdecorations.so
-
-%post -n trinity-twin-devel
-/sbin/ldconfig || :
-
-%postun -n trinity-twin-devel
-/sbin/ldconfig || :
-
-##########
-
-%package -n trinity-libkonq
-Summary:	core libraries for Konqueror
-Group:		Environment/Libraries
-
-%description -n trinity-libkonq
-These libraries are used by several TDE applications, most notably
-Konqueror and the kdesktop package.
-
-%files -n trinity-libkonq
-%defattr(-,root,root,-)
-%{tde_tdelibdir}/kded_favicons.la
-%{tde_tdelibdir}/kded_favicons.so
-%{tde_tdelibdir}/konq_sound.la
-%{tde_tdelibdir}/konq_sound.so
-%{tde_libdir}/libkonq.so.*
-%{tde_datadir}/apps/kbookmark/directory_bookmarkbar.desktop
-%{tde_datadir}/apps/kconf_update/favicons.upd
-%{tde_datadir}/apps/kconf_update/move_favicons.sh
-%{tde_datadir}/apps/konqueror/pics/arrow_bottomleft.png
-%{tde_datadir}/apps/konqueror/pics/arrow_bottomright.png
-%{tde_datadir}/apps/konqueror/pics/arrow_topleft.png
-%{tde_datadir}/apps/konqueror/pics/arrow_topright.png
-%{tde_datadir}/apps/konqueror/pics/thumbnailfont_7x4.png
-%{tde_datadir}/services/kded/favicons.desktop
-%{tde_datadir}/servicetypes/konqpopupmenuplugin.desktop
-
-%post -n trinity-libkonq
-/sbin/ldconfig || :
-
-%postun -n trinity-libkonq
-/sbin/ldconfig || :
-
-##########
-
-%package libtqt3-integration
-Summary:	Integration library between TQt3 and TDE
-Group:		Environment/Libraries
-
-Obsoletes:	tdebase-libtqt3-integration < %{version}-%{release}
-Provides:	tdebase-libtqt3-integration = %{version}-%{release}
-
-%description libtqt3-integration
-These libraries allow you to use TDE dialogs in native TQt3 applications.
-
-%files libtqt3-integration
-%defattr(-,root,root,-)
-%{tde_tdelibdir}/plugins/integration/libqtkde.la
-%{tde_tdelibdir}/plugins/integration/libqtkde.so
-%{tde_tdelibdir}/plugins/integration/libqtkde.so.*
-%{tde_tdelibdir}/kded_kdeintegration.la
-%{tde_tdelibdir}/kded_kdeintegration.so
-%{tde_datadir}/services/kded/kdeintegration.desktop
-
-##########
-
-%package -n trinity-libkonq-devel
-Summary:	development files for Konqueror's core libraries
-Group:		Development/Libraries
-Requires:	trinity-libkonq = %{version}-%{release}
-
-%description -n trinity-libkonq-devel
-This package contains headers and other development files for the core
-Konqueror libraries.
-
-%files -n trinity-libkonq-devel
-%defattr(-,root,root,-)
-%{tde_tdeincludedir}/kfileivi.h
-%{tde_tdeincludedir}/kivdirectoryoverlay.h
-%{tde_tdeincludedir}/knewmenu.h
-%{tde_tdeincludedir}/konqbookmarkmanager.h
-%{tde_tdeincludedir}/konq_*.h
-%{tde_tdeincludedir}/libkonq_export.h
-%{tde_libdir}/libkonq.la
-%{tde_libdir}/libkonq.so
-
-%post -n trinity-libkonq-devel
-/sbin/ldconfig || :
-
-%postun -n trinity-libkonq-devel
-/sbin/ldconfig || :
-
-##########
-
-%package tdeio-smb-plugin
-Summary:        Windows Connection Module for TDE
-Group:          Environment/Libraries
-
-%description tdeio-smb-plugin
-This package provides the "smb://" protocol, to connect to and from
-Windows and Samba shares.
-
-%files tdeio-smb-plugin
-%defattr(-,root,root)
-%{tde_tdelibdir}/kcm_samba.la
-%{tde_tdelibdir}/kcm_samba.so
-%{tde_tdelibdir}/kio_smb.la
-%{tde_tdelibdir}/kio_smb.so
-%{tde_datadir}/services/smb.protocol
-%{tde_datadir}/apps/konqueror/dirtree/remote/smb-network.desktop
-%{tde_datadir}/apps/remoteview/smb-network.desktop
-%{tde_datadir}/mimelnk/application/x-smb-workgroup.desktop
-
-##########
-
-%if 0%{?suse_version} || 0%{?pclinuxos}
-%debug_package
-%endif
-
-##########
-
-%prep
-%setup -q -n %{name}-%{version}%{?preversion:~%{preversion}}
-
-%patch10 -p1 -b .kdesu_no_ignore
-%patch11 -p1 -b .openterminalhere
-%if 0%{?rhel} || 0%{?fedora}
-%patch13 -p1 -b .Xsession
-%endif
-%if 0%{?suse_version}
-%patch14 -p1 -b .Xsession
-%endif
-%patch15 -p1 -b .tdeicon
-%patch30 -p1 -b .xtestsupport
-%patch31 -p1 -b .pid
-%patch39 -p1 -b .kickoff_default_favs
-%patch40 -p1 -b .kickoff_packagekit_shortcut
-%patch41 -p1 -b .translation
-%patch45 -p1 -b .vibrate_dialog
-%patch50 -p1 -b .kcontrol_menu_entry
-%patch51 -p1 -b .kdesktop_crossfade
-%patch52 -p1 -b .select_wm_gui
-%patch53 -p1 -b .kickoff_xdg
-%patch54 -p1 -b .suspend_unmount
-%patch55 -p1 -b .bookmark_global_copy
-%patch56 -p1 -b .kdm_theme_selector
-#patch57 -p1 -b .kbackground_xml_selector
-
-%patch108 -p1 -b .kdm_utf8_password
-%patch112 -p1
-
-%if 0%{?rhel} == 4
-%patch201 -p1 -b .libdetect
-%patch202 -p1 -b .dbustqt
-%patch203 -p1 -b .consolekit
-%patch204 -p1 -b .composite
-%patch205 -p1 -b .hal04
-%patch206 -p1 -b .rhel4
-%endif
-
-# Applies an optional distro-specific graphical theme
-%if "%{?tde_bg}" != ""
-# KDM Background
-%__sed -i "kdm/kfrontend/genkdmconf.c" \
-	-e 's|"Wallpaper=isadora.png\n"|"Wallpaper=%{tde_bg}\n"|'
-
-# TDE user default background
-%__sed -i "kpersonalizer/keyecandypage.cpp" \
-	-e 's|#define DEFAULT_WALLPAPER "isadora.png"|#define DEFAULT_WALLPAPER "%{tde_bg}"|'
-%__sed -i "startkde" \
-	-e 's|/usr/share/wallpapers/isadora.png.desktop|%{tde_bg}|' \
-	-e 's|Wallpaper=isadora.png|Wallpaper=%{tde_bg}|'
-%endif
-
-# TDE branding: removes KUbuntu references [Bug #617]
-%__sed -i "kcontrol/kdm/kdm-appear.cpp" \
-	-e "s|Welcome to Kubuntu |Welcome to %{tde_aboutlabel} |"
-%__sed -i "konqueror/about/konq_aboutpage.cc" \
-	-e "s|About Kubuntu|About %{tde_aboutlabel}|" \
-	-e "s|help:/kubuntu/|%{tde_aboutpage}|" \
-	-e "s|Kubuntu Documentation|%{tde_aboutlabel} Documentation|"
-%__sed -i "konqueror/about/launch.html" \
-	-e "s|help:/kubuntu/about-kubuntu/index.html|%{tde_aboutpage}|"
-%__sed -i "kdm/config.def" \
-	-e "s|Welcome to Trinity |Welcome to %{tde_aboutlabel} |"
-
-# TDE default directory in 'startkde' script (KDEDIR)
-%__sed -i "startkde" \
-	-e "s|/opt/trinity|%{tde_prefix}|g"
-
-# TDE default start button icon
-%__sed -i "startkde" \
-	-e "s|%%{tde_starticon}|%{tde_starticon}|g"
-
-
-%build
-unset QTDIR || : ; . /etc/profile.d/qt3.sh
-export PATH="%{tde_bindir}:${PATH}"
-export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
-export CMAKE_INCLUDE_PATH="%{tde_includedir}:%{tde_includedir}/tqt"
-export LD_LIBRARY_PATH="%{tde_libdir}"
-
-# Avoids building against KDE3's old stuff, if installed
-export KDEDIR=%{tde_prefix}
-
-# Shitty hack for RHEL4 ...
-if [ -d "/usr/X11R6" ]; then
-  export CMAKE_INCLUDE_PATH="${CMAKE_INCLUDE_PATH}:/usr/X11R6/include:/usr/X11R6/%{_lib}"
-  export CFLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}"
-  export CXXFLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}"
-fi
-
-# Samba 4.0 includes (Fedora 18)
-if [ -d "/usr/include/samba-4.0" ]; then
-  export CMAKE_INCLUDE_PATH="${CMAKE_INCLUDE_PATH}:/usr/include/samba-4.0"
-fi
-
-%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version}
-%__mkdir_p build
-cd build
-%endif
-
-%cmake \
-  -DBIN_INSTALL_DIR="%{tde_bindir}" \
-  -DINCLUDE_INSTALL_DIR="%{tde_tdeincludedir}" \
-  -DLIB_INSTALL_DIR="%{tde_libdir}" \
-  -DSHARE_INSTALL_PREFIX="%{tde_datadir}" \
-  -DCMAKE_SKIP_RPATH="OFF" \
-  -DCONFIG_INSTALL_DIR="/etc/trinity" \
-  -DSYSCONF_INSTALL_DIR="/etc/trinity" \
-  -DXDG_MENU_INSTALL_DIR="/etc/xdg/menus" \
-  -DWITH_SASL=ON \
-  -DWITH_LDAP=ON \
-  -DWITH_SAMBA=ON \
-  %{?with_exr:-DWITH_OPENEXR=ON} \
-  -DWITH_XCOMPOSITE=ON \
-  -DWITH_XCURSOR=ON \
-  -DWITH_XFIXES=ON \
-  %{?with_xrandr:-DWITH_XRANDR=ON} \
-  -DWITH_XRENDER=ON \
-  -DWITH_XDAMAGE=ON \
-  -DWITH_XEXT=ON \
-  %{?with_xtest:-DWITH_XTEST=ON} \
-  %{?with_xscreensaver:-DWITH_XSCREENSAVER=ON} \
-  %{?with_libart:-DWITH_LIBART=ON} \
-  -DWITH_LIBUSB=ON \
-  -DWITH_LIBRAW1394=ON \
-  -DWITH_SUDO_KDESU_BACKEND=OFF \
-  -DWITH_PAM=ON \
-  -DWITH_SHADOW=ON \
-  -DWITH_XDMCP=ON \
-  -DWITH_XINERAMA=ON \
-  -DWITH_ARTS=ON \
-  -DWITH_I8K=ON \
-  %{?with_hal:-DWITH_HAL=ON} \
-  -DWITH_KDESKTOP_LOCK_BACKTRACE=OFF \
-  -DBUILD_ALL=ON \
-%if 0%{?suse_version}
-  -DKCHECKPASS_PAM_SERVICE="xdm" \
-  -DKDM_PAM_SERVICE="xdm" \
-  -DKSCREENSAVER_PAM_SERVICE="xdm" \
-%else
-  -DKCHECKPASS_PAM_SERVICE="kcheckpass-trinity" \
-  -DKDM_PAM_SERVICE="kdm-trinity" \
-  -DKSCREENSAVER_PAM_SERVICE="kscreensaver-trinity" \
-%endif
-  %{!?with_tsak:-DBUILD_TSAK=OFF} \
-  ..
-
-%__make %{?_smp_mflags} || %__make
-
-
-%install
-%__rm -rf %{?buildroot}
-%__make install DESTDIR=%{?buildroot} -C build
-
-# Removes obsolete Beagle-related files
-%__rm -f %{?buildroot}%{tde_bindir}/khc_beagle_index.pl
-%__rm -f %{?buildroot}%{tde_bindir}/khc_beagle_search.pl
-
-# Adds a GDM/KDM/XDM session called 'TDE'
-
-# Under RHEL/Fedora/Suse, static 'xsessions' files go to '/usr/share/xsessions'.
-%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version}
-%__install -D -m 644 \
-	"%{?buildroot}%{tde_datadir}/apps/kdm/sessions/tde.desktop" \
-	"%{?buildroot}%{_datadir}/xsessions/tde.desktop"
-
-# Force session name to be 'TDE'
-%__sed -i "%{?buildroot}%{_datadir}/xsessions/tde.desktop" \
-	-e "s,^Name=.*,Name=TDE,"
-%endif
-
-# Mageia/Mandriva/PCLinuxOS stores its session file in different folder than RHEL/Fedora
-# Generated files for TDM/KDM4 go to '/usr/share/apps/kdm/sessions'
-%if 0%{?mgaversion} || 0%{?mdkversion}
-%__install -d -m 755 %{?buildroot}%{_sysconfdir}/X11/wmsession.d
-cat <<EOF >"%{?buildroot}%{_sysconfdir}/X11/wmsession.d/45TDE"
-NAME=TDE
-ICON=kde-wmsession.xpm
-DESC=The Trinity Desktop Environment
-EXEC=%{tde_bindir}/startkde
-SCRIPT:
-exec %{tde_bindir}/startkde
-EOF
-
-%__install -d -m 755 %{?buildroot}%{_datadir}/X11/dm.d
-cat <<EOF >"%{?buildroot}%{_datadir}/X11/dm.d/45TDE.conf"
-NAME=TDM
-DESCRIPTION=TDM (Trinity Display Manager)
-PACKAGE=trinity-tdm
-EXEC=%{tde_bindir}/kdm
-FNDSESSION_EXEC="/usr/sbin/chksession -k"
-EOF
-%endif
-
-# TDE 3.5.12: add script "plasma-desktop" to avoid conflict with KDE4
-%if "%{?tde_prefix}" != "/usr"
-%__install -m 755 "%{SOURCE1}" "%{?buildroot}%{tde_bindir}"
-%endif
-
-# PAM configuration files (except openSUSE)
-%if 0%{?suse_version} == 0
-%__install -D -m 644 "%{SOURCE2}" "%{?buildroot}%{_sysconfdir}/pam.d/kdm-trinity"
-%__install -D -m 644 "%{SOURCE3}" "%{?buildroot}%{_sysconfdir}/pam.d/kdm-trinity-np"
-%__install -D -m 644 "%{SOURCE4}" "%{?buildroot}%{_sysconfdir}/pam.d/kcheckpass-trinity"
-%__install -D -m 644 "%{SOURCE5}" "%{?buildroot}%{_sysconfdir}/pam.d/kscreensaver-trinity"
-%endif
-
-# KDM configuration
-%__sed -i "%{?buildroot}%{_sysconfdir}/trinity/kdm/kdmrc" \
-%if 0%{?fedora} >= 16 || 0%{?suse_version} >= 1220
-	-e "s/^#*MinShowUID=.*/MinShowUID=1000/"
-%else
-	-e "s/^#*MinShowUID=.*/MinShowUID=500/"
-%endif
-
-# Moves the XDG configuration files to TDE directory
-%if "%{tde_prefix}" != "/usr"
-%__mkdir_p "%{?buildroot}%{tde_prefix}/etc"
-%__mv -f "%{?buildroot}%{_sysconfdir}/xdg" "%{?buildroot}%{tde_prefix}/etc"
-%endif
-
-# Symlinks 'usb.ids' (Use system-provided version, not TDE provided version)
-%__rm -f "%{?buildroot}%{tde_datadir}/apps/usb.ids"
-%if 0%{?suse_version} 
-%__ln_s -f "/usr/share/usb.ids" "%{?buildroot}%{tde_datadir}/apps/usb.ids"
-%else
-%__ln_s -f "/usr/share/hwdata/usb.ids" "%{?buildroot}%{tde_datadir}/apps/usb.ids"
-%endif
-
-# Makes 'media_safelyremove.desktop' an alternative
-%__mv -f "%{buildroot}%{tde_datadir}/apps/konqueror/servicemenus/media_safelyremove.desktop" "%{buildroot}%{tde_datadir}/apps/konqueror/servicemenus/media_safelyremove.desktop_tdebase"
-%__ln_s "%{_sysconfdir}/alternatives/media_safelyremove.desktop_tdebase" "%{buildroot}%{tde_datadir}/apps/konqueror/servicemenus/media_safelyremove.desktop"
-%__mkdir_p "%{?buildroot}%{_sysconfdir}/alternatives"
-%__ln_s "%{tde_datadir}/apps/konqueror/servicemenus/media_safelyremove.desktop_tdebase" "%{?buildroot}%{_sysconfdir}/alternatives/media_safelyremove.desktop_tdebase"
-
-# SUSE: creates DM config file, used by '/etc/init.d/xdm'
-#  You must set 'DISPLAYMANAGER=tdm' in '/etc/sysconfig/displaymanager'
-%if 0%{?suse_version}
-%__install -D -m 644 "%{SOURCE6}" "%{?buildroot}/usr/lib/X11/displaymanagers/tdm"
-%__sed -i "%{?buildroot}/usr/lib/X11/displaymanagers/tdm" -e "s|/opt/trinity/bin|%{tde_bindir}|g"
-%endif
-
-# Fedora 18: no more SYSV init script, we have to use systemd.
-%if 0%{?fedora} >= 18
-%__install -D -m 644 "%{SOURCE7}" "%{?buildroot}/usr/lib/systemd/system/tdm.service"
-%endif
-
-# Symlink KDM configuration
-%__mkdir_p "%{?buildroot}%{tde_datadir}/config"
-%__ln_s "%{_sysconfdir}/trinity/kdm" "%{?buildroot}%{tde_datadir}/config/kdm"
-
-# SELINUX policy
-%if 0%{?with_selinux_policy}
-%__install -D -m 644 "%{SOURCE8}" "%{?buildroot}%{?_sysconfdir}/trinity/kdm/tdm.pp"
-%endif
-
-
-%clean
-%__rm -rf %{?buildroot}
-
-
-%changelog
-* Sat Jan 19 2013 Francois Andriot <francois.andriot@free.fr> - 3.5.13.2-1
-- Initial release for TDE 3.5.13.2
-- 
cgit v1.2.1


From 63e578e0c5da59768259fdacd7f52fe7018ce2ef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Andriot?= <albator78@libertysurf.fr>
Date: Fri, 3 Oct 2014 23:57:35 +0200
Subject: RPM Package: add trinity-filesystem

---
 redhat/Makefile.r14                                |   7 +-
 redhat/build/build_rpm_package.sh                  |   2 +-
 redhat/dependencies/arts/arts-14.0.0.spec          |  10 +-
 .../tqtinterface/tqtinterface-14.0.0.spec          |   1 -
 .../trinity-filesystem/trinity-filesystem.spec     | 145 +++++++++++++++++++++
 redhat/tdelibs/tdelibs-14.0.0.spec                 |   1 +
 6 files changed, 153 insertions(+), 13 deletions(-)
 create mode 100644 redhat/extras/trinity-filesystem/trinity-filesystem.spec

diff --git a/redhat/Makefile.r14 b/redhat/Makefile.r14
index 705f98633..9421c0db9 100644
--- a/redhat/Makefile.r14
+++ b/redhat/Makefile.r14
@@ -30,7 +30,7 @@ extras:	icons-nuvola kdevmon kdissert klamav kompose koverartist kpacman style-i
 
 
 ### Trinity Dependencies
-arts:	tqtinterface esound cmake
+arts:	tqtinterface trinity-filesystem esound cmake
 	$(call buildpkg,dependencies/arts)
 
 avahi-tqt:	tqtinterface
@@ -100,7 +100,7 @@ tdegames:	tdebase tdemultimedia
 tdegraphics:	tdebase poppler cmake
 	$(call buildpkg,tdegraphics)
 
-tdelibs:	tqt3 tqtinterface arts dbus-tqt dbus-1-tqt cmake avahi-tqt
+tdelibs:	tqt3 tqtinterface trinity-filesystem arts dbus-tqt dbus-1-tqt cmake avahi-tqt
 	$(call buildpkg,tdelibs)
 
 tdemultimedia:	tdebase akode
@@ -685,3 +685,6 @@ kpacman:
 
 style-ia-ora:
 	$(call buildpkg,extras/style-ia-ora)
+
+trinity-filesystem:
+	$(call buildpkg,extras/trinity-filesystem)
diff --git a/redhat/build/build_rpm_package.sh b/redhat/build/build_rpm_package.sh
index b927b8a0f..2eca7cef5 100755
--- a/redhat/build/build_rpm_package.sh
+++ b/redhat/build/build_rpm_package.sh
@@ -66,7 +66,7 @@ rpmbuild -ba \
   --define "packager Francois\ Andriot\ <francois.andriot@free.fr>" \
   --define "tde_version ${TDE_VERSION}" \
   --define "tde_prefix /opt/trinity" \
-  --define "preversion ${PREVERSION}" \
+  --define "preversion ${PREVERSION:\\\"\\\"}" \
   ${ARGS} \
   "${TEMPDIR}/${SPECFILE##*/}"
 RET=$?
diff --git a/redhat/dependencies/arts/arts-14.0.0.spec b/redhat/dependencies/arts/arts-14.0.0.spec
index 1f7408f49..abf983a50 100644
--- a/redhat/dependencies/arts/arts-14.0.0.spec
+++ b/redhat/dependencies/arts/arts-14.0.0.spec
@@ -54,6 +54,7 @@ BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Source0:	%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
 
 BuildRequires:	libtqt4-devel >= 1:4.2.0
+Requires:		trinity-filesystem >= %{tde_version}
 
 BuildRequires:	cmake >= 2.8
 BuildRequires:	gcc-c++
@@ -138,17 +139,8 @@ playing a wave file with some effects.
 %files
 %defattr(-,root,root,-)
 %doc COPYING.LIB
-%dir %{tde_prefix}
-%dir %{tde_bindir}
-%dir %{tde_datadir}
-%dir %{tde_datadir}/config
-%dir %{tde_datadir}/doc
-%dir %{tde_libdir}
 %dir %{tde_libdir}/mcop
 %dir %{tde_libdir}/mcop/Arts
-%dir %{tde_libdir}/pkgconfig
-%dir %{tde_includedir}
-%dir %{tde_tdeincludedir}
 %{tde_libdir}/mcop/Arts/*
 %{tde_libdir}/mcop/*.mcopclass
 %{tde_libdir}/mcop/*.mcoptype
diff --git a/redhat/dependencies/tqtinterface/tqtinterface-14.0.0.spec b/redhat/dependencies/tqtinterface/tqtinterface-14.0.0.spec
index d3564904b..d1e78eac3 100755
--- a/redhat/dependencies/tqtinterface/tqtinterface-14.0.0.spec
+++ b/redhat/dependencies/tqtinterface/tqtinterface-14.0.0.spec
@@ -97,7 +97,6 @@ Provides:	libtqt4 = %{?epoch:%{epoch}:}%{version}-%{release}
 
 Requires:	libtqt3-mt >= 3.5.0
 
-Requires:		libtqt3-mt >= 3.5.0
 %if 0%{?suse_version} && 0%{?suse_version} < 1300
 Requires:		trinity-cmake-macros
 %endif
diff --git a/redhat/extras/trinity-filesystem/trinity-filesystem.spec b/redhat/extras/trinity-filesystem/trinity-filesystem.spec
new file mode 100644
index 000000000..082f68c61
--- /dev/null
+++ b/redhat/extras/trinity-filesystem/trinity-filesystem.spec
@@ -0,0 +1,145 @@
+#
+# spec file for package trinity-filesystem
+#
+# Copyright (c) 2014 François Andriot <francois.andriot@free.fr>
+#
+# All modifications and additions to the file contributed by third parties
+# remain the property of their copyright owners, unless otherwise agreed
+# upon. The license for this file, and modifications and additions to the
+# file, is the same license as for the pristine package itself (unless the
+# license for the pristine package is not an Open Source License, in which
+# case the license is the MIT License). An "Open Source License" is a
+# license that conforms to the Open Source Definition (Version 1.9)
+# published by the Open Source Initiative.
+#
+# Please submit bugfixes or comments via http:/www.trinitydesktop.org/
+#
+
+# TDE variables
+%define tde_version 14.0.0
+%define tde_prefix /opt/trinity
+%define tde_bindir %{tde_prefix}/bin
+%define tde_datadir %{tde_prefix}/share
+%define _docdir %{tde_docdir}
+%define tde_docdir %{tde_datadir}/doc
+%define tde_tdedocdir %{tde_docdir}/tde
+%define tde_includedir %{tde_prefix}/include
+%define tde_tdeincludedir %{tde_includedir}/tde
+%define tde_libdir %{tde_prefix}/%{_lib}
+%define tde_tdelibdir %{tde_libdir}/trinity
+
+
+
+Name:		trinity-filesystem
+Version:	%{tde_version}
+Release:	1%{?dist}
+Summary:	Trinity Directory Layout
+Group:		System/Fhs
+URL:		http://www.trinitydesktop.org/
+
+%if 0%{?suse_version}
+License:	GPL-2.0+
+%else
+License:	GPLv2+
+%endif
+
+#Vendor:		Trinity Desktop
+#Packager:	Francois Andriot <francois.andriot@free.fr>
+
+Prefix:		/usr
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildArch:	noarch
+
+
+%description
+This package installs the Trinity directory structure.
+
+
+%files
+%dir %{tde_prefix}
+
+%dir %{tde_bindir}
+
+%dir %{tde_datadir}
+%dir %{tde_datadir}/config
+
+%dir %{tde_docdir}
+%dir %{tde_tdedocdir}
+%dir %{tde_tdedocdir}/HTML
+%dir %{tde_tdedocdir}/HTML/en
+%dir %{tde_tdedocdir}/HTML/en/common
+
+%dir %{tde_includedir}
+%dir %{tde_tdeincludedir}
+
+%dir %{tde_libdir}
+%dir %{tde_libdir}/pkgconfig
+%dir %{tde_tdelibdir}
+
+%dir %{tde_datadir}/applications
+%dir %{tde_datadir}/applications/tde
+%dir %{tde_datadir}/applnk
+%dir %{tde_datadir}/apps
+%dir %{tde_datadir}/config.kcfg
+%dir %{tde_datadir}/autostart
+%dir %{tde_datadir}/emoticons
+%dir %{tde_datadir}/icons
+%dir %{tde_datadir}/icons/crystalsvg
+%dir %{tde_datadir}/icons/hicolor
+%dir %{tde_datadir}/locale
+%dir %{tde_datadir}/mimelnk
+%dir %{tde_datadir}/services
+%dir %{tde_datadir}/servicetypes
+
+%dir %{_sysconfdir}/trinity
+
+##########
+
+%prep
+
+%build
+
+%install
+%__install -d -m 755 %{?buildroot}%{tde_prefix}
+
+%__install -d -m 755 %{?buildroot}%{tde_bindir}
+
+%__install -d -m 755 %{?buildroot}%{tde_datadir}
+%__install -d -m 755 %{?buildroot}%{tde_datadir}/applications
+%__install -d -m 755 %{?buildroot}%{tde_datadir}/applications/tde
+%__install -d -m 755 %{?buildroot}%{tde_datadir}/applnk
+%__install -d -m 755 %{?buildroot}%{tde_datadir}/apps
+%__install -d -m 755 %{?buildroot}%{tde_datadir}/autostart
+%__install -d -m 755 %{?buildroot}%{tde_datadir}/config
+%__install -d -m 755 %{?buildroot}%{tde_datadir}/config.kcfg
+%__install -d -m 755 %{?buildroot}%{tde_datadir}/emoticons
+%__install -d -m 755 %{?buildroot}%{tde_datadir}/icons
+%__install -d -m 755 %{?buildroot}%{tde_datadir}/icons/crystalsvg
+%__install -d -m 755 %{?buildroot}%{tde_datadir}/icons/hicolor
+%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale
+%__install -d -m 755 %{?buildroot}%{tde_datadir}/mimelnk
+%__install -d -m 755 %{?buildroot}%{tde_datadir}/services
+%__install -d -m 755 %{?buildroot}%{tde_datadir}/servicetypes
+
+%__install -d -m 755 %{?buildroot}%{tde_docdir}
+%__install -d -m 755 %{?buildroot}%{tde_tdedocdir}
+%__install -d -m 755 %{?buildroot}%{tde_tdedocdir}/HTML
+%__install -d -m 755 %{?buildroot}%{tde_tdedocdir}/HTML/en
+%__install -d -m 755 %{?buildroot}%{tde_tdedocdir}/HTML/en/common
+
+%__install -d -m 755 %{?buildroot}%{tde_includedir}
+%__install -d -m 755 %{?buildroot}%{tde_tdeincludedir}
+
+%__install -d -m 755 %{?buildroot}%{tde_libdir}
+%__install -d -m 755 %{?buildroot}%{tde_libdir}/pkgconfig
+%__install -d -m 755 %{?buildroot}%{tde_tdelibdir}
+
+%__install -d -m 755 %{?buildroot}%{_datadir}/icons/hicolor
+%__install -d -m 755 %{?buildroot}%{_datadir}/icons/hicolor/32x32
+%__install -d -m 755 %{?buildroot}%{_datadir}/icons/hicolor/32x32/apps
+
+%__install -d -m 755 %{?buildroot}%{_sysconfdir}/trinity
+
+%changelog
+* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 14.0.0-1
+- Initial build for TDE R14
diff --git a/redhat/tdelibs/tdelibs-14.0.0.spec b/redhat/tdelibs/tdelibs-14.0.0.spec
index 14cd5bf06..f8ddf2030 100644
--- a/redhat/tdelibs/tdelibs-14.0.0.spec
+++ b/redhat/tdelibs/tdelibs-14.0.0.spec
@@ -74,6 +74,7 @@ BuildRequires:	libdbus-tqt-1-devel >= 2:0.63
 BuildRequires:	libdbus-1-tqt-devel >= 2:0.9
 
 Requires:		trinity-arts >= 2:1.5.10
+Requires:		trinity-filesystem >= %{tde_version}
 
 BuildRequires:	cmake >= 2.8
 BuildRequires:	gcc-c++
-- 
cgit v1.2.1


From 19b67e6f6ae2a0ed44b004397036816398feba3e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Andriot?= <albator78@libertysurf.fr>
Date: Sat, 4 Oct 2014 00:18:04 +0200
Subject: RPM Packaging: update arts

---
 redhat/dependencies/arts/arts-14.0.0.spec | 1 +
 1 file changed, 1 insertion(+)

diff --git a/redhat/dependencies/arts/arts-14.0.0.spec b/redhat/dependencies/arts/arts-14.0.0.spec
index abf983a50..f17e1f549 100644
--- a/redhat/dependencies/arts/arts-14.0.0.spec
+++ b/redhat/dependencies/arts/arts-14.0.0.spec
@@ -54,6 +54,7 @@ BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Source0:	%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
 
 BuildRequires:	libtqt4-devel >= 1:4.2.0
+BuildRequires:	trinity-filesystem >= %{tde_version}
 Requires:		trinity-filesystem >= %{tde_version}
 
 BuildRequires:	cmake >= 2.8
-- 
cgit v1.2.1


From b33353afb9580b295ace66afb41ea352a305d73f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Andriot?= <albator78@libertysurf.fr>
Date: Sat, 4 Oct 2014 00:26:21 +0200
Subject: RPM Packaging: update dependencies

---
 redhat/dependencies/arts/arts-14.0.0.spec                 | 4 ++--
 redhat/dependencies/avahi-tqt/avahi-tqt-14.0.0.spec       | 4 ++--
 redhat/dependencies/dbus-1-tqt/dbus-1-tqt-14.0.0.spec     | 2 +-
 redhat/dependencies/dbus-tqt/dbus-tqt-14.0.0.spec         | 2 +-
 redhat/dependencies/tqtinterface/tqtinterface-14.0.0.spec | 2 +-
 redhat/tdelibs/tdelibs-14.0.0.spec                        | 1 +
 6 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/redhat/dependencies/arts/arts-14.0.0.spec b/redhat/dependencies/arts/arts-14.0.0.spec
index f17e1f549..781df345c 100644
--- a/redhat/dependencies/arts/arts-14.0.0.spec
+++ b/redhat/dependencies/arts/arts-14.0.0.spec
@@ -53,7 +53,7 @@ BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0:	%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
 
-BuildRequires:	libtqt4-devel >= 1:4.2.0
+BuildRequires:	libtqt4-devel >= 2:4.2.0
 BuildRequires:	trinity-filesystem >= %{tde_version}
 Requires:		trinity-filesystem >= %{tde_version}
 
@@ -118,7 +118,7 @@ BuildRequires:		libmad-devel
 %define with_pulseaudio 1
 %endif
 
-Requires:		libtqt4 >= 1:4.2.0
+Requires:		libtqt4 >= 2:4.2.0
 Requires:		audiofile
 
 %if "%{?tde_prefix}" == "/usr"
diff --git a/redhat/dependencies/avahi-tqt/avahi-tqt-14.0.0.spec b/redhat/dependencies/avahi-tqt/avahi-tqt-14.0.0.spec
index 83dcd2ec5..11a706c68 100644
--- a/redhat/dependencies/avahi-tqt/avahi-tqt-14.0.0.spec
+++ b/redhat/dependencies/avahi-tqt/avahi-tqt-14.0.0.spec
@@ -50,7 +50,7 @@ BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0:	%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
 
-BuildRequires:	libtqt4-devel >= 1:4.2.0
+BuildRequires:	libtqt4-devel >= 2:4.2.0
 
 BuildRequires:	gcc-c++
 BuildRequires:	pkgconfig
@@ -143,7 +143,7 @@ Group:		Development/Libraries/C and C++
 Provides:	libavahi-tqt-devel = %{?epoch:%{epoch}:}%{version}-%{release}
 
 Requires:	%{libavahi}-tqt1 = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:	libtqt4-devel >= 1:4.2.0
+Requires:	libtqt4-devel >= 2:4.2.0
 
 Obsoletes:		trinity-avahi-tqt-devel < %{?epoch:%{epoch}:}%{version}-%{release}
 Provides:		trinity-avahi-tqt-devel = %{?epoch:%{epoch}:}%{version}-%{release}
diff --git a/redhat/dependencies/dbus-1-tqt/dbus-1-tqt-14.0.0.spec b/redhat/dependencies/dbus-1-tqt/dbus-1-tqt-14.0.0.spec
index 17a045350..efe09daf6 100644
--- a/redhat/dependencies/dbus-1-tqt/dbus-1-tqt-14.0.0.spec
+++ b/redhat/dependencies/dbus-1-tqt/dbus-1-tqt-14.0.0.spec
@@ -48,7 +48,7 @@ BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Source0:	%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
 
 BuildRequires:	libtqt3-mt-devel >= 3.5.0
-BuildRequires:	libtqt4-devel >= 1:4.2.0
+BuildRequires:	libtqt4-devel >= 2:4.2.0
 
 BuildRequires:	cmake >= 2.8
 BuildRequires:	gcc-c++
diff --git a/redhat/dependencies/dbus-tqt/dbus-tqt-14.0.0.spec b/redhat/dependencies/dbus-tqt/dbus-tqt-14.0.0.spec
index db9237f94..49495c7a2 100644
--- a/redhat/dependencies/dbus-tqt/dbus-tqt-14.0.0.spec
+++ b/redhat/dependencies/dbus-tqt/dbus-tqt-14.0.0.spec
@@ -48,7 +48,7 @@ BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Source0:	%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
 
 BuildRequires:	libtqt3-mt-devel >= 3.5.0
-BuildRequires:	libtqt4-devel >= 1:4.2.0
+BuildRequires:	libtqt4-devel >= 2:4.2.0
 
 BuildRequires:	cmake >= 2.8
 BuildRequires:	gcc-c++
diff --git a/redhat/dependencies/tqtinterface/tqtinterface-14.0.0.spec b/redhat/dependencies/tqtinterface/tqtinterface-14.0.0.spec
index d1e78eac3..0470c1feb 100755
--- a/redhat/dependencies/tqtinterface/tqtinterface-14.0.0.spec
+++ b/redhat/dependencies/tqtinterface/tqtinterface-14.0.0.spec
@@ -30,7 +30,7 @@
 %endif
 
 Name:		trinity-tqtinterface
-Epoch:		1
+Epoch:		2
 Version:	4.2.0
 Release:	%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
 Summary:	The Trinity Qt Interface Libraries
diff --git a/redhat/tdelibs/tdelibs-14.0.0.spec b/redhat/tdelibs/tdelibs-14.0.0.spec
index f8ddf2030..784a9a756 100644
--- a/redhat/tdelibs/tdelibs-14.0.0.spec
+++ b/redhat/tdelibs/tdelibs-14.0.0.spec
@@ -72,6 +72,7 @@ BuildRequires:	libtqt4-devel = 2:4.2.0
 BuildRequires:	trinity-arts-devel >= 2:1.5.10
 BuildRequires:	libdbus-tqt-1-devel >= 2:0.63
 BuildRequires:	libdbus-1-tqt-devel >= 2:0.9
+BuildRequires:	trinity-filesystem >= %{tde_version}
 
 Requires:		trinity-arts >= 2:1.5.10
 Requires:		trinity-filesystem >= %{tde_version}
-- 
cgit v1.2.1


From 4a146004df95a9d0d36682ce80a1c67ef2b75055 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= <slavek.banko@axis.cz>
Date: Sat, 4 Oct 2014 02:33:53 +0200
Subject: Add libtqt3-mt-sqlite3 to suggests for krecipes on Debian and Ubuntu

---
 debian/lenny/applications/krecipes/debian/control    | 2 +-
 debian/squeeze/applications/krecipes/debian/control  | 2 +-
 ubuntu/maverick/applications/krecipes/debian/control | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/debian/lenny/applications/krecipes/debian/control b/debian/lenny/applications/krecipes/debian/control
index 700f46f17..a54559587 100644
--- a/debian/lenny/applications/krecipes/debian/control
+++ b/debian/lenny/applications/krecipes/debian/control
@@ -12,7 +12,7 @@ Vcs-Svn: svn://svn.debian.org/svn/pkg-kde/kde-extras/krecipes/trunk
 Package: krecipes-trinity
 Architecture: any
 Depends: krecipes-data-trinity (= ${source:Version}), ${shlibs:Depends}, ${misc:Depends}
-Suggests: libtqt3-mt-mysql | libtqt3-mt-psql, krecipes-doc-trinity (= ${source:Version})
+Suggests: libtqt3-mt-sqlite3 | libtqt3-mt-mysql | libtqt3-mt-psql, krecipes-doc-trinity (= ${source:Version})
 Description: recipes manager for TDE
  Krecipes is a TDE application designed to manage recipes. It can help you to
  do your shopping list, search through your recipes to find what you can do
diff --git a/debian/squeeze/applications/krecipes/debian/control b/debian/squeeze/applications/krecipes/debian/control
index 700f46f17..a54559587 100644
--- a/debian/squeeze/applications/krecipes/debian/control
+++ b/debian/squeeze/applications/krecipes/debian/control
@@ -12,7 +12,7 @@ Vcs-Svn: svn://svn.debian.org/svn/pkg-kde/kde-extras/krecipes/trunk
 Package: krecipes-trinity
 Architecture: any
 Depends: krecipes-data-trinity (= ${source:Version}), ${shlibs:Depends}, ${misc:Depends}
-Suggests: libtqt3-mt-mysql | libtqt3-mt-psql, krecipes-doc-trinity (= ${source:Version})
+Suggests: libtqt3-mt-sqlite3 | libtqt3-mt-mysql | libtqt3-mt-psql, krecipes-doc-trinity (= ${source:Version})
 Description: recipes manager for TDE
  Krecipes is a TDE application designed to manage recipes. It can help you to
  do your shopping list, search through your recipes to find what you can do
diff --git a/ubuntu/maverick/applications/krecipes/debian/control b/ubuntu/maverick/applications/krecipes/debian/control
index 700f46f17..a54559587 100644
--- a/ubuntu/maverick/applications/krecipes/debian/control
+++ b/ubuntu/maverick/applications/krecipes/debian/control
@@ -12,7 +12,7 @@ Vcs-Svn: svn://svn.debian.org/svn/pkg-kde/kde-extras/krecipes/trunk
 Package: krecipes-trinity
 Architecture: any
 Depends: krecipes-data-trinity (= ${source:Version}), ${shlibs:Depends}, ${misc:Depends}
-Suggests: libtqt3-mt-mysql | libtqt3-mt-psql, krecipes-doc-trinity (= ${source:Version})
+Suggests: libtqt3-mt-sqlite3 | libtqt3-mt-mysql | libtqt3-mt-psql, krecipes-doc-trinity (= ${source:Version})
 Description: recipes manager for TDE
  Krecipes is a TDE application designed to manage recipes. It can help you to
  do your shopping list, search through your recipes to find what you can do
-- 
cgit v1.2.1


From 3874a59988bcd5c975928863e9a0cd792cb5f780 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Andriot?= <albator78@libertysurf.fr>
Date: Sat, 4 Oct 2014 20:02:44 +0200
Subject: RPM Packaging: update R14 packages

---
 redhat/Makefile.r14                                |  2 +-
 redhat/applications/krecipes/krecipes-14.0.0.spec  | 26 +++++++++-------------
 redhat/build/build_rpm_package.sh                  |  4 ++--
 .../libart-lgpl/libart-lgpl-14.0.0.spec            |  3 +++
 redhat/dependencies/sip4-tqt/sip4-tqt.spec         |  2 +-
 redhat/dependencies/tqca-tls/tqca-tls-14.0.0.spec  |  3 +--
 redhat/dependencies/tqca/tqca-14.0.0.spec          |  5 ++---
 redhat/dependencies/tqt3/tqt3-14.0.0.spec          |  2 +-
 .../trinity-filesystem/trinity-filesystem.spec     | 26 ++++++++++++++++++++++
 redhat/tdelibs/tdelibs-14.0.0.spec                 | 20 ++++++++++++++---
 10 files changed, 65 insertions(+), 28 deletions(-)

diff --git a/redhat/Makefile.r14 b/redhat/Makefile.r14
index 9421c0db9..e63f21016 100644
--- a/redhat/Makefile.r14
+++ b/redhat/Makefile.r14
@@ -56,7 +56,7 @@ python-tqt: sip4-tqt tdelibs
 
 sip4-tqt:
 	$(call buildpkg,dependencies/sip4-tqt)
-	
+
 tqca:	tqtinterface
 	$(call buildpkg,dependencies/tqca)
 
diff --git a/redhat/applications/krecipes/krecipes-14.0.0.spec b/redhat/applications/krecipes/krecipes-14.0.0.spec
index b90f1eb85..43af9cd92 100644
--- a/redhat/applications/krecipes/krecipes-14.0.0.spec
+++ b/redhat/applications/krecipes/krecipes-14.0.0.spec
@@ -1,27 +1,27 @@
 # Default version for this component
 %define tde_pkg krecipes
-%define tde_version 14.0.0
-
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?tde_prefix}" != "/usr"
-%define _variant .opt
-%endif
 
-# TDE specific building variables
+# TDE variables
+%define tde_version 14.0.0
+%define tde_prefix /opt/trinity
 %define tde_bindir %{tde_prefix}/bin
 %define tde_datadir %{tde_prefix}/share
 %define tde_docdir %{tde_datadir}/doc
 %define tde_includedir %{tde_prefix}/include
 %define tde_libdir %{tde_prefix}/%{_lib}
 %define tde_mandir %{tde_datadir}/man
-
 %define tde_tdeappdir %{tde_datadir}/applications/tde
 %define tde_tdedocdir %{tde_docdir}/tde
 %define tde_tdeincludedir %{tde_includedir}/tde
 %define tde_tdelibdir %{tde_libdir}/trinity
-
 %define _docdir %{tde_docdir}
 
+# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
+%if "%{?tde_prefix}" != "/usr"
+%define _variant .opt
+%endif
+
+
 
 Name:			trinity-%{tde_pkg}
 Summary:		Recipes manager for TDE
@@ -40,10 +40,7 @@ BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
 
-BuildRequires:	trinity-tqtinterface-devel >= %{tde_version}
-BuildRequires:	trinity-arts-devel >= 1:1.5.10
 BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
-BuildRequires:	trinity-tdebase-devel >= %{tde_version}
 BuildRequires:	desktop-file-utils
 
 BuildRequires:	gettext
@@ -64,7 +61,7 @@ with available ingredients and a diet helper. It can also import or export
 recipes from files in various format (eg RecipeML or Meal-Master) or from
 databases.
 
-%if 0%{?suse_version} || 0%{?pclinuxos}
+%if 0%{?pclinuxos}
 %debug_package
 %endif
 
@@ -81,7 +78,6 @@ databases.
 %build
 unset QTDIR QTINC QTLIB
 export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
 
 %configure \
   --prefix=%{tde_prefix} \
@@ -104,7 +100,7 @@ export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
   --with-mysql \
   --with-postgresql
 
-%__make %{?_smp_mflags}
+%__make %{?_smp_mflags} || %__make
 
 
 %install
diff --git a/redhat/build/build_rpm_package.sh b/redhat/build/build_rpm_package.sh
index 2eca7cef5..f30a4246b 100755
--- a/redhat/build/build_rpm_package.sh
+++ b/redhat/build/build_rpm_package.sh
@@ -41,7 +41,7 @@ fi
 if [ -r "${TEMPDIR}/one.patch" ]; then
   sed -i "${TEMPDIR}/"*.spec \
       -e "/^Source0:/ s/$/\nPatch0: one.patch/" \
-      -e "/%setup/ s/$/\n%patch0 -p1 -b .orig/"
+      -e "/%setup/ s/$/\n%patch0 -p1/"
 fi
 
 # Determines if we are running an i386 or x86_64 distro
@@ -66,7 +66,7 @@ rpmbuild -ba \
   --define "packager Francois\ Andriot\ <francois.andriot@free.fr>" \
   --define "tde_version ${TDE_VERSION}" \
   --define "tde_prefix /opt/trinity" \
-  --define "preversion ${PREVERSION:\\\"\\\"}" \
+  --define "preversion ${PREVERSION:-\\\"\\\"}" \
   ${ARGS} \
   "${TEMPDIR}/${SPECFILE##*/}"
 RET=$?
diff --git a/redhat/dependencies/libart-lgpl/libart-lgpl-14.0.0.spec b/redhat/dependencies/libart-lgpl/libart-lgpl-14.0.0.spec
index 798bbdf78..ecce24978 100644
--- a/redhat/dependencies/libart-lgpl/libart-lgpl-14.0.0.spec
+++ b/redhat/dependencies/libart-lgpl/libart-lgpl-14.0.0.spec
@@ -63,6 +63,8 @@ especially suitable for embedded applications.
 %package -n %{libart}_lgpl_2-2
 Summary:        Library of functions for 2D graphics - runtime files
 Group:			System/Libraries
+Obsoletes:		libart_lgpl < %{version}-%{release}
+Provides:		libart_lgpl = %{version}-%{release}
 Provides:		libart_lgpl_2-2 = %{version}-%{release}
 
 %description -n %{libart}_lgpl_2-2
@@ -88,6 +90,7 @@ especially suitable for embedded applications.
 %package -n %{libart}_lgpl-devel
 Summary:        Library of functions for 2D graphics - development files
 Group:          Development/Libraries
+Provides:		libart_lgpl-devel = %{version}-%{release}
 Requires:       %{libart}_lgpl_2-2 = %{version}-%{release}
 
 %description -n %{libart}_lgpl-devel
diff --git a/redhat/dependencies/sip4-tqt/sip4-tqt.spec b/redhat/dependencies/sip4-tqt/sip4-tqt.spec
index 5b6485d34..8e1ea70cb 100644
--- a/redhat/dependencies/sip4-tqt/sip4-tqt.spec
+++ b/redhat/dependencies/sip4-tqt/sip4-tqt.spec
@@ -38,7 +38,7 @@ BuildRequires:	trinity-tqtinterface-devel >= %{tde_version}
 
 # TDE specific building variables
 BuildRequires:	python
-BuildRequires:	trinity-tqt3-devel >= 3.5.0
+BuildRequires:	libtqt4-devel >= 2:4.2.0
 
 %description
 SIP is a tool for generating bindings for C++ classes with some ideas
diff --git a/redhat/dependencies/tqca-tls/tqca-tls-14.0.0.spec b/redhat/dependencies/tqca-tls/tqca-tls-14.0.0.spec
index a85bae95c..8c24acab0 100644
--- a/redhat/dependencies/tqca-tls/tqca-tls-14.0.0.spec
+++ b/redhat/dependencies/tqca-tls/tqca-tls-14.0.0.spec
@@ -30,8 +30,7 @@ BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
 
-BuildRequires:  trinity-tqt3-devel >= 3.5.0
-BuildRequires:  trinity-tqtinterface-devel >= %{tde_version}
+BuildRequires:  libtqt4-devel >= 2:4.2.0
 BuildRequires:	trinity-tqca-devel >= 1.0
 BuildRequires:	openssl-devel >= 0.9.8
 
diff --git a/redhat/dependencies/tqca/tqca-14.0.0.spec b/redhat/dependencies/tqca/tqca-14.0.0.spec
index 19010e5db..093461890 100644
--- a/redhat/dependencies/tqca/tqca-14.0.0.spec
+++ b/redhat/dependencies/tqca/tqca-14.0.0.spec
@@ -33,8 +33,7 @@ BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
 
-BuildRequires:  trinity-tqt3-devel >= 3.5.0
-BuildRequires:  trinity-tqtinterface-devel >= %{tde_version}
+BuildRequires:  libtqt4-devel >= 2:4.2.0
 
 
 %description
@@ -81,7 +80,7 @@ This packages contains the development files for TQCA
 
 ##########
 
-%if 0%{?suse_version} || 0%{?pclinuxos}
+%if 0%{?pclinuxos}
 %debug_package
 %endif
 
diff --git a/redhat/dependencies/tqt3/tqt3-14.0.0.spec b/redhat/dependencies/tqt3/tqt3-14.0.0.spec
index 21f080922..fa1a1790a 100644
--- a/redhat/dependencies/tqt3/tqt3-14.0.0.spec
+++ b/redhat/dependencies/tqt3/tqt3-14.0.0.spec
@@ -327,7 +327,7 @@ Requires:	%{libtqt3}-mt = %{version}-%{release}
 
 Requires: glibc-devel
 Requires: fontconfig-devel
-Requires: freetype2-devel
+Requires: freetype-devel
 Requires: libjpeg-devel
 Requires: libpng-devel
 Requires: zlib-devel
diff --git a/redhat/extras/trinity-filesystem/trinity-filesystem.spec b/redhat/extras/trinity-filesystem/trinity-filesystem.spec
index 082f68c61..4c2ec49b4 100644
--- a/redhat/extras/trinity-filesystem/trinity-filesystem.spec
+++ b/redhat/extras/trinity-filesystem/trinity-filesystem.spec
@@ -80,6 +80,7 @@ This package installs the Trinity directory structure.
 %dir %{tde_datadir}/applications/tde
 %dir %{tde_datadir}/applnk
 %dir %{tde_datadir}/apps
+%dir %{tde_datadir}/cmake
 %dir %{tde_datadir}/config.kcfg
 %dir %{tde_datadir}/autostart
 %dir %{tde_datadir}/emoticons
@@ -88,10 +89,22 @@ This package installs the Trinity directory structure.
 %dir %{tde_datadir}/icons/hicolor
 %dir %{tde_datadir}/locale
 %dir %{tde_datadir}/mimelnk
+%dir %{tde_datadir}/mimelnk/all
+%dir %{tde_datadir}/mimelnk/application
+%dir %{tde_datadir}/mimelnk/audio
+%dir %{tde_datadir}/mimelnk/image
+%dir %{tde_datadir}/mimelnk/inode
+%dir %{tde_datadir}/mimelnk/message
+%dir %{tde_datadir}/mimelnk/model
+%dir %{tde_datadir}/mimelnk/multipart
+%dir %{tde_datadir}/mimelnk/text
+%dir %{tde_datadir}/mimelnk/uri
+%dir %{tde_datadir}/mimelnk/video
 %dir %{tde_datadir}/services
 %dir %{tde_datadir}/servicetypes
 
 %dir %{_sysconfdir}/trinity
+%dir %{_sysconfdir}/xdg/menus
 
 ##########
 
@@ -110,6 +123,7 @@ This package installs the Trinity directory structure.
 %__install -d -m 755 %{?buildroot}%{tde_datadir}/applnk
 %__install -d -m 755 %{?buildroot}%{tde_datadir}/apps
 %__install -d -m 755 %{?buildroot}%{tde_datadir}/autostart
+%__install -d -m 755 %{?buildroot}%{tde_datadir}/cmake
 %__install -d -m 755 %{?buildroot}%{tde_datadir}/config
 %__install -d -m 755 %{?buildroot}%{tde_datadir}/config.kcfg
 %__install -d -m 755 %{?buildroot}%{tde_datadir}/emoticons
@@ -118,6 +132,17 @@ This package installs the Trinity directory structure.
 %__install -d -m 755 %{?buildroot}%{tde_datadir}/icons/hicolor
 %__install -d -m 755 %{?buildroot}%{tde_datadir}/locale
 %__install -d -m 755 %{?buildroot}%{tde_datadir}/mimelnk
+%__install -d -m 755 %{?buildroot}%{tde_datadir}/mimelnk/all
+%__install -d -m 755 %{?buildroot}%{tde_datadir}/mimelnk/application
+%__install -d -m 755 %{?buildroot}%{tde_datadir}/mimelnk/audio
+%__install -d -m 755 %{?buildroot}%{tde_datadir}/mimelnk/image
+%__install -d -m 755 %{?buildroot}%{tde_datadir}/mimelnk/inode
+%__install -d -m 755 %{?buildroot}%{tde_datadir}/mimelnk/message
+%__install -d -m 755 %{?buildroot}%{tde_datadir}/mimelnk/model
+%__install -d -m 755 %{?buildroot}%{tde_datadir}/mimelnk/multipart
+%__install -d -m 755 %{?buildroot}%{tde_datadir}/mimelnk/text
+%__install -d -m 755 %{?buildroot}%{tde_datadir}/mimelnk/uri
+%__install -d -m 755 %{?buildroot}%{tde_datadir}/mimelnk/video
 %__install -d -m 755 %{?buildroot}%{tde_datadir}/services
 %__install -d -m 755 %{?buildroot}%{tde_datadir}/servicetypes
 
@@ -139,6 +164,7 @@ This package installs the Trinity directory structure.
 %__install -d -m 755 %{?buildroot}%{_datadir}/icons/hicolor/32x32/apps
 
 %__install -d -m 755 %{?buildroot}%{_sysconfdir}/trinity
+%__install -d -m 755 %{?buildroot}%{_sysconfdir}/xdg/menus
 
 %changelog
 * Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 14.0.0-1
diff --git a/redhat/tdelibs/tdelibs-14.0.0.spec b/redhat/tdelibs/tdelibs-14.0.0.spec
index 784a9a756..65b23fe48 100644
--- a/redhat/tdelibs/tdelibs-14.0.0.spec
+++ b/redhat/tdelibs/tdelibs-14.0.0.spec
@@ -51,7 +51,7 @@ License:	GPL-2.0+
 License:	GPLv2+
 %endif
 
-#Vendor:			Trinity Project
+#Vendor:			Trinity Desktop
 #Packager:		Francois Andriot <francois.andriot@free.fr>
 
 Prefix:			%{tde_prefix}
@@ -83,12 +83,22 @@ BuildRequires:	pkgconfig
 
 BuildRequires:	krb5-devel
 BuildRequires:	libxslt-devel
-BuildRequires:	cups-devel
-BuildRequires:	openssl-devel
+
+# ALSA support
 BuildRequires:	alsa-lib-devel
+
+# IDN support
 BuildRequires:	libidn-devel
+
+# CUPS support
+BuildRequires:	cups-devel
+
+# TIFF support
 BuildRequires:	libtiff-devel
 
+# OPENSSL support
+BuildRequires:	openssl-devel
+
 # GLIB2 support
 BuildRequires:	glib2-devel
 
@@ -445,6 +455,10 @@ Summary:	%{name} - Development files
 Group:		Development/Libraries
 Requires:	%{name} = %{version}-%{release}
 
+Requires:	libtqt3-mt-devel >= 3.5.0
+Requires:	libtqt4-devel = 2:4.2.0
+Requires:	trinity-arts-devel >= 2:1.5.10
+
 Obsoletes:	tdelibs-devel < %{version}-%{release}
 Provides:	tdelibs-devel = %{version}-%{release}
 Obsoletes:	trinity-kdelibs-devel < %{version}-%{release}
-- 
cgit v1.2.1


From b7783d0d16e835a101ace305fa950375ff1fe8b3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Andriot?= <albator78@libertysurf.fr>
Date: Sat, 4 Oct 2014 22:33:28 +0200
Subject: RPM Packaging: update trinity-filesystem

---
 redhat/build/get_rpm_package_name.sh               | 58 +++++++++++++++-------
 .../trinity-filesystem/trinity-filesystem.spec     | 12 +++++
 redhat/packages.el6                                |  1 +
 redhat/packages.el7                                |  1 +
 redhat/packages.oss                                |  1 +
 5 files changed, 56 insertions(+), 17 deletions(-)

diff --git a/redhat/build/get_rpm_package_name.sh b/redhat/build/get_rpm_package_name.sh
index 0ccdfa036..c89bf56f2 100755
--- a/redhat/build/get_rpm_package_name.sh
+++ b/redhat/build/get_rpm_package_name.sh
@@ -14,41 +14,65 @@ PKGNAME="${1##*/}"
 DEVEL="$2"
 
 # Some RPM packages have different name than the source tarball.
-# Language package: install only French language package
-case "${PKGNAME}" in
-  "k3b-i18n"|"koffice-i18n"|"tde-i18n") PKGNAME="${PKGNAME}-French";;
-  "koffice") PKGNAME="${PKGNAME}-suite";;
-  "tqt3") PKGNAME="libtqt3-mt";;
-  "tqtinterface") PKGNAME="libtqt4";;
-  "avahi-tqt") PKGNAME="libavahi-tqt";;
-  "dbus-tqt") PKGNAME="libdbus-tqt-1";;
-  "dbus-1-tqt") PKGNAME="libdbus-1-tqt";;
-  "libart-lgpl") PKGNAME="libart_lgpl_2-2";;
-esac
 
-# Use the Trinity Prefix, or not.
+# Some runtime packages are prefixed with 'trinity-', some are not.
 case "${PKGNAME}" in
-  "trinity-"*|"qt3"|"python-qt3"|"esound"|"lib"*) PREFIX="";;
+  "trinity-"*|"qt3"|"tqt3"|"tqtinterface"|"python-qt3"|"esound"|*"-tqt"|"lib"*) PREFIX="";;
   "autoconf"|"automake"|"cmake"|"gnuchess"|"htdig"|"imlib1"|"libotr3"|"libtool"|"lilypond"|"m4"|"mftrace"|"pcsc-perl"|"torsocks"|"wv2") PREFIX="";;
   "curl") PREFIX="trinity-lib";;
   *) PREFIX="trinity-";;
 esac
 
-echo "${PREFIX}${PKGNAME}"
+# Runtime packages
+case "${PKGNAME}" in
+  # Some packages have different runtime name than source package.
+  "avahi-tqt") PKGRUNTIME="libavahi-tqt1";;
+  "dbus-tqt") PKGRUNTIME="libdbus-tqt-1-0";;
+  "dbus-1-tqt") PKGRUNTIME="libdbus-1-tqt0";;
+  "esound") PKGRUNTIME="esound-libs";;
+  "koffice") PKGRUNTIME="trinity-koffice-suite";;
+  "libart-lgpl") PKGRUNTIME="libart_lgpl_2-2";;
+  "tqt3") PKGRUNTIME="libtqt3-mt";;
+  "tqtinterface") PKGRUNTIME="libtqt4";;
+  # Language package: install only French language package
+  "k3b-i18n"|"koffice-i18n"|"tde-i18n") PKGRUNTIME="${PKGNAME}-French";;
+  # Default case: runtime package has same name as source package
+  *) PKGRUNTIME="${PKGNAME}";;
+esac
+
+# Finally, display the runtime package name.
+echo "${PREFIX}${PKGRUNTIME}"
 
+# Development package.
 if [ -n "${DEVEL}" ]; then
   # Check if development package is required.
-  # Applications do NOT have development packages, except K3B
   case "${PKGCATEGORY}" in
+    # Applications do NOT have 'devel' package, except K3B.
     "applications") if [ "${PKGNAME}" != "k3b" ]; then exit 0; fi;;
+    # Extras packages do NOT have 'devel' package, except Akode
     "extras") if [ "${PKGNAME}" != "akode" ]; then exit 0; fi;;
   esac
-  # Other packags NOT having development package
+  
+  # Some other packags NOT having development package
   case "${PKGNAME}" in
     "hal-info"|"lilypond"|"mftrace"|"pcsc-perl"|"torsocks") exit 0;;
     "tqca-tls"|"tdeadmin"|"tdetoys"|"tde-i18n"*|"tdeaddons"|"tdeartwork"|"libtqt-perl") exit 0;;
   esac
+
+  # Some package have specific development package.
+  case "${PKGNAME}" in
+    "avahi-tqt") PKGRUNTIME="libavahi-tqt-devel";;
+    "dbus-tqt") PKGRUNTIME="libdbus-tqt-1-devel";;
+    "dbus-1-tqt") PKGDEVEL="libdbus-1-tqt-devel";;
+    "esound") PKGDEVEL="esound-devel";;
+    "libart-lgpl") PKGDEVEL="libart_lgpl-devel";;
+    "tqt3") PKGDEVEL="tqt3-dev-tools";;
+    # Default case: development package has same name as runtime package, plus '-devel' suffix.
+    *) PKGDEVEL="${PKGRUNTIME}-devel";;
+  esac
+
+  # Finally, other packages do have a '-devel'
+  echo "${PREFIX}${PKGDEVEL}"
   
-  echo "${PREFIX}${PKGNAME}-devel"
 fi
 
diff --git a/redhat/extras/trinity-filesystem/trinity-filesystem.spec b/redhat/extras/trinity-filesystem/trinity-filesystem.spec
index 4c2ec49b4..282561b98 100644
--- a/redhat/extras/trinity-filesystem/trinity-filesystem.spec
+++ b/redhat/extras/trinity-filesystem/trinity-filesystem.spec
@@ -166,6 +166,18 @@ This package installs the Trinity directory structure.
 %__install -d -m 755 %{?buildroot}%{_sysconfdir}/trinity
 %__install -d -m 755 %{?buildroot}%{_sysconfdir}/xdg/menus
 
+
+%post
+%if 0%{?suse_version}
+# Add setuid files in '/etc/permissions.local'
+for b in fileshareset kgrantpty kpac_dhcp_helper start_tdeinit; do
+  if ! grep -q "^%{tde_bindir}/${b}" "/etc/permissions.local"; then
+    echo "%{tde_bindir}/${b}          root:root       4711" >>/etc/permissions.local
+  fi
+done
+%endif
+
+
 %changelog
 * Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 14.0.0-1
 - Initial build for TDE R14
diff --git a/redhat/packages.el6 b/redhat/packages.el6
index 6d55e8cdb..c3482c8bc 100644
--- a/redhat/packages.el6
+++ b/redhat/packages.el6
@@ -34,6 +34,7 @@ doxygen
 emacs
 esound-devel
 exiv2-devel
+fdupes
 ffmpeg-devel
 fftw-devel
 file-devel
diff --git a/redhat/packages.el7 b/redhat/packages.el7
index eca5edaba..c8eb67bdf 100644
--- a/redhat/packages.el7
+++ b/redhat/packages.el7
@@ -31,6 +31,7 @@ djvulibre-devel
 doxygen
 emacs
 exiv2-devel
+fdupes
 ffmpeg-devel
 fftw-devel
 file-devel
diff --git a/redhat/packages.oss b/redhat/packages.oss
index cb6bc6dd2..7a2a1a6a1 100644
--- a/redhat/packages.oss
+++ b/redhat/packages.oss
@@ -4,6 +4,7 @@ unixODBC-devel
 mesa-libGL-devel
 mesa-libGLU-devel
 udev-devel
+fdupes
 gnokii-devel
 gpgme-devel
 flex
-- 
cgit v1.2.1


From cee75b86247530fca1a6b54ecd6cdbcfd1306a5a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Andriot?= <albator78@libertysurf.fr>
Date: Sat, 4 Oct 2014 22:44:27 +0200
Subject: RPM Packaging: update tqt3

---
 redhat/dependencies/tqt3/tqt3-14.0.0.spec | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/redhat/dependencies/tqt3/tqt3-14.0.0.spec b/redhat/dependencies/tqt3/tqt3-14.0.0.spec
index fa1a1790a..6a4b583e6 100644
--- a/redhat/dependencies/tqt3/tqt3-14.0.0.spec
+++ b/redhat/dependencies/tqt3/tqt3-14.0.0.spec
@@ -270,6 +270,7 @@ BuildRequires: util-linux
 Summary:	TQt GUI Library (Threaded runtime version), Version 3
 Group:		System/GUI/Other
 Provides:	libtqt3-mt = %{version}-%{release}
+Provides:	trinity-tqt3 = %{version}-%{release}
 
 Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
@@ -322,6 +323,7 @@ applications.
 %package -n %{libtqt3}-mt-devel
 Summary:	TQt development files (Threaded)
 Group:		Development/Libraries/X11
+Provides:	trinity-tqt3-devel = %{version}-%{release}
 Provides:	libtqt3-mt-devel = %{version}-%{release}
 Requires:	%{libtqt3}-mt = %{version}-%{release}
 
-- 
cgit v1.2.1


From 99f751deec4bf669802b3a72e204aa29cdf243d7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Andriot?= <albator78@libertysurf.fr>
Date: Sat, 4 Oct 2014 22:48:34 +0200
Subject: RPM Packaging: update tdelibs

---
 redhat/tdelibs/tdelibs-14.0.0.spec | 73 +++++++++++++++++++++++++++++++-------
 1 file changed, 61 insertions(+), 12 deletions(-)

diff --git a/redhat/tdelibs/tdelibs-14.0.0.spec b/redhat/tdelibs/tdelibs-14.0.0.spec
index 65b23fe48..52a666d90 100644
--- a/redhat/tdelibs/tdelibs-14.0.0.spec
+++ b/redhat/tdelibs/tdelibs-14.0.0.spec
@@ -66,7 +66,12 @@ Provides:		trinity-kdelibs = %{version}-%{release}
 Obsoletes:		trinity-kdelibs-apidocs < %{version}-%{release}
 Provides:		trinity-kdelibs-apidocs = %{version}-%{release}
 
-# Trinity dependencies
+# for set_permissions macro
+%if 0%{?suse_version}
+PreReq: permissions
+%endif
+
+# Trinity dependencies
 BuildRequires:	libtqt3-mt-devel >= 3.5.0
 BuildRequires:	libtqt4-devel = 2:4.2.0
 BuildRequires:	trinity-arts-devel >= 2:1.5.10
@@ -80,8 +85,17 @@ Requires:		trinity-filesystem >= %{tde_version}
 BuildRequires:	cmake >= 2.8
 BuildRequires:	gcc-c++
 BuildRequires:	pkgconfig
+BuildRequires:	fdupes
 
+# SUSE desktop files utility
+%if 0%{?suse_version}
+BuildRequires:	update-desktop-files
+%endif
+
+# KRB5 support
 BuildRequires:	krb5-devel
+
+# XSLT support
 BuildRequires:	libxslt-devel
 
 # ALSA support
@@ -242,7 +256,7 @@ BuildRequires:	xz-devel
 %endif
 %endif
 
-# Certificates support
+# Certificates support
 %if 0%{?rhel} >= 6 || 0%{?fedora}
 %define	cacert	%{_sysconfdir}/ssl/certs/ca-certificates.crt
 Requires:		ca-certificates
@@ -357,7 +371,6 @@ kimgio (image manipulation).
 %{tde_bindir}/dcopserver_shutdown
 %{tde_bindir}/dcopstart
 %{tde_bindir}/filesharelist
-%{tde_bindir}/fileshareset
 %{tde_bindir}/imagetops
 %{tde_bindir}/tdeab2tdeabc
 %{tde_bindir}/kaddprinterwizard
@@ -390,7 +403,6 @@ kimgio (image manipulation).
 %endif
 %{tde_bindir}/tdemailservice
 %{tde_bindir}/tdemimelist
-%attr(4755,root,root) %{tde_bindir}/kpac_dhcp_helper
 %{tde_bindir}/tdesendbugmail
 %{tde_bindir}/kshell
 %{tde_bindir}/tdestartupconfig
@@ -402,9 +414,7 @@ kimgio (image manipulation).
 %{tde_bindir}/make_driver_db_lpr
 %{tde_bindir}/meinproc
 %{tde_bindir}/networkstatustestservice
-%{tde_bindir}/start_tdeinit
 %{tde_bindir}/start_tdeinit_wrapper
-%attr(4755,root,root) %{tde_bindir}/kgrantpty
 %{tde_bindir}/tde_dbus_hardwarecontrol
 %{tde_bindir}/checkXML
 %{tde_bindir}/ksvgtopng
@@ -431,9 +441,22 @@ kimgio (image manipulation).
 %{tde_tdedocdir}/HTML/en/common/*
 %{tde_tdedocdir}/HTML/en/tdespell/
 
-%{_sysconfdir}/xdg/menus/tde-applications.menu
-%{_sysconfdir}/xdg/menus/tde-applications.menu-no-kde
-%{_sysconfdir}/dbus-1/system.d/org.trinitydesktop.hardwarecontrol.conf
+# Some setuid binaries need special care
+%if 0%{?suse_version}
+%verify(not mode) %{tde_bindir}/fileshareset
+%verify(not mode) %{tde_bindir}/kgrantpty
+%verify(not mode) %{tde_bindir}/kpac_dhcp_helper
+%verify(not mode) %{tde_bindir}/start_tdeinit
+%else
+%attr(4755,root,root) %{tde_bindir}/fileshareset
+%attr(4755,root,root) %{tde_bindir}/kgrantpty
+%attr(4755,root,root) %{tde_bindir}/kpac_dhcp_helper
+%attr(4711,root,root) %{tde_bindir}/start_tdeinit
+%endif
+
+%config %{_sysconfdir}/xdg/menus/tde-applications.menu
+%config %{_sysconfdir}/xdg/menus/tde-applications.menu-no-kde
+%config %{_sysconfdir}/dbus-1/system.d/org.trinitydesktop.hardwarecontrol.conf
 %{_datadir}/dbus-1/system-services/org.trinitydesktop.hardwarecontrol.service
 
 %pre
@@ -445,14 +468,22 @@ fi
 %post
 /sbin/ldconfig || :
 
+%if 0%{?suse_version}
+# Sets permissions on setuid files (openSUSE specific)
+%set_permissions %{tde_bindir}/fileshareset
+%set_permissions %{tde_bindir}/kgrantpty
+%set_permissions %{tde_bindir}/kpac_dhcp_helper
+%set_permissions %{tde_bindir}/start_tdeinit
+%endif
+
 %postun
 /sbin/ldconfig || :
 
 ##########
 
 %package devel
-Summary:	%{name} - Development files
-Group:		Development/Libraries
+Summary:	TDE Libraries (Development files)
+Group:		Development/Libraries/X11
 Requires:	%{name} = %{version}-%{release}
 
 Requires:	libtqt3-mt-devel >= 3.5.0
@@ -580,17 +611,35 @@ fi
 %__rm -rf "%{?buildroot}"
 %__make install DESTDIR="%{?buildroot}" -C build
 
-# Use system-wide CA certificate
+# Use system-wide CA certificate
 %if "%{?cacert}" != ""
 %__rm -f "%{?buildroot}%{tde_datadir}/apps/kssl/ca-bundle.crt"
 %__ln_s "%{cacert}" "%{?buildroot}%{tde_datadir}/apps/kssl/ca-bundle.crt"
 %endif
 
+# Symlinks duplicate files (mostly under 'ksgmltools2')
+%fdupes -s "%{?buildroot}"
+
+# Fix 'tderesources.desktop' (openSUSE only)
+%if 0%{?suse_version}
+%suse_update_desktop_file -r tderesources Qt X-TDE-settings-desktop
+%endif
+
 
 %clean
 %__rm -rf "%{?buildroot}"
 
 
+%if 0%{?suse_version}
+# Check permissions on setuid files (openSUSE specific)
+%verifyscript
+%verify_permissions -e %{tde_bindir}/fileshareset
+%verify_permissions -e %{tde_bindir}/kgrantpty
+%verify_permissions -e %{tde_bindir}/kpac_dhcp_helper
+%verify_permissions -e %{tde_bindir}/start_tdeinit
+%endif
+
+
 %changelog
 * Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 14.0.0-1
 - Initial release for TDE 14.0.0
-- 
cgit v1.2.1


From 498055e3b446b47f81959dac4cf7525ea5bd9679 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Andriot?= <albator78@libertysurf.fr>
Date: Sun, 5 Oct 2014 11:54:00 +0200
Subject: RPM Packaging: add fileshareset

---
 redhat/extras/fileshareset/fileshareset.spec | 90 ++++++++++++++++++++++++++++
 1 file changed, 90 insertions(+)
 create mode 100644 redhat/extras/fileshareset/fileshareset.spec

diff --git a/redhat/extras/fileshareset/fileshareset.spec b/redhat/extras/fileshareset/fileshareset.spec
new file mode 100644
index 000000000..6848123bd
--- /dev/null
+++ b/redhat/extras/fileshareset/fileshareset.spec
@@ -0,0 +1,90 @@
+#
+# spec file for package fileshareset
+#
+# Copyright (c) 2014 François Andriot <francois.andriot@free.fr>
+#
+# All modifications and additions to the file contributed by third parties
+# remain the property of their copyright owners, unless otherwise agreed
+# upon. The license for this file, and modifications and additions to the
+# file, is the same license as for the pristine package itself (unless the
+# license for the pristine package is not an Open Source License, in which
+# case the license is the MIT License). An "Open Source License" is a
+# license that conforms to the Open Source Definition (Version 1.9)
+# published by the Open Source Initiative.
+#
+# Please submit bugfixes or comments via http:/www.trinitydesktop.org/
+#
+
+# Extract from 'fileshareset.cpp'
+#copyright            : (C) 2003 SuSE AG 
+#email                : Uwe.Gansert@suse.de
+
+Name:		fileshareset
+Version:	2.0
+Release:	1%{?dist}
+Summary:	Set and list fileshares
+Group:		System/Management
+URL:		http://www.trinitydesktop.org/
+
+%if 0%{?suse_version}
+License:	GPL-2.0+
+%else
+License:	GPLv2+
+%endif
+
+#Vendor:		Trinity Project
+#Packager:	Francois Andriot <francois.andriot@free.fr>
+
+Prefix:		/usr
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Source0:        %{name}-%{version}.tar.gz
+
+BuildRequires:  gcc-c++
+#Requires:       
+
+%description
+This package contains the the fileshareset utility to allow users to
+add or remove file shares.  It's also possible to list currently shared
+locations. /etc/security/fileshare.conf is the main configuration file
+This utility was originally written for openSUSE KDE3.
+
+
+%prep
+%setup -q -n fileshareset2
+aclocal
+autoconf
+automake -a -c
+
+
+%build
+export CXXFLAGS="$CXXFLAGS -fPIE"
+export CFLAGS="$CXXFLAGS -fPIE"
+export LDFLAGS="$LDFLAGS -pie"
+%configure
+make %{?_smp_mflags}
+
+
+%install
+rm -rf $RPM_BUILD_ROOT
+%__make install DESTDIR=$RPM_BUILD_ROOT
+
+# Install the man page
+%__install -D -m 644 man/fileshareset.8 %{?buildroot}%{_mandir}/man8/fileshareset.8
+
+# Install the default configuration file
+mkdir -p "${RPM_BUILD_ROOT}/etc/security/"
+echo "RESTRICT=yes" > "${RPM_BUILD_ROOT}%{_sysconfdir}/security/fileshare.conf"
+
+
+%files
+%defattr(-,root,root,-)
+%{_bindir}/filesharelist
+%{_bindir}/fileshareset
+%{_mandir}/man8/fileshareset.8*
+%{_sysconfdir}/security/fileshare.conf
+
+
+%changelog
+* Sun Oct 5 2014 François Andriot <francois.andriot@free.fr> - 1.0-1
+- Initial build for TDE R14
-- 
cgit v1.2.1


From 059f02ff22a8161e7f615ce92dd67933e1e35654 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Andriot?= <albator78@libertysurf.fr>
Date: Sun, 5 Oct 2014 11:58:15 +0200
Subject: RPM Packaging: update fileshareset

---
 redhat/extras/fileshareset/fileshareset.spec | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/redhat/extras/fileshareset/fileshareset.spec b/redhat/extras/fileshareset/fileshareset.spec
index 6848123bd..5f4f1bf96 100644
--- a/redhat/extras/fileshareset/fileshareset.spec
+++ b/redhat/extras/fileshareset/fileshareset.spec
@@ -40,7 +40,10 @@ BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0:        %{name}-%{version}.tar.gz
 
+BuildRequires:	autoconf
+BuildRequires:	automake
 BuildRequires:  gcc-c++
+
 #Requires:       
 
 %description
-- 
cgit v1.2.1


From 74b804543784bbb591da0c8264613ca5d24582ff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Andriot?= <albator78@libertysurf.fr>
Date: Sun, 5 Oct 2014 12:04:18 +0200
Subject: RPM Packaging: update fileshareset

---
 redhat/extras/fileshareset/fileshareset.spec | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/redhat/extras/fileshareset/fileshareset.spec b/redhat/extras/fileshareset/fileshareset.spec
index 5f4f1bf96..face7a28a 100644
--- a/redhat/extras/fileshareset/fileshareset.spec
+++ b/redhat/extras/fileshareset/fileshareset.spec
@@ -65,11 +65,11 @@ export CXXFLAGS="$CXXFLAGS -fPIE"
 export CFLAGS="$CXXFLAGS -fPIE"
 export LDFLAGS="$LDFLAGS -pie"
 %configure
-make %{?_smp_mflags}
+%__make %{?_smp_mflags}
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
+%__rm -rf $RPM_BUILD_ROOT
 %__make install DESTDIR=$RPM_BUILD_ROOT
 
 # Install the man page
@@ -80,6 +80,10 @@ mkdir -p "${RPM_BUILD_ROOT}/etc/security/"
 echo "RESTRICT=yes" > "${RPM_BUILD_ROOT}%{_sysconfdir}/security/fileshare.conf"
 
 
+%clean
+%__rm -rf $RPM_BUILD_ROOT
+
+
 %files
 %defattr(-,root,root,-)
 %{_bindir}/filesharelist
-- 
cgit v1.2.1


From 2d0735da96fb5967d3cf9a3515b5e9481f928d33 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Andriot?= <albator78@libertysurf.fr>
Date: Sun, 5 Oct 2014 12:12:12 +0200
Subject: RPM Packaging: update fileshareset

---
 redhat/extras/fileshareset/fileshareset.spec | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/redhat/extras/fileshareset/fileshareset.spec b/redhat/extras/fileshareset/fileshareset.spec
index face7a28a..6f76b549f 100644
--- a/redhat/extras/fileshareset/fileshareset.spec
+++ b/redhat/extras/fileshareset/fileshareset.spec
@@ -40,6 +40,11 @@ BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0:        %{name}-%{version}.tar.gz
 
+# for set_permissions macro
+%if 0%{?suse_version}
+PreReq: permissions
+%endif
+
 BuildRequires:	autoconf
 BuildRequires:	automake
 BuildRequires:  gcc-c++
@@ -62,7 +67,7 @@ automake -a -c
 
 %build
 export CXXFLAGS="$CXXFLAGS -fPIE"
-export CFLAGS="$CXXFLAGS -fPIE"
+export CFLAGS="$CFLAGS -fPIE"
 export LDFLAGS="$LDFLAGS -pie"
 %configure
 %__make %{?_smp_mflags}
@@ -87,9 +92,16 @@ echo "RESTRICT=yes" > "${RPM_BUILD_ROOT}%{_sysconfdir}/security/fileshare.conf"
 %files
 %defattr(-,root,root,-)
 %{_bindir}/filesharelist
-%{_bindir}/fileshareset
+%verify(not mode) %{_bindir}/fileshareset
 %{_mandir}/man8/fileshareset.8*
-%{_sysconfdir}/security/fileshare.conf
+%config(noreplace) %{_sysconfdir}/security/fileshare.conf
+
+
+%if 0%{?suse_version}
+# Check permissions on setuid files (openSUSE specific)
+%verifyscript
+%verify_permissions -e /usr/bin/fileshareset
+%endif
 
 
 %changelog
-- 
cgit v1.2.1


From fdd6ad659885d68fbd8c721268b08e9edada23b4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Andriot?= <albator78@libertysurf.fr>
Date: Sun, 5 Oct 2014 12:15:36 +0200
Subject: RPM Packaging: update fileshareset

---
 redhat/extras/fileshareset/fileshareset.spec | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/redhat/extras/fileshareset/fileshareset.spec b/redhat/extras/fileshareset/fileshareset.spec
index 6f76b549f..3e7b5ca41 100644
--- a/redhat/extras/fileshareset/fileshareset.spec
+++ b/redhat/extras/fileshareset/fileshareset.spec
@@ -92,10 +92,16 @@ echo "RESTRICT=yes" > "${RPM_BUILD_ROOT}%{_sysconfdir}/security/fileshare.conf"
 %files
 %defattr(-,root,root,-)
 %{_bindir}/filesharelist
-%verify(not mode) %{_bindir}/fileshareset
 %{_mandir}/man8/fileshareset.8*
 %config(noreplace) %{_sysconfdir}/security/fileshare.conf
 
+# Setuid program
+%if 0%{?suse_version}
+%verify(not mode) %{_bindir}/fileshareset
+%else
+%attr(4755,root,root) %{tde_bindir}/fileshareset
+%endif
+
 
 %if 0%{?suse_version}
 # Check permissions on setuid files (openSUSE specific)
-- 
cgit v1.2.1


From f78ccf0c5b15486090ac70b8054d7b909192697b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Andriot?= <albator78@libertysurf.fr>
Date: Sun, 5 Oct 2014 12:23:17 +0200
Subject: RPM Packaging: update fileshareset

---
 redhat/extras/fileshareset/fileshareset.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/redhat/extras/fileshareset/fileshareset.spec b/redhat/extras/fileshareset/fileshareset.spec
index 3e7b5ca41..99e65e9f9 100644
--- a/redhat/extras/fileshareset/fileshareset.spec
+++ b/redhat/extras/fileshareset/fileshareset.spec
@@ -99,7 +99,7 @@ echo "RESTRICT=yes" > "${RPM_BUILD_ROOT}%{_sysconfdir}/security/fileshare.conf"
 %if 0%{?suse_version}
 %verify(not mode) %{_bindir}/fileshareset
 %else
-%attr(4755,root,root) %{tde_bindir}/fileshareset
+%attr(4755,root,root) %{_bindir}/fileshareset
 %endif
 
 
-- 
cgit v1.2.1


From 50d3f3a6f96fdfdb249e79977f6840b620ce8c48 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Andriot?= <albator78@libertysurf.fr>
Date: Sun, 5 Oct 2014 12:23:30 +0200
Subject: RPM Packaging: update fileshareset

---
 redhat/extras/fileshareset/fileshareset.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/redhat/extras/fileshareset/fileshareset.spec b/redhat/extras/fileshareset/fileshareset.spec
index 99e65e9f9..01a6d42c6 100644
--- a/redhat/extras/fileshareset/fileshareset.spec
+++ b/redhat/extras/fileshareset/fileshareset.spec
@@ -111,5 +111,5 @@ echo "RESTRICT=yes" > "${RPM_BUILD_ROOT}%{_sysconfdir}/security/fileshare.conf"
 
 
 %changelog
-* Sun Oct 5 2014 François Andriot <francois.andriot@free.fr> - 1.0-1
+* Sun Oct 5 2014 François Andriot <francois.andriot@free.fr> - 2.0-1
 - Initial build for TDE R14
-- 
cgit v1.2.1


From 7517fab78467f3477e972c05c57f297517aeae67 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Andriot?= <albator78@libertysurf.fr>
Date: Sun, 5 Oct 2014 13:11:56 +0200
Subject: RPM Packaging: update tdelibs

---
 redhat/tdelibs/tdelibs-14.0.0.spec | 25 ++++++++++++++++++-------
 1 file changed, 18 insertions(+), 7 deletions(-)

diff --git a/redhat/tdelibs/tdelibs-14.0.0.spec b/redhat/tdelibs/tdelibs-14.0.0.spec
index 52a666d90..67355defc 100644
--- a/redhat/tdelibs/tdelibs-14.0.0.spec
+++ b/redhat/tdelibs/tdelibs-14.0.0.spec
@@ -81,6 +81,7 @@ BuildRequires:	trinity-filesystem >= %{tde_version}
 
 Requires:		trinity-arts >= 2:1.5.10
 Requires:		trinity-filesystem >= %{tde_version}
+Requires:		fileshareset >= 2.0
 
 BuildRequires:	cmake >= 2.8
 BuildRequires:	gcc-c++
@@ -185,7 +186,7 @@ BuildRequires:	jasper-devel
 # AVAHI support
 %if 0%{?rhel} >=5 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}
 %define with_avahi 1
-BuildRequires:	trinity-avahi-tqt-devel >= 1:0.6.30
+BuildRequires:	libavahi-tqt-devel >= 1:0.6.30
 %if 0%{?mgaversion} || 0%{?mdkversion}
 BuildRequires:	%{_lib}avahi-client-devel
 Requires:		%{_lib}avahi-client3
@@ -259,6 +260,7 @@ BuildRequires:	xz-devel
 # Certificates support
 %if 0%{?rhel} >= 6 || 0%{?fedora}
 %define	cacert	%{_sysconfdir}/ssl/certs/ca-certificates.crt
+BuildRequires:	ca-certificates
 Requires:		ca-certificates
 %endif
 %if 0%{?mgaversion} || 0%{?mdkversion}
@@ -269,6 +271,11 @@ Requires:		openssl
 %define	cacert	%{_sysconfdir}/pki/tls/certs/ca-bundle.crt
 Requires:		openssl
 %endif
+%if 0%{?suse_version}
+%define cacert	%{_sysconfdir}/ssl/ca-bundle.pem
+BuildRequires:	ca-certificates
+Requires:		ca-certificates
+%endif
 
 # XRANDR support
 #  On RHEL5, xrandr library is too old.
@@ -370,7 +377,6 @@ kimgio (image manipulation).
 %{tde_bindir}/dcopserver
 %{tde_bindir}/dcopserver_shutdown
 %{tde_bindir}/dcopstart
-%{tde_bindir}/filesharelist
 %{tde_bindir}/imagetops
 %{tde_bindir}/tdeab2tdeabc
 %{tde_bindir}/kaddprinterwizard
@@ -443,12 +449,10 @@ kimgio (image manipulation).
 
 # Some setuid binaries need special care
 %if 0%{?suse_version}
-%verify(not mode) %{tde_bindir}/fileshareset
 %verify(not mode) %{tde_bindir}/kgrantpty
 %verify(not mode) %{tde_bindir}/kpac_dhcp_helper
 %verify(not mode) %{tde_bindir}/start_tdeinit
 %else
-%attr(4755,root,root) %{tde_bindir}/fileshareset
 %attr(4755,root,root) %{tde_bindir}/kgrantpty
 %attr(4755,root,root) %{tde_bindir}/kpac_dhcp_helper
 %attr(4711,root,root) %{tde_bindir}/start_tdeinit
@@ -470,7 +474,6 @@ fi
 
 %if 0%{?suse_version}
 # Sets permissions on setuid files (openSUSE specific)
-%set_permissions %{tde_bindir}/fileshareset
 %set_permissions %{tde_bindir}/kgrantpty
 %set_permissions %{tde_bindir}/kpac_dhcp_helper
 %set_permissions %{tde_bindir}/start_tdeinit
@@ -611,7 +614,7 @@ fi
 %__rm -rf "%{?buildroot}"
 %__make install DESTDIR="%{?buildroot}" -C build
 
-# Use system-wide CA certificate
+# Use system-wide CA certificates
 %if "%{?cacert}" != ""
 %__rm -f "%{?buildroot}%{tde_datadir}/apps/kssl/ca-bundle.crt"
 %__ln_s "%{cacert}" "%{?buildroot}%{tde_datadir}/apps/kssl/ca-bundle.crt"
@@ -625,6 +628,15 @@ fi
 %suse_update_desktop_file -r tderesources Qt X-TDE-settings-desktop
 %endif
 
+# Remove setuid bit on some binaries
+chmod -s %{?buildroot}%{tde_bindir}/kgrantpty
+chmod -s %{?buildroot}%{tde_bindir}/kpac_dhcp_helper
+chmod -s %{?buildroot}%{tde_bindir}/start_tdeinit
+
+# fileshareset is provided separately.
+%__rm -f "%{?buildroot}%{tde_bindir}/filesharelist"
+%__rm -f "%{?buildroot}%{tde_bindir}/fileshareset"
+
 
 %clean
 %__rm -rf "%{?buildroot}"
@@ -633,7 +645,6 @@ fi
 %if 0%{?suse_version}
 # Check permissions on setuid files (openSUSE specific)
 %verifyscript
-%verify_permissions -e %{tde_bindir}/fileshareset
 %verify_permissions -e %{tde_bindir}/kgrantpty
 %verify_permissions -e %{tde_bindir}/kpac_dhcp_helper
 %verify_permissions -e %{tde_bindir}/start_tdeinit
-- 
cgit v1.2.1


From 817b99fec21b7d89d20d3f45fc5d7712e8af09ad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Andriot?= <albator78@libertysurf.fr>
Date: Sun, 5 Oct 2014 13:18:09 +0200
Subject: RPM Packaging: update build script

---
 redhat/Makefile.r14                  |  5 ++++-
 redhat/build/get_rpm_package_name.sh | 22 +++++++++++-----------
 2 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/redhat/Makefile.r14 b/redhat/Makefile.r14
index e63f21016..c44c81de8 100644
--- a/redhat/Makefile.r14
+++ b/redhat/Makefile.r14
@@ -85,7 +85,7 @@ tdeadmin:	tdebase
 tdeartwork:	tdebase
 	$(call buildpkg,tdeartwork)
 
-tdebase:	tdelibs htdig cmake
+tdebase:	tdelibs cmake htdig fileshareset
 	$(call buildpkg,tdebase)
 
 tdebindings:	tdebase tqscintilla
@@ -662,6 +662,9 @@ meta:
 	$(call buildpkg,extras/trinity-desktop)
 
 ### Extra packages
+fileshareset:
+	$(call buildpkg,extras/fileshareset)
+
 icons-nuvola:
 	$(call buildpkg,extras/icons-nuvola)
 
diff --git a/redhat/build/get_rpm_package_name.sh b/redhat/build/get_rpm_package_name.sh
index c89bf56f2..c6221420d 100755
--- a/redhat/build/get_rpm_package_name.sh
+++ b/redhat/build/get_rpm_package_name.sh
@@ -17,23 +17,24 @@ DEVEL="$2"
 
 # Some runtime packages are prefixed with 'trinity-', some are not.
 case "${PKGNAME}" in
-  "trinity-"*|"qt3"|"tqt3"|"tqtinterface"|"python-qt3"|"esound"|*"-tqt"|"lib"*) PREFIX="";;
+  "trinity-"*|"qt3"|"tqt3"|"tqtinterface"|"python-qt3"|"esound"|"avahi-tqt"|"dbus-tqt"|"dbus-1-tqt"|"libart-lgpl"|"fileshareset") PREFIX="";;
   "autoconf"|"automake"|"cmake"|"gnuchess"|"htdig"|"imlib1"|"libotr3"|"libtool"|"lilypond"|"m4"|"mftrace"|"pcsc-perl"|"torsocks"|"wv2") PREFIX="";;
   "curl") PREFIX="trinity-lib";;
   *) PREFIX="trinity-";;
 esac
 
 # Runtime packages
+lib=$(rpm -E %_lib)
 case "${PKGNAME}" in
   # Some packages have different runtime name than source package.
-  "avahi-tqt") PKGRUNTIME="libavahi-tqt1";;
-  "dbus-tqt") PKGRUNTIME="libdbus-tqt-1-0";;
-  "dbus-1-tqt") PKGRUNTIME="libdbus-1-tqt0";;
+  "avahi-tqt") PKGRUNTIME="${lib}avahi-tqt1";;
+  "dbus-tqt") PKGRUNTIME="${lib}dbus-tqt-1-0";;
+  "dbus-1-tqt") PKGRUNTIME="${lib}dbus-1-tqt0";;
   "esound") PKGRUNTIME="esound-libs";;
   "koffice") PKGRUNTIME="trinity-koffice-suite";;
-  "libart-lgpl") PKGRUNTIME="libart_lgpl_2-2";;
-  "tqt3") PKGRUNTIME="libtqt3-mt";;
-  "tqtinterface") PKGRUNTIME="libtqt4";;
+  "libart-lgpl") PKGRUNTIME="${lib}art_lgpl_2-2";;
+  "tqt3") PKGRUNTIME="${lib}tqt3-mt";;
+  "tqtinterface") PKGRUNTIME="${lib}tqt4";;
   # Language package: install only French language package
   "k3b-i18n"|"koffice-i18n"|"tde-i18n") PKGRUNTIME="${PKGNAME}-French";;
   # Default case: runtime package has same name as source package
@@ -61,18 +62,17 @@ if [ -n "${DEVEL}" ]; then
 
   # Some package have specific development package.
   case "${PKGNAME}" in
-    "avahi-tqt") PKGRUNTIME="libavahi-tqt-devel";;
-    "dbus-tqt") PKGRUNTIME="libdbus-tqt-1-devel";;
+    "avahi-tqt") PKGDEVEL="libavahi-tqt-devel";;
+    "dbus-tqt") PKGDEVEL="libdbus-tqt-1-devel";;
     "dbus-1-tqt") PKGDEVEL="libdbus-1-tqt-devel";;
     "esound") PKGDEVEL="esound-devel";;
     "libart-lgpl") PKGDEVEL="libart_lgpl-devel";;
-    "tqt3") PKGDEVEL="tqt3-dev-tools";;
+    "tqt3") PKGDEVEL="tqt3-dev-tools tqt3-apps-devel";;
     # Default case: development package has same name as runtime package, plus '-devel' suffix.
     *) PKGDEVEL="${PKGRUNTIME}-devel";;
   esac
 
   # Finally, other packages do have a '-devel'
   echo "${PREFIX}${PKGDEVEL}"
-  
 fi
 
-- 
cgit v1.2.1


From 06a8f7549010b575249cd868dbdae8801723eb02 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Andriot?= <albator78@libertysurf.fr>
Date: Sun, 5 Oct 2014 13:18:38 +0200
Subject: RPM Packaging: update dependencies

---
 redhat/dependencies/avahi-tqt/avahi-tqt-14.0.0.spec       | 5 +----
 redhat/dependencies/dbus-1-tqt/dbus-1-tqt-14.0.0.spec     | 4 ++--
 redhat/dependencies/dbus-tqt/dbus-tqt-14.0.0.spec         | 2 +-
 redhat/dependencies/libart-lgpl/libart-lgpl-14.0.0.spec   | 4 +++-
 redhat/dependencies/tqt3/tqt3-14.0.0.spec                 | 2 +-
 redhat/dependencies/tqtinterface/tqtinterface-14.0.0.spec | 2 +-
 redhat/extras/fileshareset/fileshareset.spec              | 2 +-
 7 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/redhat/dependencies/avahi-tqt/avahi-tqt-14.0.0.spec b/redhat/dependencies/avahi-tqt/avahi-tqt-14.0.0.spec
index 11a706c68..42c73bff1 100644
--- a/redhat/dependencies/avahi-tqt/avahi-tqt-14.0.0.spec
+++ b/redhat/dependencies/avahi-tqt/avahi-tqt-14.0.0.spec
@@ -17,11 +17,8 @@
 
 # TDE variables
 %define tde_version 14.0.0
-%define tde_prefix /opt/trinity
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
 
-%if 0%{?mdkversion} || 0%{?mdkversion} || 0%{?pclinuxos}
+%if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos}
 %define libavahi %{_lib}avahi
 %else
 %define libavahi libavahi
diff --git a/redhat/dependencies/dbus-1-tqt/dbus-1-tqt-14.0.0.spec b/redhat/dependencies/dbus-1-tqt/dbus-1-tqt-14.0.0.spec
index efe09daf6..cc19f5ed6 100644
--- a/redhat/dependencies/dbus-1-tqt/dbus-1-tqt-14.0.0.spec
+++ b/redhat/dependencies/dbus-1-tqt/dbus-1-tqt-14.0.0.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_version 14.0.0
 
-%if 0%{?mdkversion} || 0%{?mdkversion} || 0%{?pclinuxos}
+%if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos}
 %define libdbus %{_lib}dbus
 %else
 %define libdbus libdbus
@@ -42,7 +42,7 @@ License:	GPLv2+
 #Vendor:		Trinity Project
 #Packager:	Francois Andriot <francois.andriot@free.fr>
 
-Prefix:		%{tde_prefix}
+Prefix:		/usr
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0:	%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
diff --git a/redhat/dependencies/dbus-tqt/dbus-tqt-14.0.0.spec b/redhat/dependencies/dbus-tqt/dbus-tqt-14.0.0.spec
index 49495c7a2..1916afe60 100644
--- a/redhat/dependencies/dbus-tqt/dbus-tqt-14.0.0.spec
+++ b/redhat/dependencies/dbus-tqt/dbus-tqt-14.0.0.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_version 14.0.0
 
-%if 0%{?mdkversion} || 0%{?mdkversion} || 0%{?pclinuxos}
+%if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos}
 %define libdbus %{_lib}dbus
 %else
 %define libdbus libdbus
diff --git a/redhat/dependencies/libart-lgpl/libart-lgpl-14.0.0.spec b/redhat/dependencies/libart-lgpl/libart-lgpl-14.0.0.spec
index ecce24978..29b3a4f5e 100644
--- a/redhat/dependencies/libart-lgpl/libart-lgpl-14.0.0.spec
+++ b/redhat/dependencies/libart-lgpl/libart-lgpl-14.0.0.spec
@@ -19,7 +19,7 @@
 # TDE variables
 %define tde_version 14.0.0
 
-%if 0%{?mdkversion} || 0%{?mdkversion} || 0%{?pclinuxos}
+%if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos}
 %define libart %{_lib}art
 %else
 %define libart libart
@@ -65,6 +65,8 @@ Summary:        Library of functions for 2D graphics - runtime files
 Group:			System/Libraries
 Obsoletes:		libart_lgpl < %{version}-%{release}
 Provides:		libart_lgpl = %{version}-%{release}
+Obsoletes:		%{_lib}art_lgpl2 < %{version}-%{release}
+Provides:		%{_lib}art_lgpl2 = %{version}-%{release}
 Provides:		libart_lgpl_2-2 = %{version}-%{release}
 
 %description -n %{libart}_lgpl_2-2
diff --git a/redhat/dependencies/tqt3/tqt3-14.0.0.spec b/redhat/dependencies/tqt3/tqt3-14.0.0.spec
index 6a4b583e6..43d1f1d3b 100644
--- a/redhat/dependencies/tqt3/tqt3-14.0.0.spec
+++ b/redhat/dependencies/tqt3/tqt3-14.0.0.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_version 14.0.0
 
-%if 0%{?mdkversion} || 0%{?mdkversion} || 0%{?pclinuxos}
+%if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos}
 %define libtqt3 %{_lib}tqt3
 %else
 %define libtqt3 libtqt3
diff --git a/redhat/dependencies/tqtinterface/tqtinterface-14.0.0.spec b/redhat/dependencies/tqtinterface/tqtinterface-14.0.0.spec
index 0470c1feb..6f781b4ca 100755
--- a/redhat/dependencies/tqtinterface/tqtinterface-14.0.0.spec
+++ b/redhat/dependencies/tqtinterface/tqtinterface-14.0.0.spec
@@ -23,7 +23,7 @@
 %define tde_libdir %{tde_prefix}/%{_lib}
 %define cmake_modules_dir %{_datadir}/cmake/Modules
 
-%if 0%{?mdkversion} || 0%{?mdkversion} || 0%{?pclinuxos}
+%if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos}
 %define libtqt4 %{_lib}tqt4
 %else
 %define libtqt4 libtqt4
diff --git a/redhat/extras/fileshareset/fileshareset.spec b/redhat/extras/fileshareset/fileshareset.spec
index 01a6d42c6..96c69e81d 100644
--- a/redhat/extras/fileshareset/fileshareset.spec
+++ b/redhat/extras/fileshareset/fileshareset.spec
@@ -81,7 +81,7 @@ export LDFLAGS="$LDFLAGS -pie"
 %__install -D -m 644 man/fileshareset.8 %{?buildroot}%{_mandir}/man8/fileshareset.8
 
 # Install the default configuration file
-mkdir -p "${RPM_BUILD_ROOT}/etc/security/"
+mkdir -p "${RPM_BUILD_ROOT}%{_sysconfdir}/security/"
 echo "RESTRICT=yes" > "${RPM_BUILD_ROOT}%{_sysconfdir}/security/fileshare.conf"
 
 
-- 
cgit v1.2.1


From 8564e5cf3f321aecabb7eb8875ded531534c7277 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Andriot?= <albator78@libertysurf.fr>
Date: Sun, 5 Oct 2014 15:03:10 +0200
Subject: RPM Packaging: add rpmlintrc

---
 redhat/tdelibs/tdelibs-14.0.0.spec       | 12 +++++++-----
 redhat/tdelibs/trinity-tdelibs-rpmlintrc |  1 +
 2 files changed, 8 insertions(+), 5 deletions(-)
 create mode 100644 redhat/tdelibs/trinity-tdelibs-rpmlintrc

diff --git a/redhat/tdelibs/tdelibs-14.0.0.spec b/redhat/tdelibs/tdelibs-14.0.0.spec
index 67355defc..2b7839a99 100644
--- a/redhat/tdelibs/tdelibs-14.0.0.spec
+++ b/redhat/tdelibs/tdelibs-14.0.0.spec
@@ -58,6 +58,7 @@ Prefix:			%{tde_prefix}
 BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0:		%{name}-%{version}%{?preversion:~%{preversion}}.tar.gz
+Source1:		%{name}-rpmlintrc
 
 Obsoletes:		tdelibs < %{version}-%{release}
 Provides:		tdelibs = %{version}-%{release}
@@ -628,12 +629,13 @@ fi
 %suse_update_desktop_file -r tderesources Qt X-TDE-settings-desktop
 %endif
 
-# Remove setuid bit on some binaries
-chmod -s %{?buildroot}%{tde_bindir}/kgrantpty
-chmod -s %{?buildroot}%{tde_bindir}/kpac_dhcp_helper
-chmod -s %{?buildroot}%{tde_bindir}/start_tdeinit
+# Remove setuid bit on some binaries.
+chmod -s "%{?buildroot}%{tde_bindir}/kgrantpty"
+chmod -s "%{?buildroot}%{tde_bindir}/kpac_dhcp_helper"
+chmod -s "%{?buildroot}%{tde_bindir}/start_tdeinit"
 
-# fileshareset is provided separately.
+# fileshareset 2.0 is provided separately.
+# Remove integrated fileshareset 1.0 .
 %__rm -f "%{?buildroot}%{tde_bindir}/filesharelist"
 %__rm -f "%{?buildroot}%{tde_bindir}/fileshareset"
 
diff --git a/redhat/tdelibs/trinity-tdelibs-rpmlintrc b/redhat/tdelibs/trinity-tdelibs-rpmlintrc
new file mode 100644
index 000000000..8668d5e81
--- /dev/null
+++ b/redhat/tdelibs/trinity-tdelibs-rpmlintrc
@@ -0,0 +1 @@
+setBadness('suse-dbus-unauthorized-service', 0)
-- 
cgit v1.2.1


From 7a5be3312ef978db822be9589a32e1893aae90e9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Andriot?= <albator78@libertysurf.fr>
Date: Sun, 5 Oct 2014 15:48:44 +0200
Subject: RPM Packaging: update tdelibs

---
 redhat/Makefile.r14                | 5 ++++-
 redhat/tdelibs/tdelibs-14.0.0.spec | 6 +++---
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/redhat/Makefile.r14 b/redhat/Makefile.r14
index c44c81de8..1ce207a10 100644
--- a/redhat/Makefile.r14
+++ b/redhat/Makefile.r14
@@ -26,7 +26,7 @@ main:	tdelibs tdebase tdeaccessibility tdeadmin tdegames tdemultimedia tdepim td
 libraries:	libkdcraw libkexiv2 libkipi libksquirrel libtdeldap libtqt-perl pytdeextensions python-trinity
 applications:	abakus amarok basket bibletime digikam dolphin filelight gtk3-tqt-engine gtk-qt-engine gwenview k3b k9copy kaffeine kaffeine-mozilla kasablanca katapult kbarcode kbfx kbibtex kbiff kbookreader kchmviewer kcmautostart kcmldap kcmldapcontroller kcmldapmanager kcpuload kdbg kdbusnotification kdiff3 kdirstat keep kerberostray kftpgrabber kile kima kiosktool kkbswitch klcddimmer kmplayer kmyfirewall kmymoney knemo knetload knetstats knights knmap knowit knutclient koffice konversation kopete-otr kpicosim kpilot krecipes krename krusader kscope ksensors kshowmail kshutdown ksplash-engine-moodin ksquirrel kstreamripper ksystemlog ktechlab ktorrent kuickshow kvirc kvkbd kvpnc mplayerthumbs piklab potracegui qt4-tqt-theme-engine rosegarden smartcardauth smb4k soundkonverter tde-guidance tdeio-apt tdeio-ftps tdeio-locate tdeio-sword tdeio-umountwrapper tdenetworkmanager tdepowersave tderadio tde-style-lipstik tde-style-qtcurve tdesudo tdesvn tde-systemsettings tdmtheme tellico tork twin-style-crystal wlassistant yakuake
 i18n:	gwenview-i18n k3b-i18n koffice-i18n tde-i18n
-extras:	icons-nuvola kdevmon kdissert klamav kompose koverartist kpacman style-ia-ora
+extras:	icons-nuvola kdevmon kdissert klamav kompose koverartist kpacman png2qrgb style-ia-ora
 
 
 ### Trinity Dependencies
@@ -686,6 +686,9 @@ koverartist:
 kpacman:
 	$(call buildpkg,extras/kpacman)
 
+png2qrgb:
+	$(call buildpkg,extras/png2qrgb)
+
 style-ia-ora:
 	$(call buildpkg,extras/style-ia-ora)
 
diff --git a/redhat/tdelibs/tdelibs-14.0.0.spec b/redhat/tdelibs/tdelibs-14.0.0.spec
index 2b7839a99..6109da527 100644
--- a/redhat/tdelibs/tdelibs-14.0.0.spec
+++ b/redhat/tdelibs/tdelibs-14.0.0.spec
@@ -630,9 +630,9 @@ fi
 %endif
 
 # Remove setuid bit on some binaries.
-chmod -s "%{?buildroot}%{tde_bindir}/kgrantpty"
-chmod -s "%{?buildroot}%{tde_bindir}/kpac_dhcp_helper"
-chmod -s "%{?buildroot}%{tde_bindir}/start_tdeinit"
+chmod 0755 "%{?buildroot}%{tde_bindir}/kgrantpty"
+chmod 0755 "%{?buildroot}%{tde_bindir}/kpac_dhcp_helper"
+chmod 0755 "%{?buildroot}%{tde_bindir}/start_tdeinit"
 
 # fileshareset 2.0 is provided separately.
 # Remove integrated fileshareset 1.0 .
-- 
cgit v1.2.1


From aeb0878cbf7f908978c080a9bbb2b4b1c08de18d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Andriot?= <albator78@libertysurf.fr>
Date: Sun, 5 Oct 2014 16:14:59 +0200
Subject: RPM Packaging: update tdelibs

---
 redhat/tdelibs/trinity-tdelibs-rpmlintrc | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/redhat/tdelibs/trinity-tdelibs-rpmlintrc b/redhat/tdelibs/trinity-tdelibs-rpmlintrc
index 8668d5e81..7df2d7387 100644
--- a/redhat/tdelibs/trinity-tdelibs-rpmlintrc
+++ b/redhat/tdelibs/trinity-tdelibs-rpmlintrc
@@ -1 +1,3 @@
 setBadness('suse-dbus-unauthorized-service', 0)
+setBadness('permissions-file-setuid-bit', 0)
+setBadness('non-position-independent-executable', 0)
-- 
cgit v1.2.1


From 29e62220cb68514d690d516f030da6c4f4aaec28 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Andriot?= <albator78@libertysurf.fr>
Date: Sun, 5 Oct 2014 18:04:47 +0200
Subject: RPM Packaging: cleanup tdebase

---
 .../kdebase-3.5.12-desktop-openterminalhere.patch  |   19 -
 redhat/tdebase/kdebase-3.5.12-disable-krandr.patch |   36 -
 .../tdebase/kdebase-3.5.12-halmountoptions.patch   |   78 -
 .../tdebase/kdebase-3.5.12-kdesktop_lock_fix.patch |   22 -
 .../kdebase-3.5.12-kdesu-noignorebutton.patch      |   45 -
 .../kdebase-3.5.12-kdm_hide_menu_button.patch      |   29 -
 redhat/tdebase/kdebase-3.5.12-kickerfix.patch      |   13 -
 .../tdebase/kdebase-3.5.12-kickoff_unstable.patch  |  428 -
 redhat/tdebase/kdebase-3.5.12-kio_man_utf8.patch   |   40 -
 .../kdebase-3.5.12-konq_menu_tab_background.patch  |  136 -
 redhat/tdebase/kdebase-3.5.12-r1220927.patch       |   29 -
 redhat/tdebase/kdebase-3.5.12-r1220975.patch       |   19 -
 .../kdebase-3.5.12-shutdowndlg-dbus-include.patch  |   20 -
 .../kdebase-3.5.12-startkde_directories.patch      |   19 -
 redhat/tdebase/kdebase-3.5.12.spec                 |  757 --
 ...ebase-3.5.13-add_disable_composite_option.patch |   81 -
 ...se-3.5.13-add_drag_drop_to_kate_file_list.patch |   33 -
 ...base-3.5.13-add_reorder_documents_in_kate.patch |  167 -
 .../kdebase-3.5.13-add_usbstorage_panel.patch      | 1278 ---
 .../kdebase-3.5.13-add_xscreensaver_support.patch  |   76 -
 ...al_window_interaction_inside_lock_process.patch |  372 -
 .../kdebase-3.5.13-build_without_consolekit.patch  |   22 -
 .../kdebase-3.5.13-build_without_dbustqt.patch     |   97 -
 ...yboard_shortcuts_for_file_location_moving.patch |   22 -
 ...e-3.5.13-disable_tsak_dialog_if_not_built.patch |   50 -
 ...-3.5.13-do_not_require_dbustqt_if_no_tsak.patch |   37 -
 .../kdebase-3.5.13-enable_xtest_support.patch      |  135 -
 ...base-3.5.13-engage_lock_in_near_real_time.patch |  252 -
 ...3-engage_lock_in_near_real_time_continued.patch |  356 -
 ...-3.5.13-ensure_pagersettings_is_installed.patch |   19 -
 .../tdebase/kdebase-3.5.13-fix_dbus_include.patch  |   10 -
 .../kdebase-3.5.13-fix_device_icon_placement.patch |   30 -
 .../tdebase/kdebase-3.5.13-fix_fancy_logout.patch  |  162 -
 .../tdebase/kdebase-3.5.13-fix_fqdn_in_title.patch |   46 -
 ...e-3.5.13-fix_kdesktop_lock_security_issue.patch |  157 -
 ...-fix_kdesu_kdesudo_argument_compatibility.patch |   18 -
 .../tdebase/kdebase-3.5.13-fix_kdm_cpu_usage.patch |   47 -
 ...kdebase-3.5.13-fix_khtml_smooth_scrolling.patch |   38 -
 redhat/tdebase/kdebase-3.5.13-fix_kio_sftp.patch   |   57 -
 ...ase-3.5.13-fix_kio_sftp_nonstandard_ports.patch |   23 -
 .../kdebase-3.5.13-fix_kxdglauncher_document.patch |   18 -
 .../tdebase/kdebase-3.5.13-fix_lib_detection.patch |  102 -
 .../tdebase/kdebase-3.5.13-fix_lock_failure.patch  |   84 -
 ....5.13-fix_menu_crash_with_disabled_search.patch |   20 -
 ...kdebase-3.5.13-fix_multihead_desktop_lock.patch |  297 -
 ...e-3.5.13-fix_potential_ABI_compat_problem.patch |   24 -
 .../kdebase-3.5.13-fix_race_condition.patch        |   22 -
 .../kdebase-3.5.13-fix_rhel4_compilation.patch     |  152 -
 .../tdebase/kdebase-3.5.13-fix_tooltip_lock.patch  |   29 -
 ...-3.5.13-fix_translations_in_desktop_files.patch |  105 -
 redhat/tdebase/kdebase-3.5.13-fix_tsak_ftbfs.patch |   12 -
 ...ebase-3.5.13-genkdmconf_Xsession_location.patch |   11 -
 ...e-3.5.13-genkdmconf_Xsession_location_xdm.patch |   11 -
 redhat/tdebase/kdebase-3.5.13-kate_focus_fix.patch |  133 -
 redhat/tdebase/kdebase-3.5.13-kate_mru.patch       |   71 -
 .../kdebase-3.5.13-kdesu-noignorebutton.patch      |   45 -
 .../kdebase-3.5.13-kdesu_showkeeppassword.patch    |   11 -
 redhat/tdebase/kdebase-3.5.13-kdm-crypt.patch      |   43 -
 .../tdebase/kdebase-3.5.13-kicker-easyvector.patch |   29 -
 .../tdebase/kdebase-3.5.13-kickoff_unstable.patch  |  442 -
 redhat/tdebase/kdebase-3.5.13-kio_man_utf8.patch   |   40 -
 .../tdebase/kdebase-3.5.13-konq_icon_effect.patch  |   19 -
 .../kdebase-3.5.13-konq_menu_tab_background.patch  |  160 -
 .../kdebase-3.5.13-konqsidebar_documents.patch     |   11 -
 ...-3.5.13-kpersonalizer_default_doubleclick.patch |   41 -
 .../kdebase-3.5.13-kwin-keramic-pics-emb.patch     |   62 -
 .../kdebase-3.5.13-mediamanager_ftbfs.patch        |   10 -
 ...e-3.5.13-option_to_disable_scroll_desktop.patch |  101 -
 ...se-3.5.13-prevent_tooltip_over_lockscreen.patch |  137 -
 ....13-randrtray_merge_x11_reconfig_requests.patch |   51 -
 ...-replicate_led_status_on_virtual_keyboard.patch |   95 -
 .../kdebase-3.5.13-restore_kde3_clock.patch        |  104 -
 .../tdebase/kdebase-3.5.13-start_dcop_in_tdm.patch |   34 -
 .../kdebase-3.5.13-startkde_directories.patch      |  118 -
 redhat/tdebase/kdebase-3.5.13-startkde_icon.patch  |   19 -
 .../kdebase-3.5.13-startkde_ldpreload.patch        |   13 -
 redhat/tdebase/kdebase-3.5.13-support_hal_04.patch | 1033 ---
 .../kdebase-3.5.13-tsak_keyboard_hotplug.patch     |  641 --
 ...3-update_default_konq_max_image_prev_size.patch |   49 -
 ...kdebase-3.5.13-upgrade_to_sru_20120806.patch.gz |  Bin 302981 -> 0 bytes
 .../kdebase-3.5.13.1-fix_displayconfig_icon.patch  |   20 -
 .../kdebase-3.5.13.1-fix_startkde_path.patch       |  107 -
 .../kdebase-3.5.13.1-fix_tdm_pid_file.patch        |   11 -
 .../tdebase/kdebase-3.5.13.1-startkde_icon.patch   |   19 -
 redhat/tdebase/kdebase-3.5.13.1.spec               | 3266 -------
 .../tdebase/kdebase-3.5.13.2-add_ck_shutdown.patch |   15 -
 ...ase-3.5.13.2-add_disable_composite_option.patch |   81 -
 .../kdebase-3.5.13.2-build_without_dbustqt.patch   |  139 -
 .../tdebase/kdebase-3.5.13.2-set_kdm_minuid.patch  |   39 -
 redhat/tdebase/kdebase-3.5.13.spec                 | 3467 -------
 redhat/tdebase/kdebase-bp126-553923b2.diff         |  135 -
 redhat/tdebase/kdebase-bp127-57f5c069.diff         |  159 -
 redhat/tdebase/kdebase-bp128-1f33dc8f.diff         |   58 -
 redhat/tdebase/r1182808.diff                       |   29 -
 redhat/tdebase/r1201523.diff                       |   31 -
 redhat/tdebase/r1201705.diff                       |   43 -
 redhat/tdebase/r1221326.diff                       |   13 -
 .../tdebase/tdebase-3.5.13.1-missing_ldflags.patch |   10 -
 .../tdebase-3.5.13.2-bookmark_global_copy.patch    |   27 -
 ...debase-3.5.13.2-displayconfig_translation.patch |   37 -
 .../tdebase-3.5.13.2-fix_halbackend_slash.patch    |   13 -
 .../tdebase-3.5.13.2-fix_ice_security_hole.patch   |   51 -
 .../tdebase-3.5.13.2-fix_media_safelyremove.patch  |   10 -
 .../tdebase-3.5.13.2-fix_tdm_user_path.patch       |   16 -
 redhat/tdebase/tdebase-3.5.13.2-fix_xdg_menu.patch | 9489 --------------------
 ...tdebase-3.5.13.2-kbackground_xml_selector.patch |  701 --
 .../tdebase-3.5.13.2-kcm_xcursor_applytheme.patch  |  136 -
 .../tdebase-3.5.13.2-kcontrol_menu_entry.patch     |   20 -
 .../tdebase-3.5.13.2-kdesktop_crossfade.patch      | 1002 ---
 .../tdebase-3.5.13.2-kdesu-noignorebutton.patch    |   26 -
 .../tdebase-3.5.13.2-kdm_theme_selector.patch      |  229 -
 .../tdebase-3.5.13.2-kdm_utf8_password.patch       |  297 -
 ...-3.5.13.2-kickoff_add_packagekit_shortcut.patch |   12 -
 .../tdebase-3.5.13.2-kickoff_default_favs.patch    |   16 -
 .../tdebase-3.5.13.2-kickoff_xdg_dirs.patch        |   45 -
 .../tdebase/tdebase-3.5.13.2-select_wm_gui.patch   |  639 --
 .../tdebase/tdebase-3.5.13.2-suspend_unmount.patch |  152 -
 .../tdebase/tdebase-3.5.13.2-vibrate_dialog.patch  |  186 -
 redhat/tdebase/tdebase-3.5.13.2.spec               |   81 +-
 redhat/tdebase/tiles-fixed-png-images.tar.gz       |  Bin 50550 -> 0 bytes
 120 files changed, 1 insertion(+), 30500 deletions(-)
 delete mode 100644 redhat/tdebase/kdebase-3.5.12-desktop-openterminalhere.patch
 delete mode 100644 redhat/tdebase/kdebase-3.5.12-disable-krandr.patch
 delete mode 100644 redhat/tdebase/kdebase-3.5.12-halmountoptions.patch
 delete mode 100644 redhat/tdebase/kdebase-3.5.12-kdesktop_lock_fix.patch
 delete mode 100644 redhat/tdebase/kdebase-3.5.12-kdesu-noignorebutton.patch
 delete mode 100644 redhat/tdebase/kdebase-3.5.12-kdm_hide_menu_button.patch
 delete mode 100644 redhat/tdebase/kdebase-3.5.12-kickerfix.patch
 delete mode 100644 redhat/tdebase/kdebase-3.5.12-kickoff_unstable.patch
 delete mode 100644 redhat/tdebase/kdebase-3.5.12-kio_man_utf8.patch
 delete mode 100644 redhat/tdebase/kdebase-3.5.12-konq_menu_tab_background.patch
 delete mode 100644 redhat/tdebase/kdebase-3.5.12-r1220927.patch
 delete mode 100644 redhat/tdebase/kdebase-3.5.12-r1220975.patch
 delete mode 100644 redhat/tdebase/kdebase-3.5.12-shutdowndlg-dbus-include.patch
 delete mode 100644 redhat/tdebase/kdebase-3.5.12-startkde_directories.patch
 delete mode 100644 redhat/tdebase/kdebase-3.5.12.spec
 delete mode 100644 redhat/tdebase/kdebase-3.5.13-add_disable_composite_option.patch
 delete mode 100644 redhat/tdebase/kdebase-3.5.13-add_drag_drop_to_kate_file_list.patch
 delete mode 100644 redhat/tdebase/kdebase-3.5.13-add_reorder_documents_in_kate.patch
 delete mode 100644 redhat/tdebase/kdebase-3.5.13-add_usbstorage_panel.patch
 delete mode 100644 redhat/tdebase/kdebase-3.5.13-add_xscreensaver_support.patch
 delete mode 100644 redhat/tdebase/kdebase-3.5.13-allow_minimal_window_interaction_inside_lock_process.patch
 delete mode 100644 redhat/tdebase/kdebase-3.5.13-build_without_consolekit.patch
 delete mode 100644 redhat/tdebase/kdebase-3.5.13-build_without_dbustqt.patch
 delete mode 100644 redhat/tdebase/kdebase-3.5.13-disable_keyboard_shortcuts_for_file_location_moving.patch
 delete mode 100644 redhat/tdebase/kdebase-3.5.13-disable_tsak_dialog_if_not_built.patch
 delete mode 100644 redhat/tdebase/kdebase-3.5.13-do_not_require_dbustqt_if_no_tsak.patch
 delete mode 100644 redhat/tdebase/kdebase-3.5.13-enable_xtest_support.patch
 delete mode 100644 redhat/tdebase/kdebase-3.5.13-engage_lock_in_near_real_time.patch
 delete mode 100644 redhat/tdebase/kdebase-3.5.13-engage_lock_in_near_real_time_continued.patch
 delete mode 100644 redhat/tdebase/kdebase-3.5.13-ensure_pagersettings_is_installed.patch
 delete mode 100644 redhat/tdebase/kdebase-3.5.13-fix_dbus_include.patch
 delete mode 100644 redhat/tdebase/kdebase-3.5.13-fix_device_icon_placement.patch
 delete mode 100644 redhat/tdebase/kdebase-3.5.13-fix_fancy_logout.patch
 delete mode 100644 redhat/tdebase/kdebase-3.5.13-fix_fqdn_in_title.patch
 delete mode 100644 redhat/tdebase/kdebase-3.5.13-fix_kdesktop_lock_security_issue.patch
 delete mode 100644 redhat/tdebase/kdebase-3.5.13-fix_kdesu_kdesudo_argument_compatibility.patch
 delete mode 100644 redhat/tdebase/kdebase-3.5.13-fix_kdm_cpu_usage.patch
 delete mode 100644 redhat/tdebase/kdebase-3.5.13-fix_khtml_smooth_scrolling.patch
 delete mode 100644 redhat/tdebase/kdebase-3.5.13-fix_kio_sftp.patch
 delete mode 100644 redhat/tdebase/kdebase-3.5.13-fix_kio_sftp_nonstandard_ports.patch
 delete mode 100644 redhat/tdebase/kdebase-3.5.13-fix_kxdglauncher_document.patch
 delete mode 100644 redhat/tdebase/kdebase-3.5.13-fix_lib_detection.patch
 delete mode 100644 redhat/tdebase/kdebase-3.5.13-fix_lock_failure.patch
 delete mode 100644 redhat/tdebase/kdebase-3.5.13-fix_menu_crash_with_disabled_search.patch
 delete mode 100644 redhat/tdebase/kdebase-3.5.13-fix_multihead_desktop_lock.patch
 delete mode 100644 redhat/tdebase/kdebase-3.5.13-fix_potential_ABI_compat_problem.patch
 delete mode 100644 redhat/tdebase/kdebase-3.5.13-fix_race_condition.patch
 delete mode 100644 redhat/tdebase/kdebase-3.5.13-fix_rhel4_compilation.patch
 delete mode 100644 redhat/tdebase/kdebase-3.5.13-fix_tooltip_lock.patch
 delete mode 100644 redhat/tdebase/kdebase-3.5.13-fix_translations_in_desktop_files.patch
 delete mode 100644 redhat/tdebase/kdebase-3.5.13-fix_tsak_ftbfs.patch
 delete mode 100644 redhat/tdebase/kdebase-3.5.13-genkdmconf_Xsession_location.patch
 delete mode 100644 redhat/tdebase/kdebase-3.5.13-genkdmconf_Xsession_location_xdm.patch
 delete mode 100644 redhat/tdebase/kdebase-3.5.13-kate_focus_fix.patch
 delete mode 100644 redhat/tdebase/kdebase-3.5.13-kate_mru.patch
 delete mode 100644 redhat/tdebase/kdebase-3.5.13-kdesu-noignorebutton.patch
 delete mode 100644 redhat/tdebase/kdebase-3.5.13-kdesu_showkeeppassword.patch
 delete mode 100644 redhat/tdebase/kdebase-3.5.13-kdm-crypt.patch
 delete mode 100644 redhat/tdebase/kdebase-3.5.13-kicker-easyvector.patch
 delete mode 100644 redhat/tdebase/kdebase-3.5.13-kickoff_unstable.patch
 delete mode 100644 redhat/tdebase/kdebase-3.5.13-kio_man_utf8.patch
 delete mode 100644 redhat/tdebase/kdebase-3.5.13-konq_icon_effect.patch
 delete mode 100644 redhat/tdebase/kdebase-3.5.13-konq_menu_tab_background.patch
 delete mode 100644 redhat/tdebase/kdebase-3.5.13-konqsidebar_documents.patch
 delete mode 100644 redhat/tdebase/kdebase-3.5.13-kpersonalizer_default_doubleclick.patch
 delete mode 100644 redhat/tdebase/kdebase-3.5.13-kwin-keramic-pics-emb.patch
 delete mode 100644 redhat/tdebase/kdebase-3.5.13-mediamanager_ftbfs.patch
 delete mode 100644 redhat/tdebase/kdebase-3.5.13-option_to_disable_scroll_desktop.patch
 delete mode 100644 redhat/tdebase/kdebase-3.5.13-prevent_tooltip_over_lockscreen.patch
 delete mode 100644 redhat/tdebase/kdebase-3.5.13-randrtray_merge_x11_reconfig_requests.patch
 delete mode 100644 redhat/tdebase/kdebase-3.5.13-replicate_led_status_on_virtual_keyboard.patch
 delete mode 100644 redhat/tdebase/kdebase-3.5.13-restore_kde3_clock.patch
 delete mode 100644 redhat/tdebase/kdebase-3.5.13-start_dcop_in_tdm.patch
 delete mode 100644 redhat/tdebase/kdebase-3.5.13-startkde_directories.patch
 delete mode 100644 redhat/tdebase/kdebase-3.5.13-startkde_icon.patch
 delete mode 100644 redhat/tdebase/kdebase-3.5.13-startkde_ldpreload.patch
 delete mode 100644 redhat/tdebase/kdebase-3.5.13-support_hal_04.patch
 delete mode 100644 redhat/tdebase/kdebase-3.5.13-tsak_keyboard_hotplug.patch
 delete mode 100644 redhat/tdebase/kdebase-3.5.13-update_default_konq_max_image_prev_size.patch
 delete mode 100644 redhat/tdebase/kdebase-3.5.13-upgrade_to_sru_20120806.patch.gz
 delete mode 100644 redhat/tdebase/kdebase-3.5.13.1-fix_displayconfig_icon.patch
 delete mode 100644 redhat/tdebase/kdebase-3.5.13.1-fix_startkde_path.patch
 delete mode 100644 redhat/tdebase/kdebase-3.5.13.1-fix_tdm_pid_file.patch
 delete mode 100644 redhat/tdebase/kdebase-3.5.13.1-startkde_icon.patch
 delete mode 100644 redhat/tdebase/kdebase-3.5.13.1.spec
 delete mode 100644 redhat/tdebase/kdebase-3.5.13.2-add_ck_shutdown.patch
 delete mode 100644 redhat/tdebase/kdebase-3.5.13.2-add_disable_composite_option.patch
 delete mode 100644 redhat/tdebase/kdebase-3.5.13.2-build_without_dbustqt.patch
 delete mode 100644 redhat/tdebase/kdebase-3.5.13.2-set_kdm_minuid.patch
 delete mode 100644 redhat/tdebase/kdebase-3.5.13.spec
 delete mode 100644 redhat/tdebase/kdebase-bp126-553923b2.diff
 delete mode 100644 redhat/tdebase/kdebase-bp127-57f5c069.diff
 delete mode 100644 redhat/tdebase/kdebase-bp128-1f33dc8f.diff
 delete mode 100644 redhat/tdebase/r1182808.diff
 delete mode 100644 redhat/tdebase/r1201523.diff
 delete mode 100644 redhat/tdebase/r1201705.diff
 delete mode 100644 redhat/tdebase/r1221326.diff
 delete mode 100644 redhat/tdebase/tdebase-3.5.13.1-missing_ldflags.patch
 delete mode 100644 redhat/tdebase/tdebase-3.5.13.2-bookmark_global_copy.patch
 delete mode 100644 redhat/tdebase/tdebase-3.5.13.2-displayconfig_translation.patch
 delete mode 100644 redhat/tdebase/tdebase-3.5.13.2-fix_halbackend_slash.patch
 delete mode 100644 redhat/tdebase/tdebase-3.5.13.2-fix_ice_security_hole.patch
 delete mode 100644 redhat/tdebase/tdebase-3.5.13.2-fix_media_safelyremove.patch
 delete mode 100644 redhat/tdebase/tdebase-3.5.13.2-fix_tdm_user_path.patch
 delete mode 100644 redhat/tdebase/tdebase-3.5.13.2-fix_xdg_menu.patch
 delete mode 100644 redhat/tdebase/tdebase-3.5.13.2-kbackground_xml_selector.patch
 delete mode 100644 redhat/tdebase/tdebase-3.5.13.2-kcm_xcursor_applytheme.patch
 delete mode 100644 redhat/tdebase/tdebase-3.5.13.2-kcontrol_menu_entry.patch
 delete mode 100644 redhat/tdebase/tdebase-3.5.13.2-kdesktop_crossfade.patch
 delete mode 100644 redhat/tdebase/tdebase-3.5.13.2-kdesu-noignorebutton.patch
 delete mode 100644 redhat/tdebase/tdebase-3.5.13.2-kdm_theme_selector.patch
 delete mode 100644 redhat/tdebase/tdebase-3.5.13.2-kdm_utf8_password.patch
 delete mode 100644 redhat/tdebase/tdebase-3.5.13.2-kickoff_add_packagekit_shortcut.patch
 delete mode 100644 redhat/tdebase/tdebase-3.5.13.2-kickoff_default_favs.patch
 delete mode 100644 redhat/tdebase/tdebase-3.5.13.2-kickoff_xdg_dirs.patch
 delete mode 100644 redhat/tdebase/tdebase-3.5.13.2-select_wm_gui.patch
 delete mode 100644 redhat/tdebase/tdebase-3.5.13.2-suspend_unmount.patch
 delete mode 100644 redhat/tdebase/tdebase-3.5.13.2-vibrate_dialog.patch
 delete mode 100644 redhat/tdebase/tiles-fixed-png-images.tar.gz

diff --git a/redhat/tdebase/kdebase-3.5.12-desktop-openterminalhere.patch b/redhat/tdebase/kdebase-3.5.12-desktop-openterminalhere.patch
deleted file mode 100644
index 1dc03e97e..000000000
--- a/redhat/tdebase/kdebase-3.5.12-desktop-openterminalhere.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-*** kdebase/kdesktop/krootwm.cc.ori	2011-07-20 14:14:25.822954866 +0200
---- kdebase/kdesktop/krootwm.cc	2011-07-20 14:16:09.964002976 +0200
-***************
-*** 760,766 ****
-      KConfigGroupSaver gs(KGlobal::config(), "General");
-      TQString terminal = KGlobal::config()->readPathEntry("TerminalApplication", "konsole");
-  
-!     *p << terminal << "--workdir=" + KGlobalSettings::desktopPath() + "/";
-  
-      p->start(KProcess::DontCare);
-  
---- 760,766 ----
-      KConfigGroupSaver gs(KGlobal::config(), "General");
-      TQString terminal = KGlobal::config()->readPathEntry("TerminalApplication", "konsole");
-  
-!     *p << terminal;
-  
-      p->start(KProcess::DontCare);
-  
diff --git a/redhat/tdebase/kdebase-3.5.12-disable-krandr.patch b/redhat/tdebase/kdebase-3.5.12-disable-krandr.patch
deleted file mode 100644
index b7924cef0..000000000
--- a/redhat/tdebase/kdebase-3.5.12-disable-krandr.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-*** kdebase/kcontrol/Makefile.am.ORI	2011-09-18 22:04:50.000000000 +0200
---- kdebase/kcontrol/Makefile.am	2011-09-18 22:05:00.000000000 +0200
-***************
-*** 12,18 ****
-  endif
-  
-  if include_kcontrol_iccconfig
-! ICCCONFIG_SUBDIR=iccconfig
-  endif
-  
-  if include_kcontrol_usbview
---- 12,18 ----
-  endif
-  
-  if include_kcontrol_iccconfig
-! #ICCCONFIG_SUBDIR=iccconfig
-  endif
-  
-  if include_kcontrol_usbview
-***************
-*** 24,30 ****
-  endif
-  
-  if include_kcontrol_randr
-! RANDR_SUBDIR=randr
-  endif
-  
-  if include_kcontrol_joystick
---- 24,30 ----
-  endif
-  
-  if include_kcontrol_randr
-! #RANDR_SUBDIR=randr
-  endif
-  
-  if include_kcontrol_joystick
diff --git a/redhat/tdebase/kdebase-3.5.12-halmountoptions.patch b/redhat/tdebase/kdebase-3.5.12-halmountoptions.patch
deleted file mode 100644
index 4a604f9a3..000000000
--- a/redhat/tdebase/kdebase-3.5.12-halmountoptions.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-*** kdebase/kioslave/media/mediamanager/halbackend.cpp.orig	2010-09-30 00:24:28.000000000 +0200
---- kdebase/kioslave/media/mediamanager/halbackend.cpp	2011-07-20 16:39:40.933056051 +0200
-***************
-*** 873,878 ****
---- 873,905 ----
-      s_HALBackend->DeviceCondition(udi, condition_name);
-  }
-  
-+ TQStringList HALBackend::getHALmountoptions(TQString udi)
-+ {
-+     const char*   _ppt_string;
-+     LibHalVolume* volume;
-+     LibHalDrive* drive;
-+ 
-+     TQString _ppt_QString;
-+ 
-+     volume = libhal_volume_from_udi( m_halContext, udi.latin1() );
-+     if( volume )
-+         drive = libhal_drive_from_udi( m_halContext, libhal_volume_get_storage_device_udi( volume ) );
-+     else
-+         drive = libhal_drive_from_udi( m_halContext, udi.latin1() );
-+ 
-+     if( !drive )
-+            return TQString::null;
-+ 
-+     if( volume )
-+        _ppt_string = libhal_volume_policy_get_mount_options ( drive, volume, NULL );
-+     else
-+        _ppt_string = libhal_drive_policy_get_mount_options ( drive, NULL );
-+ 
-+     _ppt_QString = TQString(_ppt_string ? _ppt_string : "");
-+ 
-+    return TQStringList::split(",",_ppt_QString);
-+ }
-+ 
-  TQStringList HALBackend::mountoptions(const TQString &name)
-  {
-      const Medium* medium = m_mediaList.findById(name);
-***************
-*** 1472,1481 ****
---- 1499,1524 ----
-              soptions << TQString("data=ordered");
-      }
-  
-+     TQStringList hal_mount_options = getHALmountoptions(medium->id());
-+     for (TQValueListIterator<TQString> it=hal_mount_options.begin();it!=hal_mount_options.end();it++)
-+     {
-+        soptions << *it;
-+        kdDebug()<<"HALOption: "<<*it<<endl;
-+        if ((*it).startsWith("iocharset="))
-+        {
-+            soptions.remove("utf8");
-+            kdDebug()<<"\"iocharset=\" found. Removing \"utf8\" from options."<<endl;
-+        }
-+     }
-+ 
-+ 
-      const char **options = new const char*[soptions.size() + 1];
-      uint noptions = 0;
-      for (TQStringList::ConstIterator it = soptions.begin(); it != soptions.end(); ++it, ++noptions)
-+     {
-          options[noptions] = (*it).latin1();
-+         kdDebug()<<"Option: "<<*it<<endl;
-+     }
-      options[noptions] = NULL;
-  
-      TQString qerror = i18n("Cannot mount encrypted drives!");
-diff -r -u kdebase-3.5.5a.dfsg.1.orig/kioslave/media/mediamanager/halbackend.h kdebase-3.5.5a.dfsg.1/kioslave/media/mediamanager/halbackend.h
---- kdebase-3.5.5a.dfsg.1.orig/kioslave/media/mediamanager/halbackend.h	2007-01-25 12:34:07.133446000 +0300
-+++ kdebase-3.5.5a.dfsg.1/kioslave/media/mediamanager/halbackend.h	2007-01-25 16:33:54.413638693 +0300
-@@ -192,6 +192,7 @@
- 				const char* message
- 				);
- 
-+	TQStringList getHALmountoptions(QString udi);
- /* HAL and DBus structures */
- private:
- 	/**
diff --git a/redhat/tdebase/kdebase-3.5.12-kdesktop_lock_fix.patch b/redhat/tdebase/kdebase-3.5.12-kdesktop_lock_fix.patch
deleted file mode 100644
index 0acc11659..000000000
--- a/redhat/tdebase/kdebase-3.5.12-kdesktop_lock_fix.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- kdebase-3.5.12/kdesktop/lock/lockprocess.cc.ORI	2011-12-21 18:40:05.553301746 +0100
-+++ kdebase-3.5.12/kdesktop/lock/lockprocess.cc	2011-12-21 18:43:01.643590270 +0100
-@@ -1045,17 +1045,13 @@
-             mHackProc << word;
-         }
- 
--	if (!mForbidden)
-+	if (!mForbidden && mHackProc.start() == true)
- 	{
--
--		if (mHackProc.start() == true)
--		{
- #ifdef HAVE_SETPRIORITY
- 			setpriority(PRIO_PROCESS, mHackProc.pid(), mPriority);
- #endif
-  		        //bitBlt(this, 0, 0, &mOriginal);
- 	                return true;
--		}
- 	}
- 	else
- 	// we aren't allowed to start the specified screensaver either because it didn't run for some reason
-
diff --git a/redhat/tdebase/kdebase-3.5.12-kdesu-noignorebutton.patch b/redhat/tdebase/kdebase-3.5.12-kdesu-noignorebutton.patch
deleted file mode 100644
index bc3583e5e..000000000
--- a/redhat/tdebase/kdebase-3.5.12-kdesu-noignorebutton.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-diff -rcb kdebase.ORI/kdesu/kdesu/sudlg.cpp kdebase/kdesu/kdesu/sudlg.cpp
-*** kdebase.ORI/kdesu/kdesu/sudlg.cpp	2010-12-17 22:55:07.725798945 +0100
---- kdebase/kdesu/kdesu/sudlg.cpp	2010-12-17 22:55:49.378797283 +0100
-***************
-*** 15,21 ****
-  #include "sudlg.h"
-  
-  KDEsuDialog::KDEsuDialog(TQCString user, TQCString auth_user, bool enableKeep,const TQString& icon, bool withIgnoreButton)
-!      : KPasswordDialog(Password, enableKeep, (withIgnoreButton ? User1:NoDefault), icon)
-  {
-      KConfig* config = KGlobal::config();
-      config->setGroup("super-user-command");
---- 15,21 ----
-  #include "sudlg.h"
-  
-  KDEsuDialog::KDEsuDialog(TQCString user, TQCString auth_user, bool enableKeep,const TQString& icon, bool withIgnoreButton)
-!      : KPasswordDialog(Password, enableKeep, 0, icon)
-  {
-      KConfig* config = KGlobal::config();
-      config->setGroup("super-user-command");
-***************
-*** 34,45 ****
-      } else {
-          if (m_User == "root") {
-  	    prompt = i18n("The action you requested needs root privileges. "
-! 	    "Please enter root's password below or click "
-! 	    "Ignore to continue with your current privileges.");
-          } else {
-  	    prompt = i18n("The action you requested needs additional privileges. "
-! 		"Please enter the password for \"%1\" below or click "
-! 		"Ignore to continue with your current privileges.").arg(m_User);
-  	}
-      }
-      setPrompt(prompt);
---- 34,43 ----
-      } else {
-          if (m_User == "root") {
-  	    prompt = i18n("The action you requested needs root privileges. "
-! 	    "Please enter root's password below.");
-          } else {
-  	    prompt = i18n("The action you requested needs additional privileges. "
-! 		"Please enter the password for \"%1\" below.").arg(m_User);
-  	}
-      }
-      setPrompt(prompt);
diff --git a/redhat/tdebase/kdebase-3.5.12-kdm_hide_menu_button.patch b/redhat/tdebase/kdebase-3.5.12-kdm_hide_menu_button.patch
deleted file mode 100644
index f2cb32511..000000000
--- a/redhat/tdebase/kdebase-3.5.12-kdm_hide_menu_button.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-diff -Nuar kdebase/kdm.ORI/config.def kdebase/kdm/config.def
---- kdebase/kdm.ORI/config.def	2012-01-05 19:29:01.956728364 +0100
-+++ kdebase/kdm/config.def	2012-01-05 19:28:53.165728336 +0100
-@@ -2630,3 +2630,12 @@
- Description:
-  The theme to use for the greeter. Can point to either a directory or an XML
-  file.
-+
-+Key: HideMenuButton
-+Type: bool
-+Default: false
-+User: greeter
-+Instance: */
-+Comment: &
-+Description:
-+ Determines if the "menu" button should be hidden on KDM login prompt.
-diff -Nuar kdebase/kdm.ORI/kfrontend/kgreeter.cpp kdebase/kdm/kfrontend/kgreeter.cpp
---- kdebase/kdm.ORI/kfrontend/kgreeter.cpp	2012-01-05 19:29:01.955735413 +0100
-+++ kdebase/kdm/kfrontend/kgreeter.cpp	2012-01-05 19:30:39.538730206 +0100
-@@ -892,6 +892,9 @@
- 	else
- 		menuButton->hide();
- 
-+	if ( _hideMenuButton)
-+		menuButton->hide();
-+
- 	pluginSetup();
- 
- 	verify->start();
diff --git a/redhat/tdebase/kdebase-3.5.12-kickerfix.patch b/redhat/tdebase/kdebase-3.5.12-kickerfix.patch
deleted file mode 100644
index 2a58f0020..000000000
--- a/redhat/tdebase/kdebase-3.5.12-kickerfix.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: ui/k_new_mnu.cpp
-===================================================================
---- ui/k_new_mnu.cpp	(revision 1259264)
-+++ ui/k_new_mnu.cpp	(working copy)
-@@ -3502,6 +3502,8 @@
-                                   descr, "system:/media/" + name, nId++, -1 );
- 
-         ++it; // skip separator
-+	++it;
-+	++it;
-     }
- }
- 
diff --git a/redhat/tdebase/kdebase-3.5.12-kickoff_unstable.patch b/redhat/tdebase/kdebase-3.5.12-kickoff_unstable.patch
deleted file mode 100644
index a66bf625d..000000000
--- a/redhat/tdebase/kdebase-3.5.12-kickoff_unstable.patch
+++ /dev/null
@@ -1,428 +0,0 @@
---- kdebase/kicker/kicker/buttons/knewbutton.cpp.ORI	2011-12-08 21:15:57.551323941 +0100
-+++ kdebase/kicker/kicker/buttons/knewbutton.cpp	2011-12-08 21:22:05.216346827 +0100
-@@ -55,26 +55,26 @@
-     : KButton( parent ),
-       m_oldPos(0,0)
- {
-+	setTitle(i18n("K Menu"));
-     Q_ASSERT( !m_self );
-     m_self = this;
--    m_hoverTimer = -1;
-     m_openTimer = -1;
--    m_active = false;
-+    m_hoverTimer = -1;
-     m_mouseInside = false;
-     m_drag = false;
- 
--    setIconAlignment((Qt::AlignmentFlags)(AlignTop|AlignRight));
--    setAcceptDrops(true);
--    setIcon("kmenu-suse");
--    setDrawArrow(false);
--
--    m_movie = new TQMovie(locate("data", "kicker/pics/kmenu_basic.mng"));
--    m_movie->connectUpdate(this, TQT_SLOT(updateMovie()));
--    m_movie->connectStatus(this, TQT_SLOT(slotStatus(int)));
--    m_movie->connectResize(this, TQT_SLOT(slotSetSize(const TQSize&)));
-+    setIcon("kmenu");
-+    setIcon(KickerSettings::customKMenuIcon());
- 
-     TQApplication::desktop()->screen()->installEventFilter(this);
--    setMouseTracking(true);
-+    if (KickerSettings::showKMenuText())
-+    {
-+        setButtonText(KickerSettings::kMenuText());
-+        setFont(KickerSettings::buttonFont());
-+        setTextColor(KickerSettings::buttonTextColor());
-+    }    
-+    
-+    repaint();
- }
- 
- KNewButton::~KNewButton()
-@@ -82,28 +82,14 @@
-     if ( m_self == this )
-         m_self = 0;
-     setMouseTracking(false);
--    delete m_movie;
--}
--
--void KNewButton::slotStatus(int status)
--{
--    if(status == TQMovie::EndOfLoop)
--        slotStopAnimation();
- }
- 
--TQColor KNewButton::borderColor() const
-+void KNewButton::drawButton(TQPainter *p)
- {
--    TQImage img = m_active_pixmap.convertToImage();
--
--    for (int i = 0; i < img.width(); ++i) {
--        QRgb rgb = img.pixel(orientation() == Qt::Horizontal ? img.width() - i - 1 :
--                    i, 2);
--
--        if (qGreen(rgb) > 0x50)
--            return rgb;
--    }
--
--    return img.pixel( orientation() == Qt::Horizontal ? img.width() - 2 : 2, 2);
-+    //if (KickerSettings::showDeepButtons())
-+    //    PanelPopupButton::drawDeepButton(p);
-+    //else
-+        PanelPopupButton::drawButton(p);
- }
- 
- void KNewButton::show()
-@@ -111,103 +97,12 @@
-      KButton::show();
- 
-      if (KickerSettings::firstRun()) {
--         TQTimer::singleShot(500,this,TQT_SLOT(slotExecMenu()));
-+         TQTimer::singleShot(0,this,TQT_SLOT(slotExecMenu()));
-          KickerSettings::setFirstRun(false);
-          KickerSettings::writeConfig();
-      }
- }
- 
--void KNewButton::updateMovie()
--{
--    m_oldPos = TQPoint( -1, -1 );
--    drawEye();
--
--    if (!m_active && m_movie->running())
--        m_movie->pause();
--}
--
--void KNewButton::setPopupDirection(KPanelApplet::Direction d)
--{
--    KButton::setPopupDirection(d);
--
--    delete m_movie;
--
--    switch (d) {
--    case KPanelApplet::Left:
--        setIconAlignment((Qt::AlignmentFlags)(AlignTop|AlignLeft));
--        m_movie = new TQMovie(locate("data", "kicker/pics/kmenu_vertical.mng"));
--        break;
--    case KPanelApplet::Right:
--        setIconAlignment((Qt::AlignmentFlags)(AlignTop|AlignRight));
--        m_movie = new TQMovie(locate("data", "kicker/pics/kmenu_vertical.mng"));
--        break;
--    case KPanelApplet::Up:
--        setIconAlignment((Qt::AlignmentFlags)(AlignTop|AlignHCenter));
--        m_movie = new TQMovie(locate("data", "kicker/pics/kmenu_basic.mng"));
--        break;
--    case KPanelApplet::Down:
--        setIconAlignment((Qt::AlignmentFlags)(AlignBottom|AlignHCenter));
--        m_movie = new TQMovie(locate("data", "kicker/pics/kmenu_flipped.mng"));
--    }
--
--    m_movie->connectUpdate(this, TQT_SLOT(updateMovie()));
--    m_movie->connectStatus(this, TQT_SLOT(slotStatus(int)));
--    m_movie->connectResize(this, TQT_SLOT(slotSetSize(const TQSize&)));
--}
--
--void KNewButton::slotSetSize(const TQSize& s)
--{
--    m_iconSize = s;
--}
--
--double KNewButton::buttonScaleFactor(const TQSize& s) const
--{
--    double sf = 1.0;
--
--    switch (popupDirection()) {
--        case KPanelApplet::Left:
--        case KPanelApplet::Right:
--//            sf = kMin(double(s.width()) / m_iconSize.height(), double(s.height()) / m_iconSize.width());
--//            break;
--        case KPanelApplet::Up:
--        case KPanelApplet::Down:
--            sf = kMin(double(s.width()) / m_iconSize.width(), double(s.height()) / m_iconSize.height());
--            break;
--    }
--
--    if (sf > 0.8) sf = 1.0;
--    return sf;
--}
--
--int KNewButton::widthForHeight(int height) const
--{
--    int r = m_iconSize.width() * buttonScaleFactor(TQSize(m_iconSize.width(), height));
--
--    if (!m_movie->running() && height != m_active_pixmap.height())
--    {
--        KNewButton* that = const_cast<KNewButton*>(this);
--        TQTimer::singleShot(0, that, TQT_SLOT(slotStopAnimation()));
--    }
-- 
--    return r;
--}
--
--int KNewButton::preferredDimension(int panelDim) const
--{
--    return kMax(m_icon.width(), m_icon.height());
--}
--
--int KNewButton::heightForWidth(int width) const
--{
--    int r = m_iconSize.width() * buttonScaleFactor(TQSize(width, m_iconSize.height()));
--    if (!m_movie->running() && width != m_active_pixmap.width())
--    {
--        KNewButton* that = const_cast<KNewButton*>(this);
--        TQTimer::singleShot(0, that, TQT_SLOT(slotStopAnimation()));
--    }
--    return r;
--}
--
- bool KNewButton::eventFilter(TQObject *o, TQEvent *e)
- {
-     if (e->type() == TQEvent::MouseButtonRelease ||
-@@ -223,75 +118,9 @@
-         }
-     }
- 
--    if (KickerSettings::kickoffDrawGeekoEye() && e->type() == TQEvent::MouseMove)
--    {
--        TQMouseEvent *me = static_cast<TQMouseEvent *>(e);
--        if ((me->state() & MouseButtonMask) == NoButton) 
--            drawEye();
--    }
--
-     return KButton::eventFilter(o, e);
- }
- 
--void KNewButton::drawEye()
--{
--#define eye_x 62
--#define eye_y 13
--    TQPoint mouse = TQCursor::pos();
--    TQPoint me = mapToGlobal(TQPoint(eye_x, eye_y));
--    double a = atan2(mouse.y() - me.y(), mouse.x() - me.x());
--    int dx = int(2.1 * cos(a));
--    int dy = int(2.1 * sin(a));
--
--    TQPoint newpos(eye_x+dx,eye_y+dy);
--    if (newpos!=m_oldPos) {
--        m_oldPos = newpos;
--        TQPixmap pixmap = m_active_pixmap;
--
--        double sf = 1.0;
--
--        if(!m_movie->framePixmap().isNull())
--        {
--            pixmap = m_movie->framePixmap();
--            pixmap.detach();
--            m_iconSize = pixmap.size();
--            sf = buttonScaleFactor(size());
--
--            if (KickerSettings::kickoffDrawGeekoEye()) {
--               TQPainter p(&pixmap);
--               p.setPen(white);
--               p.setBrush(white);
--               //      p.setPen(TQColor(110,185,55));
--               p.drawRect(eye_x+dx, eye_y+dy, 2, 2);
--               p. end();
--            }
--        }
--
--        TQWMatrix matrix;
--        switch (popupDirection()) {
--        case KPanelApplet::Left:
--            matrix.scale(sf, -sf);
--            matrix.rotate(90);
--            break;
--        case KPanelApplet::Up:
--            matrix.scale(sf, sf);
--            break;
--        case KPanelApplet::Right:
--            matrix.scale(sf, -sf);
--            matrix.rotate(90);
--            break;
--        case KPanelApplet::Down:
--            matrix.scale(sf, sf);
--            break;
--        }
--        m_active_pixmap = pixmap.xForm(matrix);
--
--        repaint(false);
--    }
--#undef eye_x
--#undef eye_y
--}
--
- void KNewButton::enterEvent(TQEvent* e)
- {
-     KButton::enterEvent(e);
-@@ -315,14 +144,6 @@
-     }
- 
-     m_active = true;
--    m_movie->unpause();
--    m_movie->restart();
--}
--
--void KNewButton::rewindMovie()
--{
--    m_oldPos = TQPoint( -1, -1 );
--    m_movie->unpause();
- }
- 
- void KNewButton::dragEnterEvent(TQDragEnterEvent* /*e*/)
-@@ -369,31 +190,11 @@
-     }
- }
- 
--void KNewButton::slotStopAnimation()
--{
--    m_active = false;
--    m_movie->pause();
--    m_movie->restart();
--    TQTimer::singleShot(200, this, TQT_SLOT(rewindMovie()));
--}
--
--const TQPixmap& KNewButton::labelIcon() const
--{
--    return m_active_pixmap;
--}
--
- void KNewButton::slotExecMenu()
- {
--    if (m_openTimer != -1)
--        killTimer(m_openTimer);
--
--    m_openTimer = startTimer(TQApplication::doubleClickInterval() * 3);
--
-     if (m_active)
-     {
-         m_active = false;
--        m_movie->pause();
--        m_movie->restart();
-     }
- 
-     KButton::slotExecMenu();
-@@ -401,40 +202,11 @@
-     assert(!KickerTip::tippingEnabled());
-     assert(dynamic_cast<KMenu*>(m_popup));
- 
--    disconnect(dynamic_cast<KMenu*>(m_popup), TQT_SIGNAL(aboutToHide()), this,
--            TQT_SLOT(slotStopAnimation()));
--    connect(dynamic_cast<KMenu*>(m_popup), TQT_SIGNAL(aboutToHide()),
--            TQT_SLOT(slotStopAnimation()));
--
-     m_popup->move(KickerLib::popupPosition(popupDirection(), m_popup, this));
-     // I wish KMenu would properly done itself when it closes. But it doesn't.
- 
--    bool useEffect = true; // could be TQApplication::isEffectEnabled()
--    useEffect = false; // too many TQt bugs to be useful
--    if (m_drag)
--	useEffect = false;
--
-     m_drag = false; // once is enough
--
--    if (useEffect) 
--    {
--        switch (popupDirection()) {
--        case KPanelApplet::Left:
--            qScrollEffect(m_popup, QEffects::LeftScroll);
--            break;
--        case KPanelApplet::Up:
--            qScrollEffect(m_popup, QEffects::UpScroll);
--            break;
--        case KPanelApplet::Right:
--            qScrollEffect(m_popup, QEffects::RightScroll);
--            break;
--        case KPanelApplet::Down:
--            qScrollEffect(m_popup, QEffects::DownScroll);
--            break;
--        }
--    }
--    else
--        static_cast<KMenu*>(m_popup)->show();
-+    static_cast<KMenu*>(m_popup)->show();
- }
- 
- void KNewButton::timerEvent(TQTimerEvent* e)
-@@ -447,9 +219,4 @@
-         killTimer(m_hoverTimer);
-         m_hoverTimer = -1;
-     }
--    if (e->timerId() == m_openTimer)
--    {
--        killTimer(m_openTimer);
--        m_openTimer = -1;
--    }
- }
---- kdebase/kicker/kicker/buttons/knewbutton.h.ORI	2011-12-08 21:22:24.273573281 +0100
-+++ kdebase/kicker/kicker/buttons/knewbutton.h	2011-12-08 21:24:16.791338762 +0100
-@@ -28,7 +28,6 @@
- 
- #include "kbutton.h"
- 
--#include <tqmovie.h>
- #include <tqpoint.h>
- 
- /**
-@@ -46,23 +45,8 @@
- 
-     void loadConfig( const KConfigGroup& config );
- 
--    virtual const TQPixmap& labelIcon() const;
--
--    virtual int widthForHeight(int height) const;
--    virtual int preferredDimension(int panelDim) const;
--    virtual int heightForWidth(int width) const;
--
-     TQColor borderColor() const;
- 
--    virtual void setPopupDirection(KPanelApplet::Direction d);
--
--private slots:
--    void slotStatus(int);
--    void slotSetSize(const TQSize&);
--    void slotStopAnimation();
--    void rewindMovie();
--    void updateMovie();
--
- protected:
-     virtual void show();
-     virtual void slotExecMenu();
-@@ -78,16 +62,13 @@
-     void timerEvent(TQTimerEvent*);
- 
- private:
--    void drawEye();
--    double buttonScaleFactor(const TQSize& s) const;
--
--    TQMovie* m_movie;
-+	void drawButton(TQPainter *p);
-     TQPixmap m_active_pixmap;
-     TQPoint m_oldPos;
-     TQSize m_iconSize;
-     TQRect m_sloppyRegion;
--    int m_hoverTimer;
-     int m_openTimer;
-+    int m_hoverTimer;
-     bool m_active;
-     bool m_mouseInside;
-     bool m_drag;
---- kdebase/kicker/kicker/ui/k_new_mnu.cpp.ORI	2011-12-08 21:24:57.071572016 +0100
-+++ kdebase/kicker/kicker/ui/k_new_mnu.cpp	2011-12-08 21:25:54.300324465 +0100
-@@ -1700,8 +1700,6 @@
-         TQPixmap pix( 64, footer->height() );
-         TQPainter p( &pix );
-         p.fillRect( 0, 0, 64, footer->height(), m_branding->colorGroup().brush( TQColorGroup::Base ) );
--        p.fillRect( 0, m_orientation == BottomUp ? footer->height() - 2 : 0,
--                64, 3, KNewButton::self()->borderColor() );
-         p.end();
-         footer->setPaletteBackgroundPixmap( pix );
-     }
-@@ -3501,6 +3499,8 @@
-         m_systemView->insertItem( iconName, userLabel.isEmpty() ? label : userLabel,
-                                   descr, "system:/media/" + name, nId++, -1 );
- 
-+        ++it;
-+        ++it;
-         ++it; // skip separator
-     }
- }
diff --git a/redhat/tdebase/kdebase-3.5.12-kio_man_utf8.patch b/redhat/tdebase/kdebase-3.5.12-kio_man_utf8.patch
deleted file mode 100644
index a85f0286d..000000000
--- a/redhat/tdebase/kdebase-3.5.12-kio_man_utf8.patch
+++ /dev/null
@@ -1,40 +0,0 @@
---- kdebase/kioslave/man/kio_man.cpp.orig	2010-08-13 00:37:38.000000000 +0200
-+++ kdebase/kioslave/man/kio_man.cpp	2011-12-08 21:10:25.720324499 +0100
-@@ -569,20 +569,24 @@
-         }
-         lastdir = filename.left(filename.findRev('/'));
-     
--        myStdStream = TQString::null;
--        KProcess proc;
--        /* TODO: detect availability of 'man --recode' so that this can go
--         * upstream */
--        proc << "man" << "--recode" << "UTF-8" << filename;
--
--        TQApplication::connect(&proc, TQT_SIGNAL(receivedStdout (KProcess *, char *, int)),
--                              this, TQT_SLOT(slotGetStdOutputUtf8(KProcess *, char *, int)));
--        proc.start(KProcess::Block, KProcess::All);
--
--        const TQCString cstr=myStdStream.utf8();
--        const int len = cstr.size()-1;
-+        QIODevice *fd= KFilterDev::deviceForFile(filename);
-+    
-+        if ( !fd || !fd->open(IO_ReadOnly))
-+        {
-+           delete fd;
-+           return 0;
-+        }
-+        QByteArray array(fd->readAll());
-+        kdDebug(7107) << "read " << array.size() << endl;
-+        fd->close();
-+        delete fd;
-+        
-+        if (array.isEmpty())
-+            return 0;
-+    
-+        const int len = array.size();
-         buf = new char[len + 4];
--        qmemmove(buf + 1, cstr.data(), len);
-+        qmemmove(buf + 1, array.data(), len);
-         buf[0]=buf[len]='\n'; // Start and end with a end of line
-         buf[len+1]=buf[len+2]='\0'; // Two NUL characters at end
-     }
diff --git a/redhat/tdebase/kdebase-3.5.12-konq_menu_tab_background.patch b/redhat/tdebase/kdebase-3.5.12-konq_menu_tab_background.patch
deleted file mode 100644
index 442486efa..000000000
--- a/redhat/tdebase/kdebase-3.5.12-konq_menu_tab_background.patch
+++ /dev/null
@@ -1,136 +0,0 @@
-diff -Nuar kcontrol.ORI/konqhtml/advancedTabDialog.cpp kcontrol/konqhtml/advancedTabDialog.cpp
---- kdebase/kcontrol.ORI/konqhtml/advancedTabDialog.cpp	2011-12-09 23:45:04.676253975 +0100
-+++ kdebase/kcontrol/konqhtml/advancedTabDialog.cpp	2011-12-09 23:46:28.239256986 +0100
-@@ -58,7 +58,6 @@
-     layout->addSpacing( 20 );
-     layout->addStretch();
- 
--    connect(m_advancedWidget->m_pNewTabsInBackground, TQT_SIGNAL(clicked()), this, TQT_SLOT(changed()));
-     connect(m_advancedWidget->m_pOpenAfterCurrentPage, TQT_SIGNAL(clicked()), this, TQT_SLOT(changed()));
-     connect(m_advancedWidget->m_pTabConfirm, TQT_SIGNAL(clicked()), this, TQT_SLOT(changed()));
-     connect(m_advancedWidget->m_pTabCloseActivatePrevious, TQT_SIGNAL(clicked()), this, TQT_SLOT(changed()));
-@@ -76,7 +75,6 @@
- void advancedTabDialog::load()
- {
-     m_pConfig->setGroup("FMSettings");
--    m_advancedWidget->m_pNewTabsInBackground->setChecked( ! (m_pConfig->readBoolEntry( "NewTabsInFront", false )) );
-     m_advancedWidget->m_pOpenAfterCurrentPage->setChecked( m_pConfig->readBoolEntry( "OpenAfterCurrentPage", false ) );
-     m_advancedWidget->m_pPermanentCloseButton->setChecked( m_pConfig->readBoolEntry( "PermanentCloseButton", false ) );
-     m_advancedWidget->m_pKonquerorTabforExternalURL->setChecked( m_pConfig->readBoolEntry( "KonquerorTabforExternalURL", false ) );
-@@ -92,7 +90,6 @@
- void advancedTabDialog::save()
- {
-     m_pConfig->setGroup("FMSettings");
--    m_pConfig->writeEntry( "NewTabsInFront", !(m_advancedWidget->m_pNewTabsInBackground->isChecked()) );
-     m_pConfig->writeEntry( "OpenAfterCurrentPage", m_advancedWidget->m_pOpenAfterCurrentPage->isChecked() );
-     m_pConfig->writeEntry( "PermanentCloseButton", m_advancedWidget->m_pPermanentCloseButton->isChecked() );
-     m_pConfig->writeEntry( "KonquerorTabforExternalURL", m_advancedWidget->m_pKonquerorTabforExternalURL->isChecked() );
-diff -Nuar kcontrol.ORI/konqhtml/advancedTabOptions.ui kcontrol/konqhtml/advancedTabOptions.ui
---- kdebase/kcontrol.ORI/konqhtml/advancedTabOptions.ui	2011-12-09 23:45:04.674267416 +0100
-+++ kdebase/kcontrol/konqhtml/advancedTabOptions.ui	2011-12-09 23:56:01.440255647 +0100
-@@ -62,6 +62,17 @@
-                 </widget>
-                 <widget class="QCheckBox">
-                     <property name="name">
-+                        <cstring>m_pNewTabsInBackground</cstring>
-+                    </property>
-+                    <property name="text">
-+                        <string>O&amp;pen new tabs in the background</string>
-+                    </property>
-+                    <property name="whatsThis" stdset="0">
-+                        <string>This will open a new tab in the background, instead of in the foreground.</string>
-+                    </property>
-+                </widget>
-+                <widget class="QCheckBox">
-+                    <property name="name">
-                         <cstring>m_pOpenAfterCurrentPage</cstring>
-                     </property>
-                     <property name="text">
-diff -Nuar konqueror.ORI/konq_guiclients.cc konqueror/konq_guiclients.cc
---- kdebase/konqueror.ORI/konq_guiclients.cc	2011-12-09 23:44:28.950255993 +0100
-+++ kdebase/konqueror/konq_guiclients.cc	2011-12-09 23:49:31.432261289 +0100
-@@ -115,6 +115,11 @@
-         openInTabElement.setAttribute( "group", "tabhandling" );
-         menu.appendChild( openInTabElement );
- 
-+        TQDomElement openInTabFrontElement = m_doc.createElement( "action" );
-+        openInTabFrontElement.setAttribute( "name", "openintabfront" );
-+        openInTabFrontElement.setAttribute( "group", "tabhandling" );
-+        menu.appendChild( openInTabFrontElement );
-+
-         TQDomElement separatorElement = m_doc.createElement( "separator" );
-         separatorElement.setAttribute( "group", "tabhandling" );
-         menu.appendChild( separatorElement );
-diff -Nuar konqueror.ORI/konq_mainwindow.cc konqueror/konq_mainwindow.cc
---- kdebase/konqueror.ORI/konq_mainwindow.cc	2011-12-09 23:44:29.030265039 +0100
-+++ kdebase/konqueror/konq_mainwindow.cc	2011-12-09 23:54:27.518255409 +0100
-@@ -2727,6 +2727,14 @@
-     openURL( 0L, popupItems.getFirst()->url() );
- }
- 
-+void KonqMainWindow::slotPopupNewTabAtFront()
-+{
-+    KConfig *config = KGlobal::config();
-+    KConfigGroupSaver cs( config, TQString::fromLatin1("FMSettings") );
-+    bool openAfterCurrentPage = config->readBoolEntry( "OpenAfterCurrentPage", false );
-+    popupNewTab(true, openAfterCurrentPage);
-+}
-+
- void KonqMainWindow::slotPopupNewTab()
- {
-     bool openAfterCurrentPage = KonqSettings::openAfterCurrentPage();
-@@ -2735,7 +2743,7 @@
-     if (KApplication::keyboardMouseState() & Qt::ShiftButton)
-       newTabsInFront = !newTabsInFront;
- 
--    popupNewTab(newTabsInFront, openAfterCurrentPage);
-+    popupNewTab(false, openAfterCurrentPage);
- }
- 
- void KonqMainWindow::slotPopupNewTabRight()
-@@ -2755,16 +2763,12 @@
-   KFileItemListIterator it ( popupItems );
-   KonqOpenURLRequest req;
-   req.newTab = true;
--  req.newTabInFront = false;
-+  req.newTabInFront = infront;
-   req.openAfterCurrentPage = openAfterCurrentPage;
-   req.args = popupUrlArgs;
- 
-   for ( ; it.current(); ++it )
-   {
--    if ( infront && it.atLast() )
--    {
--      req.newTabInFront = true;
--    }
-     openURL( 0L, (*it)->url(), TQString::null, req );
-   }
- }
-@@ -4783,8 +4787,14 @@
-       else
-         tab_new_x = "tab_new_bg" ;
- 
--      actNewTab = new KAction( i18n( "Open in &New Tab" ), tab_new_x, 0, this, TQT_SLOT( slotPopupNewTab() ), konqyMenuClient->actionCollection(), "openintab" );
--      actNewTab->setToolTip( i18n( "Open the document in a new tab" ) );
-+      KAction *actNewTab = new KAction( i18n( "Open in &Background Tab" ), "tab_new_bg", 0, this, TQT_SLOT( slotPopupNewTab() ), actionCollection(), "openintab" );
-+      actNewTab->setStatusText( i18n( "Open the document in a new background tab" ) );
-+      KAction *actNewTabFront = new KAction( i18n( "Open in &New Tab" ), "tab_new", 0, this, TQT_SLOT( slotPopupNewTabAtFront() ), actionCollection(), "openintabfront" );
-+      actNewTabFront->setStatusText( i18n( "Open the document in a new foreground tab" ) );
-+      actNewTab = new KAction( i18n( "Open in &Background Tab" ), tab_new_x, 0, this, TQT_SLOT( slotPopupNewTab() ), konqyMenuClient->actionCollection(), "openintab" );
-+      actNewTabFront = new KAction( i18n( "Open in &New Tab" ), tab_new_x, 0, this, TQT_SLOT( slotPopupNewTabAtFront() ), konqyMenuClient->actionCollection(), "openintabfront" );
-+      actNewTab->setToolTip( i18n( "Open the document in a new background tab" ) );
-+      actNewTabFront->setToolTip( i18n( "Open the document in a new foreground tab" ) );
-       doTabHandling = true;
-   }
- 
-diff -Nuar konqueror.ORI/konq_mainwindow.h konqueror/konq_mainwindow.h
---- kdebase/konqueror.ORI/konq_mainwindow.h	2011-12-09 23:44:28.941260682 +0100
-+++ kdebase/konqueror/konq_mainwindow.h	2011-12-09 23:54:57.772255487 +0100
-@@ -444,6 +444,7 @@
-   void slotPopupNewWindow();
-   void slotPopupThisWindow();
-   void slotPopupNewTab();
-+  void slotPopupNewTabAtFront();
-   void slotPopupNewTabRight();
-   void slotPopupPasteTo();
-   void slotRemoveView();
diff --git a/redhat/tdebase/kdebase-3.5.12-r1220927.patch b/redhat/tdebase/kdebase-3.5.12-r1220927.patch
deleted file mode 100644
index 8048cc929..000000000
--- a/redhat/tdebase/kdebase-3.5.12-r1220927.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-Index: kdebase/kcontrol/iccconfig/iccconfig.cpp
-===================================================================
---- kdebase/kcontrol/iccconfig/iccconfig.cpp	(revision 1220926)
-+++ kdebase/kcontrol/iccconfig/iccconfig.cpp	(revision 1220927)
-@@ -286,7 +286,7 @@
-   base->deleteProfileButton->setFixedWidth(90);
- 
-   XRROutputInfo *output_info;
--  KRandrSimpleAPI *randrsimple = new KRandrSimpleAPI::KRandrSimpleAPI();
-+  KRandrSimpleAPI *randrsimple = new KRandrSimpleAPI();
- 
-   config->setReadDefaults( useDefaults );
- 
-@@ -356,7 +356,7 @@
- {
- 	int i;
- 	int j;
--	KRandrSimpleAPI *randrsimple = new KRandrSimpleAPI::KRandrSimpleAPI();
-+	KRandrSimpleAPI *randrsimple = new KRandrSimpleAPI();
- 
- 	// Write system configuration
- 	systemconfig->setGroup(NULL);
-@@ -408,4 +408,4 @@
-      " for a more lifelike and vibrant image.");
- }
- 
--#include "iccconfig.moc"
-\ No newline at end of file
-+#include "iccconfig.moc"
diff --git a/redhat/tdebase/kdebase-3.5.12-r1220975.patch b/redhat/tdebase/kdebase-3.5.12-r1220975.patch
deleted file mode 100644
index d16ce90e0..000000000
--- a/redhat/tdebase/kdebase-3.5.12-r1220975.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-*** kdebase/ksmserver/shutdowndlg.cpp.ORI	2011-08-23 21:42:55.206965177 +0200
---- kdebase/ksmserver/shutdowndlg.cpp	2011-08-23 21:43:26.429965029 +0200
-***************
-*** 80,86 ****
-  {
-      DCOPRef("kicker", "KMenu").call("hideMenu");	// Make sure the K Menu is completely removed from the screen before taking a snapshot...
-      m_grayImage = TQPixmap::grabWindow(qt_xrootwin(), 0, 0, TQApplication::desktop()->width(), TQApplication::desktop()->height()).convertToImage();
-!     m_unfadedImage = TQImage::TQImage();
-      resize(0, 0);
-      setShown(true);
-      TQTimer::singleShot( 500, this, TQT_SLOT( slotPaintEffect() ) );
---- 80,86 ----
-  {
-      DCOPRef("kicker", "KMenu").call("hideMenu");	// Make sure the K Menu is completely removed from the screen before taking a snapshot...
-      m_grayImage = TQPixmap::grabWindow(qt_xrootwin(), 0, 0, TQApplication::desktop()->width(), TQApplication::desktop()->height()).convertToImage();
-!     m_unfadedImage = TQImage();
-      resize(0, 0);
-      setShown(true);
-      TQTimer::singleShot( 500, this, TQT_SLOT( slotPaintEffect() ) );
diff --git a/redhat/tdebase/kdebase-3.5.12-shutdowndlg-dbus-include.patch b/redhat/tdebase/kdebase-3.5.12-shutdowndlg-dbus-include.patch
deleted file mode 100644
index 64af6d86e..000000000
--- a/redhat/tdebase/kdebase-3.5.12-shutdowndlg-dbus-include.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff -rcb kdebase/ksmserver/shutdowndlg.h kdebase.patch/ksmserver/shutdowndlg.h
-*** kdebase/ksmserver/shutdowndlg.h	Sat Sep 25 23:33:51 2010
---- kdebase.patch/ksmserver/shutdowndlg.h	Thu Dec  9 14:58:43 2010
-***************
-*** 32,38 ****
-  
-  /* We acknowledge the the dbus API is unstable */
-  #define DBUS_API_SUBJECT_TO_CHANGE
-! #include <dbus/connection.h>
-  #include <libhal.h>
-  
-  // The (singleton) widget that makes/fades the desktop gray.
---- 32,38 ----
-  
-  /* We acknowledge the the dbus API is unstable */
-  #define DBUS_API_SUBJECT_TO_CHANGE
-! #include <dbus/dbus.h>
-  #include <libhal.h>
-  
-  // The (singleton) widget that makes/fades the desktop gray.
diff --git a/redhat/tdebase/kdebase-3.5.12-startkde_directories.patch b/redhat/tdebase/kdebase-3.5.12-startkde_directories.patch
deleted file mode 100644
index 393903059..000000000
--- a/redhat/tdebase/kdebase-3.5.12-startkde_directories.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- kdebase/startkde.ORI	2011-12-11 18:55:25.873027885 +0100
-+++ kdebase/startkde	2011-12-11 18:56:37.885065246 +0100
-@@ -144,14 +144,14 @@
- fi
- if [ -d /opt/kde3 ]; then
-   if [ -n "$KDEDIRS" ]; then
--    export KDEDIRS=$KDEDIRS:/opt/kde3/:/usr/
-+    export KDEDIRS=/opt/kde3/:$KDEDIRS:/usr/
-   else
-     export KDEDIRS=/opt/kde3/:/usr/
-   fi
- fi
- if [ -d /opt/trinity ]; then
-   if [ -n "$KDEDIRS" ]; then
--    export KDEDIRS=$KDEDIRS:/opt/trinity/:/usr/
-+    export KDEDIRS=/opt/trinity/:$KDEDIRS:/usr/
-   else
-     export KDEDIRS=/opt/trinity/:/usr/
-   fi
diff --git a/redhat/tdebase/kdebase-3.5.12.spec b/redhat/tdebase/kdebase-3.5.12.spec
deleted file mode 100644
index 9982abd3a..000000000
--- a/redhat/tdebase/kdebase-3.5.12.spec
+++ /dev/null
@@ -1,757 +0,0 @@
-# Default version for this component
-%if "%{?version}" == ""
-%define version 3.5.12
-%endif
-%define release 15
-
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?_prefix}" != "/usr"
-%define _variant .opt
-%define _docdir %{_prefix}/share/doc
-%endif
-
-# TDE 3.5.12 specific building variables
-BuildRequires: autoconf automake libtool m4
-%define tde_docdir %{_docdir}
-%define tde_libdir %{_libdir}/kde3
-
-# Older RHEL/Fedora versions use packages named "qt", "qt-devel", ..
-# whereas newer versions use "qt3", "qt3-devel" ...
-%if 0%{?rhel} >= 6 || 0%{?fedora} >= 8
-%define _qt_suffix 3
-%endif
-
-
-Name:		trinity-kdebase
-Version:	%{?version}
-Release:	%{?release}%{?dist}%{?_variant}
-License:	GPL
-Summary:	Trinity KDE Base Programs
-Group:		User Interface/Desktops
-
-Vendor:		Trinity Project
-Packager:	Francois Andriot <francois.andriot@free.fr>
-URL:		http://www.trinitydesktop.org/
-
-Prefix:		%{_prefix}
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:	kdebase-%{version}.tar.gz
-
-# Wrapper script to prevent Plasma launch at Trinity Startup
-Source1:	plasma-desktop
-
-# Pam configuration files for RHEL / Fedora
-Source2:	pamd.kdm-trinity%{?dist}
-Source3:	pamd.kdm-trinity-np%{?dist}
-Source4:	pamd.kcheckpass-trinity%{?dist}
-Source5:	pamd.kscreensaver-trinity%{?dist}
-
-# TDE Official patches (from SVN), unmodified
-# [kdebase/kcontrol] fix for openssl 1.0 
-Patch1:		http://www.trinitydesktop.org/patches/r1201523.diff
-# [kdebase/kcontrol] make it compatible with openssl < 1.0 
-Patch2:		http://www.trinitydesktop.org/patches/r1201705.diff
-# Fix My Documents shortcut on desktop
-Patch3:		http://www.trinitydesktop.org/patches/r1182808.diff
-# [kdebase] fixed an incompatibility with gcc 4.5 
-Patch4:		http://www.trinitydesktop.org/patches/r1221326.diff
-
-# TDE Official patches (from SVN), modified
-# [kdebase/ksmserver/shutdowndlg.cpp] Fixed invalid constructor per GCC 4.5.2
-Patch5:	kdebase-3.5.12-r1220975.patch
-# [kdebase] Another invalid constructor per gcc 4.5
-Patch6:		kdebase-3.5.12-r1220927.patch
-
-# TDE unofficial patches, fixing FTBFS
-## Fix for DBUS include files in RHEL6
-Patch7:		kdebase-3.5.12-shutdowndlg-dbus-include.patch
-## [kdebase/kcontrol]: disable components that depends of krandr (old distros)
-Patch8:		kdebase-3.5.12-disable-krandr.patch
-
-# TDE for RHEL/Fedora specific patches
-## [kdebase/kdesu] Remove 'ignore' button on 'kdesu' dialog box
-Patch10:	kdebase-3.5.12-kdesu-noignorebutton.patch
-## [kdebase/kdesktop] Modifies 'open terminal here' on desktop
-Patch11:	kdebase-3.5.12-desktop-openterminalhere.patch
-## [kdebase/kioslave] Forces HAL backend to use HAL mount options
-Patch12:	kdebase-3.5.12-halmountoptions.patch
-## [kdebase/kdm/kfrontend] Global Xsession file is '/etc/X11/xinit/Xsession'
-Patch13:	kdebase-3.5.13-genkdmconf_Xsession_location.patch
-## [kdebase/kicker/kicker/ui] Fix kickoff menu issues
-Patch14:	kdebase-3.5.12-kickoff_unstable.patch
-## [kdebase/startkde] Sets default Start Icon in 'kickerrc'
-Patch15:	kdebase-3.5.13-startkde_icon.patch
-## [kdebase/startkde] Fixes duplicate and incorrect TDE directories location
-Patch16:	kdebase-3.5.12-startkde_directories.patch
-
-# TDE unofficial patches for enhanced features
-## [kdebase/kate] Restores the 'number of files' and sorting widgets to the Kate configuration
-Patch20:	kdebase-3.5.13-kate_mru.patch
-## [kdebase/kioslave/man] Fix kio_man for older distros without 'man-db'
-Patch21:	kdebase-3.5.12-kio_man_utf8.patch
-## [kdebase/konqueror] Re-enable 'open tab in background'
-Patch22:	kdebase-3.5.12-konq_menu_tab_background.patch
-## [kdebase/konqueror/sidebar] Fix error message on documents parent folder
-Patch23:	kdebase-3.5.13-konqsidebar_documents.patch
-## [kdebase/kdesktop/lock] Fix missing black background
-Patch29:	kdebase-3.5.12-kdesktop_lock_fix.patch
-## [kdebase/kdm/kfrontend] Allows to hide KDM menu button
-Patch30:	kdebase-3.5.12-kdm_hide_menu_button.patch
-
-# Fedora 15 Theme: "Lovelock"
-%if 0%{?fedora} == 15
-Requires:	lovelock-backgrounds-single
-%define tde_bg /usr/share/backgrounds/lovelock/default/standard/lovelock.png
-
-Requires:	fedora-release-notes
-%define tde_aboutlabel Fedora 15
-%define tde_aboutpage /usr/share/doc/HTML/fedora-release-notes/index.html
-%endif
-
-# Fedora 16 Theme: "Verne"
-%if 0%{?fedora} == 16
-Requires:	verne-backgrounds-single
-%define tde_bg /usr/share/backgrounds/verne/default/standard/verne.png
-
-Requires:	fedora-release-notes
-%define tde_aboutlabel Fedora 16
-%define tde_aboutpage /usr/share/doc/HTML/fedora-release-notes/index.html
-%endif
-
-# RHEL 5 Theme
-%if 0%{?rhel} == 5
-Requires:	desktop-backgrounds-basic
-%define tde_bg /usr/share/backgrounds/images/default.jpg
-
-Requires:	indexhtml
-%define tde_aboutlabel Enterprise Linux 5
-%define tde_aboutpage /usr/share/doc/HTML/index.html
-%endif
-
-# RHEL 6 Theme
-%if 0%{?rhel} == 6
-Requires:	redhat-logos
-%define tde_bg /usr/share/backgrounds/default.png
-
-Requires:	redhat-indexhtml
-%define tde_aboutlabel Enterprise Linux 6
-%define tde_aboutpage /usr/share/doc/HTML/index.html
-%endif
-
-BuildRequires:	tqtinterface-devel
-BuildRequires:	trinity-arts-devel
-BuildRequires:	trinity-kdelibs-devel
-BuildRequires:	qt%{?_qt_suffix}-devel
-BuildRequires:	openssl-devel
-BuildRequires:	avahi-devel avahi-qt3-devel
-BuildRequires:	imake
-BuildRequires:	xorg-x11-proto-devel
-BuildRequires:	OpenEXR-devel
-BuildRequires:	libsmbclient-devel
-BuildRequires:	dbus-devel
-BuildRequires:	dbus-qt-devel
-BuildRequires:	lm_sensors-devel
-BuildRequires:	libfontenc-devel
-BuildRequires:	hal-devel
-BuildRequires:	audiofile-devel alsa-lib-devel
-BuildRequires:	libraw1394-devel
-BuildRequires:	openldap-devel
-BuildRequires:	libvorbis-devel
-BuildRequires:	pam-devel
-BuildRequires:	libXdmcp-devel
-BuildRequires:	libxkbfile-devel
-BuildRequires:	libusb-devel
-BuildRequires:	esound-devel
-BuildRequires:	glib2-devel
-BuildRequires:	libXcomposite-devel
-BuildRequires:	libXtst-devel
-BuildRequires:	libXdamage-devel
-BuildRequires:	xorg-x11-font-utils
-
-# These dependancies are not met in RHEL
-%if 0%{?fedora}
-BuildRequires:	jack-audio-connection-kit-devel
-BuildRequires:	nas-devel
-%endif
- 
-Requires:	tqtinterface
-Requires:	trinity-arts
-Requires:	trinity-kdelibs
-Requires:	qt%{?_qt_suffix}
-Requires:	openssl
-Requires:	avahi avahi-qt3
-Requires:	dbus-qt
-# Provides the global Xsession script (/etc/X11/xinit/Xsession)
-Requires:	xorg-x11-xinit
-
-
-# RHEL 6 Configuration files are provided in separate packages
-%if "%{?_prefix}" == "/usr"
-Requires:	kde-settings-kdm
-%endif
-Requires:	redhat-menus
-
-#Provides:	kdebase%{?_qt_suffix} = %{version}
-%if "%{?_prefix}" == "/usr"
-Provides:		kdebase%{?_qt_suffix} = %{version}
-Obsoletes:		kdebase%{?_qt_suffix} <= 3.5.10
-%endif
-
-
-# Required for Fedora LiveCD
-Provides:	service(graphical-login)
-
-
-%description
-Core applications for the Trinity K Desktop Environment.  Included are: kdm
-(replacement for xdm), kwin (window manager), konqueror (filemanager,
-web browser, ftp client, ...), konsole (xterm replacement), kpanel
-(application starter and desktop pager), kaudio (audio server),
-kdehelp (viewer for kde help files, info and man pages), kthememgr
-(system for managing alternate theme packages) plus other KDE
-components (kcheckpass, kikbd, kscreensaver, kcontrol, kfind,
-kfontmanager, kmenuedit).
-
-
-%package devel
-Requires:	%{name}
-Requires:	%{name}-libs = %{version}-%{release}
-Requires:	trinity-kdelibs-devel
-Summary:	%{summary} - Development files
-%if "%{?_prefix}" == "/usr"
-Provides:		kdebase%{?_qt_suffix}-devel = %{version}
-Obsoletes:		kdebase%{?_qt_suffix}-devel <= 3.5.10
-%endif
-
-Group:		Development/Libraries
-%description devel
-Header files for developing applications using %{name}.
-Install kdebase-devel if you want to develop or compile Konqueror,
-Kate plugins or KWin styles.
-
-
-%package extras
-Summary: Extra applications from %{name}
-Group: User Interface/Desktops
-Requires: %{name} = %{version}-%{release}
-%if "%{?_prefix}" == "/usr"
-Provides:	kdebase%{?_qt_suffix}-extras = %{version}
-Obsoletes:	kdebase%{?_qt_suffix}-extras <= 3.5.10
-%endif
-%description extras
-%{summary}, including:
- * kappfinder
- * kpager
- * ktip
- * kpersonalizer
-
-
-%package libs
-Summary: %{name} runtime libraries
-Group:   System Environment/Libraries
-Requires: trinity-kdelibs
-%if "%{?_prefix}" == "/usr"
-Provides:	kdebase%{?_qt_suffix}-libs = %{version}
-Obsoletes:	kdebase%{?_qt_suffix}-libs <= 3.5.10
-%endif
-Requires: %{name} = %{version}-%{release}
-%description libs
-%{summary}
-
-
-%package pim-ioslaves
-Summary: PIM KIOslaves from %{name}
-Group: System Environment/Libraries
-%if "%{?_prefix}" == "/usr"
-Provides:	kdebase%{?_qt_suffix}-pim-ioslaves = %{version}
-Obsoletes:	kdebase%{?_qt_suffix}-pim-ioslaves <= 3.5.10
-%endif
-%description pim-ioslaves
-Protocol handlers (KIOslaves) for personal information management, including:
- * kio_ldap
- * kio_nntp
- * kio_pop3
- * kio_smtp
-
-
-%prep
-%setup -q -n kdebase
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1
-%patch7 -p1
-%if 0%{?rhel} && 0%{?rhel} < 6
-%patch8 -p1
-%endif
-
-%patch10 -p1
-%patch11 -p1
-%patch12 -p1
-%patch13 -p1
-%patch14 -p1
-%patch15 -p1
-%patch16 -p1
-
-%patch20 -p4
-%if 0%{?rhel} > 0
-%patch21 -p1
-%endif
-%patch22 -p1
-%patch23 -p1
-
-%patch29 -p1
-%patch30 -p1
-
-# Applies an optional distro-specific graphical theme
-%if "%{?tde_bg}" != ""
-# KDM Background
-%__sed -i "kdm/kfrontend/genkdmconf.c" \
-	-e 's|"Wallpaper=isadora.png\n"|"Wallpaper=%{tde_bg}\n"|'
-
-# TDE user default background
-%__sed -i "kpersonalizer/keyecandypage.cpp" \
-	-e 's|#define DEFAULT_WALLPAPER "isadora.png"|#define DEFAULT_WALLPAPER "%{tde_bg}"|'
-%__sed -i "startkde" \
-	-e 's|/usr/share/wallpapers/isadora.png.desktop|%{tde_bg}|' \
-	-e 's|Wallpaper=isadora.png|Wallpaper=%{tde_bg}|'
-%endif
-
-%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
-# TDE branding: removes KUbuntu references [Bug #617]
-%__sed -i "kcontrol/kdm/kdm-appear.cpp" \
-	-e "s|Welcome to Kubuntu |Welcome to %{tde_aboutlabel} |"
-%__sed -i "konqueror/about/konq_aboutpage.cc" \
-	-e "s|About Kubuntu|About %{tde_aboutlabel}|" \
-	-e "s|help:/kubuntu/|%{tde_aboutpage}|" \
-	-e "s|Kubuntu Documentation|%{tde_aboutlabel} Documentation|"
-%__sed -i "konqueror/about/launch.html" \
-	-e "s|help:/kubuntu/about-kubuntu/index.html|%{tde_aboutpage}|"
-%__sed -i "kdm/config.def" \
-	-e "s|Welcome to Trinity |Welcome to %{tde_aboutlabel} |"
-
-# TDE default directory in 'startkde' script (KDEDIR)
-%__sed -i "startkde" \
-	-e "s|/opt/trinity|%{_prefix}|g"
-
-%build
-unset QTDIR || : ; . /etc/profile.d/qt.sh
-export PATH="%{_bindir}:${PATH}"
-export LDFLAGS="-L%{_libdir} -I%{_includedir}"
-export IMAKEINCLUDE="-I/usr/share/X11/config"
-
-%configure  \
-  --disable-rpath \
-  --enable-new-ldflags \
-  --disable-dependency-tracking \
-  --disable-debug --disable-warnings --enable-final \
-  --with-pam=yes \
-  --with-kdm-pam=kdm-trinity \
-  --with-kcp-pam=kcheckpass-trinity \
-  --with-kss-pam=kscreensaver-trinity \
-  --with-libraw1394 \
-  --with-openexr \
-  --with-samba \
-  --with-xinerama \
-  --with-xscreensaver \
-  --without-shadow \
-  --enable-closure \
-  --with-extra-includes=%{_includedir}/tqt
-
-# Do NOT use %{?_smp_mflags} for this package, or it will fail to build !
-%__make
-
-%install
-%__rm -rf %{?buildroot}
-%__make install DESTDIR=%{?buildroot}
-
-# Adds a GDM/KDM/XDM session called 'TDE'
-%__install -D -m 644 \
-	"%{?buildroot}%{_datadir}/apps/kdm/sessions/kde.desktop" \
-	"%{?buildroot}%{_usr}/share/xsessions/tde.desktop"
-
-# Force session name to be 'TDE'
-%__sed -i "%{?buildroot}%{_usr}/share/xsessions/tde.desktop" \
-	-e "s,^Name=.*,Name=TDE,"
-
-# Modifies 'startkde' to set KDEDIR and KDEHOME hardcoded specific for TDE
-%__sed -i "%{?buildroot}%{_bindir}/startkde" \
-	-e '/^echo "\[startkde\] Starting startkde.".*/ s,$,\nexport KDEDIR=%{_prefix}\nexport KDEHOME=~/.trinity,'
-
-# Renames '/etc/ksysguarddrc' to avoid conflict with KDE4 'ksysguard'
-%__mv -f \
-	%{?buildroot}%{_sysconfdir}/ksysguarddrc \
-	%{?buildroot}%{_sysconfdir}/ksysguarddrc.tde
-
-# TDE 3.5.12: add script "plasma-desktop" to avoid conflict with KDE4
-%if "%{?_prefix}" != "/usr"
-%__install -m 755 "%{SOURCE1}" "%{?buildroot}%{_bindir}"
-%endif
-
-# PAM configuration files
-%__install -D -m 644 "%{SOURCE2}" "%{?buildroot}%{_sysconfdir}/pam.d/kdm-trinity"
-%__install -D -m 644 "%{SOURCE3}" "%{?buildroot}%{_sysconfdir}/pam.d/kdm-trinity-np"
-%__install -D -m 644 "%{SOURCE4}" "%{?buildroot}%{_sysconfdir}/pam.d/kcheckpass-trinity"
-%__install -D -m 644 "%{SOURCE5}" "%{?buildroot}%{_sysconfdir}/pam.d/kscreensaver-trinity"
-
-# KDM configuration for RHEL/Fedora
-%__sed -i "%{?buildroot}%{_datadir}/config/kdm/kdmrc" \
-%if 0%{?fedora} >= 16
-	-e "s/^#*MinShowUID=.*/MinShowUID=1000/"
-%else
-	-e "s/^#*MinShowUID=.*/MinShowUID=500/"
-%endif
-
-# Moves the XDG configuration files to TDE directory
-%if "%{_prefix}" != "/usr"
-%__mkdir_p "%{?buildroot}%{_prefix}/etc"
-%__mv -f "%{?buildroot}%{_sysconfdir}/xdg" "%{?buildroot}%{_prefix}/etc"
-%endif
-
-%clean
-%__rm -rf %{?buildroot}
-
-
-%post
-touch --no-create %{_datadir}/icons/crystalsvg 2> /dev/null || :
-gtk-update-icon-cache --quiet %{_datadir}/icons/crystalsvg  2> /dev/null || :
-update-desktop-database 2> /dev/null || : 
-# Dirty hack to install '/etc/ksysguardrc' alongside with KDE4
-[ -r "%{_sysconfdir}/ksysguarddrc" ] || cp -f "%{_sysconfdir}/ksysguarddrc.tde" "%{_sysconfdir}/ksysguarddrc"
-
-%postun
-touch --no-create %{_datadir}/icons/crystalsvg 2> /dev/null || :
-gtk-update-icon-cache --quiet %{_datadir}/icons/crystalsvg  2> /dev/null || :
-update-desktop-database 2> /dev/null || : 
-
-
-%post libs
-/sbin/ldconfig
-
-%postun libs
-/sbin/ldconfig
-
-%post extras
-for f in crystalsvg hicolor ; do
-  touch --no-create %{_datadir}/icons/${f} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{_datadir}/icons/${f} 2> /dev/null ||:
-done
-update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
-
-%postun extras
-for f in crystalsvg hicolor ; do
-  touch --no-create %{_datadir}/icons/${f} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{_datadir}/icons/${f} 2> /dev/null ||:
-done
-update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
-
-
-%files extras
-%defattr(-,root,root,-)
-# kappfinder
-%{_bindir}/kappfinder
-%{_datadir}/applications/kde/kappfinder.desktop
-%{_datadir}/applnk/System/kappfinder.desktop
-%{_datadir}/apps/kappfinder/
-%{_datadir}/icons/hicolor/*/apps/kappfinder.png
-# ktip
-%{_bindir}/ktip
-%{_datadir}/applications/kde/ktip.desktop
-%{_datadir}/applnk/Toys/ktip.desktop
-%{_datadir}/apps/kdewizard
-%{_datadir}/autostart/ktip.desktop
-%{_datadir}/icons/hicolor/*/apps/ktip*
-# kpersonalizer
-%{_bindir}/kpersonalizer
-%{_datadir}/applications/kde/kpersonalizer.desktop
-%{_datadir}/applnk/System/kpersonalizer.desktop
-%{_datadir}/apps/kpersonalizer/
-%{_datadir}/icons/crystalsvg/*/apps/kpersonalizer.png
-# kpager
-%{_bindir}/kpager
-%{_datadir}/applications/kde/kpager.desktop
-%{_datadir}/applnk/Utilities/kpager.desktop
-%{_datadir}/icons/hicolor/*/apps/kpager.png
-
-
-%files
-%defattr(-,root,root,-)
-# kappfinder
-%exclude %{_datadir}/applications/kde/kappfinder.desktop
-%exclude %{_datadir}/applnk/System/kappfinder.desktop
-%exclude %{_datadir}/apps/kappfinder/
-%exclude %{_datadir}/icons/hicolor/*/apps/kappfinder.png
-# ktip
-%exclude %{_datadir}/applications/kde/ktip.desktop
-%exclude %{_datadir}/applnk/Toys/ktip.desktop
-%exclude %{_datadir}/apps/kdewizard
-%exclude %{_datadir}/autostart/ktip.desktop
-%exclude %{_datadir}/icons/hicolor/*/apps/ktip*
-# kpersonalizer
-%exclude %{_datadir}/applications/kde/kpersonalizer.desktop
-%exclude %{_datadir}/applnk/System/kpersonalizer.desktop
-%exclude %{_datadir}/apps/kpersonalizer/
-%exclude %{_datadir}/icons/crystalsvg/*/apps/kpersonalizer.png
-# kpager
-%exclude %{_datadir}/applications/kde/kpager.desktop
-%exclude %{_datadir}/applnk/Utilities/kpager.desktop
-%exclude %{_datadir}/icons/hicolor/*/apps/kpager.png
-
-# Pam configuration
-%{_sysconfdir}/pam.d/*
-
-%doc AUTHORS COPYING COPYING-DOCS README README.pam
-%{tde_docdir}/HTML/en/*
-%config(noreplace) %{_sysconfdir}/ksysguarddrc.tde
-%{_bindir}/genkdmconf
-%{_bindir}/kaccess
-%{_bindir}/kapplymousetheme
-%{_bindir}/kate
-%{_bindir}/kblankscrn.kss
-%{_bindir}/kbookmarkmerger
-%{_bindir}/kcminit
-%{_bindir}/kcminit_startup
-%{_bindir}/kcontrol
-%{_bindir}/kcontroledit
-%{_bindir}/kdebugdialog
-%{_bindir}/kdeinstallktheme
-%{_bindir}/kdepasswd
-%{_bindir}/kdesu
-%attr(0755,root,root) %{_bindir}/kdesud
-%{_bindir}/kdialog
-%{_bindir}/kdm
-%{_bindir}/kdmctl
-%{_bindir}/keditbookmarks
-%{_bindir}/keditfiletype
-%{_bindir}/kfind
-%{_bindir}/kfmclient
-%{_bindir}/khelpcenter
-%{_bindir}/khotkeys
-%{_bindir}/kinfocenter
-%{_bindir}/klipper
-%{_bindir}/kmenuedit
-%{_bindir}/konqueror
-%{_bindir}/konsole
-%{_bindir}/krandom.kss
-%{_bindir}/krdb
-%{_bindir}/kreadconfig
-%{_bindir}/ksmserver
-%{_bindir}/ksplashsimple
-%{_bindir}/kstart
-%{_bindir}/ksysguard
-%{_bindir}/ksysguardd
-%{_bindir}/ksystraycmd
-%{_bindir}/ktrash
-%{_bindir}/kwin
-%{_bindir}/kwin_killer_helper
-%{_bindir}/kwin_rules_dialog
-%{_bindir}/kwrite
-%{_bindir}/kwriteconfig
-%{_bindir}/kxkb
-%{_bindir}/nspluginscan
-%{_bindir}/nspluginviewer
-%{_bindir}/startkde
-%{_bindir}/kcheckrunning
-%{_bindir}/kdesktop
-%{_bindir}/kdesktop_lock
-%{_bindir}/kdm_config
-%{_bindir}/kdm_greet
-%{_bindir}/kfontinst
-%{_bindir}/kfontview
-%{_bindir}/krootimage
-%{_bindir}/kwebdesktop
-%{_datadir}/autostart/*
-%{_datadir}/desktop-directories/*
-%{_datadir}/locale/*/entry.desktop
-%{_datadir}/locale/l10n
-%{_datadir}/templates/*
-%{_datadir}/templates/.source/*
-%{_datadir}/wallpapers/*
-%{_bindir}/appletproxy
-%{_bindir}/drkonqi
-%{_bindir}/extensionproxy
-%{_bindir}/kasbar
-%attr(4755,root,root) %{_bindir}/kcheckpass
-%{_bindir}/kdeeject
-%{_bindir}/khc_docbookdig.pl
-%{_bindir}/khc_htdig.pl
-%{_bindir}/khc_htsearch.pl
-%{_bindir}/khc_indexbuilder
-%{_bindir}/khc_mansearch.pl
-%{_bindir}/kicker
-%{_bindir}/knetattach
-%if 0%{?rhel} >= 6 || 0%{?fedora} >= 15
-%{_bindir}/krandrtray
-%endif
-%{_bindir}/kompmgr
-%{_bindir}/kpm
-%{_bindir}/ksplash
-%{_libdir}/kconf_update_bin
-%{_datadir}/applnk/*.desktop
-%{_datadir}/applnk/*/*
-%{_datadir}/applnk/.hidden/*
-%exclude %{_datadir}/applnk/.hidden/.directory
-%{_datadir}/config.kcfg/*
-%{_bindir}/kio_media_mounthelper
-%{_bindir}/kdcop
-%{_bindir}/kdeprintfax
-%{_bindir}/khc_beagle_index.pl
-%{_bindir}/khc_beagle_search.pl
-%{_bindir}/kxdglauncher
-%{_bindir}/kjobviewer
-%{_bindir}/klocaldomainurifilterhelper
-%{_bindir}/kprinter
-%{_datadir}/applications/*/*
-%{_datadir}/apps/*
-%{_datadir}/icons/*color/*/*/*
-%{_datadir}/icons/crystalsvg/*/*/*
-%{_datadir}/mimelnk/*/*
-%{_datadir}/services/*
-%{_datadir}/servicetypes/*
-%{_datadir}/sounds/*
-%{tde_libdir}/*
-%{_libdir}/libkdeinit_*.*
-%if "%{_prefix}" != "/usr"
-%{_prefix}/etc/xdg/menus/applications-merged/kde-essential.menu
-%{_prefix}/etc/xdg/menus/kde-information.menu
-%{_prefix}/etc/xdg/menus/kde-screensavers.menu
-%{_prefix}/etc/xdg/menus/kde-settings.menu
-%else
-%{_sysconfdir}/xdg/menus/applications-merged/kde-essential.menu
-%{_sysconfdir}/xdg/menus/kde-information.menu
-%{_sysconfdir}/xdg/menus/kde-screensavers.menu
-%{_sysconfdir}/xdg/menus/kde-settings.menu
-%endif
-/usr/share/xsessions/*.desktop
-# Remove conflicts with redhat-menus
-%if "%{?_prefix}" != "/usr"
-%{_bindir}/plasma-desktop
-%config(noreplace) %{_datadir}/config/*
-%else
-%exclude %{_datadir}/config
-%endif
-# exclude pim-ioslaves files from main package
-%exclude %{tde_libdir}/kio_ldap.*
-%exclude %{tde_libdir}/kio_nntp.*
-%exclude %{tde_libdir}/kio_pop3.*
-%exclude %{tde_libdir}/kio_smtp.*
-%exclude %{_datadir}/services/ldap*.protocol
-%exclude %{_datadir}/services/nntp*.protocol
-%exclude %{_datadir}/services/pop3*.protocol
-%exclude %{_datadir}/services/smtp*.protocol
-
-# TDE 3.5.12 specific
-%{_bindir}/kde3
-%exclude %{_datadir}/applications/kde/display.desktop
-%exclude %{_datadir}/fonts/override/fonts.dir
-%{_docdir}/kdm/README
-
-%files libs
-%defattr(-,root,root,-)
-%exclude %{_libdir}/libkdeinit_*.*
-%{_libdir}/lib*.so.*
-%{_libdir}/lib*.la
-
-%files pim-ioslaves
-%defattr(-,root,root,-)
-%{tde_libdir}/kio_ldap.*
-%{tde_libdir}/kio_nntp.*
-%{tde_libdir}/kio_pop3.*
-%{tde_libdir}/kio_smtp.*
-%{_datadir}/services/ldap*.protocol
-%{_datadir}/services/nntp*.protocol
-%{_datadir}/services/pop3*.protocol
-%{_datadir}/services/smtp*.protocol
-
-%files devel
-%defattr(-,root,root,-)
-%{_includedir}/*.h
-%dir %{_includedir}/kate
-%{_includedir}/kate/*
-%dir %{_includedir}/kwin
-%{_includedir}/kwin/*
-%dir %{_includedir}/ksgrd
-%{_includedir}/ksgrd/*
-%dir %{_includedir}/ksplash
-%{_includedir}/ksplash/*
-%{_libdir}/lib*.so
-%exclude %{_libdir}/libkdeinit_*.*
-
-%changelog
-* Thu Jan 05 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.12-15
-- Add KDM option to hide 'Menu' button on login prompt
-
-* Wed Dec 21 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.12-14
-- Fix kdesktop_lock missing black background on kscreensaver failure
-
-* Thu Dec 11 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.12-13
-- Backports patches from TDE 3.5.13-10
-- Removes Kubuntu branding [TDE Bug #449]
-- Fix 'kio_man' on RHEL 5 and RHEL 6 [TDE Bug #714]
-- Restores the 'number of files' and sorting widgets to the Kate configuration [TDE Bug #244]
-- Re-enables 'open tab in background' konqueror feature [TDE Bug #245]
-- Fix error message 'cannot find parent folder' on konqueror sidebar
-- Fix KDEDIRS and other variables in 'startkde', that messes up translations.
-
-* Sun Nov 20 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.12-12
-- Updates Kickoff menu Fix [TDE Bugs #281, #508]
-- Add distribution-specific start button icon
-- Add graphical theme for RHEL 5, RHEL 6, Fedora 15, Fedora 16
-- Moves XDG files in TDE prefix to avoid conflict with distro-provided KDE
-- Add "service(graphical-login)"
-- kdmrc: sets "MinShowUID=500"
-- Add missing BuildRequires
-
-* Fri Sep 16 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.12-11
-- Add support for RHEL 5.
-- Remove file conflicts with KDE 4.6.5 under Fedora 15
-
-* Mon Sep 12 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.12-10
-- Add "Group" field
-
-* Sun Sep 04 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.12-9
-- Import to GIT
-
-* Tue Aug 23 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.12-8
-- Add missing BuildRequires
-- Add Patch7, Patch8, Patch9 to allow compilation under GCC >= 4.5.2
-
-* Mon Aug 22 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.12-7
-- Correct macro to install under "/opt", if desired
-
-* Wed Jul 20 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.12-6
-- Add patch to force halbackend to use HAL-provided mount options
-
-* Wed Jul 20 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.12-5
-- Add patch to modify "Open terminal here" shortcut (now opens in home directory)
-
-* Tue Jul 19 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.12-4
-- Add 'BuildRequires: dbus-qt' to enable HAL support
-
-* Wed Jun 22 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.12-3
-- Adds setuid bit on '/usr/bin/kcheckpass'
-- Removes '/usr/share/applications/kde/display.desktop' (does not work on RHEL 6.0)
-
-* Mon Dec 20 2010 Francois Andriot <francois.andriot@free.fr> - 3.5.12-2
-- Add missing Requires
-- Rename 'kde3.desktop' to 'kde.desktop' in case of default prefix
-
-* Fri Dec 17 2010 Francois Andriot <francois.andriot@free.fr> - 3.5.12-1
-- Add macro _kde3_prefix to define custom installation prefix (ex: /opt/kde3)
-- Add '--with-extra-includes=%{_includedir}/tqt'
-- Add 'patch3' to remove ignore button on kdesu dialog box
-- Add 'patch4' r1182808.diff : Fix My Documents shortcut on desktop
-
-* Wed Dec 14 2010 Francois Andriot <francois.andriot@free.fr> - 3.5.12-0
-- Initial version
-- Add script 'plasma-desktop' to prevent KDE4 plasma automatic startup
-- Add 'patch0' to fix for DBUS include files in RHEL6
-- Add 'patch1' r1201523.diff : [kdebase/kcontrol] fix for openssl 1.0 
-- Add 'patch2' r1201705.diff : [kdebase/kcontrol] make it compatible with openssl < 1.0 
-
diff --git a/redhat/tdebase/kdebase-3.5.13-add_disable_composite_option.patch b/redhat/tdebase/kdebase-3.5.13-add_disable_composite_option.patch
deleted file mode 100644
index 3fc57b6de..000000000
--- a/redhat/tdebase/kdebase-3.5.13-add_disable_composite_option.patch
+++ /dev/null
@@ -1,81 +0,0 @@
---- kdebase/kdesktop/bgmanager.cc.ORI	2012-09-06 17:20:49.564915154 -0400
-+++ kdebase/kdesktop/bgmanager.cc	2012-09-06 17:21:01.969682348 -0400
-@@ -1013,13 +1013,13 @@
-   slotChangeDesktop(0);
- }
- 
--#ifdef COMPOSITE
- void KBackgroundManager::slotCmBackgroundChanged( bool )
- {
-+#ifdef COMPOSITE
-     m_tPixmap->fill(TQColor(0, 0x0));
-     m_Hash = 0;
-     slotChangeDesktop(0);
--}
- #endif
-+}
- 
- #include "bgmanager.moc"
---- kdebase/kdesktop/main.cc.ORI	2012-09-07 20:33:09.716283507 +0200
-+++ kdebase/kdesktop/main.cc	2012-09-07 20:33:31.683842727 +0200
-@@ -43,7 +43,7 @@
- #include <fcntl.h>
- #include <stdlib.h>
- 
--#if defined(Q_WS_X11) && defined(HAVE_XRENDER) && QT_VERSION >= 0x030300
-+#if defined(WITH_COMPOSITE) && defined(Q_WS_X11) && defined(HAVE_XRENDER) && QT_VERSION >= 0x030300
- #define COMPOSITE
- #endif
- 
---- kdebase/kdesktop/bgmanager.h.ORI	2012-09-07 20:36:28.196299160 +0200
-+++ kdebase/kdesktop/bgmanager.h	2012-09-07 20:36:52.420812591 +0200
-@@ -15,7 +15,7 @@
- 
- #include <KBackgroundIface.h>
- 
--#if defined(Q_WS_X11) && defined(HAVE_XRENDER) && QT_VERSION >= 0x030300
-+#if defined(WITH_COMPOSITE) && defined(Q_WS_X11) && defined(HAVE_XRENDER) && QT_VERSION >= 0x030300
- #define COMPOSITE
- #endif
- 
---- kdebase/kdesktop/kdesktopapp.h.ORI	2012-09-07 20:37:14.677365503 +0200
-+++ kdebase/kdesktop/kdesktopapp.h	2012-09-07 20:37:25.194154223 +0200
-@@ -23,7 +23,7 @@
- #include <config.h>
- #include <kuniqueapplication.h>
- 
--#if defined(Q_WS_X11) && defined(HAVE_XRENDER) && QT_VERSION >= 0x030300
-+#if defined(WITH_COMPOSITE) && defined(Q_WS_X11) && defined(HAVE_XRENDER) && QT_VERSION >= 0x030300
- #define COMPOSITE
- #endif
- 
---- kdebase/konsole/konsole/main.cpp.ORI	2012-09-07 20:37:37.749901966 +0200
-+++ kdebase/konsole/konsole/main.cpp	2012-09-07 20:37:46.683722469 +0200
-@@ -46,7 +46,7 @@
- 
- #include "konsole.h"
- 
--#if defined(Q_WS_X11) && defined(HAVE_XRENDER) && QT_VERSION >= 0x030300
-+#if defined(WITH_COMPOSITE) && defined(Q_WS_X11) && defined(HAVE_XRENDER) && QT_VERSION >= 0x030300
- #define COMPOSITE
- #endif
- 
---- kdebase/CMakeLists.txt.ORI	2012-09-07 20:41:11.142612361 +0200
-+++ kdebase/CMakeLists.txt	2012-09-07 20:42:40.138822080 +0200
-@@ -78,6 +78,7 @@
- option( WITH_ARTS "Enable aRts support" OFF )
- option( WITH_I8K "Enable Dell laptop support (ksysguard)" OFF )
- option( WITH_HAL "Enable HAL support" OFF )
-+option( WITH_COMPOSITE "Enable COMPOSITE support" OFF )
- 
- 
- ##### user requested modules ####################
---- kdebase/config.h.cmake.composite	2012-09-07 20:44:49.980208832 +0200
-+++ kdebase/config.h.cmake	2012-09-07 20:44:56.929068934 +0200
-@@ -177,3 +177,6 @@
- 
- // tsak
- #cmakedefine BUILD_TSAK "@BUILD_TSAK@"
-+ 
-+ // kdesktop, konsole
-+ #cmakedefine WITH_COMPOSITE "@WITH_COMPOSITE@"
diff --git a/redhat/tdebase/kdebase-3.5.13-add_drag_drop_to_kate_file_list.patch b/redhat/tdebase/kdebase-3.5.13-add_drag_drop_to_kate_file_list.patch
deleted file mode 100644
index 35f271e15..000000000
--- a/redhat/tdebase/kdebase-3.5.13-add_drag_drop_to_kate_file_list.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-commit b0fa10df6cf9ba377d6bfdef719efc8ca4fe57a0
-Author: Timothy Pearson <kb9vqf@pearsoncomputing.net>
-Date:   1337062555 -0500
-
-    Add drag and drop to kate file list in manual mode
-
-diff --git a/kate/app/katefilelist.cpp b/kate/app/katefilelist.cpp
-index bc5b0a1..bd2d087 100644
---- a/kate/app/katefilelist.cpp
-+++ b/kate/app/katefilelist.cpp
-@@ -102,7 +102,7 @@ KateFileList::KateFileList (KateMainWindow *main,
-   addColumn("Document Name");
- 
-   setSelectionMode( TQListView::Single );
--  setSorting( 0, true );
-+  setSortType(KateFileList::sortByID);
-   setShowToolTips( false );
- 
-   setupActions ();
-@@ -408,9 +408,13 @@ void KateFileList::setSortType (int s)
-   m_sort = s;
-   if (m_sort == KateFileList::sortManual) {
-     setSorting( -1, true );
-+    setDragEnabled(true);
-+    setAcceptDrops(true);
-   }
-   else {
-     setSorting( 0, true );
-+    setDragEnabled(false);
-+    setAcceptDrops(false);
-     updateSort ();
-   }
- }
diff --git a/redhat/tdebase/kdebase-3.5.13-add_reorder_documents_in_kate.patch b/redhat/tdebase/kdebase-3.5.13-add_reorder_documents_in_kate.patch
deleted file mode 100644
index 5518f13a9..000000000
--- a/redhat/tdebase/kdebase-3.5.13-add_reorder_documents_in_kate.patch
+++ /dev/null
@@ -1,167 +0,0 @@
-commit 46a657f7108284d4f02107d11fa407cbf95b86b9
-Author: Timothy Pearson <kb9vqf@pearsoncomputing.net>
-Date:   1337058308 -0500
-
-    Add the ability to reorder documents in kate
-
-diff --git a/kate/app/katefilelist.cpp b/kate/app/katefilelist.cpp
-index 8d34c38..bc5b0a1 100644
---- a/kate/app/katefilelist.cpp
-+++ b/kate/app/katefilelist.cpp
-@@ -138,8 +138,14 @@ void KateFileList::setupActions ()
-   windowPrev = KStdAction::forward(TQT_TQOBJECT(this), TQT_SLOT(slotNextDocument()), m_main->actionCollection());
-   sortAction = new KSelectAction( i18n("Sort &By"), 0,
-       m_main->actionCollection(), "filelist_sortby"  );
-+  listMoveFileUp = new KAction( i18n("Move File Up"), 0, m_main->actionCollection(), "filelist_move_up" );
-+  listMoveFileUp->setShortcut(KShortcut(CTRL + SHIFT + Key_Comma));
-+  listMoveFileDown = new KAction( i18n("Move File Down"), 0, m_main->actionCollection(), "filelist_move_down" );
-+  listMoveFileDown->setShortcut(KShortcut(CTRL + SHIFT + Key_Period));
-+  connect( listMoveFileUp, TQT_SIGNAL(activated()), TQT_TQOBJECT(this), TQT_SLOT(moveFileUp()) );
-+  connect( listMoveFileDown, TQT_SIGNAL(activated()), TQT_TQOBJECT(this), TQT_SLOT(moveFileDown()) );
-   TQStringList l;
--  l << i18n("Opening Order") << i18n("Document Name") << i18n("URL");
-+  l << i18n("Opening Order") << i18n("Document Name") << i18n("URL") << i18n("Manual Placement");
-   sortAction->setItems( l );
-   connect( sortAction, TQT_SIGNAL(activated(int)), TQT_TQOBJECT(this), TQT_SLOT(setSortType(int)) );
- }
-@@ -353,10 +359,25 @@ void KateFileList::slotMenu ( TQListViewItem *item, const TQPoint &p, int /*col*
-   if (!item)
-     return;
- 
-+  m_clickedMenuItem = item;
-+  if (m_clickedMenuItem->itemAbove()) {
-+    listMoveFileUp->setEnabled(true);
-+  }
-+  else {
-+    listMoveFileUp->setEnabled(false);
-+  }
-+  if (m_clickedMenuItem->itemBelow()) {
-+    listMoveFileDown->setEnabled(true);
-+  }
-+  else {
-+    listMoveFileDown->setEnabled(false);
-+  }
-+
-   TQPopupMenu *menu = (TQPopupMenu*) ((viewManager->mainWindow())->factory()->container("filelist_popup", viewManager->mainWindow()));
- 
--  if (menu)
-+  if (menu) {
-     menu->exec(p);
-+  }
- }
- 
- TQString KateFileList::tooltip( TQListViewItem *item, int )
-@@ -385,7 +406,45 @@ TQString KateFileList::tooltip( TQListViewItem *item, int )
- void KateFileList::setSortType (int s)
- {
-   m_sort = s;
--  updateSort ();
-+  if (m_sort == KateFileList::sortManual) {
-+    setSorting( -1, true );
-+  }
-+  else {
-+    setSorting( 0, true );
-+    updateSort ();
-+  }
-+}
-+
-+void KateFileList::moveFileUp()
-+{
-+  if (m_clickedMenuItem) {
-+    sortAction->setCurrentItem(KateFileList::sortManual);
-+    setSortType(KateFileList::sortManual);
-+    TQListViewItem* nitemabove = m_clickedMenuItem->itemAbove();
-+    if (nitemabove) {
-+      nitemabove = nitemabove->itemAbove();
-+      if (nitemabove) {
-+        m_clickedMenuItem->moveItem(nitemabove);
-+      }
-+      else {
-+        // Qt made this hard
-+        nitemabove = m_clickedMenuItem->itemAbove();
-+        nitemabove->moveItem(m_clickedMenuItem);
-+      }
-+    }
-+  }
-+}
-+
-+void KateFileList::moveFileDown()
-+{
-+  if (m_clickedMenuItem) {
-+    sortAction->setCurrentItem(KateFileList::sortManual);
-+    setSortType(KateFileList::sortManual);
-+    TQListViewItem* nitemabove = m_clickedMenuItem->itemBelow();
-+    if (nitemabove) {
-+      m_clickedMenuItem->moveItem(nitemabove);
-+    }
-+  }
- }
- 
- void KateFileList::updateSort ()
-@@ -441,6 +500,11 @@ KateFileListItem::KateFileListItem( TQListView* lv,
-     m_edithistpos( 0 ),
-     m_docNumber( _doc->documentNumber() )
- {
-+  // Move this document to the end of the list where it belongs
-+  TQListViewItem* lastitem = lv->lastItem();
-+  if (lastitem) {
-+    moveItem(lastitem);
-+  }
- }
- 
- KateFileListItem::~KateFileListItem()
-diff --git a/kate/app/katefilelist.h b/kate/app/katefilelist.h
-index 176898c..e3504cb 100644
---- a/kate/app/katefilelist.h
-+++ b/kate/app/katefilelist.h
-@@ -90,7 +90,8 @@ class KateFileList : public KListView
-     enum sorting {
-       sortByID = 0,
-       sortByName = 1,
--      sortByURL = 2
-+      sortByURL = 2,
-+      sortManual = 3
-     };
- 
-     TQString tooltip( TQListViewItem *item, int );
-@@ -111,6 +112,8 @@ class KateFileList : public KListView
- 
-   public slots:
-     void setSortType (int s);
-+    void moveFileUp();
-+    void moveFileDown();
-     void slotNextDocument();
-     void slotPrevDocument();
- 
-@@ -151,6 +154,8 @@ class KateFileList : public KListView
-     KAction* windowNext;
-     KAction* windowPrev;
-     KSelectAction* sortAction;
-+    KAction* listMoveFileUp;
-+    KAction* listMoveFileDown;
- 
-     TQPtrList<KateFileListItem> m_viewHistory;
-     TQPtrList<KateFileListItem> m_editHistory;
-@@ -158,6 +163,8 @@ class KateFileList : public KListView
-     TQColor m_viewShade, m_editShade;
-     bool m_enableBgShading;
- 
-+    TQListViewItem *m_clickedMenuItem;
-+
-     class ToolTip *m_tooltip;
- };
- 
-diff --git a/kate/data/kateui.rc b/kate/data/kateui.rc
-index 27df006..6e784e9 100644
---- a/kate/data/kateui.rc
-+++ b/kate/data/kateui.rc
-@@ -162,6 +162,9 @@
-   <Action name="file_close"/>
-   <Action name="file_close_all"/>
-   <Separator/>
-+  <Action name="filelist_move_up"/>
-+  <Action name="filelist_move_down"/>
-+  <Separator/>
-   <Action name="filelist_sortby"/>
- </Menu>
- 
diff --git a/redhat/tdebase/kdebase-3.5.13-add_usbstorage_panel.patch b/redhat/tdebase/kdebase-3.5.13-add_usbstorage_panel.patch
deleted file mode 100644
index b75f1c84f..000000000
--- a/redhat/tdebase/kdebase-3.5.13-add_usbstorage_panel.patch
+++ /dev/null
@@ -1,1278 +0,0 @@
-Index: kdebase/kioslave/media/kcmodule/managermoduleview.ui
-===================================================================
---- kdebase/kioslave/media/kcmodule/managermoduleview.ui	(revision 604326)
-+++ kdebase/kioslave/media/kcmodule/managermoduleview.ui	(working copy)
-@@ -12,6 +12,9 @@
-             <height>480</height>
-         </rect>
-     </property>
-+    <property name="caption">
-+        <string>ManagerModuleView</string>
-+    </property>
-     <vbox>
-         <property name="name">
-             <cstring>unnamed</cstring>
-@@ -49,6 +52,245 @@
-                 <string>Select this if you want to enable application autostart after mounting a device.</string>
-             </property>
-         </widget>
-+        <widget class="TQGroupBox">
-+            <property name="name">
-+                <cstring>groupbox_mount</cstring>
-+            </property>
-+            <property name="title">
-+                <string>Mount options</string>
-+            </property>
-+            <vbox>
-+                <property name="name">
-+                    <cstring>unnamed</cstring>
-+                </property>
-+                <widget class="TQLabel">
-+                    <property name="name">
-+                        <cstring>textLabel3</cstring>
-+                    </property>
-+                    <property name="text">
-+                        <string>Here you can specify default mount options for your storage media. Please note that some options are not supported for certain filesystems and/or medium. You will be able to redefine all these options on per-volume basis later, using Properties dialog of the corresponding volume.&lt;br&gt;
-+Some of the options are tristate. Leave them "undefined" to let KDE choose the best value depending on your media.</string>
-+                    </property>
-+                    <property name="alignment">
-+                        <set>WordBreak|AlignVCenter</set>
-+                    </property>
-+                </widget>
-+                <widget class="TQLayoutWidget">
-+                    <property name="name">
-+                        <cstring>layout30</cstring>
-+                    </property>
-+                    <grid>
-+                        <property name="name">
-+                            <cstring>unnamed</cstring>
-+                        </property>
-+                        <widget class="TQCheckBox" row="1" column="0">
-+                            <property name="name">
-+                                <cstring>option_ro</cstring>
-+                            </property>
-+                            <property name="text">
-+                                <string>Read only</string>
-+                            </property>
-+                            <property name="whatsThis" stdset="0">
-+                                <string>By default, mount all file systems read-only.</string>
-+                            </property>
-+                        </widget>
-+                        <widget class="TQCheckBox" row="2" column="1">
-+                            <property name="name">
-+                                <cstring>option_uid</cstring>
-+                            </property>
-+                            <property name="text">
-+                                <string>Mount as user</string>
-+                            </property>
-+                            <property name="whatsThis" stdset="0">
-+                                <string>Mount this file system as user.</string>
-+                            </property>
-+                        </widget>
-+                        <widget class="TQCheckBox" row="0" column="1">
-+                            <property name="name">
-+                                <cstring>option_flush</cstring>
-+                            </property>
-+                            <property name="text">
-+                                <string>Flushed IO</string>
-+                            </property>
-+                            <property name="tristate">
-+                                <bool>true</bool>
-+                            </property>
-+                            <property name="whatsThis" stdset="0">
-+                                <string>Always flush all data to the hot plug devices immediately and don't cache it.</string>
-+                            </property>
-+                        </widget>
-+                        <widget class="TQCheckBox" row="3" column="0">
-+                            <property name="name">
-+                                <cstring>option_sync</cstring>
-+                            </property>
-+                            <property name="text">
-+                                <string>Synchronous</string>
-+                            </property>
-+                            <property name="tristate">
-+                                <bool>true</bool>
-+                            </property>
-+                            <property name="whatsThis" stdset="0">
-+                                <string>All I/O to the file system should be done synchronously.</string>
-+                            </property>
-+                        </widget>
-+                        <widget class="TQCheckBox" row="2" column="0">
-+                            <property name="name">
-+                                <cstring>option_quiet</cstring>
-+                            </property>
-+                            <property name="text">
-+                                <string>Quiet</string>
-+                            </property>
-+                            <property name="whatsThis" stdset="0">
-+                                <string>Attempts to chown or chmod files do not return errors, although they fail. Use with caution!</string>
-+                            </property>
-+                        </widget>
-+                        <widget class="TQCheckBox" row="1" column="1">
-+                            <property name="name">
-+                                <cstring>option_utf8</cstring>
-+                            </property>
-+                            <property name="text">
-+                                <string>UTF-8 charset</string>
-+                            </property>
-+                            <property name="whatsThis" stdset="0">
-+                                <string>UTF8 is the filesystem safe 8-bit encoding of Unicode that is used by the console. It can be be enabled for the filesystem with this option.</string>
-+                            </property>
-+                        </widget>
-+                        <widget class="TQLayoutWidget" row="3" column="1" rowspan="2" colspan="1">
-+                            <property name="name">
-+                                <cstring>layout29</cstring>
-+                            </property>
-+                            <grid>
-+                                <property name="name">
-+                                    <cstring>unnamed</cstring>
-+                                </property>
-+                                <widget class="TQLabel" row="1" column="0">
-+                                    <property name="name">
-+                                        <cstring>text_shortname</cstring>
-+                                    </property>
-+                                    <property name="text">
-+                                        <string>Short names:</string>
-+                                    </property>
-+                                    <property name="buddy" stdset="0">
-+                                        <cstring>option_shortname</cstring>
-+                                    </property>
-+                                    <property name="whatsThis" stdset="0">
-+                                        <string>&lt;h2&gt;Defines  the  behaviour  for  creation and display of filenames which fit into 8.3 characters. If a long name for a file exists, it will always be preferred display.&lt;/h2&gt;
-+
-+&lt;h3&gt;&lt;b&gt;Lower&lt;/b&gt;&lt;/h3&gt;
-+Force the short name to lower case upon display; store a long name when the short name is not all upper case.
-+
-+&lt;h3&gt;&lt;b&gt;Windows 95&lt;/b&gt;&lt;/h3&gt;
-+Force the short name to upper case upon display; store a long name when the short name is not all upper case.
-+
-+&lt;h3&gt;&lt;b&gt;Windows NT&lt;/b&gt;&lt;/h3&gt;
-+Display the shortname as is; store a long name when the short name is not all lower case or all upper case.
-+
-+&lt;h3&gt;&lt;b&gt;Mixed&lt;/b&gt;&lt;/h3&gt;
-+Display the short name as is; store a long name when the short name is not all upper case.</string>
-+                                    </property>
-+                                </widget>
-+                                <widget class="TQComboBox" row="0" column="1">
-+                                    <item>
-+                                        <property name="text">
-+                                            <string>All Data</string>
-+                                        </property>
-+                                    </item>
-+                                    <item>
-+                                        <property name="text">
-+                                            <string>Ordered</string>
-+                                        </property>
-+                                    </item>
-+                                    <item>
-+                                        <property name="text">
-+                                            <string>Writeback</string>
-+                                        </property>
-+                                    </item>
-+                                    <property name="name">
-+                                        <cstring>option_journaling</cstring>
-+                                    </property>
-+                                    <property name="currentItem">
-+                                        <number>1</number>
-+                                    </property>
-+                                </widget>
-+                                <widget class="TQLabel" row="0" column="0">
-+                                    <property name="name">
-+                                        <cstring>text_journaling</cstring>
-+                                    </property>
-+                                    <property name="text">
-+                                        <string>Journaling:</string>
-+                                    </property>
-+                                    <property name="buddy" stdset="0">
-+                                        <cstring>option_journaling</cstring>
-+                                    </property>
-+                                    <property name="whatsThis" stdset="0">
-+                                        <string>&lt;h2&gt;Specifies  the journalling mode for file data. Metadata is always journaled. &lt;/h2&gt;
-+           
-+&lt;h3&gt;&lt;b&gt;All Data&lt;/b&gt;&lt;/h3&gt;
-+           All  data  is  committed into the journal prior to being written into the main file system. This is the slowest variant with the highest data security.
-+
-+&lt;h3&gt;&lt;b&gt;Ordered&lt;/b&gt;&lt;/h3&gt;
-+           All data is forced directly out to the main  file system prior to its metadata being committed to the journal.
-+
-+&lt;h3&gt;&lt;b&gt;Write Back&lt;/b&gt;&lt;/h3&gt;
-+           Data ordering is not preserved - data may be written into the main file system after its metadata has been committed to the journal.  This is rumoured to  be the  highest-throughput option.  It guarantees internal file system integrity,  however it can allow old data to appear in files after  a  crash  and  journal recovery.</string>
-+                                    </property>
-+                                </widget>
-+                                <widget class="TQComboBox" row="1" column="1">
-+                                    <item>
-+                                        <property name="text">
-+                                            <string>Lower</string>
-+                                        </property>
-+                                    </item>
-+                                    <item>
-+                                        <property name="text">
-+                                            <string>Windows 95</string>
-+                                        </property>
-+                                    </item>
-+                                    <item>
-+                                        <property name="text">
-+                                            <string>Windows NT</string>
-+                                        </property>
-+                                    </item>
-+                                    <item>
-+                                        <property name="text">
-+                                            <string>Mixed</string>
-+                                        </property>
-+                                    </item>
-+                                    <property name="name">
-+                                        <cstring>option_shortname</cstring>
-+                                    </property>
-+                                </widget>
-+                            </grid>
-+                        </widget>
-+                        <widget class="TQCheckBox" row="0" column="0">
-+                            <property name="name">
-+                                <cstring>option_automount</cstring>
-+                            </property>
-+                            <property name="text">
-+                                <string>Mount automatically</string>
-+                            </property>
-+                            <property name="whatsThis" stdset="0">
-+                                <string>By default, mount all file systems automatically.</string>
-+                            </property>
-+                        </widget>
-+                        <widget class="TQCheckBox" row="4" column="0">
-+                            <property name="name">
-+                                <cstring>option_atime</cstring>
-+                            </property>
-+                            <property name="text">
-+                                <string>Access time updates</string>
-+                            </property>
-+                            <property name="tristate">
-+                                <bool>true</bool>
-+                            </property>
-+                            <property name="whatsThis" stdset="0">
-+                                <string>Update inode access time for each access.</string>
-+                            </property>
-+                        </widget>
-+                    </grid>
-+                </widget>
-+            </vbox>
-+        </widget>
-         <spacer>
-             <property name="name">
-                 <cstring>spacer1</cstring>
-@@ -62,11 +304,40 @@
-             <property name="tqsizeHint">
-                 <size>
-                     <width>21</width>
--                    <height>360</height>
-+                    <height>130</height>
-                 </size>
-             </property>
-         </spacer>
-     </vbox>
- </widget>
-+<connections>
-+    <connection>
-+        <sender>kcfg_HalBackendEnabled</sender>
-+        <signal>toggled(bool)</signal>
-+        <receiver>groupbox_mount</receiver>
-+        <slot>setEnabled(bool)</slot>
-+    </connection>
-+</connections>
-+<tabstops>
-+    <tabstop>kcfg_HalBackendEnabled</tabstop>
-+    <tabstop>kcfg_CdPollingEnabled</tabstop>
-+    <tabstop>kcfg_AutostartEnabled</tabstop>
-+    <tabstop>option_automount</tabstop>
-+    <tabstop>option_ro</tabstop>
-+    <tabstop>option_quiet</tabstop>
-+    <tabstop>option_sync</tabstop>
-+    <tabstop>option_atime</tabstop>
-+    <tabstop>option_flush</tabstop>
-+    <tabstop>option_utf8</tabstop>
-+    <tabstop>option_uid</tabstop>
-+    <tabstop>option_journaling</tabstop>
-+    <tabstop>option_shortname</tabstop>
-+</tabstops>
-+<includes>
-+    <include location="local" impldecl="in implementation">managermoduleview.ui.h</include>
-+</includes>
-+<functions>
-+    <function access="private" specifier="non virtual">init()</function>
-+</functions>
- <layoutdefaults spacing="6" margin="11"/>
- </UI>
-Index: kdebase/kioslave/media/kcmodule/managermodule.cpp
-===================================================================
---- kdebase/kioslave/media/kcmodule/managermodule.cpp	(revision 604326)
-+++ kdebase/kioslave/media/kcmodule/managermodule.cpp	(working copy)
-@@ -1,5 +1,6 @@
- /* This file is part of the KDE Project
-    Copyright (c) 2005 K�vin Ottens <ervin ipsquad net>
-+   Copyright (c) 2006 Valentine Sinitsyn <e_val@inbox.ru>
- 
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Library General Public
-@@ -20,9 +21,13 @@
- 
- #include "managermodule.h"
- 
-+#include <kconfig.h>
- #include <klocale.h>
- #include <dcopref.h>
-+#include <tqbutton.h>
- #include <tqcheckbox.h>
-+#include <tqcombobox.h>
-+#include <tqobjectlist.h>
- #include <kdirnotify_stub.h>
- 
- #include "managermoduleview.h"
-@@ -31,7 +36,7 @@
- ManagerModule::ManagerModule( TQWidget* parent, const char* name )
- 	: KCModule( parent, name )
- {
--	ManagerModuleView *view = new ManagerModuleView( this );
-+	view = new ManagerModuleView( this );
- 
- 	addConfig(  MediaManagerSettings::self(), view );
- 
-@@ -49,12 +54,87 @@
- #endif
- 	view->kcfg_CdPollingEnabled->setEnabled( false );
- 
-+	connect( view->option_automount, SIGNAL( stateChanged(int) ), this, SLOT( emitChanged() ) );
-+	connect( view->option_ro, SIGNAL( stateChanged(int) ), this, SLOT( emitChanged() ) );
-+	connect( view->option_quiet, SIGNAL( stateChanged(int) ), this, SLOT( emitChanged() ) );
-+	connect( view->option_flush, SIGNAL( stateChanged(int) ), this, SLOT( emitChanged() ) );
-+	connect( view->option_uid, SIGNAL( stateChanged(int) ), this, SLOT( emitChanged() ) );
-+	connect( view->option_utf8, SIGNAL( stateChanged(int) ), this, SLOT( emitChanged() ) );
-+	connect( view->option_sync, SIGNAL( stateChanged(int) ), this, SLOT( emitChanged() ) );
-+	connect( view->option_atime, SIGNAL( stateChanged(int) ), this, SLOT( emitChanged() ) );
-+	connect( view->option_shortname, SIGNAL( activated(int) ), this, SLOT( emitChanged() ) );
-+	connect( view->option_journaling, SIGNAL( activated(int) ), this, SLOT( emitChanged() ) );	
-+
- 	load();
-+}	
-+
-+
-+void ManagerModule::load()
-+{
-+	KCModule::load();
-+	
-+	KConfig config("mediamanagerrc");
-+	config.setGroup("DefaultOptions");
-+	
-+	view->option_automount->setChecked( config.readBoolEntry("automount", false) );
-+	view->option_ro->setChecked( config.readBoolEntry("ro", false) );
-+	view->option_quiet->setChecked( config.readBoolEntry("quiet", false) );
-+	if (config.hasKey("flush"))
-+	    view->option_flush->setChecked( config.readBoolEntry("flush") );
-+	else
-+	    view->option_flush->setNoChange();
-+	view->option_uid->setChecked( config.readBoolEntry("uid", true) );	
-+	view->option_utf8->setChecked( config.readBoolEntry("utf8", true) );
-+	if (config.hasKey("sync"))
-+	    view->option_sync->setChecked( config.readBoolEntry("sync") );
-+	else
-+	    view->option_sync->setNoChange();
-+	if (config.hasKey("atime"))    
-+	    view->option_atime->setChecked( config.readBoolEntry("atime") );
-+	else
-+	    view->option_atime->setNoChange();
-+	
-+	QString value;	
-+	
-+	value = config.readEntry("shortname", "lower").lower();
-+	for (int i = 0; i < view->option_shortname->count(); i++)
-+	    if (view->option_shortname->text(i).lower() == value) view->option_shortname->setCurrentItem(i);
-+		    
-+	value = config.readEntry("journaling", "ordered").lower();
-+	for (int i = 0; i < view->option_journaling->count(); i++)
-+	    if (view->option_journaling->text(i).lower() == value) view->option_journaling->setCurrentItem(i);
-+	    
-+	rememberSettings();
- }
- 
- void ManagerModule::save()
- {
- 	KCModule::save();
-+	
-+	KConfig config("mediamanagerrc");
-+	config.setGroup("DefaultOptions");
-+	
-+	config.writeEntry("automount", view->option_automount->isChecked());
-+	config.writeEntry("ro", view->option_ro->isChecked());
-+	config.writeEntry("quiet", view->option_quiet->isChecked());
-+	if (view->option_flush->state() == QButton::NoChange)
-+	    config.deleteEntry("flush");
-+	else
-+	    config.writeEntry("flush", view->option_flush->isChecked());
-+	config.writeEntry("uid", view->option_uid->isChecked());	
-+	config.writeEntry("utf8", view->option_utf8->isChecked());
-+	if (view->option_sync->state() == QButton::NoChange)
-+	    config.deleteEntry("sync");
-+	else
-+	    config.writeEntry("sync", view->option_sync->isChecked());
-+	if (view->option_atime->state() == QButton::NoChange)
-+	    config.deleteEntry("atime");
-+	else    
-+	    config.writeEntry("atime", view->option_atime->isChecked());
-+	config.writeEntry("journaling", view->option_journaling->currentText().lower());
-+	config.writeEntry("shortname", view->option_shortname->currentText().lower());
-+	
-+	rememberSettings();
- 
- 	//Well... reloadBackends is buggy with HAL, it seems to be linked
- 	//to a bug in the unmaintained Qt3 DBUS binding ;-/
-@@ -70,5 +150,64 @@
- 	notifier.FilesAdded( "media:/" );
- }
- 
-+void ManagerModule::defaults()
-+{
-+	KCModule::defaults();
-+	
-+	view->option_automount->setChecked(false);
-+	view->option_ro->setChecked(false);
-+	view->option_quiet->setChecked(false);	
-+	view->option_flush->setNoChange();
-+	view->option_uid->setChecked(true);	
-+	view->option_utf8->setChecked(true);	
-+	view->option_sync->setNoChange();	
-+	view->option_atime->setNoChange();
-+	view->option_journaling->setCurrentItem(1);
-+	view->option_shortname->setCurrentItem(0);
-+}
- 
-+void ManagerModule::rememberSettings()
-+{
-+	QObjectList *options = view->queryList(0, "^option_");
-+	QObject *current = 0;
-+	QObjectListIterator it(*options);
-+
-+	settings.clear();	
-+	while ( (current = it.current()) != 0 ) {
-+	    if (current->isA("QCheckBox"))
-+		settings[current] = ((QCheckBox *)current)->state();
-+	    else if (current->isA("QComboBox"))
-+		settings[current] = ((QComboBox *)current)->currentItem();
-+	    ++it;	
-+	}
-+	delete options;
-+
-+}
-+
-+void ManagerModule::emitChanged()
-+{
-+	QObjectList *options = view->queryList(0, "^option_");
-+	QObject *current = 0;
-+	QObjectListIterator it(*options);
-+	int value = -1;
-+	bool somethingChanged = false;
-+	
-+	while ( (current = it.current()) != 0 ) {
-+	    if (current->isA("QCheckBox"))
-+		value = ((QCheckBox *)current)->state();
-+	    else if (current->isA("QComboBox"))
-+		value = ((QComboBox *)current)->currentItem();
-+		
-+	    if (settings[current] != value) {
-+		somethingChanged = true;
-+		break;
-+	    }
-+	    
-+	    ++it;	
-+	}
-+	delete options;
-+
-+	emit changed(somethingChanged);
-+}
-+
- #include "managermodule.moc"
-Index: kdebase/kioslave/media/kcmodule/main.cpp
-===================================================================
---- kdebase/kioslave/media/kcmodule/main.cpp	(revision 604326)
-+++ kdebase/kioslave/media/kcmodule/main.cpp	(working copy)
-@@ -67,6 +67,7 @@
- 	                                    I18N_NOOP("(c) 2005 Jean-Remy Falleri"));
- 	about->addAuthor("Jean-Remy Falleri", I18N_NOOP("Maintainer"), "jr.falleri@laposte.net");
- 	about->addAuthor("Kevin Ottens", 0, "ervin ipsquad net");
-+	about->addAuthor("Valentine Sinitsyn", 0, "e_val@inbox.ru");
- 	about->addCredit("Achim Bohnet", I18N_NOOP("Help for the application design"));
- 
- 	setAboutData( about );
-Index: kdebase/kioslave/media/kcmodule/managermodule.h
-===================================================================
---- kdebase/kioslave/media/kcmodule/managermodule.h	(revision 604326)
-+++ kdebase/kioslave/media/kcmodule/managermodule.h	(working copy)
-@@ -1,5 +1,6 @@
- /* This file is part of the KDE Project
-    Copyright (c) 2005 K�vin Ottens <ervin ipsquad net>
-+   Copyright (c) 2006 Valentine Sinitsyn <e_val@inbox.ru>
- 
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Library General Public
-@@ -19,8 +20,11 @@
- #ifndef _MANAGERMODULE_H_
- #define _MANAGERMODULE_H_
- 
-+#include <tqmap.h>
- #include <kcmodule.h>
- 
-+class ManagerModuleView;
-+
- class ManagerModule : public KCModule
- {
- 	Q_OBJECT
-@@ -28,7 +32,18 @@
- public:
- 	ManagerModule( TQWidget* parent = 0, const char* name = 0);
- 
-+	void load();
- 	void save();
-+	void defaults();
-+	
-+private:
-+	void rememberSettings();
-+
-+	ManagerModuleView *view;
-+	TQMap<TQObject *, int> settings;
-+	
-+private slots:
-+	void emitChanged();	
- };
- 
- #endif
-Index: kdebase/kioslave/media/kcmodule/managermoduleview.ui.h
-===================================================================
---- kdebase/kioslave/media/kcmodule/managermoduleview.ui.h	(revision 0)
-+++ kdebase/kioslave/media/kcmodule/managermoduleview.ui.h	(revision 0)
-@@ -0,0 +1,18 @@
-+/****************************************************************************
-+** ui.h extension file, included from the uic-generated form implementation.
-+**
-+** If you want to add, delete, or rename functions or slots, use
-+** Qt Designer to update this file, preserving your code.
-+**
-+** You should not define a constructor or destructor in this file.
-+** Instead, write your code in functions called init() and destroy().
-+** These will automatically be called by the form's constructor and
-+** destructor.
-+*****************************************************************************/
-+
-+void ManagerModuleView::init() 
-+{
-+    option_flush->setNoChange();
-+    option_sync->setNoChange();
-+    option_atime->setNoChange();
-+}
-Index: kdebase/kioslave/media/propsdlgplugin/propertiespage.cpp
-===================================================================
---- kdebase/kioslave/media/propsdlgplugin/propertiespage.cpp	(revision 604326)
-+++ kdebase/kioslave/media/propsdlgplugin/propertiespage.cpp	(working copy)
-@@ -140,12 +140,23 @@
-     option_automount->setChecked(options["automount"] == "true");
-     connect( option_automount, TQT_SIGNAL( stateChanged(int) ), TQT_SIGNAL( changed() ) );
- 
-+    bool has_groupbox_specific = true;
-     if (!options.contains("journaling") &&
- 	!options.contains("shortname") &&
- 	!options.contains("uid") &&
- 	!options.contains("utf8") &&
--	!options.contains("flush"))
-+	!options.contains("flush")) {
-       groupbox_specific->hide();
-+      has_groupbox_specific = false;
-+    }
-+
-+    // The order is important - we want groupboxes to hide automatically depending on use_defaults
-+    // but don't want to emit changed() until user actually changes something.
-+    connect( option_defaults, TQT_SIGNAL( toggled(bool) ), groupbox_generic, SLOT( setHidden(bool) ) );
-+    if (has_groupbox_specific)
-+      connect( option_defaults, TQT_SIGNAL( toggled(bool) ), groupbox_specific, SLOT( setHidden(bool) ) );
-+    option_defaults->setChecked(options["use_defaults"] == "true");
-+    connect( option_defaults, TQT_SIGNAL( stateChanged(int) ), TQT_SIGNAL( changed() ) );    
- 
-   } else {
- 
-@@ -198,6 +210,7 @@
-     }
-   result << TQString("mountpoint=%1").arg(mp);
-   result << TQString("automount=%1").arg(option_automount->isChecked() ? "true" : "false");
-+  result << TQString("use_defaults=%1").arg(option_defaults->isChecked() ? "true" : "false");
- 
-   kdDebug() << result << endl;
- 
-Index: kdebase/kioslave/media/propsdlgplugin/propertiespagegui.ui
-===================================================================
---- kdebase/kioslave/media/propsdlgplugin/propertiespagegui.ui	(revision 604326)
-+++ kdebase/kioslave/media/propsdlgplugin/propertiespagegui.ui	(working copy)
-@@ -8,207 +8,207 @@
-         <rect>
-             <x>0</x>
-             <y>0</y>
--            <width>527</width>
--            <height>476</height>
-+            <width>219</width>
-+            <height>446</height>
-         </rect>
-     </property>
--    <hbox>
-+    <property name="caption">
-+        <string>PropertiesPageGUI</string>
-+    </property>
-+    <vbox>
-         <property name="name">
-             <cstring>unnamed</cstring>
-         </property>
--        <property name="margin">
--            <number>0</number>
--        </property>
--        <widget class="TQLayoutWidget">
-+        <widget class="TQCheckBox">
-             <property name="name">
--                <cstring>layout17</cstring>
-+                <cstring>option_defaults</cstring>
-             </property>
-+            <property name="text">
-+                <string>Use default mount options</string>
-+            </property>
-+        </widget>
-+        <widget class="TQGroupBox">
-+            <property name="name">
-+                <cstring>groupbox_generic</cstring>
-+            </property>
-+            <property name="title">
-+                <string>Generic Mount Options</string>
-+            </property>
-             <vbox>
-                 <property name="name">
-                     <cstring>unnamed</cstring>
-                 </property>
--                <widget class="TQGroupBox">
-+                <widget class="TQLayoutWidget">
-                     <property name="name">
--                        <cstring>groupbox_generic</cstring>
-+                        <cstring>layout15</cstring>
-                     </property>
--                    <property name="title">
--                        <string>Generic Mount Options</string>
--                    </property>
-                     <vbox>
-                         <property name="name">
-                             <cstring>unnamed</cstring>
-                         </property>
-+                        <widget class="TQCheckBox">
-+                            <property name="name">
-+                                <cstring>option_ro</cstring>
-+                            </property>
-+                            <property name="text">
-+                                <string>Read only</string>
-+                            </property>
-+                            <property name="whatsThis" stdset="0">
-+                                <string>Mount the file system read-only.</string>
-+                            </property>
-+                        </widget>
-+                        <widget class="TQCheckBox">
-+                            <property name="name">
-+                                <cstring>option_quiet</cstring>
-+                            </property>
-+                            <property name="text">
-+                                <string>Quiet</string>
-+                            </property>
-+                            <property name="whatsThis" stdset="0">
-+                                <string>Attempts to chown or chmod files do not return errors, although they fail. Use with caution!</string>
-+                            </property>
-+                        </widget>
-+                        <widget class="TQCheckBox">
-+                            <property name="name">
-+                                <cstring>option_sync</cstring>
-+                            </property>
-+                            <property name="text">
-+                                <string>Synchronous</string>
-+                            </property>
-+                            <property name="whatsThis" stdset="0">
-+                                <string>All I/O to the file system should be done synchronously.</string>
-+                            </property>
-+                        </widget>
-+                        <widget class="TQCheckBox">
-+                            <property name="name">
-+                                <cstring>option_atime</cstring>
-+                            </property>
-+                            <property name="text">
-+                                <string>Access time updates</string>
-+                            </property>
-+                            <property name="whatsThis" stdset="0">
-+                                <string>Update inode access time for each access.</string>
-+                            </property>
-+                        </widget>
-                         <widget class="TQLayoutWidget">
-                             <property name="name">
--                                <cstring>layout15</cstring>
-+                                <cstring>layout14</cstring>
-                             </property>
--                            <vbox>
-+                            <hbox>
-                                 <property name="name">
-                                     <cstring>unnamed</cstring>
-                                 </property>
--                                <widget class="TQCheckBox">
-+                                <widget class="TQLabel">
-                                     <property name="name">
--                                        <cstring>option_ro</cstring>
-+                                        <cstring>textLabel3</cstring>
-                                     </property>
-                                     <property name="text">
--                                        <string>Read only</string>
-+                                        <string>Mountpoint:</string>
-                                     </property>
--                                    <property name="whatsThis" stdset="0">
--                                        <string>Mount the file system read-only.</string>
-+                                    <property name="buddy" stdset="0">
-+                                        <cstring>option_mountpoint</cstring>
-                                     </property>
--                                </widget>
--                                <widget class="TQCheckBox">
--                                    <property name="name">
--                                        <cstring>option_quiet</cstring>
--                                    </property>
--                                    <property name="text">
--                                        <string>Quiet</string>
--                                    </property>
-                                     <property name="whatsThis" stdset="0">
--                                        <string>Attempts to chown or chmod files do not return errors, although they fail. Use with caution!</string>
-+                                        <string>Under what directory this file system shall be mounted. Please note that there is no guarantee that the system will respect your wish. For one the directory has to be below /media - and it does not yet have to exist.</string>
-                                     </property>
-                                 </widget>
--                                <widget class="TQCheckBox">
-+                                <widget class="TQLineEdit">
-                                     <property name="name">
--                                        <cstring>option_sync</cstring>
-+                                        <cstring>option_mountpoint</cstring>
-                                     </property>
-                                     <property name="text">
--                                        <string>Synchronous</string>
-+                                        <string></string>
-                                     </property>
--                                    <property name="whatsThis" stdset="0">
--                                        <string>All I/O to the file system should be done synchronously.</string>
--                                    </property>
-                                 </widget>
--                                <widget class="TQCheckBox">
--                                    <property name="name">
--                                        <cstring>option_atime</cstring>
--                                    </property>
--                                    <property name="text">
--                                        <string>Access time updates</string>
--                                    </property>
--                                    <property name="whatsThis" stdset="0">
--                                        <string>Update inode access time for each access.</string>
--                                    </property>
--                                </widget>
--                                <widget class="TQLayoutWidget">
--                                    <property name="name">
--                                        <cstring>layout14</cstring>
--                                    </property>
--                                    <hbox>
--                                        <property name="name">
--                                            <cstring>unnamed</cstring>
--                                        </property>
--                                        <widget class="TQLabel">
--                                            <property name="name">
--                                                <cstring>textLabel3</cstring>
--                                            </property>
--                                            <property name="text">
--                                                <string>Mountpoint:</string>
--                                            </property>
--                                            <property name="buddy" stdset="0">
--                                                <cstring>option_mountpoint</cstring>
--                                            </property>
--                                            <property name="whatsThis" stdset="0">
--                                                <string>Under what directory this file system shall be mounted. Please note that there is no guarantee that the system will respect your wish. For one the directory has to be below /media - and it does not yet have to exist.</string>
--                                            </property>
--                                        </widget>
--                                        <widget class="TQLineEdit">
--                                            <property name="name">
--                                                <cstring>option_mountpoint</cstring>
--                                            </property>
--                                            <property name="text">
--                                                <string></string>
--                                            </property>
--                                        </widget>
--                                    </hbox>
--                                </widget>
--                                <widget class="TQCheckBox">
--                                    <property name="name">
--                                        <cstring>option_automount</cstring>
--                                    </property>
--                                    <property name="text">
--                                        <string>Mount automatically</string>
--                                    </property>
--                                    <property name="whatsThis" stdset="0">
--                                        <string>Mount this file system automatically.</string>
--                                    </property>
--                                </widget>
--                            </vbox>
-+                            </hbox>
-                         </widget>
-+                        <widget class="TQCheckBox">
-+                            <property name="name">
-+                                <cstring>option_automount</cstring>
-+                            </property>
-+                            <property name="text">
-+                                <string>Mount automatically</string>
-+                            </property>
-+                            <property name="whatsThis" stdset="0">
-+                                <string>Mount this file system automatically.</string>
-+                            </property>
-+                        </widget>
-                     </vbox>
-                 </widget>
--                <widget class="TQGroupBox">
-+            </vbox>
-+        </widget>
-+        <widget class="TQGroupBox">
-+            <property name="name">
-+                <cstring>groupbox_specific</cstring>
-+            </property>
-+            <property name="title">
-+                <string>Filesystem Specific Mount Options</string>
-+            </property>
-+            <vbox>
-+                <property name="name">
-+                    <cstring>unnamed</cstring>
-+                </property>
-+                <widget class="TQLayoutWidget">
-                     <property name="name">
--                        <cstring>groupbox_specific</cstring>
-+                        <cstring>layout11</cstring>
-                     </property>
--                    <property name="title">
--                        <string>Filesystem Specific Mount Options</string>
--                    </property>
-                     <vbox>
-                         <property name="name">
-                             <cstring>unnamed</cstring>
-                         </property>
-+                        <widget class="TQCheckBox">
-+                            <property name="name">
-+                                <cstring>option_flush</cstring>
-+                            </property>
-+                            <property name="text">
-+                                <string>Flushed IO</string>
-+                            </property>
-+                            <property name="whatsThis" stdset="0">
-+                                <string>Always flush all data to the hot plug devices immediately and don't cache it.</string>
-+                            </property>
-+                        </widget>
-+                        <widget class="TQCheckBox">
-+                            <property name="name">
-+                                <cstring>option_utf8</cstring>
-+                            </property>
-+                            <property name="text">
-+                                <string>UTF-8 charset</string>
-+                            </property>
-+                            <property name="whatsThis" stdset="0">
-+                                <string>UTF8 is the filesystem safe 8-bit encoding of Unicode that is used by the console. It can be be enabled for the filesystem with this option.</string>
-+                            </property>
-+                        </widget>
-+                        <widget class="TQCheckBox">
-+                            <property name="name">
-+                                <cstring>option_uid</cstring>
-+                            </property>
-+                            <property name="text">
-+                                <string>Mount as user</string>
-+                            </property>
-+                            <property name="whatsThis" stdset="0">
-+                                <string>Mount this file system as user.</string>
-+                            </property>
-+                        </widget>
-                         <widget class="TQLayoutWidget">
-                             <property name="name">
--                                <cstring>layout11</cstring>
-+                                <cstring>layout7</cstring>
-                             </property>
--                            <vbox>
-+                            <hbox>
-                                 <property name="name">
-                                     <cstring>unnamed</cstring>
-                                 </property>
--                                <widget class="TQCheckBox">
-+                                <widget class="TQLabel">
-                                     <property name="name">
--                                        <cstring>option_flush</cstring>
-+                                        <cstring>text_journaling</cstring>
-                                     </property>
-                                     <property name="text">
--                                        <string>Flushed IO</string>
-+                                        <string>Journaling:</string>
-                                     </property>
--                                    <property name="whatsThis" stdset="0">
--                                        <string>Always flush all data to the hot plug devices immediately and don't cache it.</string>
-+                                    <property name="buddy" stdset="0">
-+                                        <cstring>option_journaling</cstring>
-                                     </property>
--                                </widget>
--                                <widget class="TQCheckBox">
--                                    <property name="name">
--                                        <cstring>option_utf8</cstring>
--                                    </property>
--                                    <property name="text">
--                                        <string>UTF-8 charset</string>
--                                    </property>
-                                     <property name="whatsThis" stdset="0">
--                                        <string>UTF8 is the filesystem safe 8-bit encoding of Unicode that is used by the console. It can be be enabled for the filesystem with this option.</string>
--                                    </property>
--                                </widget>
--                                <widget class="TQCheckBox">
--                                    <property name="name">
--                                        <cstring>option_uid</cstring>
--                                    </property>
--                                    <property name="text">
--                                        <string>Mount as user</string>
--                                    </property>
--                                    <property name="whatsThis" stdset="0">
--                                        <string>Mount this file system as user.</string>
--                                    </property>
--                                </widget>
--                                <widget class="TQLayoutWidget">
--                                    <property name="name">
--                                        <cstring>layout7</cstring>
--                                    </property>
--                                    <hbox>
--                                        <property name="name">
--                                            <cstring>unnamed</cstring>
--                                        </property>
--                                        <widget class="TQLabel">
--                                            <property name="name">
--                                                <cstring>text_journaling</cstring>
--                                            </property>
--                                            <property name="text">
--                                                <string>Journaling:</string>
--                                            </property>
--                                            <property name="buddy" stdset="0">
--                                                <cstring>option_journaling</cstring>
--                                            </property>
--                                            <property name="whatsThis" stdset="0">
--                                                <string>&lt;h2&gt;Specifies  the journalling mode for file data. Metadata is always journaled. &lt;/h2&gt;
-+                                        <string>&lt;h2&gt;Specifies  the journalling mode for file data. Metadata is always journaled. &lt;/h2&gt;
-            
- &lt;h3&gt;&lt;b&gt;All Data&lt;/b&gt;&lt;/h3&gt;
-            All  data  is  committed into the journal prior to being written into the main file system. This is the slowest variant with the highest data security.
-@@ -218,29 +218,29 @@
- 
- &lt;h3&gt;&lt;b&gt;Write Back&lt;/b&gt;&lt;/h3&gt;
-            Data ordering is not preserved - data may be written into the main file system after its metadata has been committed to the journal.  This is rumoured to  be the  highest-throughput option.  It guarantees internal file system integrity,  however it can allow old data to appear in files after  a  crash  and  journal recovery.</string>
--                                            </property>
--                                        </widget>
--                                        <widget class="TQComboBox">
--                                            <item>
--                                                <property name="text">
--                                                    <string>All Data</string>
--                                                </property>
--                                            </item>
--                                            <item>
--                                                <property name="text">
--                                                    <string>Ordered</string>
--                                                </property>
--                                            </item>
--                                            <item>
--                                                <property name="text">
--                                                    <string>Write Back</string>
--                                                </property>
--                                            </item>
--                                            <property name="name">
--                                                <cstring>option_journaling</cstring>
--                                            </property>
--                                            <property name="whatsThis" stdset="0">
--                                                <string>&lt;h2&gt;Specifies  the journalling mode for file data. Metadata is always journaled. &lt;/h2&gt;
-+                                    </property>
-+                                </widget>
-+                                <widget class="TQComboBox">
-+                                    <item>
-+                                        <property name="text">
-+                                            <string>All Data</string>
-+                                        </property>
-+                                    </item>
-+                                    <item>
-+                                        <property name="text">
-+                                            <string>Ordered</string>
-+                                        </property>
-+                                    </item>
-+                                    <item>
-+                                        <property name="text">
-+                                            <string>Write Back</string>
-+                                        </property>
-+                                    </item>
-+                                    <property name="name">
-+                                        <cstring>option_journaling</cstring>
-+                                    </property>
-+                                    <property name="whatsThis" stdset="0">
-+                                        <string>&lt;h2&gt;Specifies  the journalling mode for file data. Metadata is always journaled. &lt;/h2&gt;
-            
- &lt;h3&gt;&lt;b&gt;All Data&lt;/b&gt;&lt;/h3&gt;
-            All  data  is  committed into the journal prior to being written into the main file system. This is the slowest variant with the highest data security.
-@@ -250,30 +250,30 @@
- 
- &lt;h3&gt;&lt;b&gt;Write Back&lt;/b&gt;&lt;/h3&gt;
-            Data ordering is not preserved - data may be written into the main file system after its metadata has been committed to the journal.  This is rumoured to  be the  highest-throughput option.  It guarantees internal file system integrity,  however it can allow old data to appear in files after  a  crash  and  journal recovery.</string>
--                                            </property>
--                                        </widget>
--                                    </hbox>
-+                                    </property>
-                                 </widget>
--                                <widget class="TQLayoutWidget">
-+                            </hbox>
-+                        </widget>
-+                        <widget class="TQLayoutWidget">
-+                            <property name="name">
-+                                <cstring>layout14</cstring>
-+                            </property>
-+                            <hbox>
-+                                <property name="name">
-+                                    <cstring>unnamed</cstring>
-+                                </property>
-+                                <widget class="TQLabel">
-                                     <property name="name">
--                                        <cstring>layout14</cstring>
-+                                        <cstring>text_shortname</cstring>
-                                     </property>
--                                    <hbox>
--                                        <property name="name">
--                                            <cstring>unnamed</cstring>
--                                        </property>
--                                        <widget class="TQLabel">
--                                            <property name="name">
--                                                <cstring>text_shortname</cstring>
--                                            </property>
--                                            <property name="text">
--                                                <string>Short names:</string>
--                                            </property>
--                                            <property name="buddy" stdset="0">
--                                                <cstring>option_shortname</cstring>
--                                            </property>
--                                            <property name="whatsThis" stdset="0">
--                                                <string>&lt;h2&gt;Defines  the  behaviour  for  creation and display of filenames which fit into 8.3 characters. If a long name for a file exists, it will always be preferred display.&lt;/h2&gt;
-+                                    <property name="text">
-+                                        <string>Short names:</string>
-+                                    </property>
-+                                    <property name="buddy" stdset="0">
-+                                        <cstring>option_shortname</cstring>
-+                                    </property>
-+                                    <property name="whatsThis" stdset="0">
-+                                        <string>&lt;h2&gt;Defines  the  behaviour  for  creation and display of filenames which fit into 8.3 characters. If a long name for a file exists, it will always be preferred display.&lt;/h2&gt;
- 
- &lt;h3&gt;&lt;b&gt;Lower&lt;/b&gt;&lt;/h3&gt;
- Force the short name to lower case upon display; store a long name when the short name is not all upper case.
-@@ -286,34 +286,34 @@
- 
- &lt;h3&gt;&lt;b&gt;Mixed&lt;/b&gt;&lt;/h3&gt;
- Display the short name as is; store a long name when the short name is not all upper case.</string>
--                                            </property>
--                                        </widget>
--                                        <widget class="TQComboBox">
--                                            <item>
--                                                <property name="text">
--                                                    <string>Lower</string>
--                                                </property>
--                                            </item>
--                                            <item>
--                                                <property name="text">
--                                                    <string>Windows 95</string>
--                                                </property>
--                                            </item>
--                                            <item>
--                                                <property name="text">
--                                                    <string>Windows NT</string>
--                                                </property>
--                                            </item>
--                                            <item>
--                                                <property name="text">
--                                                    <string>Mixed</string>
--                                                </property>
--                                            </item>
--                                            <property name="name">
--                                                <cstring>option_shortname</cstring>
--                                            </property>
--                                            <property name="whatsThis" stdset="0">
--                                                <string>&lt;h2&gt;Defines  the  behaviour  for  creation and display of filenames which fit into 8.3 characters. If a long name for a file exists, it will always be preferred display.&lt;/h2&gt;
-+                                    </property>
-+                                </widget>
-+                                <widget class="TQComboBox">
-+                                    <item>
-+                                        <property name="text">
-+                                            <string>Lower</string>
-+                                        </property>
-+                                    </item>
-+                                    <item>
-+                                        <property name="text">
-+                                            <string>Windows 95</string>
-+                                        </property>
-+                                    </item>
-+                                    <item>
-+                                        <property name="text">
-+                                            <string>Windows NT</string>
-+                                        </property>
-+                                    </item>
-+                                    <item>
-+                                        <property name="text">
-+                                            <string>Mixed</string>
-+                                        </property>
-+                                    </item>
-+                                    <property name="name">
-+                                        <cstring>option_shortname</cstring>
-+                                    </property>
-+                                    <property name="whatsThis" stdset="0">
-+                                        <string>&lt;h2&gt;Defines  the  behaviour  for  creation and display of filenames which fit into 8.3 characters. If a long name for a file exists, it will always be preferred display.&lt;/h2&gt;
- 
- &lt;h3&gt;&lt;b&gt;Lower&lt;/b&gt;&lt;/h3&gt;
- Force the short name to lower case upon display; store a long name when the short name is not all upper case.
-@@ -326,42 +326,40 @@
- 
- &lt;h3&gt;&lt;b&gt;Mixed&lt;/b&gt;&lt;/h3&gt;
- Display the short name as is; store a long name when the short name is not all upper case.</string>
--                                            </property>
--                                        </widget>
--                                    </hbox>
-+                                    </property>
-                                 </widget>
--                            </vbox>
-+                            </hbox>
-                         </widget>
-                     </vbox>
-                 </widget>
--                <widget class="TQLabel">
--                    <property name="name">
--                        <cstring>label_filesystem</cstring>
--                    </property>
--                    <property name="text">
--                        <string>Filesystem: iso9660</string>
--                    </property>
--                </widget>
--                <spacer>
--                    <property name="name">
--                        <cstring>spacer1</cstring>
--                    </property>
--                    <property name="orientation">
--                        <enum>Vertical</enum>
--                    </property>
--                    <property name="sizeType">
--                        <enum>Expanding</enum>
--                    </property>
--                    <property name="tqsizeHint">
--                        <size>
--                            <width>20</width>
--                            <height>20</height>
--                        </size>
--                    </property>
--                </spacer>
-             </vbox>
-         </widget>
--    </hbox>
-+        <widget class="TQLabel">
-+            <property name="name">
-+                <cstring>label_filesystem</cstring>
-+            </property>
-+            <property name="text">
-+                <string>Filesystem: iso9660</string>
-+            </property>
-+        </widget>
-+        <spacer>
-+            <property name="name">
-+                <cstring>spacer1</cstring>
-+            </property>
-+            <property name="orientation">
-+                <enum>Vertical</enum>
-+            </property>
-+            <property name="sizeType">
-+                <enum>Expanding</enum>
-+            </property>
-+            <property name="tqsizeHint">
-+                <size>
-+                    <width>20</width>
-+                    <height>20</height>
-+                </size>
-+            </property>
-+        </spacer>
-+    </vbox>
- </widget>
- <connections>
-     <connection>
-Index: kdebase/kioslave/media/mediamanager/halbackend.cpp
-===================================================================
---- kdebase/kioslave/media/mediamanager/halbackend.cpp	(revision 604326)
-+++ kdebase/kioslave/media/mediamanager/halbackend.cpp	(working copy)
-@@ -1,5 +1,6 @@
- /* This file is part of the KDE Project
-    Copyright (c) 2004-2005 Jérôme Lodewyck <jerome dot lodewyck at normalesup dot org>
-+   Copyright (c) 2006 Valentine Sinitsyn <e_val@inbox.ru>
- 
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Library General Public
-@@ -56,9 +57,7 @@
- {
-     char*   _ppt_string;
-     TQString _ppt_QString;
--    DBusError error;
--    dbus_error_init(&error);
--    _ppt_string = libhal_device_get_property_string(ctx, udi, key, &error);
-+    _ppt_string = libhal_device_get_property_string(ctx, udi, key, NULL);
-     if ( _ppt_string )
-         _ppt_QString = _ppt_string;
-     libhal_free_string(_ppt_string);
-@@ -929,7 +928,16 @@
-     }
- 
-     KConfig config("mediamanagerrc");
--    config.setGroup(name);
-+    
-+    bool use_defaults = true;    
-+    if (config.hasGroup(name)) 
-+    {
-+	config.setGroup(name);
-+	use_defaults = config.readBoolEntry("use_defaults", false);
-+    }
-+    
-+    if (use_defaults)
-+	config.setGroup("DefaultOptions");    
- 
-     char ** array = libhal_device_get_property_strlist(m_halContext, volume_udi.latin1(), "volume.mount.valid_options", NULL);
-     TQMap<TQString,bool> valids;
-@@ -944,6 +952,8 @@
-     libhal_free_string_array(array);
-     TQStringList result;
-     TQString tmp;
-+    
-+    result << TQString("use_defaults=%1").arg(use_defaults ? "true" : "false");    
- 
-     TQString fstype = libhal_device_get_property_QString(m_halContext, volume_udi.latin1(), "volume.fstype");
-     if (fstype.isNull())
-@@ -956,9 +966,18 @@
-         removable = libhal_device_get_property_bool(m_halContext, drive_udi.latin1(), "storage.removable", NULL)
-                      || libhal_device_get_property_bool(m_halContext, drive_udi.latin1(), "storage.hotpluggable", NULL);
- 
--    config.setGroup(drive_udi);
--    bool value = config.readBoolEntry("automount", false);
--    config.setGroup(name);
-+    bool value;
-+    if (use_defaults)
-+    {
-+	value = config.readBoolEntry("automount", false);
-+    }
-+    else
-+    {
-+	QString current_group = config.group();
-+	config.setGroup(drive_udi);
-+	value = config.readBoolEntry("automount", false);
-+	config.setGroup(current_group);
-+    }
- 
-     if (libhal_device_get_property_bool(m_halContext, volume_udi.latin1(), "volume.disc.is_blank", NULL)
-         || libhal_device_get_property_bool(m_halContext, volume_udi.latin1(), "volume.disc.is_vcd", NULL)
-@@ -1083,7 +1099,7 @@
- 
-     TQMap<TQString,TQString> valids = MediaManagerUtils::splitOptions(options);
- 
--    const char *names[] = { "ro", "quiet", "atime", "uid", "utf8", "flush", "sync", 0 };
-+    const char *names[] = { "use_defaults", "ro", "quiet", "atime", "uid", "utf8", "flush", "sync", 0 };
-     for (int index = 0; names[index]; ++index)
-         if (valids.contains(names[index]))
-             config.writeEntry(names[index], valids[names[index]] == "true");
diff --git a/redhat/tdebase/kdebase-3.5.13-add_xscreensaver_support.patch b/redhat/tdebase/kdebase-3.5.13-add_xscreensaver_support.patch
deleted file mode 100644
index 8e52ab971..000000000
--- a/redhat/tdebase/kdebase-3.5.13-add_xscreensaver_support.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-commit 80deb52955cbd917e10f015f37699d830cb681ce
-Author: Slávek Banko <slavek.banko@axis.cz>
-Date:   1339336699 +0200
-
-    Add xscreensaver support to CMake
-    This closes Bug 859
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 31fb46c..3da5b2f 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -67,6 +67,7 @@
- option( WITH_XDAMAGE "Enable xdamage support" OFF )
- option( WITH_XEXT "Enable xext support" OFF )
- option( WITH_XTEST "Enable xext support" OFF )
-+option( WITH_XSCREENSAVER "Enable xscreensaver support" ${WITH_ALL_OPTIONS} )
- option( WITH_LIBUSB "Enable control of some mouse models through libusb" OFF )
- option( WITH_LIBRAW1394 "Enable visualization of ieee1394 devices through libraw1394" OFF )
- option( WITH_SUDO_KDESU_BACKEND "Use sudo as backend for kdesu (default is su)" OFF )
-diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake
-index ded1d00..1d9c83d 100644
---- a/ConfigureChecks.cmake
-+++ b/ConfigureChecks.cmake
-@@ -144,6 +144,26 @@ if( WITH_XTEST )
- endif( )
- 
- 
-+# xscreensaver ()
-+if( WITH_XSCREENSAVER )
-+  check_library_exists( Xss XScreenSaverQueryInfo "" HAVE_XSSLIB )
-+  if( HAVE_XSSLIB )
-+    pkg_search_module( XSS xscrnsaver )
-+  else( )
-+    check_library_exists( Xext XScreenSaverQueryInfo "" HAVE_XSSLIB )
-+    if( HAVE_XSSLIB )
-+      pkg_search_module( XSS xext )
-+    endif( )
-+  endif( )
-+  check_include_file( X11/extensions/scrnsaver.h HAVE_XSCREENSAVER_H )
-+  if( HAVE_XSSLIB AND HAVE_XSCREENSAVER_H )
-+    set( HAVE_XSCREENSAVER 1 )
-+  else( )
-+    tde_message_fatal( "xscreensaver is requested, but was not found on your system" )
-+  endif( )
-+endif( )
-+
-+
- # GL
- if( BUILD_KDESKTOP OR BUILD_KCONTROL OR BUILD_KSCREENSAVER )
- check_library_exists( GL glXChooseVisual "" HAVE_GLXCHOOSEVISUAL )
-diff --git a/config.h.cmake b/config.h.cmake
-index 39d6d85..772ca88 100644
---- a/config.h.cmake
-+++ b/config.h.cmake
-@@ -21,6 +21,9 @@
- // kxkb
- #cmakedefine HAVE_XTEST 1
- 
-+// xscreensaver
-+#cmakedefine HAVE_XSCREENSAVER 1
-+
- // kdm, kioslave
- #cmakedefine HAVE_TERMIOS_H 1
- 
-diff --git a/kdesktop/CMakeLists.txt b/kdesktop/CMakeLists.txt
-index 99d86d1..b2e4628 100644
---- a/kdesktop/CMakeLists.txt
-+++ b/kdesktop/CMakeLists.txt
-@@ -94,6 +94,7 @@ tde_add_tdeinit_executable( ${target} AUTOMOC
-     kdesktopsettings-static bgnd-static dmctl-static
-     konq-shared kutils-shared
-     ${XRENDER_LIBRARIES} ${XCURSOR_LIBRARIES} Xext dl
-+    ${XSS_LIBRARIES}
- )
- 
- 
diff --git a/redhat/tdebase/kdebase-3.5.13-allow_minimal_window_interaction_inside_lock_process.patch b/redhat/tdebase/kdebase-3.5.13-allow_minimal_window_interaction_inside_lock_process.patch
deleted file mode 100644
index 1c022587d..000000000
--- a/redhat/tdebase/kdebase-3.5.13-allow_minimal_window_interaction_inside_lock_process.patch
+++ /dev/null
@@ -1,372 +0,0 @@
-commit 057932620ba8355a6506b9d437518e253ba14ed9
-Author: Timothy Pearson <kb9vqf@pearsoncomputing.net>
-Date:   1327619240 -0600
-
-    Clean up lock screen internals
-    This cleanup is part of an effort to resolve Bug 810, but a new Qt3 version is required to fully resolve it
-
-diff --git a/kdesktop/lock/autologout.cc b/kdesktop/lock/autologout.cc
-index 22b449c..bef39dd 100644
---- a/kdesktop/lock/autologout.cc
-+++ b/kdesktop/lock/autologout.cc
-@@ -82,6 +82,8 @@ AutoLogout::AutoLogout(LockProcess *parent) : TQDialog(parent, "password dialog"
-     mCountdownTimerId = startTimer(1000/25);
- 
-     connect(tqApp, TQT_SIGNAL(activity()), TQT_SLOT(slotActivity()));
-+
-+    setFixedSize( sizeHint() );
- }
- 
- AutoLogout::~AutoLogout()
-diff --git a/kdesktop/lock/infodlg.cc b/kdesktop/lock/infodlg.cc
-index f5f35b9..3fbc276 100644
---- a/kdesktop/lock/infodlg.cc
-+++ b/kdesktop/lock/infodlg.cc
-@@ -99,6 +99,7 @@ InfoDlg::InfoDlg(LockProcess *parent)
-     frameLayout->addLayout( layStatus, 1, 1 );
- 
-     installEventFilter(this);
-+    setFixedSize( sizeHint() );
- }
- 
- InfoDlg::~InfoDlg()
-diff --git a/kdesktop/lock/lockdlg.cc b/kdesktop/lock/lockdlg.cc
-index 0863a22..f3eeee0 100644
---- a/kdesktop/lock/lockdlg.cc
-+++ b/kdesktop/lock/lockdlg.cc
-@@ -215,6 +215,7 @@ void PasswordDlg::init(GreeterPluginHandle *plugin)
-         mNewSessButton->hide();
- 
-     installEventFilter(this);
-+    setFixedSize( sizeHint() );
- 
-     mFailedTimerId = 0;
-     mTimeoutTimerId = startTimer(PASSDLG_HIDE_TIMEOUT);
-@@ -598,6 +599,7 @@ void PasswordDlg::show()
- {
-     TQDialog::show();
-     TQApplication::flushX();
-+    setFixedSize( sizeHint() );
- }
- 
- void PasswordDlg::slotStartNewSession()
-@@ -818,6 +820,8 @@ void PasswordDlg::slotSwitchUser()
-     connect( btn, TQT_SIGNAL(clicked()), &dialog, TQT_SLOT(reject()) );
-     vbox2->addWidget( btn );
- 
-+    dialog.setFixedSize( dialog.sizeHint() );
-+
-     int ret = static_cast< LockProcess* >(parent())->execDialog( &dialog );
-     if (ret != TQDialog::Rejected) {
-         TQDialog::reject();
-diff --git a/kdesktop/lock/lockprocess.cc b/kdesktop/lock/lockprocess.cc
-index 5acc96e..9648bbc 100644
---- a/kdesktop/lock/lockprocess.cc
-+++ b/kdesktop/lock/lockprocess.cc
-@@ -4,7 +4,7 @@
- //
- // Copyright (c) 1999 Martin R. Jones <mjones@kde.org>
- // Copyright (c) 2003 Oswald Buddenhagen <ossi@kde.org>
--// Copyright (c) 2010-2011 Timothy Pearson <kb9vqf@pearsoncomputing.net>
-+// Copyright (c) 2010-2012 Timothy Pearson <kb9vqf@pearsoncomputing.net>
- //
- 
- //kdesktop keeps running and checks user inactivity
-@@ -111,6 +111,10 @@ Status DPMSInfo ( Display *, CARD16 *, BOOL * );
- #define LOCK_GRACE_DEFAULT          5000
- #define AUTOLOGOUT_DEFAULT          600
- 
-+// FIXME
-+// This should be defined if Qt 3.4.0 or higher is in use
-+// #define KEEP_MOUSE_UNGRABBED 1
-+
- // These lines are taken on 10/2009 from X.org (X11/XF86keysym.h), defining some special multimedia keys
- #define XF86XK_AudioMute 0x1008FF12
- #define XF86XK_AudioRaiseVolume 0x1008FF13
-@@ -183,6 +187,10 @@ LockProcess::LockProcess(bool child, bool useBlankOnly)
-       mBackingStartupDelayTimer(0),
-       m_startupStatusDialog(NULL)
- {
-+#ifdef KEEP_MOUSE_UNGRABBED
-+    setNFlags(WX11DisableMove|WX11DisableClose|WX11DisableShade|WX11DisableMinimize|WX11DisableMaximize);
-+#endif
-+
-     setupSignals();
-     setupPipe();
- 
-@@ -267,7 +275,11 @@ LockProcess::LockProcess(bool child, bool useBlankOnly)
- #endif
- 
- #if (QT_VERSION-0 >= 0x030200) // XRANDR support
--  connect( kapp->desktop(), TQT_SIGNAL( resized( int )), TQT_SLOT( desktopResized()));
-+    connect( kapp->desktop(), TQT_SIGNAL( resized( int )), TQT_SLOT( desktopResized()));
-+#endif
-+
-+#ifdef KEEP_MOUSE_UNGRABBED
-+    setEnabled(false);
- #endif
- 
-     greetPlugin.library = 0;
-@@ -874,7 +886,6 @@ void LockProcess::createSaverWindow()
-     // this is a security risk and has been deactivated--welcome to the 21st century folks!
-     // setBackgroundMode(TQWidget::NoBackground);
- 
--    setCursor( tqblankCursor );
-     setGeometry(0, 0, mRootWidth, mRootHeight);
- 
-     kdDebug(1204) << "Saver window Id: " << winId() << endl;
-@@ -884,7 +895,6 @@ void LockProcess::desktopResized()
- {
-     mBusy = true;
-     suspend();
--    setCursor( tqblankCursor );
- 
-     // Get root window size
-     XWindowAttributes rootAttr;
-@@ -1087,6 +1097,7 @@ bool LockProcess::grabInput()
-         }
-     }
- 
-+#ifndef KEEP_MOUSE_UNGRABBED
-     if (!grabMouse())
-     {
-         usleep(100000);
-@@ -1096,6 +1107,7 @@ bool LockProcess::grabInput()
-             return false;
-         }
-     }
-+#endif
- 
-     lockXF86();
- 
-@@ -1150,7 +1162,6 @@ bool LockProcess::startSaver()
- 	createSaverWindow();
- 	move(0, 0);
- 	show();
--	setCursor( tqblankCursor );
- 
- 	raise();
- 	XSync(qt_xdisplay(), False);
-@@ -1313,6 +1324,8 @@ void LockProcess::repaintRootWindowIfNeeded()
- 
- bool LockProcess::startHack()
- {
-+    setCursor( tqblankCursor );
-+
-     if ((mEnsureVRootWindowSecurityTimer) && (!mEnsureVRootWindowSecurityTimer->isActive())) mEnsureVRootWindowSecurityTimer->start(250, FALSE);
- 
-     if (currentDialog || (!mDialogs.isEmpty()))
-@@ -1429,6 +1442,7 @@ void LockProcess::stopHack()
-             mHackProc.kill(SIGKILL);
-         }
-     }
-+    setCursor( tqarrowCursor );
- }
- 
- //---------------------------------------------------------------------------
-@@ -1730,7 +1744,6 @@ void LockProcess::doFunctionKeyBroadcast() {
-             mDialogControlLock = false;
-         }
-     }
--    setCursor( tqblankCursor );
- 
-     DCOPRef ref( "*", "MainApplication-Interface");
-     ref.send("sendFakeKey", DCOPArg(mkeyCode , "unsigned int"));
-diff --git a/kdesktop/lock/main.cc b/kdesktop/lock/main.cc
-index c0b8e24..0cbef60 100644
---- a/kdesktop/lock/main.cc
-+++ b/kdesktop/lock/main.cc
-@@ -45,8 +45,9 @@ bool trinity_desktop_lock_forced = FALSE;
- 
- bool MyApp::x11EventFilter( XEvent *ev )
- {
--    if (ev->type == XKeyPress || ev->type == ButtonPress)
-+    if (ev->type == XKeyPress || ev->type == ButtonPress) {
-         emit activity();
-+    }
-     else if (ev->type == MotionNotify) {
-         time_t tick = time( 0 );
-         if (tick != lastTick) {
-diff --git a/kdesktop/lock/querydlg.cc b/kdesktop/lock/querydlg.cc
-index e672d54..5f50cbe 100644
---- a/kdesktop/lock/querydlg.cc
-+++ b/kdesktop/lock/querydlg.cc
-@@ -118,6 +118,7 @@ QueryDlg::QueryDlg(LockProcess *parent)
-     connect(ok, TQT_SIGNAL(clicked()), TQT_SLOT(slotOK()));
- 
-     installEventFilter(this);
-+    setFixedSize( sizeHint() );
- }
- 
- QueryDlg::~QueryDlg()
-diff --git a/kdesktop/lock/sakdlg.cc b/kdesktop/lock/sakdlg.cc
-index 17f54a1..d96e0af 100644
---- a/kdesktop/lock/sakdlg.cc
-+++ b/kdesktop/lock/sakdlg.cc
-@@ -102,6 +102,7 @@ SAKDlg::SAKDlg(LockProcess *parent)
-     mStatusLabel->setText("<b>" + i18n("Press Ctrl+Alt+Del to begin.") + "</b><p>" + i18n("This process helps keep your password secure.") + "<br>" + i18n("It prevents unauthorized users from emulating the login screen."));
- 
-     installEventFilter(this);
-+    setFixedSize( sizeHint() );
- 
-     mSAKProcess = new KProcess;
-     *mSAKProcess << "kdmtsak";
-diff --git a/kdesktop/lock/securedlg.cc b/kdesktop/lock/securedlg.cc
-index 532b904..37524f7 100644
---- a/kdesktop/lock/securedlg.cc
-+++ b/kdesktop/lock/securedlg.cc
-@@ -144,6 +144,7 @@ SecureDlg::SecureDlg(LockProcess *parent)
-     mSwitchButton->setFixedWidth(btnSize);
- 
-     installEventFilter(this);
-+    setFixedSize( sizeHint() );
- }
- 
- SecureDlg::~SecureDlg()
-commit 678bea5ba74b3b39981e482e188c61fdd37786f0
-Author: Timothy Pearson <kb9vqf@pearsoncomputing.net>
-Date:   1328606373 -0600
-
-    Allow minimal managed window interaction inside the lock process
-    This closes Bug 810
-
-diff --git a/kdesktop/lock/lockprocess.cc b/kdesktop/lock/lockprocess.cc
-index 9648bbc..2e9c9d3 100644
---- a/kdesktop/lock/lockprocess.cc
-+++ b/kdesktop/lock/lockprocess.cc
-@@ -111,8 +111,8 @@ Status DPMSInfo ( Display *, CARD16 *, BOOL * );
- #define LOCK_GRACE_DEFAULT          5000
- #define AUTOLOGOUT_DEFAULT          600
- 
--// FIXME
--// This should be defined if Qt 3.4.0 or higher is in use
-+// Setting this define is INSECURE
-+// Use it for debugging purposes ONLY
- // #define KEEP_MOUSE_UNGRABBED 1
- 
- // These lines are taken on 10/2009 from X.org (X11/XF86keysym.h), defining some special multimedia keys
-@@ -185,7 +185,12 @@ LockProcess::LockProcess(bool child, bool useBlankOnly)
-       mHackStartupEnabled(true),
-       m_rootPixmap(NULL),
-       mBackingStartupDelayTimer(0),
--      m_startupStatusDialog(NULL)
-+      m_startupStatusDialog(NULL),
-+      m_mouseDown(0),
-+      m_mousePrevX(0),
-+      m_mousePrevY(0),
-+      m_dialogPrevX(0),
-+      m_dialogPrevY(0)
- {
- #ifdef KEEP_MOUSE_UNGRABBED
-     setNFlags(WX11DisableMove|WX11DisableClose|WX11DisableShade|WX11DisableMinimize|WX11DisableMaximize);
-@@ -208,6 +213,8 @@ LockProcess::LockProcess(bool child, bool useBlankOnly)
-     mEnsureVRootWindowSecurityTimer = new TQTimer( this );
-     connect( mEnsureVRootWindowSecurityTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(repaintRootWindowIfNeeded()) );
- 
-+    connect(tqApp, TQT_SIGNAL(mouseInteraction(XEvent *)), TQT_SLOT(slotMouseActivity(XEvent *)));
-+
-     mHackDelayStartupTimeout = trinity_desktop_lock_delay_screensaver_start?KDesktopSettings::timeout()*1000:10*1000;
-     mHackStartupEnabled = trinity_desktop_lock_delay_screensaver_start?KDesktopSettings::screenSaverEnabled():true;
- 
-@@ -2200,4 +2207,64 @@ void LockProcess::sendVkbdFocusInOut( WId window, Time t )
-     }
- }
- 
-+void LockProcess::slotMouseActivity(XEvent *event)
-+{
-+	bool inFrame = 0;
-+	bool inDialog = 0;
-+	XButtonEvent *be = (XButtonEvent *) event;
-+	XMotionEvent *me = (XMotionEvent *) event;
-+	if (event->type == ButtonPress) {
-+		// Get geometry including window frame/titlebar
-+		TQRect fgeom = mDialogs.first()->frameGeometry();
-+		TQRect wgeom = mDialogs.first()->geometry();
-+
-+		if (((be->x_root > fgeom.x()) && (be->y_root > fgeom.y())) && ((be->x_root < (fgeom.x()+fgeom.width())) && (be->y_root < (fgeom.y()+fgeom.height())))) {
-+			inFrame = 1;
-+		}
-+		if (((be->x_root > wgeom.x()) && (be->y_root > wgeom.y())) && ((be->x_root < (wgeom.x()+wgeom.width())) && (be->y_root < (wgeom.y()+wgeom.height())))) {
-+			inDialog = 1;
-+		}
-+
-+		// Clicked inside dialog; set focus
-+		if (inFrame == TRUE) {
-+			WId window = mDialogs.first()->winId();
-+			XSetInputFocus(qt_xdisplay(), window, RevertToParent, CurrentTime);
-+			fakeFocusIn(window);
-+			// Why this needs to be repeated I have no idea...
-+			XSetInputFocus(qt_xdisplay(), window, RevertToParent, CurrentTime);
-+			fakeFocusIn(window);
-+		}
-+
-+		// Clicked inside window handle (or border); drag window
-+		if ((inFrame == TRUE) && (inDialog == FALSE)) {
-+			TQPoint oldPoint = mDialogs.first()->pos();
-+			m_mouseDown = 1;
-+			m_dialogPrevX = oldPoint.x();
-+			m_dialogPrevY = oldPoint.y();
-+			m_mousePrevX = be->x_root;
-+			m_mousePrevY = be->y_root;
-+			XChangeActivePointerGrab( qt_xdisplay(), GRABEVENTS, TQCursor(tqsizeAllCursor).handle(), CurrentTime);
-+		}
-+	}
-+
-+	// Drag the window...
-+	if (event->type == MotionNotify) {
-+		if (m_mouseDown == TRUE) {
-+			int deltaX = me->x_root - m_mousePrevX;
-+			int deltaY = me->y_root - m_mousePrevY;
-+			m_dialogPrevX = m_dialogPrevX + deltaX;
-+			m_dialogPrevY = m_dialogPrevY + deltaY;
-+			mDialogs.first()->move(m_dialogPrevX, m_dialogPrevY);
-+
-+			m_mousePrevX = me->x_root;
-+			m_mousePrevY = me->y_root;
-+		}
-+	}
-+
-+	if (event->type == ButtonRelease) {
-+		m_mouseDown = 0;
-+		XChangeActivePointerGrab( qt_xdisplay(), GRABEVENTS, TQCursor(tqarrowCursor).handle(), CurrentTime);
-+	}
-+}
-+
- #include "lockprocess.moc"
-diff --git a/kdesktop/lock/lockprocess.h b/kdesktop/lock/lockprocess.h
-index 3a7e3db..18320a8 100644
---- a/kdesktop/lock/lockprocess.h
-+++ b/kdesktop/lock/lockprocess.h
-@@ -94,6 +94,7 @@ private slots:
-     bool closeCurrentWindow();
-     void repaintRootWindowIfNeeded();
-     void startSecureDialog();
-+    void slotMouseActivity(XEvent *event);
- 
- private:
-     void configure();
-@@ -197,6 +198,12 @@ private:
-     KSMModalDialog* m_startupStatusDialog;
- 
-     TQDateTime mlockDateTime;
-+
-+    bool m_mouseDown;
-+    int m_mousePrevX;
-+    int m_mousePrevY;
-+    int m_dialogPrevX;
-+    int m_dialogPrevY;
- };
- 
- #endif
-diff --git a/kdesktop/lock/main.h b/kdesktop/lock/main.h
-index c8e0e05..23797e4 100644
---- a/kdesktop/lock/main.h
-+++ b/kdesktop/lock/main.h
-@@ -32,6 +32,7 @@ protected:
-     bool x11EventFilter( XEvent * );
- signals:
-     void activity();
-+    void mouseInteraction(XEvent *event);
- private:
-     time_t lastTick;
- };      
diff --git a/redhat/tdebase/kdebase-3.5.13-build_without_consolekit.patch b/redhat/tdebase/kdebase-3.5.13-build_without_consolekit.patch
deleted file mode 100644
index 42a4f7747..000000000
--- a/redhat/tdebase/kdebase-3.5.13-build_without_consolekit.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- kdebase/kdm/backend/CMakeLists.txt.ORI	2012-09-06 22:17:30.134745111 +0200
-+++ kdebase/kdm/backend/CMakeLists.txt	2012-09-06 22:17:34.329664333 +0200
-@@ -37,7 +37,7 @@
- 
- tde_add_executable( kdm
-   SOURCES
--    access.c auth.c bootman.c choose.c client.c consolekit.c
-+    access.c auth.c bootman.c choose.c client.c
-     ctrl.c daemon.c dm.c dpylist.c error.c genauth.c
-     inifile.c krb5auth.c mitauth.c netaddr.c policy.c
-     process.c protodpy.c reset.c resource.c rpcauth.c
---- kdebase/kdm/backend/dm.h.ORI	2012-09-06 17:33:31.284704186 -0400
-+++ kdebase/kdm/backend/dm.h	2012-09-06 17:33:40.415522219 -0400
-@@ -37,8 +37,6 @@
- #ifndef _DM_H_
- #define _DM_H_ 1
- 
--#define WITH_CONSOLE_KIT
--
- #include "greet.h"
- #include <config.ci>
- 
diff --git a/redhat/tdebase/kdebase-3.5.13-build_without_dbustqt.patch b/redhat/tdebase/kdebase-3.5.13-build_without_dbustqt.patch
deleted file mode 100644
index 2e17a0db9..000000000
--- a/redhat/tdebase/kdebase-3.5.13-build_without_dbustqt.patch
+++ /dev/null
@@ -1,97 +0,0 @@
---- kdebase/kdm/backend/CMakeLists.txt.ORI	2012-09-06 22:11:08.422091268 +0200
-+++ kdebase/kdm/backend/CMakeLists.txt	2012-09-06 22:11:21.280843938 +0200
-@@ -14,11 +14,11 @@
- include_directories(
-   ${CMAKE_CURRENT_BINARY_DIR}
-   ${CMAKE_BINARY_DIR}
--  ${DBUS_TQT_INCLUDE_DIRS}
-+  ${DBUS_INCLUDE_DIRS}
- )
- 
- link_directories(
--  ${DBUS_TQT_LIBRARY_DIRS}
-+  ${DBUS_LIBRARY_DIRS}
- )
- 
- ##### kdm (executable) ##########################
-@@ -43,6 +43,6 @@
-     process.c protodpy.c reset.c resource.c rpcauth.c
-     server.c session.c sessreg.c socket.c streams.c
-     util.c xdmauth.c xdmcp.c
--  LINK X11 ${XAU_LIBRARIES} ${DBUS_TQT_LIBRARIES} ${CRYPT_LIBRARY} ${PAM_LIBRARY} ${XDMCP_LIBRARIES}
-+  LINK X11 ${XAU_LIBRARIES} ${DBUS_LIBRARIES} ${CRYPT_LIBRARY} ${PAM_LIBRARY} ${XDMCP_LIBRARIES}
-   DESTINATION ${BIN_INSTALL_DIR}
- )
---- kdebase/ksmserver/CMakeLists.txt.ORI	2012-09-06 17:22:59.990317001 -0400
-+++ kdebase/ksmserver/CMakeLists.txt	2012-09-06 17:23:16.340989494 -0400
-@@ -19,13 +19,13 @@
-   ${CMAKE_SOURCE_DIR}/kdmlib
-   ${TDE_INCLUDE_DIR}
-   ${TQT_INCLUDE_DIRS}
--  ${DBUS_TQT_INCLUDE_DIRS}
-+  ${DBUS_INCLUDE_DIRS}
-   ${HAL_INCLUDE_DIRS}
- )
- 
- link_directories(
-   ${TQT_LIBRARY_DIRS}
--  ${DBUS_TQT_LIBRARY_DIRS}
-+  ${DBUS_LIBRARY_DIRS}
- )
- 
- 
-@@ -43,5 +43,5 @@
-     main.cpp server.cpp shutdowndlg.cpp startupdlg.cpp
-     legacy.cpp startup.cpp shutdown.cpp client.cpp
-     KSMServerInterface.skel server.skel timed.ui
--  LINK dmctl-static kdeui-shared krsync-shared ${HAL_LIBRARIES} ${DBUS_TQT_LIBRARIES}
-+  LINK dmctl-static kdeui-shared krsync-shared ${HAL_LIBRARIES} ${DBUS_LIBRARIES}
- )
---- kdebase/kioslave/media/mediamanager/CMakeLists.txt.ORI	2012-09-07 23:57:56.858227336 +0200
-+++ kdebase/kioslave/media/mediamanager/CMakeLists.txt	2012-09-07 23:58:54.948097583 +0200
-@@ -20,12 +20,12 @@
-   ${TDE_INCLUDE_DIR}
-   ${TQT_INCLUDE_DIRS}
-   ${HAL_INCLUDE_DIRS}
--  ${DBUS_TQT_INCLUDE_DIRS}
-+  ${DBUS_INCLUDE_DIRS}
- )
- 
- link_directories(
-   ${TQT_LIBRARY_DIRS}
--  ${DBUS_TQT_LIBRARY_DIRS}
-+  ${DBUS_LIBRARY_DIRS}
- )
- 
- 
-@@ -48,7 +48,7 @@
- 
-   tde_add_kpart( ${target} AUTOMOC
-     SOURCES ${${target}_SRCS}
--    LINK mediacommon-static kdeinit_kded-shared ${HAL_LIBRARIES} -lhal-storage ${DBUS_TQT_LIBRARIES}
-+    LINK mediacommon-static kdeinit_kded-shared ${HAL_LIBRARIES} -lhal-storage ${DBUS_LIBRARIES} -ldbus-qt-1
-     DESTINATION ${PLUGIN_INSTALL_DIR}
-   )
- else( )
---- kdebase-3.5.13.1/ConfigureChecks.cmake.ORI	2012-10-08 22:57:40.751052066 +0200
-+++ kdebase-3.5.13.1/ConfigureChecks.cmake	2012-10-08 22:57:49.226885124 +0200
-@@ -254,19 +254,4 @@
-     tde_message_fatal( "dbus-1 is required, but was not found on your system" )
-   endif( )
- 
--  # check for dbus-tqt
--  pkg_check_modules( DBUS_TQT REQUIRED dbus-tqt )
--  tde_save( CMAKE_REQUIRED_INCLUDES CMAKE_REQUIRED_LIBRARIES )
--  set( CMAKE_REQUIRED_INCLUDES ${DBUS_TQT_INCLUDE_DIRS} ${TQT_INCLUDE_DIRS} ${QT_INCLUDE_DIRS})
--  set( CMAKE_REQUIRED_LIBRARIES ${DBUS_TQT_LDFLAGS} ${TQT_LDFLAGS} ${QT_LDFLAGS} )
--  check_cxx_source_compiles("
--    #include <tqt.h>
--    #include <dbus/connection.h>
--    int main(int, char**) { return 0; } "
--    HAVE_DBUS_QT3_07 )
--  tde_restore( CMAKE_REQUIRED_INCLUDES CMAKE_REQUIRED_LIBRARIES )
--  if( NOT HAVE_DBUS_QT3_07 )
--    tde_message_fatal( "dbus-tqt is required, but was not found on your system" )
--  endif( )
--
- endif( )
diff --git a/redhat/tdebase/kdebase-3.5.13-disable_keyboard_shortcuts_for_file_location_moving.patch b/redhat/tdebase/kdebase-3.5.13-disable_keyboard_shortcuts_for_file_location_moving.patch
deleted file mode 100644
index b83bef726..000000000
--- a/redhat/tdebase/kdebase-3.5.13-disable_keyboard_shortcuts_for_file_location_moving.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-commit 9a948c1af9c07bfdc0eb079cc3cbc84e6bd597c6
-Author: Timothy Pearson <kb9vqf@pearsoncomputing.net>
-Date:   1337062714 -0500
-
-    Disable keyboard shortcuts for file location moving, as they did not work properly and have very little practical use
-
-diff --git a/kate/app/katefilelist.cpp b/kate/app/katefilelist.cpp
-index bd2d087..d2214a4 100644
---- a/kate/app/katefilelist.cpp
-+++ b/kate/app/katefilelist.cpp
-@@ -139,9 +139,9 @@ void KateFileList::setupActions ()
-   sortAction = new KSelectAction( i18n("Sort &By"), 0,
-       m_main->actionCollection(), "filelist_sortby"  );
-   listMoveFileUp = new KAction( i18n("Move File Up"), 0, m_main->actionCollection(), "filelist_move_up" );
--  listMoveFileUp->setShortcut(KShortcut(CTRL + SHIFT + Key_Comma));
-+  //listMoveFileUp->setShortcut(KShortcut(CTRL + SHIFT + Key_Comma));
-   listMoveFileDown = new KAction( i18n("Move File Down"), 0, m_main->actionCollection(), "filelist_move_down" );
--  listMoveFileDown->setShortcut(KShortcut(CTRL + SHIFT + Key_Period));
-+  //listMoveFileDown->setShortcut(KShortcut(CTRL + SHIFT + Key_Period));
-   connect( listMoveFileUp, TQT_SIGNAL(activated()), TQT_TQOBJECT(this), TQT_SLOT(moveFileUp()) );
-   connect( listMoveFileDown, TQT_SIGNAL(activated()), TQT_TQOBJECT(this), TQT_SLOT(moveFileDown()) );
-   TQStringList l;
diff --git a/redhat/tdebase/kdebase-3.5.13-disable_tsak_dialog_if_not_built.patch b/redhat/tdebase/kdebase-3.5.13-disable_tsak_dialog_if_not_built.patch
deleted file mode 100644
index 4c0a822cd..000000000
--- a/redhat/tdebase/kdebase-3.5.13-disable_tsak_dialog_if_not_built.patch
+++ /dev/null
@@ -1,50 +0,0 @@
---- kdebase/config.h.cmake.ORI	2012-08-20 11:19:03.411461759 +0200
-+++ kdebase/config.h.cmake	2012-08-20 11:19:40.587461736 +0200
-@@ -174,3 +174,6 @@
- 
- // kdm, kcontrol
- #cmakedefine WITH_XRANDR "@WITH_XRANDR@"
-+
-+// tsak
-+#cmakedefine BUILD_TSAK "@BUILD_TSAK@"
---- kdebase/kdesktop/lock/main.cc.tsak	2012-08-20 13:55:47.265335687 +0200
-+++ kdebase/kdesktop/lock/main.cc	2012-08-20 13:56:31.594856008 +0200
-@@ -207,8 +207,11 @@
-         struct stat st;
-         KSimpleConfig* tdmconfig;
-         OPEN_TDMCONFIG_AND_SET_GROUP
-+#ifdef BUILD_TSAK
-         trinity_desktop_lock_use_sak = tdmconfig->readBoolEntry("UseSAK", true);
--
-+#else
-+        trinity_desktop_lock_use_sak = false;
-+#endif
-         LockProcess process;
- 
-         // Start loading core functions, such as the desktop wallpaper interface
-@@ -272,7 +275,11 @@
-         trinity_desktop_lock_use_system_modal_dialogs = !KDesktopSettings::useUnmanagedLockWindows();
-         trinity_desktop_lock_delay_screensaver_start = KDesktopSettings::delaySaverStart();
-         if (trinity_desktop_lock_use_system_modal_dialogs) {
-+#ifdef BUILD_TSAK
-             trinity_desktop_lock_use_sak = tdmconfig->readBoolEntry("UseSAK", true);
-+#else
-+            trinity_desktop_lock_use_sak = false;
-+#endif
-         }
-         else {
-             trinity_desktop_lock_use_sak = false;			// If SAK is enabled with unmanaged windows, the SAK dialog will never close and will "burn in" the screen
---- kdebase/kdm/kfrontend/kgapp.cpp.tsak	2012-08-20 14:00:44.387336567 +0200
-+++ kdebase/kdm/kfrontend/kgapp.cpp	2012-08-20 14:01:26.280461134 +0200
-@@ -195,7 +195,11 @@
- 	KProcess *dcop = 0;
- 	KProcess *kwin = 0;
- 
-+#ifdef BUILD_TSAK
- 	trinity_desktop_lock_use_sak = _useSAK;
-+#else
-+	trinity_desktop_lock_use_sak = false;
-+#endif
- 	if (trinity_desktop_lock_use_sak) {
- 		tsak = new KProcess;
- 		*tsak << TQCString( argv0, strrchr( argv0, '/' ) - argv0 + 2 ) + "tsak";
diff --git a/redhat/tdebase/kdebase-3.5.13-do_not_require_dbustqt_if_no_tsak.patch b/redhat/tdebase/kdebase-3.5.13-do_not_require_dbustqt_if_no_tsak.patch
deleted file mode 100644
index 7808af3d9..000000000
--- a/redhat/tdebase/kdebase-3.5.13-do_not_require_dbustqt_if_no_tsak.patch
+++ /dev/null
@@ -1,37 +0,0 @@
---- kdebase/ConfigureChecks.cmake.afterlibdetect.ORI	2012-09-06 20:46:34.705339175 +0200
-+++ kdebase/ConfigureChecks.cmake	2012-09-06 20:47:12.331548001 +0200
-@@ -229,19 +229,21 @@
-     tde_message_fatal( "dbus-1 is required, but was not found on your system" )
-   endif( )
- 
--  # check for dbus-tqt
--  pkg_check_modules( DBUS_TQT REQUIRED dbus-tqt )
--  tde_save( CMAKE_REQUIRED_INCLUDES CMAKE_REQUIRED_LIBRARIES )
--  set( CMAKE_REQUIRED_INCLUDES ${DBUS_TQT_INCLUDE_DIRS} ${TQT_INCLUDE_DIRS} ${QT_INCLUDE_DIRS})
--  set( CMAKE_REQUIRED_LIBRARIES ${DBUS_TQT_LDFLAGS} ${TQT_LDFLAGS} ${QT_LDFLAGS} )
--  check_cxx_source_compiles("
--    #include <tqt.h>
--    #include <dbus/connection.h>
--    int main(int, char**) { return 0; } "
--    HAVE_DBUS_QT3_07 )
--  tde_restore( CMAKE_REQUIRED_INCLUDES CMAKE_REQUIRED_LIBRARIES )
--  if( NOT HAVE_DBUS_QT3_07 )
--    tde_message_fatal( "dbus-tqt is required, but was not found on your system" )
-+  if( BUILD_TSAK )
-+    # check for dbus-tqt
-+    pkg_check_modules( DBUS_TQT REQUIRED dbus-tqt )
-+    tde_save( CMAKE_REQUIRED_INCLUDES CMAKE_REQUIRED_LIBRARIES )
-+    set( CMAKE_REQUIRED_INCLUDES ${DBUS_TQT_INCLUDE_DIRS} ${TQT_INCLUDE_DIRS} ${QT_INCLUDE_DIRS})
-+    set( CMAKE_REQUIRED_LIBRARIES ${DBUS_TQT_LDFLAGS} ${TQT_LDFLAGS} ${QT_LDFLAGS} )
-+    check_cxx_source_compiles("
-+      #include <tqt.h>
-+      #include <dbus/connection.h>
-+      int main(int, char**) { return 0; } "
-+      HAVE_DBUS_QT3_07 )
-+    tde_restore( CMAKE_REQUIRED_INCLUDES CMAKE_REQUIRED_LIBRARIES )
-+    if( NOT HAVE_DBUS_QT3_07 )
-+      tde_message_fatal( "dbus-tqt is required, but was not found on your system" )
-+    endif( )
-   endif( )
- 
- endif( )
diff --git a/redhat/tdebase/kdebase-3.5.13-enable_xtest_support.patch b/redhat/tdebase/kdebase-3.5.13-enable_xtest_support.patch
deleted file mode 100644
index cec848973..000000000
--- a/redhat/tdebase/kdebase-3.5.13-enable_xtest_support.patch
+++ /dev/null
@@ -1,135 +0,0 @@
-commit 45fb5561be6e828c78180c781f74d0ae9d1c3ea4
-Author: Timothy Pearson <kb9vqf@pearsoncomputing.net>
-Date:   1326230757 -0600
-
-    Enable xtest support flag
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index b832a92..f4d11ac 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -65,6 +65,7 @@ option( WITH_XRANDR "Enable xrandr support" OFF )
- option( WITH_XRENDER "Enable xrender support" OFF )
- option( WITH_XDAMAGE "Enable xdamage support" OFF )
- option( WITH_XEXT "Enable xext support" OFF )
-+option( WITH_XTEST "Enable xext support" OFF )
- option( WITH_LIBUSB "Enable control of some mouse models through libusb" OFF )
- option( WITH_LIBRAW1394 "Enable visualization of ieee1394 devices through libraw1394" OFF )
- option( WITH_SUDO_KDESU_BACKEND "Use sudo as backend for kdesu (default is su)" OFF )
-diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake
-index 7b7a1b4..df892e1 100644
---- a/ConfigureChecks.cmake
-+++ b/ConfigureChecks.cmake
-@@ -100,12 +100,25 @@ endif( )
- # xext (kwin/kompmgr)
- if( WITH_XEXT )
-   pkg_search_module( XEXT xext )
--  if( NOT XEXT_FOUND )
-+  if( XEXT_FOUND )
-+    set( HAVE_XEXT 1 )
-+  else( XEXT_FOUND )
-     tde_message_fatal( "xext is requested, but was not found on your system" )
-   endif( )
- endif( )
- 
- 
-+# xtest (kxkb)
-+if( WITH_XTEST )
-+  pkg_search_module( XTEST xtst )
-+  if( XTEST_FOUND )
-+    set( HAVE_XTEST 1 )
-+  else( XTEST_FOUND )
-+    tde_message_fatal( "xtest is requested, but was not found on your system" )
-+  endif( )
-+endif( )
-+
-+
- # GL
- if( BUILD_KDESKTOP OR BUILD_KCONTROL OR BUILD_KSCREENSAVER )
- check_library_exists( GL glXChooseVisual "" HAVE_GLXCHOOSEVISUAL )
-diff --git a/config.h.cmake b/config.h.cmake
-index d72a96c..a8de2fa 100644
---- a/config.h.cmake
-+++ b/config.h.cmake
-@@ -18,6 +18,9 @@
- // konsole, kdm, kxkb
- #cmakedefine HAVE_XKB 1
- 
-+// kxkb
-+#cmakedefine HAVE_XTEST 1
-+
- // kdm, kioslave
- #cmakedefine HAVE_TERMIOS_H 1
- 
-diff --git a/kxkb/CMakeLists.txt b/kxkb/CMakeLists.txt
-index 703591a..f36a003 100644
---- a/kxkb/CMakeLists.txt
-+++ b/kxkb/CMakeLists.txt
-@@ -22,6 +22,7 @@ include_directories(
- 
- link_directories(
-   ${TQT_LIBRARY_DIRS}
-+  ${XTEST_LIBDIR}
- )
- 
- 
-@@ -39,7 +40,7 @@ tde_add_kpart( kcm_keyboard AUTOMOC
-     extension.cpp x11helper.cpp rules.cpp kxkbconfig.cpp
-     pixmap.cpp kcmlayout.cpp kcmlayoutwidget.ui
-     kcmmisc.cpp kcmmiscwidget.ui
--  LINK kio-shared xkbfile
-+  LINK kio-shared xkbfile ${XTEST_LIBRARIES}
-   DESTINATION ${PLUGIN_INSTALL_DIR}
- )
- 
-diff --git a/kxkb/kcmmisc.cpp b/kxkb/kcmmisc.cpp
-index b4c18a4..8850d89 100644
---- a/kxkb/kcmmisc.cpp
-+++ b/kxkb/kcmmisc.cpp
-@@ -344,6 +344,21 @@ int xkb_set_off()
-     return 1;
-     }
- 
-+int xkb_state()
-+    {
-+    unsigned int mask;
-+    unsigned int numlockState;
-+    XkbStateRec xkbState;
-+    if( !xkb_init())
-+        return 0;
-+    mask = xkb_numlock_mask();
-+    if( mask == 0 )
-+        return 0;
-+    XkbGetState( dpy, XkbUseCoreKbd, &xkbState);
-+    numlockState = xkbState.locked_mods & mask;
-+    return numlockState;
-+    }
-+
- int xkb_toggle()
-     {
-     unsigned int mask;
-@@ -443,7 +458,14 @@ void numlock_toggle()
-         return;
- #endif
- #ifdef HAVE_XTEST
-+#ifdef HAVE_XKB
-+    if (xkb_state())
-+        xtest_set_on();
-+    else
-+        xtest_set_off();
-+#else // HAVE_XKB
-     xtest_toggle();
-+#endif // HAVE_XKB
- #endif
-     }
- // This code is taken from xset utility from XFree 4.3 (http://www.xfree86.org/)
---- kdebase/khotkeys/shared/CMakeLists.txt.ORI	2012-01-14 21:49:34.423813010 +0100
-+++ kdebase/khotkeys/shared/CMakeLists.txt	2012-01-14 21:53:23.915008098 +0100
-@@ -36,6 +36,6 @@
- tde_add_library( ${target} SHARED AUTOMOC
-   SOURCES ${${target}_SRCS}
-   VERSION 1.0.0
--  LINK kio-shared
-+  LINK kio-shared ${XTEST_LIBRARIES}
-   DESTINATION ${LIB_INSTALL_DIR}
- )
diff --git a/redhat/tdebase/kdebase-3.5.13-engage_lock_in_near_real_time.patch b/redhat/tdebase/kdebase-3.5.13-engage_lock_in_near_real_time.patch
deleted file mode 100644
index 54e35c45a..000000000
--- a/redhat/tdebase/kdebase-3.5.13-engage_lock_in_near_real_time.patch
+++ /dev/null
@@ -1,252 +0,0 @@
-commit 8d521d0b6ba88c6e679e7453f02897c8db7bbdf5
-Author: Timothy Pearson <kb9vqf@pearsoncomputing.net>
-Date:   1328671935 -0600
-
-    Update lock process to engage the lock in near real time
-
-diff --git a/kdesktop/lock/CMakeLists.txt b/kdesktop/lock/CMakeLists.txt
-index 5530d4c..7a35121 100644
---- a/kdesktop/lock/CMakeLists.txt
-+++ b/kdesktop/lock/CMakeLists.txt
-@@ -35,6 +35,6 @@ set( ${target}_SRCS
- 
- tde_add_executable( ${target} AUTOMOC
-   SOURCES ${${target}_SRCS}
--  LINK kdesktopsettings-static dmctl-static kio-shared Xext ${GL_LIBRARY}
-+  LINK kdesktopsettings-static dmctl-static kio-shared Xext ${GL_LIBRARY} "-z\ now"
-   DESTINATION ${BIN_INSTALL_DIR}
- )
-diff --git a/kdesktop/lock/main.cc b/kdesktop/lock/main.cc
-index 0cbef60..132ff30 100644
---- a/kdesktop/lock/main.cc
-+++ b/kdesktop/lock/main.cc
-@@ -1,6 +1,7 @@
- /* This file is part of the KDE project
-    Copyright (C) 1999 David Faure
-    Copyright (c) 2003 Oswald Buddenhagen <ossi@kde.org>
-+   Copyright (c) 2010-2012 Timothy Pearson <kb9vqf@pearsoncomputing.net>
- 
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Library General Public
-@@ -43,6 +44,13 @@ bool trinity_desktop_lock_use_sak = FALSE;
- 
- bool trinity_desktop_lock_forced = FALSE;
- 
-+bool signalled_forcelock;
-+bool signalled_dontlock;
-+bool signalled_securedialog;
-+bool signalled_blank;
-+bool signalled_run;
-+bool in_internal_mode = FALSE;
-+
- bool MyApp::x11EventFilter( XEvent *ev )
- {
-     if (ev->type == XKeyPress || ev->type == ButtonPress) {
-diff --git a/kdesktop/lockeng.cc b/kdesktop/lockeng.cc
-index 5307c5c..79d27db 100644
---- a/kdesktop/lockeng.cc
-+++ b/kdesktop/lockeng.cc
-@@ -1,8 +1,9 @@
- //===========================================================================
- //
--// This file is part of the KDE project
-+// This file is part of the TDE project
- //
- // Copyright (c) 1999 Martin R. Jones <mjones@kde.org>
-+// Copyright (c) 2012 Timothy Pearson <kb9vqf@pearsoncomputing.net>
- //
- 
- 
-@@ -29,6 +30,14 @@ extern xautolock_corner_t xautolock_corners[ 4 ];
- 
- bool trinity_lockeng_sak_available = TRUE;
- 
-+SaverEngine* m_masterSaverEngine = NULL;
-+static void sigusr1_handler(int)
-+{
-+    if (m_masterSaverEngine) {
-+        m_masterSaverEngine->lockProcessWaiting();
-+    }
-+}
-+
- //===========================================================================
- //
- // Screen saver engine. Doesn't handle the actual screensaver window,
-@@ -42,6 +51,16 @@ SaverEngine::SaverEngine()
-       mSAKProcess(NULL),
-       mTerminationRequested(false)
- {
-+    struct sigaction act;
-+
-+    // handle SIGUSR1
-+    m_masterSaverEngine = this;
-+    act.sa_handler= sigusr1_handler;
-+    sigemptyset(&(act.sa_mask));
-+    sigaddset(&(act.sa_mask), SIGUSR1);
-+    act.sa_flags = 0;
-+    sigaction(SIGUSR1, &act, 0L);
-+
-     // Save X screensaver parameters
-     XGetScreenSaver(qt_xdisplay(), &mXTimeout, &mXInterval,
-                     &mXBlanking, &mXExposures);
-@@ -60,6 +79,19 @@ SaverEngine::SaverEngine()
-     TQTimer::singleShot( 0, this, TQT_SLOT(handleSecureDialog()) );
- 
-     configure();
-+
-+    mLockProcess.clearArguments();
-+    TQString path = KStandardDirs::findExe( "kdesktop_lock" );
-+    if( path.isEmpty())
-+    {
-+	kdDebug( 1204 ) << "Can't find kdesktop_lock!" << endl;
-+    }
-+    mLockProcess << path;
-+    mLockProcess << TQString( "--internal" ) << TQString( "%1" ).arg(getpid());
-+    if (mLockProcess.start() == false )
-+    {
-+	kdDebug( 1204 ) << "Failed to start kdesktop_lock!" << endl;
-+    }
- }
- 
- //---------------------------------------------------------------------------
-@@ -68,6 +100,10 @@ SaverEngine::SaverEngine()
- //
- SaverEngine::~SaverEngine()
- {
-+    if (mState == Waiting) {
-+        kill(mLockProcess.pid(), SIGKILL);
-+    }
-+
-     mLockProcess.detach(); // don't kill it if we crash
-     delete mXAutoLock;
- 
-@@ -86,9 +122,9 @@ void SaverEngine::lock()
-     {
-         mSAKProcess->kill(SIGTERM);
-         ok = startLockProcess( ForceLock );
--// It takes a while for kdesktop_lock to start and lock the screen.
--// Therefore delay the DCOP call until it tells kdesktop that the locking is in effect.
--// This is done only for --forcelock .
-+        // It takes a while for kdesktop_lock to start and lock the screen.
-+        // Therefore delay the DCOP call until it tells kdesktop that the locking is in effect.
-+        // This is done only for --forcelock .
-         if( ok && mState != Saving )
-         {
-             DCOPClientTransaction* trans = kapp->dcopClient()->beginTransaction();
-@@ -283,40 +319,42 @@ bool SaverEngine::startLockProcess( LockType lock_type )
-     kdDebug(1204) << "SaverEngine: starting saver" << endl;
-     emitDCOPSignal("KDE_start_screensaver()", TQByteArray());
- 
--    if (mLockProcess.isRunning())
--    {
--        stopLockProcess();
--    }
--    mLockProcess.clearArguments();
--    TQString path = KStandardDirs::findExe( "kdesktop_lock" );
--    if( path.isEmpty())
--    {
--	kdDebug( 1204 ) << "Can't find kdesktop_lock!" << endl;
--	return false;
-+    if (!mLockProcess.isRunning()) {
-+	mLockProcess.clearArguments();
-+	TQString path = KStandardDirs::findExe( "kdesktop_lock" );
-+	if( path.isEmpty())
-+	{
-+	    kdDebug( 1204 ) << "Can't find kdesktop_lock!" << endl;
-+	    return false;
-+	}
-+	mLockProcess << path;
-+	mLockProcess << TQString( "--internal" ) << TQString( "%1" ).arg(getpid());
-+        if (mLockProcess.start() == false )
-+	{
-+	    kdDebug( 1204 ) << "Failed to start kdesktop_lock!" << endl;
-+	    return false;
-+	}
-     }
--    mLockProcess << path;
-+
-     switch( lock_type )
-     {
- 	case ForceLock:
--    	    mLockProcess << TQString( "--forcelock" );
-+    	    mLockProcess.kill(SIGUSR1);		// Request forcelock
- 	  break;
- 	case DontLock:
--	    mLockProcess << TQString( "--dontlock" );
-+    	    mLockProcess.kill(SIGUSR2);		// Request dontlock
- 	  break;
- 	case SecureDialog:
--	    mLockProcess << TQString( "--securedialog" );
-+    	    mLockProcess.kill(SIGWINCH);	// Request secure dialog
- 	  break;
- 	default:
- 	  break;
-     }
--    if (mBlankOnly)
--	    mLockProcess << TQString( "--blank" );
--
--    if (mLockProcess.start() == false )
--    {
--	kdDebug( 1204 ) << "Failed to start kdesktop_lock!" << endl;
--	return false;
-+    if (mBlankOnly) {
-+	    mLockProcess.kill(SIGTTIN);		// Request blanking
-     }
-+
-+    mLockProcess.kill(SIGTTOU);			// Start lock
-     XSetScreenSaver(qt_xdisplay(), 0, mXInterval,  PreferBlanking, mXExposures);
- 
-     mState = Preparing;
-@@ -359,9 +397,7 @@ void SaverEngine::stopLockProcess()
- 
- void SaverEngine::lockProcessExited()
- {
--printf("Lock process exited\n\r"); fflush(stdout);
-     bool abnormalExit = false;
--    kdDebug(1204) << "SaverEngine: lock exited" << endl;
-     if (mLockProcess.normalExit() == false) {
-         abnormalExit = true;
-     }
-@@ -387,6 +423,28 @@ printf("Lock process exited\n\r"); fflush(stdout);
-             system("logout");
-         }
-     }
-+    else {
-+        // Restart the lock process
-+        if (!mLockProcess.isRunning()) {
-+            mLockProcess.clearArguments();
-+            TQString path = KStandardDirs::findExe( "kdesktop_lock" );
-+            if( path.isEmpty())
-+            {
-+                kdDebug( 1204 ) << "Can't find kdesktop_lock!" << endl;
-+            }
-+            mLockProcess << path;
-+            mLockProcess << TQString( "--internal" ) << TQString( "%1" ).arg(getpid());
-+            if (mLockProcess.start() == false )
-+            {
-+                kdDebug( 1204 ) << "Failed to start kdesktop_lock!" << endl;
-+            }
-+        }
-+    }
-+}
-+
-+void SaverEngine::lockProcessWaiting()
-+{
-+    kdDebug(1204) << "SaverEngine: lock exited" << endl;
-     if (trinity_lockeng_sak_available == TRUE) {
-         handleSecureDialog();
-     }
-diff --git a/kdesktop/lockeng.h b/kdesktop/lockeng.h
-index ae81f90..ae08e9a 100644
---- a/kdesktop/lockeng.h
-+++ b/kdesktop/lockeng.h
-@@ -78,6 +78,9 @@ public:
-      */
-     virtual void saverLockReady();
- 
-+public slots:
-+    void lockProcessWaiting();
-+
- protected slots:
-     void idleTimeout();
-     void lockProcessExited();
diff --git a/redhat/tdebase/kdebase-3.5.13-engage_lock_in_near_real_time_continued.patch b/redhat/tdebase/kdebase-3.5.13-engage_lock_in_near_real_time_continued.patch
deleted file mode 100644
index fd39f061d..000000000
--- a/redhat/tdebase/kdebase-3.5.13-engage_lock_in_near_real_time_continued.patch
+++ /dev/null
@@ -1,356 +0,0 @@
-commit 4952641328f28a541e3fdf2200df4e1e4b11d5dd
-Author: Timothy Pearson <kb9vqf@pearsoncomputing.net>
-Date:   1328994151 -0600
-
-    Commit the rest of 8d521d0b, not merged due to GIT glitch
-
-diff --git a/kdesktop/lock/main.cc b/kdesktop/lock/main.cc
-index 132ff30..4edd1b3 100644
---- a/kdesktop/lock/main.cc
-+++ b/kdesktop/lock/main.cc
-@@ -73,140 +73,241 @@ static KCmdLineOptions options[] =
-    { "dontlock", I18N_NOOP("Only start screensaver"), 0 },
-    { "securedialog", I18N_NOOP("Launch the secure dialog"), 0 },
-    { "blank", I18N_NOOP("Only use the blank screensaver"), 0 },
-+   { "internal <pid>", I18N_NOOP("TDE internal command for background process loading"), 0 },
-    KCmdLineLastOption
- };
- 
-+static void sigusr1_handler(int)
-+{
-+    signalled_forcelock = TRUE;
-+}
-+
-+static void sigusr2_handler(int)
-+{
-+    signalled_dontlock = TRUE;
-+}
-+
-+static void sigusr3_handler(int)
-+{
-+    signalled_securedialog = TRUE;
-+}
-+
-+static void sigusr4_handler(int)
-+{
-+    signalled_blank = TRUE;
-+}
-+
-+static void sigusr5_handler(int)
-+{
-+    signalled_run = TRUE;
-+}
-+
- // -----------------------------------------------------------------------------
- 
- int main( int argc, char **argv )
- {
-     KLocale::setMainCatalogue("kdesktop");
- 
--    KCmdLineArgs::init( argc, argv, "kdesktop_lock", I18N_NOOP("KDesktop Locker"), I18N_NOOP("Session Locker for KDesktop"), "2.0" );
-+    KCmdLineArgs::init( argc, argv, "kdesktop_lock", I18N_NOOP("KDesktop Locker"), I18N_NOOP("Session Locker for KDesktop"), "2.1" );
-     KCmdLineArgs::addCmdLineOptions( options );
-     KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
- 
--    if (args->isSet( "forcelock" ))
--        trinity_desktop_lock_forced = TRUE;
--
-     putenv(strdup("SESSION_MANAGER="));
- 
-     KApplication::disableAutoDcopRegistration(); // not needed
- 
--    int kdesktop_screen_number = 0;
--    int starting_screen = 0;
--
--    bool child = false;
--    int parent_connection = 0; // socket to the parent saver
--    TQValueList<int> child_sockets;
--
--    if (KGlobalSettings::isMultiHead())
--    {
--        Display *dpy = XOpenDisplay(NULL);
--        if (! dpy) {
--            fprintf(stderr,
--                    "%s: FATAL ERROR: couldn't open display '%s'\n",
--                    argv[0], XDisplayName(NULL));
--            exit(1);
--        }
-+    while (1 == 1) {
-+        signalled_forcelock = FALSE;
-+        signalled_dontlock = FALSE;
-+        signalled_securedialog = FALSE;
-+        signalled_blank = FALSE;
-+        signalled_run = FALSE;
- 
--        int number_of_screens = ScreenCount(dpy);
--        starting_screen = kdesktop_screen_number = DefaultScreen(dpy);
--        int pos;
--        TQCString display_name = XDisplayString(dpy);
--        XCloseDisplay(dpy);
--        kdDebug() << "screen " << number_of_screens << " " << kdesktop_screen_number << " " << display_name << " " << starting_screen << endl;
--        dpy = 0;
--
--        if ((pos = display_name.findRev('.')) != -1)
--            display_name.remove(pos, 10);
--
--        TQCString env;
--        if (number_of_screens != 1) {
--            for (int i = 0; i < number_of_screens; i++) {
--                if (i != starting_screen) {
--                    int fd[2];
--                    if (pipe(fd)) {
--                        perror("pipe");
--                        break;
--                    }
--                    if (fork() == 0) {
--                        child = true;
--                        kdesktop_screen_number = i;
--                        parent_connection = fd[0];
--                        // break here because we are the child process, we don't
--                        // want to fork() anymore
--                        break;
--                    } else {
--                        child_sockets.append(fd[1]);
-+        int kdesktop_screen_number = 0;
-+        int starting_screen = 0;
-+
-+        bool child = false;
-+        int parent_connection = 0; // socket to the parent saver
-+        TQValueList<int> child_sockets;
-+
-+        if (KGlobalSettings::isMultiHead())
-+        {
-+            Display *dpy = XOpenDisplay(NULL);
-+            if (! dpy) {
-+                fprintf(stderr,
-+                        "%s: FATAL ERROR: couldn't open display '%s'\n",
-+                        argv[0], XDisplayName(NULL));
-+                exit(1);
-+            }
-+
-+            int number_of_screens = ScreenCount(dpy);
-+            starting_screen = kdesktop_screen_number = DefaultScreen(dpy);
-+            int pos;
-+            TQCString display_name = XDisplayString(dpy);
-+            XCloseDisplay(dpy);
-+            kdDebug() << "screen " << number_of_screens << " " << kdesktop_screen_number << " " << display_name << " " << starting_screen << endl;
-+            dpy = 0;
-+
-+            if ((pos = display_name.findRev('.')) != -1)
-+                display_name.remove(pos, 10);
-+
-+            TQCString env;
-+            if (number_of_screens != 1) {
-+                for (int i = 0; i < number_of_screens; i++) {
-+                    if (i != starting_screen) {
-+                        int fd[2];
-+                        if (pipe(fd)) {
-+                            perror("pipe");
-+                            break;
-+                        }
-+                        if (fork() == 0) {
-+                            child = true;
-+                            kdesktop_screen_number = i;
-+                            parent_connection = fd[0];
-+                            // break here because we are the child process, we don't
-+                            // want to fork() anymore
-+                            break;
-+                        } else {
-+                            child_sockets.append(fd[1]);
-+                        }
-                     }
-                 }
--            }
- 
--            env.sprintf("DISPLAY=%s.%d", display_name.data(),
--                        kdesktop_screen_number);
--            kdDebug() << "env " << env << endl;
-+                env.sprintf("DISPLAY=%s.%d", display_name.data(),
-+                            kdesktop_screen_number);
-+                kdDebug() << "env " << env << endl;
- 
--            if (putenv(strdup(env.data()))) {
--                fprintf(stderr,
--                        "%s: WARNING: unable to set DISPLAY environment variable\n",
--                        argv[0]);
--                perror("putenv()");
-+                if (putenv(strdup(env.data()))) {
-+                    fprintf(stderr,
-+                            "%s: WARNING: unable to set DISPLAY environment variable\n",
-+                            argv[0]);
-+                    perror("putenv()");
-+                }
-             }
-         }
--    }
- 
--    MyApp app;
--    kdDebug() << "app " << kdesktop_screen_number << " " << starting_screen << " " << child << " " << child_sockets.count() << " " << parent_connection << endl;
--    app.disableSessionManagement();
--    KGlobal::locale()->insertCatalogue("libdmctl");
--
--    // we need to read from the right rc file - possibly taking screen number in account
--    KDesktopSettings::instance("kdesktoprc");
--
--    trinity_desktop_lock_use_system_modal_dialogs = !KDesktopSettings::useUnmanagedLockWindows();
--    trinity_desktop_lock_delay_screensaver_start = KDesktopSettings::delaySaverStart();
--    trinity_desktop_lock_use_sak = KDesktopSettings::useTDESAK();
--
--    LockProcess process(child, args->isSet( "blank" ));
--    if (!child)
--        process.setChildren(child_sockets);
--    else
--        process.setParent(parent_connection);
--
--    bool rt;
--    bool sig = false;
--    if( !child && args->isSet( "forcelock" ))
--    {
--        rt = process.lock();
--        sig = true;
--    }
--    else if( child || args->isSet( "dontlock" )) {
--        rt = process.dontLock();
--    }
--    else if( child || args->isSet( "securedialog" )) {
--        int retcode = tde_sak_verify_calling_process();
--        if (retcode == 0) {
--            rt = process.runSecureDialog();
-+        MyApp app;
-+        kdDebug() << "app " << kdesktop_screen_number << " " << starting_screen << " " << child << " " << child_sockets.count() << " " << parent_connection << endl;
-+        app.disableSessionManagement();
-+        KGlobal::locale()->insertCatalogue("libdmctl");
-+
-+        // we need to read from the right rc file - possibly taking screen number in account
-+        KDesktopSettings::instance("kdesktoprc");
-+
-+        trinity_desktop_lock_use_system_modal_dialogs = !KDesktopSettings::useUnmanagedLockWindows();
-+        trinity_desktop_lock_delay_screensaver_start = KDesktopSettings::delaySaverStart();
-+        trinity_desktop_lock_use_sak = KDesktopSettings::useTDESAK();
-+
-+        if (args->isSet( "internal" )) {
-+            while (signalled_run == FALSE) {
-+                sigset_t new_mask;
-+                struct sigaction act;
-+
-+                in_internal_mode = TRUE;
-+
-+                // handle SIGUSR1
-+                act.sa_handler= sigusr1_handler;
-+                sigemptyset(&(act.sa_mask));
-+                sigaddset(&(act.sa_mask), SIGUSR1);
-+                act.sa_flags = 0;
-+                sigaction(SIGUSR1, &act, 0L);
-+                // handle SIGUSR2
-+                act.sa_handler= sigusr2_handler;
-+                sigemptyset(&(act.sa_mask));
-+                sigaddset(&(act.sa_mask), SIGUSR2);
-+                act.sa_flags = 0;
-+                sigaction(SIGUSR2, &act, 0L);
-+                // handle SIGWINCH (an ersatz SIGUSR3)
-+                act.sa_handler= sigusr3_handler;
-+                sigemptyset(&(act.sa_mask));
-+                sigaddset(&(act.sa_mask), SIGWINCH);
-+                act.sa_flags = 0;
-+                sigaction(SIGWINCH, &act, 0L);
-+                // handle SIGTTIN (an ersatz SIGUSR4)
-+                act.sa_handler= sigusr4_handler;
-+                sigemptyset(&(act.sa_mask));
-+                sigaddset(&(act.sa_mask), SIGTTIN);
-+                act.sa_flags = 0;
-+                sigaction(SIGTTIN, &act, 0L);
-+                // handle SIGTTOU (an ersatz SIGUSR5)
-+                act.sa_handler= sigusr5_handler;
-+                sigemptyset(&(act.sa_mask));
-+                sigaddset(&(act.sa_mask), SIGTTOU);
-+                act.sa_flags = 0;
-+                sigaction(SIGTTOU, &act, 0L);
-+
-+                // initialize the signal masks
-+                sigfillset(&new_mask);
-+                sigdelset(&new_mask,SIGUSR1);
-+                sigdelset(&new_mask,SIGUSR2);
-+                sigdelset(&new_mask,SIGWINCH);
-+                sigdelset(&new_mask,SIGTTIN);
-+                sigdelset(&new_mask,SIGTTOU);
-+
-+                // wait for SIGUSR1, SIGUSR2, SIGWINCH, SIGTTIN, or SIGTTOU
-+                sigsuspend(&new_mask);
-+            }
-+        }
-+
-+        if (args->isSet( "forcelock" ) || (signalled_forcelock == TRUE))
-+            trinity_desktop_lock_forced = TRUE;
-+
-+        LockProcess process(child, (args->isSet( "blank" ) || (signalled_blank == TRUE)));
-+        if (!child)
-+            process.setChildren(child_sockets);
-+        else
-+            process.setParent(parent_connection);
-+
-+        bool rt;
-+        bool sig = false;
-+        if( !child && (args->isSet( "forcelock" ) || (signalled_forcelock == TRUE)))
-+        {
-+            rt = process.lock();
-+            sig = true;
-+        }
-+        else if( child || (args->isSet( "dontlock" ) || (signalled_dontlock == TRUE))) {
-+            rt = process.dontLock();
-+        }
-+        else if( child || (args->isSet( "securedialog" ) || (signalled_securedialog == TRUE))) {
-+            int retcode = tde_sak_verify_calling_process();
-+            if (retcode == 0) {
-+                rt = process.runSecureDialog();
-+            }
-+            else {
-+                return 1;
-+            }
-         }
-         else {
-+            rt = process.defaultSave();
-+        }
-+        if (!rt) {
-             return 0;
-         }
--    }
--    else {
--        rt = process.defaultSave();
--    }
--    if (!rt) {
--        return 0;
--    }
- 
--    if( sig )
--    {
--        DCOPRef ref( "kdesktop", "KScreensaverIface");
--        ref.send( "saverLockReady" );
--    }
-+        if( sig )
-+        {
-+            DCOPRef ref( "kdesktop", "KScreensaverIface");
-+            ref.send( "saverLockReady" );
-+        }
-+
-+        if (in_internal_mode == FALSE) {
-+            return app.exec();
-+        }
-+        else {
-+            pid_t kdesktop_pid = atoi(args->getOption( "internal" ));
-+            app.exec();
-+            if (kill(kdesktop_pid, SIGUSR1) < 0) {
-+                // The controlling kdesktop process probably died.  Commit suicide...
-+                return 12;
-+            }
- 
--    return app.exec();
-+            // FIXME
-+            // We should not have to return (restart) at all,
-+            // but it seems that some X11 connections are left active,
-+            // preventing the lock process from restarting properly in the while() loop above.
-+            return 0;
-+        }
-+    }
- }
- 
- #include "main.moc"
diff --git a/redhat/tdebase/kdebase-3.5.13-ensure_pagersettings_is_installed.patch b/redhat/tdebase/kdebase-3.5.13-ensure_pagersettings_is_installed.patch
deleted file mode 100644
index 2b3d38880..000000000
--- a/redhat/tdebase/kdebase-3.5.13-ensure_pagersettings_is_installed.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-commit bd9c1479d7a965959147398d71f18be62b2aa8b6
-Author: Darrell Anderson <humanreadable@yahoo.com>
-Date:   1333232418 -0500
-
-    Ensure pagersettings.kcfg is installed.
-
-diff --git a/kicker/applets/minipager/CMakeLists.txt b/kicker/applets/minipager/CMakeLists.txt
-index b9ca9c7..a90269c 100644
---- a/kicker/applets/minipager/CMakeLists.txt
-+++ b/kicker/applets/minipager/CMakeLists.txt
-@@ -27,7 +27,7 @@ link_directories(
- ##### other data ################################
- 
- install( FILES minipagerapplet.desktop DESTINATION ${DATA_INSTALL_DIR}/kicker/applets )
--
-+install( FILES pagersettings.kcfg DESTINATION ${KCFG_INSTALL_DIR} )
- 
- ##### minipager_panelapplet (module) ############
- 
diff --git a/redhat/tdebase/kdebase-3.5.13-fix_dbus_include.patch b/redhat/tdebase/kdebase-3.5.13-fix_dbus_include.patch
deleted file mode 100644
index 19574bad0..000000000
--- a/redhat/tdebase/kdebase-3.5.13-fix_dbus_include.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- kdebase/kdm/backend/CMakeLists.txt.ORI	2012-09-19 21:39:48.505001985 +0200
-+++ kdebase/kdm/backend/CMakeLists.txt	2012-09-19 21:40:08.951005360 +0200
-@@ -14,6 +14,7 @@
- include_directories(
-   ${CMAKE_CURRENT_BINARY_DIR}
-   ${CMAKE_BINARY_DIR}
-+  ${DBUS_INCLUDE_DIRS}
-   ${DBUS_TQT_INCLUDE_DIRS}
- )
- 
diff --git a/redhat/tdebase/kdebase-3.5.13-fix_device_icon_placement.patch b/redhat/tdebase/kdebase-3.5.13-fix_device_icon_placement.patch
deleted file mode 100644
index 00bda21c2..000000000
--- a/redhat/tdebase/kdebase-3.5.13-fix_device_icon_placement.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-commit 5df6c5fca20e917aaa82665131b931a0aa7c8628
-Author: Darrell Anderson <humanreadable@yahoo.com>
-Date:   1332447011 -0500
-
-    Restore code snippet removed with GIT hash
-    27856879bf962f178d88e79144e37a47e731b122,
-    Sept. 3, 2010, "Massive import of OpenSUSE patches."
-    Restoring this snippet restores the device icon
-    placement and resolves bug report 392.
-
-diff --git a/kdesktop/kdiconview.cc b/kdesktop/kdiconview.cc
-index e2f1c80..3404e4a 100644
---- a/kdesktop/kdiconview.cc
-+++ b/kdesktop/kdiconview.cc
-@@ -1141,6 +1141,15 @@ void KDIconView::slotNewItems( const KFileItemList & entries )
-             kdDebug(1214)<<"Using saved position"<<endl;
-         }
-       }
-+      else
-+      {
-+            // Not found, we'll need to save the new pos
-+            kdDebug(1214)<<"slotNewItems(): New item without position information, try to find a sane location"<<endl;
-+
-+            moveToFreePosition(fileIVI);
-+
-+            m_bNeedSave = true;
-+      }
-     }
-   }
- 
diff --git a/redhat/tdebase/kdebase-3.5.13-fix_fancy_logout.patch b/redhat/tdebase/kdebase-3.5.13-fix_fancy_logout.patch
deleted file mode 100644
index 793334e24..000000000
--- a/redhat/tdebase/kdebase-3.5.13-fix_fancy_logout.patch
+++ /dev/null
@@ -1,162 +0,0 @@
-commit d2f8fca98e6d276f442f90dee48164be15d8e287
-Author: Timothy Pearson <kb9vqf@pearsoncomputing.net>
-Date:   1337223371 -0500
-
-    Fix fancy logout not allowing interaction with save dialogs
-    This closes Bug 922
-    Fix desktop wallpaper export failing when triggered by krootbacking or ksmserver and konsole or kdesktop_lock not previously loaded
-
-diff --git a/krootbacking/krootbacking.cpp b/krootbacking/krootbacking.cpp
-index 8e41b50..fe8574a 100644
---- a/krootbacking/krootbacking.cpp
-+++ b/krootbacking/krootbacking.cpp
-@@ -54,6 +54,8 @@ public:
- KRootBacking::KRootBacking()
-     : TQObject(KApplication::desktop(), "KRootBacking" ), m_Desk(0), m_timeout(0)
- {
-+    enableExports();
-+
-     init();
- }
- 
-diff --git a/ksmserver/shutdown.cpp b/ksmserver/shutdown.cpp
-index a4ca020..09cb2d7 100644
---- a/ksmserver/shutdown.cpp
-+++ b/ksmserver/shutdown.cpp
-@@ -189,24 +189,6 @@ void KSMServer::shutdownInternal( KApplication::ShutdownConfirm confirm,
-         // shall we save the session on logout?
-         saveSession = ( config->readEntry( "loginMode", "restorePreviousLogout" ) == "restorePreviousLogout" );
- 
--        if (showFancyLogout) {
--            KSMShutdownIPFeedback::showit(); // hide the UGLY logout process from the user
--            shutdownNotifierIPDlg = KSMShutdownIPDlg::showShutdownIP();
--            while (!KSMShutdownIPFeedback::ispainted()) {
--                tqApp->processEvents();
--            }
--        }
--
--        // synchronize any folders that were requested for shutdown sync
--        if (shutdownNotifierIPDlg) {
--            static_cast<KSMShutdownIPDlg*>(shutdownNotifierIPDlg)->setStatusMessage(i18n("Synchronizing remote folders").append("..."));
--        }
--        KRsync krs(this, "");
--        krs.executeLogoutAutoSync();
--        if (shutdownNotifierIPDlg) {
--            static_cast<KSMShutdownIPDlg*>(shutdownNotifierIPDlg)->setStatusMessage(i18n("Saving your settings..."));
--        }
--
-         if ( saveSession )
-             sessionGroup = TQString("Session: ") + SESSION_PREVIOUS_LOGOUT;
- 
-@@ -252,9 +234,9 @@ void KSMServer::shutdownInternal( KApplication::ShutdownConfirm confirm,
-             completeShutdownOrCheckpoint();
-     }
-     else {
--        if (showFancyLogout) {
--            KSMShutdownIPFeedback::stop();
--        }
-+       if (showFancyLogout) {
-+           KSMShutdownIPFeedback::stop();
-+       }
-     }
-     dialogActive = false;
- }
-@@ -502,6 +484,25 @@ void KSMServer::completeShutdownOrCheckpoint()
-     if ( waitForPhase2 )
-         return;
- 
-+    bool showFancyLogout = KConfigGroup(KGlobal::config(), "Logout").readBoolEntry("showFancyLogout", true);
-+    if (showFancyLogout) {
-+        KSMShutdownIPFeedback::showit(); // hide the UGLY logout process from the user
-+        shutdownNotifierIPDlg = KSMShutdownIPDlg::showShutdownIP();
-+        while (!KSMShutdownIPFeedback::ispainted()) {
-+            tqApp->processEvents();
-+        }
-+    }
-+
-+    // synchronize any folders that were requested for shutdown sync
-+    if (shutdownNotifierIPDlg) {
-+        static_cast<KSMShutdownIPDlg*>(shutdownNotifierIPDlg)->setStatusMessage(i18n("Synchronizing remote folders").append("..."));
-+    }
-+    KRsync krs(this, "");
-+    krs.executeLogoutAutoSync();
-+    if (shutdownNotifierIPDlg) {
-+        static_cast<KSMShutdownIPDlg*>(shutdownNotifierIPDlg)->setStatusMessage(i18n("Saving your settings..."));
-+    }
-+
-     if ( saveSession )
-         storeSession();
-     else
-diff --git a/ksmserver/shutdowndlg.cpp b/ksmserver/shutdowndlg.cpp
-index 163352a..35cae65 100644
---- a/ksmserver/shutdowndlg.cpp
-+++ b/ksmserver/shutdowndlg.cpp
-@@ -528,6 +528,11 @@ KSMShutdownIPFeedback::KSMShutdownIPFeedback()
- : TQWidget( 0L, "systemmodaldialogclass", Qt::WStyle_Customize | Qt::WStyle_NoBorder | Qt::WStyle_StaysOnTop ), m_timeout(0), m_isPainted(false), m_sharedRootPixmap(NULL), mPixmapTimeout(0)
- 
- {
-+	setShown(false);
-+	hide();
-+
-+	enableExports();
-+
- 	m_sharedRootPixmap = new KRootPixmap(this);
- 	m_sharedRootPixmap->setCustomPainting(true);
- 	connect(m_sharedRootPixmap, TQT_SIGNAL(backgroundUpdated(const TQPixmap &)), this, TQT_SLOT(slotSetBackgroundPixmap(const TQPixmap &)));
-@@ -554,15 +559,36 @@ KSMShutdownIPFeedback::KSMShutdownIPFeedback()
- 	setBackgroundPixmap( m_root );
- 	setGeometry( TQApplication::desktop()->geometry() );
- 	setBackgroundMode( TQWidget::NoBackground );
--
--	setShown(true);
- }
- 
- void KSMShutdownIPFeedback::showNow()
- {
-+	setShown(true);
-+
- 	TQTimer::singleShot( 0, this, SLOT(slotPaintEffect()) );
- }
- 
-+void KSMShutdownIPFeedback::enableExports()
-+{
-+#ifdef Q_WS_X11
-+	kdDebug(270) << k_lineinfo << "activating background exports.\n";
-+	DCOPClient *client = kapp->dcopClient();
-+	if (!client->isAttached()) {
-+		client->attach();
-+	}
-+	TQByteArray data;
-+	TQDataStream args( data, IO_WriteOnly );
-+	args << 1;
-+	
-+	TQCString appname( "kdesktop" );
-+	int screen_number = DefaultScreen(qt_xdisplay());
-+	if ( screen_number )
-+	appname.sprintf("kdesktop-screen-%d", screen_number );
-+	
-+	client->send( appname, "KBackgroundIface", "setExport(int)", data );
-+#endif
-+}
-+
- KSMShutdownIPFeedback::~KSMShutdownIPFeedback()
- {
- 	if (m_sharedRootPixmap) {
-diff --git a/ksmserver/shutdowndlg.h b/ksmserver/shutdowndlg.h
-index db66c55..05ca991 100644
---- a/ksmserver/shutdowndlg.h
-+++ b/ksmserver/shutdowndlg.h
-@@ -97,6 +97,13 @@
-     void slotSetBackgroundPixmap(const TQPixmap &);
- 
- private:
-+	/**
-+	* Asks KDesktop to export the desktop background as a KSharedPixmap.
-+	* This method uses DCOP to call KBackgroundIface/setExport(int).
-+	*/
-+	void enableExports();
-+
-+private:
-     static KSMShutdownIPFeedback * s_pSelf;
-     KSMShutdownIPFeedback();
-     int m_currentY;
diff --git a/redhat/tdebase/kdebase-3.5.13-fix_fqdn_in_title.patch b/redhat/tdebase/kdebase-3.5.13-fix_fqdn_in_title.patch
deleted file mode 100644
index 74122ec46..000000000
--- a/redhat/tdebase/kdebase-3.5.13-fix_fqdn_in_title.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-commit d409abdbef8dd8b72bb2f311fcaa7456bdc2404b
-Author: Luboš Luňák <l.lunak@suse.cz>
-Date:   Fri Mar 4 16:22:23 2011 +0100
-
-    do not show hostname in titlebar if it's FQDN of localhost
-
-diff --git a/kwin/utils.cpp b/kwin/utils.cpp
---- a/kwin/utils.cpp
-+++ b/kwin/utils.cpp
-@@ -18,6 +18,8 @@
- #include "utils.h"
- 
- #include <unistd.h>
-+#include <string.h>
-+#include <netdb.h>
- 
- #ifndef KCMRULES
- 
-@@ -323,6 +325,27 @@ bool isLocalMachine( const TQCString& host )
-             if( host == hostnamebuf )
-                 return true;
-             }
-+        else
-+            { // e.g. LibreOffice likes to give FQDN, even if gethostname() doesn't include domain
-+            struct addrinfo hints, *res, *addr;
-+            bool is_local = false;
-+
-+            memset (&hints, 0, sizeof (hints));
-+            hints.ai_family = PF_UNSPEC;
-+            hints.ai_socktype = SOCK_STREAM;
-+            hints.ai_flags |= AI_CANONNAME;
-+
-+            if( getaddrinfo( host, NULL, &hints, &res ) != 0)
-+                return false;
-+            for(addr = res; !is_local && addr; addr = addr->ai_next)
-+                {
-+                if( res->ai_canonname &&
-+                    host == TQCString( res->ai_canonname ))
-+                    is_local = true;
-+                }
-+            freeaddrinfo(res);
-+            return is_local;
-+            }
-         }
-     return false;
-     }
diff --git a/redhat/tdebase/kdebase-3.5.13-fix_kdesktop_lock_security_issue.patch b/redhat/tdebase/kdebase-3.5.13-fix_kdesktop_lock_security_issue.patch
deleted file mode 100644
index 1660d03f2..000000000
--- a/redhat/tdebase/kdebase-3.5.13-fix_kdesktop_lock_security_issue.patch
+++ /dev/null
@@ -1,157 +0,0 @@
-commit f05f9dc7532ea41c49b3e9385165d942dfab5d0e
-Author: Timothy Pearson <kb9vqf@pearsoncomputing.net>
-Date:   1327036924 -0600
-
-    If someone manages to close down kdesktop_lock through an undiscovered security vulnerability such as http://security-tracker.debian.org/tracker/CVE-2012-0064, immediately terminate the compromised TDE session
-
-diff --git a/kdesktop/lock/lockprocess.cc b/kdesktop/lock/lockprocess.cc
-index 6bd18f7..2588bbf 100644
---- a/kdesktop/lock/lockprocess.cc
-+++ b/kdesktop/lock/lockprocess.cc
-@@ -326,10 +326,8 @@ static int signal_pipe[2];
- static void sigterm_handler(int)
- {
-     if (!trinity_desktop_lock_in_sec_dlg) {
--        char tmp = 'T';
--        if (::write( signal_pipe[1], &tmp, 1) == -1) {
--            // Error handler to shut up gcc warnings
--        }
-+        // Exit uncleanly
-+        exit(1);
-     }
- }
- 
-@@ -522,7 +520,7 @@ void LockProcess::setupSignals()
-     sigaddset(&(act.sa_mask), SIGQUIT);
-     act.sa_flags = 0;
-     sigaction(SIGQUIT, &act, 0L);
--    // exit cleanly on SIGTERM
-+    // exit uncleanly on SIGTERM
-     act.sa_handler= sigterm_handler;
-     sigemptyset(&(act.sa_mask));
-     sigaddset(&(act.sa_mask), SIGTERM);
-diff --git a/kdesktop/lockeng.cc b/kdesktop/lockeng.cc
-index b957218..c5306e9 100644
---- a/kdesktop/lockeng.cc
-+++ b/kdesktop/lockeng.cc
-@@ -36,10 +36,11 @@ bool trinity_lockeng_sak_available = TRUE;
- // a newly started process.
- //
- SaverEngine::SaverEngine()
--    : KScreensaverIface(),
--      TQWidget(),
-+    : TQWidget(),
-+      KScreensaverIface(),
-       mBlankOnly(false),
--      mSAKProcess(NULL)
-+      mSAKProcess(NULL),
-+      mTerminationRequested(false)
- {
-     // Save X screensaver parameters
-     XGetScreenSaver(qt_xdisplay(), &mXTimeout, &mXInterval,
-@@ -340,6 +341,7 @@ void SaverEngine::stopLockProcess()
-     kdDebug(1204) << "SaverEngine: stopping lock" << endl;
-     emitDCOPSignal("KDE_stop_screensaver()", TQByteArray());
- 
-+    mTerminationRequested=true;
-     mLockProcess.kill();
- 
-     if (mEnabled)
-@@ -357,7 +359,33 @@ void SaverEngine::stopLockProcess()
- 
- void SaverEngine::lockProcessExited()
- {
-+printf("Lock process exited\n\r"); fflush(stdout);
-+    bool abnormalExit = false;
-     kdDebug(1204) << "SaverEngine: lock exited" << endl;
-+    if (mLockProcess.normalExit() == false) {
-+        abnormalExit = true;
-+    }
-+    else {
-+        if (mLockProcess.exitStatus() != 0) {
-+            abnormalExit = true;
-+        }
-+    }
-+    if (mTerminationRequested == true) {
-+        abnormalExit = false;
-+    }
-+    if (abnormalExit == true) {
-+        // PROBABLE HACKING ATTEMPT DETECTED
-+        // Terminate the TDE session ASAP!
-+        // Values are explained at http://lists.kde.org/?l=kde-linux&m=115770988603387
-+        TQByteArray data;
-+        TQDataStream arg(data, IO_WriteOnly);
-+        arg << (int)0 << (int)0 << (int)2;
-+        if ( ! kapp->dcopClient()->send("ksmserver", "default", "logout(int,int,int)", data) ) {
-+            // Someone got to DCOP before we did
-+            // Try an emergency system logout
-+            system("logout");
-+        }
-+    }
-     if (trinity_lockeng_sak_available == TRUE) {
-         handleSecureDialog();
-     }
-diff --git a/kdesktop/lockeng.h b/kdesktop/lockeng.h
-index b1e31bd..ae81f90 100644
---- a/kdesktop/lockeng.h
-+++ b/kdesktop/lockeng.h
-@@ -114,6 +114,7 @@ protected:
- 
- private:
-     KProcess*   mSAKProcess;
-+    bool        mTerminationRequested;
- };
- 
- #endif
-commit 5f8d730703882e1335305a2c43a378f0c4b96e8e
-Author: Timothy Pearson <kb9vqf@pearsoncomputing.net>
-Date:   1327216641 -0600
-
-    Fix desktop lock
-
-diff --git a/kdesktop/lock/lockprocess.cc b/kdesktop/lock/lockprocess.cc
-index 2588bbf..5acc96e 100644
---- a/kdesktop/lock/lockprocess.cc
-+++ b/kdesktop/lock/lockprocess.cc
-@@ -630,6 +630,8 @@ void LockProcess::startSecureDialog()
- 		return;
- 	}
- 
-+	setGeometry(0, 0, mRootWidth, mRootHeight);
-+
- 	int ret;
- 	SecureDlg inDlg( this );
- 	inDlg.setRetInt(&ret);
-diff --git a/kdesktop/lock/main.cc b/kdesktop/lock/main.cc
-index 2711c36..c0b8e24 100644
---- a/kdesktop/lock/main.cc
-+++ b/kdesktop/lock/main.cc
-@@ -181,14 +181,14 @@ int main( int argc, char **argv )
-             rt = process.runSecureDialog();
-         }
-         else {
--            return 1;
-+            return 0;
-         }
-     }
-     else {
-         rt = process.defaultSave();
-     }
-     if (!rt) {
--        return 1;
-+        return 0;
-     }
- 
-     if( sig )
-diff --git a/kdesktop/lockeng.cc b/kdesktop/lockeng.cc
-index fb0f754..5307c5c 100644
---- a/kdesktop/lockeng.cc
-+++ b/kdesktop/lockeng.cc
-@@ -372,6 +372,7 @@ printf("Lock process exited\n\r"); fflush(stdout);
-     }
-     if (mTerminationRequested == true) {
-         abnormalExit = false;
-+        mTerminationRequested = false;
-     }
-     if (abnormalExit == true) {
-         // PROBABLE HACKING ATTEMPT DETECTED
diff --git a/redhat/tdebase/kdebase-3.5.13-fix_kdesu_kdesudo_argument_compatibility.patch b/redhat/tdebase/kdebase-3.5.13-fix_kdesu_kdesudo_argument_compatibility.patch
deleted file mode 100644
index 9dd7d7935..000000000
--- a/redhat/tdebase/kdebase-3.5.13-fix_kdesu_kdesudo_argument_compatibility.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-commit 59ee4f6630e6ed6b2712600a88d3ba9ce383620b
-Author: Timothy Pearson <kb9vqf@pearsoncomputing.net>
-Date:   1339467335 -0500
-
-    Fix tdesu/tdesudo argument compatibility problem
-
-diff --git a/kdesu/kdesu/kdesu.cpp b/kdesu/kdesu/kdesu.cpp
-index 3511b1f..8ea82fb 100644
---- a/kdesu/kdesu/kdesu.cpp
-+++ b/kdesu/kdesu/kdesu.cpp
-@@ -63,6 +63,7 @@ static KCmdLineOptions options[] = {
-     { "p <prio>", I18N_NOOP("Set priority value: 0 <= prio <= 100, 0 is lowest"), "50" },
-     { "r", I18N_NOOP("Use realtime scheduling"), 0 },
-     { "nonewdcop", I18N_NOOP("Let command use existing dcopserver"), 0 },
-+    { "comment <comment>", I18N_NOOP("Ignored"), "" },
-     { "noignorebutton", I18N_NOOP("Do not display ignore button"), 0 },
-     { "i <icon name>", I18N_NOOP("Specify icon to use in the password dialog"), 0},
-     { "d", I18N_NOOP("Do not show the command to be run in the dialog"), 0},
diff --git a/redhat/tdebase/kdebase-3.5.13-fix_kdm_cpu_usage.patch b/redhat/tdebase/kdebase-3.5.13-fix_kdm_cpu_usage.patch
deleted file mode 100644
index 1a80c00f1..000000000
--- a/redhat/tdebase/kdebase-3.5.13-fix_kdm_cpu_usage.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-commit 1e2983ad0107fb1d26e3e9931528701f30632c6d
-Author: Timothy Pearson <kb9vqf@pearsoncomputing.net>
-Date:   1326856834 -0600
-
-    Fix kdm_greet high CPU usage
-    Clean up a few build warnings
-
-diff --git a/kdm/kfrontend/kgreeter.cpp b/kdm/kfrontend/kgreeter.cpp
-index 9b974cc..5877cb6 100644
---- a/kdm/kfrontend/kgreeter.cpp
-+++ b/kdm/kfrontend/kgreeter.cpp
-@@ -273,6 +273,9 @@ void KGreeter::handleInputPipe(void) {
- 		readbuf[numread] = 0;
- 		readbuf[2047] = 0;
- 		inputcommand += readbuf;
-+		if (!tqApp->hasPendingEvents()) {
-+			usleep(500);
-+		}
- 		tqApp->processEvents();
- 	}
- 	if (closingDown) {
-@@ -508,11 +511,11 @@ KGreeter::insertUsers(int limit_users)
-                 int count = 0;
- 		for (setpwent(); (ps = getpwent()) != 0;) {
- 			if (*ps->pw_dir && *ps->pw_shell &&
--			    (ps->pw_uid >= (unsigned)_lowUserId ||
--			     !ps->pw_uid && _showRoot) &&
--			    ps->pw_uid <= (unsigned)_highUserId &&
--			    !noUsers.hasUser( ps->pw_name ) &&
--			    !noUsers.hasGroup( ps->pw_gid ))
-+			    ((ps->pw_uid >= (unsigned)_lowUserId) ||
-+			     ((!ps->pw_uid) && _showRoot)) &&
-+			    (ps->pw_uid <= (unsigned)_highUserId) &&
-+			    (!noUsers.hasUser( ps->pw_name )) &&
-+			    (!noUsers.hasGroup( ps->pw_gid )))
- 			{
- 				TQString username( TQFile::decodeName( ps->pw_name ) );
- 				if (!dupes.find( username )) {
-@@ -574,7 +577,7 @@ KGreeter::insertUsers(int limit_users)
- 			for (setpwent(); (ps = getpwent()) != 0;) {
- 				if (*ps->pw_dir && *ps->pw_shell &&
- 				    (ps->pw_uid >= (unsigned)_lowUserId ||
--				     !ps->pw_uid && _showRoot) &&
-+				     ((!ps->pw_uid) && _showRoot)) &&
- 				    ps->pw_uid <= (unsigned)_highUserId &&
- 				    (users.hasUser( ps->pw_name ) ||
- 				     users.hasGroup( ps->pw_gid )))
diff --git a/redhat/tdebase/kdebase-3.5.13-fix_khtml_smooth_scrolling.patch b/redhat/tdebase/kdebase-3.5.13-fix_khtml_smooth_scrolling.patch
deleted file mode 100644
index 99256971b..000000000
--- a/redhat/tdebase/kdebase-3.5.13-fix_khtml_smooth_scrolling.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-commit b45b4bd730da3196a4658773f7eef46e004a39d6
-Author: Timothy Pearson <kb9vqf@pearsoncomputing.net>
-Date:   1337063762 -0500
-
-    Fix KHTML smooth scrolling control center option
-    This closes Bug 1001
-    Thanks to Roman Savochenko for the patch!
-
-diff --git a/kcontrol/konqhtml/htmlopts.cpp b/kcontrol/konqhtml/htmlopts.cpp
-index 0b81421..9e199cb 100644
---- a/kcontrol/konqhtml/htmlopts.cpp
-+++ b/kcontrol/konqhtml/htmlopts.cpp
-@@ -299,7 +299,7 @@ void KMiscHTMLOptions::load( bool useDefaults )
-     KConfig kdeglobals("kdeglobals", true, false);
-     kdeglobals.setReadDefaults( useDefaults );
- 	 kdeglobals.setGroup("KDE");
--    bool smoothScrolling = kdeglobals.readBoolEntry("SmoothScroll", DEFAULT_SMOOTHSCROLL);
-+    bool smoothScrolling = kdeglobals.readBoolEntry("SmoothScrolling", DEFAULT_SMOOTHSCROLL);
-     if (smoothScrolling)
- 	m_pSmoothScrollingCombo->setCurrentItem( SmoothScrollingAlways );
-     else
-@@ -374,13 +374,13 @@ void KMiscHTMLOptions::save()
-     switch(m_pSmoothScrollingCombo->currentItem())
-     {
-       case SmoothScrollingAlways:
--        kdeglobals.writeEntry( "SmoothScroll", true );
-+        kdeglobals.writeEntry( "SmoothScrolling", true );
-         break;
-       case SmoothScrollingNever:
--        kdeglobals.writeEntry( "SmoothScroll", false );
-+        kdeglobals.writeEntry( "SmoothScrolling", false );
-         break;
-       // case SmoothScrollingWhenEfficient:
--        // kdeglobals.writeEntry( "SmoothScroll", somethingelse );
-+        // kdeglobals.writeEntry( "SmoothScrolling", somethingelse );
-         // break;
-     }
-     kdeglobals.sync();
diff --git a/redhat/tdebase/kdebase-3.5.13-fix_kio_sftp.patch b/redhat/tdebase/kdebase-3.5.13-fix_kio_sftp.patch
deleted file mode 100644
index 64dfa8e21..000000000
--- a/redhat/tdebase/kdebase-3.5.13-fix_kio_sftp.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-commit e72f4926c094b2bd94501518fbcd2a3e66a74f6a
-Author: Timothy Pearson <kb9vqf@pearsoncomputing.net>
-Date:   1335166907 -0500
-
-    Fix sftp failure on newer systems
-    This closes Bug 897
-
-diff --git a/kioslave/sftp/ksshprocess.cpp b/kioslave/sftp/ksshprocess.cpp
-index 2ccab59..3393f89 100644
---- a/kioslave/sftp/ksshprocess.cpp
-+++ b/kioslave/sftp/ksshprocess.cpp
-@@ -569,7 +569,9 @@ TQString KSshProcess::getLine() {
-         // If we still don't have anything in our buffer so there must
-         // not be anything on the pty or stderr. Setup a select()
-         // to wait for some data from SSH.
--        if( buffer.empty() ) {
-+        // Hack around select() failure on newer systems
-+        unsigned long milliseconds = 0;
-+        while ((buffer.size() == 0) && (milliseconds < (60*1000))) {
-             //kdDebug(KSSHPROC) << "KSshProcess::getLine(): " <<
-             //    "Line buffer empty, calling select() to wait for data." << endl;
-             int errfd = ssh.stderrFd();
-@@ -616,14 +618,18 @@ TQString KSshProcess::getLine() {
-             // had data on it first.
-             if( FD_ISSET(ptyfd, &rfds) ) {
-                 ptyLine = ssh.readLineFromPty(false);
--                buffer.prepend(TQString(ptyLine));
-+                if (ptyLine.size() > 0) {
-+                    buffer.prepend(TQString(ptyLine));
-+                }
-                 //kdDebug(KSSHPROC) << "KSshProcess::getLine(): "
-                 //    "line from pty -" << ptyLine  << endl;
-             }
--            
-+
-             if( FD_ISSET(errfd, &rfds) ) {
-                 errLine = ssh.readLineFromStderr(false);
--                buffer.prepend(TQString(errLine));
-+                if (errLine.size() > 0) {
-+                    buffer.prepend(TQString(errLine));
-+                }
-                 //kdDebug(KSSHPROC) << "KSshProcess::getLine(): "
-                 //    "line from err -" << errLine << endl;
-             }
-@@ -637,7 +643,11 @@ TQString KSshProcess::getLine() {
-                 kdDebug(KSSHPROC) << "KSshProcess::getLine(): "
-                     "Exception on std err file descriptor." << endl;
-             }
--            
-+
-+            if (buffer.size() == 0) {
-+                milliseconds++;
-+                usleep(1000);
-+            }
-         }
-     }
-    
diff --git a/redhat/tdebase/kdebase-3.5.13-fix_kio_sftp_nonstandard_ports.patch b/redhat/tdebase/kdebase-3.5.13-fix_kio_sftp_nonstandard_ports.patch
deleted file mode 100644
index 00d3eea50..000000000
--- a/redhat/tdebase/kdebase-3.5.13-fix_kio_sftp_nonstandard_ports.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-commit 073dc86aceaa060597d7653747c3c6c14d0ed59d
-Author: Timothy Pearson <kb9vqf@pearsoncomputing.net>
-Date:   1335311121 -0500
-
-    Fix sftp when nonstandard port is specified in ssh config
-
-diff --git a/kioslave/sftp/kio_sftp.cpp b/kioslave/sftp/kio_sftp.cpp
-index 2316c8c..04a2b33 100644
---- a/kioslave/sftp/kio_sftp.cpp
-+++ b/kioslave/sftp/kio_sftp.cpp
-@@ -481,11 +481,7 @@ void sftpProtocol::setHost (const TQString& h, int port, const TQString& user, c
-     if( port > 0 )
-         mPort = port;
-     else {
--        struct servent *pse;
--        if( (pse = getservbyname("ssh", "tcp") ) == NULL )
--            mPort = 22;
--        else
--            mPort = ntohs(pse->s_port);
-+        mPort = -1;
-     }
- 
-     mUsername = user;
diff --git a/redhat/tdebase/kdebase-3.5.13-fix_kxdglauncher_document.patch b/redhat/tdebase/kdebase-3.5.13-fix_kxdglauncher_document.patch
deleted file mode 100644
index 015270759..000000000
--- a/redhat/tdebase/kdebase-3.5.13-fix_kxdglauncher_document.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-commit f752bcbf6585c61f414963ad83e1300a1da08504
-Author: Darrell Anderson <humanreadable@yahoo.com>
-Date:   1333232616 -0500
-
-    Fix "Malformed URL $( kxdglauncher --getpath xdgname DOCUMENTS )" error dialog.
-
-diff --git a/kioslave/system/entries/documents.desktop b/kioslave/system/entries/documents.desktop
-index e5fc3d1..d65cc3d 100644
---- a/kioslave/system/entries/documents.desktop
-+++ b/kioslave/system/entries/documents.desktop
-@@ -1,6 +1,6 @@
- [Desktop Entry]
- Type=Link
--Path=$( kxdglauncher --getpath --xdgname DOCUMENTS )
-+URL=$( kxdglauncher --getpath --xdgname DOCUMENTS )
- Icon=folder_man
- Name=Documents Folder
- Name[af]=Dokument Gids
diff --git a/redhat/tdebase/kdebase-3.5.13-fix_lib_detection.patch b/redhat/tdebase/kdebase-3.5.13-fix_lib_detection.patch
deleted file mode 100644
index 15092a8c4..000000000
--- a/redhat/tdebase/kdebase-3.5.13-fix_lib_detection.patch
+++ /dev/null
@@ -1,102 +0,0 @@
---- kdebase/ConfigureChecks.cmake.libdetect	2012-09-06 20:55:39.679897201 +0200
-+++ kdebase/ConfigureChecks.cmake	2012-09-06 21:06:41.454048511 +0200
-@@ -100,22 +100,26 @@
- # xext (kwin/kompmgr)
- if( WITH_XEXT )
-   pkg_search_module( XEXT xext )
--  if( XEXT_FOUND )
--    set( HAVE_XEXT 1 )
--  else( XEXT_FOUND )
--    tde_message_fatal( "xext is requested, but was not found on your system" )
-+  if( NOT XEXT_FOUND )
-+    find_path( XEXT_INCLUDE_DIR  "X11/extensions/Xext.h" )
-+    if ( NOT XEXT_INCLUDE_DIR )
-+      tde_message_fatal( "xext is requested, but was not found on your system" )
-+    endif( )
-   endif( )
-+  set( HAVE_XEXT 1 )
- endif( )
- 
- 
- # xtest (kxkb)
- if( WITH_XTEST )
-   pkg_search_module( XTEST xtst )
--  if( XTEST_FOUND )
--    set( HAVE_XTEST 1 )
--  else( XTEST_FOUND )
--    tde_message_fatal( "xtest is requested, but was not found on your system" )
-+  if( NOT XTEST_FOUND )
-+    find_path ( XTEST_INCLUDE_DIR "X11/extensions/XTest.h" )
-+    if( NOT XTEST_INCLUDE_DIR )
-+      tde_message_fatal( "xtest is requested, but was not found on your system" )
-+    endif( )
-   endif( )
-+  set( HAVE_XTEST 1 )
- endif( )
- 
- 
-@@ -125,12 +129,20 @@
-   if( HAVE_XSSLIB )
-     pkg_search_module( XSS xscrnsaver )
-   else( )
--    check_library_exists( Xext XScreenSaverQueryInfo "" HAVE_XSSLIB )
--    if( HAVE_XSSLIB )
--      pkg_search_module( XSS xext )
-+    find_path( XSS_LIBRARY_DIR "libXss.so" )
-+    if( XSS_LIBRARY_DIR )
-+      set( HAVE_XSSLIB 1 )
-+    else( )
-+      check_library_exists( Xext XScreenSaverQueryInfo "" HAVE_XSSLIB )
-+      if( HAVE_XSSLIB )
-+        pkg_search_module( XSS xext )
-+      endif( )
-     endif( )
-   endif( )
--  check_include_file( X11/extensions/scrnsaver.h HAVE_XSCREENSAVER_H )
-+  find_path( XSCREENSAVER_INCLUDE_DIR "X11/extensions/scrnsaver.h" )
-+  if( XSCREENSAVER_INCLUDE_DIR )
-+    set( HAVE_XSCREENSAVER_H 1 )
-+  endif( )
-   if( HAVE_XSSLIB AND HAVE_XSCREENSAVER_H )
-     set( HAVE_XSCREENSAVER 1 )
-   else( )
---- kdebase/kcontrol/ConfigureChecks.cmake.ORI	2012-09-06 21:14:07.070747861 +0200
-+++ kdebase/kcontrol/ConfigureChecks.cmake	2012-09-06 21:18:33.159501490 +0200
-@@ -59,10 +59,13 @@
- 
- if( WITH_LIBUSB )
-   pkg_search_module( LIBUSB libusb )
--  if( LIBUSB_FOUND )
--    set( HAVE_LIBUSB 1 CACHE INTERNAL "" FORCE )
--  else( )
--    tde_message_fatal( "libusb are requested, but not found on your system" )
-+  if( NOT LIBUSB_FOUND )
-+    find_path( LIBUSB_LIBRARY_DIR libusb.so )
-+    if( LIBUSB_LIBRARY_DIR )
-+      set( HAVE_LIBUSB 1 CACHE INTERNAL "" FORCE )
-+    else( )
-+      #tde_message_fatal( "libusb are requested, but not found on your system" )
-+    endif( )
-   endif( )
- endif( )
- 
---- kdebase/kdm/ConfigureChecks.cmake.ORI	2012-09-06 21:43:53.814013510 +0200
-+++ kdebase/kdm/ConfigureChecks.cmake	2012-09-06 21:44:10.768708628 +0200
-@@ -112,7 +112,7 @@
- # Xau
- pkg_search_module( XAU xau )
- if( NOT XAU_FOUND )
--  tde_message_fatal( "Xau are required, but not found on your system" )
-+  set( XAU_LIBRARIES "-lXau" )
- endif()
- 
- 
-@@ -122,7 +122,7 @@
-   if( XDMCP_FOUND )
-     set( XDMCP 1 CACHE INTERNAL "" FORCE )
-   else()
--    tde_message_fatal( "xdmcp is requested, but was not found on your system" )
-+    set( XDMCP_LIBRARIES "-lXdmcp" )
-   endif()
- endif()
- 
diff --git a/redhat/tdebase/kdebase-3.5.13-fix_lock_failure.patch b/redhat/tdebase/kdebase-3.5.13-fix_lock_failure.patch
deleted file mode 100644
index 6cb257d9b..000000000
--- a/redhat/tdebase/kdebase-3.5.13-fix_lock_failure.patch
+++ /dev/null
@@ -1,84 +0,0 @@
-commit 67a3a8f34892a6491ba0073a3f583503b44e58e7
-Author: Timothy Pearson <kb9vqf@pearsoncomputing.net>
-Date:   1335211141 -0500
-
-    Fix desktop lock failure due to race condition within signal handler between qt and xcb
-
-diff --git a/kdesktop/lock/lockprocess.cc b/kdesktop/lock/lockprocess.cc
-index c0050d3..3c67ac0 100644
---- a/kdesktop/lock/lockprocess.cc
-+++ b/kdesktop/lock/lockprocess.cc
-@@ -659,6 +659,7 @@ void LockProcess::startSecureDialog()
- 	mBusy = false;
- 	trinity_desktop_lock_in_sec_dlg = false;
- 	if (ret == 0) {
-+		trinity_desktop_lock_closing_windows = 1;
- 		kapp->quit();
- 	}
- 	if (ret == 1) {
-@@ -687,6 +688,7 @@ void LockProcess::startSecureDialog()
- 		mBusy = false;
- 	}
- 	if (ret == 2) {
-+		trinity_desktop_lock_closing_windows = 1;
- 		if (system("ksysguard &") == -1) {
-                     // Error handler to shut up gcc warnings
-                 }
-diff --git a/kdesktop/lock/main.cc b/kdesktop/lock/main.cc
-index 5853da1..225d9c5 100644
---- a/kdesktop/lock/main.cc
-+++ b/kdesktop/lock/main.cc
-@@ -260,7 +260,7 @@ int main( int argc, char **argv )
- 
-         bool rt;
-         bool sig = false;
--        if( !child && (args->isSet( "forcelock" ) || (signalled_forcelock == TRUE)))
-+        if( (((!child) && (args->isSet( "forcelock" ))) || (signalled_forcelock == TRUE)))
-         {
-             rt = process.lock();
-             sig = true;
-diff --git a/kdesktop/lockeng.cc b/kdesktop/lockeng.cc
-index 9eb88e1..f24d02f 100644
---- a/kdesktop/lockeng.cc
-+++ b/kdesktop/lockeng.cc
-@@ -34,7 +34,7 @@ SaverEngine* m_masterSaverEngine = NULL;
- static void sigusr1_handler(int)
- {
-     if (m_masterSaverEngine) {
--        m_masterSaverEngine->lockProcessWaiting();
-+        m_masterSaverEngine->slotLockProcessWaiting();
-     }
- }
- 
-@@ -445,6 +445,13 @@ void SaverEngine::lockProcessExited()
-     }
- }
- 
-+void SaverEngine::slotLockProcessWaiting()
-+{
-+    // lockProcessWaiting cannot be called directly from a signal handler, as it will hang in certain obscure circumstances
-+    // Instead we use a single-shot timer to immediately call lockProcessWaiting once control has returned to the Qt main loop
-+    TQTimer::singleShot(0, this, SLOT(lockProcessWaiting()));
-+}
-+
- void SaverEngine::lockProcessWaiting()
- {
-     kdDebug(1204) << "SaverEngine: lock exited" << endl;
-diff --git a/kdesktop/lockeng.h b/kdesktop/lockeng.h
-index ae08e9a..e42a048 100644
---- a/kdesktop/lockeng.h
-+++ b/kdesktop/lockeng.h
-@@ -79,11 +79,12 @@ public:
-     virtual void saverLockReady();
- 
- public slots:
--    void lockProcessWaiting();
-+    void slotLockProcessWaiting();
- 
- protected slots:
-     void idleTimeout();
-     void lockProcessExited();
-+    void lockProcessWaiting();
- 
- private slots:
-     void handleSecureDialog();
diff --git a/redhat/tdebase/kdebase-3.5.13-fix_menu_crash_with_disabled_search.patch b/redhat/tdebase/kdebase-3.5.13-fix_menu_crash_with_disabled_search.patch
deleted file mode 100644
index b52e51188..000000000
--- a/redhat/tdebase/kdebase-3.5.13-fix_menu_crash_with_disabled_search.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-commit 0afb2d8a78d212568f6836dd0e7d41382cfb991d
-Author: Slávek Banko <slavek.banko@axis.cz>
-Date:   1341682699 +0200
-
-    Fix menu crash with disabled search field
-    This resolves Bug 1081
-
-diff --git a/kicker/kicker/ui/k_mnu.cpp b/kicker/kicker/ui/k_mnu.cpp
-index b7cfe8f..702c921 100644
---- a/kicker/kicker/ui/k_mnu.cpp
-+++ b/kicker/kicker/ui/k_mnu.cpp
-@@ -273,6 +273,8 @@ void PanelKMenu::initialize()
-         connect(searchEdit, TQT_SIGNAL(textChanged(const TQString&)),
-             this, TQT_SLOT( slotUpdateSearch( const TQString&)));
-         insertItem(hbox, searchLineID, 0);
-+    } else {
-+        searchEdit = NULL;
-     }
- 
-     //TQToolTip::add(clearButton, i18n("Clear Search"));
diff --git a/redhat/tdebase/kdebase-3.5.13-fix_multihead_desktop_lock.patch b/redhat/tdebase/kdebase-3.5.13-fix_multihead_desktop_lock.patch
deleted file mode 100644
index f2aed5a2d..000000000
--- a/redhat/tdebase/kdebase-3.5.13-fix_multihead_desktop_lock.patch
+++ /dev/null
@@ -1,297 +0,0 @@
-Index: kdesktop/lock/lockdlg.cc
-===================================================================
---- kdesktop/lock/lockdlg.cc	(revision 1261452)
-+++ kdesktop/lock/lockdlg.cc	(working copy)
-@@ -115,7 +115,7 @@
-         frame->setFrameStyle( TQFrame::Panel | TQFrame::Raised );
-     frame->setLineWidth( 2 );
- 
--    TQLabel *pixLabel;
-+    TQLabel *pixLabel = NULL;
-     if (!trinity_desktop_lock_use_system_modal_dialogs) {
-         pixLabel = new TQLabel( frame, "pixlabel" );
-         pixLabel->setPixmap(DesktopIcon("lock"));
-@@ -134,7 +134,7 @@
-                 i18n("<nobr><b>The session was locked by %1</b><br>").arg( user.fullName() ), frame );
-     }
- 
--    TQLabel *lockDTLabel;
-+    TQLabel *lockDTLabel = NULL;
-     if ((trinity_desktop_lock_use_system_modal_dialogs) && (!m_lockStartDT.isNull())) {
-         lockDTLabel = new TQLabel(i18n("This session has been locked since %1").arg(m_lockStartDT.toString()), frame);
-     }
-Index: kdesktop/lock/lockprocess.cc
-===================================================================
---- kdesktop/lock/lockprocess.cc	(revision 1261452)
-+++ kdesktop/lock/lockprocess.cc	(working copy)
-@@ -173,6 +173,7 @@
-       mDialogControlLock(false),
-       mForceReject(false),
-       currentDialog(NULL),
-+      mEnsureScreenHiddenTimer(NULL),
-       mForceContinualLockDisplayTimer(NULL),
-       mEnsureVRootWindowSecurityTimer(NULL),
-       mHackDelayStartupTimer(NULL),
-@@ -288,6 +289,10 @@
-         hackResumeTimer->stop();
-         delete hackResumeTimer;
-     }
-+    if (mEnsureScreenHiddenTimer != NULL) {
-+        mEnsureScreenHiddenTimer->stop();
-+        delete mEnsureScreenHiddenTimer;
-+    }
-     if (mForceContinualLockDisplayTimer != NULL) {
-         mForceContinualLockDisplayTimer->stop();
-         delete mForceContinualLockDisplayTimer;
-@@ -410,7 +415,7 @@
-         if (numread > 0) {
-             if (readbuf[0] == 'C') {
-                 mInfoMessageDisplayed=false;
--                while (mDialogControlLock == true) sleep(1);
-+                while (mDialogControlLock == true) usleep(100000);
-                 mDialogControlLock = true;
-                 if (currentDialog != NULL) {
-                     mForceReject = true;
-@@ -423,7 +428,7 @@
-                 to_display = to_display.remove(0,1);
-                 // Lock out password dialogs and close any active dialog
-                 mInfoMessageDisplayed=true;
--                while (mDialogControlLock == true) sleep(1);
-+                while (mDialogControlLock == true) usleep(100000);
-                 mDialogControlLock = true;
-                 if (currentDialog != NULL) {
-                     mForceReject = true;
-@@ -444,7 +449,7 @@
-                 to_display = to_display.remove(0,1);
-                 // Lock out password dialogs and close any active dialog
-                 mInfoMessageDisplayed=true;
--                while (mDialogControlLock == true) sleep(1);
-+                while (mDialogControlLock == true) usleep(100000);
-                 mDialogControlLock = true;
-                 if (currentDialog != NULL) {
-                     mForceReject = true;
-@@ -468,7 +473,7 @@
-                 to_display = to_display.remove(0,1);
-                 // Lock out password dialogs and close any active dialog
-                 mInfoMessageDisplayed=true;
--                while (mDialogControlLock == true) sleep(1);
-+                while (mDialogControlLock == true) usleep(100000);
-                 mDialogControlLock = true;
-                 if (currentDialog != NULL) {
-                     mForceReject = true;
-@@ -887,8 +892,13 @@
-     mRootWidth = rootAttr.width;
-     mRootHeight = rootAttr.height;
- 
-+    // Resize the background widget
-     setGeometry(0, 0, mRootWidth, mRootHeight);
- 
-+    // Black out the background widget to hide ugly resize tiling artifacts
-+    setBackgroundColor(black);
-+    erase();
-+
-     // This slot needs to be able to execute very rapidly so as to prevent the user's desktop from ever
-     // being displayed, so we finish the hack restarting/display prettying operations in a separate timed slot
-     if (resizeTimer == NULL) {
-@@ -902,7 +912,7 @@
- {
-     stopHack();
- 
--    while (mDialogControlLock == true) sleep(1);
-+    while (mDialogControlLock == true) usleep(100000);
-     mDialogControlLock = true;
-     if (closeCurrentWindow()) {
-         TQTimer::singleShot( 0, this, SLOT(doDesktopResizeFinish()) );
-@@ -911,7 +921,13 @@
-     mDialogControlLock = false;
- 
-     // Restart the hack as the window size is now different
--    startHack();
-+    if (trinity_desktop_lock_delay_screensaver_start && trinity_desktop_lock_forced && trinity_desktop_lock_use_system_modal_dialogs) {
-+        ENABLE_CONTINUOUS_LOCKDLG_DISPLAY
-+        if (mHackStartupEnabled) mHackDelayStartupTimer->start(mHackDelayStartupTimeout, TRUE);
-+    }
-+    else {
-+        startHack();
-+    }
- 
-     mBusy = false;
- }
-@@ -1064,7 +1080,7 @@
- 
-     if (!grabKeyboard())
-     {
--        sleep(1);
-+        usleep(100000);
-         if (!grabKeyboard())
-         {
-             return false;
-@@ -1073,7 +1089,7 @@
- 
-     if (!grabMouse())
-     {
--        sleep(1);
-+        usleep(100000);
-         if (!grabMouse())
-         {
-             XUngrabKeyboard(qt_xdisplay(), CurrentTime);
-@@ -1117,7 +1133,7 @@
- 	m_grayImage.fill(0);	// Set the alpha buffer to 0 (fully transparent)
- 	m_grayImage.setAlphaBuffer(true);
- 	TQPixmap m_root;
--	m_root.resize( TQApplication::desktop()->geometry().width(), TQApplication::desktop()->geometry().height() );
-+	m_root.resize(mRootWidth, mRootHeight);
- 	TQPainter p;
- 	p.begin( &m_root );
- 	m_grayImage.setAlphaBuffer(false);
-@@ -1144,14 +1160,21 @@
- 			setBackgroundColor(black);
- 		else
- 			setBackgroundPixmap(backingPixmap);
-+		setGeometry(0, 0, mRootWidth, mRootHeight);
- 		erase();
- 	}
- 	if (trinity_desktop_lock_use_system_modal_dialogs) {
- 		// Try to get the root pixmap
--		m_rootPixmap = new KRootPixmap(this);
-+		if (!m_rootPixmap) m_rootPixmap = new KRootPixmap(this);
- 		m_rootPixmap->setCustomPainting(true);
- 		connect(m_rootPixmap, TQT_SIGNAL(backgroundUpdated(const TQPixmap &)), this, TQT_SLOT(slotPaintBackground(const TQPixmap &)));
- 		m_rootPixmap->start();
-+		// Sometimes KRootPixmap fails...make sure the desktop is hidden regardless
-+		if (!mEnsureScreenHiddenTimer) {
-+			mEnsureScreenHiddenTimer = new TQTimer( this );
-+			connect( mEnsureScreenHiddenTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotForcePaintBackground()) );
-+		}
-+		mEnsureScreenHiddenTimer->start(2000, true);
- 	}
- 
- 	if (trinity_desktop_lock_in_sec_dlg == FALSE) {
-@@ -1275,6 +1298,7 @@
- 		if (!mHackProc.isRunning()) {
- 			if (backingPixmap.isNull()) {
- 				setBackgroundColor(black);
-+				setGeometry(0, 0, mRootWidth, mRootHeight);
- 				erase();
- 			}
- 			else {
-@@ -1298,6 +1322,7 @@
- 		setBackgroundColor(black);
- 	else
- 		setBackgroundPixmap(backingPixmap);
-+	setGeometry(0, 0, mRootWidth, mRootHeight);
- 	erase();
-         return false;
-     }
-@@ -1344,6 +1369,7 @@
- 				setBackgroundColor(black);
- 			else
- 				setBackgroundPixmap(backingPixmap);
-+			setGeometry(0, 0, mRootWidth, mRootHeight);
- 			erase();
- 			mSuspended = false;
- 		}
-@@ -1377,7 +1403,10 @@
- 			else
- 				setBackgroundPixmap(backingPixmap);
- 		}
--		if (backingPixmap.isNull()) erase();
-+		if (backingPixmap.isNull()) {
-+			setGeometry(0, 0, mRootWidth, mRootHeight);
-+			erase();
-+		}
- 		else bitBlt(this, 0, 0, &backingPixmap);
- 		if (trinity_desktop_lock_use_system_modal_dialogs) {
- 			ENABLE_CONTINUOUS_LOCKDLG_DISPLAY
-@@ -1416,7 +1445,10 @@
- 		else
- 			setBackgroundPixmap(backingPixmap);
- 	}
--	if (backingPixmap.isNull()) erase();
-+	if (backingPixmap.isNull()) {
-+		setGeometry(0, 0, mRootWidth, mRootHeight);
-+		erase();
-+	}
- 	else bitBlt(this, 0, 0, &backingPixmap);
- 	if (!mSuspended) {
- 		if (trinity_desktop_lock_use_system_modal_dialogs) {
-@@ -1492,6 +1524,7 @@
- 		setBackgroundColor(black);
- 	else
- 		setBackgroundPixmap(backingPixmap);
-+	setGeometry(0, 0, mRootWidth, mRootHeight);
- 	erase();
-         return;
-     }
-@@ -1597,10 +1630,13 @@
-     }
-     mDialogs.prepend( dlg );
-     fakeFocusIn( dlg->winId());
--    if (backingPixmap.isNull() && trinity_desktop_lock_use_system_modal_dialogs) erase();
-+    if (backingPixmap.isNull() && trinity_desktop_lock_use_system_modal_dialogs) {
-+        setGeometry(0, 0, mRootWidth, mRootHeight);
-+        erase();
-+    }
-     else bitBlt(this, 0, 0, &backingPixmap);
-     int rt = dlg->exec();
--    while (mDialogControlLock == true) sleep(1);
-+    while (mDialogControlLock == true) usleep(100000);
-     currentDialog = NULL;
-     mDialogs.remove( dlg );
-     if( mDialogs.isEmpty() ) {
-@@ -1624,8 +1660,18 @@
-     return rt;
- }
- 
-+void LockProcess::slotForcePaintBackground()
-+{
-+	TQPixmap blankPixmap(mRootWidth, mRootHeight);
-+	blankPixmap.fill(Qt::black);
-+	slotPaintBackground(blankPixmap);
-+	printf("[WARNING] Unable to obtain desktop wallpaper in a timely manner.  High system load or possibly a TDE bug!\n\r"); fflush(stdout);
-+}
-+
- void LockProcess::slotPaintBackground(const TQPixmap &rpm)
- {
-+	mEnsureScreenHiddenTimer->stop();
-+
- 	TQPixmap pm = rpm;
- 
- 	if (TQPaintDevice::x11AppDepth() == 32) {
-@@ -1652,6 +1698,7 @@
- 	backingPixmap = pm;
- 	if (trinity_desktop_lock_delay_screensaver_start && trinity_desktop_lock_forced) {
- 		setBackgroundPixmap(backingPixmap);
-+		setGeometry(0, 0, mRootWidth, mRootHeight);
- 		erase();
- 	}
- }
-@@ -1677,7 +1724,7 @@
-         mBusy=true;
-         TQTimer::singleShot(1000, this, TQT_SLOT(slotDeadTimePassed()));
-         if (mkeyCode == XKeysymToKeycode(qt_xdisplay(), XF86XK_Display)) {
--            while (mDialogControlLock == true) sleep(1);
-+            while (mDialogControlLock == true) usleep(100000);
-             mDialogControlLock = true;
-             currentDialog->close();		// DO NOT use closeCurrentWindow() here!
-             mDialogControlLock = false;
-Index: kdesktop/lock/lockprocess.h
-===================================================================
---- kdesktop/lock/lockprocess.h	(revision 1261452)
-+++ kdesktop/lock/lockprocess.h	(working copy)
-@@ -74,6 +74,7 @@
-     void doDesktopResizeFinish();
-     void doFunctionKeyBroadcast();
-     void slotPaintBackground(const TQPixmap &pm);
-+    void slotForcePaintBackground();
- 
- protected:
-     virtual bool x11Event(XEvent *);
-@@ -181,6 +182,7 @@
-     bool        mForceReject;
-     TQDialog     *currentDialog;
- 
-+    TQTimer*    mEnsureScreenHiddenTimer;
-     TQTimer*    mForceContinualLockDisplayTimer;
-     TQTimer*    mEnsureVRootWindowSecurityTimer;
-     TQTimer*    mHackDelayStartupTimer;
diff --git a/redhat/tdebase/kdebase-3.5.13-fix_potential_ABI_compat_problem.patch b/redhat/tdebase/kdebase-3.5.13-fix_potential_ABI_compat_problem.patch
deleted file mode 100644
index ce8b23182..000000000
--- a/redhat/tdebase/kdebase-3.5.13-fix_potential_ABI_compat_problem.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-commit 77041d785dbbede734f8dc44aa454d07d14f0317
-Author: Timothy Pearson <kb9vqf@pearsoncomputing.net>
-Date:   1329161441 -0600
-
-    Clean up 9cc1e2c1 changes to enum
-    This corrects a potential ABI compat problem noted by Martin Gräßlin
-
-diff --git a/twin/lib/kdecoration.h b/twin/lib/kdecoration.h
-index 19fe494..f18f970 100644
---- a/kwin/lib/kdecoration.h
-+++ b/kwin/lib/kdecoration.h
-@@ -97,10 +97,10 @@ public:
-         LowerOp,
-         FullScreenOp,
-         NoBorderOp,
--	ShadowOp,
-         NoOp,
-         SetupWindowShortcutOp,
--        ApplicationRulesOp     ///< @since 3.5
-+        ApplicationRulesOp,    ///< @since 3.5
-+        ShadowOp               ///< @since 3.5.12
-         };
-     /**
-      * Basic color types that should be recognized by all decoration styles.
diff --git a/redhat/tdebase/kdebase-3.5.13-fix_race_condition.patch b/redhat/tdebase/kdebase-3.5.13-fix_race_condition.patch
deleted file mode 100644
index 868c8c3cb..000000000
--- a/redhat/tdebase/kdebase-3.5.13-fix_race_condition.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-commit 9e172fa7a1e93cc77e09616eb793b823d29ebaec
-Author: Darrell Anderson <humanreadable@yahoo.com>
-Date:   1333594438 -0500
-
-    Temporary fix for a probable race condition on some systems.
-    Still needs to be resolved by determining the root cause.
-    Partially resolves bug report 760.
-
-diff --git a/kioslave/system/kdedmodule/systemdirnotify.cpp b/kioslave/system/kdedmodule/systemdirnotify.cpp
-index 162d966..99b9ac7 100644
---- a/kioslave/system/kdedmodule/systemdirnotify.cpp
-+++ b/kioslave/system/kdedmodule/systemdirnotify.cpp
-@@ -36,6 +36,9 @@ SystemDirNotify::SystemDirNotify()
- void SystemDirNotify::init()
- {
- 	if( mInited )
-+		// FIXME Work around a race condition by inserting kdDebug delay before following
-+		// code is executed -- the root cause of the race should be investigated and fixed.
-+		kdDebug() << "SystemDirNotify::init(" << mInited << ")" << endl;
- 		return;
- 	mInited = true;
- 	KGlobal::dirs()->addResourceType("system_entries",
diff --git a/redhat/tdebase/kdebase-3.5.13-fix_rhel4_compilation.patch b/redhat/tdebase/kdebase-3.5.13-fix_rhel4_compilation.patch
deleted file mode 100644
index 21ee6a4bf..000000000
--- a/redhat/tdebase/kdebase-3.5.13-fix_rhel4_compilation.patch
+++ /dev/null
@@ -1,152 +0,0 @@
---- kdebase/kwin/kompmgr/kompmgr.c.rhel4	2012-09-06 22:02:37.201586743 +0200
-+++ kdebase/kwin/kompmgr/kompmgr.c	2012-09-06 22:04:39.529337359 +0200
-@@ -89,6 +89,8 @@
- #include <pwd.h>
- #endif
- 
-+#define ShapeInput                     2
-+
- typedef enum {
-     WINTYPE_DESKTOP,
-     WINTYPE_DOCK,
-@@ -403,6 +405,70 @@
- #endif
- }
- 
-+void
-+loadConfig(char *filename){
-+	FILE           *file = NULL;
-+	char            line[ 1024 ];
-+	size_t          length = 0;
-+	Bool            wasNull = False;
-+	Bool            section = False;
-+
-+	if( filename == NULL ){
-+#ifdef USE_ENV_HOME
-+		const char *home = getenv("HOME");
-+#else
-+		const char *home;
-+		struct passwd *p;
-+		p = getpwuid(getuid());
-+		if (p)
-+			home = p->pw_dir;
-+		else
-+			home = getenv("HOME");
-+#endif
-+		const char *configfile = "/.xcompmgrrc"; 
-+		int n = strlen(home)+strlen(configfile)+1;
-+		filename = (char*)malloc(n*sizeof(char));
-+		memset(filename,0,n);
-+		wasNull = True;
-+
-+		strcat(filename, home);
-+		strcat(filename, configfile);
-+	}
-+
-+	printf("trying '%s' as configfile\n\n", filename);
-+
-+	if( (file = fopen(filename, "r")) == NULL ){
-+		printf("failed to open config file. does it exist?\n");
-+		if( wasNull ){
-+			free(filename);
-+			filename = NULL;
-+		}
-+		return;
-+	}
-+
-+	/*find section*/
-+	while( !section && fgets(line, 1023, file) != NULL ){
-+		if( strcmp(line, "[xcompmgr]\n") == 0 )
-+			section = True;
-+	}
-+	/*read and set values*/
-+	while( section && fgets(line, 1023, file) != NULL ){
-+		int ret = strlen( line );
-+		if( ret > 1 ){
-+			if( *line == '[' )/*found new section - maybe check for '\n'?*/
-+				break;
-+			*(line+ret-1) = '\0';
-+			setParameter(line);
-+		}
-+	}
-+	printf("\nfinished parsing the config file\n");
-+	fclose(file);
-+	if( wasNull ){
-+		free(filename);
-+		filename = NULL;
-+	}
-+}
-+
- void handle_siguser (int sig)
- {
-     int uidnum;
-@@ -2992,69 +3058,6 @@
- 	return 0;
- }
- 
--void
--loadConfig(char *filename){
--	FILE           *file = NULL;
--	char            line[ 1024 ];
--	size_t          length = 0;
--	Bool            wasNull = False;
--	Bool            section = False;
--
--	if( filename == NULL ){
--#ifdef USE_ENV_HOME
--		const char *home = getenv("HOME");
--#else
--		const char *home;
--		struct passwd *p;
--		p = getpwuid(getuid());
--		if (p)
--			home = p->pw_dir;
--		else
--			home = getenv("HOME");
--#endif
--		const char *configfile = "/.xcompmgrrc"; 
--		int n = strlen(home)+strlen(configfile)+1;
--		filename = (char*)malloc(n*sizeof(char));
--		memset(filename,0,n);
--		wasNull = True;
--
--		strcat(filename, home);
--		strcat(filename, configfile);
--	}
--
--	printf("trying '%s' as configfile\n\n", filename);
--
--	if( (file = fopen(filename, "r")) == NULL ){
--		printf("failed to open config file. does it exist?\n");
--		if( wasNull ){
--			free(filename);
--			filename = NULL;
--		}
--		return;
--	}
--
--	/*find section*/
--	while( !section && fgets(line, 1023, file) != NULL ){
--		if( strcmp(line, "[xcompmgr]\n") == 0 )
--			section = True;
--	}
--	/*read and set values*/
--	while( section && fgets(line, 1023, file) != NULL ){
--		int ret = strlen( line );
--		if( ret > 1 ){
--			if( *line == '[' )/*found new section - maybe check for '\n'?*/
--				break;
--			*(line+ret-1) = '\0';
--			setParameter(line);
--		}
--	}
--	printf("\nfinished parsing the config file\n");
--	fclose(file);
--	if( wasNull ){
--		free(filename);
--		filename = NULL;
--	}
--}
- 
- 	void
- usage (char *program)
diff --git a/redhat/tdebase/kdebase-3.5.13-fix_tooltip_lock.patch b/redhat/tdebase/kdebase-3.5.13-fix_tooltip_lock.patch
deleted file mode 100644
index 6fc4d2e5e..000000000
--- a/redhat/tdebase/kdebase-3.5.13-fix_tooltip_lock.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- kdebase/kdesktop/lock/lockprocess.cc.tooltips	2012-08-10 15:16:14.047229047 +0200
-+++ kdebase/kdesktop/lock/lockprocess.cc	2012-08-10 15:41:08.433645385 +0200
-@@ -960,6 +960,26 @@
- 
-     setGeometry(0, 0, mRootWidth, mRootHeight);
- 
-+	// Hack to close all tooltips on screen
-+	Window rootWindow = RootWindow(x11Display(), x11Screen());
-+	Window parent;
-+	Window* children = NULL;
-+	Window* child = NULL;
-+	unsigned int noOfChildren = 0;
-+	XWindowAttributes childAttr;
-+	Window childTransient;
-+	 
-+	if(XQueryTree(x11Display(), rootWindow, &rootWindow, &parent, &children, &noOfChildren) && noOfChildren>0 ) {
-+		for (unsigned int i=0; i<noOfChildren; i++) {
-+			if (XGetWindowAttributes(x11Display(), children[i], &childAttr) && XGetTransientForHint(x11Display(), children[i], &childTransient)) {
-+				if((childAttr.map_state == IsViewable) && (childAttr.override_redirect) && (childTransient)) {
-+					XUnmapWindow(x11Display(), children[i]);
-+				}
-+			}
-+		}
-+	}
-+	
-+
-     kdDebug(1204) << "Saver window Id: " << winId() << endl;
- }
- 
diff --git a/redhat/tdebase/kdebase-3.5.13-fix_translations_in_desktop_files.patch b/redhat/tdebase/kdebase-3.5.13-fix_translations_in_desktop_files.patch
deleted file mode 100644
index 3bf1c1fbe..000000000
--- a/redhat/tdebase/kdebase-3.5.13-fix_translations_in_desktop_files.patch
+++ /dev/null
@@ -1,105 +0,0 @@
---- a/kdesktop/init/My_Documents	2011-10-24 00:31:04.000000000 +0200
-+++ b/kdesktop/init/My_Documents	2012-02-15 19:03:22.830485960 +0100
-@@ -3,12 +3,10 @@
- Icon=folder_wordprocessing
- Name=My Documents
- Name[af]=Dokument Gids
--Name[ar]=مستنداتي
-+Name[ar]=مستنداتي
- Name[be]=Тэчка для дакументаў
- Name[bg]=Директория с документи
- Name[bn]=ডকুমেন্ট ফোল্ডার
--Name[br]=Renkell an teulioù
--Name[ar]=مستنداتي
- Name[br]=Renkell an teulioù
- Name[bs]=Direktorij dokumenata
- Name[ca]=Carpeta de documents
---- a/kioslave/system/entries/documents.desktop	2010-09-24 08:36:47.000000000 +0200
-+++ b/kioslave/system/entries/documents.desktop	2012-02-15 19:02:55.094464303 +0100
-@@ -4,66 +4,55 @@
- Icon=folder_man
- Name=Documents Folder
- Name[af]=Dokument Gids
--Name[ar]=مستنداتي
-+Name[ar]=مستنداتي
- Name[be]=Тэчка для дакументаў
- Name[bg]=Директория с документи
- Name[bn]=ডকুমেন্ট ফোল্ডার
--Name[br]=Renkell an teulioù
-+Name[br]=Renkell an teulioù
- Name[bs]=Direktorij dokumenata
- Name[ca]=Carpeta de documents
--Name[cs]=Složka s dokumenty
--Name[csb]=Katalog dokùmentów
-+Name[cs]=Složka s dokumenty
-+Name[csb]=Katalog dokùmentów
- Name[da]=Dokumentmappe
- Name[de]=Dokumente
--Name[el]=Φάκελος εγγράφων
- Name[eo]=Dokumenta dosierujo
- Name[es]=Carpeta de documentos
- Name[et]=Dokumentide kataloog
- Name[eu]=Dokumentuen karpeta
--Name[fa]=پوشۀ مستندات
-+Name[fa]=پوشۀ مستندات
- Name[fi]=Asiakirjakansio
- Name[fr]=Dossier des documents
- Name[fy]=Ofkeppele kamera
--Name[ga]=Fillteán na gCáipéisí
-+Name[ga]=Fillteán na gCáipéisí
- Name[gl]=Cartafol de Documentos
--Name[he]=תיקיית מסמכים
- Name[hr]=Mapa dokumenata
--Name[hu]=Dokumentumok könyvtár
-+Name[hu]=Dokumentumok könyvtár
- Name[is]=Skjalamappa
- Name[it]=Cartella documenti
--Name[ja]=ドキュメントフォルダ
--Name[ka]=დოკუმენტების დასტა
--Name[kk]=Құжаттар қапшығы
--Name[km]=ថត​ឯកសារ
--Name[ko]=문서 탐색기
--Name[lt]=Dokumentų aplankai
--Name[mk]=Папка со документи
-+Name[ja]=ドキュメントフォルダ
-+Name[kk]=Құжаттар қапшығы
-+Name[lt]=Dokumentų aplankai
- Name[nb]=Dokumentmappe
- Name[nds]=Dokmenten-Orner
--Name[ne]=कागजात फोल्डर
- Name[nl]=Documenten
- Name[nn]=Dokumentmappe
--Name[pa]=ਦਸਤਾਵੇਜ਼ ਫੋਲਡਰ
--Name[pl]=Katalog dokumentów
-+Name[pa]=ਦਸਤਾਵੇਜ਼ ਫੋਲਡਰ
-+Name[pl]=Katalog dokumentów
- Name[pt]=Pasta de Documentos
- Name[pt_BR]=Pasta de Documentos
- Name[ro]=Folder documente
--Name[ru]=Документы
--Name[se]=Dokumeantamáhppa
--Name[sk]=Priečinok dokumentov
-+Name[ru]=Документы
-+Name[se]=Dokumeantamáhppa
- Name[sl]=Mapa z dokumenti
--Name[sr]=Фасцикла са документима
- Name[sr@Latn]=Fascikla sa dokumentima
- Name[sv]=Dokumentkatalog
--Name[te]=పత్రాల ఫొల్డర్
--Name[tg]=Ҳуҷҷатҳо
--Name[th]=โฟลเดอร์เอกสาร
-+Name[tg]=Ҳуҷҷатҳо
- Name[tr]=Belgeler Dizini
--Name[uk]=Тека документів
-+Name[uk]=Тека документів
- Name[uz]=Hujjatlar jildi
--Name[uz@cyrillic]=Ҳужжатлар жилди
--Name[vi]=Thư mục Tà i liệu
-+Name[uz@cyrillic]=Ҳужжатлар жилди
-+Name[vi]=Thư mục T� i liệu
- Name[wa]=Ridant documints
--Name[zh_CN]=文档文件夹
--Name[zh_TW]=文件目錄
-+Name[zh_CN]=文档文件夹
-+Name[zh_TW]=文件目錄
- 
diff --git a/redhat/tdebase/kdebase-3.5.13-fix_tsak_ftbfs.patch b/redhat/tdebase/kdebase-3.5.13-fix_tsak_ftbfs.patch
deleted file mode 100644
index d5b978458..000000000
--- a/redhat/tdebase/kdebase-3.5.13-fix_tsak_ftbfs.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- kdebase/tsak/main.cpp.tsak	2012-08-20 18:12:34.000000000 -0400
-+++ kdebase/tsak/main.cpp	2012-08-20 18:13:16.748272246 -0400
-@@ -35,7 +35,9 @@
- #include <sys/time.h>
- #include <termios.h>
- #include <signal.h>
-+extern "C" {
- #include <libudev.h>
-+}
- #include <libgen.h>
- 
- #define FIFO_DIR "/tmp/ksocket-global"
diff --git a/redhat/tdebase/kdebase-3.5.13-genkdmconf_Xsession_location.patch b/redhat/tdebase/kdebase-3.5.13-genkdmconf_Xsession_location.patch
deleted file mode 100644
index d0efe3ef8..000000000
--- a/redhat/tdebase/kdebase-3.5.13-genkdmconf_Xsession_location.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- kdebase/kdm/kfrontend/genkdmconf.c.ORI	2011-11-01 21:59:14.450046357 +0100
-+++ kdebase/kdm/kfrontend/genkdmconf.c	2011-11-01 21:59:34.449045801 +0100
-@@ -676,7 +676,7 @@
- "    ;;\n"
- "esac\n"
- "# invoke global X session script\n"
--". /etc/X11/Xsession\n";
-+". /etc/X11/xinit/Xsession\n";
- 
- static const char def_background[] =
- "[Desktop0]\n"
diff --git a/redhat/tdebase/kdebase-3.5.13-genkdmconf_Xsession_location_xdm.patch b/redhat/tdebase/kdebase-3.5.13-genkdmconf_Xsession_location_xdm.patch
deleted file mode 100644
index 82b9c0d89..000000000
--- a/redhat/tdebase/kdebase-3.5.13-genkdmconf_Xsession_location_xdm.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- kdebase/kdm/kfrontend/genkdmconf.c.ORI	2011-11-01 21:59:14.450046357 +0100
-+++ kdebase/kdm/kfrontend/genkdmconf.c	2011-11-01 21:59:34.449045801 +0100
-@@ -676,7 +676,7 @@
- "    ;;\n"
- "esac\n"
- "# invoke global X session script\n"
--". /etc/X11/Xsession\n";
-+". /etc/X11/xdm/Xsession\n";
- 
- static const char def_background[] =
- "[Desktop0]\n"
diff --git a/redhat/tdebase/kdebase-3.5.13-kate_focus_fix.patch b/redhat/tdebase/kdebase-3.5.13-kate_focus_fix.patch
deleted file mode 100644
index 589341f29..000000000
--- a/redhat/tdebase/kdebase-3.5.13-kate_focus_fix.patch
+++ /dev/null
@@ -1,133 +0,0 @@
---- kdebase.o/kate/app/kateconfigdialog.cpp.orig	2012-04-01 18:22:50.732901887 +0200
-+++ kdebase/kate/app/kateconfigdialog.cpp	2012-04-01 18:25:01.100327408 +0200
-@@ -138,6 +138,16 @@
-   TQWhatsThis::add( sb_numRecentFiles, youwouldnotbelieveit );
-   connect( sb_numRecentFiles, TQT_SIGNAL( valueChanged ( int ) ), this, TQT_SLOT( slotChanged() ) );
- 
-+  // Use only one instance of kate (MDI) ?
-+  cb_useInstance = new TQCheckBox(bgStartup);
-+  cb_useInstance->setText(i18n("Always use the current instance of kate to open new files"));
-+  cb_useInstance->setChecked(parent->useInstance);
-+  TQWhatsThis::add( cb_useInstance, i18n(
-+        "When checked, all files opened from outside of Kate will only use the "
-+        "currently opened instance of Kate.") );
-+  connect( cb_useInstance, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotChanged() ) );
-+
-+
-   // sync the konsole ?
-   cb_syncKonsole = new TQCheckBox(bgStartup);
-   cb_syncKonsole->setText(i18n("Sync &terminal emulator with active document"));
-@@ -161,7 +171,7 @@
-            this, TQT_SLOT( slotChanged() ) );
- 
-   // GROUP with the one below: "Meta-informations"
--  bgStartup = new TQButtonGroup( 1, Qt::Horizontal, i18n("Meta-Information"), frGeneral );
-+  bgStartup = new TQButtonGroup( 2, Qt::Horizontal, i18n("Meta-Information"), frGeneral );
-   lo->addWidget( bgStartup );
- 
-   // save meta infos
-@@ -409,6 +419,7 @@
-     mainWindow->modNotification = cb_modNotifications->isChecked();
- 
-     mainWindow->syncKonsole = cb_syncKonsole->isChecked();
-+    mainWindow->useInstance = cb_useInstance->isChecked();
- 
-     mainWindow->filelist->setSortType(cb_sortFiles->isChecked() ? KateFileList::sortByName : KateFileList::sortByID);
- 
-diff -urN tdebase/kate/app/kateconfigdialog.h tdebase.new/kate/app/kateconfigdialog.h
---- tdebase/kate/app/kateconfigdialog.h	2012-01-08 18:00:01.000000000 -0600
-+++ tdebase.new/kate/app/kateconfigdialog.h	2012-03-11 00:05:03.000000000 -0600
-@@ -66,6 +66,7 @@
- 
-     TQCheckBox *cb_fullPath;
-     TQCheckBox *cb_syncKonsole;
-+    TQCheckBox *cb_useInstance;
-     TQCheckBox *cb_sortFiles;
-     TQSpinBox *sb_numRecentFiles;
-     TQCheckBox *cb_modNotifications;
-diff -urN tdebase/kate/app/katemain.cpp tdebase.new/kate/app/katemain.cpp
---- tdebase/kate/app/katemain.cpp	2011-12-25 00:52:38.000000000 -0600
-+++ tdebase.new/kate/app/katemain.cpp	2012-03-11 00:05:03.000000000 -0600
-@@ -41,6 +41,8 @@
-     { "start <name>", I18N_NOOP("Start Kate with a given session"), 0 },
-     { "u", 0, 0 },
-     { "use", I18N_NOOP("Use a already running kate instance (if possible)"), 0 },
-+    { "f", 0, 0 },
-+    { "force-sdi", I18N_NOOP("Force single document mode if the MDI setting is enabled."), 0 },
-     { "p", 0, 0 },
-     { "pid <pid>", I18N_NOOP("Only try to reuse kate instance with this pid"), 0 },
-     { "e", 0, 0 },
-@@ -57,9 +59,13 @@
- 
- extern "C" KDE_EXPORT int kdemain( int argc, char **argv )
- {
-+  KConfig * config = NULL;
-+  bool alwaysUseInstance;
-   // here we go, construct the Kate version
-   TQString kateVersion = KateApp::kateVersion();
- 
-+  KInstance instance( "kate" );
-+
-   KAboutData aboutData ("kate", I18N_NOOP("Kate"), kateVersion.latin1(),
-                         I18N_NOOP( "Kate - Advanced Text Editor" ), KAboutData::License_LGPL_V2,
-                         I18N_NOOP( "(c) 2000-2005 The Kate Authors" ), 0, "http://kate.kde.org");
-@@ -107,8 +113,13 @@
-   // get our command line args ;)
-   KCmdLineArgs* args = KCmdLineArgs::parsedArgs();
- 
--  // now, first try to contact running kate instance if needed
--  if ( args->isSet("use") || (::getenv("KATE_PID")!=0) )
-+  config = KGlobal::config();
-+  config->setGroup("General");
-+  alwaysUseInstance = config->readBoolEntry("UseInstance");
-+
-+// now, first try to contact running kate instance if needed
-+  if ( ((args->isSet("use") || alwaysUseInstance) &&
-+       !(args->isSet("force-sdi")))  || (::getenv("KATE_PID")!=0) )
-   {
-     DCOPClient client;
-     client.attach ();
-diff -urN tdebase/kate/app/katemainwindow.cpp tdebase.new/kate/app/katemainwindow.cpp
---- tdebase/kate/app/katemainwindow.cpp	2012-01-08 18:00:01.000000000 -0600
-+++ tdebase.new/kate/app/katemainwindow.cpp	2012-03-11 01:18:48.000000000 -0600
-@@ -406,6 +406,7 @@
- 
-   config->setGroup("General");
-   syncKonsole =  config->readBoolEntry("Sync Konsole", true);
-+  useInstance =  config->readBoolEntry("UseInstance", false);
-   modNotification = config->readBoolEntry("Modified Notification", false);
-   KateDocManager::self()->setSaveMetaInfos(config->readBoolEntry("Save Meta Infos", true));
-   KateDocManager::self()->setDaysMetaInfos(config->readNumEntry("Days Meta Infos", 30));
-@@ -437,6 +438,8 @@
- 
-   config->writeEntry("Sync Konsole", syncKonsole);
- 
-+  config->writeEntry("UseInstance", useInstance);
-+
-   fileOpenRecent->saveEntries(config, "Recent Files");
- 
-   fileselector->writeConfig(config, "fileselector");
-diff -urN tdebase/kate/app/katemainwindow.h tdebase.new/kate/app/katemainwindow.h
---- tdebase/kate/app/katemainwindow.h	2011-12-25 00:52:38.000000000 -0600
-+++ tdebase.new/kate/app/katemainwindow.h	2012-03-11 00:05:03.000000000 -0600
-@@ -182,6 +182,7 @@
-     Kate::ToolViewManager *m_toolViewManager;
- 
-     bool syncKonsole;
-+    bool useInstance;
-     bool modNotification;
- 
-     DCOPObject *m_dcop;
-diff -urN tdebase/kate/app/katemain.cpp tdebase.new/kate/app/katemain.cpp
---- tdebase/kate/app/katemain.cpp	2011-12-25 00:52:38.000000000 -0600
-+++ tdebase.new/kate/app/katemain.cpp	2012-03-11 13:32:05.000000000 -0500
-@@ -231,7 +231,9 @@
-         else
-           wRef.call("restore");
-       }
-+      wRef.call( "hide" );
-       wRef.call( "raise" );
-+      wRef.call( "show" );
- 
-       // stop startup notification
-       KStartupInfo::appStarted(  );
diff --git a/redhat/tdebase/kdebase-3.5.13-kate_mru.patch b/redhat/tdebase/kdebase-3.5.13-kate_mru.patch
deleted file mode 100644
index 232835f9e..000000000
--- a/redhat/tdebase/kdebase-3.5.13-kate_mru.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-diff -urN /dev/shm/kdebase/kate/app/kateconfigdialog.cpp /dev/shm/kdebase.new/kate/app/kateconfigdialog.cpp
---- /dev/shm/kdebase/kate/app/kateconfigdialog.cpp	2011-07-09 01:16:52.000000000 -0500
-+++ /dev/shm/kdebase.new/kate/app/kateconfigdialog.cpp	2011-11-29 11:06:22.000000000 -0600
-@@ -112,11 +112,32 @@
-   TQWhatsThis::add(cb_fullPath,i18n("If this option is checked, the full document path will be shown in the window caption."));
-   connect( cb_fullPath, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotChanged() ) );
-
-+  // sort filelist ? ### remove
-+   cb_sortFiles = new TQCheckBox(bgStartup);
-+   cb_sortFiles->setText(i18n("Sort &files alphabetically in the file list"));
-+   cb_sortFiles->setChecked(parent->filelist->sortType() == KateFileList::sortByName);
-+   TQWhatsThis::add( cb_sortFiles, i18n(
-+         "If this is checked, the files in the file list will be sorted alphabetically.") );
-+   connect( cb_sortFiles, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotChanged() ) );
-
-   // GROUP with the one below: "Behavior"
-   bgStartup = new TQButtonGroup( 1, Qt::Horizontal, i18n("&Behavior"), frGeneral );
-   lo->addWidget( bgStartup );
-
-+  // number of recent files
-+  TQHBox *hbNrf = new TQHBox( bgStartup );
-+  TQLabel *lNrf = new TQLabel( i18n("&Number of recent files:"), hbNrf );
-+  sb_numRecentFiles = new TQSpinBox( 0, 1000, 1, hbNrf );
-+  sb_numRecentFiles->setValue( mainWindow->fileOpenRecent->maxItems() );
-+  lNrf->setBuddy( sb_numRecentFiles );
-+  TQString youwouldnotbelieveit ( i18n(
-+        "<qt>Sets the number of recent files remembered by Kate.<p><strong>NOTE: </strong>"
-+        "If you set this lower than the current value, the list will be truncated and "
-+        "some items forgotten.</qt>") );
-+  TQWhatsThis::add( lNrf, youwouldnotbelieveit );
-+  TQWhatsThis::add( sb_numRecentFiles, youwouldnotbelieveit );
-+  connect( sb_numRecentFiles, TQT_SIGNAL( valueChanged ( int ) ), this, TQT_SLOT( slotChanged() ) );
-+
-   // sync the konsole ?
-   cb_syncKonsole = new TQCheckBox(bgStartup);
-   cb_syncKonsole->setText(i18n("Sync &terminal emulator with active document"));
-@@ -389,6 +403,11 @@
-
-     mainWindow->syncKonsole = cb_syncKonsole->isChecked();
-
-+    mainWindow->filelist->setSortType(cb_sortFiles->isChecked() ? KateFileList::sortByName : KateFileList::sortByID);
-+
-+    config->writeEntry( "Number of recent files", sb_numRecentFiles->value() );
-+    mainWindow->fileOpenRecent->setMaxItems( sb_numRecentFiles->value() );
-+
-     fileSelConfigPage->apply();
-
-     filelistConfigPage->apply();
-diff -urN /dev/shm/kdebase/kate/app/kateconfigdialog.h /dev/shm/kdebase.new/kate/app/kateconfigdialog.h
---- /dev/shm/kdebase/kate/app/kateconfigdialog.h	2010-08-12 17:35:39.000000000 -0500
-+++ /dev/shm/kdebase.new/kate/app/kateconfigdialog.h	2011-11-29 11:09:03.000000000 -0600
-@@ -66,6 +66,8 @@
-
-     TQCheckBox *cb_fullPath;
-     TQCheckBox *cb_syncKonsole;
-+    TQCheckBox *cb_sortFiles;
-+    TQSpinBox *sb_numRecentFiles;
-     TQCheckBox *cb_modNotifications;
-     TQCheckBox *cb_saveMetaInfos;
-     TQSpinBox *sb_daysMetaInfos;
-diff -urN /dev/shm/kdebase/kate/app/katemainwindow.cpp /dev/shm/kdebase.new/kate/app/katemainwindow.cpp
---- /dev/shm/kdebase/kate/app/katemainwindow.cpp	2011-07-09 01:16:52.000000000 -0500
-+++ /dev/shm/kdebase.new/kate/app/katemainwindow.cpp	2011-11-29 11:10:05.000000000 -0600
-@@ -412,6 +412,7 @@
-
-   m_viewManager->setShowFullPath(config->readBoolEntry("Show Full Path in Title", false));
-
-+  fileOpenRecent->setMaxItems( config->readNumEntry("Number of recent files", fileOpenRecent->maxItems() ) );
-   fileOpenRecent->loadEntries(config, "Recent Files");
-
-   fileselector->readConfig(config, "fileselector");
diff --git a/redhat/tdebase/kdebase-3.5.13-kdesu-noignorebutton.patch b/redhat/tdebase/kdebase-3.5.13-kdesu-noignorebutton.patch
deleted file mode 100644
index f941cc20a..000000000
--- a/redhat/tdebase/kdebase-3.5.13-kdesu-noignorebutton.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-diff -rcb kdebase.ORI/kdesu/kdesu/sudlg.cpp kdebase/kdesu/kdesu/sudlg.cpp
-*** kdebase.ORI/kdesu/kdesu/sudlg.cpp	2010-12-17 22:55:07.725798945 +0100
---- kdebase/kdesu/kdesu/sudlg.cpp	2010-12-17 22:55:49.378797283 +0100
-***************
-*** 15,21 ****
-  #include "sudlg.h"
-  
-  KDEsuDialog::KDEsuDialog(TQCString user, TQCString auth_user, bool enableKeep,const TQString& icon, bool withIgnoreButton)
-!      : KPasswordDialog(Password, enableKeep, (withIgnoreButton ? User1:NoDefault), icon)
-  {
-      KConfig* config = KGlobal::config();
-      config->setGroup("super-user-command");
---- 15,21 ----
-  #include "sudlg.h"
-  
-  KDEsuDialog::KDEsuDialog(TQCString user, TQCString auth_user, bool enableKeep,const TQString& icon, bool withIgnoreButton)
-!      : KPasswordDialog(Password, enableKeep, 0, icon)
-  {
-      KConfig* config = KGlobal::config();
-      config->setGroup("super-user-command");
-***************
-*** 34,45 ****
-      } else {
-          if (m_User == "root") {
-  	    prompt = i18n("The action you requested needs root privileges. "
-! 	    "Please enter root's password below or click "
-! 	    "Ignore to continue with your current privileges.");
-          } else {
-  	    prompt = i18n("The action you requested needs additional privileges. "
-! 		"Please enter the password for \"%1\" below or click "
-! 		"Ignore to continue with your current privileges.").arg(static_cast<const char *>(m_User));
-  	}
-      }
-      setPrompt(prompt);
---- 34,43 ----
-      } else {
-          if (m_User == "root") {
-  	    prompt = i18n("The action you requested needs root privileges. "
-! 	    "Please enter root's password below.");
-          } else {
-  	    prompt = i18n("The action you requested needs additional privileges. "
-! 		"Please enter the password for \"%1\" below.").arg(static_cast<const char *>(m_User));
-  	}
-      }
-      setPrompt(prompt);
diff --git a/redhat/tdebase/kdebase-3.5.13-kdesu_showkeeppassword.patch b/redhat/tdebase/kdebase-3.5.13-kdesu_showkeeppassword.patch
deleted file mode 100644
index 565e1790d..000000000
--- a/redhat/tdebase/kdebase-3.5.13-kdesu_showkeeppassword.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- kdebase/kdesu/kdesu/kdesu.cpp.orig	2011-10-26 21:06:48.000000000 +0200
-+++ kdebase/kdesu/kdesu/kdesu.cpp	2012-01-01 16:54:11.468303046 +0100
-@@ -274,7 +274,7 @@
- 
-     // Try to exec the command with kdesud.
-     bool keep = !args->isSet("n") && have_daemon;
--    bool terminal = true;
-+    bool terminal = args->isSet("t");
-     bool new_dcop = args->isSet("newdcop");
-     bool withIgnoreButton = args->isSet("ignorebutton");
-     
diff --git a/redhat/tdebase/kdebase-3.5.13-kdm-crypt.patch b/redhat/tdebase/kdebase-3.5.13-kdm-crypt.patch
deleted file mode 100644
index 772d95f0e..000000000
--- a/redhat/tdebase/kdebase-3.5.13-kdm-crypt.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-diff -u -r kdebase.orig/config.h.cmake kdebase/config.h.cmake
---- kdebase.orig/config.h.cmake	2011-10-30 00:02:15.000000000 +0300
-+++ kdebase/config.h.cmake	2011-11-19 00:59:26.088061733 +0200
-@@ -114,6 +114,7 @@
- #cmakedefine HAVE_SYSINFO 1
- #cmakedefine HAVE_STRNLEN 1
- #cmakedefine HAVE_GETIFADDRS 1
-+#cmakedefine HAVE_CRYPT 1
- 
- #cmakedefine HAVE_SETUSERCONTEXT 1
- #cmakedefine HAVE_GETUSERSHELL 1
-diff -u -r kdebase.orig/kdm/backend/CMakeLists.txt kdebase/kdm/backend/CMakeLists.txt
---- kdebase.orig/kdm/backend/CMakeLists.txt	2011-09-03 22:32:00.000000000 +0300
-+++ kdebase/kdm/backend/CMakeLists.txt	2011-11-19 01:05:03.820839491 +0200
-@@ -43,6 +43,6 @@
-     process.c protodpy.c reset.c resource.c rpcauth.c
-     server.c session.c sessreg.c socket.c streams.c
-     util.c xdmauth.c xdmcp.c
--  LINK X11 ${XAU_LIBRARIES} ${DBUS_TQT_LIBRARIES} ${PAM_LIBRARY} ${XDMCP_LIBRARIES}
-+  LINK X11 ${XAU_LIBRARIES} ${DBUS_TQT_LIBRARIES} ${CRYPT_LIBRARY} ${PAM_LIBRARY} ${XDMCP_LIBRARIES}
-   DESTINATION ${BIN_INSTALL_DIR}
- )
-diff -u -r kdebase.orig/kdm/ConfigureChecks.cmake kdebase/kdm/ConfigureChecks.cmake
---- kdebase.orig/kdm/ConfigureChecks.cmake	2011-03-16 22:49:38.000000000 +0200
-+++ kdebase/kdm/ConfigureChecks.cmake	2011-11-19 01:05:40.426381860 +0200
-@@ -27,6 +27,16 @@
- check_function_exists( auth_timeok HAVE_AUTH_TIMEOK )
- tde_restore( CMAKE_REQUIRED_LIBRARIES )
- 
-+check_function_exists( crypt LIBC_HAVE_CRYPT )
-+if( LIBC_HAVE_CRYPT )
-+  set( HAVE_CRYPT 1 CACHE INTERNAL "" FORCE )
-+else( )
-+  check_library_exists( crypt crypt "" HAVE_CRYPT )
-+  if( HAVE_CRYPT )
-+    set( CRYPT_LIBRARY crypt )
-+  endif( )
-+endif( )
-+
- check_include_file( lastlog.h HAVE_LASTLOG_H )
- check_include_file( termio.h HAVE_TERMIO_H )
- 
-
diff --git a/redhat/tdebase/kdebase-3.5.13-kicker-easyvector.patch b/redhat/tdebase/kdebase-3.5.13-kicker-easyvector.patch
deleted file mode 100644
index b90f83a41..000000000
--- a/redhat/tdebase/kdebase-3.5.13-kicker-easyvector.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- kicker/applets/launcher/easyvector.h
-+++ kicker/applets/launcher/easyvector.h	2012-04-05 17:33:50.320708865 -0500
-@@ -87,7 +87,7 @@
- template < class VALUE, bool CHECKINDEX >
- void EasyVector< VALUE, CHECKINDEX >::eraseAt(Index index)
- {   _checkIndex(index);
--    erase(this->begin()+index);
-+    this->erase(this->begin()+index);
- }
- 
- 
-@@ -108,7 +108,7 @@
-         this->push_back(value);
-         return;
-     }
--    insert(this->begin()+index,value);
-+    this->insert(this->begin()+index,value);
- }
- 
- 
-@@ -116,7 +116,7 @@
- void EasyVector< VALUE, CHECKINDEX >::insertAt(EasyVector< VALUE, CHECKINDEX >::Index index,const EasyVector< VALUE, CHECKINDEX > &v)
- {   index=_convertInsertIndex(index);
-     _checkInsertIndex(index);
--    insert(this->begin()+index,v.begin(),v.end());
-+    this->insert(this->begin()+index,v.begin(),v.end());
- }
- 
- 
diff --git a/redhat/tdebase/kdebase-3.5.13-kickoff_unstable.patch b/redhat/tdebase/kdebase-3.5.13-kickoff_unstable.patch
deleted file mode 100644
index 00a0d4b64..000000000
--- a/redhat/tdebase/kdebase-3.5.13-kickoff_unstable.patch
+++ /dev/null
@@ -1,442 +0,0 @@
-diff -ur kdebase/kicker/kicker/buttons/knewbutton.cpp kdebase1/kicker/kicker/buttons/knewbutton.cpp
---- kdebase/kicker/kicker/buttons/knewbutton.cpp	2011-08-11 01:25:50.000000000 -0400
-+++ kdebase1/kicker/kicker/buttons/knewbutton.cpp	2011-11-18 12:54:22.380404540 -0500
-@@ -55,26 +55,28 @@
-     : KButton( parent ),
-       m_oldPos(0,0)
- {
-+	
-+	setTitle(i18n("K Menu"));
-     Q_ASSERT( !m_self );
-     m_self = this;
--    m_hoverTimer = -1;
-     m_openTimer = -1;
--    m_active = false;
-+    m_hoverTimer = -1;
-     m_mouseInside = false;
-     m_drag = false;
--
--    setIconAlignment((TQ_Alignment)(AlignTop|AlignRight));
--    setAcceptDrops(true);
--    setIcon("kmenu-suse");
--    setDrawArrow(false);
--
--    m_movie = new TQMovie(locate("data", "kicker/pics/kmenu_basic.mng"));
--    m_movie->connectUpdate(this, TQT_SLOT(updateMovie()));
--    m_movie->connectStatus(TQT_TQOBJECT(this), TQT_SLOT(slotStatus(int)));
--    m_movie->connectResize(this, TQT_SLOT(slotSetSize(const TQSize&)));
--
-+    
-+    setIcon("kmenu");
-+    setIcon(KickerSettings::customKMenuIcon());
-+    
-     TQApplication::desktop()->screen()->installEventFilter(this);
--    setMouseTracking(true);
-+
-+    if (KickerSettings::showKMenuText())
-+    {
-+        setButtonText(KickerSettings::kMenuText());
-+        setFont(KickerSettings::buttonFont());
-+        setTextColor(KickerSettings::buttonTextColor());
-+    }    
-+    
-+    tqrepaint();
- }
- 
- KNewButton::~KNewButton()
-@@ -82,28 +84,15 @@
-     if ( m_self == this )
-         m_self = 0;
-     setMouseTracking(false);
--    delete m_movie;
- }
- 
--void KNewButton::slotStatus(int status)
--{
--    if(status == TQMovie::EndOfLoop)
--        slotStopAnimation();
--}
- 
--TQColor KNewButton::borderColor() const
-+void KNewButton::drawButton(TQPainter *p)
- {
--    TQImage img = m_active_pixmap.convertToImage();
--
--    for (int i = 0; i < img.width(); ++i) {
--        QRgb rgb = img.pixel(orientation() == Qt::Horizontal ? img.width() - i - 1 :
--                    i, 2);
--
--        if (tqGreen(rgb) > 0x50)
--            return rgb;
--    }
--
--    return img.pixel( orientation() == Qt::Horizontal ? img.width() - 2 : 2, 2);
-+    if (KickerSettings::showDeepButtons())
-+        PanelPopupButton::drawDeepButton(p);
-+    else
-+        PanelPopupButton::drawButton(p);
- }
- 
- void KNewButton::show()
-@@ -111,103 +100,12 @@
-      KButton::show();
- 
-      if (KickerSettings::firstRun()) {
--         TQTimer::singleShot(500,this,TQT_SLOT(slotExecMenu()));
-+         TQTimer::singleShot(0,this,TQT_SLOT(slotExecMenu()));
-          KickerSettings::setFirstRun(false);
-          KickerSettings::writeConfig();
-      }
- }
- 
--void KNewButton::updateMovie()
--{
--    m_oldPos = TQPoint( -1, -1 );
--    drawEye();
--
--    if (!m_active && m_movie->running())
--        m_movie->pause();
--}
--
--void KNewButton::setPopupDirection(KPanelApplet::Direction d)
--{
--    KButton::setPopupDirection(d);
--
--    delete m_movie;
--
--    switch (d) {
--    case KPanelApplet::Left:
--        setIconAlignment((TQ_Alignment)(AlignTop|AlignLeft));
--        m_movie = new TQMovie(locate("data", "kicker/pics/kmenu_vertical.mng"));
--        break;
--    case KPanelApplet::Right:
--        setIconAlignment((TQ_Alignment)(AlignTop|AlignRight));
--        m_movie = new TQMovie(locate("data", "kicker/pics/kmenu_vertical.mng"));
--        break;
--    case KPanelApplet::Up:
--        setIconAlignment((TQ_Alignment)(AlignTop|AlignHCenter));
--        m_movie = new TQMovie(locate("data", "kicker/pics/kmenu_basic.mng"));
--        break;
--    case KPanelApplet::Down:
--        setIconAlignment((TQ_Alignment)(AlignBottom|AlignHCenter));
--        m_movie = new TQMovie(locate("data", "kicker/pics/kmenu_flipped.mng"));
--    }
--
--    m_movie->connectUpdate(this, TQT_SLOT(updateMovie()));
--    m_movie->connectStatus(TQT_TQOBJECT(this), TQT_SLOT(slotStatus(int)));
--    m_movie->connectResize(this, TQT_SLOT(slotSetSize(const TQSize&)));
--}
--
--void KNewButton::slotSetSize(const TQSize& s)
--{
--    m_iconSize = s;
--}
--
--double KNewButton::buttonScaleFactor(const TQSize& s) const
--{
--    double sf = 1.0;
--
--    switch (popupDirection()) {
--        case KPanelApplet::Left:
--        case KPanelApplet::Right:
--//            sf = kMin(double(s.width()) / m_iconSize.height(), double(s.height()) / m_iconSize.width());
--//            break;
--        case KPanelApplet::Up:
--        case KPanelApplet::Down:
--            sf = kMin(double(s.width()) / m_iconSize.width(), double(s.height()) / m_iconSize.height());
--            break;
--    }
--
--    if (sf > 0.8) sf = 1.0;
--    return sf;
--}
--
--int KNewButton::widthForHeight(int height) const
--{
--    int r = m_iconSize.width() * buttonScaleFactor(TQSize(m_iconSize.width(), height));
--
--    if (!m_movie->running() && height != m_active_pixmap.height())
--    {
--        KNewButton* that = const_cast<KNewButton*>(this);
--        TQTimer::singleShot(0, that, TQT_SLOT(slotStopAnimation()));
--    }
-- 
--    return r;
--}
--
--int KNewButton::preferredDimension(int panelDim) const
--{
--    return kMax(m_icon.width(), m_icon.height());
--}
--
--int KNewButton::heightForWidth(int width) const
--{
--    int r = m_iconSize.width() * buttonScaleFactor(TQSize(width, m_iconSize.height()));
--    if (!m_movie->running() && width != m_active_pixmap.width())
--    {
--        KNewButton* that = const_cast<KNewButton*>(this);
--        TQTimer::singleShot(0, that, TQT_SLOT(slotStopAnimation()));
--    }
--    return r;
--}
--
- bool KNewButton::eventFilter(TQObject *o, TQEvent *e)
- {
-     if (e->type() == TQEvent::MouseButtonRelease ||
-@@ -223,75 +121,9 @@
-         }
-     }
- 
--    if (KickerSettings::kickoffDrawGeekoEye() && e->type() == TQEvent::MouseMove)
--    {
--        TQMouseEvent *me = TQT_TQMOUSEEVENT(e);
--        if ((me->state() & Qt::MouseButtonMask) == Qt::NoButton) 
--            drawEye();
--    }
--
-     return KButton::eventFilter(o, e);
- }
- 
--void KNewButton::drawEye()
--{
--#define eye_x 62
--#define eye_y 13
--    TQPoint mouse = TQCursor::pos();
--    TQPoint me = mapToGlobal(TQPoint(eye_x, eye_y));
--    double a = atan2(mouse.y() - me.y(), mouse.x() - me.x());
--    int dx = int(2.1 * cos(a));
--    int dy = int(2.1 * sin(a));
--
--    TQPoint newpos(eye_x+dx,eye_y+dy);
--    if (newpos!=m_oldPos) {
--        m_oldPos = newpos;
--        TQPixmap pixmap = m_active_pixmap;
--
--        double sf = 1.0;
--
--        if(!m_movie->framePixmap().isNull())
--        {
--            pixmap = m_movie->framePixmap();
--            pixmap.detach();
--            m_iconSize = pixmap.size();
--            sf = buttonScaleFactor(size());
--
--            if (KickerSettings::kickoffDrawGeekoEye()) {
--               TQPainter p(&pixmap);
--               p.setPen(white);
--               p.setBrush(white);
--               //      p.setPen(TQColor(110,185,55));
--               p.drawRect(eye_x+dx, eye_y+dy, 2, 2);
--               p. end();
--            }
--        }
--
--        TQWMatrix matrix;
--        switch (popupDirection()) {
--        case KPanelApplet::Left:
--            matrix.scale(sf, -sf);
--            matrix.rotate(90);
--            break;
--        case KPanelApplet::Up:
--            matrix.scale(sf, sf);
--            break;
--        case KPanelApplet::Right:
--            matrix.scale(sf, -sf);
--            matrix.rotate(90);
--            break;
--        case KPanelApplet::Down:
--            matrix.scale(sf, sf);
--            break;
--        }
--        m_active_pixmap = pixmap.xForm(matrix);
--
--        tqrepaint(false);
--    }
--#undef eye_x
--#undef eye_y
--}
--
- void KNewButton::enterEvent(TQEvent* e)
- {
-     KButton::enterEvent(e);
-@@ -315,15 +147,8 @@
-     }
- 
-     m_active = true;
--    m_movie->unpause();
--    m_movie->restart();
- }
- 
--void KNewButton::rewindMovie()
--{
--    m_oldPos = TQPoint( -1, -1 );
--    m_movie->unpause();
--}
- 
- void KNewButton::dragEnterEvent(TQDragEnterEvent* /*e*/)
- {
-@@ -369,31 +194,12 @@
-     }
- }
- 
--void KNewButton::slotStopAnimation()
--{
--    m_active = false;
--    m_movie->pause();
--    m_movie->restart();
--    TQTimer::singleShot(200, this, TQT_SLOT(rewindMovie()));
--}
--
--const TQPixmap& KNewButton::labelIcon() const
--{
--    return m_active_pixmap;
--}
--
- void KNewButton::slotExecMenu()
- {
--    if (m_openTimer != -1)
--        killTimer(m_openTimer);
--
--    m_openTimer = startTimer(TQApplication::doubleClickInterval() * 3);
- 
-     if (m_active)
-     {
-         m_active = false;
--        m_movie->pause();
--        m_movie->restart();
-     }
- 
-     KButton::slotExecMenu();
-@@ -401,40 +207,12 @@
-     assert(!KickerTip::tippingEnabled());
-     assert(dynamic_cast<KMenu*>(m_popup));
- 
--    disconnect(dynamic_cast<KMenu*>(m_popup), TQT_SIGNAL(aboutToHide()), this,
--            TQT_SLOT(slotStopAnimation()));
--    connect(dynamic_cast<KMenu*>(m_popup), TQT_SIGNAL(aboutToHide()),
--            TQT_SLOT(slotStopAnimation()));
--
-     m_popup->move(KickerLib::popupPosition(popupDirection(), m_popup, this));
-     // I wish KMenu would properly done itself when it closes. But it doesn't.
- 
--    bool useEffect = true; // could be TQApplication::isEffectEnabled()
--    useEffect = false; // too many TQt bugs to be useful
--    if (m_drag)
--	useEffect = false;
--
-     m_drag = false; // once is enough
- 
--    if (useEffect) 
--    {
--        switch (popupDirection()) {
--        case KPanelApplet::Left:
--            qScrollEffect(m_popup, TQEffects::LeftScroll);
--            break;
--        case KPanelApplet::Up:
--            qScrollEffect(m_popup, TQEffects::UpScroll);
--            break;
--        case KPanelApplet::Right:
--            qScrollEffect(m_popup, TQEffects::RightScroll);
--            break;
--        case KPanelApplet::Down:
--            qScrollEffect(m_popup, TQEffects::DownScroll);
--            break;
--        }
--    }
--    else
--        static_cast<KMenu*>(m_popup)->show();
-+    static_cast<KMenu*>(m_popup)->show();
- }
- 
- void KNewButton::timerEvent(TQTimerEvent* e)
-@@ -447,9 +225,4 @@
-         killTimer(m_hoverTimer);
-         m_hoverTimer = -1;
-     }
--    if (e->timerId() == m_openTimer)
--    {
--        killTimer(m_openTimer);
--        m_openTimer = -1;
--    }
- }
-diff -ur kdebase/kicker/kicker/buttons/knewbutton.h kdebase1/kicker/kicker/buttons/knewbutton.h
---- kdebase/kicker/kicker/buttons/knewbutton.h	2011-03-12 01:58:13.000000000 -0500
-+++ kdebase1/kicker/kicker/buttons/knewbutton.h	2011-11-18 09:31:03.163665964 -0500
-@@ -28,7 +28,6 @@
- 
- #include "kbutton.h"
- 
--#include <tqmovie.h>
- #include <tqpoint.h>
- 
- /**
-@@ -43,25 +42,10 @@
-     ~KNewButton();
- 
-     static KNewButton *self() { return m_self; }
--
-     void loadConfig( const KConfigGroup& config );
--
--    virtual const TQPixmap& labelIcon() const;
--
--    virtual int widthForHeight(int height) const;
--    virtual int preferredDimension(int panelDim) const;
--    virtual int heightForWidth(int width) const;
--
-     TQColor borderColor() const;
-+    //virtual void setPopupDirection(KPanelApplet::Direction d);
- 
--    virtual void setPopupDirection(KPanelApplet::Direction d);
--
--private slots:
--    void slotStatus(int);
--    void slotSetSize(const TQSize&);
--    void slotStopAnimation();
--    void rewindMovie();
--    void updateMovie();
- 
- protected:
-     virtual void show();
-@@ -78,17 +62,15 @@
-     void timerEvent(TQTimerEvent*);
- 
- private:
--    void drawEye();
--    double buttonScaleFactor(const TQSize& s) const;
- 
--    TQMovie* m_movie;
-+	void drawButton(TQPainter *p);
-     TQPixmap m_active_pixmap;
-     TQPoint m_oldPos;
-     TQSize m_iconSize;
-     TQRect m_sloppyRegion;
--    int m_hoverTimer;
-     int m_openTimer;
--    bool m_active;
-+	int m_hoverTimer;
-+	bool m_active;
-     bool m_mouseInside;
-     bool m_drag;
- 
-diff -ur kdebase/kicker/kicker/ui/k_new_mnu.cpp kdebase1/kicker/kicker/ui/k_new_mnu.cpp
---- kdebase/kicker/kicker/ui/k_new_mnu.cpp	2011-08-11 01:25:49.000000000 -0400
-+++ kdebase1/kicker/kicker/ui/k_new_mnu.cpp	2011-11-18 15:02:51.565689119 -0500
-@@ -1700,8 +1700,6 @@
-         TQPixmap pix( 64, footer->height() );
-         TQPainter p( &pix );
-         p.fillRect( 0, 0, 64, footer->height(), m_branding->tqcolorGroup().brush( TQColorGroup::Base ) );
--        p.fillRect( 0, m_orientation == BottomUp ? footer->height() - 2 : 0,
--                64, 3, KNewButton::self()->borderColor() );
-         p.end();
-         footer->setPaletteBackgroundPixmap( pix );
-     }
-@@ -3500,7 +3498,8 @@
-         }
-         m_systemView->insertItem( iconName, userLabel.isEmpty() ? label : userLabel,
-                                   descr, "system:/media/" + name, nId++, -1 );
--
-+        ++it;
-+        ++it;
-         ++it; // skip separator
-     }
- }
diff --git a/redhat/tdebase/kdebase-3.5.13-kio_man_utf8.patch b/redhat/tdebase/kdebase-3.5.13-kio_man_utf8.patch
deleted file mode 100644
index dfe65563a..000000000
--- a/redhat/tdebase/kdebase-3.5.13-kio_man_utf8.patch
+++ /dev/null
@@ -1,40 +0,0 @@
---- kdebase/kioslave/man/kio_man.cpp.ORI	2011-12-03 00:22:28.400423296 +0100
-+++ kdebase/kioslave/man/kio_man.cpp	2011-12-03 00:25:59.127173102 +0100
-@@ -569,20 +569,24 @@
-         }
-         lastdir = filename.left(filename.findRev('/'));
-     
--        myStdStream = TQString::null;
--        KProcess proc;
--        /* TODO: detect availability of 'man --recode' so that this can go
--         * upstream */
--        proc << "man" << "--recode" << "UTF-8" << filename;
--
--        TQApplication::connect(&proc, TQT_SIGNAL(receivedStdout (KProcess *, char *, int)),
--                              this, TQT_SLOT(slotGetStdOutputUtf8(KProcess *, char *, int)));
--        proc.start(KProcess::Block, KProcess::All);
--
--        const TQCString cstr=myStdStream.utf8();
--        const int len = cstr.size()-1;
-+        TQIODevice *fd= KFilterDev::deviceForFile(filename);
-+    
-+        if ( !fd || !fd->open(IO_ReadOnly))
-+        {
-+           delete fd;
-+           return 0;
-+        }
-+        TQByteArray array(fd->readAll());
-+        kdDebug(7107) << "read " << array.size() << endl;
-+        fd->close();
-+        delete fd;
-+        
-+        if (array.isEmpty())
-+            return 0;
-+    
-+        const int len = array.size();
-         buf = new char[len + 4];
--        tqmemmove(buf + 1, cstr.data(), len);
-+        tqmemmove(buf + 1, array.data(), len);
-         buf[0]=buf[len]='\n'; // Start and end with a end of line
-         buf[len+1]=buf[len+2]='\0'; // Two NUL characters at end
-     }
diff --git a/redhat/tdebase/kdebase-3.5.13-konq_icon_effect.patch b/redhat/tdebase/kdebase-3.5.13-konq_icon_effect.patch
deleted file mode 100644
index 3ac7144e2..000000000
--- a/redhat/tdebase/kdebase-3.5.13-konq_icon_effect.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff -urN /dev/shm/kdebase/konqueror/listview/konq_listviewwidget.cc /dev/shm/kdebase.new/konqueror/listview/konq_listviewwidget.cc
---- /dev/shm/kdebase/konqueror/listview/konq_listviewwidget.cc	2011-08-11 00:25:51.000000000 -0500
-+++ /dev/shm/kdebase.new/konqueror/listview/konq_listviewwidget.cc	2011-12-03 20:55:00.000000000 -0600
-@@ -1009,10 +1009,11 @@
- 	   // gather pixmap
- 	   TQPixmap *pix = new TQPixmap(*(_item->pixmap(0)));
- 
--	   // call the icon effect
--           KIconEffect::visualActivate(viewport(), rect, pix);
--	 
--	   delete(pix);
-+	   // call the icon effect if enabled
-+	   if (KGlobalSettings::showKonqIconActivationEffect() == true) {
-+	       KIconEffect::visualActivate(viewport(), rect, pix);
-+	       delete(pix);
-+	   }
- 	 }
-    }
-    else
diff --git a/redhat/tdebase/kdebase-3.5.13-konq_menu_tab_background.patch b/redhat/tdebase/kdebase-3.5.13-konq_menu_tab_background.patch
deleted file mode 100644
index 483b259c1..000000000
--- a/redhat/tdebase/kdebase-3.5.13-konq_menu_tab_background.patch
+++ /dev/null
@@ -1,160 +0,0 @@
-diff -urN /dev/shm/kdebase/kcontrol/konqhtml/advancedTabDialog.cpp /dev/shm/kdebase.new/kcontrol/konqhtml/advancedTabDialog.cpp
---- kdebase/kcontrol/konqhtml/advancedTabDialog.cpp	2011-03-12 00:57:45.000000000 -0600
-+++ kdebase.new/kcontrol/konqhtml/advancedTabDialog.cpp	2011-12-03 17:25:40.297586593 -0600
-@@ -58,7 +58,6 @@
-     layout->addSpacing( 20 );
-     layout->addStretch();
- 
--    connect(m_advancedWidget->m_pNewTabsInBackground, TQT_SIGNAL(clicked()), this, TQT_SLOT(changed()));
-     connect(m_advancedWidget->m_pOpenAfterCurrentPage, TQT_SIGNAL(clicked()), this, TQT_SLOT(changed()));
-     connect(m_advancedWidget->m_pTabConfirm, TQT_SIGNAL(clicked()), this, TQT_SLOT(changed()));
-     connect(m_advancedWidget->m_pTabCloseActivatePrevious, TQT_SIGNAL(clicked()), this, TQT_SLOT(changed()));
-@@ -76,7 +75,6 @@
- void advancedTabDialog::load()
- {
-     m_pConfig->setGroup("FMSettings");
--    m_advancedWidget->m_pNewTabsInBackground->setChecked( ! (m_pConfig->readBoolEntry( "NewTabsInFront", false )) );
-     m_advancedWidget->m_pOpenAfterCurrentPage->setChecked( m_pConfig->readBoolEntry( "OpenAfterCurrentPage", false ) );
-     m_advancedWidget->m_pPermanentCloseButton->setChecked( m_pConfig->readBoolEntry( "PermanentCloseButton", false ) );
-     m_advancedWidget->m_pKonquerorTabforExternalURL->setChecked( m_pConfig->readBoolEntry( "KonquerorTabforExternalURL", false ) );
-@@ -92,7 +90,6 @@
- void advancedTabDialog::save()
- {
-     m_pConfig->setGroup("FMSettings");
--    m_pConfig->writeEntry( "NewTabsInFront", !(m_advancedWidget->m_pNewTabsInBackground->isChecked()) );
-     m_pConfig->writeEntry( "OpenAfterCurrentPage", m_advancedWidget->m_pOpenAfterCurrentPage->isChecked() );
-     m_pConfig->writeEntry( "PermanentCloseButton", m_advancedWidget->m_pPermanentCloseButton->isChecked() );
-     m_pConfig->writeEntry( "KonquerorTabforExternalURL", m_advancedWidget->m_pKonquerorTabforExternalURL->isChecked() );
-diff -urN /dev/shm/kdebase/kcontrol/konqhtml/advancedTabOptions.ui /dev/shm/kdebase.new/kcontrol/konqhtml/advancedTabOptions.ui
---- kdebase/kcontrol/konqhtml/advancedTabOptions.ui	2011-03-12 00:57:45.000000000 -0600
-+++ kdebase.new/kcontrol/konqhtml/advancedTabOptions.ui	2011-12-03 17:24:25.987334444 -0600
-@@ -51,17 +51,6 @@
-                 </property>
-                 <widget class="TQCheckBox">
-                     <property name="name">
--                        <cstring>m_pNewTabsInBackground</cstring>
--                    </property>
--                    <property name="text">
--                        <string>O&amp;pen new tabs in the background</string>
--                    </property>
--                    <property name="whatsThis" stdset="0">
--                        <string>This will open a new tab in the background, instead of in the foreground.</string>
--                    </property>
--                </widget>
--                <widget class="TQCheckBox">
--                    <property name="name">
-                         <cstring>m_pOpenAfterCurrentPage</cstring>
-                     </property>
-                     <property name="text">
-diff -urN /dev/shm/kdebase/konqueror/konq_guiclients.cc /dev/shm/kdebase.new/konqueror/konq_guiclients.cc
---- kdebase/konqueror/konq_guiclients.cc	2011-08-11 00:25:53.000000000 -0500
-+++ kdebase.new/konqueror/konq_guiclients.cc	2011-12-03 17:24:25.987334444 -0600
-@@ -104,8 +104,8 @@
-         openInSameWindow.setAttribute( "name", "sameview" );
-         openInSameWindow.setAttribute( "group", "tabhandling" );
-         menu.appendChild( openInSameWindow );
--        
--	TQDomElement openInWindow = m_doc.createElement( "action" );
-+
-+	      TQDomElement openInWindow = m_doc.createElement( "action" );
-         openInWindow.setAttribute( "name", "newview" );
-         openInWindow.setAttribute( "group", "tabhandling" );
-         menu.appendChild( openInWindow );
-@@ -115,6 +115,11 @@
-         openInTabElement.setAttribute( "group", "tabhandling" );
-         menu.appendChild( openInTabElement );
- 
-+        TQDomElement openInTabFrontElement = m_doc.createElement( "action" );
-+        openInTabFrontElement.setAttribute( "name", "openintabfront" );
-+        openInTabFrontElement.setAttribute( "group", "tabhandling" );
-+        menu.appendChild( openInTabFrontElement );
-+
-         TQDomElement separatorElement = m_doc.createElement( "separator" );
-         separatorElement.setAttribute( "group", "tabhandling" );
-         menu.appendChild( separatorElement );
-diff -urN /dev/shm/kdebase/konqueror/konq_mainwindow.cc /dev/shm/kdebase.new/konqueror/konq_mainwindow.cc
---- kdebase/konqueror/konq_mainwindow.cc	2011-08-20 02:14:06.000000000 -0500
-+++ kdebase.new/konqueror/konq_mainwindow.cc	2011-12-03 17:24:25.994334609 -0600
-@@ -2726,15 +2726,23 @@
-     openURL( 0L, popupItems.getFirst()->url() );
- }
- 
-+void KonqMainWindow::slotPopupNewTabAtFront()
-+{
-+    KConfig *config = KGlobal::config();
-+    KConfigGroupSaver cs( config, TQString::fromLatin1("FMSettings") );
-+    bool openAfterCurrentPage = config->readBoolEntry( "OpenAfterCurrentPage", false );
-+    popupNewTab(true, openAfterCurrentPage);
-+}
-+
- void KonqMainWindow::slotPopupNewTab()
- {
-     bool openAfterCurrentPage = KonqSettings::openAfterCurrentPage();
-     bool newTabsInFront = KonqSettings::newTabsInFront();
- 
--    if (KApplication::keyboardMouseState() & TQt::ShiftButton)
-+    if (KApplication::keyboardMouseState() & ShiftButton)
-       newTabsInFront = !newTabsInFront;
- 
--    popupNewTab(newTabsInFront, openAfterCurrentPage);
-+    popupNewTab(false, openAfterCurrentPage);
- }
- 
- void KonqMainWindow::slotPopupNewTabRight()
-@@ -2754,17 +2762,13 @@
-   KFileItemListIterator it ( popupItems );
-   KonqOpenURLRequest req;
-   req.newTab = true;
--  req.newTabInFront = false;
-+  req.newTabInFront = infront;
-   req.openAfterCurrentPage = openAfterCurrentPage;
-   req.args = popupUrlArgs;
- 
-   for ( ; it.current(); ++it )
-   {
--    if ( infront && it.atLast() )
--    {
--      req.newTabInFront = true;
--    }
--    openURL( 0L, (*it)->url(), TQString::null, req );
-+    openURL( 0L, (*it)->url(), QString::null, req );
-   }
- }
- 
-@@ -3926,7 +3930,7 @@
-   reloadShortcut.append(KKey(CTRL + Key_R));
-   m_paReload = new KAction( i18n( "&Reload" ), "reload", reloadShortcut, TQT_TQOBJECT(this), TQT_SLOT( slotReload() ), actionCollection(), "reload" );
-   m_paReloadAllTabs = new KAction( i18n( "&Reload All Tabs" ), "reload_all_tabs", SHIFT+Key_F5, TQT_TQOBJECT(this), TQT_SLOT( slotReloadAllTabs() ), actionCollection(), "reload_all_tabs" );
--  
-+
-   m_paReloadStop = new KAction( i18n( "&Reload/Stop" ), "reload", 0, TQT_TQOBJECT(this), TQT_SLOT( slotReloadStop() ), actionCollection(), "reload_stop" );
- 
-   m_paUndo = KStdAction::undo( KonqUndoManager::self(), TQT_SLOT( undo() ), actionCollection(), "undo" );
-@@ -4782,8 +4786,14 @@
-       else
-         tab_new_x = "tab_new_bg" ;
- 
--      actNewTab = new KAction( i18n( "Open in &New Tab" ), tab_new_x, 0, TQT_TQOBJECT(this), TQT_SLOT( slotPopupNewTab() ), konqyMenuClient->actionCollection(), "openintab" );
--      actNewTab->setToolTip( i18n( "Open the document in a new tab" ) );
-+      KAction *actNewTab = new KAction( i18n( "Open in &Background Tab" ), "tab_new_bg", 0, TQT_TQOBJECT(this), TQT_SLOT( slotPopupNewTab() ), actionCollection(), "openintab" );
-+      actNewTab->setStatusText( i18n( "Open the document in a new background tab" ) );
-+      KAction *actNewTabFront = new KAction( i18n( "Open in &New Tab" ), "tab_new", 0, TQT_TQOBJECT(this), TQT_SLOT( slotPopupNewTabAtFront() ), actionCollection(), "openintabfront" );
-+      actNewTabFront->setStatusText( i18n( "Open the document in a new foreground tab" ) );
-+      actNewTab = new KAction( i18n( "Open in &Background Tab" ), tab_new_x, 0, TQT_TQOBJECT(this), TQT_SLOT( slotPopupNewTab() ), konqyMenuClient->actionCollection(), "openintab" );
-+      actNewTabFront = new KAction( i18n( "Open in &New Tab" ), tab_new_x, 0, TQT_TQOBJECT(this), TQT_SLOT( slotPopupNewTabAtFront() ), konqyMenuClient->actionCollection(), "openintabfront" );
-+      actNewTab->setToolTip( i18n( "Open the document in a new background tab" ) );
-+      actNewTabFront->setToolTip( i18n( "Open the document in a new foreground tab" ) );
-       doTabHandling = true;
-   }
- 
-diff -urN /dev/shm/kdebase/konqueror/konq_mainwindow.h /dev/shm/kdebase.new/konqueror/konq_mainwindow.h
---- kdebase/konqueror/konq_mainwindow.h	2011-03-12 00:58:18.000000000 -0600
-+++ kdebase.new/konqueror/konq_mainwindow.h	2011-12-03 17:24:25.995334564 -0600
-@@ -444,6 +444,7 @@
-   void slotPopupNewWindow();
-   void slotPopupThisWindow();
-   void slotPopupNewTab();
-+  void slotPopupNewTabAtFront();
-   void slotPopupNewTabRight();
-   void slotPopupPasteTo();
-   void slotRemoveView();
diff --git a/redhat/tdebase/kdebase-3.5.13-konqsidebar_documents.patch b/redhat/tdebase/kdebase-3.5.13-konqsidebar_documents.patch
deleted file mode 100644
index e6076a12e..000000000
--- a/redhat/tdebase/kdebase-3.5.13-konqsidebar_documents.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- kdebase/konqueror/sidebar/trees/dirtree_module/dirtree_module.cpp.ORI	2011-12-10 15:07:43.171011925 +0100
-+++ kdebase/konqueror/sidebar/trees/dirtree_module/dirtree_module.cpp	2011-12-10 15:07:48.000797355 +0100
-@@ -400,7 +400,7 @@
-     kdDebug(1201) << this << " KonqSidebarDirTreeModule::slotNewItems " << entries.count() << endl;
- 
-     Q_ASSERT(entries.count());
--    KFileItem * firstItem = const_cast<KFileItemList&>(entries).first(); // qlist sucks for constness
-+    KFileItem * firstItem = const_cast<KFileItemList&>(entries).last(); // qlist sucks for constness
- 
-     // Find parent item - it's the same for all the items
-     KURL dir( firstItem->url().url(-1) );
diff --git a/redhat/tdebase/kdebase-3.5.13-kpersonalizer_default_doubleclick.patch b/redhat/tdebase/kdebase-3.5.13-kpersonalizer_default_doubleclick.patch
deleted file mode 100644
index e2ece8166..000000000
--- a/redhat/tdebase/kdebase-3.5.13-kpersonalizer_default_doubleclick.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-diff -urN kdebase/kpersonalizer/kospage.cpp kdebase.new2/kpersonalizer/kospage.cpp
---- kdebase/kpersonalizer/kospage.cpp	2011-08-21 02:08:16.000000000 -0500
-+++ kdebase.new2/kpersonalizer/kospage.cpp	2011-12-22 09:27:39.000000000 -0600
-@@ -142,7 +142,7 @@
- 	ckcmdisplay->writeEntry("macStyle", false, true, true);
- 
- 	cglobal->setGroup("KDE");
--	cglobal->writeEntry("SingleClick", true, true, true);
-+	cglobal->writeEntry("SingleClick", false, true, true);
- 
- 	claunch->setGroup("FeedbackStyle");
- 	claunch->writeEntry("BusyCursor", false);
-@@ -351,8 +351,8 @@
- 	textview_ospage->setText(i18n(
- 	"<b>Window activation:</b> <i>Focus on click</i><br>"
- 	"<b>Titlebar double-click:</b> <i>Shade window</i><br>"
--	"<b>Mouse selection:</b> <i>Single click</i><br>"
--	"<b>Application startup notification:</b> <i>busy cursor</i><br>"
-+	"<b>Mouse selection:</b> <i>Double click</i><br>"
-+	"<b>Application startup notification:</b> <i>none</i><br>"
- 	"<b>Keyboard scheme:</b> <i>Trinity default</i><br>"
- 	));
- }
-@@ -376,7 +376,7 @@
- 	"<b>Window activation:</b> <i>Focus on click</i><br>"
- 	"<b>Titlebar double-click:</b> <i>Maximize window</i><br>"
- 	"<b>Mouse selection:</b> <i>Double click</i><br>"
--	"<b>Application startup notification:</b> <i>busy cursor</i><br>"
-+	"<b>Application startup notification:</b> <i>none</i><br>"
- 	"<b>Keyboard scheme:</b> <i>Windows</i><br>"
- 	));
- }
-@@ -400,7 +400,7 @@
- 	b_MacMenuBar = ckcmdisplay->readBoolEntry("macStyle", false);
- 
- 	cglobal->setGroup("KDE");
--	b_SingleClick = cglobal->readBoolEntry("SingleClick", true);
-+	b_SingleClick = cglobal->readBoolEntry("SingleClick", false);
- 
- 	claunch->setGroup("FeedbackStyle");
- 	b_BusyCursor = claunch->readBoolEntry("BusyCursor", false);
diff --git a/redhat/tdebase/kdebase-3.5.13-kwin-keramic-pics-emb.patch b/redhat/tdebase/kdebase-3.5.13-kwin-keramic-pics-emb.patch
deleted file mode 100644
index 50768f626..000000000
--- a/redhat/tdebase/kdebase-3.5.13-kwin-keramic-pics-emb.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-diff -uNr kdebase-3.5.13.orig/kwin/clients/keramik/CMakeLists.txt kdebase-3.5.13/kwin/clients/keramik/CMakeLists.txt
---- kdebase-3.5.13.orig/kwin/clients/keramik/CMakeLists.txt	2012-03-14 12:56:02.567586872 +0200
-+++ kdebase-3.5.13/kwin/clients/keramik/CMakeLists.txt	2012-03-14 12:50:07.000000000 +0200
-@@ -42,22 +42,11 @@
- 
- ##### tiles.h (header) ##########################
- 
--set( pics
--  pics/caption-large-left.png pics/caption-small-right.png
--  pics/titlebar-center.png pics/titlebutton-square.png
--  pics/border-left.png pics/caption-large-right.png
--  pics/grabbar-center.png pics/titlebar-left.png
--  pics/border-right.png pics/caption-small-center.png
--  pics/grabbar-left.png pics/titlebar-right.png
--  pics/caption-large-center.png pics/caption-small-left.png
--  pics/grabbar-right.png pics/titlebutton-round.png
--  pics/bottom-left.png pics/bottom-right.png pics/bottom-center.png
--  pics/titlebutton-square-large.png pics/titlebutton-square-huge.png
--  pics/titlebutton-round-large.png pics/titlebutton-round-huge.png )
-+file(GLOB _pics "${CMAKE_CURRENT_SOURCE_DIR}/pics/*.png" )
- 
- add_custom_command( OUTPUT tiles.h
--  COMMAND ${CMAKE_CURRENT_BINARY_DIR}/embedtool ${pics}
--  DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/embedtool ${pics} )
-+  COMMAND ${CMAKE_CURRENT_BINARY_DIR}/embedtool ${_pics}
-+  DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/embedtool ${_pics} )
- 
- tde_add_executable( embedtool
-   SOURCES embedtool.cpp
-diff -Naur tdebase-master-orig/CMakeLists.txt tdebase-master/CMakeLists.txt
---- tdebase-master-orig/CMakeLists.txt	2012-03-28 09:07:30.000000000 +0200
-+++ tdebase-master/CMakeLists.txt	2012-04-01 11:41:49.000000000 +0200
-@@ -27,6 +27,7 @@
- include( CheckLibraryExists )
- include( CheckFunctionExists )
- include( CheckStructHasMember )
-+include( CheckTypeSize )
- 
- 
- ##### include our cmake modules #################
-@@ -150,6 +151,8 @@
- set( CMAKE_SHARED_LINKER_FLAGS "-Wl,--no-undefined" )
- set( CMAKE_MODULE_LINKER_FLAGS "-Wl,--no-undefined" )
- 
-+check_type_size( "long long" LONG_LONG )
-+
- 
- ##### kdebase directories #######################
- 
-diff -Naur tdebase-master-orig/config.h.cmake tdebase-master/config.h.cmake
---- tdebase-master-orig/config.h.cmake	2012-03-28 09:07:30.000000000 +0200
-+++ tdebase-master/config.h.cmake	2012-04-01 11:45:21.000000000 +0200
-@@ -3,6 +3,9 @@
- // konsole
- #cmakedefine HAVE_PROC_CWD 1
- 
-+// Defined if compiler supports long long type.
-+#cmakedefine HAVE_LONG_LONG 1
-+
- // kdesktop, konsole, kcontrol, kicker
- #cmakedefine HAVE_XRENDER 1
- 
diff --git a/redhat/tdebase/kdebase-3.5.13-mediamanager_ftbfs.patch b/redhat/tdebase/kdebase-3.5.13-mediamanager_ftbfs.patch
deleted file mode 100644
index 1d72b2378..000000000
--- a/redhat/tdebase/kdebase-3.5.13-mediamanager_ftbfs.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- kdebase/kioslave/media/mediamanager/CMakeLists.txt.ORI	2011-11-08 15:00:40.248406596 -0500
-+++ kdebase/kioslave/media/mediamanager/CMakeLists.txt	2011-11-08 15:00:56.417996538 -0500
-@@ -20,6 +20,7 @@
-   ${TDE_INCLUDE_DIR}
-   ${TQT_INCLUDE_DIRS}
-   ${HAL_INCLUDE_DIRS}
-+  ${DBUS_TQT_INCLUDE_DIRS}
- )
- 
- link_directories(
diff --git a/redhat/tdebase/kdebase-3.5.13-option_to_disable_scroll_desktop.patch b/redhat/tdebase/kdebase-3.5.13-option_to_disable_scroll_desktop.patch
deleted file mode 100644
index 732619ff5..000000000
--- a/redhat/tdebase/kdebase-3.5.13-option_to_disable_scroll_desktop.patch
+++ /dev/null
@@ -1,101 +0,0 @@
-Index: pagerapplet.cpp
-===================================================================
---- kdebase.ori/kicker/applets/minipager/pagerapplet.cpp	(revision 1287351)
-+++ kdebase/kicker/applets/minipager/pagerapplet.cpp	(working copy)
-@@ -442,6 +442,10 @@
- {
-     int newDesk;
-     int desktops = KWin::numberOfDesktops();
-+   
-+
-+    if(cycleWindow()){
-+
-     if (m_kwin->numberOfViewports(0).width() * m_kwin->numberOfViewports(0).height() > 1 )
-         desktops = m_kwin->numberOfViewports(0).width() * m_kwin->numberOfViewports(0).height();
-     if (e->delta() < 0)
-@@ -452,8 +456,9 @@
-     {
-         newDesk = (desktops + m_curDesk - 2) % desktops + 1;
-     }
--
-+  
-     slotButtonSelected(newDesk);
-+    }
- }
- 
- void KMiniPager::drawButtons()
-@@ -729,6 +734,7 @@
- 
-     showMenu->insertItem(i18n("&Window Thumbnails"), WindowThumbnails);
-     showMenu->insertItem(i18n("&Window Icons"), WindowIcons);
-+    showMenu->insertItem(i18n("&Cycle on Wheel"), Cycle);
- 
-     showMenu->insertTitle(i18n("Text Label"));
-     showMenu->insertItem(i18n("Desktop N&umber"),
-@@ -760,6 +766,7 @@
- 
-     m_contextMenu->setItemChecked(WindowThumbnails, m_settings->preview());
-     m_contextMenu->setItemChecked(WindowIcons, m_settings->icons());
-+    m_contextMenu->setItemChecked(Cycle, m_settings->cycle());
-     m_contextMenu->setItemEnabled(WindowIcons, m_settings->preview());
-     m_contextMenu->setItemEnabled(RenameDesktop,
-                                   m_settings->labelType() ==
-@@ -812,11 +819,12 @@
-             m_settings->setPreview(!m_settings->preview());
-             TaskManager::the()->trackGeometry();
-             break;
--
-+        case Cycle:
-+             m_settings->setCycle(!m_settings->cycle());
-+            break;
-         case WindowIcons:
-             m_settings->setIcons(!m_settings->icons());
-             break;
--
-         case PagerSettings::EnumBackgroundType::BgPlain + bgOffset:
-             m_settings->setBackgroundType(PagerSettings::EnumBackgroundType::BgPlain);
-             break;
-Index: pagersettings.kcfg
-===================================================================
---- kdebase.ori/kicker/applets/minipager/pagersettings.kcfg	(revision 1287351)
-+++ kdebase/kicker/applets/minipager/pagersettings.kcfg	(working copy)
-@@ -49,10 +49,15 @@
-             <label>Show desktop preview?</label>
-             <default>true</default>
-         </entry>
--
-+        
-         <entry name="Icons" type="Bool">
-             <label>Show window icons in previews?</label>
-             <default>true</default>
-         </entry>
-+        
-+        <entry name="Cycle" type="Bool">
-+          <label>Cycle through desktops with wheel?</label>
-+          <default>true</default>
-+        </entry>
-     </group>
- </kcfg>
-Index: pagerapplet.h
-===================================================================
---- kdebase.ori/kicker/applets/minipager/pagerapplet.h	(revision 1287351)
-+++ kdebase/kicker/applets/minipager/pagerapplet.h	(working copy)
-@@ -64,15 +64,17 @@
-     void setActive( WId active ) { m_activeWindow = active; }
-     WId activeWindow() { return m_activeWindow; }
- 
--    enum ConfigOptions { LaunchExtPager = 96, WindowThumbnails,
-+    enum ConfigOptions { LaunchExtPager = 96, WindowThumbnails, Cycle,
-                          WindowIcons, ConfigureDesktops, RenameDesktop };
-     int labelType() const { return m_settings->labelType(); }
- 
-     int bgType() const { return m_settings->backgroundType(); }
- 
-     bool desktopPreview() const { return m_settings->preview(); }
-+    bool cycleWindow() const { return m_settings->cycle(); }
-     bool windowIcons() const { return m_settings->icons(); }
- 
-+
-     Orientation orientation() const { return KPanelApplet::orientation(); }
-     Direction popupDirection() { return KPanelApplet::popupDirection(); }
- 
diff --git a/redhat/tdebase/kdebase-3.5.13-prevent_tooltip_over_lockscreen.patch b/redhat/tdebase/kdebase-3.5.13-prevent_tooltip_over_lockscreen.patch
deleted file mode 100644
index 57e72137f..000000000
--- a/redhat/tdebase/kdebase-3.5.13-prevent_tooltip_over_lockscreen.patch
+++ /dev/null
@@ -1,137 +0,0 @@
-From 553923b25dc41e2c17ba9038eb225cd3bb9b1770 Mon Sep 17 00:00:00 2001
-From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
-Date: Fri, 21 Sep 2012 23:27:59 +0000
-Subject: Forcibly prevent transient override redirect windows from showing up over the lock screen
-
-This closes Bug 1079
----
-diff --git a/kdesktop/lock/lockdlg.cc b/kdesktop/lock/lockdlg.cc
-index 236bf8a..005ac99 100644
---- a/kdesktop/lock/lockdlg.cc
-+++ b/kdesktop/lock/lockdlg.cc
-@@ -573,9 +573,19 @@ void PasswordDlg::gplugActivity()
- 
- void PasswordDlg::gplugMsgBox( TQMessageBox::Icon type, const TQString &text )
- {
--    TQDialog dialog( this, 0, true, (WFlags)WX11BypassWM );
-+    TQDialog dialog( this, 0, true, (trinity_desktop_lock_use_system_modal_dialogs?((WFlags)WStyle_StaysOnTop):((WFlags)WX11BypassWM)) );
-+    if (trinity_desktop_lock_use_system_modal_dialogs) {
-+        // Signal that we do not want any window controls to be shown at all
-+        Atom kde_wm_system_modal_notification;
-+        kde_wm_system_modal_notification = XInternAtom(tqt_xdisplay(), "_KDE_WM_MODAL_SYS_NOTIFICATION", False);
-+        XChangeProperty(tqt_xdisplay(), dialog.winId(), kde_wm_system_modal_notification, XA_INTEGER, 32, PropModeReplace, (unsigned char *) "TRUE", 1L);
-+    }
-+    dialog.setCaption(i18n("Authentication Subsystem Notice"));
-     TQFrame *winFrame = new TQFrame( &dialog );
--    winFrame->setFrameStyle( TQFrame::WinPanel | TQFrame::Raised );
-+    if (trinity_desktop_lock_use_system_modal_dialogs)
-+        winFrame->setFrameStyle( TQFrame::NoFrame );
-+    else
-+        winFrame->setFrameStyle( TQFrame::WinPanel | TQFrame::Raised );
-     winFrame->setLineWidth( 2 );
-     TQVBoxLayout *vbox = new TQVBoxLayout( &dialog );
-     vbox->addWidget( winFrame );
-diff --git a/kdesktop/lock/lockprocess.cc b/kdesktop/lock/lockprocess.cc
-index 2ce7507..5265bc6 100644
---- a/kdesktop/lock/lockprocess.cc
-+++ b/kdesktop/lock/lockprocess.cc
-@@ -960,6 +960,27 @@ void LockProcess::createSaverWindow()
- 
-     setGeometry(0, 0, mRootWidth, mRootHeight);
- 
-+    // HACK
-+    // Close all tooltips and notification windows
-+    {
-+        Window rootWindow = RootWindow(x11Display(), x11Screen());
-+        Window parent;
-+        Window* children = NULL;
-+        unsigned int noOfChildren = 0;
-+        XWindowAttributes childAttr;
-+        Window childTransient;
-+
-+        if (XQueryTree(x11Display(), rootWindow, &rootWindow, &parent, &children, &noOfChildren) && noOfChildren>0 ) {
-+            for (unsigned int i=0; i<noOfChildren; i++) {
-+                if (XGetWindowAttributes(x11Display(), children[i], &childAttr) && XGetTransientForHint(x11Display(), children[i], &childTransient)) {
-+                    if ((childAttr.map_state == IsViewable) && (childAttr.override_redirect) && (childTransient)) {
-+                        XUnmapWindow(x11Display(), children[i]);
-+                    }
-+                }
-+            }
-+        }
-+    }
-+
-     kdDebug(1204) << "Saver window Id: " << winId() << endl;
- }
- 
-@@ -2162,9 +2183,19 @@ void LockProcess::unlockXF86()
- 
- void LockProcess::msgBox( TQMessageBox::Icon type, const TQString &txt )
- {
--    TQDialog box( 0, "messagebox", true, (WFlags)WX11BypassWM );
-+    TQDialog box( 0, "messagebox", true, (trinity_desktop_lock_use_system_modal_dialogs?((WFlags)WStyle_StaysOnTop):((WFlags)WX11BypassWM)) );
-+    if (trinity_desktop_lock_use_system_modal_dialogs) {
-+        // Signal that we do not want any window controls to be shown at all
-+        Atom kde_wm_system_modal_notification;
-+        kde_wm_system_modal_notification = XInternAtom(tqt_xdisplay(), "_KDE_WM_MODAL_SYS_NOTIFICATION", False);
-+        XChangeProperty(tqt_xdisplay(), box.winId(), kde_wm_system_modal_notification, XA_INTEGER, 32, PropModeReplace, (unsigned char *) "TRUE", 1L);
-+    }
-+    box.setCaption(i18n("Authentication Subsystem Notice"));
-     TQFrame *winFrame = new TQFrame( &box );
--    winFrame->setFrameStyle( TQFrame::WinPanel | TQFrame::Raised );
-+    if (trinity_desktop_lock_use_system_modal_dialogs)
-+        winFrame->setFrameStyle( TQFrame::NoFrame );
-+    else
-+        winFrame->setFrameStyle( TQFrame::WinPanel | TQFrame::Raised );
-     winFrame->setLineWidth( 2 );
-     TQLabel *label1 = new TQLabel( winFrame );
-     label1->setPixmap( TQMessageBox::standardIcon( type ) );
-@@ -2264,8 +2295,10 @@ void LockProcess::windowAdded( WId w, bool managed )
-     int y = XDisplayHeight( tqt_xdisplay(), tqt_xscreen()) - attr_geom.height;
-     if( managed ) {
-         XSetWindowAttributes attr;
--        attr.override_redirect = True;
--        XChangeWindowAttributes( tqt_xdisplay(), w, CWOverrideRedirect, &attr );
-+        if (!trinity_desktop_lock_use_system_modal_dialogs) {
-+            attr.override_redirect = True;
-+            XChangeWindowAttributes( tqt_xdisplay(), w, CWOverrideRedirect, &attr );
-+        }
-         XReparentWindow( tqt_xdisplay(), w, tqt_xrootwin(), x, y );
-         XMapWindow( tqt_xdisplay(), w );
-     }
-diff --git a/kdesktop/lock/main.cc b/kdesktop/lock/main.cc
-index 56b4b5f..e74d9f9 100644
---- a/kdesktop/lock/main.cc
-+++ b/kdesktop/lock/main.cc
-@@ -76,6 +76,30 @@ bool MyApp::x11EventFilter( XEvent *ev )
-             emit activity();
-         }
-     }
-+    else if (ev->type == MapNotify) {
-+        // HACK
-+        // Close all tooltips and notification windows
-+        XMapEvent map_event = ev->xmap;
-+        XWindowAttributes childAttr;
-+        Window childTransient;
-+        if (XGetWindowAttributes(map_event.display, map_event.window, &childAttr) && XGetTransientForHint(map_event.display, map_event.window, &childTransient)) {
-+            if((childAttr.map_state == IsViewable) && (childAttr.override_redirect) && (childTransient)) {
-+                XUnmapWindow(map_event.display, map_event.window);
-+            }
-+        }
-+    }
-+    else if (ev->type == CreateNotify) {
-+        // HACK
-+        // Close all tooltips and notification windows
-+        XCreateWindowEvent create_event = ev->xcreatewindow;
-+        XWindowAttributes childAttr;
-+        Window childTransient;
-+        if (XGetWindowAttributes(create_event.display, create_event.window, &childAttr) && XGetTransientForHint(create_event.display, create_event.window, &childTransient)) {
-+            if ((childAttr.override_redirect) && (childTransient)) {
-+                XDestroyWindow(create_event.display, create_event.window);
-+            }
-+        }
-+    }
-     return KApplication::x11EventFilter( ev );
- }
- 
---
-cgit v0.9.0.2-39-g756e
diff --git a/redhat/tdebase/kdebase-3.5.13-randrtray_merge_x11_reconfig_requests.patch b/redhat/tdebase/kdebase-3.5.13-randrtray_merge_x11_reconfig_requests.patch
deleted file mode 100644
index e17ae11b5..000000000
--- a/redhat/tdebase/kdebase-3.5.13-randrtray_merge_x11_reconfig_requests.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-Index: krandrapp.cpp
-===================================================================
---- kcontrol/randr/krandrapp.cpp	(revision 1261452)
-+++ kcontrol/randr/krandrapp.cpp	(working copy)
-@@ -28,13 +28,20 @@
- KRandRApp::KRandRApp()
- 	: m_tray(new KRandRSystemTray(0L, "RANDRTray"))
- {
-+	connect(&m_eventMergingTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(handleX11ConfigChangeEvent()));
- 	m_tray->show();
- }
- 
-+void KRandRApp::handleX11ConfigChangeEvent()
-+{
-+	m_eventMergingTimer.stop();
-+	m_tray->configChanged();
-+}
-+
- bool KRandRApp::x11EventFilter(XEvent* e)
- {
- 	if (e->type == m_tray->screenChangeNotifyEvent()) {
--		m_tray->configChanged();
-+		m_eventMergingTimer.start(1000, TRUE);
- 	}
- 	return KApplication::x11EventFilter( e );
- }
-Index: krandrapp.h
-===================================================================
---- kcontrol/randr/krandrapp.h	(revision 1261452)
-+++ kcontrol/randr/krandrapp.h	(working copy)
-@@ -19,6 +19,7 @@
- #ifndef KRANDRAPP_H
- #define KRANDRAPP_H
- 
-+#include <tqtimer.h>
- #include <kuniqueapplication.h>
- 
- class KRandRSystemTray;
-@@ -32,8 +33,12 @@
- 
- 	virtual bool x11EventFilter(XEvent * e);
- 
-+private slots:
-+	void handleX11ConfigChangeEvent();
-+
- private:
- 	KRandRSystemTray*	m_tray;
-+	TQTimer			m_eventMergingTimer;
- };
- 
- #endif
diff --git a/redhat/tdebase/kdebase-3.5.13-replicate_led_status_on_virtual_keyboard.patch b/redhat/tdebase/kdebase-3.5.13-replicate_led_status_on_virtual_keyboard.patch
deleted file mode 100644
index 1d3f73ceb..000000000
--- a/redhat/tdebase/kdebase-3.5.13-replicate_led_status_on_virtual_keyboard.patch
+++ /dev/null
@@ -1,95 +0,0 @@
-commit 8468d9bd5c66fe402acbc06f728b12ea996848de
-Author: Timothy Pearson <kb9vqf@pearsoncomputing.net>
-Date:   1327049889 -0600
-
-    Replicate LED status from virtual keyboards to physical keyboards
-    Fix keyboard attribute cloning
-    This commit closes Bug 561
-
-diff --git a/tsak/main.cpp b/tsak/main.cpp
-index df485a0..26aad00 100644
---- a/tsak/main.cpp
-+++ b/tsak/main.cpp
-@@ -126,22 +126,23 @@ static void copy_features(int devin, int devout)
- 	for(i=0;i<EV_MAX;++i) {
- 		if (bit_set(i, evtypes)) {
- 			switch(i) {
--			case EV_KEY: op = UI_SET_KEYBIT; break;
--			case EV_REL: op = UI_SET_RELBIT; break;
--			case EV_ABS: op = UI_SET_ABSBIT; break;
--			case EV_MSC: op = UI_SET_MSCBIT; break;
--			case EV_LED: op = UI_SET_LEDBIT; break;
--			case EV_SND: op = UI_SET_SNDBIT; break;
--			case EV_SW: op = UI_SET_SWBIT; break;
--			default: op = -1;
-+				case EV_KEY: op = UI_SET_KEYBIT; break;
-+				case EV_REL: op = UI_SET_RELBIT; break;
-+				case EV_ABS: op = UI_SET_ABSBIT; break;
-+				case EV_MSC: op = UI_SET_MSCBIT; break;
-+				case EV_LED: op = UI_SET_LEDBIT; break;
-+				case EV_SND: op = UI_SET_SNDBIT; break;
-+				case EV_SW: op = UI_SET_SWBIT; break;
-+				default: op = -1;
-+			}
- 		}
--	}
--	if (op == -1) continue;
--	ioctl(devout, UI_SET_EVBIT, i);
--	memset(codes,0,sizeof(codes));
--	if (ioctl(devin, EVIOCGBIT(i, sizeof(codes)), codes) < 0) return;
--	for(code=0;code<KEY_MAX;code++) {
--		if (bit_set(code, codes)) ioctl(devout, op, code);
-+		if (op == -1) continue;
-+		ioctl(devout, UI_SET_EVBIT, i);
-+		memset(codes,0,sizeof(codes));
-+		if (ioctl(devin, EVIOCGBIT(i, sizeof(codes)), codes) >= 0) {
-+			for(code=0;code<KEY_MAX;code++) {
-+				if (bit_set(code, codes)) ioctl(devout, op, code);
-+			}
- 		}
- 	}
- }
-@@ -342,6 +343,7 @@ int main (int argc, char *argv[])
- {
- 	struct input_event ev[64];
- 	struct input_event event;
-+	struct input_event revev;
- 	struct uinput_user_dev devinfo={0};
- 	int devout[MAX_KEYBOARDS], rd, i, value, size = sizeof (struct input_event);
- 	char name[256] = "Unknown";
-@@ -416,9 +418,9 @@ int main (int argc, char *argv[])
- 				fprintf(stderr, "Reading from keyboard: (%s)\n", name);
- 			
- 				// Create filtered virtual output device
--				devout[current_keyboard]=open("/dev/misc/uinput",O_WRONLY|O_NONBLOCK);
-+				devout[current_keyboard]=open("/dev/misc/uinput",O_RDWR|O_NONBLOCK);
- 				if (devout[current_keyboard]<0) {
--					devout[current_keyboard]=open("/dev/uinput",O_WRONLY|O_NONBLOCK);
-+					devout[current_keyboard]=open("/dev/uinput",O_RDWR|O_NONBLOCK);
- 					if (devout[current_keyboard]<0) {
- 						perror("open(\"/dev/misc/uinput\")");
- 					}
-@@ -483,6 +485,14 @@ int main (int argc, char *argv[])
- 									fprintf(stderr, "Read failed.\n");
- 									break;
- 								}
-+
-+								// Replicate LED events from the virtual keyboard to the physical keyboard
-+								int rrd = read(devout[current_keyboard], &revev, size);
-+								if (rrd >= size) {
-+									if (revev.type == EV_LED) {
-+										write(keyboard_fds[current_keyboard], &revev, sizeof(revev));
-+									}
-+								}
- 								
- 								value = ev[0].value;
- 								
-@@ -506,7 +516,7 @@ int main (int argc, char *argv[])
- 									}
- 								}
- 						
--								if (hide_event == false) {
-+								if ((hide_event == false) && (ev[0].type != EV_LED) && (ev[1].type != EV_LED)) {
- 									// Pass the event on...
- 									event = ev[0];
- 									write(devout[current_keyboard], &event, sizeof event);
diff --git a/redhat/tdebase/kdebase-3.5.13-restore_kde3_clock.patch b/redhat/tdebase/kdebase-3.5.13-restore_kde3_clock.patch
deleted file mode 100644
index 2b697330d..000000000
--- a/redhat/tdebase/kdebase-3.5.13-restore_kde3_clock.patch
+++ /dev/null
@@ -1,104 +0,0 @@
-Index: kicker/applets/systemtray/systemtrayapplet.cpp
-===================================================================
---- kicker/applets/systemtray/systemtrayapplet.cpp	(revision 1262481)
-+++ kicker/applets/systemtray/systemtrayapplet.cpp	(working copy)
-@@ -34,6 +34,7 @@
- #include <tqstyle.h>
- #include <tqgrid.h>
- #include <tqpainter.h>
-+#include <tqimage.h>
- 
- #include <dcopclient.h>
- #include <kapplication.h>
-Index: kicker/applets/clock/clock.h
-===================================================================
---- kicker/applets/clock/clock.h	(revision 1262481)
-+++ kicker/applets/clock/clock.h	(working copy)
-@@ -41,7 +41,6 @@
- 
- #include <kickertip.h>
- #include "settings.h"
--#include "kshadowengine.h"
- 
- class TQTimer;
- class TQBoxLayout;
-@@ -283,8 +282,6 @@
-         TQDate clockGetDate();
- 
-         virtual void updateKickerTip(KickerTip::Data&);
--    
--        KTextShadowEngine *shadowEngine();
- 
-     k_dcop:
-         void reconfigure();
-@@ -344,7 +341,6 @@
-         TQStringList _remotezonelist;
-         KPopupMenu* menu;
-         ClockAppletToolTip m_tooltip;
--        KTextShadowEngine *m_shadowEngine;
- };
- 
- 
-Index: kicker/applets/clock/clock.cpp
-===================================================================
---- kicker/applets/clock/clock.cpp	(revision 1262481)
-+++ kicker/applets/clock/clock.cpp	(working copy)
-@@ -277,10 +277,7 @@
- {
-     TQRect tr(0, 0, width(), height());
-     
--    if (!KickerSettings::transparent())
--        p->drawText(tr, AlignCenter, _timeStr);
--    else
--        _applet->shadowEngine()->drawText(*p, tr, AlignCenter, _timeStr, size());
-+    p->drawText(tr, AlignCenter, _timeStr);
- }
- 
- //************************************************************
-@@ -862,10 +859,7 @@
-     else
-         tr = TQRect(4, 2, width() - 8, height() - 4);
-         
--    if (!KickerSettings::transparent())
--        p->drawText(tr, AlignCenter, _timeStr);
--    else
--        _applet->shadowEngine()->drawText(*p, tr, AlignCenter, _timeStr, size());
-+    p->drawText(tr, AlignCenter, _timeStr);
-     
-     alreadyDrawing = false;
- }
-@@ -899,8 +893,7 @@
-       _prefs(new Prefs(sharedConfig())),
-       zone(new Zone(config())),
-       menu(0),
--      m_tooltip(this),
--      m_shadowEngine(0)
-+      m_tooltip(this)
- {
-     DCOPObject::setObjId("ClockApplet");
-     _prefs->readConfig();
-@@ -938,7 +931,6 @@
- 
- ClockApplet::~ClockApplet()
- {
--    delete m_shadowEngine;
-     //reverse for the moment
-     KGlobal::locale()->removeCatalogue("clockapplet");
-     KGlobal::locale()->removeCatalogue("timezones"); // For time zone translations
-@@ -959,15 +951,7 @@
- }
- 
- 
--KTextShadowEngine *ClockApplet::shadowEngine()
--{
--    if (!m_shadowEngine)
--        m_shadowEngine = new KTextShadowEngine();
- 
--    return m_shadowEngine;
--}
--
--
- int ClockApplet::widthForHeight(int h) const
- {
-     if (orientation() == Qt::Vertical)
- 
diff --git a/redhat/tdebase/kdebase-3.5.13-start_dcop_in_tdm.patch b/redhat/tdebase/kdebase-3.5.13-start_dcop_in_tdm.patch
deleted file mode 100644
index 53d7d6cde..000000000
--- a/redhat/tdebase/kdebase-3.5.13-start_dcop_in_tdm.patch
+++ /dev/null
@@ -1,34 +0,0 @@
---- kdebase/kdm/kfrontend/kgapp.cpp.orig	2012-04-27 22:08:53.729331548 +0200
-+++ kdebase/kdm/kfrontend/kgapp.cpp	2012-04-27 22:06:29.169359295 +0200
-@@ -190,6 +190,7 @@
- 	KProcess *tsak = 0;
- 	KProcess *proc = 0;
- 	KProcess *comp = 0;
-+	KProcess *dcop = 0;
- 	KProcess *kwin = 0;
- 
- 	trinity_desktop_lock_use_sak = _useSAK;
-@@ -310,6 +311,13 @@
- 	}
- 
- 	if (!_windowManager.isEmpty()) {
-+		if (_windowManager == "kwin") {
-+			// Special case
-+			// Start DCOP...
-+			dcop = new KProcess;
-+			*dcop << TQCString( argv0, strrchr( argv0, '/' ) - argv0 + 2 ) + "dcopserver" << TQCString("--suicide");
-+			dcop->start();
-+		}
- 		kwin = new KProcess;
- 		*kwin << TQCString( argv0, strrchr( argv0, '/' ) - argv0 + 2 ) + _windowManager.ascii();
- 		kwin->start();
-@@ -453,7 +461,9 @@
- 	if (kwin) {
- 		kwin->closeStdin();
- 		kwin->detach();
-+		dcop->detach();
- 		delete kwin;
-+		delete dcop;
- 	}
- 	delete proc;
- 	UnsecureDisplay( dpy );
diff --git a/redhat/tdebase/kdebase-3.5.13-startkde_directories.patch b/redhat/tdebase/kdebase-3.5.13-startkde_directories.patch
deleted file mode 100644
index 0ac005184..000000000
--- a/redhat/tdebase/kdebase-3.5.13-startkde_directories.patch
+++ /dev/null
@@ -1,118 +0,0 @@
---- kdebase/startkde.ORI	2011-12-12 20:09:21.984162840 +0100
-+++ kdebase/startkde	2011-12-12 20:08:27.922834925 +0100
-@@ -4,6 +4,7 @@
- #
- 
- echo "[startkde] Starting startkde." 1>&2
-+export KDEDIR="/opt/trinity"
- 
- # When the X server dies we get a HUP signal from xinit. We must ignore it
- # because we still need to do some cleanup.
-@@ -74,39 +75,10 @@
-   echo "[startkde] KDEHOME is preset to $KDEHOME." 1>&2
-   export KDEHOME=$KDEHOME
- else
--  # $KDEHOME is NOT already preset in the environment. Try to help.
--  # This might be overkill but does provide flexibility.
-+  # $KDEHOME is NOT already preset in the environment.
-+  # We always use ~/.trinity as default.
-   echo "[startkde] KDEHOME is not set." 1>&2
--  if [ -d $HOME/.trinity ]; then
--    # OK, this one is obvious.
--    export KDEHOME=$HOME/.trinity
--  elif [ -d $HOME/.trinity ]; then
--    # Looks like the user had an old version of Trinity installed at last login
--    echo "[startkde] Migrating old ~/.trinity directory to new ~/.trinity name." 1>&2
--    mv $HOME/.trinity $HOME/.trinity
--    export KDEHOME=$HOME/.trinity
--  elif [ -f /usr/bin/kde4-config ]; then
--    # Looks like KDE4 is installed.
--    if [ -d $HOME/.kde ] && [ ! -d $HOME/.trinity ]; then
--      # Presume $HOME/.kde is being used for KDE4 as it already exists.
--      export KDEHOME=$HOME/.trinity
--    else
--      # Presume $HOME/.kde is being used for KDE4 to be on the safe side.
--      export KDEHOME=$HOME/.trinity
--    fi
--  elif [ -f /opt/trinity/bin/kde-config ]; then
--    # Looks like KDE3 or Trinity is installed and playing second fiddle to KDE4.
--    export KDEHOME=$HOME/.trinity
--  elif [ -f /opt/trinity/bin/kde-config ]; then
--    # Looks like KDE3 or Trinity is installed and playing second fiddle to KDE4.
--    export KDEHOME=$HOME/.trinity
--  elif [ -f /usr/bin/kde-config ] && [ -d $HOME/.kde ]; then
--    # Looks like KDE3 or Trinity is installed and not playing second fiddle to KDE4.
--    export KDEHOME=$HOME/.kde
--  else
--    # Resort to this and hope for the best!
--    export KDEHOME=$HOME/.trinity
--  fi
-+  export KDEHOME=$HOME/.trinity
-   echo "[startkde] Set KDEHOME to $KDEHOME." 1>&2
- fi
- 
-@@ -117,51 +89,25 @@
- fi
- 
- # Modify the following environment variables only as necessary.
--if [ -d /opt/trinity/games ]; then
--  export PATH=/opt/trinity/games:$PATH
--fi
--if [ -d /opt/trinity/bin ]; then
--  export PATH=/opt/trinity/bin:$PATH
--fi
--if [ -d /opt/trinity/games ]; then
--  export PATH=/opt/trinity/games:$PATH
--fi
--if [ -d /opt/trinity/bin ]; then
--  export PATH=/opt/trinity/bin:$PATH
--fi
--if [ -d /opt/trinity/share ]; then
--  export XDG_DATA_DIRS=$XDG_DATA_DIRS:/opt/trinity/share/:/usr/share/
--fi
--if [ -d /opt/trinity/share ]; then
--  export XDG_DATA_DIRS=$XDG_DATA_DIRS:/opt/trinity/share/:/usr/share/
-+if [ -d ${KDEDIR}/games ]; then
-+  export PATH=${KDEDIR}/games:$PATH
- fi
--if [ -d /opt/trinity/etc/xdg ]; then
--  export XDG_CONFIG_DIRS=$XDG_CONFIG_DIRS:/opt/trinity/etc/xdg/:/etc/xdg/
-+if [ -d ${KDEDIR}/bin ]; then
-+  export PATH=${KDEDIR}/bin:$PATH
- fi
--if [ -d /opt/trinity/etc/xdg ]; then
--  export XDG_CONFIG_DIRS=$XDG_CONFIG_DIRS:/opt/trinity/etc/xdg/:/etc/xdg/
-+if [ -d ${KDEDIR}/share ]; then
-+  export XDG_DATA_DIRS=$XDG_DATA_DIRS:${KDEDIR}/share/:/usr/share/
- fi
--if [ -d /opt/trinity/share/man ]; then
--  export MANPATH=/opt/trinity/share/man:$MANPATH
-+if [ -d ${KDEDIR}/etc/xdg ]; then
-+  export XDG_CONFIG_DIRS=$XDG_CONFIG_DIRS:${KDEDIR}/etc/xdg/:/etc/xdg/
- fi
--if [ -d /opt/trinity/share/man ]; then
--  export MANPATH=/opt/trinity/share/man:$MANPATH
--fi
--if [ -d /opt/trinity ]; then
--  if [ -n "$KDEDIRS" ]; then
--    export KDEDIRS=$KDEDIRS:/opt/trinity/:/usr/
--  else
--    export KDEDIRS=/opt/trinity/:/usr/
--  fi
--fi
--if [ -d /opt/trinity ]; then
--  if [ -n "$KDEDIRS" ]; then
--    export KDEDIRS=$KDEDIRS:/opt/trinity/:/usr/
--  else
--    export KDEDIRS=/opt/trinity/:/usr/
--  fi
-+if [ -d ${KDEDIR}/share/man ]; then
-+  export MANPATH=${KDEDIR}/share/man:$MANPATH
- fi
- 
-+# The TDE directory must be first in $KDEDIRS
-+export KDEDIRS=${KDEDIR}/:$KDEDIRS:/usr/
-+
- test -n "$KDEHOME" && kdehome=`echo "$KDEHOME" | sed "s,^~/,$HOME/,"`
- echo "[startkde] kdehome: $kdehome" 1>&2
- 
diff --git a/redhat/tdebase/kdebase-3.5.13-startkde_icon.patch b/redhat/tdebase/kdebase-3.5.13-startkde_icon.patch
deleted file mode 100644
index 166c1b52f..000000000
--- a/redhat/tdebase/kdebase-3.5.13-startkde_icon.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- tdebase/startkde.ORI	2012-07-29 18:23:59.885538470 +0200
-+++ tdebase/startkde	2012-07-29 18:26:19.022618054 +0200
-@@ -152,6 +152,16 @@
-   fi
- fi
- 
-+# Default Start Button icon for TDE
-+if [ ! -e  $kdehome/share/config/kickerrc ]; then
-+  if [ -r "%{tde_starticon}" ]; then
-+    cat <<EOF >$kdehome/share/config/kickerrc
-+[KMenu]
-+CustomIcon=%{tde_starticon}
-+EOF
-+  fi
-+fi
-+
- # XCursor mouse theme needs to be applied here to work even for kded or ksmserver.
- if test -n "$kcminputrc_mouse_cursortheme" -o -n "$kcminputrc_mouse_cursorsize" ; then
-     kapplymousetheme "$kcminputrc_mouse_cursortheme" "$kcminputrc_mouse_cursorsize"
diff --git a/redhat/tdebase/kdebase-3.5.13-startkde_ldpreload.patch b/redhat/tdebase/kdebase-3.5.13-startkde_ldpreload.patch
deleted file mode 100644
index 1b39a59ff..000000000
--- a/redhat/tdebase/kdebase-3.5.13-startkde_ldpreload.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- kdebase/startkde.ORI	2011-11-01 22:17:52.000000000 +0100
-+++ kdebase/startkde	2011-11-01 22:18:14.000000000 +0100
-@@ -413,7 +413,9 @@
- fi
- 
- if [ -n $KGTK_PRELOAD ]; then
--  if [ -e /usr/lib/libnspr4.so ]; then
-+  if [ -e /usr/lib64/libnspr4.so ]; then
-+    KGTK_NSPR_PRELOAD="/usr/lib64/libnspr4.so:"
-+  elif [ -e /usr/lib/libnspr4.so ]; then
-     KGTK_NSPR_PRELOAD="/usr/lib/libnspr4.so:"
-   fi
-   export LD_PRELOAD=$KGTK_PRELOAD:$KGTK_NSPR_PRELOAD$LD_PRELOAD
diff --git a/redhat/tdebase/kdebase-3.5.13-support_hal_04.patch b/redhat/tdebase/kdebase-3.5.13-support_hal_04.patch
deleted file mode 100644
index 0a92b6b98..000000000
--- a/redhat/tdebase/kdebase-3.5.13-support_hal_04.patch
+++ /dev/null
@@ -1,1033 +0,0 @@
---- kdebase/ksmserver/shutdowndlg.h.rhel4	2012-09-08 05:43:47.950945974 -0400
-+++ kdebase/ksmserver/shutdowndlg.h	2012-09-08 05:45:55.807337959 -0400
-@@ -32,6 +32,9 @@
- 
- #include <config.h>
- 
-+// RHEL 4 dirty hack to remove HAL support in ksmshutdown
-+#undef COMPILE_HALBACKEND
-+
- #ifndef NO_QT3_DBUS_SUPPORT
- /* We acknowledge the the dbus API is unstable */
- #define DBUS_API_SUBJECT_TO_CHANGE
---- kdebase/kioslave/media/mediamanager/halbackend.cpp.hal04	2012-09-08 14:15:10.324373357 -0400
-+++ kdebase/kioslave/media/mediamanager/halbackend.cpp	2012-09-08 14:26:12.422302958 -0400
-@@ -41,12 +41,10 @@
- #include <kprocess.h>
- 
- #define MOUNT_SUFFIX    (                                                                       \
--    (medium->isMounted() ? TQString("_mounted") : TQString("_unmounted")) +   \
--    (medium->isEncrypted() ? (halClearVolume ? "_decrypted" : "_encrypted") : "" )          \
-+    (medium->isMounted() ? TQString("_mounted") : TQString("_unmounted"))   \
-     )
- #define MOUNT_ICON_SUFFIX   (                                                              \
--    (medium->isMounted() ? TQString("_mount") : TQString("_unmount")) +   \
--    (medium->isEncrypted() ? (halClearVolume ? "_decrypt" : "_encrypt") : "" )      \
-+    (medium->isMounted() ? TQString("_mount") : TQString("_unmount"))   \
-     )
- 
- /* Static instance of this class, for static HAL callbacks */
-@@ -57,10 +55,10 @@
- {
-     char*   _ppt_string;
-     TQString _ppt_QString;
--    _ppt_string = libhal_device_get_property_string(ctx, udi, key, NULL);
-+    _ppt_string = hal_device_get_property_string(ctx, udi, key);
-     if ( _ppt_string )
-         _ppt_QString = _ppt_string;
--    libhal_free_string(_ppt_string);
-+    hal_free_string(_ppt_string);
-     return _ppt_QString;
- }
- 
-@@ -92,7 +90,7 @@
- 
-         /* Remove all the registered media first */
-         int numDevices;
--        char** halDeviceList = libhal_get_all_devices( m_halContext, &numDevices, NULL );
-+        char** halDeviceList = hal_get_all_devices( m_halContext, &numDevices );
- 
-         if ( halDeviceList )
-         {
-@@ -102,70 +100,39 @@
-             }
-         }
- 
--        libhal_free_string_array( halDeviceList );
-+        hal_free_string_array( halDeviceList );
- 
--        DBusError error;
--        dbus_error_init(&error);
--        libhal_ctx_shutdown(m_halContext, &error);
--        libhal_ctx_free(m_halContext);
-+        hal_shutdown(m_halContext);
-     }
- 
-     if (m_halStoragePolicy)
--        libhal_storage_policy_free(m_halStoragePolicy);
-+        hal_storage_policy_free(m_halStoragePolicy);
- }
- 
- /* Connect to the HAL */
- bool HALBackend::InitHal()
- {
-     kdDebug(1219) << "Context new" << endl;
--    m_halContext = libhal_ctx_new();
-+
-+    /* libhal initialization */
-+    m_halFunctions.main_loop_integration	= HALBackend::hal_main_loop_integration;
-+    m_halFunctions.device_added		= HALBackend::hal_device_added;
-+    m_halFunctions.device_removed		= HALBackend::hal_device_removed;
-+    m_halFunctions.device_new_capability	= NULL;
-+    m_halFunctions.device_lost_capability	= NULL;
-+    m_halFunctions.device_property_modified	= HALBackend::hal_device_property_modified;
-+    m_halFunctions.device_condition		= HALBackend::hal_device_condition;
-+
-+    m_halContext = hal_initialize(&m_halFunctions, false);
-     if (!m_halContext)
-     {
-         kdDebug(1219) << "Failed to initialize HAL!" << endl;
-         return false;
-     }
- 
--    // Main loop integration
--    kdDebug(1219) << "Main loop integration" << endl;
--    DBusError error;
--    dbus_error_init(&error);
--    dbus_connection = dbus_bus_get_private(DBUS_BUS_SYSTEM, &error);
--
--    if (!dbus_connection || dbus_error_is_set(&error)) {
--        dbus_error_free(&error);
--        libhal_ctx_free(m_halContext);
--        m_halContext = NULL;
--        return false;
--    }
--
--    dbus_connection_set_exit_on_disconnect (dbus_connection, FALSE);
--
--    MainLoopIntegration(dbus_connection);
--    libhal_ctx_set_dbus_connection(m_halContext, dbus_connection);
--
--    // HAL callback functions
--    kdDebug(1219) << "Callback functions" << endl;
--    libhal_ctx_set_device_added(m_halContext, HALBackend::hal_device_added);
--    libhal_ctx_set_device_removed(m_halContext, HALBackend::hal_device_removed);
--    libhal_ctx_set_device_new_capability (m_halContext, NULL);
--    libhal_ctx_set_device_lost_capability (m_halContext, NULL);
--    libhal_ctx_set_device_property_modified (m_halContext, HALBackend::hal_device_property_modified);
--    libhal_ctx_set_device_condition(m_halContext, HALBackend::hal_device_condition);
--
--    kdDebug(1219) << "Context Init" << endl;
--    if (!libhal_ctx_init(m_halContext, &error))
--    {
--        if (dbus_error_is_set(&error))
--            dbus_error_free(&error);
--        libhal_ctx_free(m_halContext);
--        m_halContext = NULL;
--        kdDebug(1219) << "Failed to init HAL context!" << endl;
--        return false;
--    }
--
-     /** @todo customize watch policy */
-     kdDebug(1219) << "Watch properties" << endl;
--    if (!libhal_device_property_watch_all(m_halContext, &error))
-+    if (hal_device_property_watch_all(m_halContext))
-     {
-         kdDebug(1219) << "Failed to watch HAL properties!" << endl;
-         return false;
-@@ -173,7 +140,7 @@
- 
-     /* libhal-storage initialization */
-     kdDebug(1219) << "Storage Policy" << endl;
--    m_halStoragePolicy = libhal_storage_policy_new();
-+    m_halStoragePolicy = hal_storage_policy_new();
-     /** @todo define libhal-storage icon policy */
- 
-     /* List devices at startup */
-@@ -186,16 +153,19 @@
-     kdDebug(1219) << "ListDevices" << endl;
- 
-     int numDevices;
--    char** halDeviceList = libhal_get_all_devices(m_halContext, &numDevices, NULL);
-+    char** halDeviceList = hal_get_all_devices(m_halContext, &numDevices);
- 
-     if (!halDeviceList)
-         return false;
- 
-     kdDebug(1219) << "HALBackend::ListDevices : " << numDevices << " devices found" << endl;
--    for (int i = 0; i < numDevices; i++)
-+    for (int i = 0; i < numDevices; i++) {
-+		kdDebug(1219) << "HALBackend::ListDevices : adding device " << i << endl;
-         AddDevice(halDeviceList[i], false);
-+		kdDebug(1219) << "HALBackend::ListDevices : end adding device " << i << endl;
-+    }
- 
--    libhal_free_string_array( halDeviceList );
-+    hal_free_string_array( halDeviceList );
- 
-     return true;
- }
-@@ -206,63 +176,54 @@
- {
-     /* We don't deal with devices that do not expose their capabilities.
-        If we don't check this, we will get a lot of warning messages from libhal */
--    if (!libhal_device_property_exists(m_halContext, udi, "info.capabilities", NULL))
-+    if (!hal_device_property_exists(m_halContext, udi, "info.capabilities")) {
-+        kdDebug(1219) << "HALBackend::AddDevice : Device does not expose capability. Skipping." << endl;   
-         return;
-+    }
- 
-     /* If the device is already listed, do not process.
-        This should not happen, but who knows... */
-     /** @todo : refresh properties instead ? */
--    if (m_mediaList.findById(udi))
-+    if (m_mediaList.findById(udi)) {
-+        kdDebug(1219) << "HALBackend::AddDevice : Device is already listed. Skipping." << endl;   
-         return;
-+    }
- 
--    if (libhal_device_get_property_bool(m_halContext, "/org/freedesktop/Hal/devices/computer", "storage.disable_volume_handling", NULL))
-+    if (hal_device_get_property_bool(m_halContext, "/org/freedesktop/Hal/devices/computer", "storage.disable_volume_handling"))
-         allowNotification=false;
- 
-     /* Add volume block devices */
--    if (libhal_device_query_capability(m_halContext, udi, "volume", NULL))
-+    if (hal_device_query_capability(m_halContext, udi, "volume"))
-     {
-+		kdDebug(1219) << "HALBackend::AddDevice : Device is a volume." << endl;   
-         /* We only list volumes that...
--         *  - are encrypted with LUKS or
-          *  - have a filesystem or
-          *  - have an audio track
-          */
--        if ( ( libhal_device_get_property_QString(m_halContext, udi, "volume.fsusage") != "crypto" ||
--               libhal_device_get_property_QString(m_halContext, udi, "volume.fstype") != "crypto_LUKS"
--             ) &&
--             libhal_device_get_property_QString(m_halContext, udi, "volume.fsusage") != "filesystem" &&
--             !libhal_device_get_property_bool(m_halContext, udi, "volume.disc.has_audio", NULL) &&
--             !libhal_device_get_property_bool(m_halContext, udi, "volume.disc.is_blank", NULL) )
-+        if ( (libhal_device_get_property_QString(m_halContext, udi, "volume.fsusage") != "filesystem") &&
-+             (!hal_device_get_property_bool(m_halContext, udi, "volume.disc.has_audio")) &&
-+             (!hal_device_get_property_bool(m_halContext, udi, "volume.disc.is_blank")) ) {
-+            kdDebug(1219) << "HALBackend::AddDevice : no filesystem, no audio track on device. Skipping." << endl;   
-             return;
-+        }
- 
-         /* Query drive udi */
-         TQString driveUdi = libhal_device_get_property_QString(m_halContext, udi, "block.storage_device");
--        if ( driveUdi.isNull() ) // no storage - no fun
-+        if ( driveUdi.isNull() ) { // no storage - no fun
-+            kdDebug(1219) << "HALBackend::AddDevice : UDI is null. Skipping." << endl;   
-             return;
-+        }
- 
-         // if the device is locked do not act upon it
--        if (libhal_device_get_property_bool(m_halContext, driveUdi.ascii(), "info.locked", NULL))
-+        if (hal_device_get_property_bool(m_halContext, driveUdi.ascii(), "info.locked"))
-             allowNotification=false;
- 
-         // if the device is locked do not act upon it
--        if (libhal_device_get_property_bool(m_halContext, driveUdi.ascii(), "storage.partition_table_changed", NULL))
-+        if (hal_device_get_property_bool(m_halContext, driveUdi.ascii(), "storage.partition_table_changed"))
-             allowNotification=false;
- 
-         /** @todo check exclusion list **/
- 
--        /* Special handling for clear crypto volumes */
--        LibHalVolume* halVolume = libhal_volume_from_udi(m_halContext, udi);
--        if (!halVolume)
--            return;
--        const char* backingVolumeUdi = libhal_volume_crypto_get_backing_volume_udi(halVolume);
--        if ( backingVolumeUdi != NULL )
--        {
--            /* The crypto drive was unlocked and may now be mounted... */
--            kdDebug(1219) << "HALBackend::AddDevice : ClearVolume appeared for " << backingVolumeUdi << endl;
--            ResetProperties(backingVolumeUdi, allowNotification);
--            libhal_volume_free(halVolume);
--            return;
--        }
--        libhal_volume_free(halVolume);
- 
-         /* Create medium */
-         Medium* medium = new Medium(udi, "");
-@@ -272,18 +233,20 @@
-         {
-             // if it's not mountable by user and not by HAL, don't show it at all
-             if ( ( libhal_device_get_property_QString(m_halContext, udi, "volume.fsusage") == "filesystem" &&
--                   !libhal_device_get_property_bool(m_halContext, udi, "volume.is_mounted", NULL ) ) &&
--                 ( libhal_device_get_property_bool(m_halContext, udi, "volume.ignore", NULL ) ) )
-+                   !hal_device_get_property_bool(m_halContext, udi, "volume.is_mounted") ) &&
-+                 ( hal_device_get_property_bool(m_halContext, udi, "volume.ignore") ) )
-             {
-+                kdDebug(1219) << "HALBackend::AddDevice : Device is not mountable. Skipping." << endl;   
-                 delete medium;
-                 return;
-             }
-         }
-         
--	// instert medium into list
--	m_mediaList.addMedium(medium, allowNotification);
-+	    // insert medium into list
-+        kdDebug(1219) << "HALBackend::AddDevice : Adding medium into list." << endl;   
-+	    m_mediaList.addMedium(medium, allowNotification);
- 
--	// finally check for automount
-+	    // finally check for automount
-         TQMap<TQString,TQString> options = MediaManagerUtils::splitOptions(mountoptions(udi));
-         kdDebug() << "automount " << options["automount"] << endl;
-         if (options["automount"] == "true" && allowNotification ) {
-@@ -294,14 +257,18 @@
- 
-         return;
-     }
-+    else
-+    {
-+		kdDebug(1219) << "HALBackend::AddDevice : Device is not a volume." << endl;   
-+    }
- 
-     /* Floppy & zip drives */
--    if (libhal_device_query_capability(m_halContext, udi, "storage", NULL))
-+    if (hal_device_query_capability(m_halContext, udi, "storage"))
-         if ((libhal_device_get_property_QString(m_halContext, udi, "storage.drive_type") == "floppy") ||
-             (libhal_device_get_property_QString(m_halContext, udi, "storage.drive_type") == "zip") ||
-             (libhal_device_get_property_QString(m_halContext, udi, "storage.drive_type") == "jaz"))
-         {
--            if (! libhal_device_get_property_bool(m_halContext, udi, "storage.removable.media_available", NULL) )
-+            if (! hal_device_get_property_bool(m_halContext, udi, "storage.removable.media_available") )
-                 allowNotification = false;
-             /* Create medium */
-             Medium* medium = new Medium(udi, "");
-@@ -314,11 +281,9 @@
-         }
- 
-     /* Camera handled by gphoto2*/
--    if (libhal_device_query_capability(m_halContext, udi, "camera", NULL) &&
--        ((libhal_device_get_property_QString(m_halContext, udi, "camera.access_method")=="ptp") ||
--
--         (libhal_device_property_exists(m_halContext, udi, "camera.libgphoto2.support", NULL) &&
--          libhal_device_get_property_bool(m_halContext, udi, "camera.libgphoto2.support", NULL)))
-+    if (hal_device_query_capability(m_halContext, udi, "camera") &&
-+         hal_device_property_exists(m_halContext, udi, "camera.libgphoto2.support") &&
-+         hal_device_get_property_bool(m_halContext, udi, "camera.libgphoto3.support")
-         )
-     {
-         /* Create medium */
-@@ -327,6 +292,7 @@
-         m_mediaList.addMedium(medium, allowNotification);
-         return;
-     }
-+    kdDebug(1219) << "HALBackend::AddDevice : Device was intentionally not added. Skipping." << endl;   
- }
- 
- void HALBackend::RemoveDevice(const char *udi)
-@@ -348,7 +314,7 @@
-         return;
-     bool allowNotification = false;
-     if (strcmp(key, "storage.removable.media_available") == 0)
--        allowNotification = libhal_device_get_property_bool(m_halContext, udi, key, NULL);
-+        allowNotification = hal_device_get_property_bool(m_halContext, udi, key);
-     ResetProperties(mediumUdi, allowNotification);
- }
- 
-@@ -421,19 +387,13 @@
-         return medium->id().ascii();
- 
-     /* Hard part : this is a volume whose drive is registered */
--    if (libhal_device_property_exists(m_halContext, udi, "info.capabilities", NULL))
--        if (libhal_device_query_capability(m_halContext, udi, "volume", NULL))
-+    if (hal_device_property_exists(m_halContext, udi, "info.capabilities"))
-+        if (hal_device_query_capability(m_halContext, udi, "volume"))
-         {
-             /* check if this belongs to an encrypted volume */
--            LibHalVolume* halVolume = libhal_volume_from_udi(m_halContext, udi);
-+            HalVolume* halVolume = hal_volume_from_udi(m_halContext, udi);
-             if (!halVolume) return NULL;
--            const char* backingUdi = libhal_volume_crypto_get_backing_volume_udi(halVolume);
--            if (backingUdi != NULL) {
--                const char* result = findMediumUdiFromUdi(backingUdi);
--                libhal_volume_free(halVolume);
--                return result;
--            }
--            libhal_volume_free(halVolume);
-+            hal_volume_free(halVolume);
- 
-             /* this is a volume whose drive is registered */
-             TQString driveUdi = libhal_device_get_property_QString(m_halContext, udi, "block.storage_device");
-@@ -462,11 +422,11 @@
- 
-     Medium* m = new Medium(mediumUdi, "");
- 
--    if (libhal_device_query_capability(m_halContext, mediumUdi, "volume", NULL))
-+    if (hal_device_query_capability(m_halContext, mediumUdi, "volume"))
-         setVolumeProperties(m);
--    if (libhal_device_query_capability(m_halContext, mediumUdi, "storage", NULL))
-+    if (hal_device_query_capability(m_halContext, mediumUdi, "storage"))
-         setFloppyProperties(m);
--    if (libhal_device_query_capability(m_halContext, mediumUdi, "camera", NULL))
-+    if (hal_device_query_capability(m_halContext, mediumUdi, "camera"))
-         setCameraProperties(m);
- 
-     m_mediaList.changeMediumState(*m, allowNotification);
-@@ -480,84 +440,50 @@
- 
-     const char* udi = medium->id().ascii();
-     /* Check if the device still exists */
--    if (!libhal_device_exists(m_halContext, udi, NULL))
-+    if (!hal_device_exists(m_halContext, udi))
-         return;
- 
-     /* Get device information from libhal-storage */
--    LibHalVolume* halVolume = libhal_volume_from_udi(m_halContext, udi);
-+    HalVolume* halVolume = hal_volume_from_udi(m_halContext, udi);
-     if (!halVolume)
-         return;
--    TQString driveUdi = libhal_volume_get_storage_device_udi(halVolume);
--    LibHalDrive*  halDrive  = 0;
-+    TQString driveUdi = hal_volume_get_storage_device_udi(halVolume);
-+    HalDrive*  halDrive  = 0;
-     if ( !driveUdi.isNull() )
--        halDrive = libhal_drive_from_udi(m_halContext, driveUdi.ascii());
-+        halDrive = hal_drive_from_udi(m_halContext, driveUdi.ascii());
-     if (!halDrive) {
-         // at times HAL sends an UnmountForced event before the device is removed
--        libhal_volume_free(halVolume);
-+        hal_volume_free(halVolume);
-         return;
-     }
- 
-     medium->setName(
--        generateName(libhal_volume_get_device_file(halVolume)) );
--
--    LibHalVolume* halClearVolume = NULL;
--    if ( libhal_device_get_property_QString(m_halContext, udi, "volume.fsusage") == "crypto" )
--    {
--        kdDebug(1219) << "HALBackend::setVolumeProperties : crypto volume" << endl;
-+        generateName(hal_volume_get_device_file(halVolume)) );
- 
--        medium->setEncrypted(true);
--        char* clearUdi = libhal_volume_crypto_get_clear_volume_udi(m_halContext, halVolume);
--	TQString clearUdiString;
--        if (clearUdi != NULL) {
--            kdDebug(1219) << "HALBackend::setVolumeProperties : crypto clear volume avail - " << clearUdi << endl;
--            halClearVolume = libhal_volume_from_udi(m_halContext, clearUdi);
--            // ignore if halClearVolume is NULL -> just not decrypted in this case
--	    clearUdiString = clearUdi;
--	    libhal_free_string(clearUdi);
--        }
--
--        if (halClearVolume)
--            medium->mountableState(
--                libhal_volume_get_device_file(halVolume),		/* Device node */
--                clearUdiString,
--                libhal_volume_get_mount_point(halClearVolume),		/* Mount point */
--                libhal_volume_get_fstype(halClearVolume),		/* Filesystem type */
--                libhal_volume_is_mounted(halClearVolume) );		/* Mounted ? */
--        else
--            medium->mountableState(
--                libhal_volume_get_device_file(halVolume),		/* Device node */
--                TQString::null,
--                TQString::null,		/* Mount point */
--                TQString::null,		/* Filesystem type */
--                false );		/* Mounted ? */
--    }
--    else
--    {
--        kdDebug(1219) << "HALBackend::setVolumeProperties : normal volume" << endl;
--        medium->mountableState(
--            libhal_volume_get_device_file(halVolume),		/* Device node */
--            libhal_volume_get_mount_point(halVolume),		/* Mount point */
--            libhal_volume_get_fstype(halVolume),		/* Filesystem type */
--            libhal_volume_is_mounted(halVolume) );		/* Mounted ? */
--    }
-+    kdDebug(1219) << "HALBackend::setVolumeProperties : normal volume" << endl;
-+    medium->mountableState(
-+        hal_volume_get_device_file(halVolume),		/* Device node */
-+        hal_volume_get_mount_point(halVolume),		/* Mount point */
-+        hal_volume_get_fstype(halVolume),		/* Filesystem type */
-+        hal_volume_is_mounted(halVolume) );		/* Mounted ? */
- 
- 
--    char* name = libhal_volume_policy_compute_display_name(halDrive, halVolume, m_halStoragePolicy);
-+    char* name = hal_volume_policy_compute_display_name(halDrive, halVolume, m_halStoragePolicy);
-     TQString volume_name = TQString::fromUtf8(name);
-     TQString media_name = volume_name;
-     medium->setLabel(media_name);
-     free(name);
- 
-     TQString mimeType;
--    if (libhal_volume_is_disc(halVolume))
-+    if (hal_volume_is_disc(halVolume))
-     {
-         mimeType = "media/cdrom" + MOUNT_SUFFIX;
- 
--        LibHalVolumeDiscType discType = libhal_volume_get_disc_type(halVolume);
--        if ((discType == LIBHAL_VOLUME_DISC_TYPE_CDROM) ||
--            (discType == LIBHAL_VOLUME_DISC_TYPE_CDR) ||
--            (discType == LIBHAL_VOLUME_DISC_TYPE_CDRW))
--            if (libhal_volume_disc_is_blank(halVolume))
-+        HalVolumeDiscType discType = hal_volume_get_disc_type(halVolume);
-+        if ((discType == HAL_VOLUME_DISC_TYPE_CDROM) ||
-+            (discType == HAL_VOLUME_DISC_TYPE_CDR) ||
-+            (discType == HAL_VOLUME_DISC_TYPE_CDRW))
-+            if (hal_volume_disc_is_blank(halVolume))
-             {
-                 mimeType = "media/blankcd";
-                 medium->unmountableState("");
-@@ -565,10 +491,10 @@
-             else
-                 mimeType = "media/cdwriter" + MOUNT_SUFFIX;
- 
--        if ((discType == LIBHAL_VOLUME_DISC_TYPE_DVDROM) || (discType == LIBHAL_VOLUME_DISC_TYPE_DVDRAM) ||
--            (discType == LIBHAL_VOLUME_DISC_TYPE_DVDR) || (discType == LIBHAL_VOLUME_DISC_TYPE_DVDRW) ||
--            (discType == LIBHAL_VOLUME_DISC_TYPE_DVDPLUSR) || (discType == LIBHAL_VOLUME_DISC_TYPE_DVDPLUSRW) )
--            if (libhal_volume_disc_is_blank(halVolume))
-+        if ((discType == HAL_VOLUME_DISC_TYPE_DVDROM) || (discType == HAL_VOLUME_DISC_TYPE_DVDRAM) ||
-+            (discType == HAL_VOLUME_DISC_TYPE_DVDR) || (discType == HAL_VOLUME_DISC_TYPE_DVDRW) ||
-+            (discType == HAL_VOLUME_DISC_TYPE_DVDPLUSR) || (discType == HAL_VOLUME_DISC_TYPE_DVDPLUSRW) )
-+            if (hal_volume_disc_is_blank(halVolume))
-             {
-                 mimeType = "media/blankdvd";
-                 medium->unmountableState("");
-@@ -576,16 +502,16 @@
-             else
-                 mimeType = "media/dvd" + MOUNT_SUFFIX;
- 
--        if (libhal_volume_disc_has_audio(halVolume) && !libhal_volume_disc_has_data(halVolume))
-+        if (hal_volume_disc_has_audio(halVolume) && !hal_volume_disc_has_data(halVolume))
-         {
-             mimeType = "media/audiocd";
--            medium->unmountableState( "audiocd:/?device=" + TQString(libhal_volume_get_device_file(halVolume)) );
-+            medium->unmountableState( "audiocd:/?device=" + TQString(hal_volume_get_device_file(halVolume)) );
-         }
- 
-         medium->setIconName(TQString::null);
- 
-         /* check if the disc id a vcd or a video dvd */
--        DiscType type = LinuxCDPolling::identifyDiscType(libhal_volume_get_device_file(halVolume));
-+        DiscType type = LinuxCDPolling::identifyDiscType(hal_volume_get_device_file(halVolume));
-         switch (type)
-         {
-         case DiscType::VCD:
-@@ -603,24 +529,24 @@
-     {
-         mimeType = "media/hdd" + MOUNT_SUFFIX;
-         medium->setIconName(TQString::null); // reset icon
--        if (libhal_drive_is_hotpluggable(halDrive))
-+        if (hal_drive_is_hotpluggable(halDrive))
-         {
-             mimeType = "media/removable" + MOUNT_SUFFIX;
-             medium->needMounting();
--            switch (libhal_drive_get_type(halDrive)) {
--            case LIBHAL_DRIVE_TYPE_COMPACT_FLASH:
-+            switch (hal_drive_get_type(halDrive)) {
-+            case HAL_DRIVE_TYPE_COMPACT_FLASH:
-                 medium->setIconName("compact_flash" + MOUNT_ICON_SUFFIX);
-                 break;
--            case LIBHAL_DRIVE_TYPE_MEMORY_STICK:
-+            case HAL_DRIVE_TYPE_MEMORY_STICK:
-                 medium->setIconName("memory_stick" + MOUNT_ICON_SUFFIX);
-                 break;
--            case LIBHAL_DRIVE_TYPE_SMART_MEDIA:
-+            case HAL_DRIVE_TYPE_SMART_MEDIA:
-                 medium->setIconName("smart_media" + MOUNT_ICON_SUFFIX);
-                 break;
--            case LIBHAL_DRIVE_TYPE_SD_MMC:
-+            case HAL_DRIVE_TYPE_SD_MMC:
-                 medium->setIconName("sd_mmc" + MOUNT_ICON_SUFFIX);
-                 break;
--            case LIBHAL_DRIVE_TYPE_PORTABLE_AUDIO_PLAYER:
-+            case HAL_DRIVE_TYPE_PORTABLE_AUDIO_PLAYER:
-             {
-                 medium->setIconName("ipod" + MOUNT_ICON_SUFFIX);
- 
-@@ -628,25 +554,25 @@
- 		         KProtocolInfo::isKnownProtocol( TQString("ipod") ) )
-                 {
-                     medium->unmountableState( "ipod:/" );
--                    medium->mountableState(  libhal_volume_is_mounted(halVolume) );
-+                    medium->mountableState(  hal_volume_is_mounted(halVolume) );
-                 }
-                 break;
-             }
--            case LIBHAL_DRIVE_TYPE_CAMERA:
-+            case HAL_DRIVE_TYPE_CAMERA:
-             {
-                 mimeType = "media/camera" + MOUNT_SUFFIX;
--                const char *physdev = libhal_drive_get_physical_device_udi(halDrive);
-+                const char *physdev = hal_drive_get_physical_device_udi(halDrive);
-                 // get model from camera
--                if (physdev && libhal_device_query_capability(m_halContext, physdev, "camera", NULL))
-+                if (physdev && hal_device_query_capability(m_halContext, physdev, "camera"))
-                 {
--                    if (libhal_device_property_exists(m_halContext, physdev, "usb_device.product", NULL))
-+                    if (hal_device_property_exists(m_halContext, physdev, "usb_device.product"))
-                         medium->setLabel(libhal_device_get_property_QString(m_halContext, physdev, "usb_device.product"));
--                    else if (libhal_device_property_exists(m_halContext, physdev, "usb.product", NULL))
-+                    else if (hal_device_property_exists(m_halContext, physdev, "usb.product"))
-                         medium->setLabel(libhal_device_get_property_QString(m_halContext, physdev, "usb.product"));
-                 }
-                 break;
-             }
--            case LIBHAL_DRIVE_TYPE_TAPE:
-+            case HAL_DRIVE_TYPE_TAPE:
-                 medium->setIconName(TQString::null); //FIXME need icon
-                 break;
-             default:
-@@ -661,8 +587,8 @@
-     }
-     medium->setMimeType(mimeType);
- 
--    libhal_drive_free(halDrive);
--    libhal_volume_free(halVolume);
-+    hal_drive_free(halDrive);
-+    hal_volume_free(halVolume);
- }
- 
- bool HALBackend::setFstabProperties( Medium *medium )
-@@ -713,10 +639,10 @@
- 
-     const char* udi = medium->id().ascii();
-     /* Check if the device still exists */
--    if (!libhal_device_exists(m_halContext, udi, NULL))
-+    if (!hal_device_exists(m_halContext, udi))
-         return false;
- 
--    LibHalDrive*  halDrive  = libhal_drive_from_udi(m_halContext, udi);
-+    HalDrive*  halDrive  = hal_drive_from_udi(m_halContext, udi);
-     if (!halDrive)
-         return false;
- 
-@@ -724,21 +650,21 @@
- 
-     if (drive_type == "zip") {
-         int numVolumes;
--        char** volumes = libhal_drive_find_all_volumes(m_halContext, halDrive, &numVolumes);
--        libhal_free_string_array(volumes);
-+        char** volumes = hal_drive_find_all_volumes(m_halContext, halDrive, &numVolumes);
-+        hal_free_string_array(volumes);
-         kdDebug(1219) << " found " << numVolumes << " volumes" << endl;
-         if (numVolumes)
-         {
--            libhal_drive_free(halDrive);
-+            hal_drive_free(halDrive);
-             return false;
-         }
-     }
- 
--    medium->setName( generateName(libhal_drive_get_device_file(halDrive)) );
-+    medium->setName( generateName(hal_drive_get_device_file(halDrive)) );
-     medium->setLabel(i18n("Unknown Drive"));
- 
-     // HAL hates floppies - so we have to do it twice ;(
--    medium->mountableState(libhal_drive_get_device_file(halDrive), TQString::null, TQString::null, false);
-+    medium->mountableState(hal_drive_get_device_file(halDrive), TQString::null, TQString::null, false);
-     setFloppyMountState(medium);
- 
-     if (drive_type == "floppy")
-@@ -762,7 +688,7 @@
- 
-     medium->setIconName(TQString::null);
- 
--    libhal_drive_free(halDrive);
-+    hal_drive_free(halDrive);
- 
-     return true;
- }
-@@ -796,7 +722,7 @@
- 
-     const char* udi = medium->id().ascii();
-     /* Check if the device still exists */
--    if (!libhal_device_exists(m_halContext, udi, NULL))
-+    if (!hal_device_exists(m_halContext, udi))
-         return;
- 
-     /** @todo find name */
-@@ -804,25 +730,25 @@
- 
-     TQString device = "camera:/";
- 
--    char *cam = libhal_device_get_property_string(m_halContext, udi, "camera.libgphoto2.name", NULL);
-+    char *cam = hal_device_get_property_string(m_halContext, udi, "camera.libgphoto2.name");
-     DBusError error;
-     dbus_error_init(&error);
-     if (cam &&
--        libhal_device_property_exists(m_halContext, udi, "usb.linux.device_number", NULL) &&
--        libhal_device_property_exists(m_halContext, udi, "usb.bus_number", NULL))
-+        hal_device_property_exists(m_halContext, udi, "usb.linux.device_number") &&
-+        hal_device_property_exists(m_halContext, udi, "usb.bus_number"))
-         device.sprintf("camera://%s@[usb:%03d,%03d]/", cam,
--                       libhal_device_get_property_int(m_halContext, udi, "usb.bus_number", &error),
--                       libhal_device_get_property_int(m_halContext, udi, "usb.linux.device_number", &error));
-+                       hal_device_get_property_int(m_halContext, udi, "usb.bus_number"),
-+                       hal_device_get_property_int(m_halContext, udi, "usb.linux.device_number"));
- 
--    libhal_free_string(cam);
-+    hal_free_string(cam);
- 
-     /** @todo find the rest of this URL */
-     medium->unmountableState(device);
-     medium->setMimeType("media/gphoto2camera");
-     medium->setIconName(TQString::null);
--    if (libhal_device_property_exists(m_halContext, udi, "usb_device.product", NULL))
-+    if (hal_device_property_exists(m_halContext, udi, "usb_device.product"))
-         medium->setLabel(libhal_device_get_property_QString(m_halContext, udi, "usb_device.product"));
--    else if (libhal_device_property_exists(m_halContext, udi, "usb.product", NULL))
-+    else if (hal_device_property_exists(m_halContext, udi, "usb.product"))
-         medium->setLabel(libhal_device_get_property_QString(m_halContext, udi, "usb.product"));
-     else
-         medium->setLabel(i18n("Camera"));
-@@ -837,6 +763,14 @@
-  ** HAL CALL-BACKS                        **
-  ******************************************/
- 
-+void HALBackend::hal_main_loop_integration(LibHalContext *ctx,
-+                                         DBusConnection *dbus_connection)
-+{
-+    kdDebug(1219) << "HALBackend::hal_main_loop_integration" << endl;
-+    Q_UNUSED(ctx);
-+    s_HALBackend->MainLoopIntegration(dbus_connection);
-+}
-+
- void HALBackend::hal_device_added(LibHalContext *ctx, const char *udi)
- {
-     kdDebug(1219) << "HALBackend::hal_device_added " << udi <<  endl;
-@@ -863,7 +797,7 @@
- 
- void HALBackend::hal_device_condition(LibHalContext *ctx, const char *udi,
-                                       const char *condition_name,
--                                      const char* message
-+                                      DBusMessage* message
-     )
- {
-     kdDebug(1219) << "HALBackend::hal_device_condition " << udi << " -- " << condition_name << endl;
-@@ -875,24 +809,24 @@
- TQStringList HALBackend::getHALmountoptions(TQString udi)
- {
-     const char*   _ppt_string;
--    LibHalVolume* volume;
--    LibHalDrive* drive;
-+    HalVolume* volume;
-+    HalDrive* drive;
- 
-     TQString _ppt_TQString;
- 
--    volume = libhal_volume_from_udi( m_halContext, udi.latin1() );
-+    volume = hal_volume_from_udi( m_halContext, udi.latin1() );
-     if( volume )
--        drive = libhal_drive_from_udi( m_halContext, libhal_volume_get_storage_device_udi( volume ) );
-+        drive = hal_drive_from_udi( m_halContext, hal_volume_get_storage_device_udi( volume ) );
-     else
--        drive = libhal_drive_from_udi( m_halContext, udi.latin1() );
-+        drive = hal_drive_from_udi( m_halContext, udi.latin1() );
- 
-     if( !drive )
-            return TQString::null;
- 
-     if( volume )
--       _ppt_string = libhal_volume_policy_get_mount_options ( drive, volume, NULL );
-+       _ppt_string = hal_volume_policy_get_mount_options ( drive, volume, NULL );
-     else
--       _ppt_string = libhal_drive_policy_get_mount_options ( drive, NULL );
-+       _ppt_string = hal_drive_policy_get_mount_options ( drive, NULL );
- 
-     _ppt_TQString = TQString(_ppt_string ? _ppt_string : "");
- 
-@@ -908,24 +842,6 @@
-         return TQStringList(); // not handled by HAL - fstab entry
- 
-     TQString volume_udi = name;
--    if (medium->isEncrypted()) {
--        // see if we have a clear volume
--        LibHalVolume* halVolume = libhal_volume_from_udi(m_halContext, medium->id().latin1());
--        if (halVolume) {
--            char* clearUdi = libhal_volume_crypto_get_clear_volume_udi(m_halContext, halVolume);
--            if (clearUdi != NULL) {
--	        volume_udi = clearUdi;
--		libhal_free_string(clearUdi);
--	    } else {
--	        // if not decrypted yet then no mountoptions
--		return TQStringList();
--	    }
--            libhal_volume_free(halVolume);
--        } else {
--	    // strange...
--	    return TQStringList();
--	}
--    }
- 
-     KConfig config("mediamanagerrc");
-     
-@@ -939,17 +855,7 @@
-     if (use_defaults)
- 	config.setGroup("DefaultOptions");    
- 
--    char ** array = libhal_device_get_property_strlist(m_halContext, volume_udi.latin1(), "volume.mount.valid_options", NULL);
-     TQMap<TQString,bool> valids;
--
--    for (int index = 0; array && array[index]; ++index) {
--        TQString t = array[index];
--        if (t.endsWith("="))
--            t = t.left(t.length() - 1);
--        valids[t] = true;
--        kdDebug() << "valid " << t << endl;
--    }
--    libhal_free_string_array(array);
-     TQStringList result;
-     TQString tmp;
-     
-@@ -963,8 +869,8 @@
- 
-     bool removable = false;
-     if ( !drive_udi.isNull() )
--        removable = libhal_device_get_property_bool(m_halContext, drive_udi.latin1(), "storage.removable", NULL)
--                     || libhal_device_get_property_bool(m_halContext, drive_udi.latin1(), "storage.hotpluggable", NULL);
-+        removable = hal_device_get_property_bool(m_halContext, drive_udi.latin1(), "storage.removable")
-+                     || hal_device_get_property_bool(m_halContext, drive_udi.latin1(), "storage.hotpluggable");
- 
-     bool value;
-     if (use_defaults)
-@@ -979,11 +885,11 @@
- 	config.setGroup(current_group);
-     }
- 
--    if (libhal_device_get_property_bool(m_halContext, volume_udi.latin1(), "volume.disc.is_blank", NULL)
--        || libhal_device_get_property_bool(m_halContext, volume_udi.latin1(), "volume.disc.is_vcd", NULL)
--        || libhal_device_get_property_bool(m_halContext, volume_udi.latin1(), "volume.disc.is_svcd", NULL)
--        || libhal_device_get_property_bool(m_halContext, volume_udi.latin1(), "volume.disc.is_videodvd", NULL)
--        || libhal_device_get_property_bool(m_halContext, volume_udi.latin1(), "volume.disc.has_audio", NULL))
-+    if (hal_device_get_property_bool(m_halContext, volume_udi.latin1(), "volume.disc.is_blank")
-+        || hal_device_get_property_bool(m_halContext, volume_udi.latin1(), "volume.disc.is_vcd")
-+        || hal_device_get_property_bool(m_halContext, volume_udi.latin1(), "volume.disc.is_svcd")
-+        || hal_device_get_property_bool(m_halContext, volume_udi.latin1(), "volume.disc.is_videodvd")
-+        || hal_device_get_property_bool(m_halContext, volume_udi.latin1(), "volume.disc.has_audio"))
-         value = false;
- 
-     result << TQString("automount=%1").arg(value ? "true" : "false");
-@@ -1540,29 +1446,6 @@
-     }
-     options[noptions] = NULL;
- 
--    TQString qerror = i18n("Cannot mount encrypted drives!");
--
--    if (!medium->isEncrypted()) {
--        // normal volume
--    	qerror = mount_priv(medium->id().latin1(), mount_point.utf8(), options, noptions, dbus_connection);
--    } else {
--        // see if we have a clear volume
--        LibHalVolume* halVolume = libhal_volume_from_udi(m_halContext, medium->id().latin1());
--        if (halVolume) {
--            char* clearUdi = libhal_volume_crypto_get_clear_volume_udi(m_halContext, halVolume);
--            if (clearUdi != NULL) {
--                qerror = mount_priv(clearUdi, mount_point.utf8(), options, noptions, dbus_connection);
--                libhal_free_string(clearUdi);
--            }
--            libhal_volume_free(halVolume);
--        }
--    }
--
--    if (!qerror.isEmpty()) {
--        kdError() << "mounting " << medium->id() << " returned " << qerror << endl;
--        return qerror;
--    }
--
-     medium->setHalMounted(true);
-     ResetProperties(medium->id().latin1());
- 
-@@ -1584,11 +1467,11 @@
-     if (!medium)
-     {   // now we get fancy: if the udi is no volume, it _might_ be a device with only one
-         // volume on it (think CDs) - so we're so nice to the caller to unmount that volume
--        LibHalDrive*  halDrive  = libhal_drive_from_udi(m_halContext, _udi.latin1());
-+        HalDrive*  halDrive  = hal_drive_from_udi(m_halContext, _udi.latin1());
-         if (halDrive)
-         {
-             int numVolumes;
--            char** volumes = libhal_drive_find_all_volumes(m_halContext, halDrive, &numVolumes);
-+            char** volumes = hal_drive_find_all_volumes(m_halContext, halDrive, &numVolumes);
-             if (numVolumes == 1)
-                 medium = m_mediaList.findById( volumes[0] );
-         }
-@@ -1626,19 +1509,8 @@
-     const char *options[2];
-     TQString udi = TQString::null;
- 
--    if (!medium->isEncrypted()) {
--        // normal volume
--        udi = medium->id();
--    } else {
--        // see if we have a clear volume
--        LibHalVolume* halVolume = libhal_volume_from_udi(m_halContext, medium->id().latin1());
--        if (halVolume) {
--            char *clearUdi = libhal_volume_crypto_get_clear_volume_udi(m_halContext, halVolume);
--	    udi = clearUdi;
--	    libhal_free_string(clearUdi);
--            libhal_volume_free(halVolume);
--        }
--    }
-+    udi = medium->id();
-+    
-     if (udi.isNull()) {
-         kdDebug() << "unmount failed: no udi" << endl;
-         return i18n("Internal Error");
-@@ -1748,111 +1620,4 @@
-     return TQString();
- }
- 
--TQString HALBackend::decrypt(const TQString &_udi, const TQString &password)
--{
--    const Medium* medium = m_mediaList.findById(_udi);
--    if (!medium)
--        return i18n("No such medium: %1").arg(_udi);
--
--    if (!medium->isEncrypted() || !medium->clearDeviceUdi().isNull())
--        return TQString();
--
--    const char *udi = medium->id().latin1();
--    DBusMessage *msg = NULL;
--    DBusMessage *reply = NULL;
--    DBusError error;
--
--    kdDebug() << "Setting up " << udi << " for crypto\n" <<endl;
--	
--    msg = dbus_message_new_method_call ("org.freedesktop.Hal", udi,
--                                        "org.freedesktop.Hal.Device.Volume.Crypto",
--                                        "Setup");
--    if (msg == NULL) {
--        kdDebug() << "decrypt failed for " << udi << ": could not create dbus message\n";
--        return i18n("Internal Error");
--    }
--
--    TQCString pwdUtf8 = password.utf8();
--    const char *pwd_utf8 = pwdUtf8;
--    if (!dbus_message_append_args (msg, DBUS_TYPE_STRING, &pwd_utf8, DBUS_TYPE_INVALID)) {
--        kdDebug() << "decrypt failed for " << udi << ": could not append args to dbus message\n";
--        dbus_message_unref (msg);
--        return i18n("Internal Error");
--    }
--
--    dbus_error_init (&error);
--    if (!(reply = dbus_connection_send_with_reply_and_block (dbus_connection, msg, -1, &error)) || 
--        dbus_error_is_set (&error))
--    {
--        TQString qerror = i18n("Internal Error");
--        kdDebug() << "decrypt failed for " << udi << ": " << error.name << " " << error.message << endl;
--        if (strcmp (error.name, "org.freedesktop.Hal.Device.Volume.Crypto.SetupPasswordError") == 0) {
--            qerror = i18n("Wrong password");
--        }
--        dbus_error_free (&error);
--        dbus_message_unref (msg);
--        while (dbus_connection_dispatch(dbus_connection) == DBUS_DISPATCH_DATA_REMAINS) ;
--        return qerror;
--    }
--
--    dbus_message_unref (msg);
--    dbus_message_unref (reply);
--
--    while (dbus_connection_dispatch(dbus_connection) == DBUS_DISPATCH_DATA_REMAINS) ;
--
--    return TQString();
--}
--
--TQString HALBackend::undecrypt(const TQString &_udi)
--{
--    const Medium* medium = m_mediaList.findById(_udi);
--    if (!medium)
--        return i18n("No such medium: %1").arg(_udi);
--
--    if (!medium->isEncrypted() || medium->clearDeviceUdi().isNull())
--        return TQString();
--
--    const char *udi = medium->id().latin1();
--    DBusMessage *msg = NULL;
--    DBusMessage *reply = NULL;
--    DBusError error;
--
--    kdDebug() << "Tear down " << udi << "\n" <<endl;
--	
--    msg = dbus_message_new_method_call ("org.freedesktop.Hal", udi,
--                                        "org.freedesktop.Hal.Device.Volume.Crypto",
--                                        "Teardown");
--    if (msg == NULL) {
--        kdDebug() << "teardown failed for " << udi << ": could not create dbus message\n";
--        return i18n("Internal Error");
--    }
--
--    if (!dbus_message_append_args (msg, DBUS_TYPE_INVALID)) {
--        kdDebug() << "teardown failed for " << udi << ": could not append args to dbus message\n";
--        dbus_message_unref (msg);
--        return i18n("Internal Error");
--    }
--
--    dbus_error_init (&error);
--    if (!(reply = dbus_connection_send_with_reply_and_block (dbus_connection, msg, -1, &error)) || 
--        dbus_error_is_set (&error))
--    {
--        TQString qerror = i18n("Internal Error");
--        kdDebug() << "teardown failed for " << udi << ": " << error.name << " " << error.message << endl;
--        dbus_error_free (&error);
--        dbus_message_unref (msg);
--        while (dbus_connection_dispatch(dbus_connection) == DBUS_DISPATCH_DATA_REMAINS) ;
--        return qerror;
--    }
--
--    dbus_message_unref (msg);
--    dbus_message_unref (reply);
--
--    ResetProperties(udi);
--
--    while (dbus_connection_dispatch(dbus_connection) == DBUS_DISPATCH_DATA_REMAINS) ;
--
--    return TQString();
--}
--
- #include "halbackend.moc"
---- kdebase/kioslave/media/mediamanager/halbackend.h.hal04	2012-09-08 14:15:10.324373357 -0400
-+++ kdebase/kioslave/media/mediamanager/halbackend.h	2012-09-08 14:27:34.564678553 -0400
-@@ -85,8 +85,6 @@
- 	TQString mount(const TQString &id);
- 	TQString mount(const Medium *medium);
- 	TQString unmount(const TQString &id);
--	TQString decrypt(const TQString &id, const TQString &password);
--	TQString undecrypt(const TQString &id);
- 
- private:
- 	/**
-@@ -152,6 +150,13 @@
- 
- /* Hal call-backs -- from gvm*/
- public:
-+	/** Invoked by libhal for integration with our mainloop.
-+	*
-+	*  @param  ctx                 LibHal context
-+	*  @param  dbus_connection     D-BUS connection to integrate
-+	*/
-+	static void hal_main_loop_integration(LibHalContext *ctx, DBusConnection *dbus_connection);
-+
- 	/** Invoked when a device is added to the Global Device List.
- 	*
- 	*  @param  ctx                 LibHal context
-@@ -184,7 +189,7 @@
- 	*/
- 	static void hal_device_condition(LibHalContext *ctx, const char *udi,
- 				const char *condition_name,
--				const char* message
-+				DBusMessage* message
- 				);
- 
- 	TQStringList getHALmountoptions(TQString udi);
-@@ -196,9 +201,14 @@
- 	LibHalContext*		m_halContext;
- 
- 	/**
-+	* Structure defining the hal callback function for devices events
-+	*/
-+	LibHalFunctions 	m_halFunctions;
-+
-+	/**
- 	* libhal-storage HAL policy, e.g. for icon names
- 	*/
--	LibHalStoragePolicy*	m_halStoragePolicy;
-+	HalStoragePolicy*	m_halStoragePolicy;
- 
- 	/**
- 	* The DBus-Qt bindings connection for mainloop integration
diff --git a/redhat/tdebase/kdebase-3.5.13-tsak_keyboard_hotplug.patch b/redhat/tdebase/kdebase-3.5.13-tsak_keyboard_hotplug.patch
deleted file mode 100644
index 8c8ab415f..000000000
--- a/redhat/tdebase/kdebase-3.5.13-tsak_keyboard_hotplug.patch
+++ /dev/null
@@ -1,641 +0,0 @@
-commit 5f413b26ebaab8a6478427e4125bda628058ff85
-Author: Timothy Pearson <kb9vqf@pearsoncomputing.net>
-Date:   1327015159 -0600
-
-    Add keyboard hotplug (add/remove) support to tsak
-    This closes Bug 587
-    Fix warning in kompmgr
-
-diff --git a/tsak/CMakeLists.txt b/tsak/CMakeLists.txt
-index 6aa5b49..4490636 100644
---- a/tsak/CMakeLists.txt
-+++ b/tsak/CMakeLists.txt
-@@ -23,5 +23,6 @@ link_directories(
- 
- tde_add_executable( tsak
-   SOURCES main.cpp
-+  LINK udev
-   DESTINATION ${BIN_INSTALL_DIR}
- )
-diff --git a/tsak/main.cpp b/tsak/main.cpp
-index 050d6c0..df485a0 100644
---- a/tsak/main.cpp
-+++ b/tsak/main.cpp
-@@ -1,8 +1,8 @@
- /*
- Copyright 2010 Adam Marchetti
--Copyright 2011 Timothy Pearson <kb9vqf@pearsoncomputing.net>
-+Copyright 2011-2012 Timothy Pearson <kb9vqf@pearsoncomputing.net>
- 
--This file is part of tsak.
-+This file is part of tsak, the TDE Secure Attention Key daemon
- 
- tsak is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as
-@@ -35,9 +35,15 @@ License along with tsak. If not, see http://www.gnu.org/licenses/.
- #include <sys/time.h>
- #include <termios.h>
- #include <signal.h>
-+#include <libudev.h>
-+#include <libgen.h>
- 
- #define FIFO_DIR "/tmp/ksocket-global"
- #define FIFO_FILE_OUT "/tmp/ksocket-global/tsak"
-+#define FIFO_LOCKFILE_OUT "/tmp/ksocket-global/tsak.lock"
-+
-+#define MAX_KEYBOARDS 64
-+#define MAX_INPUT_NODE 128
- 
- #define TestBit(bit, array) (array[(bit) / 8] & (1 << ((bit) % 8)))
- 
-@@ -46,9 +52,18 @@ typedef unsigned char byte;
- bool        mPipeOpen_out = false;
- int         mPipe_fd_out = -1;
- 
-+int         mPipe_lockfd_out = -1;
-+
-+char filename[32];
-+char key_bitmask[(KEY_MAX + 7) / 8];
-+
- struct sigaction usr_action;
- sigset_t block_mask;
- 
-+int keyboard_fd_num;
-+int keyboard_fds[MAX_KEYBOARDS];
-+int child_pids[MAX_KEYBOARDS];
-+
- const char *keycode[256] =
- {
- 	"", "<esc>", "1", "2", "3", "4", "5", "6", "7", "8",
-@@ -79,6 +94,26 @@ int bit_set(size_t i, const byte* a)
-   return a[i/CHAR_BIT] & (1 << i%CHAR_BIT);
- }
- 
-+// --------------------------------------------------------------------------------------
-+// Useful function from Stack Overflow
-+// http://stackoverflow.com/questions/874134/find-if-string-endswith-another-string-in-c
-+// --------------------------------------------------------------------------------------
-+/*  returns 1 iff str ends with suffix  */
-+int str_ends_with(const char * str, const char * suffix) {
-+
-+  if( str == NULL || suffix == NULL )
-+    return 0;
-+
-+  size_t str_len = strlen(str);
-+  size_t suffix_len = strlen(suffix);
-+
-+  if(suffix_len > str_len)
-+    return 0;
-+
-+  return 0 == strncmp( str + str_len - suffix_len, suffix, suffix_len );
-+}
-+// --------------------------------------------------------------------------------------
-+
- /* Assign features (supported axes and keys) of the physical input device (devin)
-  * to the virtual input device (devout) */
- static void copy_features(int devin, int devout)
-@@ -111,26 +146,40 @@ static void copy_features(int devin, int devout)
- 	}
- }
- 
--int find_keyboard() {
-+int find_keyboards() {
- 	int i, j;
- 	int fd;
--	char filename[32];
--	char key_bitmask[(KEY_MAX + 7) / 8];
-+	char name[256] = "Unknown";
-+
-+	keyboard_fd_num = 0;
-+	for (i=0; i<MAX_KEYBOARDS; i++) {
-+		keyboard_fds[i] = 0;
-+	}
- 	
--	for (i=0; i<32; i++) {
-+	for (i=0; i<MAX_INPUT_NODE; i++) {
- 		snprintf(filename,sizeof(filename), "/dev/input/event%d", i);
--	
-+
- 		fd = open(filename, O_RDWR|O_SYNC);
- 		ioctl(fd, EVIOCGBIT(EV_KEY, sizeof(key_bitmask)), key_bitmask);
--	
--		/* We assume that anything that has an alphabetic key in the
--			QWERTYUIOP range in it is the main keyboard. */
--		for (j = KEY_Q; j <= KEY_P; j++) {
--			if (TestBit(j, key_bitmask))
--				return fd;
-+
-+		// Ensure that we do not detect our own tsak faked keyboards
-+		ioctl (fd, EVIOCGNAME (sizeof (name)), name);
-+		if (str_ends_with(name, "+tsak") == 0) {
-+			/* We assume that anything that has an alphabetic key in the
-+				QWERTYUIOP range in it is the main keyboard. */
-+			for (j = KEY_Q; j <= KEY_P; j++) {
-+				if (TestBit(j, key_bitmask)) {
-+					keyboard_fds[keyboard_fd_num] = fd;
-+				}
-+			}
-+		}
-+
-+		if (keyboard_fds[keyboard_fd_num] == 0) {
-+			close (fd);
-+		}
-+		else {
-+			keyboard_fd_num++;
- 		}
--	
--		close (fd);
- 	}
- 	return 0;
- }
-@@ -144,6 +193,12 @@ void tearDownPipe()
- 	}
- }
- 
-+void tearDownLockingPipe()
-+{
-+	close(mPipe_lockfd_out);
-+	unlink(FIFO_LOCKFILE_OUT);
-+}
-+
- bool setFileLock(int fd, bool close_on_failure)
- {
- 	struct flock fl;
-@@ -154,8 +209,8 @@ bool setFileLock(int fd, bool close_on_failure)
- 	fl.l_len = 1;
- 
- 	// Set the exclusive file lock
--	if (fcntl(mPipe_fd_out, F_SETLK, &fl) == -1) {
--		close(mPipe_fd_out);
-+	if (fcntl(fd, F_SETLK, &fl) == -1) {
-+		close(fd);
- 		return false;
- 	}
- 
-@@ -171,7 +226,7 @@ bool checkFileLock()
- 	fl.l_whence  = SEEK_SET;
- 	fl.l_len     = 0;
- 
--	int fd = open(FIFO_FILE_OUT, O_RDWR | O_NONBLOCK);
-+	int fd = open(FIFO_LOCKFILE_OUT, O_RDWR | O_NONBLOCK);
- 	fcntl(fd, F_GETLK, &fl);  /* Overwrites lock structure with preventors. */
- 
- 	if (fd > -1) {
-@@ -202,6 +257,71 @@ bool setupPipe()
- 	return setFileLock(mPipe_fd_out, true);
- }
- 
-+bool setupLockingPipe()
-+{
-+	/* Create the FIFOs if they do not exist */
-+	umask(0);
-+	mkdir(FIFO_DIR,0644);
-+	
-+	mknod(FIFO_LOCKFILE_OUT, S_IFIFO|0600, 0);
-+	chmod(FIFO_LOCKFILE_OUT, 0600);
-+	
-+	mPipe_lockfd_out = open(FIFO_LOCKFILE_OUT, O_RDWR | O_NONBLOCK);
-+	if (mPipe_lockfd_out > -1) {
-+		// Set the exclusive file lock
-+		return setFileLock(mPipe_lockfd_out, true);
-+	}
-+
-+	return false;
-+}
-+
-+void broadcast_sak()
-+{
-+	// Let anyone listening to our interface know that an SAK keypress was received
-+	// I highly doubt there are more than 255 VTs active at once...
-+	int i;
-+	for (i=0;i<255;i++) {
-+		write(mPipe_fd_out, "SAK\n\r", 6);
-+	}
-+}
-+
-+void restart_tsak()
-+{
-+	int i;
-+
-+	fprintf(stderr, "Forcibly terminating...\n");
-+
-+	// Close down all child processes
-+	for (i=0; i<MAX_KEYBOARDS; i++) {
-+		if (child_pids[i] != 0) {
-+			kill(child_pids[i], SIGKILL);
-+		}
-+	}
-+
-+	// Wait for process termination
-+	sleep(1);
-+
-+	// Release all exclusive keyboard locks
-+	for (int current_keyboard=0;current_keyboard<keyboard_fd_num;current_keyboard++) {
-+		if(ioctl(keyboard_fds[current_keyboard], EVIOCGRAB, 0) < 0) {
-+			fprintf(stderr, "Failed to release exclusive input device lock");
-+		}
-+		close(keyboard_fds[current_keyboard]);
-+	}
-+
-+#if 1
-+	// Restart now
-+	// Note that the execl function never returns
-+	char me[2048];
-+	int chars = readlink("/proc/self/exe", me, sizeof(me));
-+	me[chars] = 0;
-+	me[2047] = 0;
-+	execl(me, basename(me), (char*)NULL);
-+#else
-+	_exit(0);	
-+#endif
-+}
-+
- class PipeHandler
- {
- public:
-@@ -215,7 +335,7 @@ PipeHandler::PipeHandler()
- 
- PipeHandler::~PipeHandler()
- {
--	tearDownPipe();
-+	tearDownLockingPipe();
- }
- 
- int main (int argc, char *argv[])
-@@ -223,13 +343,19 @@ int main (int argc, char *argv[])
- 	struct input_event ev[64];
- 	struct input_event event;
- 	struct uinput_user_dev devinfo={0};
--	int fd, devout, rd, value, size = sizeof (struct input_event);
-+	int devout[MAX_KEYBOARDS], rd, i, value, size = sizeof (struct input_event);
- 	char name[256] = "Unknown";
- 	bool ctrl_down = false;
- 	bool alt_down = false;
- 	bool hide_event = false;
- 	bool established = false;
- 	bool testrun = false;
-+	int current_keyboard;
-+	bool can_proceed;
-+
-+	for (i=0; i<MAX_KEYBOARDS; i++) {
-+		child_pids[i] = 0;
-+	}
- 
- 	if (argc == 2) {
- 		if (strcmp(argv[1], "checkactive") == 0) {
-@@ -239,7 +365,11 @@ int main (int argc, char *argv[])
- 
- 	// Check for existing file locks
- 	if (!checkFileLock()) {
--		fprintf(stderr, "Another instance of this program is already running\n");
-+		fprintf(stderr, "Another instance of this program is already running [1]\n");
-+		return 8;
-+	}
-+	if (!setupLockingPipe()) {
-+		fprintf(stderr, "Another instance of this program is already running [2]\n");
- 		return 8;
- 	}
- 
-@@ -256,125 +386,227 @@ int main (int argc, char *argv[])
- 			return 5;
- 		}
- 	
--		// Open Device
--		fd = find_keyboard();
--		if (fd == -1) {
--			printf ("Could not find your keyboard!\n");
-+		// Find keyboards
-+		find_keyboards();
-+		if (keyboard_fd_num == 0) {
-+			printf ("Could not find any usable keyboard(s)!\n");
-+			// Make sure everyone knows we physically can't detect a SAK 
-+			// Before we do this we broadcast one so that active dialogs are updated appropriately
-+			// Also, we keep watching for a keyboard to be added via a forked child process...
-+			broadcast_sak();
- 			if (established)
- 				sleep(1);
--			else
--				return 4;
-+			else {
-+				int i=fork();
-+				if (i<0) return 12; // fork failed
-+				if (i>0) {
-+					return 4;
-+				}
-+				sleep(1);
-+				restart_tsak();
-+			}
- 		}
- 		else {
--			// Print Device Name
--			ioctl (fd, EVIOCGNAME (sizeof (name)), name);
--			fprintf(stderr, "Reading From : (%s)\n", name);
--		
--			// Create filtered virtual output device
--			devout=open("/dev/misc/uinput",O_WRONLY|O_NONBLOCK);
--			if (devout<0) {
--				perror("open(\"/dev/misc/uinput\")");
--				devout=open("/dev/uinput",O_WRONLY|O_NONBLOCK);
--			}
--			if (devout<0) {
--				fprintf(stderr,"Unable to open /dev/uinput or /dev/misc/uinput (char device 10:223).\nPossible causes:\n 1) Device node does not exist\n 2) Kernel not compiled with evdev [INPUT_EVDEV] and uinput [INPUT_UINPUT] user level driver support\n 3) Permission denied.\n");
--				perror("open(\"/dev/uinput\")");
--				if (established)
--					sleep(1);
--				else
--					return 3;
--			}
--			else {
--				if(ioctl(fd, EVIOCGRAB, 2) < 0) {
--					close(fd);
--					fprintf(stderr, "Failed to grab exclusive input device lock");
-+			fprintf(stderr, "Found %d keyboard(s)\n", keyboard_fd_num);
-+
-+			can_proceed = true;
-+			for (current_keyboard=0;current_keyboard<keyboard_fd_num;current_keyboard++) {
-+				// Print Device Name
-+				ioctl (keyboard_fds[current_keyboard], EVIOCGNAME (sizeof (name)), name);
-+				fprintf(stderr, "Reading from keyboard: (%s)\n", name);
-+			
-+				// Create filtered virtual output device
-+				devout[current_keyboard]=open("/dev/misc/uinput",O_WRONLY|O_NONBLOCK);
-+				if (devout[current_keyboard]<0) {
-+					devout[current_keyboard]=open("/dev/uinput",O_WRONLY|O_NONBLOCK);
-+					if (devout[current_keyboard]<0) {
-+						perror("open(\"/dev/misc/uinput\")");
-+					}
-+				}
-+				if (devout[current_keyboard]<0) {
-+					can_proceed = false;
-+					fprintf(stderr, "Unable to open /dev/uinput or /dev/misc/uinput (char device 10:223).\nPossible causes:\n 1) Device node does not exist\n 2) Kernel not compiled with evdev [INPUT_EVDEV] and uinput [INPUT_UINPUT] user level driver support\n 3) Permission denied.\n");
-+					perror("open(\"/dev/uinput\")");
- 					if (established)
- 						sleep(1);
- 					else
--						return 1;
-+						return 3;
- 				}
--				else {
--					ioctl(fd, EVIOCGNAME(UINPUT_MAX_NAME_SIZE), devinfo.name);
--					strncat(devinfo.name, "+tsak", UINPUT_MAX_NAME_SIZE-1);
--					fprintf(stderr, "%s\n", devinfo.name);
--					ioctl(fd, EVIOCGID, &devinfo.id);
--					
--					copy_features(fd, devout);
--					write(devout,&devinfo,sizeof(devinfo));
--					if (ioctl(devout,UI_DEV_CREATE)<0) {
--						fprintf(stderr,"Unable to create input device with UI_DEV_CREATE\n");
-+			}
-+
-+			if (can_proceed == true) {
-+				for (current_keyboard=0;current_keyboard<keyboard_fd_num;current_keyboard++) {
-+					if(ioctl(keyboard_fds[current_keyboard], EVIOCGRAB, 2) < 0) {
-+						close(keyboard_fds[current_keyboard]);
-+						fprintf(stderr, "Failed to grab exclusive input device lock");
- 						if (established)
- 							sleep(1);
- 						else
--							return 2;
-+							return 1;
- 					}
- 					else {
--						fprintf(stderr,"Device created.\n");
--
--						if (established == false) {
--							tearDownPipe();
--							int i=fork();
--							if (i<0) return 9; // fork failed
--							if (i>0) {
--								// close parent process
--								close(mPipe_fd_out);
--								return 0;
--							}
--							setupPipe();
-+						ioctl(keyboard_fds[current_keyboard], EVIOCGNAME(UINPUT_MAX_NAME_SIZE), devinfo.name);
-+						strncat(devinfo.name, "+tsak", UINPUT_MAX_NAME_SIZE-1);
-+						fprintf(stderr, "%s\n", devinfo.name);
-+						ioctl(keyboard_fds[current_keyboard], EVIOCGID, &devinfo.id);
-+						
-+						copy_features(keyboard_fds[current_keyboard], devout[current_keyboard]);
-+						write(devout[current_keyboard],&devinfo,sizeof(devinfo));
-+						if (ioctl(devout[current_keyboard],UI_DEV_CREATE)<0) {
-+							fprintf(stderr, "Unable to create input device with UI_DEV_CREATE\n");
-+							if (established)
-+								sleep(1);
-+							else
-+								return 2;
- 						}
--
--						established = true;
--
--						if (testrun == true) {
--							return 0;
--						}
--				
--						while (1) {
--							if ((rd = read (fd, ev, size * 2)) < size) {
--								fprintf(stderr,"Read failed.\n");
--								break;
--							}
--							
--							value = ev[0].value;
--							
--							if (value != ' ' && ev[1].value == 0 && ev[1].type == 1){ // Read the key release event
--								if (keycode[(ev[1].code)]) {
--									if (strcmp(keycode[(ev[1].code)], "<control>") == 0) ctrl_down = false;
--									if (strcmp(keycode[(ev[1].code)], "<alt>") == 0) alt_down = false;
-+						else {
-+							fprintf(stderr, "Device created.\n");
-+	
-+							if (established == false) {
-+								int i=fork();
-+								if (i<0) return 9; // fork failed
-+								if (i>0) {
-+									child_pids[current_keyboard] = i;
-+									continue;
- 								}
-+								setupLockingPipe();
- 							}
--							if (value != ' ' && ev[1].value == 1 && ev[1].type == 1){ // Read the key press event
--								if (keycode[(ev[1].code)]) {
--									if (strcmp(keycode[(ev[1].code)], "<control>") == 0) ctrl_down = true;
--									if (strcmp(keycode[(ev[1].code)], "<alt>") == 0) alt_down = true;
--								}
-+	
-+							established = true;
-+	
-+							if (testrun == true) {
-+								return 0;
- 							}
- 					
--							hide_event = false;
--							if (keycode[(ev[1].code)]) {
--								if (alt_down && ctrl_down && (strcmp(keycode[(ev[1].code)], "<del>") == 0)) {
--									hide_event = true;
-+							while (1) {
-+								if ((rd = read (keyboard_fds[current_keyboard], ev, size * 2)) < size) {
-+									fprintf(stderr, "Read failed.\n");
-+									break;
-+								}
-+								
-+								value = ev[0].value;
-+								
-+								if (value != ' ' && ev[1].value == 0 && ev[1].type == 1){ // Read the key release event
-+									if (keycode[(ev[1].code)]) {
-+										if (strcmp(keycode[(ev[1].code)], "<control>") == 0) ctrl_down = false;
-+										if (strcmp(keycode[(ev[1].code)], "<alt>") == 0) alt_down = false;
-+									}
-+								}
-+								if (value != ' ' && ev[1].value == 1 && ev[1].type == 1){ // Read the key press event
-+									if (keycode[(ev[1].code)]) {
-+										if (strcmp(keycode[(ev[1].code)], "<control>") == 0) ctrl_down = true;
-+										if (strcmp(keycode[(ev[1].code)], "<alt>") == 0) alt_down = true;
-+									}
-+								}
-+						
-+								hide_event = false;
-+								if (keycode[(ev[1].code)]) {
-+									if (alt_down && ctrl_down && (strcmp(keycode[(ev[1].code)], "<del>") == 0)) {
-+										hide_event = true;
-+									}
-+								}
-+						
-+								if (hide_event == false) {
-+									// Pass the event on...
-+									event = ev[0];
-+									write(devout[current_keyboard], &event, sizeof event);
-+									event = ev[1];
-+									write(devout[current_keyboard], &event, sizeof event);
-+								}
-+								if (hide_event == true) {
-+									// Let anyone listening to our interface know that an SAK keypress was received
-+									broadcast_sak();
- 								}
- 							}
-+						}
-+					}
-+				}
-+
-+				// fork udev monitor process
-+				int i=fork();
-+				if (i<0) return 10; // fork failed
-+				if (i>0) {
-+					// Terminate parent
-+					return 0;
-+				}
-+
-+				// Prevent multiple process instances from starting
-+				setupLockingPipe();
-+
-+				// Wait a little bit so that udev hotplug can stabilize before we start monitoring
-+				sleep(1);
-+
-+				fprintf(stderr, "Hotplug monitoring process started\n");
-+
-+				// Monitor for hotplugged keyboards
-+				int j;
-+				int hotplug_fd;
-+				bool is_new_keyboard;
-+				struct udev *udev;
-+				struct udev_device *dev;
-+				struct udev_monitor *mon;
-+
-+				// Create the udev object
-+				udev = udev_new();
-+				if (!udev) {
-+					fprintf(stderr, "Cannot connect to udev interface\n");
-+					return 11;
-+				}
-+
-+				// Set up a udev monitor to monitor input devices
-+				mon = udev_monitor_new_from_netlink(udev, "udev");
-+				udev_monitor_filter_add_match_subsystem_devtype(mon, "input", NULL);
-+				udev_monitor_enable_receiving(mon);
-+	
-+				while (1) {
-+					// Watch for input from the monitoring process
-+					dev = udev_monitor_receive_device(mon);
-+					if (dev) {
-+						// If a keyboard was removed we need to restart...
-+						if (strcmp(udev_device_get_action(dev), "remove") == 0) {
-+							udev_device_unref(dev);
-+							udev_unref(udev);
-+							restart_tsak();
-+						}
-+
-+						is_new_keyboard = false;
-+						snprintf(filename,sizeof(filename), "%s", udev_device_get_devnode(dev));
-+						udev_device_unref(dev);
-+
-+						// Print name of keyboard
-+						hotplug_fd = open(filename, O_RDWR|O_SYNC);
-+						ioctl(hotplug_fd, EVIOCGBIT(EV_KEY, sizeof(key_bitmask)), key_bitmask);
- 					
--							if (hide_event == false) {
--								// Pass the event on...
--								event = ev[0];
--								write(devout, &event, sizeof event);
--								event = ev[1];
--								write(devout, &event, sizeof event);
--							}
--							if (hide_event == true) {
--								// Let anyone listening to our interface know that an SAK keypress was received
--								// I highly doubt there are more than 255 VTs active at once...
--								int i;
--								for (i=0;i<255;i++) {
--									write(mPipe_fd_out, "SAK\n\r", 6);
--								}
-+						/* We assume that anything that has an alphabetic key in the
-+							QWERTYUIOP range in it is the main keyboard. */
-+						for (j = KEY_Q; j <= KEY_P; j++) {
-+							if (TestBit(j, key_bitmask)) {
-+								is_new_keyboard = true;
- 							}
- 						}
-+						ioctl (hotplug_fd, EVIOCGNAME (sizeof (name)), name);
-+						close(hotplug_fd);
-+
-+						// Ensure that we do not detect our own tsak faked keyboards
-+						if (str_ends_with(name, "+tsak") == 1) {
-+							is_new_keyboard = false;
-+						}
-+
-+						// If a keyboard was added we need to restart...
-+						if (is_new_keyboard == true) {
-+							fprintf(stderr, "Hotplugged new keyboard: (%s)\n", name);
-+							udev_unref(udev);
-+							restart_tsak();
-+						}
-+					}
-+					else {
-+						fprintf(stderr, "No Device from receive_device(). An error occured.\n");
- 					}
- 				}
-+
-+				udev_unref(udev);
-+
-+				fprintf(stderr, "Hotplug monitoring process terminated\n");
- 			}
- 		}
- 	}
-diff --git a/twin/kompmgr/kompmgr.c b/twin/kompmgr/kompmgr.c
-index 5daf8c2..8216676 100644
---- a/kwin/kompmgr/kompmgr.c
-+++ b/kwin/kompmgr/kompmgr.c
-@@ -60,6 +60,7 @@ check baghira.sf.net for more infos
- #include <signal.h>
- #include <time.h>
- #include <unistd.h>
-+#include <libgen.h>
- #include <X11/Xlib.h>
- #include <X11/Xutil.h>
- #include <X11/Xatom.h>
-@@ -397,7 +398,7 @@ void delete_pid_file()
-         int chars = readlink("/proc/self/exe", me, sizeof(me));
-         me[chars] = 0;
-         me[2047] = 0;
--	execl(me, NULL);
-+	execl(me, basename(me), (char*)NULL);
-     }
- #endif
- }
diff --git a/redhat/tdebase/kdebase-3.5.13-update_default_konq_max_image_prev_size.patch b/redhat/tdebase/kdebase-3.5.13-update_default_konq_max_image_prev_size.patch
deleted file mode 100644
index b34c98212..000000000
--- a/redhat/tdebase/kdebase-3.5.13-update_default_konq_max_image_prev_size.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-commit 03e19305ec704b8749bb7564e16ed8d78a80d516
-Author: Darrell Anderson <humanreadable@yahoo.com>
-Date:   1340675585 -0500
-
-    Update default konqueror maximum image preview size to 10MB.
-
-diff --git a/kcontrol/konq/previews.cpp b/kcontrol/konq/previews.cpp
-index cbe4d40..53c16f1 100644
---- a/kcontrol/konq/previews.cpp
-+++ b/kcontrol/konq/previews.cpp
-@@ -67,14 +67,14 @@ KPreviewOptions::KPreviewOptions( TQWidget *parent, const char */*name*/ )
- 
-     setQuickHelp( i18n("<h1>Preview Options</h1> Here you can modify the behavior "
-                 "of Konqueror when it shows the files in a folder."
--                "<h2>The list of protocols:</h2> check the protocols over which "
-+                "<h2>The list of protocols:</h2> 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."
--                "<h2>Maximum File Size:</h2> 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."));
-+                "<h2>Maximum File Size:</h2> Select the maximum file size for which "
-+                "previews should be generated. For instance, if set to 10 MB (the default), "
-+                "no preview will be generated for files bigger than 10 MB, for speed reasons."));
- 
-     // Listview containing checkboxes for all protocols that support listing
-     KListView *listView = new KListView( this, "listView" );
-@@ -152,8 +152,8 @@ KPreviewOptions::KPreviewOptions( TQWidget *parent, const char */*name*/ )
-     load();
- }
- 
--// Default: 1 MB
--#define DEFAULT_MAXSIZE (1024*1024)
-+// Default: 10 MB
-+#define DEFAULT_MAXSIZE (1024*1024*10)
- 
- void KPreviewOptions::load(bool useDefaults)
- {
-@@ -171,7 +171,7 @@ void KPreviewOptions::load(bool useDefaults)
-         else
-           it.current()->setOn( group.readBoolEntry( protocol, false ) );
-     }
--    // config key is in bytes (default value 1MB), numinput is in MB
-+    // config key is in bytes (default value 10MB), numinput is in MB
-     m_maxSize->setValue( ((double)group.readNumEntry( "MaximumSize", DEFAULT_MAXSIZE )) / (1024*1024) );
- 
-     m_boostSize->setChecked( group.readBoolEntry( "BoostSize", false /*default*/ ) );
diff --git a/redhat/tdebase/kdebase-3.5.13-upgrade_to_sru_20120806.patch.gz b/redhat/tdebase/kdebase-3.5.13-upgrade_to_sru_20120806.patch.gz
deleted file mode 100644
index 780aa8581..000000000
Binary files a/redhat/tdebase/kdebase-3.5.13-upgrade_to_sru_20120806.patch.gz and /dev/null differ
diff --git a/redhat/tdebase/kdebase-3.5.13.1-fix_displayconfig_icon.patch b/redhat/tdebase/kdebase-3.5.13.1-fix_displayconfig_icon.patch
deleted file mode 100644
index 529824f7f..000000000
--- a/redhat/tdebase/kdebase-3.5.13.1-fix_displayconfig_icon.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- kdebase-3.5.13.1/kcontrol/displayconfig/displayconfig.desktop.ORI	2012-10-04 23:36:14.085070870 +0200
-+++ kdebase-3.5.13.1/kcontrol/displayconfig/displayconfig.desktop	2012-10-04 23:36:23.449879298 +0200
-@@ -3,7 +3,7 @@
- Comment=Configure display
- Comment[en_US]=Configure display
- DocPath=kcontrol/displayconfig.html
--Exec[$e]=kcmshell displayconfig
-+Exec=kcmshell displayconfig
- GenericName=
- GenericName[en_US]=
- Icon=background
-@@ -12,7 +12,7 @@
- Name=Monitor & Display
- Name[en_US]=Monitor & Display
- NoDisplay=false
--Path[$e]=
-+Path=
- StartupNotify=true
- Terminal=false
- TerminalOptions=
diff --git a/redhat/tdebase/kdebase-3.5.13.1-fix_startkde_path.patch b/redhat/tdebase/kdebase-3.5.13.1-fix_startkde_path.patch
deleted file mode 100644
index 971daf16f..000000000
--- a/redhat/tdebase/kdebase-3.5.13.1-fix_startkde_path.patch
+++ /dev/null
@@ -1,107 +0,0 @@
---- bin/startkde.ORI	2012-11-16 20:44:01.763131101 +0100
-+++ bin/startkde	2012-11-16 21:24:12.865147976 +0100
-@@ -15,6 +15,26 @@
-   source $HOME/.xprofile
- fi
- 
-+# Some functions to parse and check path correctly ...
-+is_in_path() {
-+  search="$1"; ifs="$IFS"; IFS=":"; set $PATH; IFS="$ifs"
-+  for i in $*; do
-+    [ "${i}" = "${search}" ] && return 0
-+  done
-+  return 1
-+}
-+
-+# Usage: place_before_in_path /opt/trinity/games /usr/games
-+place_before_in_path() {
-+  insert="$1"; before="$2"; ifs="$IFS"; IFS=":"; set $PATH; IFS="$ifs"
-+  NPATH=""
-+  for i in $*; do
-+    [ "${i}" = "${before}" ] && NPATH="${NPATH}:${insert}"
-+    NPATH="${NPATH}:${i}"
-+  done
-+  export PATH=${NPATH}
-+}
-+
- echo "[startkde] Starting startkde." 1>&2
- echo "[startkde] This script is $0" 1>&2
- 
-@@ -29,7 +49,7 @@
- # Do not use kde-config to determine the version. That command creates a
- # profile directory in the root of the file system. Refer to Bug Report 293.
- if [ -x $BIN_DIR/konqueror ]; then
--  KDE_VERSION="`$BIN_DIR/konqueror --version | grep KDE | awk '{print $2}'`"
-+  KDE_VERSION=$($BIN_DIR/konqueror --version | while IFS=: read a b; do [[ "$a" =~ "KDE" ]] && echo $b; done)
-   echo "[startkde] TDE version is $KDE_VERSION" 1>&2
-   export KDEDIR=${BIN_DIR%/bin}
-   echo "[startkde] TDE base directory is $KDEDIR" 1>&2
-@@ -105,27 +125,12 @@
-   # This script and kstandardirs.h and kstandardirs.cpp must match.
-   # The latter two must be edited/patched before compiling.
-   echo "[startkde] KDEHOME is not set." 1>&2
--  if [ -d $HOME/.trinity ]; then
--    # OK, this one is obvious.
--    export KDEHOME=$HOME/.trinity
--  elif [ -f /usr/bin/kde4-config ]; then
--    # Looks like KDE4 is installed.
--    if [ -d $HOME/.kde ] && [ ! -d $HOME/.trinity ]; then
--      # Presume $HOME/.kde is being used for KDE4 as it already exists.
--      export KDEHOME=$HOME/.trinity
--    else
--      # Presume $HOME/.kde is being used for KDE4 to be on the safe side.
--      export KDEHOME=$HOME/.trinity
--    fi
--  elif [ -f /opt/trinity/bin/kde-config ]; then
--    # Looks like Trinity is installed.
--    export KDEHOME=$HOME/.trinity
--  elif [ -f /usr/bin/kde-config ] && [ -d $HOME/.kde ]; then
-+  # Default value: $HOME/.trinity. Most users will use this.
-+  export KDEHOME=$HOME/.trinity
-+
-+  if [ ! -d $HOME/.trinity ] && [ ! -f /usr/bin/kde4-config ] && [ -f /usr/bin/kde-config ] && [ -d $HOME/.kde ]; then
-     # Looks like Trinity is installed and not playing second fiddle to KDE4.
-     export KDEHOME=$HOME/.kde
--  else
--    # Resort to this and hope for the best!
--    export KDEHOME=$HOME/.trinity
-   fi
-   echo "[startkde] Set KDEHOME to $KDEHOME." 1>&2
- fi
-@@ -149,30 +154,30 @@
- 
- # Modify the following environment variables only as necessary.
- if [ -d $KDEDIR/games ]; then
--  if [ "`echo $PATH | grep \"$KDEDIR/games\"`" = "" ]; then
-+  if ! is_in_path "$KDEDIR/games" ; then
-     # Respect the traditional path order. Don't blindly place $KDEDIR/games
-     # first in the path. Only place $KDEDIR/games before /usr/games. If packagers
-     # are adding $KDEDIR/games elsewhere, then they need to ensure the traditional
-     # search patch is respected.
-     # Is there a way we can check that $KDEDIR/games is always placed only just before
-     # /usr/games in the search path?
--    if [ "`echo $PATH | grep \"^\\(.*:\\)\\?/usr/games\\(:.*\\)\\?$\"`" != "" ]; then
--      export PATH="`echo $PATH | sed \"s|^\\(.*:\\)\\?/usr/games\\(:.*\\)\\?$|\\1$KDEDIR/games:/usr/games\\2|\"`"
-+    if is_in_path "/usr/games"; then
-+      place_before_in_path "$KDEDIR/games" "/usr/games"
-     else
-       export PATH=$KDEDIR/games:$PATH
-     fi
-   fi
- fi
- if [ -d $KDEDIR/bin ]; then
--  if [ "`echo $PATH | grep \"$KDEDIR/bin\"`" = "" ]; then
-+  if ! is_in_path "$KDEDIR/bin" ]; then
-     # Respect the traditional path order. Don't blindly place $KDEDIR/bin
-     # first in the path. Only place $KDEDIR/bin before /usr/bin. This order is
-     # consistent with kdelibs/kdesu/stub.cpp. If packagers are adding $KDEDIR/bin
-     # elsewhere, then they need to ensure the traditional search patch is respected.
-     # Is there a way we can check that $KDEDIR/bin is always placed only just before
-     # /usr/bin in the search path?
--    if [ "`echo $PATH | grep \"^\\(.*:\\)\\?/usr/bin\\(:.*\\)\\?$\"`" != "" ]; then
--      export PATH="`echo $PATH | sed \"s|^\\(.*:\\)\\?/usr/bin\\(:.*\\)\\?$|\\1$KDEDIR/bin:/usr/bin\\2|\"`"
-+    if is_in_path "/usr/bin"; then
-+      place_before_in_path "$KDEDIR/bin" "/usr/bin"
-     else
-       export PATH=$KDEDIR/bin:$PATH
-     fi
diff --git a/redhat/tdebase/kdebase-3.5.13.1-fix_tdm_pid_file.patch b/redhat/tdebase/kdebase-3.5.13.1-fix_tdm_pid_file.patch
deleted file mode 100644
index 8ddad87e1..000000000
--- a/redhat/tdebase/kdebase-3.5.13.1-fix_tdm_pid_file.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- kdebase-3.5.13.1/kdm/config.def.ORI	2012-12-01 12:45:04.820426652 +0100
-+++ kdebase-3.5.13.1/kdm/config.def	2012-12-01 12:45:16.291197270 +0100
-@@ -883,7 +883,7 @@
- Type: string
- Default: ""
- User: core
--Instance: "/var/run/kdm.pid"
-+Instance: "/var/run/tdm.pid"
- Merge: xdm
- Comment:
-  Where &kdm; should store its PID (do not store if empty).
diff --git a/redhat/tdebase/kdebase-3.5.13.1-startkde_icon.patch b/redhat/tdebase/kdebase-3.5.13.1-startkde_icon.patch
deleted file mode 100644
index 8b9052e09..000000000
--- a/redhat/tdebase/kdebase-3.5.13.1-startkde_icon.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- kdebase/startkde.tdeicon	2012-08-09 10:33:24.000000000 +0200
-+++ kdebase/startkde	2012-08-09 10:34:11.484608675 +0200
-@@ -302,6 +302,16 @@
-   fi
- fi
- 
-+# Default Start Button icon for TDE
-+if [ ! -e  $kdehome/share/config/kickerrc ]; then
-+  if [ -r "%{tde_starticon}" ]; then
-+    cat <<EOF >$kdehome/share/config/kickerrc
-+[KMenu]
-+CustomIcon=%{tde_starticon}
-+EOF
-+  fi
-+fi
-+
- # XCursor mouse theme needs to be applied here to work even for kded or ksmserver.
- if test -n "$kcminputrc_mouse_cursortheme" -o -n "$kcminputrc_mouse_cursorsize" ; then
-   kapplymousetheme "$kcminputrc_mouse_cursortheme" "$kcminputrc_mouse_cursorsize"
diff --git a/redhat/tdebase/kdebase-3.5.13.1.spec b/redhat/tdebase/kdebase-3.5.13.1.spec
deleted file mode 100644
index 60c400d43..000000000
--- a/redhat/tdebase/kdebase-3.5.13.1.spec
+++ /dev/null
@@ -1,3266 +0,0 @@
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?tde_prefix}" != "/usr"
-%define _variant .opt
-%endif
-
-# TDE 3.5.13 specific building variables
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-
-%define tde_tdeappdir %{tde_datadir}/applications/kde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-# Older RHEL/Fedora versions use packages named "qt", "qt-devel", ..
-# whereas newer versions use "qt3", "qt3-devel" ...
-%if 0%{?rhel} >= 6 || 0%{?fedora} >= 8 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}
-%define _qt_suffix 3
-%endif
-
-
-Name:		trinity-tdebase
-Version:	3.5.13.1
-Release:	2%{?dist}%{?_variant}
-License:	GPL
-Summary:	Trinity Base Programs
-Group:		User Interface/Desktops
-
-Obsoletes:	trinity-kdebase < %{version}-%{release}
-Provides:	trinity-kdebase = %{version}-%{release}
-Obsoletes:	trinity-kdebase-libs < %{version}-%{release}
-Obsoletes:	trinity-kdebase-extras < %{version}-%{release}
-Provides:	trinity-kdebase-extras = %{version}-%{release}
-Obsoletes:	tdebase < %{version}-%{release}
-Provides:	tdebase = %{version}-%{release}
-
-
-Vendor:		Trinity Project
-Packager:	Francois Andriot <francois.andriot@free.fr>
-URL:		http://www.trinitydesktop.org/
-
-Prefix:		%{tde_prefix}
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:	kdebase-3.5.13.1.tar.gz
-
-# Wrapper script to prevent Plasma launch at Trinity Startup
-Source1:	plasma-desktop
-
-# Pam configuration files for RHEL / Fedora
-%if 0%{?suse_version}
-Source4:	pamd.kcheckpass-trinity.opensuse%{?suse_version}
-%else
-Source2:	pamd.kdm-trinity%{?dist}
-Source3:	pamd.kdm-trinity-np%{?dist}
-Source4:	pamd.kcheckpass-trinity%{?dist}
-Source5:	pamd.kscreensaver-trinity%{?dist}
-%endif
-
-# openSUSE: configuration file for TDM
-Source6:	suse-displaymanagers-tdm
-
-
-# TDE 3.5.13 patches
-## [kdebase] Fix syntax error in icon
-Patch1:		kdebase-3.5.13.1-fix_displayconfig_icon.patch
-## [kdebase/kdesktop] Modifies 'open terminal here' on desktop [RHEL/Fedora]
-Patch11:	kdebase-3.5.12-desktop-openterminalhere.patch
-## [kdebase/kdm/kfrontend] Global Xsession file is '/etc/X11/xinit/Xsession' [RHEL/Fedora]
-Patch13:	kdebase-3.5.13-genkdmconf_Xsession_location.patch
-Patch14:	kdebase-3.5.13-genkdmconf_Xsession_location_xdm.patch
-## [kdebase/startkde] Sets default Start Icon in 'kickerrc' [RHEL/Fedora]
-Patch15:	kdebase-3.5.13.1-startkde_icon.patch
-## [kdebase/kioslave/man] Fix kio_man for older distros without 'man-db' [Bug #714]
-Patch21:	kdebase-3.5.13-kio_man_utf8.patch
-## [kdebase/kdm/kfrontend] Allows to hide KDM menu button [RHEL/Fedora]
-Patch30:	kdebase-3.5.12-kdm_hide_menu_button.patch
-## [kdebase/startkde] Fix wrong path setting
-Patch31:	kdebase-3.5.13.1-fix_startkde_path.patch
-## [kdebase/kdm] Fix PID file is 'tdm.pid' instead of 'kdm.pid' (needed for openSUSE)
-Patch32:	kdebase-3.5.13.1-fix_tdm_pid_file.patch
-
-### Patches for RHEL4 (should not go upstream)
-
-## [tdebase] Fix build on RHEL4, detect old libraries without pkg file
-Patch201:	kdebase-3.5.13-fix_lib_detection.patch
-## [tdebase] Do not build against DBUS-TQT, only DBUS and DBUS-QT
-Patch202:	kdebase-3.5.13-build_without_dbustqt.patch
-## [tdebase] Do not build against ConsoleKit
-Patch203:	kdebase-3.5.13-build_without_consolekit.patch
-## [tdebase] Add WITH_COMPOSITE option to CMakeLists.txt
-Patch204:	kdebase-3.5.13-add_disable_composite_option.patch
-## [tdebase] Downgrade halbackend to support Hal 0.4
-Patch205:	kdebase-3.5.13-support_hal_04.patch
-## [tdebase] Other(s) FTBFS ...
-Patch206:	kdebase-3.5.13-fix_rhel4_compilation.patch
-
-### Distribution-specific settings ###
-
-# Fedora 15 Theme: "Lovelock"
-%if 0%{?fedora} == 15
-Requires:	lovelock-backgrounds-single
-%define tde_bg /usr/share/backgrounds/lovelock/default/standard/lovelock.png
-%define tde_starticon /usr/share/icons/hicolor/96x96/apps/fedora-logo-icon.png
-
-Requires:	fedora-release-notes
-%define tde_aboutlabel Fedora 15
-%define tde_aboutpage /usr/share/doc/HTML/fedora-release-notes/index.html
-%endif
-
-# Fedora 16 Theme: "Verne"
-%if 0%{?fedora} == 16
-Requires:	verne-backgrounds-single
-%define tde_bg /usr/share/backgrounds/verne/default/standard/verne.png
-%define tde_starticon /usr/share/icons/hicolor/96x96/apps/fedora-logo-icon.png
-
-Requires:	fedora-release-notes
-%define tde_aboutlabel Fedora 16
-%define tde_aboutpage /usr/share/doc/HTML/fedora-release-notes/index.html
-%endif
-
-# Fedora 17 Theme: "Beefy Miracle"
-%if 0%{?fedora} == 17
-Requires:	beefy-miracle-backgrounds-single
-%define tde_bg /usr/share/backgrounds/beefy-miracle/default/standard/beefy-miracle.png
-%define tde_starticon /usr/share/icons/hicolor/96x96/apps/fedora-logo-icon.png
-
-Requires:	fedora-release-notes
-%define tde_aboutlabel Fedora 17
-%define tde_aboutpage /usr/share/doc/HTML/fedora-release-notes/index.html
-%endif
-
-# RHEL 4 Theme
-%if 0%{?rhel} == 4
-Requires:	desktop-backgrounds-basic
-%define tde_bg /usr/share/backgrounds/images/default.png
-Requires:	redhat-logos
-%define tde_starticon /usr/share/pixmaps/redhat/rpmlogo-64.xpm
-
-Requires:	indexhtml
-%define tde_aboutlabel Enterprise Linux 4
-%define tde_aboutpage /usr/share/doc/HTML/index.html
-%endif
-
-# RHEL 5 Theme
-%if 0%{?rhel} == 5
-Requires:	desktop-backgrounds-basic
-%define tde_bg /usr/share/backgrounds/images/default.jpg
-%define tde_starticon /usr/share/pixmaps/redhat-starthere.png
-
-Requires:	indexhtml
-%define tde_aboutlabel Enterprise Linux 5
-%define tde_aboutpage /usr/share/doc/HTML/index.html
-%endif
-
-# RHEL 6 Theme
-%if 0%{?rhel} == 6
-Requires:	redhat-logos
-%define tde_bg /usr/share/backgrounds/default.png
-%define tde_starticon /usr/share/icons/hicolor/96x96/apps/system-logo-icon.png
-
-Requires:	redhat-indexhtml
-%define tde_aboutlabel Enterprise Linux 6
-%define tde_aboutpage /usr/share/doc/HTML/index.html
-%endif
-
-# Mageia 2 Theme
-%if 0%{?mgaversion} == 2
-Requires:	mageia-theme-Default
-%define tde_bg /usr/share/mga/backgrounds/default.jpg
-%define tde_starticon /usr/share/icons/hicolor/scalable/apps/mageia-menu.svg
-
-Requires:	indexhtml
-%define tde_aboutlabel Mageia 2
-%define tde_aboutpage /usr/share/mga/about/index.html
-%endif
-
-# Mandriva 2011 Theme: "rosa"
-%if "%{?mdkversion}" == "201100"
-Requires:	mandriva-theme
-%define tde_bg /usr/share/mdk/backgrounds/default.jpg
-%define tde_starticon /usr/share/icons/mandriva.png
-
-Requires:	indexhtml
-%define tde_aboutlabel Mandriva 2011
-%define tde_aboutpage /usr/share/mdk/about/index.html
-%endif
-
-# PCLINUXOS 2012
-%if "%{?pclinuxos}" == "2012"
-Requires:	trinity-wallpaper-theme-default
-%define tde_bg %{tde_datadir}/wallpapers/Pulse2012/contents/images/1600x1200.jpg
-Requires:	desktop-common-data
-%define tde_starticon /usr/share/icons/pclinuxos.png
-
-Requires:	indexhtml
-%define tde_aboutlabel PCLinuxOS 2012
-%define tde_aboutpage /usr/share/mdk/about/index.html
-%endif
-
-# OpenSuse 12.2 Theme
-%if "%{?suse_version}" == "1220"
-Requires:	wallpaper-branding
-%define tde_bg /usr/share/wallpapers/openSUSEdefault/contents/images/1600x1200.jpg
-Requires:	hicolor-icon-theme-branding
-%define tde_starticon /usr/share/icons/hicolor/scalable/apps/distributor.svg
-
-Requires:	opensuse-manuals_en
-%define tde_aboutlabel OpenSuse 12.2
-%define tde_aboutpage /usr/share/doc/manual/opensuse-manuals_en/book.opensuse.startup.html
-%endif
-
-BuildRequires:	cmake >= 2.8
-BuildRequires:	trinity-tqtinterface-devel >= %{version}
-BuildRequires:	trinity-arts-devel >= %{version}
-BuildRequires:	trinity-tdelibs-devel >= %{version}
-BuildRequires:	gcc-c++ make
-BuildRequires:	qt%{?_qt_suffix}-devel
-BuildRequires:	openssl-devel
-BuildRequires:	audiofile-devel
-BuildRequires:	alsa-lib-devel
-BuildRequires:	libraw1394-devel
-BuildRequires:	libvorbis-devel
-BuildRequires:	pam-devel
-%if 0%{?mageia} || 0%{?mandriva} || 0%{?pclinuxos}
-BuildRequires:	%{_lib}usb1.0-devel
-BuildRequires:	%{_lib}usb-compat0.1-devel
-%else
-BuildRequires:	libusb-devel
-%endif
-BuildRequires:	esound-devel
-BuildRequires:	glib2-devel
-BuildRequires:	pcre-devel
-
-# OPENLDAP support
-%if 0%{?suse_version}
-BuildRequires:	openldap2-devel
-%else
-BuildRequires:	openldap-devel
-%endif
-
-# SENSORS support
-#  Disabled on OpenSuse
-%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel}
-BuildRequires:	lm_sensors-devel
-%endif
-%if 0%{?suse_version}
-BuildRequires:	libsensors4-devel
-%endif
-
-# TSAK support (requires libudev-devel)
-#  On RHEL5, udev is built statically, so TSAK cannot build.
-%if 0%{?fedora} >= 15 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 6 || 0%{?suse_version}
-%define with_tsak 1
-BuildRequires:	libudev-devel
-%endif
-
-# XRANDR support
-#  On RHEL5, xrandr library is too old.
-%if 0%{?fedora} >= 15 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 6 || 0%{?suse_version}
-%define with_xrandr 1
-%endif
-
-# HAL support
-#  On RHEL4, we do not use HAL (too old)
-%if 0%{?fedora} >= 15 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 5 || 0%{?suse_version}
-%define with_hal 1
-BuildRequires:	hal-devel >= 0.4.8
-%endif
-
-# OPENEXR support
-#  Disabled on RHEL4
-%if 0%{?fedora} >= 15 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 5 || 0%{?suse_version}
-%define with_exr 1
-BuildRequires:	OpenEXR-devel
-%endif
-
-# XSCREENSAVER support
-#  Disabled on RHEL4
-%if 0%{?fedora} >= 15 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 5 || 0%{?suse_version}
-%define with_xscreensaver 1
-%if 0%{?rhel} == 5
-BuildRequires:	xorg-x11-proto-devel
-BuildRequires:	gnome-screensaver
-%endif
-%if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires:	%{_lib}xscrnsaver%{?mgaversion:1}-devel
-%endif
-%if 0%{?fedora} || 0%{?rhel} >= 6 || 0%{?suse_version}
-BuildRequires:	libXScrnSaver-devel
-%endif
-%endif
-
-# AVAHI support
-#  Disabled on RHEL4 and RHEL5
-%if 0%{?fedora} >= 15 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 6 || 0%{?suse_version}
-BuildRequires:	trinity-avahi-tqt-devel
-Requires:		trinity-avahi-tqt
-%if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires:	%{_lib}avahi-client-devel
-Requires:		%{_lib}avahi-client3
-%else
-BuildRequires:	avahi-devel
-Requires:		avahi
-%endif
-%endif
-
-# NAS support
-# (what is nas btw ?)
-%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires:	nas-devel
-%endif
-
-# DBUS support
-#  TQT bindings not available for RHEL4
-%if 0%{?rhel} == 4
-# Dbus bindings were rebuilt with Qt support
-BuildRequires:	dbus-devel >= 0.22-12.EL.9p1
-Requires:		dbus-qt
-%else
-BuildRequires:	trinity-dbus-tqt-devel
-Requires:		trinity-dbus-tqt >= %{version}
-%endif
-
-%if 0%{?fedora} >= 17
-BuildRequires:	perl-Digest-MD5
-%endif
-
-# JACK support
-%if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires:	%{_lib}jack-devel
-%endif
-%if 0%{?fedora} || 0%{?rhel} >= 5
-BuildRequires:	jack-audio-connection-kit-devel
-%endif
-
-# X11 stuff ...
-%if 0%{?rhel} == 4
-BuildRequires:	xorg-x11-devel
-BuildRequires:	samba-common
-%else
-BuildRequires:	imake
-BuildRequires:	libxkbfile-devel
-BuildRequires:	libsmbclient-devel
-BuildRequires:	libfontenc-devel
-
-%if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires:	%{_lib}xcomposite%{?mgaversion:1}-devel
-BuildRequires:	%{_lib}xdamage-devel
-BuildRequires:	%{_lib}xdmcp%{?mgaversion:6}-devel
-BuildRequires:	%{_lib}xtst-devel
-BuildRequires:	x11-font-util
-BuildRequires:	x11-proto-devel
-%else
-BuildRequires:	libXcomposite-devel
-BuildRequires:	libXdamage-devel
-BuildRequires:	libXdmcp-devel
-BuildRequires:	libXtst-devel
-BuildRequires:	xorg-x11-proto-devel
-
-%if 0%{?suse_version}
-BuildRequires:	font-util
-BuildRequires:	bdftopcf
-%else
-BuildRequires:	xorg-x11-font-utils
-%endif
-
-%endif
-
-%endif
-
-# tdebase is a metapackage that installs all sub-packages
-Requires: %{name}-runtime-data-common = %{version}-%{release}
-Requires: %{name}-data = %{version}-%{release}
-Requires: %{name}-bin = %{version}-%{release}
-Requires: %{name}-kio-plugins = %{version}-%{release}
-Requires: %{name}-kio-pim-plugins = %{version}-%{release}
-Requires: trinity-kappfinder = %{version}-%{release}
-Requires: trinity-kate = %{version}-%{release}
-Requires: trinity-kwrite = %{version}-%{release}
-Requires: trinity-kcontrol = %{version}-%{release}
-Requires: trinity-kdepasswd = %{version}-%{release}
-Requires: trinity-tdeprint = %{version}-%{release}
-Requires: trinity-kdesktop = %{version}-%{release}
-Requires: trinity-tdm = %{version}-%{release}
-Requires: trinity-kfind = %{version}-%{release}
-Requires: trinity-khelpcenter = %{version}-%{release}
-Requires: trinity-kicker = %{version}-%{release}
-Requires: trinity-klipper = %{version}-%{release}
-Requires: trinity-kmenuedit = %{version}-%{release}
-Requires: trinity-konqueror = %{version}-%{release}
-Requires: trinity-konqueror-nsplugins = %{version}-%{release}
-Requires: trinity-konsole = %{version}-%{release}
-Requires: trinity-kpager = %{version}-%{release}
-Requires: trinity-kpersonalizer = %{version}-%{release}
-Requires: trinity-ksmserver = %{version}-%{release}
-Requires: trinity-ksplash = %{version}-%{release}
-Requires: trinity-ksysguard = %{version}-%{release}
-Requires: trinity-ksysguardd = %{version}-%{release}
-Requires: trinity-ktip = %{version}-%{release}
-Requires: trinity-twin = %{version}-%{release}
-Requires: trinity-libkonq = %{version}-%{release}
-Requires: %{name}-libtqt3-integration = %{version}-%{release}
- 
-Requires:	trinity-tqtinterface >= %{version}
-Requires:	trinity-arts >= %{version}
-Requires:	trinity-tdelibs >= %{version}
-Requires:	qt%{?_qt_suffix}
-Requires:	openssl
-
-
-# RHEL 6 Configuration files are provided in separate packages
-%if 0%{?rhel} || 0%{?fedora}
-%if "%{?tde_prefix}" == "/usr"
-Requires:	kde-settings-kdm
-%endif
-Requires:	redhat-menus
-%endif
-
-%if 0%{?suse_version}
-Requires:	desktop-data-openSUSE
-%endif
-
-%description
-TDE (the Trinity Desktop Environment) is a powerful Open Source graphical
-desktop environment for Unix workstations. It combines ease of use,
-contemporary functionality, and outstanding graphical design with the
-technological superiority of the Unix operating system.
-
-This metapackage includes the nucleus of TDE, namely the minimal package
-set necessary to run TDE as a desktop environment. This includes the
-window manager, taskbar, control center, a text editor, file manager,
-web browser, X terminal emulator, and many other programs and components.
-
-%files
-%defattr(-,root,root,-)
-%doc AUTHORS COPYING COPYING-DOCS README README.pam
-
-##########
-
-%package devel
-Summary:	%{summary} - Development files
-Group:		Development/Libraries
-Requires:	%{name} = %{version}-%{release}
-Requires:	trinity-tdelibs-devel
-
-Requires:	%{name}-bin-devel = %{version}-%{release}
-Requires:	trinity-kate-devel = %{version}-%{release}
-Requires:	trinity-kcontrol-devel = %{version}-%{release}
-Requires:	trinity-kdesktop-devel = %{version}-%{release}
-Requires:	trinity-kicker-devel = %{version}-%{release}
-Requires:	trinity-konqueror-devel = %{version}-%{release}
-Requires:	trinity-ksplash-devel = %{version}-%{release}
-Requires:	trinity-ksysguard-devel = %{version}-%{release}
-Requires:	trinity-libkonq-devel = %{version}-%{release}
-Requires:	trinity-tdm-devel = %{version}-%{release}
-Requires:	trinity-twin-devel = %{version}-%{release}
-
-Provides:	trinity-kdebase-devel = %{version}-%{release}
-Obsoletes:	trinity-kdebase-devel < %{version}-%{release}
-Provides:	tdebase-devel = %{version}-%{release}
-Obsoletes:	tdebase-devel < %{version}-%{release}
-
-Obsoletes:	trinity-kdebase-cmake < %{version}-%{release}
-Obsoletes:	tdebase-cmake < %{version}-%{release}
-
-%description devel
-This is a meta-package that installs all tdebase development packages.
-
-Header files for developing applications using %{name}.
-Install tdebase-devel if you want to develop or compile Konqueror,
-Kate plugins or KWin styles.
-
-%files devel
-%{tde_datadir}/cmake/*.cmake
-
-##########
-
-%package kio-pim-plugins
-Summary:	PIM KIOslaves from %{name}
-Group:		Environment/Libraries
-
-Provides:	trinity-kdebase-pim-ioslaves = %{version}-%{release}
-Obsoletes:	trinity-kdebase-pim-ioslaves < %{version}-%{release}
-Provides:	tdebase-kio-pim-plugins = %{version}-%{release}
-Obsoletes:	tdebase-kio-pim-plugins < %{version}-%{release}
-
-%description kio-pim-plugins
-Protocol handlers (KIOslaves) for personal information management, including:
- * kio_ldap
- * kio_nntp
- * kio_pop3
- * kio_smtp
-
-%files kio-pim-plugins
-%defattr(-,root,root,-)
-%{tde_tdelibdir}/kio_ldap.la
-%{tde_tdelibdir}/kio_ldap.so
-%{tde_tdelibdir}/kio_nntp.la
-%{tde_tdelibdir}/kio_nntp.so
-%{tde_tdelibdir}/kio_pop3.la
-%{tde_tdelibdir}/kio_pop3.so
-%{tde_tdelibdir}/kio_smtp.la
-%{tde_tdelibdir}/kio_smtp.so
-%{tde_datadir}/services/ldap.protocol
-%{tde_datadir}/services/ldaps.protocol
-%{tde_datadir}/services/nntp.protocol
-%{tde_datadir}/services/nntps.protocol
-%{tde_datadir}/services/pop3.protocol
-%{tde_datadir}/services/pop3s.protocol
-%{tde_datadir}/services/smtp.protocol
-%{tde_datadir}/services/smtps.protocol
-
-##########
-
-%package runtime-data-common
-Summary:	Shared common files for Trinity and KDE4
-Group:		Environment/Libraries
-
-Provides:	tdebase-runtime-data-common = %{version}-%{release}
-Obsoletes:	tdebase-runtime-data-common < %{version}-%{release}
-
-%description runtime-data-common
-Shared common files for both Trinity and KDE4
-Such as the desktop right-click-"Create New" list
-
-%files runtime-data-common
-%defattr(-,root,root,-)
-%{tde_datadir}/autostart/khotkeys.desktop
-%{tde_datadir}/desktop-directories/*
-%{tde_datadir}/icons/hicolor/*/apps/kxkb.png
-%{tde_datadir}/icons/hicolor/*/apps/knetattach.*
-%{tde_datadir}/icons/hicolor/*/apps/khotkeys.png
-%{tde_datadir}/icons/hicolor/*/apps/kmenuedit.png
-%{tde_datadir}/icons/hicolor/*/apps/ksplash.png
-%{tde_datadir}/locale/en_US/entry.desktop
-%{tde_datadir}/locale/l10n/*.desktop
-%{tde_datadir}/locale/l10n/*/entry.desktop
-%{tde_datadir}/locale/l10n/*/flag.png
-%{tde_datadir}/sounds/pop.wav
-%{tde_datadir}/templates
-
-%post runtime-data-common
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f}  2> /dev/null || :
-done
-
-%postun runtime-data-common
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f}  2> /dev/null || :
-done
-
-##########
-
-%package -n trinity-kappfinder
-Summary:	non-KDE application finder for KDE
-Group:		Applications/Utilities
-Requires:	%{name}-data = %{version}-%{release}
-
-%description -n trinity-kappfinder
-kappfinder searches your workstation for many common applications and
-creates menu entries for them.
-
-%files -n trinity-kappfinder
-%defattr(-,root,root,-)
-%{tde_bindir}/kappfinder
-%{tde_tdeappdir}/kappfinder.desktop
-%{tde_datadir}/applnk/System/kappfinder.desktop
-%{tde_datadir}/apps/kappfinder
-%{tde_datadir}/icons/hicolor/*/apps/kappfinder.png
-
-%post -n trinity-kappfinder
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f}  2> /dev/null || :
-done
-update-desktop-database %{tde_appdir} 2> /dev/null || : 
-
-%postun -n trinity-kappfinder
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f}  2> /dev/null || :
-done
-update-desktop-database %{tde_appdir} 2> /dev/null || : 
-
-##########
-
-%package -n trinity-libkateinterfaces
-Summary:	Common libraries used by kwrite and kate
-Group:		Environment/Libraries
-
-%description -n trinity-libkateinterfaces
-%{summary}
-
-%files -n trinity-libkateinterfaces
-%{tde_libdir}/libkateinterfaces.so.*
-
-%post -n trinity-libkateinterfaces
-/sbin/ldconfig || :
-
-%postun -n trinity-libkateinterfaces
-/sbin/ldconfig || :
-
-##########
-
-%package -n trinity-kate
-Summary:	advanced text editor for TDE
-Group:		Applications/Text
-Requires:	%{name}-data = %{version}-%{release}
-Requires:	trinity-kwrite = %{version}-%{release}
-Requires:	trinity-libkateinterfaces = %{version}-%{release}
-
-%description -n trinity-kate
-Kate is a multi document editor, based on a rewritten version of the kwrite
-editing widget of TDE.
-
-It is a multi-view editor that lets you view several instances of the same
-document with all instances being synced, or view more files at the same
-time for easy reference or simultaneous editing. The terminal emulation
-and sidebar are docked windows that can be plugged out of the main window,
-or replaced therein according to your preference.
-
-Some random features:
-* Editing of big files
-* Extensible syntax highlighting
-* Folding
-* Dynamic word wrap
-* Selectable encoding
-* Filter command
-* Global grep dialog
-
-%files -n trinity-kate
-%defattr(-,root,root,-)
-%{tde_bindir}/kate
-%{tde_tdelibdir}/kate.la
-%{tde_tdelibdir}/kate.so
-%{tde_libdir}/libkateutils.so.*
-%{tde_libdir}/lib[kt]deinit_kate.la
-%{tde_libdir}/lib[kt]deinit_kate.so
-%{tde_tdeappdir}/kate.desktop
-%{tde_datadir}/apps/kate/
-%{tde_datadir}/apps/kconf_update/kate-2.4.upd
-%{tde_datadir}/config/katerc
-%{tde_datadir}/icons/hicolor/*/apps/kate.png
-%{tde_datadir}/icons/hicolor/*/apps/kate2.svgz
-%{tde_datadir}/servicetypes/kateplugin.desktop
-%{tde_tdedocdir}/HTML/en/kate/
-
-%post -n trinity-kate
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f}  2> /dev/null || :
-done
-update-desktop-database %{tde_appdir} 2> /dev/null || : 
-/sbin/ldconfig || :
-
-%postun -n trinity-kate
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f}  2> /dev/null || :
-done
-update-desktop-database %{tde_appdir} 2> /dev/null || : 
-/sbin/ldconfig || :
-
-##########
-
-%package -n trinity-kate-devel
-Summary:	Development files for kate
-Group:		Development/Libraries
-Requires:	trinity-kate = %{version}-%{release}
-
-%description -n trinity-kate-devel
-%{summary}
-
-%files -n trinity-kate-devel
-%{tde_tdeincludedir}/kate/
-%{tde_libdir}/libkateutils.so
-%{tde_libdir}/libkateutils.la
-%{tde_libdir}/libkateinterfaces.so
-%{tde_libdir}/libkateinterfaces.la
-
-%post -n trinity-kate-devel
-/sbin/ldconfig || :
-
-%postun -n trinity-kate-devel
-/sbin/ldconfig || :
-
-##########
-
-%package -n trinity-kwrite
-Summary:	advanced text editor for TDE
-Group:		Applications/Utilities
-Requires:	%{name}-data = %{version}-%{release}
-Requires:	trinity-libkateinterfaces = %{version}-%{release}
-
-%description -n trinity-kwrite
-Kwrite is a text editor for TDE.
-
-%files -n trinity-kwrite
-%defattr(-,root,root,-)
-%{tde_bindir}/kwrite
-%{tde_tdelibdir}/kwrite.la
-%{tde_tdelibdir}/kwrite.so
-%{tde_libdir}/lib[kt]deinit_kwrite.la
-%{tde_libdir}/lib[kt]deinit_kwrite.so
-%{tde_tdeappdir}/kwrite.desktop
-%{tde_datadir}/apps/kwrite/kwriteui.rc
-%{tde_datadir}/icons/hicolor/*/apps/kwrite.png
-%{tde_datadir}/icons/hicolor/*/apps/kwrite2.svgz
-%{tde_tdedocdir}/HTML/en/kwrite/
-
-
-%post -n trinity-kwrite
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f}  2> /dev/null || :
-done
-update-desktop-database %{tde_appdir} 2> /dev/null || : 
-
-%postun -n trinity-kwrite
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f}  2> /dev/null || :
-done
-update-desktop-database %{tde_appdir} 2> /dev/null || : 
-
-##########
-
-%package -n trinity-kcontrol
-Summary:	control center for TDE
-Group:		Applications/Utilities
-Requires:	%{name}-data = %{version}-%{release}
-Requires:	usbutils
-
-%if 0%{?suse_version} == 0
-Requires:	hwdata
-%endif
-
-%description -n trinity-kcontrol
-The Trinity Control Center provides you with a centralized and convenient
-way to configure all of your TDE settings.
-
-It is made up of multiple modules. Each module is a separate application,
-but the control center organizes all of these programs into a convenient
-location.
-
-In combination with udev KControl supports the advanced
-configuration of Logitech mice, though the user must be a member of the
-plugdev group.
-
-%files -n trinity-kcontrol
-%defattr(-,root,root,-)
-%{tde_bindir}/kaccess
-%{tde_bindir}/kcontrol
-%{tde_bindir}/kdeinstallktheme
-%{tde_bindir}/keditfiletype
-%{tde_bindir}/kfontinst
-%{tde_bindir}/kfontview
-%{tde_bindir}/kinfocenter
-%{tde_bindir}/klocaldomainurifilterhelper
-%{tde_bindir}/krdb
-%{tde_tdelibdir}/fontthumbnail.la
-%{tde_tdelibdir}/fontthumbnail.so
-%{tde_tdelibdir}/kaccess.la
-%{tde_tdelibdir}/kaccess.so
-%{tde_tdelibdir}/kcm_access.la
-%{tde_tdelibdir}/kcm_access.so
-%{tde_tdelibdir}/kcm_arts.la
-%{tde_tdelibdir}/kcm_arts.so
-%{tde_tdelibdir}/kcm_background.la
-%{tde_tdelibdir}/kcm_background.so
-%{tde_tdelibdir}/kcm_bell.la
-%{tde_tdelibdir}/kcm_bell.so
-%{tde_tdelibdir}/kcm_clock.la
-%{tde_tdelibdir}/kcm_clock.so
-%{tde_tdelibdir}/kcm_colors.la
-%{tde_tdelibdir}/kcm_colors.so
-%{tde_tdelibdir}/kcm_componentchooser.la
-%{tde_tdelibdir}/kcm_componentchooser.so
-%{tde_tdelibdir}/kcm_crypto.la
-%{tde_tdelibdir}/kcm_crypto.so
-%{tde_tdelibdir}/kcm_css.la
-%{tde_tdelibdir}/kcm_css.so
-%{tde_tdelibdir}/kcm_display.la
-%{tde_tdelibdir}/kcm_display.so
-%{tde_tdelibdir}/kcm_energy.la
-%{tde_tdelibdir}/kcm_energy.so
-%{tde_tdelibdir}/kcm_filetypes.la
-%{tde_tdelibdir}/kcm_filetypes.so
-%{tde_tdelibdir}/kcm_fontinst.la
-%{tde_tdelibdir}/kcm_fontinst.so
-%{tde_tdelibdir}/kcm_fonts.la
-%{tde_tdelibdir}/kcm_fonts.so
-#%{tde_tdelibdir}/kcm_hwmanager.la
-#%{tde_tdelibdir}/kcm_hwmanager.so
-%{tde_tdelibdir}/kcm_icons.la
-%{tde_tdelibdir}/kcm_icons.so
-%{tde_tdelibdir}/kcm_info.la
-%{tde_tdelibdir}/kcm_info.so
-%{tde_tdelibdir}/kcm_input.la
-%{tde_tdelibdir}/kcm_input.so
-%{tde_tdelibdir}/kcm_ioslaveinfo.la
-%{tde_tdelibdir}/kcm_ioslaveinfo.so
-%{tde_tdelibdir}/kcm_joystick.la
-%{tde_tdelibdir}/kcm_joystick.so
-%{tde_tdelibdir}/kcm_kded.la
-%{tde_tdelibdir}/kcm_kded.so
-%{tde_tdelibdir}/kcm_[kt]dm.la
-%{tde_tdelibdir}/kcm_[kt]dm.so
-%{tde_tdelibdir}/kcm_kdnssd.so
-%{tde_tdelibdir}/kcm_kdnssd.la
-%{tde_tdelibdir}/kcm_keys.la
-%{tde_tdelibdir}/kcm_keys.so
-%{tde_tdelibdir}/kcm_kicker.la
-%{tde_tdelibdir}/kcm_kicker.so
-%{tde_tdelibdir}/kcm_kio.la
-%{tde_tdelibdir}/kcm_kio.so
-%{tde_tdelibdir}/kcm_knotify.la
-%{tde_tdelibdir}/kcm_knotify.so
-%{tde_tdelibdir}/kcm_konqhtml.la
-%{tde_tdelibdir}/kcm_konqhtml.so
-%{tde_tdelibdir}/kcm_konq.la
-%{tde_tdelibdir}/kcm_konq.so
-%{tde_tdelibdir}/kcm_kthememanager.la
-%{tde_tdelibdir}/kcm_kthememanager.so
-%{tde_tdelibdir}/kcm_kurifilt.la
-%{tde_tdelibdir}/kcm_kurifilt.so
-%{tde_tdelibdir}/kcm_launch.la
-%{tde_tdelibdir}/kcm_launch.so
-%{tde_tdelibdir}/kcm_locale.la
-%{tde_tdelibdir}/kcm_locale.so
-%{tde_tdelibdir}/kcm_nic.la
-%{tde_tdelibdir}/kcm_nic.so
-%{tde_tdelibdir}/kcm_performance.la
-%{tde_tdelibdir}/kcm_performance.so
-%{tde_tdelibdir}/kcm_privacy.la
-%{tde_tdelibdir}/kcm_privacy.so
-%{tde_tdelibdir}/kcm_samba.la
-%{tde_tdelibdir}/kcm_samba.so
-%{tde_tdelibdir}/kcm_screensaver.la
-%{tde_tdelibdir}/kcm_screensaver.so
-%{tde_tdelibdir}/kcm_smserver.la
-%{tde_tdelibdir}/kcm_smserver.so
-%{tde_tdelibdir}/kcm_spellchecking.la
-%{tde_tdelibdir}/kcm_spellchecking.so
-%{tde_tdelibdir}/kcm_style.la
-%{tde_tdelibdir}/kcm_style.so
-%{tde_tdelibdir}/kcm_taskbar.la
-%{tde_tdelibdir}/kcm_taskbar.so
-%{tde_tdelibdir}/kcm_usb.la
-%{tde_tdelibdir}/kcm_usb.so
-%{tde_tdelibdir}/kcm_view1394.la
-%{tde_tdelibdir}/kcm_view1394.so
-%{tde_tdelibdir}/kcm_xinerama.la
-%{tde_tdelibdir}/kcm_xinerama.so
-%{tde_tdelibdir}/kcontrol.la
-%{tde_tdelibdir}/kcontrol.so
-%{tde_tdelibdir}/kfile_font.la
-%{tde_tdelibdir}/kfile_font.so
-%{tde_tdelibdir}/kio_fonts.la
-%{tde_tdelibdir}/kio_fonts.so
-%{tde_tdelibdir}/kstyle_keramik_config.la
-%{tde_tdelibdir}/kstyle_keramik_config.so
-%{tde_tdelibdir}/libkfontviewpart.la
-%{tde_tdelibdir}/libkfontviewpart.so
-%{tde_tdelibdir}/libkshorturifilter.la
-%{tde_tdelibdir}/libkshorturifilter.so
-%{tde_tdelibdir}/libkuriikwsfilter.la
-%{tde_tdelibdir}/libkuriikwsfilter.so
-%{tde_tdelibdir}/libkurisearchfilter.la
-%{tde_tdelibdir}/libkurisearchfilter.so
-%{tde_tdelibdir}/liblocaldomainurifilter.la
-%{tde_tdelibdir}/liblocaldomainurifilter.so
-%{tde_libdir}/lib[kt]deinit_kaccess.la
-%{tde_libdir}/lib[kt]deinit_kaccess.so
-%{tde_libdir}/lib[kt]deinit_kcontrol.la
-%{tde_libdir}/lib[kt]deinit_kcontrol.so
-%{tde_libdir}/libkfontinst.so.*
-%{tde_tdeappdir}/arts.desktop
-%{tde_tdeappdir}/background.desktop
-%{tde_tdeappdir}/bell.desktop
-%{tde_tdeappdir}/cache.desktop
-%{tde_tdeappdir}/cdinfo.desktop
-%{tde_tdeappdir}/clock.desktop
-%{tde_tdeappdir}/colors.desktop
-%{tde_tdeappdir}/componentchooser.desktop
-%{tde_tdeappdir}/cookies.desktop
-%{tde_tdeappdir}/crypto.desktop
-%{tde_tdeappdir}/desktopbehavior.desktop
-%{tde_tdeappdir}/desktop.desktop
-%{tde_tdeappdir}/desktoppath.desktop
-%{tde_tdeappdir}/devices.desktop
-%{tde_tdeappdir}/display.desktop
-%{tde_tdeappdir}/dma.desktop
-%{tde_tdeappdir}/ebrowsing.desktop
-%{tde_tdeappdir}/filebrowser.desktop
-%{tde_tdeappdir}/filetypes.desktop
-%{tde_tdeappdir}/fonts.desktop
-#%{tde_tdeappdir}/hwmanager.desktop
-%{tde_tdeappdir}/icons.desktop
-%{tde_tdeappdir}/installktheme.desktop
-%{tde_tdeappdir}/interrupts.desktop
-%{tde_tdeappdir}/ioports.desktop
-%{tde_tdeappdir}/ioslaveinfo.desktop
-%{tde_tdeappdir}/joystick.desktop
-%{tde_tdeappdir}/kcm_kdnssd.desktop
-%{tde_tdeappdir}/kcmaccess.desktop
-%{tde_tdeappdir}/kcmcss.desktop
-%{tde_tdeappdir}/kcmfontinst.desktop
-%{tde_tdeappdir}/kcmkded.desktop
-%{tde_tdeappdir}/kcmlaunch.desktop
-%{tde_tdeappdir}/kcmnotify.desktop
-%{tde_tdeappdir}/kcmperformance.desktop
-%{tde_tdeappdir}/kcmsmserver.desktop
-%{tde_tdeappdir}/kcmtaskbar.desktop
-%{tde_tdeappdir}/kcmusb.desktop
-%{tde_tdeappdir}/kcmview1394.desktop
-%{tde_tdeappdir}/KControl.desktop
-%{tde_tdeappdir}/[kt]dm.desktop
-%{tde_tdeappdir}/keys.desktop
-%{tde_tdeappdir}/kfontview.desktop
-%{tde_tdeappdir}/khtml_behavior.desktop
-%{tde_tdeappdir}/khtml_fonts.desktop
-%{tde_tdeappdir}/khtml_java_js.desktop
-%{tde_tdeappdir}/kinfocenter.desktop
-%{tde_tdeappdir}/kthememanager.desktop
-%{tde_tdeappdir}/lanbrowser.desktop
-%{tde_tdeappdir}/language.desktop
-%{tde_tdeappdir}/media.desktop
-%{tde_tdeappdir}/memory.desktop
-%{tde_tdeappdir}/mouse.desktop
-%{tde_tdeappdir}/netpref.desktop
-%{tde_tdeappdir}/nic.desktop
-%{tde_tdeappdir}/opengl.desktop
-%{tde_tdeappdir}/panel_appearance.desktop
-%{tde_tdeappdir}/panel.desktop
-%{tde_tdeappdir}/partitions.desktop
-%{tde_tdeappdir}/pci.desktop
-%{tde_tdeappdir}/privacy.desktop
-%{tde_tdeappdir}/processor.desktop
-%{tde_tdeappdir}/proxy.desktop
-%{tde_tdeappdir}/screensaver.desktop
-%{tde_tdeappdir}/scsi.desktop
-%{tde_tdeappdir}/smbstatus.desktop
-%{tde_tdeappdir}/sound.desktop
-%{tde_tdeappdir}/spellchecking.desktop
-%{tde_tdeappdir}/style.desktop
-%{tde_tdeappdir}/useragent.desktop
-%{tde_tdeappdir}/xserver.desktop
-%{tde_datadir}/applnk/.hidden/energy.desktop
-%{tde_datadir}/applnk/.hidden/fileappearance.desktop
-%{tde_datadir}/applnk/.hidden/filebehavior.desktop
-%{tde_datadir}/applnk/.hidden/filepreviews.desktop
-%{tde_datadir}/applnk/.hidden/kcmkonqyperformance.desktop
-%{tde_datadir}/applnk/.hidden/kicker_config_appearance.desktop
-%{tde_datadir}/applnk/.hidden/kicker_config.desktop
-%{tde_datadir}/applnk/.hidden/smb.desktop
-%{tde_datadir}/applnk/.hidden/xinerama.desktop
-%{tde_datadir}/applnk/Settings/LookNFeel/
-%{tde_datadir}/applnk/Settings/WebBrowsing/khtml_appearance.desktop
-%{tde_datadir}/applnk/Settings/WebBrowsing/nsplugin.desktop
-%{tde_datadir}/applnk/Settings/WebBrowsing/smb.desktop
-%{tde_datadir}/apps/kcm_componentchooser/kcm_browser.desktop
-%{tde_datadir}/apps/kcm_componentchooser/kcm_kemail.desktop
-%{tde_datadir}/apps/kcm_componentchooser/kcm_terminal.desktop
-%{tde_datadir}/apps/konqsidebartng/virtual_folders/services/fonts.desktop
-%{tde_datadir}/apps/konqueror/servicemenus/installfont.desktop
-%{tde_datadir}/mimelnk/application/x-ktheme.desktop
-%{tde_datadir}/mimelnk/fonts/folder.desktop
-%{tde_datadir}/mimelnk/fonts/package.desktop
-%{tde_datadir}/mimelnk/fonts/system-folder.desktop
-%{tde_datadir}/services/fonts.protocol
-%{tde_datadir}/services/fontthumbnail.desktop
-%{tde_datadir}/services/kaccess.desktop
-%{tde_datadir}/services/kfile_font.desktop
-%{tde_datadir}/services/kfontviewpart.desktop
-%{tde_datadir}/services/kshorturifilter.desktop
-%{tde_datadir}/services/kuriikwsfilter.desktop
-%{tde_datadir}/services/kurisearchfilter.desktop
-%{tde_datadir}/services/localdomainurifilter.desktop
-
-%{tde_datadir}/apps/usb.ids
-%{tde_datadir}/apps/kcmview1394/oui.db
-
-# The following features are not compiled under RHEL 5
-%if 0%{?rhel} >= 6 || 0%{?fedora} >= 15 || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version}
-%{tde_bindir}/krandrtray
-%{tde_tdelibdir}/kcm_displayconfig.la
-%{tde_tdelibdir}/kcm_displayconfig.so
-%{tde_tdelibdir}/kcm_iccconfig.la
-%{tde_tdelibdir}/kcm_iccconfig.so
-%{tde_tdelibdir}/kcm_randr.la
-%{tde_tdelibdir}/kcm_randr.so
-%{tde_tdeappdir}/displayconfig.desktop
-%{tde_tdeappdir}/iccconfig.desktop
-%{tde_tdeappdir}/krandrtray.desktop
-%{tde_datadir}/applnk/.hidden/randr.desktop
-%{tde_datadir}/autostart/krandrtray-autostart.desktop
-%endif
-
-%post -n trinity-kcontrol
-/sbin/ldconfig || :
-update-desktop-database %{tde_appdir} 2> /dev/null || : 
-
-%postun -n trinity-kcontrol
-/sbin/ldconfig || :
-update-desktop-database %{tde_appdir} 2> /dev/null || : 
-
-##########
-
-%package -n trinity-kcontrol-devel
-Summary:	Development files for kcontrol
-Group:		Development/Libraries
-Requires:	trinity-kcontrol = %{version}-%{release}
-
-%description -n trinity-kcontrol-devel
-%{summary}
-
-%files -n trinity-kcontrol-devel
-%{tde_libdir}/libkfontinst.la
-%{tde_libdir}/libkfontinst.so
-
-%post -n trinity-kcontrol-devel
-/sbin/ldconfig || :
-
-%postun -n trinity-kcontrol-devel
-/sbin/ldconfig || :
-
-##########
-
-%package bin
-Summary:	core binaries for the TDE base module
-Group:		Applications/Utilities
-Requires:	%{name}-data = %{version}-%{release}
-Requires:	pam
-
-Provides:	tdebase-bin = %{version}-%{release}
-Obsoletes:	tdebase-bin < %{version}-%{release}
-
-%description bin
-This package contains miscellaneous programs needed by other
-TDE applications, particularly those in the TDE base module.
-
-%files bin
-%defattr(-,root,root,-)
-%{tde_bindir}/krootbacking
-#%{tde_bindir}/tdeinit_phase1
-%if 0%{?with_tsak}
-%attr(4511,root,root) %{tde_bindir}/[kt]dmtsak
-%{tde_bindir}/tsak
-%endif
-%{tde_bindir}/kdebugdialog
-%{tde_bindir}/kreadconfig
-%{tde_bindir}/kwriteconfig
-%{tde_bindir}/kstart
-%{tde_datadir}/config/kxkb_groups
-%{tde_bindir}/drkonqi
-%{tde_bindir}/kapplymousetheme
-%{tde_bindir}/kblankscrn.kss
-%attr(4755,root,root) %{tde_bindir}/kcheckpass
-%{tde_bindir}/kcminit
-%{tde_bindir}/kcminit_startup
-%{tde_bindir}/kdcop
-%{tde_bindir}/[kt]desu
-%attr(0755,root,root) %{tde_bindir}/[kt]desud
-%{tde_bindir}/kdialog
-%{tde_bindir}/khotkeys
-%{tde_bindir}/knetattach
-%{tde_bindir}/krandom.kss
-%{tde_bindir}/ksystraycmd
-%{tde_bindir}/kxkb
-%{tde_libdir}/kconf_update_bin/khotkeys_update
-%{tde_tdelibdir}/kcminit.la
-%{tde_tdelibdir}/kcminit.so
-%{tde_tdelibdir}/kcminit_startup.la
-%{tde_tdelibdir}/kcminit_startup.so
-%{tde_tdelibdir}/kcm_keyboard.la
-%{tde_tdelibdir}/kcm_keyboard.so
-%{tde_tdelibdir}/kcm_khotkeys_init.la
-%{tde_tdelibdir}/kcm_khotkeys_init.so
-%{tde_tdelibdir}/kcm_khotkeys.la
-%{tde_tdelibdir}/kcm_khotkeys.so
-%{tde_tdelibdir}/kded_khotkeys.la
-%{tde_tdelibdir}/kded_khotkeys.so
-%{tde_tdelibdir}/kgreet_classic.la
-%{tde_tdelibdir}/kgreet_classic.so
-%{tde_tdelibdir}/kgreet_winbind.la
-%{tde_tdelibdir}/kgreet_winbind.so
-%{tde_tdelibdir}/khotkeys.la
-%{tde_tdelibdir}/khotkeys.so
-%{tde_tdelibdir}/khotkeys_arts.la
-%{tde_tdelibdir}/khotkeys_arts.so
-%{tde_tdelibdir}/kxkb.la
-%{tde_tdelibdir}/kxkb.so
-%{tde_libdir}/lib[kt]deinit_kcminit.la
-%{tde_libdir}/lib[kt]deinit_kcminit.so
-%{tde_libdir}/lib[kt]deinit_kcminit_startup.la
-%{tde_libdir}/lib[kt]deinit_kcminit_startup.so
-%{tde_libdir}/lib[kt]deinit_khotkeys.la
-%{tde_libdir}/lib[kt]deinit_khotkeys.so
-%{tde_libdir}/lib[kt]deinit_kxkb.la
-%{tde_libdir}/lib[kt]deinit_kxkb.so
-%{tde_libdir}/libkhotkeys_shared.so.*
-%{tde_tdeappdir}/keyboard.desktop
-%{tde_tdeappdir}/keyboard_layout.desktop
-%{tde_tdeappdir}/khotkeys.desktop
-%{tde_tdeappdir}/knetattach.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/
-%{tde_datadir}/apps/drkonqi/
-%{tde_datadir}/apps/kconf_update/khotkeys_32b1_update.upd
-%{tde_datadir}/apps/kconf_update/khotkeys_printscreen.upd
-%{tde_datadir}/apps/kconf_update/konqueror_gestures_trinity21_update.upd
-%{tde_datadir}/apps/kdcop/kdcopui.rc
-%{tde_datadir}/apps/khotkeys/
-%{tde_datadir}/services/kded/khotkeys.desktop
-%{tde_datadir}/services/kxkb.desktop
-%{_sysconfdir}/pam.d/kcheckpass-trinity
-%if 0%{?suse_version} == 0
-%{_sysconfdir}/pam.d/kscreensaver-trinity
-%endif
-%{tde_tdedocdir}/HTML/en/kdcop/
-%{tde_tdedocdir}/HTML/en/kdebugdialog//
-%{tde_tdedocdir}/HTML/en/[kt]desu/
-%{tde_tdedocdir}/HTML/en/knetattach/
-%{tde_tdedocdir}/HTML/en/kxkb/
-
-%post bin
-/sbin/ldconfig || :
-update-desktop-database %{tde_appdir} 2> /dev/null || : 
-
-%postun bin
-/sbin/ldconfig || :
-update-desktop-database %{tde_appdir} 2> /dev/null || : 
-
-##########
-
-%package bin-devel
-Summary:	Development files for core binaries for the TDE base module
-Group:		Development/Libraries
-Requires:	%{name}-bin = %{version}-%{release}
-
-Obsoletes:	tdebase-bin-devel < %{version}-%{release}
-Provides:	tdebase-bin-devel = %{version}-%{release}
-
-%description bin-devel
-%{summary}
-
-%files bin-devel
-%{tde_libdir}/libkhotkeys_shared.la
-%{tde_libdir}/libkhotkeys_shared.so
-
-%post bin-devel
-/sbin/ldconfig || :
-
-%postun bin-devel
-/sbin/ldconfig || :
-
-##########
-
-%package data
-Summary:	shared data files for the TDE base module
-Group:		Environment/Libraries
-Requires:	%{name}-runtime-data-common = %{version}-%{release}
-
-Obsoletes:	tdebase-data < %{version}-%{release}
-Provides:	tdebase-data = %{version}-%{release}
-
-%description data
-This package contains the architecture-independent shared data files
-needed for a basic TDE desktop installation.
-
-%files data
-%defattr(-,root,root,-)
-%{tde_datadir}/config/kshorturifilterrc
-%{tde_datadir}/applnk/.hidden/battery.desktop
-%{tde_datadir}/applnk/.hidden/bwarning.desktop
-%{tde_datadir}/applnk/.hidden/cwarning.desktop
-%{tde_datadir}/applnk/.hidden/.directory
-%{tde_datadir}/applnk/.hidden/email.desktop
-%{tde_datadir}/applnk/.hidden/kcmkonq.desktop
-%{tde_datadir}/applnk/.hidden/kcmkxmlrpcd.desktop
-%{tde_datadir}/applnk/.hidden/konqhtml.desktop
-%{tde_datadir}/applnk/.hidden/passwords.desktop
-%{tde_datadir}/applnk/.hidden/power.desktop
-%{tde_datadir}/applnk/.hidden/socks.desktop
-%{tde_datadir}/applnk/.hidden/userinfo.desktop
-%{tde_datadir}/applnk/.hidden/virtualdesktops.desktop
-%{tde_datadir}/apps/kaccess/eventsrc
-%{tde_datadir}/apps/kcmcss/template.css
-%{tde_datadir}/apps/kcminput/
-%{tde_datadir}/apps/kcmkeys/
-%{tde_datadir}/apps/kcmlocale/pics/background.png
-%{tde_datadir}/apps/kconf_update/convertShortcuts.pl
-%{tde_datadir}/apps/kconf_update/kaccel.upd
-%{tde_datadir}/apps/kconf_update/kcmdisplayrc.upd
-%{tde_datadir}/apps/kconf_update/kuriikwsfilter.upd
-%{tde_datadir}/apps/kconf_update/mouse_cursor_theme.upd
-%{tde_datadir}/apps/kconf_update/socks.upd
-%{tde_datadir}/apps/kcontrol/
-%{tde_datadir}/apps/kdisplay/
-%{tde_datadir}/apps/kfontview/
-%{tde_datadir}/apps/kinfocenter/kinfocenterui.rc
-%{tde_datadir}/apps/kthememanager/themes/*
-%{tde_datadir}/icons/crystalsvg/*/apps/access.png
-%{tde_datadir}/icons/crystalsvg/*/apps/acroread.png
-%{tde_datadir}/icons/crystalsvg/*/apps/applixware.png
-%{tde_datadir}/icons/crystalsvg/*/apps/arts.png
-%{tde_datadir}/icons/crystalsvg/*/apps/background.png
-%{tde_datadir}/icons/crystalsvg/*/apps/bell.png
-%{tde_datadir}/icons/crystalsvg/*/apps/cache.png
-%{tde_datadir}/icons/crystalsvg/*/apps/clanbomber.png
-%{tde_datadir}/icons/crystalsvg/*/apps/clock.png
-%{tde_datadir}/icons/crystalsvg/*/apps/colors.png
-%{tde_datadir}/icons/crystalsvg/*/apps/date.png
-%{tde_datadir}/icons/crystalsvg/*/apps/email.png
-%{tde_datadir}/icons/crystalsvg/*/apps/energy.png
-%{tde_datadir}/icons/crystalsvg/*/apps/energy_star.png
-%{tde_datadir}/icons/crystalsvg/*/apps/filetypes.png
-%{tde_datadir}/icons/crystalsvg/*/apps/fonts.png
-%{tde_datadir}/icons/crystalsvg/*/apps/gimp.png
-%{tde_datadir}/icons/crystalsvg/*/apps/help_index.png
-%{tde_datadir}/icons/crystalsvg/*/apps/hwinfo.png
-%{tde_datadir}/icons/crystalsvg/*/apps/kcmdevices.png
-%{tde_datadir}/icons/crystalsvg/*/apps/kcmdf.png
-%{tde_datadir}/icons/crystalsvg/*/apps/kcmkwm.png
-%{tde_datadir}/icons/crystalsvg/*/apps/kcmmemory.png
-%{tde_datadir}/icons/crystalsvg/*/apps/kcmpartitions.png
-%{tde_datadir}/icons/crystalsvg/*/apps/kcmpci.png
-%{tde_datadir}/icons/crystalsvg/*/apps/kcontrol.png
-%{tde_datadir}/icons/crystalsvg/*/apps/[kt]dmconfig.png
-%{tde_datadir}/icons/crystalsvg/*/apps/key_bindings.png
-%{tde_datadir}/icons/crystalsvg/*/apps/kfm_home.png
-%{tde_datadir}/icons/crystalsvg/*/apps/kscreensaver.png
-%{tde_datadir}/icons/crystalsvg/*/apps/kthememgr.png
-%{tde_datadir}/icons/crystalsvg/*/apps/licq.png
-%{tde_datadir}/icons/crystalsvg/*/apps/linuxconf.png
-%{tde_datadir}/icons/crystalsvg/*/apps/locale.png
-%{tde_datadir}/icons/crystalsvg/*/apps/looknfeel.png
-%{tde_datadir}/icons/crystalsvg/*/apps/multimedia.png
-%{tde_datadir}/icons/crystalsvg/*/apps/netscape.png
-%{tde_datadir}/icons/crystalsvg/*/apps/package_applications.png
-%{tde_datadir}/icons/crystalsvg/*/apps/package_development.png
-%{tde_datadir}/icons/crystalsvg/*/apps/package_favourite.png
-%{tde_datadir}/icons/crystalsvg/*/apps/package_games.png
-%{tde_datadir}/icons/crystalsvg/*/apps/package_games_kids.png
-%{tde_datadir}/icons/crystalsvg/*/apps/package_multimedia.png
-%{tde_datadir}/icons/crystalsvg/*/apps/package_network.png
-%{tde_datadir}/icons/crystalsvg/*/apps/package.png
-%{tde_datadir}/icons/crystalsvg/*/apps/package_settings.png
-%{tde_datadir}/icons/crystalsvg/*/apps/package_toys.png
-%{tde_datadir}/icons/crystalsvg/*/apps/package_utilities.png
-%{tde_datadir}/icons/crystalsvg/*/apps/penguin.png
-%{tde_datadir}/icons/crystalsvg/*/apps/personal.png
-%{tde_datadir}/icons/crystalsvg/*/apps/phppg.png
-%{tde_datadir}/icons/crystalsvg/*/apps/proxy.png
-%{tde_datadir}/icons/crystalsvg/*/apps/pysol.png
-%{tde_datadir}/icons/crystalsvg/*/apps/randr.png
-%{tde_datadir}/icons/crystalsvg/*/apps/samba.png
-%{tde_datadir}/icons/crystalsvg/*/apps/staroffice.png
-%{tde_datadir}/icons/crystalsvg/*/apps/stylesheet.png
-%{tde_datadir}/icons/crystalsvg/*/apps/terminal.png
-%{tde_datadir}/icons/crystalsvg/*/apps/tux.png
-%{tde_datadir}/icons/crystalsvg/*/apps/wp.png
-%{tde_datadir}/icons/crystalsvg/*/apps/xclock.png
-%{tde_datadir}/icons/crystalsvg/*/apps/xfmail.png
-%{tde_datadir}/icons/crystalsvg/*/apps/xmag.png
-%{tde_datadir}/icons/crystalsvg/*/apps/xpaint.png
-%{tde_datadir}/icons/crystalsvg/scalable/apps/access.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/acroread.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/aim.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/aktion.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/antivirus.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/applixware.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/arts.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/background.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/bell.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/browser.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/cache.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/camera.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/clanbomber.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/clock.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/colors.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/core.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/date.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/display.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/download_manager.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/email.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/energy.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/error.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/fifteenpieces.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/filetypes.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/fonts.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/galeon.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/gnome_apps.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/hardware.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/hwinfo.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/ieee1394.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/kcmdevices.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/kcmkwm.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/kcmx.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/locale.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/my_mac.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/netscape.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/openoffice.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/package_development.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/package_games_kids.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/package_toys.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/penguin.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/personal.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/quicktime.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/realplayer.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/samba.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/shell.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/staroffice.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/stylesheet.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/terminal.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/tux.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/wine.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/x.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/xapp.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/xcalc.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/xchat.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/xclock.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/xeyes.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/xpaint.svgz
-%{tde_datadir}/icons/crystalsvg/*/devices/laptop.png
-%{tde_datadir}/icons/crystalsvg/*/devices/laptop.svgz
-%{tde_datadir}/icons/crystalsvg/*/actions/newfont.png
-%{tde_datadir}/icons/crystalsvg/*/apps/abiword.png
-%{tde_datadir}/icons/crystalsvg/*/apps/agent.png
-%{tde_datadir}/icons/crystalsvg/*/apps/alevt.png
-%{tde_datadir}/icons/crystalsvg/*/apps/assistant.png
-%{tde_datadir}/icons/crystalsvg/*/apps/blender.png
-%{tde_datadir}/icons/crystalsvg/*/apps/bluefish.png
-%{tde_datadir}/icons/crystalsvg/*/apps/cookie.png
-%{tde_datadir}/icons/crystalsvg/*/apps/designer.png
-%{tde_datadir}/icons/crystalsvg/*/apps/dia.png
-%{tde_datadir}/icons/crystalsvg/*/apps/dlgedit.png
-%{tde_datadir}/icons/crystalsvg/*/apps/eclipse.png
-%{tde_datadir}/icons/crystalsvg/*/apps/edu_languages.png
-%{tde_datadir}/icons/crystalsvg/*/apps/edu_mathematics.png
-%{tde_datadir}/icons/crystalsvg/*/apps/edu_miscellaneous.png
-%{tde_datadir}/icons/crystalsvg/*/apps/edu_science.png
-%{tde_datadir}/icons/crystalsvg/*/apps/emacs.png
-%{tde_datadir}/icons/crystalsvg/*/apps/enhanced_browsing.png
-%{tde_datadir}/icons/crystalsvg/*/apps/evolution.png
-%{tde_datadir}/icons/crystalsvg/*/apps/fifteenpieces.png
-%{tde_datadir}/icons/crystalsvg/*/apps/gabber.png
-%{tde_datadir}/icons/crystalsvg/*/apps/gaim.png
-%{tde_datadir}/icons/crystalsvg/*/apps/gnome_apps.png
-%{tde_datadir}/icons/crystalsvg/*/apps/gnomemeeting.png
-%{tde_datadir}/icons/crystalsvg/*/apps/gnucash.png
-%{tde_datadir}/icons/crystalsvg/*/apps/gnumeric.png
-%{tde_datadir}/icons/crystalsvg/*/apps/gv.png
-%{tde_datadir}/icons/crystalsvg/*/apps/gvim.png
-%{tde_datadir}/icons/crystalsvg/*/apps/icons.png
-%{tde_datadir}/icons/crystalsvg/*/apps/iconthemes.png
-%{tde_datadir}/icons/crystalsvg/*/apps/ieee1394.png
-%{tde_datadir}/icons/crystalsvg/*/apps/input_devices_settings.png
-%{tde_datadir}/icons/crystalsvg/*/apps/kcmkicker.png
-%{tde_datadir}/icons/crystalsvg/*/apps/kcmmidi.png
-%{tde_datadir}/icons/crystalsvg/*/apps/kcmprocessor.png
-%{tde_datadir}/icons/crystalsvg/*/apps/kcmscsi.png
-%{tde_datadir}/icons/crystalsvg/*/apps/kcmsound.png
-%{tde_datadir}/icons/crystalsvg/*/apps/kcmsystem.png
-%{tde_datadir}/icons/crystalsvg/*/apps/kcmx.png
-%{tde_datadir}/icons/crystalsvg/*/apps/keyboard.png
-%{tde_datadir}/icons/crystalsvg/*/apps/keyboard_layout.png
-%{tde_datadir}/icons/crystalsvg/*/apps/knotify.png
-%{tde_datadir}/icons/crystalsvg/*/apps/kvirc.png
-%{tde_datadir}/icons/crystalsvg/*/apps/linguist.png
-%{tde_datadir}/icons/crystalsvg/*/apps/lyx.png
-%{tde_datadir}/icons/crystalsvg/*/apps/mac.png
-%{tde_datadir}/icons/crystalsvg/*/apps/mathematica.png
-%{tde_datadir}/icons/crystalsvg/*/apps/nedit.png
-%{tde_datadir}/icons/crystalsvg/*/apps/opera.png
-%{tde_datadir}/icons/crystalsvg/*/apps/package_application.png
-%{tde_datadir}/icons/crystalsvg/*/apps/package_editors.png
-%{tde_datadir}/icons/crystalsvg/*/apps/package_edutainment.png
-%{tde_datadir}/icons/crystalsvg/*/apps/package_games_arcade.png
-%{tde_datadir}/icons/crystalsvg/*/apps/package_games_board.png
-%{tde_datadir}/icons/crystalsvg/*/apps/package_games_card.png
-%{tde_datadir}/icons/crystalsvg/*/apps/package_games_strategy.png
-%{tde_datadir}/icons/crystalsvg/*/apps/package_graphics.png
-%{tde_datadir}/icons/crystalsvg/*/apps/package_system.png
-%{tde_datadir}/icons/crystalsvg/*/apps/package_wordprocessing.png
-%{tde_datadir}/icons/crystalsvg/*/apps/pan.png
-%{tde_datadir}/icons/crystalsvg/*/apps/panel_settings.png
-%{tde_datadir}/icons/crystalsvg/*/apps/plan.png
-%{tde_datadir}/icons/crystalsvg/*/apps/planner.png
-%{tde_datadir}/icons/crystalsvg/*/apps/pybliographic.png
-%{tde_datadir}/icons/crystalsvg/*/apps/realplayer.png
-%{tde_datadir}/icons/crystalsvg/*/apps/remote.png
-%{tde_datadir}/icons/crystalsvg/*/apps/scribus.png
-%{tde_datadir}/icons/crystalsvg/*/apps/sodipodi.png
-%{tde_datadir}/icons/crystalsvg/*/apps/style.png
-%{tde_datadir}/icons/crystalsvg/*/apps/usb.png
-%{tde_datadir}/icons/crystalsvg/*/apps/vnc.png
-%{tde_datadir}/icons/crystalsvg/*/apps/wabi.png
-%{tde_datadir}/icons/crystalsvg/*/apps/wine.png
-%{tde_datadir}/icons/crystalsvg/*/apps/xcalc.png
-%{tde_datadir}/icons/crystalsvg/*/apps/xchat.png
-%{tde_datadir}/icons/crystalsvg/*/apps/xclipboard.png
-%{tde_datadir}/icons/crystalsvg/*/apps/xconsole.png
-%{tde_datadir}/icons/crystalsvg/*/apps/xedit.png
-%{tde_datadir}/icons/crystalsvg/*/apps/xemacs.png
-%{tde_datadir}/icons/crystalsvg/*/apps/xeyes.png
-%{tde_datadir}/icons/crystalsvg/*/apps/xfig.png
-%{tde_datadir}/icons/crystalsvg/*/apps/xload.png
-%{tde_datadir}/icons/crystalsvg/*/apps/xmms.png
-%{tde_datadir}/icons/crystalsvg/*/apps/xosview.png
-%{tde_datadir}/icons/crystalsvg/*/apps/xv.png
-%{tde_datadir}/icons/crystalsvg/*/apps/galeon.png
-%{tde_datadir}/icons/crystalsvg/*/apps/kcmdrkonqi.png
-%{tde_datadir}/icons/crystalsvg/*/apps/pinguin.png
-%{tde_datadir}/icons/crystalsvg/*/apps/x.png
-%{tde_datadir}/icons/crystalsvg/*/apps/xapp.png
-%{tde_datadir}/icons/crystalsvg/*/apps/xawtv.png
-%{tde_datadir}/icons/crystalsvg/*/apps/kcmopengl.png
-%{tde_datadir}/icons/crystalsvg/*/apps/wmaker_apps.png
-%{tde_datadir}/icons/crystalsvg/*/apps/qtella.png
-%{tde_datadir}/services/searchproviders
-%{tde_datadir}/services/useragentstrings/*.desktop
-%{tde_datadir}/servicetypes/searchprovider.desktop
-%{tde_datadir}/servicetypes/uasprovider.desktop
-%exclude %{tde_datadir}/sounds/pop.wav
-%{tde_datadir}/sounds/
-%{tde_datadir}/wallpapers/*
-
-%if "%{tde_prefix}" != "/usr"
-%{tde_prefix}/etc/xdg/menus/applications-merged/kde-essential.menu
-%{tde_prefix}/etc/xdg/menus/kde-information.menu
-%{tde_prefix}/etc/xdg/menus/kde-screensavers.menu
-%{tde_prefix}/etc/xdg/menus/kde-settings.menu
-%else
-%{_sysconfdir}/xdg/menus/applications-merged/kde-essential.menu
-%{_sysconfdir}/xdg/menus/kde-information.menu
-%{_sysconfdir}/xdg/menus/kde-screensavers.menu
-%{_sysconfdir}/xdg/menus/kde-settings.menu
-%endif
-
-%{tde_tdedocdir}/HTML/en/kcontrol/
-%exclude %{tde_tdedocdir}/HTML/en/kcontrol/kcmkonsole/
-%{tde_tdedocdir}/HTML/en/kinfocenter/
-
-%post data
-for f in crystalsvg ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f}  2> /dev/null || :
-done
-
-%if 0%{?mdkversion}
-# Mandriva-specific: we have to choose a background for current distribution variant (Free, One, Powerpack, ...)
-# First, we read the "product" key in /etc/product.id
-eval $(tr "," ";" </etc/product.id) 2>/dev/null
-# Then, we create a symbolic link to the corresponding background
-if [ -r "/usr/share/mdk/backgrounds/Mandriva-${product:-Free}-1280x1024-1300.jpg" "%{tde_bg}" ]; then
-  %__ln -sf "/usr/share/mdk/backgrounds/Mandriva-${product:-Free}-1280x1024-1300.jpg" "%{tde_bg}"
-fi
-%endif
-
-%postun data
-for f in crystalsvg ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f}  2> /dev/null || :
-done
-
-##########
-
-%package kio-plugins
-Summary:	core I/O slaves for TDE
-Group:		Applications/Utilities
-Requires:	trinity-kdesktop = %{version}-%{release}
-Requires:	cyrus-sasl
-Requires:	psmisc
-%if 0%{?with_hal}
-Requires:	hal >= 0.4.8
-%endif
-%if 0%{?rhel} == 4 || 0%{?suse_version}
-Requires:	cryptsetup
-%else
-Requires:	cryptsetup-luks
-%endif
-
-Obsoletes:	tdebase-kio-plugins < %{version}-%{release}
-Provides:	tdebase-kio-plugins = %{version}-%{release}
-
-%description kio-plugins
-This package includes the base kioslaves. They include, amongst many
-others, file, http, and ftp.
-
-It also includes the media kioslave, which handles removable devices,
-and which works best with hal (and therefore udev) and pmount. Media
-also extends the functionality of many other kioslaves. To use this
-service, please make sure that your user is a member of the plugdev
-group.
-
-%files kio-plugins
-%defattr(-,root,root,-)
-%{tde_bindir}/kio_media_mounthelper
-%{tde_bindir}/ktrash
-%{tde_tdelibdir}/cursorthumbnail.la
-%{tde_tdelibdir}/cursorthumbnail.so
-%{tde_tdelibdir}/djvuthumbnail.la
-%{tde_tdelibdir}/djvuthumbnail.so
-%{tde_tdelibdir}/htmlthumbnail.la
-%{tde_tdelibdir}/htmlthumbnail.so
-%{tde_tdelibdir}/imagethumbnail.la
-%{tde_tdelibdir}/imagethumbnail.so
-%{tde_tdelibdir}/kcm_cgi.la
-%{tde_tdelibdir}/kcm_cgi.so
-%{tde_tdelibdir}/kcm_media.la
-%{tde_tdelibdir}/kcm_media.so
-%{tde_tdelibdir}/kded_homedirnotify.la
-%{tde_tdelibdir}/kded_homedirnotify.so
-%{tde_tdelibdir}/kded_mediamanager.la
-%{tde_tdelibdir}/kded_mediamanager.so
-%{tde_tdelibdir}/kded_medianotifier.la
-%{tde_tdelibdir}/kded_medianotifier.so
-%{tde_tdelibdir}/kded_remotedirnotify.la
-%{tde_tdelibdir}/kded_remotedirnotify.so
-%{tde_tdelibdir}/kded_systemdirnotify.la
-%{tde_tdelibdir}/kded_systemdirnotify.so
-%{tde_tdelibdir}/kfile_media.la
-%{tde_tdelibdir}/kfile_media.so
-%{tde_tdelibdir}/kfile_trash.la
-%{tde_tdelibdir}/kfile_trash.so
-%{tde_tdelibdir}/kio_about.la
-%{tde_tdelibdir}/kio_about.so
-%{tde_tdelibdir}/kio_cgi.la
-%{tde_tdelibdir}/kio_cgi.so
-%{tde_tdelibdir}/kio_filter.la
-%{tde_tdelibdir}/kio_filter.so
-%{tde_tdelibdir}/kio_finger.la
-%{tde_tdelibdir}/kio_finger.so
-%{tde_tdelibdir}/kio_fish.la
-%{tde_tdelibdir}/kio_fish.so
-%{tde_tdelibdir}/kio_floppy.la
-%{tde_tdelibdir}/kio_floppy.so
-%{tde_tdelibdir}/kio_home.la
-%{tde_tdelibdir}/kio_home.so
-%{tde_tdelibdir}/kio_info.la
-%{tde_tdelibdir}/kio_info.so
-%{tde_tdelibdir}/kio_mac.la
-%{tde_tdelibdir}/kio_mac.so
-%{tde_tdelibdir}/kio_man.la
-%{tde_tdelibdir}/kio_man.so
-%{tde_tdelibdir}/kio_media.la
-%{tde_tdelibdir}/kio_media.so
-%{tde_tdelibdir}/kio_nfs.la
-%{tde_tdelibdir}/kio_nfs.so
-%{tde_tdelibdir}/kio_remote.la
-%{tde_tdelibdir}/kio_remote.so
-%{tde_tdelibdir}/kio_settings.la
-%{tde_tdelibdir}/kio_settings.so
-%{tde_tdelibdir}/kio_sftp.la
-%{tde_tdelibdir}/kio_sftp.so
-%{tde_tdelibdir}/kio_smb.la
-%{tde_tdelibdir}/kio_smb.so
-%{tde_tdelibdir}/kio_system.la
-%{tde_tdelibdir}/kio_system.so
-%{tde_tdelibdir}/kio_tar.la
-%{tde_tdelibdir}/kio_tar.so
-%{tde_tdelibdir}/kio_thumbnail.la
-%{tde_tdelibdir}/kio_thumbnail.so
-%{tde_tdelibdir}/kio_trash.la
-%{tde_tdelibdir}/kio_trash.so
-%{tde_tdelibdir}/libkmanpart.la
-%{tde_tdelibdir}/libkmanpart.so
-%{tde_tdelibdir}/textthumbnail.la
-%{tde_tdelibdir}/textthumbnail.so
-%{tde_tdeappdir}/kcmcgi.desktop
-%{tde_datadir}/apps/kio_finger/kio_finger.css
-%{tde_datadir}/apps/kio_finger/kio_finger.pl
-%{tde_datadir}/apps/kio_info/kde-info2html
-%{tde_datadir}/apps/kio_info/kde-info2html.conf
-%{tde_datadir}/apps/kio_man/kio_man.css
-%{tde_datadir}/apps/konqueror/dirtree/remote/smb-network.desktop
-%{tde_datadir}/apps/remoteview/smb-network.desktop
-%{tde_datadir}/apps/systemview/*.desktop
-%{tde_datadir}/config.kcfg/mediamanagersettings.kcfg
-%{tde_datadir}/mimelnk/application/x-smb-server.desktop
-%{tde_datadir}/mimelnk/application/x-smb-workgroup.desktop
-%{tde_datadir}/mimelnk/inode/system_directory.desktop
-%{tde_datadir}/mimelnk/media/*.desktop
-%{tde_datadir}/services/about.protocol
-%{tde_datadir}/services/applications.protocol
-%{tde_datadir}/services/ar.protocol
-%{tde_datadir}/services/bzip.protocol
-%{tde_datadir}/services/bzip2.protocol
-%{tde_datadir}/services/cgi.protocol
-%{tde_datadir}/services/cursorthumbnail.desktop
-%{tde_datadir}/services/djvuthumbnail.desktop
-%{tde_datadir}/services/finger.protocol
-%{tde_datadir}/services/fish.protocol
-%{tde_datadir}/services/floppy.protocol
-%{tde_datadir}/services/gzip.protocol
-%{tde_datadir}/services/home.protocol
-%{tde_datadir}/services/htmlthumbnail.desktop
-%{tde_datadir}/services/imagethumbnail.desktop
-%{tde_datadir}/services/info.protocol
-%{tde_datadir}/services/kded/homedirnotify.desktop
-%{tde_datadir}/services/kded/mediamanager.desktop
-%{tde_datadir}/services/kded/medianotifier.desktop
-%{tde_datadir}/services/kded/remotedirnotify.desktop
-%{tde_datadir}/services/kded/systemdirnotify.desktop
-%{tde_datadir}/services/kfile_media.desktop
-%{tde_datadir}/services/kfile_trash_system.desktop
-%{tde_datadir}/services/kmanpart.desktop
-%{tde_datadir}/services/mac.protocol
-%{tde_datadir}/services/man.protocol
-%{tde_datadir}/services/media.protocol
-%{tde_datadir}/services/nfs.protocol
-%{tde_datadir}/services/nxfish.protocol
-%{tde_datadir}/services/programs.protocol
-%{tde_datadir}/services/remote.protocol
-%{tde_datadir}/services/settings.protocol
-%{tde_datadir}/services/sftp.protocol
-%{tde_datadir}/services/smb.protocol
-%{tde_datadir}/services/system.protocol
-%{tde_datadir}/services/tar.protocol
-%{tde_datadir}/services/textthumbnail.desktop
-%{tde_datadir}/services/thumbnail.protocol
-%{tde_datadir}/services/trash.protocol
-%{tde_datadir}/services/zip.protocol
-%{tde_datadir}/servicetypes/thumbcreator.desktop
-%{tde_datadir}/services/kfile_trash.desktop
-%{tde_tdedocdir}/HTML/en/kioslave/
-%if 0%{?with_exr}
-%{tde_tdelibdir}/exrthumbnail.la
-%{tde_tdelibdir}/exrthumbnail.so
-%{tde_datadir}/services/exrthumbnail.desktop
-%endif
-%if 0%{?with_hal}
-%{tde_tdelibdir}/media_propsdlgplugin.la
-%{tde_tdelibdir}/media_propsdlgplugin.so
-%{tde_datadir}/services/media_propsdlgplugin.desktop
-%endif
-
-%post kio-plugins
-update-desktop-database %{tde_appdir} 2> /dev/null || : 
-
-%postun kio-plugins
-update-desktop-database %{tde_appdir} 2> /dev/null || : 
-
-
-##########
-
-%package -n trinity-kdepasswd
-Summary:	password changer for TDE
-Group:		Applications/Utilities
-
-%description -n trinity-kdepasswd
-This is a simple application which allows users to change their
-system passwords.
-
-%files -n trinity-kdepasswd
-%defattr(-,root,root,-)
-%{tde_bindir}/kdepasswd
-%{tde_tdelibdir}/kcm_useraccount.la
-%{tde_tdelibdir}/kcm_useraccount.so
-%{tde_tdeappdir}/kcm_useraccount.desktop
-%{tde_tdeappdir}/kdepasswd.desktop
-%exclude %{tde_datadir}/apps/[kt]dm/pics/users/default1.png
-%exclude %{tde_datadir}/apps/[kt]dm/pics/users/default2.png
-%exclude %{tde_datadir}/apps/[kt]dm/pics/users/default3.png
-%exclude %{tde_datadir}/apps/[kt]dm/pics/users/root1.png
-%{tde_datadir}/apps/[kt]dm/pics/users/*.png
-%{tde_datadir}/config.kcfg/kcm_useraccount.kcfg
-%{tde_datadir}/config.kcfg/kcm_useraccount_pass.kcfg
-
-%post -n trinity-kdepasswd
-update-desktop-database %{tde_appdir} 2> /dev/null || : 
-
-%postun -n trinity-kdepasswd
-update-desktop-database %{tde_appdir} 2> /dev/null || : 
-
-##########
-
-%package -n trinity-tdeprint
-Summary:	print system for TDE
-Group:		Applications/Utilities
-Requires:	%{name}-data = %{version}-%{release}
-Requires:	psutils
-
-%description -n trinity-tdeprint
-This package contains the TDE printing subsystem. It can use CUPS,
-lpd-ng or the traditional lpd. It also includes support for fax and
-pdf printing.
-
-Installation of smbclient will make you able to use smb shared printers.
-
-%files -n trinity-tdeprint
-%defattr(-,root,root,-)
-%{tde_bindir}/[kt]deprintfax
-%{tde_bindir}/kjobviewer
-%{tde_bindir}/kprinter
-%{tde_tdelibdir}/kcm_printmgr.la
-%{tde_tdelibdir}/kcm_printmgr.so
-%{tde_tdelibdir}/kio_print.la
-%{tde_tdelibdir}/kio_print.so
-%{tde_tdelibdir}/kjobviewer.la
-%{tde_tdelibdir}/kjobviewer.so
-%{tde_tdelibdir}/kprinter.la
-%{tde_tdelibdir}/kprinter.so
-%{tde_tdelibdir}/lib[kt]deprint_part.la
-%{tde_tdelibdir}/lib[kt]deprint_part.so
-%{tde_libdir}/lib[kt]deinit_kjobviewer.la
-%{tde_libdir}/lib[kt]deinit_kjobviewer.so
-%{tde_libdir}/lib[kt]deinit_kprinter.la
-%{tde_libdir}/lib[kt]deinit_kprinter.so
-%{tde_tdeappdir}/[kt]deprintfax.desktop
-%{tde_tdeappdir}/[kt]jobviewer.desktop
-%{tde_tdeappdir}/printers.desktop
-%{tde_datadir}/apps/[kt]deprint/
-%{tde_datadir}/apps/[kt]deprintfax/
-%{tde_datadir}/apps/[kt]jobviewer/
-%{tde_datadir}/apps/[kt]deprint_part/kdeprint_part.rc
-%{tde_datadir}/icons/hicolor/*/apps/kdeprintfax.png
-%{tde_datadir}/icons/hicolor/*/apps/kjobviewer.png
-%{tde_datadir}/icons/hicolor/*/apps/printmgr.png
-%{tde_datadir}/icons/hicolor/scalable/apps/kdeprintfax.svgz
-%{tde_datadir}/icons/hicolor/scalable/apps/kjobviewer.svgz
-%{tde_datadir}/icons/hicolor/scalable/apps/printmgr.svgz
-%{tde_datadir}/mimelnk/print/class.desktop
-%{tde_datadir}/mimelnk/print/driver.desktop
-%{tde_datadir}/mimelnk/print/folder.desktop
-%{tde_datadir}/mimelnk/print/jobs.desktop
-%{tde_datadir}/mimelnk/print/manager.desktop
-%{tde_datadir}/mimelnk/print/printer.desktop
-%{tde_datadir}/mimelnk/print/printermodel.desktop
-%{tde_datadir}/services/kdeprint_part.desktop
-%{tde_datadir}/services/print.protocol
-%{tde_datadir}/services/printdb.protocol
-%{tde_tdedocdir}/HTML/en/[kt]deprint/
-
-%post -n trinity-tdeprint
-/sbin/ldconfig || :
-update-desktop-database %{tde_appdir} 2> /dev/null || : 
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f}  2> /dev/null || :
-done
-
-%postun -n trinity-tdeprint
-/sbin/ldconfig || :
-update-desktop-database %{tde_appdir} 2> /dev/null || : 
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f}  2> /dev/null || :
-done
-
-##########
-
-%package -n trinity-kdesktop
-Summary:	miscellaneous binaries and files for the TDE desktop
-Group:		Applications/Utilities
-Requires:	%{name}-bin = %{version}-%{release}
-Requires:	%{name}-data = %{version}-%{release}
-Requires:	trinity-libkonq = %{version}-%{release}
-Requires:	eject
-%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion}
-Requires:	xdg-utils
-%endif
-
-%description -n trinity-kdesktop
-This package contains miscellaneous binaries and files integral to
-the TDE desktop.
-
-%files -n trinity-kdesktop
-%defattr(-,root,root,-)
-%{tde_datadir}/config/kdesktop_custom_menu1
-%{tde_datadir}/config/kdesktop_custom_menu2
-%{tde_bindir}/kcheckrunning
-%{tde_bindir}/kxdglauncher
-%{tde_bindir}/kdeeject
-%{tde_bindir}/kdesktop
-%{tde_bindir}/kdesktop_lock
-%{tde_bindir}/kwebdesktop
-%{tde_tdelibdir}/kdesktop.la
-%{tde_tdelibdir}/kdesktop.so
-%{tde_libdir}/lib[kt]deinit_kdesktop.la
-%{tde_libdir}/lib[kt]deinit_kdesktop.so
-%{tde_datadir}/apps/kdesktop/
-%{tde_datadir}/apps/konqueror/servicemenus/kdesktopSetAsBackground.desktop
-%{tde_datadir}/autostart/kdesktop.desktop
-%{tde_datadir}/config.kcfg/kdesktop.kcfg
-%{tde_datadir}/config.kcfg/klaunch.kcfg
-%{tde_datadir}/config.kcfg/kwebdesktop.kcfg
-%{tde_datadir}/icons/crystalsvg/*/apps/error.png
-
-%post -n trinity-kdesktop
-/sbin/ldconfig || :
-for f in crystalsvg ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f}  2> /dev/null || :
-done
-
-%postun -n trinity-kdesktop
-/sbin/ldconfig || :
-for f in crystalsvg ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f}  2> /dev/null || :
-done
-
-##########
-
-%package -n trinity-kdesktop-devel
-Summary:	Development files for kdesktop
-Group:		Development/Libraries
-Requires:	trinity-kdesktop = %{version}-%{release}
-
-%description -n trinity-kdesktop-devel
-%{summary}
-
-%files -n trinity-kdesktop-devel
-%{tde_tdeincludedir}/KBackgroundIface.h
-%{tde_tdeincludedir}/KDesktopIface.h
-%{tde_tdeincludedir}/KScreensaverIface.h
-
-##########
-
-%package -n trinity-tdm
-Summary:	X Display manager for TDE
-Group:		Applications/Utilities
-Requires:	%{name}-bin = %{version}-%{release}
-Requires:	%{name}-data = %{version}-%{release}
-Requires:	pam
-
-# Provides the global Xsession script (/etc/X11/xinit/Xsession or /etc/X11/Xsession)
-%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} == 4
-Requires:	xinitrc
-%endif
-%if 0%{?suse_version}
-Requires:	xdm
-%endif
-%if 0%{?rhel} >= 5 || 0%{?fedora}
-Requires:	xorg-x11-xinit
-%endif
-
-# Required for Fedora LiveCD
-%if 0%{?rhel} || 0%{?fedora}
-Provides:	service(graphical-login)
-%endif
-# Required for Mandriva's installer
-%if 0%{?mgaversion} || 0%{?mdkversion}
-Provides:	dm
-%endif
-
-%description -n trinity-tdm
-tdm manages a collection of X servers, which may be on the local host or
-remote machines. It provides services similar to those provided by init,
-getty, and login on character-based terminals: prompting for login name and
-password, authenticating the user, and running a session. tdm supports XDMCP
-(X Display Manager Control Protocol) and can also be used to run a chooser
-process which presents the user with a menu of possible hosts that offer
-XDMCP display management.
-
-A collection of icons to associate with individual users is included with
-TDE, but as part of the kdepasswd package.
-
-The menu package will help to provide TDM with a list of window managers
-that can be launched, if the window manager does not register with TDM
-already. Most users won't need this.
-
-%files -n trinity-tdm
-%defattr(-,root,root,-)
-%{tde_tdelibdir}/kgreet_pam.la
-%{tde_tdelibdir}/kgreet_pam.so
-%{tde_bindir}/gen[kt]dmconf
-%{tde_bindir}/[kt]dm
-%{tde_bindir}/[kt]dm_config
-%{tde_bindir}/[kt]dmctl
-%{tde_bindir}/[kt]dm_greet
-%{tde_bindir}/krootimage
-%{tde_datadir}/apps/[kt]dm/pics/kdelogo.png
-%{tde_datadir}/apps/[kt]dm/pics/kdelogo-crystal.png
-%{tde_datadir}/apps/[kt]dm/pics/shutdown.jpg
-%{tde_datadir}/apps/[kt]dm/pics/users/default1.png
-%{tde_datadir}/apps/[kt]dm/pics/users/default2.png
-%{tde_datadir}/apps/[kt]dm/pics/users/default3.png
-%{tde_datadir}/apps/[kt]dm/pics/users/root1.png
-%{tde_datadir}/apps/[kt]dm/sessions/*.desktop
-%{tde_datadir}/apps/[kt]dm/themes/
-%{tde_datadir}/config/[kt]dm/
-%{tde_tdedocdir}/HTML/en/[kt]dm/
-%if 0%{?suse_version} == 0
-%{_sysconfdir}/pam.d/kdm-trinity
-%{_sysconfdir}/pam.d/kdm-trinity-np
-%endif
-%if 0%{?suse_version}
-/usr/lib/X11/displaymanagers/tdm
-%endif
-
-# Distribution specific stuff
-%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version}
-%{_usr}/share/xsessions/tde.desktop
-%endif
-
-# https://wiki.mageia.org/en/How_to_add_a_new_Window_Manager_or_Display_Manager
-%if 0%{?mgaversion} || 0%{?mdkversion}
-%{_sysconfdir}/X11/wmsession.d/45TDE
-%{_datadir}/X11/dm.d/45TDE.conf
-
-%post -n trinity-tdm
-%make_session
-
-%postun -n trinity-tdm
-%make_session
-%endif
-
-##########
-
-%package -n trinity-tdm-devel
-Summary:	Development files for tdm
-Group:		Development/Libraries
-Requires:	trinity-tdm = %{version}-%{release}
-
-%description -n trinity-tdm-devel
-%{summary}
-
-%files -n trinity-tdm-devel
-%{tde_tdeincludedir}/kgreeterplugin.h
-
-##########
-
-%package -n trinity-kfind
-Summary:	file-find utility for TDE
-Group:		Applications/Utilities
-Requires:	%{name}-data = %{version}-%{release}
-
-%description -n trinity-kfind
-kfind can be used to find files and directories on your
-workstations.
-
-%files -n trinity-kfind
-%defattr(-,root,root,-)
-%{tde_bindir}/kfind
-%{tde_tdelibdir}/libkfindpart.la
-%{tde_tdelibdir}/libkfindpart.so
-%{tde_tdeappdir}/Kfind.desktop
-%{tde_datadir}/apps/kfindpart/
-%{tde_datadir}/icons/hicolor/*/apps/kfind.png
-%{tde_datadir}/services/kfindpart.desktop
-%{tde_datadir}/servicetypes/findpart.desktop
-%{tde_tdedocdir}/HTML/en/kfind/
-
-%post -n trinity-kfind
-update-desktop-database %{tde_appdir} 2> /dev/null || : 
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f}  2> /dev/null || :
-done
-
-%postun -n trinity-kfind
-update-desktop-database %{tde_appdir} 2> /dev/null || : 
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f}  2> /dev/null || :
-done
-
-##########
-
-%package -n trinity-khelpcenter
-Summary:	help center for TDE
-Group:		Applications/Utilities
-Requires:	%{name}-data = %{version}-%{release}
-Requires:	htdig
-
-%description -n trinity-khelpcenter
-The TDE Help Center provides documentation on how to use the KDE desktop.
-
-The htdig package is needed to build a searchable archive of TDE
-documentation.
-
-%files -n trinity-khelpcenter
-%defattr(-,root,root,-)
-%{tde_bindir}/khc_beagle_index.pl
-%{tde_bindir}/khc_beagle_search.pl
-%{tde_bindir}/khc_docbookdig.pl
-%{tde_bindir}/khc_htdig.pl
-%{tde_bindir}/khc_htsearch.pl
-%{tde_bindir}/khc_indexbuilder
-%{tde_bindir}/khc_mansearch.pl
-%{tde_bindir}/khelpcenter
-%{tde_tdelibdir}/khelpcenter.la
-%{tde_tdelibdir}/khelpcenter.so
-%{tde_libdir}/lib[kt]deinit_khelpcenter.la
-%{tde_libdir}/lib[kt]deinit_khelpcenter.so
-%{tde_tdeappdir}/Help.desktop
-%{tde_datadir}/apps/khelpcenter/
-%{tde_datadir}/config.kcfg/khelpcenter.kcfg
-%{tde_datadir}/icons/hicolor/*/apps/khelpcenter.*
-%{tde_datadir}/services/khelpcenter.desktop
-%{tde_tdedocdir}/HTML/en/khelpcenter/
-
-%post -n trinity-khelpcenter
-update-desktop-database %{tde_appdir} 2> /dev/null || : 
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f}  2> /dev/null || :
-done
-/sbin/ldconfig || :
-
-%postun -n trinity-khelpcenter
-update-desktop-database %{tde_appdir} 2> /dev/null || : 
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f}  2> /dev/null || :
-done
-/sbin/ldconfig || :
-
-##########
-
-%package -n trinity-kicker
-Summary:	desktop panel for TDE
-Group:		Applications/Utilities
-Requires:	%{name}-data = %{version}-%{release}
-
-%description -n trinity-kicker
-Kicker provides the TDE panel on you desktop. It can be used as a
-program launcher and can load plugins to provide additional
-functionality.
-
-%files -n trinity-kicker
-%defattr(-,root,root,-)
-%{tde_bindir}/appletproxy
-%{tde_bindir}/extensionproxy
-%{tde_bindir}/kasbar
-%{tde_bindir}/kicker
-%{tde_libdir}/kconf_update_bin/kicker-3.4-reverseLayout
-%{tde_tdelibdir}/appletproxy.la
-%{tde_tdelibdir}/appletproxy.so
-%{tde_tdelibdir}/clock_panelapplet.la
-%{tde_tdelibdir}/clock_panelapplet.so
-%{tde_tdelibdir}/dockbar_panelextension.la
-%{tde_tdelibdir}/dockbar_panelextension.so
-%{tde_tdelibdir}/extensionproxy.la
-%{tde_tdelibdir}/extensionproxy.so
-%{tde_tdelibdir}/kasbar_panelextension.la
-%{tde_tdelibdir}/kasbar_panelextension.so
-%{tde_tdelibdir}/kicker.la
-%{tde_tdelibdir}/kickermenu_find.la
-%{tde_tdelibdir}/kickermenu_find.so
-%{tde_tdelibdir}/kickermenu_kate.so
-%{tde_tdelibdir}/kickermenu_kate.la
-%{tde_tdelibdir}/kickermenu_[kt]deprint.la
-%{tde_tdelibdir}/kickermenu_[kt]deprint.so
-%{tde_tdelibdir}/kickermenu_konqueror.la
-%{tde_tdelibdir}/kickermenu_konqueror.so
-%{tde_tdelibdir}/kickermenu_konsole.la
-%{tde_tdelibdir}/kickermenu_konsole.so
-%{tde_tdelibdir}/kickermenu_prefmenu.la
-%{tde_tdelibdir}/kickermenu_prefmenu.so
-%{tde_tdelibdir}/kickermenu_recentdocs.la
-%{tde_tdelibdir}/kickermenu_recentdocs.so
-%{tde_tdelibdir}/kickermenu_remotemenu.la
-%{tde_tdelibdir}/kickermenu_remotemenu.so
-%{tde_tdelibdir}/kickermenu_systemmenu.la
-%{tde_tdelibdir}/kickermenu_systemmenu.so
-%{tde_tdelibdir}/kicker.so
-%{tde_tdelibdir}/launcher_panelapplet.la
-%{tde_tdelibdir}/launcher_panelapplet.so
-%{tde_tdelibdir}/lockout_panelapplet.la
-%{tde_tdelibdir}/lockout_panelapplet.so
-%{tde_tdelibdir}/media_panelapplet.la
-%{tde_tdelibdir}/media_panelapplet.so
-%{tde_tdelibdir}/menu_panelapplet.la
-%{tde_tdelibdir}/menu_panelapplet.so
-%{tde_tdelibdir}/minipager_panelapplet.la
-%{tde_tdelibdir}/minipager_panelapplet.so
-%{tde_tdelibdir}/naughty_panelapplet.la
-%{tde_tdelibdir}/naughty_panelapplet.so
-%{tde_tdelibdir}/run_panelapplet.la
-%{tde_tdelibdir}/run_panelapplet.so
-%{tde_tdelibdir}/sidebar_panelextension.la
-%{tde_tdelibdir}/sidebar_panelextension.so
-%{tde_tdelibdir}/systemtray_panelapplet.la
-%{tde_tdelibdir}/systemtray_panelapplet.so
-%{tde_tdelibdir}/taskbar_panelapplet.la
-%{tde_tdelibdir}/taskbar_panelapplet.so
-%{tde_tdelibdir}/taskbar_panelextension.la
-%{tde_tdelibdir}/taskbar_panelextension.so
-%{tde_tdelibdir}/trash_panelapplet.la
-%{tde_tdelibdir}/trash_panelapplet.so
-%{tde_libdir}/libkasbar.so.*
-%{tde_libdir}/lib[kt]deinit_appletproxy.la
-%{tde_libdir}/lib[kt]deinit_appletproxy.so
-%{tde_libdir}/lib[kt]deinit_extensionproxy.la
-%{tde_libdir}/lib[kt]deinit_extensionproxy.so
-%{tde_libdir}/lib[kt]deinit_kicker.la
-%{tde_libdir}/lib[kt]deinit_kicker.so
-%{tde_libdir}/libkickermain.so.*
-%{tde_libdir}/libtaskbar.so.*
-%{tde_libdir}/libtaskmanager.so.*
-%{tde_libdir}/libkickoffsearch_interfaces.so.*
-%{tde_tdeappdir}/kcmkicker.desktop
-%{tde_datadir}/applnk/.hidden/kicker_config_arrangement.desktop
-%{tde_datadir}/applnk/.hidden/kicker_config_hiding.desktop
-%{tde_datadir}/applnk/.hidden/kicker_config_menus.desktop
-%{tde_datadir}/apps/clockapplet/pics/lcd.png
-%{tde_datadir}/apps/kconf_update/kicker-3.1-properSizeSetting.pl
-%{tde_datadir}/apps/kconf_update/kicker-3.5-kconfigXTize.pl
-%{tde_datadir}/apps/kconf_update/kicker-3.5-taskbarEnums.pl
-%{tde_datadir}/apps/kconf_update/kickerrc.upd
-%{tde_datadir}/apps/kicker/
-%exclude %{tde_datadir}/apps/kicker/applets/klipper.desktop
-%exclude %{tde_datadir}/apps/kicker/applets/ksysguardapplet.desktop
-%{tde_datadir}/apps/naughtyapplet/pics/naughty-happy.png
-%{tde_datadir}/apps/naughtyapplet/pics/naughty-sad.png
-%{tde_datadir}/autostart/panel.desktop
-%{tde_datadir}/config.kcfg/kickerSettings.kcfg
-%{tde_datadir}/config.kcfg/launcherapplet.kcfg
-%{tde_datadir}/config.kcfg/pagersettings.kcfg
-%{tde_datadir}/config.kcfg/taskbar.kcfg
-%{tde_datadir}/icons/crystalsvg/*/apps/systemtray.png
-%{tde_datadir}/icons/crystalsvg/*/apps/taskbar.png
-%{tde_datadir}/icons/crystalsvg/*/apps/kbinaryclock.png
-%{tde_datadir}/icons/crystalsvg/*/apps/kdisknav.png
-%{tde_datadir}/icons/crystalsvg/*/apps/kicker.png
-%{tde_datadir}/icons/crystalsvg/*/apps/panel.png
-%{tde_datadir}/icons/crystalsvg/*/apps/runprocesscatcher.png
-%{tde_datadir}/icons/crystalsvg/*/apps/window_list.png
-%{tde_datadir}/icons/crystalsvg/*/apps/kbinaryclock.svgz
-%{tde_datadir}/icons/crystalsvg/*/apps/systemtray.svgz
-%{tde_datadir}/servicetypes/kickoffsearchplugin.desktop
-%{tde_tdedocdir}/HTML/en/kicker/
-
-%post -n trinity-kicker
-update-desktop-database %{tde_appdir} 2> /dev/null || : 
-for f in crystalsvg ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f}  2> /dev/null || :
-done
-/sbin/ldconfig || :
-
-%postun -n trinity-kicker
-update-desktop-database %{tde_appdir} 2> /dev/null || : 
-for f in crystalsvg ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f}  2> /dev/null || :
-done
-/sbin/ldconfig || :
-
-##########
-
-%package -n trinity-kicker-devel
-Summary:	Development files for kicker
-Group:		Development/Libraries
-Requires:	trinity-kicker = %{version}-%{release}
-
-%description -n trinity-kicker-devel
-%{summary}
-
-%files -n trinity-kicker-devel
-%{tde_tdeincludedir}/kickoff-search-plugin.h
-%{tde_tdeincludedir}/kickoffsearchinterface.h
-%{tde_libdir}/libkasbar.la
-%{tde_libdir}/libkasbar.so
-%{tde_libdir}/libkickermain.la
-%{tde_libdir}/libkickermain.so
-%{tde_libdir}/libkickoffsearch_interfaces.la
-%{tde_libdir}/libkickoffsearch_interfaces.so
-%{tde_libdir}/libtaskbar.la
-%{tde_libdir}/libtaskbar.so
-%{tde_libdir}/libtaskmanager.la
-%{tde_libdir}/libtaskmanager.so
-
-%post -n trinity-kicker-devel
-/sbin/ldconfig || :
-
-%postun -n trinity-kicker-devel
-/sbin/ldconfig || :
-
-##########
-
-%package -n trinity-klipper
-Summary:	clipboard utility for Trinity
-Group:		Applications/Utilities
-Requires:	%{name}-data = %{version}-%{release}
-
-%description -n trinity-klipper
-klipper provides standard clipboard functions (cut and paste, history
-saving) plus additional features, like the ability to offer actions to 
-take dependent on the clipboard contents. For example, it can launch a 
-web browser if the clipboard contains a URL.
-
-%files -n trinity-klipper
-%defattr(-,root,root,-)
-%{tde_bindir}/klipper
-%{tde_datadir}/config/klipperrc
-%{tde_tdelibdir}/klipper.la
-%{tde_tdelibdir}/klipper.so
-%{tde_tdelibdir}/klipper_panelapplet.la
-%{tde_tdelibdir}/klipper_panelapplet.so
-%{tde_libdir}/lib[kt]deinit_klipper.la
-%{tde_libdir}/lib[kt]deinit_klipper.so
-%{tde_tdeappdir}/klipper.desktop
-%{tde_datadir}/apps/kconf_update/klipper-1-2.pl
-%{tde_datadir}/apps/kconf_update/klipper-trinity1.sh
-%{tde_datadir}/apps/kconf_update/klipperrc.upd
-%{tde_datadir}/apps/kconf_update/klippershortcuts.upd
-%{tde_datadir}/apps/kicker/applets/klipper.desktop
-%{tde_datadir}/autostart/klipper.desktop
-%{tde_datadir}/icons/hicolor/*/apps/klipper.*
-%{tde_tdedocdir}/HTML/en/klipper/
-
-%post -n trinity-klipper
-update-desktop-database %{tde_appdir} 2> /dev/null || : 
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f}  2> /dev/null || :
-done
-/sbin/ldconfig || :
-
-%postun -n trinity-klipper
-update-desktop-database %{tde_appdir} 2> /dev/null || : 
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f}  2> /dev/null || :
-done
-/sbin/ldconfig || :
-
-##########
-
-%package -n trinity-kmenuedit
-Summary:	menu editor for TDE
-Group:		Applications/Utilities
-Requires:	%{name}-data = %{version}-%{release}
-
-%description -n trinity-kmenuedit
-The TDE menu editor allows you to make customisations to the KDE menu
-structure.
-
-%files -n trinity-kmenuedit
-%defattr(-,root,root,-)
-%{tde_bindir}/kcontroledit
-%{tde_bindir}/kmenuedit
-%{tde_tdelibdir}/kcontroledit.la
-%{tde_tdelibdir}/kcontroledit.so
-%{tde_tdelibdir}/kmenuedit.la
-%{tde_tdelibdir}/kmenuedit.so
-%{tde_libdir}/lib[kt]deinit_kcontroledit.la
-%{tde_libdir}/lib[kt]deinit_kcontroledit.so
-%{tde_libdir}/lib[kt]deinit_kmenuedit.la
-%{tde_libdir}/lib[kt]deinit_kmenuedit.so
-%{tde_tdeappdir}/kmenuedit.desktop
-%{tde_datadir}/applnk/System/kmenuedit.desktop
-%{tde_datadir}/apps/kcontroledit/
-%{tde_datadir}/apps/kmenuedit/
-%{tde_tdedocdir}/HTML/en/kmenuedit/
-
-%post -n trinity-kmenuedit
-update-desktop-database %{tde_appdir} 2> /dev/null || : 
-/sbin/ldconfig || :
-
-%postun -n trinity-kmenuedit
-update-desktop-database %{tde_appdir} 2> /dev/null || : 
-/sbin/ldconfig || :
-
-##########
-
-%package -n trinity-konqueror
-Summary:	TDE's advanced file manager, web browser and document viewer
-Group:		Applications/Utilities
-Requires:	%{name}-data = %{version}-%{release}
-Requires:	trinity-kcontrol = %{version}-%{release}
-Requires:	%{name}-kio-plugins = %{version}-%{release}
-Requires:	trinity-kdesktop = %{version}-%{release}
-Requires:	trinity-kfind = %{version}-%{release}
-Requires:	trinity-libkonq = %{version}-%{release}
-
-%description -n trinity-konqueror
-Konqueror is the file manager for the Trinity Desktop Environment.
-It supports basic file management on local UNIX filesystems,
-from simple cut/copy and paste operations to advanced remote
-and local network file browsing.
-
-It is also the canvas for all the latest TDE technology,
-from KIO slaves (which provide mechanisms for file access) to
-component embedding via the KParts object interface, and it
-is one of the most customizable applications available.
-
-Konqueror is an Open Source web browser with HTML4.0 compliance,
-supporting Java applets, JavaScript, CSS1 and (partially) CSS2,
-as well as Netscape plugins (for example, Flash or RealVideo plugins).
-
-It is a universal viewing application, capable of embedding
-read-only viewing components in itself to view documents without
-ever launching another application.
-
-%files -n trinity-konqueror
-%defattr(-,root,root,-)
-%{tde_datadir}/config/konqsidebartng.rc
-%{tde_bindir}/kbookmarkmerger
-%{tde_bindir}/keditbookmarks
-%{tde_bindir}/kfmclient
-%{tde_bindir}/konqueror
-%{tde_tdelibdir}/kcm_history.la
-%{tde_tdelibdir}/kcm_history.so
-%{tde_tdelibdir}/kded_konqy_preloader.la
-%{tde_tdelibdir}/kded_konqy_preloader.so
-%{tde_tdelibdir}/keditbookmarks.la
-%{tde_tdelibdir}/keditbookmarks.so
-%{tde_tdelibdir}/kfmclient.la
-%{tde_tdelibdir}/kfmclient.so
-%{tde_tdelibdir}/konq_aboutpage.la
-%{tde_tdelibdir}/konq_aboutpage.so
-%{tde_tdelibdir}/konq_iconview.la
-%{tde_tdelibdir}/konq_iconview.so
-%{tde_tdelibdir}/konq_listview.la
-%{tde_tdelibdir}/konq_listview.so
-%{tde_tdelibdir}/konq_remoteencoding.la
-%{tde_tdelibdir}/konq_remoteencoding.so
-%{tde_tdelibdir}/konq_shellcmdplugin.la
-%{tde_tdelibdir}/konq_shellcmdplugin.so
-%{tde_tdelibdir}/konq_sidebar.la
-%{tde_tdelibdir}/konq_sidebar.so
-%{tde_tdelibdir}/konq_sidebartree_bookmarks.la
-%{tde_tdelibdir}/konq_sidebartree_bookmarks.so
-%{tde_tdelibdir}/konq_sidebartree_dirtree.la
-%{tde_tdelibdir}/konq_sidebartree_dirtree.so
-%{tde_tdelibdir}/konq_sidebartree_history.la
-%{tde_tdelibdir}/konq_sidebartree_history.so
-%{tde_tdelibdir}/konqsidebar_tree.la
-%{tde_tdelibdir}/konqsidebar_tree.so
-%{tde_tdelibdir}/konqsidebar_web.la
-%{tde_tdelibdir}/konqsidebar_web.so
-%{tde_tdelibdir}/konqueror.la
-%{tde_tdelibdir}/konqueror.so
-%{tde_tdelibdir}/libkhtmlkttsdplugin.la
-%{tde_tdelibdir}/libkhtmlkttsdplugin.so
-%{tde_libdir}/lib[kt]deinit_keditbookmarks.la
-%{tde_libdir}/lib[kt]deinit_keditbookmarks.so
-%{tde_libdir}/lib[kt]deinit_kfmclient.la
-%{tde_libdir}/lib[kt]deinit_kfmclient.so
-%{tde_libdir}/lib[kt]deinit_konqueror.la
-%{tde_libdir}/lib[kt]deinit_konqueror.so
-%{tde_libdir}/libkonqsidebarplugin.so.*
-%{tde_tdeappdir}/Home.desktop
-%{tde_tdeappdir}/kcmhistory.desktop
-%{tde_tdeappdir}/kfmclient.desktop
-%{tde_tdeappdir}/kfmclient_dir.desktop
-%{tde_tdeappdir}/kfmclient_html.desktop
-%{tde_tdeappdir}/kfmclient_war.desktop
-%{tde_tdeappdir}/khtml_filter.desktop
-%{tde_tdeappdir}/konqbrowser.desktop
-%{tde_tdeappdir}/konquerorsu.desktop
-%{tde_datadir}/applnk/.hidden/konqfilemgr.desktop
-%{tde_datadir}/applnk/Internet/keditbookmarks.desktop
-%{tde_datadir}/applnk/konqueror.desktop
-%{tde_datadir}/apps/kconf_update/kfmclient_3_2.upd
-%{tde_datadir}/apps/kconf_update/kfmclient_3_2_update.sh
-%{tde_datadir}/apps/kconf_update/konqsidebartng.upd
-%{tde_datadir}/apps/kconf_update/move_konqsidebartng_entries.sh
-%{tde_datadir}/apps/keditbookmarks/keditbookmarks-genui.rc
-%{tde_datadir}/apps/keditbookmarks/keditbookmarksui.rc
-%{tde_datadir}/apps/khtml/kpartplugins/khtmlkttsd.desktop
-%{tde_datadir}/apps/khtml/kpartplugins/khtmlkttsd.rc
-%{tde_datadir}/apps/konqiconview/
-%{tde_datadir}/apps/konqlistview/
-%exclude %{tde_datadir}/apps/konqsidebartng/virtual_folders/services/fonts.desktop
-%{tde_datadir}/apps/konqsidebartng/
-%{tde_datadir}/apps/konqueror/about/
-%{tde_datadir}/apps/konqueror/icons/
-%{tde_datadir}/apps/konqueror/konq-simplebrowser.rc
-%{tde_datadir}/apps/konqueror/konqueror.rc
-%{tde_datadir}/apps/konqueror/pics/indicator_connect.png
-%{tde_datadir}/apps/konqueror/pics/indicator_empty.png
-%{tde_datadir}/apps/konqueror/pics/indicator_noconnect.png
-%{tde_datadir}/apps/konqueror/pics/indicator_viewactive.png
-%{tde_datadir}/apps/konqueror/profiles/
-%exclude %{tde_datadir}/apps/konqueror/servicemenus/kdesktopSetAsBackground.desktop
-%exclude %{tde_datadir}/apps/konqueror/servicemenus/konsolehere.desktop
-%exclude %{tde_datadir}/apps/konqueror/servicemenus/installfont.desktop
-%{tde_datadir}/apps/konqueror/servicemenus/*.desktop
-%{tde_datadir}/apps/konqueror/servicemenus/media_safelyremove.desktop_tdebase
-%{tde_datadir}/apps/konqueror/tiles/*.png
-%{tde_datadir}/autostart/konqy_preload.desktop
-%{tde_datadir}/config.kcfg/keditbookmarks.kcfg
-%{tde_datadir}/config.kcfg/konq_listview.kcfg
-%{tde_datadir}/config.kcfg/konqueror.kcfg
-%{tde_datadir}/icons/crystalsvg/*/apps/keditbookmarks.png
-%{tde_datadir}/icons/crystalsvg/*/apps/kfm_home.svgz
-%{tde_datadir}/icons/hicolor/*/apps/kfm.png
-%{tde_datadir}/icons/hicolor/*/apps/konqueror.*
-%{tde_datadir}/services/kded/konqy_preloader.desktop
-%{tde_datadir}/services/konq_*.desktop
-%{tde_datadir}/servicetypes/konqaboutpage.desktop
-%{tde_tdedocdir}/HTML/en/konqueror/
-
-%post -n trinity-konqueror
-update-desktop-database %{tde_appdir} 2> /dev/null || : 
-for f in crystalsvg hicolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f}  2> /dev/null || :
-done
-/sbin/ldconfig || :
-%if 0%{?suse_version}
-update-alternatives --install \
-%else
-alternatives --install \
-%endif
-  %{tde_datadir}/apps/konqueror/servicemenus/media_safelyremove.desktop \
-  media_safelyremove.desktop_konqueror \
-  %{tde_datadir}/apps/konqueror/servicemenus/media_safelyremove.desktop_tdebase \
-  10 || :
-
-%postun -n trinity-konqueror
-update-desktop-database %{tde_appdir} 2> /dev/null || : 
-for f in crystalsvg hicolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f}  2> /dev/null || :
-done
-/sbin/ldconfig || :
-
-%preun -n trinity-konqueror
-if [ $1 -eq 0 ]; then
-%if 0%{?suse_version}
-  update-alternatives --remove \
-%else
-  alternatives --remove \
-%endif
-    media_safelyremove.desktop_konqueror \
-    %{tde_datadir}/apps/konqueror/servicemenus/media_safelyremove.desktop_tdebase || :
-fi
-
-##########
-
-%package -n trinity-konqueror-devel
-Summary:	Development files for konqueror
-Group:		Development/Libraries
-Requires:	trinity-konqueror = %{version}-%{release}
-
-%description -n trinity-konqueror-devel
-%{summary}
-
-%files -n trinity-konqueror-devel
-%{tde_tdeincludedir}/konqsidebarplugin.h
-%{tde_tdeincludedir}/KonquerorIface.h
-%{tde_libdir}/libkonqsidebarplugin.la
-%{tde_libdir}/libkonqsidebarplugin.so
-
-%post -n trinity-konqueror-devel
-/sbin/ldconfig || :
-
-%postun -n trinity-konqueror-devel
-/sbin/ldconfig || :
-
-##########
-
-%package -n trinity-konqueror-nsplugins
-Summary:	Netscape plugin support for Konqueror
-Group:		Applications/Utilities
-Requires:	trinity-konqueror = %{version}-%{release}
-
-%description -n trinity-konqueror-nsplugins
-This package includes support for Netscape plugins in Konqueror.
-
-%files -n trinity-konqueror-nsplugins
-%defattr(-,root,root,-)
-%{tde_bindir}/nspluginscan
-%{tde_bindir}/nspluginviewer
-%{tde_tdelibdir}/kcm_nsplugins.la
-%{tde_tdelibdir}/kcm_nsplugins.so
-%{tde_tdelibdir}/libnsplugin.la
-%{tde_tdelibdir}/libnsplugin.so
-%{tde_tdeappdir}/khtml_plugins.desktop
-%{tde_datadir}/apps/plugin/nspluginpart.rc
-
-%post -n trinity-konqueror-nsplugins
-update-desktop-database %{tde_appdir} 2> /dev/null || : 
-
-%postun -n trinity-konqueror-nsplugins
-update-desktop-database %{tde_appdir} 2> /dev/null || : 
-
-##########
-
-%package -n trinity-konsole
-Summary:	X terminal emulator for TDE
-Group:		Applications/Utilities
-Requires:	%{name}-data = %{version}-%{release}
-
-%description -n trinity-konsole
-Konsole is an X terminal emulation which provides a command-line interface
-(CLI) while using the graphical K Desktop Environment. Konsole helps to
-better organize user's desktop by containing multiple sessions in a single
-window (a less cluttered desktop).
-
-Its advanced features include a simple configuration and the ability to use
-multiple terminal shells in a single window
-
-Using Konsole, a user can open:
-* Linux console sessions
-* Midnight Commander file manager sessions
-* Shell sessions
-* Root consoles sessions
-
-%files -n trinity-konsole
-%defattr(-,root,root,-)
-%{tde_bindir}/konsole
-%{tde_tdelibdir}/kcm_konsole.la
-%{tde_tdelibdir}/kcm_konsole.so
-%{tde_tdelibdir}/kded_kwrited.la
-%{tde_tdelibdir}/kded_kwrited.so
-%{tde_tdelibdir}/konsole.la
-%{tde_tdelibdir}/konsole.so
-%{tde_tdelibdir}/libkonsolepart.la
-%{tde_tdelibdir}/libkonsolepart.so
-%{tde_libdir}/lib[kt]deinit_konsole.la
-%{tde_libdir}/lib[kt]deinit_konsole.so
-%{tde_tdeappdir}/konsole.desktop
-%{tde_tdeappdir}/konsolesu.desktop
-%{tde_datadir}/applnk/.hidden/kcmkonsole.desktop
-%{tde_datadir}/apps/kconf_update/konsole.upd
-%{tde_datadir}/apps/kconf_update/schemaStrip.pl
-%{tde_datadir}/apps/konqueror/servicemenus/konsolehere.desktop
-%{tde_datadir}/apps/konsole/
-%{tde_datadir}/icons/hicolor/*/apps/konsole.*
-%{tde_datadir}/mimelnk/application/x-konsole.desktop
-%{tde_datadir}/services/kded/kwrited.desktop
-%{tde_datadir}/services/konsolepart.desktop
-%{tde_datadir}/services/konsole-script.desktop
-%{tde_datadir}/services/kwrited.desktop
-%{tde_datadir}/servicetypes/terminalemulator.desktop
-%{tde_tdedocdir}/HTML/en/konsole/
-%{tde_tdedocdir}/HTML/en/kcontrol/kcmkonsole/
-
-%post -n trinity-konsole
-update-desktop-database %{tde_appdir} 2> /dev/null || : 
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f}  2> /dev/null || :
-done
-/sbin/ldconfig || :
-
-%postun -n trinity-konsole
-update-desktop-database %{tde_appdir} 2> /dev/null || : 
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f}  2> /dev/null || :
-done
-/sbin/ldconfig || :
-
-##########
-
-%package -n trinity-kpager
-Summary:	desktop pager for TDE
-Group:		Applications/Utilities
-Requires:	%{name}-data = %{version}-%{release}
-
-%description -n trinity-kpager
-This package contains TDE's desktop pager, which displays your virtual
-desktops iconically in a window, along with icons of any running
-applications. It is used to switch between applications or desktops.
-
-%files -n trinity-kpager
-%defattr(-,root,root,-)
-%{tde_bindir}/kpager
-%{tde_tdeappdir}/kpager.desktop
-%{tde_datadir}/applnk/Utilities/kpager.desktop
-%{tde_datadir}/icons/hicolor/*/apps/kpager.png
-%{tde_tdedocdir}/HTML/en/kpager/
-
-%post -n trinity-kpager
-update-desktop-database %{tde_appdir} 2> /dev/null || : 
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f}  2> /dev/null || :
-done
-
-%postun -n trinity-kpager
-update-desktop-database %{tde_appdir} 2> /dev/null || : 
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f}  2> /dev/null || :
-done
-
-##########
-
-%package -n trinity-kpersonalizer
-Summary:	installation personalizer for TDE
-Group:		Applications/Utilities
-Requires:	%{name}-data = %{version}-%{release}
-
-%description -n trinity-kpersonalizer
-TDE Personalizer is the application that configures the TDE desktop for you.
-It's a very useful wizard that allows you to quickly change the TDE desktop to
-suit your own needs. When you run TDE for the first time, KPersonalizer is
-automatically started. KPersonalizer can also be called later.
-
-%files -n trinity-kpersonalizer
-%defattr(-,root,root,-)
-%{tde_bindir}/kpersonalizer
-%{tde_tdeappdir}/kpersonalizer.desktop
-%{tde_datadir}/applnk/System/kpersonalizer.desktop
-%{tde_datadir}/apps/kpersonalizer/
-%{tde_datadir}/icons/crystalsvg/*/apps/kpersonalizer.png
-
-%post -n trinity-kpersonalizer
-update-desktop-database %{tde_appdir} 2> /dev/null || : 
-for f in crystalsvg ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f}  2> /dev/null || :
-done
-
-%postun -n trinity-kpersonalizer
-update-desktop-database %{tde_appdir} 2> /dev/null || : 
-for f in crystalsvg ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f}  2> /dev/null || :
-done
-
-##########
-
-%package -n trinity-ksmserver
-Summary:	session manager for TDE
-Group:		Applications/Utilities
-Requires:	%{name}-data = %{version}-%{release}
-Requires:	trinity-twin = %{version}-%{release}
-
-%description -n trinity-ksmserver
-This package contains the KDE session manager. It is responsible for
-restoring your TDE session on login. It is also needed to properly
-start a KDE session. It registers KDE with X display managers, and
-provides the 'starttde' command, for starting an X session with KDE
-from the console.
-
-If you are running TDE for the first time for a certain user,
-kpersonalizer is used to help with setup. If it is not present,
-KDE will start, but many good defaults will not be set.
-
-%files -n trinity-ksmserver
-%defattr(-,root,root,-)
-%{tde_bindir}/ksmserver
-%{tde_bindir}/start[kt]de
-%{tde_tdelibdir}/ksmserver.la
-%{tde_tdelibdir}/ksmserver.so
-%{tde_libdir}/lib[kt]deinit_ksmserver.la
-%{tde_libdir}/lib[kt]deinit_ksmserver.so
-%{tde_datadir}/apps/kconf_update/ksmserver.upd
-%{tde_datadir}/apps/kconf_update/move_session_config.sh
-%{tde_datadir}/apps/ksmserver/pics/shutdownkonq.png
-
-# Remove conflicts with redhat-menus
-%if "%{?tde_prefix}" != "/usr"
-%{tde_bindir}/plasma-desktop
-%endif
-
-%post -n trinity-ksmserver
-/sbin/ldconfig || :
-
-%postun -n trinity-ksmserver
-/sbin/ldconfig || :
-
-##########
-
-%package -n trinity-ksplash
-Summary:	the TDE splash screen
-Group:		Applications/Utilities
-Requires:	%{name}-data = %{version}-%{release}
-
-%description -n trinity-ksplash
-This package includes the TDE Splash screen, which is seen when
-a TDE session is launched.
-
-%files -n trinity-ksplash
-%defattr(-,root,root,-)
-%{tde_bindir}/ksplash
-%{tde_bindir}/ksplashsimple
-%{tde_tdelibdir}/kcm_ksplashthemes.la
-%{tde_tdelibdir}/kcm_ksplashthemes.so
-%{tde_tdelibdir}/ksplashdefault.la
-%{tde_tdelibdir}/ksplashdefault.so
-%{tde_tdelibdir}/ksplashunified.la
-%{tde_tdelibdir}/ksplashunified.so
-%{tde_tdelibdir}/ksplashredmond.la
-%{tde_tdelibdir}/ksplashredmond.so
-%{tde_tdelibdir}/ksplashstandard.la
-%{tde_tdelibdir}/ksplashstandard.so
-%{tde_libdir}/libksplashthemes.so.*
-%{tde_tdeappdir}/ksplashthememgr.desktop
-%{tde_datadir}/apps/ksplash
-%{tde_datadir}/services/ksplashdefault.desktop
-%{tde_datadir}/services/ksplash.desktop
-%{tde_datadir}/services/ksplashunified.desktop
-%{tde_datadir}/services/ksplashredmond.desktop
-%{tde_datadir}/services/ksplashstandard.desktop
-%{tde_datadir}/servicetypes/ksplashplugins.desktop
-%{tde_tdedocdir}/HTML/en/ksplashml/
-
-%post -n trinity-ksplash
-update-desktop-database %{tde_appdir} 2> /dev/null || : 
-/sbin/ldconfig || :
-
-%postun -n trinity-ksplash
-update-desktop-database %{tde_appdir} 2> /dev/null || : 
-/sbin/ldconfig || :
-
-##########
-
-%package -n trinity-ksplash-devel
-Summary:	Development files for ksplash
-Group:		Development/Libraries
-Requires:	trinity-ksplash = %{version}-%{release}
-
-%description -n trinity-ksplash-devel
-%{summary}
-
-%files -n trinity-ksplash-devel
-%{tde_tdeincludedir}/ksplash/*
-%{tde_libdir}/libksplashthemes.la
-%{tde_libdir}/libksplashthemes.so
-
-%post -n trinity-ksplash-devel
-/sbin/ldconfig || :
-
-%postun -n trinity-ksplash-devel
-/sbin/ldconfig || :
-
-##########
-
-%package -n trinity-ksysguard
-Summary:	system guard for TDE
-Group:		Applications/Utilities
-Requires:	%{name}-data = %{version}-%{release}
-Requires:	trinity-ksysguardd = %{version}-%{release}
-
-%description -n trinity-ksysguard
-TDE System Guard allows you to monitor various statistics about your
-computer.
-
-%files -n trinity-ksysguard
-%defattr(-,root,root,-)
-%{tde_bindir}/kpm
-%{tde_bindir}/ksysguard
-%{tde_tdelibdir}/sysguard_panelapplet.la
-%{tde_tdelibdir}/sysguard_panelapplet.so
-%{tde_libdir}/libksgrd.so.*
-%{tde_tdeappdir}/ksysguard.desktop
-%{tde_datadir}/apps/kicker/applets/ksysguardapplet.desktop
-%{tde_datadir}/apps/ksysguard/
-%{tde_datadir}/icons/crystalsvg/*/apps/ksysguard.png
-%{tde_datadir}/mimelnk/application/x-ksysguard.desktop
-%{tde_tdedocdir}/HTML/en/ksysguard/
-
-%post -n trinity-ksysguard
-update-desktop-database %{tde_appdir} 2> /dev/null || : 
-for f in crystalsvg ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f}  2> /dev/null || :
-done
-/sbin/ldconfig || :
-
-%postun -n trinity-ksysguard
-update-desktop-database %{tde_appdir} 2> /dev/null || : 
-for f in crystalsvg ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f}  2> /dev/null || :
-done
-/sbin/ldconfig || :
-
-##########
-
-%package -n trinity-ksysguard-devel
-Summary:	Development files for ksysguard
-Group:		Development/Libraries
-Requires:	trinity-ksysguard = %{version}-%{release}
-
-%description -n trinity-ksysguard-devel
-%{summary}
-
-%files -n trinity-ksysguard-devel
-%{tde_tdeincludedir}/ksgrd/*
-%{tde_libdir}/libksgrd.la
-%{tde_libdir}/libksgrd.so
-
-%post -n trinity-ksysguard-devel
-/sbin/ldconfig || :
-
-%postun -n trinity-ksysguard-devel
-/sbin/ldconfig || :
-
-##########
-
-%package -n trinity-ksysguardd
-Summary:	system guard daemon for TDE
-Group:		Applications/Utilities
-Requires:	%{name}-data = %{version}-%{release}
-
-%description -n trinity-ksysguardd
-TDE System Guard Daemon is the daemon part of ksysguard. The daemon can
-be installed on a remote machine to enable ksysguard on another machine
-to monitor it through the daemon running there.
-
-%files -n trinity-ksysguardd
-%defattr(-,root,root,-)
-%{tde_bindir}/ksysguardd
-%config(noreplace) %{_sysconfdir}/ksysguarddrc.tde
-
-%post -n trinity-ksysguardd
-# Dirty hack to install '/etc/ksysguarddrc' alongside with KDE4
-[ -r "%{_sysconfdir}/ksysguarddrc" ] || cp -f "%{_sysconfdir}/ksysguarddrc.tde" "%{_sysconfdir}/ksysguarddrc"
-
-##########
-
-%package -n trinity-ktip
-Summary:	useful tips for TDE
-Group:		Applications/Utilities
-Requires:	%{name}-data = %{version}-%{release}
-
-%description -n trinity-ktip
-ktip provides many useful tips on using KDE when you log in.
-
-%files -n trinity-ktip
-%defattr(-,root,root,-)
-%{tde_bindir}/ktip
-%{tde_tdeappdir}/ktip.desktop
-%{tde_datadir}/applnk/Toys/ktip.desktop
-%{tde_datadir}/apps/kdewizard/pics/wizard_small.png
-%{tde_datadir}/apps/kdewizard/tips/
-%{tde_datadir}/autostart/ktip.desktop
-%{tde_datadir}/icons/hicolor/*/apps/ktip.*
-
-%post -n trinity-ktip
-update-desktop-database %{tde_appdir} 2> /dev/null || : 
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f}  2> /dev/null || :
-done
-
-%postun -n trinity-ktip
-update-desktop-database %{tde_appdir} 2> /dev/null || : 
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f}  2> /dev/null || :
-done
-
-##########
-
-%package -n trinity-twin
-Summary:	the TDE window manager
-Group:		Applications/Utilities
-Requires:	%{name}-data = %{version}-%{release}
-
-%description -n trinity-twin
-This package contains the default X window manager for KDE.
-
-%files -n trinity-twin
-%defattr(-,root,root,-)
-%{tde_bindir}/kompmgr
-%{tde_bindir}/[kt]win
-%{tde_bindir}/[kt]win_killer_helper
-#%{tde_bindir}/[kt]win_resumer_helper
-%{tde_bindir}/[kt]win_rules_dialog
-%{tde_libdir}/kconf_update_bin/[kt]win_update_default_rules
-%{tde_libdir}/kconf_update_bin/[kt]win_update_window_settings
-%{tde_tdelibdir}/kcm_[kt]win*.la
-%{tde_tdelibdir}/kcm_[kt]win*.so
-%{tde_tdelibdir}/[kt]win*.la
-%{tde_tdelibdir}/[kt]win*.so
-%{tde_libdir}/lib[kt]decorations.so.*
-%{tde_libdir}/lib[kt]deinit_[kt]win_rules_dialog.la
-%{tde_libdir}/lib[kt]deinit_[kt]win_rules_dialog.so
-%{tde_libdir}/lib[kt]deinit_[kt]win.la
-%{tde_libdir}/lib[kt]deinit_[kt]win.so
-%{tde_tdeappdir}/showdesktop.desktop
-%{tde_tdeappdir}/[kt]windecoration.desktop
-%{tde_tdeappdir}/[kt]winoptions.desktop
-%{tde_tdeappdir}/[kt]winrules.desktop
-%{tde_datadir}/applnk/.hidden/[kt]winactions.desktop
-%{tde_datadir}/applnk/.hidden/[kt]winadvanced.desktop
-%{tde_datadir}/applnk/.hidden/[kt]winfocus.desktop
-%{tde_datadir}/applnk/.hidden/[kt]winmoving.desktop
-%{tde_datadir}/applnk/.hidden/[kt]wintranslucency.desktop
-%{tde_datadir}/apps/kconf_update/[kt]win3_plugin.pl
-%{tde_datadir}/apps/kconf_update/[kt]win3_plugin.upd
-%{tde_datadir}/apps/kconf_update/[kt]win_focus1.sh
-%{tde_datadir}/apps/kconf_update/[kt]win_focus1.upd
-%{tde_datadir}/apps/kconf_update/[kt]win_focus2.sh
-%{tde_datadir}/apps/kconf_update/[kt]win_focus2.upd
-%{tde_datadir}/apps/kconf_update/[kt]win_fsp_workarounds_1.upd
-%{tde_datadir}/apps/kconf_update/[kt]winiconify.upd
-%{tde_datadir}/apps/kconf_update/[kt]winsticky.upd
-%{tde_datadir}/apps/kconf_update/[kt]win.upd
-%{tde_datadir}/apps/kconf_update/[kt]winupdatewindowsettings.upd
-%{tde_datadir}/apps/kconf_update/pluginlibFix.pl
-%{tde_datadir}/apps/[kt]win/
-%{tde_datadir}/config.kcfg/[kt]win.kcfg
-%{tde_datadir}/icons/crystalsvg/*/apps/[kt]win.png
-%{tde_tdedocdir}/HTML/en/kompmgr/
-
-%post -n trinity-twin
-update-desktop-database %{tde_appdir} 2> /dev/null || : 
-for f in crystalsvg ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f}  2> /dev/null || :
-done
-/sbin/ldconfig || :
-
-%postun -n trinity-twin
-update-desktop-database %{tde_appdir} 2> /dev/null || : 
-for f in crystalsvg ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f}  2> /dev/null || :
-done
-/sbin/ldconfig || :
-
-##########
-
-%package -n trinity-twin-devel
-Summary:	Development files for twin
-Group:		Development/Libraries
-Requires:	trinity-twin = %{version}-%{release}
-
-%description -n trinity-twin-devel
-%{summary}
-
-%files -n trinity-twin-devel
-%{tde_tdeincludedir}/[kt]win/
-%{tde_tdeincludedir}/kcommondecoration.h
-%{tde_tdeincludedir}/kdecoration.h
-%{tde_tdeincludedir}/kdecoration_p.h
-%{tde_tdeincludedir}/kdecoration_plugins_p.h
-%{tde_tdeincludedir}/kdecorationfactory.h
-%{tde_tdeincludedir}/KWinInterface.h
-%{tde_libdir}/libkdecorations.la
-%{tde_libdir}/libkdecorations.so
-
-%post -n trinity-twin-devel
-/sbin/ldconfig || :
-
-%postun -n trinity-twin-devel
-/sbin/ldconfig || :
-
-##########
-
-%package -n trinity-libkonq
-Summary:	core libraries for Konqueror
-Group:		Environment/Libraries
-
-%description -n trinity-libkonq
-These libraries are used by several TDE applications, most notably
-Konqueror and the kdesktop package.
-
-%files -n trinity-libkonq
-%defattr(-,root,root,-)
-%{tde_tdelibdir}/kded_favicons.la
-%{tde_tdelibdir}/kded_favicons.so
-%{tde_tdelibdir}/konq_sound.la
-%{tde_tdelibdir}/konq_sound.so
-%{tde_libdir}/libkonq.so.*
-%{tde_datadir}/apps/kbookmark/directory_bookmarkbar.desktop
-%{tde_datadir}/apps/kconf_update/favicons.upd
-%{tde_datadir}/apps/kconf_update/move_favicons.sh
-%{tde_datadir}/apps/konqueror/pics/arrow_bottomleft.png
-%{tde_datadir}/apps/konqueror/pics/arrow_bottomright.png
-%{tde_datadir}/apps/konqueror/pics/arrow_topleft.png
-%{tde_datadir}/apps/konqueror/pics/arrow_topright.png
-%{tde_datadir}/apps/konqueror/pics/thumbnailfont_7x4.png
-%{tde_datadir}/services/kded/favicons.desktop
-%{tde_datadir}/servicetypes/konqpopupmenuplugin.desktop
-
-%post -n trinity-libkonq
-/sbin/ldconfig || :
-
-%postun -n trinity-libkonq
-/sbin/ldconfig || :
-
-##########
-
-%package libtqt3-integration
-Summary:	Integration library between TQt3 and TDE
-Group:		Environment/Libraries
-
-Obsoletes:	tdebase-libtqt3-integration < %{version}-%{release}
-Provides:	tdebase-libtqt3-integration = %{version}-%{release}
-
-%description libtqt3-integration
-These libraries allow you to use TDE dialogs in native TQt3 applications.
-
-%files libtqt3-integration
-%defattr(-,root,root,-)
-%{tde_tdelibdir}/plugins/integration/libqtkde.la
-%{tde_tdelibdir}/plugins/integration/libqtkde.so
-%{tde_tdelibdir}/plugins/integration/libqtkde.so.*
-%{tde_tdelibdir}/kded_kdeintegration.la
-%{tde_tdelibdir}/kded_kdeintegration.so
-%{tde_datadir}/services/kded/kdeintegration.desktop
-
-##########
-
-%package -n trinity-libkonq-devel
-Summary:	development files for Konqueror's core libraries
-Group:		Development/Libraries
-Requires:	trinity-libkonq = %{version}-%{release}
-
-%description -n trinity-libkonq-devel
-This package contains headers and other development files for the core
-Konqueror libraries.
-
-%files -n trinity-libkonq-devel
-%defattr(-,root,root,-)
-%{tde_tdeincludedir}/kfileivi.h
-%{tde_tdeincludedir}/kivdirectoryoverlay.h
-%{tde_tdeincludedir}/knewmenu.h
-%{tde_tdeincludedir}/konqbookmarkmanager.h
-%{tde_tdeincludedir}/konq_*.h
-%{tde_tdeincludedir}/libkonq_export.h
-%{tde_libdir}/libkonq.la
-%{tde_libdir}/libkonq.so
-
-%post -n trinity-libkonq-devel
-/sbin/ldconfig || :
-
-%postun -n trinity-libkonq-devel
-/sbin/ldconfig || :
-
-##########
-
-%if 0%{?suse_version} || 0%{?pclinuxos}
-%debug_package
-%endif
-
-##########
-
-%prep
-%setup -q -n kdebase-3.5.13.1
-
-%patch1 -p1 -b .icon
-%patch11 -p1 -b .openterminalhere
-%if 0%{?rhel} || 0%{?fedora}
-%patch13 -p1 -b .Xsession
-%endif
-%if 0%{?suse_version}
-%patch14 -p1 -b .Xsession
-%endif
-%patch15 -p1 -b .tdeicon
-%if 0%{?rhel} || 0%{?mgaversion} || 0%{?mdkversion}
-%patch21 -p1 -b .man
-%endif
-%patch30 -p1 -b .xtestsupport
-%patch31 -p1 -b .startkde
-%patch32 -p1 -b .pid
-
-%if 0%{?rhel} == 4
-%patch201 -p1 -b .libdetect
-%patch202 -p1 -b .dbustqt
-%patch203 -p1 -b .consolekit
-%patch204 -p1 -b .composite
-%patch205 -p1 -b .hal04
-%patch206 -p1 -b .rhel4
-%endif
-
-# Applies an optional distro-specific graphical theme
-%if "%{?tde_bg}" != ""
-# KDM Background
-%__sed -i "kdm/kfrontend/genkdmconf.c" \
-	-e 's|"Wallpaper=isadora.png\n"|"Wallpaper=%{tde_bg}\n"|'
-
-# TDE user default background
-%__sed -i "kpersonalizer/keyecandypage.cpp" \
-	-e 's|#define DEFAULT_WALLPAPER "isadora.png"|#define DEFAULT_WALLPAPER "%{tde_bg}"|'
-%__sed -i "startkde" \
-	-e 's|/usr/share/wallpapers/isadora.png.desktop|%{tde_bg}|' \
-	-e 's|Wallpaper=isadora.png|Wallpaper=%{tde_bg}|'
-%endif
-
-# TDE branding: removes KUbuntu references [Bug #617]
-%__sed -i "kcontrol/kdm/kdm-appear.cpp" \
-	-e "s|Welcome to Kubuntu |Welcome to %{tde_aboutlabel} |"
-%__sed -i "konqueror/about/konq_aboutpage.cc" \
-	-e "s|About Kubuntu|About %{tde_aboutlabel}|" \
-	-e "s|help:/kubuntu/|%{tde_aboutpage}|" \
-	-e "s|Kubuntu Documentation|%{tde_aboutlabel} Documentation|"
-%__sed -i "konqueror/about/launch.html" \
-	-e "s|help:/kubuntu/about-kubuntu/index.html|%{tde_aboutpage}|"
-%__sed -i "kdm/config.def" \
-	-e "s|Welcome to Trinity |Welcome to %{tde_aboutlabel} |"
-
-# TDE default directory in 'startkde' script (KDEDIR)
-%__sed -i "startkde" \
-	-e "s|/opt/trinity|%{tde_prefix}|g"
-
-# TDE default start button icon
-%__sed -i "startkde" \
-	-e "s|%%{tde_starticon}|%{tde_starticon}|g"
-
-
-%build
-unset QTDIR || : ; . /etc/profile.d/qt3.sh
-export PATH="%{tde_bindir}:${PATH}"
-export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
-export CMAKE_INCLUDE_PATH="%{tde_includedir}:%{tde_includedir}/tqt"
-export LD_LIBRARY_PATH="%{tde_libdir}"
-
-# Avoids building against KDE3's old stuff, if installed
-export KDEDIR=%{tde_prefix}
-
-# Shitty hack for RHEL4 ...
-if [ -d /usr/X11R6 ]; then
-  export CMAKE_INCLUDE_PATH="${CMAKE_INCLUDE_PATH=}:/usr/X11R6/include:/usr/X11R6/%{_lib}"
-  export CFLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}"
-  export CXXFLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}"
-fi
-
-%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version}
-%__mkdir_p build
-cd build
-%endif
-
-%cmake \
-  -DBIN_INSTALL_DIR=%{tde_bindir} \
-  -DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \
-  -DLIB_INSTALL_DIR=%{tde_libdir} \
-  -DSHARE_INSTALL_PREFIX=%{tde_datadir} \
-  -DCMAKE_SKIP_RPATH="OFF" \
-  -DWITH_SASL=ON \
-  -DWITH_LDAP=ON \
-  -DWITH_SAMBA=ON \
-  %{?with_exr:-DWITH_OPENEXR=ON} \
-  %{?with_hal:-DWITH_HAL=ON} \
-  %{?with_xscreensaver:-DWITH_XSCREENSAVER=ON} \
-%if 0%{?rhel} == 4
-  -DWITH_XTEST=OFF \
-%else
-  -DWITH_XTEST=ON \
-%endif
-  -DWITH_XCURSOR=ON \
-  -DWITH_XFIXES=ON \
-  %{?with_xrandr:-DWITH_XRANDR=ON} \
-  -DWITH_XDAMAGE=ON \
-  -DWITH_XEXT=ON \
-  -DWITH_LIBUSB=ON \
-  -DWITH_LIBRAW1394=ON \
-  -DWITH_PAM=ON \
-  -DWITH_XDMCP=ON \
-  -DWITH_XINERAMA=ON \
-  -DWITH_XCOMPOSITE=ON \
-  -DWITH_XRENDER=ON \
-  -DWITH_ARTS=ON \
-  -DWITH_I8K=ON \
-  -DBUILD_ALL=ON \
-  -DKCHECKPASS_PAM_SERVICE="kcheckpass-trinity" \
-%if 0%{?suse_version}
-  -DKDM_PAM_SERVICE="xdm" \
-  -DKSCREENSAVER_PAM_SERVICE="kcheckpass-trinity" \
-%else
-  -DKDM_PAM_SERVICE="kdm-trinity" \
-  -DKSCREENSAVER_PAM_SERVICE="kscreensaver-trinity" \
-%endif
-  %{!?with_tsak:-DBUILD_TSAK=OFF} \
-  ..
-
-%__make %{?_smp_mflags}
-
-
-%install
-%__rm -rf %{?buildroot}
-%__make install DESTDIR=%{?buildroot} -C build
-
-
-# Under RHEL/Fedora/Suse, static 'xsessions' files go to '/usr/share/xsessions'.
-
-# Adds a GDM/KDM/XDM session called 'TDE'
-%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version}
-%__install -D -m 644 \
-	"%{?buildroot}%{tde_datadir}/apps/kdm/sessions/tde.desktop" \
-	"%{?buildroot}%{_datadir}/xsessions/tde.desktop"
-
-# Force session name to be 'TDE'
-%__sed -i "%{?buildroot}%{_datadir}/xsessions/tde.desktop" \
-	-e "s,^Name=.*,Name=TDE,"
-%endif
-
-# Mageia/Mandriva stores its session file in different folder than RHEL/Fedora
-# Generated files for TDM/KDM4 are in '/usr/share/apps/kdm/sessions'
-%if 0%{?mgaversion} || 0%{?mdkversion}
-%__install -d -m 755 %{?buildroot}%{_sysconfdir}/X11/wmsession.d
-cat <<EOF >"%{?buildroot}%{_sysconfdir}/X11/wmsession.d/45TDE"
-NAME=TDE
-ICON=kde-wmsession.xpm
-DESC=The Trinity Desktop Environment
-EXEC=%{tde_bindir}/startkde
-SCRIPT:
-exec %{tde_bindir}/startkde
-EOF
-
-%__install -d -m 755 %{?buildroot}%{_datadir}/X11/dm.d
-cat <<EOF >"%{?buildroot}%{_datadir}/X11/dm.d/45TDE.conf"
-NAME=TDM
-DESCRIPTION=TDM (Trinity Display Manager)
-PACKAGE=trinity-tdm
-EXEC=%{tde_bindir}/kdm
-FNDSESSION_EXEC="/usr/sbin/chksession -K"
-EOF
-%endif
-
-# Renames '/etc/ksysguarddrc' to avoid conflict with KDE4 'ksysguard'
-%__mv -f \
-	%{?buildroot}%{_sysconfdir}/ksysguarddrc \
-	%{?buildroot}%{_sysconfdir}/ksysguarddrc.tde
-
-# TDE 3.5.12: add script "plasma-desktop" to avoid conflict with KDE4
-%if "%{?tde_prefix}" != "/usr"
-%__install -m 755 "%{SOURCE1}" "%{?buildroot}%{tde_bindir}"
-%endif
-
-# PAM configuration files
-%if 0%{?suse_version}
-%__install -D -m 644 "%{SOURCE4}" "%{?buildroot}%{_sysconfdir}/pam.d/kcheckpass-trinity"
-%else
-%__install -D -m 644 "%{SOURCE2}" "%{?buildroot}%{_sysconfdir}/pam.d/kdm-trinity"
-%__install -D -m 644 "%{SOURCE3}" "%{?buildroot}%{_sysconfdir}/pam.d/kdm-trinity-np"
-%__install -D -m 644 "%{SOURCE4}" "%{?buildroot}%{_sysconfdir}/pam.d/kcheckpass-trinity"
-%__install -D -m 644 "%{SOURCE5}" "%{?buildroot}%{_sysconfdir}/pam.d/kscreensaver-trinity"
-%endif
-
-# KDM configuration for RHEL/Fedora
-%__sed -i "%{?buildroot}%{tde_datadir}/config/kdm/kdmrc" \
-%if 0%{?fedora} >= 16 || 0%{?suse_version} >= 1220
-	-e "s/^#*MinShowUID=.*/MinShowUID=1000/"
-%else
-	-e "s/^#*MinShowUID=.*/MinShowUID=500/"
-%endif
-
-# Moves the XDG configuration files to TDE directory
-%if "%{tde_prefix}" != "/usr"
-%__mkdir_p "%{?buildroot}%{tde_prefix}/etc"
-%__mv -f "%{?buildroot}%{_sysconfdir}/xdg" "%{?buildroot}%{tde_prefix}/etc"
-%endif
-
-# Symlinks 'usb.ids'
-%if 0%{?suse_version} == 0
-%__rm -f "%{?buildroot}%{tde_datadir}/apps/usb.ids"
-%__ln_s -f "/usr/share/hwdata/usb.ids" "%{?buildroot}%{tde_datadir}/apps/usb.ids"
-%endif
-
-# Makes 'media_safelyremove.desktop' an alternative
-%__mv -f %{buildroot}%{tde_datadir}/apps/konqueror/servicemenus/media_safelyremove.desktop %{buildroot}%{tde_datadir}/apps/konqueror/servicemenus/media_safelyremove.desktop_tdebase
-%__ln_s /etc/alternatives/media_safelyremove.desktop_tdebase %{buildroot}%{tde_datadir}/apps/konqueror/servicemenus/media_safelyremove.desktop
-
-# SUSE: creates DM config file, used by '/etc/init.d/xdm'
-#  You must set 'DISPLAYMANAGER=tdm' in '/etc/sysconfig/displaymanager'
-%if 0%{?suse_version}
-%__install -D -m 644 "%{SOURCE6}" "%{?buildroot}/usr/lib/X11/displaymanagers/tdm"
-%__sed -i "%{?buildroot}/usr/lib/X11/displaymanagers/tdm" -e "s|/opt/trinity/bin|%{tde_bindir}|g"
-%endif
-
-%clean
-%__rm -rf %{?buildroot}
-
-
-
-
-%changelog
-* Thu Nov 29 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13.1-2
-- openSUSE: fix TDM detection by XDM scripts
-
-* Mon Sep 24 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13.1-1
-- Initial release for TDE 3.5.13.1
diff --git a/redhat/tdebase/kdebase-3.5.13.2-add_ck_shutdown.patch b/redhat/tdebase/kdebase-3.5.13.2-add_ck_shutdown.patch
deleted file mode 100644
index b862f00ca..000000000
--- a/redhat/tdebase/kdebase-3.5.13.2-add_ck_shutdown.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- trinity-tdebase-3.5.13.2/kdmlib/dmctl.cpp.ORI	2013-02-15 22:22:05.217381830 +0100
-+++ trinity-tdebase-3.5.13.2/kdmlib/dmctl.cpp	2013-02-15 22:52:06.635823349 +0100
-@@ -180,7 +180,12 @@
- 	if (DMType == GDM)
- 		return exec( "QUERY_LOGOUT_ACTION\n", re ) && re.find("HALT") >= 0;
- 
-+#ifdef WITH_CONSOLE_KIT
-+	// Use consolekit to check if we can shutdown the computer
-+	return exec( "dbus-send --system --print-reply --dest=org.freedesktop.ConsoleKit /org/freedesktop/ConsoleKit/Manager org.freedesktop.ConsoleKit.Manager.CanStop\n", re ) && re.find("boolean true") >= 0;
-+#else
-	return exec( "caps\n", re ) && re.find( "\tshutdown" ) >= 0;
-+#endif
- }
- 
- void
diff --git a/redhat/tdebase/kdebase-3.5.13.2-add_disable_composite_option.patch b/redhat/tdebase/kdebase-3.5.13.2-add_disable_composite_option.patch
deleted file mode 100644
index 4dc2e72f1..000000000
--- a/redhat/tdebase/kdebase-3.5.13.2-add_disable_composite_option.patch
+++ /dev/null
@@ -1,81 +0,0 @@
---- kdebase/kdesktop/bgmanager.cc.ORI	2012-09-06 17:20:49.564915154 -0400
-+++ kdebase/kdesktop/bgmanager.cc	2012-09-06 17:21:01.969682348 -0400
-@@ -1013,13 +1013,13 @@
-   slotChangeDesktop(0);
- }
- 
--#ifdef COMPOSITE
- void KBackgroundManager::slotCmBackgroundChanged( bool )
- {
-+#ifdef COMPOSITE
-     m_tPixmap->fill(TQColor(0, 0x0));
-     m_Hash = 0;
-     slotChangeDesktop(0);
--}
- #endif
-+}
- 
- #include "bgmanager.moc"
---- kdebase/kdesktop/main.cc.ORI	2012-09-07 20:33:09.716283507 +0200
-+++ kdebase/kdesktop/main.cc	2012-09-07 20:33:31.683842727 +0200
-@@ -43,7 +43,7 @@
- #include <fcntl.h>
- #include <stdlib.h>
- 
--#if defined(Q_WS_X11) && defined(HAVE_XRENDER) && QT_VERSION >= 0x030300
-+#if defined(WITH_COMPOSITE) && defined(Q_WS_X11) && defined(HAVE_XRENDER) && QT_VERSION >= 0x030300
- #define COMPOSITE
- #endif
- 
---- kdebase/kdesktop/bgmanager.h.ORI	2012-09-07 20:36:28.196299160 +0200
-+++ kdebase/kdesktop/bgmanager.h	2012-09-07 20:36:52.420812591 +0200
-@@ -15,7 +15,7 @@
- 
- #include <KBackgroundIface.h>
- 
--#if defined(Q_WS_X11) && defined(HAVE_XRENDER) && QT_VERSION >= 0x030300
-+#if defined(WITH_COMPOSITE) && defined(Q_WS_X11) && defined(HAVE_XRENDER) && QT_VERSION >= 0x030300
- #define COMPOSITE
- #endif
- 
---- kdebase/kdesktop/kdesktopapp.h.ORI	2012-09-07 20:37:14.677365503 +0200
-+++ kdebase/kdesktop/kdesktopapp.h	2012-09-07 20:37:25.194154223 +0200
-@@ -23,7 +23,7 @@
- #include <config.h>
- #include <kuniqueapplication.h>
- 
--#if defined(Q_WS_X11) && defined(HAVE_XRENDER) && QT_VERSION >= 0x030300
-+#if defined(WITH_COMPOSITE) && defined(Q_WS_X11) && defined(HAVE_XRENDER) && QT_VERSION >= 0x030300
- #define COMPOSITE
- #endif
- 
---- kdebase/konsole/konsole/main.cpp.ORI	2012-09-07 20:37:37.749901966 +0200
-+++ kdebase/konsole/konsole/main.cpp	2012-09-07 20:37:46.683722469 +0200
-@@ -46,7 +46,7 @@
- 
- #include "konsole.h"
- 
--#if defined(Q_WS_X11) && defined(HAVE_XRENDER) && QT_VERSION >= 0x030300
-+#if defined(WITH_COMPOSITE) && defined(Q_WS_X11) && defined(HAVE_XRENDER) && QT_VERSION >= 0x030300
- #define COMPOSITE
- #endif
- 
---- trinity-tdebase-3.5.13.2/CMakeLists.txt.composite	2013-06-16 21:49:33.742313671 +0200
-+++ trinity-tdebase-3.5.13.2/CMakeLists.txt	2013-06-16 21:49:40.485177448 +0200
-@@ -82,6 +82,7 @@
- option( WITH_I8K "Enable Dell laptop support (ksysguard)" ${WITH_ALL_OPTIONS} )
- option( WITH_HAL "Enable HAL support" ${WITH_ALL_OPTIONS} )
- option( WITH_KDESKTOP_LOCK_BACKTRACE "Enable backtrace in kdesktop_lock exception handler" ${WITH_ALL_OPTIONS} )
-+option( WITH_COMPOSITE "Enable COMPOSITE support" OFF )
- 
- 
- ##### user requested modules ####################
---- trinity-tdebase-3.5.13.2/config.h.cmake.composite	2013-06-16 21:50:04.626689570 +0200
-+++ trinity-tdebase-3.5.13.2/config.h.cmake	2013-06-16 21:50:13.094518380 +0200
-@@ -188,3 +188,6 @@
- // Kickoff menu
- #cmakedefine KICKOFF_DIST_CONFIG_SHORTCUT1 "@KICKOFF_DIST_CONFIG_SHORTCUT1@"
- #cmakedefine KICKOFF_DIST_CONFIG_SHORTCUT2 "@KICKOFF_DIST_CONFIG_SHORTCUT2@"
-+
-+// kdesktop, konsole
-+#cmakedefine WITH_COMPOSITE "@WITH_COMPOSITE@"
diff --git a/redhat/tdebase/kdebase-3.5.13.2-build_without_dbustqt.patch b/redhat/tdebase/kdebase-3.5.13.2-build_without_dbustqt.patch
deleted file mode 100644
index bb4b42b0e..000000000
--- a/redhat/tdebase/kdebase-3.5.13.2-build_without_dbustqt.patch
+++ /dev/null
@@ -1,139 +0,0 @@
---- kdebase/kdm/backend/CMakeLists.txt.ORI	2012-09-06 22:11:08.422091268 +0200
-+++ kdebase/kdm/backend/CMakeLists.txt	2012-09-06 22:11:21.280843938 +0200
-@@ -14,11 +14,11 @@
- include_directories(
-   ${CMAKE_CURRENT_BINARY_DIR}
-   ${CMAKE_BINARY_DIR}
--  ${DBUS_TQT_INCLUDE_DIRS}
-+  ${DBUS_INCLUDE_DIRS}
- )
- 
- link_directories(
--  ${DBUS_TQT_LIBRARY_DIRS}
-+  ${DBUS_LIBRARY_DIRS}
- )
- 
- ##### kdm (executable) ##########################
-@@ -43,6 +43,6 @@
-     process.c protodpy.c reset.c resource.c rpcauth.c
-     server.c session.c sessreg.c socket.c streams.c
-     util.c xdmauth.c xdmcp.c
--  LINK X11 ${XAU_LIBRARIES} ${DBUS_TQT_LIBRARIES} ${CRYPT_LIBRARY} ${PAM_LIBRARY} ${XDMCP_LIBRARIES}
-+  LINK X11 ${XAU_LIBRARIES} ${DBUS_LIBRARIES} ${CRYPT_LIBRARY} ${PAM_LIBRARY} ${XDMCP_LIBRARIES}
-   DESTINATION ${BIN_INSTALL_DIR}
- )
---- kdebase/ksmserver/CMakeLists.txt.ORI	2012-09-06 17:22:59.990317001 -0400
-+++ kdebase/ksmserver/CMakeLists.txt	2012-09-06 17:23:16.340989494 -0400
-@@ -19,13 +19,13 @@
-   ${CMAKE_SOURCE_DIR}/kdmlib
-   ${TDE_INCLUDE_DIR}
-   ${TQT_INCLUDE_DIRS}
--  ${DBUS_TQT_INCLUDE_DIRS}
-+  ${DBUS_INCLUDE_DIRS}
-   ${HAL_INCLUDE_DIRS}
- )
- 
- link_directories(
-   ${TQT_LIBRARY_DIRS}
--  ${DBUS_TQT_LIBRARY_DIRS}
-+  ${DBUS_LIBRARY_DIRS}
- )
- 
- 
-@@ -43,5 +43,5 @@
-     main.cpp server.cpp shutdowndlg.cpp startupdlg.cpp
-     legacy.cpp startup.cpp shutdown.cpp client.cpp
-     KSMServerInterface.skel server.skel timed.ui
--  LINK dmctl-static kdeui-shared krsync-shared ${HAL_LIBRARIES} ${DBUS_TQT_LIBRARIES}
-+  LINK dmctl-static kdeui-shared krsync-shared ${HAL_LIBRARIES} ${DBUS_LIBRARIES}
- )
---- kdebase/kioslave/media/mediamanager/CMakeLists.txt.ORI	2012-09-07 23:57:56.858227336 +0200
-+++ kdebase/kioslave/media/mediamanager/CMakeLists.txt	2012-09-07 23:58:54.948097583 +0200
-@@ -20,12 +20,12 @@
-   ${TDE_INCLUDE_DIR}
-   ${TQT_INCLUDE_DIRS}
-   ${HAL_INCLUDE_DIRS}
--  ${DBUS_TQT_INCLUDE_DIRS}
-+  ${DBUS_INCLUDE_DIRS}
- )
- 
- link_directories(
-   ${TQT_LIBRARY_DIRS}
--  ${DBUS_TQT_LIBRARY_DIRS}
-+  ${DBUS_LIBRARY_DIRS}
- )
- 
- 
-@@ -48,7 +48,7 @@
- 
-   tde_add_kpart( ${target} AUTOMOC
-     SOURCES ${${target}_SRCS}
--    LINK mediacommon-static kdeinit_kded-shared ${HAL_LIBRARIES} -lhal-storage ${DBUS_TQT_LIBRARIES}
-+    LINK mediacommon-static kdeinit_kded-shared ${HAL_LIBRARIES} -lhal-storage ${DBUS_LIBRARIES} -ldbus-qt-1
-     DESTINATION ${PLUGIN_INSTALL_DIR}
-   )
- else( )
---- trinity-tdebase-3.5.13.2/ConfigureChecks.cmake.ORI	2013-01-23 23:11:55.903373346 +0100
-+++ trinity-tdebase-3.5.13.2/ConfigureChecks.cmake	2013-01-23 23:12:23.168860363 +0100
-@@ -256,21 +256,3 @@
- endif( )
- 
- 
--# dbus-tqt (kdm, ksmserver, kioslaves(media))
--if( BUILD_KDM OR BUILD_KSMSERVER OR (BUILD_KIOSLAVES AND WITH_HAL) )
--  # check for dbus-tqt
--  pkg_check_modules( DBUS_TQT REQUIRED dbus-tqt )
--  tde_save( CMAKE_REQUIRED_INCLUDES CMAKE_REQUIRED_LIBRARIES )
--  set( CMAKE_REQUIRED_INCLUDES ${DBUS_TQT_INCLUDE_DIRS} ${TQT_INCLUDE_DIRS} ${QT_INCLUDE_DIRS})
--  set( CMAKE_REQUIRED_LIBRARIES ${DBUS_TQT_LDFLAGS} ${TQT_LDFLAGS} ${QT_LDFLAGS} )
--  check_cxx_source_compiles("
--    #include <tqt.h>
--    #include <dbus/connection.h>
--    int main(int, char**) { return 0; } "
--    HAVE_DBUS_QT3_07 )
--  tde_restore( CMAKE_REQUIRED_INCLUDES CMAKE_REQUIRED_LIBRARIES )
--  if( NOT HAVE_DBUS_QT3_07 )
--    tde_message_fatal( "dbus-tqt is required, but was not found on your system" )
--  endif( )
--
--endif( )
---- trinity-tdebase-3.5.13.2/kicker/kicker/ui/CMakeLists.txt.ORI	2013-06-16 22:01:14.879046232 +0200
-+++ trinity-tdebase-3.5.13.2/kicker/kicker/ui/CMakeLists.txt	2013-06-16 22:01:32.316688895 +0200
-@@ -20,7 +20,7 @@
-   ${CMAKE_SOURCE_DIR}/kicker/kicker/buttons
-   ${CMAKE_SOURCE_DIR}/kdmlib
-   ${CMAKE_SOURCE_DIR}/libkonq
--  ${DBUS_TQT_INCLUDE_DIRS}
-+  ${DBUS_INCLUDE_DIRS}
-   ${TDE_INCLUDE_DIR}
-   ${TQT_INCLUDE_DIRS}
- )
-@@ -56,5 +56,5 @@
- tde_add_library( ${target} STATIC_PIC AUTOMOC
-   SOURCES ${${target}_SRCS}
-   DEPENDENCIES kicker_core-static kickermain-static
--  LINK dmctl-static kickoffsearch_interfaces-shared ${DBUS_TQT_LIBRARIES} ${HAL_LIBRARIES}
-+  LINK dmctl-static kickoffsearch_interfaces-shared ${DBUS_LIBRARIES} ${HAL_LIBRARIES}
- )
---- trinity-tdebase-3.5.13.2/kicker/kicker/core/CMakeLists.txt.ORI	2013-06-16 22:05:07.891261997 +0200
-+++ trinity-tdebase-3.5.13.2/kicker/kicker/core/CMakeLists.txt	2013-06-16 22:05:17.673060725 +0200
-@@ -17,7 +17,7 @@
-   ${CMAKE_SOURCE_DIR}/kicker/libkicker
-   ${CMAKE_SOURCE_DIR}/kicker/kicker/ui
-   ${CMAKE_SOURCE_DIR}/kicker/kicker/buttons
--  ${DBUS_TQT_INCLUDE_DIRS}
-+  ${DBUS_INCLUDE_DIRS}
-   ${TDE_INCLUDE_DIR}
-   ${TQT_INCLUDE_DIRS}
- )
---- trinity-tdebase-3.5.13.2/kicker/kicker/buttons/CMakeLists.txt.ORI	2013-06-16 22:09:44.143564983 +0200
-+++ trinity-tdebase-3.5.13.2/kicker/kicker/buttons/CMakeLists.txt	2013-06-16 22:09:48.450475959 +0200
-@@ -17,7 +17,7 @@
-   ${CMAKE_SOURCE_DIR}/kicker/kicker/core
-   ${CMAKE_SOURCE_DIR}/kicker/kicker/ui
-   ${CMAKE_SOURCE_DIR}/libkonq
--  ${DBUS_TQT_INCLUDE_DIRS}
-+  ${DBUS_INCLUDE_DIRS}
-   ${TDE_INCLUDE_DIR}
-   ${TQT_INCLUDE_DIRS}
- )
diff --git a/redhat/tdebase/kdebase-3.5.13.2-set_kdm_minuid.patch b/redhat/tdebase/kdebase-3.5.13.2-set_kdm_minuid.patch
deleted file mode 100644
index ca412df01..000000000
--- a/redhat/tdebase/kdebase-3.5.13.2-set_kdm_minuid.patch
+++ /dev/null
@@ -1,39 +0,0 @@
---- trinity-tdebase-3.5.13.2/config.h.cmake.ORI	2013-02-11 13:57:40.955386048 +0100
-+++ trinity-tdebase-3.5.13.2/config.h.cmake	2013-02-11 14:02:42.484413874 +0100
-@@ -159,6 +159,9 @@
- 
- #cmakedefine XDMCP 1
- 
-+#define TDM_DEFMINUID "@TDM_DEFMINUID@"
-+#define TDM_DEFMAXUID "@TDM_DEFMAXUID@"
-+
- 
- // ksmserver
- #cmakedefine DBUS_SYSTEM_BUS "@DBUS_SYSTEM_BUS@"
---- trinity-tdebase-3.5.13.2/kdm/kfrontend/genkdmconf.c.ORI	2013-02-11 14:03:11.290843286 +0100
-+++ trinity-tdebase-3.5.13.2/kdm/kfrontend/genkdmconf.c	2013-02-11 14:05:21.309267838 +0100
-@@ -2761,6 +2761,10 @@
- 			}
- 		}
- 	}
-+#ifdef TDM_MINDEFUID
-+	defminuid = TDM_MINDEFUID;
-+	defmaxuid = TDM_MAXDEFUID;
-+#else // TDM_MINDEFUID
- #ifdef __linux__
- 	if (!stat( "/etc/debian_version", &st )) { /* debian */
- 		defminuid = "1000";
-@@ -2778,10 +2782,11 @@
- 		defminuid = "500";
- 		defmaxuid = "65000";
- 	}
--#else
-+#else // __linux__
- 	defminuid = "1000";
- 	defmaxuid = "65000";
--#endif
-+#endif // __linux__
-+#endif // TDM_MINDEFUID
- 	for (i = 0; i < CONF_MAX_PRIO; i++)
- 		for (cs = config; cs; cs = cs->next)
- 			for (ce = cs->ents; ce; ce = ce->next)
diff --git a/redhat/tdebase/kdebase-3.5.13.spec b/redhat/tdebase/kdebase-3.5.13.spec
deleted file mode 100644
index bedeec0d1..000000000
--- a/redhat/tdebase/kdebase-3.5.13.spec
+++ /dev/null
@@ -1,3467 +0,0 @@
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?tde_prefix}" != "/usr"
-%define _variant .opt
-%endif
-
-# TDE 3.5.13 specific building variables
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-
-%define tde_tdeappdir %{tde_datadir}/applications/kde
-%define tde_tdedocdir %{tde_docdir}/kde
-%define tde_tdeincludedir %{tde_includedir}/kde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-# Older RHEL/Fedora versions use packages named "qt", "qt-devel", ..
-# whereas newer versions use "qt3", "qt3-devel" ...
-%if 0%{?rhel} >= 6 || 0%{?fedora} >= 8 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}
-%define _qt_suffix 3
-%endif
-
-
-Name:		trinity-tdebase
-Version:	3.5.13
-Release:	27%{?release}%{?dist}%{?_variant}
-License:	GPL
-Summary:	Trinity Base Programs
-Group:		User Interface/Desktops
-
-Obsoletes:	trinity-kdebase < %{version}-%{release}
-Provides:	trinity-kdebase = %{version}-%{release}
-Obsoletes:	trinity-kdebase-libs < %{version}-%{release}
-Obsoletes:	trinity-kdebase-extras < %{version}-%{release}
-Provides:	trinity-kdebase-extras = %{version}-%{release}
-Obsoletes:	tdebase < %{version}-%{release}
-Provides:	tdebase = %{version}-%{release}
-
-
-Vendor:		Trinity Project
-Packager:	Francois Andriot <francois.andriot@free.fr>
-URL:		http://www.trinitydesktop.org/
-
-Prefix:		%{tde_prefix}
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:	kdebase-%{version}.tar.gz
-
-# Wrapper script to prevent Plasma launch at Trinity Startup
-Source1:	plasma-desktop
-
-# Pam configuration files for RHEL / Fedora
-%if 0%{?suse_version}
-Source4:	pamd.kcheckpass-trinity.opensuse%{?suse_version}
-%else
-Source2:	pamd.kdm-trinity%{?dist}
-Source3:	pamd.kdm-trinity-np%{?dist}
-Source4:	pamd.kcheckpass-trinity%{?dist}
-Source5:	pamd.kscreensaver-trinity%{?dist}
-%endif
-
-# [kdebase] Fix corrupted PNG images [Bug #298]
-Source6:	tiles-fixed-png-images.tar.gz
-
-# TDE 3.5.13 patches
-## [kdebase] Missing LDFLAGS cause FTBFS
-Patch2:		tdebase-3.5.13.1-missing_ldflags.patch
-## [kdebase/kdm] adds gcrypt support [Bug #624]
-Patch7:		kdebase-3.5.13-kdm-crypt.patch
-## [kdebase/kioslave/media/mediamanager] FTBFS missing dbus-tqt includes [RHEL/Fedora]
-Patch8:		kdebase-3.5.13-mediamanager_ftbfs.patch
-## [kdebase/startkde] Hardcoded path '/usr/lib/xxx' in startkde, not suitable for x86_64 [RHEL/Fedora]
-Patch9:		kdebase-3.5.13-startkde_ldpreload.patch
-## [kdebase/kdesu] Remove 'ignore' button on 'kdesu' dialog box [RHEL/Fedora]
-Patch10:	kdebase-3.5.13-kdesu-noignorebutton.patch
-## [kdebase/kdesktop] Modifies 'open terminal here' on desktop [RHEL/Fedora]
-Patch11:	kdebase-3.5.12-desktop-openterminalhere.patch
-## [kdebase/kioslave] Forces HAL backend to use HAL mount options [Bug #986]
-Patch12:	kdebase-3.5.12-halmountoptions.patch
-## [kdebase/kdm/kfrontend] Global Xsession file is '/etc/X11/xinit/Xsession' [RHEL/Fedora]
-Patch13:	kdebase-3.5.13-genkdmconf_Xsession_location.patch
-## [kdebase/kicker/kicker/ui] Fix kickoff menu issues [Bug #508]
-Patch14:	kdebase-3.5.13-kickoff_unstable.patch
-## [kdebase/startkde] Sets default Start Icon in 'kickerrc' [RHEL/Fedora]
-Patch15:	kdebase-3.5.13-startkde_icon.patch
-## [kdebase/startkde] Fixes duplicate and incorrect TDE directories location [Bug #741]
-Patch16:	kdebase-3.5.13-startkde_directories.patch
-## [kdebase/kate] Restores the 'number of files' and sorting widgets to the Kate configuration [Bug #244]
-Patch20:	kdebase-3.5.13-kate_mru.patch
-## [kdebase/kioslave/man] Fix kio_man for older distros without 'man-db' [Bug #714]
-Patch21:	kdebase-3.5.13-kio_man_utf8.patch
-## [kdebase/konqueror] Re-enable 'open tab in background' [Bug #245]
-Patch22:	kdebase-3.5.13-konq_menu_tab_background.patch
-## [kdebase/konqueror/sidebar] Fix error message on documents parent folder [Bug #723]
-Patch23:	kdebase-3.5.13-konqsidebar_documents.patch
-## [kdebase/konqueror/listview] Konqueror Icon Activation Effect [Bug #335]
-Patch24:	kdebase-3.5.13-konq_icon_effect.patch
-## [kdebase/kdesu] Restores the "Keep password" check box to the kdesu dialog box [Bug #388]
-Patch25:	kdebase-3.5.13-kdesu_showkeeppassword.patch
-## [kdebase/kpersonalizer] Repair KPersonalizer settings to match system defaults [Bug #759]
-Patch26:	kdebase-3.5.13-kpersonalizer_default_doubleclick.patch
-## [kdebase/kicker] Restores the original KDE3 clock [Bug #387]
-Patch27:	kdebase-3.5.13-restore_kde3_clock.patch
-## [kdebase/kcontrol/randr] Implement X11 event merging in krandrtray [Bug #758]
-Patch28:	kdebase-3.5.13-randrtray_merge_x11_reconfig_requests.patch
-## [kdebase/kdesktop/lock] Fix multihead screen locking [Bug #669]
-Patch29:	kdebase-3.5.13-fix_multihead_desktop_lock.patch
-## [kdebase/kdm/kfrontend] Allows to hide KDM menu button [RHEL/Fedora]
-Patch30:	kdebase-3.5.12-kdm_hide_menu_button.patch
-## [kdebase/kxkb] Enables xtest support
-Patch31:	kdebase-3.5.13-enable_xtest_support.patch
-## [kdebase/kdm/kfrontend] fix KDM high CPU usage when inactive [Bug #690]
-Patch32:	kdebase-3.5.13-fix_kdm_cpu_usage.patch
-## [kdebase/tsak] Add keyboard hotplug (add/remove) support to tsak [Bug #587]
-Patch33:	kdebase-3.5.13-tsak_keyboard_hotplug.patch
-## [kdebase/tsak] Replicate LED status from virtual keyboards to physical keyboards [Bug #561]
-Patch34:	kdebase-3.5.13-replicate_led_status_on_virtual_keyboard.patch
-## [kdebase/kwin] do not show hostname in titlebar if it's FQDN of localhost [Bug #889]
-Patch35:	kdebase-3.5.13-fix_fqdn_in_title.patch
-## [kdebase/kicker/applets] Adds option to disable desktop switch on mouse wheel cycling [Bug #908]
-Patch36:	kdebase-3.5.13-option_to_disable_scroll_desktop.patch
-## [kdebase] Fix Keramik window decoration in KWIN [Bug #905]
-Patch37:	kdebase-3.5.13-kwin-keramic-pics-emb.patch
-## [kdebase/kdesktop] Fix device icon placement on desktop [Bug #392]
-Patch38:	kdebase-3.5.13-fix_device_icon_placement.patch
-## [kdebase/kdesktop/lock] Fix security hole in kdesktop_lock
-Patch39:	kdebase-3.5.13-fix_kdesktop_lock_security_issue.patch
-## [kdebase/kdesktop/lock] Allow minimal managed window interaction inside the lock process [Bug #810]
-Patch40:	kdebase-3.5.13-allow_minimal_window_interaction_inside_lock_process.patch
-## [kdebase/kwin] Corrects a potential ABI compat problem
-Patch41:	kdebase-3.5.13-fix_potential_ABI_compat_problem.patch
-## [kdebase] Fix kdebase translations in desktop files - part 2 [Bug #890]
-Patch42:	kdebase-3.5.13-fix_translations_in_desktop_files.patch
-## [kdebase/kate] Kate: fix focus broken when using the --use parameter [Bug #692]
-Patch43:	kdebase-3.5.13-kate_focus_fix.patch
-## [kdebase/kicker] Ensures that 'pagersettings.kcfg' is installed [Bug #908, Commit bd9c1479]
-Patch44:	kdebase-3.5.13-ensure_pagersettings_is_installed.patch
-## [kdebase] Fix "Malformed URL $( kxdglauncher --getpath xdgname DOCUMENTS )" error dialog.
-Patch45:	kdebase-3.5.13-fix_kxdglauncher_document.patch
-## [kdebase/kioslave] Fix sftp failure on newer systems [Bug #897]
-Patch46:	kdebase-3.5.13-fix_kio_sftp.patch
-## [kdebase/kicker] Fix compilation with GCC 4.7 [Bug #958]
-Patch47:	kdebase-3.5.13-kicker-easyvector.patch
-## [kdebase/kioslave] Fix sftp when nonstandard port is specified in ssh config [Bug #897]
-Patch48:	kdebase-3.5.13-fix_kio_sftp_nonstandard_ports.patch
-## [kdebase/kdm] Start minimal dcop system to support twin in tdm [Commit #66a19439]
-Patch49:	kdebase-3.5.13-start_dcop_in_tdm.patch
-## [kdebase/kdesktop/lock] Update lock process to engage the lock in near real time [Commit #8d521d0b]
-Patch50:	kdebase-3.5.13-engage_lock_in_near_real_time.patch
-## [kdebase/kdesktop/lock] Commit the rest of 8d521d0b, not merged due to GIT glitch [Commit #49526413]
-Patch51:	kdebase-3.5.13-engage_lock_in_near_real_time_continued.patch
-## [kdebase/kdesktop/lock] Fix desktop lock failure due to race condition within signal handler between qt and xcb [Commit #67a3a8f3]
-Patch52:	kdebase-3.5.13-fix_lock_failure.patch
-## [kdebase/kioslave] Temporary fix for a probable race condition on some systems. [Bug #760] [Commit #d41f5217]
-Patch53:	kdebase-3.5.13-fix_race_condition.patch
-## [kdebase] Adds USB default mount options in control panel [Bug #986]
-Patch54:	kdebase-3.5.13-add_usbstorage_panel.patch
-## [tdebase] Add the ability to reorder documents in kate [Commit #46a657f7]
-Patch55:	kdebase-3.5.13-add_reorder_documents_in_kate.patch
-## [tdebase] Add drag and drop to kate file list in manual mode [Commit #b0fa10df]
-Patch56:	kdebase-3.5.13-add_drag_drop_to_kate_file_list.patch
-## [tdebase] Disable keyboard shortcuts for file location moving, as they did not work properly 
-##  and have very little practical use [Commit #9a948c1a]
-Patch57:	kdebase-3.5.13-disable_keyboard_shortcuts_for_file_location_moving.patch
-## [tdebase] Fix KHTML smooth scrolling control center option [Bug #1001] [Commit #b45b4bd7]
-Patch58:	kdebase-3.5.13-fix_khtml_smooth_scrolling.patch
-## [tdebase] Fix fancy logout not allowing interaction with save dialogs [Bug #922]
-##   Fix desktop wallpaper export failing when triggered by krootbacking or ksmserver and konsole or kdesktop_lock not previously loaded [Commit #d2f8fca9]
-Patch59:	kdebase-3.5.13-fix_fancy_logout.patch
-## [tdebase] Update default konqueror maximum image preview size to 10MB. [Commit #03e19305]
-Patch60:	kdebase-3.5.13-update_default_konq_max_image_prev_size.patch
-## [tdebase] Fix menu crash with disabled search field [Bug #1081] [Commit #0afb2d8a]
-Patch61:	kdebase-3.5.13-fix_menu_crash_with_disabled_search.patch
-## [tdebase] Add xscreensaver support to CMake [Bug #659] [Commit #80deb529]
-Patch62:	kdebase-3.5.13-add_xscreensaver_support.patch
-## [tdebase] Forcibly prevent transient override redirect windows from showing up over the lock screen [Bug #1079] [Commit #553923b2]
-Patch63:	kdebase-3.5.13-prevent_tooltip_over_lockscreen.patch
-## [tdebase] Fix tsak FTBFS on RHEL6
-Patch64:	kdebase-3.5.13-fix_tsak_ftbfs.patch
-## [tdebase] Do not require DBUS-TQT if TSAK is not built
-Patch65:	kdebase-3.5.13-do_not_require_dbustqt_if_no_tsak.patch
-## [kdebase/kdm/kfrontend] Global Xsession file is '/etc/X11/xdm/Xsession' [RHEL4/Suse]
-Patch66:	kdebase-3.5.13-genkdmconf_Xsession_location_xdm.patch
-## [kdebase/kdm/backend] Fix DBUS include directory
-Patch67:	kdebase-3.5.13-fix_dbus_include.patch
-
-## [tdebase] Upgrade to v3.5.13-sru branch
-Patch100:	kdebase-3.5.13-upgrade_to_sru_20120806.patch.gz
-## [tdebase] Fix for SAK dialog are displayed even if TSAK is not built.
-Patch101:	kdebase-3.5.13-disable_tsak_dialog_if_not_built.patch
-
-### Patches for RHEL4 (should not go upstream)
-
-## [tdebase] Fix build on RHEL4, detect old libraries without pkg file
-Patch201:	kdebase-3.5.13-fix_lib_detection.patch
-## [tdebase] Do not build against DBUS-TQT, only DBUS and DBUS-QT
-Patch202:	kdebase-3.5.13-build_without_dbustqt.patch
-## [tdebase] Do not build against ConsoleKit
-Patch203:	kdebase-3.5.13-build_without_consolekit.patch
-## [tdebase] Add WITH_COMPOSITE option to CMakeLists.txt
-Patch204:	kdebase-3.5.13-add_disable_composite_option.patch
-## [tdebase] Downgrade halbackend to support Hal 0.4
-Patch205:	kdebase-3.5.13-support_hal_04.patch
-## [tdebase] Other(s) FTBFS ...
-Patch206:	kdebase-3.5.13-fix_rhel4_compilation.patch
-
-### FEDORA / RHEL distribution-specific settings ###
-
-# Fedora 15 Theme: "Lovelock"
-%if 0%{?fedora} == 15
-Requires:	lovelock-backgrounds-single
-%define tde_bg /usr/share/backgrounds/lovelock/default/standard/lovelock.png
-%define tde_starticon /usr/share/icons/hicolor/96x96/apps/fedora-logo-icon.png
-
-Requires:	fedora-release-notes
-%define tde_aboutlabel Fedora 15
-%define tde_aboutpage /usr/share/doc/HTML/fedora-release-notes/index.html
-%endif
-
-# Fedora 16 Theme: "Verne"
-%if 0%{?fedora} == 16
-Requires:	verne-backgrounds-single
-%define tde_bg /usr/share/backgrounds/verne/default/standard/verne.png
-%define tde_starticon /usr/share/icons/hicolor/96x96/apps/fedora-logo-icon.png
-
-Requires:	fedora-release-notes
-%define tde_aboutlabel Fedora 16
-%define tde_aboutpage /usr/share/doc/HTML/fedora-release-notes/index.html
-%endif
-
-# Fedora 17 Theme: "Beefy Miracle"
-%if 0%{?fedora} == 17
-Requires:	beefy-miracle-backgrounds-single
-%define tde_bg /usr/share/backgrounds/beefy-miracle/default/standard/beefy-miracle.png
-%define tde_starticon /usr/share/icons/hicolor/96x96/apps/fedora-logo-icon.png
-
-Requires:	fedora-release-notes
-%define tde_aboutlabel Fedora 17
-%define tde_aboutpage /usr/share/doc/HTML/fedora-release-notes/index.html
-%endif
-
-# RHEL 4 Theme
-%if 0%{?rhel} == 4
-Requires:	desktop-backgrounds-basic
-%define tde_bg /usr/share/backgrounds/images/default.png
-Requires:	redhat-logos
-%define tde_starticon /usr/share/pixmaps/redhat/rpmlogo-64.xpm
-
-Requires:	indexhtml
-%define tde_aboutlabel Enterprise Linux 4
-%define tde_aboutpage /usr/share/doc/HTML/index.html
-%endif
-
-# RHEL 5 Theme
-%if 0%{?rhel} == 5
-Requires:	desktop-backgrounds-basic
-%define tde_bg /usr/share/backgrounds/images/default.jpg
-%define tde_starticon /usr/share/pixmaps/redhat-starthere.png
-
-Requires:	indexhtml
-%define tde_aboutlabel Enterprise Linux 5
-%define tde_aboutpage /usr/share/doc/HTML/index.html
-%endif
-
-# RHEL 6 Theme
-%if 0%{?rhel} == 6
-Requires:	redhat-logos
-%define tde_bg /usr/share/backgrounds/default.png
-%define tde_starticon /usr/share/icons/hicolor/96x96/apps/system-logo-icon.png
-
-Requires:	redhat-indexhtml
-%define tde_aboutlabel Enterprise Linux 6
-%define tde_aboutpage /usr/share/doc/HTML/index.html
-%endif
-
-# Mageia 2 Theme
-%if 0%{?mgaversion} == 2
-Requires:	mageia-theme-Default
-%define tde_bg /usr/share/mga/backgrounds/default.jpg
-%define tde_starticon /usr/share/icons/hicolor/scalable/apps/mageia-menu.svg
-
-Requires:	indexhtml
-%define tde_aboutlabel Mageia 2
-%define tde_aboutpage /usr/share/mga/about/index.html
-%endif
-
-# Mandriva 2011 Theme: "rosa"
-%if "%{?mdkversion}" == "201100"
-Requires:	mandriva-theme
-%define tde_bg /usr/share/mdk/backgrounds/default.jpg
-%define tde_starticon /usr/share/icons/mandriva.png
-
-Requires:	indexhtml
-%define tde_aboutlabel Mandriva 2011
-%define tde_aboutpage /usr/share/mdk/about/index.html
-%endif
-
-# OpenSuse 12.2 Theme
-%if "%{?suse_version}" == "1220"
-Requires:	wallpaper-branding
-%define tde_bg /usr/share/wallpapers/openSUSEdefault/contents/images/1600x1200.jpg
-Requires:	hicolor-icon-theme-branding
-%define tde_starticon /usr/share/icons/hicolor/scalable/apps/distributor.svg
-
-Requires:	opensuse-manuals_en
-%define tde_aboutlabel OpenSuse 12.2
-%define tde_aboutpage /usr/share/doc/manual/opensuse-manuals_en/book.opensuse.startup.html
-%endif
-
-BuildRequires:	cmake >= 2.8
-BuildRequires:	tqtinterface-devel
-BuildRequires:	trinity-arts-devel
-BuildRequires:	trinity-tdelibs-devel
-BuildRequires:	gcc-c++ make
-BuildRequires:	qt%{?_qt_suffix}-devel
-BuildRequires:	openssl-devel
-BuildRequires:	audiofile-devel
-BuildRequires:	alsa-lib-devel
-BuildRequires:	libraw1394-devel
-BuildRequires:	libvorbis-devel
-BuildRequires:	pam-devel
-BuildRequires:	libusb-devel
-BuildRequires:	esound-devel
-BuildRequires:	glib2-devel
-BuildRequires:	pcre-devel
-
-%if 0%{?suse_version}
-BuildRequires:	openldap2-devel
-%else
-BuildRequires:	lm_sensors-devel
-BuildRequires:	openldap-devel
-%endif
-
-
-# TSAK support requires libudev-devel
-# On RHEL5, udev is built statically, so TSAK cannot build.
-# On RHEL5, xrandr library is too old.
-%if 0%{?fedora} >= 15 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 6 || 0%{?suse_version}
-%define with_tsak 1
-%define with_xrandr 1
-BuildRequires:	libudev-devel
-%endif
-
-# On RHEL4, we do not have openexr
-# On RHEL4, we do not use HAL
-%if 0%{?fedora} >= 15 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 5 || 0%{?suse_version}
-%define with_exr 1
-BuildRequires:	OpenEXR-devel
-%define with_hal 1
-BuildRequires:	hal-devel >= 0.4.8
-%endif
-
-
-%if 0%{?fedora} >= 17
-BuildRequires:	perl-Digest-MD5
-%endif
-
-%if 0%{?rhel} == 4
-BuildRequires:	xorg-x11-devel
-BuildRequires:	samba-common
-# Dbus bindings were rebuilt with Qt support
-BuildRequires:	dbus-devel >= 0.22-12.EL.9p1
-%else
-BuildRequires:	imake
-%if 0%{?suse_version}
-BuildRequires:	dbus-1-devel
-%else
-BuildRequires:	dbus-devel
-BuildRequires:	nas-devel
-%endif
-BuildRequires:	dbus-tqt-devel
-BuildRequires:	avahi-tqt-devel
-BuildRequires:	libxkbfile-devel
-BuildRequires:	libsmbclient-devel
-BuildRequires:	libfontenc-devel
-
-%if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires:	%{_lib}avahi-client-devel
-BuildRequires:	%{_lib}jack-devel
-BuildRequires:	%{_lib}xcomposite%{?mgaversion:1}-devel
-BuildRequires:	%{_lib}xdamage-devel
-BuildRequires:	%{_lib}xdmcp%{?mgaversion:6}-devel
-BuildRequires:	%{_lib}xtst-devel
-BuildRequires:	x11-font-util
-BuildRequires:	x11-proto-devel
-BuildRequires:	%{_lib}xscrnsaver%{?mgaversion:1}-devel
-Requires:		%{_lib}avahi-client3
-%else
-BuildRequires:	avahi-devel
-BuildRequires:	jack-audio-connection-kit-devel
-BuildRequires:	libXcomposite-devel
-BuildRequires:	libXdamage-devel
-BuildRequires:	libXdmcp-devel
-BuildRequires:	libXtst-devel
-%if 0%{?suse_version}
-BuildRequires:	font-util
-BuildRequires:	bdftopcf
-%else
-BuildRequires:	xorg-x11-font-utils
-%endif
-BuildRequires:	xorg-x11-proto-devel
-%if 0%{?rhel} == 5
-BuildRequires:	gnome-screensaver
-%else
-BuildRequires:	xscreensaver
-%endif
-Requires:		avahi-tqt
-%endif
-%endif
-
-# tdebase is a metapackage that installs all sub-packages
-Requires: %{name}-runtime-data-common = %{version}-%{release}
-Requires: %{name}-data = %{version}-%{release}
-Requires: %{name}-bin = %{version}-%{release}
-Requires: %{name}-kio-plugins = %{version}-%{release}
-Requires: %{name}-kio-pim-plugins = %{version}-%{release}
-Requires: trinity-kappfinder = %{version}-%{release}
-Requires: trinity-kate = %{version}-%{release}
-Requires: trinity-kwrite = %{version}-%{release}
-Requires: trinity-kcontrol = %{version}-%{release}
-Requires: trinity-kdepasswd = %{version}-%{release}
-Requires: trinity-tdeprint = %{version}-%{release}
-Requires: trinity-kdesktop = %{version}-%{release}
-Requires: trinity-tdm = %{version}-%{release}
-Requires: trinity-kfind = %{version}-%{release}
-Requires: trinity-khelpcenter = %{version}-%{release}
-Requires: trinity-kicker = %{version}-%{release}
-Requires: trinity-klipper = %{version}-%{release}
-Requires: trinity-kmenuedit = %{version}-%{release}
-Requires: trinity-konqueror = %{version}-%{release}
-Requires: trinity-konqueror-nsplugins = %{version}-%{release}
-Requires: trinity-konsole = %{version}-%{release}
-Requires: trinity-kpager = %{version}-%{release}
-Requires: trinity-kpersonalizer = %{version}-%{release}
-Requires: trinity-ksmserver = %{version}-%{release}
-Requires: trinity-ksplash = %{version}-%{release}
-Requires: trinity-ksysguard = %{version}-%{release}
-Requires: trinity-ksysguardd = %{version}-%{release}
-Requires: trinity-ktip = %{version}-%{release}
-Requires: trinity-twin = %{version}-%{release}
-Requires: trinity-libkonq = %{version}-%{release}
-Requires: %{name}-libtqt3-integration = %{version}-%{release}
- 
-Requires:	tqtinterface
-Requires:	trinity-arts
-Requires:	trinity-tdelibs
-Requires:	qt%{?_qt_suffix}
-Requires:	openssl
-
-%if 0%{?rhel} == 4
-Requires:	dbus-qt
-%else
-Requires:	dbus-tqt
-Requires:	avahi
-%endif
-
-# RHEL 6 Configuration files are provided in separate packages
-%if 0%{?rhel} || 0%{?fedora}
-%if "%{?tde_prefix}" == "/usr"
-Requires:	kde-settings-kdm
-%endif
-Requires:	redhat-menus
-%endif
-
-%if 0%{?suse_version}
-Requires:	desktop-data-openSUSE
-%endif
-
-%description
-TDE (the Trinity Desktop Environment) is a powerful Open Source graphical
-desktop environment for Unix workstations. It combines ease of use,
-contemporary functionality, and outstanding graphical design with the
-technological superiority of the Unix operating system.
-
-This metapackage includes the nucleus of TDE, namely the minimal package
-set necessary to run TDE as a desktop environment. This includes the
-window manager, taskbar, control center, a text editor, file manager,
-web browser, X terminal emulator, and many other programs and components.
-
-%files
-%defattr(-,root,root,-)
-%doc AUTHORS COPYING COPYING-DOCS README README.pam
-
-##########
-
-%package devel
-Summary:	%{summary} - Development files
-Group:		Development/Libraries
-Requires:	%{name} = %{version}-%{release}
-Requires:	trinity-tdelibs-devel
-
-Requires:	%{name}-bin-devel = %{version}-%{release}
-Requires:	trinity-kate-devel = %{version}-%{release}
-Requires:	trinity-kcontrol-devel = %{version}-%{release}
-Requires:	trinity-kdesktop-devel = %{version}-%{release}
-Requires:	trinity-kicker-devel = %{version}-%{release}
-Requires:	trinity-konqueror-devel = %{version}-%{release}
-Requires:	trinity-ksplash-devel = %{version}-%{release}
-Requires:	trinity-ksysguard-devel = %{version}-%{release}
-Requires:	trinity-libkonq-devel = %{version}-%{release}
-Requires:	trinity-tdm-devel = %{version}-%{release}
-Requires:	trinity-twin-devel = %{version}-%{release}
-
-Provides:	trinity-kdebase-devel = %{version}-%{release}
-Obsoletes:	trinity-kdebase-devel < %{version}-%{release}
-Provides:	tdebase-devel = %{version}-%{release}
-Obsoletes:	tdebase-devel < %{version}-%{release}
-
-Obsoletes:	trinity-kdebase-cmake < %{version}-%{release}
-Obsoletes:	tdebase-cmake < %{version}-%{release}
-
-%description devel
-This is a meta-package that installs all tdebase development packages.
-
-Header files for developing applications using %{name}.
-Install tdebase-devel if you want to develop or compile Konqueror,
-Kate plugins or KWin styles.
-
-%files devel
-%{tde_datadir}/cmake/*.cmake
-
-##########
-
-%package kio-pim-plugins
-Summary:	PIM KIOslaves from %{name}
-Group:		Environment/Libraries
-
-Provides:	trinity-kdebase-pim-ioslaves = %{version}-%{release}
-Obsoletes:	trinity-kdebase-pim-ioslaves < %{version}-%{release}
-Provides:	tdebase-kio-pim-plugins = %{version}-%{release}
-Obsoletes:	tdebase-kio-pim-plugins < %{version}-%{release}
-
-%description kio-pim-plugins
-Protocol handlers (KIOslaves) for personal information management, including:
- * kio_ldap
- * kio_nntp
- * kio_pop3
- * kio_smtp
-
-%files kio-pim-plugins
-%defattr(-,root,root,-)
-%{tde_tdelibdir}/kio_ldap.la
-%{tde_tdelibdir}/kio_ldap.so
-%{tde_tdelibdir}/kio_nntp.la
-%{tde_tdelibdir}/kio_nntp.so
-%{tde_tdelibdir}/kio_pop3.la
-%{tde_tdelibdir}/kio_pop3.so
-%{tde_tdelibdir}/kio_smtp.la
-%{tde_tdelibdir}/kio_smtp.so
-%{tde_datadir}/services/ldap.protocol
-%{tde_datadir}/services/ldaps.protocol
-%{tde_datadir}/services/nntp.protocol
-%{tde_datadir}/services/nntps.protocol
-%{tde_datadir}/services/pop3.protocol
-%{tde_datadir}/services/pop3s.protocol
-%{tde_datadir}/services/smtp.protocol
-%{tde_datadir}/services/smtps.protocol
-
-##########
-
-%package runtime-data-common
-Summary:	Shared common files for Trinity and KDE4
-Group:		Environment/Libraries
-
-Provides:	tdebase-runtime-data-common = %{version}-%{release}
-Obsoletes:	tdebase-runtime-data-common < %{version}-%{release}
-
-%description runtime-data-common
-Shared common files for both Trinity and KDE4
-Such as the desktop right-click-"Create New" list
-
-%files runtime-data-common
-%defattr(-,root,root,-)
-%{tde_datadir}/autostart/khotkeys.desktop
-%{tde_datadir}/desktop-directories/*
-%{tde_datadir}/icons/hicolor/*/apps/kxkb.png
-%{tde_datadir}/icons/hicolor/*/apps/knetattach.*
-%{tde_datadir}/icons/hicolor/*/apps/khotkeys.png
-%{tde_datadir}/icons/hicolor/*/apps/kmenuedit.png
-%{tde_datadir}/icons/hicolor/*/apps/ksplash.png
-%{tde_datadir}/locale/en_US/entry.desktop
-%{tde_datadir}/locale/l10n/*.desktop
-%{tde_datadir}/locale/l10n/*/entry.desktop
-%{tde_datadir}/locale/l10n/*/flag.png
-%{tde_datadir}/sounds/pop.wav
-%{tde_datadir}/templates
-
-%post runtime-data-common
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f}  2> /dev/null || :
-done
-
-%postun runtime-data-common
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f}  2> /dev/null || :
-done
-
-##########
-
-%package -n trinity-kappfinder
-Summary:	non-KDE application finder for KDE
-Group:		Applications/Utilities
-Requires:	%{name}-data = %{version}-%{release}
-
-%description -n trinity-kappfinder
-kappfinder searches your workstation for many common applications and
-creates menu entries for them.
-
-%files -n trinity-kappfinder
-%defattr(-,root,root,-)
-%{tde_bindir}/kappfinder
-%{tde_tdeappdir}/kappfinder.desktop
-%{tde_datadir}/applnk/System/kappfinder.desktop
-%{tde_datadir}/apps/kappfinder
-%{tde_datadir}/icons/hicolor/*/apps/kappfinder.png
-
-%post -n trinity-kappfinder
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f}  2> /dev/null || :
-done
-update-desktop-database %{tde_appdir} 2> /dev/null || : 
-
-%postun -n trinity-kappfinder
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f}  2> /dev/null || :
-done
-update-desktop-database %{tde_appdir} 2> /dev/null || : 
-
-##########
-
-%package -n trinity-libkateinterfaces
-Summary:	Common libraries used by kwrite and kate
-Group:		Environment/Libraries
-
-%description -n trinity-libkateinterfaces
-%{summary}
-
-%files -n trinity-libkateinterfaces
-%{tde_libdir}/libkateinterfaces.so.*
-
-%post -n trinity-libkateinterfaces
-/sbin/ldconfig || :
-
-%postun -n trinity-libkateinterfaces
-/sbin/ldconfig || :
-
-##########
-
-%package -n trinity-kate
-Summary:	advanced text editor for TDE
-Group:		Applications/Text
-Requires:	%{name}-data = %{version}-%{release}
-Requires:	trinity-kwrite = %{version}-%{release}
-Requires:	trinity-libkateinterfaces = %{version}-%{release}
-
-%description -n trinity-kate
-Kate is a multi document editor, based on a rewritten version of the kwrite
-editing widget of TDE.
-
-It is a multi-view editor that lets you view several instances of the same
-document with all instances being synced, or view more files at the same
-time for easy reference or simultaneous editing. The terminal emulation
-and sidebar are docked windows that can be plugged out of the main window,
-or replaced therein according to your preference.
-
-Some random features:
-* Editing of big files
-* Extensible syntax highlighting
-* Folding
-* Dynamic word wrap
-* Selectable encoding
-* Filter command
-* Global grep dialog
-
-%files -n trinity-kate
-%defattr(-,root,root,-)
-%{tde_bindir}/kate
-%{tde_tdelibdir}/kate.la
-%{tde_tdelibdir}/kate.so
-%{tde_libdir}/libkateutils.so.*
-%{tde_libdir}/lib[kt]deinit_kate.la
-%{tde_libdir}/lib[kt]deinit_kate.so
-%{tde_tdeappdir}/kate.desktop
-%{tde_datadir}/apps/kate/
-%{tde_datadir}/apps/kconf_update/kate-2.4.upd
-%{tde_datadir}/config/katerc
-%{tde_datadir}/icons/hicolor/*/apps/kate.png
-%{tde_datadir}/icons/hicolor/*/apps/kate2.svgz
-%{tde_datadir}/servicetypes/kateplugin.desktop
-%{tde_tdedocdir}/HTML/en/kate/
-
-%post -n trinity-kate
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f}  2> /dev/null || :
-done
-update-desktop-database %{tde_appdir} 2> /dev/null || : 
-/sbin/ldconfig || :
-
-%postun -n trinity-kate
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f}  2> /dev/null || :
-done
-update-desktop-database %{tde_appdir} 2> /dev/null || : 
-/sbin/ldconfig || :
-
-##########
-
-%package -n trinity-kate-devel
-Summary:	Development files for kate
-Group:		Development/Libraries
-Requires:	trinity-kate = %{version}-%{release}
-
-%description -n trinity-kate-devel
-%{summary}
-
-%files -n trinity-kate-devel
-%{tde_tdeincludedir}/kate/
-%{tde_libdir}/libkateutils.so
-%{tde_libdir}/libkateutils.la
-%{tde_libdir}/libkateinterfaces.so
-%{tde_libdir}/libkateinterfaces.la
-
-%post -n trinity-kate-devel
-/sbin/ldconfig || :
-
-%postun -n trinity-kate-devel
-/sbin/ldconfig || :
-
-##########
-
-%package -n trinity-kwrite
-Summary:	advanced text editor for TDE
-Group:		Applications/Utilities
-Requires:	%{name}-data = %{version}-%{release}
-Requires:	trinity-libkateinterfaces = %{version}-%{release}
-
-%description -n trinity-kwrite
-Kwrite is a text editor for TDE.
-
-%files -n trinity-kwrite
-%defattr(-,root,root,-)
-%{tde_bindir}/kwrite
-%{tde_tdelibdir}/kwrite.la
-%{tde_tdelibdir}/kwrite.so
-%{tde_libdir}/lib[kt]deinit_kwrite.la
-%{tde_libdir}/lib[kt]deinit_kwrite.so
-%{tde_tdeappdir}/kwrite.desktop
-%{tde_datadir}/apps/kwrite/kwriteui.rc
-%{tde_datadir}/icons/hicolor/*/apps/kwrite.png
-%{tde_datadir}/icons/hicolor/*/apps/kwrite2.svgz
-%{tde_tdedocdir}/HTML/en/kwrite/
-
-
-%post -n trinity-kwrite
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f}  2> /dev/null || :
-done
-update-desktop-database %{tde_appdir} 2> /dev/null || : 
-
-%postun -n trinity-kwrite
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f}  2> /dev/null || :
-done
-update-desktop-database %{tde_appdir} 2> /dev/null || : 
-
-##########
-
-%package -n trinity-kcontrol
-Summary:	control center for TDE
-Group:		Applications/Utilities
-Requires:	%{name}-data = %{version}-%{release}
-Requires:	usbutils
-
-%if 0%{?suse_version} == 0
-Requires:	hwdata
-%endif
-
-%description -n trinity-kcontrol
-The Trinity Control Center provides you with a centralized and convenient
-way to configure all of your TDE settings.
-
-It is made up of multiple modules. Each module is a separate application,
-but the control center organizes all of these programs into a convenient
-location.
-
-In combination with udev KControl supports the advanced
-configuration of Logitech mice, though the user must be a member of the
-plugdev group.
-
-%files -n trinity-kcontrol
-%defattr(-,root,root,-)
-%{tde_bindir}/kaccess
-%{tde_bindir}/kcontrol
-%{tde_bindir}/kdeinstallktheme
-%{tde_bindir}/keditfiletype
-%{tde_bindir}/kfontinst
-%{tde_bindir}/kfontview
-%{tde_bindir}/kinfocenter
-%{tde_bindir}/klocaldomainurifilterhelper
-%{tde_bindir}/krdb
-%{tde_tdelibdir}/fontthumbnail.la
-%{tde_tdelibdir}/fontthumbnail.so
-%{tde_tdelibdir}/kaccess.la
-%{tde_tdelibdir}/kaccess.so
-%{tde_tdelibdir}/kcm_access.la
-%{tde_tdelibdir}/kcm_access.so
-%{tde_tdelibdir}/kcm_arts.la
-%{tde_tdelibdir}/kcm_arts.so
-%{tde_tdelibdir}/kcm_background.la
-%{tde_tdelibdir}/kcm_background.so
-%{tde_tdelibdir}/kcm_bell.la
-%{tde_tdelibdir}/kcm_bell.so
-%{tde_tdelibdir}/kcm_clock.la
-%{tde_tdelibdir}/kcm_clock.so
-%{tde_tdelibdir}/kcm_colors.la
-%{tde_tdelibdir}/kcm_colors.so
-%{tde_tdelibdir}/kcm_componentchooser.la
-%{tde_tdelibdir}/kcm_componentchooser.so
-%{tde_tdelibdir}/kcm_crypto.la
-%{tde_tdelibdir}/kcm_crypto.so
-%{tde_tdelibdir}/kcm_css.la
-%{tde_tdelibdir}/kcm_css.so
-%{tde_tdelibdir}/kcm_display.la
-%{tde_tdelibdir}/kcm_display.so
-%{tde_tdelibdir}/kcm_energy.la
-%{tde_tdelibdir}/kcm_energy.so
-%{tde_tdelibdir}/kcm_filetypes.la
-%{tde_tdelibdir}/kcm_filetypes.so
-%{tde_tdelibdir}/kcm_fontinst.la
-%{tde_tdelibdir}/kcm_fontinst.so
-%{tde_tdelibdir}/kcm_fonts.la
-%{tde_tdelibdir}/kcm_fonts.so
-#%{tde_tdelibdir}/kcm_hwmanager.la
-#%{tde_tdelibdir}/kcm_hwmanager.so
-%{tde_tdelibdir}/kcm_icons.la
-%{tde_tdelibdir}/kcm_icons.so
-%{tde_tdelibdir}/kcm_info.la
-%{tde_tdelibdir}/kcm_info.so
-%{tde_tdelibdir}/kcm_input.la
-%{tde_tdelibdir}/kcm_input.so
-%{tde_tdelibdir}/kcm_ioslaveinfo.la
-%{tde_tdelibdir}/kcm_ioslaveinfo.so
-%{tde_tdelibdir}/kcm_joystick.la
-%{tde_tdelibdir}/kcm_joystick.so
-%{tde_tdelibdir}/kcm_kded.la
-%{tde_tdelibdir}/kcm_kded.so
-%{tde_tdelibdir}/kcm_[kt]dm.la
-%{tde_tdelibdir}/kcm_[kt]dm.so
-%{tde_tdelibdir}/kcm_kdnssd.so
-%{tde_tdelibdir}/kcm_kdnssd.la
-%{tde_tdelibdir}/kcm_keys.la
-%{tde_tdelibdir}/kcm_keys.so
-%{tde_tdelibdir}/kcm_kicker.la
-%{tde_tdelibdir}/kcm_kicker.so
-%{tde_tdelibdir}/kcm_kio.la
-%{tde_tdelibdir}/kcm_kio.so
-%{tde_tdelibdir}/kcm_knotify.la
-%{tde_tdelibdir}/kcm_knotify.so
-%{tde_tdelibdir}/kcm_konqhtml.la
-%{tde_tdelibdir}/kcm_konqhtml.so
-%{tde_tdelibdir}/kcm_konq.la
-%{tde_tdelibdir}/kcm_konq.so
-%{tde_tdelibdir}/kcm_kthememanager.la
-%{tde_tdelibdir}/kcm_kthememanager.so
-%{tde_tdelibdir}/kcm_kurifilt.la
-%{tde_tdelibdir}/kcm_kurifilt.so
-%{tde_tdelibdir}/kcm_launch.la
-%{tde_tdelibdir}/kcm_launch.so
-%{tde_tdelibdir}/kcm_locale.la
-%{tde_tdelibdir}/kcm_locale.so
-%{tde_tdelibdir}/kcm_nic.la
-%{tde_tdelibdir}/kcm_nic.so
-%{tde_tdelibdir}/kcm_performance.la
-%{tde_tdelibdir}/kcm_performance.so
-%{tde_tdelibdir}/kcm_privacy.la
-%{tde_tdelibdir}/kcm_privacy.so
-%{tde_tdelibdir}/kcm_samba.la
-%{tde_tdelibdir}/kcm_samba.so
-%{tde_tdelibdir}/kcm_screensaver.la
-%{tde_tdelibdir}/kcm_screensaver.so
-%{tde_tdelibdir}/kcm_smserver.la
-%{tde_tdelibdir}/kcm_smserver.so
-%{tde_tdelibdir}/kcm_spellchecking.la
-%{tde_tdelibdir}/kcm_spellchecking.so
-%{tde_tdelibdir}/kcm_style.la
-%{tde_tdelibdir}/kcm_style.so
-%{tde_tdelibdir}/kcm_taskbar.la
-%{tde_tdelibdir}/kcm_taskbar.so
-%{tde_tdelibdir}/kcm_usb.la
-%{tde_tdelibdir}/kcm_usb.so
-%{tde_tdelibdir}/kcm_view1394.la
-%{tde_tdelibdir}/kcm_view1394.so
-%{tde_tdelibdir}/kcm_xinerama.la
-%{tde_tdelibdir}/kcm_xinerama.so
-%{tde_tdelibdir}/kcontrol.la
-%{tde_tdelibdir}/kcontrol.so
-%{tde_tdelibdir}/kfile_font.la
-%{tde_tdelibdir}/kfile_font.so
-%{tde_tdelibdir}/kio_fonts.la
-%{tde_tdelibdir}/kio_fonts.so
-%{tde_tdelibdir}/kstyle_keramik_config.la
-%{tde_tdelibdir}/kstyle_keramik_config.so
-%{tde_tdelibdir}/libkfontviewpart.la
-%{tde_tdelibdir}/libkfontviewpart.so
-%{tde_tdelibdir}/libkshorturifilter.la
-%{tde_tdelibdir}/libkshorturifilter.so
-%{tde_tdelibdir}/libkuriikwsfilter.la
-%{tde_tdelibdir}/libkuriikwsfilter.so
-%{tde_tdelibdir}/libkurisearchfilter.la
-%{tde_tdelibdir}/libkurisearchfilter.so
-%{tde_tdelibdir}/liblocaldomainurifilter.la
-%{tde_tdelibdir}/liblocaldomainurifilter.so
-%{tde_libdir}/lib[kt]deinit_kaccess.la
-%{tde_libdir}/lib[kt]deinit_kaccess.so
-%{tde_libdir}/lib[kt]deinit_kcontrol.la
-%{tde_libdir}/lib[kt]deinit_kcontrol.so
-%{tde_libdir}/libkfontinst.so.*
-%{tde_tdeappdir}/arts.desktop
-%{tde_tdeappdir}/background.desktop
-%{tde_tdeappdir}/bell.desktop
-%{tde_tdeappdir}/cache.desktop
-%{tde_tdeappdir}/cdinfo.desktop
-%{tde_tdeappdir}/clock.desktop
-%{tde_tdeappdir}/colors.desktop
-%{tde_tdeappdir}/componentchooser.desktop
-%{tde_tdeappdir}/cookies.desktop
-%{tde_tdeappdir}/crypto.desktop
-%{tde_tdeappdir}/desktopbehavior.desktop
-%{tde_tdeappdir}/desktop.desktop
-%{tde_tdeappdir}/desktoppath.desktop
-%{tde_tdeappdir}/devices.desktop
-%{tde_tdeappdir}/display.desktop
-%{tde_tdeappdir}/dma.desktop
-%{tde_tdeappdir}/ebrowsing.desktop
-%{tde_tdeappdir}/filebrowser.desktop
-%{tde_tdeappdir}/filetypes.desktop
-%{tde_tdeappdir}/fonts.desktop
-#%{tde_tdeappdir}/hwmanager.desktop
-%{tde_tdeappdir}/icons.desktop
-%{tde_tdeappdir}/installktheme.desktop
-%{tde_tdeappdir}/interrupts.desktop
-%{tde_tdeappdir}/ioports.desktop
-%{tde_tdeappdir}/ioslaveinfo.desktop
-%{tde_tdeappdir}/joystick.desktop
-%{tde_tdeappdir}/kcm_kdnssd.desktop
-%{tde_tdeappdir}/kcmaccess.desktop
-%{tde_tdeappdir}/kcmcss.desktop
-%{tde_tdeappdir}/kcmfontinst.desktop
-%{tde_tdeappdir}/kcmkded.desktop
-%{tde_tdeappdir}/kcmlaunch.desktop
-%{tde_tdeappdir}/kcmnotify.desktop
-%{tde_tdeappdir}/kcmperformance.desktop
-%{tde_tdeappdir}/kcmsmserver.desktop
-%{tde_tdeappdir}/kcmtaskbar.desktop
-%{tde_tdeappdir}/kcmusb.desktop
-%{tde_tdeappdir}/kcmview1394.desktop
-%{tde_tdeappdir}/KControl.desktop
-%{tde_tdeappdir}/[kt]dm.desktop
-%{tde_tdeappdir}/keys.desktop
-%{tde_tdeappdir}/kfontview.desktop
-%{tde_tdeappdir}/khtml_behavior.desktop
-%{tde_tdeappdir}/khtml_fonts.desktop
-%{tde_tdeappdir}/khtml_java_js.desktop
-%{tde_tdeappdir}/kinfocenter.desktop
-%{tde_tdeappdir}/kthememanager.desktop
-%{tde_tdeappdir}/lanbrowser.desktop
-%{tde_tdeappdir}/language.desktop
-%{tde_tdeappdir}/media.desktop
-%{tde_tdeappdir}/memory.desktop
-%{tde_tdeappdir}/mouse.desktop
-%{tde_tdeappdir}/netpref.desktop
-%{tde_tdeappdir}/nic.desktop
-%{tde_tdeappdir}/opengl.desktop
-%{tde_tdeappdir}/panel_appearance.desktop
-%{tde_tdeappdir}/panel.desktop
-%{tde_tdeappdir}/partitions.desktop
-%{tde_tdeappdir}/pci.desktop
-%{tde_tdeappdir}/privacy.desktop
-%{tde_tdeappdir}/processor.desktop
-%{tde_tdeappdir}/proxy.desktop
-%{tde_tdeappdir}/screensaver.desktop
-%{tde_tdeappdir}/scsi.desktop
-%{tde_tdeappdir}/smbstatus.desktop
-%{tde_tdeappdir}/sound.desktop
-%{tde_tdeappdir}/spellchecking.desktop
-%{tde_tdeappdir}/style.desktop
-%{tde_tdeappdir}/useragent.desktop
-%{tde_tdeappdir}/xserver.desktop
-%{tde_datadir}/applnk/.hidden/energy.desktop
-%{tde_datadir}/applnk/.hidden/fileappearance.desktop
-%{tde_datadir}/applnk/.hidden/filebehavior.desktop
-%{tde_datadir}/applnk/.hidden/filepreviews.desktop
-%{tde_datadir}/applnk/.hidden/kcmkonqyperformance.desktop
-%{tde_datadir}/applnk/.hidden/kicker_config_appearance.desktop
-%{tde_datadir}/applnk/.hidden/kicker_config.desktop
-%{tde_datadir}/applnk/.hidden/smb.desktop
-%{tde_datadir}/applnk/.hidden/xinerama.desktop
-%{tde_datadir}/applnk/Settings/LookNFeel/
-%{tde_datadir}/applnk/Settings/WebBrowsing/khtml_appearance.desktop
-%{tde_datadir}/applnk/Settings/WebBrowsing/nsplugin.desktop
-%{tde_datadir}/applnk/Settings/WebBrowsing/smb.desktop
-%{tde_datadir}/apps/kcm_componentchooser/kcm_browser.desktop
-%{tde_datadir}/apps/kcm_componentchooser/kcm_kemail.desktop
-%{tde_datadir}/apps/kcm_componentchooser/kcm_terminal.desktop
-%{tde_datadir}/apps/konqsidebartng/virtual_folders/services/fonts.desktop
-%{tde_datadir}/apps/konqueror/servicemenus/installfont.desktop
-%{tde_datadir}/mimelnk/application/x-ktheme.desktop
-%{tde_datadir}/mimelnk/fonts/folder.desktop
-%{tde_datadir}/mimelnk/fonts/package.desktop
-%{tde_datadir}/mimelnk/fonts/system-folder.desktop
-%{tde_datadir}/services/fonts.protocol
-%{tde_datadir}/services/fontthumbnail.desktop
-%{tde_datadir}/services/kaccess.desktop
-%{tde_datadir}/services/kfile_font.desktop
-%{tde_datadir}/services/kfontviewpart.desktop
-%{tde_datadir}/services/kshorturifilter.desktop
-%{tde_datadir}/services/kuriikwsfilter.desktop
-%{tde_datadir}/services/kurisearchfilter.desktop
-%{tde_datadir}/services/localdomainurifilter.desktop
-
-%{tde_datadir}/apps/usb.ids
-%{tde_datadir}/apps/kcmview1394/oui.db
-
-# The following features are not compiled under RHEL 5
-%if 0%{?rhel} >= 6 || 0%{?fedora} >= 15 || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version}
-%{tde_bindir}/krandrtray
-%{tde_tdelibdir}/kcm_displayconfig.la
-%{tde_tdelibdir}/kcm_displayconfig.so
-%{tde_tdelibdir}/kcm_iccconfig.la
-%{tde_tdelibdir}/kcm_iccconfig.so
-%{tde_tdelibdir}/kcm_randr.la
-%{tde_tdelibdir}/kcm_randr.so
-%{tde_tdeappdir}/displayconfig.desktop
-%{tde_tdeappdir}/iccconfig.desktop
-%{tde_tdeappdir}/krandrtray.desktop
-%{tde_datadir}/applnk/.hidden/randr.desktop
-%{tde_datadir}/autostart/krandrtray-autostart.desktop
-%endif
-
-%post -n trinity-kcontrol
-/sbin/ldconfig || :
-update-desktop-database %{tde_appdir} 2> /dev/null || : 
-
-%postun -n trinity-kcontrol
-/sbin/ldconfig || :
-update-desktop-database %{tde_appdir} 2> /dev/null || : 
-
-##########
-
-%package -n trinity-kcontrol-devel
-Summary:	Development files for kcontrol
-Group:		Development/Libraries
-Requires:	trinity-kcontrol = %{version}-%{release}
-
-%description -n trinity-kcontrol-devel
-%{summary}
-
-%files -n trinity-kcontrol-devel
-%{tde_libdir}/libkfontinst.la
-%{tde_libdir}/libkfontinst.so
-
-%post -n trinity-kcontrol-devel
-/sbin/ldconfig || :
-
-%postun -n trinity-kcontrol-devel
-/sbin/ldconfig || :
-
-##########
-
-%package bin
-Summary:	core binaries for the TDE base module
-Group:		Applications/Utilities
-Requires:	%{name}-data = %{version}-%{release}
-Requires:	pam
-
-Provides:	tdebase-bin = %{version}-%{release}
-Obsoletes:	tdebase-bin < %{version}-%{release}
-
-%description bin
-This package contains miscellaneous programs needed by other
-TDE applications, particularly those in the TDE base module.
-
-%files bin
-%defattr(-,root,root,-)
-%{tde_bindir}/krootbacking
-#%{tde_bindir}/tdeinit_phase1
-%if 0%{?with_tsak}
-%attr(4511,root,root) %{tde_bindir}/[kt]dmtsak
-%{tde_bindir}/tsak
-%endif
-%{tde_bindir}/kdebugdialog
-%{tde_bindir}/kreadconfig
-%{tde_bindir}/kwriteconfig
-%{tde_bindir}/kstart
-%{tde_datadir}/config/kxkb_groups
-%{tde_bindir}/drkonqi
-%{tde_bindir}/kapplymousetheme
-%{tde_bindir}/kblankscrn.kss
-%attr(4755,root,root) %{tde_bindir}/kcheckpass
-%{tde_bindir}/kcminit
-%{tde_bindir}/kcminit_startup
-%{tde_bindir}/kdcop
-%{tde_bindir}/[kt]desu
-%attr(0755,root,root) %{tde_bindir}/[kt]desud
-%{tde_bindir}/kdialog
-%{tde_bindir}/khotkeys
-%{tde_bindir}/knetattach
-%{tde_bindir}/krandom.kss
-%{tde_bindir}/ksystraycmd
-%{tde_bindir}/kxkb
-%{tde_libdir}/kconf_update_bin/khotkeys_update
-%{tde_tdelibdir}/kcminit.la
-%{tde_tdelibdir}/kcminit.so
-%{tde_tdelibdir}/kcminit_startup.la
-%{tde_tdelibdir}/kcminit_startup.so
-%{tde_tdelibdir}/kcm_keyboard.la
-%{tde_tdelibdir}/kcm_keyboard.so
-%{tde_tdelibdir}/kcm_khotkeys_init.la
-%{tde_tdelibdir}/kcm_khotkeys_init.so
-%{tde_tdelibdir}/kcm_khotkeys.la
-%{tde_tdelibdir}/kcm_khotkeys.so
-%{tde_tdelibdir}/kded_khotkeys.la
-%{tde_tdelibdir}/kded_khotkeys.so
-%{tde_tdelibdir}/kgreet_classic.la
-%{tde_tdelibdir}/kgreet_classic.so
-%{tde_tdelibdir}/kgreet_winbind.la
-%{tde_tdelibdir}/kgreet_winbind.so
-%{tde_tdelibdir}/khotkeys.la
-%{tde_tdelibdir}/khotkeys.so
-%{tde_tdelibdir}/khotkeys_arts.la
-%{tde_tdelibdir}/khotkeys_arts.so
-%{tde_tdelibdir}/kxkb.la
-%{tde_tdelibdir}/kxkb.so
-%{tde_libdir}/lib[kt]deinit_kcminit.la
-%{tde_libdir}/lib[kt]deinit_kcminit.so
-%{tde_libdir}/lib[kt]deinit_kcminit_startup.la
-%{tde_libdir}/lib[kt]deinit_kcminit_startup.so
-%{tde_libdir}/lib[kt]deinit_khotkeys.la
-%{tde_libdir}/lib[kt]deinit_khotkeys.so
-%{tde_libdir}/lib[kt]deinit_kxkb.la
-%{tde_libdir}/lib[kt]deinit_kxkb.so
-%{tde_libdir}/libkhotkeys_shared.so.*
-%{tde_tdeappdir}/keyboard.desktop
-%{tde_tdeappdir}/keyboard_layout.desktop
-%{tde_tdeappdir}/khotkeys.desktop
-%{tde_tdeappdir}/knetattach.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/
-%{tde_datadir}/apps/drkonqi/
-%{tde_datadir}/apps/kconf_update/khotkeys_32b1_update.upd
-%{tde_datadir}/apps/kconf_update/khotkeys_printscreen.upd
-%{tde_datadir}/apps/kconf_update/konqueror_gestures_trinity21_update.upd
-%{tde_datadir}/apps/kdcop/kdcopui.rc
-%{tde_datadir}/apps/khotkeys/
-%{tde_datadir}/services/kded/khotkeys.desktop
-%{tde_datadir}/services/kxkb.desktop
-%{_sysconfdir}/pam.d/kcheckpass-trinity
-%if 0%{?suse_version} == 0
-%{_sysconfdir}/pam.d/kscreensaver-trinity
-%endif
-%{tde_tdedocdir}/HTML/en/kdcop/
-%{tde_tdedocdir}/HTML/en/kdebugdialog//
-%{tde_tdedocdir}/HTML/en/[kt]desu/
-%{tde_tdedocdir}/HTML/en/knetattach/
-%{tde_tdedocdir}/HTML/en/kxkb/
-
-%post bin
-/sbin/ldconfig || :
-update-desktop-database %{tde_appdir} 2> /dev/null || : 
-
-%postun bin
-/sbin/ldconfig || :
-update-desktop-database %{tde_appdir} 2> /dev/null || : 
-
-##########
-
-%package bin-devel
-Summary:	Development files for core binaries for the TDE base module
-Group:		Development/Libraries
-Requires:	%{name}-bin = %{version}-%{release}
-
-Obsoletes:	tdebase-bin-devel < %{version}-%{release}
-Provides:	tdebase-bin-devel = %{version}-%{release}
-
-%description bin-devel
-%{summary}
-
-%files bin-devel
-%{tde_libdir}/libkhotkeys_shared.la
-%{tde_libdir}/libkhotkeys_shared.so
-
-%post bin-devel
-/sbin/ldconfig || :
-
-%postun bin-devel
-/sbin/ldconfig || :
-
-##########
-
-%package data
-Summary:	shared data files for the TDE base module
-Group:		Environment/Libraries
-Requires:	%{name}-runtime-data-common = %{version}-%{release}
-
-Obsoletes:	tdebase-data < %{version}-%{release}
-Provides:	tdebase-data = %{version}-%{release}
-
-%description data
-This package contains the architecture-independent shared data files
-needed for a basic TDE desktop installation.
-
-%files data
-%defattr(-,root,root,-)
-%{tde_datadir}/config/kshorturifilterrc
-%{tde_datadir}/applnk/.hidden/battery.desktop
-%{tde_datadir}/applnk/.hidden/bwarning.desktop
-%{tde_datadir}/applnk/.hidden/cwarning.desktop
-%{tde_datadir}/applnk/.hidden/.directory
-%{tde_datadir}/applnk/.hidden/email.desktop
-%{tde_datadir}/applnk/.hidden/kcmkonq.desktop
-%{tde_datadir}/applnk/.hidden/kcmkxmlrpcd.desktop
-%{tde_datadir}/applnk/.hidden/konqhtml.desktop
-%{tde_datadir}/applnk/.hidden/passwords.desktop
-%{tde_datadir}/applnk/.hidden/power.desktop
-%{tde_datadir}/applnk/.hidden/socks.desktop
-%{tde_datadir}/applnk/.hidden/userinfo.desktop
-%{tde_datadir}/applnk/.hidden/virtualdesktops.desktop
-%{tde_datadir}/apps/kaccess/eventsrc
-%{tde_datadir}/apps/kcmcss/template.css
-%{tde_datadir}/apps/kcminput/
-%{tde_datadir}/apps/kcmkeys/
-%{tde_datadir}/apps/kcmlocale/pics/background.png
-%{tde_datadir}/apps/kconf_update/convertShortcuts.pl
-%{tde_datadir}/apps/kconf_update/kaccel.upd
-%{tde_datadir}/apps/kconf_update/kcmdisplayrc.upd
-%{tde_datadir}/apps/kconf_update/kuriikwsfilter.upd
-%{tde_datadir}/apps/kconf_update/mouse_cursor_theme.upd
-%{tde_datadir}/apps/kconf_update/socks.upd
-%{tde_datadir}/apps/kcontrol/
-%{tde_datadir}/apps/kdisplay/
-%{tde_datadir}/apps/kfontview/
-%{tde_datadir}/apps/kinfocenter/kinfocenterui.rc
-%{tde_datadir}/apps/kthememanager/themes/*
-%{tde_datadir}/icons/crystalsvg/*/apps/access.png
-%{tde_datadir}/icons/crystalsvg/*/apps/acroread.png
-%{tde_datadir}/icons/crystalsvg/*/apps/applixware.png
-%{tde_datadir}/icons/crystalsvg/*/apps/arts.png
-%{tde_datadir}/icons/crystalsvg/*/apps/background.png
-%{tde_datadir}/icons/crystalsvg/*/apps/bell.png
-%{tde_datadir}/icons/crystalsvg/*/apps/cache.png
-%{tde_datadir}/icons/crystalsvg/*/apps/clanbomber.png
-%{tde_datadir}/icons/crystalsvg/*/apps/clock.png
-%{tde_datadir}/icons/crystalsvg/*/apps/colors.png
-%{tde_datadir}/icons/crystalsvg/*/apps/date.png
-%{tde_datadir}/icons/crystalsvg/*/apps/email.png
-%{tde_datadir}/icons/crystalsvg/*/apps/energy.png
-%{tde_datadir}/icons/crystalsvg/*/apps/energy_star.png
-%{tde_datadir}/icons/crystalsvg/*/apps/filetypes.png
-%{tde_datadir}/icons/crystalsvg/*/apps/fonts.png
-%{tde_datadir}/icons/crystalsvg/*/apps/gimp.png
-%{tde_datadir}/icons/crystalsvg/*/apps/help_index.png
-%{tde_datadir}/icons/crystalsvg/*/apps/hwinfo.png
-%{tde_datadir}/icons/crystalsvg/*/apps/kcmdevices.png
-%{tde_datadir}/icons/crystalsvg/*/apps/kcmdf.png
-%{tde_datadir}/icons/crystalsvg/*/apps/kcmkwm.png
-%{tde_datadir}/icons/crystalsvg/*/apps/kcmmemory.png
-%{tde_datadir}/icons/crystalsvg/*/apps/kcmpartitions.png
-%{tde_datadir}/icons/crystalsvg/*/apps/kcmpci.png
-%{tde_datadir}/icons/crystalsvg/*/apps/kcontrol.png
-%{tde_datadir}/icons/crystalsvg/*/apps/[kt]dmconfig.png
-%{tde_datadir}/icons/crystalsvg/*/apps/key_bindings.png
-%{tde_datadir}/icons/crystalsvg/*/apps/kfm_home.png
-%{tde_datadir}/icons/crystalsvg/*/apps/kscreensaver.png
-%{tde_datadir}/icons/crystalsvg/*/apps/kthememgr.png
-%{tde_datadir}/icons/crystalsvg/*/apps/licq.png
-%{tde_datadir}/icons/crystalsvg/*/apps/linuxconf.png
-%{tde_datadir}/icons/crystalsvg/*/apps/locale.png
-%{tde_datadir}/icons/crystalsvg/*/apps/looknfeel.png
-%{tde_datadir}/icons/crystalsvg/*/apps/multimedia.png
-%{tde_datadir}/icons/crystalsvg/*/apps/netscape.png
-%{tde_datadir}/icons/crystalsvg/*/apps/package_applications.png
-%{tde_datadir}/icons/crystalsvg/*/apps/package_development.png
-%{tde_datadir}/icons/crystalsvg/*/apps/package_favourite.png
-%{tde_datadir}/icons/crystalsvg/*/apps/package_games.png
-%{tde_datadir}/icons/crystalsvg/*/apps/package_multimedia.png
-%{tde_datadir}/icons/crystalsvg/*/apps/package_network.png
-%{tde_datadir}/icons/crystalsvg/*/apps/package.png
-%{tde_datadir}/icons/crystalsvg/*/apps/package_settings.png
-%{tde_datadir}/icons/crystalsvg/*/apps/package_toys.png
-%{tde_datadir}/icons/crystalsvg/*/apps/package_utilities.png
-%{tde_datadir}/icons/crystalsvg/*/apps/penguin.png
-%{tde_datadir}/icons/crystalsvg/*/apps/personal.png
-%{tde_datadir}/icons/crystalsvg/*/apps/phppg.png
-%{tde_datadir}/icons/crystalsvg/*/apps/proxy.png
-%{tde_datadir}/icons/crystalsvg/*/apps/pysol.png
-%{tde_datadir}/icons/crystalsvg/*/apps/randr.png
-%{tde_datadir}/icons/crystalsvg/*/apps/samba.png
-%{tde_datadir}/icons/crystalsvg/*/apps/staroffice.png
-%{tde_datadir}/icons/crystalsvg/*/apps/stylesheet.png
-%{tde_datadir}/icons/crystalsvg/*/apps/terminal.png
-%{tde_datadir}/icons/crystalsvg/*/apps/tux.png
-%{tde_datadir}/icons/crystalsvg/*/apps/wp.png
-%{tde_datadir}/icons/crystalsvg/*/apps/xclock.png
-%{tde_datadir}/icons/crystalsvg/*/apps/xfmail.png
-%{tde_datadir}/icons/crystalsvg/*/apps/xmag.png
-%{tde_datadir}/icons/crystalsvg/*/apps/xpaint.png
-%{tde_datadir}/icons/crystalsvg/scalable/apps/access.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/acroread.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/aim.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/aktion.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/antivirus.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/applixware.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/arts.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/background.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/bell.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/browser.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/cache.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/camera.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/clanbomber.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/clock.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/colors.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/core.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/date.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/display.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/download_manager.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/email.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/energy.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/error.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/fifteenpieces.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/filetypes.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/fonts.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/galeon.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/gnome_apps.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/hardware.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/hwinfo.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/ieee1394.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/kcmdevices.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/kcmkwm.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/kcmx.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/locale.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/my_mac.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/netscape.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/openoffice.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/package_development.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/package_toys.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/penguin.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/personal.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/quicktime.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/realplayer.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/samba.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/shell.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/staroffice.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/stylesheet.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/terminal.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/tux.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/wine.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/x.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/xapp.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/xcalc.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/xchat.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/xclock.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/xeyes.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/xpaint.svgz
-%{tde_datadir}/icons/crystalsvg/*/devices/laptop.png
-%{tde_datadir}/icons/crystalsvg/*/devices/laptop.svgz
-%{tde_datadir}/icons/crystalsvg/*/actions/newfont.png
-%{tde_datadir}/icons/crystalsvg/*/apps/abiword.png
-%{tde_datadir}/icons/crystalsvg/*/apps/agent.png
-%{tde_datadir}/icons/crystalsvg/*/apps/alevt.png
-%{tde_datadir}/icons/crystalsvg/*/apps/assistant.png
-%{tde_datadir}/icons/crystalsvg/*/apps/blender.png
-%{tde_datadir}/icons/crystalsvg/*/apps/bluefish.png
-%{tde_datadir}/icons/crystalsvg/*/apps/cookie.png
-%{tde_datadir}/icons/crystalsvg/*/apps/designer.png
-%{tde_datadir}/icons/crystalsvg/*/apps/dia.png
-%{tde_datadir}/icons/crystalsvg/*/apps/dlgedit.png
-%{tde_datadir}/icons/crystalsvg/*/apps/eclipse.png
-%{tde_datadir}/icons/crystalsvg/*/apps/edu_languages.png
-%{tde_datadir}/icons/crystalsvg/*/apps/edu_mathematics.png
-%{tde_datadir}/icons/crystalsvg/*/apps/edu_miscellaneous.png
-%{tde_datadir}/icons/crystalsvg/*/apps/edu_science.png
-%{tde_datadir}/icons/crystalsvg/*/apps/emacs.png
-%{tde_datadir}/icons/crystalsvg/*/apps/enhanced_browsing.png
-%{tde_datadir}/icons/crystalsvg/*/apps/evolution.png
-%{tde_datadir}/icons/crystalsvg/*/apps/fifteenpieces.png
-%{tde_datadir}/icons/crystalsvg/*/apps/gabber.png
-%{tde_datadir}/icons/crystalsvg/*/apps/gaim.png
-%{tde_datadir}/icons/crystalsvg/*/apps/gnome_apps.png
-%{tde_datadir}/icons/crystalsvg/*/apps/gnomemeeting.png
-%{tde_datadir}/icons/crystalsvg/*/apps/gnucash.png
-%{tde_datadir}/icons/crystalsvg/*/apps/gnumeric.png
-%{tde_datadir}/icons/crystalsvg/*/apps/gv.png
-%{tde_datadir}/icons/crystalsvg/*/apps/gvim.png
-%{tde_datadir}/icons/crystalsvg/*/apps/icons.png
-%{tde_datadir}/icons/crystalsvg/*/apps/iconthemes.png
-%{tde_datadir}/icons/crystalsvg/*/apps/ieee1394.png
-%{tde_datadir}/icons/crystalsvg/*/apps/input_devices_settings.png
-%{tde_datadir}/icons/crystalsvg/*/apps/kcmkicker.png
-%{tde_datadir}/icons/crystalsvg/*/apps/kcmmidi.png
-%{tde_datadir}/icons/crystalsvg/*/apps/kcmprocessor.png
-%{tde_datadir}/icons/crystalsvg/*/apps/kcmscsi.png
-%{tde_datadir}/icons/crystalsvg/*/apps/kcmsound.png
-%{tde_datadir}/icons/crystalsvg/*/apps/kcmsystem.png
-%{tde_datadir}/icons/crystalsvg/*/apps/kcmx.png
-%{tde_datadir}/icons/crystalsvg/*/apps/keyboard.png
-%{tde_datadir}/icons/crystalsvg/*/apps/keyboard_layout.png
-%{tde_datadir}/icons/crystalsvg/*/apps/knotify.png
-%{tde_datadir}/icons/crystalsvg/*/apps/kvirc.png
-%{tde_datadir}/icons/crystalsvg/*/apps/linguist.png
-%{tde_datadir}/icons/crystalsvg/*/apps/lyx.png
-%{tde_datadir}/icons/crystalsvg/*/apps/mac.png
-%{tde_datadir}/icons/crystalsvg/*/apps/mathematica.png
-%{tde_datadir}/icons/crystalsvg/*/apps/nedit.png
-%{tde_datadir}/icons/crystalsvg/*/apps/opera.png
-%{tde_datadir}/icons/crystalsvg/*/apps/package_application.png
-%{tde_datadir}/icons/crystalsvg/*/apps/package_editors.png
-%{tde_datadir}/icons/crystalsvg/*/apps/package_edutainment.png
-%{tde_datadir}/icons/crystalsvg/*/apps/package_games_arcade.png
-%{tde_datadir}/icons/crystalsvg/*/apps/package_games_board.png
-%{tde_datadir}/icons/crystalsvg/*/apps/package_games_card.png
-%{tde_datadir}/icons/crystalsvg/*/apps/package_games_strategy.png
-%{tde_datadir}/icons/crystalsvg/*/apps/package_graphics.png
-%{tde_datadir}/icons/crystalsvg/*/apps/package_system.png
-%{tde_datadir}/icons/crystalsvg/*/apps/package_wordprocessing.png
-%{tde_datadir}/icons/crystalsvg/*/apps/pan.png
-%{tde_datadir}/icons/crystalsvg/*/apps/panel_settings.png
-%{tde_datadir}/icons/crystalsvg/*/apps/plan.png
-%{tde_datadir}/icons/crystalsvg/*/apps/planner.png
-%{tde_datadir}/icons/crystalsvg/*/apps/pybliographic.png
-%{tde_datadir}/icons/crystalsvg/*/apps/realplayer.png
-%{tde_datadir}/icons/crystalsvg/*/apps/remote.png
-%{tde_datadir}/icons/crystalsvg/*/apps/scribus.png
-%{tde_datadir}/icons/crystalsvg/*/apps/sodipodi.png
-%{tde_datadir}/icons/crystalsvg/*/apps/style.png
-%{tde_datadir}/icons/crystalsvg/*/apps/usb.png
-%{tde_datadir}/icons/crystalsvg/*/apps/vnc.png
-%{tde_datadir}/icons/crystalsvg/*/apps/wabi.png
-%{tde_datadir}/icons/crystalsvg/*/apps/wine.png
-%{tde_datadir}/icons/crystalsvg/*/apps/xcalc.png
-%{tde_datadir}/icons/crystalsvg/*/apps/xchat.png
-%{tde_datadir}/icons/crystalsvg/*/apps/xclipboard.png
-%{tde_datadir}/icons/crystalsvg/*/apps/xconsole.png
-%{tde_datadir}/icons/crystalsvg/*/apps/xedit.png
-%{tde_datadir}/icons/crystalsvg/*/apps/xemacs.png
-%{tde_datadir}/icons/crystalsvg/*/apps/xeyes.png
-%{tde_datadir}/icons/crystalsvg/*/apps/xfig.png
-%{tde_datadir}/icons/crystalsvg/*/apps/xload.png
-%{tde_datadir}/icons/crystalsvg/*/apps/xmms.png
-%{tde_datadir}/icons/crystalsvg/*/apps/xosview.png
-%{tde_datadir}/icons/crystalsvg/*/apps/xv.png
-%{tde_datadir}/icons/crystalsvg/*/apps/galeon.png
-%{tde_datadir}/icons/crystalsvg/*/apps/kcmdrkonqi.png
-%{tde_datadir}/icons/crystalsvg/*/apps/pinguin.png
-%{tde_datadir}/icons/crystalsvg/*/apps/x.png
-%{tde_datadir}/icons/crystalsvg/*/apps/xapp.png
-%{tde_datadir}/icons/crystalsvg/*/apps/xawtv.png
-%{tde_datadir}/icons/crystalsvg/*/apps/kcmopengl.png
-%{tde_datadir}/icons/crystalsvg/*/apps/wmaker_apps.png
-%{tde_datadir}/icons/crystalsvg/*/apps/qtella.png
-%{tde_datadir}/services/searchproviders
-%{tde_datadir}/services/useragentstrings/*.desktop
-%{tde_datadir}/servicetypes/searchprovider.desktop
-%{tde_datadir}/servicetypes/uasprovider.desktop
-%exclude %{tde_datadir}/sounds/pop.wav
-%{tde_datadir}/sounds/
-%{tde_datadir}/wallpapers/*
-
-%if "%{tde_prefix}" != "/usr"
-%{tde_prefix}/etc/xdg/menus/applications-merged/kde-essential.menu
-%{tde_prefix}/etc/xdg/menus/kde-information.menu
-%{tde_prefix}/etc/xdg/menus/kde-screensavers.menu
-%{tde_prefix}/etc/xdg/menus/kde-settings.menu
-%else
-%{_sysconfdir}/xdg/menus/applications-merged/kde-essential.menu
-%{_sysconfdir}/xdg/menus/kde-information.menu
-%{_sysconfdir}/xdg/menus/kde-screensavers.menu
-%{_sysconfdir}/xdg/menus/kde-settings.menu
-%endif
-
-%{tde_tdedocdir}/HTML/en/kcontrol/
-%exclude %{tde_tdedocdir}/HTML/en/kcontrol/kcmkonsole/
-%{tde_tdedocdir}/HTML/en/kinfocenter/
-
-%post data
-for f in crystalsvg ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f}  2> /dev/null || :
-done
-
-%if 0%{?mdkversion}
-# Mandriva-specific: we have to choose a background for current distribution variant (Free, One, Powerpack, ...)
-# First, we read the "product" key in /etc/product.id
-eval $(tr "," ";" </etc/product.id) 2>/dev/null
-# Then, we create a symbolic link to the corresponding background
-%__ln -sf "/usr/share/mdk/backgrounds/Mandriva-${product:-Free}-1280x1024-1300.jpg" "%{tde_bg}"
-%endif
-
-%postun data
-for f in crystalsvg ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f}  2> /dev/null || :
-done
-
-##########
-
-%package kio-plugins
-Summary:	core I/O slaves for TDE
-Group:		Applications/Utilities
-Requires:	trinity-kdesktop = %{version}-%{release}
-Requires:	cyrus-sasl
-Requires:	psmisc
-%if 0%{?with_hal}
-Requires:	hal >= 0.4.8
-%endif
-%if 0%{?rhel} == 4 || 0%{?suse_version}
-Requires:	cryptsetup
-%else
-Requires:	cryptsetup-luks
-%endif
-
-Obsoletes:	tdebase-kio-plugins < %{version}-%{release}
-Provides:	tdebase-kio-plugins = %{version}-%{release}
-
-%description kio-plugins
-This package includes the base kioslaves. They include, amongst many
-others, file, http, and ftp.
-
-It also includes the media kioslave, which handles removable devices,
-and which works best with hal (and therefore udev) and pmount. Media
-also extends the functionality of many other kioslaves. To use this
-service, please make sure that your user is a member of the plugdev
-group.
-
-%files kio-plugins
-%defattr(-,root,root,-)
-%{tde_bindir}/kio_media_mounthelper
-%{tde_bindir}/ktrash
-%{tde_tdelibdir}/cursorthumbnail.la
-%{tde_tdelibdir}/cursorthumbnail.so
-%{tde_tdelibdir}/djvuthumbnail.la
-%{tde_tdelibdir}/djvuthumbnail.so
-%{tde_tdelibdir}/htmlthumbnail.la
-%{tde_tdelibdir}/htmlthumbnail.so
-%{tde_tdelibdir}/imagethumbnail.la
-%{tde_tdelibdir}/imagethumbnail.so
-%{tde_tdelibdir}/kcm_cgi.la
-%{tde_tdelibdir}/kcm_cgi.so
-%{tde_tdelibdir}/kcm_media.la
-%{tde_tdelibdir}/kcm_media.so
-%{tde_tdelibdir}/kded_homedirnotify.la
-%{tde_tdelibdir}/kded_homedirnotify.so
-%{tde_tdelibdir}/kded_mediamanager.la
-%{tde_tdelibdir}/kded_mediamanager.so
-%{tde_tdelibdir}/kded_medianotifier.la
-%{tde_tdelibdir}/kded_medianotifier.so
-%{tde_tdelibdir}/kded_remotedirnotify.la
-%{tde_tdelibdir}/kded_remotedirnotify.so
-%{tde_tdelibdir}/kded_systemdirnotify.la
-%{tde_tdelibdir}/kded_systemdirnotify.so
-%{tde_tdelibdir}/kfile_media.la
-%{tde_tdelibdir}/kfile_media.so
-%{tde_tdelibdir}/kfile_trash.la
-%{tde_tdelibdir}/kfile_trash.so
-%{tde_tdelibdir}/kio_about.la
-%{tde_tdelibdir}/kio_about.so
-%{tde_tdelibdir}/kio_cgi.la
-%{tde_tdelibdir}/kio_cgi.so
-%{tde_tdelibdir}/kio_filter.la
-%{tde_tdelibdir}/kio_filter.so
-%{tde_tdelibdir}/kio_finger.la
-%{tde_tdelibdir}/kio_finger.so
-%{tde_tdelibdir}/kio_fish.la
-%{tde_tdelibdir}/kio_fish.so
-%{tde_tdelibdir}/kio_floppy.la
-%{tde_tdelibdir}/kio_floppy.so
-%{tde_tdelibdir}/kio_home.la
-%{tde_tdelibdir}/kio_home.so
-%{tde_tdelibdir}/kio_info.la
-%{tde_tdelibdir}/kio_info.so
-%{tde_tdelibdir}/kio_mac.la
-%{tde_tdelibdir}/kio_mac.so
-%{tde_tdelibdir}/kio_man.la
-%{tde_tdelibdir}/kio_man.so
-%{tde_tdelibdir}/kio_media.la
-%{tde_tdelibdir}/kio_media.so
-%{tde_tdelibdir}/kio_nfs.la
-%{tde_tdelibdir}/kio_nfs.so
-%{tde_tdelibdir}/kio_remote.la
-%{tde_tdelibdir}/kio_remote.so
-%{tde_tdelibdir}/kio_settings.la
-%{tde_tdelibdir}/kio_settings.so
-%{tde_tdelibdir}/kio_sftp.la
-%{tde_tdelibdir}/kio_sftp.so
-%{tde_tdelibdir}/kio_smb.la
-%{tde_tdelibdir}/kio_smb.so
-%{tde_tdelibdir}/kio_system.la
-%{tde_tdelibdir}/kio_system.so
-%{tde_tdelibdir}/kio_tar.la
-%{tde_tdelibdir}/kio_tar.so
-%{tde_tdelibdir}/kio_thumbnail.la
-%{tde_tdelibdir}/kio_thumbnail.so
-%{tde_tdelibdir}/kio_trash.la
-%{tde_tdelibdir}/kio_trash.so
-%{tde_tdelibdir}/libkmanpart.la
-%{tde_tdelibdir}/libkmanpart.so
-%{tde_tdelibdir}/textthumbnail.la
-%{tde_tdelibdir}/textthumbnail.so
-%{tde_tdeappdir}/kcmcgi.desktop
-%{tde_datadir}/apps/kio_finger/kio_finger.css
-%{tde_datadir}/apps/kio_finger/kio_finger.pl
-%{tde_datadir}/apps/kio_info/kde-info2html
-%{tde_datadir}/apps/kio_info/kde-info2html.conf
-%{tde_datadir}/apps/kio_man/kio_man.css
-%{tde_datadir}/apps/konqueror/dirtree/remote/smb-network.desktop
-%{tde_datadir}/apps/remoteview/smb-network.desktop
-%{tde_datadir}/apps/systemview/*.desktop
-%{tde_datadir}/config.kcfg/mediamanagersettings.kcfg
-%{tde_datadir}/mimelnk/application/x-smb-server.desktop
-%{tde_datadir}/mimelnk/application/x-smb-workgroup.desktop
-%{tde_datadir}/mimelnk/inode/system_directory.desktop
-%{tde_datadir}/mimelnk/media/*.desktop
-%{tde_datadir}/services/about.protocol
-%{tde_datadir}/services/applications.protocol
-%{tde_datadir}/services/ar.protocol
-%{tde_datadir}/services/bzip.protocol
-%{tde_datadir}/services/bzip2.protocol
-%{tde_datadir}/services/cgi.protocol
-%{tde_datadir}/services/cursorthumbnail.desktop
-%{tde_datadir}/services/djvuthumbnail.desktop
-%{tde_datadir}/services/finger.protocol
-%{tde_datadir}/services/fish.protocol
-%{tde_datadir}/services/floppy.protocol
-%{tde_datadir}/services/gzip.protocol
-%{tde_datadir}/services/home.protocol
-%{tde_datadir}/services/htmlthumbnail.desktop
-%{tde_datadir}/services/imagethumbnail.desktop
-%{tde_datadir}/services/info.protocol
-%{tde_datadir}/services/kded/homedirnotify.desktop
-%{tde_datadir}/services/kded/mediamanager.desktop
-%{tde_datadir}/services/kded/medianotifier.desktop
-%{tde_datadir}/services/kded/remotedirnotify.desktop
-%{tde_datadir}/services/kded/systemdirnotify.desktop
-%{tde_datadir}/services/kfile_media.desktop
-%{tde_datadir}/services/kfile_trash_system.desktop
-%{tde_datadir}/services/kmanpart.desktop
-%{tde_datadir}/services/mac.protocol
-%{tde_datadir}/services/man.protocol
-%{tde_datadir}/services/media.protocol
-%{tde_datadir}/services/nfs.protocol
-%{tde_datadir}/services/nxfish.protocol
-%{tde_datadir}/services/programs.protocol
-%{tde_datadir}/services/remote.protocol
-%{tde_datadir}/services/settings.protocol
-%{tde_datadir}/services/sftp.protocol
-%{tde_datadir}/services/smb.protocol
-%{tde_datadir}/services/system.protocol
-%{tde_datadir}/services/tar.protocol
-%{tde_datadir}/services/textthumbnail.desktop
-%{tde_datadir}/services/thumbnail.protocol
-%{tde_datadir}/services/trash.protocol
-%{tde_datadir}/services/zip.protocol
-%{tde_datadir}/servicetypes/thumbcreator.desktop
-%{tde_datadir}/services/kfile_trash.desktop
-%{tde_tdedocdir}/HTML/en/kioslave/
-%if 0%{?with_exr}
-%{tde_tdelibdir}/exrthumbnail.la
-%{tde_tdelibdir}/exrthumbnail.so
-%{tde_datadir}/services/exrthumbnail.desktop
-%endif
-%if 0%{?with_hal}
-%{tde_tdelibdir}/media_propsdlgplugin.la
-%{tde_tdelibdir}/media_propsdlgplugin.so
-%{tde_datadir}/services/media_propsdlgplugin.desktop
-%endif
-
-%post kio-plugins
-update-desktop-database %{tde_appdir} 2> /dev/null || : 
-
-%postun kio-plugins
-update-desktop-database %{tde_appdir} 2> /dev/null || : 
-
-
-##########
-
-%package -n trinity-kdepasswd
-Summary:	password changer for TDE
-Group:		Applications/Utilities
-
-%description -n trinity-kdepasswd
-This is a simple application which allows users to change their
-system passwords.
-
-%files -n trinity-kdepasswd
-%defattr(-,root,root,-)
-%{tde_bindir}/kdepasswd
-%{tde_tdelibdir}/kcm_useraccount.la
-%{tde_tdelibdir}/kcm_useraccount.so
-%{tde_tdeappdir}/kcm_useraccount.desktop
-%{tde_tdeappdir}/kdepasswd.desktop
-%exclude %{tde_datadir}/apps/[kt]dm/pics/users/default1.png
-%exclude %{tde_datadir}/apps/[kt]dm/pics/users/default2.png
-%exclude %{tde_datadir}/apps/[kt]dm/pics/users/default3.png
-%exclude %{tde_datadir}/apps/[kt]dm/pics/users/root1.png
-%{tde_datadir}/apps/[kt]dm/pics/users/*.png
-%{tde_datadir}/config.kcfg/kcm_useraccount.kcfg
-%{tde_datadir}/config.kcfg/kcm_useraccount_pass.kcfg
-
-%post -n trinity-kdepasswd
-update-desktop-database %{tde_appdir} 2> /dev/null || : 
-
-%postun -n trinity-kdepasswd
-update-desktop-database %{tde_appdir} 2> /dev/null || : 
-
-##########
-
-%package -n trinity-tdeprint
-Summary:	print system for TDE
-Group:		Applications/Utilities
-Requires:	%{name}-data = %{version}-%{release}
-Requires:	psutils
-
-%description -n trinity-tdeprint
-This package contains the TDE printing subsystem. It can use CUPS,
-lpd-ng or the traditional lpd. It also includes support for fax and
-pdf printing.
-
-Installation of smbclient will make you able to use smb shared printers.
-
-%files -n trinity-tdeprint
-%defattr(-,root,root,-)
-%{tde_bindir}/[kt]deprintfax
-%{tde_bindir}/kjobviewer
-%{tde_bindir}/kprinter
-%{tde_tdelibdir}/kcm_printmgr.la
-%{tde_tdelibdir}/kcm_printmgr.so
-%{tde_tdelibdir}/kio_print.la
-%{tde_tdelibdir}/kio_print.so
-%{tde_tdelibdir}/kjobviewer.la
-%{tde_tdelibdir}/kjobviewer.so
-%{tde_tdelibdir}/kprinter.la
-%{tde_tdelibdir}/kprinter.so
-%{tde_tdelibdir}/lib[kt]deprint_part.la
-%{tde_tdelibdir}/lib[kt]deprint_part.so
-%{tde_libdir}/lib[kt]deinit_kjobviewer.la
-%{tde_libdir}/lib[kt]deinit_kjobviewer.so
-%{tde_libdir}/lib[kt]deinit_kprinter.la
-%{tde_libdir}/lib[kt]deinit_kprinter.so
-%{tde_tdeappdir}/[kt]deprintfax.desktop
-%{tde_tdeappdir}/[kt]jobviewer.desktop
-%{tde_tdeappdir}/printers.desktop
-%{tde_datadir}/apps/[kt]deprint/
-%{tde_datadir}/apps/[kt]deprintfax/
-%{tde_datadir}/apps/[kt]jobviewer/
-%{tde_datadir}/apps/[kt]deprint_part/kdeprint_part.rc
-%{tde_datadir}/icons/hicolor/*/apps/kdeprintfax.png
-%{tde_datadir}/icons/hicolor/*/apps/kjobviewer.png
-%{tde_datadir}/icons/hicolor/*/apps/printmgr.png
-%{tde_datadir}/icons/hicolor/scalable/apps/kdeprintfax.svgz
-%{tde_datadir}/icons/hicolor/scalable/apps/kjobviewer.svgz
-%{tde_datadir}/icons/hicolor/scalable/apps/printmgr.svgz
-%{tde_datadir}/mimelnk/print/class.desktop
-%{tde_datadir}/mimelnk/print/driver.desktop
-%{tde_datadir}/mimelnk/print/folder.desktop
-%{tde_datadir}/mimelnk/print/jobs.desktop
-%{tde_datadir}/mimelnk/print/manager.desktop
-%{tde_datadir}/mimelnk/print/printer.desktop
-%{tde_datadir}/mimelnk/print/printermodel.desktop
-%{tde_datadir}/services/kdeprint_part.desktop
-%{tde_datadir}/services/print.protocol
-%{tde_datadir}/services/printdb.protocol
-%{tde_tdedocdir}/HTML/en/[kt]deprint/
-
-%post -n trinity-tdeprint
-/sbin/ldconfig || :
-update-desktop-database %{tde_appdir} 2> /dev/null || : 
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f}  2> /dev/null || :
-done
-
-%postun -n trinity-tdeprint
-/sbin/ldconfig || :
-update-desktop-database %{tde_appdir} 2> /dev/null || : 
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f}  2> /dev/null || :
-done
-
-##########
-
-%package -n trinity-kdesktop
-Summary:	miscellaneous binaries and files for the TDE desktop
-Group:		Applications/Utilities
-Requires:	%{name}-bin = %{version}-%{release}
-Requires:	%{name}-data = %{version}-%{release}
-Requires:	trinity-libkonq = %{version}-%{release}
-Requires:	eject
-%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion}
-Requires:	xdg-utils
-%endif
-
-%description -n trinity-kdesktop
-This package contains miscellaneous binaries and files integral to
-the TDE desktop.
-
-%files -n trinity-kdesktop
-%defattr(-,root,root,-)
-%{tde_datadir}/config/kdesktop_custom_menu1
-%{tde_datadir}/config/kdesktop_custom_menu2
-%{tde_bindir}/kcheckrunning
-%{tde_bindir}/kxdglauncher
-%{tde_bindir}/kdeeject
-%{tde_bindir}/kdesktop
-%{tde_bindir}/kdesktop_lock
-%{tde_bindir}/kwebdesktop
-%{tde_tdelibdir}/kdesktop.la
-%{tde_tdelibdir}/kdesktop.so
-%{tde_libdir}/lib[kt]deinit_kdesktop.la
-%{tde_libdir}/lib[kt]deinit_kdesktop.so
-%{tde_datadir}/apps/kdesktop/
-%{tde_datadir}/apps/konqueror/servicemenus/kdesktopSetAsBackground.desktop
-%{tde_datadir}/autostart/kdesktop.desktop
-%{tde_datadir}/config.kcfg/kdesktop.kcfg
-%{tde_datadir}/config.kcfg/klaunch.kcfg
-%{tde_datadir}/config.kcfg/kwebdesktop.kcfg
-%{tde_datadir}/icons/crystalsvg/*/apps/error.png
-
-%post -n trinity-kdesktop
-/sbin/ldconfig || :
-for f in crystalsvg ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f}  2> /dev/null || :
-done
-
-%postun -n trinity-kdesktop
-/sbin/ldconfig || :
-for f in crystalsvg ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f}  2> /dev/null || :
-done
-
-##########
-
-%package -n trinity-kdesktop-devel
-Summary:	Development files for kdesktop
-Group:		Development/Libraries
-Requires:	trinity-kdesktop = %{version}-%{release}
-
-%description -n trinity-kdesktop-devel
-%{summary}
-
-%files -n trinity-kdesktop-devel
-%{tde_tdeincludedir}/KBackgroundIface.h
-%{tde_tdeincludedir}/KDesktopIface.h
-%{tde_tdeincludedir}/KScreensaverIface.h
-
-##########
-
-%package -n trinity-tdm
-Summary:	X Display manager for TDE
-Group:		Applications/Utilities
-Requires:	%{name}-bin = %{version}-%{release}
-Requires:	%{name}-data = %{version}-%{release}
-Requires:	pam
-
-# Provides the global Xsession script (/etc/X11/xinit/Xsession or /etc/X11/Xsession)
-%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} == 4
-Requires:	xinitrc
-%endif
-%if 0%{?suse_version}
-Requires:	xdm
-%endif
-%if 0%{?rhel} >= 5 || 0%{?fedora}
-Requires:	xorg-x11-xinit
-%endif
-
-# Required for Fedora LiveCD
-Provides:	service(graphical-login)
-
-%description -n trinity-tdm
-tdm manages a collection of X servers, which may be on the local host or
-remote machines. It provides services similar to those provided by init,
-getty, and login on character-based terminals: prompting for login name and
-password, authenticating the user, and running a session. tdm supports XDMCP
-(X Display Manager Control Protocol) and can also be used to run a chooser
-process which presents the user with a menu of possible hosts that offer
-XDMCP display management.
-
-A collection of icons to associate with individual users is included with
-TDE, but as part of the kdepasswd package.
-
-The menu package will help to provide TDM with a list of window managers
-that can be launched, if the window manager does not register with TDM
-already. Most users won't need this.
-
-%files -n trinity-tdm
-%defattr(-,root,root,-)
-%{tde_tdelibdir}/kgreet_pam.la
-%{tde_tdelibdir}/kgreet_pam.so
-%{tde_bindir}/gen[kt]dmconf
-%{tde_bindir}/[kt]dm
-%{tde_bindir}/[kt]dm_config
-%{tde_bindir}/[kt]dmctl
-%{tde_bindir}/[kt]dm_greet
-%{tde_bindir}/krootimage
-%{tde_datadir}/apps/[kt]dm/pics/kdelogo.png
-%{tde_datadir}/apps/[kt]dm/pics/kdelogo-crystal.png
-%{tde_datadir}/apps/[kt]dm/pics/shutdown.jpg
-%{tde_datadir}/apps/[kt]dm/pics/users/default1.png
-%{tde_datadir}/apps/[kt]dm/pics/users/default2.png
-%{tde_datadir}/apps/[kt]dm/pics/users/default3.png
-%{tde_datadir}/apps/[kt]dm/pics/users/root1.png
-%{tde_datadir}/apps/[kt]dm/sessions/*.desktop
-%{tde_datadir}/apps/[kt]dm/themes/
-%{tde_datadir}/config/[kt]dm/
-%{tde_tdedocdir}/HTML/en/[kt]dm/
-%if 0%{?suse_version} == 0
-%{_sysconfdir}/pam.d/kdm-trinity
-%{_sysconfdir}/pam.d/kdm-trinity-np
-%endif
-
-# Distribution specific stuff
-%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version}
-%{_usr}/share/xsessions/tde.desktop
-%endif
-
-# https://wiki.mageia.org/en/How_to_add_a_new_Window_Manager_or_Display_Manager
-%if 0%{?mgaversion} || 0%{?mdkversion}
-%{_sysconfdir}/X11/wmsession.d/45TDE
-%{_datadir}/X11/dm.d/45TDE.conf
-%endif
-
-##########
-
-%package -n trinity-tdm-devel
-Summary:	Development files for tdm
-Group:		Development/Libraries
-Requires:	trinity-tdm = %{version}-%{release}
-
-%description -n trinity-tdm-devel
-%{summary}
-
-%files -n trinity-tdm-devel
-%{tde_tdeincludedir}/kgreeterplugin.h
-
-##########
-
-%package -n trinity-kfind
-Summary:	file-find utility for TDE
-Group:		Applications/Utilities
-Requires:	%{name}-data = %{version}-%{release}
-
-%description -n trinity-kfind
-kfind can be used to find files and directories on your
-workstations.
-
-%files -n trinity-kfind
-%defattr(-,root,root,-)
-%{tde_bindir}/kfind
-%{tde_tdelibdir}/libkfindpart.la
-%{tde_tdelibdir}/libkfindpart.so
-%{tde_tdeappdir}/Kfind.desktop
-%{tde_datadir}/apps/kfindpart/
-%{tde_datadir}/icons/hicolor/*/apps/kfind.png
-%{tde_datadir}/services/kfindpart.desktop
-%{tde_datadir}/servicetypes/findpart.desktop
-%{tde_tdedocdir}/HTML/en/kfind/
-
-%post -n trinity-kfind
-update-desktop-database %{tde_appdir} 2> /dev/null || : 
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f}  2> /dev/null || :
-done
-
-%postun -n trinity-kfind
-update-desktop-database %{tde_appdir} 2> /dev/null || : 
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f}  2> /dev/null || :
-done
-
-##########
-
-%package -n trinity-khelpcenter
-Summary:	help center for TDE
-Group:		Applications/Utilities
-Requires:	%{name}-data = %{version}-%{release}
-Requires:	htdig
-
-%description -n trinity-khelpcenter
-The TDE Help Center provides documentation on how to use the KDE desktop.
-
-The htdig package is needed to build a searchable archive of TDE
-documentation.
-
-%files -n trinity-khelpcenter
-%defattr(-,root,root,-)
-%{tde_bindir}/khc_beagle_index.pl
-%{tde_bindir}/khc_beagle_search.pl
-%{tde_bindir}/khc_docbookdig.pl
-%{tde_bindir}/khc_htdig.pl
-%{tde_bindir}/khc_htsearch.pl
-%{tde_bindir}/khc_indexbuilder
-%{tde_bindir}/khc_mansearch.pl
-%{tde_bindir}/khelpcenter
-%{tde_tdelibdir}/khelpcenter.la
-%{tde_tdelibdir}/khelpcenter.so
-%{tde_libdir}/lib[kt]deinit_khelpcenter.la
-%{tde_libdir}/lib[kt]deinit_khelpcenter.so
-%{tde_tdeappdir}/Help.desktop
-%{tde_datadir}/apps/khelpcenter/
-%{tde_datadir}/config.kcfg/khelpcenter.kcfg
-%{tde_datadir}/icons/hicolor/*/apps/khelpcenter.*
-%{tde_datadir}/services/khelpcenter.desktop
-%{tde_tdedocdir}/HTML/en/khelpcenter/
-
-%post -n trinity-khelpcenter
-update-desktop-database %{tde_appdir} 2> /dev/null || : 
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f}  2> /dev/null || :
-done
-/sbin/ldconfig || :
-
-%postun -n trinity-khelpcenter
-update-desktop-database %{tde_appdir} 2> /dev/null || : 
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f}  2> /dev/null || :
-done
-/sbin/ldconfig || :
-
-##########
-
-%package -n trinity-kicker
-Summary:	desktop panel for TDE
-Group:		Applications/Utilities
-Requires:	%{name}-data = %{version}-%{release}
-
-%description -n trinity-kicker
-Kicker provides the TDE panel on you desktop. It can be used as a
-program launcher and can load plugins to provide additional
-functionality.
-
-%files -n trinity-kicker
-%defattr(-,root,root,-)
-%{tde_bindir}/appletproxy
-%{tde_bindir}/extensionproxy
-%{tde_bindir}/kasbar
-%{tde_bindir}/kicker
-%{tde_libdir}/kconf_update_bin/kicker-3.4-reverseLayout
-%{tde_tdelibdir}/appletproxy.la
-%{tde_tdelibdir}/appletproxy.so
-%{tde_tdelibdir}/clock_panelapplet.la
-%{tde_tdelibdir}/clock_panelapplet.so
-%{tde_tdelibdir}/dockbar_panelextension.la
-%{tde_tdelibdir}/dockbar_panelextension.so
-%{tde_tdelibdir}/extensionproxy.la
-%{tde_tdelibdir}/extensionproxy.so
-%{tde_tdelibdir}/kasbar_panelextension.la
-%{tde_tdelibdir}/kasbar_panelextension.so
-%{tde_tdelibdir}/kicker.la
-%{tde_tdelibdir}/kickermenu_find.la
-%{tde_tdelibdir}/kickermenu_find.so
-%{tde_tdelibdir}/kickermenu_kate.so
-%{tde_tdelibdir}/kickermenu_kate.la
-%{tde_tdelibdir}/kickermenu_[kt]deprint.la
-%{tde_tdelibdir}/kickermenu_[kt]deprint.so
-%{tde_tdelibdir}/kickermenu_konqueror.la
-%{tde_tdelibdir}/kickermenu_konqueror.so
-%{tde_tdelibdir}/kickermenu_konsole.la
-%{tde_tdelibdir}/kickermenu_konsole.so
-%{tde_tdelibdir}/kickermenu_prefmenu.la
-%{tde_tdelibdir}/kickermenu_prefmenu.so
-%{tde_tdelibdir}/kickermenu_recentdocs.la
-%{tde_tdelibdir}/kickermenu_recentdocs.so
-%{tde_tdelibdir}/kickermenu_remotemenu.la
-%{tde_tdelibdir}/kickermenu_remotemenu.so
-%{tde_tdelibdir}/kickermenu_systemmenu.la
-%{tde_tdelibdir}/kickermenu_systemmenu.so
-%{tde_tdelibdir}/kicker.so
-%{tde_tdelibdir}/launcher_panelapplet.la
-%{tde_tdelibdir}/launcher_panelapplet.so
-%{tde_tdelibdir}/lockout_panelapplet.la
-%{tde_tdelibdir}/lockout_panelapplet.so
-%{tde_tdelibdir}/media_panelapplet.la
-%{tde_tdelibdir}/media_panelapplet.so
-%{tde_tdelibdir}/menu_panelapplet.la
-%{tde_tdelibdir}/menu_panelapplet.so
-%{tde_tdelibdir}/minipager_panelapplet.la
-%{tde_tdelibdir}/minipager_panelapplet.so
-%{tde_tdelibdir}/naughty_panelapplet.la
-%{tde_tdelibdir}/naughty_panelapplet.so
-%{tde_tdelibdir}/run_panelapplet.la
-%{tde_tdelibdir}/run_panelapplet.so
-%{tde_tdelibdir}/sidebar_panelextension.la
-%{tde_tdelibdir}/sidebar_panelextension.so
-%{tde_tdelibdir}/systemtray_panelapplet.la
-%{tde_tdelibdir}/systemtray_panelapplet.so
-%{tde_tdelibdir}/taskbar_panelapplet.la
-%{tde_tdelibdir}/taskbar_panelapplet.so
-%{tde_tdelibdir}/taskbar_panelextension.la
-%{tde_tdelibdir}/taskbar_panelextension.so
-%{tde_tdelibdir}/trash_panelapplet.la
-%{tde_tdelibdir}/trash_panelapplet.so
-%{tde_libdir}/libkasbar.so.*
-%{tde_libdir}/lib[kt]deinit_appletproxy.la
-%{tde_libdir}/lib[kt]deinit_appletproxy.so
-%{tde_libdir}/lib[kt]deinit_extensionproxy.la
-%{tde_libdir}/lib[kt]deinit_extensionproxy.so
-%{tde_libdir}/lib[kt]deinit_kicker.la
-%{tde_libdir}/lib[kt]deinit_kicker.so
-%{tde_libdir}/libkickermain.so.*
-%{tde_libdir}/libtaskbar.so.*
-%{tde_libdir}/libtaskmanager.so.*
-%{tde_libdir}/libkickoffsearch_interfaces.so.*
-%{tde_tdeappdir}/kcmkicker.desktop
-%{tde_datadir}/applnk/.hidden/kicker_config_arrangement.desktop
-%{tde_datadir}/applnk/.hidden/kicker_config_hiding.desktop
-%{tde_datadir}/applnk/.hidden/kicker_config_menus.desktop
-%{tde_datadir}/apps/clockapplet/pics/lcd.png
-%{tde_datadir}/apps/kconf_update/kicker-3.1-properSizeSetting.pl
-%{tde_datadir}/apps/kconf_update/kicker-3.5-kconfigXTize.pl
-%{tde_datadir}/apps/kconf_update/kicker-3.5-taskbarEnums.pl
-%{tde_datadir}/apps/kconf_update/kickerrc.upd
-%{tde_datadir}/apps/kicker/
-%exclude %{tde_datadir}/apps/kicker/applets/klipper.desktop
-%exclude %{tde_datadir}/apps/kicker/applets/ksysguardapplet.desktop
-%{tde_datadir}/apps/naughtyapplet/pics/naughty-happy.png
-%{tde_datadir}/apps/naughtyapplet/pics/naughty-sad.png
-%{tde_datadir}/autostart/panel.desktop
-%{tde_datadir}/config.kcfg/kickerSettings.kcfg
-%{tde_datadir}/config.kcfg/launcherapplet.kcfg
-%{tde_datadir}/config.kcfg/pagersettings.kcfg
-%{tde_datadir}/config.kcfg/taskbar.kcfg
-%{tde_datadir}/icons/crystalsvg/*/apps/systemtray.png
-%{tde_datadir}/icons/crystalsvg/*/apps/taskbar.png
-%{tde_datadir}/icons/crystalsvg/*/apps/kbinaryclock.png
-%{tde_datadir}/icons/crystalsvg/*/apps/kdisknav.png
-%{tde_datadir}/icons/crystalsvg/*/apps/kicker.png
-%{tde_datadir}/icons/crystalsvg/*/apps/panel.png
-%{tde_datadir}/icons/crystalsvg/*/apps/runprocesscatcher.png
-%{tde_datadir}/icons/crystalsvg/*/apps/window_list.png
-%{tde_datadir}/icons/crystalsvg/*/apps/kbinaryclock.svgz
-%{tde_datadir}/icons/crystalsvg/*/apps/systemtray.svgz
-%{tde_datadir}/servicetypes/kickoffsearchplugin.desktop
-%{tde_tdedocdir}/HTML/en/kicker/
-
-%post -n trinity-kicker
-update-desktop-database %{tde_appdir} 2> /dev/null || : 
-for f in crystalsvg ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f}  2> /dev/null || :
-done
-/sbin/ldconfig || :
-
-%postun -n trinity-kicker
-update-desktop-database %{tde_appdir} 2> /dev/null || : 
-for f in crystalsvg ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f}  2> /dev/null || :
-done
-/sbin/ldconfig || :
-
-##########
-
-%package -n trinity-kicker-devel
-Summary:	Development files for kicker
-Group:		Development/Libraries
-Requires:	trinity-kicker = %{version}-%{release}
-
-%description -n trinity-kicker-devel
-%{summary}
-
-%files -n trinity-kicker-devel
-%{tde_tdeincludedir}/kickoff-search-plugin.h
-%{tde_tdeincludedir}/kickoffsearchinterface.h
-%{tde_libdir}/libkasbar.la
-%{tde_libdir}/libkasbar.so
-%{tde_libdir}/libkickermain.la
-%{tde_libdir}/libkickermain.so
-%{tde_libdir}/libkickoffsearch_interfaces.la
-%{tde_libdir}/libkickoffsearch_interfaces.so
-%{tde_libdir}/libtaskbar.la
-%{tde_libdir}/libtaskbar.so
-%{tde_libdir}/libtaskmanager.la
-%{tde_libdir}/libtaskmanager.so
-
-%post -n trinity-kicker-devel
-/sbin/ldconfig || :
-
-%postun -n trinity-kicker-devel
-/sbin/ldconfig || :
-
-##########
-
-%package -n trinity-klipper
-Summary:	clipboard utility for Trinity
-Group:		Applications/Utilities
-Requires:	%{name}-data = %{version}-%{release}
-
-%description -n trinity-klipper
-klipper provides standard clipboard functions (cut and paste, history
-saving) plus additional features, like the ability to offer actions to 
-take dependent on the clipboard contents. For example, it can launch a 
-web browser if the clipboard contains a URL.
-
-%files -n trinity-klipper
-%defattr(-,root,root,-)
-%{tde_bindir}/klipper
-%{tde_datadir}/config/klipperrc
-%{tde_tdelibdir}/klipper.la
-%{tde_tdelibdir}/klipper.so
-%{tde_tdelibdir}/klipper_panelapplet.la
-%{tde_tdelibdir}/klipper_panelapplet.so
-%{tde_libdir}/lib[kt]deinit_klipper.la
-%{tde_libdir}/lib[kt]deinit_klipper.so
-%{tde_tdeappdir}/klipper.desktop
-%{tde_datadir}/apps/kconf_update/klipper-1-2.pl
-%{tde_datadir}/apps/kconf_update/klipper-trinity1.sh
-%{tde_datadir}/apps/kconf_update/klipperrc.upd
-%{tde_datadir}/apps/kconf_update/klippershortcuts.upd
-%{tde_datadir}/apps/kicker/applets/klipper.desktop
-%{tde_datadir}/autostart/klipper.desktop
-%{tde_datadir}/icons/hicolor/*/apps/klipper.*
-%{tde_tdedocdir}/HTML/en/klipper/
-
-%post -n trinity-klipper
-update-desktop-database %{tde_appdir} 2> /dev/null || : 
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f}  2> /dev/null || :
-done
-/sbin/ldconfig || :
-
-%postun -n trinity-klipper
-update-desktop-database %{tde_appdir} 2> /dev/null || : 
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f}  2> /dev/null || :
-done
-/sbin/ldconfig || :
-
-##########
-
-%package -n trinity-kmenuedit
-Summary:	menu editor for TDE
-Group:		Applications/Utilities
-Requires:	%{name}-data = %{version}-%{release}
-
-%description -n trinity-kmenuedit
-The TDE menu editor allows you to make customisations to the KDE menu
-structure.
-
-%files -n trinity-kmenuedit
-%defattr(-,root,root,-)
-%{tde_bindir}/kcontroledit
-%{tde_bindir}/kmenuedit
-%{tde_tdelibdir}/kcontroledit.la
-%{tde_tdelibdir}/kcontroledit.so
-%{tde_tdelibdir}/kmenuedit.la
-%{tde_tdelibdir}/kmenuedit.so
-%{tde_libdir}/lib[kt]deinit_kcontroledit.la
-%{tde_libdir}/lib[kt]deinit_kcontroledit.so
-%{tde_libdir}/lib[kt]deinit_kmenuedit.la
-%{tde_libdir}/lib[kt]deinit_kmenuedit.so
-%{tde_tdeappdir}/kmenuedit.desktop
-%{tde_datadir}/applnk/System/kmenuedit.desktop
-%{tde_datadir}/apps/kcontroledit/
-%{tde_datadir}/apps/kmenuedit/
-%{tde_tdedocdir}/HTML/en/kmenuedit/
-
-%post -n trinity-kmenuedit
-update-desktop-database %{tde_appdir} 2> /dev/null || : 
-/sbin/ldconfig || :
-
-%postun -n trinity-kmenuedit
-update-desktop-database %{tde_appdir} 2> /dev/null || : 
-/sbin/ldconfig || :
-
-##########
-
-%package -n trinity-konqueror
-Summary:	TDE's advanced file manager, web browser and document viewer
-Group:		Applications/Utilities
-Requires:	%{name}-data = %{version}-%{release}
-Requires:	trinity-kcontrol = %{version}-%{release}
-Requires:	%{name}-kio-plugins = %{version}-%{release}
-Requires:	trinity-kdesktop = %{version}-%{release}
-Requires:	trinity-kfind = %{version}-%{release}
-Requires:	trinity-libkonq = %{version}-%{release}
-
-%description -n trinity-konqueror
-Konqueror is the file manager for the Trinity Desktop Environment.
-It supports basic file management on local UNIX filesystems,
-from simple cut/copy and paste operations to advanced remote
-and local network file browsing.
-
-It is also the canvas for all the latest TDE technology,
-from KIO slaves (which provide mechanisms for file access) to
-component embedding via the KParts object interface, and it
-is one of the most customizable applications available.
-
-Konqueror is an Open Source web browser with HTML4.0 compliance,
-supporting Java applets, JavaScript, CSS1 and (partially) CSS2,
-as well as Netscape plugins (for example, Flash or RealVideo plugins).
-
-It is a universal viewing application, capable of embedding
-read-only viewing components in itself to view documents without
-ever launching another application.
-
-%files -n trinity-konqueror
-%defattr(-,root,root,-)
-%{tde_datadir}/config/konqsidebartng.rc
-%{tde_bindir}/kbookmarkmerger
-%{tde_bindir}/keditbookmarks
-%{tde_bindir}/kfmclient
-%{tde_bindir}/konqueror
-%{tde_tdelibdir}/kcm_history.la
-%{tde_tdelibdir}/kcm_history.so
-%{tde_tdelibdir}/kded_konqy_preloader.la
-%{tde_tdelibdir}/kded_konqy_preloader.so
-%{tde_tdelibdir}/keditbookmarks.la
-%{tde_tdelibdir}/keditbookmarks.so
-%{tde_tdelibdir}/kfmclient.la
-%{tde_tdelibdir}/kfmclient.so
-%{tde_tdelibdir}/konq_aboutpage.la
-%{tde_tdelibdir}/konq_aboutpage.so
-%{tde_tdelibdir}/konq_iconview.la
-%{tde_tdelibdir}/konq_iconview.so
-%{tde_tdelibdir}/konq_listview.la
-%{tde_tdelibdir}/konq_listview.so
-%{tde_tdelibdir}/konq_remoteencoding.la
-%{tde_tdelibdir}/konq_remoteencoding.so
-%{tde_tdelibdir}/konq_shellcmdplugin.la
-%{tde_tdelibdir}/konq_shellcmdplugin.so
-%{tde_tdelibdir}/konq_sidebar.la
-%{tde_tdelibdir}/konq_sidebar.so
-%{tde_tdelibdir}/konq_sidebartree_bookmarks.la
-%{tde_tdelibdir}/konq_sidebartree_bookmarks.so
-%{tde_tdelibdir}/konq_sidebartree_dirtree.la
-%{tde_tdelibdir}/konq_sidebartree_dirtree.so
-%{tde_tdelibdir}/konq_sidebartree_history.la
-%{tde_tdelibdir}/konq_sidebartree_history.so
-%{tde_tdelibdir}/konqsidebar_tree.la
-%{tde_tdelibdir}/konqsidebar_tree.so
-%{tde_tdelibdir}/konqsidebar_web.la
-%{tde_tdelibdir}/konqsidebar_web.so
-%{tde_tdelibdir}/konqueror.la
-%{tde_tdelibdir}/konqueror.so
-%{tde_tdelibdir}/libkhtmlkttsdplugin.la
-%{tde_tdelibdir}/libkhtmlkttsdplugin.so
-%{tde_libdir}/lib[kt]deinit_keditbookmarks.la
-%{tde_libdir}/lib[kt]deinit_keditbookmarks.so
-%{tde_libdir}/lib[kt]deinit_kfmclient.la
-%{tde_libdir}/lib[kt]deinit_kfmclient.so
-%{tde_libdir}/lib[kt]deinit_konqueror.la
-%{tde_libdir}/lib[kt]deinit_konqueror.so
-%{tde_libdir}/libkonqsidebarplugin.so.*
-%{tde_tdeappdir}/Home.desktop
-%{tde_tdeappdir}/kcmhistory.desktop
-%{tde_tdeappdir}/kfmclient.desktop
-%{tde_tdeappdir}/kfmclient_dir.desktop
-%{tde_tdeappdir}/kfmclient_html.desktop
-%{tde_tdeappdir}/kfmclient_war.desktop
-%{tde_tdeappdir}/khtml_filter.desktop
-%{tde_tdeappdir}/konqbrowser.desktop
-%{tde_tdeappdir}/konquerorsu.desktop
-%{tde_datadir}/applnk/.hidden/konqfilemgr.desktop
-%{tde_datadir}/applnk/Internet/keditbookmarks.desktop
-%{tde_datadir}/applnk/konqueror.desktop
-%{tde_datadir}/apps/kconf_update/kfmclient_3_2.upd
-%{tde_datadir}/apps/kconf_update/kfmclient_3_2_update.sh
-%{tde_datadir}/apps/kconf_update/konqsidebartng.upd
-%{tde_datadir}/apps/kconf_update/move_konqsidebartng_entries.sh
-%{tde_datadir}/apps/keditbookmarks/keditbookmarks-genui.rc
-%{tde_datadir}/apps/keditbookmarks/keditbookmarksui.rc
-%{tde_datadir}/apps/khtml/kpartplugins/khtmlkttsd.desktop
-%{tde_datadir}/apps/khtml/kpartplugins/khtmlkttsd.rc
-%{tde_datadir}/apps/konqiconview/
-%{tde_datadir}/apps/konqlistview/
-%exclude %{tde_datadir}/apps/konqsidebartng/virtual_folders/services/fonts.desktop
-%{tde_datadir}/apps/konqsidebartng/
-%{tde_datadir}/apps/konqueror/about/
-%{tde_datadir}/apps/konqueror/icons/
-%{tde_datadir}/apps/konqueror/konq-simplebrowser.rc
-%{tde_datadir}/apps/konqueror/konqueror.rc
-%{tde_datadir}/apps/konqueror/pics/indicator_connect.png
-%{tde_datadir}/apps/konqueror/pics/indicator_empty.png
-%{tde_datadir}/apps/konqueror/pics/indicator_noconnect.png
-%{tde_datadir}/apps/konqueror/pics/indicator_viewactive.png
-%{tde_datadir}/apps/konqueror/profiles/
-%exclude %{tde_datadir}/apps/konqueror/servicemenus/kdesktopSetAsBackground.desktop
-%exclude %{tde_datadir}/apps/konqueror/servicemenus/konsolehere.desktop
-%exclude %{tde_datadir}/apps/konqueror/servicemenus/installfont.desktop
-%{tde_datadir}/apps/konqueror/servicemenus/*.desktop
-%{tde_datadir}/apps/konqueror/servicemenus/media_safelyremove.desktop_tdebase
-%{tde_datadir}/apps/konqueror/tiles/*.png
-%{tde_datadir}/autostart/konqy_preload.desktop
-%{tde_datadir}/config.kcfg/keditbookmarks.kcfg
-%{tde_datadir}/config.kcfg/konq_listview.kcfg
-%{tde_datadir}/config.kcfg/konqueror.kcfg
-%{tde_datadir}/icons/crystalsvg/*/apps/keditbookmarks.png
-%{tde_datadir}/icons/crystalsvg/*/apps/kfm_home.svgz
-%{tde_datadir}/icons/hicolor/*/apps/kfm.png
-%{tde_datadir}/icons/hicolor/*/apps/konqueror.*
-%{tde_datadir}/services/kded/konqy_preloader.desktop
-%{tde_datadir}/services/konq_*.desktop
-%{tde_datadir}/servicetypes/konqaboutpage.desktop
-%{tde_tdedocdir}/HTML/en/konqueror/
-
-%post -n trinity-konqueror
-update-desktop-database %{tde_appdir} 2> /dev/null || : 
-for f in crystalsvg hicolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f}  2> /dev/null || :
-done
-/sbin/ldconfig || :
-%if 0%{?suse_version}
-update-alternatives --install \
-%else
-alternatives --install \
-%endif
-  %{tde_datadir}/apps/konqueror/servicemenus/media_safelyremove.desktop \
-  media_safelyremove.desktop_konqueror \
-  %{tde_datadir}/apps/konqueror/servicemenus/media_safelyremove.desktop_tdebase \
-  10 || :
-
-%postun -n trinity-konqueror
-update-desktop-database %{tde_appdir} 2> /dev/null || : 
-for f in crystalsvg hicolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f}  2> /dev/null || :
-done
-/sbin/ldconfig || :
-
-%preun -n trinity-konqueror
-if [ $1 -eq 0 ]; then
-%if 0%{?suse_version}
-  update-alternatives --remove \
-%else
-  alternatives --remove \
-%endif
-    media_safelyremove.desktop_konqueror \
-    %{tde_datadir}/apps/konqueror/servicemenus/media_safelyremove.desktop_tdebase || :
-fi
-
-##########
-
-%package -n trinity-konqueror-devel
-Summary:	Development files for konqueror
-Group:		Development/Libraries
-Requires:	trinity-konqueror = %{version}-%{release}
-
-%description -n trinity-konqueror-devel
-%{summary}
-
-%files -n trinity-konqueror-devel
-%{tde_tdeincludedir}/konqsidebarplugin.h
-%{tde_tdeincludedir}/KonquerorIface.h
-%{tde_libdir}/libkonqsidebarplugin.la
-%{tde_libdir}/libkonqsidebarplugin.so
-
-%post -n trinity-konqueror-devel
-/sbin/ldconfig || :
-
-%postun -n trinity-konqueror-devel
-/sbin/ldconfig || :
-
-##########
-
-%package -n trinity-konqueror-nsplugins
-Summary:	Netscape plugin support for Konqueror
-Group:		Applications/Utilities
-Requires:	trinity-konqueror = %{version}-%{release}
-
-%description -n trinity-konqueror-nsplugins
-This package includes support for Netscape plugins in Konqueror.
-
-%files -n trinity-konqueror-nsplugins
-%defattr(-,root,root,-)
-%{tde_bindir}/nspluginscan
-%{tde_bindir}/nspluginviewer
-%{tde_tdelibdir}/kcm_nsplugins.la
-%{tde_tdelibdir}/kcm_nsplugins.so
-%{tde_tdelibdir}/libnsplugin.la
-%{tde_tdelibdir}/libnsplugin.so
-%{tde_tdeappdir}/khtml_plugins.desktop
-%{tde_datadir}/apps/plugin/nspluginpart.rc
-
-%post -n trinity-konqueror-nsplugins
-update-desktop-database %{tde_appdir} 2> /dev/null || : 
-
-%postun -n trinity-konqueror-nsplugins
-update-desktop-database %{tde_appdir} 2> /dev/null || : 
-
-##########
-
-%package -n trinity-konsole
-Summary:	X terminal emulator for TDE
-Group:		Applications/Utilities
-Requires:	%{name}-data = %{version}-%{release}
-
-%description -n trinity-konsole
-Konsole is an X terminal emulation which provides a command-line interface
-(CLI) while using the graphical K Desktop Environment. Konsole helps to
-better organize user's desktop by containing multiple sessions in a single
-window (a less cluttered desktop).
-
-Its advanced features include a simple configuration and the ability to use
-multiple terminal shells in a single window
-
-Using Konsole, a user can open:
-* Linux console sessions
-* Midnight Commander file manager sessions
-* Shell sessions
-* Root consoles sessions
-
-%files -n trinity-konsole
-%defattr(-,root,root,-)
-%{tde_bindir}/konsole
-%{tde_tdelibdir}/kcm_konsole.la
-%{tde_tdelibdir}/kcm_konsole.so
-%{tde_tdelibdir}/kded_kwrited.la
-%{tde_tdelibdir}/kded_kwrited.so
-%{tde_tdelibdir}/konsole.la
-%{tde_tdelibdir}/konsole.so
-%{tde_tdelibdir}/libkonsolepart.la
-%{tde_tdelibdir}/libkonsolepart.so
-%{tde_libdir}/lib[kt]deinit_konsole.la
-%{tde_libdir}/lib[kt]deinit_konsole.so
-%{tde_tdeappdir}/konsole.desktop
-%{tde_tdeappdir}/konsolesu.desktop
-%{tde_datadir}/applnk/.hidden/kcmkonsole.desktop
-%{tde_datadir}/apps/kconf_update/konsole.upd
-%{tde_datadir}/apps/kconf_update/schemaStrip.pl
-%{tde_datadir}/apps/konqueror/servicemenus/konsolehere.desktop
-%{tde_datadir}/apps/konsole/
-%{tde_datadir}/icons/hicolor/*/apps/konsole.*
-%{tde_datadir}/mimelnk/application/x-konsole.desktop
-%{tde_datadir}/services/kded/kwrited.desktop
-%{tde_datadir}/services/konsolepart.desktop
-%{tde_datadir}/services/konsole-script.desktop
-%{tde_datadir}/services/kwrited.desktop
-%{tde_datadir}/servicetypes/terminalemulator.desktop
-%{tde_tdedocdir}/HTML/en/konsole/
-%{tde_tdedocdir}/HTML/en/kcontrol/kcmkonsole/
-
-%post -n trinity-konsole
-update-desktop-database %{tde_appdir} 2> /dev/null || : 
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f}  2> /dev/null || :
-done
-/sbin/ldconfig || :
-
-%postun -n trinity-konsole
-update-desktop-database %{tde_appdir} 2> /dev/null || : 
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f}  2> /dev/null || :
-done
-/sbin/ldconfig || :
-
-##########
-
-%package -n trinity-kpager
-Summary:	desktop pager for TDE
-Group:		Applications/Utilities
-Requires:	%{name}-data = %{version}-%{release}
-
-%description -n trinity-kpager
-This package contains TDE's desktop pager, which displays your virtual
-desktops iconically in a window, along with icons of any running
-applications. It is used to switch between applications or desktops.
-
-%files -n trinity-kpager
-%defattr(-,root,root,-)
-%{tde_bindir}/kpager
-%{tde_tdeappdir}/kpager.desktop
-%{tde_datadir}/applnk/Utilities/kpager.desktop
-%{tde_datadir}/icons/hicolor/*/apps/kpager.png
-%{tde_tdedocdir}/HTML/en/kpager/
-
-%post -n trinity-kpager
-update-desktop-database %{tde_appdir} 2> /dev/null || : 
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f}  2> /dev/null || :
-done
-
-%postun -n trinity-kpager
-update-desktop-database %{tde_appdir} 2> /dev/null || : 
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f}  2> /dev/null || :
-done
-
-##########
-
-%package -n trinity-kpersonalizer
-Summary:	installation personalizer for TDE
-Group:		Applications/Utilities
-Requires:	%{name}-data = %{version}-%{release}
-
-%description -n trinity-kpersonalizer
-TDE Personalizer is the application that configures the TDE desktop for you.
-It's a very useful wizard that allows you to quickly change the TDE desktop to
-suit your own needs. When you run TDE for the first time, KPersonalizer is
-automatically started. KPersonalizer can also be called later.
-
-%files -n trinity-kpersonalizer
-%defattr(-,root,root,-)
-%{tde_bindir}/kpersonalizer
-%{tde_tdeappdir}/kpersonalizer.desktop
-%{tde_datadir}/applnk/System/kpersonalizer.desktop
-%{tde_datadir}/apps/kpersonalizer/
-%{tde_datadir}/icons/crystalsvg/*/apps/kpersonalizer.png
-
-%post -n trinity-kpersonalizer
-update-desktop-database %{tde_appdir} 2> /dev/null || : 
-for f in crystalsvg ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f}  2> /dev/null || :
-done
-
-%postun -n trinity-kpersonalizer
-update-desktop-database %{tde_appdir} 2> /dev/null || : 
-for f in crystalsvg ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f}  2> /dev/null || :
-done
-
-##########
-
-%package -n trinity-ksmserver
-Summary:	session manager for TDE
-Group:		Applications/Utilities
-Requires:	%{name}-data = %{version}-%{release}
-Requires:	trinity-twin = %{version}-%{release}
-
-%description -n trinity-ksmserver
-This package contains the KDE session manager. It is responsible for
-restoring your TDE session on login. It is also needed to properly
-start a KDE session. It registers KDE with X display managers, and
-provides the 'starttde' command, for starting an X session with KDE
-from the console.
-
-If you are running TDE for the first time for a certain user,
-kpersonalizer is used to help with setup. If it is not present,
-KDE will start, but many good defaults will not be set.
-
-%files -n trinity-ksmserver
-%defattr(-,root,root,-)
-%{tde_bindir}/ksmserver
-%{tde_bindir}/start[kt]de
-%{tde_tdelibdir}/ksmserver.la
-%{tde_tdelibdir}/ksmserver.so
-%{tde_libdir}/lib[kt]deinit_ksmserver.la
-%{tde_libdir}/lib[kt]deinit_ksmserver.so
-%{tde_datadir}/apps/kconf_update/ksmserver.upd
-%{tde_datadir}/apps/kconf_update/move_session_config.sh
-%{tde_datadir}/apps/ksmserver/pics/shutdownkonq.png
-
-# Remove conflicts with redhat-menus
-%if "%{?tde_prefix}" != "/usr"
-%{tde_bindir}/plasma-desktop
-%endif
-
-%post -n trinity-ksmserver
-/sbin/ldconfig || :
-
-%postun -n trinity-ksmserver
-/sbin/ldconfig || :
-
-##########
-
-%package -n trinity-ksplash
-Summary:	the TDE splash screen
-Group:		Applications/Utilities
-Requires:	%{name}-data = %{version}-%{release}
-
-%description -n trinity-ksplash
-This package includes the TDE Splash screen, which is seen when
-a TDE session is launched.
-
-%files -n trinity-ksplash
-%defattr(-,root,root,-)
-%{tde_bindir}/ksplash
-%{tde_bindir}/ksplashsimple
-%{tde_tdelibdir}/kcm_ksplashthemes.la
-%{tde_tdelibdir}/kcm_ksplashthemes.so
-%{tde_tdelibdir}/ksplashdefault.la
-%{tde_tdelibdir}/ksplashdefault.so
-%{tde_tdelibdir}/ksplashunified.la
-%{tde_tdelibdir}/ksplashunified.so
-%{tde_tdelibdir}/ksplashredmond.la
-%{tde_tdelibdir}/ksplashredmond.so
-%{tde_tdelibdir}/ksplashstandard.la
-%{tde_tdelibdir}/ksplashstandard.so
-%{tde_libdir}/libksplashthemes.so.*
-%{tde_tdeappdir}/ksplashthememgr.desktop
-%{tde_datadir}/apps/ksplash
-%{tde_datadir}/services/ksplashdefault.desktop
-%{tde_datadir}/services/ksplash.desktop
-%{tde_datadir}/services/ksplashunified.desktop
-%{tde_datadir}/services/ksplashredmond.desktop
-%{tde_datadir}/services/ksplashstandard.desktop
-%{tde_datadir}/servicetypes/ksplashplugins.desktop
-%{tde_tdedocdir}/HTML/en/ksplashml/
-
-%post -n trinity-ksplash
-update-desktop-database %{tde_appdir} 2> /dev/null || : 
-/sbin/ldconfig || :
-
-%postun -n trinity-ksplash
-update-desktop-database %{tde_appdir} 2> /dev/null || : 
-/sbin/ldconfig || :
-
-##########
-
-%package -n trinity-ksplash-devel
-Summary:	Development files for ksplash
-Group:		Development/Libraries
-Requires:	trinity-ksplash = %{version}-%{release}
-
-%description -n trinity-ksplash-devel
-%{summary}
-
-%files -n trinity-ksplash-devel
-%{tde_tdeincludedir}/ksplash/*
-%{tde_libdir}/libksplashthemes.la
-%{tde_libdir}/libksplashthemes.so
-
-%post -n trinity-ksplash-devel
-/sbin/ldconfig || :
-
-%postun -n trinity-ksplash-devel
-/sbin/ldconfig || :
-
-##########
-
-%package -n trinity-ksysguard
-Summary:	system guard for TDE
-Group:		Applications/Utilities
-Requires:	%{name}-data = %{version}-%{release}
-Requires:	trinity-ksysguardd = %{version}-%{release}
-
-%description -n trinity-ksysguard
-TDE System Guard allows you to monitor various statistics about your
-computer.
-
-%files -n trinity-ksysguard
-%defattr(-,root,root,-)
-%{tde_bindir}/kpm
-%{tde_bindir}/ksysguard
-%{tde_tdelibdir}/sysguard_panelapplet.la
-%{tde_tdelibdir}/sysguard_panelapplet.so
-%{tde_libdir}/libksgrd.so.*
-%{tde_tdeappdir}/ksysguard.desktop
-%{tde_datadir}/apps/kicker/applets/ksysguardapplet.desktop
-%{tde_datadir}/apps/ksysguard/
-%{tde_datadir}/icons/crystalsvg/*/apps/ksysguard.png
-%{tde_datadir}/mimelnk/application/x-ksysguard.desktop
-%{tde_tdedocdir}/HTML/en/ksysguard/
-
-%post -n trinity-ksysguard
-update-desktop-database %{tde_appdir} 2> /dev/null || : 
-for f in crystalsvg ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f}  2> /dev/null || :
-done
-/sbin/ldconfig || :
-
-%postun -n trinity-ksysguard
-update-desktop-database %{tde_appdir} 2> /dev/null || : 
-for f in crystalsvg ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f}  2> /dev/null || :
-done
-/sbin/ldconfig || :
-
-##########
-
-%package -n trinity-ksysguard-devel
-Summary:	Development files for ksysguard
-Group:		Development/Libraries
-Requires:	trinity-ksysguard = %{version}-%{release}
-
-%description -n trinity-ksysguard-devel
-%{summary}
-
-%files -n trinity-ksysguard-devel
-%{tde_tdeincludedir}/ksgrd/*
-%{tde_libdir}/libksgrd.la
-%{tde_libdir}/libksgrd.so
-
-%post -n trinity-ksysguard-devel
-/sbin/ldconfig || :
-
-%postun -n trinity-ksysguard-devel
-/sbin/ldconfig || :
-
-##########
-
-%package -n trinity-ksysguardd
-Summary:	system guard daemon for TDE
-Group:		Applications/Utilities
-Requires:	%{name}-data = %{version}-%{release}
-
-%description -n trinity-ksysguardd
-TDE System Guard Daemon is the daemon part of ksysguard. The daemon can
-be installed on a remote machine to enable ksysguard on another machine
-to monitor it through the daemon running there.
-
-%files -n trinity-ksysguardd
-%defattr(-,root,root,-)
-%{tde_bindir}/ksysguardd
-%config(noreplace) %{_sysconfdir}/ksysguarddrc.tde
-
-%post -n trinity-ksysguardd
-# Dirty hack to install '/etc/ksysguarddrc' alongside with KDE4
-[ -r "%{_sysconfdir}/ksysguarddrc" ] || cp -f "%{_sysconfdir}/ksysguarddrc.tde" "%{_sysconfdir}/ksysguarddrc"
-
-##########
-
-%package -n trinity-ktip
-Summary:	useful tips for TDE
-Group:		Applications/Utilities
-Requires:	%{name}-data = %{version}-%{release}
-
-%description -n trinity-ktip
-ktip provides many useful tips on using KDE when you log in.
-
-%files -n trinity-ktip
-%defattr(-,root,root,-)
-%{tde_bindir}/ktip
-%{tde_tdeappdir}/ktip.desktop
-%{tde_datadir}/applnk/Toys/ktip.desktop
-%{tde_datadir}/apps/kdewizard/pics/wizard_small.png
-%{tde_datadir}/apps/kdewizard/tips/
-%{tde_datadir}/autostart/ktip.desktop
-%{tde_datadir}/icons/hicolor/*/apps/ktip.*
-
-%post -n trinity-ktip
-update-desktop-database %{tde_appdir} 2> /dev/null || : 
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f}  2> /dev/null || :
-done
-
-%postun -n trinity-ktip
-update-desktop-database %{tde_appdir} 2> /dev/null || : 
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f}  2> /dev/null || :
-done
-
-##########
-
-%package -n trinity-twin
-Summary:	the TDE window manager
-Group:		Applications/Utilities
-Requires:	%{name}-data = %{version}-%{release}
-
-%description -n trinity-twin
-This package contains the default X window manager for KDE.
-
-%files -n trinity-twin
-%defattr(-,root,root,-)
-%{tde_bindir}/kompmgr
-%{tde_bindir}/[kt]win
-%{tde_bindir}/[kt]win_killer_helper
-#%{tde_bindir}/[kt]win_resumer_helper
-%{tde_bindir}/[kt]win_rules_dialog
-%{tde_libdir}/kconf_update_bin/[kt]win_update_default_rules
-%{tde_libdir}/kconf_update_bin/[kt]win_update_window_settings
-%{tde_tdelibdir}/kcm_[kt]win*.la
-%{tde_tdelibdir}/kcm_[kt]win*.so
-%{tde_tdelibdir}/[kt]win*.la
-%{tde_tdelibdir}/[kt]win*.so
-%{tde_libdir}/lib[kt]decorations.so.*
-%{tde_libdir}/lib[kt]deinit_[kt]win_rules_dialog.la
-%{tde_libdir}/lib[kt]deinit_[kt]win_rules_dialog.so
-%{tde_libdir}/lib[kt]deinit_[kt]win.la
-%{tde_libdir}/lib[kt]deinit_[kt]win.so
-%{tde_tdeappdir}/showdesktop.desktop
-%{tde_tdeappdir}/[kt]windecoration.desktop
-%{tde_tdeappdir}/[kt]winoptions.desktop
-%{tde_tdeappdir}/[kt]winrules.desktop
-%{tde_datadir}/applnk/.hidden/[kt]winactions.desktop
-%{tde_datadir}/applnk/.hidden/[kt]winadvanced.desktop
-%{tde_datadir}/applnk/.hidden/[kt]winfocus.desktop
-%{tde_datadir}/applnk/.hidden/[kt]winmoving.desktop
-%{tde_datadir}/applnk/.hidden/[kt]wintranslucency.desktop
-%{tde_datadir}/apps/kconf_update/[kt]win3_plugin.pl
-%{tde_datadir}/apps/kconf_update/[kt]win3_plugin.upd
-%{tde_datadir}/apps/kconf_update/[kt]win_focus1.sh
-%{tde_datadir}/apps/kconf_update/[kt]win_focus1.upd
-%{tde_datadir}/apps/kconf_update/[kt]win_focus2.sh
-%{tde_datadir}/apps/kconf_update/[kt]win_focus2.upd
-%{tde_datadir}/apps/kconf_update/[kt]win_fsp_workarounds_1.upd
-%{tde_datadir}/apps/kconf_update/[kt]winiconify.upd
-%{tde_datadir}/apps/kconf_update/[kt]winsticky.upd
-%{tde_datadir}/apps/kconf_update/[kt]win.upd
-%{tde_datadir}/apps/kconf_update/[kt]winupdatewindowsettings.upd
-%{tde_datadir}/apps/kconf_update/pluginlibFix.pl
-%{tde_datadir}/apps/[kt]win/
-%{tde_datadir}/config.kcfg/[kt]win.kcfg
-%{tde_datadir}/icons/crystalsvg/*/apps/[kt]win.png
-%{tde_tdedocdir}/HTML/en/kompmgr/
-
-%post -n trinity-twin
-update-desktop-database %{tde_appdir} 2> /dev/null || : 
-for f in crystalsvg ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f}  2> /dev/null || :
-done
-/sbin/ldconfig || :
-
-%postun -n trinity-twin
-update-desktop-database %{tde_appdir} 2> /dev/null || : 
-for f in crystalsvg ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f}  2> /dev/null || :
-done
-/sbin/ldconfig || :
-
-##########
-
-%package -n trinity-twin-devel
-Summary:	Development files for twin
-Group:		Development/Libraries
-Requires:	trinity-twin = %{version}-%{release}
-
-%description -n trinity-twin-devel
-%{summary}
-
-%files -n trinity-twin-devel
-%{tde_tdeincludedir}/[kt]win/
-%{tde_tdeincludedir}/kcommondecoration.h
-%{tde_tdeincludedir}/kdecoration.h
-%{tde_tdeincludedir}/kdecoration_p.h
-%{tde_tdeincludedir}/kdecoration_plugins_p.h
-%{tde_tdeincludedir}/kdecorationfactory.h
-%{tde_tdeincludedir}/KWinInterface.h
-%{tde_libdir}/libkdecorations.la
-%{tde_libdir}/libkdecorations.so
-
-%post -n trinity-twin-devel
-/sbin/ldconfig || :
-
-%postun -n trinity-twin-devel
-/sbin/ldconfig || :
-
-##########
-
-%package -n trinity-libkonq
-Summary:	core libraries for Konqueror
-Group:		Environment/Libraries
-
-%description -n trinity-libkonq
-These libraries are used by several TDE applications, most notably
-Konqueror and the kdesktop package.
-
-%files -n trinity-libkonq
-%defattr(-,root,root,-)
-%{tde_tdelibdir}/kded_favicons.la
-%{tde_tdelibdir}/kded_favicons.so
-%{tde_tdelibdir}/konq_sound.la
-%{tde_tdelibdir}/konq_sound.so
-%{tde_libdir}/libkonq.so.*
-%{tde_datadir}/apps/kbookmark/directory_bookmarkbar.desktop
-%{tde_datadir}/apps/kconf_update/favicons.upd
-%{tde_datadir}/apps/kconf_update/move_favicons.sh
-%{tde_datadir}/apps/konqueror/pics/arrow_bottomleft.png
-%{tde_datadir}/apps/konqueror/pics/arrow_bottomright.png
-%{tde_datadir}/apps/konqueror/pics/arrow_topleft.png
-%{tde_datadir}/apps/konqueror/pics/arrow_topright.png
-%{tde_datadir}/apps/konqueror/pics/thumbnailfont_7x4.png
-%{tde_datadir}/services/kded/favicons.desktop
-%{tde_datadir}/servicetypes/konqpopupmenuplugin.desktop
-
-%post -n trinity-libkonq
-/sbin/ldconfig || :
-
-%postun -n trinity-libkonq
-/sbin/ldconfig || :
-
-##########
-
-%package libtqt3-integration
-Summary:	Integration library between TQt3 and TDE
-Group:		Environment/Libraries
-
-Obsoletes:	tdebase-libtqt3-integration < %{version}-%{release}
-Provides:	tdebase-libtqt3-integration = %{version}-%{release}
-
-%description libtqt3-integration
-These libraries allow you to use TDE dialogs in native TQt3 applications.
-
-%files libtqt3-integration
-%defattr(-,root,root,-)
-%{tde_tdelibdir}/plugins/integration/libqtkde.la
-%{tde_tdelibdir}/plugins/integration/libqtkde.so
-%{tde_tdelibdir}/plugins/integration/libqtkde.so.*
-%{tde_tdelibdir}/kded_kdeintegration.la
-%{tde_tdelibdir}/kded_kdeintegration.so
-%{tde_datadir}/services/kded/kdeintegration.desktop
-
-##########
-
-%package -n trinity-libkonq-devel
-Summary:	development files for Konqueror's core libraries
-Group:		Development/Libraries
-Requires:	trinity-libkonq = %{version}-%{release}
-
-%description -n trinity-libkonq-devel
-This package contains headers and other development files for the core
-Konqueror libraries.
-
-%files -n trinity-libkonq-devel
-%defattr(-,root,root,-)
-%{tde_tdeincludedir}/kfileivi.h
-%{tde_tdeincludedir}/kivdirectoryoverlay.h
-%{tde_tdeincludedir}/knewmenu.h
-%{tde_tdeincludedir}/konqbookmarkmanager.h
-%{tde_tdeincludedir}/konq_*.h
-%{tde_tdeincludedir}/libkonq_export.h
-%{tde_libdir}/libkonq.la
-%{tde_libdir}/libkonq.so
-
-%post -n trinity-libkonq-devel
-/sbin/ldconfig || :
-
-%postun -n trinity-libkonq-devel
-/sbin/ldconfig || :
-
-##########
-
-%if 0%{?suse_version}
-%debug_package
-%endif
-
-##########
-
-%prep
-%setup -q -n kdebase
-%__tar xfz %{SOURCE6} -C kicker/data/tiles
-
-%patch2 -p1
-%patch7 -p1
-%patch8 -p1
-%patch9 -p1
-
-%patch10 -p1
-%patch11 -p1
-%patch12 -p1
-%if 0%{?rhel} == 4 || 0%{?suse_version}
-%patch66 -p1 -b .Xsession
-%endif
-%if 0%{?rhel} >= 5|| 0%{?fedora}
-%patch13 -p1 -b .Xsession
-%endif
-%patch14 -p1
-%patch15 -p1
-%patch16 -p1
-
-%patch20 -p4
-%if 0%{?rhel} || 0%{?mgaversion} || 0%{?mdkversion}
-%patch21 -p1 -b .man
-%endif
-%patch22 -p1
-%patch23 -p1
-%patch24 -p4
-%patch25 -p1
-%patch26 -p1
-%patch27 -p0
-%patch28 -p0
-%patch29 -p0
-%patch30 -p1
-%patch31 -p1
-%patch32 -p1
-%patch33 -p1
-%patch34 -p1
-%patch35 -p1
-%patch36 -p1
-%patch37 -p1
-%patch38 -p1
-%patch39 -p1
-%patch40 -p1
-%patch41 -p1
-%patch42 -p1
-%patch43 -p1
-%patch44 -p1
-%patch45 -p1
-%patch46 -p1
-%patch47 -p0
-%patch48 -p1
-%patch49 -p1
-%patch50 -p1
-%patch51 -p1
-%patch52 -p1
-%patch53 -p1
-%patch54 -p1
-%patch55 -p1
-%patch56 -p1
-%patch57 -p1
-%patch58 -p1
-%patch59 -p1
-%patch60 -p1
-%patch61 -p1
-%patch62 -p1
-%patch63 -p1 -b .tooltips
-%patch64 -p1 -b .tsak
-%patch65 -p1 -b .dbustsak
-%patch67 -p1 -b .dbus
-
-%patch100 -p1
-%patch101 -p1 -b .tsak
-
-
-%if 0%{?rhel} == 4
-%patch201 -p1 -b .libdetect
-%patch202 -p1 -b .dbustqt
-%patch203 -p1 -b .consolekit
-%patch204 -p1 -b .composite
-%patch205 -p1 -b .hal04
-%patch206 -p1 -b .rhel4
-%endif
-
-# Applies an optional distro-specific graphical theme
-%if "%{?tde_bg}" != ""
-# KDM Background
-%__sed -i "kdm/kfrontend/genkdmconf.c" \
-	-e 's|"Wallpaper=isadora.png\n"|"Wallpaper=%{tde_bg}\n"|'
-
-# TDE user default background
-%__sed -i "kpersonalizer/keyecandypage.cpp" \
-	-e 's|#define DEFAULT_WALLPAPER "isadora.png"|#define DEFAULT_WALLPAPER "%{tde_bg}"|'
-%__sed -i "startkde" \
-	-e 's|/usr/share/wallpapers/isadora.png.desktop|%{tde_bg}|' \
-	-e 's|Wallpaper=isadora.png|Wallpaper=%{tde_bg}|'
-%endif
-
-# TDE branding: removes KUbuntu references [Bug #617]
-%__sed -i "kcontrol/kdm/kdm-appear.cpp" \
-	-e "s|Welcome to Kubuntu |Welcome to %{tde_aboutlabel} |"
-%__sed -i "konqueror/about/konq_aboutpage.cc" \
-	-e "s|About Kubuntu|About %{tde_aboutlabel}|" \
-	-e "s|help:/kubuntu/|%{tde_aboutpage}|" \
-	-e "s|Kubuntu Documentation|%{tde_aboutlabel} Documentation|"
-%__sed -i "konqueror/about/launch.html" \
-	-e "s|help:/kubuntu/about-kubuntu/index.html|%{tde_aboutpage}|"
-%__sed -i "kdm/config.def" \
-	-e "s|Welcome to Trinity |Welcome to %{tde_aboutlabel} |"
-
-# TDE default directory in 'startkde' script (KDEDIR)
-%__sed -i "startkde" \
-	-e "s|/opt/trinity|%{tde_prefix}|g"
-
-# TDE default start button icon
-%__sed -i "startkde" \
-	-e "s|%%{tde_starticon}|%{tde_starticon}|g"
-
-
-%build
-unset QTDIR || : ; . /etc/profile.d/qt3.sh
-export PATH="%{tde_bindir}:${PATH}"
-export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
-export CMAKE_INCLUDE_PATH="%{tde_includedir}:%{tde_includedir}/tqt"
-export LD_LIBRARY_PATH="%{tde_libdir}"
-
-# Avoids building against KDE3's old stuff, if installed
-export KDEDIR=%{tde_prefix}
-
-# Shitty hack for RHEL4 ...
-if [ -d /usr/X11R6 ]; then
-  export CMAKE_INCLUDE_PATH="${CMAKE_INCLUDE_PATH=}:/usr/X11R6/include:/usr/X11R6/%{_lib}"
-  export CFLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}"
-  export CXXFLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}"
-fi
-
-%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version}
-%__mkdir_p build
-cd build
-%endif
-
-%cmake \
-  -DBIN_INSTALL_DIR=%{tde_bindir} \
-  -DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \
-  -DLIB_INSTALL_DIR=%{tde_libdir} \
-  -DSHARE_INSTALL_PREFIX=%{tde_datadir} \
-  -DCMAKE_SKIP_RPATH="OFF" \
-  -DWITH_SASL=ON \
-  -DWITH_LDAP=ON \
-  -DWITH_SAMBA=ON \
-  %{?with_exr:-DWITH_OPENEXR=ON} \
-  %{?with_hal:-DWITH_HAL=ON} \
-%if 0%{?rhel} == 4
-  -DWITH_XTEST=OFF \
-  -DWITH_XSCREENSAVER=OFF \
-%else
-  -DWITH_XTEST=ON \
-  -DWITH_XSCREENSAVER=ON \
-%endif
-  -DWITH_XCURSOR=ON \
-  -DWITH_XFIXES=ON \
-  %{?with_xrandr:-DWITH_XRANDR=ON} \
-  -DWITH_XDAMAGE=ON \
-  -DWITH_XEXT=ON \
-  -DWITH_LIBUSB=ON \
-  -DWITH_LIBRAW1394=ON \
-  -DWITH_PAM=ON \
-  -DWITH_XDMCP=ON \
-  -DWITH_XINERAMA=ON \
-  -DWITH_XCOMPOSITE=ON \
-  -DWITH_XRENDER=ON \
-  -DWITH_ARTS=ON \
-  -DWITH_I8K=ON \
-  -DBUILD_ALL=ON \
-  -DKCHECKPASS_PAM_SERVICE="kcheckpass-trinity" \
-%if 0%{?suse_version}
-  -DKDM_PAM_SERVICE="xdm" \
-  -DKSCREENSAVER_PAM_SERVICE="kcheckpass-trinity" \
-%else
-  -DKDM_PAM_SERVICE="kdm-trinity" \
-  -DKSCREENSAVER_PAM_SERVICE="kscreensaver-trinity" \
-%endif
-  %{!?with_tsak:-DBUILD_TSAK=OFF} \
-  ..
-
-%__make %{?_smp_mflags}
-
-
-%install
-%__rm -rf %{?buildroot}
-%__make install DESTDIR=%{?buildroot} -C build
-
-
-# Under RHEL/Fedora/Suse, static 'xsessions' files go to '/usr/share/xsessions'.
-
-# Adds a GDM/KDM/XDM session called 'TDE'
-%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version}
-%__install -D -m 644 \
-	"%{?buildroot}%{tde_datadir}/apps/kdm/sessions/tde.desktop" \
-	"%{?buildroot}%{_datadir}/xsessions/tde.desktop"
-
-# Force session name to be 'TDE'
-%__sed -i "%{?buildroot}%{_datadir}/xsessions/tde.desktop" \
-	-e "s,^Name=.*,Name=TDE,"
-%endif
-
-# Mageia/Mandriva stores its session file in different folder than RHEL/Fedora
-# Generated files for TDM/KDM4 are in '/usr/share/apps/kdm/sessions'
-%if 0%{?mgaversion} || 0%{?mdkversion}
-%__install -d -m 755 %{?buildroot}%{_sysconfdir}/X11/wmsession.d
-cat <<EOF >"%{?buildroot}%{_sysconfdir}/X11/wmsession.d/45TDE"
-NAME=TDE
-ICON=kde-wmsession.xpm
-DESC=The Trinity Desktop Environment
-EXEC=%{tde_bindir}/startkde
-SCRIPT:
-exec %{tde_bindir}/startkde
-EOF
-
-%__install -d -m 755 %{?buildroot}%{_datadir}/X11/dm.d
-cat <<EOF >"%{?buildroot}%{_datadir}/X11/dm.d/45TDE.conf"
-NAME=TDM
-DESCRIPTION=TDM (Trinity Display Manager)
-PACKAGE=trinity-tdm
-EXEC=%{tde_bindir}/kdm
-FNDSESSION_EXEC="/usr/sbin/chksession -K"
-EOF
-%endif
-
-# Renames '/etc/ksysguarddrc' to avoid conflict with KDE4 'ksysguard'
-%__mv -f \
-	%{?buildroot}%{_sysconfdir}/ksysguarddrc \
-	%{?buildroot}%{_sysconfdir}/ksysguarddrc.tde
-
-# TDE 3.5.12: add script "plasma-desktop" to avoid conflict with KDE4
-%if "%{?tde_prefix}" != "/usr"
-%__install -m 755 "%{SOURCE1}" "%{?buildroot}%{tde_bindir}"
-%endif
-
-# PAM configuration files
-%if 0%{?suse_version}
-%__install -D -m 644 "%{SOURCE4}" "%{?buildroot}%{_sysconfdir}/pam.d/kcheckpass-trinity"
-%else
-%__install -D -m 644 "%{SOURCE2}" "%{?buildroot}%{_sysconfdir}/pam.d/kdm-trinity"
-%__install -D -m 644 "%{SOURCE3}" "%{?buildroot}%{_sysconfdir}/pam.d/kdm-trinity-np"
-%__install -D -m 644 "%{SOURCE4}" "%{?buildroot}%{_sysconfdir}/pam.d/kcheckpass-trinity"
-%__install -D -m 644 "%{SOURCE5}" "%{?buildroot}%{_sysconfdir}/pam.d/kscreensaver-trinity"
-%endif
-
-# KDM configuration for RHEL/Fedora
-%__sed -i "%{?buildroot}%{tde_datadir}/config/kdm/kdmrc" \
-%if 0%{?fedora} >= 16 || 0%{?suse_version} >= 1220
-	-e "s/^#*MinShowUID=.*/MinShowUID=1000/"
-%else
-	-e "s/^#*MinShowUID=.*/MinShowUID=500/"
-%endif
-
-# Moves the XDG configuration files to TDE directory
-%if "%{tde_prefix}" != "/usr"
-%__mkdir_p "%{?buildroot}%{tde_prefix}/etc"
-%__mv -f "%{?buildroot}%{_sysconfdir}/xdg" "%{?buildroot}%{tde_prefix}/etc"
-%endif
-
-# Symlinks 'usb.ids'
-%if 0%{?suse_version} == 0
-%__rm -f "%{?buildroot}%{tde_datadir}/apps/usb.ids"
-%__ln_s -f "/usr/share/hwdata/usb.ids" "%{?buildroot}%{tde_datadir}/apps/usb.ids"
-%endif
-
-# Makes 'media_safelyremove.desktop' an alternative
-%__mv -f %{buildroot}%{tde_datadir}/apps/konqueror/servicemenus/media_safelyremove.desktop %{buildroot}%{tde_datadir}/apps/konqueror/servicemenus/media_safelyremove.desktop_tdebase
-%__ln_s /etc/alternatives/media_safelyremove.desktop_tdebase %{buildroot}%{tde_datadir}/apps/konqueror/servicemenus/media_safelyremove.desktop
-
-
-%clean
-%__rm -rf %{?buildroot}
-
-
-
-
-%changelog
-* Sun Aug 19 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13-27
-- Merge with v3.5.13-sru branch, but still using v3.5.13 tdelibs
-- See: http://git.trinitydesktop.org/cgit/tdebase/log/?h=origin/v3.5.13-sru
-- Removes the "tqapp" => "app" renaming from SRU, to keep applications compatibility
-- This is the final update for v3.5.13 . Next release should be 3.5.13.1 .
-
-* Sat Jul 14 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13-26
-- Add xscreensaver support to CMake [Bug #659] [Commit #80deb529]
-- Enables 'shadow' support
-- Enables 'i8k' support
-
-* Sun Jul 08 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13-25
-- Fix menu crash with disabled search field [Bug #1081] [Commit #0afb2d8a]
-- Makes 'media_safelyremove.desktop' an alternative
-
-* Sun Jul 01 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13-24
-- Renames 'tdebase' to 'trinity-tdebase'
-- Update default konqueror maximum image preview size to 10MB. [Commit #03e19305]
-
-* Sun Jun 17 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13-23
-- Renames 'trinity-kdebase' to 'tdebase'
-- Split into several packages
-
-* Sat May 05 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13-22
-- Adds panel to choose default mounting options for removable storage [Bug #986]
-- Add the ability to reorder documents in kate [Commit #46a657f7]
-- Add drag and drop to kate file list in manual mode [Commit #b0fa10df]
-- Disable keyboard shortcuts for file location moving, as they did not work properly 
-  and have very little practical use [Commit #9a948c1a]
-- Fix KHTML smooth scrolling control center option [Bug #1001] [Commit #b45b4bd7]
-- Fix fancy logout not allowing interaction with save dialogs [Bug #922]
-  Fix desktop wallpaper export failing when triggered by krootbacking or ksmserver and konsole or 
-  kdesktop_lock not previously loaded [Commit #d2f8fca9]
-
-* Mon Apr 30 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13-21
-- Commit the rest of 8d521d0b, not merged due to GIT glitch [Commit #49526413]
-
-* Fri Apr 27 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13-20
-- Fix sftp when nonstandard port is specified in ssh config [Bug #897]
-- Start minimal dcop system to support twin in tdm [Commit #66a19439]
-- Update lock process to engage the lock in near real time [Commit #8d521d0b]
-- Fix desktop lock failure due to race condition within signal handler between qt and xcb [Commit #67a3a8f3]
-- Temporary fix for a probable race condition on some systems. [Bug #760] [Commit #d41f5217]
-
-* Tue Apr 24 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13-19
-- Build for Fedora 17
-- Fix compilation with GCC 4.7 [Bug #958]
-
-* Mon Apr 23 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13-18
-- Ensures that 'pagersettings.kcfg' is installed [Bug #908, Commit bd9c1479]
-- Fix "Malformed URL $( kxdglauncher --getpath xdgname DOCUMENTS )" error dialog.
-- Fix sftp failure on newer systems [Bug #897]
-
-* Sun Apr 01 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13-17
-- do not show hostname in titlebar if it's FQDN of localhost [Bug #889]
-- Adds option to disable desktop switch on mouse wheel cycling [Bug #908]
-- Fix Keramik window decoration in KWIN [Bug #905]
-- Fix device icon placement on desktop [Bug #392]
-- Fix security hole in kdesktop_lock
-- Allow minimal managed window interaction inside the lock process [Bug #810]
-- Corrects a potential ABI compat problem
-- Fix kdebase translations in desktop files - part 2 [Bug #890]
-- Kate: fix focus broken when using the --use parameter [Bug #692]
-   
-* Sat Jan 21 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13-16
-- Fix KDM high CPU usage when inactive [Bug #690]
-- Add keyboard hotplug (add/remove) support to tsak [Bug #587]
-- Replicate LED status from virtual keyboards to physical keyboards [Bug #561]
-
-* Thu Jan 05 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13-15
-- Add a KDM option to hide 'Menu' button on login prompt
-- Fix corrupted PNG tiles [Bug #298]
-- Adds 'xtest' support
-
-* Mon Jan 02 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13-14
-- Fix Konqueror Icon Activation Effect [Bug #335]
-- Restores the "Keep password" check box to the kdesu dialog box [Bug #388]
-- Repair KPersonalizer settings to match system defaults [Bug #759]
-- Restores the original KDE3 clock [Bug #387]
-- Implement X11 event merging in krandrtray [Bug #758]
-- Fix multihead screen locking [Bug #669]
-
-* Mon Dec 12 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-13
-- Fix variables (again)
-
-* Sun Dec 11 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-12
-- Fix KDEDIRS and other variables in 'startkde', that messes up translations. [Bug  #741]
-
-* Sat Dec 10 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-11
-- Fix error message 'cannot find parent folder' on konqueror sidebar. [Bug #723]
-
-* Sat Dec 03 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-10
-- Removes Kubuntu branding [Bug #449]
-- Re-enables 'open tab in background' konqueror feature [Bug #245]
-
-* Wed Nov 29 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-9
-- Fix 'kio_man' on RHEL 5 and RHEL 6 [Bug #714]
-- Restores the 'number of files' and sorting widgets to the Kate configuration [Bug #244]
-
-* Fri Nov 18 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-8
-- Updates Kickoff menu Fix [Bugs #281, #508]
-- Adds KDM gcrypt dependency
-
-* Sun Nov 13 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-7
-- Add distribution-specific start button icon
-
-* Sat Nov 12 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-6
-- Add graphical theme for RHEL 5, RHEL 6, Fedora 15, Fedora 16
-- Moves XDG files in TDE prefix to avoid conflict with distro-provided KDE
-
-* Fri Nov 11 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-5
-- Add "service(graphical-login)"
-- Add kickoff menu fix [Bug #508]
-- kdmrc: sets "MinShowUID=500"
-
-* Tue Nov 08 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-4
-- Fix FTBFS with dbus-tqt
-
-* Thu Nov 03 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-3
-- Add missing BuildRequires
-
-* Tue Nov 01 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-2
-- Add 'patch8' to fix LD_PRELOAD variable set by 'startkde' under x86_64
-
-* Sun Oct 30 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-1
-- Initial release for RHEL 6, RHEL 5 and Fedora 15
-
-* Sat Sep 03 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-0
-- Import to GIT
-- Use TDE 3.5.13, cmake, QT3.3.3.8d
diff --git a/redhat/tdebase/kdebase-bp126-553923b2.diff b/redhat/tdebase/kdebase-bp126-553923b2.diff
deleted file mode 100644
index 62a4e20b7..000000000
--- a/redhat/tdebase/kdebase-bp126-553923b2.diff
+++ /dev/null
@@ -1,135 +0,0 @@
-commit 553923b25dc41e2c17ba9038eb225cd3bb9b1770
-Author: Timothy Pearson <kb9vqf@pearsoncomputing.net>
-Date:   1348270079 -0500
-
-    Forcibly prevent transient override redirect windows from showing up over the lock screen
-    This closes Bug 1079
-
-diff --git a/kdesktop/lock/lockdlg.cc b/kdesktop/lock/lockdlg.cc
-index 236bf8a..005ac99 100644
---- a/kdesktop/lock/lockdlg.cc
-+++ b/kdesktop/lock/lockdlg.cc
-@@ -573,9 +573,19 @@ void PasswordDlg::gplugActivity()
- 
- void PasswordDlg::gplugMsgBox( TQMessageBox::Icon type, const TQString &text )
- {
--    TQDialog dialog( this, 0, true, (WFlags)WX11BypassWM );
-+    TQDialog dialog( this, 0, true, (trinity_desktop_lock_use_system_modal_dialogs?((WFlags)WStyle_StaysOnTop):((WFlags)WX11BypassWM)) );
-+    if (trinity_desktop_lock_use_system_modal_dialogs) {
-+        // Signal that we do not want any window controls to be shown at all
-+        Atom kde_wm_system_modal_notification;
-+        kde_wm_system_modal_notification = XInternAtom(qt_xdisplay(), "_KDE_WM_MODAL_SYS_NOTIFICATION", False);
-+        XChangeProperty(qt_xdisplay(), dialog.winId(), kde_wm_system_modal_notification, XA_INTEGER, 32, PropModeReplace, (unsigned char *) "TRUE", 1L);
-+    }
-+    dialog.setCaption(i18n("Authentication Subsystem Notice"));
-     TQFrame *winFrame = new TQFrame( &dialog );
--    winFrame->setFrameStyle( TQFrame::WinPanel | TQFrame::Raised );
-+    if (trinity_desktop_lock_use_system_modal_dialogs)
-+        winFrame->setFrameStyle( TQFrame::NoFrame );
-+    else
-+        winFrame->setFrameStyle( TQFrame::WinPanel | TQFrame::Raised );
-     winFrame->setLineWidth( 2 );
-     TQVBoxLayout *vbox = new TQVBoxLayout( &dialog );
-     vbox->addWidget( winFrame );
-diff --git a/kdesktop/lock/lockprocess.cc b/kdesktop/lock/lockprocess.cc
-index 2ce7507..5265bc6 100644
---- a/kdesktop/lock/lockprocess.cc
-+++ b/kdesktop/lock/lockprocess.cc
-@@ -960,6 +960,27 @@ void LockProcess::createSaverWindow()
- 
-     setGeometry(0, 0, mRootWidth, mRootHeight);
- 
-+    // HACK
-+    // Close all tooltips and notification windows
-+    {
-+        Window rootWindow = RootWindow(x11Display(), x11Screen());
-+        Window parent;
-+        Window* children = NULL;
-+        unsigned int noOfChildren = 0;
-+        XWindowAttributes childAttr;
-+        Window childTransient;
-+
-+        if (XQueryTree(x11Display(), rootWindow, &rootWindow, &parent, &children, &noOfChildren) && noOfChildren>0 ) {
-+            for (unsigned int i=0; i<noOfChildren; i++) {
-+                if (XGetWindowAttributes(x11Display(), children[i], &childAttr) && XGetTransientForHint(x11Display(), children[i], &childTransient)) {
-+                    if ((childAttr.map_state == IsViewable) && (childAttr.override_redirect) && (childTransient)) {
-+                        XUnmapWindow(x11Display(), children[i]);
-+                    }
-+                }
-+            }
-+        }
-+    }
-+
-     kdDebug(1204) << "Saver window Id: " << winId() << endl;
- }
- 
-@@ -2162,9 +2183,19 @@ void LockProcess::unlockXF86()
- 
- void LockProcess::msgBox( TQMessageBox::Icon type, const TQString &txt )
- {
--    TQDialog box( 0, "messagebox", true, (WFlags)WX11BypassWM );
-+    TQDialog box( 0, "messagebox", true, (trinity_desktop_lock_use_system_modal_dialogs?((WFlags)WStyle_StaysOnTop):((WFlags)WX11BypassWM)) );
-+    if (trinity_desktop_lock_use_system_modal_dialogs) {
-+        // Signal that we do not want any window controls to be shown at all
-+        Atom kde_wm_system_modal_notification;
-+        kde_wm_system_modal_notification = XInternAtom(qt_xdisplay(), "_KDE_WM_MODAL_SYS_NOTIFICATION", False);
-+        XChangeProperty(qt_xdisplay(), box.winId(), kde_wm_system_modal_notification, XA_INTEGER, 32, PropModeReplace, (unsigned char *) "TRUE", 1L);
-+    }
-+    box.setCaption(i18n("Authentication Subsystem Notice"));
-     TQFrame *winFrame = new TQFrame( &box );
--    winFrame->setFrameStyle( TQFrame::WinPanel | TQFrame::Raised );
-+    if (trinity_desktop_lock_use_system_modal_dialogs)
-+        winFrame->setFrameStyle( TQFrame::NoFrame );
-+    else
-+        winFrame->setFrameStyle( TQFrame::WinPanel | TQFrame::Raised );
-     winFrame->setLineWidth( 2 );
-     TQLabel *label1 = new TQLabel( winFrame );
-     label1->setPixmap( TQMessageBox::standardIcon( type ) );
-@@ -2264,8 +2295,10 @@ void LockProcess::windowAdded( WId w, bool managed )
-     int y = XDisplayHeight( qt_xdisplay(), qt_xscreen()) - attr_geom.height;
-     if( managed ) {
-         XSetWindowAttributes attr;
--        attr.override_redirect = True;
--        XChangeWindowAttributes( qt_xdisplay(), w, CWOverrideRedirect, &attr );
-+        if (!trinity_desktop_lock_use_system_modal_dialogs) {
-+            attr.override_redirect = True;
-+            XChangeWindowAttributes( qt_xdisplay(), w, CWOverrideRedirect, &attr );
-+        }
-         XReparentWindow( qt_xdisplay(), w, qt_xrootwin(), x, y );
-         XMapWindow( qt_xdisplay(), w );
-     }
-diff --git a/kdesktop/lock/main.cc b/kdesktop/lock/main.cc
-index 56b4b5f..e74d9f9 100644
---- a/kdesktop/lock/main.cc
-+++ b/kdesktop/lock/main.cc
-@@ -76,6 +76,30 @@ bool MyApp::x11EventFilter( XEvent *ev )
-             emit activity();
-         }
-     }
-+    else if (ev->type == MapNotify) {
-+        // HACK
-+        // Close all tooltips and notification windows
-+        XMapEvent map_event = ev->xmap;
-+        XWindowAttributes childAttr;
-+        Window childTransient;
-+        if (XGetWindowAttributes(map_event.display, map_event.window, &childAttr) && XGetTransientForHint(map_event.display, map_event.window, &childTransient)) {
-+            if((childAttr.map_state == IsViewable) && (childAttr.override_redirect) && (childTransient)) {
-+                XUnmapWindow(map_event.display, map_event.window);
-+            }
-+        }
-+    }
-+    else if (ev->type == CreateNotify) {
-+        // HACK
-+        // Close all tooltips and notification windows
-+        XCreateWindowEvent create_event = ev->xcreatewindow;
-+        XWindowAttributes childAttr;
-+        Window childTransient;
-+        if (XGetWindowAttributes(create_event.display, create_event.window, &childAttr) && XGetTransientForHint(create_event.display, create_event.window, &childTransient)) {
-+            if ((childAttr.override_redirect) && (childTransient)) {
-+                XDestroyWindow(create_event.display, create_event.window);
-+            }
-+        }
-+    }
-     return KApplication::x11EventFilter( ev );
- }
- 
diff --git a/redhat/tdebase/kdebase-bp127-57f5c069.diff b/redhat/tdebase/kdebase-bp127-57f5c069.diff
deleted file mode 100644
index da6a95d22..000000000
--- a/redhat/tdebase/kdebase-bp127-57f5c069.diff
+++ /dev/null
@@ -1,159 +0,0 @@
-commit 57f5c0698d49f0a0a7a55c75404f5b9ded910002
-Author: Timothy Pearson <kb9vqf@pearsoncomputing.net>
-Date:   1348355175 -0500
-
-    Lower override redirect windows instead of unmapping them on lock start
-    Restore lowered windows on lock exit
-    This provides a better solution to Bug 1079
-
-diff --git a/kdesktop/lock/lockprocess.cc b/kdesktop/lock/lockprocess.cc
-index 5265bc6..7191346 100644
---- a/kdesktop/lock/lockprocess.cc
-+++ b/kdesktop/lock/lockprocess.cc
-@@ -138,6 +138,8 @@ extern bool trinity_desktop_lock_delay_screensaver_start;
- extern bool trinity_desktop_lock_use_sak;
- extern bool trinity_desktop_lock_forced;
- 
-+extern TQXLibWindowList trinity_desktop_lock_hidden_window_list;
-+
- bool trinity_desktop_lock_autohide_lockdlg = TRUE;
- bool trinity_desktop_lock_closing_windows = FALSE;
- bool trinity_desktop_lock_in_sec_dlg = FALSE;
-@@ -961,7 +963,7 @@ void LockProcess::createSaverWindow()
-     setGeometry(0, 0, mRootWidth, mRootHeight);
- 
-     // HACK
--    // Close all tooltips and notification windows
-+    // Hide all tooltips and notification windows
-     {
-         Window rootWindow = RootWindow(x11Display(), x11Screen());
-         Window parent;
-@@ -974,7 +976,10 @@ void LockProcess::createSaverWindow()
-             for (unsigned int i=0; i<noOfChildren; i++) {
-                 if (XGetWindowAttributes(x11Display(), children[i], &childAttr) && XGetTransientForHint(x11Display(), children[i], &childTransient)) {
-                     if ((childAttr.map_state == IsViewable) && (childAttr.override_redirect) && (childTransient)) {
--                        XUnmapWindow(x11Display(), children[i]);
-+                        if (!trinity_desktop_lock_hidden_window_list.contains(children[i])) {
-+                            trinity_desktop_lock_hidden_window_list.append(children[i]);
-+                        }
-+                        XLowerWindow(x11Display(), children[i]);
-                     }
-                 }
-             }
-diff --git a/kdesktop/lock/lockprocess.h b/kdesktop/lock/lockprocess.h
-index 0dacc46..7fd4236 100644
---- a/kdesktop/lock/lockprocess.h
-+++ b/kdesktop/lock/lockprocess.h
-@@ -38,6 +38,8 @@ struct GreeterPluginHandle {
- #define FIFO_FILE_OUT "/tmp/ksocket-global/kdesktoplockcontrol_out"
- #define PIPE_CHECK_INTERVAL 50
- 
-+typedef TQValueList<Window> TQXLibWindowList;
-+
- //===========================================================================
- //
- // Screen saver handling process.  Handles screensaver window,
-diff --git a/kdesktop/lock/main.cc b/kdesktop/lock/main.cc
-index e74d9f9..a95747e 100644
---- a/kdesktop/lock/main.cc
-+++ b/kdesktop/lock/main.cc
-@@ -47,6 +47,8 @@ else {													\
- }													\
- tdmconfig->setGroup("X-*-Greeter");
- 
-+TQXLibWindowList trinity_desktop_lock_hidden_window_list;
-+
- // [FIXME] Add GUI configuration checkboxes for these three settings (see kdesktoprc [ScreenSaver] UseUnmanagedLockWindows, DelaySaverStart, and UseTDESAK)
- bool trinity_desktop_lock_use_system_modal_dialogs = FALSE;
- bool trinity_desktop_lock_delay_screensaver_start = FALSE;
-@@ -78,16 +80,43 @@ bool MyApp::x11EventFilter( XEvent *ev )
-     }
-     else if (ev->type == MapNotify) {
-         // HACK
--        // Close all tooltips and notification windows
-+        // Hide all tooltips and notification windows
-         XMapEvent map_event = ev->xmap;
-         XWindowAttributes childAttr;
-         Window childTransient;
-         if (XGetWindowAttributes(map_event.display, map_event.window, &childAttr) && XGetTransientForHint(map_event.display, map_event.window, &childTransient)) {
-             if((childAttr.map_state == IsViewable) && (childAttr.override_redirect) && (childTransient)) {
--                XUnmapWindow(map_event.display, map_event.window);
-+                if (!trinity_desktop_lock_hidden_window_list.contains(map_event.window)) {
-+                    trinity_desktop_lock_hidden_window_list.append(map_event.window);
-+                }
-+                XLowerWindow(map_event.display, map_event.window);
-             }
-         }
-     }
-+    else if (ev->type == VisibilityNotify) {
-+        // HACK
-+        // Hide all tooltips and notification windows
-+        XVisibilityEvent visibility_event = ev->xvisibility;
-+        XWindowAttributes childAttr;
-+        Window childTransient;
-+        if ((visibility_event.state == VisibilityUnobscured) || (visibility_event.state == VisibilityPartiallyObscured)) {
-+            if (XGetWindowAttributes(visibility_event.display, visibility_event.window, &childAttr) && XGetTransientForHint(visibility_event.display, visibility_event.window, &childTransient)) {
-+                if((childAttr.map_state == IsViewable) && (childAttr.override_redirect) && (childTransient)) {
-+                    if (!trinity_desktop_lock_hidden_window_list.contains(visibility_event.window)) {
-+                        trinity_desktop_lock_hidden_window_list.append(visibility_event.window);
-+                    }
-+                    XLowerWindow(visibility_event.display, visibility_event.window);
-+                }
-+            }
-+        }
-+    }
-+    else if (ev->type == DestroyNotify) {
-+        XDestroyWindowEvent destroy_event = ev->xdestroywindow;
-+        if (trinity_desktop_lock_hidden_window_list.contains(destroy_event.window)) {
-+            trinity_desktop_lock_hidden_window_list.remove(destroy_event.window);
-+        }
-+    }
-+#if 0
-     else if (ev->type == CreateNotify) {
-         // HACK
-         // Close all tooltips and notification windows
-@@ -100,6 +129,7 @@ bool MyApp::x11EventFilter( XEvent *ev )
-             }
-         }
-     }
-+#endif
-     return KApplication::x11EventFilter( ev );
- }
- 
-@@ -114,6 +144,14 @@ static KCmdLineOptions options[] =
-    KCmdLineLastOption
- };
- 
-+void restore_hidden_override_redirect_windows() {
-+    TQXLibWindowList::iterator it;
-+    for (it = trinity_desktop_lock_hidden_window_list.begin(); it != trinity_desktop_lock_hidden_window_list.end(); ++it) {
-+        Window win = *it;
-+        XRaiseWindow(qt_xdisplay(), win);
-+    }
-+}
-+
- static void sigusr1_handler(int)
- {
-     signalled_forcelock = TRUE;
-@@ -356,7 +394,10 @@ int main( int argc, char **argv )
-         }
- 
-         if (in_internal_mode == FALSE) {
--            return app.exec();
-+            trinity_desktop_lock_hidden_window_list.clear();
-+            int ret = app.exec();
-+            restore_hidden_override_redirect_windows();
-+            return ret;
-         }
-         else {
-             pid_t kdesktop_pid = atoi(args->getOption( "internal" ));
-@@ -364,7 +405,9 @@ int main( int argc, char **argv )
-                 // The controlling kdesktop process probably died.  Commit suicide...
-                 return 12;
-             }
-+            trinity_desktop_lock_hidden_window_list.clear();
-             app.exec();
-+            restore_hidden_override_redirect_windows();
-             if (kill(kdesktop_pid, SIGUSR1) < 0) {
-                 // The controlling kdesktop process probably died.  Commit suicide...
-                 return 12;
diff --git a/redhat/tdebase/kdebase-bp128-1f33dc8f.diff b/redhat/tdebase/kdebase-bp128-1f33dc8f.diff
deleted file mode 100644
index e552a069b..000000000
--- a/redhat/tdebase/kdebase-bp128-1f33dc8f.diff
+++ /dev/null
@@ -1,58 +0,0 @@
-commit 1f33dc8fd2fc14c2abb74be4e27ef08fdda784d6
-Author: Timothy Pearson <kb9vqf@pearsoncomputing.net>
-Date:   1348374670 -0500
-
-    Attempt to minimize the time in which new notifications are displayed before being hidden
-
-diff --git a/kdesktop/lock/lockprocess.cc b/kdesktop/lock/lockprocess.cc
-index 7191346..db92c00 100644
---- a/kdesktop/lock/lockprocess.cc
-+++ b/kdesktop/lock/lockprocess.cc
-@@ -980,6 +980,7 @@ void LockProcess::createSaverWindow()
-                             trinity_desktop_lock_hidden_window_list.append(children[i]);
-                         }
-                         XLowerWindow(x11Display(), children[i]);
-+                        XFlush(x11Display());
-                     }
-                 }
-             }
-diff --git a/kdesktop/lock/main.cc b/kdesktop/lock/main.cc
-index a95747e..7235776 100644
---- a/kdesktop/lock/main.cc
-+++ b/kdesktop/lock/main.cc
-@@ -90,6 +90,7 @@ bool MyApp::x11EventFilter( XEvent *ev )
-                     trinity_desktop_lock_hidden_window_list.append(map_event.window);
-                 }
-                 XLowerWindow(map_event.display, map_event.window);
-+                XFlush(map_event.display);
-             }
-         }
-     }
-@@ -106,10 +107,27 @@ bool MyApp::x11EventFilter( XEvent *ev )
-                         trinity_desktop_lock_hidden_window_list.append(visibility_event.window);
-                     }
-                     XLowerWindow(visibility_event.display, visibility_event.window);
-+                    XFlush(visibility_event.display);
-                 }
-             }
-         }
-     }
-+    else if (ev->type == CreateNotify) {
-+        // HACK
-+        // Close all tooltips and notification windows
-+        XCreateWindowEvent create_event = ev->xcreatewindow;
-+        XWindowAttributes childAttr;
-+        Window childTransient;
-+        if (XGetWindowAttributes(create_event.display, create_event.window, &childAttr) && XGetTransientForHint(create_event.display, create_event.window, &childTransient)) {
-+            if ((childAttr.override_redirect) && (childTransient)) {
-+                if (!trinity_desktop_lock_hidden_window_list.contains(create_event.window)) {
-+                    trinity_desktop_lock_hidden_window_list.append(create_event.window);
-+                }
-+                XLowerWindow(create_event.display, create_event.window);
-+                XFlush(create_event.display);
-+            }
-+        }
-+    }
-     else if (ev->type == DestroyNotify) {
-         XDestroyWindowEvent destroy_event = ev->xdestroywindow;
-         if (trinity_desktop_lock_hidden_window_list.contains(destroy_event.window)) {
diff --git a/redhat/tdebase/r1182808.diff b/redhat/tdebase/r1182808.diff
deleted file mode 100644
index 6163d996f..000000000
--- a/redhat/tdebase/r1182808.diff
+++ /dev/null
@@ -1,29 +0,0 @@
-Index: kdebase/kdesktop/init/My_Documents
-===================================================================
---- kdebase/kdesktop/init/My_Documents	(revision 1182807)
-+++ kdebase/kdesktop/init/My_Documents	(revision 1182808)
-@@ -1,10 +1,6 @@
- [Desktop Entry]
- Encoding=UTF-8
--Comment=
--Comment[en_US]=
--Exec=kxdglauncher --xdgname DOCUMENTS
- Icon=folder_wordprocessing
--MimeType=
- Name=My Documents
- Name[af]=Dokument Gids
- Name[ar]=مستنداتي
-@@ -70,10 +66,12 @@
- Name[wa]=Ridant documints
- Name[zh_CN]=文档文件夹
- Name[zh_TW]=文件目錄
-+URL=$( kxdglauncher --getpath --xdgname DOCUMENTS )
-+Type=Link
- StartupNotify=true
-+MimeType=
- Terminal=false
- TerminalOptions=
--Type=Application
- X-DCOP-ServiceType=
- X-KDE-SubstituteUID=false
- X-KDE-Username=
diff --git a/redhat/tdebase/r1201523.diff b/redhat/tdebase/r1201523.diff
deleted file mode 100644
index 7272968b2..000000000
--- a/redhat/tdebase/r1201523.diff
+++ /dev/null
@@ -1,31 +0,0 @@
-Index: kdebase/kcontrol/crypto/crypto.cpp
-===================================================================
---- kdebase/kcontrol/crypto/crypto.cpp	(revision 1201522)
-+++ kdebase/kcontrol/crypto/crypto.cpp	(revision 1201523)
-@@ -2321,7 +2321,7 @@
- unsigned int i;
- SSL_CTX *ctx;
- SSL *ssl;
--SSL_METHOD *meth;
-+const SSL_METHOD *meth;
- 
-   SSLv2Box->clear();
-   SSLv3Box->clear();
-@@ -2337,7 +2337,7 @@
-   CipherItem *item;
-   for (i=0; ; i++) {
-     int j, k;
--    SSL_CIPHER *sc;
-+    const SSL_CIPHER *sc;
-     sc = (meth->get_cipher)(i);
-     if (!sc)
-       break;
-@@ -2365,7 +2365,7 @@
- 
-   for (i=0; ; i++) {
-     int j, k;
--    SSL_CIPHER *sc;
-+    const SSL_CIPHER *sc;
-     sc = (meth->get_cipher)(i);
-     if (!sc)
-       break;
diff --git a/redhat/tdebase/r1201705.diff b/redhat/tdebase/r1201705.diff
deleted file mode 100644
index c7dff1e6e..000000000
--- a/redhat/tdebase/r1201705.diff
+++ /dev/null
@@ -1,43 +0,0 @@
-Index: kdebase/kcontrol/crypto/crypto.cpp
-===================================================================
---- kdebase/kcontrol/crypto/crypto.cpp	(revision 1201704)
-+++ kdebase/kcontrol/crypto/crypto.cpp	(revision 1201705)
-@@ -2316,12 +2316,19 @@
- 
- 
- #ifdef HAVE_SSL
-+
-+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
-+#define SSL_CONST const
-+#else
-+#define SSL_CONST
-+#endif
-+
- // This gets all the available ciphers from OpenSSL
- bool KCryptoConfig::loadCiphers() {
- unsigned int i;
- SSL_CTX *ctx;
- SSL *ssl;
--const SSL_METHOD *meth;
-+SSL_CONST SSL_METHOD *meth;
- 
-   SSLv2Box->clear();
-   SSLv3Box->clear();
-@@ -2337,7 +2344,7 @@
-   CipherItem *item;
-   for (i=0; ; i++) {
-     int j, k;
--    const SSL_CIPHER *sc;
-+    SSL_CONST SSL_CIPHER *sc;
-     sc = (meth->get_cipher)(i);
-     if (!sc)
-       break;
-@@ -2365,7 +2372,7 @@
- 
-   for (i=0; ; i++) {
-     int j, k;
--    const SSL_CIPHER *sc;
-+    SSL_CONST SSL_CIPHER *sc;
-     sc = (meth->get_cipher)(i);
-     if (!sc)
-       break;
diff --git a/redhat/tdebase/r1221326.diff b/redhat/tdebase/r1221326.diff
deleted file mode 100644
index b164a4679..000000000
--- a/redhat/tdebase/r1221326.diff
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: kdebase/kcontrol/randr/krandrbindings.cpp
-===================================================================
---- kdebase/kcontrol/randr/krandrbindings.cpp	(revision 1221325)
-+++ kdebase/kcontrol/randr/krandrbindings.cpp	(revision 1221326)
-@@ -28,7 +28,7 @@
- 
- 	keys->insert( "Program:krandrtray", i18n("Display Control") );
- 
--	DEF( I18N_NOOP("Switch Displays"), KShortcut::KShortcut(TQString("XF86Display")), KShortcut::KShortcut(TQString("XF86Display")), slotCycleDisplays() );
-+	DEF( I18N_NOOP("Switch Displays"), KShortcut(TQString("XF86Display")), KShortcut(TQString("XF86Display")), slotCycleDisplays() );
- 
- #undef DEF
- #undef WIN
diff --git a/redhat/tdebase/tdebase-3.5.13.1-missing_ldflags.patch b/redhat/tdebase/tdebase-3.5.13.1-missing_ldflags.patch
deleted file mode 100644
index 6f6173ef0..000000000
--- a/redhat/tdebase/tdebase-3.5.13.1-missing_ldflags.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- kdebase/khotkeys/arts/CMakeLists.txt.ORI	2012-08-07 21:21:45.840401244 +0200
-+++ kdebase/khotkeys/arts/CMakeLists.txt	2012-08-07 21:22:06.260974727 +0200
-@@ -25,6 +25,7 @@
-   ${CMAKE_SOURCE_DIR}/khotkeys/kcontrol
-   ${TDE_INCLUDE_DIR}
-   ${TQT_INCLUDE_DIRS}
-+  ${ARTS_INCLUDE_DIRS}
- )
- 
- link_directories(
diff --git a/redhat/tdebase/tdebase-3.5.13.2-bookmark_global_copy.patch b/redhat/tdebase/tdebase-3.5.13.2-bookmark_global_copy.patch
deleted file mode 100644
index b9b0ec5fa..000000000
--- a/redhat/tdebase/tdebase-3.5.13.2-bookmark_global_copy.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- ./libkonq/konqbookmarkmanager.h.ori	2013-05-08 23:26:03.558587419 +0200
-+++ ./libkonq/konqbookmarkmanager.h	2013-05-08 23:29:25.317517880 +0200
-@@ -3,6 +3,8 @@
- 
- #include <kbookmarkmanager.h>
- #include <kstandarddirs.h>
-+#include <kurl.h>
-+#include <kio/job.h>
- #include <libkonq_export.h>
- 
- class LIBKONQ_EXPORT KonqBookmarkManager
-@@ -11,7 +13,14 @@
-     static KBookmarkManager * self() {
-         if ( !s_bookmarkManager )
-         {
--            TQString bookmarksFile = locateLocal("data", TQString::fromLatin1("konqueror/bookmarks.xml"));
-+            TQString globalBookmarkFile = locate( "data",  TQString::fromLatin1( "konqueror/bookmarks.xml" ) );
-+            TQString bookmarksFile = locateLocal( "data", TQString::fromLatin1("konqueror/bookmarks.xml" ), true);
-+            if ( globalBookmarkFile != TQString::null && bookmarksFile == TQString::null ) {
-+                KIO::file_copy( 
-+                   KURL::fromPathOrURL( globalBookmarkFile ), 
-+                   KURL::fromPathOrURL( bookmarksFile ), -1, false, false
-+                );
-+            }
-             s_bookmarkManager = KBookmarkManager::managerForFile( bookmarksFile );
-         }
-         return s_bookmarkManager;
diff --git a/redhat/tdebase/tdebase-3.5.13.2-displayconfig_translation.patch b/redhat/tdebase/tdebase-3.5.13.2-displayconfig_translation.patch
deleted file mode 100644
index d2af92c3f..000000000
--- a/redhat/tdebase/tdebase-3.5.13.2-displayconfig_translation.patch
+++ /dev/null
@@ -1,37 +0,0 @@
---- trinity-tdebase-3.5.13.2~pre100+073a32f9/kcontrol/displayconfig/displayconfig.desktop.ORI	2013-05-11 14:53:30.914170537 +0200
-+++ trinity-tdebase-3.5.13.2~pre100+073a32f9/kcontrol/displayconfig/displayconfig.desktop	2013-05-11 14:53:59.495582944 +0200
-@@ -2,6 +2,7 @@
- Categories=Qt;KDE;X-KDE-settings-system;
- Comment=Configure display
- Comment[en_US]=Configure display
-+Comment[fr]=Configuration de l'affichage
- DocPath=kcontrol/displayconfig.html
- Exec=kcmshell displayconfig
- GenericName=
-@@ -11,6 +12,7 @@
- MimeType=
- Name=Monitor & Display
- Name[en_US]=Monitor & Display
-+Name[fr]=Moniteurs & Affichage
- NoDisplay=false
- Path=
- StartupNotify=true
---- trinity-tdebase-3.5.13.2~pre100+073a32f9/kcontrol/iccconfig/iccconfig.desktop.ORI	2013-05-11 21:21:04.241337141 +0200
-+++ trinity-tdebase-3.5.13.2~pre100+073a32f9/kcontrol/iccconfig/iccconfig.desktop	2013-05-11 21:21:44.782537929 +0200
-@@ -12,6 +12,7 @@
- Categories=Qt;KDE;X-KDE-settings-hardware;
- Comment=Configure display ICC profile
- Comment[en_US]=Configure display ICC profile
-+Comment[fr]=Configurer les profils de couleurs ICC
- DocPath=kcontrol/iccconfig.html
- GenericName=
- GenericName[en_US]=
-@@ -19,5 +20,6 @@
- MimeType=
- Name=ICC Color Profile
- Name[en_US]=ICC Color Profile
-+Name[fr]=Profils de couleurs ICC
- 
--NoDisplay=false
-\ Pas de fin de ligne à la fin du fichier
-+NoDisplay=false
diff --git a/redhat/tdebase/tdebase-3.5.13.2-fix_halbackend_slash.patch b/redhat/tdebase/tdebase-3.5.13.2-fix_halbackend_slash.patch
deleted file mode 100644
index 1ed19d685..000000000
--- a/redhat/tdebase/tdebase-3.5.13.2-fix_halbackend_slash.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- trinity-tdebase-3.5.13.2/kioslave/media/mediamanager/halbackend.cpp.slash	2013-08-15 18:24:06.092882626 +0200
-+++ trinity-tdebase-3.5.13.2/kioslave/media/mediamanager/halbackend.cpp	2013-08-15 18:32:20.535855050 +0200
-@@ -554,6 +554,10 @@
-         media_name.replace(pattern, i18n(pattern.utf8()));
-         medium->setLabel(media_name);
-     } else {
-+        // If media_name begins with '%', it is likely to be a directory path.
-+        if( media_name.at(0) == '%') {
-+            media_name.replace(QChar('%'), "/");
-+        }
-         medium->setLabel(i18n(media_name.utf8()));
-     }
- 
diff --git a/redhat/tdebase/tdebase-3.5.13.2-fix_ice_security_hole.patch b/redhat/tdebase/tdebase-3.5.13.2-fix_ice_security_hole.patch
deleted file mode 100644
index e0096c6b9..000000000
--- a/redhat/tdebase/tdebase-3.5.13.2-fix_ice_security_hole.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-commit c383da9dc680e5e79e75b84003eca7bfa08dd991
-Author: Timothy Pearson <kb9vqf@pearsoncomputing.net>
-Date:   1400559462 -0500
-
-    Forward port KDE SVN r803253 to fix potential security hole
-
-diff --git a/config.h.cmake b/config.h.cmake
-index f5ebeeb..cacb97c 100644
---- a/config.h.cmake
-+++ b/config.h.cmake
-@@ -182,6 +182,7 @@
- 
- // ksmserver
- #cmakedefine DBUS_SYSTEM_BUS "@DBUS_SYSTEM_BUS@"
-+#cmakedefine HAVE__ICETRANSNOLISTEN 1
- 
- // ksplashml
- #cmakedefine HAVE_XINERAMA 1
-diff --git a/ksmserver/CMakeLists.txt b/ksmserver/CMakeLists.txt
-index fdd521b..8578b01 100644
---- a/ksmserver/CMakeLists.txt
-+++ b/ksmserver/CMakeLists.txt
-@@ -9,6 +9,8 @@
- #
- #################################################
- 
-+include( ConfigureChecks.cmake )
-+
- if( NOT DBUS_SYSTEM_BUS )
-   set( DBUS_SYSTEM_BUS "unix:path=/var/run/dbus/system_bus_socket" CACHE INTERNAL "" FORCE )
- endif()
-diff --git a/ksmserver/ConfigureChecks.cmake b/ksmserver/ConfigureChecks.cmake
-new file mode 100644
-index 0000000..4f8cf79
---- /dev/null
-+++ b/ksmserver/ConfigureChecks.cmake
-@@ -0,0 +1,12 @@
-+#################################################
-+#
-+#  (C) 2014 Timothy Pearson
-+#  kb9vqf (AT) pearsoncomputing (DOT) net
-+#
-+#  Improvements and feedback are welcome
-+#
-+#  This file is released under GPL >= 2
-+#
-+#################################################
-+
-+check_library_exists( ICE _IceTransNoListen "" HAVE__ICETRANSNOLISTEN )
-\ No newline at end of file
-
diff --git a/redhat/tdebase/tdebase-3.5.13.2-fix_media_safelyremove.patch b/redhat/tdebase/tdebase-3.5.13.2-fix_media_safelyremove.patch
deleted file mode 100644
index c3ca254c8..000000000
--- a/redhat/tdebase/tdebase-3.5.13.2-fix_media_safelyremove.patch
+++ /dev/null
@@ -1,10 +0,0 @@
-diff -Naur kdebase-3.5.10/kioslave/media/services/media_safelyremove.desktop kdebase-3.5.10.yeni/kioslave/media/services/media_safelyremove.desktop
---- kdebase-3.5.10/kioslave/media/services/media_safelyremove.desktop	2008-08-19 21:16:59.000000000 +0300
-+++ kdebase-3.5.10.yeni/kioslave/media/services/media_safelyremove.desktop	2009-12-22 00:51:57.122282682 +0200
-@@ -71,5 +71,5 @@
- Name[wa]=Ositer e såvrité
- Name[zh_CN]=安全删除
- Name[zh_TW]=安全的移除
--Exec=kio_media_mounthelper -s %u
-+Exec=kio_media_mounthelper -u %u
- 
diff --git a/redhat/tdebase/tdebase-3.5.13.2-fix_tdm_user_path.patch b/redhat/tdebase/tdebase-3.5.13.2-fix_tdm_user_path.patch
deleted file mode 100644
index 4f24f6f05..000000000
--- a/redhat/tdebase/tdebase-3.5.13.2-fix_tdm_user_path.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- trinity-tdebase-3.5.13.2/kdm/config.def.ori	2013-09-07 19:18:58.424732176 +0200
-+++ trinity-tdebase-3.5.13.2/kdm/config.def	2013-09-07 19:20:24.310872875 +0200
-@@ -48,10 +48,10 @@
- #endif
- 
- #if defined(BSD) || defined(__linux__)
--# define DEF_USER_PATH "/usr/local/bin:/opt/trinity/bin:/usr/bin:/bin:/opt/trinity/games:/usr/games"
--# define DEF_SYSTEM_PATH "/usr/local/sbin:/usr/local/bin:/opt/trinity/sbin:/usr/sbin:/opt/trinity/bin:/usr/bin:/sbin:/bin"
-+# define DEF_USER_PATH "/usr/local/bin:/usr/bin:/bin:/usr/X11R6/bin:/usr/games"
-+# define DEF_SYSTEM_PATH "/usr/local/sbin:/usr/local/bin:/opt/trinity/sbin:/usr/sbin:/opt/trinity/bin:/usr/bin:/sbin:/bin:/usr/X11R6/bin"
- #else
--# define DEF_USER_PATH "/usr/local/bin:/opt/trinity/bin:/usr/bin:/bin:/opt/trinity/games:/usr/games:/usr/ucb"
-+# define DEF_USER_PATH "/usr/local/bin:/usr/bin:/bin:/usr/games:/usr/ucb"
- # define DEF_SYSTEM_PATH "/usr/local/sbin:/usr/local/bin:/opt/trinity/sbin:/usr/sbin:/opt/trinity/bin:/usr/bin:/sbin:/bin:/etc:/usr/ucb"
- #endif
- 
diff --git a/redhat/tdebase/tdebase-3.5.13.2-fix_xdg_menu.patch b/redhat/tdebase/tdebase-3.5.13.2-fix_xdg_menu.patch
deleted file mode 100644
index e176db423..000000000
--- a/redhat/tdebase/tdebase-3.5.13.2-fix_xdg_menu.patch
+++ /dev/null
@@ -1,9489 +0,0 @@
-diff -Nuar trinity-tdebase-3.5.13.2/applnk.ORI/CMakeLists.txt trinity-tdebase-3.5.13.2/applnk/CMakeLists.txt
---- trinity-tdebase-3.5.13.2/applnk.ORI/CMakeLists.txt	2013-07-28 15:44:30.821668706 +0200
-+++ trinity-tdebase-3.5.13.2/applnk/CMakeLists.txt	2013-07-28 15:47:19.313022892 +0200
-@@ -12,11 +12,11 @@
- add_subdirectory( compat )
- 
- install( FILES
--    kde-settings.menu kde-information.menu kde-screensavers.menu
-+    tde-settings.menu tde-information.menu tde-screensavers.menu
-   DESTINATION ${XDG_MENU_INSTALL_DIR} )
- 
- install( FILES
--    kde-essential.menu
-+    tde-essential.menu
-   DESTINATION ${XDG_MENU_INSTALL_DIR}/applications-merged )
- 
- install( FILES
-@@ -25,27 +25,27 @@
-   RENAME .directory )
- 
- install( FILES
--    kde-main.directory kde-development.directory kde-editors.directory
--    kde-edutainment.directory kde-games-arcade.directory
--    kde-games-board.directory kde-games-card.directory
--    kde-games-kids.directory kde-games-roguelikes.directory
--    kde-games-strategy.directory kde-games.directory
--    kde-graphics.directory kde-information.directory
--    kde-internet-terminal.directory kde-internet.directory
--    kde-more.directory kde-multimedia.directory kde-office.directory
--    kde-science.directory kde-settings-accessibility.directory
--    kde-settings-components.directory kde-settings-desktop.directory
--    kde-settings-looknfeel.directory kde-settings-network.directory
--    kde-settings-peripherals.directory kde-settings-hardware.directory
--    kde-settings-power.directory kde-settings-security.directory
--    kde-settings-sound.directory kde-settings-system.directory
--    kde-settings-webbrowsing.directory kde-settings.directory
--    kde-settingsmenu.directory kde-system-screensavers.directory
--    kde-system-terminal.directory kde-system.directory
--    kde-toys.directory kde-unknown.directory
--    kde-utilities-xutils.directory kde-utilities.directory
--    kde-utilities-accessibility.directory kde-utilities-desktop.directory
--    kde-utilities-peripherals.directory kde-utilities-file.directory
--    kde-utilities-pim.directory kde-development-translation.directory
--    kde-development-webdevelopment.directory
-+    tde-main.directory tde-development.directory tde-editors.directory
-+    tde-edutainment.directory tde-games-arcade.directory
-+    tde-games-board.directory tde-games-card.directory
-+    tde-games-kids.directory tde-games-roguelikes.directory
-+    tde-games-strategy.directory tde-games.directory
-+    tde-graphics.directory tde-information.directory
-+    tde-internet-terminal.directory tde-internet.directory
-+    tde-more.directory tde-multimedia.directory tde-office.directory
-+    tde-science.directory tde-settings-accessibility.directory
-+    tde-settings-components.directory tde-settings-desktop.directory
-+    tde-settings-looknfeel.directory tde-settings-network.directory
-+    tde-settings-peripherals.directory tde-settings-hardware.directory
-+    tde-settings-power.directory tde-settings-security.directory
-+    tde-settings-sound.directory tde-settings-system.directory
-+    tde-settings-webbrowsing.directory tde-settings.directory
-+    tde-settingsmenu.directory tde-system-screensavers.directory
-+    tde-system-terminal.directory tde-system.directory
-+    tde-toys.directory tde-unknown.directory
-+    tde-utilities-xutils.directory tde-utilities.directory
-+    tde-utilities-accessibility.directory tde-utilities-desktop.directory
-+    tde-utilities-peripherals.directory tde-utilities-file.directory
-+    tde-utilities-pim.directory tde-development-translation.directory
-+    tde-development-webdevelopment.directory
-   DESTINATION ${XDG_DIRECTORY_INSTALL_DIR} )
-diff -Nuar trinity-tdebase-3.5.13.2/applnk.ORI/kde-development.directory trinity-tdebase-3.5.13.2/applnk/kde-development.directory
---- trinity-tdebase-3.5.13.2/applnk.ORI/kde-development.directory	2013-07-28 15:44:30.821668706 +0200
-+++ trinity-tdebase-3.5.13.2/applnk/kde-development.directory	1970-01-01 01:00:00.000000000 +0100
-@@ -1,89 +0,0 @@
--[Desktop Entry]
--Encoding=UTF-8
--Type=Directory
--Name=Development
--Name[af]=Ontwikkeling
--Name[ar]=تطوير
--Name[az]=İnkişaf
--Name[be]=Распрацоўка
--Name[bg]=Разработка
--Name[bn]=ডেভেলপমেন্ট
--Name[br]=Diorren
--Name[bs]=Programiranje
--Name[ca]=Desenvolupament
--Name[cs]=Vývoj
--Name[csb]=Nôrzãdza programistów
--Name[cy]=Datblygu
--Name[da]=Udvikling
--Name[de]=Entwicklung
--Name[el]=Ανάπτυξη
--Name[eo]=Programado
--Name[es]=Desarrollo
--Name[et]=Arendus
--Name[eu]=Garapena
--Name[fa]=توسعه
--Name[fi]=Kehitystyökalut
--Name[fo]=Menning
--Name[fr]=Développement
--Name[fy]=Untwikkelje
--Name[ga]=Forbairt
--Name[gl]=Desenvolvemento
--Name[he]=פיתוח
--Name[hi]=विकास
--Name[hr]=Razvoj
--Name[hsb]=Wuwiwanje
--Name[hu]=Fejlesztőeszközök
--Name[id]=Pembangun
--Name[is]=Þróun
--Name[it]=Sviluppo
--Name[ja]=開発
--Name[ka]=განვითარება
--Name[kk]=Жетілдіру
--Name[km]=ការ​អភិវឌ្ឍន៍
--Name[ko]=개발
--Name[lo]=ພັດທະນາໂປຣແກຣມ
--Name[lt]=Programavimas
--Name[lv]=Izstrāde
--Name[mk]=Развој
--Name[mn]=Хөгжүүлэл
--Name[ms]=Pemaju
--Name[mt]=Żvilupp
--Name[nb]=Utvikling
--Name[nds]=Utwickeln
--Name[ne]=विकास
--Name[nl]=Ontwikkeling
--Name[nn]=Utvikling
--Name[nso]=Thlabollogo
--Name[oc]=Desvelopament
--Name[pa]=ਵਿਕਾਸ
--Name[pl]=Narzędzia programistów
--Name[pt]=Desenvolvimento
--Name[pt_BR]=Desenvolvimento
--Name[ro]=Dezvoltare
--Name[ru]=Разработка
--Name[rw]=Iterambere
--Name[se]=Ovdánahttin
--Name[sk]=Vývoj
--Name[sl]=Razvoj
--Name[sr]=Развој
--Name[sr@Latn]=Razvoj
--Name[ss]=Kundlondlobala
--Name[sv]=Utveckling
--Name[ta]=உருவாக்கம்
--Name[te]=డెవలప్మెంట్
--Name[tg]=Такомул
--Name[th]=พัฒนาโปรแกรม
--Name[tr]=Geliştirme
--Name[tt]=Citeşterü
--Name[uk]=Розробка
--Name[uz]=Tuzish
--Name[uz@cyrillic]=Тузиш
--Name[ven]=Nyaluwo
--Name[vi]=Phát triển
--Name[wa]=Programaedje
--Name[xh]=Ubhekiso phambili
--Name[zh_CN]=开发
--Name[zh_TW]=程式開發
--Name[zu]=Intuthuko
--Icon=package_development
--
-diff -Nuar trinity-tdebase-3.5.13.2/applnk.ORI/kde-development-translation.directory trinity-tdebase-3.5.13.2/applnk/kde-development-translation.directory
---- trinity-tdebase-3.5.13.2/applnk.ORI/kde-development-translation.directory	2013-07-28 15:44:30.821668706 +0200
-+++ trinity-tdebase-3.5.13.2/applnk/kde-development-translation.directory	1970-01-01 01:00:00.000000000 +0100
-@@ -1,72 +0,0 @@
--[Desktop Entry]
--Encoding=UTF-8
--Type=Directory
--Name=Translation
--Name[af]=Vertaling
--Name[ar]=ترجمة
--Name[be]=Пераклад
--Name[bg]=Превод
--Name[bn]=অনুবাদ
--Name[br]=Troidigezh
--Name[bs]=Prevođenje
--Name[ca]=Traducció
--Name[cs]=Překlad
--Name[csb]=Dolmaczënk
--Name[cy]=Cyfieithiad
--Name[da]=Oversættelse
--Name[de]=Übersetzung
--Name[el]=Μετάφραση
--Name[eo]=Traduko
--Name[es]=Traducción
--Name[et]=Tõlkimine
--Name[eu]=Itzulpengintza
--Name[fa]=ترجمه
--Name[fi]=Käännös
--Name[fr]=Traduction
--Name[fy]=Oersetting
--Name[ga]=Aistriúchán
--Name[gl]=Tradución
--Name[he]=תרגום
--Name[hr]=Prijevod
--Name[hu]=Fordítás
--Name[id]=Terjemahan
--Name[is]=Þýðing
--Name[it]=Traduzione
--Name[ja]=翻訳
--Name[ka]=თარგმნა
--Name[kk]=Аудару
--Name[km]=ការបកប្រែ
--Name[ko]=번역
--Name[lt]=Vertimas
--Name[mk]=Превод
--Name[ms]=Terjemahan
--Name[nb]=Oversettelse
--Name[nds]=Översetten
--Name[ne]=अनुवाद
--Name[nl]=Vertaling
--Name[nn]=Omsetjing
--Name[pa]=ਅਨੁਵਾਦ
--Name[pl]=Tłumaczenie
--Name[pt]=Tradução
--Name[pt_BR]=Tradução
--Name[ro]=Traducere
--Name[ru]=Локализация
--Name[se]=Jorgalus
--Name[sk]=Preklad
--Name[sl]=Prevajanje
--Name[sr]=Превод
--Name[sr@Latn]=Prevod
--Name[sv]=Översättning
--Name[te]=అనువాదం
--Name[tg]=Тарҷума
--Name[th]=เครื่องมือแปลภาษา
--Name[tr]=Çeviri
--Name[uk]=Переклад
--Name[uz]=Tarjima
--Name[uz@cyrillic]=Таржима
--Name[vi]=Dịch
--Name[wa]=Ratournaedje
--Name[zh_CN]=翻译
--Name[zh_TW]=翻譯
--Icon=locale
--
-diff -Nuar trinity-tdebase-3.5.13.2/applnk.ORI/kde-development-webdevelopment.directory trinity-tdebase-3.5.13.2/applnk/kde-development-webdevelopment.directory
---- trinity-tdebase-3.5.13.2/applnk.ORI/kde-development-webdevelopment.directory	2013-07-28 15:44:30.821668706 +0200
-+++ trinity-tdebase-3.5.13.2/applnk/kde-development-webdevelopment.directory	1970-01-01 01:00:00.000000000 +0100
-@@ -1,71 +0,0 @@
--[Desktop Entry]
--Encoding=UTF-8
--Type=Directory
--Name=Web Development
--Name[af]=Web Ontwikkeling
--Name[ar]=تطوير برامج للشبكة
--Name[be]=Web-распрацоўка
--Name[bg]=Уеб разработка
--Name[bn]=ওয়েব ডেভেলপমেন্ট
--Name[br]=Diorren gwiad
--Name[bs]=Web programiranje
--Name[ca]=Desenvolupament Web
--Name[cs]=Webový vývoj
--Name[csb]=Programòwanié WWW
--Name[da]=Internet-udvikling
--Name[de]=Web-Entwicklung
--Name[el]=Δικτυακή ανάπτυξη
--Name[eo]=Reta Programado
--Name[es]=Desarrollo web
--Name[et]=Veebiarendus
--Name[eu]=Web garapena
--Name[fa]=توسعۀ وب
--Name[fi]=Webin kehitys
--Name[fr]=Développement Internet
--Name[fy]=Webûntwikkeling
--Name[ga]=Forbairt Ghréasáin
--Name[gl]=Desenvolvemento Web
--Name[he]=פיתוח WEB
--Name[hr]=Web razvoj
--Name[hu]=Webes fejlesztőeszközök
--Name[id]=Pengembangan Web
--Name[is]=Vefhönnun
--Name[it]=Sviluppo web
--Name[ja]=ウェブ開発
--Name[ka]=ვებ პროგრამირება
--Name[kk]=Веб жобалау
--Name[km]=ការបង្កើត​ទំព័រ​បណ្តាញ
--Name[ko]=웹 개발
--Name[lt]=Žiniatinklio programavimas
--Name[mk]=Веб-развој
--Name[ms]=Pembangunan Web
--Name[nb]=Nettutvikling
--Name[nds]=Nett-Utwickeln
--Name[ne]=वेब विकास
--Name[nl]=Webontwikkeling
--Name[nn]=Nettutvikling
--Name[pa]=ਵੈਬ ਵਿਕਾਸ
--Name[pl]=Programowanie WWW
--Name[pt]=Desenvolvimento Web
--Name[pt_BR]=Desenvolvimento Web
--Name[ro]=Dezvoltare web
--Name[ru]=Веб-разработка
--Name[se]=Fierpmádatovdánahttin
--Name[sk]=Vývoj pre Web
--Name[sl]=Spletni razvoj
--Name[sr]=Веб развој
--Name[sr@Latn]=Veb razvoj
--Name[sv]=Webbutveckling
--Name[te]=వెబ్ డెవలప్మెంట్
--Name[tg]=Такомули Вэб
--Name[th]=พัฒนาเว็บ
--Name[tr]=Web Geliştirme
--Name[uk]=Розробка веб-сторінок
--Name[uz]=Veb uchun tuzish
--Name[uz@cyrillic]=Веб учун тузиш
--Name[vi]=Phát triển Mạng
--Name[wa]=Programaedje waibe
--Name[zh_CN]=Web 开发
--Name[zh_TW]=網頁開發
--Icon=package_network
--
-diff -Nuar trinity-tdebase-3.5.13.2/applnk.ORI/kde-editors.directory trinity-tdebase-3.5.13.2/applnk/kde-editors.directory
---- trinity-tdebase-3.5.13.2/applnk.ORI/kde-editors.directory	2013-07-28 15:44:30.821668706 +0200
-+++ trinity-tdebase-3.5.13.2/applnk/kde-editors.directory	1970-01-01 01:00:00.000000000 +0100
-@@ -1,85 +0,0 @@
--[Desktop Entry]
--Encoding=UTF-8
--Type=Directory
--Name=Editors
--Name[af]=Redigeerders
--Name[ar]=محرري النصوص
--Name[az]=Editorlar
--Name[be]=Рэдактары
--Name[bg]=Редактори
--Name[bn]=সম্পাদক
--Name[br]=Aozerien
--Name[bs]=Editori
--Name[cs]=Editory
--Name[csb]=Editorë
--Name[cy]=Golygyddion
--Name[da]=Editorer
--Name[de]=Editoren
--Name[el]=Επεξεργαστές
--Name[eo]=Redaktiloj
--Name[es]=Editores
--Name[et]=Redaktorid
--Name[eu]=Editoreak
--Name[fa]=ویرایشگرها
--Name[fi]=Editorit
--Name[fo]=Ritlar
--Name[fr]=Éditeurs de texte
--Name[fy]=Bewurkers
--Name[ga]=Eagarthóirí
--Name[gl]=Editores
--Name[he]=עורכים
--Name[hi]=संपादक
--Name[hr]=Uređivači
--Name[hsb]=Wobdźěłanje teksta
--Name[hu]=Szövegszerkesztők
--Name[id]=Editor
--Name[is]=Ritlar
--Name[it]=Editor
--Name[ja]=エディタ
--Name[ka]=რედაქტორი
--Name[kk]=Редакторлар
--Name[km]=កម្មវិធី​និពន្ធ
--Name[ko]=편집기
--Name[lo]=ແກ້ໄຂແຟ້ມຂໍ້ຄວາມ
--Name[lt]=Redaktoriai
--Name[lv]=Redaktori
--Name[mk]=Уредувачи
--Name[mn]=Боловсруулагч
--Name[ms]=Penyunting
--Name[mt]=Edituri
--Name[nb]=Skriveprogrammer
--Name[nds]=Editoren
--Name[ne]=सम्पादक
--Name[nn]=Skriveprogram
--Name[nso]=Bafetosi
--Name[pa]=ਸੰਪਾਦਕ
--Name[pl]=Edytory
--Name[pt]=Editores
--Name[pt_BR]=Editores
--Name[ro]=Editoare
--Name[ru]=Редакторы
--Name[rw]=Muhinduzi
--Name[se]=Čállinprográmmat
--Name[sk]=Editory
--Name[sl]=Urejevalniki
--Name[sr]=Уређивачи
--Name[sr@Latn]=Uređivači
--Name[ss]=Bahleli
--Name[sv]=Editorer
--Name[ta]=தொகுப்பாளர்கள்
--Name[te]=ఎడిటర్లు
--Name[tg]=Таҳриргарон
--Name[th]=โปรแกรมแก้ไขข้อความ
--Name[tr]=Düzenleyiciler
--Name[tt]=Tözätkeç
--Name[uk]=Редактори
--Name[uz]=Tahrirchilar
--Name[uz@cyrillic]=Таҳрирчилар
--Name[ven]=Vhasengulusi
--Name[vi]=Trình biên tập
--Name[wa]=Aspougneus d' tecse
--Name[xh]=Abahleli
--Name[zh_CN]=编辑器
--Name[zh_TW]=編輯器
--Name[zu]=Abalungisi
--Icon=package_editors
-diff -Nuar trinity-tdebase-3.5.13.2/applnk.ORI/kde-edutainment.directory trinity-tdebase-3.5.13.2/applnk/kde-edutainment.directory
---- trinity-tdebase-3.5.13.2/applnk.ORI/kde-edutainment.directory	2013-07-28 15:44:30.821668706 +0200
-+++ trinity-tdebase-3.5.13.2/applnk/kde-edutainment.directory	1970-01-01 01:00:00.000000000 +0100
-@@ -1,86 +0,0 @@
--[Desktop Entry]
--Encoding=UTF-8
--Type=Directory
--Name=Edutainment
--Name[af]=Opvoedkundig
--Name[ar]=التعليم الترفيهي
--Name[az]=Təhsil
--Name[be]=Адукацыя
--Name[bg]=Образование
--Name[bn]=শিক্ষামূলক মনোরঞ্জন
--Name[br]=Deskadurezh
--Name[bs]=Zabava i obrazovanje
--Name[ca]=Educació
--Name[cs]=Škola hrou
--Name[csb]=Ùczba ë edukacëjô
--Name[cy]=Addifyrwch
--Name[da]=Uddannelse
--Name[de]=Lernprogramme
--Name[el]=Εκπαίδευση
--Name[eo]=Amuzedukado
--Name[es]=Entretenimientos educativos
--Name[et]=Haridus
--Name[eu]=Jolastu eta ikasi
--Name[fa]=سرگرمی آموزشی
--Name[fi]=Opetusviihde
--Name[fo]=Undirvísing og -hald
--Name[fr]=Éducatif
--Name[fy]=Edukatyf
--Name[ga]=Oideachluichí
--Name[gl]=Educación
--Name[he]=לומדות
--Name[hi]=खेल-खेल में सीखें
--Name[hr]=Obrazovna zabava
--Name[hsb]=Wuknjenje a hrajkanje
--Name[hu]=Oktatóprogramok
--Name[is]=Kennsluleikir
--Name[it]=Istruzione divertente
--Name[ja]=エデュテインメント
--Name[ka]=სასწავლო
--Name[kk]=Оқыту
--Name[km]=ល្បែង​កំសាន្ត​បង្កើន​ចំណេះដឹង
--Name[ko]=교육
--Name[lo]=ການສຶກສາແສນມ່ວນຊື່ນ
--Name[lt]=Mokomosios programos
--Name[lv]=Izglītošana
--Name[mk]=Едукација и забава
--Name[mn]=Боловсролын програм
--Name[ms]=Hiburan Mendidik
--Name[mt]=Edukazzjoni u Divertiment
--Name[nb]=Lek og lær
--Name[nds]=Spelen & Lehren
--Name[ne]=शिक्षा मनोरञ्जन
--Name[nl]=Educatief
--Name[nn]=Underhaldningslæring
--Name[nso]=Boithabiso bja Thuto
--Name[pa]=ਸਿੱਖਿਆ
--Name[pl]=Nauka i rozrywka
--Name[pt]=Educação/Entretenimento
--Name[pt_BR]=Educativo
--Name[ro]=Educațional
--Name[ru]=Образование
--Name[se]=Stoahkan ja oahppan
--Name[sk]=Škola hrou
--Name[sl]=Zabava in učenje
--Name[sr]=Образовање
--Name[sr@Latn]=Obrazovanje
--Name[ss]=Infundvo-tfokotisa
--Name[sv]=Utbildning
--Name[ta]=கல்வி
--Name[te]=ఎడ్యూటెన్మెంట్
--Name[tg]=Омӯзиш
--Name[th]=การศึกษาแสนสนุก
--Name[tr]=Eğitim ve Eğlence
--Name[tt]=Öyränü & Yal itü
--Name[uk]=Освітні
--Name[uz]=Oʻynab oʻrganish
--Name[uz@cyrillic]=Ўйнаб ўрганиш
--Name[ven]=Pfunzotakadza
--Name[vi]=Học vui
--Name[wa]=Sicole avou plaijhi
--Name[xh]=Ufundiso
--Name[zh_CN]=寓教于乐
--Name[zh_TW]=教育和娛樂
--Name[zu]=Ezemfundo
--Icon=package_edutainment
--
-diff -Nuar trinity-tdebase-3.5.13.2/applnk.ORI/kde-essential.menu trinity-tdebase-3.5.13.2/applnk/kde-essential.menu
---- trinity-tdebase-3.5.13.2/applnk.ORI/kde-essential.menu	2013-07-28 15:44:30.821668706 +0200
-+++ trinity-tdebase-3.5.13.2/applnk/kde-essential.menu	1970-01-01 01:00:00.000000000 +0100
-@@ -1,27 +0,0 @@
-- <!DOCTYPE Menu PUBLIC "-//freedesktop//DTD Menu 1.0//EN"
--  "http://www.freedesktop.org/standards/menu-spec/1.0/menu.dtd">
--
--<Menu>
--        <!-- The following menus are hidden by default -->
--	<Menu>
--		<Name>Settings</Name>
--		<Directory>kde-settings.directory</Directory>
--                <MergeFile>../kde-settings.menu</MergeFile>
--	</Menu>
--	<Menu>
--		<Name>Information</Name>
--		<Directory>kde-information.directory</Directory>
--                <MergeFile>../kde-information.menu</MergeFile>
--	</Menu>
--        <Move>
--           <Old>Settings/Information</Old><New>Information</New>
--        </Move>
--	<Menu>
--		<Name>System</Name>
--		<Menu>
--			<Name>ScreenSavers</Name>
--			<Directory>kde-system-screensavers.directory</Directory>
--	                <MergeFile>../kde-screensavers.menu</MergeFile>
--		</Menu>
--	</Menu>
--</Menu>
-diff -Nuar trinity-tdebase-3.5.13.2/applnk.ORI/kde-games-arcade.directory trinity-tdebase-3.5.13.2/applnk/kde-games-arcade.directory
---- trinity-tdebase-3.5.13.2/applnk.ORI/kde-games-arcade.directory	2013-07-28 15:44:30.821668706 +0200
-+++ trinity-tdebase-3.5.13.2/applnk/kde-games-arcade.directory	1970-01-01 01:00:00.000000000 +0100
-@@ -1,74 +0,0 @@
--[Desktop Entry]
--Encoding=UTF-8
--Type=Directory
--Name=Arcade
--Name[af]=Arkade
--Name[ar]=ألعاب الــ Arcade
--Name[az]=Əyləncə
--Name[be]=Аркады
--Name[bg]=Аркадни
--Name[bn]=আর্কেড
--Name[br]=C'hoarioù tavarn
--Name[bs]=Arkade
--Name[cs]=Arkády
--Name[csb]=Chwatkòwé grë
--Name[cy]=Arcêd
--Name[da]=Arkade
--Name[de]=Arkade
--Name[eo]=Arkado
--Name[et]=Võitlusmängud
--Name[fa]=گذرگاه تاقدار
--Name[fo]=Arkaduspøl
--Name[fr]=Jeux d'arcade
--Name[fy]=Arkade
--Name[ga]=Stuara Siamsa
--Name[he]=משחקי Arcade
--Name[hi]=ऑर्केड
--Name[hr]=Arkada
--Name[hu]=Ügyességi játékok
--Name[is]=Spilasalur
--Name[ja]=アーケード
--Name[kk]=Аркад ойындары
--Name[km]=ធ្វើ​ដំណើរ
--Name[ko]=아케이드
--Name[lo]=ເກມອາເຄດ
--Name[lt]=Arkada
--Name[lv]=Arkāde
--Name[mk]=Аркадни игри
--Name[mn]=Сансар
--Name[ms]=Arked
--Name[mt]=Logħob tal-Arcades
--Name[nb]=Arkade
--Name[nds]=Speelhall
--Name[ne]=आर्केड
--Name[nn]=Arkade
--Name[pa]=ਅਰਕਾਡੀ
--Name[pl]=Gry zręcznościowe
--Name[pt]=Arcada
--Name[ro]=Aventuri
--Name[ru]=Аркады
--Name[rw]=Ikirongozi
--Name[se]=Fearán
--Name[sk]=Akčné hry
--Name[sl]=Arkade
--Name[sr]=Аркадне
--Name[sr@Latn]=Arkadne
--Name[sv]=Arkad
--Name[ta]=ஆர்கேட்
--Name[te]=ఆర్కేడ్
--Name[tg]=Силсилаи бозиҳо
--Name[th]=เกมอาเขต
--Name[tr]=Oyun Makinesi
--Name[tt]=Arkad
--Name[uk]=Аркади
--Name[uz]=Arkada
--Name[uz@cyrillic]=Аркада
--Name[ven]=Petea
--Name[vi]=Mái vòm
--Name[wa]=Årcåde
--Name[xh]=Umqolo wesakhiwo esiphatha ubunzima bento
--Name[zh_CN]=街机
--Name[zh_TW]=大型遊戲機遊戲
--Name[zu]=Umhhume
--Icon=package_games_arcade
--X-KDE-SuppressGenericNames=Game,Arcade Game
-diff -Nuar trinity-tdebase-3.5.13.2/applnk.ORI/kde-games-board.directory trinity-tdebase-3.5.13.2/applnk/kde-games-board.directory
---- trinity-tdebase-3.5.13.2/applnk.ORI/kde-games-board.directory	2013-07-28 15:44:30.821668706 +0200
-+++ trinity-tdebase-3.5.13.2/applnk/kde-games-board.directory	1970-01-01 01:00:00.000000000 +0100
-@@ -1,81 +0,0 @@
--[Desktop Entry]
--Encoding=UTF-8
--Type=Directory
--Name=Board Games
--Name[af]=Bord Speletjies
--Name[ar]=ألعاب الألواح
--Name[az]=Lüvhə Oyunları
--Name[be]=Настольныя гульні
--Name[bg]=Игри на дъска
--Name[bn]=বোর্ডের খেলা
--Name[br]=C'hoarioù taolenn
--Name[bs]=Igre na ploči
--Name[ca]=Jocs de taula
--Name[cs]=Deskové hry
--Name[csb]=Planszowé grë
--Name[cy]=Gemau Bwrdd
--Name[da]=Brætspil
--Name[de]=Brettspiele
--Name[el]=Επιτραπέζια παιχνίδια
--Name[eo]=Tabuloludoj
--Name[es]=Juegos de tablero
--Name[et]=Lauamängud
--Name[eu]=Mahai jokoak
--Name[fa]=بازیهای تخته
--Name[fi]=Lautapelit
--Name[fr]=Jeux de plateau
--Name[fy]=Boardspultsjes
--Name[ga]=Cluichí Cláir
--Name[gl]=Xogos de Taboleiro
--Name[he]=משחקי לוח
--Name[hi]=बिसात के खेल
--Name[hr]=Igre na ploči
--Name[hsb]=Deskowe hry
--Name[hu]=Táblajátékok
--Name[id]=Permainan Papan
--Name[is]=Borðleikir
--Name[it]=Giochi da tavolo
--Name[ja]=ボードゲーム
--Name[ka]=მაგიდის თამაშები
--Name[kk]=Үстел ойындары
--Name[km]=ល្បែង​ក្ដារ
--Name[ko]=보드 게임
--Name[lt]=Stalo žaidimai
--Name[lv]=Galda spēles
--Name[mk]=Игри на табла
--Name[mn]=Хөлөгт тоглоом
--Name[ms]=Permainan 'Board'
--Name[mt]=Logħob tal-boards
--Name[nb]=Brettspill
--Name[nds]=Brettspelen
--Name[ne]=बोर्ड खेल
--Name[nl]=Bordspellen
--Name[nn]=Brettspel
--Name[pa]=ਬੋਰਡ ਖੇਡਾਂ
--Name[pl]=Gry planszowe
--Name[pt]=Jogos de Tabuleiro
--Name[pt_BR]=Jogos de Tabuleiro
--Name[ro]=Jocuri de table
--Name[ru]=Настольные игры
--Name[rw]=Imikino y'Umuryango
--Name[se]=Duolbbášspealut
--Name[sk]=Stolové hry
--Name[sl]=Namizne igre
--Name[sr]=Игре на табли
--Name[sr@Latn]=Igre na tabli
--Name[sv]=Brädspel
--Name[ta]=மேசை விளையாட்டுகள்
--Name[te]=పలక ఆటలు
--Name[tg]=Бозиҳои рӯимизӣ
--Name[th]=เกมกระดาน
--Name[tr]=Masaüstü Oyunları
--Name[tt]=Östäl Uyını
--Name[uk]=Ігри на дошці
--Name[uz]=Stol oʻyinlari
--Name[uz@cyrillic]=Стол ўйинлари
--Name[vi]=Trò chơi bảng
--Name[wa]=Djeus d' platea
--Name[zh_CN]=棋类游戏
--Name[zh_TW]=棋盤遊戲
--Icon=package_games_board
--X-KDE-SuppressGenericNames=Game,Board Game
-diff -Nuar trinity-tdebase-3.5.13.2/applnk.ORI/kde-games-card.directory trinity-tdebase-3.5.13.2/applnk/kde-games-card.directory
---- trinity-tdebase-3.5.13.2/applnk.ORI/kde-games-card.directory	2013-07-28 15:44:30.821668706 +0200
-+++ trinity-tdebase-3.5.13.2/applnk/kde-games-card.directory	1970-01-01 01:00:00.000000000 +0100
-@@ -1,81 +0,0 @@
--[Desktop Entry]
--Encoding=UTF-8
--Type=Directory
--Name=Card Games
--Name[af]=Kaart Speletjies
--Name[ar]=ألعاب الورق
--Name[az]=Kart Oyunları
--Name[be]=Картавыя гульні
--Name[bg]=Игри с карти
--Name[bn]=তাসের খেলা
--Name[br]=C'hoarioù Kartennoù
--Name[bs]=Igre sa kartama
--Name[ca]=Jocs de cartes
--Name[cs]=Karetní hry
--Name[csb]=Kartowé grë
--Name[cy]=Gemau Cardiau
--Name[da]=Kortspil
--Name[de]=Kartenspiele
--Name[el]=Παιχνίδια καρτών
--Name[eo]=Kartludoj
--Name[es]=Juegos de cartas
--Name[et]=Kaardimängud
--Name[eu]=Karta jokoak
--Name[fa]=بازیهای کارت
--Name[fi]=Korttipelit
--Name[fr]=Jeux de cartes
--Name[fy]=Kaartspultsjes
--Name[ga]=Cluichí Cártaí
--Name[gl]=Xogos de Cartas
--Name[he]=משחקי קלפים
--Name[hi]=ताश के खेल
--Name[hr]=Igre s kartama
--Name[hsb]=Kartowe hry
--Name[hu]=Kártyajátékok
--Name[id]=Permainan Kartu
--Name[is]=Spilaleikir
--Name[it]=Giochi di carte
--Name[ja]=カードゲーム
--Name[ka]=ბანქოს თამაშები
--Name[kk]=Карта ойындары
--Name[km]=ល្បែង​បៀរ
--Name[ko]=카드 게임
--Name[lt]=Kortų žaidimai
--Name[lv]=Kāršu spēles
--Name[mk]=Игри со карти
--Name[mn]=Хөзрийн тоглоом
--Name[ms]=Permainan Kad
--Name[mt]=Logħob tal-Karti
--Name[nb]=Kortspill
--Name[nds]=Koortspelen
--Name[ne]=कार्ड खेल
--Name[nl]=Kaartspellen
--Name[nn]=Kortspel
--Name[pa]=ਤਾਸ਼ ਖੇਡਾਂ
--Name[pl]=Gry karciane
--Name[pt]=Jogos de Cartas
--Name[pt_BR]=Jogos de Cartas 
--Name[ro]=Jocuri de cărți
--Name[ru]=Карточные игры
--Name[rw]=Imikino y'Ikarita
--Name[se]=Goartaspealut
--Name[sk]=Kartové hry
--Name[sl]=Igre s kartami
--Name[sr]=Игре са картама
--Name[sr@Latn]=Igre sa kartama
--Name[sv]=Kortspel
--Name[ta]=சீட்டு விளையாட்டுகள்
--Name[te]=పేక ఆటలు
--Name[tg]=Бозиҳои корт
--Name[th]=เกมไพ่ต่าง ๆ
--Name[tr]=Kart Oyunları
--Name[tt]=Kard Uyını
--Name[uk]=Карткові ігри
--Name[uz]=Qarta oʻyinlari
--Name[uz@cyrillic]=Қарта ўйинлари
--Name[vi]=Trò chơi thẻ
--Name[wa]=Cwårdjeus
--Name[zh_CN]=牌类游戏
--Name[zh_TW]=紙牌遊戲
--Icon=package_games_card
--X-KDE-SuppressGenericNames=Game,Card Game
-diff -Nuar trinity-tdebase-3.5.13.2/applnk.ORI/kde-games.directory trinity-tdebase-3.5.13.2/applnk/kde-games.directory
---- trinity-tdebase-3.5.13.2/applnk.ORI/kde-games.directory	2013-07-28 15:44:30.821668706 +0200
-+++ trinity-tdebase-3.5.13.2/applnk/kde-games.directory	1970-01-01 01:00:00.000000000 +0100
-@@ -1,89 +0,0 @@
--[Desktop Entry]
--Encoding=UTF-8
--Type=Directory
--Name=Games
--Name[af]=Speletjies
--Name[ar]=ألعاب
--Name[az]=Oyunlar
--Name[be]=Гульні
--Name[bg]=Игри
--Name[bn]=খেলা
--Name[br]=C'hoarioù
--Name[bs]=Igre
--Name[ca]=Jocs
--Name[cs]=Hry
--Name[csb]=Grë
--Name[cy]=Gemau
--Name[da]=Spil
--Name[de]=Spiele
--Name[el]=Παιχνίδια
--Name[eo]=Ludoj
--Name[es]=Juegos
--Name[et]=Mängud
--Name[eu]=Jokoak
--Name[fa]=بازیها
--Name[fi]=Pelit
--Name[fo]=Spøl
--Name[fr]=Jeux
--Name[fy]=Amusemint
--Name[ga]=Cluichí
--Name[gl]=Xogos
--Name[he]=משחקים
--Name[hi]=खेल
--Name[hr]=Igre
--Name[hsb]=Hry
--Name[hu]=Játékok
--Name[id]=Permainan
--Name[is]=Leikir
--Name[it]=Giochi
--Name[ja]=ゲーム
--Name[ka]=თამაშები
--Name[kk]=Ойындар
--Name[km]=ល្បែង
--Name[ko]=게임
--Name[lo]=ເກມ
--Name[lt]=Žaidimai
--Name[lv]=Spēles
--Name[mk]=Игри
--Name[mn]=Тоглоом
--Name[ms]=Permainan
--Name[mt]=Logħob
--Name[nb]=Spill
--Name[nds]=Spelen
--Name[ne]=खेल
--Name[nl]=Amusement
--Name[nn]=Spel
--Name[nso]=Dipapadi
--Name[oc]=Jogs
--Name[pa]=ਖੇਡਾਂ
--Name[pl]=Gry
--Name[pt]=Jogos
--Name[pt_BR]=Jogos
--Name[ro]=Jocuri
--Name[ru]=Игры
--Name[rw]=Imikino
--Name[se]=Spealut
--Name[sk]=Hry
--Name[sl]=Igre
--Name[sr]=Игре
--Name[sr@Latn]=Igre
--Name[ss]=Imidlalo
--Name[sv]=Spel
--Name[ta]=விளையாட்டுகள்
--Name[te]=ఆటలు
--Name[tg]=Бозиҳо
--Name[th]=เกมส์
--Name[tr]=Oyunlar
--Name[tt]=Uyınnar
--Name[uk]=Ігри
--Name[uz]=Oʻyinlar
--Name[uz@cyrillic]=Ўйинлар
--Name[ven]=Mitambo
--Name[vi]=Trò chơi
--Name[wa]=Djeus
--Name[xh]=Imidlalo
--Name[zh_CN]=游戏
--Name[zh_TW]=遊戲
--Name[zu]=Imidlalo
--Icon=package_games
--
-diff -Nuar trinity-tdebase-3.5.13.2/applnk.ORI/kde-games-kids.directory trinity-tdebase-3.5.13.2/applnk/kde-games-kids.directory
---- trinity-tdebase-3.5.13.2/applnk.ORI/kde-games-kids.directory	2013-07-28 15:44:30.821668706 +0200
-+++ trinity-tdebase-3.5.13.2/applnk/kde-games-kids.directory	1970-01-01 01:00:00.000000000 +0100
-@@ -1,88 +0,0 @@
--[Desktop Entry]
--Encoding=UTF-8
--Type=Directory
--Name=Games for Kids
--Name[af]=Kinder Speletjies
--Name[ar]= ألعاب للأطفال
--Name[az]=Uşaxlar Üçün Oyunlar
--Name[be]=Дзіцячыя гульні
--Name[bg]=Игри за деца
--Name[bn]=বাচ্চাদের খেলা
--Name[br]=C'hoarioù evit ar Bugale
--Name[bs]=Igre za djecu
--Name[ca]=Jocs per a nens
--Name[cs]=Hry pro děti
--Name[csb]=Grë dlô dzecë
--Name[cy]=Gêmau ar gyfer Plant
--Name[da]=Spil for børn
--Name[de]=Spiele für Kinder
--Name[el]=Παιχνίδια για παιδιά
--Name[eo]=Ludoj por infanoj
--Name[es]=Juegos para niños
--Name[et]=Laste mängud
--Name[eu]=Haur jokoak
--Name[fa]=بازیهایی برای بچه‌ها
--Name[fi]=Lasten pelit
--Name[fo]=Spøl fyri børn
--Name[fr]=Jeux pour les enfants
--Name[fy]=Spultsjes foar bêrn
--Name[ga]=Cluichí do Pháistí
--Name[gl]=Xogos para Nenos
--Name[he]=משחקים לילדים
--Name[hi]=बच्चों के लिए खेल
--Name[hr]=Igre za djecu
--Name[hsb]=Hry za dźěći
--Name[hu]=Játékok kicsiknek
--Name[id]=Permainan Kanak-kanak
--Name[is]=Leikir fyrir krakka
--Name[it]=Giochi per bambini
--Name[ja]=子供向けゲーム
--Name[ka]=საბავშვო თამაშები
--Name[kk]=Балалар ойындары
--Name[km]=ល្បែង​សម្រាប់​កូន​ក្មេង
--Name[ko]=어린이용 게임
--Name[lo]=ເກມສຳລັບເດັກ
--Name[lt]=Žaidimai vaikams
--Name[lv]=Spēles bērniem
--Name[mk]=Игри за деца
--Name[mn]=Хүүхдийн тоглоом
--Name[ms]=Permainan Kanak-kanak
--Name[mt]=Logħob għat-tfal
--Name[nb]=Spill for barn
--Name[nds]=Spelen för Kinners
--Name[ne]=केटाकेटीका लागि खेल
--Name[nl]=spelletjes voor kinderen
--Name[nn]=Barnespel
--Name[nso]=Dipapadi tsa Bana
--Name[pa]=ਬੱਚਿਆਂ ਲਈ ਖੇਡਾਂ
--Name[pl]=Gry dla dzieci
--Name[pt]=Jogos para Crianças
--Name[pt_BR]=Jogos para Crianças
--Name[ro]=Jocuri pentru copii
--Name[ru]=Детские игры
--Name[rw]=Imikino y'Abana
--Name[se]=Mánáidspealut
--Name[sk]=Hry pre deti
--Name[sl]=Igre za otroke
--Name[sr]=Игре за децу
--Name[sr@Latn]=Igre za decu
--Name[ss]=Imidlalo yebantfwana
--Name[sv]=Spel för barn
--Name[ta]=குழந்தைகளுக்கான விளையாட்டுகள்
--Name[te]=పిల్లల ఆటలు
--Name[tg]=Бозиҳои кӯдакона
--Name[th]=เกมส์สำหรับเด็ก
--Name[tr]=Çocuklar için Oyunlar
--Name[tt]=Bala Uyını
--Name[uk]=Ігри для дітей
--Name[uz]=Kichkintoylar uchun oʻyinlar
--Name[uz@cyrillic]=Кичкинтойлар учун ўйинлар
--Name[ven]=Mitambo ya vhana
--Name[vi]=Trò chơi cho Trẻ
--Name[wa]=Djeus po ls efants
--Name[xh]=Imidlalo Yabantwana
--Name[zh_CN]=儿童游戏
--Name[zh_TW]=小孩的遊戲
--Name[zu]=Imidlalo yabantwana
--Icon=package_games_kids
--X-KDE-SuppressGenericNames=Game,Game for Children
-diff -Nuar trinity-tdebase-3.5.13.2/applnk.ORI/kde-games-roguelikes.directory trinity-tdebase-3.5.13.2/applnk/kde-games-roguelikes.directory
---- trinity-tdebase-3.5.13.2/applnk.ORI/kde-games-roguelikes.directory	2013-07-28 15:44:30.821668706 +0200
-+++ trinity-tdebase-3.5.13.2/applnk/kde-games-roguelikes.directory	1970-01-01 01:00:00.000000000 +0100
-@@ -1,84 +0,0 @@
--[Desktop Entry]
--Encoding=UTF-8
--Type=Directory
--Name=Rogue-like Games
--Name[af]=Rogue-tipe Speletjies
--Name[ar]=ألعاب شبه Rogue
--Name[az]=Rogue Bənzəri Oyunlar
--Name[be]=Гульны Rogue
--Name[bg]=Хазартни игри
--Name[bn]=রোগ্ (Rogue)-এর মত খেলা
--Name[br]=Ur c'hoari a seurt gant Rogue
--Name[bs]=Rogue-like igre
--Name[ca]=Jocs com el Rogue
--Name[cs]=Hry podobné Rogue
--Name[csb]=Gré z familëji Rogue
--Name[cy]=Gemau sy'n debyg i Rogue
--Name[da]=Rogue-lignende spil
--Name[de]=Rogue-ähnliche Spiele
--Name[el]=Παιχνίδια τύπου Rogue
--Name[eo]=Filudoj
--Name[es]=Juegos tipo Rogue
--Name[et]=Rogue-laadsed mängud
--Name[eu]=Rogue motako jokoak
--Name[fa]=بازیهای شبیه Rogue
--Name[fi]=Rogue-tyyliset pelit
--Name[fo]=Rogue-lík spøl
--Name[fr]=Jeux à la Rogue
--Name[fy]=Soarte mei rogue spulstjes
--Name[ga]=Cluichí cosúil le Rogue
--Name[gl]=Xogos do estilo de Rogue
--Name[he]=משחקים נוסח Rogue
--Name[hi]=छलिया जैसे खेल
--Name[hr]=Igre kao Rogue
--Name[hsb]=Hry, podobne na Rogue
--Name[hu]=Rogue-szerű játékok
--Name[id]=Permainan ala Rogue
--Name[is]=Skotleikir
--Name[it]=Giochi in stile Rogue
--Name[ja]=Rogue 風のゲーム
--Name[ka]= Rogue ტიპის თამაშები
--Name[kk]=Rogue-секілді ойындар
--Name[lo]=ເກມຄ້າຍ Rogue
--Name[lt]=Išdykėlio tipo žaidimai
--Name[lv]=Rogue līdzīgas spēles
--Name[mk]=Игри како Rogue
--Name[mn]=Rogue-тоглоом
--Name[ms]=Permainan ala Rogue
--Name[mt]=Logħob bħal Rogue
--Name[nb]=Rollespill
--Name[nds]=Spelen so as Rogue
--Name[ne]=रग-प्रकारको खेल
--Name[nl]=Rogue-achtige spellen
--Name[nn]=Rogue-aktige spel
--Name[nso]=Dipapadi tsa Bokalatsane
--Name[pa]=ਠੱਗ-ਵਰਗੀਆਂ ਖੇਡਾਂ
--Name[pl]=Gry z rodziny Rogue
--Name[pt]=Jogos tipo Rogue
--Name[pt_BR]=Jogos parecidos com Rogue
--Name[ro]=Jocuri violente
--Name[ru]=Ролевые игры в стиле Rogue
--Name[rw]=Imikino Ingunge-nka
--Name[se]=Rogue-lágána spealut
--Name[sk]=Hry v štýle Rogue
--Name[sl]=Igre kot Rogue
--Name[sr]=Игре налик на Rogue
--Name[sr@Latn]=Igre nalik na Rogue
--Name[ss]=I-Rogue-lefana nemidlalo
--Name[sv]=Spel som liknar Rogue
--Name[ta]=முரட்டுதனமான விளையாட்டுகள்
--Name[te]=రోగ్ లాంటి ఆటలు
--Name[tg]=Бозиҳои шабиявии Rogue
--Name[th]=เกมส์คล้าย Rogue
--Name[tr]=Rogue benzeri oyunlar
--Name[tt]=Gizeş Uyını
--Name[uk]=Ігри на кшталт Rogue
--Name[uz]=Rogue oʻyiniga oʻxshash oʻyinlar
--Name[uz@cyrillic]=Rogue ўйинига ўхшаш ўйинлар
--Name[ven]=U fhura-sa Mitambo
--Name[vi]=Trò chơi giống Rogue
--Name[wa]=Djeus ki rshonnèt-st a «rogue»
--Name[xh]=Imidlalo efana ne Rogue
--Name[zh_CN]=恶作剧游戏
--Name[zh_TW]=冒險類遊戲
--Name[zu]=Imidlalo enjenge-Rogue
-diff -Nuar trinity-tdebase-3.5.13.2/applnk.ORI/kde-games-strategy.directory trinity-tdebase-3.5.13.2/applnk/kde-games-strategy.directory
---- trinity-tdebase-3.5.13.2/applnk.ORI/kde-games-strategy.directory	2013-07-28 15:44:30.821668706 +0200
-+++ trinity-tdebase-3.5.13.2/applnk/kde-games-strategy.directory	1970-01-01 01:00:00.000000000 +0100
-@@ -1,87 +0,0 @@
--[Desktop Entry]
--Encoding=UTF-8
--Type=Directory
--Name=Tactics & Strategy
--Name[af]=Strategie & Taktiek
--Name[ar]=الألعاب الميدانية و الإستراتجية
--Name[az]=Strategiya & Taktika
--Name[be]=Тактыка і стратэгія
--Name[bg]=Стратегически игри
--Name[bn]=কৌশল এবং পরিকল্পনা
--Name[br]=Brezelekaouriezh ha kadouriezh
--Name[bs]=Taktika i strategija
--Name[ca]=Tàctiques i estratègia
--Name[cs]=Taktické a strategické
--Name[csb]=Takticzné ë strategiczné grë
--Name[cy]=Tactegau & Strategaeth
--Name[da]=Taktik & Strategi
--Name[de]=Strategie & Taktik
--Name[el]=Τακτική & Στρατηγική
--Name[eo]=Taktikoj & Strategioj
--Name[es]=Táctica y estrategia
--Name[et]=Taktika ja strateegia
--Name[eu]=Taktika eta estrategia
--Name[fa]=راهکارها و راهبردها
--Name[fi]=Taktiikka ja strategia
--Name[fo]=Taktikkur og strategi
--Name[fr]=Tactique et stratégie
--Name[fy]=Taktysk en strategysk
--Name[ga]=Beartaíocht agus Straitéisí
--Name[gl]=Tácticas e Estratexia
--Name[he]=טקטיקה ואסטרטגיה
--Name[hi]=रणनीतिक और कौशल
--Name[hr]=Taktika i strategija
--Name[hsb]=Strategiske hry
--Name[hu]=Taktikai és stratégiai
--Name[id]=Taktik dan Strategi
--Name[is]=Kænska & áræði
--Name[it]=Tattica e strategia
--Name[ja]=戦略 & 戦術
--Name[ka]=ტაქტიკა & სტრატეგია
--Name[kk]=Тактика және стратегия
--Name[km]=ក្បួន & យុទ្ធសាស្ត្រ
--Name[ko]=전략 및 전술
--Name[lo]=ເກມກົນລະຍຸດແລະວາງແຜນ
--Name[lt]=Taktika ir strategija
--Name[lv]=Taktika & Stratēģija
--Name[mk]=Тактика и стратегија
--Name[mn]=Тактик & стратеги
--Name[ms]=Strategi dan Taktik
--Name[mt]=Tattika u Strateġija
--Name[nb]=Taktikk og strategi
--Name[nds]=Taktik & Strategie
--Name[ne]=कौशल र रणनीति
--Name[nl]=Tactiek en Strategie
--Name[nn]=Taktikk og strategi
--Name[nso]=Mekgwanakgwana & Tselathwii
--Name[pa]=ਤਕਨੀਕੀ ਤੇ ਗਿਆਨ
--Name[pl]=Gry taktyczne i strategiczne
--Name[pt]=Tácticas e Estratégia
--Name[pt_BR]=Táticas & Estratégias
--Name[ro]=Tactică și strategie
--Name[ru]=Стратегия
--Name[rw]=Imigabo & Imigambi
--Name[se]=Taktihkka ja strategiija
--Name[sk]=Taktické a strategické
--Name[sl]=Taktika in strategija
--Name[sr]=Тактика и стратегија
--Name[sr@Latn]=Taktika i strategija
--Name[ss]=Masu & indlela yekwenta
--Name[sv]=Taktik och strategi
--Name[ta]=உத்திகளும் தந்திரங்களும்
--Name[te]=యుక్తి & తంత్రాలు
--Name[tg]=Бозиҳои стратегӣ
--Name[th]=เกมกลยุทธ์และวางแผน
--Name[tr]=Taktik ve Strateji
--Name[tt]=Taktik & Strategi
--Name[uk]=Тактика та стратегія
--Name[uz]=Taktika va strategiya
--Name[uz@cyrillic]=Тактика ва стратегия
--Name[ven]=Madzhenele & Maitele
--Name[vi]=Chiến thuật và Chiến lược
--Name[wa]=Tactike eyet stratedjeye
--Name[xh]=Amacebo okufumana iinjongo & Amacebo okuzoba
--Name[zh_CN]=策略游戏
--Name[zh_TW]=戰略及策略
--Name[zu]=Amaqhinga & Iplani
--Icon=package_games_strategy
-diff -Nuar trinity-tdebase-3.5.13.2/applnk.ORI/kde-graphics.directory trinity-tdebase-3.5.13.2/applnk/kde-graphics.directory
---- trinity-tdebase-3.5.13.2/applnk.ORI/kde-graphics.directory	2013-07-28 15:44:30.821668706 +0200
-+++ trinity-tdebase-3.5.13.2/applnk/kde-graphics.directory	1970-01-01 01:00:00.000000000 +0100
-@@ -1,89 +0,0 @@
--[Desktop Entry]
--Encoding=UTF-8
--Type=Directory
--Name=Graphics
--Name[af]=Grafieka
--Name[ar]=برامج رسم
--Name[az]=Qrafika
--Name[be]=Графіка
--Name[bg]=Графика
--Name[bn]=গ্রাফিক্স
--Name[br]=Grafikoù
--Name[bs]=Grafika
--Name[ca]=Gràfics
--Name[cs]=Grafika
--Name[csb]=Grafika
--Name[cy]=Graffeg
--Name[da]=Grafik
--Name[de]=Graphik
--Name[el]=Γραφικά
--Name[eo]=Grafiko
--Name[es]=Gráficos
--Name[et]=Graafika
--Name[eu]=Grafikoak
--Name[fa]=نگاره‌ها
--Name[fi]=Grafiikka
--Name[fo]=Teknindi
--Name[fr]=Graphisme
--Name[fy]=Grafysk
--Name[ga]=Grafaic
--Name[gl]=Gráficos
--Name[he]=גרפיקה
--Name[hi]=चित्रकारी
--Name[hr]=Grafika
--Name[hsb]=Grafika
--Name[hu]=Grafikai programok
--Name[id]=Grafis
--Name[is]=Myndvinnsla
--Name[it]=Grafica
--Name[ja]=グラフィックス
--Name[ka]=გრაფიკა
--Name[kk]=Графика
--Name[km]=ក្រាហ្វិក
--Name[ko]=그래픽
--Name[lo]=ກຣາບຟິກ
--Name[lt]=Grafika
--Name[lv]=Grafika
--Name[mk]=Графика
--Name[mn]=График
--Name[ms]=Grafik
--Name[mt]=Grafika
--Name[nb]=Bilde
--Name[nds]=Grafik
--Name[ne]=ग्राफिक्स
--Name[nl]=Grafisch
--Name[nn]=Grafikk
--Name[nso]=Di-Graphics
--Name[oc]=Grafics
--Name[pa]=ਚਿੱਤਰਕਲਾ
--Name[pl]=Grafika
--Name[pt]=Gráficos
--Name[pt_BR]=Gráficos
--Name[ro]=Grafică
--Name[ru]=Графика
--Name[rw]=Ibishushanyo
--Name[se]=Grafihkka
--Name[sk]=Grafika
--Name[sl]=Grafika
--Name[sr]=Графика
--Name[sr@Latn]=Grafika
--Name[ss]=Titfombe-mdvwebo
--Name[sv]=Grafik
--Name[ta]=சித்திரங்கள்
--Name[te]=గ్రాఫిక్స్
--Name[tg]=Графика
--Name[th]=กราฟิก
--Name[tr]=Grafik Programları
--Name[tt]=Sızım
--Name[uk]=Графіка
--Name[uz]=Grafika
--Name[uz@cyrillic]=Графика
--Name[ven]=Dzigirafu
--Name[vi]=Đồ hoạ
--Name[wa]=Grafikes
--Name[xh]=Imizobo
--Name[zh_CN]=图像
--Name[zh_TW]=圖形
--Name[zu]=Imidwebo
--Icon=package_graphics
--
-diff -Nuar trinity-tdebase-3.5.13.2/applnk.ORI/kde-information.directory trinity-tdebase-3.5.13.2/applnk/kde-information.directory
---- trinity-tdebase-3.5.13.2/applnk.ORI/kde-information.directory	2013-07-28 15:44:30.821668706 +0200
-+++ trinity-tdebase-3.5.13.2/applnk/kde-information.directory	1970-01-01 01:00:00.000000000 +0100
-@@ -1,87 +0,0 @@
--[Desktop Entry]
--Encoding=UTF-8
--Type=Directory
--Name=Information
--Name[af]=Informasie
--Name[ar]=معلومات
--Name[az]=Mə'lumat
--Name[be]=Інфармацыя
--Name[bg]=Информация
--Name[bn]=তথ্য
--Name[br]=Titouroù
--Name[bs]=Informacije
--Name[ca]=Informació
--Name[cs]=Informace
--Name[csb]=Wëdowiédzô
--Name[cy]=Gwybodaeth
--Name[el]=Πληροφορίες
--Name[eo]=Informoj
--Name[es]=Información
--Name[et]=Info
--Name[eu]=Informazioa
--Name[fa]=اطلاعات
--Name[fi]=Järjestelmätiedot
--Name[fo]=Upplýsingar
--Name[fr]=Informations
--Name[fy]=Ynformaasje
--Name[ga]=Eolas
--Name[gl]=Información
--Name[he]=מידע
--Name[hi]=जानकारी
--Name[hr]=Podaci
--Name[hsb]=Informacija
--Name[hu]=Információ
--Name[id]=Informasi
--Name[is]=Upplýsingar
--Name[it]=Informazioni
--Name[ja]=情報
--Name[ka]=ინფორმაცია
--Name[kk]=Мәлімет
--Name[km]=ព័ត៌មាន
--Name[ko]=정보
--Name[lo]=ຂໍ້ມູນຕ່າງໆ
--Name[lt]=Informacija
--Name[lv]=Informācija
--Name[mk]=Информации
--Name[mn]=Мэдээлэл
--Name[ms]=Maklumat
--Name[mt]=Informazzjoni
--Name[nb]=Informasjon
--Name[nds]=Informatschoon
--Name[ne]=सूचना
--Name[nl]=Informatie
--Name[nn]=Informasjon
--Name[nso]=Tshedimoso
--Name[oc]=Infòrmacion
--Name[pa]=ਜਾਣਕਾਰੀ
--Name[pl]=Informacje
--Name[pt]=Informação
--Name[pt_BR]=Informação
--Name[ro]=Informații
--Name[ru]=Сведения
--Name[rw]=Amakuru
--Name[se]=Diehtu
--Name[sk]=Informácie
--Name[sl]=Informacije
--Name[sr]=Информације
--Name[sr@Latn]=Informacije
--Name[ss]=Imininingwane
--Name[ta]=தகவல்
--Name[te]=సమాచారం
--Name[tg]=Иттилоот
--Name[th]=ข้อมูลต่างๆ
--Name[tr]=Bilgi
--Name[tt]=Beldermä
--Name[uk]=Інформація
--Name[uz]=Maʼlumot
--Name[uz@cyrillic]=Маълумот
--Name[ven]=Mafhungo
--Name[vi]=Thông tin
--Name[wa]=Informåcions
--Name[xh]=Ulwazi
--Name[zh_CN]=信息
--Name[zh_TW]=資訊
--Name[zu]=Ulwazi
--Icon=hwinfo
--X-KDE-BaseGroup=info
--NoDisplay=true
-diff -Nuar trinity-tdebase-3.5.13.2/applnk.ORI/kde-information.menu trinity-tdebase-3.5.13.2/applnk/kde-information.menu
---- trinity-tdebase-3.5.13.2/applnk.ORI/kde-information.menu	2013-07-28 15:44:30.821668706 +0200
-+++ trinity-tdebase-3.5.13.2/applnk/kde-information.menu	1970-01-01 01:00:00.000000000 +0100
-@@ -1,10 +0,0 @@
-- <!DOCTYPE Menu PUBLIC "-//freedesktop//DTD Menu 1.0//EN"
--  "http://www.freedesktop.org/standards/menu-spec/1.0/menu.dtd">
--
--<Menu>
--	<Name>Information</Name>
--	<Directory>kde-information.directory</Directory>
--	<Include>
--		<Category>X-KDE-information</Category>
--	</Include>
--</Menu>
-diff -Nuar trinity-tdebase-3.5.13.2/applnk.ORI/kde-internet.directory trinity-tdebase-3.5.13.2/applnk/kde-internet.directory
---- trinity-tdebase-3.5.13.2/applnk.ORI/kde-internet.directory	2013-07-28 15:44:30.821668706 +0200
-+++ trinity-tdebase-3.5.13.2/applnk/kde-internet.directory	1970-01-01 01:00:00.000000000 +0100
-@@ -1,48 +0,0 @@
--[Desktop Entry]
--Encoding=UTF-8
--Type=Directory
--Name=Internet
--Name[ar]=الإنترنت
--Name[az]=İnternet
--Name[be]=Інтэрнэт
--Name[bg]=Интернет
--Name[bn]=ইন্টারনেট
--Name[br]=Kenrouedad
--Name[cy]=Rhyngrwyd
--Name[el]=Διαδίκτυο
--Name[eo]=Interreto
--Name[fa]=اینترنت
--Name[fy]=Ynternet
--Name[ga]=Idirlíon
--Name[he]=אינטרנט
--Name[hi]=इंटरनेट
--Name[is]=Internetið
--Name[ja]=インターネット
--Name[ka]=ინტერნეტი
--Name[kk]=Интернет
--Name[km]=អ៊ិនធឺណិត
--Name[ko]=인터넷
--Name[lt]=Internetas
--Name[lv]=Internets
--Name[mk]=Интернет
--Name[mn]=Интернэт
--Name[nb]=Internett
--Name[ne]=इन्टरनेट
--Name[nn]=Internett
--Name[pa]=ਇੰਟਰਨੈੱਟ
--Name[ru]=Интернет
--Name[rw]=Interineti
--Name[se]=Interneahtta
--Name[sr]=Интернет
--Name[ta]=இணையம்
--Name[te]=ఇంటర్నెట్
--Name[tg]=Интернет
--Name[th]=อินเทอร์เน็ต
--Name[tr]=İnternet
--Name[tt]=Päräwez
--Name[uk]=Інтернет
--Name[uz@cyrillic]=Интернет
--Name[wa]=Daegntoele
--Name[zh_TW]=網際網路
--Icon=package_network
--
-diff -Nuar trinity-tdebase-3.5.13.2/applnk.ORI/kde-internet-terminal.directory trinity-tdebase-3.5.13.2/applnk/kde-internet-terminal.directory
---- trinity-tdebase-3.5.13.2/applnk.ORI/kde-internet-terminal.directory	2013-07-28 15:44:30.821668706 +0200
-+++ trinity-tdebase-3.5.13.2/applnk/kde-internet-terminal.directory	1970-01-01 01:00:00.000000000 +0100
-@@ -1,88 +0,0 @@
--[Desktop Entry]
--Encoding=UTF-8
--Type=Directory
--Name=Terminal Applications
--Name[af]=Terminaal Programme
--Name[ar]=تطبيقات مطرافية
--Name[az]=Terminal Proqramları
--Name[be]=Тэрмінальныя праграмы
--Name[bg]=Конзолни програми
--Name[bn]=টার্মিনাল অ্যাপলিকেশন
--Name[br]=Arloadoù an termenell
--Name[bs]=Tekstualni programi
--Name[ca]=Aplicacions de terminal
--Name[cs]=Terminálové aplikace
--Name[csb]=Programë terminala
--Name[cy]=Cymhwysiadau Terfynell
--Name[da]=Terminalprogrammer
--Name[de]=Terminalprogramme
--Name[el]=Εφαρμογές τερματικού
--Name[eo]=Terminal-Aplikaĵoj
--Name[es]=Aplicaciones de terminal
--Name[et]=Terminali rakendused
--Name[eu]=Terminaleko aplikazioak
--Name[fa]=کاربردهای پایانه
--Name[fi]=Päätesovellukset
--Name[fo]=Tekstforrit
--Name[fr]=Applications pour terminal
--Name[fy]=Terminal-tapassingen
--Name[ga]=Feidhmchláir Teirminéil
--Name[gl]=Aplicacións de Terminal
--Name[he]=יישומי מסוף
--Name[hi]=टर्मिनल अनुप्रयोग
--Name[hr]=Terminalske aplikacije
--Name[hsb]=Programy za terminal
--Name[hu]=Parancsértelmezők
--Name[id]=Aplikasi Terminal
--Name[is]=Skjáhermiforrit
--Name[it]=Applicazioni terminale
--Name[ja]=ターミナルアプリケーション
--Name[ka]=კონსოლის პროგრამები
--Name[kk]=Консоль қолданбалары
--Name[km]=កម្មវិធី​ស្ថានីយ
--Name[ko]=터미널 프로그램
--Name[lo]=ໂປຣແກຣມເທີມີນໍ
--Name[lt]=Terminalinės programos
--Name[lv]=Termināla Aplikācijas
--Name[mk]=Терминалски апликации
--Name[mn]=Терминал-Програм
--Name[ms]=Aplikasi Terminal
--Name[mt]=Programmi tat-Terminal
--Name[nb]=Terminalprogrammer
--Name[nds]=Terminalprogrammen
--Name[ne]=टर्मिनल अनुप्रयोग
--Name[nl]=Terminal-toepassingen
--Name[nn]=Terminalprogram
--Name[nso]=Ditshumiso tsa Terminal
--Name[pa]=ਟਰਮੀਨਲ ਕਾਰਜ
--Name[pl]=Programy terminala
--Name[pt]=Aplicações de Terminal
--Name[pt_BR]=Aplicativos de terminal
--Name[ro]=Aplicații de terminal
--Name[ru]=Консольные приложения
--Name[rw]=Amaporogaramu Nkiriya
--Name[se]=Terminálprográmmat
--Name[sk]=Terminálové aplikácie
--Name[sl]=Terminalski programi
--Name[sr]=Терминалски програми
--Name[sr@Latn]=Terminalski programi
--Name[ss]=Ticelo tesikhungo
--Name[sv]=Terminalprogram
--Name[ta]=முனைய பயன்பாடுகள்
--Name[te]=టర్మినల్ కార్యక్రమములు
--Name[tg]=Барномаҳои консол
--Name[th]=โปรแกรมเทอร์มินัล
--Name[tr]=Uçbirim Uygulamaları
--Name[tt]=Terminal Yazılımnarı
--Name[uk]=Термінальні програми
--Name[uz]=Terminal uchun dasturlar
--Name[uz@cyrillic]=Терминал учун дастурлар
--Name[ven]=Apulikhesheni ya Theminala
--Name[vi]=Trình đầu cuối
--Name[wa]=Programes terminås
--Name[xh]=Izicelo Zesiphelo sendlela
--Name[zh_CN]=终端应用程序
--Name[zh_TW]=終端機程式
--Name[zu]=Abayaleli bangaphandle
--Icon=konsole
--Version=1.0
-diff -Nuar trinity-tdebase-3.5.13.2/applnk.ORI/kde-main.directory trinity-tdebase-3.5.13.2/applnk/kde-main.directory
---- trinity-tdebase-3.5.13.2/applnk.ORI/kde-main.directory	2013-07-28 15:44:30.821668706 +0200
-+++ trinity-tdebase-3.5.13.2/applnk/kde-main.directory	1970-01-01 01:00:00.000000000 +0100
-@@ -1,80 +0,0 @@
--[Desktop Entry]
--Encoding=UTF-8
--Type=Directory
--Icon=package
--Name=KDE Menu
--Name[af]=KDE Kieslys
--Name[ar]=قائمة KDE
--Name[az]=KDE Meyusu
--Name[be]=Меню KDE
--Name[bg]=Главно меню
--Name[bn]=কে.ডি.ই. মেনু
--Name[br]=Meuziad KDE
--Name[bs]=KDE meni
--Name[ca]=Menú de KDE
--Name[cs]=Nabídka KDE
--Name[csb]=KDE menu
--Name[cy]=Dewislen KDE
--Name[da]=KDE-Menu
--Name[de]=KDE-Menü
--Name[el]=Μενού KDE
--Name[eo]=KDEa Menuo
--Name[es]=Menú de KDE
--Name[et]=KDE menüü
--Name[eu]=KDE menua
--Name[fa]=گزینگان KDE
--Name[fi]=Valikko
--Name[fr]=Menu de KDE
--Name[fy]=KDE-menu
--Name[ga]=Roghchlár KDE
--Name[gl]=Menú de KDE
--Name[he]=תפריט KDE
--Name[hi]=केडीई मेन्यू
--Name[hr]=KDE izbornik
--Name[hsb]=KDE meni
--Name[hu]=KDE menü
--Name[id]=Menu KDE
--Name[is]=KDE valmynd
--Name[it]=Menu KDE
--Name[ja]=KDE メニュー
--Name[ka]=KDE მენიუ
--Name[kk]=KDE мәзірі
--Name[km]=ម៉ឺនុយ KDE
--Name[ko]=KDE 메뉴
--Name[lt]=KDE meniu
--Name[lv]=KDE izvēlne
--Name[mk]=KDE-мени
--Name[mn]=КДЭ цэс
--Name[ms]=Menu KDE
--Name[mt]=Menu KDE
--Name[nb]=KDE-meny
--Name[nds]=KDE-Menü
--Name[ne]=केडीई मेनु
--Name[nl]=KDE-menu
--Name[nn]=KDE-meny
--Name[pa]=KDE ਮੇਨੂ
--Name[pl]=Menu KDE
--Name[pt]=Menu KDE
--Name[pt_BR]=Menu do KDE
--Name[ro]=Meniu KDE
--Name[ru]=Меню KDE
--Name[rw]=Ibikubiyemo bya KDE 
--Name[se]=KDE-fállu
--Name[sk]=Menu KDE
--Name[sl]=Meni KDE
--Name[sr]=KDE мени
--Name[sr@Latn]=KDE meni
--Name[sv]=KDE-meny
--Name[ta]=கேடியி பட்டி
--Name[te]=కెడిఈ పట్టీ
--Name[tg]=Менюи KDE
--Name[th]=เมนู KDE
--Name[tr]=KDE Menüsü
--Name[tt]=KDE Saylağı
--Name[uk]=Меню KDE
--Name[uz]=KDE menyu
--Name[uz@cyrillic]=KDE меню
--Name[vi]=Thực đơn KDE
--Name[wa]=Dressêye KDE
--Name[zh_CN]=KDE 菜单
--Name[zh_TW]=KDE 選單
-diff -Nuar trinity-tdebase-3.5.13.2/applnk.ORI/kde-more.directory trinity-tdebase-3.5.13.2/applnk/kde-more.directory
---- trinity-tdebase-3.5.13.2/applnk.ORI/kde-more.directory	2013-07-28 15:44:30.821668706 +0200
-+++ trinity-tdebase-3.5.13.2/applnk/kde-more.directory	1970-01-01 01:00:00.000000000 +0100
-@@ -1,79 +0,0 @@
--[Desktop Entry]
--Encoding=UTF-8
--Type=Directory
--Icon=package
--Name=More Applications
--Name[af]=Meer Programme
--Name[ar]=المزيد من التطبيقات
--Name[az]=Daha Çox Proqram
--Name[be]=Яшчэ праграмы
--Name[bg]=Още програми
--Name[bn]=আরো অ্যাপলিকেশন
--Name[br]=Ar re all
--Name[bs]=Još programa
--Name[ca]=Més aplicacions
--Name[cs]=Více aplikací
--Name[csb]=Wicy programów
--Name[cy]=Rhagor o Gymhwysiadau
--Name[da]=Flere programmer
--Name[de]=Weitere Programme
--Name[el]=Περισσότερες εφαρμογές
--Name[eo]=Pluaj aplikaĵoj
--Name[es]=Más aplicaciones
--Name[et]=Muud rakendused
--Name[eu]=Aplikazio gehiago
--Name[fa]=کاربردهای بیشتر
--Name[fi]=Lisää sovelluksia
--Name[fr]=Autres applications
--Name[fy]=Mear programma's
--Name[ga]=Feidhmchláir Breise
--Name[gl]=Máis Aplicacións
--Name[he]=עוד יישומים
--Name[hi]=और अधिक अनुप्रयोग
--Name[hr]=Više aplikacija
--Name[hsb]=Wjace programow
--Name[hu]=További alkalmazások
--Name[id]=Aplikasi Lain
--Name[is]=Fleiri forrit
--Name[it]=Altri programmi
--Name[ja]=その他のアプリケーション
--Name[ka]=დამატებითი პროგრამები
--Name[kk]=Басқа қолданбалар
--Name[km]=កម្មវិធីបន្ថែម​ទៀត
--Name[ko]=더 많은 프로그램
--Name[lt]=Daugiau programų
--Name[lv]=Vairāk aplikāciju
--Name[mk]=Уште апликации
--Name[ms]=Aplikasi Lain
--Name[mt]=Programmi KDE
--Name[nb]=Flere programmer
--Name[nds]=Mehr Programmen
--Name[ne]=धेरै अनुप्रयोग
--Name[nl]=Meer programma's
--Name[nn]=Fleire program
--Name[pa]=ਹੋਰ ਕਾਰਜ
--Name[pl]=Więcej programów
--Name[pt]=Mais Aplicações
--Name[pt_BR]=Mais Aplicativos
--Name[ro]=Alte aplicații
--Name[ru]=Дополнительные приложения
--Name[rw]=Amaporogaramu Arenze
--Name[se]=Eanet prográmmat
--Name[sk]=Ďalšie aplikácie
--Name[sl]=Več programov
--Name[sr]=Још програма
--Name[sr@Latn]=Još programa
--Name[sv]=Fler program
--Name[ta]=அதிக பயன்பாடுகள்
--Name[te]=మరికొన్ని కార్యక్రమములు
--Name[tg]=Барномаҳои иловагӣ
--Name[th]=แอพพลิเคชันอื่นๆ
--Name[tr]=Daha Fazla Uygulama
--Name[tt]=Başqa Yazılımnar
--Name[uk]=Інші програми
--Name[uz]=Boshqa dasturlar
--Name[uz@cyrillic]=Бошқа дастурлар
--Name[vi]=Ứng dụng Thêm nữa
--Name[wa]=Co ds ôtes programes
--Name[zh_CN]=更多应用程序
--Name[zh_TW]=更多應用程式
-diff -Nuar trinity-tdebase-3.5.13.2/applnk.ORI/kde-multimedia.directory trinity-tdebase-3.5.13.2/applnk/kde-multimedia.directory
---- trinity-tdebase-3.5.13.2/applnk.ORI/kde-multimedia.directory	2013-07-28 15:44:30.821668706 +0200
-+++ trinity-tdebase-3.5.13.2/applnk/kde-multimedia.directory	1970-01-01 01:00:00.000000000 +0100
-@@ -1,65 +0,0 @@
--[Desktop Entry]
--Encoding=UTF-8
--Type=Directory
--Name=Multimedia
--Name[ar]=الوسائط المتعددة
--Name[az]=Multimediya
--Name[be]=Мультымедыя
--Name[bg]=Мултимедия
--Name[bn]=মাল্টিমিডিয়া
--Name[br]=Liesvedia
--Name[bs]=Multimedija
--Name[ca]=Multimèdia
--Name[cs]=Multimédia
--Name[csb]=Mùltimedia
--Name[cy]=Amlgyfryngau
--Name[da]=Multimedie
--Name[el]=Πολυμέσα
--Name[eo]=Plurmedio
--Name[et]=Multimeedia
--Name[fa]=چند رسانه‌ای
--Name[fo]=Fleirmiðla
--Name[fr]=Multimédia
--Name[ga]=Ilmheáin
--Name[he]=מולטימדיה
--Name[hi]=मल्टीमीडिया
--Name[hr]=Multimedija
--Name[hsb]=Multimedije
--Name[hu]=Multimédia
--Name[is]=Margmiðlun
--Name[ja]=マルチメディア
--Name[ka]=მულტიმედია
--Name[kk]=Мультимедиа
--Name[km]=ពហុព័ត៌មាន
--Name[ko]=멀티미디어
--Name[lo]=ເມົາຕິມີເດຍ
--Name[lv]=Multimēdija
--Name[mk]=Мултимедија
--Name[mn]=Мултимедиа
--Name[ne]=मल्टिमिडिया
--Name[nso]=Media wa Bontshi
--Name[pa]=ਮਲਟੀਮੀਡਿਆ
--Name[pt]=Multimédia
--Name[pt_BR]=Multimídia
--Name[ru]=Мультимедиа
--Name[rw]=Mutwaramakuru
--Name[sk]=Multimédiá
--Name[sl]=Večpredstavnost
--Name[sr]=Мултимедија
--Name[sr@Latn]=Multimedija
--Name[ss]=Tinhlobonhlobo-tetindzaba
--Name[ta]=பல்லூடகம்
--Name[te]=బహుళ మాద్యమం
--Name[tg]=Мултимедия
--Name[th]=มัลติมีเดีย
--Name[tr]=Çokluortam
--Name[uk]=Мультимедіа
--Name[uz@cyrillic]=Мултимедиа
--Name[ven]=Zwimwumwusi
--Name[vi]=Đa phương tiện
--Name[xh]=Iindlela ezininzi zokwenza
--Name[zh_CN]=多媒体
--Name[zh_TW]=多媒體
--Name[zu]=Onozindaba abaningi
--Icon=package_multimedia
--
-diff -Nuar trinity-tdebase-3.5.13.2/applnk.ORI/kde-office.directory trinity-tdebase-3.5.13.2/applnk/kde-office.directory
---- trinity-tdebase-3.5.13.2/applnk.ORI/kde-office.directory	2013-07-28 15:44:30.821668706 +0200
-+++ trinity-tdebase-3.5.13.2/applnk/kde-office.directory	1970-01-01 01:00:00.000000000 +0100
-@@ -1,86 +0,0 @@
--[Desktop Entry]
--Encoding=UTF-8
--Type=Directory
--Name=Office
--Name[af]=Kantoor
--Name[ar]=المكتب
--Name[az]=Offis
--Name[be]=Офіс
--Name[bg]=Офис
--Name[bn]=অফিস
--Name[br]=Burev
--Name[bs]=Uredske aplikacije
--Name[ca]=Oficina
--Name[cs]=Kancelář
--Name[csb]=Biuro
--Name[cy]=Swyddfa
--Name[da]=Kontor
--Name[de]=Büroprogramme
--Name[el]=Γραφείο
--Name[eo]=Laborejo
--Name[es]=Oficina
--Name[et]=Kontoritöö
--Name[eu]=Bulegoa
--Name[fa]=اداره
--Name[fi]=Toimisto-ohjelmat
--Name[fo]=Skrivstova
--Name[fr]=Bureautique
--Name[fy]=Kantoartapassingen
--Name[ga]=Oifig
--Name[gl]=Ofimática
--Name[he]=יישומים משרדיים
--Name[hi]=कार्यालय
--Name[hr]=Ured
--Name[hsb]=Běrowowe programy
--Name[hu]=Irodai alkalmazások
--Name[is]=Skrifstofuforrit
--Name[it]=Ufficio
--Name[ja]=オフィス
--Name[ka]=ოფისი
--Name[kk]=Офис
--Name[km]=ការិយាល័យ
--Name[ko]=사무용 도구
--Name[lo]=ໂປຣແກຣມຊຸດສຳນັກງານ
--Name[lt]=Biuro programos
--Name[lv]=Birojs
--Name[mk]=Канцеларија
--Name[mn]=Албан програм
--Name[ms]=Pejabat
--Name[mt]=Uffiċċju
--Name[nb]=Kontor
--Name[nds]=Kontoor
--Name[ne]=कार्यालय
--Name[nl]=Kantoortoepassingen
--Name[nn]=Kontor
--Name[nso]=Ofisi
--Name[oc]=Burèu
--Name[pa]=ਦਫ਼ਤਰ
--Name[pl]=Biuro
--Name[pt]=Escritório
--Name[pt_BR]=Escritório
--Name[ro]=Aplicații birotică
--Name[ru]=Офис
--Name[rw]=Ofise
--Name[se]=Kántuvra
--Name[sk]=Kancelária
--Name[sl]=Pisarna
--Name[ss]=Lihhovisi
--Name[sv]=Kontorsprogram
--Name[ta]=அலுவலகம்
--Name[te]=కార్యాలయము
--Name[tg]=Офис
--Name[th]=โปรแกรมชุดสำนักงาน
--Name[tr]=Ofis
--Name[tt]=Eşxänä
--Name[uk]=Офіс
--Name[uz]=Idora uchun dasturlar
--Name[uz@cyrillic]=Идора учун дастурлар
--Name[ven]=Ofisi
--Name[vi]=Văn phòng
--Name[wa]=Buro
--Name[xh]=Ofisi
--Name[zh_CN]=办公
--Name[zh_TW]=辦公軟體
--Name[zu]=Ihhofisi
--Icon=package_wordprocessing
--SortOrder=koshell.desktop,kword.desktop,kspread.desktop,kpresenter.desktop
-diff -Nuar trinity-tdebase-3.5.13.2/applnk.ORI/kde-science.directory trinity-tdebase-3.5.13.2/applnk/kde-science.directory
---- trinity-tdebase-3.5.13.2/applnk.ORI/kde-science.directory	2013-07-28 15:44:30.821668706 +0200
-+++ trinity-tdebase-3.5.13.2/applnk/kde-science.directory	1970-01-01 01:00:00.000000000 +0100
-@@ -1,80 +0,0 @@
--[Desktop Entry]
--Encoding=UTF-8
--Type=Directory
--Icon=kcmdf
--Name=Science & Math
--Name[af]=Wetenskap & Wiskunde
--Name[ar]=العلوم و الرياضيات
--Name[az]=Elm və Riyaziyyat
--Name[be]=Навука і матэматыка
--Name[bg]=Математика
--Name[bn]=বিজ্ঞান এবং গণিত
--Name[br]=Skiant ha Jedoniel
--Name[bs]=Nauka i matematika
--Name[ca]=Ciència i Matemàtiques
--Name[cs]=Věda a matematika
--Name[csb]=Ùczbòwé
--Name[cy]=Gwyddoniaeth a Mathemateg
--Name[da]=Naturvidenskab & matematik
--Name[de]=Wissenschaft & Mathematik
--Name[el]=Επιστήμη & Μαθηματικά
--Name[en_GB]=Science & Maths
--Name[eo]=Scienco kaj Matematiko
--Name[es]=Ciencia y matemáticas
--Name[et]=Teadus
--Name[eu]=Zientzia eta matematikaa
--Name[fa]=علوم و ریاضی
--Name[fi]=Tiede ja matematiikka
--Name[fr]=Science et mathématiques
--Name[fy]=Wittenskiplik en wiskunde
--Name[ga]=Eolaíocht & Matamaitic
--Name[gl]=Ciencia e Matemáticas
--Name[he]=מדע ומתמטיקה
--Name[hi]=विज्ञान और गणित
--Name[hr]=Znanost i matematika
--Name[hsb]=Matematika & Wědomosć
--Name[hu]=Tudományok, matematika
--Name[id]=Ilmu Pengetahuan & Matematika
--Name[is]=Vísindi og stærðfræði
--Name[it]=Scienza e matematica
--Name[ja]=サイエンス & 数学
--Name[ka]=მეცნიერება და მათემატიკა 
--Name[kk]=Ғылыми және математикалық
--Name[km]=វិទ្យាសាស្ត្រ & គណិតវិទ្យា
--Name[ko]=과학과 수학
--Name[lt]=Mokslas ir matematika
--Name[lv]=Zinātne un Matemātika
--Name[mk]=Наука и математика
--Name[ms]=Matematik & Sains
--Name[mt]=Xjenza u Matematika
--Name[nb]=Vitenskap og matematikk
--Name[nds]=Wetenschap & Mathematik
--Name[ne]=विज्ञान र गणीत
--Name[nl]=Wetenschap en wiskunde
--Name[nn]=Vitskap og matematikk
--Name[pa]=ਵਿਗਿਆਨ ਤੇ ਗਣਿਤ
--Name[pl]=Naukowe
--Name[pt]=Ciência e Matemática
--Name[pt_BR]=Ciências & Matemática
--Name[ro]=Știință și matematică
--Name[ru]=Наука
--Name[rw]=Ikoranabuhanga & Imibare
--Name[se]=Dieđa ja matematihkka
--Name[sk]=Veda
--Name[sl]=Znanost in matematika
--Name[sr]=Наука и математика
--Name[sr@Latn]=Nauka i matematika
--Name[sv]=Vetenskap och matematik
--Name[ta]=அறிவியல் & கணிதம்
--Name[te]=విజ్ఞానం & గణితం
--Name[tg]=Илм ва математика
--Name[th]=วิทยาศาสตร์และคณิตศาสตร์
--Name[tr]=Bilim ve Matematik
--Name[tt]=Fän & Sanaw
--Name[uk]=Наука і математика
--Name[uz]=Fan va Matematika
--Name[uz@cyrillic]=Фан ва Математика
--Name[vi]=Khoa học & Toán học
--Name[wa]=Siyinces et matematikes
--Name[zh_CN]=科学和数学
--Name[zh_TW]=科學與數學
-diff -Nuar trinity-tdebase-3.5.13.2/applnk.ORI/kde-screensavers.menu trinity-tdebase-3.5.13.2/applnk/kde-screensavers.menu
---- trinity-tdebase-3.5.13.2/applnk.ORI/kde-screensavers.menu	2013-07-28 15:44:30.821668706 +0200
-+++ trinity-tdebase-3.5.13.2/applnk/kde-screensavers.menu	1970-01-01 01:00:00.000000000 +0100
-@@ -1,10 +0,0 @@
-- <!DOCTYPE Menu PUBLIC "-//freedesktop//DTD Menu 1.0//EN"
--  "http://www.freedesktop.org/standards/menu-spec/1.0/menu.dtd">
--
--<Menu>
--	<Name>ScreenSavers</Name>
--	<Directory>kde-system-screensavers.directory</Directory>
--	<Include>
--		<Category>X-KDE-ScreenSaver</Category>
--	</Include>
--</Menu>
-diff -Nuar trinity-tdebase-3.5.13.2/applnk.ORI/kde-settings-accessibility.directory trinity-tdebase-3.5.13.2/applnk/kde-settings-accessibility.directory
---- trinity-tdebase-3.5.13.2/applnk.ORI/kde-settings-accessibility.directory	2013-07-28 15:44:30.821668706 +0200
-+++ trinity-tdebase-3.5.13.2/applnk/kde-settings-accessibility.directory	1970-01-01 01:00:00.000000000 +0100
-@@ -1,85 +0,0 @@
--[Desktop Entry]
--Encoding=UTF-8
--Type=Directory
--Name=Regional & Accessibility
--Name[af]=Streek & Toeganklikheid
--Name[ar]=الإقليمي وتسهيل الوصول
--Name[az]=Regional Qurğular & Yetişmə Qabiliyyəti
--Name[be]=Рэгіянальныя настаўленні і даступнасць
--Name[bg]=Локализация
--Name[bn]=আঞ্চলিক এবং সহায়ক প্রযুক্তি
--Name[br]=Rannvro hag Haezadusted
--Name[bs]=Regionalno i pristupačnost
--Name[ca]=Regional i accessibilitat
--Name[cs]=Místní zvyklosti a zpřístupnění
--Name[csb]=Òbéńdowé ë przistãpnosc
--Name[cy]=Rhanbarthol & Hygyrchedd
--Name[da]=Region & Tilgængelighed
--Name[de]=Regionaleinstellungen & Zugangshilfen
--Name[el]=Περιοχή & Προσιτότητα
--Name[eo]=Regiono & Alirebleco
--Name[es]=Regional y accesibilidad
--Name[et]=Hõlbustus
--Name[eu]=Eskualdea eta erabilerraztasuna
--Name[fa]=منطقه‌ای و دستیابی‌پذیری
--Name[fi]=Alueellisuus ja käytettävyys
--Name[fr]=Régionalisation et accessibilité
--Name[fy]=Regio en tagonklikens
--Name[ga]=Réigiúnach agus Insroichteacht
--Name[gl]=Rexional e Acesibilidade
--Name[he]=הגדרות אזוריות ונגישות
--Name[hi]=क्षेत्रीय व भाषायी पहुँच
--Name[hr]=Regionalnost i pristupačnost
--Name[hsb]=Kraj & Přistupnosć
--Name[hu]=Nyelv, kezelési segítség
--Name[is]=Svæðisbundnar stillingar og aðgengi
--Name[it]=Regionali e Accesso facilitato
--Name[ja]=地域 & アクセシビリティ
--Name[ka]=რეგიონალური და სეპციალური შესაძლებლობები
--Name[kk]=Жергілікті және Арнаулы мүмкіндіктер
--Name[km]=តំបន់ & មធ្យោបាយ​ងាយស្រួល
--Name[ko]=지역과 내게 필요한 설정
--Name[lo]=ຄວາມສາມາດໃນການໃຊ້ງານ
--Name[lt]=Regionai bei prieinamumas
--Name[lv]=Reģionāls un Pieejamība
--Name[mk]=Регионалност и пристапливост
--Name[mn]=Бүслүүр-тохируулга & Хэрэглэх тохь
--Name[ms]=Pemudahcapai & Tetapan Tempatan
--Name[mt]=Reġjonali u Aċċessibiltà
--Name[nb]=Regionalt og tilgjengelighet
--Name[nds]=Regioon & Behinnertenhülp
--Name[ne]=क्षेत्रीय र पहुँचयोग्य
--Name[nl]=Regio en toegankelijkheid
--Name[nn]=Regional og tilgjenge
--Name[nso]=Ya Naga & Tsenelo
--Name[pa]=ਖੇਤਰੀ ਅਤੇ ਸਹੂਲਤਾਂ
--Name[pl]=Regionalne i dostępność
--Name[pt]=Regional e Acessibilidade
--Name[pt_BR]=Regional & Acessibilidade
--Name[ro]=Regional și accesibilitate
--Name[ru]=Региональные и специальные возможности
--Name[rw]=By'agace & Ukugerwaho
--Name[se]=Báikkálaš ja álkkibut geavaheapmi
--Name[sk]=Prístupnosť a regionálne nastavenie
--Name[sl]=Regionalnost in dostopnost
--Name[sr]=Регија и приступачност
--Name[sr@Latn]=Regija i pristupačnost
--Name[ss]=Kutfolakala kalula & kwesifundza 
--Name[sv]=Region och handikappstöd
--Name[ta]=நாடும் & அணுகலும்
--Name[te]=ప్రాంతియతా & అందుబాటు
--Name[tg]=Имкониятҳои минтақавӣ
--Name[th]=เขตพื้นที่และการใช้งาน
--Name[tr]=Bölgesel ve Erişilebilirlik
--Name[tt]=Cirläşterü & İreşülek
--Name[uk]=Локалізація та доступність
--Name[uz]=Regional va qulayliklar
--Name[uz@cyrillic]=Регионал ва қулайликлар
--Name[ven]=U Dzhenea ha vhupo
--Name[vi]=Hỗ trợ quốc tế & Hỗ trợ người tàn tật
--Name[wa]=Redjonå & Accessibilité
--Name[xh]=Ummandla & Nofumaneko
--Name[zh_CN]=区域和辅助功能
--Name[zh_TW]=區域性與易用性
--Name[zu]=Okwesifunda & Igunya lokungena
--Icon=locale
-diff -Nuar trinity-tdebase-3.5.13.2/applnk.ORI/kde-settings-components.directory trinity-tdebase-3.5.13.2/applnk/kde-settings-components.directory
---- trinity-tdebase-3.5.13.2/applnk.ORI/kde-settings-components.directory	2013-07-28 15:44:30.821668706 +0200
-+++ trinity-tdebase-3.5.13.2/applnk/kde-settings-components.directory	1970-01-01 01:00:00.000000000 +0100
-@@ -1,85 +0,0 @@
--[Desktop Entry]
--Encoding=UTF-8
--Type=Directory
--Name=KDE Components
--Name[af]=KDE Komponente
--Name[ar]=مكوّنات KDE
--Name[az]=KDE Tərkib Hissələri
--Name[be]=Кампаненты KDE
--Name[bg]=Компоненти
--Name[bn]=কে.ডি.ই-র বিভিন্ন উপাদান
--Name[br]=Parzhioù KDE
--Name[bs]=KDE komponente
--Name[ca]=Components del KDE
--Name[cs]=Komponenty KDE
--Name[csb]=Dzéle KDE
--Name[cy]= Cydrannau KDE
--Name[da]=KDE-komponenter
--Name[de]=KDE-Komponenten
--Name[el]=Συστατικά του KDE
--Name[eo]=KDEaj komponentoj
--Name[es]=Componentes de KDE
--Name[et]=KDE komponendid
--Name[eu]=KDE osagaiak
--Name[fa]=مؤلفه‌های KDE
--Name[fi]=KDE-komponentit
--Name[fr]=Composants de KDE
--Name[fy]=KDE-compeninten
--Name[ga]=Comhpháirteanna KDE
--Name[gl]=Compoñentes de KDE
--Name[he]=רכיבי KDE
--Name[hi]=केडीई के घटक
--Name[hr]=KDE komponente
--Name[hsb]=KDE-komponenty
--Name[hu]=KDE-komponensek
--Name[id]=Komponen KDE
--Name[is]=KDE einingar
--Name[it]=Componenti di KDE
--Name[ja]=KDE コンポーネント
--Name[ka]=KDE კომპონენტები
--Name[kk]=KDE компоненттер
--Name[km]=សមាសភាគ KDE
--Name[ko]=KDE 구성요소
--Name[lo]=ຄອມໂພເນນຂອງ KDE
--Name[lt]=KDE komponentai
--Name[lv]=KDE Komponentes
--Name[mk]=Компоненти на KDE
--Name[mn]=КДЭ-Бүрэлдхүүнүүд
--Name[ms]=Komponen KDE
--Name[nb]=KDE-komponenter
--Name[nds]=KDE-Komponenten
--Name[ne]=KDE अवयव
--Name[nl]=KDE-componenten
--Name[nn]=KDE-komponent
--Name[nso]=Dikagare tsa KDE
--Name[pa]=KDE ਭਾਗ
--Name[pl]=Składniki KDE
--Name[pt]=Componentes do KDE
--Name[pt_BR]=Componentes do KDE
--Name[ro]=Componente KDE
--Name[ru]=Компоненты
--Name[rw]=Inyangingo za KDE
--Name[se]=KDE-oasit
--Name[sk]=Komponenty KDE
--Name[sl]=Komponente KDE
--Name[sr]=KDE компоненте
--Name[sr@Latn]=KDE komponente
--Name[ss]=Tincenye te KDE 
--Name[sv]=KDE-komponenter
--Name[ta]=KDE கூறுகள்
--Name[te]=కెడిఈ అంశాలు
--Name[tg]=Қисматҳои KDE
--Name[th]=ส่วนประกอบของ KDE
--Name[tr]=KDE Bileşenleri
--Name[tt]=KDE Öleşläre
--Name[uk]=Компоненти KDE
--Name[uz]=KDE komponentlari
--Name[uz@cyrillic]=KDE компонентлари
--Name[ven]=Zwipida zwa KDE
--Name[vi]=Thành phần của KDE
--Name[wa]=Componints di KDE
--Name[xh]=Izinto ze KDE
--Name[zh_CN]=KDE 组件
--Name[zh_TW]=KDE 元件
--Name[zu]= Amalunga e-KDE
--Icon=blockdevice
-diff -Nuar trinity-tdebase-3.5.13.2/applnk.ORI/kde-settings-desktop.directory trinity-tdebase-3.5.13.2/applnk/kde-settings-desktop.directory
---- trinity-tdebase-3.5.13.2/applnk.ORI/kde-settings-desktop.directory	2013-07-28 15:44:30.820668728 +0200
-+++ trinity-tdebase-3.5.13.2/applnk/kde-settings-desktop.directory	1970-01-01 01:00:00.000000000 +0100
-@@ -1,80 +0,0 @@
--[Desktop Entry]
--Encoding=UTF-8
--Type=Directory
--Name=Desktop
--Name[af]=Werkskerm
--Name[ar]=سطح المكتب
--Name[az]=Masa Üstü
--Name[be]=Працоўны стол
--Name[bg]=Работен плот
--Name[bn]=ডেস্কটপ
--Name[br]=Gorretaol
--Name[bs]=Radna površina
--Name[ca]=Escriptori
--Name[cs]=Pracovní plocha
--Name[csb]=Pùlt
--Name[cy]=Penbwrdd
--Name[de]=Arbeitsfläche
--Name[el]=Επιφάνεια εργασίας
--Name[eo]=Tabulo
--Name[es]=Escritorio
--Name[et]=Töölaud
--Name[eu]=Mahaigaina
--Name[fa]=رومیزی
--Name[fi]=Työpöytä
--Name[fo]=Skriviborð
--Name[fr]=Bureau
--Name[fy]=Buroblêd
--Name[ga]=Deasc
--Name[gl]=Escritorio
--Name[he]=שולחן עבודה
--Name[hi]=डेस्कटॉप
--Name[hr]=Radna površina
--Name[hsb]=Dźěłowy powjerch
--Name[hu]=Munkaasztal
--Name[is]=Skjáborð
--Name[ja]=デスクトップ
--Name[ka]=სამუშაო დაფა
--Name[kk]=Жұмыс үстелі
--Name[km]=ផ្ទៃតុ
--Name[ko]=데스크톱
--Name[lo]=ພື້ນທີ່ເຮັດວງກ
--Name[lt]=Darbastalis
--Name[lv]=Darbvirsma
--Name[mk]=Работна површина
--Name[mn]=Ажлын тавцан
--Name[ms]=Ruang Kerja
--Name[nb]=Skrivebord
--Name[nds]=Schriefdisch
--Name[ne]=डेस्कटप
--Name[nl]=Bureaublad
--Name[nn]=Skrivebord
--Name[oc]=BurèU
--Name[pa]=ਵੇਹੜਾ
--Name[pl]=Pulpit
--Name[pt]=Ambiente de Trabalho
--Name[pt_BR]=Área de Trabalho
--Name[ru]=Рабочий стол
--Name[rw]=Ibiro
--Name[se]=Čállinbeavdi
--Name[sk]=Plocha
--Name[sl]=Namizje
--Name[sr]=Радна површина
--Name[sr@Latn]=Radna površina
--Name[ss]=Desktop 
--Name[sv]=Skrivbord
--Name[ta]=மேல்மேசை
--Name[te]=రంగస్ఠలం
--Name[tg]=Мизи корӣ
--Name[th]=พื้นที่ทำงาน
--Name[tr]=Masaüstü
--Name[tt]=Östäl
--Name[uk]=Стільниця
--Name[uz]=Ish stoli
--Name[uz@cyrillic]=Иш столи
--Name[ven]=Desikithopo
--Name[vi]=Màn hình nền
--Name[wa]=Sicribanne
--Name[zh_CN]=桌面
--Name[zh_TW]=桌面
--Icon=desktop
-diff -Nuar trinity-tdebase-3.5.13.2/applnk.ORI/kde-settings.directory trinity-tdebase-3.5.13.2/applnk/kde-settings.directory
---- trinity-tdebase-3.5.13.2/applnk.ORI/kde-settings.directory	2013-07-28 15:44:30.821668706 +0200
-+++ trinity-tdebase-3.5.13.2/applnk/kde-settings.directory	1970-01-01 01:00:00.000000000 +0100
-@@ -1,88 +0,0 @@
--[Desktop Entry]
--Encoding=UTF-8
--Type=Directory
--Name=Settings-Modules
--Name[af]=Instel-Modules
--Name[ar]=الوحدات النمطية للتعيينات
--Name[az]=Qurğu Modulları
--Name[be]=Модулі настаўлення
--Name[bg]=Контролен център
--Name[bn]=সেটিংস-মডিউল
--Name[br]=Kefluniadur-molladoù
--Name[bs]=Postavke-Moduli
--Name[ca]=Mòduls de paràmetres
--Name[cs]=Moduly nastavení
--Name[csb]=Ùstôw - mòdułë
--Name[cy]=Modiwlau Gosodiadau
--Name[da]=Indstillingsmoduler
--Name[de]=Einstellungsmodule
--Name[el]=Ρυθμίσεις-Αρθρώματα
--Name[eo]=Agordomoduloj
--Name[es]=Módulos de preferencias
--Name[et]=Seadistuste moodulid
--Name[eu]=Ezarpenak-moduluak
--Name[fa]=پیمانه‌های تنظیمات
--Name[fi]=Asetusmoduulit
--Name[fo]=Uppsetingarpartar
--Name[fr]=Modules de configuration
--Name[fy]=Ynstellingsmodules
--Name[ga]=Modúil Socraithe
--Name[gl]=Módulos de Opcións
--Name[he]=מודולי הגדרות
--Name[hi]=विन्यास-मॉड्यूल्स
--Name[hr]=Postavke-Moduli
--Name[hsb]=Nastajenja -module
--Name[hu]=Beállítómodulok
--Name[is]=Stillingareiningar
--Name[it]=Moduli impostazioni
--Name[ja]=設定モジュール
--Name[ka]=მოდულები
--Name[kk]=Модульдер
--Name[km]=ការ​កំណត់​ម៉ូឌុល
--Name[ko]=설정-모듈
--Name[lo]=ຕັ້ງຄ່າໂມດູນ
--Name[lt]=Parinkčių moduliai
--Name[lv]=Parametru moduļi
--Name[mk]=Модули за поставувања
--Name[mn]=Тохируулга-горим
--Name[ms]=Tetapan Modul
--Name[mt]=Moduli tas-settings
--Name[nb]=Innstillingsmoduler
--Name[nds]=Instellen-Modulen
--Name[ne]=सेटिङ-मोड्युल
--Name[nl]=Configuratiemodules
--Name[nn]=Innstillingsmodular
--Name[nso]=Diripa tsa Dipeakanyo
--Name[pa]=ਸੈਟਿੰਗ-ਮੋਡੀਊਲ
--Name[pl]=Ustawienia - moduły
--Name[pt]=Módulos de Preferências
--Name[pt_BR]=Módulos de Configuração
--Name[ro]=Module de configurare
--Name[ru]=Модули
--Name[rw]=Amagenamiterere-Ibice
--Name[se]=Heivehusmoduvllat
--Name[sk]=Moduly nastavenia
--Name[sl]=Nastavitveni moduli
--Name[sr]=Поставке-модули
--Name[sr@Latn]=Postavke-moduli
--Name[ss]=Kuhleleka kwetahluko 
--Name[sv]=Inställningsmoduler
--Name[ta]=அமைப்புகள்-பகுதிகள்
--Name[te]=అమరికలు-మాడ్యూళ్లు
--Name[tg]=Модулҳо
--Name[th]=โมดูลการตั้งค่า
--Name[tr]=Modül Ayarları
--Name[tt]=Caylaw-Modullar
--Name[uk]=Модулі параметрів
--Name[uz]=Mslamalar modullari
--Name[uz@cyrillic]=Мсламалар модуллари
--Name[ven]=Modulu wa mavhekanyele
--Name[vi]=Thiết lập Mô đun
--Name[wa]=Apontiaedjes des modules
--Name[xh]=Izicwangciso-Iminqongo wokulinganisela
--Name[zh_CN]=设置模块
--Name[zh_TW]=設定模組
--Name[zu]=Izingxenye-zezilungiselelo
--NoDisplay=true
--Icon=package_settings
--X-KDE-BaseGroup=settings
-diff -Nuar trinity-tdebase-3.5.13.2/applnk.ORI/kde-settings-hardware.directory trinity-tdebase-3.5.13.2/applnk/kde-settings-hardware.directory
---- trinity-tdebase-3.5.13.2/applnk.ORI/kde-settings-hardware.directory	2013-07-28 15:44:30.821668706 +0200
-+++ trinity-tdebase-3.5.13.2/applnk/kde-settings-hardware.directory	1970-01-01 01:00:00.000000000 +0100
-@@ -1,59 +0,0 @@
--[Desktop Entry]
--Encoding=UTF-8
--Type=Directory
--Name=Hardware
--Name[af]=Hardeware
--Name[ar]=العتاد
--Name[be]=Апаратнае забеспячэнне
--Name[bg]=Хардуер
--Name[bn]=হার্ডওয়্যার
--Name[br]=Periantel
--Name[bs]=Hardver
--Name[csb]=Nôrzãdza
--Name[cy]=Caledwedd
--Name[el]=Υλικό
--Name[eo]=Aparataro
--Name[et]=Riistvara
--Name[fa]=سخت‌افزار
--Name[fi]=Laitteisto
--Name[fr]=Matériel
--Name[ga]=Crua-Earraí
--Name[he]=חומרה
--Name[hr]=Hardver
--Name[hu]=Hardver
--Name[id]=Perangkat Keras
--Name[is]=Vélbúnaður
--Name[ja]=ハードウェア
--Name[ka]=მოწყობილობები
--Name[kk]=Жабдықтар
--Name[km]=ផ្នែក​រឹង
--Name[ko]=하드웨어
--Name[lt]=Aparatinė įranga
--Name[mk]=Хардвер
--Name[ms]=Perkakasan
--Name[nb]=Maskinvare
--Name[ne]=हार्डवेयर
--Name[nn]=Maskinvare
--Name[pa]=ਜੰਤਰ
--Name[pl]=Sprzęt
--Name[ru]=Оборудование
--Name[rw]=Icyuma
--Name[se]=Mašiidnagálvu
--Name[sl]=Strojna oprema
--Name[sr]=Хардвер
--Name[sr@Latn]=Hardver
--Name[sv]=Hårdvara
--Name[ta]=வன்பொருள்
--Name[te]=హార్డ్ వేర్
--Name[tg]=Сахтафзор
--Name[th]=อุปกรณ์ภายในเครื่อง
--Name[tr]=Donanım
--Name[tt]=Cıhazlar
--Name[uk]=Обладнання
--Name[uz]=Asbob-uskunalar
--Name[uz@cyrillic]=Асбоб-ускуналар
--Name[vi]=Phần cứng
--Name[wa]=Éndjolreye
--Name[zh_CN]=硬件
--Name[zh_TW]=硬體
--Icon=input_devices_settings
-diff -Nuar trinity-tdebase-3.5.13.2/applnk.ORI/kde-settings-looknfeel.directory trinity-tdebase-3.5.13.2/applnk/kde-settings-looknfeel.directory
---- trinity-tdebase-3.5.13.2/applnk.ORI/kde-settings-looknfeel.directory	2013-07-28 15:44:30.821668706 +0200
-+++ trinity-tdebase-3.5.13.2/applnk/kde-settings-looknfeel.directory	1970-01-01 01:00:00.000000000 +0100
-@@ -1,86 +0,0 @@
--[Desktop Entry]
--Encoding=UTF-8
--Type=Directory
--Name=Appearance & Themes
--Name[af]=Voorkoms & Temas
--Name[ar]=المظهر و السمات
--Name[az]=Görünüş & Örtüklər
--Name[be]=Вонкавы выгляд і тэмы
--Name[bg]=Външен вид
--Name[bn]=চেহারা এবং থীম
--Name[br]=Neuziadur ha gizioù
--Name[bs]=Izgled i teme
--Name[ca]=Aparença i temes
--Name[cs]=Vzhled a motivy
--Name[csb]=Wëzdrzatk ë témë
--Name[cy]=Golwg a Themau
--Name[da]=Udseende & Temaer
--Name[de]=Erscheinungsbild
--Name[el]=Εμφάνιση & Θέματα
--Name[eo]=Aspekto & Etosoj
--Name[es]=Aspecto y temas
--Name[et]=Välimus ja teemad
--Name[eu]=Itxura eta gaiak
--Name[fa]=ظاهر و چهره‌ها
--Name[fi]=Ulkonäkö ja teemat
--Name[fr]=Apparence et thèmes
--Name[fy]=Uterlik en tema's
--Name[ga]=Cuma agus Téamaí
--Name[gl]=Apariencia e Temas
--Name[he]=מראה וערכות נושא
--Name[hi]=शक्ल-सूरत एवं प्रसंग
--Name[hr]=Izgled i teme
--Name[hsb]=Napohlad & Temy
--Name[hu]=Megjelenés, témák
--Name[id]=Penampilan dan Tema
--Name[is]=Viðmót og útlit
--Name[it]=Aspetto e Temi
--Name[ja]=外観 & テーマ
--Name[ka]=გარეგნობა და თემები
--Name[kk]=Көрініс пен нақыштар
--Name[km]=រូបរាង & ស្បែក
--Name[ko]=모양과 테마
--Name[lo]=ຝັຣງເສດສ໌
--Name[lt]=Išvaizda ir temos
--Name[lv]=Izskats un Tēmas
--Name[mk]=Изглед и теми
--Name[mn]=Харагдалт & хэлбэр
--Name[ms]=Tema dan Penampilan
--Name[mt]=Apparenza u Temi
--Name[nb]=Utseende og temaer
--Name[nds]=Utsehn & Muster
--Name[ne]=दृश्य र विषयवस्तु
--Name[nl]=Uiterlijk en thema's
--Name[nn]=Utsjånad og tema
--Name[nso]=Ponagalo & Melaetsa
--Name[pa]=ਦਿੱਖ ਅਤੇ ਸਰੂਪ
--Name[pl]=Wygląd i motywy
--Name[pt]=Aparência e Temas
--Name[pt_BR]=Aparência & Temas
--Name[ro]=Aspect și tematici
--Name[ru]=Внешний вид и темы
--Name[rw]=Imigaragarire & Insanganyamatsiko 
--Name[se]=Fárda ja fáttát
--Name[sk]=Vzhľad a témy
--Name[sl]=Videz in teme
--Name[sr]=Изглед и теме
--Name[sr@Latn]=Izgled i teme
--Name[ss]=Kubukeka & kwendzikimba
--Name[sv]=Utseende och teman
--Name[ta]=தோற்றம் & உருக்கரு
--Name[te]=రూపం ఇంకా వైవిద్యాంశాలు
--Name[tg]=Намуди зоҳирӣ ва услуб
--Name[th]=รูปแบบและชุดตกแต่ง
--Name[tr]=Görünüm ve Temalar
--Name[tt]=Küreneş & Tışlaw
--Name[uk]=Вигляд та теми
--Name[uz]=Tashqi koʻrinishi va mavzular
--Name[uz@cyrillic]=Ташқи кўриниши ва мавзулар
--Name[ven]=Mbonalelo & Dzithero
--Name[vi]=Diện mạo & Sắc thái
--Name[wa]=Rivnance & Tinmes
--Name[xh]=Ubonakalo Nemixholo
--Name[zh_CN]=外观和主题
--Name[zh_TW]=外觀與主題
--Name[zu]=Ukubukeka & Izingqikithi
--Icon=looknfeel
-diff -Nuar trinity-tdebase-3.5.13.2/applnk.ORI/kde-settings.menu trinity-tdebase-3.5.13.2/applnk/kde-settings.menu
---- trinity-tdebase-3.5.13.2/applnk.ORI/kde-settings.menu	2013-07-28 15:44:30.821668706 +0200
-+++ trinity-tdebase-3.5.13.2/applnk/kde-settings.menu	1970-01-01 01:00:00.000000000 +0100
-@@ -1,91 +0,0 @@
-- <!DOCTYPE Menu PUBLIC "-//freedesktop//DTD Menu 1.0//EN"
--  "http://www.freedesktop.org/standards/menu-spec/1.0/menu.dtd">
--
--<Menu>
--	<Name>Settings</Name>
--	<Menu>
--		<Name>Accessibility</Name>
--		<Directory>kde-settings-accessibility.directory</Directory>
--		<Include>
--			<Category>X-KDE-settings-accessibility</Category>
--		</Include>
--	</Menu>
--	<Menu>
--		<Name>Components</Name>
--		<Directory>kde-settings-components.directory</Directory>
--		<Include>
--			<Category>X-KDE-settings-components</Category>
--		</Include>
--	</Menu>
--	<Menu>
--		<Name>Desktop</Name>
--		<Directory>kde-settings-desktop.directory</Directory>
--		<Include>
--			<Category>X-KDE-settings-desktop</Category>
--		</Include>
--	</Menu>
--	<Menu>
--		<Name>LookNFeel</Name>
--		<Directory>kde-settings-looknfeel.directory</Directory>
--		<Include>
--			<Category>X-KDE-settings-looknfeel</Category>
--		</Include>
--	</Menu>
--	<Menu>
--		<Name>Network</Name>
--		<Directory>kde-settings-network.directory</Directory>
--		<Include>
--			<Category>X-KDE-settings-network</Category>
--		</Include>
--		<Menu>
--			<Name>WebBrowsing</Name>
--			<Directory>kde-settings-webbrowsing.directory</Directory>
--			<Include>
--				<Category>X-KDE-settings-webbrowsing</Category>
--			</Include>
--		</Menu>
--	</Menu>
--	<Menu>
--		<Name>Peripherals</Name>
--		<Directory>kde-settings-peripherals.directory</Directory>
--		<Include>
--			<Category>X-KDE-settings-peripherals</Category>
--			<Category>X-KDE-settings-hardware</Category>
--		</Include>
--		<Menu>
--			<Name>Information</Name>
--			<Directory>kde-settings-information.directory</Directory>
--			<Include>
--				<Category>X-KDE-settings-information</Category>
--			</Include>
--		</Menu>
--	</Menu>
--	<Menu>
--		<Name>PowerControl</Name>
--		<Directory>kde-settings-power.directory</Directory>
--		<Include>
--			<Category>X-KDE-settings-power</Category>
--		</Include>
--	</Menu>
--	<Menu>
--		<Name>Security</Name>
--		<Directory>kde-settings-security.directory</Directory>
--		<Include>
--			<Category>X-KDE-settings-security</Category>
--		</Include>
--	</Menu>
--	<Menu>
--		<Name>Sound</Name>
--		<Directory>kde-settings-sound.directory</Directory>
--		<Include>
--			<Category>X-KDE-settings-sound</Category>
--		</Include>
--	</Menu>
--	<Menu>
--		<Name>System</Name>
--		<Directory>kde-settings-system.directory</Directory>
--		<Include>
--			<Category>X-KDE-settings-system</Category>
--		</Include>
--	</Menu>
--</Menu>
-diff -Nuar trinity-tdebase-3.5.13.2/applnk.ORI/kde-settingsmenu.directory trinity-tdebase-3.5.13.2/applnk/kde-settingsmenu.directory
---- trinity-tdebase-3.5.13.2/applnk.ORI/kde-settingsmenu.directory	2013-07-28 15:44:30.821668706 +0200
-+++ trinity-tdebase-3.5.13.2/applnk/kde-settingsmenu.directory	1970-01-01 01:00:00.000000000 +0100
-@@ -1,78 +0,0 @@
--[Desktop Entry]
--Encoding=UTF-8
--Type=Directory
--Name=Settings
--Name[af]=Instellings
--Name[ar]=التعيينات
--Name[az]=Qurğular
--Name[be]=Настаўленні
--Name[bg]=Настройки
--Name[bn]=সেটিংস
--Name[br]=Dibarzhoù
--Name[bs]=Postavke
--Name[ca]=Preferències
--Name[cs]=Nastavení
--Name[csb]=Ùstôw
--Name[cy]=Gosodiadau
--Name[da]=Opsætning
--Name[de]=Einstellungen
--Name[el]=Ρυθμίσεις
--Name[eo]=Agordo
--Name[es]=Preferencias
--Name[et]=Seadistused
--Name[eu]=Ezarpenak
--Name[fa]=تنظیمات
--Name[fi]=Asetukset
--Name[fr]=Configuration
--Name[fy]=Ynstellings
--Name[ga]=Socruithe
--Name[gl]=Opcións
--Name[he]=הגדרות
--Name[hi]=विन्यास
--Name[hr]=Postavke
--Name[hsb]=Nastajenja
--Name[hu]=Beállítások
--Name[is]=Stillingar
--Name[it]=Impostazioni
--Name[ja]=設定
--Name[ka]=პარამეტრები
--Name[kk]=Параметрлері
--Name[km]=ការ​កំណត់
--Name[ko]=설정
--Name[lt]=Parinktys
--Name[lv]=Parametri
--Name[mk]=Поставувања
--Name[mn]=Тохируулга
--Name[ms]=Tempatan
--Name[nb]=Innstillinger
--Name[nds]=Instellen
--Name[ne]=सेटिङ
--Name[nl]=Instellingen
--Name[nn]=Innstillingar
--Name[pa]=ਸੈਟਿੰਗ
--Name[pl]=Ustawienia
--Name[pt]=Configuração
--Name[pt_BR]=Configurações
--Name[ro]=Setări
--Name[ru]=Настройка
--Name[rw]=Amagenamiterere
--Name[se]=Heivehusat
--Name[sk]=Nastavenia
--Name[sl]=Nastavitve
--Name[sr]=Поставке
--Name[sr@Latn]=Postavke
--Name[sv]=Inställningar
--Name[ta]=அமைப்புகள்
--Name[te]=అమరికలు
--Name[tg]=Танзимот
--Name[th]=ตั้งค่าต่างๆ
--Name[tr]=Ayarlar
--Name[tt]=Caylaw
--Name[uk]=Параметри
--Name[uz]=Moslamalar
--Name[uz@cyrillic]=Мосламалар
--Name[vi]=Thiết lập
--Name[wa]=Apontiaedjes
--Name[zh_CN]=设置
--Name[zh_TW]=設定
--Icon=package_settings
-diff -Nuar trinity-tdebase-3.5.13.2/applnk.ORI/kde-settings-network.directory trinity-tdebase-3.5.13.2/applnk/kde-settings-network.directory
---- trinity-tdebase-3.5.13.2/applnk.ORI/kde-settings-network.directory	2013-07-28 15:44:30.821668706 +0200
-+++ trinity-tdebase-3.5.13.2/applnk/kde-settings-network.directory	1970-01-01 01:00:00.000000000 +0100
-@@ -1,86 +0,0 @@
--[Desktop Entry]
--Encoding=UTF-8
--Type=Directory
--Name=Internet & Network
--Name[af]=Internet & Netwerk
--Name[ar]=الإنترنت و الشبكة
--Name[az]=İnternet & Şəbəkə
--Name[be]=Інтэрнэт і сетка
--Name[bg]=Интернет и мрежа
--Name[bn]=ইন্টারনেট এবং নেটওয়ার্ক
--Name[br]=Kenrouedad ha Rouedad
--Name[bs]=Internet i mreža
--Name[ca]=Internet i xarxa
--Name[cs]=Internet a síť
--Name[csb]=Internet ë séc
--Name[cy]=Rhyngrwyd & Rhwydwaith
--Name[da]=Internet & Netværk
--Name[de]=Internet & Netzwerk
--Name[el]=Διαδίκτυο & Δίκτυο
--Name[eo]=Reto & Interreto
--Name[es]=Internet y Red
--Name[et]=Internet ja võrk
--Name[eu]=Internet eta sarea
--Name[fa]=اینترنت و شبکه
--Name[fi]=Internet ja verkko
--Name[fr]=Internet et réseau
--Name[fy]=Ynternet en netwurk
--Name[ga]=Idirlíon agus Líonra
--Name[gl]=Internet e Rede
--Name[he]=אינטרנט ורשתות
--Name[hi]=इंटरनेट तथा नेटवर्क
--Name[hr]=Internet i mreža
--Name[hsb]=Internet & Syć
--Name[hu]=Hálózat, internet
--Name[id]=Internet dan Jaringan
--Name[is]=Staðarnet og Internetið
--Name[it]=Internet e Rete
--Name[ja]=インターネット & ネットワーク
--Name[ka]=ქსელი და ინტერნეტი
--Name[kk]=Интернет және желі
--Name[km]=អ៊ិនធឺណិត & បណ្ដាញ
--Name[ko]=인터넷과 네트워크
--Name[lo]=ອີນເຕີເນັດ
--Name[lt]=Internetas ir tinklas
--Name[lv]=Internets un Tīkli
--Name[mk]=Интернет и мрежи
--Name[mn]=Интернэт & Сүлжээ
--Name[ms]=Internet & Jaringan
--Name[mt]=Internet u Network
--Name[nb]=Internett og nettverk
--Name[nds]=Internet & Nettwark
--Name[ne]=इन्टरनेट र सञ्जाल
--Name[nl]=Internet en netwerk
--Name[nn]=Internett og nettverk
--Name[nso]=Internet & Kgokagano
--Name[pa]=ਇੰਟਰਨੈੱਟ ਅਤੇ ਨੈੱਟਵਰਕ
--Name[pl]=Internet i sieć
--Name[pt]=Internet e Rede
--Name[pt_BR]=Internet & Rede
--Name[ro]=Internet și rețea
--Name[ru]=Сеть и Интернет
--Name[rw]=Interineti & Urusobemiyoboro
--Name[se]=Interneahtta ja fierpmádat
--Name[sk]=Internet a sieť
--Name[sl]=Internet in omrežje
--Name[sr]=Интернет и мрежа
--Name[sr@Latn]=Internet i mreža
--Name[ss]=Internet & luchungechunge
--Name[sv]=Internet och nätverk
--Name[ta]=இணையம் & வலையமைப்பு
--Name[te]=ఇంటర్నెట్ & నెట్వర్క్
--Name[tg]=Интернет ва шабақа
--Name[th]=อินเทอร์เน็ตและเครือข่าย
--Name[tr]=İnternet ve Ağ Ayarları
--Name[tt]=Päräwez & Çeltär
--Name[uk]=Інтернет та мережа
--Name[uz]=Internet va tarmoq
--Name[uz@cyrillic]=Интернет ва тармоқ
--Name[ven]=Inthanete & Vhukwamani
--Name[vi]=Internet & Mạng
--Name[wa]=Rantoele & Daegntoele
--Name[xh]=Internet & Nomsebenzi womnatha
--Name[zh_CN]=Internet 和网络
--Name[zh_TW]=網路
--Name[zu]=Internet & Uxhumano olusakazekile
--Icon=network
-diff -Nuar trinity-tdebase-3.5.13.2/applnk.ORI/kde-settings-peripherals.directory trinity-tdebase-3.5.13.2/applnk/kde-settings-peripherals.directory
---- trinity-tdebase-3.5.13.2/applnk.ORI/kde-settings-peripherals.directory	2013-07-28 15:44:30.821668706 +0200
-+++ trinity-tdebase-3.5.13.2/applnk/kde-settings-peripherals.directory	1970-01-01 01:00:00.000000000 +0100
-@@ -1,87 +0,0 @@
--[Desktop Entry]
--Encoding=UTF-8
--Type=Directory
--Name=Peripherals
--Name[af]=Randapperatuur
--Name[ar]=الأجهزة المحيطية
--Name[az]=Avadanlıq
--Name[be]=Перыферыя
--Name[bg]=Периферия
--Name[bn]=পেরিফেরাল
--Name[br]=Trobarzhelloù
--Name[bs]=Vanjski uređaji
--Name[ca]=Perifèrics
--Name[cs]=Periférie
--Name[csb]=Periferëjné ùrzãdzenia
--Name[cy]=Perifferolion
--Name[da]=Tilkoblinger
--Name[de]=Angeschlossene Geräte
--Name[el]=Περιφερειακά
--Name[eo]=Periferaĵoj
--Name[es]=Periféricos
--Name[et]=Välisseadmed
--Name[eu]=Periferikoak
--Name[fa]=وسایل جانبی
--Name[fi]=Laitteet
--Name[fo]=Úteindir
--Name[fr]=Périphériques
--Name[fy]=Râneapparaten
--Name[ga]=Forimeallaigh
--Name[gl]=Periféricos
--Name[he]=ציוד היקפי
--Name[hi]=सहायक पुरजे
--Name[hr]=Periferni uređaji
--Name[hsb]=Periferija
--Name[hu]=Perifériák
--Name[is]=Jaðartæki
--Name[it]=Periferiche
--Name[ja]=周辺機器
--Name[ka]=პერიფერიული
--Name[kk]=Периферия
--Name[km]=គ្រឿង​កុំព្យូទ័រ
--Name[ko]=주변 장치
--Name[lo]=ອຸປະກອນຕໍ່ພວງ
--Name[lt]=Periferija
--Name[lv]=Perifērija
--Name[mk]=Периферни уреди
--Name[mn]=Залгаатай төхөөрөмжүүд
--Name[ms]=Perkakasan
--Name[mt]=Apparat
--Name[nb]=Tilleggsenheter
--Name[nds]=Reedschappen
--Name[ne]=परिवृत्तीय
--Name[nl]=Randapparaten
--Name[nn]=Tilleggseiningar
--Name[nso]=Ditswelantle
--Name[oc]=Periferics
--Name[pa]=ਸਹਾਇਕ ਜੰਤਰ
--Name[pl]=Urządzenia peryferyjne
--Name[pt]=Periféricos
--Name[pt_BR]=Periféricos
--Name[ro]=Periferice
--Name[ru]=Периферия
--Name[rw]=Ibyinyuma
--Name[se]=Ovttadagat
--Name[sk]=Periférie
--Name[sl]=Strojni dodatki
--Name[sr]=Периферије
--Name[sr@Latn]=Periferije
--Name[ss]=Ema-peripherals
--Name[sv]=Kringutrustning
--Name[ta]=கருவிகள்
--Name[te]=పరికరాలు
--Name[tg]=Дастгоҳҳои лозимӣ
--Name[th]=อุปกรณ์ต่อพ่วง
--Name[tr]=Çevre Birimleri
--Name[tt]=Cıhazlar
--Name[uk]=Периферійні пристрої
--Name[uz]=Ulangan uskunalar
--Name[uz@cyrillic]=Уланган ускуналар
--Name[ven]=Dzipheriferala
--Name[vi]=Thiết bị ngoại vi
--Name[wa]=Periferikes
--Name[xh]=Iilayini zomda
--Name[zh_CN]=外设
--Name[zh_TW]=週邊設備
--Name[zu]=Imixhantela
--Icon=input_devices_settings
-diff -Nuar trinity-tdebase-3.5.13.2/applnk.ORI/kde-settings-power.directory trinity-tdebase-3.5.13.2/applnk/kde-settings-power.directory
---- trinity-tdebase-3.5.13.2/applnk.ORI/kde-settings-power.directory	2013-07-28 15:44:30.821668706 +0200
-+++ trinity-tdebase-3.5.13.2/applnk/kde-settings-power.directory	1970-01-01 01:00:00.000000000 +0100
-@@ -1,88 +0,0 @@
--[Desktop Entry]
--Encoding=UTF-8
--Type=Directory
--Name=Power Control
--Name[af]=Krag Beheer
--Name[ar]=التحكّم بالطّاقة
--Name[az]=Güc İdarəsi
--Name[be]=Кіраванне сілкаваннем
--Name[bg]=Електрозахранване
--Name[bn]=পাওয়ার নিয়ন্ত্রণ
--Name[br]=Renadur ar gremm
--Name[bs]=Ušteda energije
--Name[ca]=Control d'energia
--Name[cs]=Správa napájení
--Name[csb]=Kòntrola sëłë
--Name[cy]=Rheoli Pŵer
--Name[da]=Strømstyring
--Name[de]=Energiekontrolle
--Name[el]=Έλεγχος ισχύος
--Name[eo]=Elektrostirilo
--Name[es]=Control de energía
--Name[et]=Voolutarve
--Name[eu]=Energia kontrola
--Name[fa]=کنترل توان
--Name[fi]=Virranhallinta
--Name[fo]=Orkustýring
--Name[fr]=Contrôle de l'énergie
--Name[fy]=Enerzjybehear
--Name[ga]=Rialú Cumhachta
--Name[gl]=Control da Enerxéa
--Name[he]=צריכת חשמל
--Name[hi]=बिज़ली नियंत्रण
--Name[hr]=Ušteda energije
--Name[hsb]=Milina
--Name[hu]=Energiakezelés
--Name[id]=Kontrol Power
--Name[is]=Orkustilling
--Name[it]=Controllo energia
--Name[ja]=電源管理
--Name[ka]=კვების კონტროლი
--Name[kk]=Қуаттандыруды бақылау
--Name[km]=ការ​ត្រួត​ពិនិត្យ​ថាមពល
--Name[ko]=전원 관리
--Name[lo]=ຄວບຄຸມການໃຊ້ພະລັງງານ
--Name[lt]=Energijos kontrolė
--Name[lv]=Energo Kontrole
--Name[mk]=Контрола на енергија
--Name[mn]=Энергийн удирдлага
--Name[ms]=Kawalan Kuasa
--Name[mt]=Kontroll tal-konsum
--Name[nb]=Strømkontroll
--Name[nds]=Stroomkuntrull
--Name[ne]=शक्ति नियन्त्रण
--Name[nl]=Energiebeheer
--Name[nn]=Straumkontroll
--Name[nso]=Taolo ya Matla
--Name[oc]=Contròle d'alimentacion
--Name[pa]=ਊਰਜਾ ਕੰਟਰੋਲ
--Name[pl]=Zasilanie
--Name[pt]=Controlo de Energia
--Name[pt_BR]=Controle de Energia
--Name[ro]=Control energie
--Name[ru]=Управление питанием
--Name[rw]=Igenzura ry'Umuriro
--Name[se]=El-rávdnje stivren
--Name[sk]=Ovládanie spotreby
--Name[sl]=Nadzor energije
--Name[sr]=Контрола енергије
--Name[sr@Latn]=Kontrola energije
--Name[ss]=Kulawulwa kwemlilo
--Name[sv]=Strömsparfunktion
--Name[ta]=மின்னோட்ட கட்டுப்பாடு
--Name[te]=విద్యుత్ నియంత్రణ
--Name[tg]=Идораи қувваи барқ
--Name[th]=ควบคุมการใช้พลังงาน
--Name[tr]=Güç Denetimi
--Name[tt]=Qüät İdäräse
--Name[uk]=Керування живленням
--Name[uz]=Elektr taʼminotni boshqarish
--Name[uz@cyrillic]=Электр таъминотни бошқариш
--Name[ven]=Ndanguli ya maanda
--Name[vi]=Điều khiển Nguồn điện
--Name[wa]=Controle di l' alimintåcion
--Name[xh]=Ulawulo Lwamandla
--Name[zh_CN]=电源控制
--Name[zh_TW]=電源控制
--Name[zu]=Ukulawulwa kwamandla
--Icon=energy
-diff -Nuar trinity-tdebase-3.5.13.2/applnk.ORI/kde-settings-security.directory trinity-tdebase-3.5.13.2/applnk/kde-settings-security.directory
---- trinity-tdebase-3.5.13.2/applnk.ORI/kde-settings-security.directory	2013-07-28 15:44:30.821668706 +0200
-+++ trinity-tdebase-3.5.13.2/applnk/kde-settings-security.directory	1970-01-01 01:00:00.000000000 +0100
-@@ -1,86 +0,0 @@
--[Desktop Entry]
--Encoding=UTF-8
--Type=Directory
--Name=Security & Privacy
--Name[af]=Sekuriteit & Privaatheid
--Name[ar]=الأمن و السرية
--Name[az]=Təhlükəsizlik & Gizlilik
--Name[be]=Бяспека і прыватнасць
--Name[bg]=Поверителност
--Name[bn]=নিরাপত্তা এবং গোপনীয়তা
--Name[br]=Surentez ha buhez prevez
--Name[bs]=Sigurnost i privatnost
--Name[ca]=Seguretat i privacitat
--Name[cs]=Bezpečnost a soukromí
--Name[csb]=Bezpiek ë priwatnosc
--Name[cy]=Diogelwch & Preifatrwydd
--Name[da]=Sikkerhed & Private data
--Name[de]=Sicherheit & Privatsphäre
--Name[el]=Ασφάλεια & Προσωπικό απόρρητο
--Name[eo]=Sekureco & Privateco
--Name[es]=Seguridad y privacidad
--Name[et]=Turvalisus ja privaatsus
--Name[eu]=Segurtasuna eta pribatutasuna
--Name[fa]=امنیت و محرمانگی
--Name[fi]=Turvallisuus ja yksityisyys
--Name[fr]=Sécurité et confidentialité
--Name[fy]=Privacy en befeiliging
--Name[ga]=Slándáil agus Príobháideachas
--Name[gl]=Seguridade e Privacidade
--Name[he]=אבטחה ופרטיות
--Name[hi]=सुरक्षा तथा गोपनीयता
--Name[hr]=Sigurnost i privatnost
--Name[hsb]=Wěstosć & Anonymnosć
--Name[hu]=Adatvédelem
--Name[id]=Keamanan & Privasi
--Name[is]=Öryggi og einkamál
--Name[it]=Sicurezza e Privacy
--Name[ja]=セキュリティ & プライバシー
--Name[ka]=დაცვა და კონფიდენციალურობა
--Name[kk]=Қауіпсіздік
--Name[km]=សុវត្ថិភាព & ភាព​ឯកជន
--Name[ko]=보안과 사생활
--Name[lo]=ຄວາມປອດໄພ & ຄວາມເປັນສ່ວນຕົວ
--Name[lt]=Saugumas ir privatumas
--Name[lv]=Drošība un Privātums
--Name[mk]=Безбедност и приватност
--Name[mn]=Хамгаалалт & Амгалан
--Name[ms]=Sekuriti dan Privasi
--Name[mt]=Sigurtà u Privatezza
--Name[nb]=Sikkerhet og personvern
--Name[nds]=Sekerheit & Privaatrebeet
--Name[ne]=सुरक्षा र गोपनीयता
--Name[nl]=Privacy en beveiliging
--Name[nn]=Tryggleik og privatliv
--Name[nso]=Tshireletso & Bosephiri
--Name[pa]=ਸੁਰੱਖਿਆ ਅਤੇ ਰਹੱਸ
--Name[pl]=Bezpieczeństwo i prywatność
--Name[pt]=Segurança e Privacidade
--Name[pt_BR]=Segurança & Privacidade
--Name[ro]=Securitate și confidențialitate
--Name[ru]=Безопасность и конфиденциальность
--Name[rw]=Umutekano & Umwihariko
--Name[se]=Sihkkarvuohta ja iežassuodjaleapmi
--Name[sk]=Zabezpečenie a súkromie
--Name[sl]=Varnost in zasebnost
--Name[sr]=Безбедност и приватност
--Name[sr@Latn]=Bezbednost i privatnost
--Name[ss]=Kuphepha & ngasese
--Name[sv]=Säkerhet och integritet
--Name[ta]=பாதுகாப்பு & தனித்துவம்
--Name[te]=భద్రత & ప్రైవసి
--Name[tg]=Амният ва махфинокӣ
--Name[th]=ความปลอดภัยและความเป็นส่วนตัว
--Name[tr]=Güvenlik ve Gizlilik
--Name[tt]=İminlek & Xosusílıq
--Name[uk]=Безпека та приватність
--Name[uz]=Xavfsizlik va shaxsiy maʼlumot
--Name[uz@cyrillic]=Хавфсизлик ва шахсий маълумот
--Name[ven]=Vhutsireledzi & Tshiphiri
--Name[vi]=Bảo mật & Sự riêng tư
--Name[wa]=Såvrité & Privaceye
--Name[xh]=Ukhuseleko & Nobunikazi
--Name[zh_CN]=安全和隐私
--Name[zh_TW]=安全性與私密性
--Name[zu]=Ukuvikeleka & Ingasese
--Icon=password
-diff -Nuar trinity-tdebase-3.5.13.2/applnk.ORI/kde-settings-sound.directory trinity-tdebase-3.5.13.2/applnk/kde-settings-sound.directory
---- trinity-tdebase-3.5.13.2/applnk.ORI/kde-settings-sound.directory	2013-07-28 15:44:30.821668706 +0200
-+++ trinity-tdebase-3.5.13.2/applnk/kde-settings-sound.directory	1970-01-01 01:00:00.000000000 +0100
-@@ -1,85 +0,0 @@
--[Desktop Entry]
--Encoding=UTF-8
--Type=Directory
--Name=Sound & Multimedia
--Name[af]=Klank & Multimedia
--Name[ar]=الصوت و الوسائط المتعددة
--Name[az]=Səs & Multimediya
--Name[be]=Гук і мультымедыя
--Name[bg]=Мултимедия
--Name[bn]=শব্দ ও মাল্টিমিডিয়া
--Name[br]=Son & Liesvedia
--Name[bs]=Zvuk i multimedija
--Name[ca]=So i multimèdia
--Name[cs]=Zvuk a multimédia
--Name[csb]=Zwãk ë mùltimedia
--Name[cy]=Sain & Amlgyfryngau
--Name[da]=Lyd & Multimedie
--Name[el]=Ήχος & Πολυμέσα
--Name[eo]=Sono & Plurmedio
--Name[es]=Sonidos y multimedia
--Name[et]=Heli ja multimeedia
--Name[eu]=Soinua eta multimedia
--Name[fa]=صوت و چند رسانه‌ای
--Name[fi]=Ääni ja multimedia
--Name[fr]=Son et multimédia
--Name[fy]=Lûd en multimedia
--Name[ga]=Fuaim agus Ilmheáin
--Name[gl]=Son e Multimedia
--Name[he]=צליל ומולטימדיה
--Name[hi]=ध्वनि व मल्टीमीडिया
--Name[hr]=Zvuk i multimedija
--Name[hsb]=Zwuk & Multimedia
--Name[hu]=Hang, multimédia
--Name[id]=Efek Suara & Multimedia
--Name[is]=Hljóð og margmiðlun
--Name[it]=Suono e Multimedia
--Name[ja]=サウンド & マルチメディア
--Name[ka]=ხმა და მეულტიმედია
--Name[kk]=Дыбыс пен мультимедиа
--Name[km]=សំឡេង & ពហុព័ត៌មាន
--Name[ko]=소리와 멀티미디어
--Name[lo]=ເມົາຕິມີເດຍ
--Name[lt]=Garsas ir daugialypė terpė
--Name[lv]=Skaņa un Multimēdija
--Name[mk]=Звук и мултимедија
--Name[mn]=Дуу & Мултимедиа
--Name[ms]=Bunyi & Multimedia
--Name[mt]=Ħsejjes u Multimedia
--Name[nb]=Lyd og multimedia
--Name[nds]=Kläng & Multimedia
--Name[ne]=ध्वनि र मल्टिमिडिया
--Name[nl]=Geluid en multimedia
--Name[nn]=Lyd og multimedia
--Name[nso]=Modumo & Media wa Bontshi
--Name[pa]=ਅਵਾਜ਼ ਅਤੇ ਮਲਟੀਮੀਡਿਆ
--Name[pl]=Dźwięk i multimedia
--Name[pt]=Som e Multimédia
--Name[pt_BR]=Som & Multimídia
--Name[ro]=Sunet și multimedia
--Name[ru]=Звук и мультимедиа
--Name[rw]=Ijwi & Mutwaramakuru
--Name[se]=Jietna ja multimedia
--Name[sk]=Zvuk a multimédiá
--Name[sl]=Zvok in večpredstavnost
--Name[sr]=Звук и мултимедија
--Name[sr@Latn]=Zvuk i multimedija
--Name[ss]=Umsindvo & tinhlobonhlobo-tetindzaba
--Name[sv]=Ljud och multimedia
--Name[ta]=ஒலி & பல்லூடகம்
--Name[te]=శబ్దం & మల్టీ మీడియా
--Name[tg]=Садо ва мултимедия
--Name[th]=เสียงและมัลติมีเดีย
--Name[tr]=Ses ve Çokluortam
--Name[tt]=Tawış & Multimedia
--Name[uk]=Звук та мультимедіа
--Name[uz]=Tovush va multimedia
--Name[uz@cyrillic]=Товуш ва мултимедиа
--Name[ven]=Mubvumo & Zwimwumwusi
--Name[vi]=Âm nhạc & Đa phương tiện
--Name[wa]=Son & Multimedia
--Name[xh]=Isandi & Multimedia
--Name[zh_CN]=声音和多媒体
--Name[zh_TW]=聲音與多媒體
--Name[zu]=Umsindo & Onozindaba abaningi
--Icon=multimedia
-diff -Nuar trinity-tdebase-3.5.13.2/applnk.ORI/kde-settings-system.directory trinity-tdebase-3.5.13.2/applnk/kde-settings-system.directory
---- trinity-tdebase-3.5.13.2/applnk.ORI/kde-settings-system.directory	2013-07-28 15:44:30.821668706 +0200
-+++ trinity-tdebase-3.5.13.2/applnk/kde-settings-system.directory	1970-01-01 01:00:00.000000000 +0100
-@@ -1,84 +0,0 @@
--[Desktop Entry]
--Encoding=UTF-8
--Type=Directory
--Name=System Administration
--Name[af]=Stelsel Administrasie
--Name[ar]=إدارة النّظام
--Name[az]=Sistem İdarəsi
--Name[be]=Сістэмнае адміністраванне
--Name[bg]=Администрация
--Name[bn]=সিস্টেম অ্যাডমিনস্ট্রেশন
--Name[br]=Melestradur ar Reizhiad
--Name[bs]=Administracija sistema
--Name[ca]=Administració del sistema
--Name[cs]=Správa systému
--Name[csb]=Sprôwianié systemã
--Name[cy]=Gweinyddiaith Cysawd
--Name[da]=Systemadministration
--Name[de]=Systemverwaltung
--Name[el]=Διαχείριση συστήματος
--Name[eo]=Sistemadministrado
--Name[es]=Administración del sistema
--Name[et]=Süsteemi administreerimine
--Name[eu]=Sistemaren kudeaketa
--Name[fa]=سرپرستی سیستم
--Name[fi]=Järjestelmänhallinta
--Name[fr]=Administration du système
--Name[fy]=Systeembehear
--Name[ga]=Riarachán Córais
--Name[gl]=Administración do Sistema
--Name[he]=מנהל המערכת
--Name[hi]=तंत्र प्रशासन
--Name[hr]=Administracija sustava
--Name[hsb]=Zarjadowanje systema
--Name[hu]=Rendszeradminisztráció
--Name[id]=Administrasi Sistem
--Name[is]=Kerfisstjórnun
--Name[it]=Amministrazione di sistema
--Name[ja]=システム管理
--Name[ka]=სისტემის ადმინისტრირება
--Name[kk]=Жүйе әкімшілігі
--Name[km]=ការ​គ្រប់គ្រង​ប្រព័ន្ធ
--Name[ko]=시스템 관리
--Name[lo]=SAM -ສຳລັບຜູ້ເບິ່ງແຍງລະບົບ
--Name[lt]=Sistemos administravimas
--Name[lv]=Sistēmas Administrācija
--Name[mk]=Системска администрација
--Name[mn]=Систем-Зохион байгуулалт
--Name[ms]= Pengurusan Sistem
--Name[mt]=Amministrazzjoni tas-Sistema
--Name[nb]=Systemadministrasjon
--Name[nds]=Systeempleeg
--Name[ne]=प्रणाली प्रशासक
--Name[nl]=Systeembeheer
--Name[nn]=Systemadministrasjon
--Name[pa]=ਸਿਸਟਮ ਪਰਸ਼ਾਸ਼ਨ
--Name[pl]=Administracja systemu
--Name[pt]=Administração do Sistema
--Name[pt_BR]=Administração do Sistema
--Name[ro]=Administrare sistem
--Name[ru]=Системное администрирование
--Name[rw]=Ubuyobozi bwa Sisitemu
--Name[se]=Vuogádathálddašeapmi
--Name[sk]=Správa systému
--Name[sl]=Sistemsko upravljanje
--Name[sr]=Администрација система
--Name[sr@Latn]=Administracija sistema
--Name[sv]=Systemadministration
--Name[ta]=கணினி-நிர்வாகம்
--Name[te]=వ్యవస్థ నిర్వహణ
--Name[tg]=Идоракунии система
--Name[th]=การดูแลระบบ
--Name[tr]=Sistem Yönetimi
--Name[tt]=Sanaq İdäräse
--Name[uk]=Адміністрування системи
--Name[uz]=Tizimni boshqarish
--Name[uz@cyrillic]=Тизимни бошқариш
--Name[ven]=Kulangulele kwa Maitele
--Name[vi]=Quản lý Hệ thống
--Name[wa]=Manaedjmint do sistinme
--Name[xh]=Umphathi Wendlela yokusebenza
--Name[zh_CN]=系统管理
--Name[zh_TW]=系統管理
--Name[zu]=Ukugcinwa kwe-sistimu
--Icon=kcmsystem
-diff -Nuar trinity-tdebase-3.5.13.2/applnk.ORI/kde-settings-webbrowsing.directory trinity-tdebase-3.5.13.2/applnk/kde-settings-webbrowsing.directory
---- trinity-tdebase-3.5.13.2/applnk.ORI/kde-settings-webbrowsing.directory	2013-07-28 15:44:30.821668706 +0200
-+++ trinity-tdebase-3.5.13.2/applnk/kde-settings-webbrowsing.directory	1970-01-01 01:00:00.000000000 +0100
-@@ -1,85 +0,0 @@
--[Desktop Entry]
--Encoding=UTF-8
--Type=Directory
--Name=Web Browser
--Name[af]=Web Blaaier
--Name[ar]=متصفح الشبكة
--Name[az]=Veb Səyyahı
--Name[be]=Вандроўнік па Сеціве
--Name[bg]=Уеб браузър
--Name[bn]=ওয়েব ব্রাউজার
--Name[br]=Furcher an Internet
--Name[bs]=Web preglednik
--Name[ca]=Navegació Web
--Name[cs]=Prohlížeč Webu
--Name[csb]=Przezérnik WWW
--Name[cy]=Porydd Gwê
--Name[da]=Browser
--Name[de]=Webbrowser
--Name[el]=Περιηγητής ιστού
--Name[eo]=TTT-legilo
--Name[es]=Navegador Web
--Name[et]=Veebilehitseja
--Name[eu]=Web arakatzailea
--Name[fa]=مرورگر وب‌‌
--Name[fi]=WWW-selain
--Name[fo]=Vevlesari
--Name[fr]=Navigateur web
--Name[fy]=Webblêder
--Name[ga]=Brabhsálaí Lín
--Name[gl]=Navegador Web
--Name[he]=דפדפן
--Name[hi]=वेब ब्राउज़र
--Name[hr]=Web preglednik
--Name[hsb]=Web-browser
--Name[hu]=Webböngésző
--Name[id]=Peselancar Web
--Name[is]=Vafri
--Name[it]=Navigazione Web
--Name[ja]=ウェブブラウザ
--Name[ka]=ვებ ბრაუზერი
--Name[kk]=Веб шолғыш
--Name[km]=កម្មវិធី​រុករក​បណ្ដាញ
--Name[ko]=웹 브라우저
--Name[lo]=ຮງກເບິ່ງຖານເບິ່ງຂໍ້ມູນ
--Name[lt]=Žiniatinklio naršyklė
--Name[lv]=Tīmekļa Pārlūks
--Name[mk]=Веб-прелистувач
--Name[mn]=Вэб-Хөтөч
--Name[ms]=Pelayar Web
--Name[nb]=Nettleser
--Name[nds]=Nettkieker
--Name[ne]=वेब ब्राउजर
--Name[nl]=Webbrowser
--Name[nn]=Nettlesar
--Name[nso]=Seinyakisi sa Web
--Name[pa]=ਵੈਬ ਝਲਕਾਰਾ
--Name[pl]=Przeglądarka WWW
--Name[pt]=Navegação Web
--Name[pt_BR]=Navegador Web
--Name[ro]=Navigator de web
--Name[ru]=Браузер
--Name[rw]=Mucukumbuzi Rubuga
--Name[se]=Fierpmádatlogan
--Name[sk]=Webový prehliadač
--Name[sl]=Spletni brskalnik
--Name[sr]=Веб прегледач
--Name[sr@Latn]=Veb pregledač
--Name[ss]=Ibrawuza ye-Web 
--Name[sv]=Webbläsning
--Name[ta]=வலை உலாவி
--Name[te]=వెబ్ బ్రౌజర్
--Name[tg]=Намоишгари Веб
--Name[th]=เว็บเบราว์เซอร์
--Name[tr]=Web Tarayıcı
--Name[uk]=Навігатор Тенет
--Name[uz]=Veb-brauzer
--Name[uz@cyrillic]=Веб-браузер
--Name[ven]=Burausa ya Web
--Name[vi]=Trình duyệt Mạng
--Name[wa]=Betchteu waibe
--Name[xh]=Umkhangeli zincwadi we Web
--Name[zh_CN]=Web 浏览器
--Name[zh_TW]=網頁瀏覽器
--Name[zu]=Umcingi we-Web
--Icon=konqueror
-diff -Nuar trinity-tdebase-3.5.13.2/applnk.ORI/kde-system.directory trinity-tdebase-3.5.13.2/applnk/kde-system.directory
---- trinity-tdebase-3.5.13.2/applnk.ORI/kde-system.directory	2013-07-28 15:44:30.821668706 +0200
-+++ trinity-tdebase-3.5.13.2/applnk/kde-system.directory	1970-01-01 01:00:00.000000000 +0100
-@@ -1,81 +0,0 @@
--[Desktop Entry]
--Encoding=UTF-8
--Type=Directory
--Name=System
--Name[af]=Stelsel
--Name[ar]=النظام
--Name[az]=Sistem
--Name[be]=Сістэма
--Name[bg]=Система
--Name[bn]=সিস্টেম
--Name[br]=Reizhiad
--Name[bs]=Sistem
--Name[ca]=Sistema
--Name[cs]=Systém
--Name[csb]=Systema
--Name[cy]=Cysawd
--Name[el]=Σύστημα
--Name[eo]=Sistemo
--Name[es]=Sistema
--Name[et]=Süsteem
--Name[eu]=Sistema
--Name[fa]=سیستم
--Name[fi]=Järjestelmä
--Name[fo]=Kervi
--Name[fr]=Système
--Name[fy]=Systeem
--Name[ga]=Córas
--Name[gl]=Sistema
--Name[he]=מערכת
--Name[hi]=तंत्र
--Name[hr]=Sustav
--Name[hu]=Rendszer
--Name[id]=Sistem
--Name[is]=Kerfi
--Name[it]=Sistema
--Name[ja]=システム
--Name[ka]=სისტემა
--Name[kk]=Жүйелік
--Name[km]=ប្រព័ន្ធ
--Name[ko]=시스템
--Name[lo]=ຈັດການລະບົບ
--Name[lt]=Sistema
--Name[lv]=Sistēma
--Name[mk]=Систем
--Name[mn]=Систем
--Name[ms]=Sistem
--Name[mt]=Sistema
--Name[nds]=Systeem
--Name[ne]=प्रणाली
--Name[nl]=Systeem
--Name[oc]=Sistemo
--Name[pa]=ਸਿਸਟਮ
--Name[pt]=Sistema
--Name[pt_BR]=Sistema
--Name[ro]=Sistem
--Name[ru]=Система
--Name[rw]=Sisitemu
--Name[se]=Vuogádat
--Name[sk]=Systém
--Name[sl]=Sistem
--Name[sr]=Систем
--Name[sr@Latn]=Sistem
--Name[ss]=Umshini
--Name[ta]=அமைப்பு
--Name[te]=వ్యవస్థ
--Name[tg]=Система
--Name[th]=ระบบ
--Name[tr]=Sistem
--Name[tt]=Sistem
--Name[uk]=Система
--Name[uz]=Tizim
--Name[uz@cyrillic]=Тизим
--Name[ven]=Maitele
--Name[vi]=Hệ thống
--Name[wa]=Sistinme
--Name[xh]=Indlela esestyenziswayo
--Name[zh_CN]=系统
--Name[zh_TW]=系統
--Name[zu]=Isistimu
--Icon=package_system
--
-diff -Nuar trinity-tdebase-3.5.13.2/applnk.ORI/kde-system-screensavers.directory trinity-tdebase-3.5.13.2/applnk/kde-system-screensavers.directory
---- trinity-tdebase-3.5.13.2/applnk.ORI/kde-system-screensavers.directory	2013-07-28 15:44:30.821668706 +0200
-+++ trinity-tdebase-3.5.13.2/applnk/kde-system-screensavers.directory	1970-01-01 01:00:00.000000000 +0100
-@@ -1,171 +0,0 @@
--[Desktop Entry]
--Encoding=UTF-8
--Type=Directory
--Name=Screen Savers
--Name[af]=Skerm Bewaarders
--Name[ar]=مدخري الشاشة
--Name[az]=Ekran Qoruyucuları
--Name[be]=Зберагальнікі экрана
--Name[bg]=Предпазители на екрана
--Name[bn]=স্ক্রীন সেভার
--Name[br]=Damanterien Skramm
--Name[bs]=Zaštita ekrana (screensaver)
--Name[ca]=Salvapantalles
--Name[cs]=Šetřiče obrazovky
--Name[csb]=Wëgaszôcz ekranu
--Name[cy]=Arbedyddion Sgrîn
--Name[da]=Pauseskærme
--Name[de]=Bildschirmschoner
--Name[el]=Προφύλαξη οθόνης
--Name[eo]=Ekrankurtenoj
--Name[es]=Salvapantallas
--Name[et]=Ekraanisäästjad
--Name[eu]=Pantaila babesleak
--Name[fa]=محافظهای صفحه نمایش
--Name[fi]=Näytönsäästäjät
--Name[fo]=Skíggjaspararir
--Name[fr]=Écrans de veille
--Name[fy]=Skermbefeiliging
--Name[ga]=Spárálaithe Scáileáin
--Name[gl]=Protectores de Pantalla
--Name[he]=שומרי מסך
--Name[hi]=स्क्रीन सेवर
--Name[hr]=Zaštita zaslona
--Name[hsb]=Škitaki za wobrazowku
--Name[hu]=Képernyővédő
--Name[is]=Skjásvæfur
--Name[it]=Salvaschermi
--Name[ja]=スクリーンセーバー
--Name[kk]=Экран сақтаушылары
--Name[km]=ធាតុ​សង្គ្រោះ​អេក្រង់
--Name[ko]=화면 보호기
--Name[lo]=ໂປຣແກຣມຮັກສາຫນ້າຈໍ
--Name[lt]=Ekrano Užsklandos
--Name[lv]=Ekrāna saudzetāji
--Name[mk]=Екрански чувари
--Name[mn]=Дэлгэц гамнагч
--Name[ms]=Penghias Skrin
--Name[nb]=Pauseskjerme
--Name[nds]=Pausschirm
--Name[ne]=स्क्रिनसेभर
--Name[nl]=Schermbeveiliging
--Name[nn]=Pauseskjermar
--Name[nso]=Diboloki tsa Pontsho
--Name[oc]=Salvador d'ecrans
--Name[pa]=ਸਕਰੀਨ-ਸੇਵਰ
--Name[pl]=Wygaszacze ekranu
--Name[pt]=Protectores de Ecrã
--Name[pt_BR]=Protetores de tela
--Name[ro]=Protecții de ecran
--Name[ru]=Хранители экрана
--Name[rw]=Mugaragaza Ukubamaso
--Name[se]=Šearbmasiestejeaddjit
--Name[sk]=Šetriče obrazovky
--Name[sl]=Ohranjevalniki zaslona
--Name[sr]=Чувари екрана
--Name[sr@Latn]=Čuvari ekrana
--Name[ss]=Sigcini-skrini
--Name[sv]=Skärmsläckare
--Name[ta]=திரை காப்பாளர்கள்
--Name[te]= స్క్రీన్ సేవర్లు
--Name[tg]=Пардаи экран
--Name[th]=โปรแกรมรักษาหน้าจอ
--Name[tr]=Ekran Koruyucular
--Name[tt]=Küräk Saqlağıçı
--Name[uk]=Зберігачі екрана
--Name[uz]=Ekran saqlovchilari
--Name[uz@cyrillic]=Экран сақловчилари
--Name[ven]=Tshivhulungi tsha Tshikirini
--Name[vi]=Trình bảo vệ màn hình
--Name[wa]=Sipårgneus di waitroûle
--Name[xh]=Abagcini Bekhusi
--Name[zh_CN]=屏幕保护程序
--Name[zh_TW]=螢幕保護程式
--Name[zu]=Abagcini Besikrini
--Icon=kscreensaver
--X-KDE-BaseGroup=screensavers
--
--Comment=Screen saver demos
--Comment[af]=Skerm bewaarder demonstrasies
--Comment[ar]=عروض توضيحية لمدخر الشاشة
--Comment[az]=Ekran Qoruyucu Demoları
--Comment[be]=Дэманстрацыі зберагальніка экрана
--Comment[bg]=Демо на предпазителите на екрана
--Comment[bn]=স্ক্রীন সেভার ডেমো
--Comment[br]=Diskouezadur damanterien skramm
--Comment[bs]=Demonstracije zaštite ekrana
--Comment[ca]=Demos de salvapantalles
--Comment[cs]=Ukázky šetřičů obrazovky
--Comment[csb]=Pòdzérk wëgaszôcza ekranu
--Comment[cy]=Arddangosfeydd arbedyddion sgrîn
--Comment[da]=Pauseskærm-demoer
--Comment[de]=Demos zu Bildschirmschonern
--Comment[el]=Επίδειξη προφύλαξης οθόνης
--Comment[eo]=Demonstro de la ekrankurtenoj
--Comment[es]=Demostraciones del salvapantallas
--Comment[et]=Ekraanisäästjate demod
--Comment[eu]=Pantaila babesle demoak
--Comment[fa]=نمایشهای صفحه کلید
--Comment[fi]=Näytönsäästäjien mallit
--Comment[fo]=Skíggjaspararadømi
--Comment[fr]=Démonstrations d'écrans de veille
--Comment[fy]=Skermbefeiligingdemo's
--Comment[ga]=Taispeántais na spárálaithe scáileáin
--Comment[gl]=Demostracións dos protectores de pantalla
--Comment[he]=הדגמות של שומרי מסך
--Comment[hi]=स्क्रीन सेवर डेमोस
--Comment[hr]=Demonstracije zaštite zaslona
--Comment[hsb]=demonstrowanje škitakow za wobrazowku
--Comment[hu]=Képernyővédő-demók
--Comment[id]=Demo screen saver
--Comment[is]=Skjásvæfukynningar
--Comment[it]=Anteprime dei salvaschermi
--Comment[ja]=スクリーンセーバーのデモ
--Comment[kk]=Экран сақтаушыны таңдау
--Comment[km]=បង្ហាញ​ធាតុ​សង្គ្រោះ​អេក្រង់​សាក​មើល
--Comment[ko]=화면 보호기 데모
--Comment[lo]=ຕົວຢ່າງໂປຣແກຣມຮັກສາຫນ້າຈໍ
--Comment[lt]=Ekrano užsklandos demonstracija
--Comment[lv]=Ekrāna saudzētāja demoversijas
--Comment[mk]=Демоа на екрански чувари
--Comment[mn]=Дэлгэц гамнагчийн үзүүлэн
--Comment[ms]=Contoh penghias skrin
--Comment[mt]=Wirjiet ta' screen savers
--Comment[nb]=Pauseskjerm-demoer
--Comment[nds]=Pausschirmen utproberen
--Comment[ne]=स्क्रिनसेभर डेमो
--Comment[nl]=Schermbeveiligingdemo's
--Comment[nn]=Pauseskjerm-demoar
--Comment[nso]=Di-demo tsa seboloki sa pontsho
--Comment[oc]=Demonstracions dèu salvador d'ecran
--Comment[pa]=ਸਕਰੀਨ-ਸੇਵਰ ਝਲਕ
--Comment[pl]=Podgląd wygaszacza ekranu
--Comment[pt]=Demonstrações de protectores de ecrã
--Comment[pt_BR]=Amostras de protetores de tela
--Comment[ro]=Demonstrații pentru protecții de ecran
--Comment[ru]=Просмотр хранителей экрана
--Comment[rw]=Amayerekana ya Mugaragaza Ukubamaso
--Comment[se]=Šearbmasiestejeaddji demonstrašuvnnat.
--Comment[sk]=Demo šetričov obrazovky
--Comment[sl]=Predstavitve ohranjevalnikov zaslona
--Comment[sr]=Демои чуварâ екрана
--Comment[sr@Latn]=Demoi čuvarâ ekrana
--Comment[ss]=Kukhonjiswa kwesigcini skrini
--Comment[sv]=Demonstration av skärmsläckare
--Comment[ta]=திரை காத்தலின் விளக்கக் காட்சிகள்
--Comment[te]=స్క్రీన్ సేవర్ డెమొలు
--Comment[tg]=Намоиши пардаи экран
--Comment[th]=ตัวอย่างโปรแกรมรักษาหน้าจอ
--Comment[tr]=Ekran koruyucu tanıtımları
--Comment[tt]=Küräksaqçı sınawları
--Comment[uk]=Демонстрації зберігачів екрана
--Comment[uz]=Ekran saqlovchilar namunalari
--Comment[uz@cyrillic]=Экран сақловчилар намуналари
--Comment[ven]=Demo ya tshivhulungi tsha tshikirini
--Comment[vi]=Thử trình bảo vệ màn hình
--Comment[wa]=Sipårgneus di waitroûle di saye
--Comment[xh]=Demos zomgcini wekhusi
--Comment[zh_CN]=屏幕保护程序演示
--Comment[zh_TW]=螢幕保護程式展示
--Comment[zu]=Imiboniso yezigcini zikrini
--NoDisplay=true
-diff -Nuar trinity-tdebase-3.5.13.2/applnk.ORI/kde-system-terminal.directory trinity-tdebase-3.5.13.2/applnk/kde-system-terminal.directory
---- trinity-tdebase-3.5.13.2/applnk.ORI/kde-system-terminal.directory	2013-07-28 15:44:30.821668706 +0200
-+++ trinity-tdebase-3.5.13.2/applnk/kde-system-terminal.directory	1970-01-01 01:00:00.000000000 +0100
-@@ -1,88 +0,0 @@
--[Desktop Entry]
--Encoding=UTF-8
--Type=Directory
--Name=Terminal Applications
--Name[af]=Terminaal Programme
--Name[ar]=تطبيقات مطرافية
--Name[az]=Terminal Proqramları
--Name[be]=Тэрмінальныя праграмы
--Name[bg]=Конзолни програми
--Name[bn]=টার্মিনাল অ্যাপলিকেশন
--Name[br]=Arloadoù an termenell
--Name[bs]=Tekstualni programi
--Name[ca]=Aplicacions de terminal
--Name[cs]=Terminálové aplikace
--Name[csb]=Programë terminala
--Name[cy]=Cymhwysiadau Terfynell
--Name[da]=Terminalprogrammer
--Name[de]=Terminalprogramme
--Name[el]=Εφαρμογές τερματικού
--Name[eo]=Terminal-Aplikaĵoj
--Name[es]=Aplicaciones de terminal
--Name[et]=Terminali rakendused
--Name[eu]=Terminaleko aplikazioak
--Name[fa]=کاربردهای پایانه
--Name[fi]=Päätesovellukset
--Name[fo]=Tekstforrit
--Name[fr]=Applications pour terminal
--Name[fy]=Terminal-tapassingen
--Name[ga]=Feidhmchláir Teirminéil
--Name[gl]=Aplicacións de Terminal
--Name[he]=יישומי מסוף
--Name[hi]=टर्मिनल अनुप्रयोग
--Name[hr]=Terminalske aplikacije
--Name[hsb]=Programy za terminal
--Name[hu]=Parancsértelmezők
--Name[id]=Aplikasi Terminal
--Name[is]=Skjáhermiforrit
--Name[it]=Applicazioni terminale
--Name[ja]=ターミナルアプリケーション
--Name[ka]=კონსოლის პროგრამები
--Name[kk]=Консоль қолданбалары
--Name[km]=កម្មវិធី​ស្ថានីយ
--Name[ko]=터미널 프로그램
--Name[lo]=ໂປຣແກຣມເທີມີນໍ
--Name[lt]=Terminalinės programos
--Name[lv]=Termināla Aplikācijas
--Name[mk]=Терминалски апликации
--Name[mn]=Терминал-Програм
--Name[ms]=Aplikasi Terminal
--Name[mt]=Programmi tat-Terminal
--Name[nb]=Terminalprogrammer
--Name[nds]=Terminalprogrammen
--Name[ne]=टर्मिनल अनुप्रयोग
--Name[nl]=Terminal-toepassingen
--Name[nn]=Terminalprogram
--Name[nso]=Ditshumiso tsa Terminal
--Name[pa]=ਟਰਮੀਨਲ ਕਾਰਜ
--Name[pl]=Programy terminala
--Name[pt]=Aplicações de Terminal
--Name[pt_BR]=Aplicativos de terminal
--Name[ro]=Aplicații de terminal
--Name[ru]=Консольные приложения
--Name[rw]=Amaporogaramu Nkiriya
--Name[se]=Terminálprográmmat
--Name[sk]=Terminálové aplikácie
--Name[sl]=Terminalski programi
--Name[sr]=Терминалски програми
--Name[sr@Latn]=Terminalski programi
--Name[ss]=Ticelo tesikhungo
--Name[sv]=Terminalprogram
--Name[ta]=முனைய பயன்பாடுகள்
--Name[te]=టర్మినల్ కార్యక్రమములు
--Name[tg]=Барномаҳои консол
--Name[th]=โปรแกรมเทอร์มินัล
--Name[tr]=Uçbirim Uygulamaları
--Name[tt]=Terminal Yazılımnarı
--Name[uk]=Термінальні програми
--Name[uz]=Terminal uchun dasturlar
--Name[uz@cyrillic]=Терминал учун дастурлар
--Name[ven]=Apulikhesheni ya Theminala
--Name[vi]=Trình đầu cuối
--Name[wa]=Programes terminås
--Name[xh]=Izicelo Zesiphelo sendlela
--Name[zh_CN]=终端应用程序
--Name[zh_TW]=終端機程式
--Name[zu]=Abayaleli bangaphandle
--Icon=konsole
--Version=1.0
-diff -Nuar trinity-tdebase-3.5.13.2/applnk.ORI/kde-toys.directory trinity-tdebase-3.5.13.2/applnk/kde-toys.directory
---- trinity-tdebase-3.5.13.2/applnk.ORI/kde-toys.directory	2013-07-28 15:44:30.821668706 +0200
-+++ trinity-tdebase-3.5.13.2/applnk/kde-toys.directory	1970-01-01 01:00:00.000000000 +0100
-@@ -1,88 +0,0 @@
--[Desktop Entry]
--Encoding=UTF-8
--Type=Directory
--Name=Toys
--Name[af]=Speelgoed
--Name[ar]=الألعاب
--Name[az]=Oyuncaqlar
--Name[be]=Цацкі
--Name[bg]=Играчки
--Name[bn]=খেলনা
--Name[br]=C'hoarielloù
--Name[bs]=Igračke
--Name[ca]=Joguines
--Name[cs]=Hračky
--Name[csb]=Zôbôwczi
--Name[cy]=Tegannau
--Name[da]=Legetøj
--Name[de]=Kleinigkeiten
--Name[el]=Παιχνιδάκια
--Name[eo]=Amuzaĵoj
--Name[es]=Ocio
--Name[et]=Mänguasjad
--Name[eu]=Jolasak
--Name[fa]=سرگرمیها
--Name[fi]=Lelut
--Name[fo]=Leiku
--Name[fr]=Petits outils
--Name[fy]=Boartersguod
--Name[ga]=Áilleagáin
--Name[gl]=Entretementos
--Name[he]=צעצועים
--Name[hi]=खिलौने
--Name[hr]=Igračke
--Name[hsb]=Hrajki
--Name[hu]=Mütyürkék
--Name[id]=Mainan
--Name[is]=Leikföng
--Name[it]=Giochini
--Name[ja]=アクセサリ
--Name[ka]=სათამაშოები
--Name[kk]=Ойын-сауықтар
--Name[km]=ប្រដាប់​ក្មេង​លេង
--Name[ko]=장난감
--Name[lo]=ຂອງເຫລັ້ນ
--Name[lt]=Žaislai
--Name[lv]=Rotaļlietas
--Name[mk]=Играчки
--Name[mn]=Наадгай
--Name[ms]=Permainan
--Name[mt]=Ġugarelli
--Name[nb]=Leketøy
--Name[nds]=Speelkraam
--Name[ne]=खेलौना
--Name[nl]=Speelgoed
--Name[nn]=Leiker
--Name[nso]=Dibapadisane
--Name[oc]=Joguines
--Name[pa]=ਖਿਡੌਣੇ
--Name[pl]=Zabawa
--Name[pt]=Diversão
--Name[pt_BR]=Brinquedos
--Name[ro]=Jucării
--Name[ru]=Развлечения
--Name[rw]=Ibikinisho
--Name[se]=Stohkosat
--Name[sk]=Hračky
--Name[sl]=Igrače
--Name[sr]=Играчке
--Name[sr@Latn]=Igračke
--Name[ss]=Kwekudlalisa
--Name[sv]=Leksaker
--Name[ta]=பொம்மைகள்
--Name[te]=ఆట వస్తువులు
--Name[tg]=Бозичаҳои шавқовар
--Name[th]=ของเล่นสนุกๆ
--Name[tr]=Eğlence
--Name[tt]=Uyınnar
--Name[uk]=Іграшки
--Name[uz]=Oʻyinchoqlar
--Name[uz@cyrillic]=Ўйинчоқлар
--Name[ven]=Zwautambisa vhana
--Name[vi]=Đồ chơi
--Name[wa]=Amuzmints
--Name[xh]=Izinto zokudlala
--Name[zh_CN]=玩具
--Name[zh_TW]=玩具
--Name[zu]=Amathoyizi
--Icon=package_toys
-diff -Nuar trinity-tdebase-3.5.13.2/applnk.ORI/kde-unknown.directory trinity-tdebase-3.5.13.2/applnk/kde-unknown.directory
---- trinity-tdebase-3.5.13.2/applnk.ORI/kde-unknown.directory	2013-07-28 15:44:30.821668706 +0200
-+++ trinity-tdebase-3.5.13.2/applnk/kde-unknown.directory	1970-01-01 01:00:00.000000000 +0100
-@@ -1,76 +0,0 @@
--[Desktop Entry]
--Encoding=UTF-8
--Type=Directory
--Name=Lost & Found
--Name[af]=Verlore & Gevind
--Name[ar]=فُقد ووُجد
--Name[az]=İtirdim və Tapdım
--Name[be]=Згубленыя і знойдзеныя
--Name[bg]=Разни
--Name[bn]=হারানো প্রাপ্তি
--Name[br]=Kollet & kavet
--Name[bs]=Izgubljeno/nađeno
--Name[ca]=Perdut i trobat
--Name[cs]=Ztráty a nálezy
--Name[csb]=Zgùbione ë nalazłé
--Name[cy]=Colledig a Chanfyddedig
--Name[da]=Glemte sager
--Name[de]=Nicht zuzuordnen
--Name[el]=Χάθηκαν & Βρέθηκαν
--Name[eo]=Perdita kaj trovita
--Name[es]=Objetos perdidos
--Name[et]=Tundmatud
--Name[eu]=Galdu eta aurkitutakoak
--Name[fa]=گم‌شده و یافته‌شده
--Name[fi]=Hävinneet ja löydetyt
--Name[fr]=Objets trouvés
--Name[fy]=Wat oer is
--Name[ga]=Caillte agus Aimsithe
--Name[gl]=Outros
--Name[he]=אבדות
--Name[hi]=खोया/पाया
--Name[hr]=Izgubljeno-nađeno
--Name[hsb]=Pytane & Namakane
--Name[hu]=Ismeretlen
--Name[is]=Tapað & fundið
--Name[it]=Oggetti smarriti
--Name[kk]=Жоғалып табылғандар
--Name[km]=បាត់ & រកឃើញ
--Name[ko]=기타 프로그램
--Name[lt]=Pamesta ir rasta
--Name[lv]=Pazudis & Atrasts
--Name[mk]=Изгубено-најдено
--Name[mn]=Алдагдал & Олдолт
--Name[ms]=Hilang & Jumpa
--Name[mt]=Mitlufin u Misjuba
--Name[nb]=Tapt og funnet
--Name[nds]=Passt narms sünst
--Name[ne]=हराएका र फेला परेका
--Name[nl]=Overig
--Name[nn]=Tapt og funne
--Name[pa]=ਗੁਆਚੇ ਤੇ ਲੱਭੇ
--Name[pl]=Zgubione i znalezione
--Name[pt]=Perdidos e Achados
--Name[pt_BR]=Achados & Perdidos
--Name[ro]=Pierdute și regăsite
--Name[ru]=Камера хранения
--Name[rw]=Byabuze & Byabonetse
--Name[se]=Láhppon ja gávdnon
--Name[sk]=Straty a nálezy
--Name[sl]=Izgubljeno in najdeno
--Name[sr]=Изгубљено-нађено
--Name[sr@Latn]=Izgubljeno-nađeno
--Name[sv]=Hittegods
--Name[ta]=இழந்த & கிடைத்த
--Name[te]=పోయినవి & దొరికినవి
--Name[tg]=Ҷустуҷӯй
--Name[th]=หาไม่เจอดูที่นี่
--Name[tr]=Kayıplar ve Bulunanlar
--Name[tt]=Yuğaltu & Tabu
--Name[uk]=Загублено та знайдено
--Name[uz]=Nomaʼlum
--Name[uz@cyrillic]=Номаълум
--Name[vi]=Mất & Tìm
--Name[wa]=Pierdous & rtrovés
--Name[zh_CN]=未知类别
--Icon=help
-diff -Nuar trinity-tdebase-3.5.13.2/applnk.ORI/kde-utilities-accessibility.directory trinity-tdebase-3.5.13.2/applnk/kde-utilities-accessibility.directory
---- trinity-tdebase-3.5.13.2/applnk.ORI/kde-utilities-accessibility.directory	2013-07-28 15:44:30.821668706 +0200
-+++ trinity-tdebase-3.5.13.2/applnk/kde-utilities-accessibility.directory	1970-01-01 01:00:00.000000000 +0100
-@@ -1,148 +0,0 @@
--[Desktop Entry]
--Encoding=UTF-8
--Type=Directory
--Name=Accessibility
--Name[af]=Toeganklikheid
--Name[ar]=تسهيل الوصول
--Name[az]=Yetişmə Qabiliyyəti
--Name[be]=Даступнасць
--Name[bg]=Равностоен достъп
--Name[bn]=সহায়ক প্রযুক্তি
--Name[br]=Haezadusted
--Name[bs]=Pristupačnost
--Name[ca]=Accessibilitat
--Name[cs]=Zpřístupnění
--Name[csb]=Pòmòce przistãpù
--Name[cy]=Hygyrchedd
--Name[da]=Tilgængelighed
--Name[de]=Zugangshilfen
--Name[el]=Προσιτότητα
--Name[eo]=Alirebleco
--Name[es]=Accesibilidad
--Name[et]=Hõlbustus
--Name[eu]=Erabilerraztasuna
--Name[fa]=دستیابی‌پذیری
--Name[fi]=Helppokäyttötoiminnot
--Name[fr]=Accessibilité
--Name[fy]=Tagonklikens
--Name[ga]=Inrochtaineacht
--Name[gl]=Accesibilidade
--Name[he]=נגישות
--Name[hi]=पहुँच
--Name[hr]=Pristupačnost
--Name[hu]=Kezelési segítség
--Name[id]=Aksesibiliti
--Name[is]=Aðgengi
--Name[it]=Accessibilità
--Name[ja]=アクセシビリティ
--Name[ka]=სპეციალური შესაძლბლობები
--Name[kk]=Арнайы мүмкіндіктер
--Name[km]=ភាព​អាច​ចូល​ដំណើរការ​បាន
--Name[ko]=내게 필요한 설정
--Name[lo]=ຄວາມສາມາດໃນການໃຊ້ງານ
--Name[lt]=Prieinamumas
--Name[lv]=Pieejamība
--Name[mk]=Пристапливост
--Name[mn]=Хэрэглэх тохь
--Name[ms]=Kebolehcapaian
--Name[mt]=Aċċessibiltà
--Name[nb]=Tilgjengelighet
--Name[nds]=Behinnertenhülp
--Name[ne]=पहुँचता
--Name[nl]=Toegankelijkheid
--Name[nn]=Tilgjenge
--Name[nso]=Botsenelo
--Name[oc]=Accessibilitat
--Name[pa]=ਸਹੂਲਤਾਂ
--Name[pl]=Dostępność
--Name[pt]=Acessibilidade
--Name[pt_BR]=Acessibilidade
--Name[ro]=Accesibilitate
--Name[ru]=Специальные возможности
--Name[rw]=Ukugerwaho
--Name[se]=Álkkibut geavaheapmi
--Name[sk]=Prístupnosť
--Name[sl]=Dostopnost
--Name[sr]=Приступачност
--Name[sr@Latn]=Pristupačnost
--Name[ss]=Kutfolakala kalula
--Name[sv]=Handikappstöd
--Name[ta]=அணுகல்
--Name[te]=అందుబాటు
--Name[tg]=Имконпазирӣ
--Name[th]=ตัวช่วยในการใช้งาน
--Name[tr]=Erişilebilirlik
--Name[tt]=Qulaylıq
--Name[uk]=Доступність
--Name[uz]=Qulayliklar
--Name[uz@cyrillic]=Қулайликлар
--Name[ven]=Dzheneaho
--Name[vi]=Hỗ trợ người tàn tật
--Name[wa]=Accessibilité
--Name[xh]=Unikezelo
--Name[zh_CN]=辅助
--Name[zh_TW]=無障礙輔助
--Name[zu]=Ukungena
--Icon=access
--Comment=Accessibility
--Comment[af]=Toeganklikheid
--Comment[be]=Даступнасць
--Comment[bg]=Равностоен достъп
--Comment[bn]=সহায়ক প্রযুক্তি
--Comment[br]=Haezadusted
--Comment[bs]=Pristupačnost
--Comment[ca]=Accessibilitat
--Comment[cs]=Zpřístupnění
--Comment[csb]=Pòmòce przistãpù
--Comment[cy]=Hygyrchedd
--Comment[da]=Tilgængelighed
--Comment[de]=Zugangshilfen
--Comment[el]=Προσβασιμότητα
--Comment[eo]=Alirebleco
--Comment[es]=Accesibilidad
--Comment[et]=Hõlbustus
--Comment[eu]=Erabilerraztasuna
--Comment[fa]=دستیابی‌پذیری
--Comment[fi]=Helppokäyttöisyys
--Comment[fr]=Accessibilité
--Comment[fy]=Tagonklikens
--Comment[ga]=Inrochtaineacht
--Comment[gl]=Accesibilidade
--Comment[he]=נגישות
--Comment[hr]=Pristupačnost
--Comment[hu]=Kezelési segítség
--Comment[is]=Aðgengi
--Comment[it]=Accessibilità
--Comment[ja]=アクセシビリティ
--Comment[kk]=Арнайы мүмкіндіктер
--Comment[km]=មធ្យោបាយ​ងាយស្រួល
--Comment[ko]=내게 필요한 설정
--Comment[mk]=Пристапливост
--Comment[ms]=Kebolehcapaian
--Comment[nb]=Tilgjengelighet
--Comment[nds]=Behinnertenhülp
--Comment[ne]=पहुँचता
--Comment[nl]=Toegankelijkheid
--Comment[nn]=Tilgjenge
--Comment[pa]=ਸਹੂਲਤਾਂ
--Comment[pl]=Dostępność
--Comment[pt]=Acessibilidade
--Comment[pt_BR]=Acessibilidade
--Comment[ro]=Accesibilitate
--Comment[ru]=Специальные возможности
--Comment[sk]=Prístupnosť
--Comment[sl]=Dostopnost
--Comment[sr]=Приступачност
--Comment[sr@Latn]=Pristupačnost
--Comment[sv]=Handikappstöd
--Comment[te]=అందుబాటు
--Comment[tg]=Имконпазирӣ
--Comment[th]=ตัวช่วยให้ใช้งานสะดวกขึ้น
--Comment[tr]=Erişilebilirlik
--Comment[uk]=Доступність
--Comment[uz]=Qulayliklar
--Comment[uz@cyrillic]=Қулайликлар
--Comment[vi]=Hỗ trợ người tàn tật
--Comment[wa]=Accessibilité
--Comment[zh_CN]=辅助
--Comment[zh_TW]=無障礙輔助
-diff -Nuar trinity-tdebase-3.5.13.2/applnk.ORI/kde-utilities-desktop.directory trinity-tdebase-3.5.13.2/applnk/kde-utilities-desktop.directory
---- trinity-tdebase-3.5.13.2/applnk.ORI/kde-utilities-desktop.directory	2013-07-28 15:44:30.820668728 +0200
-+++ trinity-tdebase-3.5.13.2/applnk/kde-utilities-desktop.directory	1970-01-01 01:00:00.000000000 +0100
-@@ -1,141 +0,0 @@
--[Desktop Entry]
--Encoding=UTF-8
--Type=Directory
--Name=Desktop
--Name[af]=Werkskerm
--Name[ar]=سطح المكتب
--Name[az]=Masa Üstü
--Name[be]=Працоўны стол
--Name[bg]=Работен плот
--Name[bn]=ডেস্কটপ
--Name[br]=Gorretaol
--Name[bs]=Radna površina
--Name[ca]=Escriptori
--Name[cs]=Pracovní plocha
--Name[csb]=Pùlt
--Name[cy]=Penbwrdd
--Name[de]=Arbeitsfläche
--Name[el]=Επιφάνεια εργασίας
--Name[eo]=Tabulo
--Name[es]=Escritorio
--Name[et]=Töölaud
--Name[eu]=Mahaigaina
--Name[fa]=رومیزی
--Name[fi]=Työpöytä
--Name[fo]=Skriviborð
--Name[fr]=Bureau
--Name[fy]=Buroblêd
--Name[ga]=Deasc
--Name[gl]=Escritorio
--Name[he]=שולחן עבודה
--Name[hi]=डेस्कटॉप
--Name[hr]=Radna površina
--Name[hsb]=Dźěłowy powjerch
--Name[hu]=Munkaasztal
--Name[is]=Skjáborð
--Name[ja]=デスクトップ
--Name[ka]=სამუშაო დაფა
--Name[kk]=Жұмыс үстелі
--Name[km]=ផ្ទៃតុ
--Name[ko]=데스크톱
--Name[lo]=ພື້ນທີ່ເຮັດວງກ
--Name[lt]=Darbastalis
--Name[lv]=Darbvirsma
--Name[mk]=Работна површина
--Name[mn]=Ажлын тавцан
--Name[ms]=Ruang Kerja
--Name[nb]=Skrivebord
--Name[nds]=Schriefdisch
--Name[ne]=डेस्कटप
--Name[nl]=Bureaublad
--Name[nn]=Skrivebord
--Name[oc]=BurèU
--Name[pa]=ਵੇਹੜਾ
--Name[pl]=Pulpit
--Name[pt]=Ambiente de Trabalho
--Name[pt_BR]=Área de Trabalho
--Name[ru]=Рабочий стол
--Name[rw]=Ibiro
--Name[se]=Čállinbeavdi
--Name[sk]=Plocha
--Name[sl]=Namizje
--Name[sr]=Радна површина
--Name[sr@Latn]=Radna površina
--Name[ss]=Desktop 
--Name[sv]=Skrivbord
--Name[ta]=மேல்மேசை
--Name[te]=రంగస్ఠలం
--Name[tg]=Мизи корӣ
--Name[th]=พื้นที่ทำงาน
--Name[tr]=Masaüstü
--Name[tt]=Östäl
--Name[uk]=Стільниця
--Name[uz]=Ish stoli
--Name[uz@cyrillic]=Иш столи
--Name[ven]=Desikithopo
--Name[vi]=Màn hình nền
--Name[wa]=Sicribanne
--Name[zh_CN]=桌面
--Name[zh_TW]=桌面
--Icon=desktop
--Comment=Desktop
--Comment[af]=Werkskerm
--Comment[ar]=سطح المكتب
--Comment[be]=Працоўны стол
--Comment[bg]=Работен плот
--Comment[bn]=ডেস্কটপ
--Comment[br]=Burev
--Comment[ca]=Escriptori
--Comment[cs]=Pracovní plocha
--Comment[csb]=Pùlt
--Comment[cy]=Penbwrdd
--Comment[de]=KDE-Arbeitsfläche
--Comment[el]=Επιφάνεια εργασίας
--Comment[eo]=KDEa labortablo
--Comment[es]=Escritorio
--Comment[et]=Töölaud
--Comment[eu]=Mahaigaina
--Comment[fa]=رومیزی
--Comment[fi]=Työpöytä
--Comment[fr]=Bureau
--Comment[fy]=Buroblêd
--Comment[ga]=Deasc
--Comment[gl]=Escritorio
--Comment[he]=שולחן העבודה
--Comment[hr]=Radna površina
--Comment[hu]=Munkaasztal
--Comment[is]=Skjáborð
--Comment[ja]=デスクトップ
--Comment[ka]=სამუშაო დაფა
--Comment[kk]=Үстел
--Comment[km]=ផ្ទៃតុ
--Comment[ko]=데스크톱
--Comment[lt]=Darbastalis
--Comment[mk]=Работна површина
--Comment[nb]=Skrivebord
--Comment[nds]=Schriefdisch
--Comment[ne]=डेस्कटप
--Comment[nl]=Bureaublad
--Comment[nn]=Skrivebord
--Comment[pa]=ਵੇਹੜਾ
--Comment[pl]=Pulpit
--Comment[pt]=Ecrã
--Comment[pt_BR]=Área de Trabalho
--Comment[ru]=Рабочий стол
--Comment[se]=Čállinbeavdi
--Comment[sk]=Pracovná plocha
--Comment[sl]=Namizje
--Comment[sr]=Радна површина
--Comment[sr@Latn]=Radna površina
--Comment[sv]=Skrivbord
--Comment[te]=రంగస్థలం
--Comment[tg]=Мизи корӣ
--Comment[th]=พื้นที่หน้าจอ
--Comment[tr]=Masaüstü
--Comment[uk]=Стільниця
--Comment[uz]=Ish stoli
--Comment[uz@cyrillic]=Иш столи
--Comment[vi]=Màn hình nền
--Comment[wa]=Sicribanne
--Comment[zh_CN]=桌面
--Comment[zh_TW]=桌面
-diff -Nuar trinity-tdebase-3.5.13.2/applnk.ORI/kde-utilities.directory trinity-tdebase-3.5.13.2/applnk/kde-utilities.directory
---- trinity-tdebase-3.5.13.2/applnk.ORI/kde-utilities.directory	2013-07-28 15:44:30.821668706 +0200
-+++ trinity-tdebase-3.5.13.2/applnk/kde-utilities.directory	1970-01-01 01:00:00.000000000 +0100
-@@ -1,170 +0,0 @@
--[Desktop Entry]
--Encoding=UTF-8
--Type=Directory
--Name=Utilities
--Name[af]=Nutsprogramme
--Name[ar]=عدة التشغيل
--Name[az]=Tə'minatlar
--Name[be]=Службовыя праграмы
--Name[bg]=Инструменти
--Name[bn]=আনুষঙ্গিক
--Name[br]=Mavegoù
--Name[bs]=Korisni programi
--Name[ca]=Utilitats
--Name[cs]=Nástroje
--Name[csb]=Nôrzãdza
--Name[cy]=Defnyddioldebau
--Name[da]=Redskaber
--Name[de]=Dienstprogramme
--Name[el]=Εργαλεία
--Name[eo]=Utilaĵoj
--Name[es]=Utilidades
--Name[et]=Utiliidid
--Name[eu]=Tresnak
--Name[fa]=برنامه‌های سودمند
--Name[fi]=Apuohjelmat
--Name[fo]=Hentleikar
--Name[fr]=Utilitaires
--Name[fy]=Helpmiddelen
--Name[ga]=Uirlisí
--Name[gl]=Utilidades
--Name[he]=כלים
--Name[hi]=यूटिलिटीज़
--Name[hr]=Alati
--Name[hsb]=Pomocniki
--Name[hu]=Segédprogramok
--Name[is]=Nytjatól
--Name[it]=Accessori
--Name[ja]=ユーティリティ
--Name[ka]=ხელსაწყოები
--Name[kk]=Утилиталары
--Name[km]=ឧបករណ៍
--Name[ko]=유틸리티
--Name[lo]=ໃຊ້ປະໂຫຍດ
--Name[lt]=Pagalbininkai
--Name[lv]=Utilītas
--Name[mk]=Алатки
--Name[mn]=Хэрэгсэл програмууд
--Name[ms]=Utiliti
--Name[mt]=Utilitajiet
--Name[nb]=Verktøy
--Name[nds]=Warktüüch
--Name[ne]=युटिलिटी
--Name[nl]=Hulpmiddelen
--Name[nn]=Verktøy
--Name[nso]=Didiriswa
--Name[oc]=Utilitats
--Name[pa]=ਸਹੂਲਤ
--Name[pl]=Narzędzia
--Name[pt]=Utilitários
--Name[pt_BR]=Utilitários
--Name[ro]=Utilitare
--Name[ru]=Служебные
--Name[rw]=Nkemurabibazo
--Name[se]=Reaiddut
--Name[sk]=Nástroje
--Name[sl]=Potrebščine
--Name[sr]=Алати
--Name[sr@Latn]=Alati
--Name[ss]=Kwekusetjentiswa
--Name[sv]=Verktyg
--Name[ta]=கருவிகள்
--Name[te]=సౌలభ్యాలు
--Name[tg]=Лавозимот
--Name[th]=โปรแกรมอรรถประโยชน์
--Name[tr]=Yardımcı Programlar
--Name[tt]=Faydalıq
--Name[uk]=Утиліти
--Name[uz]=Vositalar
--Name[uz@cyrillic]=Воситалар
--Name[ven]=Zwishumiswa
--Name[vi]=Các tiện ích
--Name[wa]=Usteyes
--Name[xh]=Izinto eziluncedo
--Name[zh_CN]=实用工具
--Name[zh_TW]=實用工具
--Name[zu]=Izisebenzi
--Icon=package_utilities
--Comment=Utilities
--Comment[af]=Nutsprogramme
--Comment[ar]=عدّة التشغيل
--Comment[az]=Tə'minatlar
--Comment[be]=Службовыя праграмы
--Comment[bg]=Помощни програми
--Comment[bn]=প্রায়শই কাজে লাগে এমন কিছু প্রোগ্রাম
--Comment[br]=Mavegoù
--Comment[bs]=Korisni programi
--Comment[ca]=Utilitats
--Comment[cs]=Nástroje
--Comment[csb]=Nôrzãdza
--Comment[cy]= Defnyddioldebau
--Comment[da]=Redskaber
--Comment[de]=Dienstprogramme
--Comment[el]=Εργαλεία
--Comment[eo]=Utilaĵoj
--Comment[es]=Utilidades
--Comment[et]=Utiliidid
--Comment[eu]=Tresnak
--Comment[fa]=برنامه‌های سودمند
--Comment[fi]=Apuohjelmat
--Comment[fo]=Hentleikar
--Comment[fr]=Utilitaires
--Comment[fy]=Helpmiddelen
--Comment[ga]=Uirlisí
--Comment[gl]=Utilidades
--Comment[he]=כלים
--Comment[hi]=यूटिलिटीज़
--Comment[hr]=Alati
--Comment[hsb]=Pomocne programy
--Comment[hu]=Segédprogramok
--Comment[is]=Ýmis nytsamleg áhöld
--Comment[it]=Accessori
--Comment[ja]=ユーティリティ
--Comment[ka]=ხელსაწყოები
--Comment[kk]=Утилиталары
--Comment[km]=ឧបករណ៍
--Comment[ko]=유틸리티
--Comment[lo]=ໂປຣແກຣມໃຊ້ໃຫ້ເປັນປະໂຫຍດ
--Comment[lt]=Pagalbininkai
--Comment[lv]=Utilītas
--Comment[mk]=Алатки
--Comment[mn]=Хэрэгсэл програмууд
--Comment[ms]=Utiliti
--Comment[mt]=Utilitajiet
--Comment[nb]=Verktøy
--Comment[nds]=Hülpprogrammen
--Comment[ne]=युटिलिटी
--Comment[nl]=Hulpmiddelen
--Comment[nn]=Verktøy
--Comment[nso]=Didiriswa
--Comment[oc]=Utilitats
--Comment[pa]=ਸਹੂਲਤ
--Comment[pl]=Narzędzia
--Comment[pt]=Utilitários
--Comment[pt_BR]=Utilitários
--Comment[ro]=Utilitare
--Comment[ru]=Различные утилиты
--Comment[rw]=Nkemurabibazo
--Comment[se]=Reaiddut
--Comment[sk]=Nástroje
--Comment[sl]=Potrebščine
--Comment[sr]=Алати
--Comment[sr@Latn]=Alati
--Comment[ss]=Kwekusetjentiswa
--Comment[sv]=Verktyg
--Comment[ta]=கருவிகள்
--Comment[te]=సౌలభ్యాలు
--Comment[tg]=Лавозимоти гуногун
--Comment[th]=โปรแกรมอรรถประโยชน์
--Comment[tr]=Yardımcı Programlar
--Comment[tt]=Faydalıqlar
--Comment[uk]=Утиліти
--Comment[uz]=Vositalar
--Comment[uz@cyrillic]=Воситалар
--Comment[ven]=Zwishumiswa
--Comment[vi]=Các tiện ích
--Comment[wa]=Usteyes
--Comment[xh]=Izinto eziluncedo
--Comment[zh_CN]=实用工具
--Comment[zh_TW]=實用工具
--Comment[zu]=Izisebenzi
-diff -Nuar trinity-tdebase-3.5.13.2/applnk.ORI/kde-utilities-file.directory trinity-tdebase-3.5.13.2/applnk/kde-utilities-file.directory
---- trinity-tdebase-3.5.13.2/applnk.ORI/kde-utilities-file.directory	2013-07-28 15:44:30.821668706 +0200
-+++ trinity-tdebase-3.5.13.2/applnk/kde-utilities-file.directory	1970-01-01 01:00:00.000000000 +0100
-@@ -1,139 +0,0 @@
--[Desktop Entry]
--Encoding=UTF-8
--Type=Directory
--Name=File
--Name[af]=Lêer
--Name[ar]=الملف
--Name[be]=Файл
--Name[bg]=Файл
--Name[bn]=ফাইল
--Name[br]=Restr
--Name[bs]=Datoteka
--Name[ca]=Fitxer
--Name[cs]=Soubor
--Name[csb]=Lopk
--Name[cy]=Ffeil
--Name[da]=Fil
--Name[de]=Datei
--Name[el]=Αρχείο
--Name[eo]=Dosiero
--Name[es]=Archivo
--Name[et]=Fail
--Name[eu]=Fitxategia
--Name[fa]=پرونده
--Name[fi]=Tiedosto
--Name[fr]=Fichier
--Name[fy]=Triem
--Name[ga]=Comhad
--Name[gl]=Ficheiro
--Name[he]=קובץ
--Name[hr]=Datoteka
--Name[hu]=Fájl
--Name[id]=Berkas
--Name[is]=Skrá
--Name[ja]=ファイル
--Name[ka]=ფაილი
--Name[kk]=Файл
--Name[km]=ឯកសារ
--Name[ko]=파일
--Name[ku]=Pel
--Name[lt]=Byla
--Name[mk]=Датотека
--Name[ms]=Fail
--Name[nb]=Fil
--Name[nds]=Datei
--Name[ne]=फाइल
--Name[nl]=Bestand
--Name[nn]=Fil
--Name[pa]=ਫਾਇਲ
--Name[pl]=Plik
--Name[pt]=Ficheiro
--Name[pt_BR]=Arquivo
--Name[ro]=Fișier
--Name[ru]=Работа с файлами
--Name[rw]=Idosiye
--Name[se]=Fiila
--Name[sk]=Súbor
--Name[sl]=Datoteke
--Name[sr]=Фајл
--Name[sr@Latn]=Fajl
--Name[sv]=Fil
--Name[te]=దస్త్రం
--Name[tg]=Файл
--Name[th]=แฟ้ม
--Name[tr]=Dosya
--Name[uk]=Файл
--Name[uz]=Fayl
--Name[uz@cyrillic]=Файл
--Name[vi]=Tập tin
--Name[wa]=Fitchî
--Name[zh_CN]=文件
--Name[zh_TW]=檔案
--Icon=kfm
--Comment=File
--Comment[af]=Lêer
--Comment[ar]=الملف
--Comment[be]=Файл
--Comment[bg]=Файл
--Comment[bn]=ফাইল
--Comment[br]=Restr
--Comment[bs]=Datoteka
--Comment[ca]=Fitxer
--Comment[cs]=Soubor
--Comment[csb]=Lopk
--Comment[cy]=Ffeil
--Comment[da]=Fil
--Comment[de]=Datei
--Comment[el]=Αρχείο
--Comment[eo]=Dosiero
--Comment[es]=Archivo
--Comment[et]=Fail
--Comment[eu]=Fitxategia
--Comment[fa]=پرونده
--Comment[fi]=Tiedosto
--Comment[fr]=Fichier
--Comment[fy]=Triem
--Comment[ga]=Comhad
--Comment[gl]=Ficheiro
--Comment[he]=קובץ
--Comment[hr]=Datoteka
--Comment[hu]=Fájl
--Comment[id]=Berkas
--Comment[is]=Skrá
--Comment[ja]=ファイル
--Comment[ka]=ფაილი
--Comment[kk]=Файл
--Comment[km]=ឯកសារ
--Comment[ko]=글꼴 파일
--Comment[ku]=Pel
--Comment[lt]=Byla
--Comment[mk]=Датотека
--Comment[ms]=Fail
--Comment[nb]=Fil
--Comment[nds]=Datei
--Comment[ne]=फाइल
--Comment[nl]=Bestand
--Comment[nn]=Fil
--Comment[pa]=ਫਾਇਲ
--Comment[pl]=Plik
--Comment[pt]=Ficheiro
--Comment[pt_BR]=Arquivo
--Comment[ro]=Fișier
--Comment[ru]=Работа с файлами
--Comment[se]=Fiila
--Comment[sk]=Súbor
--Comment[sl]=Datoteke
--Comment[sr]=Фајл
--Comment[sr@Latn]=Fajl
--Comment[sv]=Fil
--Comment[te]=దస్త్రం
--Comment[tg]=Файл
--Comment[th]=แฟ้ม
--Comment[tr]=Dosya
--Comment[uk]=Файл
--Comment[uz]=Fayl
--Comment[uz@cyrillic]=Файл
--Comment[vi]=Tập tin
--Comment[wa]=Fitchî
--Comment[zh_CN]=文件
--Comment[zh_TW]=檔案
-diff -Nuar trinity-tdebase-3.5.13.2/applnk.ORI/kde-utilities-peripherals.directory trinity-tdebase-3.5.13.2/applnk/kde-utilities-peripherals.directory
---- trinity-tdebase-3.5.13.2/applnk.ORI/kde-utilities-peripherals.directory	2013-07-28 15:44:30.821668706 +0200
-+++ trinity-tdebase-3.5.13.2/applnk/kde-utilities-peripherals.directory	1970-01-01 01:00:00.000000000 +0100
-@@ -1,149 +0,0 @@
--[Desktop Entry]
--Encoding=UTF-8
--Type=Directory
--Name=Peripherals
--Name[af]=Randapperatuur
--Name[ar]=الأجهزة المحيطية
--Name[az]=Avadanlıq
--Name[be]=Перыферыя
--Name[bg]=Периферия
--Name[bn]=পেরিফেরাল
--Name[br]=Trobarzhelloù
--Name[bs]=Vanjski uređaji
--Name[ca]=Perifèrics
--Name[cs]=Periférie
--Name[csb]=Periferëjné ùrzãdzenia
--Name[cy]=Perifferolion
--Name[da]=Tilkoblinger
--Name[de]=Angeschlossene Geräte
--Name[el]=Περιφερειακά
--Name[eo]=Periferaĵoj
--Name[es]=Periféricos
--Name[et]=Välisseadmed
--Name[eu]=Periferikoak
--Name[fa]=وسایل جانبی
--Name[fi]=Laitteet
--Name[fo]=Úteindir
--Name[fr]=Périphériques
--Name[fy]=Râneapparaten
--Name[ga]=Forimeallaigh
--Name[gl]=Periféricos
--Name[he]=ציוד היקפי
--Name[hi]=सहायक पुरजे
--Name[hr]=Periferni uređaji
--Name[hsb]=Periferija
--Name[hu]=Perifériák
--Name[is]=Jaðartæki
--Name[it]=Periferiche
--Name[ja]=周辺機器
--Name[ka]=პერიფერიული
--Name[kk]=Периферия
--Name[km]=គ្រឿង​កុំព្យូទ័រ
--Name[ko]=주변 장치
--Name[lo]=ອຸປະກອນຕໍ່ພວງ
--Name[lt]=Periferija
--Name[lv]=Perifērija
--Name[mk]=Периферни уреди
--Name[mn]=Залгаатай төхөөрөмжүүд
--Name[ms]=Perkakasan
--Name[mt]=Apparat
--Name[nb]=Tilleggsenheter
--Name[nds]=Reedschappen
--Name[ne]=परिवृत्तीय
--Name[nl]=Randapparaten
--Name[nn]=Tilleggseiningar
--Name[nso]=Ditswelantle
--Name[oc]=Periferics
--Name[pa]=ਸਹਾਇਕ ਜੰਤਰ
--Name[pl]=Urządzenia peryferyjne
--Name[pt]=Periféricos
--Name[pt_BR]=Periféricos
--Name[ro]=Periferice
--Name[ru]=Периферия
--Name[rw]=Ibyinyuma
--Name[se]=Ovttadagat
--Name[sk]=Periférie
--Name[sl]=Strojni dodatki
--Name[sr]=Периферије
--Name[sr@Latn]=Periferije
--Name[ss]=Ema-peripherals
--Name[sv]=Kringutrustning
--Name[ta]=கருவிகள்
--Name[te]=పరికరాలు
--Name[tg]=Дастгоҳҳои лозимӣ
--Name[th]=อุปกรณ์ต่อพ่วง
--Name[tr]=Çevre Birimleri
--Name[tt]=Cıhazlar
--Name[uk]=Периферійні пристрої
--Name[uz]=Ulangan uskunalar
--Name[uz@cyrillic]=Уланган ускуналар
--Name[ven]=Dzipheriferala
--Name[vi]=Thiết bị ngoại vi
--Name[wa]=Periferikes
--Name[xh]=Iilayini zomda
--Name[zh_CN]=外设
--Name[zh_TW]=週邊設備
--Name[zu]=Imixhantela
--Icon=input_devices_settings
--Comment=Peripherals
--Comment[af]=Randapparatuur 
--Comment[be]=Перыферыя
--Comment[bg]=Периферия
--Comment[bn]=পেরিফেরাল
--Comment[br]=Trobarzhelloù
--Comment[bs]=Vanjski uređaji
--Comment[ca]=Perifèrics
--Comment[cs]=Periférie
--Comment[csb]=Periferëjné ùrzãdzenia
--Comment[cy]=Perifferolion
--Comment[da]=Tilkoblinger
--Comment[de]=Angeschlossene Geräte
--Comment[el]=Περιφερειακά
--Comment[eo]=Periferaĵoj
--Comment[es]=Periféricos
--Comment[et]=Välisseadmed
--Comment[eu]=Periferikoak
--Comment[fa]=وسایل جانبی
--Comment[fi]=Oheislaitteet
--Comment[fr]=Périphériques
--Comment[fy]=Râneapparaten
--Comment[ga]=Forimeallaigh
--Comment[gl]=Periféricos
--Comment[he]=ציוד היקפי
--Comment[hr]=Periferni uređaji
--Comment[hu]=Perifériák
--Comment[is]=Jaðartæki
--Comment[it]=Periferiche
--Comment[ja]=周辺機器
--Comment[kk]=Периферия
--Comment[km]=គ្រឿង​កុំព្យូទ័រ
--Comment[ko]=주변 장치
--Comment[mk]=Периферни уреди
--Comment[ms]=Persisian
--Comment[nb]=Tikoblede enheter
--Comment[nds]=Reedschappen
--Comment[ne]=परिवृतिय
--Comment[nl]=Randapparaten
--Comment[nn]=Tilleggseiningar
--Comment[pa]=ਜੰਤਰ
--Comment[pl]=Urządzenia peryferyjne
--Comment[pt]=Periféricos
--Comment[pt_BR]=Periféricos
--Comment[ro]=Periferice
--Comment[ru]=Периферия
--Comment[sk]=Periférie
--Comment[sl]=Strojni dodatki
--Comment[sr]=Периферије
--Comment[sr@Latn]=Periferije
--Comment[sv]=Kringutrustning
--Comment[te]=పరికరాలు
--Comment[tg]=Дастгоҳҳои лозимӣ
--Comment[th]=อุปกรณ์ต่อพ่วง
--Comment[tr]=Çevre Birimleri
--Comment[uk]=Периферійні
--Comment[uz]=Ulangan uskunalar
--Comment[uz@cyrillic]=Уланган ускуналар
--Comment[vi]=Thiết bị ngoại vi
--Comment[wa]=Éndjins
--Comment[zh_CN]=外设
--Comment[zh_TW]=週邊設備
-diff -Nuar trinity-tdebase-3.5.13.2/applnk.ORI/kde-utilities-pim.directory trinity-tdebase-3.5.13.2/applnk/kde-utilities-pim.directory
---- trinity-tdebase-3.5.13.2/applnk.ORI/kde-utilities-pim.directory	2013-07-28 15:44:30.820668728 +0200
-+++ trinity-tdebase-3.5.13.2/applnk/kde-utilities-pim.directory	1970-01-01 01:00:00.000000000 +0100
-@@ -1,45 +0,0 @@
--[Desktop Entry]
--Encoding=UTF-8
--Type=Directory
--Name=PIM
--Name[ar]=مدبِر المعلومات الشخصي
--Name[be]=Кіраўнік персанальнай інфармацыі
--Name[bn]=পি-আই-এম
--Name[csb]=Priwatnô wëdowiédzô
--Name[eo]=PCI
--Name[he]=ניהול מידע אישי
--Name[ne]=पी आई एम
--Name[pl]=Informacje osobiste
--Name[ro]=Manager de Informații Personale
--Name[ru]=Персональная информация
--Name[se]=Peršuvnnalaš diehtogieđahalli
--Name[sl]=Osebni podatki
--Name[sv]=Personlig information
--Name[te]=పిఐఎం
--Name[th]=ตัวจัดการข้อมูลส่วนตัว
--Name[uk]=Керування інформацією
--Name[zh_CN]=个人信息管理
--Icon=korganizer
--Comment=PIM
--Comment[af]=Persoonlike Informasie Bestuurder
--Comment[ar]=مدبر المعلومات الشخصي
--Comment[be]=Кіраўнік персанальнай інфармацыі
--Comment[bn]=পি-আই-এম
--Comment[csb]=Sprôwianie priwatną wëdowiédzą
--Comment[de]=Persönliches Informationsmanagement
--Comment[eo]=PCI
--Comment[fy]=Persoanlike Ynformaasje Behear
--Comment[he]=ניהול מידע אישי
--Comment[kk]=Дербес ақпарат менеджері
--Comment[ne]=पी आई एम
--Comment[nl]=Persoonlijke Informatie Management
--Comment[pl]=Zarządzanie informacjami osobistymi
--Comment[ro]=Manager de Informații Personale
--Comment[ru]=Управление личной информацией (PIM)
--Comment[se]=Peršuvnnalaš diehtogieđahalli
--Comment[sl]=Osebni podatki
--Comment[sv]=Personlig informationshantering
--Comment[te]=పిఐఎం
--Comment[th]=สำหรับจัดการข้อมูลส่วนตัว เช่น เบอร์โทรศัพท์, ที่อยู่
--Comment[uk]=Керування особистою інформацією (PIM)
--Comment[zh_CN]=个人信息管理
-diff -Nuar trinity-tdebase-3.5.13.2/applnk.ORI/kde-utilities-xutils.directory trinity-tdebase-3.5.13.2/applnk/kde-utilities-xutils.directory
---- trinity-tdebase-3.5.13.2/applnk.ORI/kde-utilities-xutils.directory	2013-07-28 15:44:30.821668706 +0200
-+++ trinity-tdebase-3.5.13.2/applnk/kde-utilities-xutils.directory	1970-01-01 01:00:00.000000000 +0100
-@@ -1,166 +0,0 @@
--[Desktop Entry]
--Encoding=UTF-8
--Type=Directory
--Name=X-Utilities
--Name[ar]=عدة X
--Name[az]=X Tə'minatları
--Name[be]=Службовыя праграмы X
--Name[bg]=Инструменти за X
--Name[bn]=এক্স-উইটিলিটি
--Name[br]=Mavegoù X
--Name[ca]=Utilitats de X
--Name[cs]=Nástroje X
--Name[csb]=X - nôrzãdza
--Name[cy]=Defnyddioldebau-X
--Name[da]=X-Redskaber
--Name[de]=X-Dienstprogramme
--Name[el]=Εργαλεία-X
--Name[eo]=X-Utilaĵoj
--Name[es]=Utilidades-X
--Name[et]=X'i utiliidid
--Name[eu]=X-tresnak
--Name[fa]=برنامه‌های سودمند X
--Name[fi]=X-Apuohjelmat
--Name[fo]=Hentleikar til X
--Name[fr]=Utilitaires X
--Name[fy]=Grafyske helpprogramma's
--Name[ga]=Uirlisí X
--Name[gl]=Utilidades das X
--Name[he]=כלי X
--Name[hi]=एक्स-यूटिलिटीज़
--Name[hr]=X-alati
--Name[hsb]=Pomocniki za X
--Name[hu]=X segédprogramok
--Name[is]=X Tól
--Name[it]=Programmi di X
--Name[ja]=X-ユーティリティ
--Name[ka]= X-ხელსაწყოები
--Name[kk]=X-утилиталар
--Name[km]=ឧបករណ៍-X
--Name[ko]=X 유틸리티
--Name[lo]=ໃຊ້ປະໂຫຍດ์ X
--Name[lt]=X pagalbininkai
--Name[lv]=X Utilītas
--Name[mk]=X-алатки
--Name[mn]=X-Хэрэгслүүд
--Name[ms]=Utiliti X
--Name[mt]=Utilitajiet tal-X
--Name[nb]=X-verktøy
--Name[nds]=X-Warktüüch
--Name[ne]=X-युटिलिटी
--Name[nl]=Grafische hulpprogramma's
--Name[nn]=X-verktøy
--Name[nso]=X-Didiriswa
--Name[pa]=X-ਸਹੂਲਤ
--Name[pl]=Narzędzia dla X
--Name[pt]=Utilitários do X
--Name[pt_BR]=Utilitários X
--Name[ro]=Utilitare X
--Name[ru]=Утилиты X
--Name[rw]=X-Nkemurabibazo
--Name[se]=X-reaiddut
--Name[sk]=Nastroje pre X
--Name[sl]=Potrebščine za X
--Name[sr]=X-алати
--Name[sr@Latn]=X-alati
--Name[ss]=Kwekusetjentiswa-X
--Name[sv]=X-verktyg
--Name[ta]=X-கருவிகள்
--Name[te]=ఎక్స్-సౌలభ్యాలు
--Name[tg]=Лавозимотҳои X
--Name[th]=โปรแกรมอรรถประโยชน์ X
--Name[tr]=X Yardımcı Programları
--Name[tt]=X-Faydalıq
--Name[uk]=Утиліти X Window
--Name[uz]=X uchun vositalar
--Name[uz@cyrillic]=X учун воситалар
--Name[ven]=Zwishumiswa-X
--Name[vi]=Tiện ích X
--Name[wa]=Usteyes X
--Name[xh]=Izinto eziluncedo ze-X
--Name[zh_CN]=X 实用工具
--Name[zh_TW]=X-實用工具
--Name[zu]=Izisebenzi ze-X
--Icon=xapp
--Comment=X Window Utilities
--Comment[af]=X Window Nutsprogramme
--Comment[ar]=عدة نوافذ X
--Comment[az]=X Window Tə'minatları
--Comment[be]=Службовыя праграмы X Window
--Comment[bg]=Помощни програми за сървъра X
--Comment[bn]=এক্স উইণ্ডো সিস্টেম সম্বন্ধিত নানা প্রোগ্রাম
--Comment[br]=Mavegoù X Window
--Comment[bs]=Korisni X Window programi
--Comment[ca]=Utilitats de X Window System
--Comment[cs]=Nástroje X Window
--Comment[csb]=Nôrzãdza dlô systemë X Window
--Comment[cy]=Defnyddioldebau Ffenestr X
--Comment[da]=X-Window redskaber
--Comment[de]=X-Window-Dienstprogramme
--Comment[el]=Εργαλεία των X Windows
--Comment[eo]=Utilaĵoj por la X-Fenestrosistemo
--Comment[es]=Utilidades X Window
--Comment[et]=X Window utiliidid
--Comment[eu]=X Window tresnak
--Comment[fa]=برنامه‌های سودمند پنجرۀ X
--Comment[fi]=X Window -apuohjelmat
--Comment[fo]=Hentleikar til X
--Comment[fr]=Utilitaires X-Window
--Comment[fy]=X Window-helpprogramma's
--Comment[ga]=Uirlisí Fuinneoga X
--Comment[gl]=Utilidades das X Window
--Comment[he]=כלים של X Window
--Comment[hi]=एक्स विंडो यूटिलिटीज़
--Comment[hr]=Alati X prozora
--Comment[hsb]=Pomocne programy za X11
--Comment[hu]=X Window segédprogramok
--Comment[is]=X gluggatól
--Comment[it]=Programmi di X Window
--Comment[ja]=X ウィンドウユーティリティ
--Comment[ka]=X Window–ს ხელსაწყოები
--Comment[kk]=X Window утилиталары
--Comment[km]=ឧបករណ៍ X Window
--Comment[ko]=X 윈도 유틸리티
--Comment[lo]=ໂປຣແກຣມໃຊ້ໂຫຍດຂອງ X
--Comment[lt]=X Window pagalbininkai
--Comment[lv]=X logu utilītas
--Comment[mk]=Алатки за X Window
--Comment[mn]=X-Виндов-хэрэгсэл програмууд
--Comment[ms]=Utiliti Tetingkap X
--Comment[mt]=Utilitajiet tal-XWindows
--Comment[nb]=Verktøy for X-window
--Comment[nds]=Hülpprogrammen för X-Finstern
--Comment[ne]=X सञ्झ्याल युटिलिटी
--Comment[nl]=X Window-hulpprogramma's
--Comment[nn]=X Window-verktøy
--Comment[nso]=Didiriswa tsa X Window
--Comment[pa]=X Window ਸਹੂਲਤਾਂ
--Comment[pl]=Narzędzia dla systemu XWindow
--Comment[pt]=Utilitários do X Window
--Comment[pt_BR]=Utilitários do X Window
--Comment[ro]=Utilitare X Window
--Comment[ru]=Утилиты X Window
--Comment[rw]=Nkemurabibazo Idirishya X
--Comment[se]=X Window-reaiddut
--Comment[sk]=Nástroje pre X Window
--Comment[sl]=Potrebščine za X Window
--Comment[sr]=X Window алати
--Comment[sr@Latn]=X Window alati
--Comment[ss]=X kwekusetjentiswa kweliwindi
--Comment[sv]=X-window-verktyg
--Comment[ta]=X-சாளர கருவிகள்
--Comment[te]=ఎక్స్ విండో సౌలభ్యాలు
--Comment[tg]=Лавозимотҳои Х Window
--Comment[th]=โปรแกรมอรรถประโยชน์ของ X
--Comment[tr]=X Yardımcı Programları
--Comment[tt]=X Window Faydalığı
--Comment[uk]=Утиліти системи X Window
--Comment[uz]=X Windows vositalari
--Comment[uz@cyrillic]=X Windows воситалари
--Comment[ven]=Zwishumiswa zwa X window
--Comment[vi]=Các tiện ích của X window
--Comment[wa]=Usteyes pol sistinme grafike X11
--Comment[xh]=X Windows Izinto eziluncedo
--Comment[zh_CN]=X Window 实用工具
--Comment[zh_TW]=X 視窗實用工具
--Comment[zu]=Izisebenzi ze-X Window
-diff -Nuar trinity-tdebase-3.5.13.2/applnk.ORI/Makefile.am trinity-tdebase-3.5.13.2/applnk/Makefile.am
---- trinity-tdebase-3.5.13.2/applnk.ORI/Makefile.am	2013-07-28 15:44:30.820668728 +0200
-+++ trinity-tdebase-3.5.13.2/applnk/Makefile.am	2013-07-28 15:47:19.313022892 +0200
-@@ -1,58 +1,58 @@
- SUBDIRS = compat
- 
--xdg_menu_DATA = kde-settings.menu kde-information.menu kde-screensavers.menu
-+xdg_menu_DATA = tde-settings.menu tde-information.menu tde-screensavers.menu
- 
--xdg_mergedmenu_DATA = kde-essential.menu
-+xdg_mergedmenu_DATA = tde-essential.menu
- xdg_mergedmenudir = $(xdg_menudir)/applications-merged
- 
- xdg_directory_DATA = \
--kde-main.directory \
--kde-development.directory \
--kde-editors.directory \
--kde-edutainment.directory \
--kde-games-arcade.directory \
--kde-games-board.directory \
--kde-games-card.directory \
--kde-games-kids.directory \
--kde-games-roguelikes.directory \
--kde-games-strategy.directory \
--kde-games.directory \
--kde-graphics.directory \
--kde-information.directory \
--kde-internet-terminal.directory \
--kde-internet.directory \
--kde-more.directory \
--kde-multimedia.directory \
--kde-office.directory \
--kde-science.directory \
--kde-settings-accessibility.directory \
--kde-settings-components.directory \
--kde-settings-desktop.directory \
--kde-settings-looknfeel.directory \
--kde-settings-network.directory \
--kde-settings-peripherals.directory \
--kde-settings-hardware.directory \
--kde-settings-power.directory \
--kde-settings-security.directory \
--kde-settings-sound.directory \
--kde-settings-system.directory \
--kde-settings-webbrowsing.directory \
--kde-settings.directory \
--kde-settingsmenu.directory \
--kde-system-screensavers.directory \
--kde-system-terminal.directory \
--kde-system.directory \
--kde-toys.directory \
--kde-unknown.directory \
--kde-utilities-xutils.directory \
--kde-utilities.directory \
--kde-utilities-accessibility.directory \
--kde-utilities-desktop.directory \
--kde-utilities-peripherals.directory \
--kde-utilities-file.directory \
--kde-utilities-pim.directory \
--kde-development-translation.directory \
--kde-development-webdevelopment.directory
-+tde-main.directory \
-+tde-development.directory \
-+tde-editors.directory \
-+tde-edutainment.directory \
-+tde-games-arcade.directory \
-+tde-games-board.directory \
-+tde-games-card.directory \
-+tde-games-kids.directory \
-+tde-games-roguelikes.directory \
-+tde-games-strategy.directory \
-+tde-games.directory \
-+tde-graphics.directory \
-+tde-information.directory \
-+tde-internet-terminal.directory \
-+tde-internet.directory \
-+tde-more.directory \
-+tde-multimedia.directory \
-+tde-office.directory \
-+tde-science.directory \
-+tde-settings-accessibility.directory \
-+tde-settings-components.directory \
-+tde-settings-desktop.directory \
-+tde-settings-looknfeel.directory \
-+tde-settings-network.directory \
-+tde-settings-peripherals.directory \
-+tde-settings-hardware.directory \
-+tde-settings-power.directory \
-+tde-settings-security.directory \
-+tde-settings-sound.directory \
-+tde-settings-system.directory \
-+tde-settings-webbrowsing.directory \
-+tde-settings.directory \
-+tde-settingsmenu.directory \
-+tde-system-screensavers.directory \
-+tde-system-terminal.directory \
-+tde-system.directory \
-+tde-toys.directory \
-+tde-unknown.directory \
-+tde-utilities-xutils.directory \
-+tde-utilities.directory \
-+tde-utilities-accessibility.directory \
-+tde-utilities-desktop.directory \
-+tde-utilities-peripherals.directory \
-+tde-utilities-file.directory \
-+tde-utilities-pim.directory \
-+tde-development-translation.directory \
-+tde-development-webdevelopment.directory
- 
- install-data-local:
- 	for file in `cat $(srcdir)/old_desktop_files` ; do \
-diff -Nuar trinity-tdebase-3.5.13.2/applnk.ORI/tde-development.directory trinity-tdebase-3.5.13.2/applnk/tde-development.directory
---- trinity-tdebase-3.5.13.2/applnk.ORI/tde-development.directory	1970-01-01 01:00:00.000000000 +0100
-+++ trinity-tdebase-3.5.13.2/applnk/tde-development.directory	2013-07-28 15:47:19.313022892 +0200
-@@ -0,0 +1,89 @@
-+[Desktop Entry]
-+Encoding=UTF-8
-+Type=Directory
-+Name=Development
-+Name[af]=Ontwikkeling
-+Name[ar]=تطوير
-+Name[az]=İnkişaf
-+Name[be]=Распрацоўка
-+Name[bg]=Разработка
-+Name[bn]=ডেভেলপমেন্ট
-+Name[br]=Diorren
-+Name[bs]=Programiranje
-+Name[ca]=Desenvolupament
-+Name[cs]=Vývoj
-+Name[csb]=Nôrzãdza programistów
-+Name[cy]=Datblygu
-+Name[da]=Udvikling
-+Name[de]=Entwicklung
-+Name[el]=Ανάπτυξη
-+Name[eo]=Programado
-+Name[es]=Desarrollo
-+Name[et]=Arendus
-+Name[eu]=Garapena
-+Name[fa]=توسعه
-+Name[fi]=Kehitystyökalut
-+Name[fo]=Menning
-+Name[fr]=Développement
-+Name[fy]=Untwikkelje
-+Name[ga]=Forbairt
-+Name[gl]=Desenvolvemento
-+Name[he]=פיתוח
-+Name[hi]=विकास
-+Name[hr]=Razvoj
-+Name[hsb]=Wuwiwanje
-+Name[hu]=Fejlesztőeszközök
-+Name[id]=Pembangun
-+Name[is]=Þróun
-+Name[it]=Sviluppo
-+Name[ja]=開発
-+Name[ka]=განვითარება
-+Name[kk]=Жетілдіру
-+Name[km]=ការ​អភិវឌ្ឍន៍
-+Name[ko]=개발
-+Name[lo]=ພັດທະນາໂປຣແກຣມ
-+Name[lt]=Programavimas
-+Name[lv]=Izstrāde
-+Name[mk]=Развој
-+Name[mn]=Хөгжүүлэл
-+Name[ms]=Pemaju
-+Name[mt]=Żvilupp
-+Name[nb]=Utvikling
-+Name[nds]=Utwickeln
-+Name[ne]=विकास
-+Name[nl]=Ontwikkeling
-+Name[nn]=Utvikling
-+Name[nso]=Thlabollogo
-+Name[oc]=Desvelopament
-+Name[pa]=ਵਿਕਾਸ
-+Name[pl]=Narzędzia programistów
-+Name[pt]=Desenvolvimento
-+Name[pt_BR]=Desenvolvimento
-+Name[ro]=Dezvoltare
-+Name[ru]=Разработка
-+Name[rw]=Iterambere
-+Name[se]=Ovdánahttin
-+Name[sk]=Vývoj
-+Name[sl]=Razvoj
-+Name[sr]=Развој
-+Name[sr@Latn]=Razvoj
-+Name[ss]=Kundlondlobala
-+Name[sv]=Utveckling
-+Name[ta]=உருவாக்கம்
-+Name[te]=డెవలప్మెంట్
-+Name[tg]=Такомул
-+Name[th]=พัฒนาโปรแกรม
-+Name[tr]=Geliştirme
-+Name[tt]=Citeşterü
-+Name[uk]=Розробка
-+Name[uz]=Tuzish
-+Name[uz@cyrillic]=Тузиш
-+Name[ven]=Nyaluwo
-+Name[vi]=Phát triển
-+Name[wa]=Programaedje
-+Name[xh]=Ubhekiso phambili
-+Name[zh_CN]=开发
-+Name[zh_TW]=程式開發
-+Name[zu]=Intuthuko
-+Icon=package_development
-+
-diff -Nuar trinity-tdebase-3.5.13.2/applnk.ORI/tde-development-translation.directory trinity-tdebase-3.5.13.2/applnk/tde-development-translation.directory
---- trinity-tdebase-3.5.13.2/applnk.ORI/tde-development-translation.directory	1970-01-01 01:00:00.000000000 +0100
-+++ trinity-tdebase-3.5.13.2/applnk/tde-development-translation.directory	2013-07-28 15:47:19.314022870 +0200
-@@ -0,0 +1,72 @@
-+[Desktop Entry]
-+Encoding=UTF-8
-+Type=Directory
-+Name=Translation
-+Name[af]=Vertaling
-+Name[ar]=ترجمة
-+Name[be]=Пераклад
-+Name[bg]=Превод
-+Name[bn]=অনুবাদ
-+Name[br]=Troidigezh
-+Name[bs]=Prevođenje
-+Name[ca]=Traducció
-+Name[cs]=Překlad
-+Name[csb]=Dolmaczënk
-+Name[cy]=Cyfieithiad
-+Name[da]=Oversættelse
-+Name[de]=Übersetzung
-+Name[el]=Μετάφραση
-+Name[eo]=Traduko
-+Name[es]=Traducción
-+Name[et]=Tõlkimine
-+Name[eu]=Itzulpengintza
-+Name[fa]=ترجمه
-+Name[fi]=Käännös
-+Name[fr]=Traduction
-+Name[fy]=Oersetting
-+Name[ga]=Aistriúchán
-+Name[gl]=Tradución
-+Name[he]=תרגום
-+Name[hr]=Prijevod
-+Name[hu]=Fordítás
-+Name[id]=Terjemahan
-+Name[is]=Þýðing
-+Name[it]=Traduzione
-+Name[ja]=翻訳
-+Name[ka]=თარგმნა
-+Name[kk]=Аудару
-+Name[km]=ការបកប្រែ
-+Name[ko]=번역
-+Name[lt]=Vertimas
-+Name[mk]=Превод
-+Name[ms]=Terjemahan
-+Name[nb]=Oversettelse
-+Name[nds]=Översetten
-+Name[ne]=अनुवाद
-+Name[nl]=Vertaling
-+Name[nn]=Omsetjing
-+Name[pa]=ਅਨੁਵਾਦ
-+Name[pl]=Tłumaczenie
-+Name[pt]=Tradução
-+Name[pt_BR]=Tradução
-+Name[ro]=Traducere
-+Name[ru]=Локализация
-+Name[se]=Jorgalus
-+Name[sk]=Preklad
-+Name[sl]=Prevajanje
-+Name[sr]=Превод
-+Name[sr@Latn]=Prevod
-+Name[sv]=Översättning
-+Name[te]=అనువాదం
-+Name[tg]=Тарҷума
-+Name[th]=เครื่องมือแปลภาษา
-+Name[tr]=Çeviri
-+Name[uk]=Переклад
-+Name[uz]=Tarjima
-+Name[uz@cyrillic]=Таржима
-+Name[vi]=Dịch
-+Name[wa]=Ratournaedje
-+Name[zh_CN]=翻译
-+Name[zh_TW]=翻譯
-+Icon=locale
-+
-diff -Nuar trinity-tdebase-3.5.13.2/applnk.ORI/tde-development-webdevelopment.directory trinity-tdebase-3.5.13.2/applnk/tde-development-webdevelopment.directory
---- trinity-tdebase-3.5.13.2/applnk.ORI/tde-development-webdevelopment.directory	1970-01-01 01:00:00.000000000 +0100
-+++ trinity-tdebase-3.5.13.2/applnk/tde-development-webdevelopment.directory	2013-07-28 15:47:19.314022870 +0200
-@@ -0,0 +1,71 @@
-+[Desktop Entry]
-+Encoding=UTF-8
-+Type=Directory
-+Name=Web Development
-+Name[af]=Web Ontwikkeling
-+Name[ar]=تطوير برامج للشبكة
-+Name[be]=Web-распрацоўка
-+Name[bg]=Уеб разработка
-+Name[bn]=ওয়েব ডেভেলপমেন্ট
-+Name[br]=Diorren gwiad
-+Name[bs]=Web programiranje
-+Name[ca]=Desenvolupament Web
-+Name[cs]=Webový vývoj
-+Name[csb]=Programòwanié WWW
-+Name[da]=Internet-udvikling
-+Name[de]=Web-Entwicklung
-+Name[el]=Δικτυακή ανάπτυξη
-+Name[eo]=Reta Programado
-+Name[es]=Desarrollo web
-+Name[et]=Veebiarendus
-+Name[eu]=Web garapena
-+Name[fa]=توسعۀ وب
-+Name[fi]=Webin kehitys
-+Name[fr]=Développement Internet
-+Name[fy]=Webûntwikkeling
-+Name[ga]=Forbairt Ghréasáin
-+Name[gl]=Desenvolvemento Web
-+Name[he]=פיתוח WEB
-+Name[hr]=Web razvoj
-+Name[hu]=Webes fejlesztőeszközök
-+Name[id]=Pengembangan Web
-+Name[is]=Vefhönnun
-+Name[it]=Sviluppo web
-+Name[ja]=ウェブ開発
-+Name[ka]=ვებ პროგრამირება
-+Name[kk]=Веб жобалау
-+Name[km]=ការបង្កើត​ទំព័រ​បណ្តាញ
-+Name[ko]=웹 개발
-+Name[lt]=Žiniatinklio programavimas
-+Name[mk]=Веб-развој
-+Name[ms]=Pembangunan Web
-+Name[nb]=Nettutvikling
-+Name[nds]=Nett-Utwickeln
-+Name[ne]=वेब विकास
-+Name[nl]=Webontwikkeling
-+Name[nn]=Nettutvikling
-+Name[pa]=ਵੈਬ ਵਿਕਾਸ
-+Name[pl]=Programowanie WWW
-+Name[pt]=Desenvolvimento Web
-+Name[pt_BR]=Desenvolvimento Web
-+Name[ro]=Dezvoltare web
-+Name[ru]=Веб-разработка
-+Name[se]=Fierpmádatovdánahttin
-+Name[sk]=Vývoj pre Web
-+Name[sl]=Spletni razvoj
-+Name[sr]=Веб развој
-+Name[sr@Latn]=Veb razvoj
-+Name[sv]=Webbutveckling
-+Name[te]=వెబ్ డెవలప్మెంట్
-+Name[tg]=Такомули Вэб
-+Name[th]=พัฒนาเว็บ
-+Name[tr]=Web Geliştirme
-+Name[uk]=Розробка веб-сторінок
-+Name[uz]=Veb uchun tuzish
-+Name[uz@cyrillic]=Веб учун тузиш
-+Name[vi]=Phát triển Mạng
-+Name[wa]=Programaedje waibe
-+Name[zh_CN]=Web 开发
-+Name[zh_TW]=網頁開發
-+Icon=package_network
-+
-diff -Nuar trinity-tdebase-3.5.13.2/applnk.ORI/tde-editors.directory trinity-tdebase-3.5.13.2/applnk/tde-editors.directory
---- trinity-tdebase-3.5.13.2/applnk.ORI/tde-editors.directory	1970-01-01 01:00:00.000000000 +0100
-+++ trinity-tdebase-3.5.13.2/applnk/tde-editors.directory	2013-07-28 15:47:19.314022870 +0200
-@@ -0,0 +1,85 @@
-+[Desktop Entry]
-+Encoding=UTF-8
-+Type=Directory
-+Name=Editors
-+Name[af]=Redigeerders
-+Name[ar]=محرري النصوص
-+Name[az]=Editorlar
-+Name[be]=Рэдактары
-+Name[bg]=Редактори
-+Name[bn]=সম্পাদক
-+Name[br]=Aozerien
-+Name[bs]=Editori
-+Name[cs]=Editory
-+Name[csb]=Editorë
-+Name[cy]=Golygyddion
-+Name[da]=Editorer
-+Name[de]=Editoren
-+Name[el]=Επεξεργαστές
-+Name[eo]=Redaktiloj
-+Name[es]=Editores
-+Name[et]=Redaktorid
-+Name[eu]=Editoreak
-+Name[fa]=ویرایشگرها
-+Name[fi]=Editorit
-+Name[fo]=Ritlar
-+Name[fr]=Éditeurs de texte
-+Name[fy]=Bewurkers
-+Name[ga]=Eagarthóirí
-+Name[gl]=Editores
-+Name[he]=עורכים
-+Name[hi]=संपादक
-+Name[hr]=Uređivači
-+Name[hsb]=Wobdźěłanje teksta
-+Name[hu]=Szövegszerkesztők
-+Name[id]=Editor
-+Name[is]=Ritlar
-+Name[it]=Editor
-+Name[ja]=エディタ
-+Name[ka]=რედაქტორი
-+Name[kk]=Редакторлар
-+Name[km]=កម្មវិធី​និពន្ធ
-+Name[ko]=편집기
-+Name[lo]=ແກ້ໄຂແຟ້ມຂໍ້ຄວາມ
-+Name[lt]=Redaktoriai
-+Name[lv]=Redaktori
-+Name[mk]=Уредувачи
-+Name[mn]=Боловсруулагч
-+Name[ms]=Penyunting
-+Name[mt]=Edituri
-+Name[nb]=Skriveprogrammer
-+Name[nds]=Editoren
-+Name[ne]=सम्पादक
-+Name[nn]=Skriveprogram
-+Name[nso]=Bafetosi
-+Name[pa]=ਸੰਪਾਦਕ
-+Name[pl]=Edytory
-+Name[pt]=Editores
-+Name[pt_BR]=Editores
-+Name[ro]=Editoare
-+Name[ru]=Редакторы
-+Name[rw]=Muhinduzi
-+Name[se]=Čállinprográmmat
-+Name[sk]=Editory
-+Name[sl]=Urejevalniki
-+Name[sr]=Уређивачи
-+Name[sr@Latn]=Uređivači
-+Name[ss]=Bahleli
-+Name[sv]=Editorer
-+Name[ta]=தொகுப்பாளர்கள்
-+Name[te]=ఎడిటర్లు
-+Name[tg]=Таҳриргарон
-+Name[th]=โปรแกรมแก้ไขข้อความ
-+Name[tr]=Düzenleyiciler
-+Name[tt]=Tözätkeç
-+Name[uk]=Редактори
-+Name[uz]=Tahrirchilar
-+Name[uz@cyrillic]=Таҳрирчилар
-+Name[ven]=Vhasengulusi
-+Name[vi]=Trình biên tập
-+Name[wa]=Aspougneus d' tecse
-+Name[xh]=Abahleli
-+Name[zh_CN]=编辑器
-+Name[zh_TW]=編輯器
-+Name[zu]=Abalungisi
-+Icon=package_editors
-diff -Nuar trinity-tdebase-3.5.13.2/applnk.ORI/tde-edutainment.directory trinity-tdebase-3.5.13.2/applnk/tde-edutainment.directory
---- trinity-tdebase-3.5.13.2/applnk.ORI/tde-edutainment.directory	1970-01-01 01:00:00.000000000 +0100
-+++ trinity-tdebase-3.5.13.2/applnk/tde-edutainment.directory	2013-07-28 15:47:19.314022870 +0200
-@@ -0,0 +1,86 @@
-+[Desktop Entry]
-+Encoding=UTF-8
-+Type=Directory
-+Name=Edutainment
-+Name[af]=Opvoedkundig
-+Name[ar]=التعليم الترفيهي
-+Name[az]=Təhsil
-+Name[be]=Адукацыя
-+Name[bg]=Образование
-+Name[bn]=শিক্ষামূলক মনোরঞ্জন
-+Name[br]=Deskadurezh
-+Name[bs]=Zabava i obrazovanje
-+Name[ca]=Educació
-+Name[cs]=Škola hrou
-+Name[csb]=Ùczba ë edukacëjô
-+Name[cy]=Addifyrwch
-+Name[da]=Uddannelse
-+Name[de]=Lernprogramme
-+Name[el]=Εκπαίδευση
-+Name[eo]=Amuzedukado
-+Name[es]=Entretenimientos educativos
-+Name[et]=Haridus
-+Name[eu]=Jolastu eta ikasi
-+Name[fa]=سرگرمی آموزشی
-+Name[fi]=Opetusviihde
-+Name[fo]=Undirvísing og -hald
-+Name[fr]=Éducatif
-+Name[fy]=Edukatyf
-+Name[ga]=Oideachluichí
-+Name[gl]=Educación
-+Name[he]=לומדות
-+Name[hi]=खेल-खेल में सीखें
-+Name[hr]=Obrazovna zabava
-+Name[hsb]=Wuknjenje a hrajkanje
-+Name[hu]=Oktatóprogramok
-+Name[is]=Kennsluleikir
-+Name[it]=Istruzione divertente
-+Name[ja]=エデュテインメント
-+Name[ka]=სასწავლო
-+Name[kk]=Оқыту
-+Name[km]=ល្បែង​កំសាន្ត​បង្កើន​ចំណេះដឹង
-+Name[ko]=교육
-+Name[lo]=ການສຶກສາແສນມ່ວນຊື່ນ
-+Name[lt]=Mokomosios programos
-+Name[lv]=Izglītošana
-+Name[mk]=Едукација и забава
-+Name[mn]=Боловсролын програм
-+Name[ms]=Hiburan Mendidik
-+Name[mt]=Edukazzjoni u Divertiment
-+Name[nb]=Lek og lær
-+Name[nds]=Spelen & Lehren
-+Name[ne]=शिक्षा मनोरञ्जन
-+Name[nl]=Educatief
-+Name[nn]=Underhaldningslæring
-+Name[nso]=Boithabiso bja Thuto
-+Name[pa]=ਸਿੱਖਿਆ
-+Name[pl]=Nauka i rozrywka
-+Name[pt]=Educação/Entretenimento
-+Name[pt_BR]=Educativo
-+Name[ro]=Educațional
-+Name[ru]=Образование
-+Name[se]=Stoahkan ja oahppan
-+Name[sk]=Škola hrou
-+Name[sl]=Zabava in učenje
-+Name[sr]=Образовање
-+Name[sr@Latn]=Obrazovanje
-+Name[ss]=Infundvo-tfokotisa
-+Name[sv]=Utbildning
-+Name[ta]=கல்வி
-+Name[te]=ఎడ్యూటెన్మెంట్
-+Name[tg]=Омӯзиш
-+Name[th]=การศึกษาแสนสนุก
-+Name[tr]=Eğitim ve Eğlence
-+Name[tt]=Öyränü & Yal itü
-+Name[uk]=Освітні
-+Name[uz]=Oʻynab oʻrganish
-+Name[uz@cyrillic]=Ўйнаб ўрганиш
-+Name[ven]=Pfunzotakadza
-+Name[vi]=Học vui
-+Name[wa]=Sicole avou plaijhi
-+Name[xh]=Ufundiso
-+Name[zh_CN]=寓教于乐
-+Name[zh_TW]=教育和娛樂
-+Name[zu]=Ezemfundo
-+Icon=package_edutainment
-+
-diff -Nuar trinity-tdebase-3.5.13.2/applnk.ORI/tde-essential.menu trinity-tdebase-3.5.13.2/applnk/tde-essential.menu
---- trinity-tdebase-3.5.13.2/applnk.ORI/tde-essential.menu	1970-01-01 01:00:00.000000000 +0100
-+++ trinity-tdebase-3.5.13.2/applnk/tde-essential.menu	2013-07-28 15:47:19.314022870 +0200
-@@ -0,0 +1,27 @@
-+ <!DOCTYPE Menu PUBLIC "-//freedesktop//DTD Menu 1.0//EN"
-+  "http://www.freedesktop.org/standards/menu-spec/1.0/menu.dtd">
-+
-+<Menu>
-+        <!-- The following menus are hidden by default -->
-+	<Menu>
-+		<Name>Settings</Name>
-+		<Directory>tde-settings.directory</Directory>
-+                <MergeFile>../tde-settings.menu</MergeFile>
-+	</Menu>
-+	<Menu>
-+		<Name>Information</Name>
-+		<Directory>tde-information.directory</Directory>
-+                <MergeFile>../tde-information.menu</MergeFile>
-+	</Menu>
-+        <Move>
-+           <Old>Settings/Information</Old><New>Information</New>
-+        </Move>
-+	<Menu>
-+		<Name>System</Name>
-+		<Menu>
-+			<Name>ScreenSavers</Name>
-+			<Directory>tde-system-screensavers.directory</Directory>
-+	                <MergeFile>../tde-screensavers.menu</MergeFile>
-+		</Menu>
-+	</Menu>
-+</Menu>
-diff -Nuar trinity-tdebase-3.5.13.2/applnk.ORI/tde-games-arcade.directory trinity-tdebase-3.5.13.2/applnk/tde-games-arcade.directory
---- trinity-tdebase-3.5.13.2/applnk.ORI/tde-games-arcade.directory	1970-01-01 01:00:00.000000000 +0100
-+++ trinity-tdebase-3.5.13.2/applnk/tde-games-arcade.directory	2013-07-28 15:47:19.314022870 +0200
-@@ -0,0 +1,74 @@
-+[Desktop Entry]
-+Encoding=UTF-8
-+Type=Directory
-+Name=Arcade
-+Name[af]=Arkade
-+Name[ar]=ألعاب الــ Arcade
-+Name[az]=Əyləncə
-+Name[be]=Аркады
-+Name[bg]=Аркадни
-+Name[bn]=আর্কেড
-+Name[br]=C'hoarioù tavarn
-+Name[bs]=Arkade
-+Name[cs]=Arkády
-+Name[csb]=Chwatkòwé grë
-+Name[cy]=Arcêd
-+Name[da]=Arkade
-+Name[de]=Arkade
-+Name[eo]=Arkado
-+Name[et]=Võitlusmängud
-+Name[fa]=گذرگاه تاقدار
-+Name[fo]=Arkaduspøl
-+Name[fr]=Jeux d'arcade
-+Name[fy]=Arkade
-+Name[ga]=Stuara Siamsa
-+Name[he]=משחקי Arcade
-+Name[hi]=ऑर्केड
-+Name[hr]=Arkada
-+Name[hu]=Ügyességi játékok
-+Name[is]=Spilasalur
-+Name[ja]=アーケード
-+Name[kk]=Аркад ойындары
-+Name[km]=ធ្វើ​ដំណើរ
-+Name[ko]=아케이드
-+Name[lo]=ເກມອາເຄດ
-+Name[lt]=Arkada
-+Name[lv]=Arkāde
-+Name[mk]=Аркадни игри
-+Name[mn]=Сансар
-+Name[ms]=Arked
-+Name[mt]=Logħob tal-Arcades
-+Name[nb]=Arkade
-+Name[nds]=Speelhall
-+Name[ne]=आर्केड
-+Name[nn]=Arkade
-+Name[pa]=ਅਰਕਾਡੀ
-+Name[pl]=Gry zręcznościowe
-+Name[pt]=Arcada
-+Name[ro]=Aventuri
-+Name[ru]=Аркады
-+Name[rw]=Ikirongozi
-+Name[se]=Fearán
-+Name[sk]=Akčné hry
-+Name[sl]=Arkade
-+Name[sr]=Аркадне
-+Name[sr@Latn]=Arkadne
-+Name[sv]=Arkad
-+Name[ta]=ஆர்கேட்
-+Name[te]=ఆర్కేడ్
-+Name[tg]=Силсилаи бозиҳо
-+Name[th]=เกมอาเขต
-+Name[tr]=Oyun Makinesi
-+Name[tt]=Arkad
-+Name[uk]=Аркади
-+Name[uz]=Arkada
-+Name[uz@cyrillic]=Аркада
-+Name[ven]=Petea
-+Name[vi]=Mái vòm
-+Name[wa]=Årcåde
-+Name[xh]=Umqolo wesakhiwo esiphatha ubunzima bento
-+Name[zh_CN]=街机
-+Name[zh_TW]=大型遊戲機遊戲
-+Name[zu]=Umhhume
-+Icon=package_games_arcade
-+X-KDE-SuppressGenericNames=Game,Arcade Game
-diff -Nuar trinity-tdebase-3.5.13.2/applnk.ORI/tde-games-board.directory trinity-tdebase-3.5.13.2/applnk/tde-games-board.directory
---- trinity-tdebase-3.5.13.2/applnk.ORI/tde-games-board.directory	1970-01-01 01:00:00.000000000 +0100
-+++ trinity-tdebase-3.5.13.2/applnk/tde-games-board.directory	2013-07-28 15:47:19.315022849 +0200
-@@ -0,0 +1,81 @@
-+[Desktop Entry]
-+Encoding=UTF-8
-+Type=Directory
-+Name=Board Games
-+Name[af]=Bord Speletjies
-+Name[ar]=ألعاب الألواح
-+Name[az]=Lüvhə Oyunları
-+Name[be]=Настольныя гульні
-+Name[bg]=Игри на дъска
-+Name[bn]=বোর্ডের খেলা
-+Name[br]=C'hoarioù taolenn
-+Name[bs]=Igre na ploči
-+Name[ca]=Jocs de taula
-+Name[cs]=Deskové hry
-+Name[csb]=Planszowé grë
-+Name[cy]=Gemau Bwrdd
-+Name[da]=Brætspil
-+Name[de]=Brettspiele
-+Name[el]=Επιτραπέζια παιχνίδια
-+Name[eo]=Tabuloludoj
-+Name[es]=Juegos de tablero
-+Name[et]=Lauamängud
-+Name[eu]=Mahai jokoak
-+Name[fa]=بازیهای تخته
-+Name[fi]=Lautapelit
-+Name[fr]=Jeux de plateau
-+Name[fy]=Boardspultsjes
-+Name[ga]=Cluichí Cláir
-+Name[gl]=Xogos de Taboleiro
-+Name[he]=משחקי לוח
-+Name[hi]=बिसात के खेल
-+Name[hr]=Igre na ploči
-+Name[hsb]=Deskowe hry
-+Name[hu]=Táblajátékok
-+Name[id]=Permainan Papan
-+Name[is]=Borðleikir
-+Name[it]=Giochi da tavolo
-+Name[ja]=ボードゲーム
-+Name[ka]=მაგიდის თამაშები
-+Name[kk]=Үстел ойындары
-+Name[km]=ល្បែង​ក្ដារ
-+Name[ko]=보드 게임
-+Name[lt]=Stalo žaidimai
-+Name[lv]=Galda spēles
-+Name[mk]=Игри на табла
-+Name[mn]=Хөлөгт тоглоом
-+Name[ms]=Permainan 'Board'
-+Name[mt]=Logħob tal-boards
-+Name[nb]=Brettspill
-+Name[nds]=Brettspelen
-+Name[ne]=बोर्ड खेल
-+Name[nl]=Bordspellen
-+Name[nn]=Brettspel
-+Name[pa]=ਬੋਰਡ ਖੇਡਾਂ
-+Name[pl]=Gry planszowe
-+Name[pt]=Jogos de Tabuleiro
-+Name[pt_BR]=Jogos de Tabuleiro
-+Name[ro]=Jocuri de table
-+Name[ru]=Настольные игры
-+Name[rw]=Imikino y'Umuryango
-+Name[se]=Duolbbášspealut
-+Name[sk]=Stolové hry
-+Name[sl]=Namizne igre
-+Name[sr]=Игре на табли
-+Name[sr@Latn]=Igre na tabli
-+Name[sv]=Brädspel
-+Name[ta]=மேசை விளையாட்டுகள்
-+Name[te]=పలక ఆటలు
-+Name[tg]=Бозиҳои рӯимизӣ
-+Name[th]=เกมกระดาน
-+Name[tr]=Masaüstü Oyunları
-+Name[tt]=Östäl Uyını
-+Name[uk]=Ігри на дошці
-+Name[uz]=Stol oʻyinlari
-+Name[uz@cyrillic]=Стол ўйинлари
-+Name[vi]=Trò chơi bảng
-+Name[wa]=Djeus d' platea
-+Name[zh_CN]=棋类游戏
-+Name[zh_TW]=棋盤遊戲
-+Icon=package_games_board
-+X-KDE-SuppressGenericNames=Game,Board Game
-diff -Nuar trinity-tdebase-3.5.13.2/applnk.ORI/tde-games-card.directory trinity-tdebase-3.5.13.2/applnk/tde-games-card.directory
---- trinity-tdebase-3.5.13.2/applnk.ORI/tde-games-card.directory	1970-01-01 01:00:00.000000000 +0100
-+++ trinity-tdebase-3.5.13.2/applnk/tde-games-card.directory	2013-07-28 15:47:19.315022849 +0200
-@@ -0,0 +1,81 @@
-+[Desktop Entry]
-+Encoding=UTF-8
-+Type=Directory
-+Name=Card Games
-+Name[af]=Kaart Speletjies
-+Name[ar]=ألعاب الورق
-+Name[az]=Kart Oyunları
-+Name[be]=Картавыя гульні
-+Name[bg]=Игри с карти
-+Name[bn]=তাসের খেলা
-+Name[br]=C'hoarioù Kartennoù
-+Name[bs]=Igre sa kartama
-+Name[ca]=Jocs de cartes
-+Name[cs]=Karetní hry
-+Name[csb]=Kartowé grë
-+Name[cy]=Gemau Cardiau
-+Name[da]=Kortspil
-+Name[de]=Kartenspiele
-+Name[el]=Παιχνίδια καρτών
-+Name[eo]=Kartludoj
-+Name[es]=Juegos de cartas
-+Name[et]=Kaardimängud
-+Name[eu]=Karta jokoak
-+Name[fa]=بازیهای کارت
-+Name[fi]=Korttipelit
-+Name[fr]=Jeux de cartes
-+Name[fy]=Kaartspultsjes
-+Name[ga]=Cluichí Cártaí
-+Name[gl]=Xogos de Cartas
-+Name[he]=משחקי קלפים
-+Name[hi]=ताश के खेल
-+Name[hr]=Igre s kartama
-+Name[hsb]=Kartowe hry
-+Name[hu]=Kártyajátékok
-+Name[id]=Permainan Kartu
-+Name[is]=Spilaleikir
-+Name[it]=Giochi di carte
-+Name[ja]=カードゲーム
-+Name[ka]=ბანქოს თამაშები
-+Name[kk]=Карта ойындары
-+Name[km]=ល្បែង​បៀរ
-+Name[ko]=카드 게임
-+Name[lt]=Kortų žaidimai
-+Name[lv]=Kāršu spēles
-+Name[mk]=Игри со карти
-+Name[mn]=Хөзрийн тоглоом
-+Name[ms]=Permainan Kad
-+Name[mt]=Logħob tal-Karti
-+Name[nb]=Kortspill
-+Name[nds]=Koortspelen
-+Name[ne]=कार्ड खेल
-+Name[nl]=Kaartspellen
-+Name[nn]=Kortspel
-+Name[pa]=ਤਾਸ਼ ਖੇਡਾਂ
-+Name[pl]=Gry karciane
-+Name[pt]=Jogos de Cartas
-+Name[pt_BR]=Jogos de Cartas 
-+Name[ro]=Jocuri de cărți
-+Name[ru]=Карточные игры
-+Name[rw]=Imikino y'Ikarita
-+Name[se]=Goartaspealut
-+Name[sk]=Kartové hry
-+Name[sl]=Igre s kartami
-+Name[sr]=Игре са картама
-+Name[sr@Latn]=Igre sa kartama
-+Name[sv]=Kortspel
-+Name[ta]=சீட்டு விளையாட்டுகள்
-+Name[te]=పేక ఆటలు
-+Name[tg]=Бозиҳои корт
-+Name[th]=เกมไพ่ต่าง ๆ
-+Name[tr]=Kart Oyunları
-+Name[tt]=Kard Uyını
-+Name[uk]=Карткові ігри
-+Name[uz]=Qarta oʻyinlari
-+Name[uz@cyrillic]=Қарта ўйинлари
-+Name[vi]=Trò chơi thẻ
-+Name[wa]=Cwårdjeus
-+Name[zh_CN]=牌类游戏
-+Name[zh_TW]=紙牌遊戲
-+Icon=package_games_card
-+X-KDE-SuppressGenericNames=Game,Card Game
-diff -Nuar trinity-tdebase-3.5.13.2/applnk.ORI/tde-games.directory trinity-tdebase-3.5.13.2/applnk/tde-games.directory
---- trinity-tdebase-3.5.13.2/applnk.ORI/tde-games.directory	1970-01-01 01:00:00.000000000 +0100
-+++ trinity-tdebase-3.5.13.2/applnk/tde-games.directory	2013-07-28 15:47:19.315022849 +0200
-@@ -0,0 +1,89 @@
-+[Desktop Entry]
-+Encoding=UTF-8
-+Type=Directory
-+Name=Games
-+Name[af]=Speletjies
-+Name[ar]=ألعاب
-+Name[az]=Oyunlar
-+Name[be]=Гульні
-+Name[bg]=Игри
-+Name[bn]=খেলা
-+Name[br]=C'hoarioù
-+Name[bs]=Igre
-+Name[ca]=Jocs
-+Name[cs]=Hry
-+Name[csb]=Grë
-+Name[cy]=Gemau
-+Name[da]=Spil
-+Name[de]=Spiele
-+Name[el]=Παιχνίδια
-+Name[eo]=Ludoj
-+Name[es]=Juegos
-+Name[et]=Mängud
-+Name[eu]=Jokoak
-+Name[fa]=بازیها
-+Name[fi]=Pelit
-+Name[fo]=Spøl
-+Name[fr]=Jeux
-+Name[fy]=Amusemint
-+Name[ga]=Cluichí
-+Name[gl]=Xogos
-+Name[he]=משחקים
-+Name[hi]=खेल
-+Name[hr]=Igre
-+Name[hsb]=Hry
-+Name[hu]=Játékok
-+Name[id]=Permainan
-+Name[is]=Leikir
-+Name[it]=Giochi
-+Name[ja]=ゲーム
-+Name[ka]=თამაშები
-+Name[kk]=Ойындар
-+Name[km]=ល្បែង
-+Name[ko]=게임
-+Name[lo]=ເກມ
-+Name[lt]=Žaidimai
-+Name[lv]=Spēles
-+Name[mk]=Игри
-+Name[mn]=Тоглоом
-+Name[ms]=Permainan
-+Name[mt]=Logħob
-+Name[nb]=Spill
-+Name[nds]=Spelen
-+Name[ne]=खेल
-+Name[nl]=Amusement
-+Name[nn]=Spel
-+Name[nso]=Dipapadi
-+Name[oc]=Jogs
-+Name[pa]=ਖੇਡਾਂ
-+Name[pl]=Gry
-+Name[pt]=Jogos
-+Name[pt_BR]=Jogos
-+Name[ro]=Jocuri
-+Name[ru]=Игры
-+Name[rw]=Imikino
-+Name[se]=Spealut
-+Name[sk]=Hry
-+Name[sl]=Igre
-+Name[sr]=Игре
-+Name[sr@Latn]=Igre
-+Name[ss]=Imidlalo
-+Name[sv]=Spel
-+Name[ta]=விளையாட்டுகள்
-+Name[te]=ఆటలు
-+Name[tg]=Бозиҳо
-+Name[th]=เกมส์
-+Name[tr]=Oyunlar
-+Name[tt]=Uyınnar
-+Name[uk]=Ігри
-+Name[uz]=Oʻyinlar
-+Name[uz@cyrillic]=Ўйинлар
-+Name[ven]=Mitambo
-+Name[vi]=Trò chơi
-+Name[wa]=Djeus
-+Name[xh]=Imidlalo
-+Name[zh_CN]=游戏
-+Name[zh_TW]=遊戲
-+Name[zu]=Imidlalo
-+Icon=package_games
-+
-diff -Nuar trinity-tdebase-3.5.13.2/applnk.ORI/tde-games-kids.directory trinity-tdebase-3.5.13.2/applnk/tde-games-kids.directory
---- trinity-tdebase-3.5.13.2/applnk.ORI/tde-games-kids.directory	1970-01-01 01:00:00.000000000 +0100
-+++ trinity-tdebase-3.5.13.2/applnk/tde-games-kids.directory	2013-07-28 15:47:19.315022849 +0200
-@@ -0,0 +1,88 @@
-+[Desktop Entry]
-+Encoding=UTF-8
-+Type=Directory
-+Name=Games for Kids
-+Name[af]=Kinder Speletjies
-+Name[ar]= ألعاب للأطفال
-+Name[az]=Uşaxlar Üçün Oyunlar
-+Name[be]=Дзіцячыя гульні
-+Name[bg]=Игри за деца
-+Name[bn]=বাচ্চাদের খেলা
-+Name[br]=C'hoarioù evit ar Bugale
-+Name[bs]=Igre za djecu
-+Name[ca]=Jocs per a nens
-+Name[cs]=Hry pro děti
-+Name[csb]=Grë dlô dzecë
-+Name[cy]=Gêmau ar gyfer Plant
-+Name[da]=Spil for børn
-+Name[de]=Spiele für Kinder
-+Name[el]=Παιχνίδια για παιδιά
-+Name[eo]=Ludoj por infanoj
-+Name[es]=Juegos para niños
-+Name[et]=Laste mängud
-+Name[eu]=Haur jokoak
-+Name[fa]=بازیهایی برای بچه‌ها
-+Name[fi]=Lasten pelit
-+Name[fo]=Spøl fyri børn
-+Name[fr]=Jeux pour les enfants
-+Name[fy]=Spultsjes foar bêrn
-+Name[ga]=Cluichí do Pháistí
-+Name[gl]=Xogos para Nenos
-+Name[he]=משחקים לילדים
-+Name[hi]=बच्चों के लिए खेल
-+Name[hr]=Igre za djecu
-+Name[hsb]=Hry za dźěći
-+Name[hu]=Játékok kicsiknek
-+Name[id]=Permainan Kanak-kanak
-+Name[is]=Leikir fyrir krakka
-+Name[it]=Giochi per bambini
-+Name[ja]=子供向けゲーム
-+Name[ka]=საბავშვო თამაშები
-+Name[kk]=Балалар ойындары
-+Name[km]=ល្បែង​សម្រាប់​កូន​ក្មេង
-+Name[ko]=어린이용 게임
-+Name[lo]=ເກມສຳລັບເດັກ
-+Name[lt]=Žaidimai vaikams
-+Name[lv]=Spēles bērniem
-+Name[mk]=Игри за деца
-+Name[mn]=Хүүхдийн тоглоом
-+Name[ms]=Permainan Kanak-kanak
-+Name[mt]=Logħob għat-tfal
-+Name[nb]=Spill for barn
-+Name[nds]=Spelen för Kinners
-+Name[ne]=केटाकेटीका लागि खेल
-+Name[nl]=spelletjes voor kinderen
-+Name[nn]=Barnespel
-+Name[nso]=Dipapadi tsa Bana
-+Name[pa]=ਬੱਚਿਆਂ ਲਈ ਖੇਡਾਂ
-+Name[pl]=Gry dla dzieci
-+Name[pt]=Jogos para Crianças
-+Name[pt_BR]=Jogos para Crianças
-+Name[ro]=Jocuri pentru copii
-+Name[ru]=Детские игры
-+Name[rw]=Imikino y'Abana
-+Name[se]=Mánáidspealut
-+Name[sk]=Hry pre deti
-+Name[sl]=Igre za otroke
-+Name[sr]=Игре за децу
-+Name[sr@Latn]=Igre za decu
-+Name[ss]=Imidlalo yebantfwana
-+Name[sv]=Spel för barn
-+Name[ta]=குழந்தைகளுக்கான விளையாட்டுகள்
-+Name[te]=పిల్లల ఆటలు
-+Name[tg]=Бозиҳои кӯдакона
-+Name[th]=เกมส์สำหรับเด็ก
-+Name[tr]=Çocuklar için Oyunlar
-+Name[tt]=Bala Uyını
-+Name[uk]=Ігри для дітей
-+Name[uz]=Kichkintoylar uchun oʻyinlar
-+Name[uz@cyrillic]=Кичкинтойлар учун ўйинлар
-+Name[ven]=Mitambo ya vhana
-+Name[vi]=Trò chơi cho Trẻ
-+Name[wa]=Djeus po ls efants
-+Name[xh]=Imidlalo Yabantwana
-+Name[zh_CN]=儿童游戏
-+Name[zh_TW]=小孩的遊戲
-+Name[zu]=Imidlalo yabantwana
-+Icon=package_games_kids
-+X-KDE-SuppressGenericNames=Game,Game for Children
-diff -Nuar trinity-tdebase-3.5.13.2/applnk.ORI/tde-games-roguelikes.directory trinity-tdebase-3.5.13.2/applnk/tde-games-roguelikes.directory
---- trinity-tdebase-3.5.13.2/applnk.ORI/tde-games-roguelikes.directory	1970-01-01 01:00:00.000000000 +0100
-+++ trinity-tdebase-3.5.13.2/applnk/tde-games-roguelikes.directory	2013-07-28 15:47:19.315022849 +0200
-@@ -0,0 +1,84 @@
-+[Desktop Entry]
-+Encoding=UTF-8
-+Type=Directory
-+Name=Rogue-like Games
-+Name[af]=Rogue-tipe Speletjies
-+Name[ar]=ألعاب شبه Rogue
-+Name[az]=Rogue Bənzəri Oyunlar
-+Name[be]=Гульны Rogue
-+Name[bg]=Хазартни игри
-+Name[bn]=রোগ্ (Rogue)-এর মত খেলা
-+Name[br]=Ur c'hoari a seurt gant Rogue
-+Name[bs]=Rogue-like igre
-+Name[ca]=Jocs com el Rogue
-+Name[cs]=Hry podobné Rogue
-+Name[csb]=Gré z familëji Rogue
-+Name[cy]=Gemau sy'n debyg i Rogue
-+Name[da]=Rogue-lignende spil
-+Name[de]=Rogue-ähnliche Spiele
-+Name[el]=Παιχνίδια τύπου Rogue
-+Name[eo]=Filudoj
-+Name[es]=Juegos tipo Rogue
-+Name[et]=Rogue-laadsed mängud
-+Name[eu]=Rogue motako jokoak
-+Name[fa]=بازیهای شبیه Rogue
-+Name[fi]=Rogue-tyyliset pelit
-+Name[fo]=Rogue-lík spøl
-+Name[fr]=Jeux à la Rogue
-+Name[fy]=Soarte mei rogue spulstjes
-+Name[ga]=Cluichí cosúil le Rogue
-+Name[gl]=Xogos do estilo de Rogue
-+Name[he]=משחקים נוסח Rogue
-+Name[hi]=छलिया जैसे खेल
-+Name[hr]=Igre kao Rogue
-+Name[hsb]=Hry, podobne na Rogue
-+Name[hu]=Rogue-szerű játékok
-+Name[id]=Permainan ala Rogue
-+Name[is]=Skotleikir
-+Name[it]=Giochi in stile Rogue
-+Name[ja]=Rogue 風のゲーム
-+Name[ka]= Rogue ტიპის თამაშები
-+Name[kk]=Rogue-секілді ойындар
-+Name[lo]=ເກມຄ້າຍ Rogue
-+Name[lt]=Išdykėlio tipo žaidimai
-+Name[lv]=Rogue līdzīgas spēles
-+Name[mk]=Игри како Rogue
-+Name[mn]=Rogue-тоглоом
-+Name[ms]=Permainan ala Rogue
-+Name[mt]=Logħob bħal Rogue
-+Name[nb]=Rollespill
-+Name[nds]=Spelen so as Rogue
-+Name[ne]=रग-प्रकारको खेल
-+Name[nl]=Rogue-achtige spellen
-+Name[nn]=Rogue-aktige spel
-+Name[nso]=Dipapadi tsa Bokalatsane
-+Name[pa]=ਠੱਗ-ਵਰਗੀਆਂ ਖੇਡਾਂ
-+Name[pl]=Gry z rodziny Rogue
-+Name[pt]=Jogos tipo Rogue
-+Name[pt_BR]=Jogos parecidos com Rogue
-+Name[ro]=Jocuri violente
-+Name[ru]=Ролевые игры в стиле Rogue
-+Name[rw]=Imikino Ingunge-nka
-+Name[se]=Rogue-lágána spealut
-+Name[sk]=Hry v štýle Rogue
-+Name[sl]=Igre kot Rogue
-+Name[sr]=Игре налик на Rogue
-+Name[sr@Latn]=Igre nalik na Rogue
-+Name[ss]=I-Rogue-lefana nemidlalo
-+Name[sv]=Spel som liknar Rogue
-+Name[ta]=முரட்டுதனமான விளையாட்டுகள்
-+Name[te]=రోగ్ లాంటి ఆటలు
-+Name[tg]=Бозиҳои шабиявии Rogue
-+Name[th]=เกมส์คล้าย Rogue
-+Name[tr]=Rogue benzeri oyunlar
-+Name[tt]=Gizeş Uyını
-+Name[uk]=Ігри на кшталт Rogue
-+Name[uz]=Rogue oʻyiniga oʻxshash oʻyinlar
-+Name[uz@cyrillic]=Rogue ўйинига ўхшаш ўйинлар
-+Name[ven]=U fhura-sa Mitambo
-+Name[vi]=Trò chơi giống Rogue
-+Name[wa]=Djeus ki rshonnèt-st a «rogue»
-+Name[xh]=Imidlalo efana ne Rogue
-+Name[zh_CN]=恶作剧游戏
-+Name[zh_TW]=冒險類遊戲
-+Name[zu]=Imidlalo enjenge-Rogue
-diff -Nuar trinity-tdebase-3.5.13.2/applnk.ORI/tde-games-strategy.directory trinity-tdebase-3.5.13.2/applnk/tde-games-strategy.directory
---- trinity-tdebase-3.5.13.2/applnk.ORI/tde-games-strategy.directory	1970-01-01 01:00:00.000000000 +0100
-+++ trinity-tdebase-3.5.13.2/applnk/tde-games-strategy.directory	2013-07-28 15:47:19.315022849 +0200
-@@ -0,0 +1,87 @@
-+[Desktop Entry]
-+Encoding=UTF-8
-+Type=Directory
-+Name=Tactics & Strategy
-+Name[af]=Strategie & Taktiek
-+Name[ar]=الألعاب الميدانية و الإستراتجية
-+Name[az]=Strategiya & Taktika
-+Name[be]=Тактыка і стратэгія
-+Name[bg]=Стратегически игри
-+Name[bn]=কৌশল এবং পরিকল্পনা
-+Name[br]=Brezelekaouriezh ha kadouriezh
-+Name[bs]=Taktika i strategija
-+Name[ca]=Tàctiques i estratègia
-+Name[cs]=Taktické a strategické
-+Name[csb]=Takticzné ë strategiczné grë
-+Name[cy]=Tactegau & Strategaeth
-+Name[da]=Taktik & Strategi
-+Name[de]=Strategie & Taktik
-+Name[el]=Τακτική & Στρατηγική
-+Name[eo]=Taktikoj & Strategioj
-+Name[es]=Táctica y estrategia
-+Name[et]=Taktika ja strateegia
-+Name[eu]=Taktika eta estrategia
-+Name[fa]=راهکارها و راهبردها
-+Name[fi]=Taktiikka ja strategia
-+Name[fo]=Taktikkur og strategi
-+Name[fr]=Tactique et stratégie
-+Name[fy]=Taktysk en strategysk
-+Name[ga]=Beartaíocht agus Straitéisí
-+Name[gl]=Tácticas e Estratexia
-+Name[he]=טקטיקה ואסטרטגיה
-+Name[hi]=रणनीतिक और कौशल
-+Name[hr]=Taktika i strategija
-+Name[hsb]=Strategiske hry
-+Name[hu]=Taktikai és stratégiai
-+Name[id]=Taktik dan Strategi
-+Name[is]=Kænska & áræði
-+Name[it]=Tattica e strategia
-+Name[ja]=戦略 & 戦術
-+Name[ka]=ტაქტიკა & სტრატეგია
-+Name[kk]=Тактика және стратегия
-+Name[km]=ក្បួន & យុទ្ធសាស្ត្រ
-+Name[ko]=전략 및 전술
-+Name[lo]=ເກມກົນລະຍຸດແລະວາງແຜນ
-+Name[lt]=Taktika ir strategija
-+Name[lv]=Taktika & Stratēģija
-+Name[mk]=Тактика и стратегија
-+Name[mn]=Тактик & стратеги
-+Name[ms]=Strategi dan Taktik
-+Name[mt]=Tattika u Strateġija
-+Name[nb]=Taktikk og strategi
-+Name[nds]=Taktik & Strategie
-+Name[ne]=कौशल र रणनीति
-+Name[nl]=Tactiek en Strategie
-+Name[nn]=Taktikk og strategi
-+Name[nso]=Mekgwanakgwana & Tselathwii
-+Name[pa]=ਤਕਨੀਕੀ ਤੇ ਗਿਆਨ
-+Name[pl]=Gry taktyczne i strategiczne
-+Name[pt]=Tácticas e Estratégia
-+Name[pt_BR]=Táticas & Estratégias
-+Name[ro]=Tactică și strategie
-+Name[ru]=Стратегия
-+Name[rw]=Imigabo & Imigambi
-+Name[se]=Taktihkka ja strategiija
-+Name[sk]=Taktické a strategické
-+Name[sl]=Taktika in strategija
-+Name[sr]=Тактика и стратегија
-+Name[sr@Latn]=Taktika i strategija
-+Name[ss]=Masu & indlela yekwenta
-+Name[sv]=Taktik och strategi
-+Name[ta]=உத்திகளும் தந்திரங்களும்
-+Name[te]=యుక్తి & తంత్రాలు
-+Name[tg]=Бозиҳои стратегӣ
-+Name[th]=เกมกลยุทธ์และวางแผน
-+Name[tr]=Taktik ve Strateji
-+Name[tt]=Taktik & Strategi
-+Name[uk]=Тактика та стратегія
-+Name[uz]=Taktika va strategiya
-+Name[uz@cyrillic]=Тактика ва стратегия
-+Name[ven]=Madzhenele & Maitele
-+Name[vi]=Chiến thuật và Chiến lược
-+Name[wa]=Tactike eyet stratedjeye
-+Name[xh]=Amacebo okufumana iinjongo & Amacebo okuzoba
-+Name[zh_CN]=策略游戏
-+Name[zh_TW]=戰略及策略
-+Name[zu]=Amaqhinga & Iplani
-+Icon=package_games_strategy
-diff -Nuar trinity-tdebase-3.5.13.2/applnk.ORI/tde-graphics.directory trinity-tdebase-3.5.13.2/applnk/tde-graphics.directory
---- trinity-tdebase-3.5.13.2/applnk.ORI/tde-graphics.directory	1970-01-01 01:00:00.000000000 +0100
-+++ trinity-tdebase-3.5.13.2/applnk/tde-graphics.directory	2013-07-28 15:47:19.316022827 +0200
-@@ -0,0 +1,89 @@
-+[Desktop Entry]
-+Encoding=UTF-8
-+Type=Directory
-+Name=Graphics
-+Name[af]=Grafieka
-+Name[ar]=برامج رسم
-+Name[az]=Qrafika
-+Name[be]=Графіка
-+Name[bg]=Графика
-+Name[bn]=গ্রাফিক্স
-+Name[br]=Grafikoù
-+Name[bs]=Grafika
-+Name[ca]=Gràfics
-+Name[cs]=Grafika
-+Name[csb]=Grafika
-+Name[cy]=Graffeg
-+Name[da]=Grafik
-+Name[de]=Graphik
-+Name[el]=Γραφικά
-+Name[eo]=Grafiko
-+Name[es]=Gráficos
-+Name[et]=Graafika
-+Name[eu]=Grafikoak
-+Name[fa]=نگاره‌ها
-+Name[fi]=Grafiikka
-+Name[fo]=Teknindi
-+Name[fr]=Graphisme
-+Name[fy]=Grafysk
-+Name[ga]=Grafaic
-+Name[gl]=Gráficos
-+Name[he]=גרפיקה
-+Name[hi]=चित्रकारी
-+Name[hr]=Grafika
-+Name[hsb]=Grafika
-+Name[hu]=Grafikai programok
-+Name[id]=Grafis
-+Name[is]=Myndvinnsla
-+Name[it]=Grafica
-+Name[ja]=グラフィックス
-+Name[ka]=გრაფიკა
-+Name[kk]=Графика
-+Name[km]=ក្រាហ្វិក
-+Name[ko]=그래픽
-+Name[lo]=ກຣາບຟິກ
-+Name[lt]=Grafika
-+Name[lv]=Grafika
-+Name[mk]=Графика
-+Name[mn]=График
-+Name[ms]=Grafik
-+Name[mt]=Grafika
-+Name[nb]=Bilde
-+Name[nds]=Grafik
-+Name[ne]=ग्राफिक्स
-+Name[nl]=Grafisch
-+Name[nn]=Grafikk
-+Name[nso]=Di-Graphics
-+Name[oc]=Grafics
-+Name[pa]=ਚਿੱਤਰਕਲਾ
-+Name[pl]=Grafika
-+Name[pt]=Gráficos
-+Name[pt_BR]=Gráficos
-+Name[ro]=Grafică
-+Name[ru]=Графика
-+Name[rw]=Ibishushanyo
-+Name[se]=Grafihkka
-+Name[sk]=Grafika
-+Name[sl]=Grafika
-+Name[sr]=Графика
-+Name[sr@Latn]=Grafika
-+Name[ss]=Titfombe-mdvwebo
-+Name[sv]=Grafik
-+Name[ta]=சித்திரங்கள்
-+Name[te]=గ్రాఫిక్స్
-+Name[tg]=Графика
-+Name[th]=กราฟิก
-+Name[tr]=Grafik Programları
-+Name[tt]=Sızım
-+Name[uk]=Графіка
-+Name[uz]=Grafika
-+Name[uz@cyrillic]=Графика
-+Name[ven]=Dzigirafu
-+Name[vi]=Đồ hoạ
-+Name[wa]=Grafikes
-+Name[xh]=Imizobo
-+Name[zh_CN]=图像
-+Name[zh_TW]=圖形
-+Name[zu]=Imidwebo
-+Icon=package_graphics
-+
-diff -Nuar trinity-tdebase-3.5.13.2/applnk.ORI/tde-information.directory trinity-tdebase-3.5.13.2/applnk/tde-information.directory
---- trinity-tdebase-3.5.13.2/applnk.ORI/tde-information.directory	1970-01-01 01:00:00.000000000 +0100
-+++ trinity-tdebase-3.5.13.2/applnk/tde-information.directory	2013-07-28 15:47:19.316022827 +0200
-@@ -0,0 +1,87 @@
-+[Desktop Entry]
-+Encoding=UTF-8
-+Type=Directory
-+Name=Information
-+Name[af]=Informasie
-+Name[ar]=معلومات
-+Name[az]=Mə'lumat
-+Name[be]=Інфармацыя
-+Name[bg]=Информация
-+Name[bn]=তথ্য
-+Name[br]=Titouroù
-+Name[bs]=Informacije
-+Name[ca]=Informació
-+Name[cs]=Informace
-+Name[csb]=Wëdowiédzô
-+Name[cy]=Gwybodaeth
-+Name[el]=Πληροφορίες
-+Name[eo]=Informoj
-+Name[es]=Información
-+Name[et]=Info
-+Name[eu]=Informazioa
-+Name[fa]=اطلاعات
-+Name[fi]=Järjestelmätiedot
-+Name[fo]=Upplýsingar
-+Name[fr]=Informations
-+Name[fy]=Ynformaasje
-+Name[ga]=Eolas
-+Name[gl]=Información
-+Name[he]=מידע
-+Name[hi]=जानकारी
-+Name[hr]=Podaci
-+Name[hsb]=Informacija
-+Name[hu]=Információ
-+Name[id]=Informasi
-+Name[is]=Upplýsingar
-+Name[it]=Informazioni
-+Name[ja]=情報
-+Name[ka]=ინფორმაცია
-+Name[kk]=Мәлімет
-+Name[km]=ព័ត៌មាន
-+Name[ko]=정보
-+Name[lo]=ຂໍ້ມູນຕ່າງໆ
-+Name[lt]=Informacija
-+Name[lv]=Informācija
-+Name[mk]=Информации
-+Name[mn]=Мэдээлэл
-+Name[ms]=Maklumat
-+Name[mt]=Informazzjoni
-+Name[nb]=Informasjon
-+Name[nds]=Informatschoon
-+Name[ne]=सूचना
-+Name[nl]=Informatie
-+Name[nn]=Informasjon
-+Name[nso]=Tshedimoso
-+Name[oc]=Infòrmacion
-+Name[pa]=ਜਾਣਕਾਰੀ
-+Name[pl]=Informacje
-+Name[pt]=Informação
-+Name[pt_BR]=Informação
-+Name[ro]=Informații
-+Name[ru]=Сведения
-+Name[rw]=Amakuru
-+Name[se]=Diehtu
-+Name[sk]=Informácie
-+Name[sl]=Informacije
-+Name[sr]=Информације
-+Name[sr@Latn]=Informacije
-+Name[ss]=Imininingwane
-+Name[ta]=தகவல்
-+Name[te]=సమాచారం
-+Name[tg]=Иттилоот
-+Name[th]=ข้อมูลต่างๆ
-+Name[tr]=Bilgi
-+Name[tt]=Beldermä
-+Name[uk]=Інформація
-+Name[uz]=Maʼlumot
-+Name[uz@cyrillic]=Маълумот
-+Name[ven]=Mafhungo
-+Name[vi]=Thông tin
-+Name[wa]=Informåcions
-+Name[xh]=Ulwazi
-+Name[zh_CN]=信息
-+Name[zh_TW]=資訊
-+Name[zu]=Ulwazi
-+Icon=hwinfo
-+X-KDE-BaseGroup=info
-+NoDisplay=true
-diff -Nuar trinity-tdebase-3.5.13.2/applnk.ORI/tde-information.menu trinity-tdebase-3.5.13.2/applnk/tde-information.menu
---- trinity-tdebase-3.5.13.2/applnk.ORI/tde-information.menu	1970-01-01 01:00:00.000000000 +0100
-+++ trinity-tdebase-3.5.13.2/applnk/tde-information.menu	2013-07-28 15:47:19.316022827 +0200
-@@ -0,0 +1,10 @@
-+ <!DOCTYPE Menu PUBLIC "-//freedesktop//DTD Menu 1.0//EN"
-+  "http://www.freedesktop.org/standards/menu-spec/1.0/menu.dtd">
-+
-+<Menu>
-+	<Name>Information</Name>
-+	<Directory>tde-information.directory</Directory>
-+	<Include>
-+		<Category>X-KDE-information</Category>
-+	</Include>
-+</Menu>
-diff -Nuar trinity-tdebase-3.5.13.2/applnk.ORI/tde-internet.directory trinity-tdebase-3.5.13.2/applnk/tde-internet.directory
---- trinity-tdebase-3.5.13.2/applnk.ORI/tde-internet.directory	1970-01-01 01:00:00.000000000 +0100
-+++ trinity-tdebase-3.5.13.2/applnk/tde-internet.directory	2013-07-28 15:47:19.316022827 +0200
-@@ -0,0 +1,48 @@
-+[Desktop Entry]
-+Encoding=UTF-8
-+Type=Directory
-+Name=Internet
-+Name[ar]=الإنترنت
-+Name[az]=İnternet
-+Name[be]=Інтэрнэт
-+Name[bg]=Интернет
-+Name[bn]=ইন্টারনেট
-+Name[br]=Kenrouedad
-+Name[cy]=Rhyngrwyd
-+Name[el]=Διαδίκτυο
-+Name[eo]=Interreto
-+Name[fa]=اینترنت
-+Name[fy]=Ynternet
-+Name[ga]=Idirlíon
-+Name[he]=אינטרנט
-+Name[hi]=इंटरनेट
-+Name[is]=Internetið
-+Name[ja]=インターネット
-+Name[ka]=ინტერნეტი
-+Name[kk]=Интернет
-+Name[km]=អ៊ិនធឺណិត
-+Name[ko]=인터넷
-+Name[lt]=Internetas
-+Name[lv]=Internets
-+Name[mk]=Интернет
-+Name[mn]=Интернэт
-+Name[nb]=Internett
-+Name[ne]=इन्टरनेट
-+Name[nn]=Internett
-+Name[pa]=ਇੰਟਰਨੈੱਟ
-+Name[ru]=Интернет
-+Name[rw]=Interineti
-+Name[se]=Interneahtta
-+Name[sr]=Интернет
-+Name[ta]=இணையம்
-+Name[te]=ఇంటర్నెట్
-+Name[tg]=Интернет
-+Name[th]=อินเทอร์เน็ต
-+Name[tr]=İnternet
-+Name[tt]=Päräwez
-+Name[uk]=Інтернет
-+Name[uz@cyrillic]=Интернет
-+Name[wa]=Daegntoele
-+Name[zh_TW]=網際網路
-+Icon=package_network
-+
-diff -Nuar trinity-tdebase-3.5.13.2/applnk.ORI/tde-internet-terminal.directory trinity-tdebase-3.5.13.2/applnk/tde-internet-terminal.directory
---- trinity-tdebase-3.5.13.2/applnk.ORI/tde-internet-terminal.directory	1970-01-01 01:00:00.000000000 +0100
-+++ trinity-tdebase-3.5.13.2/applnk/tde-internet-terminal.directory	2013-07-28 15:47:19.316022827 +0200
-@@ -0,0 +1,88 @@
-+[Desktop Entry]
-+Encoding=UTF-8
-+Type=Directory
-+Name=Terminal Applications
-+Name[af]=Terminaal Programme
-+Name[ar]=تطبيقات مطرافية
-+Name[az]=Terminal Proqramları
-+Name[be]=Тэрмінальныя праграмы
-+Name[bg]=Конзолни програми
-+Name[bn]=টার্মিনাল অ্যাপলিকেশন
-+Name[br]=Arloadoù an termenell
-+Name[bs]=Tekstualni programi
-+Name[ca]=Aplicacions de terminal
-+Name[cs]=Terminálové aplikace
-+Name[csb]=Programë terminala
-+Name[cy]=Cymhwysiadau Terfynell
-+Name[da]=Terminalprogrammer
-+Name[de]=Terminalprogramme
-+Name[el]=Εφαρμογές τερματικού
-+Name[eo]=Terminal-Aplikaĵoj
-+Name[es]=Aplicaciones de terminal
-+Name[et]=Terminali rakendused
-+Name[eu]=Terminaleko aplikazioak
-+Name[fa]=کاربردهای پایانه
-+Name[fi]=Päätesovellukset
-+Name[fo]=Tekstforrit
-+Name[fr]=Applications pour terminal
-+Name[fy]=Terminal-tapassingen
-+Name[ga]=Feidhmchláir Teirminéil
-+Name[gl]=Aplicacións de Terminal
-+Name[he]=יישומי מסוף
-+Name[hi]=टर्मिनल अनुप्रयोग
-+Name[hr]=Terminalske aplikacije
-+Name[hsb]=Programy za terminal
-+Name[hu]=Parancsértelmezők
-+Name[id]=Aplikasi Terminal
-+Name[is]=Skjáhermiforrit
-+Name[it]=Applicazioni terminale
-+Name[ja]=ターミナルアプリケーション
-+Name[ka]=კონსოლის პროგრამები
-+Name[kk]=Консоль қолданбалары
-+Name[km]=កម្មវិធី​ស្ថានីយ
-+Name[ko]=터미널 프로그램
-+Name[lo]=ໂປຣແກຣມເທີມີນໍ
-+Name[lt]=Terminalinės programos
-+Name[lv]=Termināla Aplikācijas
-+Name[mk]=Терминалски апликации
-+Name[mn]=Терминал-Програм
-+Name[ms]=Aplikasi Terminal
-+Name[mt]=Programmi tat-Terminal
-+Name[nb]=Terminalprogrammer
-+Name[nds]=Terminalprogrammen
-+Name[ne]=टर्मिनल अनुप्रयोग
-+Name[nl]=Terminal-toepassingen
-+Name[nn]=Terminalprogram
-+Name[nso]=Ditshumiso tsa Terminal
-+Name[pa]=ਟਰਮੀਨਲ ਕਾਰਜ
-+Name[pl]=Programy terminala
-+Name[pt]=Aplicações de Terminal
-+Name[pt_BR]=Aplicativos de terminal
-+Name[ro]=Aplicații de terminal
-+Name[ru]=Консольные приложения
-+Name[rw]=Amaporogaramu Nkiriya
-+Name[se]=Terminálprográmmat
-+Name[sk]=Terminálové aplikácie
-+Name[sl]=Terminalski programi
-+Name[sr]=Терминалски програми
-+Name[sr@Latn]=Terminalski programi
-+Name[ss]=Ticelo tesikhungo
-+Name[sv]=Terminalprogram
-+Name[ta]=முனைய பயன்பாடுகள்
-+Name[te]=టర్మినల్ కార్యక్రమములు
-+Name[tg]=Барномаҳои консол
-+Name[th]=โปรแกรมเทอร์มินัล
-+Name[tr]=Uçbirim Uygulamaları
-+Name[tt]=Terminal Yazılımnarı
-+Name[uk]=Термінальні програми
-+Name[uz]=Terminal uchun dasturlar
-+Name[uz@cyrillic]=Терминал учун дастурлар
-+Name[ven]=Apulikhesheni ya Theminala
-+Name[vi]=Trình đầu cuối
-+Name[wa]=Programes terminås
-+Name[xh]=Izicelo Zesiphelo sendlela
-+Name[zh_CN]=终端应用程序
-+Name[zh_TW]=終端機程式
-+Name[zu]=Abayaleli bangaphandle
-+Icon=konsole
-+Version=1.0
-diff -Nuar trinity-tdebase-3.5.13.2/applnk.ORI/tde-main.directory trinity-tdebase-3.5.13.2/applnk/tde-main.directory
---- trinity-tdebase-3.5.13.2/applnk.ORI/tde-main.directory	1970-01-01 01:00:00.000000000 +0100
-+++ trinity-tdebase-3.5.13.2/applnk/tde-main.directory	2013-07-28 15:47:19.316022827 +0200
-@@ -0,0 +1,80 @@
-+[Desktop Entry]
-+Encoding=UTF-8
-+Type=Directory
-+Icon=package
-+Name=KDE Menu
-+Name[af]=KDE Kieslys
-+Name[ar]=قائمة KDE
-+Name[az]=KDE Meyusu
-+Name[be]=Меню KDE
-+Name[bg]=Главно меню
-+Name[bn]=কে.ডি.ই. মেনু
-+Name[br]=Meuziad KDE
-+Name[bs]=KDE meni
-+Name[ca]=Menú de KDE
-+Name[cs]=Nabídka KDE
-+Name[csb]=KDE menu
-+Name[cy]=Dewislen KDE
-+Name[da]=KDE-Menu
-+Name[de]=KDE-Menü
-+Name[el]=Μενού KDE
-+Name[eo]=KDEa Menuo
-+Name[es]=Menú de KDE
-+Name[et]=KDE menüü
-+Name[eu]=KDE menua
-+Name[fa]=گزینگان KDE
-+Name[fi]=Valikko
-+Name[fr]=Menu de KDE
-+Name[fy]=KDE-menu
-+Name[ga]=Roghchlár KDE
-+Name[gl]=Menú de KDE
-+Name[he]=תפריט KDE
-+Name[hi]=केडीई मेन्यू
-+Name[hr]=KDE izbornik
-+Name[hsb]=KDE meni
-+Name[hu]=KDE menü
-+Name[id]=Menu KDE
-+Name[is]=KDE valmynd
-+Name[it]=Menu KDE
-+Name[ja]=KDE メニュー
-+Name[ka]=KDE მენიუ
-+Name[kk]=KDE мәзірі
-+Name[km]=ម៉ឺនុយ KDE
-+Name[ko]=KDE 메뉴
-+Name[lt]=KDE meniu
-+Name[lv]=KDE izvēlne
-+Name[mk]=KDE-мени
-+Name[mn]=КДЭ цэс
-+Name[ms]=Menu KDE
-+Name[mt]=Menu KDE
-+Name[nb]=KDE-meny
-+Name[nds]=KDE-Menü
-+Name[ne]=केडीई मेनु
-+Name[nl]=KDE-menu
-+Name[nn]=KDE-meny
-+Name[pa]=KDE ਮੇਨੂ
-+Name[pl]=Menu KDE
-+Name[pt]=Menu KDE
-+Name[pt_BR]=Menu do KDE
-+Name[ro]=Meniu KDE
-+Name[ru]=Меню KDE
-+Name[rw]=Ibikubiyemo bya KDE 
-+Name[se]=KDE-fállu
-+Name[sk]=Menu KDE
-+Name[sl]=Meni KDE
-+Name[sr]=KDE мени
-+Name[sr@Latn]=KDE meni
-+Name[sv]=KDE-meny
-+Name[ta]=கேடியி பட்டி
-+Name[te]=కెడిఈ పట్టీ
-+Name[tg]=Менюи KDE
-+Name[th]=เมนู KDE
-+Name[tr]=KDE Menüsü
-+Name[tt]=KDE Saylağı
-+Name[uk]=Меню KDE
-+Name[uz]=KDE menyu
-+Name[uz@cyrillic]=KDE меню
-+Name[vi]=Thực đơn KDE
-+Name[wa]=Dressêye KDE
-+Name[zh_CN]=KDE 菜单
-+Name[zh_TW]=KDE 選單
-diff -Nuar trinity-tdebase-3.5.13.2/applnk.ORI/tde-more.directory trinity-tdebase-3.5.13.2/applnk/tde-more.directory
---- trinity-tdebase-3.5.13.2/applnk.ORI/tde-more.directory	1970-01-01 01:00:00.000000000 +0100
-+++ trinity-tdebase-3.5.13.2/applnk/tde-more.directory	2013-07-28 15:47:19.317022805 +0200
-@@ -0,0 +1,79 @@
-+[Desktop Entry]
-+Encoding=UTF-8
-+Type=Directory
-+Icon=package
-+Name=More Applications
-+Name[af]=Meer Programme
-+Name[ar]=المزيد من التطبيقات
-+Name[az]=Daha Çox Proqram
-+Name[be]=Яшчэ праграмы
-+Name[bg]=Още програми
-+Name[bn]=আরো অ্যাপলিকেশন
-+Name[br]=Ar re all
-+Name[bs]=Još programa
-+Name[ca]=Més aplicacions
-+Name[cs]=Více aplikací
-+Name[csb]=Wicy programów
-+Name[cy]=Rhagor o Gymhwysiadau
-+Name[da]=Flere programmer
-+Name[de]=Weitere Programme
-+Name[el]=Περισσότερες εφαρμογές
-+Name[eo]=Pluaj aplikaĵoj
-+Name[es]=Más aplicaciones
-+Name[et]=Muud rakendused
-+Name[eu]=Aplikazio gehiago
-+Name[fa]=کاربردهای بیشتر
-+Name[fi]=Lisää sovelluksia
-+Name[fr]=Autres applications
-+Name[fy]=Mear programma's
-+Name[ga]=Feidhmchláir Breise
-+Name[gl]=Máis Aplicacións
-+Name[he]=עוד יישומים
-+Name[hi]=और अधिक अनुप्रयोग
-+Name[hr]=Više aplikacija
-+Name[hsb]=Wjace programow
-+Name[hu]=További alkalmazások
-+Name[id]=Aplikasi Lain
-+Name[is]=Fleiri forrit
-+Name[it]=Altri programmi
-+Name[ja]=その他のアプリケーション
-+Name[ka]=დამატებითი პროგრამები
-+Name[kk]=Басқа қолданбалар
-+Name[km]=កម្មវិធីបន្ថែម​ទៀត
-+Name[ko]=더 많은 프로그램
-+Name[lt]=Daugiau programų
-+Name[lv]=Vairāk aplikāciju
-+Name[mk]=Уште апликации
-+Name[ms]=Aplikasi Lain
-+Name[mt]=Programmi KDE
-+Name[nb]=Flere programmer
-+Name[nds]=Mehr Programmen
-+Name[ne]=धेरै अनुप्रयोग
-+Name[nl]=Meer programma's
-+Name[nn]=Fleire program
-+Name[pa]=ਹੋਰ ਕਾਰਜ
-+Name[pl]=Więcej programów
-+Name[pt]=Mais Aplicações
-+Name[pt_BR]=Mais Aplicativos
-+Name[ro]=Alte aplicații
-+Name[ru]=Дополнительные приложения
-+Name[rw]=Amaporogaramu Arenze
-+Name[se]=Eanet prográmmat
-+Name[sk]=Ďalšie aplikácie
-+Name[sl]=Več programov
-+Name[sr]=Још програма
-+Name[sr@Latn]=Još programa
-+Name[sv]=Fler program
-+Name[ta]=அதிக பயன்பாடுகள்
-+Name[te]=మరికొన్ని కార్యక్రమములు
-+Name[tg]=Барномаҳои иловагӣ
-+Name[th]=แอพพลิเคชันอื่นๆ
-+Name[tr]=Daha Fazla Uygulama
-+Name[tt]=Başqa Yazılımnar
-+Name[uk]=Інші програми
-+Name[uz]=Boshqa dasturlar
-+Name[uz@cyrillic]=Бошқа дастурлар
-+Name[vi]=Ứng dụng Thêm nữa
-+Name[wa]=Co ds ôtes programes
-+Name[zh_CN]=更多应用程序
-+Name[zh_TW]=更多應用程式
-diff -Nuar trinity-tdebase-3.5.13.2/applnk.ORI/tde-multimedia.directory trinity-tdebase-3.5.13.2/applnk/tde-multimedia.directory
---- trinity-tdebase-3.5.13.2/applnk.ORI/tde-multimedia.directory	1970-01-01 01:00:00.000000000 +0100
-+++ trinity-tdebase-3.5.13.2/applnk/tde-multimedia.directory	2013-07-28 15:47:19.317022805 +0200
-@@ -0,0 +1,65 @@
-+[Desktop Entry]
-+Encoding=UTF-8
-+Type=Directory
-+Name=Multimedia
-+Name[ar]=الوسائط المتعددة
-+Name[az]=Multimediya
-+Name[be]=Мультымедыя
-+Name[bg]=Мултимедия
-+Name[bn]=মাল্টিমিডিয়া
-+Name[br]=Liesvedia
-+Name[bs]=Multimedija
-+Name[ca]=Multimèdia
-+Name[cs]=Multimédia
-+Name[csb]=Mùltimedia
-+Name[cy]=Amlgyfryngau
-+Name[da]=Multimedie
-+Name[el]=Πολυμέσα
-+Name[eo]=Plurmedio
-+Name[et]=Multimeedia
-+Name[fa]=چند رسانه‌ای
-+Name[fo]=Fleirmiðla
-+Name[fr]=Multimédia
-+Name[ga]=Ilmheáin
-+Name[he]=מולטימדיה
-+Name[hi]=मल्टीमीडिया
-+Name[hr]=Multimedija
-+Name[hsb]=Multimedije
-+Name[hu]=Multimédia
-+Name[is]=Margmiðlun
-+Name[ja]=マルチメディア
-+Name[ka]=მულტიმედია
-+Name[kk]=Мультимедиа
-+Name[km]=ពហុព័ត៌មាន
-+Name[ko]=멀티미디어
-+Name[lo]=ເມົາຕິມີເດຍ
-+Name[lv]=Multimēdija
-+Name[mk]=Мултимедија
-+Name[mn]=Мултимедиа
-+Name[ne]=मल्टिमिडिया
-+Name[nso]=Media wa Bontshi
-+Name[pa]=ਮਲਟੀਮੀਡਿਆ
-+Name[pt]=Multimédia
-+Name[pt_BR]=Multimídia
-+Name[ru]=Мультимедиа
-+Name[rw]=Mutwaramakuru
-+Name[sk]=Multimédiá
-+Name[sl]=Večpredstavnost
-+Name[sr]=Мултимедија
-+Name[sr@Latn]=Multimedija
-+Name[ss]=Tinhlobonhlobo-tetindzaba
-+Name[ta]=பல்லூடகம்
-+Name[te]=బహుళ మాద్యమం
-+Name[tg]=Мултимедия
-+Name[th]=มัลติมีเดีย
-+Name[tr]=Çokluortam
-+Name[uk]=Мультимедіа
-+Name[uz@cyrillic]=Мултимедиа
-+Name[ven]=Zwimwumwusi
-+Name[vi]=Đa phương tiện
-+Name[xh]=Iindlela ezininzi zokwenza
-+Name[zh_CN]=多媒体
-+Name[zh_TW]=多媒體
-+Name[zu]=Onozindaba abaningi
-+Icon=package_multimedia
-+
-diff -Nuar trinity-tdebase-3.5.13.2/applnk.ORI/tde-office.directory trinity-tdebase-3.5.13.2/applnk/tde-office.directory
---- trinity-tdebase-3.5.13.2/applnk.ORI/tde-office.directory	1970-01-01 01:00:00.000000000 +0100
-+++ trinity-tdebase-3.5.13.2/applnk/tde-office.directory	2013-07-28 15:47:19.317022805 +0200
-@@ -0,0 +1,86 @@
-+[Desktop Entry]
-+Encoding=UTF-8
-+Type=Directory
-+Name=Office
-+Name[af]=Kantoor
-+Name[ar]=المكتب
-+Name[az]=Offis
-+Name[be]=Офіс
-+Name[bg]=Офис
-+Name[bn]=অফিস
-+Name[br]=Burev
-+Name[bs]=Uredske aplikacije
-+Name[ca]=Oficina
-+Name[cs]=Kancelář
-+Name[csb]=Biuro
-+Name[cy]=Swyddfa
-+Name[da]=Kontor
-+Name[de]=Büroprogramme
-+Name[el]=Γραφείο
-+Name[eo]=Laborejo
-+Name[es]=Oficina
-+Name[et]=Kontoritöö
-+Name[eu]=Bulegoa
-+Name[fa]=اداره
-+Name[fi]=Toimisto-ohjelmat
-+Name[fo]=Skrivstova
-+Name[fr]=Bureautique
-+Name[fy]=Kantoartapassingen
-+Name[ga]=Oifig
-+Name[gl]=Ofimática
-+Name[he]=יישומים משרדיים
-+Name[hi]=कार्यालय
-+Name[hr]=Ured
-+Name[hsb]=Běrowowe programy
-+Name[hu]=Irodai alkalmazások
-+Name[is]=Skrifstofuforrit
-+Name[it]=Ufficio
-+Name[ja]=オフィス
-+Name[ka]=ოფისი
-+Name[kk]=Офис
-+Name[km]=ការិយាល័យ
-+Name[ko]=사무용 도구
-+Name[lo]=ໂປຣແກຣມຊຸດສຳນັກງານ
-+Name[lt]=Biuro programos
-+Name[lv]=Birojs
-+Name[mk]=Канцеларија
-+Name[mn]=Албан програм
-+Name[ms]=Pejabat
-+Name[mt]=Uffiċċju
-+Name[nb]=Kontor
-+Name[nds]=Kontoor
-+Name[ne]=कार्यालय
-+Name[nl]=Kantoortoepassingen
-+Name[nn]=Kontor
-+Name[nso]=Ofisi
-+Name[oc]=Burèu
-+Name[pa]=ਦਫ਼ਤਰ
-+Name[pl]=Biuro
-+Name[pt]=Escritório
-+Name[pt_BR]=Escritório
-+Name[ro]=Aplicații birotică
-+Name[ru]=Офис
-+Name[rw]=Ofise
-+Name[se]=Kántuvra
-+Name[sk]=Kancelária
-+Name[sl]=Pisarna
-+Name[ss]=Lihhovisi
-+Name[sv]=Kontorsprogram
-+Name[ta]=அலுவலகம்
-+Name[te]=కార్యాలయము
-+Name[tg]=Офис
-+Name[th]=โปรแกรมชุดสำนักงาน
-+Name[tr]=Ofis
-+Name[tt]=Eşxänä
-+Name[uk]=Офіс
-+Name[uz]=Idora uchun dasturlar
-+Name[uz@cyrillic]=Идора учун дастурлар
-+Name[ven]=Ofisi
-+Name[vi]=Văn phòng
-+Name[wa]=Buro
-+Name[xh]=Ofisi
-+Name[zh_CN]=办公
-+Name[zh_TW]=辦公軟體
-+Name[zu]=Ihhofisi
-+Icon=package_wordprocessing
-+SortOrder=koshell.desktop,kword.desktop,kspread.desktop,kpresenter.desktop
-diff -Nuar trinity-tdebase-3.5.13.2/applnk.ORI/tde-science.directory trinity-tdebase-3.5.13.2/applnk/tde-science.directory
---- trinity-tdebase-3.5.13.2/applnk.ORI/tde-science.directory	1970-01-01 01:00:00.000000000 +0100
-+++ trinity-tdebase-3.5.13.2/applnk/tde-science.directory	2013-07-28 15:47:19.317022805 +0200
-@@ -0,0 +1,80 @@
-+[Desktop Entry]
-+Encoding=UTF-8
-+Type=Directory
-+Icon=kcmdf
-+Name=Science & Math
-+Name[af]=Wetenskap & Wiskunde
-+Name[ar]=العلوم و الرياضيات
-+Name[az]=Elm və Riyaziyyat
-+Name[be]=Навука і матэматыка
-+Name[bg]=Математика
-+Name[bn]=বিজ্ঞান এবং গণিত
-+Name[br]=Skiant ha Jedoniel
-+Name[bs]=Nauka i matematika
-+Name[ca]=Ciència i Matemàtiques
-+Name[cs]=Věda a matematika
-+Name[csb]=Ùczbòwé
-+Name[cy]=Gwyddoniaeth a Mathemateg
-+Name[da]=Naturvidenskab & matematik
-+Name[de]=Wissenschaft & Mathematik
-+Name[el]=Επιστήμη & Μαθηματικά
-+Name[en_GB]=Science & Maths
-+Name[eo]=Scienco kaj Matematiko
-+Name[es]=Ciencia y matemáticas
-+Name[et]=Teadus
-+Name[eu]=Zientzia eta matematikaa
-+Name[fa]=علوم و ریاضی
-+Name[fi]=Tiede ja matematiikka
-+Name[fr]=Science et mathématiques
-+Name[fy]=Wittenskiplik en wiskunde
-+Name[ga]=Eolaíocht & Matamaitic
-+Name[gl]=Ciencia e Matemáticas
-+Name[he]=מדע ומתמטיקה
-+Name[hi]=विज्ञान और गणित
-+Name[hr]=Znanost i matematika
-+Name[hsb]=Matematika & Wědomosć
-+Name[hu]=Tudományok, matematika
-+Name[id]=Ilmu Pengetahuan & Matematika
-+Name[is]=Vísindi og stærðfræði
-+Name[it]=Scienza e matematica
-+Name[ja]=サイエンス & 数学
-+Name[ka]=მეცნიერება და მათემატიკა 
-+Name[kk]=Ғылыми және математикалық
-+Name[km]=វិទ្យាសាស្ត្រ & គណិតវិទ្យា
-+Name[ko]=과학과 수학
-+Name[lt]=Mokslas ir matematika
-+Name[lv]=Zinātne un Matemātika
-+Name[mk]=Наука и математика
-+Name[ms]=Matematik & Sains
-+Name[mt]=Xjenza u Matematika
-+Name[nb]=Vitenskap og matematikk
-+Name[nds]=Wetenschap & Mathematik
-+Name[ne]=विज्ञान र गणीत
-+Name[nl]=Wetenschap en wiskunde
-+Name[nn]=Vitskap og matematikk
-+Name[pa]=ਵਿਗਿਆਨ ਤੇ ਗਣਿਤ
-+Name[pl]=Naukowe
-+Name[pt]=Ciência e Matemática
-+Name[pt_BR]=Ciências & Matemática
-+Name[ro]=Știință și matematică
-+Name[ru]=Наука
-+Name[rw]=Ikoranabuhanga & Imibare
-+Name[se]=Dieđa ja matematihkka
-+Name[sk]=Veda
-+Name[sl]=Znanost in matematika
-+Name[sr]=Наука и математика
-+Name[sr@Latn]=Nauka i matematika
-+Name[sv]=Vetenskap och matematik
-+Name[ta]=அறிவியல் & கணிதம்
-+Name[te]=విజ్ఞానం & గణితం
-+Name[tg]=Илм ва математика
-+Name[th]=วิทยาศาสตร์และคณิตศาสตร์
-+Name[tr]=Bilim ve Matematik
-+Name[tt]=Fän & Sanaw
-+Name[uk]=Наука і математика
-+Name[uz]=Fan va Matematika
-+Name[uz@cyrillic]=Фан ва Математика
-+Name[vi]=Khoa học & Toán học
-+Name[wa]=Siyinces et matematikes
-+Name[zh_CN]=科学和数学
-+Name[zh_TW]=科學與數學
-diff -Nuar trinity-tdebase-3.5.13.2/applnk.ORI/tde-screensavers.menu trinity-tdebase-3.5.13.2/applnk/tde-screensavers.menu
---- trinity-tdebase-3.5.13.2/applnk.ORI/tde-screensavers.menu	1970-01-01 01:00:00.000000000 +0100
-+++ trinity-tdebase-3.5.13.2/applnk/tde-screensavers.menu	2013-07-28 15:47:19.317022805 +0200
-@@ -0,0 +1,10 @@
-+ <!DOCTYPE Menu PUBLIC "-//freedesktop//DTD Menu 1.0//EN"
-+  "http://www.freedesktop.org/standards/menu-spec/1.0/menu.dtd">
-+
-+<Menu>
-+	<Name>ScreenSavers</Name>
-+	<Directory>tde-system-screensavers.directory</Directory>
-+	<Include>
-+		<Category>X-KDE-ScreenSaver</Category>
-+	</Include>
-+</Menu>
-diff -Nuar trinity-tdebase-3.5.13.2/applnk.ORI/tde-settings-accessibility.directory trinity-tdebase-3.5.13.2/applnk/tde-settings-accessibility.directory
---- trinity-tdebase-3.5.13.2/applnk.ORI/tde-settings-accessibility.directory	1970-01-01 01:00:00.000000000 +0100
-+++ trinity-tdebase-3.5.13.2/applnk/tde-settings-accessibility.directory	2013-07-28 15:47:19.318022784 +0200
-@@ -0,0 +1,85 @@
-+[Desktop Entry]
-+Encoding=UTF-8
-+Type=Directory
-+Name=Regional & Accessibility
-+Name[af]=Streek & Toeganklikheid
-+Name[ar]=الإقليمي وتسهيل الوصول
-+Name[az]=Regional Qurğular & Yetişmə Qabiliyyəti
-+Name[be]=Рэгіянальныя настаўленні і даступнасць
-+Name[bg]=Локализация
-+Name[bn]=আঞ্চলিক এবং সহায়ক প্রযুক্তি
-+Name[br]=Rannvro hag Haezadusted
-+Name[bs]=Regionalno i pristupačnost
-+Name[ca]=Regional i accessibilitat
-+Name[cs]=Místní zvyklosti a zpřístupnění
-+Name[csb]=Òbéńdowé ë przistãpnosc
-+Name[cy]=Rhanbarthol & Hygyrchedd
-+Name[da]=Region & Tilgængelighed
-+Name[de]=Regionaleinstellungen & Zugangshilfen
-+Name[el]=Περιοχή & Προσιτότητα
-+Name[eo]=Regiono & Alirebleco
-+Name[es]=Regional y accesibilidad
-+Name[et]=Hõlbustus
-+Name[eu]=Eskualdea eta erabilerraztasuna
-+Name[fa]=منطقه‌ای و دستیابی‌پذیری
-+Name[fi]=Alueellisuus ja käytettävyys
-+Name[fr]=Régionalisation et accessibilité
-+Name[fy]=Regio en tagonklikens
-+Name[ga]=Réigiúnach agus Insroichteacht
-+Name[gl]=Rexional e Acesibilidade
-+Name[he]=הגדרות אזוריות ונגישות
-+Name[hi]=क्षेत्रीय व भाषायी पहुँच
-+Name[hr]=Regionalnost i pristupačnost
-+Name[hsb]=Kraj & Přistupnosć
-+Name[hu]=Nyelv, kezelési segítség
-+Name[is]=Svæðisbundnar stillingar og aðgengi
-+Name[it]=Regionali e Accesso facilitato
-+Name[ja]=地域 & アクセシビリティ
-+Name[ka]=რეგიონალური და სეპციალური შესაძლებლობები
-+Name[kk]=Жергілікті және Арнаулы мүмкіндіктер
-+Name[km]=តំបន់ & មធ្យោបាយ​ងាយស្រួល
-+Name[ko]=지역과 내게 필요한 설정
-+Name[lo]=ຄວາມສາມາດໃນການໃຊ້ງານ
-+Name[lt]=Regionai bei prieinamumas
-+Name[lv]=Reģionāls un Pieejamība
-+Name[mk]=Регионалност и пристапливост
-+Name[mn]=Бүслүүр-тохируулга & Хэрэглэх тохь
-+Name[ms]=Pemudahcapai & Tetapan Tempatan
-+Name[mt]=Reġjonali u Aċċessibiltà
-+Name[nb]=Regionalt og tilgjengelighet
-+Name[nds]=Regioon & Behinnertenhülp
-+Name[ne]=क्षेत्रीय र पहुँचयोग्य
-+Name[nl]=Regio en toegankelijkheid
-+Name[nn]=Regional og tilgjenge
-+Name[nso]=Ya Naga & Tsenelo
-+Name[pa]=ਖੇਤਰੀ ਅਤੇ ਸਹੂਲਤਾਂ
-+Name[pl]=Regionalne i dostępność
-+Name[pt]=Regional e Acessibilidade
-+Name[pt_BR]=Regional & Acessibilidade
-+Name[ro]=Regional și accesibilitate
-+Name[ru]=Региональные и специальные возможности
-+Name[rw]=By'agace & Ukugerwaho
-+Name[se]=Báikkálaš ja álkkibut geavaheapmi
-+Name[sk]=Prístupnosť a regionálne nastavenie
-+Name[sl]=Regionalnost in dostopnost
-+Name[sr]=Регија и приступачност
-+Name[sr@Latn]=Regija i pristupačnost
-+Name[ss]=Kutfolakala kalula & kwesifundza 
-+Name[sv]=Region och handikappstöd
-+Name[ta]=நாடும் & அணுகலும்
-+Name[te]=ప్రాంతియతా & అందుబాటు
-+Name[tg]=Имкониятҳои минтақавӣ
-+Name[th]=เขตพื้นที่และการใช้งาน
-+Name[tr]=Bölgesel ve Erişilebilirlik
-+Name[tt]=Cirläşterü & İreşülek
-+Name[uk]=Локалізація та доступність
-+Name[uz]=Regional va qulayliklar
-+Name[uz@cyrillic]=Регионал ва қулайликлар
-+Name[ven]=U Dzhenea ha vhupo
-+Name[vi]=Hỗ trợ quốc tế & Hỗ trợ người tàn tật
-+Name[wa]=Redjonå & Accessibilité
-+Name[xh]=Ummandla & Nofumaneko
-+Name[zh_CN]=区域和辅助功能
-+Name[zh_TW]=區域性與易用性
-+Name[zu]=Okwesifunda & Igunya lokungena
-+Icon=locale
-diff -Nuar trinity-tdebase-3.5.13.2/applnk.ORI/tde-settings-components.directory trinity-tdebase-3.5.13.2/applnk/tde-settings-components.directory
---- trinity-tdebase-3.5.13.2/applnk.ORI/tde-settings-components.directory	1970-01-01 01:00:00.000000000 +0100
-+++ trinity-tdebase-3.5.13.2/applnk/tde-settings-components.directory	2013-07-28 15:47:19.318022784 +0200
-@@ -0,0 +1,85 @@
-+[Desktop Entry]
-+Encoding=UTF-8
-+Type=Directory
-+Name=KDE Components
-+Name[af]=KDE Komponente
-+Name[ar]=مكوّنات KDE
-+Name[az]=KDE Tərkib Hissələri
-+Name[be]=Кампаненты KDE
-+Name[bg]=Компоненти
-+Name[bn]=কে.ডি.ই-র বিভিন্ন উপাদান
-+Name[br]=Parzhioù KDE
-+Name[bs]=KDE komponente
-+Name[ca]=Components del KDE
-+Name[cs]=Komponenty KDE
-+Name[csb]=Dzéle KDE
-+Name[cy]= Cydrannau KDE
-+Name[da]=KDE-komponenter
-+Name[de]=KDE-Komponenten
-+Name[el]=Συστατικά του KDE
-+Name[eo]=KDEaj komponentoj
-+Name[es]=Componentes de KDE
-+Name[et]=KDE komponendid
-+Name[eu]=KDE osagaiak
-+Name[fa]=مؤلفه‌های KDE
-+Name[fi]=KDE-komponentit
-+Name[fr]=Composants de KDE
-+Name[fy]=KDE-compeninten
-+Name[ga]=Comhpháirteanna KDE
-+Name[gl]=Compoñentes de KDE
-+Name[he]=רכיבי KDE
-+Name[hi]=केडीई के घटक
-+Name[hr]=KDE komponente
-+Name[hsb]=KDE-komponenty
-+Name[hu]=KDE-komponensek
-+Name[id]=Komponen KDE
-+Name[is]=KDE einingar
-+Name[it]=Componenti di KDE
-+Name[ja]=KDE コンポーネント
-+Name[ka]=KDE კომპონენტები
-+Name[kk]=KDE компоненттер
-+Name[km]=សមាសភាគ KDE
-+Name[ko]=KDE 구성요소
-+Name[lo]=ຄອມໂພເນນຂອງ KDE
-+Name[lt]=KDE komponentai
-+Name[lv]=KDE Komponentes
-+Name[mk]=Компоненти на KDE
-+Name[mn]=КДЭ-Бүрэлдхүүнүүд
-+Name[ms]=Komponen KDE
-+Name[nb]=KDE-komponenter
-+Name[nds]=KDE-Komponenten
-+Name[ne]=KDE अवयव
-+Name[nl]=KDE-componenten
-+Name[nn]=KDE-komponent
-+Name[nso]=Dikagare tsa KDE
-+Name[pa]=KDE ਭਾਗ
-+Name[pl]=Składniki KDE
-+Name[pt]=Componentes do KDE
-+Name[pt_BR]=Componentes do KDE
-+Name[ro]=Componente KDE
-+Name[ru]=Компоненты
-+Name[rw]=Inyangingo za KDE
-+Name[se]=KDE-oasit
-+Name[sk]=Komponenty KDE
-+Name[sl]=Komponente KDE
-+Name[sr]=KDE компоненте
-+Name[sr@Latn]=KDE komponente
-+Name[ss]=Tincenye te KDE 
-+Name[sv]=KDE-komponenter
-+Name[ta]=KDE கூறுகள்
-+Name[te]=కెడిఈ అంశాలు
-+Name[tg]=Қисматҳои KDE
-+Name[th]=ส่วนประกอบของ KDE
-+Name[tr]=KDE Bileşenleri
-+Name[tt]=KDE Öleşläre
-+Name[uk]=Компоненти KDE
-+Name[uz]=KDE komponentlari
-+Name[uz@cyrillic]=KDE компонентлари
-+Name[ven]=Zwipida zwa KDE
-+Name[vi]=Thành phần của KDE
-+Name[wa]=Componints di KDE
-+Name[xh]=Izinto ze KDE
-+Name[zh_CN]=KDE 组件
-+Name[zh_TW]=KDE 元件
-+Name[zu]= Amalunga e-KDE
-+Icon=blockdevice
-diff -Nuar trinity-tdebase-3.5.13.2/applnk.ORI/tde-settings-desktop.directory trinity-tdebase-3.5.13.2/applnk/tde-settings-desktop.directory
---- trinity-tdebase-3.5.13.2/applnk.ORI/tde-settings-desktop.directory	1970-01-01 01:00:00.000000000 +0100
-+++ trinity-tdebase-3.5.13.2/applnk/tde-settings-desktop.directory	2013-07-28 15:47:19.318022784 +0200
-@@ -0,0 +1,80 @@
-+[Desktop Entry]
-+Encoding=UTF-8
-+Type=Directory
-+Name=Desktop
-+Name[af]=Werkskerm
-+Name[ar]=سطح المكتب
-+Name[az]=Masa Üstü
-+Name[be]=Працоўны стол
-+Name[bg]=Работен плот
-+Name[bn]=ডেস্কটপ
-+Name[br]=Gorretaol
-+Name[bs]=Radna površina
-+Name[ca]=Escriptori
-+Name[cs]=Pracovní plocha
-+Name[csb]=Pùlt
-+Name[cy]=Penbwrdd
-+Name[de]=Arbeitsfläche
-+Name[el]=Επιφάνεια εργασίας
-+Name[eo]=Tabulo
-+Name[es]=Escritorio
-+Name[et]=Töölaud
-+Name[eu]=Mahaigaina
-+Name[fa]=رومیزی
-+Name[fi]=Työpöytä
-+Name[fo]=Skriviborð
-+Name[fr]=Bureau
-+Name[fy]=Buroblêd
-+Name[ga]=Deasc
-+Name[gl]=Escritorio
-+Name[he]=שולחן עבודה
-+Name[hi]=डेस्कटॉप
-+Name[hr]=Radna površina
-+Name[hsb]=Dźěłowy powjerch
-+Name[hu]=Munkaasztal
-+Name[is]=Skjáborð
-+Name[ja]=デスクトップ
-+Name[ka]=სამუშაო დაფა
-+Name[kk]=Жұмыс үстелі
-+Name[km]=ផ្ទៃតុ
-+Name[ko]=데스크톱
-+Name[lo]=ພື້ນທີ່ເຮັດວງກ
-+Name[lt]=Darbastalis
-+Name[lv]=Darbvirsma
-+Name[mk]=Работна површина
-+Name[mn]=Ажлын тавцан
-+Name[ms]=Ruang Kerja
-+Name[nb]=Skrivebord
-+Name[nds]=Schriefdisch
-+Name[ne]=डेस्कटप
-+Name[nl]=Bureaublad
-+Name[nn]=Skrivebord
-+Name[oc]=BurèU
-+Name[pa]=ਵੇਹੜਾ
-+Name[pl]=Pulpit
-+Name[pt]=Ambiente de Trabalho
-+Name[pt_BR]=Área de Trabalho
-+Name[ru]=Рабочий стол
-+Name[rw]=Ibiro
-+Name[se]=Čállinbeavdi
-+Name[sk]=Plocha
-+Name[sl]=Namizje
-+Name[sr]=Радна површина
-+Name[sr@Latn]=Radna površina
-+Name[ss]=Desktop 
-+Name[sv]=Skrivbord
-+Name[ta]=மேல்மேசை
-+Name[te]=రంగస్ఠలం
-+Name[tg]=Мизи корӣ
-+Name[th]=พื้นที่ทำงาน
-+Name[tr]=Masaüstü
-+Name[tt]=Östäl
-+Name[uk]=Стільниця
-+Name[uz]=Ish stoli
-+Name[uz@cyrillic]=Иш столи
-+Name[ven]=Desikithopo
-+Name[vi]=Màn hình nền
-+Name[wa]=Sicribanne
-+Name[zh_CN]=桌面
-+Name[zh_TW]=桌面
-+Icon=desktop
-diff -Nuar trinity-tdebase-3.5.13.2/applnk.ORI/tde-settings.directory trinity-tdebase-3.5.13.2/applnk/tde-settings.directory
---- trinity-tdebase-3.5.13.2/applnk.ORI/tde-settings.directory	1970-01-01 01:00:00.000000000 +0100
-+++ trinity-tdebase-3.5.13.2/applnk/tde-settings.directory	2013-07-28 15:47:19.318022784 +0200
-@@ -0,0 +1,88 @@
-+[Desktop Entry]
-+Encoding=UTF-8
-+Type=Directory
-+Name=Settings-Modules
-+Name[af]=Instel-Modules
-+Name[ar]=الوحدات النمطية للتعيينات
-+Name[az]=Qurğu Modulları
-+Name[be]=Модулі настаўлення
-+Name[bg]=Контролен център
-+Name[bn]=সেটিংস-মডিউল
-+Name[br]=Kefluniadur-molladoù
-+Name[bs]=Postavke-Moduli
-+Name[ca]=Mòduls de paràmetres
-+Name[cs]=Moduly nastavení
-+Name[csb]=Ùstôw - mòdułë
-+Name[cy]=Modiwlau Gosodiadau
-+Name[da]=Indstillingsmoduler
-+Name[de]=Einstellungsmodule
-+Name[el]=Ρυθμίσεις-Αρθρώματα
-+Name[eo]=Agordomoduloj
-+Name[es]=Módulos de preferencias
-+Name[et]=Seadistuste moodulid
-+Name[eu]=Ezarpenak-moduluak
-+Name[fa]=پیمانه‌های تنظیمات
-+Name[fi]=Asetusmoduulit
-+Name[fo]=Uppsetingarpartar
-+Name[fr]=Modules de configuration
-+Name[fy]=Ynstellingsmodules
-+Name[ga]=Modúil Socraithe
-+Name[gl]=Módulos de Opcións
-+Name[he]=מודולי הגדרות
-+Name[hi]=विन्यास-मॉड्यूल्स
-+Name[hr]=Postavke-Moduli
-+Name[hsb]=Nastajenja -module
-+Name[hu]=Beállítómodulok
-+Name[is]=Stillingareiningar
-+Name[it]=Moduli impostazioni
-+Name[ja]=設定モジュール
-+Name[ka]=მოდულები
-+Name[kk]=Модульдер
-+Name[km]=ការ​កំណត់​ម៉ូឌុល
-+Name[ko]=설정-모듈
-+Name[lo]=ຕັ້ງຄ່າໂມດູນ
-+Name[lt]=Parinkčių moduliai
-+Name[lv]=Parametru moduļi
-+Name[mk]=Модули за поставувања
-+Name[mn]=Тохируулга-горим
-+Name[ms]=Tetapan Modul
-+Name[mt]=Moduli tas-settings
-+Name[nb]=Innstillingsmoduler
-+Name[nds]=Instellen-Modulen
-+Name[ne]=सेटिङ-मोड्युल
-+Name[nl]=Configuratiemodules
-+Name[nn]=Innstillingsmodular
-+Name[nso]=Diripa tsa Dipeakanyo
-+Name[pa]=ਸੈਟਿੰਗ-ਮੋਡੀਊਲ
-+Name[pl]=Ustawienia - moduły
-+Name[pt]=Módulos de Preferências
-+Name[pt_BR]=Módulos de Configuração
-+Name[ro]=Module de configurare
-+Name[ru]=Модули
-+Name[rw]=Amagenamiterere-Ibice
-+Name[se]=Heivehusmoduvllat
-+Name[sk]=Moduly nastavenia
-+Name[sl]=Nastavitveni moduli
-+Name[sr]=Поставке-модули
-+Name[sr@Latn]=Postavke-moduli
-+Name[ss]=Kuhleleka kwetahluko 
-+Name[sv]=Inställningsmoduler
-+Name[ta]=அமைப்புகள்-பகுதிகள்
-+Name[te]=అమరికలు-మాడ్యూళ్లు
-+Name[tg]=Модулҳо
-+Name[th]=โมดูลการตั้งค่า
-+Name[tr]=Modül Ayarları
-+Name[tt]=Caylaw-Modullar
-+Name[uk]=Модулі параметрів
-+Name[uz]=Mslamalar modullari
-+Name[uz@cyrillic]=Мсламалар модуллари
-+Name[ven]=Modulu wa mavhekanyele
-+Name[vi]=Thiết lập Mô đun
-+Name[wa]=Apontiaedjes des modules
-+Name[xh]=Izicwangciso-Iminqongo wokulinganisela
-+Name[zh_CN]=设置模块
-+Name[zh_TW]=設定模組
-+Name[zu]=Izingxenye-zezilungiselelo
-+NoDisplay=true
-+Icon=package_settings
-+X-KDE-BaseGroup=settings
-diff -Nuar trinity-tdebase-3.5.13.2/applnk.ORI/tde-settings-hardware.directory trinity-tdebase-3.5.13.2/applnk/tde-settings-hardware.directory
---- trinity-tdebase-3.5.13.2/applnk.ORI/tde-settings-hardware.directory	1970-01-01 01:00:00.000000000 +0100
-+++ trinity-tdebase-3.5.13.2/applnk/tde-settings-hardware.directory	2013-07-28 15:47:19.318022784 +0200
-@@ -0,0 +1,59 @@
-+[Desktop Entry]
-+Encoding=UTF-8
-+Type=Directory
-+Name=Hardware
-+Name[af]=Hardeware
-+Name[ar]=العتاد
-+Name[be]=Апаратнае забеспячэнне
-+Name[bg]=Хардуер
-+Name[bn]=হার্ডওয়্যার
-+Name[br]=Periantel
-+Name[bs]=Hardver
-+Name[csb]=Nôrzãdza
-+Name[cy]=Caledwedd
-+Name[el]=Υλικό
-+Name[eo]=Aparataro
-+Name[et]=Riistvara
-+Name[fa]=سخت‌افزار
-+Name[fi]=Laitteisto
-+Name[fr]=Matériel
-+Name[ga]=Crua-Earraí
-+Name[he]=חומרה
-+Name[hr]=Hardver
-+Name[hu]=Hardver
-+Name[id]=Perangkat Keras
-+Name[is]=Vélbúnaður
-+Name[ja]=ハードウェア
-+Name[ka]=მოწყობილობები
-+Name[kk]=Жабдықтар
-+Name[km]=ផ្នែក​រឹង
-+Name[ko]=하드웨어
-+Name[lt]=Aparatinė įranga
-+Name[mk]=Хардвер
-+Name[ms]=Perkakasan
-+Name[nb]=Maskinvare
-+Name[ne]=हार्डवेयर
-+Name[nn]=Maskinvare
-+Name[pa]=ਜੰਤਰ
-+Name[pl]=Sprzęt
-+Name[ru]=Оборудование
-+Name[rw]=Icyuma
-+Name[se]=Mašiidnagálvu
-+Name[sl]=Strojna oprema
-+Name[sr]=Хардвер
-+Name[sr@Latn]=Hardver
-+Name[sv]=Hårdvara
-+Name[ta]=வன்பொருள்
-+Name[te]=హార్డ్ వేర్
-+Name[tg]=Сахтафзор
-+Name[th]=อุปกรณ์ภายในเครื่อง
-+Name[tr]=Donanım
-+Name[tt]=Cıhazlar
-+Name[uk]=Обладнання
-+Name[uz]=Asbob-uskunalar
-+Name[uz@cyrillic]=Асбоб-ускуналар
-+Name[vi]=Phần cứng
-+Name[wa]=Éndjolreye
-+Name[zh_CN]=硬件
-+Name[zh_TW]=硬體
-+Icon=input_devices_settings
-diff -Nuar trinity-tdebase-3.5.13.2/applnk.ORI/tde-settings-looknfeel.directory trinity-tdebase-3.5.13.2/applnk/tde-settings-looknfeel.directory
---- trinity-tdebase-3.5.13.2/applnk.ORI/tde-settings-looknfeel.directory	1970-01-01 01:00:00.000000000 +0100
-+++ trinity-tdebase-3.5.13.2/applnk/tde-settings-looknfeel.directory	2013-07-28 15:47:19.319022762 +0200
-@@ -0,0 +1,86 @@
-+[Desktop Entry]
-+Encoding=UTF-8
-+Type=Directory
-+Name=Appearance & Themes
-+Name[af]=Voorkoms & Temas
-+Name[ar]=المظهر و السمات
-+Name[az]=Görünüş & Örtüklər
-+Name[be]=Вонкавы выгляд і тэмы
-+Name[bg]=Външен вид
-+Name[bn]=চেহারা এবং থীম
-+Name[br]=Neuziadur ha gizioù
-+Name[bs]=Izgled i teme
-+Name[ca]=Aparença i temes
-+Name[cs]=Vzhled a motivy
-+Name[csb]=Wëzdrzatk ë témë
-+Name[cy]=Golwg a Themau
-+Name[da]=Udseende & Temaer
-+Name[de]=Erscheinungsbild
-+Name[el]=Εμφάνιση & Θέματα
-+Name[eo]=Aspekto & Etosoj
-+Name[es]=Aspecto y temas
-+Name[et]=Välimus ja teemad
-+Name[eu]=Itxura eta gaiak
-+Name[fa]=ظاهر و چهره‌ها
-+Name[fi]=Ulkonäkö ja teemat
-+Name[fr]=Apparence et thèmes
-+Name[fy]=Uterlik en tema's
-+Name[ga]=Cuma agus Téamaí
-+Name[gl]=Apariencia e Temas
-+Name[he]=מראה וערכות נושא
-+Name[hi]=शक्ल-सूरत एवं प्रसंग
-+Name[hr]=Izgled i teme
-+Name[hsb]=Napohlad & Temy
-+Name[hu]=Megjelenés, témák
-+Name[id]=Penampilan dan Tema
-+Name[is]=Viðmót og útlit
-+Name[it]=Aspetto e Temi
-+Name[ja]=外観 & テーマ
-+Name[ka]=გარეგნობა და თემები
-+Name[kk]=Көрініс пен нақыштар
-+Name[km]=រូបរាង & ស្បែក
-+Name[ko]=모양과 테마
-+Name[lo]=ຝັຣງເສດສ໌
-+Name[lt]=Išvaizda ir temos
-+Name[lv]=Izskats un Tēmas
-+Name[mk]=Изглед и теми
-+Name[mn]=Харагдалт & хэлбэр
-+Name[ms]=Tema dan Penampilan
-+Name[mt]=Apparenza u Temi
-+Name[nb]=Utseende og temaer
-+Name[nds]=Utsehn & Muster
-+Name[ne]=दृश्य र विषयवस्तु
-+Name[nl]=Uiterlijk en thema's
-+Name[nn]=Utsjånad og tema
-+Name[nso]=Ponagalo & Melaetsa
-+Name[pa]=ਦਿੱਖ ਅਤੇ ਸਰੂਪ
-+Name[pl]=Wygląd i motywy
-+Name[pt]=Aparência e Temas
-+Name[pt_BR]=Aparência & Temas
-+Name[ro]=Aspect și tematici
-+Name[ru]=Внешний вид и темы
-+Name[rw]=Imigaragarire & Insanganyamatsiko 
-+Name[se]=Fárda ja fáttát
-+Name[sk]=Vzhľad a témy
-+Name[sl]=Videz in teme
-+Name[sr]=Изглед и теме
-+Name[sr@Latn]=Izgled i teme
-+Name[ss]=Kubukeka & kwendzikimba
-+Name[sv]=Utseende och teman
-+Name[ta]=தோற்றம் & உருக்கரு
-+Name[te]=రూపం ఇంకా వైవిద్యాంశాలు
-+Name[tg]=Намуди зоҳирӣ ва услуб
-+Name[th]=รูปแบบและชุดตกแต่ง
-+Name[tr]=Görünüm ve Temalar
-+Name[tt]=Küreneş & Tışlaw
-+Name[uk]=Вигляд та теми
-+Name[uz]=Tashqi koʻrinishi va mavzular
-+Name[uz@cyrillic]=Ташқи кўриниши ва мавзулар
-+Name[ven]=Mbonalelo & Dzithero
-+Name[vi]=Diện mạo & Sắc thái
-+Name[wa]=Rivnance & Tinmes
-+Name[xh]=Ubonakalo Nemixholo
-+Name[zh_CN]=外观和主题
-+Name[zh_TW]=外觀與主題
-+Name[zu]=Ukubukeka & Izingqikithi
-+Icon=looknfeel
-diff -Nuar trinity-tdebase-3.5.13.2/applnk.ORI/tde-settings.menu trinity-tdebase-3.5.13.2/applnk/tde-settings.menu
---- trinity-tdebase-3.5.13.2/applnk.ORI/tde-settings.menu	1970-01-01 01:00:00.000000000 +0100
-+++ trinity-tdebase-3.5.13.2/applnk/tde-settings.menu	2013-07-28 15:47:19.319022762 +0200
-@@ -0,0 +1,91 @@
-+ <!DOCTYPE Menu PUBLIC "-//freedesktop//DTD Menu 1.0//EN"
-+  "http://www.freedesktop.org/standards/menu-spec/1.0/menu.dtd">
-+
-+<Menu>
-+	<Name>Settings</Name>
-+	<Menu>
-+		<Name>Accessibility</Name>
-+		<Directory>tde-settings-accessibility.directory</Directory>
-+		<Include>
-+			<Category>X-KDE-settings-accessibility</Category>
-+		</Include>
-+	</Menu>
-+	<Menu>
-+		<Name>Components</Name>
-+		<Directory>tde-settings-components.directory</Directory>
-+		<Include>
-+			<Category>X-KDE-settings-components</Category>
-+		</Include>
-+	</Menu>
-+	<Menu>
-+		<Name>Desktop</Name>
-+		<Directory>tde-settings-desktop.directory</Directory>
-+		<Include>
-+			<Category>X-KDE-settings-desktop</Category>
-+		</Include>
-+	</Menu>
-+	<Menu>
-+		<Name>LookNFeel</Name>
-+		<Directory>tde-settings-looknfeel.directory</Directory>
-+		<Include>
-+			<Category>X-KDE-settings-looknfeel</Category>
-+		</Include>
-+	</Menu>
-+	<Menu>
-+		<Name>Network</Name>
-+		<Directory>tde-settings-network.directory</Directory>
-+		<Include>
-+			<Category>X-KDE-settings-network</Category>
-+		</Include>
-+		<Menu>
-+			<Name>WebBrowsing</Name>
-+			<Directory>tde-settings-webbrowsing.directory</Directory>
-+			<Include>
-+				<Category>X-KDE-settings-webbrowsing</Category>
-+			</Include>
-+		</Menu>
-+	</Menu>
-+	<Menu>
-+		<Name>Peripherals</Name>
-+		<Directory>tde-settings-peripherals.directory</Directory>
-+		<Include>
-+			<Category>X-KDE-settings-peripherals</Category>
-+			<Category>X-KDE-settings-hardware</Category>
-+		</Include>
-+		<Menu>
-+			<Name>Information</Name>
-+			<Directory>tde-settings-information.directory</Directory>
-+			<Include>
-+				<Category>X-KDE-settings-information</Category>
-+			</Include>
-+		</Menu>
-+	</Menu>
-+	<Menu>
-+		<Name>PowerControl</Name>
-+		<Directory>tde-settings-power.directory</Directory>
-+		<Include>
-+			<Category>X-KDE-settings-power</Category>
-+		</Include>
-+	</Menu>
-+	<Menu>
-+		<Name>Security</Name>
-+		<Directory>tde-settings-security.directory</Directory>
-+		<Include>
-+			<Category>X-KDE-settings-security</Category>
-+		</Include>
-+	</Menu>
-+	<Menu>
-+		<Name>Sound</Name>
-+		<Directory>tde-settings-sound.directory</Directory>
-+		<Include>
-+			<Category>X-KDE-settings-sound</Category>
-+		</Include>
-+	</Menu>
-+	<Menu>
-+		<Name>System</Name>
-+		<Directory>tde-settings-system.directory</Directory>
-+		<Include>
-+			<Category>X-KDE-settings-system</Category>
-+		</Include>
-+	</Menu>
-+</Menu>
-diff -Nuar trinity-tdebase-3.5.13.2/applnk.ORI/tde-settingsmenu.directory trinity-tdebase-3.5.13.2/applnk/tde-settingsmenu.directory
---- trinity-tdebase-3.5.13.2/applnk.ORI/tde-settingsmenu.directory	1970-01-01 01:00:00.000000000 +0100
-+++ trinity-tdebase-3.5.13.2/applnk/tde-settingsmenu.directory	2013-07-28 15:47:19.319022762 +0200
-@@ -0,0 +1,78 @@
-+[Desktop Entry]
-+Encoding=UTF-8
-+Type=Directory
-+Name=Settings
-+Name[af]=Instellings
-+Name[ar]=التعيينات
-+Name[az]=Qurğular
-+Name[be]=Настаўленні
-+Name[bg]=Настройки
-+Name[bn]=সেটিংস
-+Name[br]=Dibarzhoù
-+Name[bs]=Postavke
-+Name[ca]=Preferències
-+Name[cs]=Nastavení
-+Name[csb]=Ùstôw
-+Name[cy]=Gosodiadau
-+Name[da]=Opsætning
-+Name[de]=Einstellungen
-+Name[el]=Ρυθμίσεις
-+Name[eo]=Agordo
-+Name[es]=Preferencias
-+Name[et]=Seadistused
-+Name[eu]=Ezarpenak
-+Name[fa]=تنظیمات
-+Name[fi]=Asetukset
-+Name[fr]=Configuration
-+Name[fy]=Ynstellings
-+Name[ga]=Socruithe
-+Name[gl]=Opcións
-+Name[he]=הגדרות
-+Name[hi]=विन्यास
-+Name[hr]=Postavke
-+Name[hsb]=Nastajenja
-+Name[hu]=Beállítások
-+Name[is]=Stillingar
-+Name[it]=Impostazioni
-+Name[ja]=設定
-+Name[ka]=პარამეტრები
-+Name[kk]=Параметрлері
-+Name[km]=ការ​កំណត់
-+Name[ko]=설정
-+Name[lt]=Parinktys
-+Name[lv]=Parametri
-+Name[mk]=Поставувања
-+Name[mn]=Тохируулга
-+Name[ms]=Tempatan
-+Name[nb]=Innstillinger
-+Name[nds]=Instellen
-+Name[ne]=सेटिङ
-+Name[nl]=Instellingen
-+Name[nn]=Innstillingar
-+Name[pa]=ਸੈਟਿੰਗ
-+Name[pl]=Ustawienia
-+Name[pt]=Configuração
-+Name[pt_BR]=Configurações
-+Name[ro]=Setări
-+Name[ru]=Настройка
-+Name[rw]=Amagenamiterere
-+Name[se]=Heivehusat
-+Name[sk]=Nastavenia
-+Name[sl]=Nastavitve
-+Name[sr]=Поставке
-+Name[sr@Latn]=Postavke
-+Name[sv]=Inställningar
-+Name[ta]=அமைப்புகள்
-+Name[te]=అమరికలు
-+Name[tg]=Танзимот
-+Name[th]=ตั้งค่าต่างๆ
-+Name[tr]=Ayarlar
-+Name[tt]=Caylaw
-+Name[uk]=Параметри
-+Name[uz]=Moslamalar
-+Name[uz@cyrillic]=Мосламалар
-+Name[vi]=Thiết lập
-+Name[wa]=Apontiaedjes
-+Name[zh_CN]=设置
-+Name[zh_TW]=設定
-+Icon=package_settings
-diff -Nuar trinity-tdebase-3.5.13.2/applnk.ORI/tde-settings-network.directory trinity-tdebase-3.5.13.2/applnk/tde-settings-network.directory
---- trinity-tdebase-3.5.13.2/applnk.ORI/tde-settings-network.directory	1970-01-01 01:00:00.000000000 +0100
-+++ trinity-tdebase-3.5.13.2/applnk/tde-settings-network.directory	2013-07-28 15:47:19.319022762 +0200
-@@ -0,0 +1,86 @@
-+[Desktop Entry]
-+Encoding=UTF-8
-+Type=Directory
-+Name=Internet & Network
-+Name[af]=Internet & Netwerk
-+Name[ar]=الإنترنت و الشبكة
-+Name[az]=İnternet & Şəbəkə
-+Name[be]=Інтэрнэт і сетка
-+Name[bg]=Интернет и мрежа
-+Name[bn]=ইন্টারনেট এবং নেটওয়ার্ক
-+Name[br]=Kenrouedad ha Rouedad
-+Name[bs]=Internet i mreža
-+Name[ca]=Internet i xarxa
-+Name[cs]=Internet a síť
-+Name[csb]=Internet ë séc
-+Name[cy]=Rhyngrwyd & Rhwydwaith
-+Name[da]=Internet & Netværk
-+Name[de]=Internet & Netzwerk
-+Name[el]=Διαδίκτυο & Δίκτυο
-+Name[eo]=Reto & Interreto
-+Name[es]=Internet y Red
-+Name[et]=Internet ja võrk
-+Name[eu]=Internet eta sarea
-+Name[fa]=اینترنت و شبکه
-+Name[fi]=Internet ja verkko
-+Name[fr]=Internet et réseau
-+Name[fy]=Ynternet en netwurk
-+Name[ga]=Idirlíon agus Líonra
-+Name[gl]=Internet e Rede
-+Name[he]=אינטרנט ורשתות
-+Name[hi]=इंटरनेट तथा नेटवर्क
-+Name[hr]=Internet i mreža
-+Name[hsb]=Internet & Syć
-+Name[hu]=Hálózat, internet
-+Name[id]=Internet dan Jaringan
-+Name[is]=Staðarnet og Internetið
-+Name[it]=Internet e Rete
-+Name[ja]=インターネット & ネットワーク
-+Name[ka]=ქსელი და ინტერნეტი
-+Name[kk]=Интернет және желі
-+Name[km]=អ៊ិនធឺណិត & បណ្ដាញ
-+Name[ko]=인터넷과 네트워크
-+Name[lo]=ອີນເຕີເນັດ
-+Name[lt]=Internetas ir tinklas
-+Name[lv]=Internets un Tīkli
-+Name[mk]=Интернет и мрежи
-+Name[mn]=Интернэт & Сүлжээ
-+Name[ms]=Internet & Jaringan
-+Name[mt]=Internet u Network
-+Name[nb]=Internett og nettverk
-+Name[nds]=Internet & Nettwark
-+Name[ne]=इन्टरनेट र सञ्जाल
-+Name[nl]=Internet en netwerk
-+Name[nn]=Internett og nettverk
-+Name[nso]=Internet & Kgokagano
-+Name[pa]=ਇੰਟਰਨੈੱਟ ਅਤੇ ਨੈੱਟਵਰਕ
-+Name[pl]=Internet i sieć
-+Name[pt]=Internet e Rede
-+Name[pt_BR]=Internet & Rede
-+Name[ro]=Internet și rețea
-+Name[ru]=Сеть и Интернет
-+Name[rw]=Interineti & Urusobemiyoboro
-+Name[se]=Interneahtta ja fierpmádat
-+Name[sk]=Internet a sieť
-+Name[sl]=Internet in omrežje
-+Name[sr]=Интернет и мрежа
-+Name[sr@Latn]=Internet i mreža
-+Name[ss]=Internet & luchungechunge
-+Name[sv]=Internet och nätverk
-+Name[ta]=இணையம் & வலையமைப்பு
-+Name[te]=ఇంటర్నెట్ & నెట్వర్క్
-+Name[tg]=Интернет ва шабақа
-+Name[th]=อินเทอร์เน็ตและเครือข่าย
-+Name[tr]=İnternet ve Ağ Ayarları
-+Name[tt]=Päräwez & Çeltär
-+Name[uk]=Інтернет та мережа
-+Name[uz]=Internet va tarmoq
-+Name[uz@cyrillic]=Интернет ва тармоқ
-+Name[ven]=Inthanete & Vhukwamani
-+Name[vi]=Internet & Mạng
-+Name[wa]=Rantoele & Daegntoele
-+Name[xh]=Internet & Nomsebenzi womnatha
-+Name[zh_CN]=Internet 和网络
-+Name[zh_TW]=網路
-+Name[zu]=Internet & Uxhumano olusakazekile
-+Icon=network
-diff -Nuar trinity-tdebase-3.5.13.2/applnk.ORI/tde-settings-peripherals.directory trinity-tdebase-3.5.13.2/applnk/tde-settings-peripherals.directory
---- trinity-tdebase-3.5.13.2/applnk.ORI/tde-settings-peripherals.directory	1970-01-01 01:00:00.000000000 +0100
-+++ trinity-tdebase-3.5.13.2/applnk/tde-settings-peripherals.directory	2013-07-28 15:47:19.319022762 +0200
-@@ -0,0 +1,87 @@
-+[Desktop Entry]
-+Encoding=UTF-8
-+Type=Directory
-+Name=Peripherals
-+Name[af]=Randapperatuur
-+Name[ar]=الأجهزة المحيطية
-+Name[az]=Avadanlıq
-+Name[be]=Перыферыя
-+Name[bg]=Периферия
-+Name[bn]=পেরিফেরাল
-+Name[br]=Trobarzhelloù
-+Name[bs]=Vanjski uređaji
-+Name[ca]=Perifèrics
-+Name[cs]=Periférie
-+Name[csb]=Periferëjné ùrzãdzenia
-+Name[cy]=Perifferolion
-+Name[da]=Tilkoblinger
-+Name[de]=Angeschlossene Geräte
-+Name[el]=Περιφερειακά
-+Name[eo]=Periferaĵoj
-+Name[es]=Periféricos
-+Name[et]=Välisseadmed
-+Name[eu]=Periferikoak
-+Name[fa]=وسایل جانبی
-+Name[fi]=Laitteet
-+Name[fo]=Úteindir
-+Name[fr]=Périphériques
-+Name[fy]=Râneapparaten
-+Name[ga]=Forimeallaigh
-+Name[gl]=Periféricos
-+Name[he]=ציוד היקפי
-+Name[hi]=सहायक पुरजे
-+Name[hr]=Periferni uređaji
-+Name[hsb]=Periferija
-+Name[hu]=Perifériák
-+Name[is]=Jaðartæki
-+Name[it]=Periferiche
-+Name[ja]=周辺機器
-+Name[ka]=პერიფერიული
-+Name[kk]=Периферия
-+Name[km]=គ្រឿង​កុំព្យូទ័រ
-+Name[ko]=주변 장치
-+Name[lo]=ອຸປະກອນຕໍ່ພວງ
-+Name[lt]=Periferija
-+Name[lv]=Perifērija
-+Name[mk]=Периферни уреди
-+Name[mn]=Залгаатай төхөөрөмжүүд
-+Name[ms]=Perkakasan
-+Name[mt]=Apparat
-+Name[nb]=Tilleggsenheter
-+Name[nds]=Reedschappen
-+Name[ne]=परिवृत्तीय
-+Name[nl]=Randapparaten
-+Name[nn]=Tilleggseiningar
-+Name[nso]=Ditswelantle
-+Name[oc]=Periferics
-+Name[pa]=ਸਹਾਇਕ ਜੰਤਰ
-+Name[pl]=Urządzenia peryferyjne
-+Name[pt]=Periféricos
-+Name[pt_BR]=Periféricos
-+Name[ro]=Periferice
-+Name[ru]=Периферия
-+Name[rw]=Ibyinyuma
-+Name[se]=Ovttadagat
-+Name[sk]=Periférie
-+Name[sl]=Strojni dodatki
-+Name[sr]=Периферије
-+Name[sr@Latn]=Periferije
-+Name[ss]=Ema-peripherals
-+Name[sv]=Kringutrustning
-+Name[ta]=கருவிகள்
-+Name[te]=పరికరాలు
-+Name[tg]=Дастгоҳҳои лозимӣ
-+Name[th]=อุปกรณ์ต่อพ่วง
-+Name[tr]=Çevre Birimleri
-+Name[tt]=Cıhazlar
-+Name[uk]=Периферійні пристрої
-+Name[uz]=Ulangan uskunalar
-+Name[uz@cyrillic]=Уланган ускуналар
-+Name[ven]=Dzipheriferala
-+Name[vi]=Thiết bị ngoại vi
-+Name[wa]=Periferikes
-+Name[xh]=Iilayini zomda
-+Name[zh_CN]=外设
-+Name[zh_TW]=週邊設備
-+Name[zu]=Imixhantela
-+Icon=input_devices_settings
-diff -Nuar trinity-tdebase-3.5.13.2/applnk.ORI/tde-settings-power.directory trinity-tdebase-3.5.13.2/applnk/tde-settings-power.directory
---- trinity-tdebase-3.5.13.2/applnk.ORI/tde-settings-power.directory	1970-01-01 01:00:00.000000000 +0100
-+++ trinity-tdebase-3.5.13.2/applnk/tde-settings-power.directory	2013-07-28 15:47:19.319022762 +0200
-@@ -0,0 +1,88 @@
-+[Desktop Entry]
-+Encoding=UTF-8
-+Type=Directory
-+Name=Power Control
-+Name[af]=Krag Beheer
-+Name[ar]=التحكّم بالطّاقة
-+Name[az]=Güc İdarəsi
-+Name[be]=Кіраванне сілкаваннем
-+Name[bg]=Електрозахранване
-+Name[bn]=পাওয়ার নিয়ন্ত্রণ
-+Name[br]=Renadur ar gremm
-+Name[bs]=Ušteda energije
-+Name[ca]=Control d'energia
-+Name[cs]=Správa napájení
-+Name[csb]=Kòntrola sëłë
-+Name[cy]=Rheoli Pŵer
-+Name[da]=Strømstyring
-+Name[de]=Energiekontrolle
-+Name[el]=Έλεγχος ισχύος
-+Name[eo]=Elektrostirilo
-+Name[es]=Control de energía
-+Name[et]=Voolutarve
-+Name[eu]=Energia kontrola
-+Name[fa]=کنترل توان
-+Name[fi]=Virranhallinta
-+Name[fo]=Orkustýring
-+Name[fr]=Contrôle de l'énergie
-+Name[fy]=Enerzjybehear
-+Name[ga]=Rialú Cumhachta
-+Name[gl]=Control da Enerxéa
-+Name[he]=צריכת חשמל
-+Name[hi]=बिज़ली नियंत्रण
-+Name[hr]=Ušteda energije
-+Name[hsb]=Milina
-+Name[hu]=Energiakezelés
-+Name[id]=Kontrol Power
-+Name[is]=Orkustilling
-+Name[it]=Controllo energia
-+Name[ja]=電源管理
-+Name[ka]=კვების კონტროლი
-+Name[kk]=Қуаттандыруды бақылау
-+Name[km]=ការ​ត្រួត​ពិនិត្យ​ថាមពល
-+Name[ko]=전원 관리
-+Name[lo]=ຄວບຄຸມການໃຊ້ພະລັງງານ
-+Name[lt]=Energijos kontrolė
-+Name[lv]=Energo Kontrole
-+Name[mk]=Контрола на енергија
-+Name[mn]=Энергийн удирдлага
-+Name[ms]=Kawalan Kuasa
-+Name[mt]=Kontroll tal-konsum
-+Name[nb]=Strømkontroll
-+Name[nds]=Stroomkuntrull
-+Name[ne]=शक्ति नियन्त्रण
-+Name[nl]=Energiebeheer
-+Name[nn]=Straumkontroll
-+Name[nso]=Taolo ya Matla
-+Name[oc]=Contròle d'alimentacion
-+Name[pa]=ਊਰਜਾ ਕੰਟਰੋਲ
-+Name[pl]=Zasilanie
-+Name[pt]=Controlo de Energia
-+Name[pt_BR]=Controle de Energia
-+Name[ro]=Control energie
-+Name[ru]=Управление питанием
-+Name[rw]=Igenzura ry'Umuriro
-+Name[se]=El-rávdnje stivren
-+Name[sk]=Ovládanie spotreby
-+Name[sl]=Nadzor energije
-+Name[sr]=Контрола енергије
-+Name[sr@Latn]=Kontrola energije
-+Name[ss]=Kulawulwa kwemlilo
-+Name[sv]=Strömsparfunktion
-+Name[ta]=மின்னோட்ட கட்டுப்பாடு
-+Name[te]=విద్యుత్ నియంత్రణ
-+Name[tg]=Идораи қувваи барқ
-+Name[th]=ควบคุมการใช้พลังงาน
-+Name[tr]=Güç Denetimi
-+Name[tt]=Qüät İdäräse
-+Name[uk]=Керування живленням
-+Name[uz]=Elektr taʼminotni boshqarish
-+Name[uz@cyrillic]=Электр таъминотни бошқариш
-+Name[ven]=Ndanguli ya maanda
-+Name[vi]=Điều khiển Nguồn điện
-+Name[wa]=Controle di l' alimintåcion
-+Name[xh]=Ulawulo Lwamandla
-+Name[zh_CN]=电源控制
-+Name[zh_TW]=電源控制
-+Name[zu]=Ukulawulwa kwamandla
-+Icon=energy
-diff -Nuar trinity-tdebase-3.5.13.2/applnk.ORI/tde-settings-security.directory trinity-tdebase-3.5.13.2/applnk/tde-settings-security.directory
---- trinity-tdebase-3.5.13.2/applnk.ORI/tde-settings-security.directory	1970-01-01 01:00:00.000000000 +0100
-+++ trinity-tdebase-3.5.13.2/applnk/tde-settings-security.directory	2013-07-28 15:47:19.320022740 +0200
-@@ -0,0 +1,86 @@
-+[Desktop Entry]
-+Encoding=UTF-8
-+Type=Directory
-+Name=Security & Privacy
-+Name[af]=Sekuriteit & Privaatheid
-+Name[ar]=الأمن و السرية
-+Name[az]=Təhlükəsizlik & Gizlilik
-+Name[be]=Бяспека і прыватнасць
-+Name[bg]=Поверителност
-+Name[bn]=নিরাপত্তা এবং গোপনীয়তা
-+Name[br]=Surentez ha buhez prevez
-+Name[bs]=Sigurnost i privatnost
-+Name[ca]=Seguretat i privacitat
-+Name[cs]=Bezpečnost a soukromí
-+Name[csb]=Bezpiek ë priwatnosc
-+Name[cy]=Diogelwch & Preifatrwydd
-+Name[da]=Sikkerhed & Private data
-+Name[de]=Sicherheit & Privatsphäre
-+Name[el]=Ασφάλεια & Προσωπικό απόρρητο
-+Name[eo]=Sekureco & Privateco
-+Name[es]=Seguridad y privacidad
-+Name[et]=Turvalisus ja privaatsus
-+Name[eu]=Segurtasuna eta pribatutasuna
-+Name[fa]=امنیت و محرمانگی
-+Name[fi]=Turvallisuus ja yksityisyys
-+Name[fr]=Sécurité et confidentialité
-+Name[fy]=Privacy en befeiliging
-+Name[ga]=Slándáil agus Príobháideachas
-+Name[gl]=Seguridade e Privacidade
-+Name[he]=אבטחה ופרטיות
-+Name[hi]=सुरक्षा तथा गोपनीयता
-+Name[hr]=Sigurnost i privatnost
-+Name[hsb]=Wěstosć & Anonymnosć
-+Name[hu]=Adatvédelem
-+Name[id]=Keamanan & Privasi
-+Name[is]=Öryggi og einkamál
-+Name[it]=Sicurezza e Privacy
-+Name[ja]=セキュリティ & プライバシー
-+Name[ka]=დაცვა და კონფიდენციალურობა
-+Name[kk]=Қауіпсіздік
-+Name[km]=សុវត្ថិភាព & ភាព​ឯកជន
-+Name[ko]=보안과 사생활
-+Name[lo]=ຄວາມປອດໄພ & ຄວາມເປັນສ່ວນຕົວ
-+Name[lt]=Saugumas ir privatumas
-+Name[lv]=Drošība un Privātums
-+Name[mk]=Безбедност и приватност
-+Name[mn]=Хамгаалалт & Амгалан
-+Name[ms]=Sekuriti dan Privasi
-+Name[mt]=Sigurtà u Privatezza
-+Name[nb]=Sikkerhet og personvern
-+Name[nds]=Sekerheit & Privaatrebeet
-+Name[ne]=सुरक्षा र गोपनीयता
-+Name[nl]=Privacy en beveiliging
-+Name[nn]=Tryggleik og privatliv
-+Name[nso]=Tshireletso & Bosephiri
-+Name[pa]=ਸੁਰੱਖਿਆ ਅਤੇ ਰਹੱਸ
-+Name[pl]=Bezpieczeństwo i prywatność
-+Name[pt]=Segurança e Privacidade
-+Name[pt_BR]=Segurança & Privacidade
-+Name[ro]=Securitate și confidențialitate
-+Name[ru]=Безопасность и конфиденциальность
-+Name[rw]=Umutekano & Umwihariko
-+Name[se]=Sihkkarvuohta ja iežassuodjaleapmi
-+Name[sk]=Zabezpečenie a súkromie
-+Name[sl]=Varnost in zasebnost
-+Name[sr]=Безбедност и приватност
-+Name[sr@Latn]=Bezbednost i privatnost
-+Name[ss]=Kuphepha & ngasese
-+Name[sv]=Säkerhet och integritet
-+Name[ta]=பாதுகாப்பு & தனித்துவம்
-+Name[te]=భద్రత & ప్రైవసి
-+Name[tg]=Амният ва махфинокӣ
-+Name[th]=ความปลอดภัยและความเป็นส่วนตัว
-+Name[tr]=Güvenlik ve Gizlilik
-+Name[tt]=İminlek & Xosusílıq
-+Name[uk]=Безпека та приватність
-+Name[uz]=Xavfsizlik va shaxsiy maʼlumot
-+Name[uz@cyrillic]=Хавфсизлик ва шахсий маълумот
-+Name[ven]=Vhutsireledzi & Tshiphiri
-+Name[vi]=Bảo mật & Sự riêng tư
-+Name[wa]=Såvrité & Privaceye
-+Name[xh]=Ukhuseleko & Nobunikazi
-+Name[zh_CN]=安全和隐私
-+Name[zh_TW]=安全性與私密性
-+Name[zu]=Ukuvikeleka & Ingasese
-+Icon=password
-diff -Nuar trinity-tdebase-3.5.13.2/applnk.ORI/tde-settings-sound.directory trinity-tdebase-3.5.13.2/applnk/tde-settings-sound.directory
---- trinity-tdebase-3.5.13.2/applnk.ORI/tde-settings-sound.directory	1970-01-01 01:00:00.000000000 +0100
-+++ trinity-tdebase-3.5.13.2/applnk/tde-settings-sound.directory	2013-07-28 15:47:19.320022740 +0200
-@@ -0,0 +1,85 @@
-+[Desktop Entry]
-+Encoding=UTF-8
-+Type=Directory
-+Name=Sound & Multimedia
-+Name[af]=Klank & Multimedia
-+Name[ar]=الصوت و الوسائط المتعددة
-+Name[az]=Səs & Multimediya
-+Name[be]=Гук і мультымедыя
-+Name[bg]=Мултимедия
-+Name[bn]=শব্দ ও মাল্টিমিডিয়া
-+Name[br]=Son & Liesvedia
-+Name[bs]=Zvuk i multimedija
-+Name[ca]=So i multimèdia
-+Name[cs]=Zvuk a multimédia
-+Name[csb]=Zwãk ë mùltimedia
-+Name[cy]=Sain & Amlgyfryngau
-+Name[da]=Lyd & Multimedie
-+Name[el]=Ήχος & Πολυμέσα
-+Name[eo]=Sono & Plurmedio
-+Name[es]=Sonidos y multimedia
-+Name[et]=Heli ja multimeedia
-+Name[eu]=Soinua eta multimedia
-+Name[fa]=صوت و چند رسانه‌ای
-+Name[fi]=Ääni ja multimedia
-+Name[fr]=Son et multimédia
-+Name[fy]=Lûd en multimedia
-+Name[ga]=Fuaim agus Ilmheáin
-+Name[gl]=Son e Multimedia
-+Name[he]=צליל ומולטימדיה
-+Name[hi]=ध्वनि व मल्टीमीडिया
-+Name[hr]=Zvuk i multimedija
-+Name[hsb]=Zwuk & Multimedia
-+Name[hu]=Hang, multimédia
-+Name[id]=Efek Suara & Multimedia
-+Name[is]=Hljóð og margmiðlun
-+Name[it]=Suono e Multimedia
-+Name[ja]=サウンド & マルチメディア
-+Name[ka]=ხმა და მეულტიმედია
-+Name[kk]=Дыбыс пен мультимедиа
-+Name[km]=សំឡេង & ពហុព័ត៌មាន
-+Name[ko]=소리와 멀티미디어
-+Name[lo]=ເມົາຕິມີເດຍ
-+Name[lt]=Garsas ir daugialypė terpė
-+Name[lv]=Skaņa un Multimēdija
-+Name[mk]=Звук и мултимедија
-+Name[mn]=Дуу & Мултимедиа
-+Name[ms]=Bunyi & Multimedia
-+Name[mt]=Ħsejjes u Multimedia
-+Name[nb]=Lyd og multimedia
-+Name[nds]=Kläng & Multimedia
-+Name[ne]=ध्वनि र मल्टिमिडिया
-+Name[nl]=Geluid en multimedia
-+Name[nn]=Lyd og multimedia
-+Name[nso]=Modumo & Media wa Bontshi
-+Name[pa]=ਅਵਾਜ਼ ਅਤੇ ਮਲਟੀਮੀਡਿਆ
-+Name[pl]=Dźwięk i multimedia
-+Name[pt]=Som e Multimédia
-+Name[pt_BR]=Som & Multimídia
-+Name[ro]=Sunet și multimedia
-+Name[ru]=Звук и мультимедиа
-+Name[rw]=Ijwi & Mutwaramakuru
-+Name[se]=Jietna ja multimedia
-+Name[sk]=Zvuk a multimédiá
-+Name[sl]=Zvok in večpredstavnost
-+Name[sr]=Звук и мултимедија
-+Name[sr@Latn]=Zvuk i multimedija
-+Name[ss]=Umsindvo & tinhlobonhlobo-tetindzaba
-+Name[sv]=Ljud och multimedia
-+Name[ta]=ஒலி & பல்லூடகம்
-+Name[te]=శబ్దం & మల్టీ మీడియా
-+Name[tg]=Садо ва мултимедия
-+Name[th]=เสียงและมัลติมีเดีย
-+Name[tr]=Ses ve Çokluortam
-+Name[tt]=Tawış & Multimedia
-+Name[uk]=Звук та мультимедіа
-+Name[uz]=Tovush va multimedia
-+Name[uz@cyrillic]=Товуш ва мултимедиа
-+Name[ven]=Mubvumo & Zwimwumwusi
-+Name[vi]=Âm nhạc & Đa phương tiện
-+Name[wa]=Son & Multimedia
-+Name[xh]=Isandi & Multimedia
-+Name[zh_CN]=声音和多媒体
-+Name[zh_TW]=聲音與多媒體
-+Name[zu]=Umsindo & Onozindaba abaningi
-+Icon=multimedia
-diff -Nuar trinity-tdebase-3.5.13.2/applnk.ORI/tde-settings-system.directory trinity-tdebase-3.5.13.2/applnk/tde-settings-system.directory
---- trinity-tdebase-3.5.13.2/applnk.ORI/tde-settings-system.directory	1970-01-01 01:00:00.000000000 +0100
-+++ trinity-tdebase-3.5.13.2/applnk/tde-settings-system.directory	2013-07-28 15:47:19.320022740 +0200
-@@ -0,0 +1,84 @@
-+[Desktop Entry]
-+Encoding=UTF-8
-+Type=Directory
-+Name=System Administration
-+Name[af]=Stelsel Administrasie
-+Name[ar]=إدارة النّظام
-+Name[az]=Sistem İdarəsi
-+Name[be]=Сістэмнае адміністраванне
-+Name[bg]=Администрация
-+Name[bn]=সিস্টেম অ্যাডমিনস্ট্রেশন
-+Name[br]=Melestradur ar Reizhiad
-+Name[bs]=Administracija sistema
-+Name[ca]=Administració del sistema
-+Name[cs]=Správa systému
-+Name[csb]=Sprôwianié systemã
-+Name[cy]=Gweinyddiaith Cysawd
-+Name[da]=Systemadministration
-+Name[de]=Systemverwaltung
-+Name[el]=Διαχείριση συστήματος
-+Name[eo]=Sistemadministrado
-+Name[es]=Administración del sistema
-+Name[et]=Süsteemi administreerimine
-+Name[eu]=Sistemaren kudeaketa
-+Name[fa]=سرپرستی سیستم
-+Name[fi]=Järjestelmänhallinta
-+Name[fr]=Administration du système
-+Name[fy]=Systeembehear
-+Name[ga]=Riarachán Córais
-+Name[gl]=Administración do Sistema
-+Name[he]=מנהל המערכת
-+Name[hi]=तंत्र प्रशासन
-+Name[hr]=Administracija sustava
-+Name[hsb]=Zarjadowanje systema
-+Name[hu]=Rendszeradminisztráció
-+Name[id]=Administrasi Sistem
-+Name[is]=Kerfisstjórnun
-+Name[it]=Amministrazione di sistema
-+Name[ja]=システム管理
-+Name[ka]=სისტემის ადმინისტრირება
-+Name[kk]=Жүйе әкімшілігі
-+Name[km]=ការ​គ្រប់គ្រង​ប្រព័ន្ធ
-+Name[ko]=시스템 관리
-+Name[lo]=SAM -ສຳລັບຜູ້ເບິ່ງແຍງລະບົບ
-+Name[lt]=Sistemos administravimas
-+Name[lv]=Sistēmas Administrācija
-+Name[mk]=Системска администрација
-+Name[mn]=Систем-Зохион байгуулалт
-+Name[ms]= Pengurusan Sistem
-+Name[mt]=Amministrazzjoni tas-Sistema
-+Name[nb]=Systemadministrasjon
-+Name[nds]=Systeempleeg
-+Name[ne]=प्रणाली प्रशासक
-+Name[nl]=Systeembeheer
-+Name[nn]=Systemadministrasjon
-+Name[pa]=ਸਿਸਟਮ ਪਰਸ਼ਾਸ਼ਨ
-+Name[pl]=Administracja systemu
-+Name[pt]=Administração do Sistema
-+Name[pt_BR]=Administração do Sistema
-+Name[ro]=Administrare sistem
-+Name[ru]=Системное администрирование
-+Name[rw]=Ubuyobozi bwa Sisitemu
-+Name[se]=Vuogádathálddašeapmi
-+Name[sk]=Správa systému
-+Name[sl]=Sistemsko upravljanje
-+Name[sr]=Администрација система
-+Name[sr@Latn]=Administracija sistema
-+Name[sv]=Systemadministration
-+Name[ta]=கணினி-நிர்வாகம்
-+Name[te]=వ్యవస్థ నిర్వహణ
-+Name[tg]=Идоракунии система
-+Name[th]=การดูแลระบบ
-+Name[tr]=Sistem Yönetimi
-+Name[tt]=Sanaq İdäräse
-+Name[uk]=Адміністрування системи
-+Name[uz]=Tizimni boshqarish
-+Name[uz@cyrillic]=Тизимни бошқариш
-+Name[ven]=Kulangulele kwa Maitele
-+Name[vi]=Quản lý Hệ thống
-+Name[wa]=Manaedjmint do sistinme
-+Name[xh]=Umphathi Wendlela yokusebenza
-+Name[zh_CN]=系统管理
-+Name[zh_TW]=系統管理
-+Name[zu]=Ukugcinwa kwe-sistimu
-+Icon=kcmsystem
-diff -Nuar trinity-tdebase-3.5.13.2/applnk.ORI/tde-settings-webbrowsing.directory trinity-tdebase-3.5.13.2/applnk/tde-settings-webbrowsing.directory
---- trinity-tdebase-3.5.13.2/applnk.ORI/tde-settings-webbrowsing.directory	1970-01-01 01:00:00.000000000 +0100
-+++ trinity-tdebase-3.5.13.2/applnk/tde-settings-webbrowsing.directory	2013-07-28 15:47:19.320022740 +0200
-@@ -0,0 +1,85 @@
-+[Desktop Entry]
-+Encoding=UTF-8
-+Type=Directory
-+Name=Web Browser
-+Name[af]=Web Blaaier
-+Name[ar]=متصفح الشبكة
-+Name[az]=Veb Səyyahı
-+Name[be]=Вандроўнік па Сеціве
-+Name[bg]=Уеб браузър
-+Name[bn]=ওয়েব ব্রাউজার
-+Name[br]=Furcher an Internet
-+Name[bs]=Web preglednik
-+Name[ca]=Navegació Web
-+Name[cs]=Prohlížeč Webu
-+Name[csb]=Przezérnik WWW
-+Name[cy]=Porydd Gwê
-+Name[da]=Browser
-+Name[de]=Webbrowser
-+Name[el]=Περιηγητής ιστού
-+Name[eo]=TTT-legilo
-+Name[es]=Navegador Web
-+Name[et]=Veebilehitseja
-+Name[eu]=Web arakatzailea
-+Name[fa]=مرورگر وب‌‌
-+Name[fi]=WWW-selain
-+Name[fo]=Vevlesari
-+Name[fr]=Navigateur web
-+Name[fy]=Webblêder
-+Name[ga]=Brabhsálaí Lín
-+Name[gl]=Navegador Web
-+Name[he]=דפדפן
-+Name[hi]=वेब ब्राउज़र
-+Name[hr]=Web preglednik
-+Name[hsb]=Web-browser
-+Name[hu]=Webböngésző
-+Name[id]=Peselancar Web
-+Name[is]=Vafri
-+Name[it]=Navigazione Web
-+Name[ja]=ウェブブラウザ
-+Name[ka]=ვებ ბრაუზერი
-+Name[kk]=Веб шолғыш
-+Name[km]=កម្មវិធី​រុករក​បណ្ដាញ
-+Name[ko]=웹 브라우저
-+Name[lo]=ຮງກເບິ່ງຖານເບິ່ງຂໍ້ມູນ
-+Name[lt]=Žiniatinklio naršyklė
-+Name[lv]=Tīmekļa Pārlūks
-+Name[mk]=Веб-прелистувач
-+Name[mn]=Вэб-Хөтөч
-+Name[ms]=Pelayar Web
-+Name[nb]=Nettleser
-+Name[nds]=Nettkieker
-+Name[ne]=वेब ब्राउजर
-+Name[nl]=Webbrowser
-+Name[nn]=Nettlesar
-+Name[nso]=Seinyakisi sa Web
-+Name[pa]=ਵੈਬ ਝਲਕਾਰਾ
-+Name[pl]=Przeglądarka WWW
-+Name[pt]=Navegação Web
-+Name[pt_BR]=Navegador Web
-+Name[ro]=Navigator de web
-+Name[ru]=Браузер
-+Name[rw]=Mucukumbuzi Rubuga
-+Name[se]=Fierpmádatlogan
-+Name[sk]=Webový prehliadač
-+Name[sl]=Spletni brskalnik
-+Name[sr]=Веб прегледач
-+Name[sr@Latn]=Veb pregledač
-+Name[ss]=Ibrawuza ye-Web 
-+Name[sv]=Webbläsning
-+Name[ta]=வலை உலாவி
-+Name[te]=వెబ్ బ్రౌజర్
-+Name[tg]=Намоишгари Веб
-+Name[th]=เว็บเบราว์เซอร์
-+Name[tr]=Web Tarayıcı
-+Name[uk]=Навігатор Тенет
-+Name[uz]=Veb-brauzer
-+Name[uz@cyrillic]=Веб-браузер
-+Name[ven]=Burausa ya Web
-+Name[vi]=Trình duyệt Mạng
-+Name[wa]=Betchteu waibe
-+Name[xh]=Umkhangeli zincwadi we Web
-+Name[zh_CN]=Web 浏览器
-+Name[zh_TW]=網頁瀏覽器
-+Name[zu]=Umcingi we-Web
-+Icon=konqueror
-diff -Nuar trinity-tdebase-3.5.13.2/applnk.ORI/tde-system.directory trinity-tdebase-3.5.13.2/applnk/tde-system.directory
---- trinity-tdebase-3.5.13.2/applnk.ORI/tde-system.directory	1970-01-01 01:00:00.000000000 +0100
-+++ trinity-tdebase-3.5.13.2/applnk/tde-system.directory	2013-07-28 15:47:19.320022740 +0200
-@@ -0,0 +1,81 @@
-+[Desktop Entry]
-+Encoding=UTF-8
-+Type=Directory
-+Name=System
-+Name[af]=Stelsel
-+Name[ar]=النظام
-+Name[az]=Sistem
-+Name[be]=Сістэма
-+Name[bg]=Система
-+Name[bn]=সিস্টেম
-+Name[br]=Reizhiad
-+Name[bs]=Sistem
-+Name[ca]=Sistema
-+Name[cs]=Systém
-+Name[csb]=Systema
-+Name[cy]=Cysawd
-+Name[el]=Σύστημα
-+Name[eo]=Sistemo
-+Name[es]=Sistema
-+Name[et]=Süsteem
-+Name[eu]=Sistema
-+Name[fa]=سیستم
-+Name[fi]=Järjestelmä
-+Name[fo]=Kervi
-+Name[fr]=Système
-+Name[fy]=Systeem
-+Name[ga]=Córas
-+Name[gl]=Sistema
-+Name[he]=מערכת
-+Name[hi]=तंत्र
-+Name[hr]=Sustav
-+Name[hu]=Rendszer
-+Name[id]=Sistem
-+Name[is]=Kerfi
-+Name[it]=Sistema
-+Name[ja]=システム
-+Name[ka]=სისტემა
-+Name[kk]=Жүйелік
-+Name[km]=ប្រព័ន្ធ
-+Name[ko]=시스템
-+Name[lo]=ຈັດການລະບົບ
-+Name[lt]=Sistema
-+Name[lv]=Sistēma
-+Name[mk]=Систем
-+Name[mn]=Систем
-+Name[ms]=Sistem
-+Name[mt]=Sistema
-+Name[nds]=Systeem
-+Name[ne]=प्रणाली
-+Name[nl]=Systeem
-+Name[oc]=Sistemo
-+Name[pa]=ਸਿਸਟਮ
-+Name[pt]=Sistema
-+Name[pt_BR]=Sistema
-+Name[ro]=Sistem
-+Name[ru]=Система
-+Name[rw]=Sisitemu
-+Name[se]=Vuogádat
-+Name[sk]=Systém
-+Name[sl]=Sistem
-+Name[sr]=Систем
-+Name[sr@Latn]=Sistem
-+Name[ss]=Umshini
-+Name[ta]=அமைப்பு
-+Name[te]=వ్యవస్థ
-+Name[tg]=Система
-+Name[th]=ระบบ
-+Name[tr]=Sistem
-+Name[tt]=Sistem
-+Name[uk]=Система
-+Name[uz]=Tizim
-+Name[uz@cyrillic]=Тизим
-+Name[ven]=Maitele
-+Name[vi]=Hệ thống
-+Name[wa]=Sistinme
-+Name[xh]=Indlela esestyenziswayo
-+Name[zh_CN]=系统
-+Name[zh_TW]=系統
-+Name[zu]=Isistimu
-+Icon=package_system
-+
-diff -Nuar trinity-tdebase-3.5.13.2/applnk.ORI/tde-system-screensavers.directory trinity-tdebase-3.5.13.2/applnk/tde-system-screensavers.directory
---- trinity-tdebase-3.5.13.2/applnk.ORI/tde-system-screensavers.directory	1970-01-01 01:00:00.000000000 +0100
-+++ trinity-tdebase-3.5.13.2/applnk/tde-system-screensavers.directory	2013-07-28 15:47:19.320022740 +0200
-@@ -0,0 +1,171 @@
-+[Desktop Entry]
-+Encoding=UTF-8
-+Type=Directory
-+Name=Screen Savers
-+Name[af]=Skerm Bewaarders
-+Name[ar]=مدخري الشاشة
-+Name[az]=Ekran Qoruyucuları
-+Name[be]=Зберагальнікі экрана
-+Name[bg]=Предпазители на екрана
-+Name[bn]=স্ক্রীন সেভার
-+Name[br]=Damanterien Skramm
-+Name[bs]=Zaštita ekrana (screensaver)
-+Name[ca]=Salvapantalles
-+Name[cs]=Šetřiče obrazovky
-+Name[csb]=Wëgaszôcz ekranu
-+Name[cy]=Arbedyddion Sgrîn
-+Name[da]=Pauseskærme
-+Name[de]=Bildschirmschoner
-+Name[el]=Προφύλαξη οθόνης
-+Name[eo]=Ekrankurtenoj
-+Name[es]=Salvapantallas
-+Name[et]=Ekraanisäästjad
-+Name[eu]=Pantaila babesleak
-+Name[fa]=محافظهای صفحه نمایش
-+Name[fi]=Näytönsäästäjät
-+Name[fo]=Skíggjaspararir
-+Name[fr]=Écrans de veille
-+Name[fy]=Skermbefeiliging
-+Name[ga]=Spárálaithe Scáileáin
-+Name[gl]=Protectores de Pantalla
-+Name[he]=שומרי מסך
-+Name[hi]=स्क्रीन सेवर
-+Name[hr]=Zaštita zaslona
-+Name[hsb]=Škitaki za wobrazowku
-+Name[hu]=Képernyővédő
-+Name[is]=Skjásvæfur
-+Name[it]=Salvaschermi
-+Name[ja]=スクリーンセーバー
-+Name[kk]=Экран сақтаушылары
-+Name[km]=ធាតុ​សង្គ្រោះ​អេក្រង់
-+Name[ko]=화면 보호기
-+Name[lo]=ໂປຣແກຣມຮັກສາຫນ້າຈໍ
-+Name[lt]=Ekrano Užsklandos
-+Name[lv]=Ekrāna saudzetāji
-+Name[mk]=Екрански чувари
-+Name[mn]=Дэлгэц гамнагч
-+Name[ms]=Penghias Skrin
-+Name[nb]=Pauseskjerme
-+Name[nds]=Pausschirm
-+Name[ne]=स्क्रिनसेभर
-+Name[nl]=Schermbeveiliging
-+Name[nn]=Pauseskjermar
-+Name[nso]=Diboloki tsa Pontsho
-+Name[oc]=Salvador d'ecrans
-+Name[pa]=ਸਕਰੀਨ-ਸੇਵਰ
-+Name[pl]=Wygaszacze ekranu
-+Name[pt]=Protectores de Ecrã
-+Name[pt_BR]=Protetores de tela
-+Name[ro]=Protecții de ecran
-+Name[ru]=Хранители экрана
-+Name[rw]=Mugaragaza Ukubamaso
-+Name[se]=Šearbmasiestejeaddjit
-+Name[sk]=Šetriče obrazovky
-+Name[sl]=Ohranjevalniki zaslona
-+Name[sr]=Чувари екрана
-+Name[sr@Latn]=Čuvari ekrana
-+Name[ss]=Sigcini-skrini
-+Name[sv]=Skärmsläckare
-+Name[ta]=திரை காப்பாளர்கள்
-+Name[te]= స్క్రీన్ సేవర్లు
-+Name[tg]=Пардаи экран
-+Name[th]=โปรแกรมรักษาหน้าจอ
-+Name[tr]=Ekran Koruyucular
-+Name[tt]=Küräk Saqlağıçı
-+Name[uk]=Зберігачі екрана
-+Name[uz]=Ekran saqlovchilari
-+Name[uz@cyrillic]=Экран сақловчилари
-+Name[ven]=Tshivhulungi tsha Tshikirini
-+Name[vi]=Trình bảo vệ màn hình
-+Name[wa]=Sipårgneus di waitroûle
-+Name[xh]=Abagcini Bekhusi
-+Name[zh_CN]=屏幕保护程序
-+Name[zh_TW]=螢幕保護程式
-+Name[zu]=Abagcini Besikrini
-+Icon=kscreensaver
-+X-KDE-BaseGroup=screensavers
-+
-+Comment=Screen saver demos
-+Comment[af]=Skerm bewaarder demonstrasies
-+Comment[ar]=عروض توضيحية لمدخر الشاشة
-+Comment[az]=Ekran Qoruyucu Demoları
-+Comment[be]=Дэманстрацыі зберагальніка экрана
-+Comment[bg]=Демо на предпазителите на екрана
-+Comment[bn]=স্ক্রীন সেভার ডেমো
-+Comment[br]=Diskouezadur damanterien skramm
-+Comment[bs]=Demonstracije zaštite ekrana
-+Comment[ca]=Demos de salvapantalles
-+Comment[cs]=Ukázky šetřičů obrazovky
-+Comment[csb]=Pòdzérk wëgaszôcza ekranu
-+Comment[cy]=Arddangosfeydd arbedyddion sgrîn
-+Comment[da]=Pauseskærm-demoer
-+Comment[de]=Demos zu Bildschirmschonern
-+Comment[el]=Επίδειξη προφύλαξης οθόνης
-+Comment[eo]=Demonstro de la ekrankurtenoj
-+Comment[es]=Demostraciones del salvapantallas
-+Comment[et]=Ekraanisäästjate demod
-+Comment[eu]=Pantaila babesle demoak
-+Comment[fa]=نمایشهای صفحه کلید
-+Comment[fi]=Näytönsäästäjien mallit
-+Comment[fo]=Skíggjaspararadømi
-+Comment[fr]=Démonstrations d'écrans de veille
-+Comment[fy]=Skermbefeiligingdemo's
-+Comment[ga]=Taispeántais na spárálaithe scáileáin
-+Comment[gl]=Demostracións dos protectores de pantalla
-+Comment[he]=הדגמות של שומרי מסך
-+Comment[hi]=स्क्रीन सेवर डेमोस
-+Comment[hr]=Demonstracije zaštite zaslona
-+Comment[hsb]=demonstrowanje škitakow za wobrazowku
-+Comment[hu]=Képernyővédő-demók
-+Comment[id]=Demo screen saver
-+Comment[is]=Skjásvæfukynningar
-+Comment[it]=Anteprime dei salvaschermi
-+Comment[ja]=スクリーンセーバーのデモ
-+Comment[kk]=Экран сақтаушыны таңдау
-+Comment[km]=បង្ហាញ​ធាតុ​សង្គ្រោះ​អេក្រង់​សាក​មើល
-+Comment[ko]=화면 보호기 데모
-+Comment[lo]=ຕົວຢ່າງໂປຣແກຣມຮັກສາຫນ້າຈໍ
-+Comment[lt]=Ekrano užsklandos demonstracija
-+Comment[lv]=Ekrāna saudzētāja demoversijas
-+Comment[mk]=Демоа на екрански чувари
-+Comment[mn]=Дэлгэц гамнагчийн үзүүлэн
-+Comment[ms]=Contoh penghias skrin
-+Comment[mt]=Wirjiet ta' screen savers
-+Comment[nb]=Pauseskjerm-demoer
-+Comment[nds]=Pausschirmen utproberen
-+Comment[ne]=स्क्रिनसेभर डेमो
-+Comment[nl]=Schermbeveiligingdemo's
-+Comment[nn]=Pauseskjerm-demoar
-+Comment[nso]=Di-demo tsa seboloki sa pontsho
-+Comment[oc]=Demonstracions dèu salvador d'ecran
-+Comment[pa]=ਸਕਰੀਨ-ਸੇਵਰ ਝਲਕ
-+Comment[pl]=Podgląd wygaszacza ekranu
-+Comment[pt]=Demonstrações de protectores de ecrã
-+Comment[pt_BR]=Amostras de protetores de tela
-+Comment[ro]=Demonstrații pentru protecții de ecran
-+Comment[ru]=Просмотр хранителей экрана
-+Comment[rw]=Amayerekana ya Mugaragaza Ukubamaso
-+Comment[se]=Šearbmasiestejeaddji demonstrašuvnnat.
-+Comment[sk]=Demo šetričov obrazovky
-+Comment[sl]=Predstavitve ohranjevalnikov zaslona
-+Comment[sr]=Демои чуварâ екрана
-+Comment[sr@Latn]=Demoi čuvarâ ekrana
-+Comment[ss]=Kukhonjiswa kwesigcini skrini
-+Comment[sv]=Demonstration av skärmsläckare
-+Comment[ta]=திரை காத்தலின் விளக்கக் காட்சிகள்
-+Comment[te]=స్క్రీన్ సేవర్ డెమొలు
-+Comment[tg]=Намоиши пардаи экран
-+Comment[th]=ตัวอย่างโปรแกรมรักษาหน้าจอ
-+Comment[tr]=Ekran koruyucu tanıtımları
-+Comment[tt]=Küräksaqçı sınawları
-+Comment[uk]=Демонстрації зберігачів екрана
-+Comment[uz]=Ekran saqlovchilar namunalari
-+Comment[uz@cyrillic]=Экран сақловчилар намуналари
-+Comment[ven]=Demo ya tshivhulungi tsha tshikirini
-+Comment[vi]=Thử trình bảo vệ màn hình
-+Comment[wa]=Sipårgneus di waitroûle di saye
-+Comment[xh]=Demos zomgcini wekhusi
-+Comment[zh_CN]=屏幕保护程序演示
-+Comment[zh_TW]=螢幕保護程式展示
-+Comment[zu]=Imiboniso yezigcini zikrini
-+NoDisplay=true
-diff -Nuar trinity-tdebase-3.5.13.2/applnk.ORI/tde-system-terminal.directory trinity-tdebase-3.5.13.2/applnk/tde-system-terminal.directory
---- trinity-tdebase-3.5.13.2/applnk.ORI/tde-system-terminal.directory	1970-01-01 01:00:00.000000000 +0100
-+++ trinity-tdebase-3.5.13.2/applnk/tde-system-terminal.directory	2013-07-28 15:47:19.320022740 +0200
-@@ -0,0 +1,88 @@
-+[Desktop Entry]
-+Encoding=UTF-8
-+Type=Directory
-+Name=Terminal Applications
-+Name[af]=Terminaal Programme
-+Name[ar]=تطبيقات مطرافية
-+Name[az]=Terminal Proqramları
-+Name[be]=Тэрмінальныя праграмы
-+Name[bg]=Конзолни програми
-+Name[bn]=টার্মিনাল অ্যাপলিকেশন
-+Name[br]=Arloadoù an termenell
-+Name[bs]=Tekstualni programi
-+Name[ca]=Aplicacions de terminal
-+Name[cs]=Terminálové aplikace
-+Name[csb]=Programë terminala
-+Name[cy]=Cymhwysiadau Terfynell
-+Name[da]=Terminalprogrammer
-+Name[de]=Terminalprogramme
-+Name[el]=Εφαρμογές τερματικού
-+Name[eo]=Terminal-Aplikaĵoj
-+Name[es]=Aplicaciones de terminal
-+Name[et]=Terminali rakendused
-+Name[eu]=Terminaleko aplikazioak
-+Name[fa]=کاربردهای پایانه
-+Name[fi]=Päätesovellukset
-+Name[fo]=Tekstforrit
-+Name[fr]=Applications pour terminal
-+Name[fy]=Terminal-tapassingen
-+Name[ga]=Feidhmchláir Teirminéil
-+Name[gl]=Aplicacións de Terminal
-+Name[he]=יישומי מסוף
-+Name[hi]=टर्मिनल अनुप्रयोग
-+Name[hr]=Terminalske aplikacije
-+Name[hsb]=Programy za terminal
-+Name[hu]=Parancsértelmezők
-+Name[id]=Aplikasi Terminal
-+Name[is]=Skjáhermiforrit
-+Name[it]=Applicazioni terminale
-+Name[ja]=ターミナルアプリケーション
-+Name[ka]=კონსოლის პროგრამები
-+Name[kk]=Консоль қолданбалары
-+Name[km]=កម្មវិធី​ស្ថានីយ
-+Name[ko]=터미널 프로그램
-+Name[lo]=ໂປຣແກຣມເທີມີນໍ
-+Name[lt]=Terminalinės programos
-+Name[lv]=Termināla Aplikācijas
-+Name[mk]=Терминалски апликации
-+Name[mn]=Терминал-Програм
-+Name[ms]=Aplikasi Terminal
-+Name[mt]=Programmi tat-Terminal
-+Name[nb]=Terminalprogrammer
-+Name[nds]=Terminalprogrammen
-+Name[ne]=टर्मिनल अनुप्रयोग
-+Name[nl]=Terminal-toepassingen
-+Name[nn]=Terminalprogram
-+Name[nso]=Ditshumiso tsa Terminal
-+Name[pa]=ਟਰਮੀਨਲ ਕਾਰਜ
-+Name[pl]=Programy terminala
-+Name[pt]=Aplicações de Terminal
-+Name[pt_BR]=Aplicativos de terminal
-+Name[ro]=Aplicații de terminal
-+Name[ru]=Консольные приложения
-+Name[rw]=Amaporogaramu Nkiriya
-+Name[se]=Terminálprográmmat
-+Name[sk]=Terminálové aplikácie
-+Name[sl]=Terminalski programi
-+Name[sr]=Терминалски програми
-+Name[sr@Latn]=Terminalski programi
-+Name[ss]=Ticelo tesikhungo
-+Name[sv]=Terminalprogram
-+Name[ta]=முனைய பயன்பாடுகள்
-+Name[te]=టర్మినల్ కార్యక్రమములు
-+Name[tg]=Барномаҳои консол
-+Name[th]=โปรแกรมเทอร์มินัล
-+Name[tr]=Uçbirim Uygulamaları
-+Name[tt]=Terminal Yazılımnarı
-+Name[uk]=Термінальні програми
-+Name[uz]=Terminal uchun dasturlar
-+Name[uz@cyrillic]=Терминал учун дастурлар
-+Name[ven]=Apulikhesheni ya Theminala
-+Name[vi]=Trình đầu cuối
-+Name[wa]=Programes terminås
-+Name[xh]=Izicelo Zesiphelo sendlela
-+Name[zh_CN]=终端应用程序
-+Name[zh_TW]=終端機程式
-+Name[zu]=Abayaleli bangaphandle
-+Icon=konsole
-+Version=1.0
-diff -Nuar trinity-tdebase-3.5.13.2/applnk.ORI/tde-toys.directory trinity-tdebase-3.5.13.2/applnk/tde-toys.directory
---- trinity-tdebase-3.5.13.2/applnk.ORI/tde-toys.directory	1970-01-01 01:00:00.000000000 +0100
-+++ trinity-tdebase-3.5.13.2/applnk/tde-toys.directory	2013-07-28 15:47:19.320022740 +0200
-@@ -0,0 +1,88 @@
-+[Desktop Entry]
-+Encoding=UTF-8
-+Type=Directory
-+Name=Toys
-+Name[af]=Speelgoed
-+Name[ar]=الألعاب
-+Name[az]=Oyuncaqlar
-+Name[be]=Цацкі
-+Name[bg]=Играчки
-+Name[bn]=খেলনা
-+Name[br]=C'hoarielloù
-+Name[bs]=Igračke
-+Name[ca]=Joguines
-+Name[cs]=Hračky
-+Name[csb]=Zôbôwczi
-+Name[cy]=Tegannau
-+Name[da]=Legetøj
-+Name[de]=Kleinigkeiten
-+Name[el]=Παιχνιδάκια
-+Name[eo]=Amuzaĵoj
-+Name[es]=Ocio
-+Name[et]=Mänguasjad
-+Name[eu]=Jolasak
-+Name[fa]=سرگرمیها
-+Name[fi]=Lelut
-+Name[fo]=Leiku
-+Name[fr]=Petits outils
-+Name[fy]=Boartersguod
-+Name[ga]=Áilleagáin
-+Name[gl]=Entretementos
-+Name[he]=צעצועים
-+Name[hi]=खिलौने
-+Name[hr]=Igračke
-+Name[hsb]=Hrajki
-+Name[hu]=Mütyürkék
-+Name[id]=Mainan
-+Name[is]=Leikföng
-+Name[it]=Giochini
-+Name[ja]=アクセサリ
-+Name[ka]=სათამაშოები
-+Name[kk]=Ойын-сауықтар
-+Name[km]=ប្រដាប់​ក្មេង​លេង
-+Name[ko]=장난감
-+Name[lo]=ຂອງເຫລັ້ນ
-+Name[lt]=Žaislai
-+Name[lv]=Rotaļlietas
-+Name[mk]=Играчки
-+Name[mn]=Наадгай
-+Name[ms]=Permainan
-+Name[mt]=Ġugarelli
-+Name[nb]=Leketøy
-+Name[nds]=Speelkraam
-+Name[ne]=खेलौना
-+Name[nl]=Speelgoed
-+Name[nn]=Leiker
-+Name[nso]=Dibapadisane
-+Name[oc]=Joguines
-+Name[pa]=ਖਿਡੌਣੇ
-+Name[pl]=Zabawa
-+Name[pt]=Diversão
-+Name[pt_BR]=Brinquedos
-+Name[ro]=Jucării
-+Name[ru]=Развлечения
-+Name[rw]=Ibikinisho
-+Name[se]=Stohkosat
-+Name[sk]=Hračky
-+Name[sl]=Igrače
-+Name[sr]=Играчке
-+Name[sr@Latn]=Igračke
-+Name[ss]=Kwekudlalisa
-+Name[sv]=Leksaker
-+Name[ta]=பொம்மைகள்
-+Name[te]=ఆట వస్తువులు
-+Name[tg]=Бозичаҳои шавқовар
-+Name[th]=ของเล่นสนุกๆ
-+Name[tr]=Eğlence
-+Name[tt]=Uyınnar
-+Name[uk]=Іграшки
-+Name[uz]=Oʻyinchoqlar
-+Name[uz@cyrillic]=Ўйинчоқлар
-+Name[ven]=Zwautambisa vhana
-+Name[vi]=Đồ chơi
-+Name[wa]=Amuzmints
-+Name[xh]=Izinto zokudlala
-+Name[zh_CN]=玩具
-+Name[zh_TW]=玩具
-+Name[zu]=Amathoyizi
-+Icon=package_toys
-diff -Nuar trinity-tdebase-3.5.13.2/applnk.ORI/tde-unknown.directory trinity-tdebase-3.5.13.2/applnk/tde-unknown.directory
---- trinity-tdebase-3.5.13.2/applnk.ORI/tde-unknown.directory	1970-01-01 01:00:00.000000000 +0100
-+++ trinity-tdebase-3.5.13.2/applnk/tde-unknown.directory	2013-07-28 15:47:19.320022740 +0200
-@@ -0,0 +1,76 @@
-+[Desktop Entry]
-+Encoding=UTF-8
-+Type=Directory
-+Name=Lost & Found
-+Name[af]=Verlore & Gevind
-+Name[ar]=فُقد ووُجد
-+Name[az]=İtirdim və Tapdım
-+Name[be]=Згубленыя і знойдзеныя
-+Name[bg]=Разни
-+Name[bn]=হারানো প্রাপ্তি
-+Name[br]=Kollet & kavet
-+Name[bs]=Izgubljeno/nađeno
-+Name[ca]=Perdut i trobat
-+Name[cs]=Ztráty a nálezy
-+Name[csb]=Zgùbione ë nalazłé
-+Name[cy]=Colledig a Chanfyddedig
-+Name[da]=Glemte sager
-+Name[de]=Nicht zuzuordnen
-+Name[el]=Χάθηκαν & Βρέθηκαν
-+Name[eo]=Perdita kaj trovita
-+Name[es]=Objetos perdidos
-+Name[et]=Tundmatud
-+Name[eu]=Galdu eta aurkitutakoak
-+Name[fa]=گم‌شده و یافته‌شده
-+Name[fi]=Hävinneet ja löydetyt
-+Name[fr]=Objets trouvés
-+Name[fy]=Wat oer is
-+Name[ga]=Caillte agus Aimsithe
-+Name[gl]=Outros
-+Name[he]=אבדות
-+Name[hi]=खोया/पाया
-+Name[hr]=Izgubljeno-nađeno
-+Name[hsb]=Pytane & Namakane
-+Name[hu]=Ismeretlen
-+Name[is]=Tapað & fundið
-+Name[it]=Oggetti smarriti
-+Name[kk]=Жоғалып табылғандар
-+Name[km]=បាត់ & រកឃើញ
-+Name[ko]=기타 프로그램
-+Name[lt]=Pamesta ir rasta
-+Name[lv]=Pazudis & Atrasts
-+Name[mk]=Изгубено-најдено
-+Name[mn]=Алдагдал & Олдолт
-+Name[ms]=Hilang & Jumpa
-+Name[mt]=Mitlufin u Misjuba
-+Name[nb]=Tapt og funnet
-+Name[nds]=Passt narms sünst
-+Name[ne]=हराएका र फेला परेका
-+Name[nl]=Overig
-+Name[nn]=Tapt og funne
-+Name[pa]=ਗੁਆਚੇ ਤੇ ਲੱਭੇ
-+Name[pl]=Zgubione i znalezione
-+Name[pt]=Perdidos e Achados
-+Name[pt_BR]=Achados & Perdidos
-+Name[ro]=Pierdute și regăsite
-+Name[ru]=Камера хранения
-+Name[rw]=Byabuze & Byabonetse
-+Name[se]=Láhppon ja gávdnon
-+Name[sk]=Straty a nálezy
-+Name[sl]=Izgubljeno in najdeno
-+Name[sr]=Изгубљено-нађено
-+Name[sr@Latn]=Izgubljeno-nađeno
-+Name[sv]=Hittegods
-+Name[ta]=இழந்த & கிடைத்த
-+Name[te]=పోయినవి & దొరికినవి
-+Name[tg]=Ҷустуҷӯй
-+Name[th]=หาไม่เจอดูที่นี่
-+Name[tr]=Kayıplar ve Bulunanlar
-+Name[tt]=Yuğaltu & Tabu
-+Name[uk]=Загублено та знайдено
-+Name[uz]=Nomaʼlum
-+Name[uz@cyrillic]=Номаълум
-+Name[vi]=Mất & Tìm
-+Name[wa]=Pierdous & rtrovés
-+Name[zh_CN]=未知类别
-+Icon=help
-diff -Nuar trinity-tdebase-3.5.13.2/applnk.ORI/tde-utilities-accessibility.directory trinity-tdebase-3.5.13.2/applnk/tde-utilities-accessibility.directory
---- trinity-tdebase-3.5.13.2/applnk.ORI/tde-utilities-accessibility.directory	1970-01-01 01:00:00.000000000 +0100
-+++ trinity-tdebase-3.5.13.2/applnk/tde-utilities-accessibility.directory	2013-07-28 15:47:19.321022719 +0200
-@@ -0,0 +1,148 @@
-+[Desktop Entry]
-+Encoding=UTF-8
-+Type=Directory
-+Name=Accessibility
-+Name[af]=Toeganklikheid
-+Name[ar]=تسهيل الوصول
-+Name[az]=Yetişmə Qabiliyyəti
-+Name[be]=Даступнасць
-+Name[bg]=Равностоен достъп
-+Name[bn]=সহায়ক প্রযুক্তি
-+Name[br]=Haezadusted
-+Name[bs]=Pristupačnost
-+Name[ca]=Accessibilitat
-+Name[cs]=Zpřístupnění
-+Name[csb]=Pòmòce przistãpù
-+Name[cy]=Hygyrchedd
-+Name[da]=Tilgængelighed
-+Name[de]=Zugangshilfen
-+Name[el]=Προσιτότητα
-+Name[eo]=Alirebleco
-+Name[es]=Accesibilidad
-+Name[et]=Hõlbustus
-+Name[eu]=Erabilerraztasuna
-+Name[fa]=دستیابی‌پذیری
-+Name[fi]=Helppokäyttötoiminnot
-+Name[fr]=Accessibilité
-+Name[fy]=Tagonklikens
-+Name[ga]=Inrochtaineacht
-+Name[gl]=Accesibilidade
-+Name[he]=נגישות
-+Name[hi]=पहुँच
-+Name[hr]=Pristupačnost
-+Name[hu]=Kezelési segítség
-+Name[id]=Aksesibiliti
-+Name[is]=Aðgengi
-+Name[it]=Accessibilità
-+Name[ja]=アクセシビリティ
-+Name[ka]=სპეციალური შესაძლბლობები
-+Name[kk]=Арнайы мүмкіндіктер
-+Name[km]=ភាព​អាច​ចូល​ដំណើរការ​បាន
-+Name[ko]=내게 필요한 설정
-+Name[lo]=ຄວາມສາມາດໃນການໃຊ້ງານ
-+Name[lt]=Prieinamumas
-+Name[lv]=Pieejamība
-+Name[mk]=Пристапливост
-+Name[mn]=Хэрэглэх тохь
-+Name[ms]=Kebolehcapaian
-+Name[mt]=Aċċessibiltà
-+Name[nb]=Tilgjengelighet
-+Name[nds]=Behinnertenhülp
-+Name[ne]=पहुँचता
-+Name[nl]=Toegankelijkheid
-+Name[nn]=Tilgjenge
-+Name[nso]=Botsenelo
-+Name[oc]=Accessibilitat
-+Name[pa]=ਸਹੂਲਤਾਂ
-+Name[pl]=Dostępność
-+Name[pt]=Acessibilidade
-+Name[pt_BR]=Acessibilidade
-+Name[ro]=Accesibilitate
-+Name[ru]=Специальные возможности
-+Name[rw]=Ukugerwaho
-+Name[se]=Álkkibut geavaheapmi
-+Name[sk]=Prístupnosť
-+Name[sl]=Dostopnost
-+Name[sr]=Приступачност
-+Name[sr@Latn]=Pristupačnost
-+Name[ss]=Kutfolakala kalula
-+Name[sv]=Handikappstöd
-+Name[ta]=அணுகல்
-+Name[te]=అందుబాటు
-+Name[tg]=Имконпазирӣ
-+Name[th]=ตัวช่วยในการใช้งาน
-+Name[tr]=Erişilebilirlik
-+Name[tt]=Qulaylıq
-+Name[uk]=Доступність
-+Name[uz]=Qulayliklar
-+Name[uz@cyrillic]=Қулайликлар
-+Name[ven]=Dzheneaho
-+Name[vi]=Hỗ trợ người tàn tật
-+Name[wa]=Accessibilité
-+Name[xh]=Unikezelo
-+Name[zh_CN]=辅助
-+Name[zh_TW]=無障礙輔助
-+Name[zu]=Ukungena
-+Icon=access
-+Comment=Accessibility
-+Comment[af]=Toeganklikheid
-+Comment[be]=Даступнасць
-+Comment[bg]=Равностоен достъп
-+Comment[bn]=সহায়ক প্রযুক্তি
-+Comment[br]=Haezadusted
-+Comment[bs]=Pristupačnost
-+Comment[ca]=Accessibilitat
-+Comment[cs]=Zpřístupnění
-+Comment[csb]=Pòmòce przistãpù
-+Comment[cy]=Hygyrchedd
-+Comment[da]=Tilgængelighed
-+Comment[de]=Zugangshilfen
-+Comment[el]=Προσβασιμότητα
-+Comment[eo]=Alirebleco
-+Comment[es]=Accesibilidad
-+Comment[et]=Hõlbustus
-+Comment[eu]=Erabilerraztasuna
-+Comment[fa]=دستیابی‌پذیری
-+Comment[fi]=Helppokäyttöisyys
-+Comment[fr]=Accessibilité
-+Comment[fy]=Tagonklikens
-+Comment[ga]=Inrochtaineacht
-+Comment[gl]=Accesibilidade
-+Comment[he]=נגישות
-+Comment[hr]=Pristupačnost
-+Comment[hu]=Kezelési segítség
-+Comment[is]=Aðgengi
-+Comment[it]=Accessibilità
-+Comment[ja]=アクセシビリティ
-+Comment[kk]=Арнайы мүмкіндіктер
-+Comment[km]=មធ្យោបាយ​ងាយស្រួល
-+Comment[ko]=내게 필요한 설정
-+Comment[mk]=Пристапливост
-+Comment[ms]=Kebolehcapaian
-+Comment[nb]=Tilgjengelighet
-+Comment[nds]=Behinnertenhülp
-+Comment[ne]=पहुँचता
-+Comment[nl]=Toegankelijkheid
-+Comment[nn]=Tilgjenge
-+Comment[pa]=ਸਹੂਲਤਾਂ
-+Comment[pl]=Dostępność
-+Comment[pt]=Acessibilidade
-+Comment[pt_BR]=Acessibilidade
-+Comment[ro]=Accesibilitate
-+Comment[ru]=Специальные возможности
-+Comment[sk]=Prístupnosť
-+Comment[sl]=Dostopnost
-+Comment[sr]=Приступачност
-+Comment[sr@Latn]=Pristupačnost
-+Comment[sv]=Handikappstöd
-+Comment[te]=అందుబాటు
-+Comment[tg]=Имконпазирӣ
-+Comment[th]=ตัวช่วยให้ใช้งานสะดวกขึ้น
-+Comment[tr]=Erişilebilirlik
-+Comment[uk]=Доступність
-+Comment[uz]=Qulayliklar
-+Comment[uz@cyrillic]=Қулайликлар
-+Comment[vi]=Hỗ trợ người tàn tật
-+Comment[wa]=Accessibilité
-+Comment[zh_CN]=辅助
-+Comment[zh_TW]=無障礙輔助
-diff -Nuar trinity-tdebase-3.5.13.2/applnk.ORI/tde-utilities-desktop.directory trinity-tdebase-3.5.13.2/applnk/tde-utilities-desktop.directory
---- trinity-tdebase-3.5.13.2/applnk.ORI/tde-utilities-desktop.directory	1970-01-01 01:00:00.000000000 +0100
-+++ trinity-tdebase-3.5.13.2/applnk/tde-utilities-desktop.directory	2013-07-28 15:47:19.321022719 +0200
-@@ -0,0 +1,141 @@
-+[Desktop Entry]
-+Encoding=UTF-8
-+Type=Directory
-+Name=Desktop
-+Name[af]=Werkskerm
-+Name[ar]=سطح المكتب
-+Name[az]=Masa Üstü
-+Name[be]=Працоўны стол
-+Name[bg]=Работен плот
-+Name[bn]=ডেস্কটপ
-+Name[br]=Gorretaol
-+Name[bs]=Radna površina
-+Name[ca]=Escriptori
-+Name[cs]=Pracovní plocha
-+Name[csb]=Pùlt
-+Name[cy]=Penbwrdd
-+Name[de]=Arbeitsfläche
-+Name[el]=Επιφάνεια εργασίας
-+Name[eo]=Tabulo
-+Name[es]=Escritorio
-+Name[et]=Töölaud
-+Name[eu]=Mahaigaina
-+Name[fa]=رومیزی
-+Name[fi]=Työpöytä
-+Name[fo]=Skriviborð
-+Name[fr]=Bureau
-+Name[fy]=Buroblêd
-+Name[ga]=Deasc
-+Name[gl]=Escritorio
-+Name[he]=שולחן עבודה
-+Name[hi]=डेस्कटॉप
-+Name[hr]=Radna površina
-+Name[hsb]=Dźěłowy powjerch
-+Name[hu]=Munkaasztal
-+Name[is]=Skjáborð
-+Name[ja]=デスクトップ
-+Name[ka]=სამუშაო დაფა
-+Name[kk]=Жұмыс үстелі
-+Name[km]=ផ្ទៃតុ
-+Name[ko]=데스크톱
-+Name[lo]=ພື້ນທີ່ເຮັດວງກ
-+Name[lt]=Darbastalis
-+Name[lv]=Darbvirsma
-+Name[mk]=Работна површина
-+Name[mn]=Ажлын тавцан
-+Name[ms]=Ruang Kerja
-+Name[nb]=Skrivebord
-+Name[nds]=Schriefdisch
-+Name[ne]=डेस्कटप
-+Name[nl]=Bureaublad
-+Name[nn]=Skrivebord
-+Name[oc]=BurèU
-+Name[pa]=ਵੇਹੜਾ
-+Name[pl]=Pulpit
-+Name[pt]=Ambiente de Trabalho
-+Name[pt_BR]=Área de Trabalho
-+Name[ru]=Рабочий стол
-+Name[rw]=Ibiro
-+Name[se]=Čállinbeavdi
-+Name[sk]=Plocha
-+Name[sl]=Namizje
-+Name[sr]=Радна површина
-+Name[sr@Latn]=Radna površina
-+Name[ss]=Desktop 
-+Name[sv]=Skrivbord
-+Name[ta]=மேல்மேசை
-+Name[te]=రంగస్ఠలం
-+Name[tg]=Мизи корӣ
-+Name[th]=พื้นที่ทำงาน
-+Name[tr]=Masaüstü
-+Name[tt]=Östäl
-+Name[uk]=Стільниця
-+Name[uz]=Ish stoli
-+Name[uz@cyrillic]=Иш столи
-+Name[ven]=Desikithopo
-+Name[vi]=Màn hình nền
-+Name[wa]=Sicribanne
-+Name[zh_CN]=桌面
-+Name[zh_TW]=桌面
-+Icon=desktop
-+Comment=Desktop
-+Comment[af]=Werkskerm
-+Comment[ar]=سطح المكتب
-+Comment[be]=Працоўны стол
-+Comment[bg]=Работен плот
-+Comment[bn]=ডেস্কটপ
-+Comment[br]=Burev
-+Comment[ca]=Escriptori
-+Comment[cs]=Pracovní plocha
-+Comment[csb]=Pùlt
-+Comment[cy]=Penbwrdd
-+Comment[de]=KDE-Arbeitsfläche
-+Comment[el]=Επιφάνεια εργασίας
-+Comment[eo]=KDEa labortablo
-+Comment[es]=Escritorio
-+Comment[et]=Töölaud
-+Comment[eu]=Mahaigaina
-+Comment[fa]=رومیزی
-+Comment[fi]=Työpöytä
-+Comment[fr]=Bureau
-+Comment[fy]=Buroblêd
-+Comment[ga]=Deasc
-+Comment[gl]=Escritorio
-+Comment[he]=שולחן העבודה
-+Comment[hr]=Radna površina
-+Comment[hu]=Munkaasztal
-+Comment[is]=Skjáborð
-+Comment[ja]=デスクトップ
-+Comment[ka]=სამუშაო დაფა
-+Comment[kk]=Үстел
-+Comment[km]=ផ្ទៃតុ
-+Comment[ko]=데스크톱
-+Comment[lt]=Darbastalis
-+Comment[mk]=Работна површина
-+Comment[nb]=Skrivebord
-+Comment[nds]=Schriefdisch
-+Comment[ne]=डेस्कटप
-+Comment[nl]=Bureaublad
-+Comment[nn]=Skrivebord
-+Comment[pa]=ਵੇਹੜਾ
-+Comment[pl]=Pulpit
-+Comment[pt]=Ecrã
-+Comment[pt_BR]=Área de Trabalho
-+Comment[ru]=Рабочий стол
-+Comment[se]=Čállinbeavdi
-+Comment[sk]=Pracovná plocha
-+Comment[sl]=Namizje
-+Comment[sr]=Радна површина
-+Comment[sr@Latn]=Radna površina
-+Comment[sv]=Skrivbord
-+Comment[te]=రంగస్థలం
-+Comment[tg]=Мизи корӣ
-+Comment[th]=พื้นที่หน้าจอ
-+Comment[tr]=Masaüstü
-+Comment[uk]=Стільниця
-+Comment[uz]=Ish stoli
-+Comment[uz@cyrillic]=Иш столи
-+Comment[vi]=Màn hình nền
-+Comment[wa]=Sicribanne
-+Comment[zh_CN]=桌面
-+Comment[zh_TW]=桌面
-diff -Nuar trinity-tdebase-3.5.13.2/applnk.ORI/tde-utilities.directory trinity-tdebase-3.5.13.2/applnk/tde-utilities.directory
---- trinity-tdebase-3.5.13.2/applnk.ORI/tde-utilities.directory	1970-01-01 01:00:00.000000000 +0100
-+++ trinity-tdebase-3.5.13.2/applnk/tde-utilities.directory	2013-07-28 15:47:19.321022719 +0200
-@@ -0,0 +1,170 @@
-+[Desktop Entry]
-+Encoding=UTF-8
-+Type=Directory
-+Name=Utilities
-+Name[af]=Nutsprogramme
-+Name[ar]=عدة التشغيل
-+Name[az]=Tə'minatlar
-+Name[be]=Службовыя праграмы
-+Name[bg]=Инструменти
-+Name[bn]=আনুষঙ্গিক
-+Name[br]=Mavegoù
-+Name[bs]=Korisni programi
-+Name[ca]=Utilitats
-+Name[cs]=Nástroje
-+Name[csb]=Nôrzãdza
-+Name[cy]=Defnyddioldebau
-+Name[da]=Redskaber
-+Name[de]=Dienstprogramme
-+Name[el]=Εργαλεία
-+Name[eo]=Utilaĵoj
-+Name[es]=Utilidades
-+Name[et]=Utiliidid
-+Name[eu]=Tresnak
-+Name[fa]=برنامه‌های سودمند
-+Name[fi]=Apuohjelmat
-+Name[fo]=Hentleikar
-+Name[fr]=Utilitaires
-+Name[fy]=Helpmiddelen
-+Name[ga]=Uirlisí
-+Name[gl]=Utilidades
-+Name[he]=כלים
-+Name[hi]=यूटिलिटीज़
-+Name[hr]=Alati
-+Name[hsb]=Pomocniki
-+Name[hu]=Segédprogramok
-+Name[is]=Nytjatól
-+Name[it]=Accessori
-+Name[ja]=ユーティリティ
-+Name[ka]=ხელსაწყოები
-+Name[kk]=Утилиталары
-+Name[km]=ឧបករណ៍
-+Name[ko]=유틸리티
-+Name[lo]=ໃຊ້ປະໂຫຍດ
-+Name[lt]=Pagalbininkai
-+Name[lv]=Utilītas
-+Name[mk]=Алатки
-+Name[mn]=Хэрэгсэл програмууд
-+Name[ms]=Utiliti
-+Name[mt]=Utilitajiet
-+Name[nb]=Verktøy
-+Name[nds]=Warktüüch
-+Name[ne]=युटिलिटी
-+Name[nl]=Hulpmiddelen
-+Name[nn]=Verktøy
-+Name[nso]=Didiriswa
-+Name[oc]=Utilitats
-+Name[pa]=ਸਹੂਲਤ
-+Name[pl]=Narzędzia
-+Name[pt]=Utilitários
-+Name[pt_BR]=Utilitários
-+Name[ro]=Utilitare
-+Name[ru]=Служебные
-+Name[rw]=Nkemurabibazo
-+Name[se]=Reaiddut
-+Name[sk]=Nástroje
-+Name[sl]=Potrebščine
-+Name[sr]=Алати
-+Name[sr@Latn]=Alati
-+Name[ss]=Kwekusetjentiswa
-+Name[sv]=Verktyg
-+Name[ta]=கருவிகள்
-+Name[te]=సౌలభ్యాలు
-+Name[tg]=Лавозимот
-+Name[th]=โปรแกรมอรรถประโยชน์
-+Name[tr]=Yardımcı Programlar
-+Name[tt]=Faydalıq
-+Name[uk]=Утиліти
-+Name[uz]=Vositalar
-+Name[uz@cyrillic]=Воситалар
-+Name[ven]=Zwishumiswa
-+Name[vi]=Các tiện ích
-+Name[wa]=Usteyes
-+Name[xh]=Izinto eziluncedo
-+Name[zh_CN]=实用工具
-+Name[zh_TW]=實用工具
-+Name[zu]=Izisebenzi
-+Icon=package_utilities
-+Comment=Utilities
-+Comment[af]=Nutsprogramme
-+Comment[ar]=عدّة التشغيل
-+Comment[az]=Tə'minatlar
-+Comment[be]=Службовыя праграмы
-+Comment[bg]=Помощни програми
-+Comment[bn]=প্রায়শই কাজে লাগে এমন কিছু প্রোগ্রাম
-+Comment[br]=Mavegoù
-+Comment[bs]=Korisni programi
-+Comment[ca]=Utilitats
-+Comment[cs]=Nástroje
-+Comment[csb]=Nôrzãdza
-+Comment[cy]= Defnyddioldebau
-+Comment[da]=Redskaber
-+Comment[de]=Dienstprogramme
-+Comment[el]=Εργαλεία
-+Comment[eo]=Utilaĵoj
-+Comment[es]=Utilidades
-+Comment[et]=Utiliidid
-+Comment[eu]=Tresnak
-+Comment[fa]=برنامه‌های سودمند
-+Comment[fi]=Apuohjelmat
-+Comment[fo]=Hentleikar
-+Comment[fr]=Utilitaires
-+Comment[fy]=Helpmiddelen
-+Comment[ga]=Uirlisí
-+Comment[gl]=Utilidades
-+Comment[he]=כלים
-+Comment[hi]=यूटिलिटीज़
-+Comment[hr]=Alati
-+Comment[hsb]=Pomocne programy
-+Comment[hu]=Segédprogramok
-+Comment[is]=Ýmis nytsamleg áhöld
-+Comment[it]=Accessori
-+Comment[ja]=ユーティリティ
-+Comment[ka]=ხელსაწყოები
-+Comment[kk]=Утилиталары
-+Comment[km]=ឧបករណ៍
-+Comment[ko]=유틸리티
-+Comment[lo]=ໂປຣແກຣມໃຊ້ໃຫ້ເປັນປະໂຫຍດ
-+Comment[lt]=Pagalbininkai
-+Comment[lv]=Utilītas
-+Comment[mk]=Алатки
-+Comment[mn]=Хэрэгсэл програмууд
-+Comment[ms]=Utiliti
-+Comment[mt]=Utilitajiet
-+Comment[nb]=Verktøy
-+Comment[nds]=Hülpprogrammen
-+Comment[ne]=युटिलिटी
-+Comment[nl]=Hulpmiddelen
-+Comment[nn]=Verktøy
-+Comment[nso]=Didiriswa
-+Comment[oc]=Utilitats
-+Comment[pa]=ਸਹੂਲਤ
-+Comment[pl]=Narzędzia
-+Comment[pt]=Utilitários
-+Comment[pt_BR]=Utilitários
-+Comment[ro]=Utilitare
-+Comment[ru]=Различные утилиты
-+Comment[rw]=Nkemurabibazo
-+Comment[se]=Reaiddut
-+Comment[sk]=Nástroje
-+Comment[sl]=Potrebščine
-+Comment[sr]=Алати
-+Comment[sr@Latn]=Alati
-+Comment[ss]=Kwekusetjentiswa
-+Comment[sv]=Verktyg
-+Comment[ta]=கருவிகள்
-+Comment[te]=సౌలభ్యాలు
-+Comment[tg]=Лавозимоти гуногун
-+Comment[th]=โปรแกรมอรรถประโยชน์
-+Comment[tr]=Yardımcı Programlar
-+Comment[tt]=Faydalıqlar
-+Comment[uk]=Утиліти
-+Comment[uz]=Vositalar
-+Comment[uz@cyrillic]=Воситалар
-+Comment[ven]=Zwishumiswa
-+Comment[vi]=Các tiện ích
-+Comment[wa]=Usteyes
-+Comment[xh]=Izinto eziluncedo
-+Comment[zh_CN]=实用工具
-+Comment[zh_TW]=實用工具
-+Comment[zu]=Izisebenzi
-diff -Nuar trinity-tdebase-3.5.13.2/applnk.ORI/tde-utilities-file.directory trinity-tdebase-3.5.13.2/applnk/tde-utilities-file.directory
---- trinity-tdebase-3.5.13.2/applnk.ORI/tde-utilities-file.directory	1970-01-01 01:00:00.000000000 +0100
-+++ trinity-tdebase-3.5.13.2/applnk/tde-utilities-file.directory	2013-07-28 15:47:19.321022719 +0200
-@@ -0,0 +1,139 @@
-+[Desktop Entry]
-+Encoding=UTF-8
-+Type=Directory
-+Name=File
-+Name[af]=Lêer
-+Name[ar]=الملف
-+Name[be]=Файл
-+Name[bg]=Файл
-+Name[bn]=ফাইল
-+Name[br]=Restr
-+Name[bs]=Datoteka
-+Name[ca]=Fitxer
-+Name[cs]=Soubor
-+Name[csb]=Lopk
-+Name[cy]=Ffeil
-+Name[da]=Fil
-+Name[de]=Datei
-+Name[el]=Αρχείο
-+Name[eo]=Dosiero
-+Name[es]=Archivo
-+Name[et]=Fail
-+Name[eu]=Fitxategia
-+Name[fa]=پرونده
-+Name[fi]=Tiedosto
-+Name[fr]=Fichier
-+Name[fy]=Triem
-+Name[ga]=Comhad
-+Name[gl]=Ficheiro
-+Name[he]=קובץ
-+Name[hr]=Datoteka
-+Name[hu]=Fájl
-+Name[id]=Berkas
-+Name[is]=Skrá
-+Name[ja]=ファイル
-+Name[ka]=ფაილი
-+Name[kk]=Файл
-+Name[km]=ឯកសារ
-+Name[ko]=파일
-+Name[ku]=Pel
-+Name[lt]=Byla
-+Name[mk]=Датотека
-+Name[ms]=Fail
-+Name[nb]=Fil
-+Name[nds]=Datei
-+Name[ne]=फाइल
-+Name[nl]=Bestand
-+Name[nn]=Fil
-+Name[pa]=ਫਾਇਲ
-+Name[pl]=Plik
-+Name[pt]=Ficheiro
-+Name[pt_BR]=Arquivo
-+Name[ro]=Fișier
-+Name[ru]=Работа с файлами
-+Name[rw]=Idosiye
-+Name[se]=Fiila
-+Name[sk]=Súbor
-+Name[sl]=Datoteke
-+Name[sr]=Фајл
-+Name[sr@Latn]=Fajl
-+Name[sv]=Fil
-+Name[te]=దస్త్రం
-+Name[tg]=Файл
-+Name[th]=แฟ้ม
-+Name[tr]=Dosya
-+Name[uk]=Файл
-+Name[uz]=Fayl
-+Name[uz@cyrillic]=Файл
-+Name[vi]=Tập tin
-+Name[wa]=Fitchî
-+Name[zh_CN]=文件
-+Name[zh_TW]=檔案
-+Icon=kfm
-+Comment=File
-+Comment[af]=Lêer
-+Comment[ar]=الملف
-+Comment[be]=Файл
-+Comment[bg]=Файл
-+Comment[bn]=ফাইল
-+Comment[br]=Restr
-+Comment[bs]=Datoteka
-+Comment[ca]=Fitxer
-+Comment[cs]=Soubor
-+Comment[csb]=Lopk
-+Comment[cy]=Ffeil
-+Comment[da]=Fil
-+Comment[de]=Datei
-+Comment[el]=Αρχείο
-+Comment[eo]=Dosiero
-+Comment[es]=Archivo
-+Comment[et]=Fail
-+Comment[eu]=Fitxategia
-+Comment[fa]=پرونده
-+Comment[fi]=Tiedosto
-+Comment[fr]=Fichier
-+Comment[fy]=Triem
-+Comment[ga]=Comhad
-+Comment[gl]=Ficheiro
-+Comment[he]=קובץ
-+Comment[hr]=Datoteka
-+Comment[hu]=Fájl
-+Comment[id]=Berkas
-+Comment[is]=Skrá
-+Comment[ja]=ファイル
-+Comment[ka]=ფაილი
-+Comment[kk]=Файл
-+Comment[km]=ឯកសារ
-+Comment[ko]=글꼴 파일
-+Comment[ku]=Pel
-+Comment[lt]=Byla
-+Comment[mk]=Датотека
-+Comment[ms]=Fail
-+Comment[nb]=Fil
-+Comment[nds]=Datei
-+Comment[ne]=फाइल
-+Comment[nl]=Bestand
-+Comment[nn]=Fil
-+Comment[pa]=ਫਾਇਲ
-+Comment[pl]=Plik
-+Comment[pt]=Ficheiro
-+Comment[pt_BR]=Arquivo
-+Comment[ro]=Fișier
-+Comment[ru]=Работа с файлами
-+Comment[se]=Fiila
-+Comment[sk]=Súbor
-+Comment[sl]=Datoteke
-+Comment[sr]=Фајл
-+Comment[sr@Latn]=Fajl
-+Comment[sv]=Fil
-+Comment[te]=దస్త్రం
-+Comment[tg]=Файл
-+Comment[th]=แฟ้ม
-+Comment[tr]=Dosya
-+Comment[uk]=Файл
-+Comment[uz]=Fayl
-+Comment[uz@cyrillic]=Файл
-+Comment[vi]=Tập tin
-+Comment[wa]=Fitchî
-+Comment[zh_CN]=文件
-+Comment[zh_TW]=檔案
-diff -Nuar trinity-tdebase-3.5.13.2/applnk.ORI/tde-utilities-peripherals.directory trinity-tdebase-3.5.13.2/applnk/tde-utilities-peripherals.directory
---- trinity-tdebase-3.5.13.2/applnk.ORI/tde-utilities-peripherals.directory	1970-01-01 01:00:00.000000000 +0100
-+++ trinity-tdebase-3.5.13.2/applnk/tde-utilities-peripherals.directory	2013-07-28 15:47:19.321022719 +0200
-@@ -0,0 +1,149 @@
-+[Desktop Entry]
-+Encoding=UTF-8
-+Type=Directory
-+Name=Peripherals
-+Name[af]=Randapperatuur
-+Name[ar]=الأجهزة المحيطية
-+Name[az]=Avadanlıq
-+Name[be]=Перыферыя
-+Name[bg]=Периферия
-+Name[bn]=পেরিফেরাল
-+Name[br]=Trobarzhelloù
-+Name[bs]=Vanjski uređaji
-+Name[ca]=Perifèrics
-+Name[cs]=Periférie
-+Name[csb]=Periferëjné ùrzãdzenia
-+Name[cy]=Perifferolion
-+Name[da]=Tilkoblinger
-+Name[de]=Angeschlossene Geräte
-+Name[el]=Περιφερειακά
-+Name[eo]=Periferaĵoj
-+Name[es]=Periféricos
-+Name[et]=Välisseadmed
-+Name[eu]=Periferikoak
-+Name[fa]=وسایل جانبی
-+Name[fi]=Laitteet
-+Name[fo]=Úteindir
-+Name[fr]=Périphériques
-+Name[fy]=Râneapparaten
-+Name[ga]=Forimeallaigh
-+Name[gl]=Periféricos
-+Name[he]=ציוד היקפי
-+Name[hi]=सहायक पुरजे
-+Name[hr]=Periferni uređaji
-+Name[hsb]=Periferija
-+Name[hu]=Perifériák
-+Name[is]=Jaðartæki
-+Name[it]=Periferiche
-+Name[ja]=周辺機器
-+Name[ka]=პერიფერიული
-+Name[kk]=Периферия
-+Name[km]=គ្រឿង​កុំព្យូទ័រ
-+Name[ko]=주변 장치
-+Name[lo]=ອຸປະກອນຕໍ່ພວງ
-+Name[lt]=Periferija
-+Name[lv]=Perifērija
-+Name[mk]=Периферни уреди
-+Name[mn]=Залгаатай төхөөрөмжүүд
-+Name[ms]=Perkakasan
-+Name[mt]=Apparat
-+Name[nb]=Tilleggsenheter
-+Name[nds]=Reedschappen
-+Name[ne]=परिवृत्तीय
-+Name[nl]=Randapparaten
-+Name[nn]=Tilleggseiningar
-+Name[nso]=Ditswelantle
-+Name[oc]=Periferics
-+Name[pa]=ਸਹਾਇਕ ਜੰਤਰ
-+Name[pl]=Urządzenia peryferyjne
-+Name[pt]=Periféricos
-+Name[pt_BR]=Periféricos
-+Name[ro]=Periferice
-+Name[ru]=Периферия
-+Name[rw]=Ibyinyuma
-+Name[se]=Ovttadagat
-+Name[sk]=Periférie
-+Name[sl]=Strojni dodatki
-+Name[sr]=Периферије
-+Name[sr@Latn]=Periferije
-+Name[ss]=Ema-peripherals
-+Name[sv]=Kringutrustning
-+Name[ta]=கருவிகள்
-+Name[te]=పరికరాలు
-+Name[tg]=Дастгоҳҳои лозимӣ
-+Name[th]=อุปกรณ์ต่อพ่วง
-+Name[tr]=Çevre Birimleri
-+Name[tt]=Cıhazlar
-+Name[uk]=Периферійні пристрої
-+Name[uz]=Ulangan uskunalar
-+Name[uz@cyrillic]=Уланган ускуналар
-+Name[ven]=Dzipheriferala
-+Name[vi]=Thiết bị ngoại vi
-+Name[wa]=Periferikes
-+Name[xh]=Iilayini zomda
-+Name[zh_CN]=外设
-+Name[zh_TW]=週邊設備
-+Name[zu]=Imixhantela
-+Icon=input_devices_settings
-+Comment=Peripherals
-+Comment[af]=Randapparatuur 
-+Comment[be]=Перыферыя
-+Comment[bg]=Периферия
-+Comment[bn]=পেরিফেরাল
-+Comment[br]=Trobarzhelloù
-+Comment[bs]=Vanjski uređaji
-+Comment[ca]=Perifèrics
-+Comment[cs]=Periférie
-+Comment[csb]=Periferëjné ùrzãdzenia
-+Comment[cy]=Perifferolion
-+Comment[da]=Tilkoblinger
-+Comment[de]=Angeschlossene Geräte
-+Comment[el]=Περιφερειακά
-+Comment[eo]=Periferaĵoj
-+Comment[es]=Periféricos
-+Comment[et]=Välisseadmed
-+Comment[eu]=Periferikoak
-+Comment[fa]=وسایل جانبی
-+Comment[fi]=Oheislaitteet
-+Comment[fr]=Périphériques
-+Comment[fy]=Râneapparaten
-+Comment[ga]=Forimeallaigh
-+Comment[gl]=Periféricos
-+Comment[he]=ציוד היקפי
-+Comment[hr]=Periferni uređaji
-+Comment[hu]=Perifériák
-+Comment[is]=Jaðartæki
-+Comment[it]=Periferiche
-+Comment[ja]=周辺機器
-+Comment[kk]=Периферия
-+Comment[km]=គ្រឿង​កុំព្យូទ័រ
-+Comment[ko]=주변 장치
-+Comment[mk]=Периферни уреди
-+Comment[ms]=Persisian
-+Comment[nb]=Tikoblede enheter
-+Comment[nds]=Reedschappen
-+Comment[ne]=परिवृतिय
-+Comment[nl]=Randapparaten
-+Comment[nn]=Tilleggseiningar
-+Comment[pa]=ਜੰਤਰ
-+Comment[pl]=Urządzenia peryferyjne
-+Comment[pt]=Periféricos
-+Comment[pt_BR]=Periféricos
-+Comment[ro]=Periferice
-+Comment[ru]=Периферия
-+Comment[sk]=Periférie
-+Comment[sl]=Strojni dodatki
-+Comment[sr]=Периферије
-+Comment[sr@Latn]=Periferije
-+Comment[sv]=Kringutrustning
-+Comment[te]=పరికరాలు
-+Comment[tg]=Дастгоҳҳои лозимӣ
-+Comment[th]=อุปกรณ์ต่อพ่วง
-+Comment[tr]=Çevre Birimleri
-+Comment[uk]=Периферійні
-+Comment[uz]=Ulangan uskunalar
-+Comment[uz@cyrillic]=Уланган ускуналар
-+Comment[vi]=Thiết bị ngoại vi
-+Comment[wa]=Éndjins
-+Comment[zh_CN]=外设
-+Comment[zh_TW]=週邊設備
-diff -Nuar trinity-tdebase-3.5.13.2/applnk.ORI/tde-utilities-pim.directory trinity-tdebase-3.5.13.2/applnk/tde-utilities-pim.directory
---- trinity-tdebase-3.5.13.2/applnk.ORI/tde-utilities-pim.directory	1970-01-01 01:00:00.000000000 +0100
-+++ trinity-tdebase-3.5.13.2/applnk/tde-utilities-pim.directory	2013-07-28 15:47:19.321022719 +0200
-@@ -0,0 +1,45 @@
-+[Desktop Entry]
-+Encoding=UTF-8
-+Type=Directory
-+Name=PIM
-+Name[ar]=مدبِر المعلومات الشخصي
-+Name[be]=Кіраўнік персанальнай інфармацыі
-+Name[bn]=পি-আই-এম
-+Name[csb]=Priwatnô wëdowiédzô
-+Name[eo]=PCI
-+Name[he]=ניהול מידע אישי
-+Name[ne]=पी आई एम
-+Name[pl]=Informacje osobiste
-+Name[ro]=Manager de Informații Personale
-+Name[ru]=Персональная информация
-+Name[se]=Peršuvnnalaš diehtogieđahalli
-+Name[sl]=Osebni podatki
-+Name[sv]=Personlig information
-+Name[te]=పిఐఎం
-+Name[th]=ตัวจัดการข้อมูลส่วนตัว
-+Name[uk]=Керування інформацією
-+Name[zh_CN]=个人信息管理
-+Icon=korganizer
-+Comment=PIM
-+Comment[af]=Persoonlike Informasie Bestuurder
-+Comment[ar]=مدبر المعلومات الشخصي
-+Comment[be]=Кіраўнік персанальнай інфармацыі
-+Comment[bn]=পি-আই-এম
-+Comment[csb]=Sprôwianie priwatną wëdowiédzą
-+Comment[de]=Persönliches Informationsmanagement
-+Comment[eo]=PCI
-+Comment[fy]=Persoanlike Ynformaasje Behear
-+Comment[he]=ניהול מידע אישי
-+Comment[kk]=Дербес ақпарат менеджері
-+Comment[ne]=पी आई एम
-+Comment[nl]=Persoonlijke Informatie Management
-+Comment[pl]=Zarządzanie informacjami osobistymi
-+Comment[ro]=Manager de Informații Personale
-+Comment[ru]=Управление личной информацией (PIM)
-+Comment[se]=Peršuvnnalaš diehtogieđahalli
-+Comment[sl]=Osebni podatki
-+Comment[sv]=Personlig informationshantering
-+Comment[te]=పిఐఎం
-+Comment[th]=สำหรับจัดการข้อมูลส่วนตัว เช่น เบอร์โทรศัพท์, ที่อยู่
-+Comment[uk]=Керування особистою інформацією (PIM)
-+Comment[zh_CN]=个人信息管理
-diff -Nuar trinity-tdebase-3.5.13.2/applnk.ORI/tde-utilities-xutils.directory trinity-tdebase-3.5.13.2/applnk/tde-utilities-xutils.directory
---- trinity-tdebase-3.5.13.2/applnk.ORI/tde-utilities-xutils.directory	1970-01-01 01:00:00.000000000 +0100
-+++ trinity-tdebase-3.5.13.2/applnk/tde-utilities-xutils.directory	2013-07-28 15:47:19.321022719 +0200
-@@ -0,0 +1,166 @@
-+[Desktop Entry]
-+Encoding=UTF-8
-+Type=Directory
-+Name=X-Utilities
-+Name[ar]=عدة X
-+Name[az]=X Tə'minatları
-+Name[be]=Службовыя праграмы X
-+Name[bg]=Инструменти за X
-+Name[bn]=এক্স-উইটিলিটি
-+Name[br]=Mavegoù X
-+Name[ca]=Utilitats de X
-+Name[cs]=Nástroje X
-+Name[csb]=X - nôrzãdza
-+Name[cy]=Defnyddioldebau-X
-+Name[da]=X-Redskaber
-+Name[de]=X-Dienstprogramme
-+Name[el]=Εργαλεία-X
-+Name[eo]=X-Utilaĵoj
-+Name[es]=Utilidades-X
-+Name[et]=X'i utiliidid
-+Name[eu]=X-tresnak
-+Name[fa]=برنامه‌های سودمند X
-+Name[fi]=X-Apuohjelmat
-+Name[fo]=Hentleikar til X
-+Name[fr]=Utilitaires X
-+Name[fy]=Grafyske helpprogramma's
-+Name[ga]=Uirlisí X
-+Name[gl]=Utilidades das X
-+Name[he]=כלי X
-+Name[hi]=एक्स-यूटिलिटीज़
-+Name[hr]=X-alati
-+Name[hsb]=Pomocniki za X
-+Name[hu]=X segédprogramok
-+Name[is]=X Tól
-+Name[it]=Programmi di X
-+Name[ja]=X-ユーティリティ
-+Name[ka]= X-ხელსაწყოები
-+Name[kk]=X-утилиталар
-+Name[km]=ឧបករណ៍-X
-+Name[ko]=X 유틸리티
-+Name[lo]=ໃຊ້ປະໂຫຍດ์ X
-+Name[lt]=X pagalbininkai
-+Name[lv]=X Utilītas
-+Name[mk]=X-алатки
-+Name[mn]=X-Хэрэгслүүд
-+Name[ms]=Utiliti X
-+Name[mt]=Utilitajiet tal-X
-+Name[nb]=X-verktøy
-+Name[nds]=X-Warktüüch
-+Name[ne]=X-युटिलिटी
-+Name[nl]=Grafische hulpprogramma's
-+Name[nn]=X-verktøy
-+Name[nso]=X-Didiriswa
-+Name[pa]=X-ਸਹੂਲਤ
-+Name[pl]=Narzędzia dla X
-+Name[pt]=Utilitários do X
-+Name[pt_BR]=Utilitários X
-+Name[ro]=Utilitare X
-+Name[ru]=Утилиты X
-+Name[rw]=X-Nkemurabibazo
-+Name[se]=X-reaiddut
-+Name[sk]=Nastroje pre X
-+Name[sl]=Potrebščine za X
-+Name[sr]=X-алати
-+Name[sr@Latn]=X-alati
-+Name[ss]=Kwekusetjentiswa-X
-+Name[sv]=X-verktyg
-+Name[ta]=X-கருவிகள்
-+Name[te]=ఎక్స్-సౌలభ్యాలు
-+Name[tg]=Лавозимотҳои X
-+Name[th]=โปรแกรมอรรถประโยชน์ X
-+Name[tr]=X Yardımcı Programları
-+Name[tt]=X-Faydalıq
-+Name[uk]=Утиліти X Window
-+Name[uz]=X uchun vositalar
-+Name[uz@cyrillic]=X учун воситалар
-+Name[ven]=Zwishumiswa-X
-+Name[vi]=Tiện ích X
-+Name[wa]=Usteyes X
-+Name[xh]=Izinto eziluncedo ze-X
-+Name[zh_CN]=X 实用工具
-+Name[zh_TW]=X-實用工具
-+Name[zu]=Izisebenzi ze-X
-+Icon=xapp
-+Comment=X Window Utilities
-+Comment[af]=X Window Nutsprogramme
-+Comment[ar]=عدة نوافذ X
-+Comment[az]=X Window Tə'minatları
-+Comment[be]=Службовыя праграмы X Window
-+Comment[bg]=Помощни програми за сървъра X
-+Comment[bn]=এক্স উইণ্ডো সিস্টেম সম্বন্ধিত নানা প্রোগ্রাম
-+Comment[br]=Mavegoù X Window
-+Comment[bs]=Korisni X Window programi
-+Comment[ca]=Utilitats de X Window System
-+Comment[cs]=Nástroje X Window
-+Comment[csb]=Nôrzãdza dlô systemë X Window
-+Comment[cy]=Defnyddioldebau Ffenestr X
-+Comment[da]=X-Window redskaber
-+Comment[de]=X-Window-Dienstprogramme
-+Comment[el]=Εργαλεία των X Windows
-+Comment[eo]=Utilaĵoj por la X-Fenestrosistemo
-+Comment[es]=Utilidades X Window
-+Comment[et]=X Window utiliidid
-+Comment[eu]=X Window tresnak
-+Comment[fa]=برنامه‌های سودمند پنجرۀ X
-+Comment[fi]=X Window -apuohjelmat
-+Comment[fo]=Hentleikar til X
-+Comment[fr]=Utilitaires X-Window
-+Comment[fy]=X Window-helpprogramma's
-+Comment[ga]=Uirlisí Fuinneoga X
-+Comment[gl]=Utilidades das X Window
-+Comment[he]=כלים של X Window
-+Comment[hi]=एक्स विंडो यूटिलिटीज़
-+Comment[hr]=Alati X prozora
-+Comment[hsb]=Pomocne programy za X11
-+Comment[hu]=X Window segédprogramok
-+Comment[is]=X gluggatól
-+Comment[it]=Programmi di X Window
-+Comment[ja]=X ウィンドウユーティリティ
-+Comment[ka]=X Window–ს ხელსაწყოები
-+Comment[kk]=X Window утилиталары
-+Comment[km]=ឧបករណ៍ X Window
-+Comment[ko]=X 윈도 유틸리티
-+Comment[lo]=ໂປຣແກຣມໃຊ້ໂຫຍດຂອງ X
-+Comment[lt]=X Window pagalbininkai
-+Comment[lv]=X logu utilītas
-+Comment[mk]=Алатки за X Window
-+Comment[mn]=X-Виндов-хэрэгсэл програмууд
-+Comment[ms]=Utiliti Tetingkap X
-+Comment[mt]=Utilitajiet tal-XWindows
-+Comment[nb]=Verktøy for X-window
-+Comment[nds]=Hülpprogrammen för X-Finstern
-+Comment[ne]=X सञ्झ्याल युटिलिटी
-+Comment[nl]=X Window-hulpprogramma's
-+Comment[nn]=X Window-verktøy
-+Comment[nso]=Didiriswa tsa X Window
-+Comment[pa]=X Window ਸਹੂਲਤਾਂ
-+Comment[pl]=Narzędzia dla systemu XWindow
-+Comment[pt]=Utilitários do X Window
-+Comment[pt_BR]=Utilitários do X Window
-+Comment[ro]=Utilitare X Window
-+Comment[ru]=Утилиты X Window
-+Comment[rw]=Nkemurabibazo Idirishya X
-+Comment[se]=X Window-reaiddut
-+Comment[sk]=Nástroje pre X Window
-+Comment[sl]=Potrebščine za X Window
-+Comment[sr]=X Window алати
-+Comment[sr@Latn]=X Window alati
-+Comment[ss]=X kwekusetjentiswa kweliwindi
-+Comment[sv]=X-window-verktyg
-+Comment[ta]=X-சாளர கருவிகள்
-+Comment[te]=ఎక్స్ విండో సౌలభ్యాలు
-+Comment[tg]=Лавозимотҳои Х Window
-+Comment[th]=โปรแกรมอรรถประโยชน์ของ X
-+Comment[tr]=X Yardımcı Programları
-+Comment[tt]=X Window Faydalığı
-+Comment[uk]=Утиліти системи X Window
-+Comment[uz]=X Windows vositalari
-+Comment[uz@cyrillic]=X Windows воситалари
-+Comment[ven]=Zwishumiswa zwa X window
-+Comment[vi]=Các tiện ích của X window
-+Comment[wa]=Usteyes pol sistinme grafike X11
-+Comment[xh]=X Windows Izinto eziluncedo
-+Comment[zh_CN]=X Window 实用工具
-+Comment[zh_TW]=X 視窗實用工具
-+Comment[zu]=Izisebenzi ze-X Window
diff --git a/redhat/tdebase/tdebase-3.5.13.2-kbackground_xml_selector.patch b/redhat/tdebase/tdebase-3.5.13.2-kbackground_xml_selector.patch
deleted file mode 100644
index 94016932e..000000000
--- a/redhat/tdebase/tdebase-3.5.13.2-kbackground_xml_selector.patch
+++ /dev/null
@@ -1,701 +0,0 @@
---- ./kcontrol/background/bgadvanced.cpp.ORI	2013-05-09 14:42:39.036269356 +0200
-+++ ./kcontrol/background/bgadvanced.cpp	2013-05-09 14:43:12.485581123 +0200
-@@ -44,6 +44,7 @@
- #include "bgadvanced.h"
- #include "bgadvanced_ui.h"
- 
-+#include "KCrossBGRender.h"
- #include <X11/Xlib.h>
- 
- /**** BGAdvancedDialog ****/
-@@ -63,7 +64,7 @@
- }
- 
- 
--BGAdvancedDialog::BGAdvancedDialog(KBackgroundRenderer *_r,
-+BGAdvancedDialog::BGAdvancedDialog(KCrossBGRender *_r,
-                                    TQWidget *parent,
-                                    bool m_multidesktop)
-     : KDialogBase(parent, "BGAdvancedDialog",
---- ./kcontrol/background/bgdialog.cpp.ORI	2013-05-09 14:46:43.556237673 +0200
-+++ ./kcontrol/background/bgdialog.cpp	2013-05-09 14:47:33.054218951 +0200
-@@ -63,6 +63,7 @@
- #include "bgwallpaper.h"
- #include "bgadvanced.h"
- #include "bgdialog.h"
-+#include "KCrossBGRender.h"
- 
- #define NR_PREDEF_PATTERNS 6
- 
-@@ -194,19 +195,19 @@
-          int eDesk = i>0 ? i-1 : 0;
-          
-          // Setup the merged-screen renderer
--         KBackgroundRenderer * r = new KBackgroundRenderer(eDesk, 0, false, _config);
-+         KCrossBGRender * r = new KCrossBGRender(eDesk, 0, false, _config);
-          m_renderer[i].insert( 0, r );
-          connect( r, TQT_SIGNAL(imageDone(int,int)), TQT_SLOT(slotPreviewDone(int,int)) );
-          
-          // Setup the common-screen renderer
--         r = new KBackgroundRenderer(eDesk, 0, true, _config);
-+         r = new KCrossBGRender(eDesk, 0, true, _config);
-          m_renderer[i].insert( 1, r );
-          connect( r, TQT_SIGNAL(imageDone(int,int)), TQT_SLOT(slotPreviewDone(int,int)) );
-          
-          // Setup the remaining renderers for each screen
-          for (unsigned j=0; j < m_numScreens; ++j )
-          {
--            r = new KBackgroundRenderer(eDesk, j, true, _config);
-+            r = new KCrossBGRender(eDesk, j, true, _config);
-             m_renderer[i].insert( j+2, r );
-             connect( r, TQT_SIGNAL(imageDone(int,int)), TQT_SLOT(slotPreviewDone(int,int)) );
-          }
-@@ -221,14 +222,14 @@
-       }
-       
-       // set up the common desktop renderer
--      KBackgroundRenderer * r = new KBackgroundRenderer(0, 0, false, _config);
-+      KCrossBGRender * r = new KCrossBGRender(0, 0, false, _config);
-       m_renderer[0].insert(0, r);
-       connect(r, TQT_SIGNAL(imageDone(int,int)), TQT_SLOT(slotPreviewDone(int,int)));
- 
-       // set up all the other desktop renderers
-       for (unsigned i = 0; i < m_numDesks; ++i)
-       {
--         r = new KBackgroundRenderer(i, 0, false, _config);
-+         r = new KCrossBGRender(i, 0, false, _config);
-          m_renderer[i+1].insert(0, r);
-          connect(r, TQT_SIGNAL(imageDone(int,int)), TQT_SLOT(slotPreviewDone(int,int)));
-       }
-@@ -266,7 +267,7 @@
-    delete m_pGlobals;
- }
- 
--KBackgroundRenderer * BGDialog::eRenderer()
-+KCrossBGRender * BGDialog::eRenderer()
- {
-    return m_renderer[m_eDesk][m_eScreen];
- }
-@@ -681,7 +682,7 @@
- 
- void BGDialog::updateUI()
- {
--   KBackgroundRenderer *r = eRenderer();
-+   KCrossBGRender *r = eRenderer();
-    m_comboDesktop->setCurrentItem(m_eDesk);
-    m_comboScreen->setCurrentItem(m_eScreen);
- 
-@@ -819,7 +820,7 @@
-    if (!m_previewUpdates)
-       return;
- 
--   KBackgroundRenderer * r = m_renderer[m_eDesk][(m_eScreen>1) ? (screen_done+2) : m_eScreen];
-+   KCrossBGRender * r = m_renderer[m_eDesk][(m_eScreen>1) ? (screen_done+2) : m_eScreen];
- 
-    if (r->image().isNull())
-       return;
-@@ -858,7 +859,7 @@
- 
- void BGDialog::slotWallpaperTypeChanged(int i)
- {
--   KBackgroundRenderer *r = eRenderer();
-+   KCrossBGRender *r = eRenderer();
-    r->stop();
- 
-    // No picture
-@@ -984,7 +985,7 @@
- 
- void BGDialog::slotWallpaperPos(int mode)
- {
--   KBackgroundRenderer *r = eRenderer();
-+   KCrossBGRender *r = eRenderer();
- 
-    mode++;
-    m_wallpaperPos = mode;
-@@ -1002,7 +1003,7 @@
- 
- void BGDialog::slotSetupMulti()
- {
--    KBackgroundRenderer *r = eRenderer();
-+    KCrossBGRender *r = eRenderer();
- 
-     BGMultiWallpaperDialog dlg(r, topLevelWidget());
-     if (dlg.exec() == TQDialog::Accepted) {
-@@ -1018,7 +1019,7 @@
- 
- void BGDialog::slotPrimaryColor(const TQColor &color)
- {
--   KBackgroundRenderer *r = eRenderer();
-+   KCrossBGRender *r = eRenderer();
- 
-    if (color == r->colorA())
-       return;
-@@ -1033,7 +1034,7 @@
- 
- void BGDialog::slotSecondaryColor(const TQColor &color)
- {
--   KBackgroundRenderer *r = eRenderer();
-+   KCrossBGRender *r = eRenderer();
- 
-    if (color == r->colorB())
-       return;
-@@ -1048,7 +1049,7 @@
- 
- void BGDialog::slotPattern(int pattern)
- {
--   KBackgroundRenderer *r = eRenderer();
-+   KCrossBGRender *r = eRenderer();
-    r->stop();
-    bool bSecondaryEnabled = true;
-    if (pattern < NR_PREDEF_PATTERNS)
-@@ -1085,7 +1086,7 @@
-       // Copy stuff
-       for (unsigned desk = 0; desk < m_numDesks+1; ++desk )
-       {
--         KBackgroundRenderer *master = m_renderer[desk][1];
-+         KCrossBGRender *master = m_renderer[desk][1];
-          for (unsigned screen = 0; screen < m_numScreens; ++screen)
-          {
-             m_renderer[desk][screen+2]->copyConfig(master);
-@@ -1140,7 +1141,7 @@
-       // Copy stuff
-       for (unsigned screen = 0; screen < m_renderer[0].size(); ++screen )
-       {
--         KBackgroundRenderer *master = m_renderer[0][screen];
-+         KCrossBGRender *master = m_renderer[0][screen];
-          for (unsigned desk = 0; desk < m_numDesks; ++desk )
-          {
-             m_renderer[desk+1][screen]->copyConfig(master);
-@@ -1179,7 +1180,7 @@
- 
- void BGDialog::slotAdvanced()
- {
--    KBackgroundRenderer *r = eRenderer();
-+    KCrossBGRender *r = eRenderer();
- 
-     m_previewUpdates = false;
-     BGAdvancedDialog dlg(r, topLevelWidget(), m_multidesktop);
-@@ -1301,7 +1302,7 @@
-    {
-       for (unsigned j = 0; j < m_renderer[i].size(); ++j )
-       {
--         KBackgroundRenderer * r = m_renderer[i][j];
-+         KCrossBGRender * r = m_renderer[i][j];
-          if( r->isActive())
-              r->stop();
-          r->desktopResized();
---- ./kcontrol/background/bgadvanced.h.ori	2013-05-09 14:49:18.551047531 +0200
-+++ ./kcontrol/background/bgadvanced.h	2013-05-09 14:49:23.509945456 +0200
-@@ -33,14 +33,14 @@
- class TQSpinBox;
- 
- class BGAdvancedBase;
--class KBackgroundRenderer;
-+class KCrossBGRender;
- class KBackgroundProgram;
- 
- class BGAdvancedDialog : public KDialogBase
- {
-    Q_OBJECT
- public:
--   BGAdvancedDialog(KBackgroundRenderer *_r, TQWidget *parent, bool m_multidesktop);
-+   BGAdvancedDialog(KCrossBGRender *_r, TQWidget *parent, bool m_multidesktop);
- 
-    void setCacheSize(int s);
-    int cacheSize();
-@@ -79,7 +79,7 @@
-    void slotEnableProgram(bool b);
- 
- private:
--   KBackgroundRenderer *r;
-+   KCrossBGRender *r;
- 
-    BGAdvancedBase *dlg;
- 
---- ./kcontrol/background/bgdialog.h.ORI	2013-05-09 14:49:59.223210319 +0200
-+++ ./kcontrol/background/bgdialog.h	2013-05-09 14:50:40.215366483 +0200
-@@ -28,6 +28,7 @@
- #include "bgrender.h"
- #include "bgsettings.h"
- #include "bgdefaults.h"
-+#include "KCrossBGRender.h"
- 
- class BGMonitorArrangement;
- class KStandardDirs;
-@@ -53,7 +54,7 @@
- protected:
-    void initUI();
-    void updateUI();
--   KBackgroundRenderer * eRenderer();
-+   KCrossBGRender * eRenderer();
- 
-    void setWallpaper(const TQString &);
- 
-@@ -95,7 +96,7 @@
-    int m_screen;
-    int m_eDesk;
-    int m_eScreen;
--   TQValueVector< TQPtrVector<KBackgroundRenderer> > m_renderer; // m_renderer[desk][screen]
-+   TQValueVector< TQPtrVector<KCrossBGRender> > m_renderer; // m_renderer[desk][screen]
-    TQMap<TQString,int> m_wallpaper;
-    TQStringList m_patterns;
-    int m_slideShowRandom; // Remembers last Slide Show setting
---- ./kcontrol/background/bgwallpaper.h.ORI	2013-05-09 14:51:55.150823830 +0200
-+++ ./kcontrol/background/bgwallpaper.h	2013-05-09 14:52:37.513949453 +0200
-@@ -27,6 +27,7 @@
- #include <tqstringlist.h>
- 
- #include <kdialogbase.h>
-+#include <kdebug.h>
- 
- class BGMultiWallpaperBase;
- class KBackgroundSettings;
-@@ -55,12 +56,16 @@
-    void slotMoveDown();
-    void slotOk();
-    void slotItemSelected( TQListBoxItem * );
-+   void slotCheckScheduled(bool);
-+   void slotChangedXML(const TQString&);
-+
- private:
-    void setEnabledMoveButtons();
- 
-    KBackgroundSettings *m_pSettings;
- 
-    BGMultiWallpaperBase *dlg;
-+   TQString lastXml;
- };
- 
- #endif
---- ./kcontrol/background/bgwallpaper.cpp.ORI	2013-05-09 14:53:01.461452198 +0200
-+++ ./kcontrol/background/bgwallpaper.cpp	2013-05-09 14:57:27.712924157 +0200
-@@ -26,12 +26,14 @@
- #include <tqevent.h>
- #include <tqpushbutton.h>
- #include <tqspinbox.h>
-+#include <tqgroupbox.h>
- 
- #include <kfiledialog.h>
- #include <kimageio.h>
- #include <klocale.h>
- #include <kstandarddirs.h>
- #include <kurldrag.h>
-+#include <kurlrequester.h>
- 
- #include "bgsettings.h"
- #include "bgwallpaper.h"
-@@ -119,10 +121,41 @@
-    connect(dlg->m_buttonMoveUp, TQT_SIGNAL(clicked()), TQT_SLOT(slotMoveUp()));
-    connect(dlg->m_buttonMoveDown, TQT_SIGNAL(clicked()), TQT_SLOT(slotMoveDown()));
-    connect(dlg->m_listImages,  TQT_SIGNAL(clicked ( TQListBoxItem * )), TQT_SLOT(slotItemSelected( TQListBoxItem *)));
-+   connect(dlg->chkScheduled, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotCheckScheduled(bool)));   
-+   connect(dlg->kurlXmlFile, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(slotChangedXML(const TQString &)));
-+
-    dlg->m_buttonRemove->setEnabled( false );
-    dlg->m_buttonMoveUp->setEnabled( false );
-    dlg->m_buttonMoveDown->setEnabled( false );
- 
-+   // XML Stuffs
-+   dlg->kurlXmlFile->setFilter("*.xml");
-+   if (m_pSettings->wallpaperList()[0].endsWith("xml",false)) {
-+      dlg->kurlXmlFile->setURL(m_pSettings->wallpaperList()[0]);
-+      dlg->chkScheduled->setChecked(true);
-+      dlg->m_listImages->removeItem(0);
-+      lastXml = m_pSettings->wallpaperList()[0];
-+   } else {
-+      dlg->kurlXmlFile->setURL("/usr/share/mdk/backgrounds/Mandriva.xml");
-+      dlg->chkScheduled->setChecked(false);
-+      slotCheckScheduled(false);
-+   }
-+}
-+
-+void BGMultiWallpaperDialog::slotCheckScheduled(bool state)
-+{
-+    if ( state == true ) {
-+        dlg->grpNormalShow->setEnabled(false);
-+        dlg->kurlXmlFile->setEnabled(true);
-+    } else {
-+        dlg->grpNormalShow->setEnabled(true);
-+        dlg->kurlXmlFile->setEnabled(false);
-+    }
-+}
-+
-+void BGMultiWallpaperDialog::slotChangedXML(const TQString & file)
-+{
-+    lastXml = file;
- }
- 
- void BGMultiWallpaperDialog::slotItemSelected( TQListBoxItem * )
-@@ -222,15 +255,38 @@
- 
- void BGMultiWallpaperDialog::slotOk()
- {
-+    bool useXml = false;
-+    // Looking to XML
-+    if (dlg->chkScheduled->isChecked() && lastXml.endsWith("xml",false)) {
-+        useXml = true;
-+        kdDebug() << "Adding XML" << lastXml;
-+        dlg->m_listImages->insertItem(lastXml,0);
-+    }
-+
-+    kdDebug() <<  dlg->m_listImages << endl;
-+
-     TQStringList lst;
--    for (unsigned i=0; i < dlg->m_listImages->count(); i++)
-+    for (unsigned i=0; i < dlg->m_listImages->count(); i++) {
--	lst.append(dlg->m_listImages->text(i));
-+        lst.append(dlg->m_listImages->text(i));
-+    }
-     m_pSettings->setWallpaperList(lst);
-     m_pSettings->setWallpaperChangeInterval(dlg->m_spinInterval->value());
--    if (dlg->m_cbRandom->isChecked())
-+    if (dlg->m_cbRandom->isChecked()) {
-        m_pSettings->setMultiWallpaperMode(KBackgroundSettings::Random);
--    else
-+    } else {
-        m_pSettings->setMultiWallpaperMode(KBackgroundSettings::InOrder);
-+    }
-+
-+    if(useXml) {
-+        m_pSettings->changeWallpaper();
-+        m_pSettings->setWallpaper(lastXml);
-+        m_pSettings->changeWallpaper();
-+    } else {
-+        m_pSettings->changeWallpaper();
-+        m_pSettings->setWallpaper(lst[0]);
-+        m_pSettings->changeWallpaper();
-+    }
-+
-     accept();
- }
- 
---- kdebase-3.5.9/kcontrol/background/bgwallpaper_ui.ui.kbg_trans	2008-03-17 11:06:49.000000000 -0300
-+++ kdebase-3.5.9/kcontrol/background/bgwallpaper_ui.ui	2008-03-17 11:07:13.000000000 -0300
-@@ -1,4 +1,4 @@
--<!DOCTYPE UI><UI version="3.1" stdsetdef="1">
-+<!DOCTYPE UI><UI version="3.3" stdsetdef="1">
- <class>BGMultiWallpaperBase</class>
- <widget class="TQWidget">
-     <property name="name">
-@@ -8,155 +8,209 @@
-         <rect>
-             <x>0</x>
-             <y>0</y>
--            <width>410</width>
--            <height>196</height>
-+            <width>499</width>
-+            <height>526</height>
-         </rect>
-     </property>
--    <grid>
-+    <property name="caption">
-+        <string>BGMultiWallPaperBase</string>
-+    </property>
-+    <vbox>
-         <property name="name">
-             <cstring>unnamed</cstring>
-         </property>
-         <property name="margin">
-             <number>0</number>
-         </property>
--        <widget class="TQLabel" row="2" column="0">
--            <property name="name">
--                <cstring>textLabel2</cstring>
--            </property>
--            <property name="text">
--                <string>Show the following pictures:</string>
--            </property>
--        </widget>
--        <widget class="TQCheckBox" row="1" column="0">
--            <property name="name">
--                <cstring>m_cbRandom</cstring>
--            </property>
--            <property name="text">
--                <string>&amp;Show pictures in random order</string>
--            </property>
--        </widget>
--        <widget class="TQLayoutWidget" row="0" column="0">
-+        <widget class="TQLayoutWidget">
-             <property name="name">
--                <cstring>layout3</cstring>
-+                <cstring>layout8</cstring>
-             </property>
-             <hbox>
-                 <property name="name">
-                     <cstring>unnamed</cstring>
-                 </property>
--                <widget class="TQLabel">
-+                <widget class="TQCheckBox">
-                     <property name="name">
--                        <cstring>textLabel1</cstring>
-+                        <cstring>chkScheduled</cstring>
-                     </property>
-                     <property name="text">
--                        <string>Change &amp;picture after:</string>
--                    </property>
--                    <property name="buddy" stdset="0">
--                        <cstring>m_spinInterval</cstring>
-+                        <string>Scheduled Slide Show</string>
-                     </property>
-                 </widget>
--                <widget class="TQSpinBox">
-+                <widget class="KURLRequester">
-                     <property name="name">
--                        <cstring>m_spinInterval</cstring>
-+                        <cstring>kurlXmlFile</cstring>
-                     </property>
-                 </widget>
--                <spacer>
--                    <property name="name">
--                        <cstring>spacer4</cstring>
--                    </property>
--                    <property name="orientation">
--                        <enum>Horizontal</enum>
--                    </property>
--                    <property name="sizeType">
--                        <enum>Expanding</enum>
--                    </property>
--                    <property name="sizeHint">
--                        <size>
--                            <width>20</width>
--                            <height>20</height>
--                        </size>
--                    </property>
--                </spacer>
-             </hbox>
-         </widget>
--        <widget class="TQLayoutWidget" row="3" column="0">
-+        <widget class="QGroupBox">
-             <property name="name">
--                <cstring>layout4</cstring>
-+                <cstring>grpNormalShow</cstring>
-             </property>
--            <grid>
-+            <property name="title">
-+                <string></string>
-+            </property>
-+            <vbox>
-                 <property name="name">
-                     <cstring>unnamed</cstring>
-                 </property>
--                <widget class="BGMultiWallpaperList" row="0" column="0" rowspan="5" colspan="1">
-+                <widget class="TQLayoutWidget">
-                     <property name="name">
--                        <cstring>m_listImages</cstring>
--                    </property>
--                    <property name="sizePolicy">
--                        <sizepolicy>
--                            <hsizetype>3</hsizetype>
--                            <vsizetype>3</vsizetype>
--                            <horstretch>0</horstretch>
--                            <verstretch>0</verstretch>
--                        </sizepolicy>
--                    </property>
--                    <property name="minimumSize">
--                        <size>
--                            <width>300</width>
--                            <height>100</height>
--                        </size>
-+                        <cstring>layout3</cstring>
-                     </property>
-+                    <hbox>
-+                        <property name="name">
-+                            <cstring>unnamed</cstring>
-+                        </property>
-+                        <widget class="TQLabel">
-+                            <property name="name">
-+                                <cstring>textLabel1_2</cstring>
-+                            </property>
-+                            <property name="text">
-+                                <string>Change &amp;picture after:</string>
-+                            </property>
-+                            <property name="buddy" stdset="0">
-+                                <cstring>m_spinInterval</cstring>
-+                            </property>
-+                        </widget>
-+                        <widget class="TQSpinBox">
-+                            <property name="name">
-+                                <cstring>m_spinInterval</cstring>
-+                            </property>
-+                        </widget>
-+                        <spacer>
-+                            <property name="name">
-+                                <cstring>spacer4</cstring>
-+                            </property>
-+                            <property name="orientation">
-+                                <enum>Horizontal</enum>
-+                            </property>
-+                            <property name="sizeType">
-+                                <enum>Expanding</enum>
-+                            </property>
-+                            <property name="sizeHint">
-+                                <size>
-+                                    <width>20</width>
-+                                    <height>20</height>
-+                                </size>
-+                            </property>
-+                        </spacer>
-+                    </hbox>
-                 </widget>
--                <widget class="TQPushButton" row="0" column="1">
-+                <widget class="TQCheckBox">
-                     <property name="name">
--                        <cstring>m_buttonAdd</cstring>
-+                        <cstring>m_cbRandom</cstring>
-                     </property>
-                     <property name="text">
--                        <string>&amp;Add...</string>
--                    </property>
--                </widget>
--                <spacer row="4" column="1">
--                    <property name="name">
--                        <cstring>spacer5</cstring>
--                    </property>
--                    <property name="orientation">
--                        <enum>Vertical</enum>
--                    </property>
--                    <property name="sizeType">
--                        <enum>Expanding</enum>
-+                        <string>&amp;Show pictures in random order</string>
-                     </property>
--                    <property name="sizeHint">
--                        <size>
--                            <width>20</width>
--                            <height>20</height>
--                        </size>
--                    </property>
--                </spacer>
--                <widget class="TQPushButton" row="1" column="1">
--                    <property name="name">
--                        <cstring>m_buttonRemove</cstring>
--                    </property>
--                    <property name="text">
--                        <string>&amp;Remove</string>
-+                    <property name="accel">
-+                        <string>Alt+S</string>
-                     </property>
-                 </widget>
--                <widget class="TQPushButton" row="3" column="1">
-+                <widget class="TQLabel">
-                     <property name="name">
--                        <cstring>m_buttonMoveDown</cstring>
-+                        <cstring>textLabel2</cstring>
-                     </property>
-                     <property name="text">
--                        <string>Move &amp;Down</string>
-+                        <string>Show the following pictures:</string>
-                     </property>
-                 </widget>
--                <widget class="TQPushButton" row="2" column="1">
-+                <widget class="TQLayoutWidget">
-                     <property name="name">
--                        <cstring>m_buttonMoveUp</cstring>
--                    </property>
--                    <property name="text">
--                        <string>Move &amp;Up</string>
-+                        <cstring>layout4</cstring>
-                     </property>
-+                    <grid>
-+                        <property name="name">
-+                            <cstring>unnamed</cstring>
-+                        </property>
-+                        <widget class="BGMultiWallpaperList" row="0" column="0" rowspan="5" colspan="1">
-+                            <property name="name">
-+                                <cstring>m_listImages</cstring>
-+                            </property>
-+                            <property name="sizePolicy">
-+                                <sizepolicy>
-+                                    <hsizetype>3</hsizetype>
-+                                    <vsizetype>3</vsizetype>
-+                                    <horstretch>0</horstretch>
-+                                    <verstretch>0</verstretch>
-+                                </sizepolicy>
-+                            </property>
-+                            <property name="minimumSize">
-+                                <size>
-+                                    <width>300</width>
-+                                    <height>100</height>
-+                                </size>
-+                            </property>
-+                        </widget>
-+                        <widget class="TQPushButton" row="0" column="1">
-+                            <property name="name">
-+                                <cstring>m_buttonAdd</cstring>
-+                            </property>
-+                            <property name="text">
-+                                <string>&amp;Add...</string>
-+                            </property>
-+                            <property name="accel">
-+                                <string>Alt+A</string>
-+                            </property>
-+                        </widget>
-+                        <spacer row="4" column="1">
-+                            <property name="name">
-+                                <cstring>spacer5</cstring>
-+                            </property>
-+                            <property name="orientation">
-+                                <enum>Vertical</enum>
-+                            </property>
-+                            <property name="sizeType">
-+                                <enum>Expanding</enum>
-+                            </property>
-+                            <property name="sizeHint">
-+                                <size>
-+                                    <width>20</width>
-+                                    <height>20</height>
-+                                </size>
-+                            </property>
-+                        </spacer>
-+                        <widget class="TQPushButton" row="1" column="1">
-+                            <property name="name">
-+                                <cstring>m_buttonRemove</cstring>
-+                            </property>
-+                            <property name="text">
-+                                <string>&amp;Remove</string>
-+                            </property>
-+                            <property name="accel">
-+                                <string>Alt+R</string>
-+                            </property>
-+                        </widget>
-+                        <widget class="TQPushButton" row="3" column="1">
-+                            <property name="name">
-+                                <cstring>m_buttonMoveDown</cstring>
-+                            </property>
-+                            <property name="text">
-+                                <string>Move &amp;Down</string>
-+                            </property>
-+                            <property name="accel">
-+                                <string>Alt+D</string>
-+                            </property>
-+                        </widget>
-+                        <widget class="TQPushButton" row="2" column="1">
-+                            <property name="name">
-+                                <cstring>m_buttonMoveUp</cstring>
-+                            </property>
-+                            <property name="text">
-+                                <string>Move &amp;Up</string>
-+                            </property>
-+                            <property name="accel">
-+                                <string>Alt+U</string>
-+                            </property>
-+                        </widget>
-+                    </grid>
-                 </widget>
--            </grid>
-+            </vbox>
-         </widget>
--    </grid>
-+    </vbox>
- </widget>
- <includes>
-     <include location="local" impldecl="in declaration">bgwallpaper.h</include>
-@@ -164,4 +218,9 @@
- </includes>
- <layoutdefaults spacing="3" margin="6"/>
- <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
-+<includehints>
-+    <includehint>kurlrequester.h</includehint>
-+    <includehint>klineedit.h</includehint>
-+    <includehint>kpushbutton.h</includehint>
-+</includehints>
- </UI>
diff --git a/redhat/tdebase/tdebase-3.5.13.2-kcm_xcursor_applytheme.patch b/redhat/tdebase/tdebase-3.5.13.2-kcm_xcursor_applytheme.patch
deleted file mode 100644
index 1926ad62a..000000000
--- a/redhat/tdebase/tdebase-3.5.13.2-kcm_xcursor_applytheme.patch
+++ /dev/null
@@ -1,136 +0,0 @@
---- tdebase/kcontrol/input/xcursor/themepage.cpp.ORI	2013-07-22 19:33:45.153674930 +0200
-+++ tdebase/kcontrol/input/xcursor/themepage.cpp	2013-07-23 15:24:01.664497762 +0200
-@@ -33,6 +33,8 @@
- #include <kio/netaccess.h>
- #include <ktar.h>
- 
-+#include "../../krdb/krdb.h"
-+
- #include <tqlayout.h>
- #include <tqdir.h>
- #include <tqpixmap.h>
-@@ -42,6 +44,7 @@
- #include <tqpainter.h>
- #include <tqfileinfo.h>
- #include <tqpushbutton.h>
-+#include <dcopref.h>
- 
- #include <cstdlib> // for getenv()
- 
-@@ -53,6 +56,10 @@
- #include <X11/Xlib.h>
- #include <X11/Xcursor/Xcursor.h>
- 
-+#ifdef HAVE_XFIXES
-+#  include <X11/extensions/Xfixes.h>
-+#endif
-+
- // Check for older version
- #if !defined(XCURSOR_LIB_MAJOR) && defined(XCURSOR_MAJOR)
- # define XCURSOR_LIB_MAJOR	XCURSOR_MAJOR
-@@ -133,6 +140,65 @@
- {
- }
- 
-+bool ThemePage::applyTheme(TQString theme, TQString size)
-+{
-+#ifdef HAVE_XCURSOR
-+    if (theme.isEmpty()) {
-+        return false;
-+    }
-+
-+    // Apply the TDE cursor theme to ourselves
-+    XcursorSetTheme(qt_xdisplay(), theme.latin1());
-+
-+    // Tell klauncher to set the XCURSOR_THEME and XCURSOR_SIZE environment
-+    // variables when launching applications.
-+    DCOPRef klauncher("klauncher");
-+    klauncher.send("setLaunchEnv", TQCString("XCURSOR_THEME"), theme);
-+    if( !size.isEmpty()) {
-+        klauncher.send("setLaunchEnv", TQCString("XCURSOR_SIZE"), size);
-+    }
-+
-+    // Update the Xcursor X resources
-+    runRdb(0);
-+
-+    // Apply the TDE cursor size to ourselves
-+    if (!size.isEmpty()) {
-+    	XcursorSetDefaultSize(qt_xdisplay(), size.toUInt());
-+    }
-+
-+    // Reload the standard cursors
-+    TQStringList names;
-+
-+    // Qt cursors
-+    names << "left_ptr"       << "up_arrow"      << "cross"      << "wait"
-+          << "left_ptr_watch" << "ibeam"         << "size_ver"   << "size_hor"
-+          << "size_bdiag"     << "size_fdiag"    << "size_all"   << "split_v"
-+          << "split_h"        << "pointing_hand" << "openhand"
-+          << "closedhand"     << "forbidden"     << "whats_this" << "copy" << "move" << "link";
-+
-+    // X core cursors
-+    names << "X_cursor"            << "right_ptr"           << "hand1"
-+          << "hand2"               << "watch"               << "xterm"
-+          << "crosshair"           << "left_ptr_watch"      << "center_ptr"
-+          << "sb_h_double_arrow"   << "sb_v_double_arrow"   << "fleur"
-+          << "top_left_corner"     << "top_side"            << "top_right_corner"
-+          << "right_side"          << "bottom_right_corner" << "bottom_side"
-+          << "bottom_left_corner"  << "left_side"           << "question_arrow"
-+          << "pirate";
-+
-+    for (int i = 0; i < names.size(); ++i)
-+    {
-+        const char* name = (*(names.at(i))).ascii();
-+        Cursor handle = XcursorLibraryLoadCursor(qt_xdisplay(), name);
-+        XFixesChangeCursorByName(qt_xdisplay(), handle, TQFile::encodeName(name));
-+        XFreeCursor(qt_xdisplay(), handle); // Don't leak the cursor
-+    }
-+
-+    return true;
-+#else // HAVE_XCURSOR
-+    return false;
-+#endif
-+}
- 
- void ThemePage::save()
- {
-@@ -145,10 +209,17 @@
- 	c.setGroup( "Mouse" );
- 	c.writeEntry( "cursorTheme", selectedTheme != "system" ? selectedTheme : TQString::null );
- 
--	KMessageBox::information( this, i18n("You have to restart KDE for these "
-+    // The Kcontrol panel does not allow to set cursor size for now.
-+    // So we keep the same size as written in config file.
-+    TQCString size = c.readEntry("cursorSize", TQString()).local8Bit();
-+
-+    if (!applyTheme(selectedTheme, size))
-+    {
-+		KMessageBox::information( this, i18n("You have to restart KDE for these "
- 				"changes to take effect."), i18n("Cursor Settings Changed"),
- 				"CursorSettingsChanged" );
--
-+	}
-+	
- 	currentTheme = selectedTheme;
- }
- 
---- tdebase/kcontrol/input/xcursor/themepage.h.ORI	2013-07-22 19:49:33.467191658 +0200
-+++ tdebase/kcontrol/input/xcursor/themepage.h	2013-07-22 19:56:03.990484896 +0200
-@@ -45,6 +45,7 @@
- 		void load();
- 		void load( bool useDefaults );
- 		void defaults();
-+		bool applyTheme(TQString theme, TQString size);
- 
- 	signals:
- 		void changed( bool );
---- tdebase/kcontrol/input/xcursor/CMakeLists.txt.ORI	2013-07-23 15:24:41.178064068 +0200
-+++ tdebase/kcontrol/input/xcursor/CMakeLists.txt	2013-07-23 15:27:31.694851294 +0200
-@@ -21,5 +21,6 @@
- 
- tde_add_library( themepage STATIC_PIC AUTOMOC
-   SOURCES
--    themepage.cpp previewwidget.cpp
-+    themepage.cpp previewwidget.cpp ../../krdb/krdb.cpp
-+  LINK Xfixes
- )
diff --git a/redhat/tdebase/tdebase-3.5.13.2-kcontrol_menu_entry.patch b/redhat/tdebase/tdebase-3.5.13.2-kcontrol_menu_entry.patch
deleted file mode 100644
index cdef8e5a7..000000000
--- a/redhat/tdebase/tdebase-3.5.13.2-kcontrol_menu_entry.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- ./kcontrol/kcontrol/KControl.desktop~	2013-01-09 02:12:13.000000000 +0100
-+++ ./kcontrol/kcontrol/KControl.desktop	2013-05-08 17:55:54.250733219 +0200
-@@ -5,7 +5,7 @@
- DocPath=kcontrol/index.html
- X-KDE-StartupNotify=true
- 
--Name=Control Center
-+Name=Trinity Control Center
- Name[af]=Beheer Sentrum
- Name[ar]=مركز التحكم
- Name[az]=İdarə Mərkəzi
-@@ -28,7 +28,7 @@
- Name[eu]=Kontrol gunea
- Name[fa]=مرکز کنترل
- Name[fi]=Ohjauskeskus
--Name[fr]=Centre de configuration de KDE
-+Name[fr]=Centre de configuration de Trinity
- Name[fy]=Konfiguraasjesintrum
- Name[ga]=Lárionad Rialaithe
- Name[gl]=Centro de Control
diff --git a/redhat/tdebase/tdebase-3.5.13.2-kdesktop_crossfade.patch b/redhat/tdebase/tdebase-3.5.13.2-kdesktop_crossfade.patch
deleted file mode 100644
index 0d6e5cf83..000000000
--- a/redhat/tdebase/tdebase-3.5.13.2-kdesktop_crossfade.patch
+++ /dev/null
@@ -1,1002 +0,0 @@
-diff -p -up kdebase-3.5.9/kcontrol/background/crossfade.h.crossfade-efect kdebase-3.5.9/kcontrol/background/crossfade.h
---- kdebase-3.5.9/kcontrol/background/crossfade.h.crossfade-efect	2008-03-11 09:17:29.000000000 -0300
-+++ kdebase-3.5.9/kcontrol/background/crossfade.h	2008-03-11 09:17:29.000000000 -0300
-@@ -0,0 +1,56 @@
-+/* vi: ts=8 sts=4 sw=4
-+ * kate: space-indent on; tab-width 8; indent-width 4; indent-mode cstyle;
-+ *
-+ * This file is part of the KDE project, module kdesktop.
-+ * Copyright (C) 1999,2000 Geert Jansen <jansen@kde.org>
-+ *
-+ * You can Freely distribute this program under the GNU General Public
-+ * License. See the file "COPYING" for the exact licensing terms.
-+ */
-+
-+#ifndef __crossfade_h_Included__
-+#define __crossfade_h_Included__
-+
-+#include <tqtimer.h>
-+#include <tqpainter.h>
-+#include <tqpixmap.h>
-+#include <X11/X.h>
-+#include <X11/Xlib.h>
-+#include <X11/Xatom.h>
-+#include <X11/extensions/Xrender.h>
-+#include <kdebug.h>
-+#include <unistd.h>
-+
-+
-+
-+inline TQPixmap crossFade(const TQPixmap &pix1, const TQPixmap &pix2, double r_alpha,
-+	                bool sync = false){
-+
-+    TQPixmap pix = TQPixmap(1,1,8); 
-+    int mw,mh;
-+    mw = pix1.width();
-+    mh = pix1.height();
-+
-+    int alpha = 0xffff * (1-r_alpha);
-+    
-+    XRenderColor clr = { 0, 0, 0, alpha }; 
-+    XRenderPictureAttributes pa;
-+    pa.repeat = True;
-+    Picture pic = XRenderCreatePicture(pix.x11Display(), pix.handle(),
-+	    XRenderFindStandardFormat (pix.x11Display(), PictStandardA8),
-+	    CPRepeat, &pa);
-+    XRenderFillRectangle(pix.x11Display(), PictOpSrc, pic,
-+			 &clr, 0, 0, 1, 1);
-+    TQPixmap dst(pix1);
-+    dst.detach();
-+    XRenderComposite(pix.x11Display(), PictOpOver, pix2.x11RenderHandle(),
-+	    pic, dst.x11RenderHandle(),0,0, 0,0, 0,0, mw,mh);
-+
-+    if (sync) {
-+       XSync(pix.x11Display(), false);	
-+    }
-+    XRenderFreePicture(pix.x11Display(), pic);
-+    return dst;
-+}
-+
-+#endif // __crossfade_h_Included__
---- ./kcontrol/background/CMakeLists.txt.ORI	2013-05-08 18:36:33.605165935 +0200
-+++ ./kcontrol/background/CMakeLists.txt	2013-05-08 18:37:55.448537081 +0200
-@@ -28,7 +28,7 @@
-   ##### bgnd (static) #############################
- 
-   tde_add_library( bgnd STATIC_PIC AUTOMOC
--    SOURCES bgrender.cpp bgsettings.cpp
-+    SOURCES bgrender.cpp bgsettings.cpp KCrossBGRender.cc
-     LINK ${LIBART_LIBRARIES}
-   )
- 
---- ./kcontrol/background/bgrender.cpp.ORI	2013-05-08 18:39:20.212849124 +0200
-+++ ./kcontrol/background/bgrender.cpp	2013-05-08 18:44:04.200187009 +0200
-@@ -10,6 +10,8 @@
- 
- #include <config.h>
- 
-+#include "KCrossBGRender.h"
-+
- #include <time.h>
- #include <stdlib.h>
- #include <utime.h>
-@@ -1061,7 +1063,7 @@
- }
- 
- 
--KBackgroundRenderer * KVirtualBGRenderer::renderer(unsigned screen)
-+KCrossBGRender * KVirtualBGRenderer::renderer(unsigned screen)
- {
-     return m_renderer[screen];
- }
-@@ -1220,7 +1222,8 @@
-     for (unsigned i=0; i<m_numRenderers; ++i)
-     {
-         int eScreen = m_bCommonScreen ? 0 : i;
--        KBackgroundRenderer * r = new KBackgroundRenderer( m_desk, eScreen, m_bDrawBackgroundPerScreen, m_pConfig );
-+        //KBackgroundRenderer * r = new KBackgroundRenderer( m_desk, eScreen, m_bDrawBackgroundPerScreen, m_pConfig );
-+        KCrossBGRender *r = new KCrossBGRender(m_desk, eScreen, m_bDrawBackgroundPerScreen, m_pConfig);
-         m_renderer.insert( i, r );
-         r->setSize(renderSize(i));
-         connect( r, TQT_SIGNAL(imageDone(int,int)), this, TQT_SLOT(screenDone(int,int)) );
-@@ -1250,7 +1253,8 @@
-     Q_UNUSED(_desk);
-     Q_UNUSED(_screen);
- 
--    const KBackgroundRenderer * sender = dynamic_cast<const KBackgroundRenderer*>(this->sender());
-+    //const KBackgroundRenderer * sender = dynamic_cast<const KBackgroundRenderer*>(this->sender());
-+    const KCrossBGRender * sender = dynamic_cast<const KCrossBGRender*>(this->sender());
-     int screen = m_renderer.find(sender);
-     if (screen == -1)
-         //??
---- kdebase-3.5.9/kcontrol/background/KCrossBGRender.h.crossfade-efect	2008-03-11 09:17:29.000000000 -0300
-+++ kdebase-3.5.9/kcontrol/background/KCrossBGRender.h	2008-03-11 10:50:24.000000000 -0300
-@@ -0,0 +1,76 @@
-+/*
-+ * Copyright (C) 2008 Danilo Cesar Lemes de Paula <danilo@mandriva.com>
-+ * Copyright (C) 2008 Gustavo Boiko <boiko@mandriva.com>
-+ * Mandriva Conectiva
-+ *
-+ * This library is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU Library General Public
-+ * License version 2 as published by the Free Software Foundation.
-+ *
-+ * This library is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ * Library General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU Library General Public License
-+ * along with this library; see the file COPYING.LIB.  If not, write to
-+ * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-+ * Boston, MA 02111-1307, USA.
-+*/
-+
-+#ifndef __KCrossBGRender_h_Included__
-+#define __KCrossBGRender_h_Included__
-+
-+
-+#include <tqvaluelist.h>
-+#include <tqpixmap.h>
-+#include <tqvaluelist.h>
-+#include <tqdatetime.h>
-+
-+#include "bgrender.h"
-+
-+class TQDomElement;
-+
-+typedef struct crossEvent{
-+	bool transition;
-+	TQString pix1;
-+	TQString pix2;
-+	TQTime stime; //start time
-+	TQTime etime; //end time
-+} KBGCrossEvent;
-+
-+
-+class KCrossBGRender: public KBackgroundRenderer{
-+	
-+TQ_OBJECT
-+
-+public:
-+	KCrossBGRender(int desk, int screen, bool drawBackgroundPerScreen, KConfig *config=0);
-+	~KCrossBGRender();
-+
-+	bool needWallpaperChange();
-+	void changeWallpaper(bool init=false);
-+	TQPixmap pixmap();
-+	bool usingCrossXml(){return useCrossEfect;};
-+
-+
-+private:
-+	TQPixmap pix;
-+	int secs;
-+	TQString xmlFileName;
-+	bool useCrossEfect;
-+	
-+	int actualPhase;
-+	 
-+	void createStartTime(TQDomElement e);
-+	void createTransition(TQDomElement e);
-+	void createStatic(TQDomElement e);
-+	bool setCurrentEvent(bool init = false);
-+	void initCrossFade(TQString xml);
-+	void fixEnabled();
-+	TQPixmap getCurrentPixmap();
-+	KBGCrossEvent current;
-+	TQValueList<KBGCrossEvent> timeList;
-+};
-+
-+#endif // __KCrossBGRender_h_Included__ 
---- ./kcontrol/background/bgrender.h.ORI	2013-05-08 18:46:41.122053931 +0200
-+++ ./kcontrol/background/bgrender.h	2013-05-08 18:49:07.510128486 +0200
-@@ -28,6 +28,7 @@
- class KTempFile;
- class KShellProcess;
- class KStandardDirs;
-+class KCrossBGRender;
- 
- /**
-  * This class renders a desktop background to a TQImage. The operation is
-@@ -127,7 +128,7 @@
-     KVirtualBGRenderer(int desk, KConfig *config=0l);
-     ~KVirtualBGRenderer();
-     
--    KBackgroundRenderer * renderer(unsigned screen);
-+    KCrossBGRender * renderer(unsigned screen);
-     unsigned numRenderers() const { return m_numRenderers; }
- 
-     TQPixmap pixmap();
-@@ -173,7 +174,8 @@
-     TQSize m_size;
-     
-     TQMemArray<bool> m_bFinished;
--    TQPtrVector<KBackgroundRenderer> m_renderer;
-+    //TQPtrVector<KBackgroundRenderer> m_renderer;
-+    TQPtrVector<KCrossBGRender> m_renderer;
-     TQPixmap *m_pPixmap;
- };
- 
-diff -p -up kdebase-3.5.9/kcontrol/background/KCrossBGRender.cc.crossfade-efect kdebase-3.5.9/kcontrol/background/KCrossBGRender.cc
---- kdebase-3.5.9/kcontrol/background/KCrossBGRender.cc.crossfade-efect	2008-03-11 09:17:29.000000000 -0300
-+++ kdebase-3.5.9/kcontrol/background/KCrossBGRender.cc	2008-03-11 10:54:41.000000000 -0300
-@@ -0,0 +1,362 @@
-+/*
-+ * Copyright (C) 2008 Danilo Cesar Lemes de Paula <danilo@mandriva.com>
-+ * Copyright (C) 2008 Gustavo Boiko <boiko@mandriva.com>
-+ * Mandriva Conectiva
-+ *
-+ * This library is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU Library General Public
-+ * License version 2 as published by the Free Software Foundation.
-+ *
-+ * This library is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ * Library General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU Library General Public License
-+ * along with this library; see the file COPYING.LIB.  If not, write to
-+ * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-+ * Boston, MA 02111-1307, USA.
-+ */
-+
-+#include <tqdom.h>
-+#include <tqfile.h>
-+
-+#include <kdebug.h>
-+
-+#include "KCrossBGRender.h"
-+//#include "crossfade.h"
-+#include <tqapplication.h>
-+#include <kimageeffect.h>
-+
-+
-+KCrossBGRender::KCrossBGRender(int desk, int screen, bool drawBackgroundPerScreen, KConfig *config): KBackgroundRenderer(desk,screen,drawBackgroundPerScreen,config)
-+{
-+	useCrossEfect = false;
-+	if ( wallpaperList()[0].endsWith("xml",false) ) {
-+		initCrossFade(wallpaperList()[0]);
-+	}
-+}
-+		
-+
-+void KCrossBGRender::initCrossFade(TQString xmlFile)
-+{	
-+	useCrossEfect = true;
-+	if (xmlFile.isEmpty()){
-+		useCrossEfect = false;
-+		return;
-+	}
-+	secs = 0;
-+	timeList.empty();
-+
-+	// read the XMLfile
-+	TQDomDocument xmldoc = TQDomDocument(xmlFile);
-+	TQFile file( xmlFile );
-+	if ( !file.open( IO_ReadOnly ) ) {
-+		useCrossEfect = false;
-+		return;
-+	}
-+	if ( !xmldoc.setContent( &file ) ) {
-+		useCrossEfect = false;
-+		file.close();
-+		return;
-+	}
-+	file.close();
-+
-+	TQDomElement docElem = xmldoc.documentElement();
-+	TQDomNode n = docElem.firstChild();
-+	while( !n.isNull() ) {
-+		TQDomElement e = n.toElement(); // try to convert the node to an element.
-+		if( !e.isNull() ) {
-+			if (e.tagName() == "starttime") {
-+				createStartTime(e);	
-+			} else if (e.tagName() == "transition") {
-+				createTransition(e);
-+			} else if (e.tagName() == "static") {
-+				createStatic(e);
-+			}
-+		}
-+		n = n.nextSibling();
-+	}
-+
-+	// Setting "now" state
-+	setCurrentEvent(true);
-+	pix = getCurrentPixmap();
-+	
-+	useCrossEfect = true;
-+}
-+
-+
-+KCrossBGRender::~KCrossBGRender(){
-+}
-+
-+TQPixmap KCrossBGRender::pixmap() {
-+	fixEnabled();	
-+	if (!useCrossEfect){
-+		TQPixmap p = KBackgroundRenderer::pixmap();
-+		kdDebug() << "Inherited " << p.size() << endl;
-+		if (p.width() == 0 && p.height() == 0){
-+			p.convertFromImage(image());
-+		}
-+		return p;
-+	}
-+	
-+	return pix;
-+}
-+
-+bool KCrossBGRender::needWallpaperChange(){
-+	if (!useCrossEfect) {
-+		return KBackgroundRenderer::needWallpaperChange();
-+	}
-+
-+	bool forceChange = setCurrentEvent();    // If we change the current state
-+	if (forceChange){			 // do not matter what hapens
-+		actualPhase = 0;                 // we need to change background
-+		return true;
-+	}
-+
-+	// Return false if it's not a transition
-+	if (!current.transition) {
-+		return false;
-+	}
-+
-+	double timeLeft, timeTotal;
-+	TQTime now = TQTime::currentTime();
-+
-+	timeLeft = now.secsTo(current.etime);
-+	if (timeLeft < 0) {
-+		timeLeft += 86400; // before midnight
-+	}
-+	timeTotal = current.stime.secsTo(current.etime);
-+	if (timeTotal < 0) {
-+		timeTotal += 86400;
-+	}
-+
-+	double passed  = timeTotal - timeLeft;
-+	double timeCell   =  timeTotal/60; //Time cell size
-+
-+	//kdDebug() << "\ntimeleft:" << timeLeft << " timeTotal:" << timeTotal 
-+	//          << "\npassed:" << passed << " timeCell:" << timeCell
-+	//	  << "\nactualPhase: " << actualPhase << endl;	
-+
-+	int aux = passed/timeCell;	
-+	if(actualPhase != aux){
-+		//kdDebug() << "needWallpaperChange() => returned true" << endl;
-+		actualPhase = passed/timeCell;
-+		return true;
-+	}
-+
-+	//kdDebug() << "needWallpaperChange() => returned false" << endl;
-+	return false;
-+}
-+
-+/* 
-+ * This method change the enabledEffect flag to TRUE of FALSE, according 
-+ * with multiWallpaperMode and FileName (it needs to be a XML)
-+ */
-+void KCrossBGRender::fixEnabled(){
-+
-+	
-+	TQString w = wallpaperList()[0];
-+	useCrossEfect = false;	
-+	if(multiWallpaperMode() == Random || multiWallpaperMode() == InOrder){
-+		
-+		if ( w != xmlFileName ){
-+			// New XML File
-+			xmlFileName = w;
-+			if (w.endsWith("xml",false)){
-+				initCrossFade(wallpaperList()[0]);
-+				//useCrossEfect = true;	
-+			}else{
-+				// Not, it's not a xml file
-+				useCrossEfect = false;
-+			}
-+		}else if (w.endsWith("xml",false)){
-+			//xmlFile doesn't change
-+			//but it's there
-+			useCrossEfect = true;
-+		}else{
-+			// it's not a XML file
-+			useCrossEfect = false;
-+		}
-+	}
-+}
-+
-+void KCrossBGRender::changeWallpaper(bool init){
-+
-+
-+
-+	fixEnabled();
-+
-+	if (!useCrossEfect){
-+		KBackgroundRenderer::changeWallpaper(init);
-+		return;
-+	}
-+
-+	pix = getCurrentPixmap();
-+
-+
-+}
-+
-+
-+bool KCrossBGRender::setCurrentEvent(bool init){
-+	TQTime now = TQTime::currentTime();
-+	
-+
-+	//Verify if is need to change
-+	if (!(init || now <= current.stime || now >= current.etime )) {
-+		return false;
-+	}
-+
-+	TQValueList<KBGCrossEvent>::iterator it;
-+	for ( it = timeList.begin(); it != timeList.end(); ++it ){
-+
-+		// Look for time
-+		if ( ((*it).stime <= now && now <= (*it).etime) ||   //normal situation
-+		     ((*it).etime <= (*it).stime && (now >= (*it).stime ||
-+		     				     now <= (*it).etime) ) )	
-+		{
-+			current = *it;
-+			actualPhase = 0;
-+
-+			//kdDebug() << "Cur: " << current.stime << "< now <" << current.etime << endl;
-+			return true;
-+		}
-+	}
-+}
-+
-+TQPixmap KCrossBGRender::getCurrentPixmap()
-+{
-+	float alpha;
-+	TQPixmap ret;
-+	TQImage tmp;
-+	TQImage p1;
-+	if (!tmp.load(current.pix1))
-+		return TQPixmap();
-+
-+	// scale the pixmap to fit in the screen
-+	//p1 = TQPixmap(QApplication::desktop()->screenGeometry().size());
-+	//TQPainter p(&p1);
-+	//p.drawPixmap(p1.rect(), tmp);
-+	//
-+	p1 = tmp.smoothScale(TQApplication::desktop()->screenGeometry().size());
-+
-+	if (current.transition){
-+		TQTime now = TQTime::currentTime();
-+		double timeLeft,timeTotal;
-+
-+		TQImage p2;
-+
-+		if (!tmp.load(current.pix2) )
-+			return NULL;
-+
-+		p2 = tmp.smoothScale(TQApplication::desktop()->screenGeometry().size());
-+		//TQPainter p(&p2);
-+		//p.drawPixmap(p2.rect(), tmp);
-+
-+		timeLeft = now.secsTo(current.etime);
-+		if (timeLeft < 0)
-+			timeLeft += 86400;
-+		timeTotal = current.stime.secsTo(current.etime);
-+		if (timeTotal < 0)
-+			timeTotal += 86400;
-+		
-+		alpha = (timeTotal - timeLeft)/timeTotal;
-+
-+		//ret = crossFade(p2,p1,alpha);
-+		tmp = KImageEffect::blend(p2,p1,alpha);
-+		ret.convertFromImage(tmp);
-+		return ret;
-+	}else{
-+		ret.convertFromImage(p1);
-+		return ret;
-+	}	
-+	
-+
-+}
-+
-+void KCrossBGRender::createStartTime(TQDomElement docElem)
-+{	
-+	int hour;
-+	int minutes;
-+
-+	TQDomNode n = docElem.firstChild();
-+	while( !n.isNull() ) {
-+		TQDomElement e = n.toElement();
-+		if( !e.isNull() ) {
-+			if (e.tagName() == "hour"){
-+				hour =  e.text().toInt();
-+			}else if ( e.tagName() == "minute" ){
-+				minutes = e.text().toInt();
-+			}
-+			
-+		}
-+		
-+		n = n.nextSibling();
-+	}
-+	secs = hour*60*60 + minutes*60;
-+}
-+void KCrossBGRender::createTransition(TQDomElement docElem)
-+{
-+	int duration;
-+	TQString from;
-+	TQString to;
-+
-+	TQDomNode n = docElem.firstChild();
-+	while( !n.isNull() ) {
-+		TQDomElement e = n.toElement();
-+		if( !e.isNull() ) {
-+			if (e.tagName() == "duration"){
-+				duration = e.text().toFloat();
-+			}else if ( e.tagName() == "from" ){
-+				from = e.text();
-+			}
-+			else if ( e.tagName() == "to" ){
-+				to = e.text();
-+			}
-+			
-+		}
-+		n = n.nextSibling();
-+	}
-+	TQTime startTime(0,0,0);
-+	startTime = startTime.addSecs(secs);
-+	TQTime endTime(0,0,0);
-+	endTime = endTime.addSecs(secs+duration);
-+
-+	secs += duration;
-+	
-+	KBGCrossEvent l = {true, from, to, startTime,endTime};
-+
-+	timeList.append(l);
-+
-+}
-+void KCrossBGRender::createStatic(TQDomElement docElem)
-+{	
-+	int duration;
-+	TQString file;
-+	
-+	TQDomNode n = docElem.firstChild();
-+	while( !n.isNull() ) {
-+		TQDomElement e = n.toElement();
-+		if( !e.isNull() ) {
-+			if (e.tagName() == "duration"){
-+				duration = e.text().toFloat();
-+			}else if ( e.tagName() == "file" ){
-+				file = e.text();
-+			}
-+			
-+		}
-+		n = n.nextSibling();
-+	}
-+	
-+	TQTime startTime(0,0,0);
-+	startTime = startTime.addSecs(secs);
-+	TQTime endTime(0,0,0);
-+	endTime = endTime.addSecs(secs+duration);
-+	
-+	secs += duration;
-+
-+	KBGCrossEvent l = {false, file, NULL, startTime,endTime};
-+	timeList.append(l);
-+}
-+
-+#include "KCrossBGRender.moc"
---- ./kdm/kfrontend/krootimage.h.ORI	2013-05-08 18:54:48.631599139 +0200
-+++ ./kdm/kfrontend/krootimage.h	2013-05-08 18:55:02.365339708 +0200
-@@ -27,6 +27,7 @@
- #include <tqtimer.h>
- 
- #include <bgrender.h>
-+#include <KCrossBGRender.h>
- 
- 
- class MyApplication : public KApplication
---- ./kdesktop/bgmanager.cc.ORI	2013-05-08 18:56:29.915684768 +0200
-+++ ./kdesktop/bgmanager.cc	2013-05-08 19:12:04.451954803 +0200
-@@ -16,10 +16,16 @@
- #include "bgsettings.h"
- #include "kdesktopapp.h"
- 
-+//FIXME
-+#include "KCrossBGRender.h"
-+#include "crossfade.h"
-+
- #include <assert.h>
- 
- #include <tqtimer.h>
- #include <tqscrollview.h>
-+#include <tqpainter.h>
-+#include <tqdesktopwidget.h>
- 
- #include <kiconloader.h>
- #include <kconfig.h>
-@@ -34,6 +40,8 @@
- #include <X11/X.h>
- #include <X11/Xlib.h>
- #include <X11/Xatom.h>
-+#include <X11/extensions/Xrender.h>
-+#include <unistd.h>
- 
- #ifndef None
- #define None 0L
-@@ -47,7 +55,8 @@
- 
- #include "pixmapserver.h"
- 
--template class TQPtrVector<KBackgroundRenderer>;
-+//template class TQPtrVector<KBackgroundRenderer>;
-+template class TQPtrVector<KCrossBGRender>;
- template class TQPtrVector<KBackgroundCacheEntry>;
- template class TQMemArray<int>;
- 
-@@ -108,6 +117,12 @@
-     connect(m_pTimer, TQT_SIGNAL(timeout()), TQT_SLOT(slotTimeout()));
-     m_pTimer->start( 60000 );
- 
-+    /*CrossFade's config*/
-+    m_crossTimer = new TQTimer(this);
-+    connect(m_crossTimer, TQT_SIGNAL(timeout()), TQT_SLOT(slotCrossFadeTimeout()));
-+    /*Ends here*/
-+
-+
-     connect(m_pKwinmodule, TQT_SIGNAL(currentDesktopChanged(int)),
- 	    TQT_SLOT(slotChangeDesktop(int)));
-     connect(m_pKwinmodule, TQT_SIGNAL(numberOfDesktopsChanged(int)),
-@@ -577,6 +592,36 @@
- 
- 
- /*
-+ * This slot is called when the Timeout is executed
-+ */
-+void KBackgroundManager::slotCrossFadeTimeout()
-+{
-+    KVirtualBGRenderer *r = m_Renderer[fadeDesk];
-+    if (crossInit) {
-+        mBenchmark.start();
-+    }
-+
-+    if (mAlpha <= 0.0 || mBenchmark.elapsed() > 300 ) {
-+        bool do_cleanup = true;
-+        mAlpha = 1;
-+        m_crossTimer->stop();
-+        KPixmap pixm(mNextScreen);
-+        setPixmap(&pixm, r->hash(), fadeDesk);
-+        return;
-+    }
-+    // Reset Timer
-+    mBenchmark.start();
-+
-+    TQPixmap dst = crossFade(*mOldScreen, mNextScreen, mAlpha, crossInit);
-+    KPixmap pixm(dst);
-+    setPixmap(&pixm, r->hash(), fadeDesk);
-+
-+    mAlpha -=0.03;
-+    crossInit = false;
-+}
-+
-+
-+/*
-  * This slot is called when a renderer is done.
-  */
- void KBackgroundManager::slotImageDone(int desk)
-@@ -592,6 +637,10 @@
-     KPixmap *pm = new KPixmap();
-     KVirtualBGRenderer *r = m_Renderer[desk];
-     bool do_cleanup = true;
-+    fadeDesk = desk; 
-+    mAlpha = 1.0;
-+    int width,height;
-+
- 
-     *pm = r->pixmap();
-     // If current: paint it
-@@ -603,7 +652,41 @@
-         //setPixmap(viewport_background, r->hash(), desk);
-         //delete viewport_background;
-         
--        setPixmap(pm, r->hash(), desk);
-+        //START
-+        if (m_Renderer[effectiveDesktop()]->renderer(0)->crossFadeBg() && !m_Renderer[effectiveDesktop()]->renderer(0)->usingCrossXml()){	
-+            int mode = m_Renderer[effectiveDesktop()]->renderer(0)->wallpaperMode();
-+            width = TQApplication::desktop()->screenGeometry().width(); //m_pDesktop->width();
-+            height = TQApplication::desktop()->screenGeometry().height();// m_pDesktop->height();	
-+
-+            if (mode == KBackgroundSettings::NoWallpaper || mode == KBackgroundSettings::Tiled || mode  == KBackgroundSettings::CenterTiled ){
-+                mNextScreen = TQPixmap(width,height);
-+                TQPainter p (&mNextScreen);
-+                p.drawTiledPixmap(0,0,width,height,*pm);        
-+            } else {
-+                mNextScreen = TQPixmap(*pm);
-+            }
-+
-+            if (m_pDesktop){
-+                mOldScreen = const_cast<TQPixmap *>( m_pDesktop->backgroundPixmap() );
-+            }else{
-+                mOldScreen = const_cast<TQPixmap *>(
-+                TQApplication::desktop()->screen()->backgroundPixmap() );
-+            }
-+
-+            //TODO Find a way to discover if CrossFade effect needs to run  
-+            if (mOldScreen){
-+                crossInit = true;
-+                m_crossTimer->start(70);
-+            } else{
-+                setPixmap(pm, r->hash(), desk);
-+            }
-+        }else{
-+            setPixmap(pm, r->hash(), desk);
-+        }
-+        //ENDS HERE  */
-+	    
-+        //setPixmap(pm, r->hash(), desk);
-+
-         if (!m_bBgInitDone)
-         {
-             m_bBgInitDone = true;
-@@ -801,7 +884,8 @@
- TQString KBackgroundManager::currentWallpaper(int desk)
- {
-     //TODO Is the behaviour of this function appropriate for multiple screens?
--    KBackgroundRenderer *r = m_Renderer[validateDesk(desk)]->renderer(0);
-+    //KBackgroundRenderer *r = m_Renderer[validateDesk(desk)]->renderer(0);
-+    KCrossBGRender *r = m_Renderer[validateDesk(desk)]->renderer(0);
- 
-     return r->currentWallpaper();
- }
-@@ -818,7 +902,7 @@
- // DCOP exported
- void KBackgroundManager::setExport(int _export)
- {
--    kdDebug() << "KBackgroundManager enabling exports.\n";
-+//    kdDebug() << "KBackgroundManager enabling exports.\n";
-     applyExport(_export);
-     slotChangeDesktop(0);
- }
-@@ -843,7 +927,7 @@
-     //TODO Is the behaviour of this function appropriate for multiple screens?
-     for (unsigned i=0; i < m_Renderer[effectiveDesktop()]->numRenderers(); ++i)
-     {
--        KBackgroundRenderer *r = m_Renderer[effectiveDesktop()]->renderer(i);
-+        KCrossBGRender *r = m_Renderer[effectiveDesktop()]->renderer(i);
-         r->stop();
-         r->setWallpaperMode(mode);
-         r->setMultiWallpaperMode(KBackgroundSettings::NoMulti);
-@@ -856,7 +940,7 @@
- void KBackgroundManager::setWallpaper(TQString wallpaper)
- {
-     //TODO Is the behaviour of this function appropriate for multiple screens?
--    KBackgroundRenderer *r = m_Renderer[effectiveDesktop()]->renderer(0);
-+    KCrossBGRender *r = m_Renderer[effectiveDesktop()]->renderer(0);
-     int mode = r->wallpaperMode();
-     if (mode == KBackgroundSettings::NoWallpaper)
-        mode = KBackgroundSettings::Tiled;
-@@ -869,7 +953,7 @@
- TQStringList KBackgroundManager::wallpaperFiles(int desk)
- {
-     //TODO Is the behaviour of this function appropriate for multiple screens?
--    KBackgroundRenderer *r = m_Renderer[validateDesk(desk)]->renderer(0);
-+    KCrossBGRender *r = m_Renderer[validateDesk(desk)]->renderer(0);
- 
-     return r->wallpaperFiles();
- }
-@@ -880,7 +964,7 @@
- TQStringList KBackgroundManager::wallpaperList(int desk)
- {
-     //TODO Is the behaviour of this function appropriate for multiple screens?
--    KBackgroundRenderer *r = m_Renderer[validateDesk(desk)]->renderer(0);;
-+    KCrossBGRender *r = m_Renderer[validateDesk(desk)]->renderer(0);;
- 
-     return r->wallpaperList();
- }
-@@ -907,7 +991,7 @@
-     //TODO Is the behaviour of this function appropriate for multiple screens?
-     for (unsigned i=0; i < m_Renderer[sdesk]->numRenderers(); ++i)
-     {
--        KBackgroundRenderer *r = m_Renderer[sdesk]->renderer(i);
-+        KCrossBGRender *r = m_Renderer[sdesk]->renderer(i);
-     
-         setCommon(false);   // Force each desktop to have it's own wallpaper
-     
-@@ -974,7 +1058,7 @@
-     //TODO Is the behaviour of this function appropriate for multiple screens?
-     for (unsigned i=0; i < m_Renderer[effectiveDesktop()]->numRenderers(); ++i)
-     {
--        KBackgroundRenderer *r = m_Renderer[effectiveDesktop()]->renderer(i);
-+        KCrossBGRender *r = m_Renderer[effectiveDesktop()]->renderer(i);
-         r->stop();
-     
-         if (isColorA)
---- ./kdesktop/bgmanager.h.ORI	2013-05-08 19:13:25.120426716 +0200
-+++ ./kdesktop/bgmanager.h	2013-05-08 19:15:12.071398460 +0200
-@@ -13,6 +13,7 @@
- #include <tqstring.h>
- #include <tqptrvector.h>
- 
-+#include <tqdatetime.h>
- #include <KBackgroundIface.h>
- 
- #if defined(Q_WS_X11) && defined(HAVE_XRENDER) && QT_VERSION >= 0x030300
-@@ -89,6 +90,7 @@
-     void desktopResized();
-     void clearRoot();
-     void saveImages();
-+    void slotCrossFadeTimeout();
-     void slotCmBackgroundChanged(bool);
- 
- private:
-@@ -131,6 +133,15 @@
-     KPixmapServer *m_pPixmapServer;
-     
-     unsigned long m_xrootpmap;
-+
-+    /*CrossFade vars*/
-+    TQTimer * m_crossTimer;
-+    double mAlpha;
-+    TQPixmap  mNextScreen;
-+    TQPixmap  * mOldScreen;
-+    int fadeDesk;
-+    TQTime mBenchmark;
-+    bool crossInit;
- };
- 
- #endif // __BGManager_h_Included__
---- trinity-tdebase-3.5.13.2~pre102+43d29f86/kcontrol/background/bgdialog_ui.ui.ORI	2013-05-15 12:13:14.000000000 +0000
-+++ trinity-tdebase-3.5.13.2~pre102+43d29f86/kcontrol/background/bgdialog_ui.ui	2013-05-15 12:20:25.000000000 +0000
-@@ -376,6 +376,17 @@
- &lt;/ul&gt;&lt;/qt&gt;</string>
-                     </property>
-                 </widget>
-+                <widget class="TQCheckBox" row="8" column="1">
-+                    <property name="name">
-+                        <cstring>m_cbCrossFadeBg</cstring>
-+                    </property>
-+                    <property name="text">
-+                        <string>Cross-fading background</string>
-+                    </property>
-+                    <property name="whatsThis" stdset="0">
-+                        <string>Enables a smooth fading effect when changing background image.</string>
-+                    </property>
-+                </widget>
-                 <widget class="TQComboBox" row="5" column="1">
-                     <property name="name">
-                         <cstring>m_comboBlend</cstring>
---- trinity-tdebase-3.5.13.2~pre102+43d29f86/kcontrol/background/bgdefaults.h.ORI	2013-05-15 13:42:20.933760867 +0000
-+++ trinity-tdebase-3.5.13.2~pre102+43d29f86/kcontrol/background/bgdefaults.h	2013-05-15 13:42:38.305365721 +0000
-@@ -34,5 +34,6 @@
- #define _defBlendMode KBackgroundSettings::NoBlending
- #define _defBlendBalance 100
- #define _defReverseBlending false
-+#define _defCrossFadeBg false
- 
- #endif // __BGDefaults_h_Included__
---- trinity-tdebase-3.5.13.2~pre102+43d29f86/kcontrol/background/bgsettings.h.ORI	2013-05-15 13:37:34.228282617 +0000
-+++ trinity-tdebase-3.5.13.2~pre102+43d29f86/kcontrol/background/bgsettings.h	2013-05-15 13:39:31.884606381 +0000
-@@ -198,6 +198,9 @@
-     void setReverseBlending(bool value);
-     bool reverseBlending() const { return m_ReverseBlending; }
- 
-+    void setCrossFadeBg(bool value);
-+    bool crossFadeBg() const { return m_CrossFadeBg; }
-+
-     void setBlendBalance(int value);
-     int blendBalance() const { return m_BlendBalance; }
- 
-@@ -273,6 +276,7 @@
-     int m_BlendMode, defBlendMode;
-     int m_BlendBalance, defBlendBalance;
-     bool m_ReverseBlending, defReverseBlending;
-+    bool m_CrossFadeBg, defCrossFadeBg;
-     int m_MinOptimizationDepth;
-     bool m_bShm;
-     bool m_bDrawBackgroundPerScreen;
---- trinity-tdebase-3.5.13.2~pre102+43d29f86/kcontrol/background/bgsettings.cpp.ORI	2013-05-15 13:39:59.408980208 +0000
-+++ trinity-tdebase-3.5.13.2~pre102+43d29f86/kcontrol/background/bgsettings.cpp	2013-05-15 13:46:15.197432823 +0000
-@@ -437,6 +437,7 @@
-     defBlendMode = _defBlendMode;
-     defBlendBalance = _defBlendBalance;
-     defReverseBlending = _defReverseBlending;
-+    defCrossFadeBg = _defCrossFadeBg;
- 
-     m_MinOptimizationDepth = _defMinOptimizationDepth;
-     m_bShm = _defShm;
-@@ -537,6 +538,7 @@
-     m_BlendMode = settings->m_BlendMode;
-     m_BlendBalance = settings->m_BlendBalance;
-     m_ReverseBlending = settings->m_ReverseBlending;
-+    m_CrossFadeBg = settings->m_CrossFadeBg;
-     m_MinOptimizationDepth = settings->m_MinOptimizationDepth;
-     m_bShm = settings->m_bShm;
-     m_MultiMode = settings->m_MultiMode;
-@@ -633,6 +635,15 @@
- }
- 
- 
-+void KBackgroundSettings::setCrossFadeBg(bool value)
-+{
-+    if (m_CrossFadeBg == value)
-+	return;
-+    dirty = hashdirty = true;
-+    m_CrossFadeBg = value;
-+}
-+
-+
- void KBackgroundSettings::setWallpaper(TQString wallpaper)
- {
-     dirty = hashdirty = true;
-@@ -774,6 +785,8 @@
- 
-     m_ReverseBlending = m_pConfig->readBoolEntry( "ReverseBlending", defReverseBlending);
- 
-+    m_CrossFadeBg = m_pConfig->readBoolEntry( "CrossFadeBg", defCrossFadeBg);
-+
-     // Multiple wallpaper config
-     m_WallpaperList = m_pConfig->readPathListEntry("WallpaperList");
- 
-@@ -834,6 +847,7 @@
-     m_pConfig->writeEntry("BlendMode", m_BlMRevMap[m_BlendMode]);
-     m_pConfig->writeEntry("BlendBalance", m_BlendBalance);
-     m_pConfig->writeEntry("ReverseBlending", m_ReverseBlending);
-+    m_pConfig->writeEntry("CrossFadeBg", m_CrossFadeBg);
-     m_pConfig->writeEntry("MinOptimizationDepth", m_MinOptimizationDepth);
-     m_pConfig->writeEntry("UseSHM", m_bShm);
- 
---- trinity-tdebase-3.5.13.2~pre102+43d29f86/kcontrol/background/bgdialog.h.ORI	2013-05-15 13:56:09.397921090 +0000
-+++ trinity-tdebase-3.5.13.2~pre102+43d29f86/kcontrol/background/bgdialog.h	2013-05-15 13:56:17.377739605 +0000
-@@ -80,6 +80,7 @@
-    void slotBlendReverse(bool b);
-    void desktopResized();
-    void setBlendingEnabled(bool);
-+   void slotCrossFadeBg(bool);
- 
- protected:
-    void getEScreen();
---- trinity-tdebase-3.5.13.2~pre102+43d29f86/kcontrol/background/bgdialog.cpp.ORI	2013-05-15 13:53:49.809095324 +0000
-+++ trinity-tdebase-3.5.13.2~pre102+43d29f86/kcontrol/background/bgdialog.cpp	2013-05-15 13:53:54.636985486 +0000
-@@ -174,6 +174,10 @@
-    connect(m_cbBlendReverse, TQT_SIGNAL(toggled(bool)),
-            TQT_SLOT(slotBlendReverse(bool)));
- 
-+   // Crossfading background
-+   connect(m_cbCrossFadeBg, TQT_SIGNAL(toggled(bool)),
-+           TQT_SLOT(slotCrossFadeBg(bool)));
-+
-    // advanced options
-    connect(m_buttonAdvanced, TQT_SIGNAL(clicked()),
-            TQT_SLOT(slotAdvanced()));
-@@ -304,6 +308,7 @@
-     m_cbBlendReverse->setEnabled( false );
-     m_buttonAdvanced->setEnabled( false );
-     m_buttonGetNew->setEnabled( false );
-+    m_cbCrossFadeBg->setEnabled( false );
- }
- 
- void BGDialog::load( bool useDefaults )
-@@ -781,6 +786,8 @@
-     m_cbBlendReverse->setChecked(r->reverseBlending());
-     m_sliderBlend->setValue( r->blendBalance() / 10 );
- 
-+    m_cbCrossFadeBg->setChecked(r->crossFadeBg());
-+
-     m_comboBlend->blockSignals(false);
-     m_sliderBlend->blockSignals(false);
- 
-@@ -1295,6 +1302,17 @@
-    eRenderer()->start(true);
- }
- 
-+void BGDialog::slotCrossFadeBg(bool b)
-+{
-+   if (b == eRenderer()->crossFadeBg())
-+      return;
-+   emit changed(true);
-+
-+   eRenderer()->stop();
-+   eRenderer()->setCrossFadeBg(b);
-+   eRenderer()->start(true);
-+}
-+
- void BGDialog::desktopResized()
- {
-    for (unsigned i = 0; i < m_renderer.size(); ++i)
diff --git a/redhat/tdebase/tdebase-3.5.13.2-kdesu-noignorebutton.patch b/redhat/tdebase/tdebase-3.5.13.2-kdesu-noignorebutton.patch
deleted file mode 100644
index 41b081edc..000000000
--- a/redhat/tdebase/tdebase-3.5.13.2-kdesu-noignorebutton.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- trinity-tdebase-3.5.13.2~pre102+43d29f86/kdesu/kdesu/sudlg.cpp.kdesu_no_ignore	2013-05-16 22:59:53.633425236 +0200
-+++ trinity-tdebase-3.5.13.2~pre102+43d29f86/kdesu/kdesu/sudlg.cpp	2013-05-16 23:00:04.685200151 +0200
-@@ -15,7 +15,7 @@
- #include "sudlg.h"
- 
- KDEsuDialog::KDEsuDialog(TQCString user, TQCString auth_user, bool enableKeep,const TQString& icon, bool withIgnoreButton, int timeout)
--     : KPasswordDialog(Password, enableKeep, (withIgnoreButton ? User1:NoDefault), icon)
-+     : KPasswordDialog(Password, enableKeep, 0, icon)
- {
-     KConfig* config = KGlobal::config();
-     config->setGroup("super-user-command");
-@@ -34,12 +34,10 @@
-     } else {
-         if (m_User == "root") {
- 	    prompt = i18n("The action you requested needs root privileges. "
--	    "Please enter root's password below or click "
--	    "Ignore to continue with your current privileges.");
-+	    "Please enter root's password below.");
-         } else {
- 	    prompt = i18n("The action you requested needs additional privileges. "
--		"Please enter the password for \"%1\" below or click "
--		"Ignore to continue with your current privileges.").arg(static_cast<const char *>(m_User));
-+		"Please enter the password for \"%1\" below.").arg(static_cast<const char *>(m_User));
- 	}
-     }
-     setPrompt(prompt);
diff --git a/redhat/tdebase/tdebase-3.5.13.2-kdm_theme_selector.patch b/redhat/tdebase/tdebase-3.5.13.2-kdm_theme_selector.patch
deleted file mode 100644
index 39f6f49a3..000000000
--- a/redhat/tdebase/tdebase-3.5.13.2-kdm_theme_selector.patch
+++ /dev/null
@@ -1,229 +0,0 @@
---- trinity-tdebase-3.5.13.2~pre86+807a5445/kcontrol/kdm/kdm-appear.h.kdm_theme_selector	2013-01-09 02:12:13.000000000 +0100
-+++ trinity-tdebase-3.5.13.2~pre86+807a5445/kcontrol/kdm/kdm-appear.h	2013-05-09 12:58:14.535347383 +0200
-@@ -26,6 +26,7 @@
- #include <tqimage.h>
- #include <tqfileinfo.h>
- #include <tqpushbutton.h>
-+#include <tqgroupbox.h>
- 
- #include <kcolorbutton.h>
- #include <kurl.h>
-@@ -57,6 +58,7 @@
- 
- 	void loadColorSchemes(KBackedComboBox *combo);
- 	void loadGuiStyles(KBackedComboBox *combo);
-+	void loadThemes(KBackedComboBox *combo);
- 	void loadLanguageList(KLanguageButton *combo);
- 
- 	bool eventFilter(TQObject *, TQEvent *);
-@@ -72,6 +74,7 @@
- private slots:
- 	void slotAreaRadioClicked(int id);
- 	void slotLogoButtonClicked();
-+	void slotUsethemeChanged(bool state);
- 	void changed();
- 
- private:
-@@ -85,14 +88,19 @@
- 	TQRadioButton *logoRadio;
- 	TQLineEdit    *xLineEdit;
- 	TQLineEdit    *yLineEdit;
-+	TQCheckBox    * themecheck;
- 	KBackedComboBox    *compositorcombo;
- 	KBackedComboBox    *guicombo;
-+	KBackedComboBox    *themecombo;
- 	KBackedComboBox    *colcombo;
- 	KBackedComboBox    *echocombo;
-+	TQLabel * themeimagelabel;
- 	KLanguageButton *langcombo;
- 	TQCheckBox    *sakbox;
- 	TQLabel    *sakwarning;
- 
-+ 	//TQHBoxLayout * themehlay;
-+	TQGroupBox *themegroup;
- };
- 
- #endif
---- trinity-tdebase-3.5.13.2~pre86+807a5445/kcontrol/kdm/kdm-appear.cpp.kdm_theme_selector	2013-01-09 02:12:13.000000000 +0100
-+++ trinity-tdebase-3.5.13.2~pre86+807a5445/kcontrol/kdm/kdm-appear.cpp	2013-05-09 13:00:34.428413714 +0200
-@@ -28,6 +28,7 @@
- #include <tqbuttongroup.h>
- #include <tqlabel.h>
- #include <tqlayout.h>
-+#include <tqcheckbox.h>
- #include <tqradiobutton.h>
- #include <tqwhatsthis.h>
- #include <tqvalidator.h>
-@@ -35,6 +36,7 @@
- #include <tqcheckbox.h>
- #include <tqstyle.h>
- 
-+#include <kdesktopfile.h>
- #include <klocale.h>
- #include <klineedit.h>
- #include <kimageio.h>
-@@ -62,10 +64,43 @@
- 
-   TQVBoxLayout *vbox = new TQVBoxLayout(this, KDialog::marginHint(),
-                       KDialog::spacingHint(), "vbox");
--  TQGroupBox *group = new TQGroupBox(i18n("Appearance"), this);
-+ 
-+  // ThemeBox Starts here
-+
-+  themecheck = new TQCheckBox( i18n("Use Theme"), this );
-+  vbox->addWidget(themecheck);
-+  connect(themecheck, TQT_SIGNAL(toggled(bool)), TQT_SLOT(changed()));
-+  connect(themecheck, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotUsethemeChanged(bool)));  
-+ 
-+  themegroup = new TQGroupBox(0, Vertical, i18n("Theme"), this);
-+  vbox->addWidget(themegroup);
-+
-+  TQGridLayout * grid = new TQGridLayout( themegroup->layout(), 4, 3, KDialog::spacingHint() );
-+
-+  grid->setColStretch(1, 1);
-+  grid->setColStretch(2, 1);
-+
-+  themecombo = new KBackedComboBox(themegroup);
-+  loadThemes(themecombo);
-+  
-+  TQLabel * label1 = new TQLabel(themecombo, i18n("KDM Theme:"),themegroup);
-+  grid->addWidget(label1,1,0);
-+  grid->addWidget(themecombo,1,1);
-+  connect(themecombo, TQT_SIGNAL(activated(int)), TQT_SLOT(changed()));
-+  connect(themecombo, TQT_SIGNAL(activated(int)), TQT_SLOT(slotThemeChanged(int)));
-+
-+  themeimagelabel = new TQLabel(themecombo,"",themegroup);
-+
-+  grid->addMultiCellWidget(themeimagelabel,1,3,2,2,TQt::AlignRight);
-+
-+  vbox->addStretch(1);
-+  // ENDS HERE
-+
-+  TQGroupBox * group = new TQGroupBox(i18n("Appearance"), this);
-+
-   vbox->addWidget(group);
- 
--  TQGridLayout *grid = new TQGridLayout( group, 5, 2, KDialog::marginHint(),
-+  grid = new TQGridLayout( group, 5, 2, KDialog::marginHint(),
-                        KDialog::spacingHint(), "grid");
-   grid->addRowSpacing(0, group->fontMetrics().height());
-   grid->setColStretch(0, 1);
-@@ -267,10 +302,25 @@
- 
- }
- 
-+
-+void KDMAppearanceWidget::slotUsethemeChanged(bool state)
-+{
-+	//themehlay->setEnabled(state);
-+	//themecombo->setEnabled(state);
-+	//themeimagelabel->setEnabled(state);
-+	themegroup->setEnabled(state);
-+}
-+
-+
- void KDMAppearanceWidget::makeReadOnly()
- {
-     disconnect( logobutton, TQT_SIGNAL(clicked()),
- 		this, TQT_SLOT(slotLogoButtonClicked()) );
-+    
-+    themecheck->setEnabled(false);
-+    //themegroup->setEnabled(false);
-+    themecombo->setEnabled(false);
-+    themeimagelabel->setEnabled(false);
-     logobutton->setAcceptDrops(false);
-     greetstr_lined->setReadOnly(true);
-     noneRadio->setEnabled(false);
-@@ -352,6 +402,40 @@
-   }
- }
- 
-+void KDMAppearanceWidget::loadThemes(KBackedComboBox *combo)
-+{
-+  // Gets current Theme in kdmrc
-+  TQString current;
-+  config->setGroup("X-*-Greeter");
-+  TQFileInfo Theme = config->readEntry("Theme");
-+  if(Theme.exists()) {
-+    current = Theme.fileName();
-+  }
-+
-+  // List directories under "themes" directory
-+  TQDir d(locate("data", TQString::fromLatin1("kdm/themes/")), "", TQDir::Name, TQDir::Dirs|TQDir::NoSymLinks|TQDir::Readable|TQDir::Executable);
-+  TQStringList list = d.entryList();
-+  
-+  combo->clear();
-+  for (TQStringList::ConstIterator it = list.begin(); it != list.end(); ++it) {
-+      TQString name = (*it);
-+
-+      if(name == "." || name == ".." ) {
-+         continue;
-+	  }
-+      
-+      if (name.isEmpty()) {
-+         name = "default";
-+      }
-+      
-+      combo->insertItem( *it, name);
-+
-+      if (name == current) {
-+         combo->setCurrentItem(combo->count()-1);
-+      }
-+  }
-+}
-+
- bool KDMAppearanceWidget::setLogo(TQString logo)
- {
-     TQString flogo = logo.isEmpty() ?
-@@ -468,6 +552,10 @@
- 
-   config->writeEntry("GUIStyle", guicombo->currentId());
- 
-+  TQString Theme = locate("data", TQString::fromLatin1("kdm/themes/"));
-+  Theme.append(themecombo->currentId());
-+  config->writeEntry("Theme", Theme);
-+
-   config->writeEntry("ColorScheme", colcombo->currentId());
- 
-   config->writeEntry("EchoMode", echocombo->currentId());
-@@ -476,6 +564,8 @@
- 
-   config->writeEntry("Language", langcombo->current());
- 
-+  config->writeEntry("UseTheme", themecheck->isChecked());
-+
-   if (!sakwarning) {
-     config->writeEntry("UseSAK", sakbox->isChecked());
-   }
-@@ -523,6 +613,8 @@
-   // Check the current compositor type
-   compositorcombo->setCurrentId(config->readEntry("Compositor"));
- 
-+  loadThemes(themecombo);
-+
-   // Check the GUI type
-   guicombo->setCurrentId(config->readEntry("GUIStyle"));
- 
-@@ -544,6 +636,9 @@
-   // get the language
-   langcombo->setCurrentItem(config->readEntry("Language", "C"));
- 
-+  themecheck->setChecked(config->readBoolEntry("UseTheme",true));
-+  slotUsethemeChanged(config->readBoolEntry("UseTheme",true));
-+
-   // See if the SAK is enabled
-   if (!sakwarning) {
-     sakbox->setChecked(config->readBoolEntry("UseSAK", true));
-@@ -556,10 +651,12 @@
- 
- void KDMAppearanceWidget::defaults()
- {
-+  themecheck->setChecked(true);
-   greetstr_lined->setText( i18n("Welcome to %n") );
-   logoRadio->setChecked( true );
-   slotAreaRadioClicked( KdmLogo );
-   setLogo( "" );
-+  themecombo->setCurrentId("");
-   compositorcombo->setCurrentId( "" );
-   guicombo->setCurrentId( "" );
-   colcombo->setCurrentId( "" );
diff --git a/redhat/tdebase/tdebase-3.5.13.2-kdm_utf8_password.patch b/redhat/tdebase/tdebase-3.5.13.2-kdm_utf8_password.patch
deleted file mode 100644
index 9ba4bdd05..000000000
--- a/redhat/tdebase/tdebase-3.5.13.2-kdm_utf8_password.patch
+++ /dev/null
@@ -1,297 +0,0 @@
---- ./kdmlib/kgreet_classic.cpp.ORI	2013-05-09 17:43:03.148552793 +0200
-+++ ./kdmlib/kgreet_classic.cpp	2013-05-09 17:51:09.129324589 +0200
-@@ -26,21 +26,30 @@
- #include "themer/kdmthemer.h"
- #include "themer/kdmitem.h"
- 
-+#include <kglobal.h>
- #include <klocale.h>
- #include <klineedit.h>
--#include <kpassdlg.h>
- #include <kuser.h>
- 
- #include <tqregexp.h>
- #include <tqlayout.h>
- #include <tqlabel.h>
- 
--class KDMPasswordEdit : public KPasswordEdit {
-+class KDMPasswordEdit : public KLineEdit {
- public:
--	KDMPasswordEdit( TQWidget *parent ) : KPasswordEdit( parent, 0 ) {}
--	KDMPasswordEdit( KPasswordEdit::EchoModes echoMode, TQWidget *parent ) : KPasswordEdit( echoMode, parent, 0 ) {}
-+    KDMPasswordEdit( TQWidget *parent ) : KLineEdit( parent ) 
-+    {
-+        setEchoMode(TQLineEdit::Password);
-+    }
-+
-+    KDMPasswordEdit( TQLineEdit::EchoMode echoMode, TQWidget *parent ) : KLineEdit( parent )
-+    {
-+        setEchoMode(echoMode);
-+    }
-+
-+
- protected:
--	virtual void contextMenuEvent( TQContextMenuEvent * ) {}
-+    virtual void contextMenuEvent( TQContextMenuEvent * ) {}
- };
- 
- static int echoMode;
-@@ -104,11 +113,11 @@
- 			grid->addWidget( loginLabel, line, 0 );
- 			grid->addWidget( new TQLabel( fixedUser, parent ), line++, 1 );
- 		}
--		if (echoMode == -1)
-+		if (echoMode == -1) {
- 			passwdEdit = new KDMPasswordEdit( parent );
--		else
--			passwdEdit = new KDMPasswordEdit( (KPasswordEdit::EchoModes)echoMode,
--			                                  parent );
-+		} else {
-+			passwdEdit = new KDMPasswordEdit( (TQLineEdit::EchoMode)echoMode, parent );
-+		}
- 		connect( passwdEdit, TQT_SIGNAL(textChanged( const TQString & )),
- 		         TQT_SLOT(slotActivity()) );
- 		connect( passwdEdit, TQT_SIGNAL(lostFocus()), TQT_SLOT(slotActivity()) );
-@@ -135,8 +144,8 @@
- 	}
- 	if (func != Authenticate) {
- 		if (echoMode == -1) {
--			passwd1Edit = new KDMPasswordEdit( (KPasswordEdit::EchoModes)echoMode, parent );
--			passwd2Edit = new KDMPasswordEdit( (KPasswordEdit::EchoModes)echoMode, parent );
-+			passwd1Edit = new KDMPasswordEdit( (TQLineEdit::EchoMode)echoMode, parent );
-+			passwd2Edit = new KDMPasswordEdit( (TQLineEdit::EchoMode)echoMode, parent );
- 		} else {
- 			passwd1Edit = new KDMPasswordEdit( parent );
- 			passwd2Edit = new KDMPasswordEdit( parent );
-@@ -247,16 +256,16 @@
- 		                          KGreeterPluginHandler::IsUser );
- 		break;
- 	case 1:
--		handler->gplugReturnText( passwdEdit->password(),
-+		handler->gplugReturnText( passwdEdit->text().utf8(),
- 		                          KGreeterPluginHandler::IsPassword |
- 		                          KGreeterPluginHandler::IsSecret );
- 		break;
- 	case 2:
--		handler->gplugReturnText( passwd1Edit->password(),
-+		handler->gplugReturnText( passwd1Edit->text().utf8(),
- 		                          KGreeterPluginHandler::IsSecret );
- 		break;
- 	default: // case 3:
--		handler->gplugReturnText( passwd2Edit->password(),
-+		handler->gplugReturnText( passwd2Edit->text().utf8(),
- 		                          KGreeterPluginHandler::IsNewPassword |
- 		                          KGreeterPluginHandler::IsSecret );
- 		break;
-@@ -405,11 +414,11 @@
- 	// assert( !running );
- 	setActive2( true );
- 	if (authTok) {
--		passwd1Edit->erase();
--		passwd2Edit->erase();
-+		passwd1Edit->clear();
-+		passwd2Edit->clear();
- 		passwd1Edit->setFocus();
- 	} else {
--		passwdEdit->erase();
-+		passwdEdit->clear();
- 		if (loginEdit && loginEdit->isEnabled())
- 			passwdEdit->setEnabled( true );
- 		else {
-@@ -426,7 +435,7 @@
- KClassicGreeter::clear()
- {
- 	// assert( !running && !passwd1Edit );
--	passwdEdit->erase();
-+	passwdEdit->clear();
- 	if (loginEdit) {
- 		loginEdit->clear();
- 		loginEdit->setFocus();
-@@ -484,9 +493,24 @@
-                   TQVariant (*getConf)( void *, const char *, const TQVariant & ),
-                   void *ctx )
- {
--	echoMode = getConf( ctx, "EchoMode", TQVariant( -1 ) ).toInt();
--	KGlobal::locale()->insertCatalogue( "kgreet_classic" );
--	return true;
-+    echoMode = getConf( ctx, "EchoMode", TQVariant( -1 ) ).toInt();
-+    switch (echoMode)
-+    {
-+        case (0):
-+        case (1):
-+            echoMode = TQLineEdit::Password;
-+            break;
-+
-+        case (2):
-+            echoMode = TQLineEdit::NoEcho;
-+            break;
-+
-+        default:
-+            echoMode = TQLineEdit::Password;
-+    }
-+
-+    KGlobal::locale()->insertCatalogue( "kgreet_classic" );
-+    return true;
- }
- 
- static void done( void )
---- ./kdmlib/kgreet_classic.h.ORI	2013-05-09 17:53:03.266961035 +0200
-+++ ./kdmlib/kgreet_classic.h	2013-05-09 17:53:49.235008948 +0200
-@@ -31,7 +31,6 @@
- #include <tqobject.h>
- 
- class KLineEdit;
--class KPasswordEdit;
- class KSimpleConfig;
- class TQGridLayout;
- class TQLabel;
-@@ -76,7 +75,7 @@
- 
- 	TQLabel *loginLabel, *passwdLabel, *passwd1Label, *passwd2Label;
- 	KLineEdit *loginEdit;
--	KPasswordEdit *passwdEdit, *passwd1Edit, *passwd2Edit;
-+	KLineEdit *passwdEdit, *passwd1Edit, *passwd2Edit;
- 	KSimpleConfig *stsFile;
- 	TQString fixedUser, curUser;
- 	Function func;
---- ./kdmlib/kgreet_winbind.cpp.ORI	2013-05-09 17:54:36.906021481 +0200
-+++ ./kdmlib/kgreet_winbind.cpp	2013-05-09 18:00:23.089847329 +0200
-@@ -26,11 +26,11 @@
- #include "themer/kdmthemer.h"
- #include "themer/kdmitem.h"
- 
-+#include <kglobal.h>
- #include <klocale.h>
- #include <kdebug.h>
- #include <kcombobox.h>
- #include <klineedit.h>
--#include <kpassdlg.h>
- #include <kuser.h>
- #include <kprocio.h>
- 
-@@ -40,10 +40,17 @@
- 
- #include <stdlib.h>
- 
--class KDMPasswordEdit : public KPasswordEdit {
-+class KDMPasswordEdit : public KLineEdit {
- public:
--	KDMPasswordEdit( TQWidget *parent ) : KPasswordEdit( parent, 0 ) {}
--	KDMPasswordEdit( KPasswordEdit::EchoModes echoMode, TQWidget *parent ) : KPasswordEdit( echoMode, parent, 0 ) {}
-+    KDMPasswordEdit( TQWidget *parent ) : KLineEdit( parent )
-+    {
-+        setEchoMode(TQLineEdit::Password);
-+    }
-+    KDMPasswordEdit( TQLineEdit::EchoMode echoMode, TQWidget *parent ) : KLineEdit( parent )
-+    {
-+        setEchoMode(echoMode);
-+    }
-+
- protected:
- 	virtual void contextMenuEvent( TQContextMenuEvent * ) {}
- };
-@@ -150,7 +157,7 @@
- 		if (echoMode == -1)
- 			passwdEdit = new KDMPasswordEdit( parent );
- 		else
--			passwdEdit = new KDMPasswordEdit( (KPasswordEdit::EchoModes)echoMode,
-+			passwdEdit = new KDMPasswordEdit( (TQLineEdit::EchoMode)echoMode,
- 			                                  parent );
- 		connect( passwdEdit, TQT_SIGNAL(textChanged( const TQString & )),
- 		         TQT_SLOT(slotActivity()) );
-@@ -180,8 +187,8 @@
- 	}
- 	if (func != Authenticate) {
- 		if (echoMode == -1) {
--			passwd1Edit = new KDMPasswordEdit( (KPasswordEdit::EchoModes)echoMode, parent );
--			passwd2Edit = new KDMPasswordEdit( (KPasswordEdit::EchoModes)echoMode, parent );
-+			passwd1Edit = new KDMPasswordEdit( (TQLineEdit::EchoMode)echoMode, parent );
-+			passwd2Edit = new KDMPasswordEdit( (TQLineEdit::EchoMode)echoMode, parent );
- 		} else {
- 			passwd1Edit = new KDMPasswordEdit( parent );
- 			passwd2Edit = new KDMPasswordEdit( parent );
-@@ -328,16 +335,16 @@
- 		                          KGreeterPluginHandler::IsUser );
- 		break;
- 	case 1:
--		handler->gplugReturnText( passwdEdit->password(),
-+		handler->gplugReturnText( passwdEdit->text().utf8(),
- 		                          KGreeterPluginHandler::IsPassword |
- 		                          KGreeterPluginHandler::IsSecret );
- 		break;
- 	case 2:
--		handler->gplugReturnText( passwd1Edit->password(),
-+		handler->gplugReturnText( passwd1Edit->text().utf8(),
- 		                          KGreeterPluginHandler::IsSecret );
- 		break;
- 	default: // case 3:
--		handler->gplugReturnText( passwd2Edit->password(),
-+		handler->gplugReturnText( passwd2Edit->text().utf8(),
- 		                          KGreeterPluginHandler::IsNewPassword |
- 		                          KGreeterPluginHandler::IsSecret );
- 		break;
-@@ -486,11 +493,11 @@
- 	// assert( !running );
- 	setActive2( true );
- 	if (authTok) {
--		passwd1Edit->erase();
--		passwd2Edit->erase();
-+		passwd1Edit->clear();
-+		passwd2Edit->clear();
- 		passwd1Edit->setFocus();
- 	} else {
--		passwdEdit->erase();
-+		passwdEdit->clear();
- 		if (loginEdit && loginEdit->isEnabled())
- 			passwdEdit->setEnabled( true );
- 		else {
-@@ -507,7 +514,7 @@
- KWinbindGreeter::clear()
- {
- 	// assert( !running && !passwd1Edit );
--	passwdEdit->erase();
-+	passwdEdit->clear();
- 	if (loginEdit) {
- 		domainCombo->setCurrentItem( defaultDomain );
- 		slotChangedDomain( defaultDomain );
-@@ -632,6 +639,21 @@
-                   void *ctx )
- {
- 	echoMode = getConf( ctx, "EchoMode", TQVariant( -1 ) ).toInt();
-+	switch (echoMode)
-+	{
-+		case (0):
-+		case (1):
-+			echoMode = TQLineEdit::Password;
-+			break;
-+
-+		case (2):
-+			echoMode = TQLineEdit::NoEcho;
-+			break;
-+		
-+		default:
-+			echoMode = TQLineEdit::Password;
-+	}
-+
- 	staticDomains = TQStringList::split( ':', getConf( ctx, "winbind.Domains", TQVariant( "" ) ).toString() );
- 	if (!staticDomains.contains("<local>"))
- 		staticDomains << "<local>";
---- ./kdmlib/kgreet_winbind.h.ORI	2013-05-09 18:00:46.495362083 +0200
-+++ ./kdmlib/kgreet_winbind.h	2013-05-09 18:01:22.960606033 +0200
-@@ -33,7 +33,6 @@
- 
- class KComboBox;
- class KLineEdit;
--class KPasswordEdit;
- class KSimpleConfig;
- class TQGridLayout;
- class TQLabel;
-@@ -85,7 +84,7 @@
- 	TQLabel *domainLabel, *loginLabel, *passwdLabel, *passwd1Label, *passwd2Label;
- 	KComboBox *domainCombo;
- 	KLineEdit *loginEdit;
--	KPasswordEdit *passwdEdit, *passwd1Edit, *passwd2Edit;
-+	KLineEdit *passwdEdit, *passwd1Edit, *passwd2Edit;
- 	KSimpleConfig *stsFile;
- 	TQString fixedDomain, fixedUser, curUser;
- 	TQStringList allUsers, mDomainListing;
diff --git a/redhat/tdebase/tdebase-3.5.13.2-kickoff_add_packagekit_shortcut.patch b/redhat/tdebase/tdebase-3.5.13.2-kickoff_add_packagekit_shortcut.patch
deleted file mode 100644
index 727cfeec0..000000000
--- a/redhat/tdebase/tdebase-3.5.13.2-kickoff_add_packagekit_shortcut.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- trinity-tdebase-3.5.13.2~pre100+073a32f9/CMakeLists.txt.ORI	2013-05-10 19:40:45.930287816 +0200
-+++ trinity-tdebase-3.5.13.2~pre100+073a32f9/CMakeLists.txt	2013-05-10 19:40:57.593049243 +0200
-@@ -244,6 +244,9 @@
- endif()
- 
- ##### Checks for a distribution-specific 2nd menu item, generally a shortcut to graphical package manager
-+if(EXISTS "/usr/share/applications/gpk-application.desktop")
-+  set( KICKOFF_DIST_CONFIG_SHORTCUT2 "/usr/share/applications/gpk-application.desktop" )
-+endif()
- if(EXISTS "/usr/share/applications/package-manager.desktop")
-   set( KICKOFF_DIST_CONFIG_SHORTCUT2 "/usr/share/applications/package-manager.desktop" )
- endif()
diff --git a/redhat/tdebase/tdebase-3.5.13.2-kickoff_default_favs.patch b/redhat/tdebase/tdebase-3.5.13.2-kickoff_default_favs.patch
deleted file mode 100644
index bbba25a86..000000000
--- a/redhat/tdebase/tdebase-3.5.13.2-kickoff_default_favs.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- trinity-tdebase-3.5.13.2~pre86+807a5445/kicker/kicker/ui/default-favs.ORI	2013-05-09 22:50:36.607264087 +0200
-+++ trinity-tdebase-3.5.13.2~pre86+807a5445/kicker/kicker/ui/default-favs	2013-05-09 22:50:46.935039753 +0200
-@@ -1,9 +1,7 @@
--MozillaFirefox.desktop
--kde-Kontact.desktop
--writer.desktop
--kde-amarok.desktop
--kde-digikam.desktop
- kde-Home.desktop
-+kde-konqbrowser.desktop
-+kde-Kfind.desktop
-+kde-kate.desktop
-+kde-konsole.desktop
- kde-KControl.desktop
- kde-Help.desktop
--kde-konsole.desktop
diff --git a/redhat/tdebase/tdebase-3.5.13.2-kickoff_xdg_dirs.patch b/redhat/tdebase/tdebase-3.5.13.2-kickoff_xdg_dirs.patch
deleted file mode 100644
index a3619839f..000000000
--- a/redhat/tdebase/tdebase-3.5.13.2-kickoff_xdg_dirs.patch
+++ /dev/null
@@ -1,45 +0,0 @@
---- ./kicker/kicker/ui/k_new_mnu.cpp.ori	2013-05-08 21:56:01.084691260 +0200
-+++ ./kicker/kicker/ui/k_new_mnu.cpp	2013-05-08 21:58:02.086130445 +0200
-@@ -1428,6 +1428,42 @@
-            m_systemView->insertItem( "folder_man", i18n( "My Documents" ), documentPath, documentPath, nId++, index++ );
-     }
- 
-+    if ( KStandardDirs::exists( KGlobalSettings::picturesPath() + "/" ) )
-+    {
-+        TQString picturesPath = KGlobalSettings::picturesPath();
-+        if ( picturesPath.endsWith( "/" ) )
-+            picturesPath = picturesPath.left( picturesPath.length() - 1 );
-+        if (picturesPath!=TQDir::homeDirPath())
-+           m_systemView->insertItem( "folder_image", i18n( "My Images" ), picturesPath, picturesPath, nId++, index++ );
-+   }
-+
-+    if ( KStandardDirs::exists( KGlobalSettings::musicPath() + "/" ) )
-+    {
-+        TQString musicPath = KGlobalSettings::musicPath();
-+        if ( musicPath.endsWith( "/" ) )
-+            musicPath = musicPath.left( musicPath.length() - 1 );
-+        if (musicPath!=TQDir::homeDirPath())
-+           m_systemView->insertItem( "folder_sound", i18n( "My Music" ), musicPath, musicPath, nId++, index++ );
-+    }
-+
-+    if ( KStandardDirs::exists( KGlobalSettings::videosPath() + "/" ) )
-+    {
-+        TQString videosPath = KGlobalSettings::videosPath();
-+        if ( videosPath.endsWith( "/" ) )
-+            videosPath = videosPath.left( videosPath.length() - 1 );
-+        if (videosPath!=TQDir::homeDirPath())
-+           m_systemView->insertItem( "folder_video", i18n( "My Videos" ), videosPath, videosPath, nId++, index++ );
-+    }
-+
-+    if ( KStandardDirs::exists( KGlobalSettings::downloadPath() + "/" ) )
-+    {
-+        TQString downloadPath = KGlobalSettings::downloadPath();
-+        if ( downloadPath.endsWith( "/" ) )
-+            downloadPath = downloadPath.left( downloadPath.length() - 1 );
-+        if (downloadPath!=TQDir::homeDirPath())
-+           m_systemView->insertItem( "folder_inbox", i18n( "My Downloads" ), downloadPath, downloadPath, nId++, index++ );
-+    }
-+
-     m_systemView->insertItem( "network", i18n( "Network Folders" ),
-                               "remote:/", "remote:/", nId++, index++ );
- 
diff --git a/redhat/tdebase/tdebase-3.5.13.2-select_wm_gui.patch b/redhat/tdebase/tdebase-3.5.13.2-select_wm_gui.patch
deleted file mode 100644
index 464ef3f51..000000000
--- a/redhat/tdebase/tdebase-3.5.13.2-select_wm_gui.patch
+++ /dev/null
@@ -1,639 +0,0 @@
---- ./ksmserver/startup.cpp.ori	2013-05-08 20:04:32.138717187 +0200
-+++ ./ksmserver/startup.cpp	2013-05-08 20:14:12.550305958 +0200
-@@ -115,43 +115,40 @@
-     int count =  config->readNumEntry( "count" );
-     appsToStart = count;
- 
--    TQValueList<TQStringList> wmCommands;
--    if ( !wm.isEmpty() ) {
--	for ( int i = 1; i <= count; i++ ) {
--	    TQString n = TQString::number(i);
--	    if ( wm == config->readEntry( TQString("program")+n ) ) {
--		wmCommands << config->readListEntry( TQString("restartCommand")+n );
--	    }
--	}
--    }
--    if ( wmCommands.isEmpty() )
--        wmCommands << ( TQStringList() << wm );
--
-     publishProgress( appsToStart, true );
-     connectDCOPSignal( launcher, launcher, "autoStart0Done()",
-                        "autoStart0Done()", true);
-     connectDCOPSignal( launcher, launcher, "autoStart1Done()",
-                        "autoStart1Done()", true);
-     connectDCOPSignal( launcher, launcher, "autoStart2Done()",
-                        "autoStart2Done()", true);
-     upAndRunning( "ksmserver" );
- 
--    if ( !wmCommands.isEmpty() ) {
--        // when we have a window manager, we start it first and give
--        // it some time before launching other processes. Results in a
--        // visually more appealing startup.
--        for (uint i = 0; i < wmCommands.count(); i++)
--            startApplication( wmCommands[i] );
--        if ((showFancyLogin) && (!startupNotifierIPDlg)) {
--            startupNotifierIPDlg = KSMStartupIPDlg::showStartupIP();
--        }
--        TQTimer::singleShot( 4000, this, TQT_SLOT( autoStart0() ) );
--    } else {
--        if ((showFancyLogin) && (!startupNotifierIPDlg)) {
--            startupNotifierIPDlg = KSMStartupIPDlg::showStartupIP();
-+    // find all commands to launch the wm in the session
-+    TQValueList<QStringList> wmStartCommands;
-+    if ( !wm.isEmpty() ) {
-+        for ( int i = 1; i <= count; i++ ) {
-+            TQString n = TQString::number(i);
-+            // special hack for it, both kde3(=native) and kde4 kwin have the same program,
-+            // but the command for kde4 kwin starts with the kde4 wrapper
-+            if( config->readEntry( TQString("program")+n ) == "kwin" ) {
-+                TQStringList command = config->readListEntry( TQString("restartCommand")+n );
-+                if( wmCommands.count() > 1 && wmCommands[ 0 ].endsWith( "kde4" )
-+                    && command.count() > 1 && command[ 0 ].endsWith( "kde4" )) {
-+                    wmStartCommands << command; // kde4 wanted, kde4 found
-+                } else if(!( wmCommands.count() > 1 && wmCommands[ 0 ].endsWith( "kde4" ))
-+                    && !( command.count() > 1 && command[ 0 ].endsWith( "kde4" ))) {
-+                    wmStartCommands << command; // native wanted, native found
-+                }
-+            } else if ( wm == config->readEntry( TQString("program")+n ) ) {
-+                wmStartCommands << config->readListEntry( TQString("restartCommand")+n );
-+            }
-         }
--        autoStart0();
-+								     }
-+    if( wmStartCommands.isEmpty()) { // otherwise use the configured default
-+        wmStartCommands << wmCommands;
-     }
-+    launchWM( wmStartCommands );
- }
- 
- /*!
-@@ -180,18 +177,57 @@
-                        "autoStart1Done()", true);
-     connectDCOPSignal( launcher, launcher, "autoStart2Done()",
-                        "autoStart2Done()", true);
--    startApplication( wm );
-+    launchWM( TQValueList< TQStringList >() << wmCommands );
-     if ((showFancyLogin) && (!startupNotifierIPDlg)) {
-         startupNotifierIPDlg = KSMStartupIPDlg::showStartupIP();
-     }
-+}
-+
-+void KSMServer::launchWM( const QValueList< QStringList >& wmStartCommands )
-+{
-+    assert( state == LaunchingWM );
-+
-+    // when we have a window manager, we start it first and give
-+    // it some time before launching other processes. Results in a
-+    // visually more appealing startup.
-+    wmProcess = startApplication( wmStartCommands[ 0 ] );
-+    connect( wmProcess, TQT_SIGNAL( processExited( KProcess* )), TQT_SLOT( wmProcessChange()));
-+    // there can be possibly more wm's (because of forking for multihead),
-+    // but in such case care only about the process of the first one
-+    for (unsigned int i = 1; i < wmStartCommands.count(); i++) {
-+        startApplication( wmStartCommands[i] );
-+    }
-     TQTimer::singleShot( 4000, this, TQT_SLOT( autoStart0() ) );
- }
- 
- 
- void KSMServer::clientSetProgram( KSMClient* client )
- {
--    if ( !wm.isEmpty() && client->program() == wm )
-+    if ( client->program() == wm ) {
-         autoStart0();
-+    }
-+}
-+
-+void KSMServer::wmProcessChange()
-+{
-+    if( state != LaunchingWM )
-+    { // don't care about the process when not in the wm-launching state anymore
-+        wmProcess = NULL;
-+        return;
-+    }
-+    if( !wmProcess->isRunning())
-+    { // wm failed to launch for some reason, go with kwin instead
-+        kdWarning( 1218 ) << "Window manager '" << wm << "' failed to launch" << endl;
-+        if( wm == "kwin" ) {
-+            return; // uhoh, kwin itself failed
-+	}
-+        kdDebug( 1218 ) << "Launching KWin" << endl;
-+        wm = "kwin";
-+        wmCommands = ( TQStringList() << "kwin" ); 
-+        // launch it
-+        launchWM( TQValueList< TQStringList >() << wmCommands );
-+        return;
-+    }
- }
- 
- void KSMServer::autoStart0()
---- ./ksmserver/server.h.ORI	2013-05-08 20:16:35.950487652 +0200
-+++ ./ksmserver/server.h	2013-05-08 20:19:49.069692796 +0200
-@@ -30,6 +30,8 @@
- #define SESSION_PREVIOUS_LOGOUT "saved at previous logout"
- #define SESSION_BY_USER  "saved by user"
- 
-+class KProcess;
-+
- typedef TQValueList<TQCString> QCStringList;
- class KSMListener;
- class KSMConnection;
-@@ -98,6 +100,8 @@
- 		      KApplication::ShutdownType sdtype,
- 		      KApplication::ShutdownMode sdmode );
- 
-+    void launchWM( const TQValueList< TQStringList >& wmStartCommands );
-+
- public slots:
-     void cleanUp();
- 
-@@ -120,6 +124,7 @@
-     void autoStart2();
-     void tryRestoreNext();
-     void startupSuspendTimeout();
-+    void wmProcessChange();
- 
- private:
-     void handlePendingInteractions();
-@@ -138,7 +143,7 @@
-     void startProtection();
-     void endProtection();
- 
--    void startApplication( TQStringList command,
-+    KProcess* startApplication( TQStringList command,
-         const TQString& clientMachine = TQString::null,
-         const TQString& userId = TQString::null );
-     void executeCommand( const TQStringList& command );
-@@ -149,6 +154,7 @@
-     bool isCM( const TQString& program ) const;
-     bool isNotifier( const KSMClient* client ) const;
-     bool isNotifier( const TQString& program ) const;
-+    void selectWm( const TQString& kdewm );
-     bool defaultSession() const; // empty session
-     void setupXIOErrorHandler();
- 
-@@ -231,6 +237,8 @@
-     TQString lastIdStarted;
-     
-     TQStringList excludeApps;
-+    TQStringList wmCommands;
-+    KProcess* wmProcess;
- 
-     WindowMap legacyWindows;
-     int initialClientCount;
---- ./ksmserver/CMakeLists.txt.ORI	2013-05-08 20:21:11.420074784 +0200
-+++ ./ksmserver/CMakeLists.txt	2013-05-08 20:22:16.602794164 +0200
-@@ -28,6 +28,8 @@
-   ${DBUS_TQT_LIBRARY_DIRS}
- )
- 
-+add_subdirectory( windowmanagers )
-+
- 
- ##### other data ################################
- 
---- ./ksmserver/main.cpp.ori	2013-05-08 20:22:52.841082235 +0200
-+++ ./ksmserver/main.cpp	2013-05-08 20:23:11.717711399 +0200
-@@ -203,8 +203,6 @@
-     }
- 
-     TQCString wm = args->getOption("windowmanager");
--    if ( wm.isEmpty() )
--	wm = "kwin";
- 
-     bool only_local = args->isSet("local");
- #ifndef HAVE__ICETRANSNOLISTEN
---- ./ksmserver/server.cpp.ori	2013-05-08 20:24:02.870706512 +0200
-+++ ./ksmserver/server.cpp	2013-05-08 20:35:02.808745909 +0200
-@@ -77,6 +77,8 @@
- #include <kprocess.h>
- #include <dcopclient.h>
- #include <dcopref.h>
-+#include <kdesktopfile.h>
-+#include <kshell.h>
- 
- #include "server.h"
- #include "global.h"
-@@ -98,11 +100,11 @@
- /*! Utility function to execute a command on the local machine. Used
-  * to restart applications.
-  */
--void KSMServer::startApplication( TQStringList command, const TQString& clientMachine,
-+KProcess* KSMServer::startApplication( TQStringList command, const TQString& clientMachine,
-     const TQString& userId )
- {
-     if ( command.isEmpty() )
--        return;
-+        return NULL;
-     if ( !userId.isEmpty()) {
-         struct passwd* pw = getpwuid( getuid());
-         if( pw != NULL && userId != TQString::fromLocal8Bit( pw->pw_name )) {
-@@ -116,12 +118,13 @@
-         command.prepend( clientMachine );
- 	command.prepend( xonCommand ); // "xon" by default
-     }
--    int n = command.count();
--    TQCString app = command[0].latin1();
--    TQValueList<TQCString> argList;
--    for ( int i=1; i < n; i++)
--       argList.append( TQCString(command[i].latin1()));
--    DCOPRef( launcher ).send( "exec_blind", app, DCOPArg( argList, "TQValueList<TQCString>" ) );
-+    KProcess* process = new KProcess( this );
-+    *process << command;
-+    // make it auto-delete
-+    connect( process, TQT_SIGNAL( processExited( KProcess* )), process, TQT_SLOT( deleteLater()));
-+    process->start();
-+    return process;
-+
- }
- 
- /*! Utility function to execute a command on the local machine. Used
-@@ -579,7 +582,7 @@
- #endif
- 
- KSMServer::KSMServer( const TQString& windowManager, bool _only_local )
--  : DCOPObject("ksmserver"), sessionGroup( "" ), startupNotifierIPDlg(0), shutdownNotifierIPDlg(0)
-+  : DCOPObject("ksmserver"), sessionGroup( "" ), startupNotifierIPDlg(0), shutdownNotifierIPDlg(0), wmProcess( NULL )
- {
-     the_server = this;
-     clean = false;
-@@ -595,7 +598,10 @@
-     config->setGroup("General" );
-     clientInteracting = 0;
-     xonCommand = config->readEntry( "xonCommand", "xon" );
--    
-+
-+    KGlobal::dirs()->addResourceType( "windowmanagers", "share/apps/ksmserver/windowmanagers" );
-+    selectWm( windowManager );
-+
-     connect( &knotifyTimeoutTimer, TQT_SIGNAL( timeout()), TQT_SLOT( knotifyTimeout()));
-     connect( &startupSuspendTimeoutTimer, TQT_SIGNAL( timeout()), TQT_SLOT( startupSuspendTimeout()));
-     connect( &pendingShutdown, TQT_SIGNAL( timeout()), TQT_SLOT( pendingShutdownTimeout()));
-@@ -851,15 +857,15 @@
-     config->setGroup( sessionGroup );
-     count =  0;
- 
--    if ( !wm.isEmpty() ) {
--        // put the wm first
--        for ( KSMClient* c = clients.first(); c; c = clients.next() )
--            if ( c->program() == wm ) {
--                clients.prepend( clients.take() );
--                break;
--            }
-+    // put the wm first
-+    for ( KSMClient* c = clients.first(); c; c = clients.next() ) {
-+        if ( c->program() == wm ) {
-+            clients.prepend( clients.take() );
-+            break;
-+        }
-     }
- 
-+
-     for ( KSMClient* c = clients.first(); c; c = clients.next() ) {
-         int restartHint = c->restartStyleHint();
-         if (restartHint == SmRestartNever)
-@@ -909,11 +915,7 @@
- 
- bool KSMServer::isWM( const TQString& program ) const
- {
--    // KWin relies on ksmserver's special treatment in phase1,
--    // therefore make sure it's recognized even if ksmserver
--    // was initially started with different WM, and kwin replaced
--    // it later
--    return ((program == wm) || (program == "kwin"));
-+    return program == wm;
- }
- 
- bool KSMServer::isCM( const KSMClient* client ) const
-@@ -941,3 +943,62 @@
- {
-     return sessionGroup.isEmpty();
- }
-+
-+static bool noDisplay( KDesktopFile& f )
-+{
-+    KConfigGroup gr( &f, "Desktop Entry" );
-+    if (gr.readBoolEntry("NoDisplay", false)) {
-+        return true;
-+    }
-+    if (gr.hasKey("OnlyShowIn")) {
-+        if (!gr.readListEntry("OnlyShowIn", ';').contains("KDE"))
-+            return true;
-+    }
-+    if (gr.hasKey("NotShowIn")) {
-+        if (gr.readListEntry("NotShowIn", ';').contains("KDE"))
-+            return true;
-+    }
-+    return false;
-+}
-+
-+// selection logic:
-+// - $KDEWM is set - use that
-+// - a wm is selected using the kcm - use that
-+// - if that fails, just use KWin
-+void KSMServer::selectWm( const TQString& kdewm )
-+{
-+    wm = "kwin"; // defaults
-+    wmCommands = ( TQStringList() << "kwin" ); 
-+    if( !kdewm.isEmpty())
-+    {
-+        wmCommands = ( TQStringList() << kdewm );
-+        wm = kdewm;
-+        return;
-+    }
-+    KConfigGroup config(KGlobal::config(), "General");
-+    TQString cfgwm = config.readEntry( "windowManager", "kwin" );
-+    KDesktopFile file( cfgwm + ".desktop", true, "windowmanagers" );
-+    if( noDisplay( file )) {
-+        return;
-+    }
-+    if( !file.tryExec()) {
-+        return;
-+    }
-+    file.setDesktopGroup();
-+    TQString testexec = file.readEntry( "X-KDE-WindowManagerTestExec" );
-+    if( !testexec.isEmpty())
-+    {
-+        int ret = system( TQFile::encodeName( testexec ));
-+        if( !WIFEXITED( ret ) || WEXITSTATUS( ret ) != 0 ) {
-+            return;
-+        }
-+    }
-+    TQStringList cfgWmCommands = KShell::splitArgs( file.readEntry( "Exec" ));
-+    if( cfgWmCommands.isEmpty()) {
-+        return;
-+    }
-+    TQString smname = file.readEntry( "X-KDE-WindowManagerId" );
-+    // ok
-+    wm = smname.isEmpty() ? cfgwm : smname;
-+    wmCommands = cfgWmCommands;
-+}
-Index: ksmserver/windowmanagers/CMakeLists.txt
-===================================================================
---- /dev/null
-+++ ./ksmserver/windowmanagers/CMakeLists.txt
-@@ -0,0 +1,4 @@
-+install(
-+  FILES compiz-custom.desktop compiz.desktop kwin4.desktop metacity.desktop openbox.desktop
-+  DESTINATION ${DATA_INSTALL_DIR}/ksmserver/windowmanagers
-+)
-Index: ksmserver/windowmanagers/openbox.desktop
-===================================================================
---- /dev/null
-+++ ./ksmserver/windowmanagers/openbox.desktop
-@@ -0,0 +1,5 @@
-+[Desktop Entry]
-+Name=Openbox
-+Exec=openbox
-+TryExec=openbox
-+
-Index: ksmserver/windowmanagers/compiz.desktop
-===================================================================
---- /dev/null
-+++ ./ksmserver/windowmanagers/compiz.desktop
-@@ -0,0 +1,4 @@
-+[Desktop Entry]
-+Name=Compiz
-+Exec=compiz ccp
-+TryExec=compiz
-Index: ksmserver/windowmanagers/compiz-custom.desktop
-===================================================================
---- /dev/null
-+++ ./ksmserver/windowmanagers/compiz-custom.desktop
-@@ -0,0 +1,5 @@
-+[Desktop Entry]
-+Name=Compiz custom (create wrapper script 'compiz-kde-launcher' to launch it)
-+Exec=compiz-kde-launcher
-+TryExec=compiz
-+X-KDE-WindowManagerId=compiz
-Index: ksmserver/windowmanagers/kwin4.desktop
-===================================================================
---- /dev/null
-+++ ./ksmserver/windowmanagers/kwin4.desktop
-@@ -0,0 +1,6 @@
-+[Desktop Entry]
-+Name=KWin (KDE4)
-+Exec=kde4 /usr/bin/kwin
-+TryExec=/usr/bin/kwin
-+X-KDE-WindowManagerId=kwin
-+
-Index: ksmserver/windowmanagers/metacity.desktop
-===================================================================
---- /dev/null
-+++ ./ksmserver/windowmanagers/metacity.desktop
-@@ -0,0 +1,4 @@
-+[Desktop Entry]
-+Name=Metacity (GNOME)
-+Exec=metacity
-+TryExec=metacity
---- ./kcontrol/smserver/smserverconfigdlg.ui.ori	2013-05-08 20:42:59.226232919 +0200
-+++ ./kcontrol/smserver/smserverconfigdlg.ui	2013-05-08 20:45:53.648749758 +0200
-@@ -1,4 +1,4 @@
--<!DOCTYPE UI><UI version="3.2" stdsetdef="1">
-+<!DOCTYPE UI><UI version="3.3" stdsetdef="1">
- <class>SMServerConfigDlg</class>
- <widget class="TQWidget">
-     <property name="name">
-@@ -8,8 +8,8 @@
-         <rect>
-             <x>0</x>
-             <y>0</y>
--            <width>325</width>
--            <height>366</height>
-+            <width>334</width>
-+            <height>476</height>
-         </rect>
-     </property>
-     <property name="caption">
-@@ -173,6 +173,24 @@
-                 </widget>
-             </vbox>
-         </widget>
-+        <widget class="TQGroupBox">
-+            <property name="name">
-+                <cstring>windowManagerGroup</cstring>
-+            </property>
-+            <property name="title">
-+                <string>Window Manager</string>
-+            </property>
-+            <hbox>
-+                <property name="name">
-+                    <cstring>unnamed</cstring>
-+                </property>
-+                <widget class="TQComboBox">
-+                    <property name="name">
-+                        <cstring>windowManagerCombo</cstring>
-+                    </property>
-+                </widget>
-+            </hbox>
-+        </widget>
-         <widget class="TQButtonGroup">
-             <property name="name">
-                 <cstring>advancedGroup</cstring>
-@@ -279,6 +297,12 @@
-         <receiver>SMServerConfigDlg</receiver>
-         <slot>configChanged()</slot>
-     </connection>
-+    <connection>
-+        <sender>windowManagerCombo</sender>
-+        <signal>activated(int)</signal>
-+        <receiver>SMServerConfigDlg</receiver>
-+        <slot>configChanged()</slot>
-+    </connection>
- </connections>
- <includes>
-     <include location="global" impldecl="in implementation">kdialog.h</include>
---- ./kcontrol/smserver/kcmsmserver.cpp.ORI	2013-05-08 20:47:16.855088794 +0200
-+++ ./kcontrol/smserver/kcmsmserver.cpp	2013-05-08 20:57:27.009783724 +0200
-@@ -22,6 +22,8 @@
- #include <tqcheckbox.h>
- #include <tqlayout.h>
- #include <tqradiobutton.h>
-+#include <tqcombobox.h>
-+#include <tqfile.h>
- 
- #include <dcopclient.h>
- 
-@@ -29,6 +31,12 @@
- #include <kconfig.h>
- #include <kgenericfactory.h>
- #include <klineedit.h>
-+#include <kstandarddirs.h>
-+#include <tqregexp.h>
-+#include <kdesktopfile.h>
-+#include <kdebug.h>
-+#include <kprocess.h>
-+#include <kmessagebox.h>
- 
- #include "kcmsmserver.h"
- #include "smserverconfigimpl.h"
-@@ -52,6 +60,7 @@
- 
-     dialog->show();
-     topLayout->add(dialog);
-+    KGlobal::dirs()->addResourceType( "windowmanagers", "share/apps/ksmserver/windowmanagers" );
-     load();
- 
- }
-@@ -90,6 +99,7 @@
-     dialog->logoutRadio->setChecked(true);
-     break;
-   }
-+  loadWMs(c->readEntry("windowManager", "kwin"));
-   dialog->excludeLineedit->setText( c->readEntry("excludeApps"));
- 
-   c->setGroup("Logout");
-@@ -121,6 +131,7 @@
-                    dialog->rebootRadio->isChecked() ?
-                      int(KApplication::ShutdownTypeReboot) :
-                      int(KApplication::ShutdownTypeNone));
-+  c->writeEntry("windowManager", currentWM());
-   c->writeEntry("excludeApps", dialog->excludeLineedit->text());
-   c->setGroup("Logout");
-   c->writeEntry( "showLogoutStatusDlg", dialog->showLogoutStatusDialog->isChecked());
-@@ -131,6 +142,12 @@
-   // update the k menu if necessary
-   TQByteArray data;
-   kapp->dcopClient()->send( "kicker", "kicker", "configure()", data );
-+  if( oldwm != currentWM())
-+  { // TODO switch it already in the session instead and tell ksmserver
-+    KMessageBox::information( this,
-+        i18n( "The new window manager will be used when TDE is started the next time." ),
-+        i18n( "Window manager change" ), "windowmanagerchange" );
-+  }
- }
- 
- void SMServerConfig::defaults()
-@@ -138,5 +155,79 @@
- 	load( true );
- }
- 
-+static bool noDisplay( KDesktopFile& f )
-+{
-+    KConfigGroup gr( &f, "Desktop Entry" );
-+    if (gr.readBoolEntry("NoDisplay", false)) {
-+        return true;
-+    }
-+    if (gr.hasKey("OnlyShowIn")) {
-+        if (!gr.readListEntry("OnlyShowIn", ';').contains("KDE"))
-+            return true;
-+    }
-+    if (gr.hasKey("NotShowIn")) {
-+        if (gr.readListEntry("NotShowIn", ';').contains("KDE"))
-+            return true;
-+    }
-+    return false;
-+}
-+
-+void SMServerConfig::loadWMs( const TQString& current )
-+{
-+  TQString kwinname = i18n( "KWin (KDE default)" );
-+  dialog->windowManagerCombo->insertItem( kwinname );
-+  dialog->windowManagerCombo->setCurrentItem( 0 );
-+  wms[ kwinname ] = "kwin";
-+  oldwm = "kwin";
-+  TQStringList list = KGlobal::dirs()->findAllResources( "windowmanagers", TQString(), false, true );
-+  TQRegExp reg( ".*/([^/\\.]*)\\.[^/\\.]*" );
-+  for( TQStringList::ConstIterator it = list.begin();
-+       it != list.end();
-+       ++it )
-+  {
-+    TQString wmfile = *it;
-+    KDesktopFile file( wmfile );
-+    if( noDisplay( file )) {
-+        continue;
-+    }
-+    if( !file.tryExec()) {
-+        continue;
-+    }
-+    file.setDesktopGroup();
-+    TQString testexec = file.readEntry( "X-KDE-WindowManagerTestExec" );
-+    if( !testexec.isEmpty())
-+    {
-+        int ret = system( TQFile::encodeName( testexec ));
-+        if( !WIFEXITED( ret ) || WEXITSTATUS( ret ) != 0 ) {
-+            continue;
-+        }
-+    }
-+    TQString name = file.readName();
-+    if( name.isEmpty()) {
-+        continue;
-+    }
-+    if( !reg.exactMatch( wmfile )) {
-+        continue;
-+    }
-+    TQString wm = reg.cap( 1 );
-+    if( wms.values().contains( wm )) {
-+        continue;
-+    }
-+    wms[ name ] = wm;
-+    dialog->windowManagerCombo->insertItem( name );
-+    if( wms[ name ] == current ) // make it selected
-+    {
-+        dialog->windowManagerCombo->setCurrentItem( dialog->windowManagerCombo->count() - 1 );
-+        oldwm = wm;
-+    }
-+  }
-+}
-+
-+TQString SMServerConfig::currentWM() const
-+{
-+  return wms[ dialog->windowManagerCombo->currentText() ];
-+}
-+
-+
- #include "kcmsmserver.moc"
- 
---- ./kcontrol/smserver/kcmsmserver.h.ORI	2013-05-08 20:58:45.880171397 +0200
-+++ ./kcontrol/smserver/kcmsmserver.h	2013-05-08 20:59:21.030453176 +0200
-@@ -40,6 +40,10 @@
- 
- private:
-   SMServerConfigImpl* dialog;
-+  void loadWMs( const TQString& current );
-+  TQString currentWM() const;
-+  TQMap< TQString, TQString > wms; // i18n text -> internal name
-+  TQString oldwm; // the original value
- 
- };
- 
diff --git a/redhat/tdebase/tdebase-3.5.13.2-suspend_unmount.patch b/redhat/tdebase/tdebase-3.5.13.2-suspend_unmount.patch
deleted file mode 100644
index 5b8264eb0..000000000
--- a/redhat/tdebase/tdebase-3.5.13.2-suspend_unmount.patch
+++ /dev/null
@@ -1,152 +0,0 @@
---- ./kioslave/media/libmediacommon/medium.cpp.ori	2013-05-08 22:57:09.317384423 +0200
-+++ ./kioslave/media/libmediacommon/medium.cpp	2013-05-08 22:57:36.730837358 +0200
-@@ -44,6 +44,7 @@
- 	loadUserLabel();
- 
- 	m_halmounted = false;
-+	m_isHotplug = false;
- }
- 
- Medium::Medium()
-@@ -65,6 +66,7 @@
- 	m_properties+= TQString::null; /* CLEAR_DEVICE_UDI */
- 	
- 	m_halmounted = false;
-+	m_isHotplug = false;
- }
- 
- const Medium Medium::create(const TQStringList &properties)
---- ./kioslave/media/libmediacommon/medium.h.ORI	2013-05-08 22:59:10.772959829 +0200
-+++ ./kioslave/media/libmediacommon/medium.h	2013-05-08 22:59:56.602044404 +0200
-@@ -92,6 +92,9 @@
- 	void setHalMounted(bool flag) const { m_halmounted = flag; }
- 	bool halMounted() const { return m_halmounted; }
- 
-+	void setIsHotplug( bool state ) { m_isHotplug = state; }
-+	bool isHotplug() const { return m_isHotplug; }
-+
- //private:
- 	Medium();
- 
-@@ -100,6 +103,8 @@
- 
- 	TQStringList m_properties;
- 	mutable bool m_halmounted;
-+
-+	bool m_isHotplug;
- 	
- friend class TQValueListNode<const Medium>;
- };
---- ./kioslave/media/mediamanager/mediamanager.cpp.ori	2013-05-08 23:00:39.673183801 +0200
-+++ ./kioslave/media/mediamanager/mediamanager.cpp	2013-05-08 23:04:47.639224260 +0200
-@@ -354,6 +354,57 @@
-     emit mediumChanged(name);
- }
- 
-+TQString MediaManager::unmountAllSuspend()
-+{
-+    TQPtrList<Medium> list = m_mediaList.list();
-+
-+    TQPtrList<Medium>::const_iterator it = list.begin();
-+    TQPtrList<Medium>::const_iterator end = list.end();
-+
-+    TQString result;
-+
-+    for (; it!=end; ++it)
-+    {
-+        if ( (*it)->isMounted() && (*it)->isHotplug() )
-+        {
-+            TQString tmp = unmount( (*it)->id() );
-+            if ( !tmp.isEmpty() ) { // umount failed
-+                result = tmp;
-+            } else {
-+                m_suspendResumeMountList.append( (*it)->id() );
-+            }
-+        }
-+    }
-+
-+    // return last error
-+    return result;
-+}
-+
-+TQString MediaManager::remountAllResume()
-+{
-+    TQString result;
-+
-+    for (TQStringList::const_iterator it = m_suspendResumeMountList.begin();
-+         it != m_suspendResumeMountList.end();
-+         ++it)
-+    {
-+        const Medium *m = m_mediaList.findById(*it);
-+
-+        if ( m && m->needMounting() )
-+        {
-+            TQString tmp = mount( *it );
-+            if ( !tmp.isEmpty() ) { // mount failed
-+                result = tmp;
-+            }
-+        }
-+    }
-+
-+    m_suspendResumeMountList.clear();
-+
-+    // return last error
-+    return result;
-+}
-+
- 
- extern "C" {
-     KDE_EXPORT KDEDModule *create_mediamanager(const TQCString &obj)
---- ./kioslave/media/mediamanager/mediamanager.h.ORI	2013-05-08 23:05:36.250251036 +0200
-+++ ./kioslave/media/mediamanager/mediamanager.h	2013-05-08 23:07:27.650019601 +0200
-@@ -60,6 +60,20 @@
- 	bool removableUnplug(const TQString &devNode);
- 	bool removableCamera(const TQString &devNode);
- 
-+       /**
-+         * Unmount manually all partitions when going to suspend
-+         *
-+         * @return last error if any
-+         */
-+        TQString unmountAllSuspend();
-+
-+        /**
-+         * Remount previously unmounted partitions in unmountAllSuspend()
-+         *
-+         * @return last error if any
-+         */
-+        TQString remountAllResume();
-+
- k_dcop_signals:
- 	void mediumAdded(const TQString &name, bool allowNotification);
- 	void mediumRemoved(const TQString &name, bool allowNotification);
-@@ -87,6 +101,8 @@
- 	HALBackend *m_halbackend;
- 	MediaDirNotify m_dirNotify;
- 	FstabBackend *m_fstabbackend;
-+	TQStringList m_suspendResumeMountList;
-+
- };
- 
- #endif
---- ./kioslave/media/mediamanager/halbackend.cpp.ori	2013-05-08 23:08:12.196126863 +0200
-+++ ./kioslave/media/mediamanager/halbackend.cpp	2013-05-08 23:08:51.096347073 +0200
-@@ -541,6 +541,7 @@
-             libhal_volume_is_mounted(halVolume) );		/* Mounted ? */
-     }
- 
-+    medium->setIsHotplug( libhal_drive_is_hotpluggable(halDrive) );
- 
-     char* name = libhal_volume_policy_compute_display_name(halDrive, halVolume, m_halStoragePolicy);
-     TQString volume_name = TQString::fromUtf8(name);
---- ./kioslave/media/mediamanager/halbackend.h.ORI	2013-05-08 23:09:35.761451488 +0200
-+++ ./kioslave/media/mediamanager/halbackend.h	2013-05-08 23:10:21.608531952 +0200
-@@ -89,6 +89,8 @@
- 	TQString decrypt(const TQString &id, const TQString &password);
- 	TQString undecrypt(const TQString &id);
- 
-+	static bool isHotplug( const TQString & id );
-+
- private:
- 	/**
- 	* Append a device in the media list. This function will check if the device
diff --git a/redhat/tdebase/tdebase-3.5.13.2-vibrate_dialog.patch b/redhat/tdebase/tdebase-3.5.13.2-vibrate_dialog.patch
deleted file mode 100644
index 346eda1f5..000000000
--- a/redhat/tdebase/tdebase-3.5.13.2-vibrate_dialog.patch
+++ /dev/null
@@ -1,186 +0,0 @@
---- trinity-tdebase-3.5.13.2~pre102+43d29f86/kcontrol/screensaver/scrnsave.h.ORI	2013-05-14 22:12:18.159235590 +0200
-+++ trinity-tdebase-3.5.13.2~pre102+43d29f86/kcontrol/screensaver/scrnsave.h	2013-05-14 22:12:56.657422259 +0200
-@@ -58,6 +58,7 @@
-     void slotLock( bool );
-     void slotDelaySaverStart( bool );
-     void slotUseTSAK( bool );
-+    void slotVibrateUnlock( bool );
-     void slotUseUnmanagedLockWindows( bool );
-     void slotHideActiveWindowsFromSaver( bool );
-     void processLockouts();
-@@ -101,6 +102,7 @@
-     TQGroupBox   *mSettingsGroup;
-     TQCheckBox   *mDelaySaverStartCheckBox;
-     TQCheckBox   *mUseTSAKCheckBox;
-+    TQCheckBox   *mVibrateUnlockCheckBox;
-     TQCheckBox   *mUseUnmanagedLockWindowsCheckBox;
-     TQCheckBox   *mHideActiveWindowsFromSaverCheckBox;
- 
-@@ -119,6 +121,7 @@
-     bool        mImmutable;
-     bool        mDelaySaverStart;
-     bool        mUseTSAK;
-+    bool        mVibrateUnlock;
-     bool        mUseUnmanagedLockWindows;
-     bool        mHideActiveWindowsFromSaver;
- 
---- trinity-tdebase-3.5.13.2~pre102+43d29f86/kcontrol/screensaver/scrnsave.cpp.vibrate_dialog	2013-04-26 22:15:23.000000000 +0200
-+++ trinity-tdebase-3.5.13.2~pre102+43d29f86/kcontrol/screensaver/scrnsave.cpp	2013-05-14 22:24:37.354375502 +0200
-@@ -270,6 +270,13 @@
-     settingsGroupLayout->addWidget(mHideActiveWindowsFromSaverCheckBox, 3, 1);
-     TQWhatsThis::add( mHideActiveWindowsFromSaverCheckBox, i18n("Hide all active windows from the screen saver and use the desktop background as the screen saver input.") );
- 
-+    mVibrateUnlockCheckBox = new TQCheckBox( i18n("&Vibrate unlock dialog box on failure"), mSettingsGroup );
-+    mVibrateUnlockCheckBox->setEnabled( true );
-+    mVibrateUnlockCheckBox->setChecked( mVibrateUnlock );
-+    connect( mVibrateUnlockCheckBox, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotVibrateUnlock( bool ) ) );
-+    settingsGroupLayout->addWidget(mVibrateUnlockCheckBox, 4, 1);
-+    TQWhatsThis::add( mVibrateUnlockCheckBox, i18n("Makes the unlock dialog box vibrate when entering an incorrect password.") );
-+
-     // right column
-     TQBoxLayout* rightColumnLayout = new TQVBoxLayout(topLayout, KDialog::spacingHint());
- 
-@@ -429,6 +436,7 @@
-     mLock = config->readBoolEntry("Lock", false);
-     mDelaySaverStart = config->readBoolEntry("DelaySaverStart", true);
-     mUseTSAK = config->readBoolEntry("UseTDESAK", true);
-+    mVibrateUnlock = config->readBoolEntry("VibrateUnlock", true);
-     mUseUnmanagedLockWindows = config->readBoolEntry("UseUnmanagedLockWindows", false);
-     mHideActiveWindowsFromSaver = config->readBoolEntry("HideActiveWindowsFromSaver", true);
-     mSaver = config->readEntry("Saver");
-@@ -481,6 +489,7 @@
-     config->writeEntry("Lock", mLock);
-     config->writeEntry("DelaySaverStart", mDelaySaverStart);
-     config->writeEntry("UseTDESAK", mUseTSAK);
-+    config->writeEntry("VibrateUnlock", mVibrateUnlock);
-     config->writeEntry("UseUnmanagedLockWindows", mUseUnmanagedLockWindows);
-     config->writeEntry("HideActiveWindowsFromSaver", mHideActiveWindowsFromSaver);
- 
-@@ -688,10 +697,14 @@
-         mUseTSAKCheckBox->setChecked( false );
-     }
-     if (!mUseUnmanagedLockWindows) {
-+        mVibrateUnlockCheckBox->setEnabled( true );
-+        mVibrateUnlockCheckBox->setChecked( mVibrateUnlock );
-         mHideActiveWindowsFromSaverCheckBox->setEnabled( true );
-         mHideActiveWindowsFromSaverCheckBox->setChecked( mHideActiveWindowsFromSaver );
-     }
-     else {
-+        mVibrateUnlockCheckBox->setEnabled( false );
-+        mVibrateUnlockCheckBox->setChecked( false );
-         mHideActiveWindowsFromSaverCheckBox->setEnabled( false );
-         mHideActiveWindowsFromSaverCheckBox->setChecked( false );
-     }
-@@ -936,6 +949,16 @@
-     processLockouts();
-     mChanged = true;
-     emit changed(true);
-+}
-+
-+//---------------------------------------------------------------------------
-+//
-+void KScreenSaver::slotVibrateUnlock( bool u )
-+{
-+    if (mVibrateUnlockCheckBox->isEnabled()) mVibrateUnlock = u;
-+    processLockouts();
-+    mChanged = true;
-+    emit changed(true);
- }
- 
- //---------------------------------------------------------------------------
---- trinity-tdebase-3.5.13.2~pre102+43d29f86/kdesktop/lock/lockdlg.h.vibrate_dialog	2013-01-09 02:12:13.000000000 +0100
-+++ trinity-tdebase-3.5.13.2~pre102+43d29f86/kdesktop/lock/lockdlg.h	2013-05-14 22:42:50.562878532 +0200
-@@ -60,6 +60,7 @@
-     void slotOK();
-     void layoutClicked();
-     void slotActivity();
-+    void moveTimerDone();
- 
- protected slots:
-     virtual void reject();
-@@ -79,6 +80,8 @@
-     void handleVerify();
-     void reapVerify();
-     void cantCheck();
-+    void movedialog( int _move );
-+    void badPasswordLogin();
-     GreeterPluginHandle *mPlugin;
-     KGreeterPlugin *greet;
-     TQFrame      *frame;
-@@ -95,6 +98,8 @@
-     int         sPid, sFd;
-     TQListView   *lv;
-     TQDateTime   m_lockStartDT;
-+    bool        waitMoveDialog;
-+    bool	VibrateUnlock;
- };
- 
- #endif
---- trinity-tdebase-3.5.13.2~pre102+43d29f86/kdesktop/lock/lockdlg.cc.vibrate_dialog	2013-01-09 02:12:13.000000000 +0100
-+++ trinity-tdebase-3.5.13.2~pre102+43d29f86/kdesktop/lock/lockdlg.cc	2013-05-14 22:42:12.809621715 +0200
-@@ -55,6 +55,7 @@
- #include <X11/keysym.h>
- #include <X11/Xatom.h>
- #include <fixx11h.h>
-+#include <kapplication.h>
- 
- #ifndef AF_LOCAL
- # define AF_LOCAL	AF_UNIX
-@@ -246,6 +247,11 @@
-         mLayoutButton->hide(); // no kxkb running
-     }
-     capsLocked();
-+
-+    KConfig* config = new KConfig("kdesktoprc");
-+    config->setGroup("ScreenSaver");
-+    VibrateUnlock = config->readBoolEntry("VibrateUnlock", true);
-+    delete config;
- }
- 
- PasswordDlg::~PasswordDlg()
-@@ -302,6 +308,37 @@
-     }
- }
- 
-+void PasswordDlg::movedialog( int _move )
-+{
-+     waitMoveDialog = true;
-+     this->move(pos().x()+_move, pos().y());
-+     TQTimer::singleShot( 50, this, TQT_SLOT(moveTimerDone()) );
-+     while (waitMoveDialog) {
-+          kapp->processEvents();
-+     }
-+}
-+
-+void PasswordDlg::moveTimerDone()
-+{
-+     waitMoveDialog = false;
-+}
-+
-+void PasswordDlg::badPasswordLogin()
-+{
-+     if ( VibrateUnlock && mUnlockingFailed )
-+     {
-+          for ( int i = 0 ; i<2 ; i++)
-+          {
-+               movedialog( 10 );
-+               movedialog( -20 );
-+               movedialog( 20 );
-+               movedialog( -20 );
-+               movedialog( 20 );
-+               movedialog( -10 );
-+          }
-+     }
-+}
-+
- //---------------------------------------------------------------------------
- //
- // Handle timer events.
-@@ -437,6 +474,7 @@
-             ok->setEnabled(false);
-             cancel->setEnabled(false);
-             mNewSessButton->setEnabled( false );
-+            badPasswordLogin();
-             return;
-         case AuthAbort:
-             return;
diff --git a/redhat/tdebase/tdebase-3.5.13.2.spec b/redhat/tdebase/tdebase-3.5.13.2.spec
index 7b6538887..36302b99c 100644
--- a/redhat/tdebase/tdebase-3.5.13.2.spec
+++ b/redhat/tdebase/tdebase-3.5.13.2.spec
@@ -90,56 +90,6 @@ Source8:	tdm%{?dist}.pp
 Source9:	mgabutton.svg
 %endif
 
-# Patch party !
-
-# Permanent patches, all TDE versions
-## [tdebase/kdesktop] Modifies 'open terminal here' on desktop [RHEL/Fedora]
-Patch1:		kdebase-3.5.12-desktop-openterminalhere.patch
-## [tdebase] Sets default Start Icon in 'kickerrc' [RHEL/Fedora]
-Patch2:		kdebase-3.5.13.1-startkde_icon.patch
-## [tdebase/kcontrol] Adds FR translation for KCM ICC
-Patch3:		tdebase-3.5.13.2-displayconfig_translation.patch
-## [tdebase/kicker] Adds default entries for Kickoff menu
-Patch4:		tdebase-3.5.13.2-kickoff_default_favs.patch
-## [tdebase] Changes konsole default word separator
-Patch5:		tdebase-14.0.0-konsole_wordseps.patch
-## [tdebase] Fix '%' caracter in hal volumes
-Patch6:		tdebase-3.5.13.2-fix_halbackend_slash.patch
-
-# Permanent patches, this TDE version only
-## [tdebase/kdm] Fix PID file is 'tdm.pid' instead of 'kdm.pid' (needed for openSUSE)
-Patch11:	kdebase-3.5.13.1-fix_tdm_pid_file.patch
-## [kdebase/kdesu] Remove 'ignore' button on 'kdesu' dialog box [RHEL/Fedora]
-Patch12:	tdebase-3.5.13.2-kdesu-noignorebutton.patch
-## [kdebase/applnk] Fix XDG menu to avoid KDE4 conflict
-Patch13:	tdebase-3.5.13.2-fix_xdg_menu.patch
-## [kdebase/tdm] Fix USER_PATH variable in TDM
-Patch14:	tdebase-3.5.13.2-fix_tdm_user_path.patch
-## [kdebase/Ksmserver] orward port KDE SVN r803253 to fix potential security hole [Commit #c383da9d]
-Patch15:	tdebase-3.5.13.2-fix_ice_security_hole.patch
-
-# Patches from Mandriva
-Patch101:	tdebase-3.5.13.2-vibrate_dialog.patch
-Patch102:	tdebase-3.5.13.2-kcontrol_menu_entry.patch
-Patch103:	tdebase-3.5.13.2-kdesktop_crossfade.patch
-Patch104:	tdebase-3.5.13.2-kickoff_xdg_dirs.patch
-Patch105:	tdebase-3.5.13.2-suspend_unmount.patch
-Patch106:	tdebase-3.5.13.2-bookmark_global_copy.patch
-
-### Specific patches for RHEL4 (should not go upstream)
-
-## [tdebase] Fix build on RHEL4, detect old libraries without pkg file
-Patch301:	kdebase-3.5.13-fix_lib_detection.patch
-## [tdebase] Do not build against DBUS-TQT, only DBUS and DBUS-QT
-Patch302:	kdebase-3.5.13.2-build_without_dbustqt.patch
-## [tdebase] Do not build against ConsoleKit
-Patch303:	kdebase-3.5.13-build_without_consolekit.patch
-## [tdebase] Add WITH_COMPOSITE option to CMakeLists.txt
-Patch304:	kdebase-3.5.13.2-add_disable_composite_option.patch
-## [tdebase] Downgrade halbackend to support Hal 0.4
-Patch305:	kdebase-3.5.13-support_hal_04.patch
-## [tdebase] Other(s) FTBFS ...
-Patch306:	kdebase-3.5.13-fix_rhel4_compilation.patch
 
 ### Distribution-specific settings ###
 
@@ -3366,7 +3316,7 @@ Windows and Samba shares.
 
 ##########
 
-%if 0%{?suse_version} || 0%{?pclinuxos}
+%if 0%{?pclinuxos}
 %debug_package
 %endif
 
@@ -3374,35 +3324,6 @@ Windows and Samba shares.
 
 %prep
 %setup -q -n %{name}-%{version}%{?preversion:~%{preversion}}
-%patch1 -p1 -b .openterminalhere
-%patch2 -p1 -b .startmenuicon
-%patch3 -p1 -b .displayconfigtranslation
-%patch4 -p1 -b .kickoffdefaultsfav
-%patch5 -p1 -b .konsolewordseps
-%patch6 -p1 -b .halbackend
-
-%patch11 -p1 -b .tdmpid
-%patch12 -p1 -b .kdesunoignorebutton
-%patch13 -p1 -b .xdgmenu
-%patch14 -p1 -b .tdmuserpath
-%patch15 -p1 -b .iceauth
-
-%patch101 -p1 -b .vibrate_dialog
-%patch102 -p1 -b .kcontrol_menu_entry
-%patch103 -p1 -b .kdesktop_crossfade
-%patch104 -p1 -b .kickoff_xdg
-%patch105 -p1 -b .suspend_unmount
-%patch106 -p1 -b .bookmark_global_copy
-
-
-%if 0%{?rhel} == 4
-%patch301 -p1 -b .libdetect
-%patch302 -p1 -b .dbustqt
-%patch303 -p1 -b .consolekit
-%patch304 -p1 -b .composite
-#patch305 -p1 -b .hal04
-%patch306 -p1 -b .rhel4
-%endif
 
 # Applies an optional distro-specific graphical theme
 %if "%{?tde_bg}" != ""
diff --git a/redhat/tdebase/tiles-fixed-png-images.tar.gz b/redhat/tdebase/tiles-fixed-png-images.tar.gz
deleted file mode 100644
index 67b5226d6..000000000
Binary files a/redhat/tdebase/tiles-fixed-png-images.tar.gz and /dev/null differ
-- 
cgit v1.2.1


From dee649254a7acd6603c905d43744b499ac875b6e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Andriot?= <albator78@libertysurf.fr>
Date: Sun, 5 Oct 2014 18:52:49 +0200
Subject: RPM packaging: update tdebase

---
 redhat/tdebase/tdebase-14.0.0.spec | 243 +++++++++++++++++++++----------------
 redhat/tdebase/tdm.fc18.pp         | Bin 0 -> 936 bytes
 redhat/tdebase/tdm.fc18.te         |  11 ++
 3 files changed, 151 insertions(+), 103 deletions(-)
 create mode 100644 redhat/tdebase/tdm.fc18.pp
 create mode 100644 redhat/tdebase/tdm.fc18.te

diff --git a/redhat/tdebase/tdebase-14.0.0.spec b/redhat/tdebase/tdebase-14.0.0.spec
index c242ff438..6f444a8c6 100644
--- a/redhat/tdebase/tdebase-14.0.0.spec
+++ b/redhat/tdebase/tdebase-14.0.0.spec
@@ -1,46 +1,57 @@
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?tde_prefix}" != "/usr"
-%define _variant .opt
-%endif
-
+#
+# spec file for package tdebase
+#
+# Copyright (c) 2014 François Andriot <francois.andriot@free.fr>
+#
+# All modifications and additions to the file contributed by third parties
+# remain the property of their copyright owners, unless otherwise agreed
+# upon. The license for this file, and modifications and additions to the
+# file, is the same license as for the pristine package itself (unless the
+# license for the pristine package is not an Open Source License, in which
+# case the license is the MIT License). An "Open Source License" is a
+# license that conforms to the Open Source Definition (Version 1.9)
+# published by the Open Source Initiative.
+#
+# Please submit bugfixes or comments via http:/www.trinitydesktop.org/
+#
+
+# TDE variables
 %define tde_version 14.0.0
-
-# TDE specific building variables
+%define tde_prefix /opt/trinity
 %define tde_bindir %{tde_prefix}/bin
 %define tde_datadir %{tde_prefix}/share
 %define tde_docdir %{tde_datadir}/doc
 %define tde_includedir %{tde_prefix}/include
 %define tde_libdir %{tde_prefix}/%{_lib}
-
 %define tde_tdeappdir %{tde_datadir}/applications/tde
 %define tde_tdedocdir %{tde_docdir}/tde
 %define tde_tdeincludedir %{tde_includedir}/tde
 %define tde_tdelibdir %{tde_libdir}/trinity
 
+# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
+%if "%{?tde_prefix}" != "/usr"
+%define _variant .opt
+%endif
+
 
 Name:		trinity-tdebase
 Version:	%{tde_version}
 Release:	%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
-License:	GPL
 Summary:	Trinity Base Programs
 Group:		User Interface/Desktops
+URL:		http://www.trinitydesktop.org/
 
-Obsoletes:	trinity-kdebase < %{version}-%{release}
-Provides:	trinity-kdebase = %{version}-%{release}
-Obsoletes:	trinity-kdebase-libs < %{version}-%{release}
-Provides:	trinity-kdebase-libs = %{version}-%{release}
-Obsoletes:	trinity-kdebase-extras < %{version}-%{release}
-Provides:	trinity-kdebase-extras = %{version}-%{release}
-Obsoletes:	tdebase < %{version}-%{release}
-Provides:	tdebase = %{version}-%{release}
-
+%if 0%{?suse_version}
+License:	GPL-2.0+
+%else
+License:	GPLv2+
+%endif
 
-Vendor:		Trinity Project
-Packager:	Francois Andriot <francois.andriot@free.fr>
-URL:		http://www.trinitydesktop.org/
+#Vendor:			Trinity Desktop
+#Packager:		Francois Andriot <francois.andriot@free.fr>
 
-Prefix:		%{tde_prefix}
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Prefix:			%{tde_prefix}
+BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0:	%{name}-%{version}%{?preversion:~%{preversion}}.tar.gz
 
@@ -81,28 +92,14 @@ Source8:	tdm%{?dist}.pp
 Source9:	mgabutton.svg
 %endif
 
-# Patch party !
-
-# Permanent patches, all TDE versions
-## [tdebase/kdesktop] Modifies 'open terminal here' on desktop [RHEL/Fedora]
-Patch101:		tdebase-14.0.0-open_terminal_here.patch
-## [tdebase] Sets default Start Icon in 'kickerrc' [RHEL/Fedora]
-Patch102:		tdebase-14.0.0-default_menu_icon.patch
-## [tdebase] Changes konsole default word separator
-Patch105:		tdebase-14.0.0-konsole_wordseps.patch
-
-# Permanent patches, this TDE version only
-
-# Patches from Mandriva
-Patch201:	tdebase-14.0.0-vibrate_dialog.patch
-Patch205:	tdebase-14.0.0-suspend_unmount.patch
-
-# Experimental patches
-Patch301:	tdebase-14.0.0-kcm_xcursor_applytheme.patch
-## [tdebase] Fix i18n description loading in 'twin_update_default_rules'
-Patch302:	tdebase-14.0.0-fix_twin_rules_translation.patch
-
-Patch303:	tdebase-14.0.0-tdehardwarebackend_fix_iocharset.patch
+Obsoletes:	trinity-kdebase < %{version}-%{release}
+Provides:	trinity-kdebase = %{version}-%{release}
+Obsoletes:	trinity-kdebase-libs < %{version}-%{release}
+Provides:	trinity-kdebase-libs = %{version}-%{release}
+Obsoletes:	trinity-kdebase-extras < %{version}-%{release}
+Provides:	trinity-kdebase-extras = %{version}-%{release}
+Obsoletes:	tdebase < %{version}-%{release}
+Provides:	tdebase = %{version}-%{release}
 
 
 ### Distribution-specific settings ###
@@ -321,19 +318,31 @@ Requires:	opensuse-manuals_en
 %define tde_aboutpage /usr/share/doc/manual/opensuse-manuals_en/book.opensuse.startup.html
 %endif
 
-BuildRequires:	cmake >= 2.8
-BuildRequires:	trinity-tqt3-devel >= 3.5.0
-BuildRequires:	trinity-tqtinterface-devel >= %{tde_version}
-BuildRequires:	trinity-arts-devel >= 1:1.5.10
 BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
+
+BuildRequires:	cmake >= 2.8
 BuildRequires:	gcc-c++
 BuildRequires:	make
+
+# OPENSSL support
 BuildRequires:	openssl-devel
+
+# AUDIOFILE support
 BuildRequires:	audiofile-devel
+
+# ALSA supportl
 BuildRequires:	alsa-lib-devel
+
+# RAW1394 support
 BuildRequires:	libraw1394-devel
+
+# VORBIS support
 BuildRequires:	libvorbis-devel
+
+# GLIB2 support
 BuildRequires:	glib2-devel
+
+# PCRE support
 BuildRequires:	pcre-devel
 
 # SASL support
@@ -429,15 +438,7 @@ BuildRequires:	xscreensaver
 # AVAHI support
 #  Disabled on RHEL4 and RHEL5
 %if 0%{?fedora} >= 15 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 6 || 0%{?suse_version}
-BuildRequires:	trinity-avahi-tqt-devel
-Requires:		trinity-avahi-tqt
-%if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires:	%{_lib}avahi-client-devel
-Requires:		%{_lib}avahi-client3
-%else
-BuildRequires:	avahi-devel
-Requires:		avahi
-%endif
+BuildRequires:	libavahi-tqt-devel
 %endif
 
 # NAS support
@@ -453,8 +454,8 @@ BuildRequires:	nas-devel
 BuildRequires:	dbus-devel >= 0.22-12.EL.9p1
 Requires:		dbus-qt >= 0.22-12.EL.9p1
 %else
-BuildRequires:	trinity-dbus-tqt-devel >= 1:0.63
-Requires:		trinity-dbus-tqt >= 1:0.63
+BuildRequires:	libdbus-tqt-devel >= 2:0.63
+Requires:		libdbus-tqt >= 2:0.63
 %endif
 
 %if 0%{?fedora} >= 17
@@ -471,7 +472,7 @@ BuildRequires:	jack-audio-connection-kit-devel
 
 # LIBART_LGPL support
 %define with_libart 1
-BuildRequires:	trinity-libart-lgpl-devel
+BuildRequires:	libart_lgpl-devel
 
 # SAMBA support
 %if 0%{?rhel} == 4
@@ -610,9 +611,9 @@ Requires: trinity-libkonq = %{version}-%{release}
 Requires: %{name}-libtqt3-integration = %{version}-%{release}
 Requires: %{name}-tdeio-smb-plugin = %{version}-%{release}
  
-Requires:	trinity-tqt3 >= 3.5.0
-Requires:	trinity-tqtinterface >= %{tde_version}
-Requires:	trinity-arts >= 1:1.5.10
+Requires:	libtqt3-mt >= 3.5.0
+Requires:	libtqt4 >= 2:4.2.0
+Requires:	trinity-arts >= 2:1.5.10
 Requires:	trinity-tdelibs >= %{tde_version}
 Requires:	openssl
 
@@ -650,8 +651,8 @@ web browser, X terminal emulator, and many other programs and components.
 Summary:	%{summary} - Development files
 Group:		Development/Libraries
 Requires:	%{name} = %{version}-%{release}
-Requires:	trinity-tqtinterface-devel >= %{tde_version}
-Requires:	trinity-arts-devel >= 1:1.5.10
+Requires:	libtqt4-devel >= 2:4.2.0
+Requires:	trinity-arts-devel >= 2:1.5.10
 Requires:	trinity-tdelibs-devel >= %{tde_version}
 
 Requires:	%{name}-bin-devel = %{version}-%{release}
@@ -974,7 +975,6 @@ plugdev group.
 %{tde_bindir}/keditfiletype
 %{tde_bindir}/tdefontinst
 %{tde_bindir}/tdefontview
-#%{tde_bindir}/kinfocenter
 %{tde_bindir}/klocaldomainurifilterhelper
 %{tde_bindir}/krdb
 %{tde_tdelibdir}/fontthumbnail.la
@@ -1017,8 +1017,6 @@ plugdev group.
 %{tde_tdelibdir}/kcm_info.so
 %{tde_tdelibdir}/kcm_input.la
 %{tde_tdelibdir}/kcm_input.so
-#%{tde_tdelibdir}/kcm_ioslaveinfo.la
-#%{tde_tdelibdir}/kcm_ioslaveinfo.so
 %{tde_tdelibdir}/kcm_joystick.la
 %{tde_tdelibdir}/kcm_joystick.so
 %{tde_tdelibdir}/kcm_kded.la
@@ -1117,7 +1115,6 @@ plugdev group.
 %{tde_tdeappdir}/installktheme.desktop
 %{tde_tdeappdir}/interrupts.desktop
 %{tde_tdeappdir}/ioports.desktop
-#%{tde_tdeappdir}/ioslaveinfo.desktop
 %{tde_tdeappdir}/joystick.desktop
 %{tde_tdeappdir}/kcm_tdednssd.desktop
 %{tde_tdeappdir}/kcmaccess.desktop
@@ -1422,7 +1419,6 @@ needed for a basic TDE desktop installation.
 %{tde_datadir}/apps/kcontrol/
 %{tde_datadir}/apps/tdedisplay/
 %{tde_datadir}/apps/tdefontview/
-#%{tde_datadir}/apps/kinfocenter/kinfocenterui.rc
 %{tde_datadir}/apps/kthememanager/themes/*
 %{tde_datadir}/icons/crystalsvg/*/apps/access.png
 %{tde_datadir}/icons/crystalsvg/*/apps/acroread.png
@@ -1880,19 +1876,43 @@ system passwords.
 %{tde_tdelibdir}/kcm_useraccount.so
 %{tde_tdeappdir}/kcm_useraccount.desktop
 %{tde_tdeappdir}/tdepasswd.desktop
-%exclude %{tde_datadir}/apps/tdm/pics/users/default1.png
-%exclude %{tde_datadir}/apps/tdm/pics/users/default2.png
-%exclude %{tde_datadir}/apps/tdm/pics/users/default3.png
-%exclude %{tde_datadir}/apps/tdm/pics/users/root1.png
-%{tde_datadir}/apps/tdm/pics/users/*.png
 %{tde_datadir}/config.kcfg/kcm_useraccount.kcfg
 %{tde_datadir}/config.kcfg/kcm_useraccount_pass.kcfg
+%{tde_tdedocdir}/HTML/en/tdepasswd/
+%{_datadir}/faces/Apple.png
+%{_datadir}/faces/BeachBall.png
+%{_datadir}/faces/Blowfish.png
+%{_datadir}/faces/Bug.png
+%{_datadir}/faces/Butterfly.png
+%{_datadir}/faces/Car.png
+%{_datadir}/faces/Cow.png 
+%{_datadir}/faces/Daemon.png
+%{_datadir}/faces/Dog.png
+%{_datadir}/faces/Elephant.png
+%{_datadir}/faces/Flower.png
+%{_datadir}/faces/Frog.png
+%{_datadir}/faces/Ghost.png
+%{_datadir}/faces/Guitar.png
+%{_datadir}/faces/Heart.png
+%{_datadir}/faces/Konqui.png
+%{_datadir}/faces/Lion.png
+%{_datadir}/faces/Monkey.png
+%{_datadir}/faces/Penguin.png
+%{_datadir}/faces/Pig.png
+%{_datadir}/faces/Rabbit.png
+%{_datadir}/faces/Ring.png
+%{_datadir}/faces/Scream.png
+%{_datadir}/faces/Shark.png
+%{_datadir}/faces/Splash.png
+%{_datadir}/faces/Star.png
+%{_datadir}/faces/Teddybear.png
+%{_datadir}/faces/Turtle.png
 
 %post -n trinity-tdepasswd
-update-desktop-database %{tde_appdir} 2> /dev/null || : 
+update-desktop-database %{tde_tdeappdir} 2> /dev/null || : 
 
 %postun -n trinity-tdepasswd
-update-desktop-database %{tde_appdir} 2> /dev/null || : 
+update-desktop-database %{tde_tdeappdir} 2> /dev/null || : 
 
 ##########
 
@@ -2074,7 +2094,7 @@ Provides:	tdm
 %endif
 
 %description -n trinity-tdm
-tdm manages a collection of X servers, which may be on the local host or
+TDM manages a collection of X servers, which may be on the local host or
 remote machines. It provides services similar to those provided by init,
 getty, and login on character-based terminals: prompting for login name and
 password, authenticating the user, and running a session. tdm supports XDMCP
@@ -2101,10 +2121,6 @@ already. Most users won't need this.
 %{tde_bindir}/krootimage
 %{tde_datadir}/apps/tdm/pics/kdelogo.png
 %{tde_datadir}/apps/tdm/pics/shutdown.jpg
-%{tde_datadir}/apps/tdm/pics/users/default1.png
-%{tde_datadir}/apps/tdm/pics/users/default2.png
-%{tde_datadir}/apps/tdm/pics/users/default3.png
-%{tde_datadir}/apps/tdm/pics/users/root1.png
 %{tde_datadir}/apps/tdm/sessions/*.desktop
 %{tde_datadir}/apps/tdm/themes/
 %{tde_datadir}/config/tdm
@@ -2116,6 +2132,13 @@ already. Most users won't need this.
 %config(noreplace) %{_sysconfdir}/pam.d/tdm-trinity-np
 %endif
 
+# XDG user faces
+%{_datadir}/faces/default1.png
+%{_datadir}/faces/default2.png
+%{_datadir}/faces/default3.png
+%{_datadir}/faces/default4.png
+%{_datadir}/faces/root1.png
+
 # Distribution specific stuff
 %if 0%{?suse_version} == 1140
 %{_sysconfdir}/init.d/xdm.tde
@@ -2141,6 +2164,9 @@ already. Most users won't need this.
 %{?_sysconfdir}/trinity/tdm/tdm.pp
 %endif
 
+# Logrotate configuration
+%{_sysconfdir}/logrotate.d/tdm
+
 %pre -n trinity-tdm
 # Make sure that TDM configuration files are now under '/etc/trinity/tdm'
 if [ -d "%{tde_datadir}/config/tdm" ] && [ ! -L "%{tde_datadir}/config/tdm" ]; then
@@ -2165,11 +2191,13 @@ fi
 %if 0%{?with_selinux_policy}
 /usr/sbin/semodule -i "%{?_sysconfdir}/trinity/tdm/tdm.pp"
 %endif
+
 # Sets default user icon in TDM
-if [ ! -r "%{tde_datadir}/apps/tdm/faces/.default.face.icon" ]; then
-  [ -d "%{tde_datadir}/apps/tdm/faces" ] || mkdir -p "%{tde_datadir}/apps/tdm/faces"
-  %__cp -f "%{tde_datadir}/apps/tdm/pics/users/default2.png" "%{tde_datadir}/apps/tdm/faces/.default.face.icon"
-fi
+#if [ ! -r "%{tde_datadir}/apps/tdm/faces/.default.face.icon" ]; then
+#  [ -d "%{tde_datadir}/apps/tdm/faces" ] || mkdir -p "%{tde_datadir}/apps/tdm/faces"
+#  %__cp -f "%{tde_datadir}/apps/tdm/pics/users/default2.png" "%{tde_datadir}/apps/tdm/faces/.default.face.icon"
+#fi
+
 # Sets default language for TDM
 if [ "$1" = "1" ]; then
   if [ -n "${LANG}" ] && [ "${LANG}" != "C" ]; then
@@ -2261,8 +2289,6 @@ documentation.
 
 %files -n trinity-khelpcenter
 %defattr(-,root,root,-)
-#%{tde_bindir}/khc_beagle_index.pl
-#%{tde_bindir}/khc_beagle_search.pl
 %{tde_bindir}/khc_docbookdig.pl
 %{tde_bindir}/khc_htdig.pl
 %{tde_bindir}/khc_htsearch.pl
@@ -2386,7 +2412,6 @@ functionality.
 %{tde_datadir}/applnk/.hidden/kicker_config_menus.desktop
 %{tde_datadir}/apps/clockapplet/pics/lcd.png
 %{tde_datadir}/apps/tdeconf_update/kicker-3.1-properSizeSetting.pl
-#%{tde_datadir}/apps/tdeconf_update/kicker-3.5-tdeconfigXTize.pl
 %{tde_datadir}/apps/tdeconf_update/kicker-3.5-taskbarEnums.pl
 %{tde_datadir}/apps/tdeconf_update/kickerrc.upd
 %{tde_datadir}/apps/kicker/
@@ -2811,6 +2836,7 @@ Using Konsole, a user can open:
 %{tde_datadir}/servicetypes/terminalemulator.desktop
 %{tde_tdedocdir}/HTML/en/konsole/
 %{tde_tdedocdir}/HTML/en/kcontrol/kcmkonsole/
+%{_sysconfdir}/fonts/conf.d/99-konsole.conf
 
 %post -n trinity-konsole
 update-desktop-database %{tde_appdir} 2> /dev/null || : 
@@ -3331,7 +3357,7 @@ Windows and Samba shares.
 
 ##########
 
-%if 0%{?suse_version} || 0%{?pclinuxos}
+%if 0%{?pclinuxos}
 %debug_package
 %endif
 
@@ -3340,18 +3366,6 @@ Windows and Samba shares.
 %prep
 %setup -q -n %{name}-%{version}%{?preversion:~%{preversion}}
 
-%patch101 -p1 -b .openterminalhere
-%patch102 -p1 -b .startmenuicon
-%patch105 -p1 -b .konsolewordseps
-
-%patch201 -p1 -b .vibrate_dialog
-%patch205 -p1 -b .suspend_unmount
-
-%patch301 -p1 -b .kcmxcursor
-%patch302 -p1 -b .twintranslation
-
-%patch303 -p1 -b .iocharset
-
 # Applies an optional distro-specific graphical theme
 %if "%{?tde_bg}" != ""
 # TDM Background
@@ -3410,6 +3424,7 @@ fi
 unset QTDIR QTINC QTLIB
 export PATH="%{tde_bindir}:${PATH}"
 export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}"
+export TDEDIR="%{tde_prefix}"
 
 # Samba 4.0 includes (Fedora 18)
 if [ -d "/usr/include/samba-4.0" ]; then
@@ -3588,6 +3603,28 @@ EOF
 %__install -D -m 755 "%{SOURCE7}" "%{?buildroot}%{?_sysconfdir}/init.d/xdm.tde"
 %endif
 
+# Console font to fontconfig
+%__mkdir_p "%{buildroot}%{_sysconfdir}/fonts/conf.d"
+cat <<EOF >"%{buildroot}%{_sysconfdir}/fonts/conf.d/99-konsole.conf"
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<fontconfig>
+  <!-- Font directory list -->
+  <dir>%{tde_datadir}/apps/konsole/fonts</dir>
+</fontconfig>
+EOF
+
+# logrotate configuration
+mkdir -p %{buildroot}%{_sysconfdir}/logrotate.d
+cat << EOF > "%{buildroot}%{_sysconfdir}/logrotate.d/tdm"
+/var/log/tdm.log {
+    weekly
+    notifempty
+    missingok
+    nocompress
+}
+EOF
+
 
 %clean
 %__rm -rf %{?buildroot}
diff --git a/redhat/tdebase/tdm.fc18.pp b/redhat/tdebase/tdm.fc18.pp
new file mode 100644
index 000000000..2e79e9554
Binary files /dev/null and b/redhat/tdebase/tdm.fc18.pp differ
diff --git a/redhat/tdebase/tdm.fc18.te b/redhat/tdebase/tdm.fc18.te
new file mode 100644
index 000000000..b42592f11
--- /dev/null
+++ b/redhat/tdebase/tdm.fc18.te
@@ -0,0 +1,11 @@
+
+module tdm.fc18 1.0;
+
+require {
+	type fprintd_t;
+	type initrc_t;
+	class dbus send_msg;
+}
+
+#============= fprintd_t ==============
+allow fprintd_t initrc_t:dbus send_msg;
-- 
cgit v1.2.1


From 0a5934b1b2ad08d0d728d081e779f56d303243ed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Andriot?= <albator78@libertysurf.fr>
Date: Sun, 5 Oct 2014 19:05:50 +0200
Subject: RPM Packaging: update tdebase

---
 redhat/tdebase/tdebase-14.0.0.spec | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/redhat/tdebase/tdebase-14.0.0.spec b/redhat/tdebase/tdebase-14.0.0.spec
index 6f444a8c6..85541a970 100644
--- a/redhat/tdebase/tdebase-14.0.0.spec
+++ b/redhat/tdebase/tdebase-14.0.0.spec
@@ -101,6 +101,10 @@ Provides:	trinity-kdebase-extras = %{version}-%{release}
 Obsoletes:	tdebase < %{version}-%{release}
 Provides:	tdebase = %{version}-%{release}
 
+# for set_permissions macro
+%if 0%{?suse_version}
+PreReq: permissions
+%endif
 
 ### Distribution-specific settings ###
 
@@ -454,8 +458,9 @@ BuildRequires:	nas-devel
 BuildRequires:	dbus-devel >= 0.22-12.EL.9p1
 Requires:		dbus-qt >= 0.22-12.EL.9p1
 %else
-BuildRequires:	libdbus-tqt-devel >= 2:0.63
-Requires:		libdbus-tqt >= 2:0.63
+BuildRequires:	libdbus-tqt-1-devel >= 2:0.63
+BuildRequires:	libdbus-1-tqt-devel >= 2:0.9
+Requires:		libdbus-tqt-1-0 >= 2:0.63
 %endif
 
 %if 0%{?fedora} >= 17
@@ -463,12 +468,18 @@ BuildRequires:	perl-Digest-MD5
 %endif
 
 # JACK support
+%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?fedora} || 0%{?suse_version}
+%define with_jack 1
 %if 0%{?mgaversion} || 0%{?mdkversion}
 BuildRequires:	%{_lib}jack-devel
 %endif
-%if 0%{?fedora} || 0%{?rhel} >= 5
+%if 0%{?rhel} >= 5 || 0%{?fedora}
 BuildRequires:	jack-audio-connection-kit-devel
 %endif
+%if 0%{?suse_version}
+BuildRequires:	libjack-devel
+%endif
+%endif
 
 # LIBART_LGPL support
 %define with_libart 1
-- 
cgit v1.2.1


From da1cda111221bfb6606d88bebae36e3a016415a1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Andriot?= <albator78@libertysurf.fr>
Date: Sun, 5 Oct 2014 19:47:06 +0200
Subject: RPM Packaging: add htdig

---
 redhat/3rdparty/htdig/htdig.spec | 231 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 231 insertions(+)
 create mode 100644 redhat/3rdparty/htdig/htdig.spec

diff --git a/redhat/3rdparty/htdig/htdig.spec b/redhat/3rdparty/htdig/htdig.spec
new file mode 100644
index 000000000..3dcfe7274
--- /dev/null
+++ b/redhat/3rdparty/htdig/htdig.spec
@@ -0,0 +1,231 @@
+%define _disable_ld_as_needed 1
+%define _disable_ld_no_undefined 1
+
+%define contentdir /var/www
+
+Summary:	A web indexing and searching system for a small domain or intranet
+Name:		htdig
+Version:	3.2.0b7
+Release:	1%{?dist}
+License:	GPL
+Group:		Networking/WWW
+URL:		http://www.htdig.org/
+
+Source0:	htdig-3.2.0b7.tar.gz
+
+BuildRequires:	flex >= 2.5.4a-13
+BuildRequires:	libtool
+BuildRequires:	gcc-c++
+BuildRequires:	zlib-devel
+
+BuildRoot:	%{_tmppath}/%{name}-buildroot
+
+%description
+The ht://Dig system is a complete world wide web indexing and searching system 
+for a small domain or intranet. This system is not meant to replace the need 
+for powerful internet-wide search systems like Lycos, Infoseek, Webcrawler and 
+AltaVista. Instead it is meant to cover the search needs for a single company, 
+campus, or even a particular sub section of a web site.
+
+As opposed to some WAIS-based or web-server based search engines, ht://Dig can 
+span several web servers at a site. The type of these different web servers 
+doesn't matter as long as they understand the HTTP 1.0 protocol.
+
+ht://Dig was developed at San Diego State University as a way to search the
+various web servers on the campus network.
+
+%files
+%defattr(-,root,root,0755)
+%dir %{_sysconfdir}/htdig
+%config(noreplace) %{_sysconfdir}/htdig/cookies.txt
+%config(noreplace) %{_sysconfdir}/htdig/htdig.conf
+%config(noreplace) %{_sysconfdir}/htdig/HtFileType-magic.mime
+%config(noreplace) %{_sysconfdir}/htdig/mime.types
+%{_bindir}/*
+%dir %{_libdir}/htdig
+%dir %{_libdir}/htdig_db
+%{_libdir}/htdig/*3.2.0.so
+%{_libdir}/htdig_db/*3.2.0.so
+%dir %attr(-,htdig,htdig) /var/lib/htdig
+%dir %attr(-,htdig,root) %{_datadir}/htdig
+%{_datadir}/htdig/*
+%{_mandir}/man1/*
+%{_mandir}/man8/*
+
+%pre
+egrep "^htdig:" /etc/group >/dev/null
+if [ $? = 1 ]; then
+		echo "adding htdig group"
+		groupadd -r htdig
+fi
+egrep "^htdig:" /etc/passwd >/dev/null
+if [ $? = 1 ]; then
+		echo "adding htdig user"
+		useradd -r -g htdig -s "" -d /var/lib/htdig htdig 
+fi
+egrep "^htdig:.*/var/lib/htdig:" /etc/passwd   >/dev/null
+if [ $? = 1 ]; then
+		echo "updating htdig homedir"
+		perl -pi -e "s,^(htdig:.*:)[^:]+(:[^:]*)$,\1/var/lib/htdig\2," /etc/passwd
+fi
+
+%preun
+# we're uninstalling
+if [ $1 = 0 ]; then
+		egrep "^htdig:" /etc/passwd >/dev/null
+		if [ $? = 0 ]; then
+			echo "removing htdig user"
+			userdel htdig # userdel seems to nuke the group too..
+		fi
+
+		egrep "^htdig:" /etc/group >/dev/null
+		if [ $? = 0 ]; then
+			echo "removing htdig group"
+			groupdel htdig
+		fi
+fi
+
+##########
+
+%package	devel
+Summary:	Libraries needed to develop for htdig
+Group:		Development/C
+Requires:	%{name} = %{version}-%{release}
+
+%description	devel
+Libraries needed to develop for htdig.
+
+%files devel
+%defattr(-,root,root)
+%doc ChangeLog
+%doc htdoc/*
+%{_libdir}/htdig/*.a
+%{_libdir}/htdig/*.la
+%{_libdir}/htdig/*[a-z].so
+%{_libdir}/htdig_db/*.a
+%{_libdir}/htdig_db/*.la
+%{_libdir}/htdig_db/*[a-z].so
+%{_includedir}/*
+
+##########
+
+%package	web
+Summary:	Scripts and HTML code needed for using ht://Dig as a web search engine
+Group:		Networking/WWW
+Requires:	%{name} = %{version}-%{release}
+Requires:	webserver
+
+%description	web
+The ht://Dig system is a complete world wide web indexing and searching
+system for a small domain or intranet. This system is not meant to replace
+the need for powerful internet-wide search systems like Lycos, Infoseek,
+Webcrawler and AltaVista. Instead it is meant to cover the search needs for
+a single company, campus, or even a particular sub section of a web site. As
+opposed to some WAIS-based or web-server based search engines, ht://Dig can
+span several web servers at a site. The type of these different web servers
+doesn't matter as long as they understand the HTTP 1.0 protocol.
+
+The %{name}-web package includes CGI scripts and HTML code needed to use
+ht://Dig on a website.
+
+ht://Dig was developed at San Diego State University as a way to search the
+various web servers on the campus network.
+
+%files web
+%defattr(-,root,root)
+%config(missingok, noreplace) %attr(0755,root,root) /etc/cron.daily/htdig-dbgen
+%{contentdir}/html/htdig
+%{contentdir}/cgi-bin/*
+
+%post web
+# Only run this if installing for the first time
+if [ "$1" = 1 ]; then
+	if [ -f /etc/httpd/conf/httpd.conf ];then
+	SERVERNAME="`grep '^ServerName' /etc/httpd/conf/httpd.conf | awk 'NR == 1 {print $2}'`"
+	fi
+	[ -z "$SERVERNAME" ] && SERVERNAME="`hostname -f`"
+	[ -z "$SERVERNAME" ] && SERVERNAME="localhost"
+	sed 's/^start_url:.*/#&\
+# (See end of file for this parameter.)/' /etc/htdig/htdig.conf > /tmp/ht.$$
+	cat /tmp/ht.$$ > /etc/htdig/htdig.conf
+	rm /tmp/ht.$$
+	cat >> /etc/htdig/htdig.conf <<!
+
+# Automatically set up by htdig RPM, from your current Apache httpd.conf...
+# Verify and configure these, and set maintainer above, before running
+# /usr/bin/rundig.
+# See /usr/doc/htdig*/attrs.html for descriptions of attributes.
+
+# The URL(s) where htdig will start.  See also limit_urls_to above.
+start_url:	http://$SERVERNAME/
+
+# This makes sure that we don't spider the web
+local_urls_only: true
+
+# These attributes allow indexing server via local filesystem rather than HTTP.
+local_urls:	http://$SERVERNAME/=/var/www/html/
+local_user_urls:	http://$SERVERNAME/=/home/,/public_html/
+!
+
+fi
+
+##########
+
+%prep
+%setup -q
+autoreconf -fiv
+
+
+%build
+%configure \
+    --prefix=%{_prefix} \
+    --libdir=%{_libdir} \
+    --mandir=%{_mandir} \
+    --enable-shared \
+    --with-config-dir=%{_sysconfdir}/htdig \
+    --with-common-dir=%{contentdir}/html/htdig \
+    --with-database-dir=/var/lib/htdig \
+    --localstatedir=/var/lib/htdig \
+    --with-cgi-bin-dir=%{contentdir}/cgi-bin \
+    --with-image-dir=%{contentdir}/html/htdig \
+    --with-search-dir=%{contentdir}/html/htdig \
+    --with-default-config-file=/etc/htdig/htdig.conf \
+    --with-apache=/usr/sbin/httpd \
+    --with-zlib=%{_prefix}
+
+%__make %{?_smp_mflags}
+mv htdoc/ChangeLog .
+
+
+%install
+rm -rf %{buildroot}
+
+%__make install DESTDIR=%{?buildroot}
+
+# Installs the cron job
+%__install -d -m 755 cron/htdig-dbgen "%{buildroot}%{?_sysconfdir}/cron.daily/htdig-dbgen"
+
+cp %{buildroot}%{contentdir}/cgi-bin/htsearch %{buildroot}%{_bindir}
+
+chmod 644 %{buildroot}%{contentdir}/html/htdig/*
+
+# pb with current rpm and symlinks (4.0.3-0.8mdk)
+ln -sf ./search.html %{buildroot}%{contentdir}/html/htdig/index.html
+
+# now get rid of the %{buildroot} paths in the conf files
+for i in /etc/htdig.conf /usr/bin/rundig ; do
+    perl -pi -e "s|%{buildroot}||g" %{buildroot}/$i
+done
+
+mkdir -p %{buildroot}%{_datadir}
+mv %{buildroot}%{contentdir}/html/htdig %{buildroot}%{_datadir}
+ln -sf ../../../usr/share/htdig %{buildroot}%{contentdir}/html/htdig
+
+
+%clean
+rm -rf %{buildroot}
+
+
+%changelog
+* Sun Oct 05 2014 Francois Andriot <francois.andriot@free.fr> - 3.2.0b7-1
+- Initial build for TDE R14
-- 
cgit v1.2.1


From 23c47887e5a720c33b011034d40cb8715d8f9943 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Andriot?= <albator78@libertysurf.fr>
Date: Sun, 5 Oct 2014 19:54:29 +0200
Subject: RPM Packaging: update tdebase

---
 redhat/tdebase/tdebase-14.0.0.spec | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/redhat/tdebase/tdebase-14.0.0.spec b/redhat/tdebase/tdebase-14.0.0.spec
index 85541a970..5e316a18e 100644
--- a/redhat/tdebase/tdebase-14.0.0.spec
+++ b/redhat/tdebase/tdebase-14.0.0.spec
@@ -327,6 +327,7 @@ BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
 BuildRequires:	cmake >= 2.8
 BuildRequires:	gcc-c++
 BuildRequires:	make
+BuildRequires:	htdig
 
 # OPENSSL support
 BuildRequires:	openssl-devel
@@ -415,7 +416,7 @@ BuildRequires:	OpenEXR-devel
 
 # XSCREENSAVER support
 #  Disabled on RHEL4, RHEL >= 7
-%if 0%{?fedora} >= 15 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 5 || 0%{?suse_version}
+%if 0%{?fedora} >= 15 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 7 || 0%{?suse_version}
 %if 0%{?rhel} == 0 || 0%{?rhel} <= 6
 %define with_xscreensaver 1
 %if 0%{?rhel} == 5
-- 
cgit v1.2.1


From eeada3096c6428725b9b30eb45667733440a8f38 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Andriot?= <albator78@libertysurf.fr>
Date: Sun, 5 Oct 2014 20:17:10 +0200
Subject: RPM Packaging: update tdebase

---
 redhat/tdebase/tdebase-14.0.0.spec | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/redhat/tdebase/tdebase-14.0.0.spec b/redhat/tdebase/tdebase-14.0.0.spec
index 5e316a18e..391890e3e 100644
--- a/redhat/tdebase/tdebase-14.0.0.spec
+++ b/redhat/tdebase/tdebase-14.0.0.spec
@@ -373,6 +373,16 @@ BuildRequires:	libusb-devel
 BuildRequires:	esound-devel
 %endif
 
+# IDN support
+BuildRequires:	libidn-devel
+
+# GAMIN support
+#  Not on openSUSE.
+%if 0%{?rhel} || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion}
+%define with_gamin 1
+BuildRequires:	gamin-devel
+%endif
+
 # OPENLDAP support
 %if 0%{?suse_version}
 BuildRequires:	openldap2-devel
@@ -433,6 +443,9 @@ BuildRequires:	%{_lib}xscrnsaver%{?mgaversion:1}-devel
 %if 0%{?fedora} || 0%{?rhel} >= 6 || 0%{?suse_version} >= 1220
 BuildRequires:	xscreensaver
 BuildRequires:	libXScrnSaver-devel
+%if 0%{?suse_version}
+BuildRequires:	xscreensaver-data-extra
+%endif
 %endif
 %if 0%{?suse_version} == 1140
 BuildRequires:	xscreensaver
-- 
cgit v1.2.1


From 8d0b1a16c5e295f6af100ed8c9544ab4c1f769ec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Andriot?= <albator78@libertysurf.fr>
Date: Sun, 5 Oct 2014 20:34:27 +0200
Subject: RPM Packaging: update tdebase

---
 redhat/tdebase/tdebase-14.0.0.spec | 30 +++++++++++++++---------------
 redhat/tdelibs/tdelibs-14.0.0.spec | 20 ++++++++++++++++----
 2 files changed, 31 insertions(+), 19 deletions(-)

diff --git a/redhat/tdebase/tdebase-14.0.0.spec b/redhat/tdebase/tdebase-14.0.0.spec
index 391890e3e..0279140ae 100644
--- a/redhat/tdebase/tdebase-14.0.0.spec
+++ b/redhat/tdebase/tdebase-14.0.0.spec
@@ -322,6 +322,7 @@ Requires:	opensuse-manuals_en
 %define tde_aboutpage /usr/share/doc/manual/opensuse-manuals_en/book.opensuse.startup.html
 %endif
 
+BuildRequires:	trinity-arts-devel >= 2:1.5.10
 BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
 
 BuildRequires:	cmake >= 2.8
@@ -459,6 +460,19 @@ BuildRequires:	xscreensaver
 BuildRequires:	libavahi-tqt-devel
 %endif
 
+# MESA support
+%if 0%{?rhel} || 0%{?fedora}
+BuildRequires: mesa-libGL-devel
+BuildRequires: mesa-libGLU-devel
+%endif
+%if 0%{?mdkversion} || 0%{?mgaversion}
+BuildRequires: mesaglu-devel
+%endif
+%if 0%{?suse_version}
+BuildRequires: Mesa-libGL-devel
+BuildRequires: Mesa-libGLU-devel
+%endif
+
 # NAS support
 # (what is nas btw ?)
 %if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion}
@@ -481,20 +495,6 @@ Requires:		libdbus-tqt-1-0 >= 2:0.63
 BuildRequires:	perl-Digest-MD5
 %endif
 
-# JACK support
-%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?fedora} || 0%{?suse_version}
-%define with_jack 1
-%if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires:	%{_lib}jack-devel
-%endif
-%if 0%{?rhel} >= 5 || 0%{?fedora}
-BuildRequires:	jack-audio-connection-kit-devel
-%endif
-%if 0%{?suse_version}
-BuildRequires:	libjack-devel
-%endif
-%endif
-
 # LIBART_LGPL support
 %define with_libart 1
 BuildRequires:	libart_lgpl-devel
@@ -569,10 +569,10 @@ BuildRequires:	libXcomposite-devel
 BuildRequires:	xorg-x11-devel
 %endif
 
+# LIBFONTENC support
 %if 0%{?suse_version} == 1140
 BuildRequires:	xorg-x11-libfontenc-devel
 %endif
-
 %if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} >= 1220
 BuildRequires:	libfontenc-devel
 %endif
diff --git a/redhat/tdelibs/tdelibs-14.0.0.spec b/redhat/tdelibs/tdelibs-14.0.0.spec
index 6109da527..d34d9ff3e 100644
--- a/redhat/tdelibs/tdelibs-14.0.0.spec
+++ b/redhat/tdelibs/tdelibs-14.0.0.spec
@@ -490,15 +490,27 @@ Summary:	TDE Libraries (Development files)
 Group:		Development/Libraries/X11
 Requires:	%{name} = %{version}-%{release}
 
-Requires:	libtqt3-mt-devel >= 3.5.0
-Requires:	libtqt4-devel = 2:4.2.0
-Requires:	trinity-arts-devel >= 2:1.5.10
-
 Obsoletes:	tdelibs-devel < %{version}-%{release}
 Provides:	tdelibs-devel = %{version}-%{release}
 Obsoletes:	trinity-kdelibs-devel < %{version}-%{release}
 Provides:	trinity-kdelibs-devel = %{version}-%{release}
 
+Requires:	libtqt3-mt-devel >= 3.5.0
+Requires:	libtqt4-devel = 2:4.2.0
+Requires:	trinity-arts-devel >= 2:1.5.10
+
+# XCOMPOSITE support
+%if 0%{?mgaversion} || 0%{?mdkversion}
+%if 0%{?mgaversion} >= 4
+Requires:	%{_lib}xcomposite-devel
+%else
+Requires:	%{_lib}xcomposite%{?mgaversion:1}-devel
+%endif
+%endif
+%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version} >= 1220
+Requires:	libXcomposite-devel
+%endif
+
 %description devel
 This package includes the header files you will need to compile
 applications for TDE.
-- 
cgit v1.2.1


From 43019de6de85f6fa21251f6f55f0052846fecdb0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Andriot?= <albator78@libertysurf.fr>
Date: Sun, 5 Oct 2014 20:39:55 +0200
Subject: RPM Packaging: update tdelibs

---
 redhat/tdelibs/tdelibs-14.0.0.spec | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/redhat/tdelibs/tdelibs-14.0.0.spec b/redhat/tdelibs/tdelibs-14.0.0.spec
index d34d9ff3e..9dd69488c 100644
--- a/redhat/tdelibs/tdelibs-14.0.0.spec
+++ b/redhat/tdelibs/tdelibs-14.0.0.spec
@@ -499,6 +499,14 @@ Requires:	libtqt3-mt-devel >= 3.5.0
 Requires:	libtqt4-devel = 2:4.2.0
 Requires:	trinity-arts-devel >= 2:1.5.10
 
+# LIBART_LGPL support
+Requires:	libart_lgpl-devel
+
+# XT support
+%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version}
+Requires: libXt-devel
+%endif
+
 # XCOMPOSITE support
 %if 0%{?mgaversion} || 0%{?mdkversion}
 %if 0%{?mgaversion} >= 4
-- 
cgit v1.2.1


From 731d4f0b06e9ba999add5d15dc48c2904db2d925 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Andriot?= <albator78@libertysurf.fr>
Date: Sun, 5 Oct 2014 21:03:15 +0200
Subject: Openbsd: remove useless tqt3 patches

---
 .../tqt3/patches/patch-src_tools_qfile_cpp         | 68 ----------------------
 .../tqt3/patches/patch-src_tools_qfile_unix_cpp    | 54 -----------------
 2 files changed, 122 deletions(-)
 delete mode 100644 openbsd/14.0.0/dependencies/tqt3/patches/patch-src_tools_qfile_cpp
 delete mode 100644 openbsd/14.0.0/dependencies/tqt3/patches/patch-src_tools_qfile_unix_cpp

diff --git a/openbsd/14.0.0/dependencies/tqt3/patches/patch-src_tools_qfile_cpp b/openbsd/14.0.0/dependencies/tqt3/patches/patch-src_tools_qfile_cpp
deleted file mode 100644
index ddf1ad444..000000000
--- a/openbsd/14.0.0/dependencies/tqt3/patches/patch-src_tools_qfile_cpp
+++ /dev/null
@@ -1,68 +0,0 @@
---- src/tools/qfile.cpp.orig	Fri Sep  5 20:07:14 2014
-+++ src/tools/qfile.cpp	Fri Sep  5 20:11:15 2014
-@@ -73,8 +73,13 @@
- {
- public:
-     TQString errorString;
-+    int lastAccess;
- };
- 
-+#define ACCESS_NONE -1
-+#define ACCESS_READ 0
-+#define ACCESS_WRITE 1
-+
- extern bool qt_file_access( const TQString& fn, int t );
- 
- /*!
-@@ -199,6 +204,7 @@
- {
-     delete d;
-     d = new TQFilePrivate;
-+    d->lastAccess = ACCESS_NONE;
-     setFlags( IO_Direct );
-     setStatus( IO_Ok );
-     setErrorString( qt_fileerr_unknown );
-@@ -385,6 +391,10 @@
-     if ( isRaw() ) {				// raw file
- 	nread = TQIODevice::readLine( p, maxlen );
-     } else {					// buffered file
-+        if (d->lastAccess == ACCESS_WRITE) {
-+            ::fseek(fh, 0, SEEK_CUR);
-+            d->lastAccess = ACCESS_READ;
-+        }
- 	p = fgets( p, maxlen, fh );
- 	if ( p ) {
- 	    nread = tqstrlen( p );
-@@ -466,6 +476,10 @@
- 	char buf[1];
- 	ch = readBlock( buf, 1 ) == 1 ? buf[0] : EOF;
-     } else {					// buffered file
-+        if (d->lastAccess == ACCESS_WRITE) {
-+            ::fseek(fh, 0, SEEK_CUR);
-+            d->lastAccess = ACCESS_READ;
-+        }
- 	if ( (ch = getc( fh )) != EOF ) {
- 	    if ( !isSequentialAccess() )
- 		ioIndex++;
-@@ -502,6 +516,10 @@
- 	buf[0] = ch;
- 	ch = writeBlock( buf, 1 ) == 1 ? ch : EOF;
-     } else {					// buffered file
-+        if (d->lastAccess == ACCESS_READ) {
-+            ::fseek(fh, 0, SEEK_CUR);
-+            d->lastAccess = ACCESS_WRITE;
-+        }
- 	if ( (ch = putc( ch, fh )) != EOF ) {
- 	    if ( !isSequentialAccess() )
- 		ioIndex++;
-@@ -556,6 +574,10 @@
- 	else
- 	    ch = EOF;
-     } else {					// buffered file
-+        if (d->lastAccess == ACCESS_WRITE) {
-+            ::fseek(fh, 0, SEEK_CUR);
-+            d->lastAccess = ACCESS_READ;
-+        }
- 	if ( (ch = ungetc(ch, fh)) != EOF ) {
- 	    if ( !isSequentialAccess() )
- 		ioIndex--;
diff --git a/openbsd/14.0.0/dependencies/tqt3/patches/patch-src_tools_qfile_unix_cpp b/openbsd/14.0.0/dependencies/tqt3/patches/patch-src_tools_qfile_unix_cpp
deleted file mode 100644
index 989554b93..000000000
--- a/openbsd/14.0.0/dependencies/tqt3/patches/patch-src_tools_qfile_unix_cpp
+++ /dev/null
@@ -1,54 +0,0 @@
---- src/tools/qfile_unix.cpp.orig	Fri Sep  5 20:17:49 2014
-+++ src/tools/qfile_unix.cpp	Fri Sep  5 20:20:59 2014
-@@ -56,6 +56,17 @@
- #include <errno.h>
- #include <limits.h>
- 
-+class TQFilePrivate
-+{
-+public:
-+    TQString errorString;
-+    int lastAccess;
-+};
-+
-+#define ACCESS_NONE -1
-+#define ACCESS_READ 0
-+#define ACCESS_WRITE 1
-+
- extern const char* qt_fileerr_read;
- 
- bool qt_file_access( const TQString& fn, int t )
-@@ -525,6 +536,7 @@
- #else
- 	ok = ( ::fseek(fh, pos, SEEK_SET) == 0 );
- #endif
-+    d->lastAccess = ACCESS_NONE;
-     }
-     if ( ok )
- #if defined(QT_LARGEFILE_SUPPORT) && !defined(QT_ABI_QT4)
-@@ -593,6 +605,10 @@
- 		setErrorStringErrno( errno );
- 	    }
- 	} else {					// buffered file
-+        if (d->lastAccess == ACCESS_WRITE) {
-+        ::fseek(fh, 0, SEEK_CUR);
-+        d->lastAccess = ACCESS_READ;
-+        }
- 	    nread += fread( p, 1, len-nread, fh );
- 	    if ( (uint)nread != len ) {
- 		if ( ferror( fh ) || nread==0 ) {
-@@ -644,8 +660,13 @@
-     TQ_ULONG nwritten;				// number of bytes written
-     if ( isRaw() )				// raw file
- 	nwritten = ::write( fd, (void *)p, len );
--    else					// buffered file
-+	else {					// buffered file
-+		if (d->lastAccess == ACCESS_READ) {
-+			::fseek(fh, 0, SEEK_CUR);
-+			d->lastAccess = ACCESS_WRITE;
-+		}
- 	nwritten = fwrite( p, 1, len, fh );
-+	}
-     if ( nwritten != len ) {		// write error
- 	if ( errno == ENOSPC )			// disk is full
- 	    setStatus( IO_ResourceError );
-- 
cgit v1.2.1


From ef99bab0f88b20a4e8d7bd88caf9b61ef28dc273 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Andriot?= <albator78@libertysurf.fr>
Date: Sun, 5 Oct 2014 21:54:58 +0200
Subject: RPM packaging: update tdebase

---
 redhat/tdebase/tdebase-14.0.0.spec | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/redhat/tdebase/tdebase-14.0.0.spec b/redhat/tdebase/tdebase-14.0.0.spec
index 0279140ae..ba819450f 100644
--- a/redhat/tdebase/tdebase-14.0.0.spec
+++ b/redhat/tdebase/tdebase-14.0.0.spec
@@ -3467,6 +3467,7 @@ fi
   -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
   -DCMAKE_SKIP_RPATH=OFF \
   -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
+  -DCMAKE_NO_BUILTIN_CHRPATH=ON \
   -DCMAKE_VERBOSE_MAKEFILE=ON \
   -DWITH_GCC_VISIBILITY=ON \
   \
@@ -3650,6 +3651,14 @@ cat << EOF > "%{buildroot}%{_sysconfdir}/logrotate.d/tdm"
 }
 EOF
 
+# Move faces icon to XDG directory
+if [ ! -d "%{?buildroot}%{_datadir}/faces" ]; then
+  %__mkdir_p "%{?buildroot}%{_datadir}/faces"
+  %__mv -f "%{?buildroot}%{tde_datadir}/apps/tdm/pics/users/"* "%{?buildroot}%{_datadir}/faces"
+  %__rmdir "%{?buildroot}%{tde_datadir}/apps/tdm/pics/users/"
+  %__ln_s "%{_datadir}/faces" "%{?buildroot}%{tde_datadir}/apps/tdm/pics/users"
+fi
+
 
 %clean
 %__rm -rf %{?buildroot}
-- 
cgit v1.2.1


From acfd3fe1f272114ac7567c00571f9d999fa7144d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Andriot?= <albator78@libertysurf.fr>
Date: Sun, 5 Oct 2014 22:18:07 +0200
Subject: RPM Packaging: update tdebase

---
 redhat/tdebase/tdebase-14.0.0.spec | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/redhat/tdebase/tdebase-14.0.0.spec b/redhat/tdebase/tdebase-14.0.0.spec
index ba819450f..f5e7e9ad3 100644
--- a/redhat/tdebase/tdebase-14.0.0.spec
+++ b/redhat/tdebase/tdebase-14.0.0.spec
@@ -3651,11 +3651,11 @@ cat << EOF > "%{buildroot}%{_sysconfdir}/logrotate.d/tdm"
 }
 EOF
 
-# Move faces icon to XDG directory
+# Move faces icon to XDG directory '/usr/share/faces'
 if [ ! -d "%{?buildroot}%{_datadir}/faces" ]; then
   %__mkdir_p "%{?buildroot}%{_datadir}/faces"
   %__mv -f "%{?buildroot}%{tde_datadir}/apps/tdm/pics/users/"* "%{?buildroot}%{_datadir}/faces"
-  %__rmdir "%{?buildroot}%{tde_datadir}/apps/tdm/pics/users/"
+  rmdir "%{?buildroot}%{tde_datadir}/apps/tdm/pics/users/"
   %__ln_s "%{_datadir}/faces" "%{?buildroot}%{tde_datadir}/apps/tdm/pics/users"
 fi
 
-- 
cgit v1.2.1


From 0f7e2f11d7315e9d6f28561ac2aef93236d0f266 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Andriot?= <albator78@libertysurf.fr>
Date: Sun, 5 Oct 2014 22:40:41 +0200
Subject: RPM Packaging: update tdebase

---
 redhat/tdebase/tdebase-14.0.0.spec | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/redhat/tdebase/tdebase-14.0.0.spec b/redhat/tdebase/tdebase-14.0.0.spec
index f5e7e9ad3..29436aa39 100644
--- a/redhat/tdebase/tdebase-14.0.0.spec
+++ b/redhat/tdebase/tdebase-14.0.0.spec
@@ -2146,6 +2146,7 @@ already. Most users won't need this.
 %{tde_bindir}/krootimage
 %{tde_datadir}/apps/tdm/pics/kdelogo.png
 %{tde_datadir}/apps/tdm/pics/shutdown.jpg
+%{tde_datadir}/apps/tdm/pics/users
 %{tde_datadir}/apps/tdm/sessions/*.desktop
 %{tde_datadir}/apps/tdm/themes/
 %{tde_datadir}/config/tdm
@@ -2218,10 +2219,10 @@ fi
 %endif
 
 # Sets default user icon in TDM
-#if [ ! -r "%{tde_datadir}/apps/tdm/faces/.default.face.icon" ]; then
-#  [ -d "%{tde_datadir}/apps/tdm/faces" ] || mkdir -p "%{tde_datadir}/apps/tdm/faces"
-#  %__cp -f "%{tde_datadir}/apps/tdm/pics/users/default2.png" "%{tde_datadir}/apps/tdm/faces/.default.face.icon"
-#fi
+if [ ! -r "%{tde_datadir}/apps/tdm/faces/.default.face.icon" ]; then
+  [ -d "%{tde_datadir}/apps/tdm/faces" ] || mkdir -p "%{tde_datadir}/apps/tdm/faces"
+  %__cp -f "%{tde_datadir}/apps/tdm/pics/users/default2.png" "%{tde_datadir}/apps/tdm/faces/.default.face.icon"
+fi
 
 # Sets default language for TDM
 if [ "$1" = "1" ]; then
@@ -2229,6 +2230,7 @@ if [ "$1" = "1" ]; then
     %__sed -i "%{_sysconfdir}/trinity/tdm/tdmrc" -e "s|^#*Language=.*|Language=${LANG}|"
   fi
 fi
+
 # openSUSE 11.4 tdm's startup script
 if [ -r "%{_sysconfdir}/init.d/xdm.tde" ]; then
   cat "%{_sysconfdir}/init.d/xdm.tde" >"%{_sysconfdir}/init.d/xdm"
@@ -3655,9 +3657,9 @@ EOF
 if [ ! -d "%{?buildroot}%{_datadir}/faces" ]; then
   %__mkdir_p "%{?buildroot}%{_datadir}/faces"
   %__mv -f "%{?buildroot}%{tde_datadir}/apps/tdm/pics/users/"* "%{?buildroot}%{_datadir}/faces"
-  rmdir "%{?buildroot}%{tde_datadir}/apps/tdm/pics/users/"
-  %__ln_s "%{_datadir}/faces" "%{?buildroot}%{tde_datadir}/apps/tdm/pics/users"
 fi
+rmdir "%{?buildroot}%{tde_datadir}/apps/tdm/pics/users/"
+%__ln_s "%{_datadir}/faces" "%{?buildroot}%{tde_datadir}/apps/tdm/pics/users"
 
 
 %clean
-- 
cgit v1.2.1


From 01a7863524342e1aec31679e55d08830cc571066 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Andriot?= <albator78@libertysurf.fr>
Date: Sun, 5 Oct 2014 23:07:57 +0200
Subject: RPM Packaging: update tdebase

---
 redhat/tdebase/tdebase-14.0.0.spec | 29 +++++++++++++++++++++--------
 1 file changed, 21 insertions(+), 8 deletions(-)

diff --git a/redhat/tdebase/tdebase-14.0.0.spec b/redhat/tdebase/tdebase-14.0.0.spec
index 29436aa39..d5ee98490 100644
--- a/redhat/tdebase/tdebase-14.0.0.spec
+++ b/redhat/tdebase/tdebase-14.0.0.spec
@@ -564,10 +564,8 @@ BuildRequires:	%{_lib}xcomposite%{?mgaversion:1}-devel
 BuildRequires:	libXcomposite-devel
 %endif
 
-# Other X11 stuff ...
-%if 0%{?rhel} == 4
-BuildRequires:	xorg-x11-devel
-%endif
+# Requires 'usb.ids'
+BuildRequires:	usbutils
 
 # LIBFONTENC support
 %if 0%{?suse_version} == 1140
@@ -577,6 +575,11 @@ BuildRequires:	xorg-x11-libfontenc-devel
 BuildRequires:	libfontenc-devel
 %endif
 
+# Other X11 stuff ...
+%if 0%{?rhel} == 4
+BuildRequires:	xorg-x11-devel
+%endif
+
 %if 0%{?mgaversion} || 0%{?mdkversion}
 BuildRequires:	x11-font-util
 BuildRequires:	x11-proto-devel
@@ -2151,6 +2154,9 @@ already. Most users won't need this.
 %{tde_datadir}/apps/tdm/themes/
 %{tde_datadir}/config/tdm
 %dir %{_sysconfdir}/trinity/tdm
+%if 0%{?with_selinux_policy}
+%exclude %{?_sysconfdir}/trinity/tdm/tdm.pp
+%endif
 %config(noreplace) %{_sysconfdir}/trinity/tdm/*
 %{tde_tdedocdir}/HTML/en/tdm/
 %if 0%{?suse_version} == 0
@@ -2199,17 +2205,24 @@ if [ -d "%{tde_datadir}/config/tdm" ] && [ ! -L "%{tde_datadir}/config/tdm" ]; t
   if [ -d "%{_sysconfdir}/trinity/tdm" ]; then
     # If there is already something under '/etc/trinity/tdm', simply delete old configuration
     echo "Deleting TDM configuration under '%{tde_datadir}/config/tdm'"
-    %__rm -rf "%{tde_datadir}/config/tdm"
+    rm -rf "%{tde_datadir}/config/tdm"
   else
     # Else, move '/opt/trinity/share/config/tdm' to '/etc/trinity/tdm'
     if [ ! -d "%{_sysconfdir}/trinity" ]; then
-      %__mkdir_p "%{_sysconfdir}/trinity"
+      mkdir -p "%{_sysconfdir}/trinity"
     fi
     echo "Migrating TDM configuration from '%{tde_datadir}/config/tdm' to '%{_sysconfdir}/trinity/tdm'"
-    %__mv -f "%{tde_datadir}/config/tdm" "%{_sysconfdir}/trinity/tdm.migr"
+    mv -f "%{tde_datadir}/config/tdm" "%{_sysconfdir}/trinity/tdm.migr"
   fi
 fi
 
+# Remove actual directory before creating a symlink
+if [ ! -L "%{tde_datadir}/apps/tdm/pics/users" ]; then
+  [ -d "%{_datadir}/faces" ] || mkdir -p "%{_datadir}/faces"
+  cp -f "%{tde_datadir}/apps/tdm/pics/users/"* "%{_datadir}/faces"
+  rm -rf "%{tde_datadir}/apps/tdm/pics/users"
+fi
+
 %post -n trinity-tdm
 %if 0%{?mgaversion} || 0%{?mdkversion}
 %make_session
@@ -3657,8 +3670,8 @@ EOF
 if [ ! -d "%{?buildroot}%{_datadir}/faces" ]; then
   %__mkdir_p "%{?buildroot}%{_datadir}/faces"
   %__mv -f "%{?buildroot}%{tde_datadir}/apps/tdm/pics/users/"* "%{?buildroot}%{_datadir}/faces"
+  rmdir "%{?buildroot}%{tde_datadir}/apps/tdm/pics/users"
 fi
-rmdir "%{?buildroot}%{tde_datadir}/apps/tdm/pics/users/"
 %__ln_s "%{_datadir}/faces" "%{?buildroot}%{tde_datadir}/apps/tdm/pics/users"
 
 
-- 
cgit v1.2.1