RHEL/Fedora: updates kde-i18n-Chinese-Big5, updates QT chinese translations

2 files changed, 281 insertions, 19 deletions

diff --git a/redhat/qt3/qt3-3.3.8.d-updates_zh-tw_translations.patch b/redhat/qt3/qt3-3.3.8.d-updates_zh-tw_translations.patch
new file mode 100644
index 000000000..c5da1ad4c
--- /dev/null
+++ b/redhat/qt3/qt3-3.3.8.d-updates_zh-tw_translations.patch
@@ -0,0 +1,251 @@
+--- qt3/translations/qt_zh-tw.ts.ORI	2011-10-30 09:42:26.000000000 +0100
++++ qt3/translations/qt_zh-tw.ts	2011-12-18 22:06:58.432615802 +0100
+@@ -115,7 +115,7 @@
+     </message>
+     <message>
+         <source>Menu</source>
+-        <translation>Menu</translation>
++        <translation>選單</translation>
+     </message>
+     <message>
+         <source>Help</source>
+@@ -337,7 +337,7 @@
+     </message>
+     <message>
+         <source>A&amp;lpha channel:</source>
+-        <translation>Alpha 色頻(&amp;L)：</translation>
++        <translation>透明色頻(&amp;L)：</translation>
+     </message>
+     <message>
+         <source>&amp;Basic colors</source>
+@@ -429,11 +429,11 @@
+     </message>
+     <message>
+         <source>Read: %1</source>
+-        <translation>讀取： %1</translation>
++        <translation>讀取：%1</translation>
+     </message>
+     <message>
+         <source>Write: %1</source>
+-        <translation>寫入： %1</translation>
++        <translation>寫入：%1</translation>
+     </message>
+     <message>
+         <source>Cancel</source>
+@@ -1194,7 +1194,7 @@
+     </message>
+     <message>
+         <source>Customize...</source>
+-        <translation>自訂...</translation>
++        <translation>自訂…</translation>
+     </message>
+ </context>
+ <context>
+@@ -1264,7 +1264,7 @@
+     </message>
+     <message>
+         <source>&lt;h3&gt;About Qt&lt;/h3&gt;&lt;p&gt;This program uses Qt version %1.&lt;/p&gt;&lt;p&gt;Qt is a C++ toolkit for multiplatform GUI &amp;amp; application development.&lt;/p&gt;&lt;p&gt;Qt provides single-source portability across MS&amp;nbsp;Windows, Mac&amp;nbsp;OS&amp;nbsp;X, Linux, and all major commercial Unix variants.&lt;br&gt;Qt is also available for embedded devices.&lt;/p&gt;&lt;p&gt;Qt is a Trolltech product. See &lt;tt&gt;http://www.trolltech.com/qt/&lt;/tt&gt; for more information.&lt;/p&gt;</source>
+-        <translation>&lt;h3&gt;關於 Qt&lt;/h3&gt;&lt;p&gt;本程式使用 Qt 版本 %1。&lt;/p&gt;&lt;p&gt;Qt 是用於多平台 GUI 和應用程式開發的 C++ 工具套件。&lt;/p&gt;&lt;p&gt;Qt 為 MS&amp;nbsp;Windows、Mac&amp;nbsp;OS&amp;nbsp;X、Linux 和所有主要的商用 Unix 變異版本，提供跨平台的單一原始碼可攜性。&lt;br&gt;Qt 也可用於內嵌裝置。&lt;/p&gt;&lt;p&gt;Qt 是 Trolltech 的產品。如需詳細資訊，請參閱 &lt;tt&gt;http://www.trolltech.com/qt/&lt;/tt&gt;。&lt;/p&gt;</translation>
++        <translation>&lt;h3&gt;關於 Qt&lt;/h3&gt;&lt;p&gt;本程式使用 Qt 版本 %1。&lt;/p&gt;&lt;p&gt;Qt 是用於多平臺 GUI 和應用程式開發的 C++ 工具套件。&lt;/p&gt;&lt;p&gt;Qt 為 MS&amp;nbsp;Windows、Mac&amp;nbsp;OS&amp;nbsp;X、Linux 和所有主要的商用 Unix 變異版本，提供跨平臺的單一原始碼可攜性。&lt;br&gt;Qt 也可用於內嵌裝置。&lt;/p&gt;&lt;p&gt;Qt 是 Trolltech 的產品。如需詳細資訊，請參閱 &lt;tt&gt;http://www.trolltech.com/qt/&lt;/tt&gt;。&lt;/p&gt;</translation>
+     </message>
+ </context>
+ <context>
+@@ -1282,7 +1282,7 @@
+     </message>
+     <message>
+         <source>Aliases: %1</source>
+-        <translation>別名： %1</translation>
++        <translation>別名：%1</translation>
+     </message>
+     <message>
+         <source>unknown</source>
+@@ -1338,7 +1338,7 @@
+     </message>
+     <message>
+         <source>Browse...</source>
+-        <translation>瀏覽...</translation>
++        <translation>瀏覽…</translation>
+     </message>
+     <message>
+         <source>Options</source>
+@@ -1386,123 +1386,123 @@
+     </message>
+     <message>
+         <source>A0 (841 x 1189 mm)</source>
+-        <translation>A0 (841 x 1189 mm)</translation>
++        <translation>A0 (841 x 1189 公釐)</translation>
+     </message>
+     <message>
+         <source>A1 (594 x 841 mm)</source>
+-        <translation>A1 (594 x 841 mm)</translation>
++        <translation>A1 (594 x 841 公釐)</translation>
+     </message>
+     <message>
+         <source>A2 (420 x 594 mm)</source>
+-        <translation>A2 (420 x 594 mm)</translation>
++        <translation>A2 (420 x 594 公釐)</translation>
+     </message>
+     <message>
+         <source>A3 (297 x 420 mm)</source>
+-        <translation>A3 (297 x 420 mm)</translation>
++        <translation>A3 (297 x 420 公釐)</translation>
+     </message>
+     <message>
+         <source>A4 (210x297 mm, 8.26x11.7 inches)</source>
+-        <translation>A4 (210x297 mm，8.26x11.7 英吋)</translation>
++        <translation>A4 (210x297 公釐，8.26x11.7 英吋)</translation>
+     </message>
+     <message>
+         <source>A5 (148 x 210 mm)</source>
+-        <translation>A5 (148 x 210 mm)</translation>
++        <translation>A5 (148 x 210 公釐)</translation>
+     </message>
+     <message>
+         <source>A6 (105 x 148 mm)</source>
+-        <translation>A6 (105 x 148 mm)</translation>
++        <translation>A6 (105 x 148 公釐)</translation>
+     </message>
+     <message>
+         <source>A7 (74 x 105 mm)</source>
+-        <translation>A7 (74 x 105 mm)</translation>
++        <translation>A7 (74 x 105 公釐)</translation>
+     </message>
+     <message>
+         <source>A8 (52 x 74 mm)</source>
+-        <translation>A8 (52 x 74 mm)</translation>
++        <translation>A8 (52 x 74 公釐)</translation>
+     </message>
+     <message>
+         <source>A9 (37 x 52 mm)</source>
+-        <translation>A9 (37 x 52 mm)</translation>
++        <translation>A9 (37 x 52 公釐)</translation>
+     </message>
+     <message>
+         <source>B0 (1000 x 1414 mm)</source>
+-        <translation>B0 (1000 x 1414 mm)</translation>
++        <translation>B0 (1000 x 1414 公釐)</translation>
+     </message>
+     <message>
+         <source>B1 (707 x 1000 mm)</source>
+-        <translation>B1 (707 x 1000 mm)</translation>
++        <translation>B1 (707 x 1000 公釐)</translation>
+     </message>
+     <message>
+         <source>B2 (500 x 707 mm)</source>
+-        <translation>B2 (500 x 707 mm)</translation>
++        <translation>B2 (500 x 707 公釐)</translation>
+     </message>
+     <message>
+         <source>B3 (353 x 500 mm)</source>
+-        <translation>B3 (353 x 500 mm)</translation>
++        <translation>B3 (353 x 500 公釐)</translation>
+     </message>
+     <message>
+         <source>B4 (250 x 353 mm)</source>
+-        <translation>B4 (250 x 353 mm)</translation>
++        <translation>B4 (250 x 353 公釐)</translation>
+     </message>
+     <message>
+         <source>B5 (176 x 250 mm, 6.93x9.84 inches)</source>
+-        <translation>B5 (176 x 250 mm，6.93x9.84 英吋)</translation>
++        <translation>B5 (176 x 250 公釐，6.93x9.84 英吋)</translation>
+     </message>
+     <message>
+         <source>B6 (125 x 176 mm)</source>
+-        <translation>B6 (125 x 176 mm)</translation>
++        <translation>B6 (125 x 176 公釐)</translation>
+     </message>
+     <message>
+         <source>B7 (88 x 125 mm)</source>
+-        <translation>B7 (88 x 125 mm)</translation>
++        <translation>B7 (88 x 125 公釐)</translation>
+     </message>
+     <message>
+         <source>B8 (62 x 88 mm)</source>
+-        <translation>B8 (62 x 88 mm)</translation>
++        <translation>B8 (62 x 88 公釐)</translation>
+     </message>
+     <message>
+         <source>B9 (44 x 62 mm)</source>
+-        <translation>B9 (44 x 62 mm)</translation>
++        <translation>B9 (44 x 62 公釐)</translation>
+     </message>
+     <message>
+         <source>B10 (31 x 44 mm)</source>
+-        <translation>B10 (31 x 44 mm)</translation>
++        <translation>B10 (31 x 44 公釐)</translation>
+     </message>
+     <message>
+         <source>C5E (163 x 229 mm)</source>
+-        <translation>C5E (163 x 229 mm)</translation>
++        <translation>C5E (163 x 229 公釐)</translation>
+     </message>
+     <message>
+         <source>DLE (110 x 220 mm)</source>
+-        <translation>DLE (110 x 220 mm)</translation>
++        <translation>DLE (110 x 220 公釐)</translation>
+     </message>
+     <message>
+         <source>Executive (7.5x10 inches, 191x254 mm)</source>
+-        <translation>Executive (7.5x10 英吋，191x254 mm)</translation>
++        <translation>Executive (7.5x10 英吋，191x254 公釐)</translation>
+     </message>
+     <message>
+         <source>Folio (210 x 330 mm)</source>
+-        <translation>Folio (210 x 330 mm)</translation>
++        <translation>Folio (210 x 330 公釐)</translation>
+     </message>
+     <message>
+         <source>Ledger (432 x 279 mm)</source>
+-        <translation>Ledger (432 x 279 mm)</translation>
++        <translation>Ledger (432 x 279 公釐)</translation>
+     </message>
+     <message>
+         <source>Legal (8.5x14 inches, 216x356 mm)</source>
+-        <translation>Legal (8.5x14 英吋，216x356 mm)</translation>
++        <translation>Legal (8.5x14 英吋，216x356 公釐)</translation>
+     </message>
+     <message>
+         <source>Letter (8.5x11 inches, 216x279 mm)</source>
+-        <translation>Letter (8.5x11 英吋，216x279 mm)</translation>
++        <translation>Letter (8.5x11 英吋，216x279 公釐)</translation>
+     </message>
+     <message>
+         <source>Tabloid (279 x 432 mm)</source>
+-        <translation>Tabloid (279 x 432 mm)</translation>
++        <translation>Tabloid (279 x 432 公釐)</translation>
+     </message>
+     <message>
+         <source>US Common #10 Envelope (105 x 241 mm)</source>
+-        <translation>美國一般 10 號信封 (105 x 241 mm)</translation>
++        <translation>美國一般 10 號信封 (105 x 241 公釐)</translation>
+     </message>
+     <message>
+         <source>Setup Printer</source>
+@@ -1691,7 +1691,7 @@
+     <name>QToolBar</name>
+     <message>
+         <source>More...</source>
+-        <translation>其他...</translation>
++        <translation>其他…</translation>
+     </message>
+ </context>
+ <context>
+@@ -1811,7 +1811,7 @@
+     </message>
+     <message>
+         <source>&amp;Help</source>
+-        <translation>說明(&amp;H)</translation>
++        <translation>求助(&amp;H)</translation>
+     </message>
+ </context>
+ <context>
+@@ -1988,7 +1988,7 @@
+     </message>
+     <message>
+         <source>Paste special...</source>
+-        <translation>選擇性貼上...</translation>
++        <translation>選擇性貼上…</translation>
+     </message>
+     <message>
+         <source>Clear</source>
diff --git a/redhat/qt3/qt3.spec b/redhat/qt3/qt3.spec
index ad8ae872f..fcadb5b6d 100644
--- a/redhat/qt3/qt3.spec
+++ b/redhat/qt3/qt3.spec
@@ -1,8 +1,14 @@
 # Default version for this component
 %if "%{?version}" == ""
-%define version 3.3.8d
+%define version 3.3.8.d
 %endif
 
+# Always install under standard prefix
+%define _prefix /usr
+
+# This allows the legacy RHEL/Fedora patches to apply in TDE version.
+%define _default_patch_fuzz 2
+
 # The following QT4 packages should NOT be installed to
 # allow QT3 compilation (please uninstall them prior to compile)
 #  qt
@@ -12,24 +18,20 @@
 #  qt-devel
 # ...maybe others !!!!
 
-%define _default_patch_fuzz 2
+Name:			qt3
+Version:		%{?version}
+Release:		3%{?dist}
+Summary:		The shared library for the Qt 3 GUI toolkit
 
-Name: qt3
-Version: %{?version}
-Release: 2%{?dist}
-Summary: The shared library for the Qt 3 GUI toolkit
+License:		QPL or GPLv2 or GPLv3
+Group:			System Environment/Libraries
+URL:			http://www.trinitydesktop.org/
 
-License: QPL or GPLv2 or GPLv3
-Group: System Environment/Libraries
-URL:		http://www.trinitydesktop.org/
-#Url: http://www.troll.no
+Obsoletes:		qt < 1:%{version}-%{release}
+Provides:		qt = 1:%{version}-%{release}
 
-Obsoletes: qt < 1:%{version}-%{release}
-Provides: qt = 1:%{version}-%{release}
+BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-#Source0: ftp://ftp.troll.no/qt/source/qt-x11-free-3.3.8b.tar.gz
 Source0: qt3-3.3.8.d.tar.gz
 Source2: qt.sh
 Source3: qt.csh
@@ -84,6 +86,9 @@ Patch110: 0084-compositing-properties.patch
 Patch200: qt-x11-free-3.3.4-fullscreen.patch
 #Patch201: qt-x11-free-3.3.8b-gcc43.patch
 
+# TDE 3.5.13 patches
+Patch300: qt3-3.3.8.d-updates_zh-tw_translations.patch
+
 %define qt_dirname qt-3.3
 %define qtdir %{_libdir}/%{qt_dirname}
 %define qt_docdir %{_docdir}/qt-devel-%{version}
@@ -350,6 +355,9 @@ for the Qt 3 toolkit.
 %patch200 -p1 -b .fullscreen
 #patch201 -p1 -b .gcc34
 
+# TDE 3.5.13 patches
+%patch300 -p1
+
 # convert to UTF-8
 iconv -f iso-8859-1 -t utf-8 < doc/man/man3/qdial.3qt > doc/man/man3/qdial.3qt_
 mv doc/man/man3/qdial.3qt_ doc/man/man3/qdial.3qt
@@ -592,13 +600,13 @@ rm -rf %{buildroot}
 %{_datadir}/pixmaps/linguist3.png
 %{_datadir}/pixmaps/assistant3.png
 
-# QT 3.3.8D (TDE): 4 binaries have appeared
+# QT 3.3.8.D (TDE): 4 binaries have appeared
 %{qtdir}/bin/createcw
 %{qtdir}/bin/makeqpf
 %{qtdir}/bin/mergetr
 %{qtdir}/bin/msg2qm
 
-# QT 3.3.8D (TDE): removes lots of unnecessary include files
+# QT 3.3.8.D (TDE): removes lots of unnecessary include files
 # (where do they come from ??? They were not in 3.3.8b !)
 %exclude %{qtdir}/include/btree.h
 #%exclude %{qtdir}/include/config.h
@@ -701,10 +709,13 @@ rm -rf %{buildroot}
 
 
 %changelog
-* Thu Nov 03 2011 Francois Andriot <francois.andriot@free.fr> - 3.3.8d-2
+* Sun Dec 18 2011 Francois Andriot <francois.andriot@free.fr> - 3.3.8.d-3
+- Updates zh_TW translations, thanks to Wei-Lun Chao .
+
+* Thu Nov 03 2011 Francois Andriot <francois.andriot@free.fr> - 3.3.8.d-2
 - Add missing BuildRequires
 
-* Fri Sep 02 2011 Francois Andriot <francois.andriot@free.fr> - 3.3.8d-1
+* Fri Sep 02 2011 Francois Andriot <francois.andriot@free.fr> - 3.3.8.d-1
 - Initial build for RHEL 6, RHEL 5, and Fedora 15
 - Switch to Trinity Version
 - Spec file based on RHEL 6 'qt3-3.3.8b-29'