[Pkg-kde-commits] rev 307 - in branches/kde-3.3.2/kdelibs/debian: . patches
Christopher Martin
chrsmrtn-guest@haydn.debian.org
Tue, 14 Dec 2004 07:29:27 -0700
Author: chrsmrtn-guest
Date: 2004-12-14 07:28:37 -0700 (Tue, 14 Dec 2004)
New Revision: 307
Added:
branches/kde-3.3.2/kdelibs/debian/patches/01_kdelibs_branch.diff
Removed:
branches/kde-3.3.2/kdelibs/debian/patches/post-3.3.1-kdelibs-kio.diff
branches/kde-3.3.2/kdelibs/debian/patches/post-3.3.2-kdelibs-htmlframes2.diff
Modified:
branches/kde-3.3.2/kdelibs/debian/changelog
branches/kde-3.3.2/kdelibs/debian/control
branches/kde-3.3.2/kdelibs/debian/patches/02_autotools_update.diff
branches/kde-3.3.2/kdelibs/debian/patches/03_libtool_arm.diff
branches/kde-3.3.2/kdelibs/debian/patches/04_am_maintainer_mode.diff
branches/kde-3.3.2/kdelibs/debian/patches/05_pedantic-errors.diff
branches/kde-3.3.2/kdelibs/debian/patches/06_automake-1.9.diff
branches/kde-3.3.2/kdelibs/debian/patches/10_kstandarddirs.diff
branches/kde-3.3.2/kdelibs/debian/patches/11_applications_menu.diff
branches/kde-3.3.2/kdelibs/debian/rules
Log:
Add branch update and other misc. changes.
Modified: branches/kde-3.3.2/kdelibs/debian/changelog
===================================================================
--- branches/kde-3.3.2/kdelibs/debian/changelog 2004-12-14 03:07:46 UTC (rev 306)
+++ branches/kde-3.3.2/kdelibs/debian/changelog 2004-12-14 14:28:37 UTC (rev 307)
@@ -1,11 +1,12 @@
kdelibs (4:3.3.2-1~pre1) unstable; urgency=low
* New upstream release.
+ * KDE_3_3_BRANCH update. Includes the kdelibs part of the fix
+ for CAN-2004-1158.
* Removed patches:
- - 01_kdelibs_branch.diff.uu
- - post-3.3.1-kdelibs-khtml.diff (we keep post-3.3.1-kdelibs-kio.diff since
- the fix is KDE_3_3_BRANCH but not in KDE_3_3_2_RELEASE).
+ - post-3.3.1-kdelibs-khtml.diff and post-3.3.1-kdelibs-kio.diff since
+ these fixes are in KDE_3_3_BRANCH.
* New patches:
- 06_automake-1.9.diff
@@ -25,9 +26,12 @@
- usr/include/kde/kiobuffer.h
- usr/include/kde/kwallettypes.h
+ * debian/control:
+ - removed unneeded build-dependency on automake1.9.
+
* debian/rules:
- call dh_makeshlibs with DH_COMPAT set to 3, so that -V works again for
- us (worksaround debhelper bug #280830). (Closes: #280826)
+ us (works around debhelper bug #280830). (Closes: #280826)
-- Adeodato Simó <asp16@alu.ua.es> Tue, 14 Dec 2004 03:55:06 +0100
Modified: branches/kde-3.3.2/kdelibs/debian/control
===================================================================
--- branches/kde-3.3.2/kdelibs/debian/control 2004-12-14 03:07:46 UTC (rev 306)
+++ branches/kde-3.3.2/kdelibs/debian/control 2004-12-14 14:28:37 UTC (rev 307)
@@ -2,8 +2,8 @@
Section: libs
Priority: optional
Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
-Uploaders: Christopher L Cheney <ccheney@debian.org>, Adeodato Simó <asp16@alu.ua.es>
-Build-Depends: automake1.9, debhelper (>> 4.2.0), docbook-to-man, gawk, gettext, libart-2.0-dev, libarts1-dev (>> 1.3.0), libaspell-dev, libbz2-dev, libcupsys2-dev, libdb4.2-dev, libfam-dev, libidn11-dev, libjasper-1.701-dev, libldap2-dev, libopenexr-dev (>= 1.2.1), libpam0g-dev, libpcre3-dev, libsasl2-dev, libssl-dev, libtiff4-dev, libxml2-dev, libxml2-utils, libxrender-dev, libxslt1-dev, qt3-doc, sharutils, texinfo, xlibmesa-glu-dev
+Uploaders: Christopher L Cheney <ccheney@debian.org>, Adeodato Simó <asp16@alu.ua.es>, Christopher Martin <chrsmrtn@freeshell.org>
+Build-Depends: debhelper (>> 4.2.0), docbook-to-man, gawk, gettext, libart-2.0-dev, libarts1-dev (>> 1.3.0), libaspell-dev, libbz2-dev, libcupsys2-dev, libdb4.2-dev, libfam-dev, libidn11-dev, libjasper-1.701-dev, libldap2-dev, libopenexr-dev (>= 1.2.1), libpam0g-dev, libpcre3-dev, libsasl2-dev, libssl-dev, libtiff4-dev, libxml2-dev, libxml2-utils, libxrender-dev, libxslt1-dev, qt3-doc, sharutils, texinfo, xlibmesa-glu-dev
Build-Depends-Indep: doxygen, qt3-doc
Standards-Version: 3.6.1
Added: branches/kde-3.3.2/kdelibs/debian/patches/01_kdelibs_branch.diff
===================================================================
--- branches/kde-3.3.2/kdelibs/debian/patches/01_kdelibs_branch.diff 2004-12-14 03:07:46 UTC (rev 306)
+++ branches/kde-3.3.2/kdelibs/debian/patches/01_kdelibs_branch.diff 2004-12-14 14:28:37 UTC (rev 307)
@@ -0,0 +1,1572 @@
+diff -Nrua kdelibs-release/admin/acinclude.m4.in kdelibs-branch/admin/acinclude.m4.in
+--- kdelibs-release/admin/acinclude.m4.in 2004-11-12 17:48:09.000000000 -0500
++++ kdelibs-branch/admin/acinclude.m4.in 2004-12-09 16:22:14.000000000 -0500
+@@ -4254,7 +4254,8 @@
+
+ AC_DEFUN([KDE_CHECK_PYTHON],
+ [
+- KDE_CHECK_PYTHON_INTERN("2.3",
++ KDE_CHECK_PYTHON_INTERN("2.4",
++ [KDE_CHECK_PYTHON_INTERN("2.3",
+ [KDE_CHECK_PYTHON_INTERN("2.2",
+ [KDE_CHECK_PYTHON_INTERN("2.1",
+ [KDE_CHECK_PYTHON_INTERN("2.0",
+@@ -4262,6 +4263,7 @@
+ ])
+ ])
+ ])
++ ])
+ ])
+
+ AC_DEFUN([KDE_CHECK_STL],
+diff -Nrua kdelibs-release/dcop/dcopclient.cpp kdelibs-branch/dcop/dcopclient.cpp
+--- kdelibs-release/dcop/dcopclient.cpp 2004-07-13 08:45:47.000000000 -0400
++++ kdelibs-branch/dcop/dcopclient.cpp 2004-12-10 11:02:57.000000000 -0500
+@@ -1846,7 +1846,7 @@
+ tv.tv_sec = msecs / 1000;
+ tv.tv_usec = (msecs % 1000) * 1000;
+ if ( select( socket() + 1, &fds, 0, 0, &tv ) <= 0 ) {
+- if( useEventLoop && (time_left > guiTimeout)) {
++ if( useEventLoop && (timeout < 0 || time_left > guiTimeout)) {
+ // nothing was available, we got a timeout. Reactivate
+ // the GUI in blocked state.
+ bool old_lock = d->non_blocking_call_lock;
+@@ -1854,7 +1854,8 @@
+ d->non_blocking_call_lock = true;
+ emit blockUserInput( true );
+ }
+- d->eventLoopTimer.start(time_left - guiTimeout, true);
++ if( timeout >= 0 )
++ d->eventLoopTimer.start(time_left - guiTimeout, true);
+ qApp->enter_loop();
+ d->eventLoopTimer.stop();
+ if ( !old_lock ) {
+diff -Nrua kdelibs-release/dcop/dcopidlng/kalyptusCxxToDcopIDL.pm kdelibs-branch/dcop/dcopidlng/kalyptusCxxToDcopIDL.pm
+--- kdelibs-release/dcop/dcopidlng/kalyptusCxxToDcopIDL.pm 2003-10-19 08:18:57.000000000 -0400
++++ kdelibs-branch/dcop/dcopidlng/kalyptusCxxToDcopIDL.pm 2004-12-11 08:37:42.000000000 -0500
+@@ -671,6 +671,7 @@
+ $argType =~ s/^\s*(.*?)\s*$/$1/;
+ $argType =~ s/</</g;
+ $argType =~ s/>/>/g;
++ $argType =~ s/\s//g;
+
+ $args .= " <ARG><TYPE$typeAttrs>$argType</TYPE><NAME>$arg->{ArgName}</NAME></ARG>\n";
+
+diff -Nrua kdelibs-release/interfaces/kimproxy/interface/dcopinstantmessenger.desktop kdelibs-branch/interfaces/kimproxy/interface/dcopinstantmessenger.desktop
+--- kdelibs-release/interfaces/kimproxy/interface/dcopinstantmessenger.desktop 2004-11-22 03:34:03.000000000 -0500
++++ kdelibs-branch/interfaces/kimproxy/interface/dcopinstantmessenger.desktop 2004-12-11 06:18:32.000000000 -0500
+@@ -4,6 +4,7 @@
+ X-KDE-ServiceType=DCOP/InstantMessenger
+ Comment=Instant Messenger with a DCOP interface
+ Comment[af]=Oombliklike Boodskapper met DCOP intervlak
++Comment[ar]=مراسل فوري مع واجهة DCOP
+ Comment[bg]=Програма за съобщения в реално време с интерфейс DCOP
+ Comment[bn]=ডিকপ (DCOP) ইন্টারফেস সহ ইনস্ট্যান্ট মেসেঞ্জার
+ Comment[bs]=Instant poruke sa DCOP interfejsom
+diff -Nrua kdelibs-release/interfaces/kimproxy/interface/kcm_instantmessenger.desktop kdelibs-branch/interfaces/kimproxy/interface/kcm_instantmessenger.desktop
+--- kdelibs-release/interfaces/kimproxy/interface/kcm_instantmessenger.desktop 2004-11-13 02:20:18.000000000 -0500
++++ kdelibs-branch/interfaces/kimproxy/interface/kcm_instantmessenger.desktop 2004-12-11 06:18:32.000000000 -0500
+@@ -38,6 +38,7 @@
+ Name[zh_CN]=即时通讯程序
+ Comment=The instant messenger allows two-way chat between individuals and groups.
+ Comment[af]=Die oombliklike boodskappe laat twee rigting kommunikasie tussen individue en groepe toe.
++Comment[ar]=يسمح المراسل الفوري بمحادثة متبادلة بين أفراد ومجموعات
+ Comment[bg]=Разговор между различни хора в реално време.
+ Comment[bn]=ইনস্ট্যান্ট মেসেঞ্জার একাধিক ব্যক্তি বা গোষ্ঠীকে দ্বিমুখী বার্তালাপ বা আড্ডার সুযোগ দেয়।
+ Comment[bs]=Program za instant poruke omogućuje dvosmjernu komunikaciju između pojedinaca i grupa.
+diff -Nrua kdelibs-release/kate/part/kateviewhelpers.cpp kdelibs-branch/kate/part/kateviewhelpers.cpp
+--- kdelibs-release/kate/part/kateviewhelpers.cpp 2004-07-09 18:08:56.000000000 -0400
++++ kdelibs-branch/kate/part/kateviewhelpers.cpp 2004-12-08 13:49:37.000000000 -0500
+@@ -104,7 +104,7 @@
+
+ void KateCmdLine::hideMe ()
+ {
+- if (isVisibleTo(parentWidget())) {
++ if ( isVisibleTo(parentWidget()) && ! hasFocus() ) {
+ m_view->toggleCmdLine ();
+ }
+ //m_view->/*show*/setCmdLine (false);
+diff -Nrua kdelibs-release/kate/plugins/autobookmarker/ktexteditor_autobookmarker.desktop kdelibs-branch/kate/plugins/autobookmarker/ktexteditor_autobookmarker.desktop
+--- kdelibs-release/kate/plugins/autobookmarker/ktexteditor_autobookmarker.desktop 2004-11-12 02:27:48.000000000 -0500
++++ kdelibs-branch/kate/plugins/autobookmarker/ktexteditor_autobookmarker.desktop 2004-12-11 06:18:32.000000000 -0500
+@@ -42,6 +42,7 @@
+ Name[zh_CN]=KTextEditor 自动书签器
+ Comment=Set bookmarks on lines matching a pattern when documents are loaded
+ Comment[af]=Stel 'n boekmerk op lyne wat met 'n patroon ooreenstem wanneer die dokument gelaai word.
++Comment[ar]=ضبط المحفوظات على الأسطر الموافقة لنمط عند تحميل المستندات
+ Comment[bg]=Установяване на отметки на редовете, които отговарят на зададен шаблон по време на зареждане на файла
+ Comment[bn]=ডকুমেন্ট লোড করাকালীন প্রদত্ত নকশার সাথে মেলে এমন সমস্ত লাইন বুকমার্ক করে
+ Comment[bs]=Podešava zabilješke na linijama koje odgovaraju uzorku pri učitavanju dokumenta
+diff -Nrua kdelibs-release/kate/plugins/isearch/ktexteditor_isearch.desktop kdelibs-branch/kate/plugins/isearch/ktexteditor_isearch.desktop
+--- kdelibs-release/kate/plugins/isearch/ktexteditor_isearch.desktop 2004-11-12 02:27:49.000000000 -0500
++++ kdelibs-branch/kate/plugins/isearch/ktexteditor_isearch.desktop 2004-12-11 06:18:32.000000000 -0500
+@@ -63,6 +63,7 @@
+ Name[zu]=I-Plugin Yosesho Lokwenyuka ngezigaba ze-KTextEditor
+ Comment=Also known as "As you type search"
+ Comment[af]=Ook bekend as "Soos jy tik soektog"
++Comment[ar]=يعرف أيضاً بـ "البحث أثناء الكتابة"
+ Comment[bg]=Последователно търсене, известно още като търсене по време на въвеждане на низа
+ Comment[bn]="টাইপ করাকালীন সন্ধান" হিসাবেও পরিচিত
+ Comment[bs]=Takođe poznat kao "Pretraga dok kucate"
+@@ -75,6 +76,7 @@
+ Comment[et]=Tuntud ka kui "otsimine vastavalt kirjutamisele"
+ Comment[fi]=Tunnetaan myös nimellä "Hae kun kirjoitat"
+ Comment[fr]=Aussi connu comme « Recherche pendant la saisie »
++Comment[ga]=Darbh ainm "Cuardach Beo" freisin
+ Comment[he]=ידוע גם בתור "חיפוש תוך כדי כתיבה"
+ Comment[hr]=Poznat i kao "As you type search"
+ Comment[hu]=Más néven "Beírásos keresés"
+diff -Nrua kdelibs-release/kate/plugins/wordcompletion/ktexteditor_docwordcompletion.desktop kdelibs-branch/kate/plugins/wordcompletion/ktexteditor_docwordcompletion.desktop
+--- kdelibs-release/kate/plugins/wordcompletion/ktexteditor_docwordcompletion.desktop 2004-11-12 02:27:49.000000000 -0500
++++ kdelibs-branch/kate/plugins/wordcompletion/ktexteditor_docwordcompletion.desktop 2004-12-11 06:18:32.000000000 -0500
+@@ -2,6 +2,7 @@
+ Encoding=UTF-8
+ Name=KTextEditor Word Completion Plugin
+ Name[af]=KTextEditor Woord Voltooiïng Inprop Module
++Name[ar]=KTextEditor وظيفة إضافيّة لإكمال الكلمات
+ Name[bn]=কে-টেক্সট-এডিটর শব্দ পরিপূরণ প্লাগ-ইন
+ Name[bs]=KTextEditor dodatak za dovršavanje riječi
+ Name[ca]=Endollable de completar paraules del KTextEditor
+@@ -43,6 +44,7 @@
+ Name[zh_CN]=KTextEditor 单词补全插件
+ Comment=Directional or popup-based completion from words in the document
+ Comment[af]=Direksionele of opspring gebaseerde woord voltooiïng van woorde in die dokument
++Comment[ar]=إكمال متجهي أو مبني على الانبثاق من الكلمات في المستند
+ Comment[bg]=Автоматично завършване на думи, базирано на използваните вече думи в документа
+ Comment[bn]=ডকুমেন্ট-এর অন্যান্য শব্দের উপর ভিত্তি করে পরিপূরণ
+ Comment[bs]=Direkcionalno ili popup-bazirano dovršavanje za riječi u dokumentu
+diff -Nrua kdelibs-release/kdecore/all_languages.desktop kdelibs-branch/kdecore/all_languages.desktop
+--- kdelibs-release/kdecore/all_languages.desktop 2004-11-28 03:33:02.000000000 -0500
++++ kdelibs-branch/kdecore/all_languages.desktop 2004-12-11 06:18:33.000000000 -0500
+@@ -223,6 +223,7 @@
+ Name[fa]=امهری
+ Name[fi]=Amhara
+ Name[fr]=Amharique
++Name[ga]=Amarais
+ Name[he]=אמהרית
+ Name[hi]=अम्हारिक
+ Name[hr]=Amarski
+@@ -462,6 +463,7 @@
+ Name[et]=Vanapärsia
+ Name[fa]=اوستایی
+ Name[fi]=Avesta
++Name[ga]=Aivéistis
+ Name[he]=אווסטית
+ Name[hi]=अवेस्तन
+ Name[hr]=Avestanski
+@@ -504,6 +506,7 @@
+ Name[et]=Aimaraa
+ Name[fa]=آیمارا
+ Name[fi]=Aimara
++Name[ga]=Adhmarais
+ Name[gl]=Aimara
+ Name[he]=איימרה
+ Name[hi]=अयमारा
+@@ -840,6 +843,7 @@
+ Name[cy]=Bihareg
+ Name[de]=Biharisch
+ Name[fa]=بیحاری
++Name[ga]=Bihairis
+ Name[he]=ביהרי
+ Name[hi]=बिहारी
+ Name[hr]=Biharski
+@@ -873,6 +877,7 @@
+ Name[cy]=Bislameg
+ Name[fa]=بیسلاما
+ Name[fr]=Bichlamar
++Name[ga]=Bioslamais
+ Name[he]=ביסלמה
+ Name[hi]=बिस्लामा
+ Name[hr]=Bislamski
+@@ -1285,6 +1290,7 @@
+ Name[fa]=چچن
+ Name[fi]=Tšetšeeni
+ Name[fr]=Tchétchène
++Name[ga]=Seisnis
+ Name[gl]=Checheno
+ Name[he]=צ'צ'נית
+ Name[hi]=चेचेन
+@@ -1473,6 +1479,7 @@
+ Name[fa]=چووش
+ Name[fi]=Tšuvassi
+ Name[fr]=Tchouvache
++Name[ga]=Suvais
+ Name[he]=צ'ובשית
+ Name[hi]=चाउवेश
+ Name[hr]=Čuvaški
+@@ -2646,6 +2653,7 @@
+ Name[fa]=گالگان
+ Name[fi]=Galicia
+ Name[fr]=Galicien
++Name[ga]=Gailísis
+ Name[gl]=Galego
+ Name[he]=גליציאנית
+ Name[hi]=गैलियन
+@@ -2806,6 +2814,7 @@
+ Name[et]=Guaranii
+ Name[eu]=Guaraniera
+ Name[fa]=گورانی
++Name[ga]=Guaráinis
+ Name[gl]=Guaraní
+ Name[he]=גוארני
+ Name[hi]=गौरानी
+@@ -3087,17 +3096,19 @@
+ Name[zu]=Isi-Hiri Motu
+ [hsb]
+ Name=Upper Sorbian
++Name[ar]=الصربية العليا
+ Name[bs]=Gornji lužičkosrpski
+ Name[ca]=Alt sòrab
+ Name[cs]=Hornolužicko srbský
+ Name[cy]=Sorbieg Uchaf
+ Name[da]=Øvresorbisk
++Name[de]=Obersorbisch
+ Name[es]=Sorbio alto
+ Name[et]=Ülemsorbi
+ Name[fr]=Haut Sorabe
+ Name[ga]=Sorbais Uachtarach
+ Name[hu]=felső szorb
+-Name[it]=Alto sorbian
++Name[it]=Alto sorabo
+ Name[ja]=ソルブ語
+ Name[nb]=Øvresorbisk
+ Name[nds]=Böversorbsch
+@@ -3112,7 +3123,7 @@
+ [hu]
+ Name=Hungarian
+ Name[af]=Hongaars
+-Name[ar]=الهنغارية (المجرية)
++Name[ar]=الهنغارية
+ Name[az]=Macarca
+ Name[be]=Вугорская
+ Name[bg]=Унгарски
+@@ -3290,6 +3301,7 @@
+ Name[bn]=ইনাক্টিটুট
+ Name[fa]=اینوکتیتوت
+ Name[fi]=Eskimo
++Name[ga]=Ionúitis
+ Name[he]=אינוקטיטוט
+ Name[hi]=इनुक्तितु
+ Name[hr]=Inuktitutski
+@@ -3874,6 +3886,7 @@
+ Name[eo]=Kmera
+ Name[et]=Khmeeri
+ Name[fa]=خمر
++Name[ga]=Címéiris
+ Name[he]=חמר
+ Name[hi]=ख्मेर
+ Name[hr]=Kmerski
+@@ -3914,6 +3927,7 @@
+ Name[et]=Kikuju
+ Name[fa]=کیکویو
+ Name[fi]=Kikuju
++Name[ga]=Ciocúis
+ Name[he]=קיקויו
+ Name[hi]=किकूयू
+ Name[hr]=Kikujski
+@@ -3991,6 +4005,7 @@
+ Name[fa]=قرقیز
+ Name[fi]=Kirgiisi
+ Name[fr]=Kirghize
++Name[ga]=Cirgeastáinis
+ Name[he]=קירגיזית
+ Name[hi]=किर्गिज
+ Name[hr]=Kirgiski
+@@ -4721,6 +4736,7 @@
+ Name[et]=Malajalami
+ Name[fa]=مالایالامی
+ Name[fi]=Malajalam
++Name[ga]=Mailéalaimis
+ Name[he]=מליאלאם
+ Name[hi]=मलयालम
+ Name[hr]=Malajamski
+@@ -4812,6 +4828,7 @@
+ Name[es]=Maratí
+ Name[fa]=مراتی
+ Name[fr]=Marathe
++Name[ga]=Maraitis
+ Name[he]=מאראתי
+ Name[hi]=मराठी
+ Name[hr]=Maratski
+@@ -5181,11 +5198,13 @@
+ Name[zu]=Isi-Nauru
+ [nds]
+ Name=Low Saxon
++Name[ar]=الساكسونيّة الدنيا
+ Name[bs]=Niži saksonski
+ Name[ca]=Baix saxó
+ Name[cs]=Dolnosaský
+ Name[cy]=Sacsoneg Isel
+ Name[da]=Nedresaksisk
++Name[de]=Plattdeutsch
+ Name[es]=Bajo sajón
+ Name[et]=Alamsaksi
+ Name[fr]=Bas saxon (ou francique, ou plattdeutsch)
+@@ -6306,6 +6325,7 @@
+ Name[eu]=Kitxua
+ Name[fa]=کوچوا
+ Name[fi]=Ketšua
++Name[ga]=Ceatsuais
+ Name[he]=קצ'ואה
+ Name[hi]=क्वेचुआ
+ Name[hu]=kecsua
+@@ -6741,6 +6761,7 @@
+ Name[fa]=سینهالسیی
+ Name[fi]=Singali
+ Name[fr]=Singhalais
++Name[ga]=Siolóinis
+ Name[he]=סינהלזית
+ Name[hi]=सिंहली
+ Name[hr]=Sinhalski
+@@ -7077,6 +7098,7 @@
+ Name[de]=Sindhi-Sprache
+ Name[eo]=Sinda
+ Name[fa]=سیندهی
++Name[ga]=Sindis
+ Name[he]=סינדהי
+ Name[hi]=सिंधी
+ Name[hu]=szindi
+@@ -7400,6 +7422,7 @@
+ Name[fa]=سوندانزی
+ Name[fi]=Sunda
+ Name[fr]=Soudanais
++Name[ga]=Sundais
+ Name[he]=סודנית
+ Name[hi]=सूडानी
+ Name[hu]=szundanéz
+@@ -7452,6 +7475,7 @@
+ Name[eu]=Swahiliera
+ Name[fa]=سواحیلی
+ Name[fi]=Suahili
++Name[ga]=Svahaílis
+ Name[he]=סוואהילי
+ Name[hi]=स्वाहिली
+ Name[hr]=Svahili
+@@ -7680,6 +7704,7 @@
+ Name[eu]=Tatarera
+ Name[fa]=تاتاری
+ Name[fi]=Tataari
++Name[ga]=Tatairis
+ Name[he]=טטרית
+ Name[hi]=तातार
+ Name[hr]=Tatarski
+@@ -7723,6 +7748,7 @@
+ Name[eo]=Telugua
+ Name[fa]=تلوگویی
+ Name[fr]=Télougou
++Name[ga]=Teileagúilis
+ Name[he]=טלוגו
+ Name[hi]=तेलुगु
+ Name[hr]=Telugski
+@@ -7937,6 +7963,7 @@
+ Name[fa]=تیگرینیایی
+ Name[fi]=Tigrinja
+ Name[fr]=Tigrigna
++Name[ga]=Tigrinis
+ Name[he]=טיגריניה
+ Name[hi]=टिग्रिन्या
+ Name[hr]=Tigrinski
+@@ -8086,6 +8113,7 @@
+ Name[fa]=ترکمنی
+ Name[fi]=Turkmeeni
+ Name[fr]=Turkmène
++Name[ga]=Turcamáinis
+ Name[he]=טורקמנית
+ Name[hi]=तुर्कमेन
+ Name[hr]=Turkmenski
+@@ -8697,6 +8725,7 @@
+ Name[eo]=Volofa
+ Name[et]=Volofi
+ Name[fa]=ولفی
++Name[ga]=Volaifis
+ Name[he]=וולוף
+ Name[hi]=वालाफ़
+ Name[hr]=Volofski
+diff -Nrua kdelibs-release/kdecore/eventsrc kdelibs-branch/kdecore/eventsrc
+--- kdelibs-release/kdecore/eventsrc 2004-11-12 02:27:50.000000000 -0500
++++ kdelibs-branch/kdecore/eventsrc 2004-12-11 06:18:33.000000000 -0500
+@@ -146,6 +146,7 @@
+ Name[zu]=Ukuqedwa kombhalo:ukujikelezisa
+ Comment=The end of the list of matches has been reached
+ Comment[af]=Die einde van die lys van ooreenkomste is bereik
++Comment[ar]=تم الوصول إلى نهاية قائمة التماثلات
+ Comment[bg]=Достигнат е края на списъка от съвпадения
+ Comment[bn]=মিলের তালিকার শেষে উপস্থিত
+ Comment[bs]=Došao sam do kraja liste pogodaka
+@@ -260,6 +261,7 @@
+ Name[zu]=Ukuqedwa kokumbhalo: akukho okufanayo
+ Comment=No matching completion was found
+ Comment[af]=Geen ooreenstemming was gevind
++Comment[ar]=لا توجد تكملة مطابقة
+ Comment[bg]=Не е намерено съвпадение
+ Comment[bn]=কোনো যুতসই পরিপূরক পাওয়া যায় নি
+ Comment[bs]=Nijedno dovršavanje nije pronađeno
+@@ -374,6 +376,7 @@
+ Name[zu]=Ukuqedwa kokubhaliweyo: ukufaniswa kwesikhashana
+ Comment=There is more than one possible match
+ Comment[af]=Daar is meer as een moontlik ooreenkoms
++Comment[ar]=هنالك أكثر من تطابق واحد ممكن
+ Comment[bg]=Повече от едно съвпадение са намерени
+ Comment[bn]=একাধিক সম্ভাব্য পরিপূরক বর্তমান
+ Comment[bs]=Postoji više od jednog mogućeg pogotka
+@@ -458,7 +461,7 @@
+ Name[ms]=Tidak boleh Buka Fail
+ Name[mt]=Ma jistax jinfetaħ fajl
+ Name[nb]=Kan ikke åpne fil
+-Name[nds]=Datei laat sik nich opmaken
++Name[nds]=Datei lett sik nich opmaken
+ Name[nl]=Kan het bestand niet openen
+ Name[nn]=Kan ikkje opna fil
+ Name[nso]=Ekase Bule Faele
+@@ -529,7 +532,7 @@
+ Comment[ms]=Fail dipilih tidak boleh dibaca atau ditulis
+ Comment[mt]=Il-fajl magħżul ma setax jinfetaħ għall-qari jew kitba.
+ Comment[nb]=Den valgte fila kan ikke åpnes for lesing eller skriving
+-Comment[nds]=De utsöchte Datei laat sik nich lesen oder schrieven
++Comment[nds]=De utsöchte Datei lett sik nich lesen oder schrieven
+ Comment[nl]=Het geselecteerde bestand kan niet worden geopend om te lezen of naar te schrijven.
+ Comment[nn]=Den valte fila kan ikkje opnast for lesing eller skriving
+ Comment[nso]=Faele yeo e kgethilwego ekase bulelwe go bala goba go ngwala
+@@ -637,6 +640,7 @@
+ Name[zu]=Iphutha Lengozi
+ Comment=There was a serious error causing the program to exit
+ Comment[af]=Daar was 'n ernstige fout wat veroorsaak het dat die program beïendig is.
++Comment[ar]=لقد كان هناك خطأ كبير أدى الى خروج البرنامج
+ Comment[bg]=Появи се сериозна грешка, която предизвика прекъсване на програмата
+ Comment[bn]=একটি গুরুতর ত্রুটির দরুণ প্রোগ্রামটি থেমে গেছে
+ Comment[bs]=Program je morao završiti zbog ozbiljne greške
+@@ -753,6 +757,7 @@
+ Name[zu]=Isaziso
+ Comment=Something special happened in the program
+ Comment[af]=Iets spesiaal het met die program gebeur
++Comment[ar]=حدث شيء خاص في البرنامج
+ Comment[bg]=В програмата се случи нещо неочаквано
+ Comment[bn]=প্রোগ্রামে বিশেষ কিছু একটা ঘটেছে
+ Comment[bs]=Nešto posebno se desilo u programu
+@@ -872,6 +877,7 @@
+ Name[zu]=Isexwayiso
+ Comment=There was an error in the program which may cause problems
+ Comment[af]=Daar was 'n fout in die program wat dalk probleme kan veroorsaak
++Comment[ar]=هناك خطأ في البرنامج قد يؤدي الى حدوث مشاكل
+ Comment[bg]=Появи се грешка, която може да предизвика проблеми
+ Comment[bn]=প্রোগ্রামে একটি ত্রুটি ছিল যার ফলে সমস্যা হতে পারে
+ Comment[bs]=Postoji greška u programu koja možda uzrokuje probleme.
+@@ -1114,6 +1120,7 @@
+ Name[zu]=Ukungena ngaphakathi
+ Comment=KDE is starting up
+ Comment[af]=Begin KDE Laai
++Comment[ar]=جاري بدء KDE
+ Comment[bg]=Стартиране на системата
+ Comment[bn]=কে.ডি.ই. চালু হচ্ছে
+ Comment[bs]=KDE se pokreće
+@@ -1228,6 +1235,7 @@
+ Name[zu]=Phumela ngaphandle
+ Comment=KDE is exiting
+ Comment[af]=KDE is besig om toe te maak
++Comment[ar]=جارى إيقاف KDE
+ Comment[bg]=Спиране на системата
+ Comment[bn]=কে.ডি.ই. বন্ধ করা হচ্ছে
+ Comment[bs]=KDE se zatvara
+diff -Nrua kdelibs-release/kdecore/kaboutdata.cpp kdelibs-branch/kdecore/kaboutdata.cpp
+--- kdelibs-release/kdecore/kaboutdata.cpp 2004-02-21 15:05:12.000000000 -0500
++++ kdelibs-branch/kdecore/kaboutdata.cpp 2004-12-04 10:44:55.000000000 -0500
+@@ -102,7 +102,8 @@
+ mCopyrightStatement( copyrightStatement ),
+ mOtherText( text ),
+ mHomepageAddress( homePageAddress ),
+- mBugEmailAddress( bugsEmailAddress )
++ mBugEmailAddress( bugsEmailAddress ),
++ mLicenseText (0)
+ {
+ d = new KAboutDataPrivate;
+ d->productName = 0;
+@@ -119,6 +120,8 @@
+
+ KAboutData::~KAboutData()
+ {
++ if (mLicenseKey == License_File)
++ delete [] mLicenseText;
+ delete d;
+ }
+
+diff -Nrua kdelibs-release/kdecore/kaccel.cpp kdelibs-branch/kdecore/kaccel.cpp
+--- kdelibs-release/kdecore/kaccel.cpp 2004-05-27 04:43:47.000000000 -0400
++++ kdelibs-branch/kdecore/kaccel.cpp 2004-12-02 03:35:45.000000000 -0500
+@@ -20,6 +20,7 @@
+ #include "kaccel.h"
+
+ #include <qaccel.h>
++#include <qguardedptr.h>
+ #include <qpopupmenu.h>
+ #include <qstring.h>
+ #include <qtimer.h>
+@@ -316,9 +317,12 @@
+ KAccelAction* pAction = m_mapIDToAction[nID];
+ if( !pAction->isEnabled() )
+ continue;
++ QGuardedPtr<KAccelPrivate> me = this;
+ connect( this, SIGNAL(menuItemActivated()), pAction->objSlotPtr(), pAction->methodSlotPtr() );
+ emit menuItemActivated();
+- disconnect( this, SIGNAL(menuItemActivated()), pAction->objSlotPtr(), pAction->methodSlotPtr() );
++ if (me) {
++ disconnect( me, SIGNAL(menuItemActivated()), pAction->objSlotPtr(), pAction->methodSlotPtr() );
++ }
+ } else
+ slotKeyPressed( nID );
+
+diff -Nrua kdelibs-release/kdecore/kdebug.areas kdelibs-branch/kdecore/kdebug.areas
+--- kdelibs-release/kdecore/kdebug.areas 2004-06-17 09:28:27.000000000 -0400
++++ kdelibs-branch/kdecore/kdebug.areas 2004-11-29 12:09:51.000000000 -0500
+@@ -459,6 +459,9 @@
+ 30518 openoffice-filter
+ 30519 import-export-openoffice-filter-lib
+ 30520 kword-1.3-filter
++30521 gnumeric-filter
++30522 latex-filter
++30523 quattro-pro-filter
+ 31000 koffice
+ 32001 kword
+ 32002 kword (formatting)
+diff -Nrua kdelibs-release/kdecore/network/kresolvermanager.cpp kdelibs-branch/kdecore/network/kresolvermanager.cpp
+--- kdelibs-release/kdecore/network/kresolvermanager.cpp 2004-10-08 20:10:16.000000000 -0400
++++ kdelibs-branch/kdecore/network/kresolvermanager.cpp 2004-12-05 12:25:51.000000000 -0500
+@@ -197,6 +197,8 @@
+
+ } resInit;
+
++} // anonymous namespace
++
+ /*
+ * parameters
+ */
+@@ -767,5 +769,3 @@
+ QMutexLocker locker(&mutex);
+ dequeueNew(obj);
+ }
+-
+-} // anonymous namespace
+diff -Nrua kdelibs-release/kdecore/network/ksocketdevice.cpp kdelibs-branch/kdecore/network/ksocketdevice.cpp
+--- kdelibs-release/kdecore/network/ksocketdevice.cpp 2004-08-29 20:50:48.000000000 -0400
++++ kdelibs-branch/kdecore/network/ksocketdevice.cpp 2004-12-05 12:25:51.000000000 -0500
+@@ -804,58 +804,58 @@
+ bool isNull() const
+ { return obj == 0; }
+ };
++}
+
+- static KSocketDeviceFactoryBase* defaultImplFactory;
+- static QMutex defaultImplFactoryMutex;
+- typedef QMap<int, KSocketDeviceFactoryBase* > factoryMap;
+- static factoryMap factories;
++static KSocketDeviceFactoryBase* defaultImplFactory;
++static QMutex defaultImplFactoryMutex;
++typedef QMap<int, KSocketDeviceFactoryBase* > factoryMap;
++static factoryMap factories;
+
+- KSocketDevice* KSocketDevice::createDefault(KSocketBase* parent)
+- {
+- KSocketDevice* device = dynamic_cast<KSocketDevice*>(parent);
+- if (device != 0L)
+- return device;
+-
+- KSocksSocketDevice::initSocks();
+-
+- if (defaultImplFactory)
+- return defaultImplFactory->create(parent);
+-
+- // the really default
+- return new KSocketDevice(parent);
+- }
+-
+- KSocketDevice* KSocketDevice::createDefault(KSocketBase* parent, int capabilities)
+- {
+- KSocketDevice* device = dynamic_cast<KSocketDevice*>(parent);
+- if (device != 0L)
+- return device;
+-
+- QMutexLocker locker(&defaultImplFactoryMutex);
+- factoryMap::ConstIterator it = factories.constBegin();
+- for ( ; it != factories.constEnd(); ++it)
+- if ((it.key() & capabilities) == capabilities)
+- // found a match
+- return it.data()->create(parent);
+-
+- return 0L; // no default
+- }
+-
+- KSocketDeviceFactoryBase*
+- KSocketDevice::setDefaultImpl(KSocketDeviceFactoryBase* factory)
+- {
+- QMutexLocker locker(&defaultImplFactoryMutex);
+- KSocketDeviceFactoryBase* old = defaultImplFactory;
+- defaultImplFactory = factory;
+- return old;
+- }
+-
+- void KSocketDevice::addNewImpl(KSocketDeviceFactoryBase* factory, int capabilities)
+- {
+- QMutexLocker locker(&defaultImplFactoryMutex);
+- if (factories.contains(capabilities))
+- delete factories[capabilities];
+- factories.insert(capabilities, factory);
+- }
++KSocketDevice* KSocketDevice::createDefault(KSocketBase* parent)
++{
++ KSocketDevice* device = dynamic_cast<KSocketDevice*>(parent);
++ if (device != 0L)
++ return device;
++
++ KSocksSocketDevice::initSocks();
++
++ if (defaultImplFactory)
++ return defaultImplFactory->create(parent);
++
++ // the really default
++ return new KSocketDevice(parent);
++}
++
++KSocketDevice* KSocketDevice::createDefault(KSocketBase* parent, int capabilities)
++{
++ KSocketDevice* device = dynamic_cast<KSocketDevice*>(parent);
++ if (device != 0L)
++ return device;
++
++ QMutexLocker locker(&defaultImplFactoryMutex);
++ factoryMap::ConstIterator it = factories.constBegin();
++ for ( ; it != factories.constEnd(); ++it)
++ if ((it.key() & capabilities) == capabilities)
++ // found a match
++ return it.data()->create(parent);
+
++ return 0L; // no default
+ }
++
++KSocketDeviceFactoryBase*
++KSocketDevice::setDefaultImpl(KSocketDeviceFactoryBase* factory)
++{
++ QMutexLocker locker(&defaultImplFactoryMutex);
++ KSocketDeviceFactoryBase* old = defaultImplFactory;
++ defaultImplFactory = factory;
++ return old;
++}
++
++void KSocketDevice::addNewImpl(KSocketDeviceFactoryBase* factory, int capabilities)
++{
++ QMutexLocker locker(&defaultImplFactoryMutex);
++ if (factories.contains(capabilities))
++ delete factories[capabilities];
++ factories.insert(capabilities, factory);
++}
++
+diff -Nrua kdelibs-release/kdeprint/kdeprintd.desktop kdelibs-branch/kdeprint/kdeprintd.desktop
+--- kdelibs-release/kdeprint/kdeprintd.desktop 2004-11-12 02:27:50.000000000 -0500
++++ kdelibs-branch/kdeprint/kdeprintd.desktop 2004-12-11 06:18:34.000000000 -0500
+@@ -76,6 +76,7 @@
+ Name[zu]= I-Daemon Yokushicilela kwe-KDE
+ Comment=Print daemon for KDE
+ Comment[af]=Druk Bediener vir KDE
++Comment[ar]=خادم طباعة لـ KDE
+ Comment[bg]=Демон за печат в КДЕ
+ Comment[bn]=কে.ডি.ই-র মুদ্রণ ডিমন
+ Comment[bs]=Demon za štampu za KDE
+diff -Nrua kdelibs-release/kdeprint/specials.desktop kdelibs-branch/kdeprint/specials.desktop
+--- kdelibs-release/kdeprint/specials.desktop 2004-11-28 03:33:03.000000000 -0500
++++ kdelibs-branch/kdeprint/specials.desktop 2004-12-11 06:18:34.000000000 -0500
+@@ -790,6 +790,7 @@
+ Icon=kmail
+ Name=Mail PDF File
+ Name[af]=Pos PDF Lêer
++Name[ar]=ارسال ملف PDF كبريد
+ Name[be]=Даслаць PDF файл
+ Name[bg]=Изпращане на файл PDF по е-поща
+ Name[bn]=পি-ডি-এফ ফাইল মেইল করো
+diff -Nrua kdelibs-release/kdeui/kdetrayproxy/kdetrayproxy.desktop kdelibs-branch/kdeui/kdetrayproxy/kdetrayproxy.desktop
+--- kdelibs-release/kdeui/kdetrayproxy/kdetrayproxy.desktop 2004-11-12 02:27:51.000000000 -0500
++++ kdelibs-branch/kdeui/kdetrayproxy/kdetrayproxy.desktop 2004-12-11 06:18:34.000000000 -0500
+@@ -3,6 +3,7 @@
+ Type=Service
+ Name=KDE Tray Proxy Module
+ Name[af]=KDE Skinkbord Proksie Module
++Name[ar]=وحدة تحكّم KDE Tray Proxy
+ Name[bn]=কে.ডি.ই. ট্রে প্রক্সি মডিউল
+ Name[bs]=KDE proxy modul za tray
+ Name[ca]=Mòdul de safata d'intermediari del KDE
+@@ -38,6 +39,7 @@
+ Name[zh_CN]=KDE 托盘代理模块
+ Comment=Proxy enabling KDE systray applications to work without KWin
+ Comment[af]=Proksie wat KDE 'systray' programme toelaat om sonder KWin te werk
++Comment[ar]=ملقّم وكيل يسمح لتطبيقات KDE systray بالعمل من دون KWin
+ Comment[bg]=Модул, който позволява на програмите от КДЕ да работят в системния поднос с други мениджъри на прозорци
+ Comment[bn]=কে.ডি.ই. সিস-ট্রে অ্যাপলিকেশন কে-উইন ছাড়াই কাজ করাবার জন্য প্রক্সি
+ Comment[bs]=Proxy koji omogućuje KDE systray programima da rade izvan KWin-a
+@@ -56,7 +58,7 @@
+ Comment[lt]=Proxy įgalinantis KDE sistemos dėklo taikomasias programas dirbti be KWin
+ Comment[mk]=Прокси кое им овозможува на KDE апликациите од сис. лента да работат без KWin
+ Comment[nb]=Modul som gjør at systemkurvprogrammet for KDE kan fungere uten KWin
+-Comment[nds]=Disse Proxy laat Programmen ok ahn KWin as Finsterpleger binnen den Paneel-Systeemafsnitt lopen
++Comment[nds]=Disse Proxy lett Programmen ok ahn KWin as Finsterpleger binnen den Paneel-Systeemafsnitt lopen
+ Comment[nl]=Proxy-module om applicaties in het KDE-systeemvak te plaatsen die geen KWin ondersteuning hebben.
+ Comment[nn]=Modul som gjer at systemtrauprogram for KDE kan fungera uavhengig av KWin
+ Comment[pa]=KWin ਬਿਨਾਂ ਕੰਮ ਕਰਨ ਲਈ KDE systray ਕਾਰਜਾਂ ਲਈ ਪਰਾਕਸੀ ਯੋਗ
+diff -Nrua kdelibs-release/khtml/ecma/kjs_window.cpp kdelibs-branch/khtml/ecma/kjs_window.cpp
+--- kdelibs-release/khtml/ecma/kjs_window.cpp 2004-11-17 08:23:07.000000000 -0500
++++ kdelibs-branch/khtml/ecma/kjs_window.cpp 2004-12-10 06:00:29.000000000 -0500
+@@ -1464,7 +1464,7 @@
+ part->xmlDocImpl()->updateRendering();
+ if ( part )
+ emit part->browserExtension()->requestFocus(part);
+- KMessageBox::error(widget, QStyleSheet::convertFromPlainText(str), caption);
++ KMessageBox::error(widget, str, caption);
+ return Undefined();
+ case Window::Confirm:
+ if (!widget->dialogsAllowed())
+@@ -1473,7 +1473,7 @@
+ part->xmlDocImpl()->updateRendering();
+ if ( part )
+ emit part->browserExtension()->requestFocus(part);
+- return Boolean((KMessageBox::warningYesNo(widget, QStyleSheet::convertFromPlainText(str), caption,
++ return Boolean((KMessageBox::warningYesNo(widget, str, caption,
+ KStdGuiItem::ok(), KStdGuiItem::cancel()) == KMessageBox::Yes));
+ case Window::Prompt:
+ if (!widget->dialogsAllowed())
+diff -Nrua kdelibs-release/khtml/html/html_miscimpl.cpp kdelibs-branch/khtml/html/html_miscimpl.cpp
+--- kdelibs-release/khtml/html/html_miscimpl.cpp 2004-11-17 08:59:16.000000000 -0500
++++ kdelibs-branch/khtml/html/html_miscimpl.cpp 2004-12-03 05:03:49.000000000 -0500
+@@ -523,6 +523,12 @@
+
+ // -----------------------------------------------------------------------------
+
++NodeImpl *HTMLFormCollectionImpl::item( unsigned long index ) const
++{
++ int dummy;
++ return getItem(0L, index, dummy);
++}
++
+ unsigned long HTMLFormCollectionImpl::calcLength(NodeImpl*) const
+ {
+ QPtrList<HTMLGenericFormElementImpl> l = static_cast<HTMLFormElementImpl*>( base )->formElements;
+diff -Nrua kdelibs-release/khtml/html/html_miscimpl.h kdelibs-branch/khtml/html/html_miscimpl.h
+--- kdelibs-release/khtml/html/html_miscimpl.h 2004-11-17 08:59:16.000000000 -0500
++++ kdelibs-branch/khtml/html/html_miscimpl.h 2004-12-03 05:03:49.000000000 -0500
+@@ -75,8 +75,8 @@
+ virtual ~HTMLCollectionImpl();
+ unsigned long length() const;
+ // Only when iterating forward, it will use caching, ie. making it O(1).
+- NodeImpl *item ( unsigned long index ) const;
+- // obsolete and not domtree changes save, virtual too.
++ virtual NodeImpl *item ( unsigned long index ) const;
++ // obsolete and not domtree changes save
+ virtual NodeImpl *firstItem() const;
+ virtual NodeImpl *nextItem() const;
+
+@@ -126,6 +126,7 @@
+ {}
+ ~HTMLFormCollectionImpl() { }
+
++ virtual NodeImpl *item ( unsigned long index ) const;
+ virtual NodeImpl *firstItem() const;
+ virtual NodeImpl *nextItem() const;
+ protected:
+diff -Nrua kdelibs-release/khtml/khtml_part.cpp kdelibs-branch/khtml/khtml_part.cpp
+--- kdelibs-release/khtml/khtml_part.cpp 2004-11-17 08:46:56.000000000 -0500
++++ kdelibs-branch/khtml/khtml_part.cpp 2004-12-12 17:37:11.000000000 -0500
+@@ -4758,7 +4758,7 @@
+ KHTMLPart::findFrameParent( KParts::ReadOnlyPart *callingPart, const QString &f, khtml::ChildFrame **childFrame )
+ {
+ #ifdef DEBUG_FINDFRAME
+- kdDebug(6050) << "KHTMLPart::findFrameParent: this = " << this << " URL = " << m_url << " findFrameParent( " << f << " )" << endl;
++ kdDebug(6050) << "KHTMLPart::findFrameParent: this = " << this << " URL = " << m_url << " name = " << name() << " findFrameParent( " << f << " )" << endl;
+ #endif
+ // Check access
+ KHTMLPart* const callingHtmlPart = dynamic_cast<KHTMLPart *>(callingPart);
+@@ -4766,6 +4766,9 @@
+ if (!checkFrameAccess(callingHtmlPart))
+ return 0;
+
++ if (!childFrame && !parentPart() && (name() == f))
++ return this;
++
+ FrameIt it = d->m_frames.find( f );
+ const FrameIt end = d->m_frames.end();
+ if ( it != end )
+diff -Nrua kdelibs-release/khtml/khtml_run.cpp kdelibs-branch/khtml/khtml_run.cpp
+--- kdelibs-release/khtml/khtml_run.cpp 2003-11-01 16:14:59.000000000 -0500
++++ kdelibs-branch/khtml/khtml_run.cpp 2004-12-10 06:03:18.000000000 -0500
+@@ -33,6 +33,9 @@
+ false, false, hideErrorDialog ),
+ m_child( child )
+ {
++ // Don't use an external browser for parts of a webpage we are rendering. (iframes at least are one example)
++ setEnableExternalBrowser(false);
++
+ // get the wheel to start spinning
+ part->started(0L);
+ }
+diff -Nrua kdelibs-release/khtml/kmultipart/kmultipart.desktop kdelibs-branch/khtml/kmultipart/kmultipart.desktop
+--- kdelibs-release/khtml/kmultipart/kmultipart.desktop 2004-11-12 02:27:51.000000000 -0500
++++ kdelibs-branch/khtml/kmultipart/kmultipart.desktop 2004-12-11 06:18:34.000000000 -0500
+@@ -4,6 +4,7 @@
+ MimeType=multipart/mixed;multipart/x-mixed-replace
+ Name=Embeddable Component for multipart/mixed
+ Name[af]=Inlegbare Komponent vir multideel/gemeng
++Name[ar]=مكوّن مدمج لمتعدد الأجزاء أو مختلط.
+ Name[bg]=Компонент за вграждане за преглед на съобщения multipart/mixed
+ Name[bn]=multipart/mixed-এর জন্য অভ্যন্তরীণ উপাদান
+ Name[bs]=Ugradiva komponenta za multipart/mixed
+diff -Nrua kdelibs-release/khtml/rendering/render_block.cpp kdelibs-branch/khtml/rendering/render_block.cpp
+--- kdelibs-release/khtml/rendering/render_block.cpp 2004-11-24 09:01:00.000000000 -0500
++++ kdelibs-branch/khtml/rendering/render_block.cpp 2004-11-30 10:05:46.000000000 -0500
+@@ -1038,7 +1038,7 @@
+ int cw = lineWidth( child->yPos() );
+ static_cast<RenderBox*>(child)->calcHorizontalMargins
+ ( child->style()->marginLeft(), child->style()->marginRight(), cw);
+-
++ chPos = leftOff + child->marginLeft();
+ }
+ }
+ } else {
+diff -Nrua kdelibs-release/kio/kio/job.cpp kdelibs-branch/kio/kio/job.cpp
+--- kdelibs-release/kio/kio/job.cpp 2004-11-08 19:50:35.000000000 -0500
++++ kdelibs-branch/kio/kio/job.cpp 2004-12-07 20:08:15.000000000 -0500
+@@ -3121,10 +3121,10 @@
+ f.close();
+ KSimpleConfig config( path );
+ config.setDesktopGroup();
+- config.writePathEntry( QString::fromLatin1("URL"), (*it).uSource.url() );
+- KURL urlName = (*it).uSource;
+- urlName.setPass( "" );
+- config.writeEntry( QString::fromLatin1("Name"), urlName.url() );
++ KURL url = (*it).uSource;
++ url.setPass( "" );
++ config.writePathEntry( QString::fromLatin1("URL"), url.url() );
++ config.writeEntry( QString::fromLatin1("Name"), url.url() );
+ config.writeEntry( QString::fromLatin1("Type"), QString::fromLatin1("Link") );
+ QString protocol = (*it).uSource.protocol();
+ if ( protocol == QString::fromLatin1("ftp") )
+@@ -3375,9 +3375,8 @@
+ QString newPath;
+ // Offer overwrite only if the existing thing is a file
+ // If src==dest, use "overwrite-itself"
+- RenameDlg_Mode mode = (RenameDlg_Mode)
+- ( ( err == ERR_DIR_ALREADY_EXIST ? 0 :
+- ( m_currentSrcURL == dest ) ? M_OVERWRITE_ITSELF : M_OVERWRITE ) );
++ RenameDlg_Mode mode = (RenameDlg_Mode) (
++ ( m_currentSrcURL == dest ) ? M_OVERWRITE_ITSELF : M_OVERWRITE );
+
+ if ( m_srcList.count() > 1 )
+ mode = (RenameDlg_Mode) ( mode | M_MULTI | M_SKIP );
+diff -Nrua kdelibs-release/kio/kio/kdirlister.cpp kdelibs-branch/kio/kio/kdirlister.cpp
+--- kdelibs-release/kio/kio/kdirlister.cpp 2004-07-02 18:54:42.000000000 -0400
++++ kdelibs-branch/kio/kio/kdirlister.cpp 2004-12-11 20:17:31.000000000 -0500
+@@ -1883,6 +1883,9 @@
+ bool KDirLister::matchesMimeFilter( const KFileItem *item ) const
+ {
+ Q_ASSERT( item );
++ // Don't lose time determining the mimetype if there is no filter
++ if ( d->mimeFilter.isEmpty() && d->mimeExcludeFilter.isEmpty() )
++ return true;
+ return matchesMimeFilter( item->mimetype() );
+ }
+
+diff -Nrua kdelibs-release/kio/kio/kprotocolmanager.cpp kdelibs-branch/kio/kio/kprotocolmanager.cpp
+--- kdelibs-release/kio/kio/kprotocolmanager.cpp 2004-04-15 10:49:05.000000000 -0400
++++ kdelibs-branch/kio/kio/kprotocolmanager.cpp 2004-12-01 09:32:17.000000000 -0500
+@@ -72,8 +72,8 @@
+
+ // DEFAULT USERAGENT STRING
+ #define CFG_DEFAULT_UAGENT(X) \
+-QString("Mozilla/5.0 (compatible; Konqueror/%1.%2%3) (KHTML, like Gecko)") \
+- .arg(KDE_VERSION_MAJOR).arg(KDE_VERSION_MINOR).arg(X)
++QString("Mozilla/5.0 (compatible; Konqueror/%1.%2%3) KHTML/%4.%5.%6 (like Gecko)") \
++ .arg(KDE_VERSION_MAJOR).arg(KDE_VERSION_MINOR).arg(X).arg(KDE_VERSION_MAJOR).arg(KDE_VERSION_MINOR).arg(KDE_VERSION_RELEASE)
+
+ void KProtocolManager::reparseConfiguration()
+ {
+diff -Nrua kdelibs-release/kio/kio/krun.cpp kdelibs-branch/kio/kio/krun.cpp
+--- kdelibs-release/kio/kio/krun.cpp 2004-09-30 06:14:18.000000000 -0400
++++ kdelibs-branch/kio/kio/krun.cpp 2004-12-11 06:46:53.000000000 -0500
+@@ -65,6 +65,7 @@
+ bool m_runExecutables;
+
+ QString m_preferredService;
++ QString m_externalBrowser;
+ QGuardedPtr <QWidget> m_window;
+ };
+
+@@ -707,6 +708,7 @@
+ d = new KRunPrivate;
+ d->m_runExecutables = true;
+ d->m_window = window;
++ setEnableExternalBrowser(true);
+
+ // Start the timer. This means we will return to the event
+ // loop and do initialization afterwards.
+@@ -750,8 +752,7 @@
+ QString exec;
+ if (m_strURL.protocol().startsWith("http"))
+ {
+- KConfigGroup cfg(KGlobal::config(), "General");
+- exec = cfg.readEntry("BrowserApplication");
++ exec = d->m_externalBrowser;
+ }
+
+ if ( m_bIsLocalFile )
+@@ -1124,6 +1125,14 @@
+ m_timer.start( 0, true );
+ }
+
++void KRun::setEnableExternalBrowser(bool b)
++{
++ if (b)
++ d->m_externalBrowser = KConfigGroup(KGlobal::config(), "General").readEntry("BrowserApplication");
++ else
++ d->m_externalBrowser = QString::null;
++}
++
+ void KRun::setPreferredService( const QString& desktopEntryName )
+ {
+ d->m_preferredService = desktopEntryName;
+diff -Nrua kdelibs-release/kio/kio/krun.h kdelibs-branch/kio/kio/krun.h
+--- kdelibs-release/kio/kio/krun.h 2004-05-07 14:05:18.000000000 -0400
++++ kdelibs-branch/kio/kio/krun.h 2004-12-11 06:46:53.000000000 -0500
+@@ -161,6 +161,14 @@
+ void setRunExecutables(bool b);
+
+ /**
++ * Sets whether the external webbrowser setting should be honoured.
++ * This is enabled by default.
++ * This should only be disabled in webbrowser applications.
++ * @since 3.4
++ */
++ void setEnableExternalBrowser(bool b);
++
++ /**
+ * Open a list of URLs with a certain service (application).
+ *
+ * @param _service the service to run
+diff -Nrua kdelibs-release/kio/kpasswdserver.desktop kdelibs-branch/kio/kpasswdserver.desktop
+--- kdelibs-release/kio/kpasswdserver.desktop 2004-11-12 02:27:52.000000000 -0500
++++ kdelibs-branch/kio/kpasswdserver.desktop 2004-12-11 06:18:35.000000000 -0500
+@@ -69,6 +69,7 @@
+ Name[zu]=Ingxenye Yegama lokudlula le-KDED
+ Comment=Password caching support
+ Comment[af]=Wagwoord Kasberging ondersteuning
++Comment[ar]=دعم تخزين كلمة المرور بصورة مؤقّتة
+ Comment[bg]=Кеширане на пароли
+ Comment[bn]=পাসওয়ার্ড ক্যাশ-এ রাখা সমর্থন করে
+ Comment[bs]=Podrška za keširanje šifre
+diff -Nrua kdelibs-release/kio/misc/kpac/eventsrc kdelibs-branch/kio/misc/kpac/eventsrc
+--- kdelibs-release/kio/misc/kpac/eventsrc 2004-11-15 02:54:58.000000000 -0500
++++ kdelibs-branch/kio/misc/kpac/eventsrc 2004-12-11 06:18:35.000000000 -0500
+@@ -271,7 +271,7 @@
+ Comment[mn]=Итгэмжилэгч тохиргооны скрипт татагдахгүй байна
+ Comment[ms]=Skrip penyelarasan proksi tidak boleh dimuat turun
+ Comment[nb]=Klarte ikke å laste ned skiptet for mellomtjener-innstillinger
+-Comment[nds]=Dat Skript för't Instellen vun den Proxy laat sik nich daalladen
++Comment[nds]=Dat Skript för't Instellen vun den Proxy lett sik nich daalladen
+ Comment[nl]=Het proxyconfiguratiescript kon niet worden opgehaald
+ Comment[nn]=Klarte ikkje lasta ned skript for mellomtenaroppsett
+ Comment[pa]=ਪਰਾਕਸੀ ਸੰਰਚਨਾ ਸਕ੍ਰਿਪਟ ਨੂੰ ਲੋਡ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ ਹੈ
+diff -Nrua kdelibs-release/kio/misc/kpac/proxyscout.desktop kdelibs-branch/kio/misc/kpac/proxyscout.desktop
+--- kdelibs-release/kio/misc/kpac/proxyscout.desktop 2004-11-15 02:54:58.000000000 -0500
++++ kdelibs-branch/kio/misc/kpac/proxyscout.desktop 2004-12-11 06:18:35.000000000 -0500
+@@ -40,6 +40,7 @@
+ Name[zh_CN]=代理搜索
+ Comment=Automatic proxy configuration
+ Comment[af]=Outomatiese proksie opstelling
++Comment[ar]=تهيئة تلقائيّة للخادم الوكيل
+ Comment[bg]=Автоматично конфигуриране на прокси сървъра
+ Comment[bn]=স্বয়ংক্রিয় প্রক্সি কনফিগারেশন
+ Comment[bs]=Automatsko podešavanje proxy-ja
+diff -Nrua kdelibs-release/kio/misc/kssld/kssld.desktop kdelibs-branch/kio/misc/kssld/kssld.desktop
+--- kdelibs-release/kio/misc/kssld/kssld.desktop 2004-11-12 02:27:52.000000000 -0500
++++ kdelibs-branch/kio/misc/kssld/kssld.desktop 2004-12-11 06:18:35.000000000 -0500
+@@ -72,6 +72,7 @@
+ Name[zu]=Ingxenye ye-daemon ye-KSSL
+ Comment=KSSL daemon module for KDED
+ Comment[af]=KSSL bediener module vir KDED
++Comment[ar]=وحدة خادم KSSL لـ KDED
+ Comment[bg]=Модул демон за KSSL за KDED
+ Comment[bn]=KDED-র জন্য KSSL ডিমন মডিউল
+ Comment[bs]=KSSL Daemon Module za KDED
+diff -Nrua kdelibs-release/kio/misc/kwalletd/kwalletd.desktop kdelibs-branch/kio/misc/kwalletd/kwalletd.desktop
+--- kdelibs-release/kio/misc/kwalletd/kwalletd.desktop 2004-11-12 02:27:52.000000000 -0500
++++ kdelibs-branch/kio/misc/kwalletd/kwalletd.desktop 2004-12-11 06:18:36.000000000 -0500
+@@ -65,6 +65,7 @@
+ Name[zh_TW]=KWAllet 服務程式模組
+ Comment=KWallet daemon module for KDED
+ Comment[af]=KBeursie bediener bodule vir KDED
++Comment[ar]=وحدة خادم KWallet لـ KDED
+ Comment[bg]=Модул демон за системата Портфейл за KDED
+ Comment[bn]=KDED-র জন্য কে-ওয়ালেট ডিমন মডিউল
+ Comment[bs]=KWallet daemon modul za KDED
+diff -Nrua kdelibs-release/kioslave/http/kcookiejar/kcookiejar.desktop kdelibs-branch/kioslave/http/kcookiejar/kcookiejar.desktop
+--- kdelibs-release/kioslave/http/kcookiejar/kcookiejar.desktop 2004-11-12 02:27:53.000000000 -0500
++++ kdelibs-branch/kioslave/http/kcookiejar/kcookiejar.desktop 2004-12-11 06:18:36.000000000 -0500
+@@ -63,6 +63,7 @@
+ Name[zu]=Ingxenye Yojeke ye-Cookie ye-KDED
+ Comment=Keeps track of all cookies in the system
+ Comment[af]=Hou tred van al die koekies in die stelsel
++Comment[ar]=تتبّع كل ملفّات الـ cookies على النظام
+ Comment[bg]=Контрол над всички кукита в системата
+ Comment[bn]=সিস্টেমে সমস্ত কুকি-র খোঁজখবর রাখে
+ Comment[bs]=Prati sve kolačiće (cookije) na sistemu
+diff -Nrua kdelibs-release/kresources/kresources.desktop kdelibs-branch/kresources/kresources.desktop
+--- kdelibs-release/kresources/kresources.desktop 2004-11-12 02:27:53.000000000 -0500
++++ kdelibs-branch/kresources/kresources.desktop 2004-12-11 06:18:36.000000000 -0500
+@@ -74,6 +74,7 @@
+
+ Comment=Configure KDE Resources
+ Comment[af]=Stel KDE Hulpbronne op
++Comment[ar]=إعداد موارد KDE
+ Comment[be]=Настроіць рэсурсы KDE
+ Comment[bg]=Настройки на ресурсите на КДЕ
+ Comment[bn]=কে.ডি.ই. রিসোর্সসমূহ কনফিগার করো
+diff -Nrua kdelibs-release/ksmartcard/kardimpl/kcardgemsafe.desktop kdelibs-branch/ksmartcard/kardimpl/kcardgemsafe.desktop
+--- kdelibs-release/ksmartcard/kardimpl/kcardgemsafe.desktop 2004-11-12 02:27:53.000000000 -0500
++++ kdelibs-branch/ksmartcard/kardimpl/kcardgemsafe.desktop 2004-12-11 06:18:36.000000000 -0500
+@@ -10,6 +10,7 @@
+ X-KDE-Smartcard-SubSubType=gem3
+ Name=GemSafe Card Implementation
+ Name[af]=Gemsafe Kaart implementering
++Name[ar]=GemSafe Card تطبيق
+ Name[bg]=Реализация на карта GemSafe
+ Name[bn]=জেম-সেফ কার্ড ইমপ্লিমেন্টেশন
+ Name[bs]=GemSafe Card implementacija
+diff -Nrua kdelibs-release/ksmartcard/kardimpl/kcardgsm.desktop kdelibs-branch/ksmartcard/kardimpl/kcardgsm.desktop
+--- kdelibs-release/ksmartcard/kardimpl/kcardgsm.desktop 2004-11-12 02:27:53.000000000 -0500
++++ kdelibs-branch/ksmartcard/kardimpl/kcardgsm.desktop 2004-12-11 06:18:36.000000000 -0500
+@@ -10,6 +10,7 @@
+ X-KDE-Smartcard-SubSubType=gsm3
+ Name=GSM Card Implementation
+ Name[af]=GSM Kaart implementering
++Name[ar]=GSM Card تطبيق
+ Name[bg]=Реализация на карта GSM
+ Name[bn]=জি-এস-এম কার্ড ইমপ্লিমেন্টেশন
+ Name[bs]=GSM Card implementacija
+diff -Nrua kdelibs-release/kspell2/Makefile.am kdelibs-branch/kspell2/Makefile.am
+--- kdelibs-release/kspell2/Makefile.am 2004-05-03 23:44:31.000000000 -0400
++++ kdelibs-branch/kspell2/Makefile.am 2004-12-04 19:54:31.000000000 -0500
+@@ -1,24 +1,23 @@
+-SUBDIRS = ui . tests plugins
++SUBDIRS = . ui tests plugins
+ METASOURCES = AUTO
+
+-lib_LTLIBRARIES = libkspell2.la
++noinst_LTLIBRARIES = libkspell2base.la
+
+ AM_CPPFLAGS = -DKDE_NO_COMPAT -DQT_NO_COMPAT -I$(top_srcdir)/kutils $(all_includes)
+
+-kspell2includedir = $(includedir)/kspell2
++kspell2baseincludedir = $(includedir)/kspell2
+
+-kspell2include_HEADERS = settings.h filter.h \
++kspell2baseinclude_HEADERS = settings.h filter.h \
+ dictionary.h broker.h \
+ backgroundchecker.h defaultdictionary.h
+
+-libkspell2_la_SOURCES = settings.cpp broker.cpp \
++libkspell2base_la_SOURCES = settings.cpp broker.cpp \
+ client.cpp filter.cpp backgroundchecker.cpp \
+ backgroundthread.cpp backgroundengine.cpp \
+ defaultdictionary.cpp
+
+-libkspell2_la_LDFLAGS = -no-undefined -version-info 1:0:0 $(all_libraries)
+-libkspell2_la_LIBADD = $(LIB_KPARTS) ../kutils/libkutils.la ./ui/libkspell2ui.la
++libkspell2base_la_LDFLAGS = -no-undefined $(all_libraries)
++libkspell2base_la_LIBADD = $(LIB_KPARTS) ../kutils/libkutils.la
+
+ servicetype_DATA = kspellclient.desktop
+ servicetypedir = $(kde_servicetypesdir)
+-KDE_OPTIONS = nofinal
+diff -Nrua kdelibs-release/kspell2/kspellclient.desktop kdelibs-branch/kspell2/kspellclient.desktop
+--- kdelibs-release/kspell2/kspellclient.desktop 2004-11-12 02:27:53.000000000 -0500
++++ kdelibs-branch/kspell2/kspellclient.desktop 2004-12-11 06:18:37.000000000 -0500
+@@ -5,6 +5,7 @@
+ X-KDE-Derived=KPluginInfo
+ Comment=KSpell Client
+ Comment[af]=KSpel Klient
++Comment[ar]=عميل KSpell
+ Comment[be]=Кліент KSpell
+ Comment[bg]=Клиент на KSpell
+ Comment[bn]=কে-স্পেল ক্লায়েন্ট
+diff -Nrua kdelibs-release/kspell2/plugins/aspell/Makefile.am kdelibs-branch/kspell2/plugins/aspell/Makefile.am
+--- kdelibs-release/kspell2/plugins/aspell/Makefile.am 2004-05-01 01:32:17.000000000 -0400
++++ kdelibs-branch/kspell2/plugins/aspell/Makefile.am 2004-12-04 19:54:31.000000000 -0500
+@@ -7,7 +7,7 @@
+ kspell_aspell_la_SOURCES = kspell_aspellclient.cpp kspell_aspelldict.cpp
+
+ kspell_aspell_la_LDFLAGS = -module -no-undefined $(KDE_PLUGIN)
+-kspell_aspell_la_LIBADD = ../../libkspell2.la -laspell
++kspell_aspell_la_LIBADD = ../../ui/libkspell2.la -laspell
+
+ service_DATA = kspell_aspell.desktop
+ servicedir = $(kde_servicesdir)
+diff -Nrua kdelibs-release/kspell2/plugins/ispell/Makefile.am kdelibs-branch/kspell2/plugins/ispell/Makefile.am
+--- kdelibs-release/kspell2/plugins/ispell/Makefile.am 2004-05-01 01:32:17.000000000 -0400
++++ kdelibs-branch/kspell2/plugins/ispell/Makefile.am 2004-12-04 19:54:31.000000000 -0500
+@@ -14,7 +14,7 @@
+ ispell_checker.cpp
+
+ kspell_ispell_la_LDFLAGS = -module -no-undefined $(KDE_PLUGIN)
+-kspell_ispell_la_LIBADD = ../../libkspell2.la
++kspell_ispell_la_LIBADD = ../../ui/libkspell2.la
+
+ service_DATA = kspell_ispell.desktop
+ servicedir = $(kde_servicesdir)
+diff -Nrua kdelibs-release/kspell2/tests/Makefile.am kdelibs-branch/kspell2/tests/Makefile.am
+--- kdelibs-release/kspell2/tests/Makefile.am 2004-05-01 01:48:20.000000000 -0400
++++ kdelibs-branch/kspell2/tests/Makefile.am 2004-12-04 19:54:31.000000000 -0500
+@@ -6,19 +6,19 @@
+ test_dialog test_highlighter test_configdialog
+
+ test_SOURCES = test.cpp
+-test_LDADD = ../libkspell2.la $(LIB_KDECORE)
++test_LDADD = ../ui/libkspell2.la $(LIB_KDECORE)
+
+ test_filter_SOURCES = test_filter.cpp
+-test_filter_LDADD = ../libkspell2.la $(LIB_KDECORE)
++test_filter_LDADD = ../ui/libkspell2.la $(LIB_KDECORE)
+
+ backgroundtest_SOURCES = backgroundtest.cpp
+-backgroundtest_LDADD = ../libkspell2.la $(LIB_KDECORE)
++backgroundtest_LDADD = ../ui/libkspell2.la $(LIB_KDECORE)
+
+ test_dialog_SOURCES = test_dialog.cpp
+-test_dialog_LDADD = ../libkspell2.la $(LIB_KDECORE)
++test_dialog_LDADD = ../ui/libkspell2.la $(LIB_KDECORE)
+
+ test_highlighter_SOURCES = test_highlighter.cpp
+-test_highlighter_LDADD = ../libkspell2.la $(LIB_KDECORE)
++test_highlighter_LDADD = ../ui/libkspell2.la $(LIB_KDECORE)
+
+ test_configdialog_SOURCES = test_configdialog.cpp
+-test_configdialog_LDADD = ../libkspell2.la $(LIB_KDECORE)
++test_configdialog_LDADD = ../ui/libkspell2.la $(LIB_KDECORE)
+diff -Nrua kdelibs-release/kspell2/ui/Makefile.am kdelibs-branch/kspell2/ui/Makefile.am
+--- kdelibs-release/kspell2/ui/Makefile.am 2004-05-13 13:47:50.000000000 -0400
++++ kdelibs-branch/kspell2/ui/Makefile.am 2004-12-04 19:54:32.000000000 -0500
+@@ -1,6 +1,6 @@
+ METASOURCES = AUTO
+
+-noinst_LTLIBRARIES = libkspell2ui.la
++lib_LTLIBRARIES = libkspell2.la
+
+ KDE_CXXFLAGS = -DKDE_NO_COMPAT -DQT_NO_COMPAT
+ INCLUDES = -I$(top_srcdir)/kspell2 $(all_includes)
+@@ -9,8 +9,9 @@
+ kspell2include_HEADERS = dialog.h highlighter.h configdialog.h \
+ configwidget.h
+
+-libkspell2ui_la_SOURCES = kspell2ui.ui dialog.cpp \
++libkspell2_la_SOURCES = kspell2ui.ui dialog.cpp \
+ highlighter.cpp configui.ui configdialog.cpp \
+ configwidget.cpp
+
+-libkspell2ui_la_LDFLAGS = -no-undefined $(all_libraries)
++libkspell2_la_LDFLAGS = -no-undefined -version-info 1:0:0 $(all_libraries)
++libkspell2_la_LIBADD = ../libkspell2base.la
+diff -Nrua kdelibs-release/kutils/kplugininfo.desktop kdelibs-branch/kutils/kplugininfo.desktop
+--- kdelibs-release/kutils/kplugininfo.desktop 2004-10-30 02:38:19.000000000 -0400
++++ kdelibs-branch/kutils/kplugininfo.desktop 2004-12-11 06:18:37.000000000 -0500
+@@ -23,6 +23,7 @@
+ Name[fa]=اطلاعات متصلکنندهی KDE
+ Name[fi]=KDE:n lisäosatiedot
+ Name[fr]=Information sur le module KDE
++Name[ga]=Eolas Bhreiseán KDE
+ Name[gl]=Información de Plugin de KDE
+ Name[he]=מידע על תוספים של KDE
+ Name[hi]=केडीई प्लगिन जानकारी
+diff -Nrua kdelibs-release/mimetypes/application/vnd.mozilla.xul+xml.desktop kdelibs-branch/mimetypes/application/vnd.mozilla.xul+xml.desktop
+--- kdelibs-release/mimetypes/application/vnd.mozilla.xul+xml.desktop 2004-11-12 02:27:54.000000000 -0500
++++ kdelibs-branch/mimetypes/application/vnd.mozilla.xul+xml.desktop 2004-12-11 06:18:37.000000000 -0500
+@@ -7,6 +7,7 @@
+ Patterns=*.xul;*.XUL;
+ Comment=Mozilla XUL File
+ Comment[af]=Mozilla XUL Lêer
++Comment[ar]=ملف Mozilla XUL
+ Comment[be]=Файл Mozilla XUL
+ Comment[bg]=Файл XUL на Мозила
+ Comment[bn]=মোজিলা এক্স-ইউ-এল ফাইল
+@@ -19,6 +20,7 @@
+ Comment[et]=Mozilla XUL fail
+ Comment[fi]=Mozilla XUL-tiedosto
+ Comment[fr]=Fichier XUL Mozilla
++Comment[ga]=Comhad Mozilla XUL
+ Comment[he]=קובץ XUL של מוזילה
+ Comment[hu]=Mozilla XUL-fájl
+ Comment[is]=Mozilla XUL skrá
+diff -Nrua kdelibs-release/mimetypes/application/vnd.stardivision.chart.desktop kdelibs-branch/mimetypes/application/vnd.stardivision.chart.desktop
+--- kdelibs-release/mimetypes/application/vnd.stardivision.chart.desktop 2004-11-12 02:27:54.000000000 -0500
++++ kdelibs-branch/mimetypes/application/vnd.stardivision.chart.desktop 2004-12-11 06:18:37.000000000 -0500
+@@ -6,6 +6,7 @@
+ Icon=kchart_chrt
+ Comment=StarOffice Chart
+ Comment[af]=StarOffice Kaart
++Comment[ar]=تخطيط StarOffice
+ Comment[bg]=Документ на StarOffice Chart
+ Comment[bn]=স্টার-অফিস চার্ট
+ Comment[bs]=StarOffice grafikon
+@@ -18,6 +19,7 @@
+ Comment[es]=Hoja de cálculo de StarOffice
+ Comment[fi]=StarOffice-kaavio
+ Comment[fr]=Diagramme StarOffice
++Comment[ga]=Cairt StarOffice
+ Comment[hu]=StarOfice-diagram
+ Comment[is]=StarOffice tafla
+ Comment[it]=Diagramma StarOffice
+diff -Nrua kdelibs-release/mimetypes/application/vnd.stardivision.draw.desktop kdelibs-branch/mimetypes/application/vnd.stardivision.draw.desktop
+--- kdelibs-release/mimetypes/application/vnd.stardivision.draw.desktop 2004-11-12 02:27:54.000000000 -0500
++++ kdelibs-branch/mimetypes/application/vnd.stardivision.draw.desktop 2004-12-11 06:18:37.000000000 -0500
+@@ -20,6 +20,7 @@
+ Comment[et]=StarOffice joonis
+ Comment[fi]=StarOffice-piirros
+ Comment[fr]=Dessin StarOffice
++Comment[ga]=Dearadh StarOffice
+ Comment[he]=ציור של StarOffice
+ Comment[hu]=StarOffice-rajz
+ Comment[is]=StarOffice teikning
+diff -Nrua kdelibs-release/mimetypes/application/vnd.stardivision.math.desktop kdelibs-branch/mimetypes/application/vnd.stardivision.math.desktop
+--- kdelibs-release/mimetypes/application/vnd.stardivision.math.desktop 2004-11-12 02:27:54.000000000 -0500
++++ kdelibs-branch/mimetypes/application/vnd.stardivision.math.desktop 2004-12-11 06:18:37.000000000 -0500
+@@ -6,6 +6,7 @@
+ Icon=kformula_kfo
+ Comment=StarOffice Math Document
+ Comment[af]=StarOffice Wiskunde Dokument
++Comment[ar]=مستند StarOffice Math
+ Comment[be]=Дакумэнт StarOffice Math
+ Comment[bg]=Документ на StarOffice Math
+ Comment[bn]=স্টার-অফিস ম্যাথ নথী
+diff -Nrua kdelibs-release/mimetypes/application/vnd.stardivision.writer-global.desktop kdelibs-branch/mimetypes/application/vnd.stardivision.writer-global.desktop
+--- kdelibs-release/mimetypes/application/vnd.stardivision.writer-global.desktop 2004-11-12 02:27:54.000000000 -0500
++++ kdelibs-branch/mimetypes/application/vnd.stardivision.writer-global.desktop 2004-12-11 06:18:37.000000000 -0500
+@@ -6,6 +6,7 @@
+ Icon=wordprocessing
+ Comment=StarOffice Writer Master Document
+ Comment[af]=StarOffice Writer Meester Dokument
++Comment[ar]=مستند StarOffice Writer Master
+ Comment[bg]=Главен документ на StarOffice Writer
+ Comment[bn]=স্টার-অফিস রাইটার মাস্টার নথী
+ Comment[bs]=StarOffice Writer glavni dokument
+diff -Nrua kdelibs-release/mimetypes/application/vnd.sun.xml.calc.desktop kdelibs-branch/mimetypes/application/vnd.sun.xml.calc.desktop
+--- kdelibs-release/mimetypes/application/vnd.sun.xml.calc.desktop 2004-10-30 02:38:20.000000000 -0400
++++ kdelibs-branch/mimetypes/application/vnd.sun.xml.calc.desktop 2004-12-11 06:18:37.000000000 -0500
+@@ -22,6 +22,7 @@
+ Comment[fa]=صفحهگستردهی OpenOffice.org
+ Comment[fi]=OpenOffice.org-taulukko
+ Comment[fr]=Feuille de calcul OpenOffice.org
++Comment[ga]=Scarbhileog OpenOffice.org
+ Comment[gl]=Folla de Cálculo de OpenOffice.org
+ Comment[he]=גיליון אלקטרוני של OpenOffice.org
+ Comment[hi]=स्टारआफिस.ऑर्ग स्प्रेडशीट
+diff -Nrua kdelibs-release/mimetypes/application/vnd.sun.xml.calc.template.desktop kdelibs-branch/mimetypes/application/vnd.sun.xml.calc.template.desktop
+--- kdelibs-release/mimetypes/application/vnd.sun.xml.calc.template.desktop 2004-11-12 02:27:54.000000000 -0500
++++ kdelibs-branch/mimetypes/application/vnd.sun.xml.calc.template.desktop 2004-12-11 06:18:37.000000000 -0500
+@@ -2,6 +2,7 @@
+ Encoding=UTF-8
+ Comment=OpenOffice.org Spreadsheet Template
+ Comment[af]=OpenOffice.org Spreiblad Voorbeeld
++Comment[ar]=قالب OpenOffice.org Spreadsheet
+ Comment[be]=Шаблён электроннай табліцы OpenOffice.org
+ Comment[bg]=Шаблон на OpenOffice.org Spreadsheet
+ Comment[bn]=ওপেন-অফিস.অর্গ স্প্রেডশিট টেম্প্লেট
+diff -Nrua kdelibs-release/mimetypes/application/vnd.sun.xml.draw.desktop kdelibs-branch/mimetypes/application/vnd.sun.xml.draw.desktop
+--- kdelibs-release/mimetypes/application/vnd.sun.xml.draw.desktop 2004-11-22 03:34:04.000000000 -0500
++++ kdelibs-branch/mimetypes/application/vnd.sun.xml.draw.desktop 2004-12-11 06:18:37.000000000 -0500
+@@ -21,6 +21,7 @@
+ Comment[fa]=ترسیم OpenOffice.org
+ Comment[fi]=OpenOffice.org-piirros
+ Comment[fr]=Dessin OpenOffice.org
++Comment[ga]=Dearadh OpenOffice.org
+ Comment[gl]=Debuxo de OpenOffice.org
+ Comment[he]=ציור של OpenOffice.org
+ Comment[hi]=ओपनआफिस.ऑर्ग ड्राइंग
+diff -Nrua kdelibs-release/mimetypes/application/vnd.sun.xml.draw.template.desktop kdelibs-branch/mimetypes/application/vnd.sun.xml.draw.template.desktop
+--- kdelibs-release/mimetypes/application/vnd.sun.xml.draw.template.desktop 2004-11-15 02:54:58.000000000 -0500
++++ kdelibs-branch/mimetypes/application/vnd.sun.xml.draw.template.desktop 2004-12-11 06:18:37.000000000 -0500
+@@ -2,6 +2,7 @@
+ Encoding=UTF-8
+ Comment=OpenOffice.org Drawing Template
+ Comment[af]=OpenOffice.org Tekening Voorbeeld
++Comment[ar]=قالب OpenOffice.org Drawing
+ Comment[be]=Шаблён малюнку OpenOffice.org
+ Comment[bg]=Шаблон на OpenOffice.org Drawing
+ Comment[bn]=ওপেন-অফিস.অর্গ ড্রয়িং টেম্প্লেট
+diff -Nrua kdelibs-release/mimetypes/application/vnd.sun.xml.impress.template.desktop kdelibs-branch/mimetypes/application/vnd.sun.xml.impress.template.desktop
+--- kdelibs-release/mimetypes/application/vnd.sun.xml.impress.template.desktop 2004-11-12 02:27:54.000000000 -0500
++++ kdelibs-branch/mimetypes/application/vnd.sun.xml.impress.template.desktop 2004-12-11 06:18:37.000000000 -0500
+@@ -2,6 +2,7 @@
+ Encoding=UTF-8
+ Comment=OpenOffice.org Presentation Template
+ Comment[af]=OpenOffice.org Voorlegging
++Comment[ar]=قالب OpenOffice.org Presentation
+ Comment[be]=Шаблён прэзэнтацыі OpenOffice.org
+ Comment[bg]=Шаблон на OpenOffice.org Presentation
+ Comment[bn]=ওপেন-অফিস.অর্গ প্রেসেন্টেশন টেম্প্লেট
+diff -Nrua kdelibs-release/mimetypes/application/vnd.sun.xml.writer.master.desktop kdelibs-branch/mimetypes/application/vnd.sun.xml.writer.master.desktop
+--- kdelibs-release/mimetypes/application/vnd.sun.xml.writer.master.desktop 2004-11-12 02:27:54.000000000 -0500
++++ kdelibs-branch/mimetypes/application/vnd.sun.xml.writer.master.desktop 2004-12-11 06:18:37.000000000 -0500
+@@ -2,6 +2,7 @@
+ Encoding=UTF-8
+ Comment=OpenOffice.org Master Text Document
+ Comment[af]=OpenOffice.org Meester Teks Dokument
++Comment[ar]=مستند نصّي OpenOffice.org Master
+ Comment[bg]=Главен документ на OpenOffice.org Writer
+ Comment[bn]=ওপেন-অফিস.অর্গ মাস্টার টেক্সট নথী
+ Comment[bs]=OpenOffice.org glavni tekst dokument
+diff -Nrua kdelibs-release/mimetypes/application/vnd.sun.xml.writer.template.desktop kdelibs-branch/mimetypes/application/vnd.sun.xml.writer.template.desktop
+--- kdelibs-release/mimetypes/application/vnd.sun.xml.writer.template.desktop 2004-11-12 02:27:54.000000000 -0500
++++ kdelibs-branch/mimetypes/application/vnd.sun.xml.writer.template.desktop 2004-12-11 06:18:37.000000000 -0500
+@@ -2,6 +2,7 @@
+ Encoding=UTF-8
+ Comment=OpenOffice.org Text Document Template
+ Comment[af]=OpenOffice.org Teks Dokument Voorbeeld
++Comment[ar]=قالب مستند نصّي OpenOffice.org
+ Comment[be]=Шаблён тэкставы дакумэнт OpenOffice.org
+ Comment[bg]=Шаблон на OpenOffice.org Text Document
+ Comment[bn]=ওপেন-অফিস.অর্গ টেক্সট নথী টেম্প্লেট
+diff -Nrua kdelibs-release/mimetypes/application/x-bz2dvi.desktop kdelibs-branch/mimetypes/application/x-bz2dvi.desktop
+--- kdelibs-release/mimetypes/application/x-bz2dvi.desktop 2004-11-12 02:27:54.000000000 -0500
++++ kdelibs-branch/mimetypes/application/x-bz2dvi.desktop 2004-12-11 06:18:37.000000000 -0500
+@@ -2,6 +2,7 @@
+ Encoding=UTF-8
+ Comment=Bzip2 Compressed DVI File
+ Comment[af]=Bzip2 gekompakteerde DVI Lêer
++Comment[ar]=ملف DVI مضغوط بـ Bzip2
+ Comment[bg]=Компресиран файл DVI с bzip2
+ Comment[bn]=বি-জিপ-২ (Bzip2) কম্প্রেসকৃত ডি-ভি-আই ফাইল
+ Comment[bs]=Bzip2 komprimirana DVI datoteka
+@@ -13,6 +14,7 @@
+ Comment[et]=Bzip2 tihendusega DVI fail
+ Comment[fi]=Bzip2-pakattu DVI-tiedosto
+ Comment[fr]=Fichier DVI compacté avec Bzip2
++Comment[ga]=Comhad DVI comhbhrúite le bzip2
+ Comment[he]=קובץ DVI דחוס באמצעות Bzip2
+ Comment[hu]=Bzip2-vel tömörített DVI-fájl
+ Comment[is]=Bzip2 þjöppuð DVI skrá
+diff -Nrua kdelibs-release/mimetypes/application/x-executable-script.desktop kdelibs-branch/mimetypes/application/x-executable-script.desktop
+--- kdelibs-release/mimetypes/application/x-executable-script.desktop 2004-11-12 02:27:54.000000000 -0500
++++ kdelibs-branch/mimetypes/application/x-executable-script.desktop 2004-12-11 06:18:38.000000000 -0500
+@@ -2,6 +2,7 @@
+ Encoding=UTF-8
+ Comment=Script (possibly executable)
+ Comment[af]=Skrip (moointlik uitvoerbaar)
++Comment[ar]=Script (ربما قابلة للتنفيذ)
+ Comment[bg]=Скрипт (вероятно изпълним)
+ Comment[bn]=স্ক্রিপ্ট (সম্ভবত এক্সিকিউটেবল)
+ Comment[bs]=Skripta (možda izvršiva)
+@@ -13,6 +14,7 @@
+ Comment[et]=Käivitatav skript
+ Comment[fi]=Skripti (mahdollisesti suoritettava)
+ Comment[fr]=Script (peut-être exécutable)
++Comment[ga]=Script (b'fhéidir inrite)
+ Comment[he]=תסריט הנראה כניתן להרצה
+ Comment[hu]=Szkript (általában futtatható)
+ Comment[is]=Skeljaforrit (sem er ef til vill keyranlegt)
+diff -Nrua kdelibs-release/mimetypes/application/x-executable.desktop kdelibs-branch/mimetypes/application/x-executable.desktop
+--- kdelibs-release/mimetypes/application/x-executable.desktop 2004-10-30 02:38:21.000000000 -0400
++++ kdelibs-branch/mimetypes/application/x-executable.desktop 2004-12-11 06:18:38.000000000 -0500
+@@ -36,7 +36,7 @@
+ Comment[ms]=Fail Boleh Laksana
+ Comment[mt]=Programm
+ Comment[nb]=Program
+-Comment[nds]=Datei, laat sik utföhren
++Comment[nds]=Datei, lett sik utföhren
+ Comment[nl]=Uitvoerbaar bestand
+ Comment[nn]=Køyrbar fil
+ Comment[nso]=Faele yeo e Phethagatsegago
+diff -Nrua kdelibs-release/mimetypes/application/x-gzdvi.desktop kdelibs-branch/mimetypes/application/x-gzdvi.desktop
+--- kdelibs-release/mimetypes/application/x-gzdvi.desktop 2004-11-12 02:27:54.000000000 -0500
++++ kdelibs-branch/mimetypes/application/x-gzdvi.desktop 2004-12-11 06:18:38.000000000 -0500
+@@ -2,6 +2,7 @@
+ Encoding=UTF-8
+ Comment=Gzip Compressed DVI File
+ Comment[af]=Gzip Gekompakteerde DVI Lêer
++Comment[ar]=ملف DVI مضغوط بـ Gzip
+ Comment[bg]=Компресиран файл DVI с gzip
+ Comment[bn]=জি-জিপকৃত (gzipped) ডি-ভি-আই ফাইল
+ Comment[bs]=Gzip komprimirana DVI datoteka
+diff -Nrua kdelibs-release/mimetypes/application/x-ica.desktop kdelibs-branch/mimetypes/application/x-ica.desktop
+--- kdelibs-release/mimetypes/application/x-ica.desktop 2004-11-13 02:20:19.000000000 -0500
++++ kdelibs-branch/mimetypes/application/x-ica.desktop 2004-12-11 06:18:38.000000000 -0500
+@@ -3,6 +3,7 @@
+ MimeType=application/x-ica
+ Comment=Citrix ICA Client Configuration
+ Comment[af]=Citrix ICA Klient Opstelling
++Comment[ar]=إعداد عميل Citrix ICA
+ Comment[bg]=Конфигурация на клиент Citrix ICA
+ Comment[bn]=সাইট্রিক্স ICA ক্লায়েন্ট কনফিগারেশন
+ Comment[bs]=Citrix ICA Client postavke
+diff -Nrua kdelibs-release/mimetypes/application/x-iso.desktop kdelibs-branch/mimetypes/application/x-iso.desktop
+--- kdelibs-release/mimetypes/application/x-iso.desktop 2004-11-12 02:27:54.000000000 -0500
++++ kdelibs-branch/mimetypes/application/x-iso.desktop 2004-12-11 06:18:38.000000000 -0500
+@@ -5,6 +5,7 @@
+ Icon=cdtrack
+ Comment=ISO9660 Image File
+ Comment[af]=ISO9660 CD-Beeld Leêr
++Comment[ar]=ملف صورة ISO9660
+ Comment[be]=Файл вобразу ISO9660
+ Comment[bg]=Файл снимка ISO9660
+ Comment[bn]=ISO9660 ইমেজ ফাইল
+diff -Nrua kdelibs-release/mimetypes/application/x-javascript.desktop kdelibs-branch/mimetypes/application/x-javascript.desktop
+--- kdelibs-release/mimetypes/application/x-javascript.desktop 2004-11-12 02:27:54.000000000 -0500
++++ kdelibs-branch/mimetypes/application/x-javascript.desktop 2004-12-11 06:18:38.000000000 -0500
+@@ -5,6 +5,7 @@
+ Patterns=*.js;
+ Comment=JavaScript File
+ Comment[af]=JavaScript Lêer
++Comment[ar]=ملف جافا سكريبت
+ Comment[be]=Файл JavaScript
+ Comment[bg]=Изходен код на JavaScript
+ Comment[bn]=জাভাস্ক্রিপ্ট ফাইল
+diff -Nrua kdelibs-release/mimetypes/application/x-msmetafile.desktop kdelibs-branch/mimetypes/application/x-msmetafile.desktop
+--- kdelibs-release/mimetypes/application/x-msmetafile.desktop 2004-10-30 02:38:21.000000000 -0400
++++ kdelibs-branch/mimetypes/application/x-msmetafile.desktop 2004-12-11 06:18:38.000000000 -0500
+@@ -17,6 +17,7 @@
+ Comment[et]=Microsoft MetaFile
+ Comment[fi]=Microsoft Metatiedosto
+ Comment[fr]=Métafichier Microsoft
++Comment[ga]=Meiteachomhad Microsoft
+ Comment[he]=מטא-קובץ של Microsoft
+ Comment[hr]=Microsoft metadatoteka
+ Comment[hu]=Microsoft-metafájl
+diff -Nrua kdelibs-release/mimetypes/application/x-object.desktop kdelibs-branch/mimetypes/application/x-object.desktop
+--- kdelibs-release/mimetypes/application/x-object.desktop 2004-08-24 02:29:49.000000000 -0400
++++ kdelibs-branch/mimetypes/application/x-object.desktop 2004-12-11 06:18:38.000000000 -0500
+@@ -25,6 +25,7 @@
+ Comment[fa]=کد موضوعی
+ Comment[fi]=Objektikoodi
+ Comment[fr]=Code objet
++Comment[ga]=Cód Oibiachta
+ Comment[gl]=Código Obxecto
+ Comment[he]=קוד אובייקט
+ Comment[hi]=ऑब्जेक्ट कोड
+diff -Nrua kdelibs-release/mimetypes/application/x-pak.desktop kdelibs-branch/mimetypes/application/x-pak.desktop
+--- kdelibs-release/mimetypes/application/x-pak.desktop 2004-11-12 02:27:54.000000000 -0500
++++ kdelibs-branch/mimetypes/application/x-pak.desktop 2004-12-11 06:18:38.000000000 -0500
+@@ -6,6 +6,7 @@
+ Patterns=*.pak;*.PAK;
+ Comment=PAK File Archive
+ Comment[af]=PAK Argief
++Comment[ar]=أرشيف ملف PAK
+ Comment[be]=Архіў PAK
+ Comment[bg]=Архив PAK
+ Comment[bn]=PAK ফাইল আর্কাইভ
+diff -Nrua kdelibs-release/mimetypes/application/x-python-bytecode.desktop kdelibs-branch/mimetypes/application/x-python-bytecode.desktop
+--- kdelibs-release/mimetypes/application/x-python-bytecode.desktop 2004-10-30 02:38:21.000000000 -0400
++++ kdelibs-branch/mimetypes/application/x-python-bytecode.desktop 2004-12-11 06:18:38.000000000 -0500
+@@ -25,6 +25,7 @@
+ Comment[fa]=کدبایت Python
+ Comment[fi]=Python-tavukoodi
+ Comment[fr]=Bytecode Python
++Comment[ga]=Beartchód Python
+ Comment[gl]=Bytecode de Python
+ Comment[he]=קוד בתים של Python
+ Comment[hi]=पायथन बाइटकोड
+diff -Nrua kdelibs-release/mimetypes/application/x-tex-pk.desktop kdelibs-branch/mimetypes/application/x-tex-pk.desktop
+--- kdelibs-release/mimetypes/application/x-tex-pk.desktop 2004-11-09 02:35:29.000000000 -0500
++++ kdelibs-branch/mimetypes/application/x-tex-pk.desktop 2004-12-11 06:18:38.000000000 -0500
+@@ -21,6 +21,7 @@
+ Comment[fa]=قلم جمع
+ Comment[fi]=Pakattu kirjasin
+ Comment[fr]=Police de caractères compactée
++Comment[ga]=Clófhoireann Phacáilte
+ Comment[gl]=Fonte Empaquetada
+ Comment[he]=גופן ארוז
+ Comment[hi]=पैक्ड फ़ॉन्ट
+diff -Nrua kdelibs-release/mimetypes/application/x-vnd.kde.kplato.desktop kdelibs-branch/mimetypes/application/x-vnd.kde.kplato.desktop
+--- kdelibs-release/mimetypes/application/x-vnd.kde.kplato.desktop 2004-11-12 02:27:54.000000000 -0500
++++ kdelibs-branch/mimetypes/application/x-vnd.kde.kplato.desktop 2004-12-11 06:18:38.000000000 -0500
+@@ -4,6 +4,7 @@
+ MimeType=application/x-vnd.kde.kplato
+ Comment=KPlato Project Management Document
+ Comment[af]=KPlato Projek Bestuur Dokument
++Comment[ar]=مستند إدارة مشاريع KPlato
+ Comment[bg]=Документ на KPlato Project Management
+ Comment[bn]=কে-প্লেটো প্রোজেক্ট ম্যানেজমেন্ট নথী
+ Comment[bs]=KPlato Menadžment projektima dokument
+diff -Nrua kdelibs-release/mimetypes/audio/mpeg.desktop kdelibs-branch/mimetypes/audio/mpeg.desktop
+--- kdelibs-release/mimetypes/audio/mpeg.desktop 2004-11-22 03:34:05.000000000 -0500
++++ kdelibs-branch/mimetypes/audio/mpeg.desktop 2004-12-11 06:18:38.000000000 -0500
+@@ -8,6 +8,7 @@
+ Icon=sound
+ Comment=MPEG Audio
+ Comment[af]=MPEG Klank
++Comment[ar]=صوت MPEG
+ Comment[be]=MPEG аўдыё
+ Comment[bg]=Аудио файл MPEG
+ Comment[bn]=এমপেগ অডিও
+@@ -23,6 +24,7 @@
+ Comment[et]=MPEG audiofail
+ Comment[fi]=MPEG-ääni
+ Comment[fr]=Son MPEG
++Comment[ga]=Fuaim MPEG
+ Comment[he]=שמע MPEG
+ Comment[hu]=MPEG-hangfájl
+ Comment[is]=MPEG hljóðskrá
+diff -Nrua kdelibs-release/mimetypes/audio/x-mp2.desktop kdelibs-branch/mimetypes/audio/x-mp2.desktop
+--- kdelibs-release/mimetypes/audio/x-mp2.desktop 2004-11-12 02:27:54.000000000 -0500
++++ kdelibs-branch/mimetypes/audio/x-mp2.desktop 2004-12-11 06:18:38.000000000 -0500
+@@ -7,6 +7,7 @@
+ X-KDE-IsAlso=audio/mpeg
+ Comment=MPEG Layer 2 Audio
+ Comment[af]=MPEG Vlak 2 Klank
++Comment[ar]=صوت MPEG Layer 2
+ Comment[be]=MPEG Layer 2 аўдыё
+ Comment[bg]=Аудио файл MP2
+ Comment[bn]=এমপেগ লেয়ার ২ অডিও
+diff -Nrua kdelibs-release/mimetypes/audio/x-musepack.desktop kdelibs-branch/mimetypes/audio/x-musepack.desktop
+--- kdelibs-release/mimetypes/audio/x-musepack.desktop 2004-10-30 02:38:26.000000000 -0400
++++ kdelibs-branch/mimetypes/audio/x-musepack.desktop 2004-12-11 06:18:38.000000000 -0500
+@@ -19,6 +19,7 @@
+ Comment[et]=Musepack audiofail
+ Comment[fi]=Musepack-ääni
+ Comment[fr]=Son Musepack
++Comment[ga]=Fuaim Musepack
+ Comment[he]=MusePack שמע
+ Comment[hu]=Musepack-hangfájl
+ Comment[is]=Musepack hljóðskrá
+diff -Nrua kdelibs-release/mimetypes/image/x-exr.desktop kdelibs-branch/mimetypes/image/x-exr.desktop
+--- kdelibs-release/mimetypes/image/x-exr.desktop 2004-11-12 02:27:55.000000000 -0500
++++ kdelibs-branch/mimetypes/image/x-exr.desktop 2004-12-11 06:18:39.000000000 -0500
+@@ -21,6 +21,7 @@
+ Comment[et]=ILM EXR pildifail
+ Comment[fi]=ILM EXR -kuva
+ Comment[fr]=Image ILM EXR
++Comment[ga]=Íomhá ILM EXR
+ Comment[he]=תמונת ILM EXR
+ Comment[hr]=ILM EXR slika
+ Comment[hu]=ILM EXR-kép
+diff -Nrua kdelibs-release/mimetypes/text/x-ldif.desktop kdelibs-branch/mimetypes/text/x-ldif.desktop
+--- kdelibs-release/mimetypes/text/x-ldif.desktop 2004-10-30 02:38:30.000000000 -0400
++++ kdelibs-branch/mimetypes/text/x-ldif.desktop 2004-12-11 06:18:39.000000000 -0500
+@@ -22,6 +22,7 @@
+ Comment[fa]=دفترنشانی LDAP
+ Comment[fi]=LDAP-osoitekirja
+ Comment[fr]=Carnet d'adresses LDAP
++Comment[ga]=Leabhar Seoltaí LDAP
+ Comment[gl]=Caderno de Enderezos LDAP
+ Comment[he]=ספר כתובת מבוסס LDAP
+ Comment[hi]=LDAP पता पुस्तिका
+diff -Nrua kdelibs-release/mimetypes/text/x-xslt.desktop kdelibs-branch/mimetypes/text/x-xslt.desktop
+--- kdelibs-release/mimetypes/text/x-xslt.desktop 2004-11-22 03:34:05.000000000 -0500
++++ kdelibs-branch/mimetypes/text/x-xslt.desktop 2004-12-11 06:18:39.000000000 -0500
+@@ -21,6 +21,7 @@
+ Comment[fa]=پروندهی صفحهگستردهی XSLT
+ Comment[fi]=XSLT-tyylitiedosto
+ Comment[fr]=Feuille de style XSLT
++Comment[ga]=Stílbhileog XSLT
+ Comment[he]=קובץ גיליון סגנון XSLT
+ Comment[hi]=XSLT स्टाइलशीट फ़ाइल
+ Comment[hr]=XSLT datoteka s opisom stila
+diff -Nrua kdelibs-release/pics/crystalsvg/index.theme kdelibs-branch/pics/crystalsvg/index.theme
+--- kdelibs-release/pics/crystalsvg/index.theme 2004-11-12 02:27:55.000000000 -0500
++++ kdelibs-branch/pics/crystalsvg/index.theme 2004-12-11 06:18:39.000000000 -0500
+@@ -17,6 +17,7 @@
+ Name[uz]=Кристал SVG бета1
+ Comment=Icon Theme by Everaldo.com Design Studio
+ Comment[af]=Ikoon Tema deur Everaldo.com Design Studio
++Comment[ar]=سمات أيقونات من استديوهات تصميم Everaldo.com
+ Comment[be]=Тэма піктаграмаў ад студыі дызайну Everaldo.com
+ Comment[bg]=Тема с икони от Евералдо (www.everaldo.com)
+ Comment[bn]=এভারাল্ডোর (www.everaldo.com) তৈরি আইকন থিম
Modified: branches/kde-3.3.2/kdelibs/debian/patches/02_autotools_update.diff
===================================================================
--- branches/kde-3.3.2/kdelibs/debian/patches/02_autotools_update.diff 2004-12-14 03:07:46 UTC (rev 306)
+++ branches/kde-3.3.2/kdelibs/debian/patches/02_autotools_update.diff 2004-12-14 14:28:37 UTC (rev 307)
@@ -1,6 +1,5 @@
-diff -Nrua kdelibs-3.3.1/admin/compile kdelibs-patched/admin/compile
---- kdelibs-3.3.1/admin/compile 2002-09-30 07:18:17.000000000 -0500
-+++ kdelibs-patched/admin/compile 2004-09-19 17:51:50.000000000 -0500
+--- kdelibs-orig/admin/compile
++++ kdelibs-patched/admin/compile
@@ -1,8 +1,9 @@
#! /bin/sh
-
@@ -180,9 +179,8 @@
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-end: "$"
+# End:
-diff -Nrua kdelibs-3.3.1/admin/config.guess kdelibs-patched/admin/config.guess
---- kdelibs-3.3.1/admin/config.guess 2004-08-02 09:17:40.000000000 -0500
-+++ kdelibs-patched/admin/config.guess 2004-08-25 09:25:50.000000000 -0500
+--- kdelibs-orig/admin/config.guess
++++ kdelibs-patched/admin/config.guess
@@ -3,7 +3,7 @@
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
# 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
@@ -244,9 +242,8 @@
esac
echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
exit 0 ;;
-diff -Nrua kdelibs-3.3.1/admin/depcomp kdelibs-patched/admin/depcomp
---- kdelibs-3.3.1/admin/depcomp 2003-04-16 16:53:18.000000000 -0500
-+++ kdelibs-patched/admin/depcomp 2004-09-19 17:51:50.000000000 -0500
+--- kdelibs-orig/admin/depcomp
++++ kdelibs-patched/admin/depcomp
@@ -1,7 +1,9 @@
#! /bin/sh
-
@@ -717,9 +714,8 @@
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-end: "$"
+# End:
-diff -Nrua kdelibs-3.3.1/admin/install-sh kdelibs-patched/admin/install-sh
---- kdelibs-3.3.1/admin/install-sh 2003-08-07 04:41:31.000000000 -0500
-+++ kdelibs-patched/admin/install-sh 2004-09-19 17:51:50.000000000 -0500
+--- kdelibs-orig/admin/install-sh
++++ kdelibs-patched/admin/install-sh
@@ -1,19 +1,38 @@
#!/bin/sh
-#
@@ -1268,9 +1264,8 @@
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-end: "$"
+# End:
-diff -Nrua kdelibs-3.3.1/admin/missing kdelibs-patched/admin/missing
---- kdelibs-3.3.1/admin/missing 2002-10-26 11:44:28.000000000 -0500
-+++ kdelibs-patched/admin/missing 2004-09-19 17:51:50.000000000 -0500
+--- kdelibs-orig/admin/missing
++++ kdelibs-patched/admin/missing
@@ -1,6 +1,10 @@
#! /bin/sh
# Common stub for a few missing GNU programs while installing.
@@ -1527,9 +1522,8 @@
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-end: "$"
+# End:
-diff -Nrua kdelibs-3.3.1/admin/mkinstalldirs kdelibs-patched/admin/mkinstalldirs
---- kdelibs-3.3.1/admin/mkinstalldirs 2002-10-26 11:53:16.000000000 -0500
-+++ kdelibs-patched/admin/mkinstalldirs 2004-09-19 17:51:50.000000000 -0500
+--- kdelibs-orig/admin/mkinstalldirs
++++ kdelibs-patched/admin/mkinstalldirs
@@ -1,20 +1,32 @@
#! /bin/sh
# mkinstalldirs --- make directory hierarchy
@@ -1654,9 +1648,8 @@
+# time-stamp-end: "$"
# End:
-# mkinstalldirs ends here
-diff -Nrua kdelibs-3.3.1/admin/ylwrap kdelibs-patched/admin/ylwrap
---- kdelibs-3.3.1/admin/ylwrap 2001-10-04 19:46:36.000000000 -0500
-+++ kdelibs-patched/admin/ylwrap 2004-09-19 17:51:50.000000000 -0500
+--- kdelibs-orig/admin/ylwrap
++++ kdelibs-patched/admin/ylwrap
@@ -1,6 +1,11 @@
#! /bin/sh
# ylwrap - wrapper for lex/yacc invocations.
Modified: branches/kde-3.3.2/kdelibs/debian/patches/03_libtool_arm.diff
===================================================================
--- branches/kde-3.3.2/kdelibs/debian/patches/03_libtool_arm.diff 2004-12-14 03:07:46 UTC (rev 306)
+++ branches/kde-3.3.2/kdelibs/debian/patches/03_libtool_arm.diff 2004-12-14 14:28:37 UTC (rev 307)
@@ -1,6 +1,5 @@
-diff -Nrua kdelibs-3.2.92/admin/libtool.m4.in kdelibs-patched/admin/libtool.m4.in
---- kdelibs-3.2.92/admin/libtool.m4.in 2004-04-02 09:39:50.000000000 -0600
-+++ kdelibs-patched/admin/libtool.m4.in 2004-07-26 15:57:35.000000000 -0500
+--- kdelibs-orig/admin/libtool.m4.in
++++ kdelibs-patched/admin/libtool.m4.in
@@ -2180,17 +2180,7 @@
# This must be Linux ELF.
Modified: branches/kde-3.3.2/kdelibs/debian/patches/04_am_maintainer_mode.diff
===================================================================
--- branches/kde-3.3.2/kdelibs/debian/patches/04_am_maintainer_mode.diff 2004-12-14 03:07:46 UTC (rev 306)
+++ branches/kde-3.3.2/kdelibs/debian/patches/04_am_maintainer_mode.diff 2004-12-14 14:28:37 UTC (rev 307)
@@ -1,6 +1,5 @@
-diff -Nrua kdelibs-3.2.92/configure.in.in kdelibs-patched/configure.in.in
---- kdelibs-3.2.92/configure.in.in 2004-02-26 15:15:43.000000000 -0600
-+++ kdelibs-patched/configure.in.in 2004-07-26 16:00:17.000000000 -0500
+--- kdelibs-orig/configure.in.in
++++ kdelibs-patched/configure.in.in
@@ -19,6 +19,8 @@
dnl Automake doc recommends to do this only here. (Janos)
AM_INIT_AUTOMAKE(@MODULENAME@, @VERSION@) dnl searches for some needed programs
Modified: branches/kde-3.3.2/kdelibs/debian/patches/05_pedantic-errors.diff
===================================================================
--- branches/kde-3.3.2/kdelibs/debian/patches/05_pedantic-errors.diff 2004-12-14 03:07:46 UTC (rev 306)
+++ branches/kde-3.3.2/kdelibs/debian/patches/05_pedantic-errors.diff 2004-12-14 14:28:37 UTC (rev 307)
@@ -1,6 +1,5 @@
-diff -Nrua kdelibs-3.2.92/admin/acinclude.m4.in kdelibs-patched/admin/acinclude.m4.in
---- kdelibs-3.2.92/admin/acinclude.m4.in 2004-07-26 16:01:17.000000000 -0500
-+++ kdelibs-patched/admin/acinclude.m4.in 2004-07-26 16:02:01.000000000 -0500
+--- kdelibs-orig/admin/acinclude.m4.in
++++ kdelibs-patched/admin/acinclude.m4.in
@@ -2087,9 +2087,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
Modified: branches/kde-3.3.2/kdelibs/debian/patches/06_automake-1.9.diff
===================================================================
--- branches/kde-3.3.2/kdelibs/debian/patches/06_automake-1.9.diff 2004-12-14 03:07:46 UTC (rev 306)
+++ branches/kde-3.3.2/kdelibs/debian/patches/06_automake-1.9.diff 2004-12-14 14:28:37 UTC (rev 307)
@@ -1,5 +1,5 @@
---- a/admin/detect-autoconf.sh
-+++ b/admin/detect-autoconf.sh
+--- kdelibs-orig/admin/detect-autoconf.sh
++++ kdelibs-patched/admin/detect-autoconf.sh
@@ -11,7 +11,7 @@
# needed to compile KDE. Do not forget to include the name/version #
# separator if one is present, e.g. -1.2 where - is the separator.
Modified: branches/kde-3.3.2/kdelibs/debian/patches/10_kstandarddirs.diff
===================================================================
--- branches/kde-3.3.2/kdelibs/debian/patches/10_kstandarddirs.diff 2004-12-14 03:07:46 UTC (rev 306)
+++ branches/kde-3.3.2/kdelibs/debian/patches/10_kstandarddirs.diff 2004-12-14 14:28:37 UTC (rev 307)
@@ -1,6 +1,5 @@
-diff -Nrua kdelibs-3.2.92/kdecore/kstandarddirs.cpp kdelibs-patched/kdecore/kstandarddirs.cpp
---- kdelibs-3.2.92/kdecore/kstandarddirs.cpp 2004-07-16 11:10:24.000000000 -0500
-+++ kdelibs-patched/kdecore/kstandarddirs.cpp 2004-07-26 16:06:09.000000000 -0500
+--- kdelibs-orig/kdecore/kstandarddirs.cpp
++++ kdelibs-patched/kdecore/kstandarddirs.cpp
@@ -747,6 +747,10 @@
if ((local || testdir.exists()) && !candidates->contains(path))
candidates->append(path);
Modified: branches/kde-3.3.2/kdelibs/debian/patches/11_applications_menu.diff
===================================================================
--- branches/kde-3.3.2/kdelibs/debian/patches/11_applications_menu.diff 2004-12-14 03:07:46 UTC (rev 306)
+++ branches/kde-3.3.2/kdelibs/debian/patches/11_applications_menu.diff 2004-12-14 14:28:37 UTC (rev 307)
@@ -1,6 +1,5 @@
-diff -Nru kdelibs-3.2.1/kded/applications.menu kdelibs-patched/kded/applications.menu
---- kdelibs-3.2.1/kded/applications.menu 2004-03-04 20:48:18.000000000 -0600
-+++ kdelibs-patched/kded/applications.menu 2004-03-04 20:48:53.000000000 -0600
+--- kdelibs-orig/kded/applications.menu
++++ kdelibs-patched/kded/applications.menu
@@ -4,22 +4,36 @@
<Menu>
<Name>KDE</Name>
Deleted: branches/kde-3.3.2/kdelibs/debian/patches/post-3.3.1-kdelibs-kio.diff
Deleted: branches/kde-3.3.2/kdelibs/debian/patches/post-3.3.2-kdelibs-htmlframes2.diff
Modified: branches/kde-3.3.2/kdelibs/debian/rules
===================================================================
--- branches/kde-3.3.2/kdelibs/debian/rules 2004-12-14 03:07:46 UTC (rev 306)
+++ branches/kde-3.3.2/kdelibs/debian/rules 2004-12-14 14:28:37 UTC (rev 307)
@@ -76,6 +76,7 @@
cd $(objdir) && \
../configure $(configkde) --enable-final \
--with-distribution="$$version (`cat /etc/debian_version`)" \
+ --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \
--enable-dnotify --enable-mitshm --with-alsa --with-ipv6-lookup=auto \
$(FAST_MALLOC)